From nobody Sun Feb  8 21:32:30 2026
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=1647876294; cv=none;
	d=zohomail.com; s=zohoarc;
	b=KLGcJZx9zj3Q0Q2HUnU3V0X9HyYC3h37kOtTuhgpdcRZTa/gy8+bD6iJaUR8Y6Z6QhTII+OkMwVuZUcfCIGJEGC0PyXOIqRmG4hB3rcKfVbCrUGouSV0aYYFSNHEroqzDQXEkSqDfF6zCKi0jb2JvxIF1Pv6/9A+bDh4W25Zu0Y=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1647876294;
 h=Content-Type:Content-Transfer-Encoding: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=0ilRRDDFISKwZiDtbTaQLPAME//Aan3F5rdVgK3uQCA=;
	b=CQzM1upgvO5UWVjUKfhd/hVe/OYvWo06c9SChklOXVKdb34j3DIMfB3LcRs9/63P1lkI8YZI2PdRhGNpg7OCj8atgsO08vmJ0CCrYaiHBPN6uV2aVtuCYqbmcKkpwjpg7uN3S6ZRXAzFd+rlLfcbFIlD9sEF+pzdT2LRN8B5FE4=
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=<pkrempa@redhat.com> (p=none dis=none)
Return-Path: <libvir-list-bounces@redhat.com>
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 1647876294018497.14365779328443;
 Mon, 21 Mar 2022 08:24:54 -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-46-UU6ZABS6MyuuqGDgaZe8Jg-1; Mon, 21 Mar 2022 11:24:50 -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 9B25381DA19;
	Mon, 21 Mar 2022 15:24:47 +0000 (UTC)
Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com
 (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100])
	by smtp.corp.redhat.com (Postfix) with ESMTP id 6883D41D3ED;
	Mon, 21 Mar 2022 15:24:47 +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 BD4101940344;
	Mon, 21 Mar 2022 15:24:46 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com
 [10.11.54.9])
 by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with
 ESMTP id 5ECD2193F514 for <libvir-list@listman.corp.redhat.com>;
 Mon, 21 Mar 2022 15:24:45 +0000 (UTC)
Received: by smtp.corp.redhat.com (Postfix)
 id 416B141D3ED; Mon, 21 Mar 2022 15:24:45 +0000 (UTC)
Received: from speedmetal.lan (unknown [10.40.208.35])
 by smtp.corp.redhat.com (Postfix) with ESMTP id 59B2241D3FD
 for <libvir-list@redhat.com>; Mon, 21 Mar 2022 15:24:44 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
	s=mimecast20190719; t=1647876292;
	h=from:from:sender:sender:reply-to:subject:subject:date:date:
	 message-id:message-id:to:to: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=0ilRRDDFISKwZiDtbTaQLPAME//Aan3F5rdVgK3uQCA=;
	b=hQAROJMWBf1D9SD8Y51r2ilQB+fpUkDeOrfKD49Dv8skr5p/4DrEyfs0dtzvBqJ6SIMhd8
	RN6ffDFPLnbuSKSiX4Lxe4UVWkp9Zj9PbbCgNk13smlf8YZeHJ8wTLaj/v2eMyFF4IdQgg
	39D4xlIlO/nnyq8Kh1DJglrGEa2WJD8=
X-MC-Unique: UU6ZABS6MyuuqGDgaZe8Jg-1
X-Original-To: libvir-list@listman.corp.redhat.com
From: Peter Krempa <pkrempa@redhat.com>
To: libvir-list@redhat.com
Subject: [PATCH 3/7] qemu: domain: Add XML namespace code for overriding
 device config
Date: Mon, 21 Mar 2022 16:24:36 +0100
Message-Id: 
 <aef7e33d6ae7d608894c819b4c9450d63c1c0b94.1647876193.git.pkrempa@redhat.com>
In-Reply-To: <cover.1647876193.git.pkrempa@redhat.com>
References: <cover.1647876193.git.pkrempa@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 2.85 on 10.11.54.9
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Development discussions about the libvirt library & tools
 <libvir-list.redhat.com>
List-Unsubscribe: <https://listman.redhat.com/mailman/options/libvir-list>,
 <mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <http://listman.redhat.com/archives/libvir-list/>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://listman.redhat.com/mailman/listinfo/libvir-list>,
 <mailto:libvir-list-request@redhat.com?subject=subscribe>
