From patchwork Thu May 5 16:17:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernhard Beschow X-Patchwork-Id: 1627022 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=brkb2uGw; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4KvJq15FW9z9sBF for ; Fri, 6 May 2022 02:21:17 +1000 (AEST) Received: from localhost ([::1]:58696 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nmeE7-00030K-Hm for incoming@patchwork.ozlabs.org; Thu, 05 May 2022 12:21:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37228) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nmeBO-00020L-9Y; Thu, 05 May 2022 12:18:26 -0400 Received: from mail-ej1-x635.google.com ([2a00:1450:4864:20::635]:45832) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nmeBM-0005j0-NK; Thu, 05 May 2022 12:18:25 -0400 Received: by mail-ej1-x635.google.com with SMTP id y3so9645910ejo.12; Thu, 05 May 2022 09:18:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qUtnbnlrI+UnKirLM6NXJpF8MZDLftaoOuEhflZEltQ=; b=brkb2uGwgyvMsXeFk8WzFoMDdfQSd/1o6cxzVEd4DLOKK7yDYDxVCRac5gNNxPRWn1 T7oWutMk93OTI8kETmSpZjXRmBkogqXKnCrFydvUwvOKq3SmsRYkGf/vsybYURP09sus 6Xwq5GtvaoCxjtBfdYZdfjHliTh9G9E8MoRH+BHLhR00Fd5FNQQ6IIIVHbBeK1NVtAgz w+GDX4gDfKB5dcOuEwu0mDyX6BrstXU8TqqEyEanBfvjyIDzxQIwPIcvvGAsUr0tHMnJ J1/YNGE+9bJmWCe1T6QncrumOVUvuv3swFTovEt4STh5NEeVkANvGkr5nCfmOvwdhyLb SWCQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qUtnbnlrI+UnKirLM6NXJpF8MZDLftaoOuEhflZEltQ=; b=6sLgK2wvJhIBSDbiWKnHanM9GSSg4IQyK2PtFNwDGl+15FxKOP5Ja+597e9vkNdkLn jEqPuoebBwMZSJApYZqG84JNIFcHdxgpaCjd1L3uHhVLURvQ/lrq1q/QzEwvzl84DzcW l0hg2KrGzghfS5DuEguMjwxoKIkT7toG0T0iI7ACYdns6gmfD6z8f+U2h37W/TwVDZyW 09W6351iy8uB2lMzoBf4HaPVOSEztsIn7WMxwwPfGBsDIUIs8SWtdBOjzVUO267NrIb2 57Pfmp+jiU02bBrfAevkwRxjYcOsizYZ27b2LFDKZXJzk5p9N0dt7gNc7MCV3EfpqiIQ 77JQ== X-Gm-Message-State: AOAM5336f8ir6Kv9THPDFWpLZB9esEQ8PkWT6g1jGQhFuvKAQzMBcTuG IkrhOxvncothmE4ry/Vl5BFBjkWJeRw= X-Google-Smtp-Source: ABdhPJy06WVnmA4+bFFXkHCTTo6GIEsrDjZ36MYfTCwxAZbKbLL8talOL/Q5fHSgrwnmgbIuigjhNQ== X-Received: by 2002:a17:907:c2a:b0:6f4:4b49:9cfb with SMTP id ga42-20020a1709070c2a00b006f44b499cfbmr19926797ejc.697.1651767502505; Thu, 05 May 2022 09:18:22 -0700 (PDT) Received: from Provence.localdomain (dynamic-078-054-123-159.78.54.pool.telefonica.de. [78.54.123.159]) by smtp.gmail.com with ESMTPSA id i6-20020a17090685c600b006f3ef214dcfsm868542ejy.53.2022.05.05.09.18.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 May 2022 09:18:22 -0700 (PDT) From: Bernhard Beschow To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, Bernhard Beschow , "Michael S. Tsirkin" , Marcel Apfelbaum , Paolo Bonzini , Richard Henderson , Eduardo Habkost Subject: [PATCH 04/11] hw/i386/pc: Unexport PC_CPU_MODEL_IDS macro Date: Thu, 5 May 2022 18:17:58 +0200 Message-Id: <20220505161805.11116-5-shentey@gmail.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220505161805.11116-1-shentey@gmail.com> References: <20220505161805.11116-1-shentey@gmail.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::635; envelope-from=shentey@gmail.com; helo=mail-ej1-x635.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The macro seems to be used only internally, so remove it. Signed-off-by: Bernhard Beschow --- hw/i386/pc.c | 9 +++++++++ include/hw/i386/pc.h | 8 -------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 649511a49b..c2975d7de5 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -95,6 +95,15 @@ #include "trace.h" #include CONFIG_DEVICES +/* + * Helper for setting model-id for CPU models that changed model-id + * depending on QEMU versions up to QEMU 2.4. + */ +#define PC_CPU_MODEL_IDS(v) \ + { "qemu32-" TYPE_X86_CPU, "model-id", "QEMU Virtual CPU version " v, },\ + { "qemu64-" TYPE_X86_CPU, "model-id", "QEMU Virtual CPU version " v, },\ + { "athlon-" TYPE_X86_CPU, "model-id", "QEMU Virtual CPU version " v, }, + GlobalProperty pc_compat_7_0[] = {}; const size_t pc_compat_7_0_len = G_N_ELEMENTS(pc_compat_7_0); diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 637367dc5f..b34c664ff5 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -289,14 +289,6 @@ extern const size_t pc_compat_1_5_len; extern GlobalProperty pc_compat_1_4[]; extern const size_t pc_compat_1_4_len; -/* Helper for setting model-id for CPU models that changed model-id - * depending on QEMU versions up to QEMU 2.4. - */ -#define PC_CPU_MODEL_IDS(v) \ - { "qemu32-" TYPE_X86_CPU, "model-id", "QEMU Virtual CPU version " v, },\ - { "qemu64-" TYPE_X86_CPU, "model-id", "QEMU Virtual CPU version " v, },\ - { "athlon-" TYPE_X86_CPU, "model-id", "QEMU Virtual CPU version " v, }, - #define DEFINE_PC_MACHINE(suffix, namestr, initfn, optsfn) \ static void pc_machine_##suffix##_class_init(ObjectClass *oc, void *data) \ { \