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=-11.6 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 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 755B2C432C3 for ; Fri, 15 Nov 2019 14:09:42 +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 373EC20729 for ; Fri, 15 Nov 2019 14:09:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="ZqKGZ4lt" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 373EC20729 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]:39572 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iVcI9-0001qA-Dw for qemu-devel@archiver.kernel.org; Fri, 15 Nov 2019 09:09:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57736) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iVcHL-0001Dt-56 for qemu-devel@nongnu.org; Fri, 15 Nov 2019 09:08:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iVcHI-0007JC-GA for qemu-devel@nongnu.org; Fri, 15 Nov 2019 09:08:50 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:21432 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iVcHI-0007Id-Az for qemu-devel@nongnu.org; Fri, 15 Nov 2019 09:08:48 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1573826927; 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=tjXBQd3zEXkIGUSPPWKe/s1PY4/gCgUQ3ktVfXiH0Zs=; b=ZqKGZ4ltcu8vjDAatX1rjSOGMH4u9gUILotTccWqQtUCy3dU9bOeaXxM9JDNrEC4e243Mm 6k0h2VK0wIe180nqrL3Tv6Il4xfjAH8xS8+GnaH1tuXw9ByeNqmHOF35k5llCDdO4lJha3 taLcklzqvfee5cyCba/FL5pXFjdR8CM= Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-386-M7bzbm3uOgOm89eyvzO21Q-1; Fri, 15 Nov 2019 09:08:45 -0500 Received: by mail-qk1-f198.google.com with SMTP id p68so6447920qkf.9 for ; Fri, 15 Nov 2019 06:08:45 -0800 (PST) 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=UJVCwZRhhPveTODtSPg3DS4InFxi5RN8lZ97QbV7LLQ=; b=olHE+RuT+aWT2/KY3WveLVqMPZ7Mkz0SzgCOXgvekYNhjQgFwT6CtoDaHOqBhYdR2N seLuubIBjNS/9OI8hUZfo9qQOwU1sHakJcTE3CmVszh2hjDra1yMXwbxaJd+RL4U6Akk Lnr3BsN5DDBCCtyN2HM4Fy2HlpxEmUlG/MSIOW28lfuc/CHHmkcotkEYA06O9a7Ck6dO B6MQjruLykr8PQReSAhpEG6OWvgQslN9UbmeU6vLNvFGlZ5X7GZPFaTaOUHVMu3wJasr nxFwrsE7wFWfswUYDfTtW/V2JadoHifOrDg3CpnGXZTyN2TW98vG25ZQ4t8b/tgFry0U ZyOw== X-Gm-Message-State: APjAAAVXjpyG88lFR6DA/MuXMNjhBWRlEWL3WsF3zkFkKP0zG29nFrOg 5MUt+xEcWmrxK3l/Y9zZx/qwVh6DXcCyK7jMTbbQ7cEfejk0OfNALLTZYysFsSB5CWQ5cwL2ofN qjQA6qEaq6hblZV4= X-Received: by 2002:ac8:405d:: with SMTP id j29mr13372278qtl.332.1573826925114; Fri, 15 Nov 2019 06:08:45 -0800 (PST) X-Google-Smtp-Source: APXvYqzXh1fgTwcjdokvZFa4l0s0HiEBOKeBKvNggT6uXisDvKxj5GE9IwUebSfFxup6Ix+vZUA5uA== X-Received: by 2002:ac8:405d:: with SMTP id j29mr13372166qtl.332.1573826924127; Fri, 15 Nov 2019 06:08:44 -0800 (PST) Received: from redhat.com (bzq-79-176-6-42.red.bezeqint.net. [79.176.6.42]) by smtp.gmail.com with ESMTPSA id y7sm3218090qto.84.2019.11.15.06.08.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Nov 2019 06:08:43 -0800 (PST) Date: Fri, 15 Nov 2019 09:08:37 -0500 From: "Michael S. Tsirkin" To: Cornelia Huck Subject: Re: [PATCH] hw: add compat machines for 5.0 Message-ID: <20191115090757-mutt-send-email-mst@kernel.org> References: <20191112104811.30323-1-cohuck@redhat.com> MIME-Version: 1.0 In-Reply-To: <20191112104811.30323-1-cohuck@redhat.com> X-MC-Unique: M7bzbm3uOgOm89eyvzO21Q-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=WINDOWS-1252 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 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 , qemu-devel@nongnu.org, Halil Pasic , Christian Borntraeger , qemu-s390x@nongnu.org, qemu-arm@nongnu.org, qemu-ppc@nongnu.org, David Gibson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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 > --- >=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 Seems a bit cleaner in the same patch. Eduardo what's your take? > --- > 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 > 2.21.0