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=-13.1 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, 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 42732C43215 for ; Fri, 15 Nov 2019 11:55:51 +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 0D9032073B for ; Fri, 15 Nov 2019 11:55:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=gibson.dropbear.id.au header.i=@gibson.dropbear.id.au header.b="i6/+qeqF" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0D9032073B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=gibson.dropbear.id.au Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:37958 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iVaCb-0003BZ-Pn for qemu-devel@archiver.kernel.org; Fri, 15 Nov 2019 06:55:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:39741) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iVaAR-0001Dd-2y for qemu-devel@nongnu.org; Fri, 15 Nov 2019 06:53:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iVaAP-00063e-CP for qemu-devel@nongnu.org; Fri, 15 Nov 2019 06:53:35 -0500 Received: from bilbo.ozlabs.org ([2401:3900:2:1::2]:33895 helo=ozlabs.org) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iVaAK-0005z8-Nj; Fri, 15 Nov 2019 06:53:29 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 47DxZC4cBRz9sPK; Fri, 15 Nov 2019 22:53:23 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1573818803; bh=Qy+aAwAfg425Zf1umA1D4VEFp1Spf/MWeYcWUZkNM9o=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=i6/+qeqFCws3+NW+6RSJPF8lDiRBC7iYMryrkiL2DPR4+tsVkeZDKN7OQl5g4C+PH tUjWC4E32+k4I1BWbbXhmpMOKVNXEeH2ctdrIEna2Q1DKaN0290wQpWehF2lWzST9F okXrB9slvWXvj0+sefQl+oen4CgKgFJqNMujBZN8= Date: Fri, 15 Nov 2019 20:32:40 +1100 From: David Gibson To: Cornelia Huck Subject: Re: [PATCH] hw: add compat machines for 5.0 Message-ID: <20191115093240.GG2134@umbus.fritz.box> References: <20191112104811.30323-1-cohuck@redhat.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="reI/iBAAp9kzkmX4" Content-Disposition: inline In-Reply-To: <20191112104811.30323-1-cohuck@redhat.com> User-Agent: Mutt/1.12.1 (2019-06-15) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2401:3900:2:1::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: Peter Maydell , 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 Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" --reI/iBAAp9kzkmX4 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Nov 12, 2019 at 11:48:11AM +0100, Cornelia Huck wrote: > Add 5.0 machine types for arm/i440fx/q35/s390x/spapr. >=20 > For i440fx and q35, unversioned cpu models are still translated > to -v1; I'll leave changing this (if desired) to the respective > maintainers. >=20 > Signed-off-by: Cornelia Huck Acked-by: David Gibson > --- >=20 > also pushed out to https://github.com/cohuck/qemu machine-5.0 >=20 > x86 folks: if you want to change the cpu model versioning, I > can do it in this patch, or just do it on top yourselves >=20 > --- > hw/arm/virt.c | 7 ++++++- > 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, 69 insertions(+), 6 deletions(-) >=20 > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > index d4bedc260712..02f654b63278 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -2147,10 +2147,15 @@ static void machvirt_machine_init(void) > } > type_init(machvirt_machine_init); > =20 > +static void virt_machine_5_0_options(MachineClass *mc) > +{ > +} > +DEFINE_VIRT_MACHINE_AS_LATEST(5, 0) > + > static void virt_machine_4_2_options(MachineClass *mc) > { > } > -DEFINE_VIRT_MACHINE_AS_LATEST(4, 2) > +DEFINE_VIRT_MACHINE(4, 2) > =20 > static void virt_machine_4_1_options(MachineClass *mc) > { > diff --git a/hw/core/machine.c b/hw/core/machine.c > index 1689ad3bf8af..21fe2d974817 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" > =20 > +GlobalProperty hw_compat_4_2[] =3D {}; > +const size_t hw_compat_4_2_len =3D G_N_ELEMENTS(hw_compat_4_2); > + > GlobalProperty hw_compat_4_1[] =3D { > { "virtio-pci", "x-pcie-flr-init", "off" }, > }; > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index 96715f8a3f99..2126c49ee7c5 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -103,6 +103,9 @@ > =20 > struct hpet_fw_config hpet_cfg =3D {.count =3D UINT8_MAX}; > =20 > +GlobalProperty pc_compat_4_2[] =3D {}; > +const size_t pc_compat_4_2_len =3D G_N_ELEMENTS(pc_compat_4_2); > + > GlobalProperty pc_compat_4_1[] =3D {}; > const size_t pc_compat_4_1_len =3D G_N_ELEMENTS(pc_compat_4_1); > =20 > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index 2aefa3b8dfe3..65915ea23c4a 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -424,7 +424,7 @@ static void pc_i440fx_machine_options(MachineClass *m) > machine_class_allow_dynamic_sysbus_dev(m, TYPE_RAMFB_DEVICE); > } > =20 > -static void pc_i440fx_4_2_machine_options(MachineClass *m) > +static void pc_i440fx_5_0_machine_options(MachineClass *m) > { > PCMachineClass *pcmc =3D PC_MACHINE_CLASS(m); > pc_i440fx_machine_options(m); > @@ -433,6 +433,18 @@ static void pc_i440fx_4_2_machine_options(MachineCla= ss *m) > pcmc->default_cpu_version =3D 1; > } > =20 > +DEFINE_I440FX_MACHINE(v5_0, "pc-i440fx-5.0", NULL, > + pc_i440fx_5_0_machine_options); > + > +static void pc_i440fx_4_2_machine_options(MachineClass *m) > +{ > + pc_i440fx_5_0_machine_options(m); > + m->alias =3D NULL; > + m->is_default =3D 0; > + compat_props_add(m->compat_props, hw_compat_4_2, hw_compat_4_2_len); > + compat_props_add(m->compat_props, pc_compat_4_2, pc_compat_4_2_len); > +} > + > DEFINE_I440FX_MACHINE(v4_2, "pc-i440fx-4.2", NULL, > pc_i440fx_4_2_machine_options); > =20 > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > index d51f5247276d..c582a6f6a363 100644 > --- a/hw/i386/pc_q35.c > +++ b/hw/i386/pc_q35.c > @@ -348,7 +348,7 @@ static void pc_q35_machine_options(MachineClass *m) > m->max_cpus =3D 288; > } > =20 > -static void pc_q35_4_2_machine_options(MachineClass *m) > +static void pc_q35_5_0_machine_options(MachineClass *m) > { > PCMachineClass *pcmc =3D PC_MACHINE_CLASS(m); > pc_q35_machine_options(m); > @@ -356,6 +356,17 @@ static void pc_q35_4_2_machine_options(MachineClass = *m) > pcmc->default_cpu_version =3D 1; > } > =20 > +DEFINE_Q35_MACHINE(v5_0, "pc-q35-5.0", NULL, > + pc_q35_5_0_machine_options); > + > +static void pc_q35_4_2_machine_options(MachineClass *m) > +{ > + pc_q35_5_0_machine_options(m); > + m->alias =3D NULL; > + compat_props_add(m->compat_props, hw_compat_4_2, hw_compat_4_2_len); > + compat_props_add(m->compat_props, pc_compat_4_2, pc_compat_4_2_len); > +} > + > DEFINE_Q35_MACHINE(v4_2, "pc-q35-4.2", NULL, > pc_q35_4_2_machine_options); > =20 > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 94f9d27096af..d5c33f2c19d3 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -4486,15 +4486,26 @@ static const TypeInfo spapr_machine_info =3D { > } \ > type_init(spapr_machine_register_##suffix) > =20 > +/* > + * pseries-5.0 > + */ > +static void spapr_machine_5_0_class_options(MachineClass *mc) > +{ > + /* Defaults for the latest behaviour inherited from the base class */ > +} > + > +DEFINE_SPAPR_MACHINE(5_0, "5.0", true); > + > /* > * pseries-4.2 > */ > static void spapr_machine_4_2_class_options(MachineClass *mc) > { > - /* Defaults for the latest behaviour inherited from the base class */ > + spapr_machine_5_0_class_options(mc); > + compat_props_add(mc->compat_props, hw_compat_4_2, hw_compat_4_2_len); > } > =20 > -DEFINE_SPAPR_MACHINE(4_2, "4.2", true); > +DEFINE_SPAPR_MACHINE(4_2, "4.2", false); > =20 > /* > * pseries-4.1 > diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c > index d3edeef0ad92..01e7e209a5da 100644 > --- a/hw/s390x/s390-virtio-ccw.c > +++ b/hw/s390x/s390-virtio-ccw.c > @@ -639,14 +639,26 @@ bool css_migration_enabled(void) > } = \ > type_init(ccw_machine_register_##suffix) > =20 > +static void ccw_machine_5_0_instance_options(MachineState *machine) > +{ > +} > + > +static void ccw_machine_5_0_class_options(MachineClass *mc) > +{ > +} > +DEFINE_CCW_MACHINE(5_0, "5.0", true); > + > static void ccw_machine_4_2_instance_options(MachineState *machine) > { > + ccw_machine_5_0_instance_options(machine); > } > =20 > static void ccw_machine_4_2_class_options(MachineClass *mc) > { > + ccw_machine_5_0_class_options(mc); > + compat_props_add(mc->compat_props, hw_compat_4_2, hw_compat_4_2_len); > } > -DEFINE_CCW_MACHINE(4_2, "4.2", true); > +DEFINE_CCW_MACHINE(4_2, "4.2", false); > =20 > static void ccw_machine_4_1_instance_options(MachineState *machine) > { > diff --git a/include/hw/boards.h b/include/hw/boards.h > index de45087f34cb..24cbeecbaecc 100644 > --- a/include/hw/boards.h > +++ b/include/hw/boards.h > @@ -329,6 +329,9 @@ struct MachineState { > } \ > type_init(machine_initfn##_register_types) > =20 > +extern GlobalProperty hw_compat_4_2[]; > +extern const size_t hw_compat_4_2_len; > + > extern GlobalProperty hw_compat_4_1[]; > extern const size_t hw_compat_4_1_len; > =20 > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h > index e6fa8418ca61..0b23fc73c99b 100644 > --- a/include/hw/i386/pc.h > +++ b/include/hw/i386/pc.h > @@ -239,6 +239,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_4_2[]; > +extern const size_t pc_compat_4_2_len; > + > extern GlobalProperty pc_compat_4_1[]; > extern const size_t pc_compat_4_1_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 --reI/iBAAp9kzkmX4 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEdfRlhq5hpmzETofcbDjKyiDZs5IFAl3OcLgACgkQbDjKyiDZ s5LAIQ//X2f2XE9Gy8dIU0yG4iRW3Wvrv3GlrPHeT8JHjsoyXlc3yHMJJwygA3In KANTUCf5wA69k5qknSSip3EslNbGYQ5RXnMZpkYVJ6cqTSyqn9JCNm2TvYMuYMKG Hb7gMF9ql5YcjVu7vAcSEIC9fq2/2DOIJHK8yR01iJj4rV7zBPsm/JiUIpc0CBvr VcJ/GjkksUOAoSUnzXMuDlC2q1FVUF/pkS5ooE7lq/baLTTWnk5vpw3mUiejtDE5 T+/L729VnBIeftH1rycIc2j+pMLHbzHcdBl9/popY0lyrEGSIQ079EqbYjvCpMew Rru6VZyFp8r9KjBEioYmpnmwD9hSm4xMdd0YdX7Y2oSeiHUWgskXC8Hd2FvRIwHH kyp2q9fgbVJ22l8JOsh9sooRXZu9IDAyjEqIab0E1r5I+cVMP5/20oqqBbY2XHvc gh68fHsjwaR1qeT7RU9QlljcsxnK+CAgXBQJocZPnW1/9nOj14tV2NhqD1zwgZA6 Z7ud92Ff0mMCQBcmevFKCEbkvGwqkxO+rccpN50iZmPmGK2vhJDWpUa0hwEHziqP t9eIo7k+sFZNTD3pmf10XGNbLYUp9UsWwbEdcFdwZOUxs4ZkRBSB06VX7V7QKyHZ 4KW9dKEBQhGBtBevymBXhjpLAyk3S4denjLKJO7pM2ZRtJ7bf38= =pI3k -----END PGP SIGNATURE----- --reI/iBAAp9kzkmX4--