9:15 a.m.
Sadly, the replies changes for older QEMUs are synthetic.
Separated for easier review.
Also available on gitlab:
git fetch https://gitlab.com/janotomko/libvirt/ virtiofs-bootindex
https://gitlab.com/janotomko/libvirt/-/tree/virtiofs-bootindex
And a broken pipeline:
https://gitlab.com/janotomko/libvirt/-/pipelines/248162273
Ján Tomko (7):
tests: switch vhost-user-fs-hugepages to use boot order
conf: add boot order to filesystem
qemu: add QEMU_CAPS_VHOST_USER_FS_BOOTINDEX
fixup: vhost-user-fs-device properties
fixup: renumber
Add validation for virtiofs boot order setting
qemu: format bootindex for vhost-user-fs
docs/schemas/domaincommon.rng | 3 +
src/conf/domain_conf.c | 5 +-
src/conf/domain_validate.c | 17 ++-
src/qemu/qemu_capabilities.c | 8 +
src/qemu/qemu_capabilities.h | 1 +
src/qemu/qemu_command.c | 3 +
src/qemu/qemu_validate.c | 6 +
.../caps_4.2.0.aarch64.replies | 131 ++++++++++++----
.../caps_4.2.0.s390x.replies | 119 ++++++++++++---
.../caps_4.2.0.x86_64.replies | 131 ++++++++++++----
.../caps_5.0.0.aarch64.replies | 136 +++++++++++++----
.../caps_5.0.0.ppc64.replies | 124 +++++++++++++---
.../caps_5.0.0.riscv64.replies | 120 ++++++++++++---
.../caps_5.0.0.x86_64.replies | 136 +++++++++++++----
.../caps_5.1.0.x86_64.replies | 136 +++++++++++++----
.../caps_5.2.0.aarch64.replies | 136 +++++++++++++----
.../caps_5.2.0.ppc64.replies | 124 +++++++++++++---
.../caps_5.2.0.riscv64.replies | 120 ++++++++++++---
.../caps_5.2.0.s390x.replies | 124 +++++++++++++---
.../caps_5.2.0.x86_64.replies | 136 +++++++++++++----
.../caps_6.0.0.x86_64.replies | 140 ++++++++++++++----
.../caps_6.0.0.x86_64.xml | 1 +
...vhost-user-fs-hugepages.x86_64-latest.args | 3 +-
.../vhost-user-fs-hugepages.xml | 3 +-
24 files changed, 1534 insertions(+), 329 deletions(-)
--
2.29.2
9:15 a.m.
New subject: [libvirt PATCH 1/7] tests: switch vhost-user-fs-hugepages to use boot order
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
tests/qemuxml2argvdata/vhost-user-fs-hugepages.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/qemuxml2argvdata/vhost-user-fs-hugepages.xml
b/tests/qemuxml2argvdata/vhost-user-fs-hugepages.xml
index 96b9774704..e9982150c7 100644
--- a/tests/qemuxml2argvdata/vhost-user-fs-hugepages.xml
+++ b/tests/qemuxml2argvdata/vhost-user-fs-hugepages.xml
@@ -12,7 +12,6 @@
<vcpu placement='static'>2</vcpu>
<os>
<type arch='x86_64' machine='q35'>hvm</type>
- <boot dev='hd'/>
</os>
<features>
<acpi/>
@@ -34,6 +33,7 @@
<driver name='qemu' type='qcow2'/>
<source file='/var/lib/libvirt/images/guest.qcow2'/>
<target dev='vda' bus='virtio'/>
+ <boot order='1'/>
<address type='pci' domain='0x0000' bus='0x04'
slot='0x00' function='0x0'/>
</disk>
<controller type='usb' index='0' model='none'/>
--
2.29.2
9:15 a.m.
New subject: [libvirt PATCH 2/7] conf: add boot order to filesystem
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
docs/schemas/domaincommon.rng | 3 +++
src/conf/domain_conf.c | 5 +++--
tests/qemuxml2argvdata/vhost-user-fs-hugepages.xml | 1 +
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index a4bddcf132..09e7747787 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -2812,6 +2812,9 @@
<empty/>
</element>
</optional>
+ <optional>
+ <ref name="deviceBoot"/>
+ </optional>
<optional>
<ref name="alias"/>
</optional>
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index dab4f10326..b8cfadb70c 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -10345,7 +10345,8 @@ virDomainFSDefParseXML(virDomainXMLOptionPtr xmlopt,
def->src->path = g_steal_pointer(&source);
def->dst = g_steal_pointer(&target);
- if (virDomainDeviceInfoParseXML(xmlopt, node, &def->info, flags) < 0)
+ if (virDomainDeviceInfoParseXML(xmlopt, node, &def->info,
+ flags | VIR_DOMAIN_DEF_PARSE_ALLOW_BOOT) < 0)
goto error;
return def;
@@ -24896,7 +24897,7 @@ virDomainFSDefFormat(virBufferPtr buf,
if (def->readonly)
virBufferAddLit(buf, "<readonly/>\n");
- virDomainDeviceInfoFormat(buf, &def->info, flags);
+ virDomainDeviceInfoFormat(buf, &def->info, flags |
VIR_DOMAIN_DEF_FORMAT_ALLOW_BOOT);
if (def->space_hard_limit)
virBufferAsprintf(buf, "<space_hard_limit unit='bytes'>"
diff --git a/tests/qemuxml2argvdata/vhost-user-fs-hugepages.xml
b/tests/qemuxml2argvdata/vhost-user-fs-hugepages.xml
index e9982150c7..3f130dd152 100644
--- a/tests/qemuxml2argvdata/vhost-user-fs-hugepages.xml
+++ b/tests/qemuxml2argvdata/vhost-user-fs-hugepages.xml
@@ -66,6 +66,7 @@
<binary path='/usr/libexec/virtiofsd'/>
<source dir='/path'/>
<target dir='mount_tag'/>
+ <boot order='2'/>
<address type='pci' domain='0x0000' bus='0x01'
slot='0x00' function='0x0'/>
</filesystem>
<input type='mouse' bus='ps2'/>
--
2.29.2
9:15 a.m.
New subject: [libvirt PATCH 3/7] qemu: add QEMU_CAPS_VHOST_USER_FS_BOOTINDEX
Introduced by QEMU commit:
commit 6da32fe5efdd71c9d254a436ce972194ff631285
Author: Laszlo Ersek <lersek(a)redhat.com>
AuthorDate: 2021-01-12 14:16:03 +0100
Commit: Michael S. Tsirkin <mst(a)redhat.com>
CommitDate: 2021-01-13 09:06:37 -0500
vhost-user-fs: add the "bootindex" property
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 8 ++++++++
src/qemu/qemu_capabilities.h | 1 +
tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 +
3 files changed, 10 insertions(+)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index d656732c3e..4a1bf9b6fe 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -610,6 +610,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
"dc390",
"am53c974",
"virtio-pmem-pci",
+ "vhost-user-fs.bootindex",
);
@@ -1510,6 +1511,10 @@ static struct virQEMUCapsDevicePropsFlags
virQEMUCapsDevicePropsNVDIMM[] = {
{ "unarmed", QEMU_CAPS_DEVICE_NVDIMM_UNARMED, NULL },
};
+static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVhostUserFS[] = {
+ { "bootindex", QEMU_CAPS_VHOST_USER_FS_BOOTINDEX, NULL },
+};
+
/* see documentation for virQEMUQAPISchemaPathGet for the query format */
static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] = {
{ "blockdev-add/arg-type/options/+gluster/debug-level",
QEMU_CAPS_GLUSTER_DEBUG_LEVEL},
@@ -1661,6 +1666,9 @@ static virQEMUCapsDeviceTypeProps virQEMUCapsDeviceProps[] = {
{ "usb-host", virQEMUCapsDevicePropsUSBHost,
G_N_ELEMENTS(virQEMUCapsDevicePropsUSBHost),
-1 },
+ { "vhost-user-fs-device", virQEMUCapsDevicePropsVhostUserFS,
+ G_N_ELEMENTS(virQEMUCapsDevicePropsVhostUserFS),
+ QEMU_CAPS_DEVICE_VHOST_USER_FS },
};
static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsMemoryBackendFile[] = {
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index a14a78f959..cd95103652 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -590,6 +590,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check
*/
QEMU_CAPS_SCSI_DC390, /* -device dc-390 */
QEMU_CAPS_SCSI_AM53C974, /* -device am53c974 */
QEMU_CAPS_DEVICE_VIRTIO_PMEM_PCI, /* -device virtio-pmem-pci */
+ QEMU_CAPS_VHOST_USER_FS_BOOTINDEX, /* vhost-user-fs.bootindex */
QEMU_CAPS_LAST /* this must always be the last item */
} virQEMUCapsFlags;
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index bd5021860e..f988357c44 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@@ -251,6 +251,7 @@
<flag name='dc390'/>
<flag name='am53c974'/>
<flag name='virtio-pmem-pci'/>
+ <flag name='vhost-user-fs.bootindex'/>
<version>5002050</version>
<kvmVersion>0</kvmVersion>
<microcodeVersion>43100242</microcodeVersion>
--
2.29.2
9:15 a.m.
New subject: [libvirt PATCH 4/7] fixup: vhost-user-fs-device properties
---
.../caps_4.2.0.aarch64.replies | 79 +++++++++++++++++
.../caps_4.2.0.s390x.replies | 79 +++++++++++++++++
.../caps_4.2.0.x86_64.replies | 79 +++++++++++++++++
.../caps_5.0.0.aarch64.replies | 84 ++++++++++++++++++
.../caps_5.0.0.ppc64.replies | 84 ++++++++++++++++++
.../caps_5.0.0.riscv64.replies | 84 ++++++++++++++++++
.../caps_5.0.0.x86_64.replies | 84 ++++++++++++++++++
.../caps_5.1.0.x86_64.replies | 84 ++++++++++++++++++
.../caps_5.2.0.aarch64.replies | 84 ++++++++++++++++++
.../caps_5.2.0.ppc64.replies | 84 ++++++++++++++++++
.../caps_5.2.0.riscv64.replies | 84 ++++++++++++++++++
.../caps_5.2.0.s390x.replies | 84 ++++++++++++++++++
.../caps_5.2.0.x86_64.replies | 84 ++++++++++++++++++
.../caps_6.0.0.x86_64.replies | 88 +++++++++++++++++++
14 files changed, 1165 insertions(+)
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies
b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies
index 68f67d6dd8..29981e96a0 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies
@@ -6302,6 +6302,85 @@
"id": "libvirt-31"
}
+{
+ "execute": "device-list-properties",
+ "arguments": {
+ "typename": "vhost-user-fs-device"
+ },
+ "id": "libvirt-33"
+}
+
+{
+ "return": [
+ {
+ "default-value": false,
+ "name": "packed",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": false,
+ "name": "iommu_platform",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "event_idx",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": false,
+ "name": "x-disable-legacy-check",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "notify_on_empty",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "any_layout",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "use-started",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "indirect_desc",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "name": "chardev",
+ "description": "ID of a chardev to use as a backend",
+ "type": "str"
+ },
+ {
+ "default-value": 128,
+ "name": "queue-size",
+ "type": "uint16"
+ },
+ {
+ "name": "tag",
+ "type": "str"
+ },
+ {
+ "default-value": 1,
+ "name": "num-request-queues",
+ "type": "uint16"
+ }
+ ],
+ "id": "libvirt-33"
+}
+
{
"execute": "qom-list-properties",
"arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies
b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies
index f87a7aa812..000426f4c2 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies
@@ -4421,6 +4421,85 @@
"id": "libvirt-30"
}
+{
+ "execute": "device-list-properties",
+ "arguments": {
+ "typename": "vhost-user-fs-device"
+ },
+ "id": "libvirt-33"
+}
+
+{
+ "return": [
+ {
+ "default-value": false,
+ "name": "packed",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": false,
+ "name": "iommu_platform",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "event_idx",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": false,
+ "name": "x-disable-legacy-check",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "notify_on_empty",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "any_layout",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "use-started",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "indirect_desc",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "name": "chardev",
+ "description": "ID of a chardev to use as a backend",
+ "type": "str"
+ },
+ {
+ "default-value": 128,
+ "name": "queue-size",
+ "type": "uint16"
+ },
+ {
+ "name": "tag",
+ "type": "str"
+ },
+ {
+ "default-value": 1,
+ "name": "num-request-queues",
+ "type": "uint16"
+ }
+ ],
+ "id": "libvirt-33"
+}
+
{
"execute": "qom-list-properties",
"arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.replies
index f4d868efe1..d4790878e0 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.replies
@@ -5788,6 +5788,85 @@
"id": "libvirt-36"
}
+{
+ "execute": "device-list-properties",
+ "arguments": {
+ "typename": "vhost-user-fs-device"
+ },
+ "id": "libvirt-33"
+}
+
+{
+ "return": [
+ {
+ "default-value": false,
+ "name": "packed",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": false,
+ "name": "iommu_platform",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "event_idx",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": false,
+ "name": "x-disable-legacy-check",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "notify_on_empty",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "any_layout",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "use-started",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "indirect_desc",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "name": "chardev",
+ "description": "ID of a chardev to use as a backend",
+ "type": "str"
+ },
+ {
+ "default-value": 128,
+ "name": "queue-size",
+ "type": "uint16"
+ },
+ {
+ "name": "tag",
+ "type": "str"
+ },
+ {
+ "default-value": 1,
+ "name": "num-request-queues",
+ "type": "uint16"
+ }
+ ],
+ "id": "libvirt-33"
+}
+
{
"execute": "qom-list-properties",
"arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies
b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies
index 5d3eeff868..e054d20a60 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies
@@ -6791,6 +6791,90 @@
"id": "libvirt-31"
}
+{
+ "execute": "device-list-properties",
+ "arguments": {
+ "typename": "vhost-user-fs-device"
+ },
+ "id": "libvirt-33"
+}
+
+{
+ "return": [
+ {
+ "default-value": false,
+ "name": "packed",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "use-disabled-flag",
+ "type": "bool"
+ },
+ {
+ "default-value": false,
+ "name": "iommu_platform",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "event_idx",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": false,
+ "name": "x-disable-legacy-check",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "notify_on_empty",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "any_layout",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "use-started",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "indirect_desc",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "name": "chardev",
+ "description": "ID of a chardev to use as a backend",
+ "type": "str"
+ },
+ {
+ "default-value": 128,
+ "name": "queue-size",
+ "type": "uint16"
+ },
+ {
+ "name": "tag",
+ "type": "str"
+ },
+ {
+ "default-value": 1,
+ "name": "num-request-queues",
+ "type": "uint16"
+ }
+ ],
+ "id": "libvirt-33"
+}
+
{
"execute": "qom-list-properties",
"arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.replies
b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.replies
index 5fb320d9c3..49d6e87cf6 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.replies
@@ -6788,6 +6788,90 @@
"id": "libvirt-33"
}
+{
+ "execute": "device-list-properties",
+ "arguments": {
+ "typename": "vhost-user-fs-device"
+ },
+ "id": "libvirt-33"
+}
+
+{
+ "return": [
+ {
+ "default-value": false,
+ "name": "packed",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "use-disabled-flag",
+ "type": "bool"
+ },
+ {
+ "default-value": false,
+ "name": "iommu_platform",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "event_idx",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": false,
+ "name": "x-disable-legacy-check",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "notify_on_empty",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "any_layout",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "use-started",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "indirect_desc",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "name": "chardev",
+ "description": "ID of a chardev to use as a backend",
+ "type": "str"
+ },
+ {
+ "default-value": 128,
+ "name": "queue-size",
+ "type": "uint16"
+ },
+ {
+ "name": "tag",
+ "type": "str"
+ },
+ {
+ "default-value": 1,
+ "name": "num-request-queues",
+ "type": "uint16"
+ }
+ ],
+ "id": "libvirt-33"
+}
+
{
"execute": "qom-list-properties",
"arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.replies
b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.replies
index f2791e7659..efff3881b6 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.replies
@@ -4767,6 +4767,90 @@
"id": "libvirt-32"
}
+{
+ "execute": "device-list-properties",
+ "arguments": {
+ "typename": "vhost-user-fs-device"
+ },
+ "id": "libvirt-33"
+}
+
+{
+ "return": [
+ {
+ "default-value": false,
+ "name": "packed",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "use-disabled-flag",
+ "type": "bool"
+ },
+ {
+ "default-value": false,
+ "name": "iommu_platform",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "event_idx",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": false,
+ "name": "x-disable-legacy-check",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "notify_on_empty",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "any_layout",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "use-started",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "indirect_desc",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "name": "chardev",
+ "description": "ID of a chardev to use as a backend",
+ "type": "str"
+ },
+ {
+ "default-value": 128,
+ "name": "queue-size",
+ "type": "uint16"
+ },
+ {
+ "name": "tag",
+ "type": "str"
+ },
+ {
+ "default-value": 1,
+ "name": "num-request-queues",
+ "type": "uint16"
+ }
+ ],
+ "id": "libvirt-33"
+}
+
{
"execute": "qom-list-properties",
"arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.replies
index 87e63c99e0..3e9b384409 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.replies
@@ -6276,6 +6276,90 @@
"id": "libvirt-36"
}
+{
+ "execute": "device-list-properties",
+ "arguments": {
+ "typename": "vhost-user-fs-device"
+ },
+ "id": "libvirt-33"
+}
+
+{
+ "return": [
+ {
+ "default-value": false,
+ "name": "packed",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "use-disabled-flag",
+ "type": "bool"
+ },
+ {
+ "default-value": false,
+ "name": "iommu_platform",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "event_idx",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": false,
+ "name": "x-disable-legacy-check",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "notify_on_empty",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "any_layout",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "use-started",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "indirect_desc",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "name": "chardev",
+ "description": "ID of a chardev to use as a backend",
+ "type": "str"
+ },
+ {
+ "default-value": 128,
+ "name": "queue-size",
+ "type": "uint16"
+ },
+ {
+ "name": "tag",
+ "type": "str"
+ },
+ {
+ "default-value": 1,
+ "name": "num-request-queues",
+ "type": "uint16"
+ }
+ ],
+ "id": "libvirt-33"
+}
+
{
"execute": "qom-list-properties",
"arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.replies
index a6480ca994..2b1ef1c4ea 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.replies
@@ -6393,6 +6393,90 @@
"id": "libvirt-36"
}
+{
+ "execute": "device-list-properties",
+ "arguments": {
+ "typename": "vhost-user-fs-device"
+ },
+ "id": "libvirt-33"
+}
+
+{
+ "return": [
+ {
+ "default-value": false,
+ "name": "packed",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "use-disabled-flag",
+ "type": "bool"
+ },
+ {
+ "default-value": false,
+ "name": "iommu_platform",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "event_idx",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": false,
+ "name": "x-disable-legacy-check",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "notify_on_empty",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "any_layout",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "use-started",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "indirect_desc",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "name": "chardev",
+ "description": "ID of a chardev to use as a backend",
+ "type": "str"
+ },
+ {
+ "default-value": 128,
+ "name": "queue-size",
+ "type": "uint16"
+ },
+ {
+ "name": "tag",
+ "type": "str"
+ },
+ {
+ "default-value": 1,
+ "name": "num-request-queues",
+ "type": "uint16"
+ }
+ ],
+ "id": "libvirt-33"
+}
+
{
"execute": "qom-list-properties",
"arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.replies
b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.replies
index f30b1882f4..cfe3074f73 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.replies
@@ -7174,6 +7174,90 @@
"id": "libvirt-32"
}
+{
+ "execute": "device-list-properties",
+ "arguments": {
+ "typename": "vhost-user-fs-device"
+ },
+ "id": "libvirt-33"
+}
+
+{
+ "return": [
+ {
+ "default-value": false,
+ "name": "packed",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "use-disabled-flag",
+ "type": "bool"
+ },
+ {
+ "default-value": false,
+ "name": "iommu_platform",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "event_idx",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": false,
+ "name": "x-disable-legacy-check",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "notify_on_empty",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "any_layout",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "use-started",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "indirect_desc",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "name": "chardev",
+ "description": "ID of a chardev to use as a backend",
+ "type": "str"
+ },
+ {
+ "default-value": 128,
+ "name": "queue-size",
+ "type": "uint16"
+ },
+ {
+ "name": "tag",
+ "type": "str"
+ },
+ {
+ "default-value": 1,
+ "name": "num-request-queues",
+ "type": "uint16"
+ }
+ ],
+ "id": "libvirt-33"
+}
+
{
"execute": "qom-list-properties",
"arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.replies
b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.replies
index ad1ea72190..3d8c7b56a1 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.replies
@@ -6979,6 +6979,90 @@
"id": "libvirt-33"
}
+{
+ "execute": "device-list-properties",
+ "arguments": {
+ "typename": "vhost-user-fs-device"
+ },
+ "id": "libvirt-33"
+}
+
+{
+ "return": [
+ {
+ "default-value": false,
+ "name": "packed",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "use-disabled-flag",
+ "type": "bool"
+ },
+ {
+ "default-value": false,
+ "name": "iommu_platform",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "event_idx",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": false,
+ "name": "x-disable-legacy-check",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "notify_on_empty",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "any_layout",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "use-started",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "indirect_desc",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "name": "chardev",
+ "description": "ID of a chardev to use as a backend",
+ "type": "str"
+ },
+ {
+ "default-value": 128,
+ "name": "queue-size",
+ "type": "uint16"
+ },
+ {
+ "name": "tag",
+ "type": "str"
+ },
+ {
+ "default-value": 1,
+ "name": "num-request-queues",
+ "type": "uint16"
+ }
+ ],
+ "id": "libvirt-33"
+}
+
{
"execute": "qom-list-properties",
"arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.replies
b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.replies
index afa22034d8..dd63ccb45c 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.replies
@@ -4936,6 +4936,90 @@
"id": "libvirt-32"
}
+{
+ "execute": "device-list-properties",
+ "arguments": {
+ "typename": "vhost-user-fs-device"
+ },
+ "id": "libvirt-33"
+}
+
+{
+ "return": [
+ {
+ "default-value": false,
+ "name": "packed",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "use-disabled-flag",
+ "type": "bool"
+ },
+ {
+ "default-value": false,
+ "name": "iommu_platform",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "event_idx",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": false,
+ "name": "x-disable-legacy-check",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "notify_on_empty",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "any_layout",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "use-started",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "indirect_desc",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "name": "chardev",
+ "description": "ID of a chardev to use as a backend",
+ "type": "str"
+ },
+ {
+ "default-value": 128,
+ "name": "queue-size",
+ "type": "uint16"
+ },
+ {
+ "name": "tag",
+ "type": "str"
+ },
+ {
+ "default-value": 1,
+ "name": "num-request-queues",
+ "type": "uint16"
+ }
+ ],
+ "id": "libvirt-33"
+}
+
{
"execute": "qom-list-properties",
"arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.replies
b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.replies
index 7f524ca0f9..93ce46c672 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.replies
@@ -5056,6 +5056,90 @@
}
}
+{
+ "execute": "device-list-properties",
+ "arguments": {
+ "typename": "vhost-user-fs-device"
+ },
+ "id": "libvirt-33"
+}
+
+{
+ "return": [
+ {
+ "default-value": false,
+ "name": "packed",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "use-disabled-flag",
+ "type": "bool"
+ },
+ {
+ "default-value": false,
+ "name": "iommu_platform",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "event_idx",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": false,
+ "name": "x-disable-legacy-check",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "notify_on_empty",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "any_layout",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "use-started",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "indirect_desc",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "name": "chardev",
+ "description": "ID of a chardev to use as a backend",
+ "type": "str"
+ },
+ {
+ "default-value": 128,
+ "name": "queue-size",
+ "type": "uint16"
+ },
+ {
+ "name": "tag",
+ "type": "str"
+ },
+ {
+ "default-value": 1,
+ "name": "num-request-queues",
+ "type": "uint16"
+ }
+ ],
+ "id": "libvirt-33"
+}
+
{
"execute": "qom-list-properties",
"arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.replies
index 6988ae010f..9cd602b3b6 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.replies
@@ -6528,6 +6528,90 @@
"id": "libvirt-36"
}
+{
+ "execute": "device-list-properties",
+ "arguments": {
+ "typename": "vhost-user-fs-device"
+ },
+ "id": "libvirt-33"
+}
+
+{
+ "return": [
+ {
+ "default-value": false,
+ "name": "packed",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "use-disabled-flag",
+ "type": "bool"
+ },
+ {
+ "default-value": false,
+ "name": "iommu_platform",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "event_idx",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": false,
+ "name": "x-disable-legacy-check",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "notify_on_empty",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "any_layout",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "use-started",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "indirect_desc",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "name": "chardev",
+ "description": "ID of a chardev to use as a backend",
+ "type": "str"
+ },
+ {
+ "default-value": 128,
+ "name": "queue-size",
+ "type": "uint16"
+ },
+ {
+ "name": "tag",
+ "type": "str"
+ },
+ {
+ "default-value": 1,
+ "name": "num-request-queues",
+ "type": "uint16"
+ }
+ ],
+ "id": "libvirt-33"
+}
+
{
"execute": "qom-list-properties",
"arguments": {
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.replies
index f2440d7151..943944e138 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.replies
@@ -6587,6 +6587,94 @@
"id": "libvirt-36"
}
+{
+ "execute": "device-list-properties",
+ "arguments": {
+ "typename": "vhost-user-fs-device"
+ },
+ "id": "libvirt-33"
+}
+
+{
+ "return": [
+ {
+ "default-value": false,
+ "name": "packed",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "use-disabled-flag",
+ "type": "bool"
+ },
+ {
+ "default-value": false,
+ "name": "iommu_platform",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "event_idx",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": false,
+ "name": "x-disable-legacy-check",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "notify_on_empty",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "any_layout",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "use-started",
+ "type": "bool"
+ },
+ {
+ "default-value": true,
+ "name": "indirect_desc",
+ "description": "on/off",
+ "type": "bool"
+ },
+ {
+ "name": "chardev",
+ "description": "ID of a chardev to use as a backend",
+ "type": "str"
+ },
+ {
+ "default-value": 128,
+ "name": "queue-size",
+ "type": "uint16"
+ },
+ {
+ "name": "tag",
+ "type": "str"
+ },
+ {
+ "default-value": 1,
+ "name": "num-request-queues",
+ "type": "uint16"
+ },
+ {
+ "name": "bootindex",
+ "type": "int32"
+ }
+ ],
+ "id": "libvirt-33"
+}
+
{
"execute": "qom-list-properties",
"arguments": {
--
2.29.2
9:15 a.m.
New subject: [libvirt PATCH 5/7] fixup: renumber
---
.../caps_4.2.0.aarch64.replies | 56 +++++++++----------
.../caps_4.2.0.s390x.replies | 44 +++++++--------
.../caps_4.2.0.x86_64.replies | 56 +++++++++----------
.../caps_5.0.0.aarch64.replies | 56 +++++++++----------
.../caps_5.0.0.ppc64.replies | 44 +++++++--------
.../caps_5.0.0.riscv64.replies | 36 ++++++------
.../caps_5.0.0.x86_64.replies | 56 +++++++++----------
.../caps_5.1.0.x86_64.replies | 56 +++++++++----------
.../caps_5.2.0.aarch64.replies | 52 ++++++++---------
.../caps_5.2.0.ppc64.replies | 44 +++++++--------
.../caps_5.2.0.riscv64.replies | 36 ++++++------
.../caps_5.2.0.s390x.replies | 44 +++++++--------
.../caps_5.2.0.x86_64.replies | 56 +++++++++----------
.../caps_6.0.0.x86_64.replies | 56 +++++++++----------
14 files changed, 346 insertions(+), 346 deletions(-)
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies
b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies
index 29981e96a0..e488270c0c 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.replies
@@ -6307,7 +6307,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -6378,7 +6378,7 @@
"type": "uint16"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -6386,7 +6386,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-32"
+ "id": "libvirt-33"
}
{
@@ -6451,7 +6451,7 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-33"
}
{
@@ -6459,7 +6459,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-33"
+ "id": "libvirt-34"
}
{
@@ -6523,7 +6523,7 @@
"type": "bool"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-34"
}
{
@@ -6531,7 +6531,7 @@
"arguments": {
"typename": "max-arm-cpu"
},
- "id": "libvirt-34"
+ "id": "libvirt-35"
}
{
@@ -6718,12 +6718,12 @@
"type": "bool"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-35"
}
{
"execute": "query-machines",
- "id": "libvirt-35"
+ "id": "libvirt-36"
}
{
@@ -7281,7 +7281,7 @@
"deprecated": false
}
],
- "id": "libvirt-35"
+ "id": "libvirt-36"
}
{
@@ -7289,7 +7289,7 @@
"arguments": {
"typename": "virt-4.2-machine"
},
- "id": "libvirt-36"
+ "id": "libvirt-37"
}
{
@@ -7442,12 +7442,12 @@
"type": "child<cfi.pflash01>"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-37"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-37"
+ "id": "libvirt-38"
}
{
@@ -7638,34 +7638,34 @@
"static": false
}
],
- "id": "libvirt-37"
+ "id": "libvirt-38"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-38"
+ "id": "libvirt-39"
}
{
"return": [
],
- "id": "libvirt-38"
+ "id": "libvirt-39"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-39"
+ "id": "libvirt-40"
}
{
"return": [
],
- "id": "libvirt-39"
+ "id": "libvirt-40"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-40"
+ "id": "libvirt-41"
}
{
@@ -8833,12 +8833,12 @@
"option": "drive"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-41"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-41"
+ "id": "libvirt-42"
}
{
@@ -8916,12 +8916,12 @@
"capability": "validate-uuid"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-42"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-42"
+ "id": "libvirt-43"
}
{
@@ -21492,12 +21492,12 @@
]
}
],
- "id": "libvirt-42"
+ "id": "libvirt-43"
}
{
"execute": "query-gic-capabilities",
- "id": "libvirt-43"
+ "id": "libvirt-44"
}
{
@@ -21513,7 +21513,7 @@
"kernel": false
}
],
- "id": "libvirt-43"
+ "id": "libvirt-44"
}
{
@@ -21524,7 +21524,7 @@
"name": "host"
}
},
- "id": "libvirt-44"
+ "id": "libvirt-45"
}
{
@@ -21554,7 +21554,7 @@
}
}
},
- "id": "libvirt-44"
+ "id": "libvirt-45"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies
b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies
index 000426f4c2..94d2659f9d 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.replies
@@ -4426,7 +4426,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-33"
+ "id": "libvirt-31"
}
{
@@ -4497,7 +4497,7 @@
"type": "uint16"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-31"
}
{
@@ -4505,7 +4505,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-31"
+ "id": "libvirt-32"
}
{
@@ -4570,7 +4570,7 @@
"type": "bool"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-32"
}
{
@@ -4578,7 +4578,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-32"
+ "id": "libvirt-33"
}
{
@@ -4642,12 +4642,12 @@
"type": "int"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-33"
}
{
"execute": "query-machines",
- "id": "libvirt-33"
+ "id": "libvirt-34"
}
{
@@ -4774,12 +4774,12 @@
"deprecated": false
}
],
- "id": "libvirt-33"
+ "id": "libvirt-34"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-34"
+ "id": "libvirt-35"
}
{
@@ -5386,34 +5386,34 @@
"migration-safe": true
}
],
- "id": "libvirt-34"
+ "id": "libvirt-35"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-35"
+ "id": "libvirt-36"
}
{
"return": [
],
- "id": "libvirt-35"
+ "id": "libvirt-36"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-36"
+ "id": "libvirt-37"
}
{
"return": [
],
- "id": "libvirt-36"
+ "id": "libvirt-37"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-37"
+ "id": "libvirt-38"
}
{
@@ -6560,12 +6560,12 @@
"option": "drive"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-38"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-38"
+ "id": "libvirt-39"
}
{
@@ -6643,12 +6643,12 @@
"capability": "validate-uuid"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-39"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-39"
+ "id": "libvirt-40"
}
{
@@ -19270,7 +19270,7 @@
]
}
],
- "id": "libvirt-39"
+ "id": "libvirt-40"
}
{
@@ -19281,7 +19281,7 @@
"name": "host"
}
},
- "id": "libvirt-40"
+ "id": "libvirt-41"
}
{
@@ -19335,7 +19335,7 @@
}
}
},
- "id": "libvirt-40"
+ "id": "libvirt-41"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.replies
index d4790878e0..550c5f06b5 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.replies
@@ -5793,7 +5793,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-33"
+ "id": "libvirt-37"
}
{
@@ -5864,7 +5864,7 @@
"type": "uint16"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-37"
}
{
@@ -5872,7 +5872,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-37"
+ "id": "libvirt-38"
}
{
@@ -5937,7 +5937,7 @@
"type": "bool"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-38"
}
{
@@ -5945,7 +5945,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-38"
+ "id": "libvirt-39"
}
{
@@ -6009,7 +6009,7 @@
"type": "int"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-39"
}
{
@@ -6017,7 +6017,7 @@
"arguments": {
"typename": "max-x86_64-cpu"
},
- "id": "libvirt-39"
+ "id": "libvirt-40"
}
{
@@ -7571,12 +7571,12 @@
"type": "bool"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-40"
}
{
"execute": "query-machines",
- "id": "libvirt-40"
+ "id": "libvirt-41"
}
{
@@ -7968,12 +7968,12 @@
"deprecated": false
}
],
- "id": "libvirt-40"
+ "id": "libvirt-41"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-41"
+ "id": "libvirt-42"
}
{
@@ -9356,12 +9356,12 @@
"migration-safe": true
}
],
- "id": "libvirt-41"
+ "id": "libvirt-42"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-42"
+ "id": "libvirt-43"
}
{
@@ -9369,12 +9369,12 @@
"tpm-crb",
"tpm-tis"
],
- "id": "libvirt-42"
+ "id": "libvirt-43"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-43"
+ "id": "libvirt-44"
}
{
@@ -9382,12 +9382,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-43"
+ "id": "libvirt-44"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-44"
+ "id": "libvirt-45"
}
{
@@ -10673,12 +10673,12 @@
"option": "drive"
}
],
- "id": "libvirt-44"
+ "id": "libvirt-45"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-45"
+ "id": "libvirt-46"
}
{
@@ -10756,12 +10756,12 @@
"capability": "validate-uuid"
}
],
- "id": "libvirt-45"
+ "id": "libvirt-46"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-46"
+ "id": "libvirt-47"
}
{
@@ -23680,16 +23680,16 @@
]
}
],
- "id": "libvirt-46"
+ "id": "libvirt-47"
}
{
"execute": "query-sev-capabilities",
- "id": "libvirt-47"
+ "id": "libvirt-48"
}
{
- "id": "libvirt-47",
+ "id": "libvirt-48",
"error": {
"class": "GenericError",
"desc": "SEV feature is not available"
@@ -23704,7 +23704,7 @@
"name": "host"
}
},
- "id": "libvirt-48"
+ "id": "libvirt-49"
}
{
@@ -24006,7 +24006,7 @@
}
}
},
- "id": "libvirt-48"
+ "id": "libvirt-49"
}
{
@@ -24020,7 +24020,7 @@
}
}
},
- "id": "libvirt-49"
+ "id": "libvirt-50"
}
{
@@ -24322,7 +24322,7 @@
}
}
},
- "id": "libvirt-49"
+ "id": "libvirt-50"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies
b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies
index e054d20a60..529a95167d 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies
@@ -6796,7 +6796,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -6872,7 +6872,7 @@
"type": "uint16"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-32"
}
{
@@ -6880,7 +6880,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-32"
+ "id": "libvirt-33"
}
{
@@ -6950,7 +6950,7 @@
"type": "bool"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-33"
}
{
@@ -6958,7 +6958,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-33"
+ "id": "libvirt-34"
}
{
@@ -7027,7 +7027,7 @@
"type": "bool"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-34"
}
{
@@ -7035,7 +7035,7 @@
"arguments": {
"typename": "max-arm-cpu"
},
- "id": "libvirt-34"
+ "id": "libvirt-35"
}
{
@@ -7239,12 +7239,12 @@
"type": "bool"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-35"
}
{
"execute": "query-machines",
- "id": "libvirt-35"
+ "id": "libvirt-36"
}
{
@@ -7832,7 +7832,7 @@
"deprecated": false
}
],
- "id": "libvirt-35"
+ "id": "libvirt-36"
}
{
@@ -7840,7 +7840,7 @@
"arguments": {
"typename": "virt-5.0-machine"
},
- "id": "libvirt-36"
+ "id": "libvirt-37"
}
{
@@ -7988,12 +7988,12 @@
"type": "child<cfi.pflash01>"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-37"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-37"
+ "id": "libvirt-38"
}
{
@@ -8189,24 +8189,24 @@
"static": false
}
],
- "id": "libvirt-37"
+ "id": "libvirt-38"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-38"
+ "id": "libvirt-39"
}
{
"return": [
"tpm-tis"
],
- "id": "libvirt-38"
+ "id": "libvirt-39"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-39"
+ "id": "libvirt-40"
}
{
@@ -8214,12 +8214,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-39"
+ "id": "libvirt-40"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-40"
+ "id": "libvirt-41"
}
{
@@ -9377,12 +9377,12 @@
"option": "drive"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-41"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-41"
+ "id": "libvirt-42"
}
{
@@ -9460,12 +9460,12 @@
"capability": "validate-uuid"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-42"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-42"
+ "id": "libvirt-43"
}
{
@@ -22845,12 +22845,12 @@
]
}
],
- "id": "libvirt-42"
+ "id": "libvirt-43"
}
{
"execute": "query-gic-capabilities",
- "id": "libvirt-43"
+ "id": "libvirt-44"
}
{
@@ -22866,7 +22866,7 @@
"kernel": false
}
],
- "id": "libvirt-43"
+ "id": "libvirt-44"
}
{
@@ -22877,7 +22877,7 @@
"name": "host"
}
},
- "id": "libvirt-44"
+ "id": "libvirt-45"
}
{
@@ -22908,7 +22908,7 @@
}
}
},
- "id": "libvirt-44"
+ "id": "libvirt-45"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.replies
b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.replies
index 49d6e87cf6..91bd0e9002 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.replies
@@ -6793,7 +6793,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-33"
+ "id": "libvirt-34"
}
{
@@ -6869,7 +6869,7 @@
"type": "uint16"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-34"
}
{
@@ -6877,7 +6877,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-34"
+ "id": "libvirt-35"
}
{
@@ -6947,7 +6947,7 @@
"type": "bool"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-35"
}
{
@@ -6955,7 +6955,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-35"
+ "id": "libvirt-36"
}
{
@@ -7024,12 +7024,12 @@
"type": "bool"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-36"
}
{
"execute": "query-machines",
- "id": "libvirt-36"
+ "id": "libvirt-37"
}
{
@@ -7299,7 +7299,7 @@
"deprecated": false
}
],
- "id": "libvirt-36"
+ "id": "libvirt-37"
}
{
@@ -7307,7 +7307,7 @@
"arguments": {
"typename": "pseries-5.0-machine"
},
- "id": "libvirt-37"
+ "id": "libvirt-38"
}
{
@@ -7516,12 +7516,12 @@
"type": "string"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-38"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-38"
+ "id": "libvirt-39"
}
{
@@ -9727,24 +9727,24 @@
"static": false
}
],
- "id": "libvirt-38"
+ "id": "libvirt-39"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-39"
+ "id": "libvirt-40"
}
{
"return": [
"tpm-spapr"
],
- "id": "libvirt-39"
+ "id": "libvirt-40"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-40"
+ "id": "libvirt-41"
}
{
@@ -9752,12 +9752,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-40"
+ "id": "libvirt-41"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-41"
+ "id": "libvirt-42"
}
{
@@ -10894,12 +10894,12 @@
"option": "drive"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-42"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-42"
+ "id": "libvirt-43"
}
{
@@ -10977,12 +10977,12 @@
"capability": "validate-uuid"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-43"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-43"
+ "id": "libvirt-44"
}
{
@@ -24303,7 +24303,7 @@
]
}
],
- "id": "libvirt-43"
+ "id": "libvirt-44"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.replies
b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.replies
index efff3881b6..2c21e057bd 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.replies
@@ -4856,7 +4856,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-33"
+ "id": "libvirt-34"
}
{
@@ -4926,7 +4926,7 @@
"type": "bool"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-34"
}
{
@@ -4934,7 +4934,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-34"
+ "id": "libvirt-35"
}
{
@@ -5003,12 +5003,12 @@
"type": "int"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-35"
}
{
"execute": "query-machines",
- "id": "libvirt-35"
+ "id": "libvirt-36"
}
{
@@ -5066,7 +5066,7 @@
"deprecated": false
}
],
- "id": "libvirt-35"
+ "id": "libvirt-36"
}
{
@@ -5074,7 +5074,7 @@
"arguments": {
"typename": "virt-machine"
},
- "id": "libvirt-36"
+ "id": "libvirt-37"
}
{
@@ -5164,34 +5164,34 @@
"type": "string"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-37"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-37"
+ "id": "libvirt-38"
}
{
"return": [
],
- "id": "libvirt-37"
+ "id": "libvirt-38"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-38"
+ "id": "libvirt-39"
}
{
"return": [
],
- "id": "libvirt-38"
+ "id": "libvirt-39"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-39"
+ "id": "libvirt-40"
}
{
@@ -6457,12 +6457,12 @@
"option": "drive"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-40"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-40"
+ "id": "libvirt-41"
}
{
@@ -6540,12 +6540,12 @@
"capability": "validate-uuid"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-41"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-41"
+ "id": "libvirt-42"
}
{
@@ -20084,5 +20084,5 @@
]
}
],
- "id": "libvirt-41"
+ "id": "libvirt-42"
}
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.replies
index 3e9b384409..d5aa3ee2cc 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.replies
@@ -6281,7 +6281,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-33"
+ "id": "libvirt-37"
}
{
@@ -6357,7 +6357,7 @@
"type": "uint16"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-37"
}
{
@@ -6365,7 +6365,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-37"
+ "id": "libvirt-38"
}
{
@@ -6435,7 +6435,7 @@
"type": "bool"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-38"
}
{
@@ -6443,7 +6443,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-38"
+ "id": "libvirt-39"
}
{
@@ -6512,7 +6512,7 @@
"type": "int"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-39"
}
{
@@ -6520,7 +6520,7 @@
"arguments": {
"typename": "max-x86_64-cpu"
},
- "id": "libvirt-39"
+ "id": "libvirt-40"
}
{
@@ -8086,12 +8086,12 @@
"type": "bool"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-40"
}
{
"execute": "query-machines",
- "id": "libvirt-40"
+ "id": "libvirt-41"
}
{
@@ -8467,12 +8467,12 @@
"deprecated": false
}
],
- "id": "libvirt-40"
+ "id": "libvirt-41"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-41"
+ "id": "libvirt-42"
}
{
@@ -10017,12 +10017,12 @@
"migration-safe": true
}
],
- "id": "libvirt-41"
+ "id": "libvirt-42"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-42"
+ "id": "libvirt-43"
}
{
@@ -10030,12 +10030,12 @@
"tpm-crb",
"tpm-tis"
],
- "id": "libvirt-42"
+ "id": "libvirt-43"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-43"
+ "id": "libvirt-44"
}
{
@@ -10043,12 +10043,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-43"
+ "id": "libvirt-44"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-44"
+ "id": "libvirt-45"
}
{
@@ -11324,12 +11324,12 @@
"option": "drive"
}
],
- "id": "libvirt-44"
+ "id": "libvirt-45"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-45"
+ "id": "libvirt-46"
}
{
@@ -11407,12 +11407,12 @@
"capability": "validate-uuid"
}
],
- "id": "libvirt-45"
+ "id": "libvirt-46"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-46"
+ "id": "libvirt-47"
}
{
@@ -25141,16 +25141,16 @@
]
}
],
- "id": "libvirt-46"
+ "id": "libvirt-47"
}
{
"execute": "query-sev-capabilities",
- "id": "libvirt-47"
+ "id": "libvirt-48"
}
{
- "id": "libvirt-47",
+ "id": "libvirt-48",
"error": {
"class": "GenericError",
"desc": "SEV feature is not available"
@@ -25165,7 +25165,7 @@
"name": "host"
}
},
- "id": "libvirt-48"
+ "id": "libvirt-49"
}
{
@@ -25468,7 +25468,7 @@
}
}
},
- "id": "libvirt-48"
+ "id": "libvirt-49"
}
{
@@ -25482,7 +25482,7 @@
}
}
},
- "id": "libvirt-49"
+ "id": "libvirt-50"
}
{
@@ -25785,7 +25785,7 @@
}
}
},
- "id": "libvirt-49"
+ "id": "libvirt-50"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.replies
index 2b1ef1c4ea..2d602e67b1 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.replies
@@ -6398,7 +6398,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-33"
+ "id": "libvirt-37"
}
{
@@ -6474,7 +6474,7 @@
"type": "uint16"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-37"
}
{
@@ -6482,7 +6482,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-37"
+ "id": "libvirt-38"
}
{
@@ -6552,7 +6552,7 @@
"type": "bool"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-38"
}
{
@@ -6560,7 +6560,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-38"
+ "id": "libvirt-39"
}
{
@@ -6629,7 +6629,7 @@
"type": "int"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-39"
}
{
@@ -6637,7 +6637,7 @@
"arguments": {
"typename": "max-x86_64-cpu"
},
- "id": "libvirt-39"
+ "id": "libvirt-40"
}
{
@@ -8223,12 +8223,12 @@
"type": "bool"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-40"
}
{
"execute": "query-machines",
- "id": "libvirt-40"
+ "id": "libvirt-41"
}
{
@@ -8620,12 +8620,12 @@
"deprecated": false
}
],
- "id": "libvirt-40"
+ "id": "libvirt-41"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-41"
+ "id": "libvirt-42"
}
{
@@ -10327,12 +10327,12 @@
"migration-safe": true
}
],
- "id": "libvirt-41"
+ "id": "libvirt-42"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-42"
+ "id": "libvirt-43"
}
{
@@ -10340,12 +10340,12 @@
"tpm-crb",
"tpm-tis"
],
- "id": "libvirt-42"
+ "id": "libvirt-43"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-43"
+ "id": "libvirt-44"
}
{
@@ -10353,12 +10353,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-43"
+ "id": "libvirt-44"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-44"
+ "id": "libvirt-45"
}
{
@@ -11653,12 +11653,12 @@
"option": "drive"
}
],
- "id": "libvirt-44"
+ "id": "libvirt-45"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-45"
+ "id": "libvirt-46"
}
{
@@ -11736,12 +11736,12 @@
"capability": "validate-uuid"
}
],
- "id": "libvirt-45"
+ "id": "libvirt-46"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-46"
+ "id": "libvirt-47"
}
{
@@ -25900,16 +25900,16 @@
]
}
],
- "id": "libvirt-46"
+ "id": "libvirt-47"
}
{
"execute": "query-sev-capabilities",
- "id": "libvirt-47"
+ "id": "libvirt-48"
}
{
- "id": "libvirt-47",
+ "id": "libvirt-48",
"error": {
"class": "GenericError",
"desc": "SEV is not enabled in KVM"
@@ -25924,7 +25924,7 @@
"name": "host"
}
},
- "id": "libvirt-48"
+ "id": "libvirt-49"
}
{
@@ -26232,7 +26232,7 @@
}
}
},
- "id": "libvirt-48"
+ "id": "libvirt-49"
}
{
@@ -26246,7 +26246,7 @@
}
}
},
- "id": "libvirt-49"
+ "id": "libvirt-50"
}
{
@@ -26554,7 +26554,7 @@
}
}
},
- "id": "libvirt-49"
+ "id": "libvirt-50"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.replies
b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.replies
index cfe3074f73..fc057d8e60 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.replies
@@ -7263,7 +7263,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-33"
+ "id": "libvirt-34"
}
{
@@ -7333,7 +7333,7 @@
"type": "bool"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-34"
}
{
@@ -7341,7 +7341,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-34"
+ "id": "libvirt-35"
}
{
@@ -7410,7 +7410,7 @@
"type": "bool"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-35"
}
{
@@ -7418,7 +7418,7 @@
"arguments": {
"typename": "max-arm-cpu"
},
- "id": "libvirt-35"
+ "id": "libvirt-36"
}
{
@@ -7627,12 +7627,12 @@
"type": "bool"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-36"
}
{
"execute": "query-machines",
- "id": "libvirt-36"
+ "id": "libvirt-37"
}
{
@@ -8369,7 +8369,7 @@
"deprecated": false
}
],
- "id": "libvirt-36"
+ "id": "libvirt-37"
}
{
@@ -8377,7 +8377,7 @@
"arguments": {
"typename": "virt-5.2-machine"
},
- "id": "libvirt-37"
+ "id": "libvirt-38"
}
{
@@ -8540,12 +8540,12 @@
"type": "child<cfi.pflash01>"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-38"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-38"
+ "id": "libvirt-39"
}
{
@@ -8779,24 +8779,24 @@
"deprecated": false
}
],
- "id": "libvirt-38"
+ "id": "libvirt-39"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-39"
+ "id": "libvirt-40"
}
{
"return": [
"tpm-tis"
],
- "id": "libvirt-39"
+ "id": "libvirt-40"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-40"
+ "id": "libvirt-41"
}
{
@@ -8804,12 +8804,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-40"
+ "id": "libvirt-41"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-41"
+ "id": "libvirt-42"
}
{
@@ -9986,12 +9986,12 @@
"option": "drive"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-42"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-42"
+ "id": "libvirt-43"
}
{
@@ -10069,12 +10069,12 @@
"capability": "validate-uuid"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-43"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-43"
+ "id": "libvirt-44"
}
{
@@ -24344,12 +24344,12 @@
]
}
],
- "id": "libvirt-43"
+ "id": "libvirt-44"
}
{
"execute": "query-gic-capabilities",
- "id": "libvirt-44"
+ "id": "libvirt-45"
}
{
@@ -24365,7 +24365,7 @@
"kernel": false
}
],
- "id": "libvirt-44"
+ "id": "libvirt-45"
}
{
@@ -24376,7 +24376,7 @@
"name": "host"
}
},
- "id": "libvirt-45"
+ "id": "libvirt-46"
}
{
@@ -24408,7 +24408,7 @@
}
}
},
- "id": "libvirt-45"
+ "id": "libvirt-46"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.replies
b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.replies
index 3d8c7b56a1..38086b9935 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.replies
@@ -6984,7 +6984,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-33"
+ "id": "libvirt-34"
}
{
@@ -7060,7 +7060,7 @@
"type": "uint16"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-34"
}
{
@@ -7068,7 +7068,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-34"
+ "id": "libvirt-35"
}
{
@@ -7138,7 +7138,7 @@
"type": "bool"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-35"
}
{
@@ -7146,7 +7146,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-35"
+ "id": "libvirt-36"
}
{
@@ -7215,12 +7215,12 @@
"type": "bool"
}
],
- "id": "libvirt-35"
+ "id": "libvirt-36"
}
{
"execute": "query-machines",
- "id": "libvirt-36"
+ "id": "libvirt-37"
}
{
@@ -7540,7 +7540,7 @@
"default-ram-id": "mpc8544ds.ram"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-37"
}
{
@@ -7548,7 +7548,7 @@
"arguments": {
"typename": "pseries-5.2-machine"
},
- "id": "libvirt-37"
+ "id": "libvirt-38"
}
{
@@ -7752,12 +7752,12 @@
"type": "string"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-38"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-38"
+ "id": "libvirt-39"
}
{
@@ -10403,24 +10403,24 @@
"deprecated": false
}
],
- "id": "libvirt-38"
+ "id": "libvirt-39"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-39"
+ "id": "libvirt-40"
}
{
"return": [
"tpm-spapr"
],
- "id": "libvirt-39"
+ "id": "libvirt-40"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-40"
+ "id": "libvirt-41"
}
{
@@ -10428,12 +10428,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-40"
+ "id": "libvirt-41"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-41"
+ "id": "libvirt-42"
}
{
@@ -11589,12 +11589,12 @@
"option": "drive"
}
],
- "id": "libvirt-41"
+ "id": "libvirt-42"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-42"
+ "id": "libvirt-43"
}
{
@@ -11672,12 +11672,12 @@
"capability": "validate-uuid"
}
],
- "id": "libvirt-42"
+ "id": "libvirt-43"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-43"
+ "id": "libvirt-44"
}
{
@@ -25888,7 +25888,7 @@
]
}
],
- "id": "libvirt-43"
+ "id": "libvirt-44"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.replies
b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.replies
index dd63ccb45c..4677893a7a 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.replies
@@ -5025,7 +5025,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-33"
+ "id": "libvirt-34"
}
{
@@ -5095,7 +5095,7 @@
"type": "bool"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-34"
}
{
@@ -5103,7 +5103,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-34"
+ "id": "libvirt-35"
}
{
@@ -5172,12 +5172,12 @@
"type": "int"
}
],
- "id": "libvirt-34"
+ "id": "libvirt-35"
}
{
"execute": "query-machines",
- "id": "libvirt-35"
+ "id": "libvirt-36"
}
{
@@ -5231,7 +5231,7 @@
"deprecated": false
}
],
- "id": "libvirt-35"
+ "id": "libvirt-36"
}
{
@@ -5239,7 +5239,7 @@
"arguments": {
"typename": "virt-machine"
},
- "id": "libvirt-36"
+ "id": "libvirt-37"
}
{
@@ -5329,34 +5329,34 @@
"type": "bool"
}
],
- "id": "libvirt-36"
+ "id": "libvirt-37"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-37"
+ "id": "libvirt-38"
}
{
"return": [
],
- "id": "libvirt-37"
+ "id": "libvirt-38"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-38"
+ "id": "libvirt-39"
}
{
"return": [
],
- "id": "libvirt-38"
+ "id": "libvirt-39"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-39"
+ "id": "libvirt-40"
}
{
@@ -6641,12 +6641,12 @@
"option": "drive"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-40"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-40"
+ "id": "libvirt-41"
}
{
@@ -6724,12 +6724,12 @@
"capability": "validate-uuid"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-41"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-41"
+ "id": "libvirt-42"
}
{
@@ -21155,5 +21155,5 @@
]
}
],
- "id": "libvirt-41"
+ "id": "libvirt-42"
}
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.replies
b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.replies
index 93ce46c672..2652ebe6ee 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.replies
@@ -5061,7 +5061,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-33"
+ "id": "libvirt-31"
}
{
@@ -5137,7 +5137,7 @@
"type": "uint16"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-31"
}
{
@@ -5145,7 +5145,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-31"
+ "id": "libvirt-32"
}
{
@@ -5215,7 +5215,7 @@
"type": "bool"
}
],
- "id": "libvirt-31"
+ "id": "libvirt-32"
}
{
@@ -5223,7 +5223,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-32"
+ "id": "libvirt-33"
}
{
@@ -5292,12 +5292,12 @@
"type": "int"
}
],
- "id": "libvirt-32"
+ "id": "libvirt-33"
}
{
"execute": "query-machines",
- "id": "libvirt-33"
+ "id": "libvirt-34"
}
{
@@ -5466,12 +5466,12 @@
"default-ram-id": "s390.ram"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-34"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-34"
+ "id": "libvirt-35"
}
{
@@ -6152,34 +6152,34 @@
"deprecated": false
}
],
- "id": "libvirt-34"
+ "id": "libvirt-35"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-35"
+ "id": "libvirt-36"
}
{
"return": [
],
- "id": "libvirt-35"
+ "id": "libvirt-36"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-36"
+ "id": "libvirt-37"
}
{
"return": [
],
- "id": "libvirt-36"
+ "id": "libvirt-37"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-37"
+ "id": "libvirt-38"
}
{
@@ -7335,12 +7335,12 @@
"option": "drive"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-38"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-38"
+ "id": "libvirt-39"
}
{
@@ -7418,12 +7418,12 @@
"capability": "validate-uuid"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-39"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-39"
+ "id": "libvirt-40"
}
{
@@ -21745,7 +21745,7 @@
]
}
],
- "id": "libvirt-39"
+ "id": "libvirt-40"
}
{
@@ -21756,7 +21756,7 @@
"name": "host"
}
},
- "id": "libvirt-40"
+ "id": "libvirt-41"
}
{
@@ -21812,7 +21812,7 @@
}
}
},
- "id": "libvirt-40"
+ "id": "libvirt-41"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.replies
index 9cd602b3b6..13e967306d 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.replies
@@ -6533,7 +6533,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-33"
+ "id": "libvirt-37"
}
{
@@ -6609,7 +6609,7 @@
"type": "uint16"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-37"
}
{
@@ -6617,7 +6617,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-37"
+ "id": "libvirt-38"
}
{
@@ -6687,7 +6687,7 @@
"type": "bool"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-38"
}
{
@@ -6695,7 +6695,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-38"
+ "id": "libvirt-39"
}
{
@@ -6764,7 +6764,7 @@
"type": "int"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-39"
}
{
@@ -6772,7 +6772,7 @@
"arguments": {
"typename": "max-x86_64-cpu"
},
- "id": "libvirt-39"
+ "id": "libvirt-40"
}
{
@@ -8370,12 +8370,12 @@
"type": "bool"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-40"
}
{
"execute": "query-machines",
- "id": "libvirt-40"
+ "id": "libvirt-41"
}
{
@@ -8833,12 +8833,12 @@
"default-ram-id": "pc.ram"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-41"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-41"
+ "id": "libvirt-42"
}
{
@@ -10663,12 +10663,12 @@
"deprecated": false
}
],
- "id": "libvirt-41"
+ "id": "libvirt-42"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-42"
+ "id": "libvirt-43"
}
{
@@ -10676,12 +10676,12 @@
"tpm-crb",
"tpm-tis"
],
- "id": "libvirt-42"
+ "id": "libvirt-43"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-43"
+ "id": "libvirt-44"
}
{
@@ -10689,12 +10689,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-43"
+ "id": "libvirt-44"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-44"
+ "id": "libvirt-45"
}
{
@@ -11989,12 +11989,12 @@
"option": "drive"
}
],
- "id": "libvirt-44"
+ "id": "libvirt-45"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-45"
+ "id": "libvirt-46"
}
{
@@ -12072,12 +12072,12 @@
"capability": "validate-uuid"
}
],
- "id": "libvirt-45"
+ "id": "libvirt-46"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-46"
+ "id": "libvirt-47"
}
{
@@ -26696,16 +26696,16 @@
]
}
],
- "id": "libvirt-46"
+ "id": "libvirt-47"
}
{
"execute": "query-sev-capabilities",
- "id": "libvirt-47"
+ "id": "libvirt-48"
}
{
- "id": "libvirt-47",
+ "id": "libvirt-48",
"error": {
"class": "GenericError",
"desc": "SEV is not enabled in KVM"
@@ -26720,7 +26720,7 @@
"name": "host"
}
},
- "id": "libvirt-48"
+ "id": "libvirt-49"
}
{
@@ -27029,7 +27029,7 @@
}
}
},
- "id": "libvirt-48"
+ "id": "libvirt-49"
}
{
@@ -27043,7 +27043,7 @@
}
}
},
- "id": "libvirt-49"
+ "id": "libvirt-50"
}
{
@@ -27352,7 +27352,7 @@
}
}
},
- "id": "libvirt-49"
+ "id": "libvirt-50"
}
{
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.replies
b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.replies
index 943944e138..21242b7247 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.replies
@@ -6592,7 +6592,7 @@
"arguments": {
"typename": "vhost-user-fs-device"
},
- "id": "libvirt-33"
+ "id": "libvirt-37"
}
{
@@ -6672,7 +6672,7 @@
"type": "int32"
}
],
- "id": "libvirt-33"
+ "id": "libvirt-37"
}
{
@@ -6680,7 +6680,7 @@
"arguments": {
"typename": "memory-backend-file"
},
- "id": "libvirt-37"
+ "id": "libvirt-38"
}
{
@@ -6750,7 +6750,7 @@
"type": "bool"
}
],
- "id": "libvirt-37"
+ "id": "libvirt-38"
}
{
@@ -6758,7 +6758,7 @@
"arguments": {
"typename": "memory-backend-memfd"
},
- "id": "libvirt-38"
+ "id": "libvirt-39"
}
{
@@ -6827,7 +6827,7 @@
"type": "int"
}
],
- "id": "libvirt-38"
+ "id": "libvirt-39"
}
{
@@ -6835,7 +6835,7 @@
"arguments": {
"typename": "max-x86_64-cpu"
},
- "id": "libvirt-39"
+ "id": "libvirt-40"
}
{
@@ -8445,12 +8445,12 @@
"type": "bool"
}
],
- "id": "libvirt-39"
+ "id": "libvirt-40"
}
{
"execute": "query-machines",
- "id": "libvirt-40"
+ "id": "libvirt-41"
}
{
@@ -8926,12 +8926,12 @@
"default-ram-id": "pc.ram"
}
],
- "id": "libvirt-40"
+ "id": "libvirt-41"
}
{
"execute": "query-cpu-definitions",
- "id": "libvirt-41"
+ "id": "libvirt-42"
}
{
@@ -10756,12 +10756,12 @@
"deprecated": false
}
],
- "id": "libvirt-41"
+ "id": "libvirt-42"
}
{
"execute": "query-tpm-models",
- "id": "libvirt-42"
+ "id": "libvirt-43"
}
{
@@ -10769,12 +10769,12 @@
"tpm-crb",
"tpm-tis"
],
- "id": "libvirt-42"
+ "id": "libvirt-43"
}
{
"execute": "query-tpm-types",
- "id": "libvirt-43"
+ "id": "libvirt-44"
}
{
@@ -10782,12 +10782,12 @@
"passthrough",
"emulator"
],
- "id": "libvirt-43"
+ "id": "libvirt-44"
}
{
"execute": "query-command-line-options",
- "id": "libvirt-44"
+ "id": "libvirt-45"
}
{
@@ -12098,12 +12098,12 @@
"option": "drive"
}
],
- "id": "libvirt-44"
+ "id": "libvirt-45"
}
{
"execute": "query-migrate-capabilities",
- "id": "libvirt-45"
+ "id": "libvirt-46"
}
{
@@ -12181,12 +12181,12 @@
"capability": "validate-uuid"
}
],
- "id": "libvirt-45"
+ "id": "libvirt-46"
}
{
"execute": "query-qmp-schema",
- "id": "libvirt-46"
+ "id": "libvirt-47"
}
{
@@ -26977,16 +26977,16 @@
]
}
],
- "id": "libvirt-46"
+ "id": "libvirt-47"
}
{
"execute": "query-sev-capabilities",
- "id": "libvirt-47"
+ "id": "libvirt-48"
}
{
- "id": "libvirt-47",
+ "id": "libvirt-48",
"error": {
"class": "GenericError",
"desc": "SEV is not enabled in KVM"
@@ -27001,7 +27001,7 @@
"name": "host"
}
},
- "id": "libvirt-48"
+ "id": "libvirt-49"
}
{
@@ -27313,7 +27313,7 @@
}
}
},
- "id": "libvirt-48"
+ "id": "libvirt-49"
}
{
@@ -27327,7 +27327,7 @@
}
}
},
- "id": "libvirt-49"
+ "id": "libvirt-50"
}
{
@@ -27639,7 +27639,7 @@
}
}
},
- "id": "libvirt-49"
+ "id": "libvirt-50"
}
{
--
2.29.2
9:15 a.m.
New subject: [libvirt PATCH 6/7] Add validation for virtiofs boot order setting
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/conf/domain_validate.c | 17 ++++++++++++++++-
src/qemu/qemu_validate.c | 6 ++++++
2 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c
index 649fc335ac..404eee09a9 100644
--- a/src/conf/domain_validate.c
+++ b/src/conf/domain_validate.c
@@ -1528,6 +1528,19 @@ virDomainShmemDefValidate(const virDomainShmemDef *shmem)
return 0;
}
+static int
+virDomainFSDefValidate(const virDomainFSDef *fs)
+{
+ if (fs->info.bootIndex &&
+ fs->fsdriver != VIR_DOMAIN_FS_DRIVER_TYPE_VIRTIOFS) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+ _("boot order is only supported for virtiofs"));
+ return -1;
+ }
+
+ return 0;
+}
+
static int
virDomainDeviceDefValidateInternal(const virDomainDeviceDef *dev,
@@ -1573,10 +1586,12 @@ virDomainDeviceDefValidateInternal(const virDomainDeviceDef *dev,
case VIR_DOMAIN_DEVICE_SHMEM:
return virDomainShmemDefValidate(dev->data.shmem);
+ case VIR_DOMAIN_DEVICE_FS:
+ return virDomainFSDefValidate(dev->data.fs);
+
case VIR_DOMAIN_DEVICE_AUDIO:
/* TODO: validate? */
case VIR_DOMAIN_DEVICE_LEASE:
- case VIR_DOMAIN_DEVICE_FS:
case VIR_DOMAIN_DEVICE_SOUND:
case VIR_DOMAIN_DEVICE_WATCHDOG:
case VIR_DOMAIN_DEVICE_GRAPHICS:
diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
index a060bd98ba..92319ab3a5 100644
--- a/src/qemu/qemu_validate.c
+++ b/src/qemu/qemu_validate.c
@@ -4093,6 +4093,12 @@ qemuValidateDomainDeviceDefFS(virDomainFSDefPtr fs,
}
if (qemuValidateDomainDefVirtioFSSharedMemory(def, qemuCaps) < 0)
return -1;
+ if (fs->info.bootIndex &&
+ !virQEMUCapsGet(qemuCaps, QEMU_CAPS_VHOST_USER_FS_BOOTINDEX)) {
+ virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+ _("setting virtiofs boot order is not supported with this
QEMU binary"));
+ return -1;
+ }
break;
case VIR_DOMAIN_FS_DRIVER_TYPE_LAST:
--
2.29.2
9:15 a.m.
New subject: [libvirt PATCH 7/7] qemu: format bootindex for vhost-user-fs
Wire up the QEMU command line for this option.
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
src/qemu/qemu_command.c | 3 +++
.../vhost-user-fs-hugepages.x86_64-latest.args | 3 ++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 1ec302d4ac..ac19902025 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -2194,6 +2194,9 @@ qemuBuildVHostUserFsCommandLine(virCommandPtr cmd,
virQEMUBuildBufferEscapeComma(&opt, fs->dst);
qemuBuildVirtioOptionsStr(&opt, fs->virtio);
+ if (fs->info.bootIndex)
+ virBufferAsprintf(&opt, ",bootindex=%u", fs->info.bootIndex);
+
if (qemuBuildDeviceAddressStr(&opt, def, &fs->info, priv->qemuCaps)
< 0)
return -1;
diff --git a/tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.args
b/tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.args
index e4f5db7a63..24cafed400 100644
--- a/tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.args
@@ -42,7 +42,8 @@ addr=0x1 \
-device virtio-blk-pci,bus=pci.4,addr=0x0,drive=libvirt-1-format,\
id=virtio-disk0,bootindex=1 \
-chardev socket,id=chr-vu-fs0,path=/tmp/lib/domain--1-guest/fs0.vhost-fs.sock \
--device vhost-user-fs-pci,chardev=chr-vu-fs0,tag=mount_tag,bus=pci.1,addr=0x0 \
+-device vhost-user-fs-pci,chardev=chr-vu-fs0,tag=mount_tag,bootindex=2,\
+bus=pci.1,addr=0x0 \
-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
resourcecontrol=deny \
-msg timestamp=on
--
2.29.2
11:30 a.m.
On 01/28/21 16:15, Ján Tomko wrote:
Sadly, the replies changes for older QEMUs are synthetic.
Separated for easier review.
Also available on gitlab:
git fetch https://gitlab.com/janotomko/libvirt/ virtiofs-bootindex
https://gitlab.com/janotomko/libvirt/-/tree/virtiofs-bootindex
And a broken pipeline:
https://gitlab.com/janotomko/libvirt/-/pipelines/248162273
Ján Tomko (7):
tests: switch vhost-user-fs-hugepages to use boot order
conf: add boot order to filesystem
qemu: add QEMU_CAPS_VHOST_USER_FS_BOOTINDEX
fixup: vhost-user-fs-device properties
fixup: renumber
Add validation for virtiofs boot order setting
qemu: format bootindex for vhost-user-fs
docs/schemas/domaincommon.rng | 3 +
src/conf/domain_conf.c | 5 +-
src/conf/domain_validate.c | 17 ++-
src/qemu/qemu_capabilities.c | 8 +
src/qemu/qemu_capabilities.h | 1 +
src/qemu/qemu_command.c | 3 +
src/qemu/qemu_validate.c | 6 +
.../caps_4.2.0.aarch64.replies | 131 ++++++++++++----
.../caps_4.2.0.s390x.replies | 119 ++++++++++++---
.../caps_4.2.0.x86_64.replies | 131 ++++++++++++----
.../caps_5.0.0.aarch64.replies | 136 +++++++++++++----
.../caps_5.0.0.ppc64.replies | 124 +++++++++++++---
.../caps_5.0.0.riscv64.replies | 120 ++++++++++++---
.../caps_5.0.0.x86_64.replies | 136 +++++++++++++----
.../caps_5.1.0.x86_64.replies | 136 +++++++++++++----
.../caps_5.2.0.aarch64.replies | 136 +++++++++++++----
.../caps_5.2.0.ppc64.replies | 124 +++++++++++++---
.../caps_5.2.0.riscv64.replies | 120 ++++++++++++---
.../caps_5.2.0.s390x.replies | 124 +++++++++++++---
.../caps_5.2.0.x86_64.replies | 136 +++++++++++++----
.../caps_6.0.0.x86_64.replies | 140 ++++++++++++++----
.../caps_6.0.0.x86_64.xml | 1 +
...vhost-user-fs-hugepages.x86_64-latest.args | 3 +-
.../vhost-user-fs-hugepages.xml | 3 +-
24 files changed, 1534 insertions(+), 329 deletions(-)
I've applied this series locally on top of e59bb226b7d9 ("docs: link to
PCI docs from the kbase page", 2021-01-28), and tested it as follows:
- Added <boot order='N'/> to the virtio-fs element I already had; virsh
edit completed fine
- Booted the OVMF guest once with N=1 and then separately with N=3,
while the SCSI system disk of the guest had <boot order='2'/> in both
cases. Checked the firmware log to verify the behavior -- it was OK in
both cases.
So please add the following to whichever patch it applies to:
Tested-by: Laszlo Ersek <lersek(a)redhat.com>
(I didn't explicitly run any test suite, nor did I attempt to verify
behavior with an older QEMU, so I figure my T-b does not apply to every
patch in the series.)
Thank you Jano for implementing this feature.
--*--
Some general notes/questions on testing:
I used the documentation at <https://libvirt.org/compiling.html#building>;.
- I think the example pathname "/home/to/your/checkout/src/libvirtd"
should include the "build" directory name now, after the meson conversion.
- I had to stop / start "virtlogd" separately, too; noting that in the
docs could help.
- I had to set SELinux to Permissive temporarily, otherwise QEMU
wouldn't start. A note on SELinux could be helpful.
- I manually "power cycled" the virtual networks on my laptop as well,
because the dnsmasq command lines refer to the "lease helper" binaries,
and the latter are also specific to the libvirtd build. I'm not sure
this was really necessary, but better safe than sorry?...
- After completing the tests, I shut down the one-off virtlogd and
libvirtd processes (Ctrl-C), and started the system-wide binaries again,
with systemctl. Systemctl reports both of those as "running OK" now;
however, when I try to net-start the virtual networks again, with
"virsh", I get the following error:
error: failed to connect to the hypervisor
error: Failed to connect socket to '/var/run/libvirt/libvirt-sock': No
such file or directory
I don't know what that's about. I guess I'll just reboot my laptop now :)
Thanks!
Laszlo
7:31 a.m.
On a Thursday in 2021, Laszlo Ersek wrote:
On 01/28/21 16:15, Ján Tomko wrote:
> Sadly, the replies changes for older QEMUs are synthetic.
> Separated for easier review.
>
> Also available on gitlab:
> git fetch https://gitlab.com/janotomko/libvirt/ virtiofs-bootindex
> https://gitlab.com/janotomko/libvirt/-/tree/virtiofs-bootindex
>
> And a broken pipeline:
> https://gitlab.com/janotomko/libvirt/-/pipelines/248162273
>
> Ján Tomko (7):
> tests: switch vhost-user-fs-hugepages to use boot order
> conf: add boot order to filesystem
> qemu: add QEMU_CAPS_VHOST_USER_FS_BOOTINDEX
> fixup: vhost-user-fs-device properties
> fixup: renumber
> Add validation for virtiofs boot order setting
> qemu: format bootindex for vhost-user-fs
>
> docs/schemas/domaincommon.rng | 3 +
> src/conf/domain_conf.c | 5 +-
> src/conf/domain_validate.c | 17 ++-
> src/qemu/qemu_capabilities.c | 8 +
> src/qemu/qemu_capabilities.h | 1 +
> src/qemu/qemu_command.c | 3 +
> src/qemu/qemu_validate.c | 6 +
> .../caps_4.2.0.aarch64.replies | 131 ++++++++++++----
> .../caps_4.2.0.s390x.replies | 119 ++++++++++++---
> .../caps_4.2.0.x86_64.replies | 131 ++++++++++++----
> .../caps_5.0.0.aarch64.replies | 136 +++++++++++++----
> .../caps_5.0.0.ppc64.replies | 124 +++++++++++++---
> .../caps_5.0.0.riscv64.replies | 120 ++++++++++++---
> .../caps_5.0.0.x86_64.replies | 136 +++++++++++++----
> .../caps_5.1.0.x86_64.replies | 136 +++++++++++++----
> .../caps_5.2.0.aarch64.replies | 136 +++++++++++++----
> .../caps_5.2.0.ppc64.replies | 124 +++++++++++++---
> .../caps_5.2.0.riscv64.replies | 120 ++++++++++++---
> .../caps_5.2.0.s390x.replies | 124 +++++++++++++---
> .../caps_5.2.0.x86_64.replies | 136 +++++++++++++----
> .../caps_6.0.0.x86_64.replies | 140 ++++++++++++++----
> .../caps_6.0.0.x86_64.xml | 1 +
> ...vhost-user-fs-hugepages.x86_64-latest.args | 3 +-
> .../vhost-user-fs-hugepages.xml | 3 +-
> 24 files changed, 1534 insertions(+), 329 deletions(-)
>
I've applied this series locally on top of e59bb226b7d9 ("docs: link to
PCI docs from the kbase page", 2021-01-28), and tested it as follows:
- Added <boot order='N'/> to the virtio-fs element I already had; virsh
edit completed fine
- Booted the OVMF guest once with N=1 and then separately with N=3,
while the SCSI system disk of the guest had <boot order='2'/> in both
cases. Checked the firmware log to verify the behavior -- it was OK in
both cases.
So please add the following to whichever patch it applies to:
Tested-by: Laszlo Ersek <lersek(a)redhat.com>
Thanks,
(I didn't explicitly run any test suite, nor did I attempt to
verify
behavior with an older QEMU, so I figure my T-b does not apply to every
patch in the series.)
Thank you Jano for implementing this feature.
I would have done it sooner but I had trouble locating my script for
tuning the caps replies :(
--*--
Some general notes/questions on testing:
I used the documentation at <https://libvirt.org/compiling.html#building>;.
- I think the example pathname "/home/to/your/checkout/src/libvirtd"
should include the "build" directory name now, after the meson conversion.
That's a straightforward change, patch sent.
- I had to stop / start "virtlogd" separately, too; noting
that in the
docs could help.
I think virtlogd from the system would work too, but libvirtd in the
builddir probably does not have the right SELinux label.
make rpm
was the easiest way for me to test stuff that required SELinux changes.
I'm not sure what is the easiest equivalent after the Meson conversion.
Alternatively, copying context from the system binaries works,
but I'm not sure whether that's something we want to include in our
scripts/ repo.
- I had to set SELinux to Permissive temporarily, otherwise QEMU
wouldn't start. A note on SELinux could be helpful.
- I manually "power cycled" the virtual networks on my laptop as well,
because the dnsmasq command lines refer to the "lease helper" binaries,
and the latter are also specific to the libvirtd build. I'm not sure
this was really necessary, but better safe than sorry?...
- After completing the tests, I shut down the one-off virtlogd and
libvirtd processes (Ctrl-C), and started the system-wide binaries again,
with systemctl. Systemctl reports both of those as "running OK" now;
however, when I try to net-start the virtual networks again, with
"virsh", I get the following error:
error: failed to connect to the hypervisor
error: Failed to connect socket to '/var/run/libvirt/libvirt-sock': No
such file or directory
I don't know what that's about. I guess I'll just reboot my laptop now :)
I suspect it has something to do with socket activation.
Jano
Thanks!
Laszlo
1:18 p.m.
On 1/28/21 4:15 PM, Ján Tomko wrote:
Sadly, the replies changes for older QEMUs are synthetic.
Separated for easier review.
Also available on gitlab:
git fetch https://gitlab.com/janotomko/libvirt/ virtiofs-bootindex
https://gitlab.com/janotomko/libvirt/-/tree/virtiofs-bootindex
And a broken pipeline:
https://gitlab.com/janotomko/libvirt/-/pipelines/248162273
Ján Tomko (7):
tests: switch vhost-user-fs-hugepages to use boot order
conf: add boot order to filesystem
qemu: add QEMU_CAPS_VHOST_USER_FS_BOOTINDEX
fixup: vhost-user-fs-device properties
fixup: renumber
Add validation for virtiofs boot order setting
qemu: format bootindex for vhost-user-fs
docs/schemas/domaincommon.rng | 3 +
src/conf/domain_conf.c | 5 +-
src/conf/domain_validate.c | 17 ++-
src/qemu/qemu_capabilities.c | 8 +
src/qemu/qemu_capabilities.h | 1 +
src/qemu/qemu_command.c | 3 +
src/qemu/qemu_validate.c | 6 +
.../caps_4.2.0.aarch64.replies | 131 ++++++++++++----
.../caps_4.2.0.s390x.replies | 119 ++++++++++++---
.../caps_4.2.0.x86_64.replies | 131 ++++++++++++----
.../caps_5.0.0.aarch64.replies | 136 +++++++++++++----
.../caps_5.0.0.ppc64.replies | 124 +++++++++++++---
.../caps_5.0.0.riscv64.replies | 120 ++++++++++++---
.../caps_5.0.0.x86_64.replies | 136 +++++++++++++----
.../caps_5.1.0.x86_64.replies | 136 +++++++++++++----
.../caps_5.2.0.aarch64.replies | 136 +++++++++++++----
.../caps_5.2.0.ppc64.replies | 124 +++++++++++++---
.../caps_5.2.0.riscv64.replies | 120 ++++++++++++---
.../caps_5.2.0.s390x.replies | 124 +++++++++++++---
.../caps_5.2.0.x86_64.replies | 136 +++++++++++++----
.../caps_6.0.0.x86_64.replies | 140 ++++++++++++++----
.../caps_6.0.0.x86_64.xml | 1 +
...vhost-user-fs-hugepages.x86_64-latest.args | 3 +-
.../vhost-user-fs-hugepages.xml | 3 +-
24 files changed, 1534 insertions(+), 329 deletions(-)
Hopefully, you'll squash 4/7 and 5/7 into 3/7 so that we're able to
compile && test after each commit.
Also, news entry would be nice (it's fine a follow up patch).
Reviewed-by: Michal Privoznik <mprivozn(a)redhat.com>
Michal
1392
days inactive
1393
days old
10 comments
3 participants
participants (3)
-
Ján Tomko -
Laszlo Ersek -
Michal Privoznik