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=-8.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 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 CDD6EC7618B for ; Wed, 24 Jul 2019 14:05:35 +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 8C54322CD0 for ; Wed, 24 Jul 2019 14:05:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8C54322CD0 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]:51954 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqHte-0001B4-Is for qemu-devel@archiver.kernel.org; Wed, 24 Jul 2019 10:05:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51407) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hqHtN-0000Jy-C8 for qemu-devel@nongnu.org; Wed, 24 Jul 2019 10:05:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hqHtL-0005eU-Rw for qemu-devel@nongnu.org; Wed, 24 Jul 2019 10:05:17 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42126) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hqHtI-0005Wo-G4; Wed, 24 Jul 2019 10:05:12 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 331D8B2DEC; Wed, 24 Jul 2019 14:05:09 +0000 (UTC) Received: from [10.36.117.47] (ovpn-117-47.ams2.redhat.com [10.36.117.47]) by smtp.corp.redhat.com (Postfix) with ESMTP id 82D0060A9F; Wed, 24 Jul 2019 14:04:44 +0000 (UTC) To: Cornelia Huck , Peter Maydell , Eduardo Habkost , Marcel Apfelbaum , "Michael S . Tsirkin" , Paolo Bonzini , Richard Henderson , David Gibson , Halil Pasic , Christian Borntraeger References: <20190724103524.20916-1-cohuck@redhat.com> From: David Hildenbrand Openpgp: preference=signencrypt Autocrypt: addr=david@redhat.com; prefer-encrypt=mutual; keydata= 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 SE+xAvmumFBY Organization: Red Hat GmbH Message-ID: Date: Wed, 24 Jul 2019 16:04:43 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.7.2 MIME-Version: 1.0 In-Reply-To: <20190724103524.20916-1-cohuck@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Wed, 24 Jul 2019 14:05:09 +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: Re: [Qemu-devel] [PATCH for-4.2] hw: add compat machines for 4.2 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: qemu-s390x@nongnu.org, qemu-arm@nongnu.org, qemu-ppc@nongnu.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 24.07.19 12:35, Cornelia Huck wrote: > Add 4.2 machine types for arm/i440fx/q35/s390x/spapr. > > For i440fx and q35, unversioned cpu models are still translated > to -v1, as 0788a56bd1ae ("i386: Make unversioned CPU models be > aliases") states this should only transition to the latest cpu > model version in 4.3 (or later). > > Signed-off-by: Cornelia Huck > --- > hw/arm/virt.c | 9 ++++++++- > hw/core/machine.c | 3 +++ > hw/i386/pc.c | 3 +++ > hw/i386/pc_piix.c | 14 +++++++++++++- > hw/i386/pc_q35.c | 13 ++++++++++++- > hw/ppc/spapr.c | 15 +++++++++++++-- > hw/s390x/s390-virtio-ccw.c | 14 +++++++++++++- > include/hw/boards.h | 3 +++ > include/hw/i386/pc.h | 3 +++ > 9 files changed, 71 insertions(+), 6 deletions(-) > > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > index d9496c936342..64e3fc34401a 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -2046,10 +2046,17 @@ static void machvirt_machine_init(void) > } > type_init(machvirt_machine_init); > > +static void virt_machine_4_2_options(MachineClass *mc) > +{ > +} > +DEFINE_VIRT_MACHINE_AS_LATEST(4, 2) > + > static void virt_machine_4_1_options(MachineClass *mc) > { > + virt_machine_4_2_options(mc); > + compat_props_add(mc->compat_props, hw_compat_4_1, hw_compat_4_1_len); > } > -DEFINE_VIRT_MACHINE_AS_LATEST(4, 1) > +DEFINE_VIRT_MACHINE(4, 1) > > static void virt_machine_4_0_options(MachineClass *mc) > { > diff --git a/hw/core/machine.c b/hw/core/machine.c > index c58a8e594efc..a79d4ad740a0 100644 > --- a/hw/core/machine.c > +++ b/hw/core/machine.c > @@ -27,6 +27,9 @@ > #include "hw/pci/pci.h" > #include "hw/mem/nvdimm.h" > > +GlobalProperty hw_compat_4_1[] = {}; > +const size_t hw_compat_4_1_len = G_N_ELEMENTS(hw_compat_4_1); > + > GlobalProperty hw_compat_4_0[] = { > { "VGA", "edid", "false" }, > { "secondary-vga", "edid", "false" }, > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index 549c43705096..2aa1c49701dd 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -116,6 +116,9 @@ struct hpet_fw_config hpet_cfg = {.count = UINT8_MAX}; > /* Physical Address of PVH entry point read from kernel ELF NOTE */ > static size_t pvh_start_addr; > > +GlobalProperty pc_compat_4_1[] = {}; > +const size_t pc_compat_4_1_len = G_N_ELEMENTS(pc_compat_4_1); > + > GlobalProperty pc_compat_4_0[] = {}; > const size_t pc_compat_4_0_len = G_N_ELEMENTS(pc_compat_4_0); > > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index c2280c72effb..24e71be1d218 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -433,7 +433,7 @@ static void pc_i440fx_machine_options(MachineClass *m) > machine_class_allow_dynamic_sysbus_dev(m, TYPE_RAMFB_DEVICE); > } > > -static void pc_i440fx_4_1_machine_options(MachineClass *m) > +static void pc_i440fx_4_2_machine_options(MachineClass *m) > { > PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > pc_i440fx_machine_options(m); > @@ -442,6 +442,18 @@ static void pc_i440fx_4_1_machine_options(MachineClass *m) > pcmc->default_cpu_version = 1; > } > > +DEFINE_I440FX_MACHINE(v4_2, "pc-i440fx-4.2", NULL, > + pc_i440fx_4_2_machine_options); > + > +static void pc_i440fx_4_1_machine_options(MachineClass *m) > +{ > + pc_i440fx_4_2_machine_options(m); > + m->alias = NULL; > + m->is_default = 0; > + compat_props_add(m->compat_props, hw_compat_4_1, hw_compat_4_1_len); > + compat_props_add(m->compat_props, pc_compat_4_1, pc_compat_4_1_len); > +} > + > DEFINE_I440FX_MACHINE(v4_1, "pc-i440fx-4.1", NULL, > pc_i440fx_4_1_machine_options); > > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > index 397e1fdd2f37..e61260762cdc 100644 > --- a/hw/i386/pc_q35.c > +++ b/hw/i386/pc_q35.c > @@ -365,7 +365,7 @@ static void pc_q35_machine_options(MachineClass *m) > m->max_cpus = 288; > } > > -static void pc_q35_4_1_machine_options(MachineClass *m) > +static void pc_q35_4_2_machine_options(MachineClass *m) > { > PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > pc_q35_machine_options(m); > @@ -373,6 +373,17 @@ static void pc_q35_4_1_machine_options(MachineClass *m) > pcmc->default_cpu_version = 1; > } > > +DEFINE_Q35_MACHINE(v4_2, "pc-q35-4.2", NULL, > + pc_q35_4_2_machine_options); > + > +static void pc_q35_4_1_machine_options(MachineClass *m) > +{ > + pc_q35_4_2_machine_options(m); > + m->alias = NULL; > + compat_props_add(m->compat_props, hw_compat_4_1, hw_compat_4_1_len); > + compat_props_add(m->compat_props, pc_compat_4_1, pc_compat_4_1_len); > +} > + > DEFINE_Q35_MACHINE(v4_1, "pc-q35-4.1", NULL, > pc_q35_4_1_machine_options); > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 821f0d4a49ff..6c8aa6054508 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -4426,15 +4426,26 @@ static const TypeInfo spapr_machine_info = { > } \ > type_init(spapr_machine_register_##suffix) > > +/* > + * pseries-4.2 > + */ > +static void spapr_machine_4_2_class_options(MachineClass *mc) > +{ > + /* Defaults for the latest behaviour inherited from the base class */ > +} > + > +DEFINE_SPAPR_MACHINE(4_2, "4.2", true); > + > /* > * pseries-4.1 > */ > static void spapr_machine_4_1_class_options(MachineClass *mc) > { > - /* Defaults for the latest behaviour inherited from the base class */ > + spapr_machine_4_2_class_options(mc); > + compat_props_add(mc->compat_props, hw_compat_4_1, hw_compat_4_1_len); > } > > -DEFINE_SPAPR_MACHINE(4_1, "4.1", true); > +DEFINE_SPAPR_MACHINE(4_1, "4.1", false); > > /* > * pseries-4.0 > diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c > index 5b6a9a4e5574..593b34e0e201 100644 > --- a/hw/s390x/s390-virtio-ccw.c > +++ b/hw/s390x/s390-virtio-ccw.c > @@ -660,14 +660,26 @@ bool css_migration_enabled(void) > } \ > type_init(ccw_machine_register_##suffix) > > +static void ccw_machine_4_2_instance_options(MachineState *machine) > +{ > +} > + > +static void ccw_machine_4_2_class_options(MachineClass *mc) > +{ > +} > +DEFINE_CCW_MACHINE(4_2, "4.2", true); > + > static void ccw_machine_4_1_instance_options(MachineState *machine) > { > + ccw_machine_4_2_instance_options(machine); > } > > static void ccw_machine_4_1_class_options(MachineClass *mc) > { > + ccw_machine_4_2_class_options(mc); > + compat_props_add(mc->compat_props, hw_compat_4_1, hw_compat_4_1_len); > } > -DEFINE_CCW_MACHINE(4_1, "4.1", true); > +DEFINE_CCW_MACHINE(4_1, "4.1", false); > > static void ccw_machine_4_0_instance_options(MachineState *machine) > { > diff --git a/include/hw/boards.h b/include/hw/boards.h > index a71d1a53a5c0..d9ec37d80743 100644 > --- a/include/hw/boards.h > +++ b/include/hw/boards.h > @@ -317,6 +317,9 @@ struct MachineState { > } \ > type_init(machine_initfn##_register_types) > > +extern GlobalProperty hw_compat_4_1[]; > +extern const size_t hw_compat_4_1_len; > + > extern GlobalProperty hw_compat_4_0[]; > extern const size_t hw_compat_4_0_len; > > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h > index 859b64c51d45..c840e392515b 100644 > --- a/include/hw/i386/pc.h > +++ b/include/hw/i386/pc.h > @@ -302,6 +302,9 @@ int e820_add_entry(uint64_t, uint64_t, uint32_t); > int e820_get_num_entries(void); > bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); > > +extern GlobalProperty pc_compat_4_1[]; > +extern const size_t pc_compat_4_1_len; > + > extern GlobalProperty pc_compat_4_0[]; > extern const size_t pc_compat_4_0_len; > > s390x bits Reviewed-by: David Hildenbrand -- Thanks, David / dhildenb