Errors-To: libvir-list-bounces@redhat.com
Sender: "libvir-list" <libvir-list-bounces@redhat.com>
X-Scanned-By: MIMEDefang 2.85 on 10.11.54.9
Authentication-Results: relay.mimecast.com;
	auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com
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: 1647876295011100003
Content-Type: text/plain; charset="utf-8"

Implement the XML parser and formatter for overriding of device
properties such as:

  <qemu:deviceOverride>
    <qemu:device alias=3D'ua-disk'>
      <qemu:property name=3D'prop1' type=3D'string' value=3D'propval1'/>
      <qemu:property name=3D'prop2' type=3D'signed' value=3D'-321'/>
      <qemu:property name=3D'prop3' type=3D'unsigned' value=3D'123'/>
      <qemu:property name=3D'prop4' type=3D'bool' value=3D'true'/>
      <qemu:property name=3D'prop5' type=3D'bool' value=3D'false'/>
      <qemu:property name=3D'prop6' type=3D'bool' value=3D'false'/>
      <qemu:property name=3D'prop6' type=3D'remove'/>
    </qemu:device>
  </qemu:deviceOverride>

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
---
 docs/schemas/domaincommon.rng                 |  32 +++
 src/qemu/qemu_domain.c                        | 206 ++++++++++++++++++
 src/qemu/qemu_domain.h                        |  33 +++
 .../qemu-ns.x86_64-4.0.0.args                 |   2 +-
 .../qemu-ns.x86_64-latest.args                |   2 +-
 tests/qemuxml2argvdata/qemu-ns.xml            |  12 +
 .../qemu-ns.x86_64-latest.xml                 |  12 +
 7 files changed, 297 insertions(+), 2 deletions(-)

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 9c1b64a644..804ade3f37 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -80,6 +80,9 @@
         <optional>
           <ref name=3D"qemudeprecation"/>
         </optional>
+        <optional>
+          <ref name=3D"qemudeviceoverride"/>
+        </optional>
         <optional>
           <ref name=3D"lxcsharens"/>
         </optional>
@@ -7553,6 +7556,35 @@
     </element>
   </define>

+  <define name=3D"qemudeviceoverride">
+    <element name=3D"deviceOverride" ns=3D"http://libvirt.org/schemas/doma=
in/qemu/1.0">
+      <interleave>
+        <zeroOrMore>
+          <element name=3D"device">
+            <attribute name=3D"alias"/>
+            <zeroOrMore>
+              <element name=3D"property">
+                <attribute name=3D"name"/>
+                <attribute name=3D"type">
+                  <choice>
+                    <value>string</value>
+                    <value>signed</value>
+                    <value>unsigned</value>
+                    <value>bool</value>
+                    <value>remove</value>
+                  </choice>
+                </attribute>
+                <optional>
+                  <attribute name=3D"value"/>
+                </optional>
+              </element>
+            </zeroOrMore>
+          </element>
+        </zeroOrMore>
+      </interleave>
+    </element>
+  </define>
+

   <!--
        Optional hypervisor extensions in their own namespace:
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 3bf864bc5d..595440173c 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -3181,6 +3181,23 @@ qemuDomainXmlNsDefFree(qemuDomainXmlNsDef *def)

     g_free(def->deprecationBehavior);

+    for (i =3D 0; i < def->ndeviceOverride; i++) {
+        size_t j;
+        g_free(def->deviceOverride[i].alias);
+
+        for (j =3D 0; j < def->deviceOverride[i].nprops; j++) {
+            qemuDomainXmlNsDeviceOverrideProperty *prop =3D def->deviceOve=
rride[i].props + j;
+
+            g_free(prop->name);
+            g_free(prop->value);
+            virJSONValueFree(prop->json);
+        }
+
+        g_free(def->deviceOverride[i].props);
+    }
+
+    g_free(def->deviceOverride);
+
     g_free(def);
 }

@@ -3319,6 +3336,159 @@ qemuDomainDefNamespaceParseCaps(qemuDomainXmlNsDef =
*nsdef,
     return 0;
 }

