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=-15.1 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 A3279C433E0 for ; Wed, 10 Mar 2021 14:22:08 +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 488BB64FF6 for ; Wed, 10 Mar 2021 14:22:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 488BB64FF6 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]:35122 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lJzix-0001z9-8G for qemu-devel@archiver.kernel.org; Wed, 10 Mar 2021 09:22:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33716) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lJzh3-0008T6-Fa for qemu-devel@nongnu.org; Wed, 10 Mar 2021 09:20:09 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:27249) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lJzh0-0002YS-Gf for qemu-devel@nongnu.org; Wed, 10 Mar 2021 09:20:08 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615386005; 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=l7LmQBfCB56xYWGzxOi/G9Q22x0btSnVpD6FOjxKX/4=; b=SYyAHJ9E10Q6bc7uwS9ILkwODNgYklXcOJQu1BkdhHNqb5s+1aNz7QpFRvQFdShk+jxTvz 8Jh+qbeNY7tLBVOXuG1MtfB3z9Lj9D8jBWrYn1JbB5FfrbnXsxqPku8veGLW3yzE5kPYC+ gijeew1jTU9Mozoj8CeaHmtwBjZ1Qag= 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-24-QU68CYCuN9S9w-MQasnDGA-1; Wed, 10 Mar 2021 09:20:03 -0500 X-MC-Unique: QU68CYCuN9S9w-MQasnDGA-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E0EF8804331; Wed, 10 Mar 2021 14:20:01 +0000 (UTC) Received: from [10.36.112.254] (ovpn-112-254.ams2.redhat.com [10.36.112.254]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5B15A101E24A; Wed, 10 Mar 2021 14:20:00 +0000 (UTC) Subject: Re: [PATCH v2 1/2] accel: kvm: Fix kvm_type invocation To: Andrew Jones , qemu-devel@nongnu.org, qemu-arm@nongnu.org References: <20210310135218.255205-1-drjones@redhat.com> <20210310135218.255205-2-drjones@redhat.com> From: Auger Eric Message-ID: Date: Wed, 10 Mar 2021 15:19:58 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.7.0 MIME-Version: 1.0 In-Reply-To: <20210310135218.255205-2-drjones@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=eric.auger@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=170.10.133.124; envelope-from=eric.auger@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.243, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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@linaro.org, pbonzini@redhat.com, maz@kernel.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Hi Drew, On 3/10/21 2:52 PM, Andrew Jones wrote: > Prior to commit f2ce39b4f067 a MachineClass kvm_type method > only needed to be registered to ensure it would be executed. > With commit f2ce39b4f067 a kvm-type machine property must also > be specified. hw/arm/virt relies on the kvm_type method to pass > its selected IPA limit to KVM, but this is not exposed as a > machine property. Restore the previous functionality of invoking > kvm_type when it's present. Ouch, good catch for this regression > > Fixes: f2ce39b4f067 ("vl: make qemu_get_machine_opts static") > Signed-off-by: Andrew Jones > --- > accel/kvm/kvm-all.c | 2 ++ > include/hw/boards.h | 1 + > 2 files changed, 3 insertions(+) > > diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c > index f88a52393fe0..37b0a1861e72 100644 > --- a/accel/kvm/kvm-all.c > +++ b/accel/kvm/kvm-all.c > @@ -2068,6 +2068,8 @@ static int kvm_init(MachineState *ms) > "kvm-type", > &error_abort); > type = mc->kvm_type(ms, kvm_type); > + } else if (mc->kvm_type) { > + type = mc->kvm_type(ms, NULL); > } > > do { > diff --git a/include/hw/boards.h b/include/hw/boards.h > index a46dfe5d1a6a..327949967609 100644 > --- a/include/hw/boards.h > +++ b/include/hw/boards.h > @@ -128,6 +128,7 @@ typedef struct { > * @kvm_type: > * Return the type of KVM corresponding to the kvm-type string option or > * computed based on other criteria such as the host kernel capabilities. > + * kvm-type may be NULL if it is not needed. > * @numa_mem_supported: > * true if '--numa node.mem' option is supported and false otherwise > * @smp_parse: > Reviewed-by: Eric Auger Eric