Received: by 2002:ac2:4841:0:0:0:0:0 with SMTP id 1csp1243111lfy; Tue, 28 Jul 2020 22:28:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzlIuOwk4P+Hh2nCvTFNuh0TpIrUnXA8vP0DZ+DC3ZeFMmJCFjbtMZRof9Ri6c6bj/FXnrf X-Received: by 2002:a5b:f07:: with SMTP id x7mr24396851ybr.234.1596000502658; Tue, 28 Jul 2020 22:28:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1596000502; cv=none; d=google.com; s=arc-20160816; b=SNGkPskPF6nBfMUyVH4CdbN8sZb4QASCv1G3SqpRSAvrw+39W24vsq1g9ucZ6FwX6x shsLdPoIMrUSiYAUrLz0WOBx2+1n+K+n4eiznDZ0PzWx09NQgkaJjefmuzqRekuRRAOS YD3SfYUS8fXUG7lfTopFdSyKGmePhaxpRvdz0QUgeDAizS5GODBo2xblR5G+FYY4Af2y e1vo54oe8XDq3p7bO2scZQ0KVswzcvtCy92iRjS8lk6SsKidEgWTrdX9IeiUWSe0m8W/ sTSY8KABsUw/ycZ7m945XlcMDoR2Gs4F/TrGlu/J1ZOAe7ICNG3Z6NftSJ0fd9yakp29 F7Vg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:in-reply-to:content-disposition :mime-version:references:message-id:subject:to:from:date :dkim-signature; bh=5Z7XsETAAkMmT2FLHATWHx6oaYwCr6md1lUz/htEaio=; b=SCmTDymVK0DTcXLnHFwk4LA/oU7T5UqagZJa6Cs04+MRcmffTFott09AXP1bK+wskE r3TKMFHLED+cIbZ4VdjKXOWcuNRcnH6janfxAWehjO8EyWw9clKa0DOpgZ/Ep7022gmi h4RFniDck8aSK5kgh6nKABPyKGyg0VnScGM6w4r6TEiHb1hcgch91ylqKMIDoo8ExZMU CmvcDrKgdW65RiwT8CgcfZciOFZMA+rdsOAVv1BYBR8tNIUi+I6fnuMMt2v7iGi9IOHm fVUPH2qJsG0RPTz5qMjlVNhRtcqIuHWJxgIHW/1GQPJJc6CX6CIjLMScNfkWqpiAGVch S5+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gibson.dropbear.id.au header.s=201602 header.b=liTL4arL; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id p13si1192371ybm.28.2020.07.28.22.28.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 28 Jul 2020 22:28:22 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@gibson.dropbear.id.au header.s=201602 header.b=liTL4arL; spf=pass (google.com: domain of qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org" Received: from localhost ([::1]:52926 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k0edZ-0003zL-VV for alex.bennee@linaro.org; Wed, 29 Jul 2020 01:28:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42914) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k0edR-0003xn-3y; Wed, 29 Jul 2020 01:28:13 -0400 Received: from ozlabs.org ([2401:3900:2:1::2]:57235) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k0edO-00013P-3T; Wed, 29 Jul 2020 01:28:12 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 4BGhrt4Xkzz9sRN; Wed, 29 Jul 2020 15:27:58 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1596000478; bh=u2H9nUDtULPnaLk2QmdvvA2EoyWj96L7acMienJVhls=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=liTL4arLlOUOp1jmCfDoXzGlgACMYfsWagWtKy5QzF1iIfAAO/PRx3g6gasLxxiDV JccrvBwiZFVhnRxFuxzoeOsM3i685TO8jcxf3gKbk+R13FW4FUnDY7iLVRjHxbsk4O gM8omNGjtQeGQh/BqHOGMGUHCk/pTJx89FYqbrr0= Date: Wed, 29 Jul 2020 12:55:45 +1000 From: David Gibson To: Cornelia Huck Subject: Re: [PATCH] hw: add compat machines for 5.2 Message-ID: <20200729025545.GK84173@umbus.fritz.box> References: <20200728094645.272149-1-cohuck@redhat.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="zPXeIxDajdrcF2en" Content-Disposition: inline In-Reply-To: <20200728094645.272149-1-cohuck@redhat.com> Received-SPF: pass client-ip=2401:3900:2:1::2; envelope-from=dgibson@ozlabs.org; helo=ozlabs.org X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -9 X-Spam_score: -1.0 X-Spam_bar: - X-Spam_report: (-1.0 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-arm@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Thomas Huth , Eduardo Habkost , "Michael S. Tsirkin" , qemu-devel@nongnu.org, Halil Pasic , Christian Borntraeger , qemu-s390x@nongnu.org, qemu-arm@nongnu.org, qemu-ppc@nongnu.org, Marcel Apfelbaum Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: UgD6efGqVokQ --zPXeIxDajdrcF2en Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Jul 28, 2020 at 11:46:45AM +0200, Cornelia Huck wrote: > Add 5.2 machine types for arm/i440fx/q35/s390x/spapr. >=20 > Signed-off-by: Cornelia Huck ppc parts Acked-by: David Gibson > --- > 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(-) >=20 > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > index ecfee362a182..acf9bfbeceaf 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -2546,10 +2546,17 @@ static void machvirt_machine_init(void) > } > type_init(machvirt_machine_init); > =20 > +static void virt_machine_5_2_options(MachineClass *mc) > +{ > +} > +DEFINE_VIRT_MACHINE_AS_LATEST(5, 2) > + > static void virt_machine_5_1_options(MachineClass *mc) > { > + virt_machine_5_2_options(mc); > + compat_props_add(mc->compat_props, hw_compat_5_1, hw_compat_5_1_len); > } > -DEFINE_VIRT_MACHINE_AS_LATEST(5, 1) > +DEFINE_VIRT_MACHINE(5, 1) > =20 > static void virt_machine_5_0_options(MachineClass *mc) > { > diff --git a/hw/core/machine.c b/hw/core/machine.c > index 2f881d6d75b8..a24fe18ab6a6 100644 > --- a/hw/core/machine.c > +++ b/hw/core/machine.c > @@ -28,6 +28,9 @@ > #include "hw/mem/nvdimm.h" > #include "migration/vmstate.h" > =20 > +GlobalProperty hw_compat_5_1[] =3D {}; > +const size_t hw_compat_5_1_len =3D G_N_ELEMENTS(hw_compat_5_1); > + > GlobalProperty hw_compat_5_0[] =3D { > { "virtio-balloon-device", "page-poison", "false" }, > { "vmport", "x-read-set-eax", "off" }, > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index 3d419d599127..1733b5341a62 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -97,6 +97,9 @@ > #include "fw_cfg.h" > #include "trace.h" > =20 > +GlobalProperty pc_compat_5_1[] =3D {}; > +const size_t pc_compat_5_1_len =3D G_N_ELEMENTS(pc_compat_5_1); > + > GlobalProperty pc_compat_5_0[] =3D {}; > const size_t pc_compat_5_0_len =3D G_N_ELEMENTS(pc_compat_5_0); > =20 > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index b789e83f9acb..c5ba70ca17cb 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -426,7 +426,7 @@ static void pc_i440fx_machine_options(MachineClass *m) > machine_class_allow_dynamic_sysbus_dev(m, TYPE_VMBUS_BRIDGE); > } > =20 > -static void pc_i440fx_5_1_machine_options(MachineClass *m) > +static void pc_i440fx_5_2_machine_options(MachineClass *m) > { > PCMachineClass *pcmc =3D PC_MACHINE_CLASS(m); > pc_i440fx_machine_options(m); > @@ -435,6 +435,18 @@ static void pc_i440fx_5_1_machine_options(MachineCla= ss *m) > pcmc->default_cpu_version =3D 1; > } > =20 > +DEFINE_I440FX_MACHINE(v5_2, "pc-i440fx-5.2", NULL, > + pc_i440fx_5_2_machine_options); > + > +static void pc_i440fx_5_1_machine_options(MachineClass *m) > +{ > + pc_i440fx_5_2_machine_options(m); > + m->alias =3D NULL; > + m->is_default =3D false; > + compat_props_add(m->compat_props, hw_compat_5_1, hw_compat_5_1_len); > + compat_props_add(m->compat_props, pc_compat_5_1, pc_compat_5_1_len); > +} > + > DEFINE_I440FX_MACHINE(v5_1, "pc-i440fx-5.1", NULL, > pc_i440fx_5_1_machine_options); > =20 > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > index a3e607a544a5..0cb9c18cd44d 100644 > --- a/hw/i386/pc_q35.c > +++ b/hw/i386/pc_q35.c > @@ -353,7 +353,7 @@ static void pc_q35_machine_options(MachineClass *m) > m->max_cpus =3D 288; > } > =20 > -static void pc_q35_5_1_machine_options(MachineClass *m) > +static void pc_q35_5_2_machine_options(MachineClass *m) > { > PCMachineClass *pcmc =3D PC_MACHINE_CLASS(m); > pc_q35_machine_options(m); > @@ -361,6 +361,17 @@ static void pc_q35_5_1_machine_options(MachineClass = *m) > pcmc->default_cpu_version =3D 1; > } > =20 > +DEFINE_Q35_MACHINE(v5_2, "pc-q35-5.2", NULL, > + pc_q35_5_2_machine_options); > + > +static void pc_q35_5_1_machine_options(MachineClass *m) > +{ > + pc_q35_5_2_machine_options(m); > + m->alias =3D NULL; > + compat_props_add(m->compat_props, hw_compat_5_1, hw_compat_5_1_len); > + compat_props_add(m->compat_props, pc_compat_5_1, pc_compat_5_1_len); > +} > + > DEFINE_Q35_MACHINE(v5_1, "pc-q35-5.1", NULL, > pc_q35_5_1_machine_options); > =20 > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 0ae293ec9431..1c8d0981b382 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -4579,15 +4579,26 @@ static void spapr_machine_latest_class_options(Ma= chineClass *mc) > } \ > type_init(spapr_machine_register_##suffix) > =20 > +/* > + * pseries-5.2 > + */ > +static void spapr_machine_5_2_class_options(MachineClass *mc) > +{ > + /* Defaults for the latest behaviour inherited from the base class */ > +} > + > +DEFINE_SPAPR_MACHINE(5_2, "5.2", true); > + > /* > * pseries-5.1 > */ > static void spapr_machine_5_1_class_options(MachineClass *mc) > { > - /* Defaults for the latest behaviour inherited from the base class */ > + spapr_machine_5_2_class_options(mc); > + compat_props_add(mc->compat_props, hw_compat_5_1, hw_compat_5_1_len); > } > =20 > -DEFINE_SPAPR_MACHINE(5_1, "5.1", true); > +DEFINE_SPAPR_MACHINE(5_1, "5.1", false); > =20 > /* > * pseries-5.0 > diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c > index 403d30e13bca..3dc22737a389 100644 > --- a/hw/s390x/s390-virtio-ccw.c > +++ b/hw/s390x/s390-virtio-ccw.c > @@ -804,14 +804,26 @@ bool css_migration_enabled(void) > } = \ > type_init(ccw_machine_register_##suffix) > =20 > +static void ccw_machine_5_2_instance_options(MachineState *machine) > +{ > +} > + > +static void ccw_machine_5_2_class_options(MachineClass *mc) > +{ > +} > +DEFINE_CCW_MACHINE(5_2, "5.2", true); > + > static void ccw_machine_5_1_instance_options(MachineState *machine) > { > + ccw_machine_5_2_instance_options(machine); > } > =20 > static void ccw_machine_5_1_class_options(MachineClass *mc) > { > + ccw_machine_5_2_class_options(mc); > + compat_props_add(mc->compat_props, hw_compat_5_1, hw_compat_5_1_len); > } > -DEFINE_CCW_MACHINE(5_1, "5.1", true); > +DEFINE_CCW_MACHINE(5_1, "5.1", false); > =20 > static void ccw_machine_5_0_instance_options(MachineState *machine) > { > diff --git a/include/hw/boards.h b/include/hw/boards.h > index 426ce5f625a4..bc5b82ad209e 100644 > --- a/include/hw/boards.h > +++ b/include/hw/boards.h > @@ -319,6 +319,9 @@ struct MachineState { > } \ > type_init(machine_initfn##_register_types) > =20 > +extern GlobalProperty hw_compat_5_1[]; > +extern const size_t hw_compat_5_1_len; > + > extern GlobalProperty hw_compat_5_0[]; > extern const size_t hw_compat_5_0_len; > =20 > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h > index 3d7ed3a55e30..fe52e165b27c 100644 > --- a/include/hw/i386/pc.h > +++ b/include/hw/i386/pc.h > @@ -193,6 +193,9 @@ void pc_system_firmware_init(PCMachineState *pcms, Me= moryRegion *rom_memory); > void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid, > const CPUArchIdList *apic_ids, GArray *entry); > =20 > +extern GlobalProperty pc_compat_5_1[]; > +extern const size_t pc_compat_5_1_len; > + > extern GlobalProperty pc_compat_5_0[]; > extern const size_t pc_compat_5_0_len; > =20 --=20 David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson --zPXeIxDajdrcF2en Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEdfRlhq5hpmzETofcbDjKyiDZs5IFAl8g5TEACgkQbDjKyiDZ s5KiTRAAyqYIAF454xAkxXmjLD24v3wRP1OgCvRRu3ndcLyhlqVGSD8GlaWnObPa ZFoKEcfdRyAB8p4GM6e/P+/PvSm5scf1AWr5pICymopKs/3yxWzetGOseCA3HOC+ gul9hon3k0H2qgu4AzO7Rpjfb6TzZrTxbieFp7CVk3NRsyxkt3/jfR/CRsMjJlKD WLouyxvoO05l2tDmM6F0pdjhg4FW6G/rf5UJGxCWM6X+YfebtxMUXGvb/DoRdCfl urhO/omy/1iaqsJbeWFGNCW7g2rILV16Iwn6dV/xMYM92hGRRGxgRNle9Az6VKaO EjznikNVQpOu5kRGpULPaRiWDU+GtALTTAJ2UzWz96sCgbqj7bMNUnb2zCAUSLt+ LS0Oy6Q1d/XxPE/Fky/Gvug38H1Q+T8oTkDlNAMZVT/QvLE8nzIJoEs0qb+EHAd3 IMlrwtomMBtLSkxh0UMmJKsd5Y85zrF5Ux1yOpkPdjpHP5QTVNnEyeFpJfxWISkI XhyeV6EJIInrs2bTkYq3y6PUduiDCXExiiK0ld7R/HNUBaLkSHT5h+8JQWo7+Z0x sNFDFZLkndeydEN0ELf9KA2OdSLybUgXue0ClYTlA5a6tTT5VVHrJRvxEThYYb7X xZI0IHkZoewToyzcLg7WdbGOYmMZaezKAKvcSnfELKHhqPsb/Ns= =mo8B -----END PGP SIGNATURE----- --zPXeIxDajdrcF2en--