+VIR_ENUM_IMPL(qemuDomainXmlNsDeviceOverride,
+              QEMU_DOMAIN_XML_NS_DEVICE_OVERRIDE_LAST,
+              "",
+              "string",
+              "signed",
+              "unsigned",
+              "bool",
+              "remove",
+             );
+
+
+static int
+qemuDomainDefNamespaceParseDeviceOverrideProperties(qemuDomainXmlNsDeviceO=
verride *device,
+                                                    xmlNodePtr *propnodes,
+                                                    size_t npropnodes)
+{
+    size_t i;
+
+    device->props =3D g_new0(qemuDomainXmlNsDeviceOverrideProperty, npropn=
odes);
+    device->nprops =3D npropnodes;
+
+    for (i =3D 0; i < npropnodes; i++) {
+        qemuDomainXmlNsDeviceOverrideProperty *prop =3D device->props + i;
+        unsigned long long ull;
+        long long ll;
+        bool b;
+
+        if (!(prop->name =3D virXMLPropString(propnodes[i], "name"))) {
+            virReportError(VIR_ERR_XML_ERROR, "%s",
+                           _("missing 'name' attribute for qemu:property")=
);
+            return -1;
+        }
+
+        if (STREQ(prop->name, "id")) {
+            virReportError(VIR_ERR_XML_ERROR, "%s",
+                           _("property with name 'id' can't be overriden")=
);
+            return -1;
+        }
+
+        if (virXMLPropEnum(propnodes[i], "type",
+                           qemuDomainXmlNsDeviceOverrideTypeFromString,
+                           VIR_XML_PROP_REQUIRED | VIR_XML_PROP_NONZERO,
+                           &prop->type) < 0)
+            return -1;
+
+        if (!(prop->value =3D virXMLPropString(propnodes[i], "value"))) {
+            if (prop->type !=3D QEMU_DOMAIN_XML_NS_DEVICE_OVERRIDE_REMOVE)=
 {
+                virReportError(VIR_ERR_XML_ERROR, "%s",
+                               _("missing 'value' attribute for 'qemu:prop=
erty'"));
+                return -1;
+            }
+        }
+
+        switch (prop->type) {
+        case QEMU_DOMAIN_XML_NS_DEVICE_OVERRIDE_STRING:
+            prop->json =3D virJSONValueNewString(g_strdup(prop->value));
+            break;
+
+        case QEMU_DOMAIN_XML_NS_DEVICE_OVERRIDE_SIGNED:
+            if (virStrToLong_ll(prop->value, NULL, 10, &ll) < 0) {
+                virReportError(VIR_ERR_XML_ERROR,
+                               _("invalid value '%s' of 'value' attribute =
of 'qemu:property'"),
+                               prop->value);
+                return -1;
+            }
+            prop->json =3D virJSONValueNewNumberLong(ll);
+            break;
+
+        case QEMU_DOMAIN_XML_NS_DEVICE_OVERRIDE_UNSIGNED:
+            if (virStrToLong_ullp(prop->value, NULL, 10, &ull) < 0) {
+                virReportError(VIR_ERR_XML_ERROR,
+                               _("invalid value '%s' of 'value' attribute =
of 'qemu:property'"),
+                               prop->value);
+                return -1;
+            }
+            prop->json =3D virJSONValueNewNumberUlong(ull);
+            break;
+
+        case QEMU_DOMAIN_XML_NS_DEVICE_OVERRIDE_BOOL:
+            if (STRNEQ(prop->value, "true") && STRNEQ(prop->value, "false"=
)) {
+                virReportError(VIR_ERR_XML_ERROR,
+                               _("invalid value '%s' of 'value' attribute =
of 'qemu:property'"),
+                               prop->value);
+                return -1;
+            }
+
+            b =3D STREQ(prop->value, "true");
+            prop->json =3D virJSONValueNewBoolean(b);
+            break;
+
+        case QEMU_DOMAIN_XML_NS_DEVICE_OVERRIDE_REMOVE:
+            if (prop->value) {
+                virReportError(VIR_ERR_XML_ERROR, "%s",
+                               _("setting 'value' attribute of 'qemu:prope=
rty' doesn't make sense with 'remove' type"));
+                return -1;
+            }
+            break;
+
+        case QEMU_DOMAIN_XML_NS_DEVICE_OVERRIDE_NONE:
+        case QEMU_DOMAIN_XML_NS_DEVICE_OVERRIDE_LAST:
+            virReportEnumRangeError(qemuDomainXmlNsDeviceOverrideType, pro=
p->type);
+            return -1;
+        }
+    }
+
+    return 0;
+}
+
+
+static int
+qemuDomainDefNamespaceParseDeviceOverride(qemuDomainXmlNsDef *nsdef,
+                                          xmlXPathContextPtr ctxt)
+{
+    g_autofree xmlNodePtr *devicenodes =3D NULL;
+    ssize_t ndevicenodes;
+    size_t i;
+
+    if ((ndevicenodes =3D virXPathNodeSet("./qemu:deviceOverride/qemu:devi=
ce", ctxt, &devicenodes)) < 0)
+        return -1;
+
+    if (ndevicenodes =3D=3D 0)
+        return 0;
+
+    nsdef->deviceOverride =3D g_new0(qemuDomainXmlNsDeviceOverride, ndevic=
enodes);
+    nsdef->ndeviceOverride =3D ndevicenodes;
+
+    for (i =3D 0; i < ndevicenodes; i++) {
+        qemuDomainXmlNsDeviceOverride *n =3D nsdef->deviceOverride + i;
+        g_autofree xmlNodePtr *propnodes =3D NULL;
+        ssize_t npropnodes;
+        VIR_XPATH_NODE_AUTORESTORE(ctxt);
+
+        ctxt->node =3D devicenodes[i];
+
+        if (!(n->alias =3D virXMLPropString(devicenodes[i], "alias"))) {
+            virReportError(VIR_ERR_XML_ERROR, "%s",
+                           _("missing 'alias' attribute for qemu:device"));
+            return -1;
+        }
+
+        if ((npropnodes =3D virXPathNodeSet("./qemu:property", ctxt, &prop=
nodes)) < 0)
+            return -1;
+
+        if (npropnodes =3D=3D 0)
+            continue;
+
+        if (qemuDomainDefNamespaceParseDeviceOverrideProperties(n, propnod=
es, npropnodes) < 0)
+            return -1;
+    }
+
+    return 0;
+}
+

 static int
 qemuDomainDefNamespaceParse(xmlXPathContextPtr ctxt,
@@ -3331,6 +3501,7 @@ qemuDomainDefNamespaceParse(xmlXPathContextPtr ctxt,

     if (qemuDomainDefNamespaceParseCommandlineArgs(nsdata, ctxt) < 0 ||
         qemuDomainDefNamespaceParseCommandlineEnv(nsdata, ctxt) < 0 ||
+        qemuDomainDefNamespaceParseDeviceOverride(nsdata, ctxt) < 0 ||
         qemuDomainDefNamespaceParseCaps(nsdata, ctxt) < 0)
         goto cleanup;

@@ -3386,6 +3557,40 @@ qemuDomainDefNamespaceFormatXMLCaps(virBuffer *buf,
 }


+static void
+qemuDomainDefNamespaceFormatXMLDeviceOverride(virBuffer *buf,
+                                              qemuDomainXmlNsDef *xmlns)
+{
+    g_auto(virBuffer) childBuf =3D VIR_BUFFER_INIT_CHILD(buf);
+    size_t i;
+
+    for (i =3D 0; i < xmlns->ndeviceOverride; i++) {
+        qemuDomainXmlNsDeviceOverride *device =3D xmlns->deviceOverride + =
i;
+        g_auto(virBuffer) deviceAttrBuf =3D VIR_BUFFER_INITIALIZER;
+        g_auto(virBuffer) deviceChildBuf =3D VIR_BUFFER_INIT_CHILD(&childB=
uf);
+        size_t j;
+
+        virBufferEscapeString(&deviceAttrBuf, " alias=3D'%s'", device->ali=
as);
+
+        for (j =3D 0; j < device->nprops; j++) {
+            g_auto(virBuffer) propAttrBuf =3D VIR_BUFFER_INITIALIZER;
+            qemuDomainXmlNsDeviceOverrideProperty *prop =3D device->props =
+ j;
+
+            virBufferEscapeString(&propAttrBuf, " name=3D'%s'", prop->name=
);
+            virBufferAsprintf(&propAttrBuf, " type=3D'%s'",
+                              qemuDomainXmlNsDeviceOverrideTypeToString(pr=
op->type));
+            virBufferEscapeString(&propAttrBuf, " value=3D'%s'", prop->val=
ue);
+
+            virXMLFormatElement(&deviceChildBuf, "qemu:property", &propAtt=
rBuf, NULL);
+        }
+
+        virXMLFormatElement(&childBuf, "qemu:device", &deviceAttrBuf, &dev=
iceChildBuf);
+    }
+
+    virXMLFormatElement(buf, "qemu:deviceOverride", NULL, &childBuf);
+}
+
+
 static int
 qemuDomainDefNamespaceFormatXML(virBuffer *buf,
                                 void *nsdata)
@@ -3394,6 +3599,7 @@ qemuDomainDefNamespaceFormatXML(virBuffer *buf,

     qemuDomainDefNamespaceFormatXMLCommandline(buf, cmd);
     qemuDomainDefNamespaceFormatXMLCaps(buf, cmd);
+    qemuDomainDefNamespaceFormatXMLDeviceOverride(buf, cmd);

     virBufferEscapeString(buf, "<qemu:deprecation behavior=3D'%s'/>\n",
                           cmd->deprecationBehavior);
diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index edafb585b3..fb7375026e 100644
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -443,6 +443,36 @@ struct _qemuDomainXmlNsEnvTuple {
     char *value;
 };

+
+typedef enum {
+    QEMU_DOMAIN_XML_NS_DEVICE_OVERRIDE_NONE,
+    QEMU_DOMAIN_XML_NS_DEVICE_OVERRIDE_STRING,
+    QEMU_DOMAIN_XML_NS_DEVICE_OVERRIDE_SIGNED,
+    QEMU_DOMAIN_XML_NS_DEVICE_OVERRIDE_UNSIGNED,
+    QEMU_DOMAIN_XML_NS_DEVICE_OVERRIDE_BOOL,
+    QEMU_DOMAIN_XML_NS_DEVICE_OVERRIDE_REMOVE,
+
+    QEMU_DOMAIN_XML_NS_DEVICE_OVERRIDE_LAST
+} qemuDomainXmlNsDeviceOverrideType;
+VIR_ENUM_DECL(qemuDomainXmlNsDeviceOverride);
+
+typedef struct _qemuDomainXmlNsDeviceOverrideProperty qemuDomainXmlNsDevic=
eOverrideProperty;
+struct _qemuDomainXmlNsDeviceOverrideProperty {
+    char *name;
+    qemuDomainXmlNsDeviceOverrideType type;
+    char *value;
+    virJSONValue *json;
+};
+
+typedef struct _qemuDomainXmlNsDeviceOverride qemuDomainXmlNsDeviceOverrid=
e;
+struct _qemuDomainXmlNsDeviceOverride {
+    char *alias;
+
+    size_t nprops;
+    qemuDomainXmlNsDeviceOverrideProperty *props;
+};
+
+
 typedef struct _qemuDomainXmlNsDef qemuDomainXmlNsDef;
 struct _qemuDomainXmlNsDef {
     char **args;
@@ -458,6 +488,9 @@ struct _qemuDomainXmlNsDef {
      * starting the VM to avoid any form of errors in the parser or when
      * changing qemu versions. The knob is mainly for development/CI purpo=
ses */
     char *deprecationBehavior;
+
+    size_t ndeviceOverride;
+    qemuDomainXmlNsDeviceOverride *deviceOverride;
 };


diff --git a/tests/qemuxml2argvdata/qemu-ns.x86_64-4.0.0.args b/tests/qemux=
ml2argvdata/qemu-ns.x86_64-4.0.0.args
index 5105f410ce..236f984a90 100644
--- a/tests/qemuxml2argvdata/qemu-ns.x86_64-4.0.0.args
+++ b/tests/qemuxml2argvdata/qemu-ns.x86_64-4.0.0.args
@@ -31,7 +31,7 @@ BAR=3D'' \
 -device piix3-usb-uhci,id=3Dusb,bus=3Dpci.0,addr=3D0x1.0x2 \
 -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no=
de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw=
","file":"libvirt-1-storage"}' \
--device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dide0-0-0=
,bootindex=3D1 \
+-device ide-hd,bus=3Dide.0,unit=3D0,drive=3Dlibvirt-1-format,id=3Dua-disk,=
bootindex=3D1 \
 -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.0,addr=3D0x2 \
 -unknown parameter \
 -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
diff --git a/tests/qemuxml2argvdata/qemu-ns.x86_64-latest.args b/tests/qemu=
xml2argvdata/qemu-ns.x86_64-latest.args
index 05ccade7e4..c0bf45000f 100644
--- a/tests/qemuxml2argvdata/qemu-ns.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/qemu-ns.x86_64-latest.args
@@ -33,7 +33,7 @@ BAR=3D'' \
 -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.0","addr":"0x1.0=
x2"}' \
 -blockdev '{"driver":"host_device","filename":"/dev/HostVG/QEMUGuest1","no=
de-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \
 -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw=
","file":"libvirt-1-storage"}' \
--device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form=
at","id":"ide0-0-0","bootindex":1}' \
+-device '{"driver":"ide-hd","bus":"ide.0","unit":0,"drive":"libvirt-1-form=
at","id":"ua-disk","bootindex":1}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.0","add=
r":"0x2"}' \
 -unknown parameter \
diff --git a/tests/qemuxml2argvdata/qemu-ns.xml b/tests/qemuxml2argvdata/qe=
mu-ns.xml
index 9d2f5502e9..69c93b1f9b 100644
--- a/tests/qemuxml2argvdata/qemu-ns.xml
+++ b/tests/qemuxml2argvdata/qemu-ns.xml
@@ -17,6 +17,7 @@
     <disk type=3D'block' device=3D'disk'>
       <source dev=3D'/dev/HostVG/QEMUGuest1'/>
       <target dev=3D'hda' bus=3D'ide'/>
+      <alias name=3D'ua-disk'/>
       <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
     </disk>
     <controller type=3D'ide' index=3D'0'/>
@@ -32,5 +33,16 @@
     <qemu:add capability=3D"blockdev"/>
     <qemu:del capability=3D"name"/>
   </qemu:capabilities>
+  <qemu:deviceOverride>
+    <qemu:device alias=3D'ua-disk'>
+      <qemu:property name=3D'prop1' type=3D'string' value=3D'propval1'/>
+      <qemu:property name=3D'prop2' type=3D'signed' value=3D'-321'/>
+      <qemu:property name=3D'prop3' type=3D'unsigned' value=3D'123'/>
+      <qemu:property name=3D'prop4' type=3D'bool' value=3D'true'/>
+      <qemu:property name=3D'prop5' type=3D'bool' value=3D'false'/>
+      <qemu:property name=3D'prop6' type=3D'bool' value=3D'false'/>
+      <qemu:property name=3D'prop6' type=3D'remove'/>
+    </qemu:device>
+  </qemu:deviceOverride>
   <qemu:deprecation behavior=3D'crash'/>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/qemu-ns.x86_64-latest.xml b/tests/qem=
uxml2xmloutdata/qemu-ns.x86_64-latest.xml
index 674525d033..7638d7199c 100644
--- a/tests/qemuxml2xmloutdata/qemu-ns.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/qemu-ns.x86_64-latest.xml
@@ -21,6 +21,7 @@
       <driver name=3D'qemu' type=3D'raw'/>
       <source dev=3D'/dev/HostVG/QEMUGuest1'/>
       <target dev=3D'hda' bus=3D'ide'/>
+      <alias name=3D'ua-disk'/>
       <address type=3D'drive' controller=3D'0' bus=3D'0' target=3D'0' unit=
=3D'0'/>
     </disk>
     <controller type=3D'ide' index=3D'0'>
@@ -48,5 +49,16 @@
     <qemu:add capability=3D'blockdev'/>
     <qemu:del capability=3D'name'/>
   </qemu:capabilities>
+  <qemu:deviceOverride>
+    <qemu:device alias=3D'ua-disk'>
+      <qemu:property name=3D'prop1' type=3D'string' value=3D'propval1'/>
+      <qemu:property name=3D'prop2' type=3D'signed' value=3D'-321'/>
+      <qemu:property name=3D'prop3' type=3D'unsigned' value=3D'123'/>
+      <qemu:property name=3D'prop4' type=3D'bool' value=3D'true'/>
+      <qemu:property name=3D'prop5' type=3D'bool' value=3D'false'/>
+      <qemu:property name=3D'prop6' type=3D'bool' value=3D'false'/>
+      <qemu:property name=3D'prop6' type=3D'remove'/>
+    </qemu:device>
+  </qemu:deviceOverride>
   <qemu:deprecation behavior=3D'crash'/>
 </domain>
--=20
2.35.1