From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CA5C9C5B576 for ; Sun, 30 Jun 2019 21:32:12 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 97963208E3 for ; Sun, 30 Jun 2019 21:32:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 97963208E3 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:46638 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hhhQh-0000FT-Hn for qemu-devel@archiver.kernel.org; Sun, 30 Jun 2019 17:32:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43658) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hhhPG-0008Ad-Ca for qemu-devel@nongnu.org; Sun, 30 Jun 2019 17:30:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hhhPE-0001r9-TQ for qemu-devel@nongnu.org; Sun, 30 Jun 2019 17:30:42 -0400 Received: from mail-qt1-f194.google.com ([209.85.160.194]:46162) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hhhPE-0001pX-OV for qemu-devel@nongnu.org; Sun, 30 Jun 2019 17:30:40 -0400 Received: by mail-qt1-f194.google.com with SMTP id h21so12556891qtn.13 for ; Sun, 30 Jun 2019 14:30:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=pViBL033yEjj1VETWFPrnHDhlRspG+D0B/zjkDcLXHQ=; b=BsqkcBjk0+g5AtEXr4y1DZ3hV74RZisnDf7F/Bauxv5e/oRZN2fCXQ8S2DXqQBbM8U 7kSglSP3nPRQ3bZqp2nkpMh8zQN1k9Y5Ei4AGR70k3m7utR9aHb9LNfpRvfrP6L2u7x5 2ai8/jF4vb8wtHX8ctyskApu2celt+A13THFko1bRSAZJD9rHYx1kuzgi4XwIYruIn5h VRs8Ht8rl8Ls4dJNMZTylRQIxyIqQV4wZDDMAzuJFUaP9GZPKVcyLaDiNjcMJt3s7nxh sWgbKUwtZWkBoh40atEsrtYV717z+ain/ou8hBHmIuwj6NcdoZunYmUTjgtkqaMmt3Bl OV6w== X-Gm-Message-State: APjAAAVi3wEoTyhaobj3iNPVd3ZVT6PgVKkGZ+hH1a+YQeUAzySgsOkd sN+DAcIM33cUyEyBgD6s+ZM8xw== X-Google-Smtp-Source: APXvYqxOMnpKA6pSXNcCBro10dfUPqQ6Qpoxp5TcCch7cBrjieKImt6+mFrD9OxV2jMsEboKj6e00g== X-Received: by 2002:a0c:f788:: with SMTP id s8mr17328871qvn.35.1561930237557; Sun, 30 Jun 2019 14:30:37 -0700 (PDT) Received: from redhat.com ([37.26.146.159]) by smtp.gmail.com with ESMTPSA id c5sm4164140qkb.41.2019.06.30.14.30.32 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sun, 30 Jun 2019 14:30:36 -0700 (PDT) Date: Sun, 30 Jun 2019 17:30:25 -0400 From: "Michael S. Tsirkin" To: Eduardo Habkost Message-ID: <20190630173000-mutt-send-email-mst@kernel.org> References: <20190628200227.1053-1-ehabkost@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190628200227.1053-1-ehabkost@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.160.194 Subject: Re: [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: Samuel Ortiz , Sergio Lopez , qemu-devel@nongnu.org, Paolo Bonzini , Richard Henderson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Fri, Jun 28, 2019 at 05:02:27PM -0300, Eduardo Habkost wrote: > 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 Pls feel free to merge. > --- > 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 { > > /* use PVH to load kernels that support this feature */ > bool pvh_enabled; > + > + /* Enables contiguous-apic-ID mode */ > + bool compat_apic_id_mode; > } PCMachineClass; > > #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; > } > > -/* Enables contiguous-apic-ID mode, for compatibility */ > -static bool compat_apic_id_mode; > - > -void enable_compat_apic_id_mode(void) > -{ > - compat_apic_id_mode = 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 = PC_MACHINE_GET_CLASS(pcms); > uint32_t correct_id; > static bool warned; > > correct_id = x86_apicid_from_cpu_idx(smp_cores, smp_threads, cpu_index); > - if (compat_apic_id_mode) { > + if (pcmc->compat_apic_id_mode) { > if (cpu_index != 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 = MACHINE(qdev_get_machine()); > - int64_t apic_id = x86_cpu_apic_id_from_index(id); > + PCMachineState *pcms = PC_MACHINE(ms); > + int64_t apic_id = x86_cpu_apic_id_from_index(pcms, id); > Error *local_err = NULL; > > 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 = x86_cpu_apic_id_from_index(max_cpus - 1) + 1; > + pcms->apic_id_limit = x86_cpu_apic_id_from_index(pcms, max_cpus - 1) + 1; > possible_cpus = mc->possible_cpu_arch_ids(ms); > for (i = 0; i < smp_cpus; i++) { > pc_new_cpu(possible_cpus->cpus[i].type, possible_cpus->cpus[i].arch_id, > @@ -2660,6 +2655,7 @@ static int64_t pc_get_default_cpu_node_id(const MachineState *ms, int idx) > > static const CPUArchIdList *pc_possible_cpu_arch_ids(MachineState *ms) > { > + PCMachineState *pcms = PC_MACHINE(ms); > int i; > > if (ms->possible_cpus) { > @@ -2679,7 +2675,7 @@ static const CPUArchIdList *pc_possible_cpu_arch_ids(MachineState *ms) > > ms->possible_cpus->cpus[i].type = ms->cpu_type; > ms->possible_cpus->cpus[i].vcpus_count = 1; > - ms->possible_cpus->cpus[i].arch_id = x86_cpu_apic_id_from_index(i); > + ms->possible_cpus->cpus[i].arch_id = 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 = 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(); > } > > /* 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, > > static void pc_i440fx_1_3_machine_options(MachineClass *m) > { > + PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > static GlobalProperty compat[] = { > 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) > > pc_i440fx_1_4_machine_options(m); > m->hw_version = "1.3.0"; > + pcmc->compat_apic_id_mode = true; > compat_props_add(m->compat_props, compat, G_N_ELEMENTS(compat)); > } > > -- > 2.18.0.rc1.1.g3f1ff2140