From patchwork Fri Mar 3 09:23:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Roos, Thomas" X-Patchwork-Id: 20381 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 57C14C678D4 for ; Fri, 3 Mar 2023 09:23:55 +0000 (UTC) Received: from smtp-fw-6002.amazon.com (smtp-fw-6002.amazon.com [52.95.49.90]) by mx.groups.io with SMTP id smtpd.web10.19444.1677835428475014930 for ; Fri, 03 Mar 2023 01:23:48 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@amazon.de header.s=amazon201209 header.b=LVizGNoe; spf=pass (domain: amazon.de, ip: 52.95.49.90, mailfrom: prvs=4195db054=throos@amazon.de) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.de; i=@amazon.de; q=dns/txt; s=amazon201209; t=1677835429; x=1709371429; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=E/C06n/eeEvnSzDGsMaKnM/53hsW6Eh5aMJnuu/FqtY=; b=LVizGNoenpFvuE3mIliCzoCL58+j20fdC9cs7EZyJxUeg54d8IXQFgJi gJZuJRah1N4CO9RIUWH/xeBOc4FwevYjIDZ71eXGt+T9fK9B3SwIAC2hP ZoNAAU0zaqJ+mvgZ1Ock6DNJlBJs10fMumselxAXLt0CH9yI42O6lrQ34 M=; X-IronPort-AV: E=Sophos;i="5.98,230,1673913600"; d="scan'208";a="303194115" Received: from iad12-co-svc-p1-lb1-vlan3.amazon.com (HELO email-inbound-relay-iad-1a-m6i4x-b5bd57cf.us-east-1.amazon.com) ([10.43.8.6]) by smtp-border-fw-6002.iad6.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Mar 2023 09:23:42 +0000 Received: from EX19D016EUC001.ant.amazon.com (iad12-ws-svc-p26-lb9-vlan3.iad.amazon.com [10.40.163.38]) by email-inbound-relay-iad-1a-m6i4x-b5bd57cf.us-east-1.amazon.com (Postfix) with ESMTPS id 564FD44871 for ; Fri, 3 Mar 2023 09:23:41 +0000 (UTC) Received: from u182adcbddbfb55.ant.amazon.com (10.1.213.17) by EX19D016EUC001.ant.amazon.com (10.252.51.169) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.24; Fri, 3 Mar 2023 09:23:39 +0000 From: To: CC: Thomas Roos Subject: [PATCH] qemuboot-x86.inc: allow overwrite of QB_CPU Date: Fri, 3 Mar 2023 10:23:27 +0100 Message-ID: <20230303092328.155569-1-throos@amazon.de> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Originating-IP: [10.1.213.17] X-ClientProxiedBy: EX19D032UWA003.ant.amazon.com (10.13.139.37) To EX19D016EUC001.ant.amazon.com (10.252.51.169) List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 03 Mar 2023 09:23:55 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177983 From: Thomas Roos To test nested kvm with qemu QB_CPU* needs to be modified. E.g. set to "-cpu Haswell-noTSX-IBRS,vmx=on" This allows to overwrite this from local.conf etc. Signed-off-by: Thomas Roos --- meta/conf/machine/include/x86/qemuboot-x86.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/conf/machine/include/x86/qemuboot-x86.inc b/meta/conf/machine/include/x86/qemuboot-x86.inc index dd7e7c9384..6ae03633ae 100644 --- a/meta/conf/machine/include/x86/qemuboot-x86.inc +++ b/meta/conf/machine/include/x86/qemuboot-x86.inc @@ -1,11 +1,11 @@ # For runqemu IMAGE_CLASSES += "qemuboot" QB_SMP ?= "-smp 4" -QB_CPU:x86 = "-cpu IvyBridge -machine q35,i8042=off" -QB_CPU_KVM:x86 = "-cpu IvyBridge -machine q35,i8042=off" +QB_CPU:x86 ?= "-cpu IvyBridge -machine q35,i8042=off" +QB_CPU_KVM:x86 ?= "-cpu IvyBridge -machine q35,i8042=off" -QB_CPU:x86-64 = "-cpu IvyBridge -machine q35,i8042=off" -QB_CPU_KVM:x86-64 = "-cpu IvyBridge -machine q35,i8042=off" +QB_CPU:x86-64 ?= "-cpu IvyBridge -machine q35,i8042=off" +QB_CPU_KVM:x86-64 ?= "-cpu IvyBridge -machine q35,i8042=off" QB_AUDIO_DRV = "alsa" QB_AUDIO_OPT = "-device AC97"