From nobody Fri Apr 19 08:53:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1684742890; cv=none; d=zohomail.com; s=zohoarc; b=CfmtWBYU3lKq/YMPOGZglOP15odOmoKYLaURyH+V8ACH0lhsv2CcfZhJDpTWWgpejdgjNJW78XLus/xHKkGE5wnyydYyT3xUeUjPNty9O87ShL8WY11aMizalIIJhB3c1kumLvKhmhVAGZf+3n3WCf0MGg68cyR8nIPE9ZQ9OwQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684742890; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ksLbFtgV89u/0Gxttqswa6NlUYtir/4Z70e94J6nqLg=; b=V9G3Ir1/+D8HJ048P/EMyarkfbUKCEL9cGl31bUwkYvNoKwO9Wz9aqX6uyglN5kY1jIVW/s9GVk6tZiEtzfprCFE8lpjNbDSvNu5BoAfFUu2gPGBxMyWDA4gOnMVwYMfg/WEokxcvZvKKEysT0lu7Wt6xmNWyy0wboG9WmiRkmE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1684742890850940.671967776632; Mon, 22 May 2023 01:08:10 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-74-0T7800o2MjGe2ReMBtW56g-1; Mon, 22 May 2023 04:07:53 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id F076C101B042; Mon, 22 May 2023 08:07:50 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id DAD22C54189; Mon, 22 May 2023 08:07:49 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id BC6B319465A0; Mon, 22 May 2023 08:07:49 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id B021419466DF for ; Mon, 22 May 2023 08:07:48 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 84D42200AE6F; Mon, 22 May 2023 08:07:48 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.148]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C4307200C0EE; Mon, 22 May 2023 08:07:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684742882; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=ksLbFtgV89u/0Gxttqswa6NlUYtir/4Z70e94J6nqLg=; b=YsgiON8Gl7XvX6OG0T/Zjzuvr6xt7u5S7QvYhEKLzJe6gSn2z31Dr7rHJWJ6x+jJcOUlAn mAm1pdhluNXTuppdvGPJmfLjBHRja0B6+gfgA3uAKTlYmw3ddW+1K9d9RI91+IADB+itQa 2C9YSe601GRBEnnl6cR+NEI5a5XCuoA= X-MC-Unique: 0T7800o2MjGe2ReMBtW56g-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 1/4] Revert "qemu: Generate command line for MTE feature" Date: Mon, 22 May 2023 10:07:41 +0200 Message-Id: <20230522080744.38527-2-abologna@redhat.com> In-Reply-To: <20230522080744.38527-1-abologna@redhat.com> References: <20230522080744.38527-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mprivozn@redhat.com, cohuck@redhat.com Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1684742892611100001 Content-Type: text/plain; charset="utf-8"; x-default="true" The QEMU interface is still in a state of flux, and KVM support has been pulled shortly after having been merged. Let's not commit to a stable interface in libvirt just yet. Reverts: b10bc8f7ab6f9986ccc54ba04fc5b3bad7576be6 Signed-off-by: Andrea Bolognani Reviewed-by: Cornelia Huck Reviewed-by:: J=C3=A1n Tomko --- src/qemu/qemu_command.c | 6 ------ tests/qemuxml2argvdata/aarch64-gic-v3.args | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 9b993c3aad..2a6d9408f6 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6797,12 +6797,6 @@ qemuAppendDomainFeaturesMachineParam(virBuffer *buf, virBufferAsprintf(buf, ",cap-ibs=3D%s", str); } =20 - if (def->features[VIR_DOMAIN_FEATURE_MTE] !=3D VIR_TRISTATE_SWITCH_ABS= ENT) { - const char *str; - str =3D virTristateSwitchTypeToString(def->features[VIR_DOMAIN_FEA= TURE_MTE]); - virBufferAsprintf(buf, ",mte=3D%s", str); - } - return 0; } =20 diff --git a/tests/qemuxml2argvdata/aarch64-gic-v3.args b/tests/qemuxml2arg= vdata/aarch64-gic-v3.args index 0244951d87..0d7a1c259a 100644 --- a/tests/qemuxml2argvdata/aarch64-gic-v3.args +++ b/tests/qemuxml2argvdata/aarch64-gic-v3.args @@ -10,7 +10,7 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-aarch64= test/.config \ -name guest=3Daarch64test,debug-threads=3Don \ -S \ -object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/va= r/lib/libvirt/qemu/domain--1-aarch64test/master-key.aes"}' \ --machine virt,usb=3Doff,gic-version=3D3,mte=3Don,dump-guest-core=3Doff,mem= ory-backend=3Dmach-virt.ram \ +-machine virt,usb=3Doff,gic-version=3D3,dump-guest-core=3Doff,memory-backe= nd=3Dmach-virt.ram \ -accel kvm \ -cpu host \ -m 1024 \ --=20 2.40.1 From nobody Fri Apr 19 08:53:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1684742878; cv=none; d=zohomail.com; s=zohoarc; b=hZZSGkq5XUfo8+geg0FKSIC3ZtD+9DQnRVKxTPzEJGroz5femsYnW2SupkO5IOfrdg025GCLgGkfol8Wk2IiQqWL2flUJ/dyzxSMLaZ2q+Q0TAS6lbLtyEBNz/865RWkwvmDxbhCMIHWOAkDH2BlrNGCbPSnFGRzXGh/G9p7VKU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684742878; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=tce/NtnRoFYFrhjAAaBRrtqQxXj3tXLXtf82E4mRiyY=; b=Q+idQgCAju3Cdvdjkwo/+tr/bxGAcmQWFq3wpqXvKuDEzqmCm1Lc7JzHT3LcTr+bJNiuEXt8Auk+vrINfaTuY+ihjh3EyDYLTBvVMoj2sXHr6LFNhStEm4fKjRSXBqVm2uctZWH9TVsyzUJN00bza9TmgvgMnuSb8YeVq2ub5nA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 168474287891691.30180130101314; Mon, 22 May 2023 01:07:58 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-32-KK_Dl_McNtuzXFSNu9OgOA-1; Mon, 22 May 2023 04:07:54 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id F09F7185A7AB; Mon, 22 May 2023 08:07:50 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id AC6BCC54186; Mon, 22 May 2023 08:07:50 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 9454E19465A8; Mon, 22 May 2023 08:07:50 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 9CD39194658C for ; Mon, 22 May 2023 08:07:49 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 8BA4E20296C8; Mon, 22 May 2023 08:07:49 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.148]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CA0FA200C0EE; Mon, 22 May 2023 08:07:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684742878; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=tce/NtnRoFYFrhjAAaBRrtqQxXj3tXLXtf82E4mRiyY=; b=NFWo0iNvzzLQtEQgibo5DAtR3feFkUgUuN85BsSEBnamSULA9zFA+iaDajI5sKZDCDJRkQ 8lZnf7HkE7MOY2ZU5yxv4VZ5vRftrDw0JHWGxtsgA3tQ1ugPldpi0kK/jPJiIB8FsMJk2E RgsMO0tKV0wHV2amG7UWSpKSUUNwg4k= X-MC-Unique: KK_Dl_McNtuzXFSNu9OgOA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 2/4] Revert "qemu: Validate MTE feature" Date: Mon, 22 May 2023 10:07:42 +0200 Message-Id: <20230522080744.38527-3-abologna@redhat.com> In-Reply-To: <20230522080744.38527-1-abologna@redhat.com> References: <20230522080744.38527-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mprivozn@redhat.com, cohuck@redhat.com Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1684742880333100001 Content-Type: text/plain; charset="utf-8"; x-default="true" The QEMU interface is still in a state of flux, and KVM support has been pulled shortly after having been merged. Let's not commit to a stable interface in libvirt just yet. Reverts: c6c9b5d251de215ed378aa0bc31daa2e1170409e Signed-off-by: Andrea Bolognani Reviewed-by: Cornelia Huck Reviewed-by:: J=C3=A1n Tomko --- src/qemu/qemu_validate.c | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index da76556854..99c7775e9b 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -124,23 +124,14 @@ qemuValidateDomainDefFeatures(const virDomainDef *def, =20 case VIR_DOMAIN_FEATURE_GIC: case VIR_DOMAIN_FEATURE_MTE: - if (def->features[i] !=3D VIR_TRISTATE_SWITCH_ABSENT) { - if (!qemuDomainIsARMVirt(def)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("The '%1$s' feature is not supported = for architecture '%2$s' or machine type '%3$s'"), - featureName, - virArchToString(def->os.arch), - def->os.machine); - return -1; - } - - if (i =3D=3D VIR_DOMAIN_FEATURE_MTE && - !virQEMUCapsGet(qemuCaps, QEMU_CAPS_MACHINE_VIRT_MTE))= { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("The '%1$s' feature is not supported = with this QEMU binary"), - featureName); - return -1; - } + if (def->features[i] =3D=3D VIR_TRISTATE_SWITCH_ON && + !qemuDomainIsARMVirt(def)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("The '%1$s' feature is not supported for = architecture '%2$s' or machine type '%3$s'"), + featureName, + virArchToString(def->os.arch), + def->os.machine); + return -1; } break; =20 --=20 2.40.1 From nobody Fri Apr 19 08:53:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1684742883; cv=none; d=zohomail.com; s=zohoarc; b=V1UJjhSZmYh9kpt6NlWdfRCuMGBmJW3995YjMnMXoTnEuuX+oFCj9A/WDl/9L0b2TzhI/1TGkeAlB3oekly//TwWjYJyI5tOa/4f5K9hUBrave94tZx89VEYngardvKhu7mY7mQgRQzC3nFphhTx+JiAUk505vh05y0MRlEajoQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684742883; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=XoG+0wBasJcnygNAqgXuExU3ImIU4ngBTLPEzg3zqOw=; b=KgF7Y6sxFKvkPHNNgwCk4nDd9+KVobS3YPYTqupK8zq7uKUQwST1gPKCmYYFc1/tE9Lp1O5NszqHD2k50HZ97OWS2Cg/NNKOo5jwsRMC7dW/0776UbZTBdh56lnUafo6IOFZg/mwZvK51ThLrTRox6R+yqBrwRaPkMmREaCOyhM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com with SMTPS id 1684742883071669.9287673910528; Mon, 22 May 2023 01:08:03 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-516-Ddn9334rOXaMW3yr1zLyQg-1; Mon, 22 May 2023 04:07:55 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4A8271C0904A; Mon, 22 May 2023 08:07:52 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 354574F2DC2; Mon, 22 May 2023 08:07:52 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id F2D3C1946595; Mon, 22 May 2023 08:07:51 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id AE5591946A41 for ; Mon, 22 May 2023 08:07:50 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 91DE62029F71; Mon, 22 May 2023 08:07:50 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.148]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D0DFE20296C6; Mon, 22 May 2023 08:07:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684742882; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=XoG+0wBasJcnygNAqgXuExU3ImIU4ngBTLPEzg3zqOw=; b=CFWpLqn5SINCc2z2egBMTuLkR5saJF/eQ8Zl6KxuGGQ7/F4LcEmPWeHebVcNIh2WAqVfR5 UG2/FbXCMf3RcHyRFF3T5sdTX3Unru1RGeHHepYT8LuAn0NAzrO9fuH3H/Rc/7Ve8+Yjz0 GRRm+TNqkFGfMUoWYEkn70NSWeTX2Ko= X-MC-Unique: Ddn9334rOXaMW3yr1zLyQg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 3/4] Revert "qemu:: Introduce QEMU_CAPS_MACHINE_VIRT_MTE capability" Date: Mon, 22 May 2023 10:07:43 +0200 Message-Id: <20230522080744.38527-4-abologna@redhat.com> In-Reply-To: <20230522080744.38527-1-abologna@redhat.com> References: <20230522080744.38527-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mprivozn@redhat.com, cohuck@redhat.com Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1684742884721100003 Content-Type: text/plain; charset="utf-8"; x-default="true" The QEMU interface is still in a state of flux, and KVM support has been pulled shortly after having been merged. Let's not commit to a stable interface in libvirt just yet. Reverts: 1347a19f75a23b4d92e6a7b549fcde52b23f0258 Signed-off-by: Andrea Bolognani Reviewed-by: Cornelia Huck Reviewed-by:: J=C3=A1n Tomko --- src/qemu/qemu_capabilities.c | 2 -- src/qemu/qemu_capabilities.h | 1 - tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml | 1 - 7 files changed, 8 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index a88c4070ab..cf85d42198 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -693,7 +693,6 @@ VIR_ENUM_IMPL(virQEMUCaps, "virtio-gpu.blob", /* QEMU_CAPS_VIRTIO_GPU_BLOB */ "rbd-encryption-layering", /* QEMU_CAPS_RBD_ENCRYPTION_LAYER= ING */ "rbd-encryption-luks-any", /* QEMU_CAPS_RBD_ENCRYPTION_LUKS_= ANY */ - "machine.virt.mte", /* QEMU_CAPS_MACHINE_VIRT_MTE */ ); =20 =20 @@ -1721,7 +1720,6 @@ static struct virQEMUCapsStringFlags virQEMUCapsMachi= nePropsPSeries[] =3D { =20 static struct virQEMUCapsStringFlags virQEMUCapsMachinePropsVirt[] =3D { { "iommu", QEMU_CAPS_MACHINE_VIRT_IOMMU }, - { "mte", QEMU_CAPS_MACHINE_VIRT_MTE }, }; =20 static struct virQEMUCapsStringFlags virQEMUCapsMachinePropsGeneric[] =3D { diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index ffece17877..3b55aed07a 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -672,7 +672,6 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ QEMU_CAPS_VIRTIO_GPU_BLOB, /* -device virtio-gpu-*.blob=3D */ QEMU_CAPS_RBD_ENCRYPTION_LAYERING, /* layered encryption support for C= eph RBD */ QEMU_CAPS_RBD_ENCRYPTION_LUKS_ANY, /* luks-any (LUKS and LUKS2) encryp= tion format for Ceph RBD */ - QEMU_CAPS_MACHINE_VIRT_MTE, /* -machine virt,mte=3D* for ARM guests */ =20 QEMU_CAPS_LAST /* this must always be the last item */ } virQEMUCapsFlags; diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml b/tests/qemu= capabilitiesdata/caps_5.2.0_aarch64.xml index 4843b32a45..b1c5c21abb 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml @@ -130,7 +130,6 @@ - 5002000 61700243 v5.2.0 diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml b/tests/qemu= capabilitiesdata/caps_6.0.0_aarch64.xml index 78e297c7f4..6faf407a97 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml @@ -140,7 +140,6 @@ - 6000000 61700242 v6.0.0 diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml b/tests/qemu= capabilitiesdata/caps_6.2.0_aarch64.xml index f37b84d399..e312801b89 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml @@ -153,7 +153,6 @@ - 6001050 61700244 diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml b/tests/= qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml index d0f1815e85..3517e81d15 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml @@ -161,7 +161,6 @@ - 6002092 61700243 v7.0.0-rc2 diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml b/tests/qemu= capabilitiesdata/caps_7.0.0_aarch64.xml index 5ca98e19be..58db75d1d7 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml @@ -161,7 +161,6 @@ - 6002092 61700243 v7.0.0-rc2 --=20 2.40.1 From nobody Fri Apr 19 08:53:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1684742884; cv=none; d=zohomail.com; s=zohoarc; b=Y1s/OjEblqdQ9IdB81R2nUU5FNfX16fLF7obJJP6Cs3wcjrpNMML3inPP4e9VsZr6/ezsjzCDxdYMS6+xqsEUjTvQfsPSFpGYjyNkIZFv3zrx5zrw8rlfbZAQTUFTerNKshBCphIRA9kbf2R6M0u9gEBjxmZy9/V4QkyiAQZjgg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1684742884; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=hgzA2axwnnapV04/84KLDU9EfLip9OsPhTU1cT9iJ14=; b=EI+ZoXK/KT9al++9PRrVAPDfJKamH8jlTVhLcDnj8t8IgQd9g1/hvMQEzcKpkJnhu9hrLpVV4IGQWx1jsfNZnkKgH+k1MJ7dWn5AvlFD92yOcauWG0hFqsENRyZ/22leYhUlIhQsXhtq3JZWkca4cLOxZ4AwN/tQu/oeWwhZb78= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1684742884038150.28046949215684; Mon, 22 May 2023 01:08:04 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-471-tVrpA9otMsGaDBQijCnh8A-1; Mon, 22 May 2023 04:07:56 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 79821800B35; Mon, 22 May 2023 08:07:54 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 609842166B26; Mon, 22 May 2023 08:07:54 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 34ADD1946595; Mon, 22 May 2023 08:07:54 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id A565D194658C for ; Mon, 22 May 2023 08:07:51 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 987842029F71; Mon, 22 May 2023 08:07:51 +0000 (UTC) Received: from harajuku.usersys.redhat.com (unknown [10.45.226.148]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D78F42029F6E; Mon, 22 May 2023 08:07:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684742883; h=from:from:sender:sender: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:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=hgzA2axwnnapV04/84KLDU9EfLip9OsPhTU1cT9iJ14=; b=NroumMIpKnkVnrsVAHavRxwiI8iaBjWM4ypnbXRZ9M9KWpqD2uE0KMLGvRVyWAtS60TWat K5fAnxw8/bMRHaouLeLZVeEa5mYp7u+aj9tWlxqbPDiX20MLNqzYwqkvhj46I38tznyxQ3 LSxUkZc+PLkMM1SI0knLiS9GdM3iHdc= X-MC-Unique: tVrpA9otMsGaDBQijCnh8A-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 4/4] Revert "conf: Introduce MTE domain feature" Date: Mon, 22 May 2023 10:07:44 +0200 Message-Id: <20230522080744.38527-5-abologna@redhat.com> In-Reply-To: <20230522080744.38527-1-abologna@redhat.com> References: <20230522080744.38527-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mprivozn@redhat.com, cohuck@redhat.com Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1684742884762100005 Content-Type: text/plain; charset="utf-8"; x-default="true" The QEMU interface is still in a state of flux, and KVM support has been pulled shortly after having been merged. Let's not commit to a stable interface in libvirt just yet. Reverts: 720e8f13ff71377580cd37b118cee8a1f982d1d8 Signed-off-by: Andrea Bolognani Reviewed-by: Cornelia Huck Reviewed-by:: J=C3=A1n Tomko --- docs/formatdomain.rst | 7 ------- src/conf/domain_conf.c | 6 +----- src/conf/domain_conf.h | 1 - src/conf/schemas/domaincommon.rng | 5 ----- src/qemu/qemu_validate.c | 1 - tests/qemuxml2argvdata/aarch64-gic-v3.xml | 1 - tests/qemuxml2xmloutdata/aarch64-gic-v3.aarch64-latest.xml | 1 - 7 files changed, 1 insertion(+), 21 deletions(-) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index b46eefb0f6..dd28a565e1 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -2000,7 +2000,6 @@ Hypervisors may allow certain CPU / machine features = to be toggled on/off. 128 - ... =20 @@ -2231,12 +2230,6 @@ are: tb-cache The size of translation block cache size an integer (= a multiple of MiB) :since:`8.0.0` =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D =20 -``mte`` - Configure Memory Tagging Extensions for ARM guests. Possible values for= the - ``state`` attribute are ``on`` and ``off``. If the attribute is not - defined, the hypervisor default will be used. :since:`Since 9.4.0` (QEM= U/KVM - only) - Time keeping ------------ =20 diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 047a4c97bf..6a864a8db9 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -181,7 +181,6 @@ VIR_ENUM_IMPL(virDomainFeature, "sbbc", "ibs", "tcg", - "mte", ); =20 VIR_ENUM_IMPL(virDomainCapabilitiesPolicy, @@ -16646,8 +16645,7 @@ virDomainFeaturesDefParse(virDomainDef *def, =20 case VIR_DOMAIN_FEATURE_HTM: case VIR_DOMAIN_FEATURE_NESTED_HV: - case VIR_DOMAIN_FEATURE_CCF_ASSIST: - case VIR_DOMAIN_FEATURE_MTE: { + case VIR_DOMAIN_FEATURE_CCF_ASSIST: { virTristateSwitch state; =20 if (virXMLPropTristateSwitch(nodes[i], "state", @@ -20488,7 +20486,6 @@ virDomainDefFeaturesCheckABIStability(virDomainDef = *src, case VIR_DOMAIN_FEATURE_HTM: case VIR_DOMAIN_FEATURE_NESTED_HV: case VIR_DOMAIN_FEATURE_CCF_ASSIST: - case VIR_DOMAIN_FEATURE_MTE: if (src->features[i] !=3D dst->features[i]) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("State of feature '%1$s' differs: source:= '%2$s', destination: '%3$s'"), @@ -27008,7 +27005,6 @@ virDomainDefFormatFeatures(virBuffer *buf, case VIR_DOMAIN_FEATURE_HTM: case VIR_DOMAIN_FEATURE_NESTED_HV: case VIR_DOMAIN_FEATURE_CCF_ASSIST: - case VIR_DOMAIN_FEATURE_MTE: switch ((virTristateSwitch) def->features[i]) { case VIR_TRISTATE_SWITCH_LAST: case VIR_TRISTATE_SWITCH_ABSENT: diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 3f8d6e81c0..c1cb2ed69d 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2169,7 +2169,6 @@ typedef enum { VIR_DOMAIN_FEATURE_SBBC, VIR_DOMAIN_FEATURE_IBS, VIR_DOMAIN_FEATURE_TCG, - VIR_DOMAIN_FEATURE_MTE, =20 VIR_DOMAIN_FEATURE_LAST } virDomainFeature; diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincom= mon.rng index 37e350ac2c..f8c7b6a648 100644 --- a/src/conf/schemas/domaincommon.rng +++ b/src/conf/schemas/domaincommon.rng @@ -6653,11 +6653,6 @@ - - - - - diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 99c7775e9b..da4b9a3b35 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -123,7 +123,6 @@ qemuValidateDomainDefFeatures(const virDomainDef *def, break; =20 case VIR_DOMAIN_FEATURE_GIC: - case VIR_DOMAIN_FEATURE_MTE: if (def->features[i] =3D=3D VIR_TRISTATE_SWITCH_ON && !qemuDomainIsARMVirt(def)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, diff --git a/tests/qemuxml2argvdata/aarch64-gic-v3.xml b/tests/qemuxml2argv= data/aarch64-gic-v3.xml index b9317284b0..247d6025f7 100644 --- a/tests/qemuxml2argvdata/aarch64-gic-v3.xml +++ b/tests/qemuxml2argvdata/aarch64-gic-v3.xml @@ -10,7 +10,6 @@ - diff --git a/tests/qemuxml2xmloutdata/aarch64-gic-v3.aarch64-latest.xml b/t= ests/qemuxml2xmloutdata/aarch64-gic-v3.aarch64-latest.xml index 1a74903aaa..5b2fb7df75 100644 --- a/tests/qemuxml2xmloutdata/aarch64-gic-v3.aarch64-latest.xml +++ b/tests/qemuxml2xmloutdata/aarch64-gic-v3.aarch64-latest.xml @@ -10,7 +10,6 @@ - --=20 2.40.1