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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 22869C433F5 for ; Fri, 18 Mar 2022 12:32:45 +0000 (UTC) Received: from localhost ([::1]:44452 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nVBmc-0004KT-Uf for qemu-devel@archiver.kernel.org; Fri, 18 Mar 2022 08:32:43 -0400 Received: from eggs.gnu.org ([209.51.188.92]:35612) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nVBin-0002Bw-OI for qemu-devel@nongnu.org; Fri, 18 Mar 2022 08:28:47 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:43028) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nVBij-0000g5-SD for qemu-devel@nongnu.org; Fri, 18 Mar 2022 08:28:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1647606520; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ThhdvcZPsQAJXmrn9Dm2sMpoRrM2Z3xvNgdmlbbaR5Y=; b=ZHjP7Zo/T+HlgsEyUBH8LkngSt+zfTiOEYDWNulyIr08ZDtG+24/yluYsM1nHfBPYn1IIV 51pgBGrhkkpt3+qheTCwMxWmXy15uT30mA+0YA+8f8eqfgqxxBQQK+Pvn+pWvtJOdvyp5/ GSO7j94FSAf120l7UA4ZiSLcbcOxTE0= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-481-oAg6aoWZPH6HFtPu2186MA-1; Fri, 18 Mar 2022 08:28:39 -0400 X-MC-Unique: oAg6aoWZPH6HFtPu2186MA-1 Received: by mail-wm1-f70.google.com with SMTP id m35-20020a05600c3b2300b0038c90ef2dceso4963wms.4 for ; Fri, 18 Mar 2022 05:28:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=ThhdvcZPsQAJXmrn9Dm2sMpoRrM2Z3xvNgdmlbbaR5Y=; b=yazKeOsOI8RWAYvutI9L+IgNxeXG8J6n7pb5eUwlpwJymbaZKriJQB5rchB+dRtao3 0YHYVmw2wyrzOEDX8IEzzYzMrDpZhmPC1ZprYP8nY25f2vVbK/Us2qptJ90D7frUkuZ+ pYR+Y67xR4fIDy+3Qnu9fh2DZsF3vTUKkLQdHpiMlQNwMYir0BMBriPE+uEJ+3tU4E8c yN5dGMQ36DGtcI0Jf5V93B5yGZqzqJI1vbNnuQ68Jyprip+C9rra6EhoAembud5jcFYT /UsPicJ7z+Ve3Czl/L2nNgWKWhx8edMuzmm+So9vdoeEpheG85TPw9J8+j2lipS5gxqW 5P3Q== X-Gm-Message-State: AOAM531xpZJyaUOqRfu1OLv8L9hupJuobTSNhZK56EYg/T0sjwkb7hQm cMNnKjdTvdiTUYIrPCObmOzkQK8GIxjQj4Jr5KR9sUH+HynUk0JCTS1FuZxWuBJ5kzl9sWfHkFm 1g6xkUecsy8ncELI= X-Received: by 2002:adf:f943:0:b0:203:b456:c71d with SMTP id q3-20020adff943000000b00203b456c71dmr7961326wrr.568.1647606514752; Fri, 18 Mar 2022 05:28:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxqE9c0ycpa6wbWr+HGTnFUbUcmI85mFZ7FJV+ZbTm9HwLP7Fw4vh9fxXWvgBXArDovhjTYGA== X-Received: by 2002:adf:f943:0:b0:203:b456:c71d with SMTP id q3-20020adff943000000b00203b456c71dmr7961293wrr.568.1647606514381; Fri, 18 Mar 2022 05:28:34 -0700 (PDT) Received: from ?IPv6:2a01:e0a:59e:9d80:527b:9dff:feef:3874? ([2a01:e0a:59e:9d80:527b:9dff:feef:3874]) by smtp.gmail.com with ESMTPSA id p3-20020a05600c358300b00389f8158b6bsm10444073wmq.4.2022.03.18.05.28.31 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 18 Mar 2022 05:28:33 -0700 (PDT) Subject: Re: [PATCH for-7.1] hw: Add compat machines for 7.1 To: Cornelia Huck , qemu-arm@nongnu.org, qemu-devel@nongnu.org, qemu-ppc@nongnu.org, qemu-s390x@nongnu.org References: <20220316145521.1224083-1-cohuck@redhat.com> From: Eric Auger Message-ID: Date: Fri, 18 Mar 2022 13:28:31 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.1 MIME-Version: 1.0 In-Reply-To: <20220316145521.1224083-1-cohuck@redhat.com> Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=eauger@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=170.10.129.124; envelope-from=eauger@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable 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: , Cc: Eduardo Habkost , Peter Maydell , Eric Farman , "Michael S. Tsirkin" , Daniel Henrique Barboza , Richard Henderson , Thomas Huth , =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , Yanan Wang , Greg Kurz , =?UTF-8?Q?C=c3=a9dric_Le_Goater?= , David Gibson , Halil Pasic , Paolo Bonzini , David Hildenbrand , Christian Borntraeger , Laurent Vivier Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Hi Connie, On 3/16/22 3:55 PM, Cornelia Huck wrote: > Add 7.1 machine types for arm/i440fx/m68k/q35/s390x/spapr. > > 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/m68k/virt.c | 9 ++++++++- > hw/ppc/spapr.c | 15 +++++++++++++-- > hw/s390x/s390-virtio-ccw.c | 14 +++++++++++++- > include/hw/boards.h | 3 +++ > include/hw/i386/pc.h | 3 +++ > 10 files changed, 79 insertions(+), 7 deletions(-) for the arm part: Reviewed-by: Eric Auger Thanks Eric > > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > index 46a42502bc55..2e6b4aac8c75 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -3017,10 +3017,17 @@ static void machvirt_machine_init(void) > } > type_init(machvirt_machine_init); > > +static void virt_machine_7_1_options(MachineClass *mc) > +{ > +} > +DEFINE_VIRT_MACHINE_AS_LATEST(7, 1) > + > static void virt_machine_7_0_options(MachineClass *mc) > { > + virt_machine_7_1_options(mc); > + compat_props_add(mc->compat_props, hw_compat_7_0, hw_compat_7_0_len); > } > -DEFINE_VIRT_MACHINE_AS_LATEST(7, 0) > +DEFINE_VIRT_MACHINE(7, 0) > > static void virt_machine_6_2_options(MachineClass *mc) > { > diff --git a/hw/core/machine.c b/hw/core/machine.c > index d856485cb4d0..cb9c05a7ded7 100644 > --- a/hw/core/machine.c > +++ b/hw/core/machine.c > @@ -37,6 +37,9 @@ > #include "hw/virtio/virtio.h" > #include "hw/virtio/virtio-pci.h" > > +GlobalProperty hw_compat_7_0[] = {}; > +const size_t hw_compat_7_0_len = G_N_ELEMENTS(hw_compat_7_0); > + > GlobalProperty hw_compat_6_2[] = {}; > const size_t hw_compat_6_2_len = G_N_ELEMENTS(hw_compat_6_2); > > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index fd55fc725caf..23bba9d82c12 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -95,6 +95,9 @@ > #include "trace.h" > #include CONFIG_DEVICES > > +GlobalProperty pc_compat_7_0[] = {}; > +const size_t pc_compat_7_0_len = G_N_ELEMENTS(pc_compat_7_0); > + > GlobalProperty pc_compat_6_2[] = { > { "virtio-mem", "unplugged-inaccessible", "off" }, > }; > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index b72c03d0a626..4c185c72d014 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -415,7 +415,7 @@ static void pc_i440fx_machine_options(MachineClass *m) > machine_class_allow_dynamic_sysbus_dev(m, TYPE_VMBUS_BRIDGE); > } > > -static void pc_i440fx_7_0_machine_options(MachineClass *m) > +static void pc_i440fx_7_1_machine_options(MachineClass *m) > { > PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > pc_i440fx_machine_options(m); > @@ -424,6 +424,18 @@ static void pc_i440fx_7_0_machine_options(MachineClass *m) > pcmc->default_cpu_version = 1; > } > > +DEFINE_I440FX_MACHINE(v7_1, "pc-i440fx-7.1", NULL, > + pc_i440fx_7_1_machine_options); > + > +static void pc_i440fx_7_0_machine_options(MachineClass *m) > +{ > + pc_i440fx_7_1_machine_options(m); > + m->alias = NULL; > + m->is_default = false; > + compat_props_add(m->compat_props, hw_compat_7_0, hw_compat_7_0_len); > + compat_props_add(m->compat_props, pc_compat_7_0, pc_compat_7_0_len); > +} > + > DEFINE_I440FX_MACHINE(v7_0, "pc-i440fx-7.0", NULL, > pc_i440fx_7_0_machine_options); > > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > index 1780f79bc127..302288342a91 100644 > --- a/hw/i386/pc_q35.c > +++ b/hw/i386/pc_q35.c > @@ -360,7 +360,7 @@ static void pc_q35_machine_options(MachineClass *m) > m->max_cpus = 288; > } > > -static void pc_q35_7_0_machine_options(MachineClass *m) > +static void pc_q35_7_1_machine_options(MachineClass *m) > { > PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > pc_q35_machine_options(m); > @@ -368,6 +368,17 @@ static void pc_q35_7_0_machine_options(MachineClass *m) > pcmc->default_cpu_version = 1; > } > > +DEFINE_Q35_MACHINE(v7_1, "pc-q35-7.1", NULL, > + pc_q35_7_1_machine_options); > + > +static void pc_q35_7_0_machine_options(MachineClass *m) > +{ > + pc_q35_7_1_machine_options(m); > + m->alias = NULL; > + compat_props_add(m->compat_props, hw_compat_7_0, hw_compat_7_0_len); > + compat_props_add(m->compat_props, pc_compat_7_0, pc_compat_7_0_len); > +} > + > DEFINE_Q35_MACHINE(v7_0, "pc-q35-7.0", NULL, > pc_q35_7_0_machine_options); > > diff --git a/hw/m68k/virt.c b/hw/m68k/virt.c > index bbaf630bbf20..afa52d7e491e 100644 > --- a/hw/m68k/virt.c > +++ b/hw/m68k/virt.c > @@ -316,10 +316,17 @@ type_init(virt_machine_register_types) > } \ > type_init(machvirt_machine_##major##_##minor##_init); > > +static void virt_machine_7_1_options(MachineClass *mc) > +{ > +} > +DEFINE_VIRT_MACHINE(7, 1, true) > + > static void virt_machine_7_0_options(MachineClass *mc) > { > + virt_machine_7_1_options(mc); > + compat_props_add(mc->compat_props, hw_compat_7_0, hw_compat_7_0_len); > } > -DEFINE_VIRT_MACHINE(7, 0, true) > +DEFINE_VIRT_MACHINE(7, 0, false) > > static void virt_machine_6_2_options(MachineClass *mc) > { > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 953fc65fa863..3561882d6615 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -4703,15 +4703,26 @@ static void spapr_machine_latest_class_options(MachineClass *mc) > } \ > type_init(spapr_machine_register_##suffix) > > +/* > + * pseries-7.1 > + */ > +static void spapr_machine_7_1_class_options(MachineClass *mc) > +{ > + /* Defaults for the latest behaviour inherited from the base class */ > +} > + > +DEFINE_SPAPR_MACHINE(7_1, "7.1", true); > + > /* > * pseries-7.0 > */ > static void spapr_machine_7_0_class_options(MachineClass *mc) > { > - /* Defaults for the latest behaviour inherited from the base class */ > + spapr_machine_7_1_class_options(mc); > + compat_props_add(mc->compat_props, hw_compat_7_0, hw_compat_7_0_len); > } > > -DEFINE_SPAPR_MACHINE(7_0, "7.0", true); > +DEFINE_SPAPR_MACHINE(7_0, "7.0", false); > > /* > * pseries-6.2 > diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c > index 90480e7cf9bc..c3eab13c60e8 100644 > --- a/hw/s390x/s390-virtio-ccw.c > +++ b/hw/s390x/s390-virtio-ccw.c > @@ -791,14 +791,26 @@ bool css_migration_enabled(void) > } \ > type_init(ccw_machine_register_##suffix) > > +static void ccw_machine_7_1_instance_options(MachineState *machine) > +{ > +} > + > +static void ccw_machine_7_1_class_options(MachineClass *mc) > +{ > +} > +DEFINE_CCW_MACHINE(7_1, "7.1", true); > + > static void ccw_machine_7_0_instance_options(MachineState *machine) > { > + ccw_machine_7_1_instance_options(machine); > } > > static void ccw_machine_7_0_class_options(MachineClass *mc) > { > + ccw_machine_7_1_class_options(mc); > + compat_props_add(mc->compat_props, hw_compat_7_0, hw_compat_7_0_len); > } > -DEFINE_CCW_MACHINE(7_0, "7.0", true); > +DEFINE_CCW_MACHINE(7_0, "7.0", false); > > static void ccw_machine_6_2_instance_options(MachineState *machine) > { > diff --git a/include/hw/boards.h b/include/hw/boards.h > index c92ac8815c85..d64b5481e834 100644 > --- a/include/hw/boards.h > +++ b/include/hw/boards.h > @@ -380,6 +380,9 @@ struct MachineState { > } \ > type_init(machine_initfn##_register_types) > > +extern GlobalProperty hw_compat_7_0[]; > +extern const size_t hw_compat_7_0_len; > + > extern GlobalProperty hw_compat_6_2[]; > extern const size_t hw_compat_6_2_len; > > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h > index 1a27de9c8b35..637367dc5fae 100644 > --- a/include/hw/i386/pc.h > +++ b/include/hw/i386/pc.h > @@ -202,6 +202,9 @@ void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid, > /* sgx.c */ > void pc_machine_init_sgx_epc(PCMachineState *pcms); > > +extern GlobalProperty pc_compat_7_0[]; > +extern const size_t pc_compat_7_0_len; > + > extern GlobalProperty pc_compat_6_2[]; > extern const size_t pc_compat_6_2_len; > >