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=-6.6 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,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 3803DC54FCB for ; Sun, 26 Apr 2020 18:16:21 +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 02ACD2070A for ; Sun, 26 Apr 2020 18:16:21 +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="VNrHSOC1" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 02ACD2070A 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]:41578 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jSlpE-0001kd-1J for qemu-devel@archiver.kernel.org; Sun, 26 Apr 2020 14:16:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34034) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jSleX-0001e1-NP for qemu-devel@nongnu.org; Sun, 26 Apr 2020 14:05:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jSleW-0001yl-QJ for qemu-devel@nongnu.org; Sun, 26 Apr 2020 14:05:17 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:56952 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jSleW-0001tN-Ag for qemu-devel@nongnu.org; Sun, 26 Apr 2020 14:05:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1587924314; 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=SIlpn6vfoI2PTDFzrEx2LdpaXKs6agX8yJQnljguihI=; b=VNrHSOC1y5k0UUFK5RWzUNPxK7WGMUt6YHm1Nq8OZnOf1yUygJ7FZ5Xao4zHoPfH43TWr6 S86OWJjakHYiyWlmQw/s1dZGAHn4iI4n2J7LYIQh4iVaqRYkrhY7bF1K8vNj3+NafjZZdH MxwROR1a/oEWUqkMaMHm1IKcJeY9MsY= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-116-OqRZ5ji6MaytHI5jDLTeAg-1; Sun, 26 Apr 2020 14:05:12 -0400 X-MC-Unique: OqRZ5ji6MaytHI5jDLTeAg-1 Received: by mail-wm1-f69.google.com with SMTP id t62so5847009wma.0 for ; Sun, 26 Apr 2020 11:05:12 -0700 (PDT) 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=YDqYcORQBwJDnonJ5MHzdzhmgiJ4VlwhJK9Ck0nVzf4=; b=Sc1bTktqwaxiQpLKmQ7GVHaAEO5CvJXpBpCj7Pr9+YuAU5feYY+36hxZfalLfgh2dC zDQrYyTd7qXOW+KLvcyIeh+tsTZHHbgA62ANWu1hzeJrRh3rAyhFgnZR2SqNfI2BhCyu 6AVUh1FtoRi1GtXbHtusfSL4xd79mR1rbS7YrIWNNuxeydT5EOQnfN7RWQZacrdYxjPl yiaY3N0UGoVhIWA1QSqXBDxZlpqsSaC3H8lqalqTn0gKvVOO9UI82igPcaxcvQlh/Dwg D4fH9xXuG50QIsdGMB6a86ZuROsoZtAfat2jUIbjj8N9N90/raH4699BQgDWZIElJ+y1 Eimg== X-Gm-Message-State: AGi0Pub7bqrKxjOu7PboBeUBBRnKMbw0IZD7WaHIr6jYuiYS4LlTMeoV cpKxs/SWTQ3XAE1otVeOkwYTAKjS4QIEu4JAV+FsqdM9mNd8pNC8Y7wgHuUbxgXSi4TKylxc1iM hak+khDBkhJk1mis= X-Received: by 2002:a1c:c345:: with SMTP id t66mr23309045wmf.189.1587924309637; Sun, 26 Apr 2020 11:05:09 -0700 (PDT) X-Google-Smtp-Source: APiQypLz+xdrw63AggFBit6slcRnaW4TFgMB7kfNOxz8Bb0kuG51A9MB4mZRHhnt/xWIBahXIeXBtQ== X-Received: by 2002:a1c:c345:: with SMTP id t66mr23309004wmf.189.1587924309195; Sun, 26 Apr 2020 11:05:09 -0700 (PDT) Received: from redhat.com (bzq-109-66-7-121.red.bezeqint.net. [109.66.7.121]) by smtp.gmail.com with ESMTPSA id b12sm18822991wro.18.2020.04.26.11.05.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Apr 2020 11:05:08 -0700 (PDT) Date: Sun, 26 Apr 2020 14:05:05 -0400 From: "Michael S. Tsirkin" To: Cornelia Huck Subject: Re: [PATCH] hw: add compat machines for 5.1 Message-ID: <20200426140452-mutt-send-email-mst@kernel.org> References: <20200424090314.544-1-cohuck@redhat.com> MIME-Version: 1.0 In-Reply-To: <20200424090314.544-1-cohuck@redhat.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Received-SPF: pass client-ip=205.139.110.61; envelope-from=mst@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/26 14:05:12 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] 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 Fri, Apr 24, 2020 at 11:03:14AM +0200, Cornelia Huck wrote: > Add 5.1 machine types for arm/i440fx/q35/s390x/spapr. >=20 > Signed-off-by: Cornelia Huck Reviewed-by: Michael S. Tsirkin > --- >=20 > Still keeping the default cpu model version on x86 at v1. >=20 > I'll queue this to my s390-next branch, as I'm planning to send a pull > req as soon as 5.0 is out; if someone else wants to queue this, we'll > figure it out :) Feel free to do so. > --- > 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 7dc96abf72cf..5e84c09402dd 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -2309,15 +2309,22 @@ static void machvirt_machine_init(void) > } > type_init(machvirt_machine_init); > =20 > +static void virt_machine_5_1_options(MachineClass *mc) > +{ > +} > +DEFINE_VIRT_MACHINE_AS_LATEST(5, 1) > + > static void virt_machine_5_0_options(MachineClass *mc) > { > static GlobalProperty compat[] =3D { > { TYPE_TPM_TIS_SYSBUS, "ppi", "false" }, > }; > =20 > + virt_machine_5_1_options(mc); > + compat_props_add(mc->compat_props, hw_compat_5_0, hw_compat_5_0_len)= ; > compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat)); > } > -DEFINE_VIRT_MACHINE_AS_LATEST(5, 0) > +DEFINE_VIRT_MACHINE(5, 0) > =20 > static void virt_machine_4_2_options(MachineClass *mc) > { > diff --git a/hw/core/machine.c b/hw/core/machine.c > index c1a444cb7558..7a50dd518f4c 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_0[] =3D {}; > +const size_t hw_compat_5_0_len =3D G_N_ELEMENTS(hw_compat_5_0); > + > GlobalProperty hw_compat_4_2[] =3D { > { "virtio-blk-device", "queue-size", "128"}, > { "virtio-scsi-device", "virtqueue_size", "128"}, > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index 5143c516531e..13e1d18cd758 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -94,6 +94,9 @@ > #include "fw_cfg.h" > #include "trace.h" > =20 > +GlobalProperty pc_compat_5_0[] =3D {}; > +const size_t pc_compat_5_0_len =3D G_N_ELEMENTS(pc_compat_5_0); > + > GlobalProperty pc_compat_4_2[] =3D { > { "mch", "smbase-smram", "off" }, > }; > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index 22dee0e76c62..921caa502b85 100644 > --- a/hw/i386/pc_piix.c > +++ b/hw/i386/pc_piix.c > @@ -419,7 +419,7 @@ static void pc_i440fx_machine_options(MachineClass *m= ) > machine_class_allow_dynamic_sysbus_dev(m, TYPE_RAMFB_DEVICE); > } > =20 > -static void pc_i440fx_5_0_machine_options(MachineClass *m) > +static void pc_i440fx_5_1_machine_options(MachineClass *m) > { > PCMachineClass *pcmc =3D PC_MACHINE_CLASS(m); > pc_i440fx_machine_options(m); > @@ -428,6 +428,18 @@ static void pc_i440fx_5_0_machine_options(MachineCla= ss *m) > pcmc->default_cpu_version =3D 1; > } > =20 > +DEFINE_I440FX_MACHINE(v5_1, "pc-i440fx-5.1", NULL, > + pc_i440fx_5_1_machine_options); > + > +static void pc_i440fx_5_0_machine_options(MachineClass *m) > +{ > + pc_i440fx_5_1_machine_options(m); > + m->alias =3D NULL; > + m->is_default =3D false; > + compat_props_add(m->compat_props, hw_compat_5_0, hw_compat_5_0_len); > + compat_props_add(m->compat_props, pc_compat_5_0, pc_compat_5_0_len); > +} > + > DEFINE_I440FX_MACHINE(v5_0, "pc-i440fx-5.0", NULL, > pc_i440fx_5_0_machine_options); > =20 > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > index d37c425e2236..253688a9b8f3 100644 > --- a/hw/i386/pc_q35.c > +++ b/hw/i386/pc_q35.c > @@ -349,7 +349,7 @@ static void pc_q35_machine_options(MachineClass *m) > m->max_cpus =3D 288; > } > =20 > -static void pc_q35_5_0_machine_options(MachineClass *m) > +static void pc_q35_5_1_machine_options(MachineClass *m) > { > PCMachineClass *pcmc =3D PC_MACHINE_CLASS(m); > pc_q35_machine_options(m); > @@ -357,6 +357,17 @@ static void pc_q35_5_0_machine_options(MachineClass = *m) > pcmc->default_cpu_version =3D 1; > } > =20 > +DEFINE_Q35_MACHINE(v5_1, "pc-q35-5.1", NULL, > + pc_q35_5_1_machine_options); > + > +static void pc_q35_5_0_machine_options(MachineClass *m) > +{ > + pc_q35_5_1_machine_options(m); > + m->alias =3D NULL; > + compat_props_add(m->compat_props, hw_compat_5_0, hw_compat_5_0_len); > + compat_props_add(m->compat_props, pc_compat_5_0, pc_compat_5_0_len); > +} > + > DEFINE_Q35_MACHINE(v5_0, "pc-q35-5.0", NULL, > pc_q35_5_0_machine_options); > =20 > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 9a2bd501aa6e..fd5bfd11a84c 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -4599,15 +4599,26 @@ static void spapr_machine_latest_class_options(Ma= chineClass *mc) > } \ > type_init(spapr_machine_register_##suffix) > =20 > +/* > + * pseries-5.1 > + */ > +static void spapr_machine_5_1_class_options(MachineClass *mc) > +{ > + /* Defaults for the latest behaviour inherited from the base class *= / > +} > + > +DEFINE_SPAPR_MACHINE(5_1, "5.1", true); > + > /* > * pseries-5.0 > */ > static void spapr_machine_5_0_class_options(MachineClass *mc) > { > - /* Defaults for the latest behaviour inherited from the base class *= / > + spapr_machine_5_1_class_options(mc); > + compat_props_add(mc->compat_props, hw_compat_5_0, hw_compat_5_0_len)= ; > } > =20 > -DEFINE_SPAPR_MACHINE(5_0, "5.0", true); > +DEFINE_SPAPR_MACHINE(5_0, "5.0", false); > =20 > /* > * pseries-4.2 > diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c > index 0fa00a9fff3d..967a6de9683b 100644 > --- a/hw/s390x/s390-virtio-ccw.c > +++ b/hw/s390x/s390-virtio-ccw.c > @@ -672,14 +672,26 @@ bool css_migration_enabled(void) > } = \ > type_init(ccw_machine_register_##suffix) > =20 > +static void ccw_machine_5_1_instance_options(MachineState *machine) > +{ > +} > + > +static void ccw_machine_5_1_class_options(MachineClass *mc) > +{ > +} > +DEFINE_CCW_MACHINE(5_1, "5.1", true); > + > static void ccw_machine_5_0_instance_options(MachineState *machine) > { > + ccw_machine_5_1_instance_options(machine); > } > =20 > static void ccw_machine_5_0_class_options(MachineClass *mc) > { > + ccw_machine_5_1_class_options(mc); > + compat_props_add(mc->compat_props, hw_compat_5_0, hw_compat_5_0_len)= ; > } > -DEFINE_CCW_MACHINE(5_0, "5.0", true); > +DEFINE_CCW_MACHINE(5_0, "5.0", false); > =20 > static void ccw_machine_4_2_instance_options(MachineState *machine) > { > diff --git a/include/hw/boards.h b/include/hw/boards.h > index fd4d62b5010f..18815d9be24f 100644 > --- a/include/hw/boards.h > +++ b/include/hw/boards.h > @@ -318,6 +318,9 @@ struct MachineState { > } \ > type_init(machine_initfn##_register_types) > =20 > +extern GlobalProperty hw_compat_5_0[]; > +extern const size_t hw_compat_5_0_len; > + > extern GlobalProperty hw_compat_4_2[]; > extern const size_t hw_compat_4_2_len; > =20 > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h > index 6ab6eda046fd..15b9294dac38 100644 > --- a/include/hw/i386/pc.h > +++ b/include/hw/i386/pc.h > @@ -204,6 +204,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_0[]; > +extern const size_t pc_compat_5_0_len; > + > extern GlobalProperty pc_compat_4_2[]; > extern const size_t pc_compat_4_2_len; > =20 > --=20 > 2.21.1