From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a17:505:1f8d:b0:1be9:327d:8ee3 with SMTP id pt13csp764323njb; Fri, 6 Sep 2024 01:05:51 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUVy6GwCYbDorX68Apa42S8RHj90sx5PiaK/jY2dn2PTs5sVFoJeQLFAhOmyDsi0ygyczMoYPwogK7WJg==@linaro.org X-Google-Smtp-Source: AGHT+IFRwalQIJVeU83sKSthcXNPJ+jZK+FbpmZTQWn9cghIVVZfDLgtFHe+GVQjc12SGATz/Vdh X-Received: by 2002:a05:620a:2484:b0:7a4:dfd6:5fb8 with SMTP id af79cd13be357-7a997333cd9mr183350485a.23.1725609951310; Fri, 06 Sep 2024 01:05:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1725609951; cv=none; d=google.com; s=arc-20240605; b=Gow1uOgbv6bV9LTN5odQfPUTBYT36/mASHXbLnwYdmBMxTJv/x6admWUbSNejPrM21 vTEbaTE2wQlE2Zcini1MxSsYfGRO1VlEHlmv//fIPfos/xLsQwe0Y07fqlB+24zQMMgN 6LK1Hhfe8wA4FIe2Hj2UhPPcOMeehQiftV9+0gBhv/6dLhHUBllrNMVXEsFWr2+VpMiM X5Xe115HDFiSdgN2cqVJ+1SsKisGaeV/lxNFMxZwKBCMRsV/djpEb1iZVG+fB0SlfXHu 1PBN1uQGX0gLvl/ZbrFM1pgl78AN/tksarBQ3S8s5NDOk3b/JVi2G5IsyX1wBwJVB2sj tyaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:user-agent :in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :dkim-signature; bh=b2Z8vDLtxvOwVz/1/J0e/jbknfGPmCb71D3+u6PQgWw=; fh=MSXx3/f76VBDSIqjUjASUTosLueICKiQ6SjAWjuHdEM=; b=ijxwUQqkifdj/fq4qcVevc5e4GGg2657EGnvURJniwk2Wlwjsij5JNfQbm8NcV6CLM FB4QsU9FWuU7Ltx4+aBm8WmX81vlZ0ZpSUaYWHWZ8Us0RiRuN5LThSipoPcC6wlboCzT 5JXgiBU5h+zFs7U3JRrrCF3vo3HgxATAbJWi9zjOVCz5G/LyMdaoOhqSLJuGk1fZTgHu 19zFtMDx9JZ0Axy/hcMMi7DT7MSS9+nDv/kE1H7Kd9lLZQwEANvzDU68qRREzIH3dv2w e5nn0+pFGICxDz8SLAhmBNDj4svuMkTYXutl9Qqdqw+SpNds3mfiTt/dPb2FRJxyyACX 2vWg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=cURkoN9t; 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=pass (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 af79cd13be357-7a98f00a154si418328085a.452.2024.09.06.01.05.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 06 Sep 2024 01:05:51 -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=pass header.i=@redhat.com header.s=mimecast20190719 header.b=cURkoN9t; 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=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1smTyL-0006uc-Kr; Fri, 06 Sep 2024 04:05:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1smTyJ-0006mj-LD for qemu-arm@nongnu.org; Fri, 06 Sep 2024 04:05:35 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1smTyH-0003Tb-TX for qemu-arm@nongnu.org; Fri, 06 Sep 2024 04:05:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1725609932; h=from:from:reply-to: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=b2Z8vDLtxvOwVz/1/J0e/jbknfGPmCb71D3+u6PQgWw=; b=cURkoN9t1YkLx7bU5pkTIK0wDmXnrVtgnz+IBOlGIoKSbxQFlccM27VqREGdEZqUXF+zB9 GG8FRVFazrpQdFvRo3ePRVjdiIJxQMe7rA+KwY68RNavo5Ek08UEK050+FvKGdoluBBvab O2z+cHS3iYB8cTciESIV2al6ihojirw= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-473-af-HXlhEMk6jyJKElEwrpw-1; Fri, 06 Sep 2024 04:05:27 -0400 X-MC-Unique: af-HXlhEMk6jyJKElEwrpw-1 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 110AB1953963; Fri, 6 Sep 2024 08:05:23 +0000 (UTC) Received: from redhat.com (unknown [10.42.28.57]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 6C9AD19560AA; Fri, 6 Sep 2024 08:05:13 +0000 (UTC) Date: Fri, 6 Sep 2024 09:05:10 +0100 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= To: Peter Maydell Cc: Cornelia Huck , Eduardo Habkost , Marcel Apfelbaum , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= , Yanan Wang , Zhao Liu , Paolo Bonzini , Richard Henderson , "Michael S. Tsirkin" , Laurent Vivier , Nicholas Piggin , Daniel Henrique Barboza , David Gibson , Harsh Prateek Bora , Thomas Huth , Halil Pasic , Christian Borntraeger , Eric Farman , David Hildenbrand , Ilya Leoshkevich , qemu-arm@nongnu.org, qemu-devel@nongnu.org, qemu-ppc@nongnu.org, qemu-s390x@nongnu.org Subject: Re: [PATCH for-9.2] hw: add compat machines for 9.2 Message-ID: References: <20240816103723.2325982-1-cohuck@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: User-Agent: Mutt/2.2.12 (2023-09-09) X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 Received-SPF: pass client-ip=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: 11 X-Spam_score: 1.1 X-Spam_bar: + X-Spam_report: (1.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.142, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_SBL_CSS=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-arm@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= Errors-To: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org Sender: qemu-arm-bounces+alex.bennee=linaro.org@nongnu.org X-TUID: E7xbtPGuPzcO On Thu, Sep 05, 2024 at 08:05:14PM +0100, Peter Maydell wrote: > On Thu, 5 Sept 2024 at 19:22, Daniel P. Berrangé wrote: > > > > On Fri, Aug 16, 2024 at 11:47:16AM +0100, Daniel P. Berrangé wrote: > > > On Fri, Aug 16, 2024 at 12:37:23PM +0200, Cornelia Huck wrote: > > > > Add 9.2 machine types for arm/i440fx/m68k/q35/s390x/spapr. > > > > > > > > Signed-off-by: Cornelia Huck > > > > --- > > > > hw/arm/virt.c | 9 ++++++++- > > > > hw/core/machine.c | 3 +++ > > > > hw/i386/pc.c | 3 +++ > > > > hw/i386/pc_piix.c | 15 ++++++++++++--- > > > > hw/i386/pc_q35.c | 13 +++++++++++-- > > > > hw/m68k/virt.c | 9 ++++++++- > > > > hw/ppc/spapr.c | 15 +++++++++++++-- > > > > hw/s390x/s390-virtio-ccw.c | 14 +++++++++++++- > > > > include/hw/boards.h | 3 +++ > > > > include/hw/i386/pc.h | 3 +++ > > > > 10 files changed, 77 insertions(+), 10 deletions(-) > > > > > > Reviewed-by: Daniel P. Berrangé > > > > > > > > > > diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c > > > > index d9e69243b4a7..746bfe05d386 100644 > > > > --- a/hw/i386/pc_piix.c > > > > +++ b/hw/i386/pc_piix.c > > > > @@ -479,13 +479,24 @@ static void pc_i440fx_machine_options(MachineClass *m) > > > > "Use a different south bridge than PIIX3"); > > > > } > > > > > > > > -static void pc_i440fx_machine_9_1_options(MachineClass *m) > > > > +static void pc_i440fx_machine_9_2_options(MachineClass *m) > > > > { > > > > pc_i440fx_machine_options(m); > > > > m->alias = "pc"; > > > > m->is_default = true; > > > > } > > > > > > > > +DEFINE_I440FX_MACHINE(9, 2); > > > > + > > > > +static void pc_i440fx_machine_9_1_options(MachineClass *m) > > > > +{ > > > > + pc_i440fx_machine_9_2_options(m); > > > > + m->alias = NULL; > > > > + m->is_default = false; > > > > + compat_props_add(m->compat_props, hw_compat_9_1, hw_compat_9_1_len); > > > > + compat_props_add(m->compat_props, pc_compat_9_1, pc_compat_9_1_len); > > > > +} > > > > + > > > > DEFINE_I440FX_MACHINE(9, 1); > > > > > > > > static void pc_i440fx_machine_9_0_options(MachineClass *m) > > > > @@ -493,8 +504,6 @@ static void pc_i440fx_machine_9_0_options(MachineClass *m) > > > > PCMachineClass *pcmc = PC_MACHINE_CLASS(m); > > > > > > > > pc_i440fx_machine_9_1_options(m); > > > > - m->alias = NULL; > > > > - m->is_default = false; > > > > m->smbios_memory_device_size = 16 * GiB; > > > > > > Feels like we should be adding an "_AS_LATEST" macro > > > variant for piix/q35 too, so it matches the pattern > > > in other targets for handling alias & is_default. > > > > > > Not a thing your patch needs todo though. > > > > I've just a patch that does that now. If it looks good & you want to include > > it as a pre-requisite for your patch here feel free to grab, otherwise I can > > rebase it after your patch merges. > > I have this patch in my target-arm pullreq that's currently posted > and pending merge, by the way. Ah ok, i'll rebase on top of that. then With regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|