From nobody Sat May 11 21:38:10 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1561752309; cv=none; d=zoho.com; s=zohoarc; b=cbYdMxKzFSUWOfHLvIKtnsszR+UYIvcAdLDW+z1RMQG43fgAlnHFabF+SvYn/fuY4LJkNgKibmvt2jjd5K3uxp/Alc0jpwD3l/jiCPk8TihTRUipkXizvDMFeNXjdov+i9A5tgS2vtUGuDBPxDFNilkPIa1VdyhQ7JaDCZyunGI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1561752309; h=Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=eKza5N1aOecZiMwPgeq0XLInHtvD83D4pNQosvPrezI=; b=Mj4BBFAjGxQKzvRH69UWkoIt65zjh1Ce7Sl5dAKlijCHPuAr9JDuStPx5TX9N7mEKwkVYfV7WrCRfxuMra4oH3WfTXcMfaKJdTw5Hw8hb3FvvD2yZoyCTHe6K8nQtje/CrxUwGHWdOgkBgJ87fXbdDuMj9wPIXSoqp8s1BhOAew= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 15617523096761008.6673038802209; Fri, 28 Jun 2019 13:05:09 -0700 (PDT) Received: from localhost ([::1]:36096 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hgx7B-0003WC-UC for importer@patchew.org; Fri, 28 Jun 2019 16:04:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39033) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hgx4x-0002xq-En for qemu-devel@nongnu.org; Fri, 28 Jun 2019 16:02:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hgx4u-00049w-Pm for qemu-devel@nongnu.org; Fri, 28 Jun 2019 16:02:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50552) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hgx4u-00049Y-HV for qemu-devel@nongnu.org; Fri, 28 Jun 2019 16:02:36 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6631031628FF; Fri, 28 Jun 2019 20:02:34 +0000 (UTC) Received: from localhost (ovpn-116-7.gru2.redhat.com [10.97.116.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 795BD5C88A; Fri, 28 Jun 2019 20:02:29 +0000 (UTC) From: Eduardo Habkost To: qemu-devel@nongnu.org Date: Fri, 28 Jun 2019 17:02:27 -0300 Message-Id: <20190628200227.1053-1-ehabkost@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Fri, 28 Jun 2019 20:02:35 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH] pc: Move compat_apic_id_mode variable to PCMachineClass X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Eduardo Habkost , Sergio Lopez , "Michael S. Tsirkin" , Samuel Ortiz , Paolo Bonzini , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Replace the static variable with a PCMachineClass field. This will help us eventually get rid of the pc_compat_*() init functions. Signed-off-by: Eduardo Habkost Reviewed-by: Michael S. Tsirkin Reviewed-by: Philippe Mathieu-Daude --- include/hw/i386/pc.h | 3 +++ hw/i386/pc.c | 22 +++++++++------------- hw/i386/pc_piix.c | 3 ++- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index c54cc54a47..853502f277 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -134,6 +134,9 @@ typedef struct PCMachineClass { =20 /* use PVH to load kernels that support this feature */ bool pvh_enabled; + + /* Enables contiguous-apic-ID mode */ + bool compat_apic_id_mode; } PCMachineClass; =20 #define TYPE_PC_MACHINE "generic-pc-machine" diff --git a/hw/i386/pc.c b/hw/i386/pc.c index e96360b47a..3983621f1c 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -913,14 +913,6 @@ bool e820_get_entry(int idx, uint32_t type, uint64_t *= address, uint64_t *length) return false; } =20 -/* Enables contiguous-apic-ID mode, for compatibility */ -static bool compat_apic_id_mode; - -void enable_compat_apic_id_mode(void) -{ - compat_apic_id_mode =3D true; -} - /* Calculates initial APIC ID for a specific CPU index * * Currently we need to be able to calculate the APIC ID from the CPU index @@ -928,13 +920,15 @@ void enable_compat_apic_id_mode(void) * no concept of "CPU index", and the NUMA tables on fw_cfg need the APIC = ID of * all CPUs up to max_cpus. */ -static uint32_t x86_cpu_apic_id_from_index(unsigned int cpu_index) +static uint32_t x86_cpu_apic_id_from_index(PCMachineState *pcms, + unsigned int cpu_index) { + PCMachineClass *pcmc =3D PC_MACHINE_GET_CLASS(pcms); uint32_t correct_id; static bool warned; =20 correct_id =3D x86_apicid_from_cpu_idx(smp_cores, smp_threads, cpu_ind= ex); - if (compat_apic_id_mode) { + if (pcmc->compat_apic_id_mode) { if (cpu_index !=3D correct_id && !warned && !qtest_enabled()) { error_report("APIC IDs set in compatibility mode, " "CPU topology won't match the configuration"); @@ -1533,7 +1527,8 @@ static void pc_new_cpu(const char *typename, int64_t = apic_id, Error **errp) void pc_hot_add_cpu(const int64_t id, Error **errp) { MachineState *ms =3D MACHINE(qdev_get_machine()); - int64_t apic_id =3D x86_cpu_apic_id_from_index(id); + PCMachineState *pcms =3D PC_MACHINE(ms); + int64_t apic_id =3D x86_cpu_apic_id_from_index(pcms, id); Error *local_err =3D NULL; =20 if (id < 0) { @@ -1569,7 +1564,7 @@ void pc_cpus_init(PCMachineState *pcms) * * This is used for FW_CFG_MAX_CPUS. See comments on bochs_bios_init(). */ - pcms->apic_id_limit =3D x86_cpu_apic_id_from_index(max_cpus - 1) + 1; + pcms->apic_id_limit =3D x86_cpu_apic_id_from_index(pcms, max_cpus - 1)= + 1; possible_cpus =3D mc->possible_cpu_arch_ids(ms); for (i =3D 0; i < smp_cpus; i++) { pc_new_cpu(possible_cpus->cpus[i].type, possible_cpus->cpus[i].arc= h_id, @@ -2660,6 +2655,7 @@ static int64_t pc_get_default_cpu_node_id(const Machi= neState *ms, int idx) =20 static const CPUArchIdList *pc_possible_cpu_arch_ids(MachineState *ms) { + PCMachineState *pcms =3D PC_MACHINE(ms); int i; =20 if (ms->possible_cpus) { @@ -2679,7 +2675,7 @@ static const CPUArchIdList *pc_possible_cpu_arch_ids(= MachineState *ms) =20 ms->possible_cpus->cpus[i].type =3D ms->cpu_type; ms->possible_cpus->cpus[i].vcpus_count =3D 1; - ms->possible_cpus->cpus[i].arch_id =3D x86_cpu_apic_id_from_index(= i); + ms->possible_cpus->cpus[i].arch_id =3D x86_cpu_apic_id_from_index(= pcms, i); x86_topo_ids_from_apicid(ms->possible_cpus->cpus[i].arch_id, smp_cores, smp_threads, &topo); ms->possible_cpus->cpus[i].props.has_socket_id =3D true; diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c index c07c4a5b38..f29de58636 100644 --- a/hw/i386/pc_piix.c +++ b/hw/i386/pc_piix.c @@ -358,7 +358,6 @@ static void pc_compat_1_4_fn(MachineState *machine) static void pc_compat_1_3(MachineState *machine) { pc_compat_1_4_fn(machine); - enable_compat_apic_id_mode(); } =20 /* PC compat function for pc-0.14 to pc-1.2 */ @@ -708,6 +707,7 @@ DEFINE_I440FX_MACHINE(v1_4, "pc-i440fx-1.4", pc_compat_= 1_4_fn, =20 static void pc_i440fx_1_3_machine_options(MachineClass *m) { + PCMachineClass *pcmc =3D PC_MACHINE_CLASS(m); static GlobalProperty compat[] =3D { PC_CPU_MODEL_IDS("1.3.0") { "usb-tablet", "usb_version", "1" }, @@ -718,6 +718,7 @@ static void pc_i440fx_1_3_machine_options(MachineClass = *m) =20 pc_i440fx_1_4_machine_options(m); m->hw_version =3D "1.3.0"; + pcmc->compat_apic_id_mode =3D true; compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat)); } =20 --=20 2.18.0.rc1.1.g3f1ff2140