From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:ac2:4841:0:0:0:0:0 with SMTP id 1csp1408442lfy; Thu, 20 Aug 2020 07:35:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzTTWF2l6uVsq2xVpCQsq13crNikTQuaBiZ7aZFbO798v4f5MpMZsjKCyyL8tV9d5J2r4DR X-Received: by 2002:a25:c786:: with SMTP id w128mr5362837ybe.212.1597934156820; Thu, 20 Aug 2020 07:35:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1597934156; cv=none; d=google.com; s=arc-20160816; b=Rkkudte7Qi0+HO6LPMnsQbp+/7OMBpKlDJpeeTBRimrvcAG+2hzJNCL9mtXvvbHxfb 31O4MxGEZKSNnjhs1RiYyIiCuFKTW45RwiPFQ22JeClESxCCLgr2b/ZhrkNpFVw4Sv4r YnpPzcGd10dTULU7PGdbg3P+gQ+y+R9rD5lWiGJuUae57nBjwjNCLGdjfEOoSGgLhacN auKOTSaaFudZAfqN/Ld2pKQdQ40On5Kyi+0EwJQ9Z/WwvepeG1e5qfGYO5at/RnkSDiv XsZsd1YUVuRu0yYSTszFOfmXbe+czLlEkHAjaFPp0giPPqQ7nGXA3Wu6oEVJg7bXjw6e +VHg== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:subject:to:from:date :dkim-signature; bh=7wJLVk9TQdhEMtskEjdeIzXRZ4bQ8MBgRvM3fya+DrI=; b=v2eLDx0d0bBvGRczEGFURhcPSHMJjKbp3mOk08/8qL0V73XCFhmCTloytKk3WfANcp 5LwWWvRyQ2iy2D+A/bzcwOPM8XhDry7NebCjrgDJz2Vb56fhuj5VZAdHxTYpw9zHi1g4 ArwyogvPi13XU5KDTt6+JO40+ocm5jVfaQdPZWK0LrBI/M/ipAxfPPLU5iC4Hv5mnBy6 0D5WPJZIbUh0Xcad6kZEXLUDRgOS2ImLHq1rrpdlVcUmeACYFDf9W4B9xm2RFMvQEG3I LEoo66E+92yR2fHBSGurKyzsCFR07Phti63SRfybwst4cBLXfOuCzZUQQbb3cUFt/XqJ G4Ag== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=GqVeZQNP; 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"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id t3si2133090ybt.290.2020.08.20.07.35.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 20 Aug 2020 07:35:56 -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=@redhat.com header.s=mimecast20190719 header.b=GqVeZQNP; 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"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:34006 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k8lfY-0001oM-5D for alex.bennee@linaro.org; Thu, 20 Aug 2020 10:35:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54654) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k8lfE-0001nS-2z for qemu-arm@nongnu.org; Thu, 20 Aug 2020 10:35:36 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:47720) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1k8lfA-0001uy-Ur for qemu-arm@nongnu.org; Thu, 20 Aug 2020 10:35:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597934131; 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=7wJLVk9TQdhEMtskEjdeIzXRZ4bQ8MBgRvM3fya+DrI=; b=GqVeZQNPBtuHhCIzGAHcDrbIFJd7X2KF4kUUBsQSsqKd7c7gjoQQlyrjbQvTpQAHpgMqA2 S9VN64yZd0Jf8J0eN3sTXHHPcrUTJPg1gPfpaU8eLoRIv1nj+G+yyhst2nXaQxZomDZkYs SbvshREH7ElOu4g/A+DPA0XnmYpq/lY= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-322-S93px3b6PbazcvQo2pctqw-1; Thu, 20 Aug 2020 10:35:28 -0400 X-MC-Unique: S93px3b6PbazcvQo2pctqw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 404E68030AF; Thu, 20 Aug 2020 14:35:27 +0000 (UTC) Received: from localhost (unknown [10.43.2.114]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3DE201B47B; Thu, 20 Aug 2020 14:35:10 +0000 (UTC) Date: Thu, 20 Aug 2020 16:35:08 +0200 From: Igor Mammedov To: Eduardo Habkost Subject: Re: [PULL 3/3] hw: add compat machines for 5.2 Message-ID: <20200820163508.5c2fce23@redhat.com> In-Reply-To: <20200819152258.703874-4-ehabkost@redhat.com> References: <20200819152258.703874-1-ehabkost@redhat.com> <20200819152258.703874-4-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=imammedo@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=63.128.21.124; envelope-from=imammedo@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/20 09:00:23 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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 , "Daniel P. =?UTF-8?B?QmVycmFuZ8Op?=" , David Hildenbrand , qemu-s390x@nongnu.org, Markus Armbruster , Cornelia Huck , Andrew Jones , qemu-devel@nongnu.org, Halil Pasic , Christian Borntraeger , Greg Kurz , qemu-arm@nongnu.org, "Michael S. Tsirkin" , Paolo Bonzini , qemu-ppc@nongnu.org, David Gibson , Richard Henderson Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: "Qemu-arm" X-TUID: HmkqGtfYjKs3 On Wed, 19 Aug 2020 11:22:58 -0400 Eduardo Habkost wrote: > From: Cornelia Huck > > Add 5.2 machine types for arm/i440fx/q35/s390x/spapr. > > Reviewed-by: Andrew Jones > Reviewed-by: Michael S. Tsirkin > Reviewed-by: Greg Kurz > Acked-by: Christian Borntraeger > Acked-by: David Gibson > Acked-by: Thomas Huth > Signed-off-by: Cornelia Huck > Message-Id: <20200819144016.281156-1-cohuck@redhat.com> > Signed-off-by: Eduardo Habkost Is this the latest version of the patch? It doesn't apply cleanly on top of the current master. > --- > include/hw/boards.h | 3 +++ > include/hw/i386/pc.h | 3 +++ > 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 +++++++++++++- > 9 files changed, 71 insertions(+), 6 deletions(-) > > diff --git a/include/hw/boards.h b/include/hw/boards.h > index 426ce5f625..bc5b82ad20 100644 > --- a/include/hw/boards.h > +++ b/include/hw/boards.h > @@ -319,6 +319,9 @@ struct MachineState { > } \ > type_init(machine_initfn##_register_types) > > +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; > > diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h > index 3d7ed3a55e..fe52e165b2 100644 > --- a/include/hw/i386/pc.h > +++ b/include/hw/i386/pc.h > @@ -193,6 +193,9 @@ void pc_system_firmware_init(PCMachineState *pcms, MemoryRegion *rom_memory); > void pc_madt_cpu_entry(AcpiDeviceIf *adev, int uid, > const CPUArchIdList *apic_ids, GArray *entry); > > +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; > > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > index ecfee362a1..acf9bfbece 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); > > +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) > > static void virt_machine_5_0_options(MachineClass *mc) > { > diff --git a/hw/core/machine.c b/hw/core/machine.c > index 8d1a90c6cf..cf5f2dfaeb 100644 > --- a/hw/core/machine.c > +++ b/hw/core/machine.c > @@ -28,6 +28,9 @@ > #include "hw/mem/nvdimm.h" > #include "migration/vmstate.h" > > +GlobalProperty hw_compat_5_1[] = {}; > +const size_t hw_compat_5_1_len = G_N_ELEMENTS(hw_compat_5_1); > + > GlobalProperty hw_compat_5_0[] = { > { "pci-host-bridge", "x-config-reg-migration-enabled", "off" }, > { "virtio-balloon-device", "page-poison", "false" }, > diff --git a/hw/i386/pc.c b/hw/i386/pc.c > index 47c5ca3e34..9aa813949c 100644 > --- a/hw/i386/pc.c > +++ b/hw/i386/pc.c > @@ -97,6 +97,9 @@ > #include "fw_cfg.h" > #include "trace.h" > > +GlobalProperty pc_compat_5_1[] = {}; > +const size_t pc_compat_5_1_len = G_N_ELEMENTS(pc_compat_5_1); > + > GlobalProperty pc_compat_5_0[] = { > }; > const size_t pc_compat_5_0_len = G_N_ELEMENTS(pc_compat_5_0); > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > index b789e83f9a..c5ba70ca17 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); > } > > -static void pc_i440fx_5_1_machine_options(MachineClass *m) > +static void pc_i440fx_5_2_machine_options(MachineClass *m) > { > PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > pc_i440fx_machine_options(m); > @@ -435,6 +435,18 @@ static void pc_i440fx_5_1_machine_options(MachineClass *m) > pcmc->default_cpu_version = 1; > } > > +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 = NULL; > + m->is_default = 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); > > diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c > index a3e607a544..0cb9c18cd4 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 = 288; > } > > -static void pc_q35_5_1_machine_options(MachineClass *m) > +static void pc_q35_5_2_machine_options(MachineClass *m) > { > PCMachineClass *pcmc = 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 = 1; > } > > +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 = 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); > > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 0ae293ec94..1c8d0981b3 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -4579,15 +4579,26 @@ static void spapr_machine_latest_class_options(MachineClass *mc) > } \ > type_init(spapr_machine_register_##suffix) > > +/* > + * 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); > } > > -DEFINE_SPAPR_MACHINE(5_1, "5.1", true); > +DEFINE_SPAPR_MACHINE(5_1, "5.1", false); > > /* > * pseries-5.0 > diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c > index e72c61d2ea..f4ea6a9545 100644 > --- a/hw/s390x/s390-virtio-ccw.c > +++ b/hw/s390x/s390-virtio-ccw.c > @@ -801,14 +801,26 @@ bool css_migration_enabled(void) > } \ > type_init(ccw_machine_register_##suffix) > > +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); > } > > 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); > > static void ccw_machine_5_0_instance_options(MachineState *machine) > {