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.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 885D3C54FD0 for ; Mon, 27 Apr 2020 10:12:01 +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 4B93C206E9 for ; Mon, 27 Apr 2020 10:12:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="XG4s+rh8" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4B93C206E9 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]:36622 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jT0k4-0005g5-Fu for qemu-devel@archiver.kernel.org; Mon, 27 Apr 2020 06:12:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40022) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jT0iP-0003n3-4Z for qemu-devel@nongnu.org; Mon, 27 Apr 2020 06:10:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jT0iO-0003it-AU for qemu-devel@nongnu.org; Mon, 27 Apr 2020 06:10:16 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:23096 helo=us-smtp-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 1jT0iN-0003gJ-Ts for qemu-devel@nongnu.org; Mon, 27 Apr 2020 06:10:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1587982214; 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=7jx3RoBb4hDH7vaECqM7PiML351QlBPjDB7CPVmiLY0=; b=XG4s+rh83RAIRceVv8EUGem3DYOVhQM1V7TQUVkhQ9HINnH1Jnu8YT0MpJhXYpiKPVEAmh eqJwVLTXPxYpHwyQrVoN2GHmxAROusIJnoZkEnPkMjQqTG0/bjvmFHRpcfGpilD5QRx/Y/ YA099VHAQ/TG5ruBM0Iw6HMTsiKItpo= 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-201-sNs4_JE4PQKPP7-061XNnQ-1; Mon, 27 Apr 2020 06:10:09 -0400 X-MC-Unique: sNs4_JE4PQKPP7-061XNnQ-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 917B71005510; Mon, 27 Apr 2020 10:10:07 +0000 (UTC) Received: from gondolin (ovpn-112-184.ams2.redhat.com [10.36.112.184]) by smtp.corp.redhat.com (Postfix) with ESMTP id 58DEE5D9DC; Mon, 27 Apr 2020 10:09:58 +0000 (UTC) Date: Mon, 27 Apr 2020 12:09:56 +0200 From: Cornelia Huck To: Auger Eric Subject: Re: [PATCH] hw: add compat machines for 5.1 Message-ID: <20200427120956.6c2f775c.cohuck@redhat.com> In-Reply-To: <4166d3fc-58e9-405d-71a1-2270ced75e7d@redhat.com> References: <20200424090314.544-1-cohuck@redhat.com> <548cd0de-17d3-204d-7df1-4c8fdccad83c@redhat.com> <20200427110609.36ecaac6.cohuck@redhat.com> <4166d3fc-58e9-405d-71a1-2270ced75e7d@redhat.com> Organization: Red Hat GmbH MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=207.211.31.120; envelope-from=cohuck@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/04/27 02:05:28 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.120 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, David Gibson Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Mon, 27 Apr 2020 11:58:28 +0200 Auger Eric wrote: > Hi Connie, > > On 4/27/20 11:06 AM, Cornelia Huck wrote: > > On Mon, 27 Apr 2020 09:43:33 +0200 > > Auger Eric wrote: > > > >> Hi Connie, > >> > >> On 4/24/20 11:03 AM, Cornelia Huck wrote: > >>> Add 5.1 machine types for arm/i440fx/q35/s390x/spapr. > >>> > >>> Signed-off-by: Cornelia Huck > >>> --- > >>> > >>> Still keeping the default cpu model version on x86 at v1. > >>> > >>> 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 :) > >>> > >>> --- > >>> 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(-) > >>> > >>> 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); > >>> > >>> +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[] = { > >>> { TYPE_TPM_TIS_SYSBUS, "ppi", "false" }, > >>> }; > >>> > >>> + 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)); > >> As spotted by patchew we need { TYPE_TPM_TIS_SYSBUS, "ppi", "false" } to > >> be applied for all machine types 5_0 onwards as our tpm-tis-device does > >> not support PPI. So I guess we need to move compat[] declaration outside > >> of virt_machine_5_0_options and call > >> "compat_props_add(mc->compat_props, compat, G_N_ELEMENTS(compat));" > >> for each virt_machine_5_*_options? Or is a misuse of compats? > > > > Ah, that was the error (I could not really make sense of it). > > > > So, if I understand it correctly, ppi needs to be disabled for all virt > > machines. > ppi property of tpm-tis-sysbus device needs to be disabled for all virt > machines whose version >= 5.0. tpm-tis-sysbus device is supported from > 5.0 onwards. It would probably be ok to set for all versions; if the device is not available, a compat entry should not hurt. > > Looking again at the code, I should rather set the default value of the > ppi property to false in tpm_tis_sysbus_properties. Before we shared the > same device with x86, hence the compat but now we have a separate one. I > guess that should work directly without the pain of that compat :-( Let > me check ... Yes, that seems like a better solution. > > Thanks > > Eric > I think the correct way to do this would be to add the > > "compat" prop in virt_machine_class_init() (even if it is not strictly > > compat, as it always needs to be disabled). It can be removed there and > > added to a compat machine should support be added in the future. > > > > Or does anyone have a better idea? > > > >