[PATCH 00/48] Retire more capabilities
Chop chop. More capabilities can be retired. https://gitlab.com/MichalPrivoznik/libvirt/-/pipelines/688345136 Michal Prívozník (48): qemu: Drop misleading comment for qemuDomainQueryWakeupSuspendSupport() qemu: Acquire QUERY job in qemuDomainQueryWakeupSuspendSupport() tests: Make qemuAgent single sync qemu: Assume QEMU_CAPS_NUMA qemu_capabilities: Stop detecting QEMU_CAPS_NUMA qemu: Retire QEMU_CAPS_NUMA qemu: Assume QEMU_CAPS_VSERPORT_CHANGE qemu_agent: Drop @singleSync from _qemuAgent qemu_capabilities: Stop detecting QEMU_CAPS_VSERPORT_CHANGE qemu: Retire QEMU_CAPS_VSERPORT_CHANGE qemu: Assume QEMU_CAPS_DUMP_COMPLETED qemu_capabilities: Stop detecting QEMU_CAPS_DUMP_COMPLETED qemu: Retire QEMU_CAPS_DUMP_COMPLETED qemu: Assume QEMU_CAPS_QOM_LIST_PROPERTIES qemu_capabilities: Stop detecting QEMU_CAPS_QOM_LIST_PROPERTIES qemu: Retire QEMU_CAPS_QOM_LIST_PROPERTIES qemu: Assume QEMU_CAPS_QUERY_CURRENT_MACHINE qemu_capabilities: Stop detecting QEMU_CAPS_QUERY_CURRENT_MACHINE qemu: Retire QEMU_CAPS_QUERY_CURRENT_MACHINE qemu_capabilities: Stop detecting QEMU_CAPS_BITMAP_MERGE qemu: Retire QEMU_CAPS_BITMAP_MERGE qemu: Assume QEMU_CAPS_QUERY_DISPLAY_OPTIONS qemu_capabilities: Stop detecting QEMU_CAPS_QUERY_DISPLAY_OPTIONS qemu: Retire QEMU_CAPS_QUERY_DISPLAY_OPTIONS qemu: Assume QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SIZE qemu_capabilities: Stop detecting QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SIZE qemu: Retire QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SIZE qemu: Assume QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE qemu_capabilities: Stop detecting QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE qemu: Retire QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE qemu: Assume QEMU_CAPS_VIRTIO_NET_HOST_MTU qemu_capabilities: Stop detecting QEMU_CAPS_VIRTIO_NET_HOST_MTU qemu: Retire QEMU_CAPS_VIRTIO_NET_HOST_MTU qemu: Assume QEMU_CAPS_VIRTIO_NET_FAILOVER qemu_capabilities: Stop detecting QEMU_CAPS_VIRTIO_NET_FAILOVER qemu: Retire QEMU_CAPS_VIRTIO_NET_FAILOVER qemu: Assume QEMU_CAPS_BLOCKIO qemu_capabilities: Stop detecting QEMU_CAPS_BLOCKIO qemu: Retire QEMU_CAPS_BLOCKIO qemu: Assume QEMU_CAPS_VIRTIO_BLK_NUM_QUEUES qemu_capabilities: Stop detecting QEMU_CAPS_VIRTIO_BLK_QUEUE_SIZE qemu: Retire QEMU_CAPS_VIRTIO_BLK_NUM_QUEUES qemu: Assume QEMU_CAPS_DISK_SHARE_RW qemu_capabilities: Stop detecting QEMU_CAPS_DISK_SHARE_RW qemu: Retire QEMU_CAPS_DISK_SHARE_RW qemu: Assume QEMU_CAPS_DISK_WRITE_CACHE qemu_capabilities: Stop detecting QEMU_CAPS_DISK_WRITE_CACHE qemu: Retire QEMU_CAPS_DISK_WRITE_CACHE src/qemu/qemu_agent.c | 7 +- src/qemu/qemu_agent.h | 3 +- src/qemu/qemu_capabilities.c | 76 ++++--------------- src/qemu/qemu_capabilities.h | 30 ++++---- src/qemu/qemu_command.c | 15 +--- src/qemu/qemu_domain.c | 10 +-- src/qemu/qemu_driver.c | 40 +++------- src/qemu/qemu_process.c | 6 +- src/qemu/qemu_validate.c | 54 ------------- tests/qemuagenttest.c | 50 +----------- .../caps_4.2.0.aarch64.xml | 15 ---- .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 14 ---- .../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 15 ---- .../caps_4.2.0.x86_64.xml | 15 ---- .../caps_5.0.0.aarch64.xml | 15 ---- .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 15 ---- .../caps_5.0.0.riscv64.xml | 15 ---- .../caps_5.0.0.x86_64.xml | 15 ---- .../qemucapabilitiesdata/caps_5.1.0.sparc.xml | 9 --- .../caps_5.1.0.x86_64.xml | 15 ---- .../caps_5.2.0.aarch64.xml | 15 ---- .../qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 15 ---- .../caps_5.2.0.riscv64.xml | 15 ---- .../qemucapabilitiesdata/caps_5.2.0.s390x.xml | 15 ---- .../caps_5.2.0.x86_64.xml | 15 ---- .../caps_6.0.0.aarch64.xml | 15 ---- .../qemucapabilitiesdata/caps_6.0.0.s390x.xml | 15 ---- .../caps_6.0.0.x86_64.xml | 15 ---- .../caps_6.1.0.x86_64.xml | 15 ---- .../caps_6.2.0.aarch64.xml | 15 ---- .../qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 15 ---- .../caps_6.2.0.x86_64.xml | 15 ---- .../caps_7.0.0.aarch64.xml | 15 ---- .../qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 15 ---- .../caps_7.0.0.x86_64.xml | 15 ---- .../qemucapabilitiesdata/caps_7.1.0.ppc64.xml | 15 ---- .../caps_7.1.0.x86_64.xml | 15 ---- .../caps_7.2.0.x86_64.xml | 15 ---- tests/qemumonitortestutils.c | 3 +- tests/qemuxml2argvdata/controller-order.args | 2 +- tests/qemuxml2argvdata/cpu-numa-disjoint.err | 1 - .../fd-memory-numa-topology2.args | 2 +- .../fd-memory-numa-topology2.xml | 2 +- .../fd-memory-numa-topology3.args | 2 +- .../fd-memory-numa-topology3.xml | 2 +- tests/qemuxml2argvdata/net-virtio-teaming.err | 1 - tests/qemuxml2argvdata/numatune-memnode.err | 1 - .../video-device-pciaddr-default.args | 2 +- .../video-qxl-device-vgamem.args | 2 +- tests/qemuxml2argvdata/video-qxl-device.args | 2 +- .../video-qxl-sec-device-vgamem.args | 2 +- .../video-qxl-sec-device.args | 2 +- .../video-vga-device-vgamem.args | 2 +- tests/qemuxml2argvdata/video-vga-device.args | 2 +- .../video-virtio-gpu-device.args | 2 +- .../video-virtio-gpu-sdl-gl.args | 2 +- .../video-virtio-gpu-spice-gl.args | 2 +- .../video-virtio-gpu-virgl.args | 2 +- tests/qemuxml2argvdata/video-virtio-vga.args | 2 +- tests/qemuxml2argvtest.c | 31 +++----- tests/qemuxml2xmltest.c | 21 ++--- 61 files changed, 90 insertions(+), 706 deletions(-) delete mode 100644 tests/qemuxml2argvdata/cpu-numa-disjoint.err delete mode 100644 tests/qemuxml2argvdata/net-virtio-teaming.err delete mode 100644 tests/qemuxml2argvdata/numatune-memnode.err -- 2.37.4
The was an attempt to document the retvals for qemuDomainQueryWakeupSuspendSupport(). However, it's misleading because in reality, the function can return nothing but 0 or -1, but the comment implies retval of 1 too. Since the set of possible return values complies with our unwritten rule (0 for success, -1 for error), there's no real value in having the comment and as such can be dropped. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_driver.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 59a3b37b98..7c8fc8949c 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16313,7 +16313,6 @@ qemuDomainProbeQMPCurrentMachine(virDomainObj *vm, } -/* returns -1 on error, or if query is not supported, 0 if query was successful */ static int qemuDomainQueryWakeupSuspendSupport(virDomainObj *vm, bool *wakeupSupported) -- 2.37.4
On a Tuesday in 2022, Michal Privoznik wrote:
The was an attempt to document the retvals for qemuDomainQueryWakeupSuspendSupport(). However, it's misleading because in reality, the function can return nothing but 0 or -1, but the comment implies retval of 1 too.
Since the set of possible return values complies with our unwritten rule (0 for success, -1 for error), there's no real value in having the comment and as such can be dropped.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_driver.c | 1 - 1 file changed, 1 deletion(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
The qemuDomainQueryWakeupSuspendSupport() does not change state of the domain as it just runs 'query-current-machine' QMP command. Therefore, there's no need for it to acquire MODIFY job, QUERY job is perfectly okay. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 7c8fc8949c..56b809617a 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16323,7 +16323,7 @@ qemuDomainQueryWakeupSuspendSupport(virDomainObj *vm, if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_QUERY_CURRENT_MACHINE)) return -1; - if (virDomainObjBeginJob(vm, VIR_JOB_MODIFY) < 0) + if (virDomainObjBeginJob(vm, VIR_JOB_QUERY) < 0) return -1; if ((ret = virDomainObjCheckActive(vm)) < 0) -- 2.37.4
On a Tuesday in 2022, Michal Privoznik wrote:
The qemuDomainQueryWakeupSuspendSupport() does not change state of the domain as it just runs 'query-current-machine' QMP command. Therefore, there's no need for it to acquire MODIFY job, QUERY job is perfectly okay.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
The qemuAgent has option to issue guest-sync command before each intended command or issue the sync commend just once, right after the socked is opened and before the first intended command is issued. The latter is referred to as single sync agent and is enabled by VSERPORT_CHANGED event which allows us to detect when the agent (dis-)connects in the guest. Now, every QEMU that we support (4.2.0 or newer) has the event and thus will use single sync agent. Therefore, adjust qemuagenttest to make it test what's used in the real world, rather than old approach. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- tests/qemuagenttest.c | 50 +++--------------------------------- tests/qemumonitortestutils.c | 2 +- 2 files changed, 4 insertions(+), 48 deletions(-) diff --git a/tests/qemuagenttest.c b/tests/qemuagenttest.c index dd2d4984e2..7724df2742 100644 --- a/tests/qemuagenttest.c +++ b/tests/qemuagenttest.c @@ -56,16 +56,10 @@ testQemuAgentSSHKeys(const void *data) "}}") < 0) return -1; - if (qemuMonitorTestAddAgentSyncResponse(test) < 0) - return -1; - if (qemuMonitorTestAddItem(test, "guest-ssh-add-authorized-keys", "{ \"return\" : {} }") < 0) return -1; - if (qemuMonitorTestAddAgentSyncResponse(test) < 0) - return -1; - if (qemuMonitorTestAddItem(test, "guest-ssh-remove-authorized-keys", "{ \"return\" : {} }") < 0) return -1; @@ -121,9 +115,6 @@ testQemuAgentFSFreeze(const void *data) "{ \"return\" : 5 }") < 0) return -1; - if (qemuMonitorTestAddAgentSyncResponse(test) < 0) - return -1; - if (qemuMonitorTestAddItem(test, "guest-fsfreeze-freeze", "{ \"return\" : 7 }") < 0) return -1; @@ -168,9 +159,6 @@ testQemuAgentFSThaw(const void *data) "{ \"return\" : 5 }") < 0) return -1; - if (qemuMonitorTestAddAgentSyncResponse(test) < 0) - return -1; - if (qemuMonitorTestAddItem(test, "guest-fsfreeze-thaw", "{ \"return\" : 7 }") < 0) return -1; @@ -358,9 +346,6 @@ testQemuAgentGetFSInfo(const void *data) goto cleanup; } - if (qemuMonitorTestAddAgentSyncResponse(test) < 0) - goto cleanup; - if (qemuMonitorTestAddItem(test, "guest-get-fsinfo", "{\"error\":" " {\"class\":\"CommandDisabled\"," @@ -404,16 +389,10 @@ testQemuAgentSuspend(const void *data) "{ \"return\" : {} }") < 0) return -1; - if (qemuMonitorTestAddAgentSyncResponse(test) < 0) - return -1; - if (qemuMonitorTestAddItem(test, "guest-suspend-disk", "{ \"return\" : {} }") < 0) return -1; - if (qemuMonitorTestAddAgentSyncResponse(test) < 0) - return -1; - if (qemuMonitorTestAddItem(test, "guest-suspend-hybrid", "{ \"return\" : {} }") < 0) return -1; @@ -505,9 +484,6 @@ testQemuAgentShutdown(const void *data) QEMU_AGENT_SHUTDOWN_HALT) < 0) return -1; - if (qemuMonitorTestAddAgentSyncResponse(test) < 0) - return -1; - priv.event = QEMU_AGENT_EVENT_SHUTDOWN; priv.mode = "powerdown"; @@ -520,9 +496,6 @@ testQemuAgentShutdown(const void *data) QEMU_AGENT_SHUTDOWN_POWERDOWN) < 0) return -1; - if (qemuMonitorTestAddAgentSyncResponse(test) < 0) - return -1; - priv.event = QEMU_AGENT_EVENT_RESET; priv.mode = "reboot"; @@ -539,9 +512,6 @@ testQemuAgentShutdown(const void *data) /* check negative response, so that we can verify that the agent breaks * out from sleep */ - if (qemuMonitorTestAddAgentSyncResponse(test) < 0) - return -1; - if (qemuMonitorTestAddItem(test, "guest-shutdown", "{\"error\":" " {\"class\":\"CommandDisabled\"," @@ -628,9 +598,6 @@ testQemuAgentCPU(const void *data) if (qemuAgentUpdateCPUInfo(2, cpuinfo, nvcpus) < 0) return -1; - if (qemuMonitorTestAddAgentSyncResponse(test) < 0) - return -1; - if (qemuMonitorTestAddItemParams(test, "guest-set-vcpus", "{ \"return\" : 1 }", "vcpus", testQemuAgentCPUArguments1, @@ -641,18 +608,12 @@ testQemuAgentCPU(const void *data) return -1; /* try to hotplug two, second one will fail */ - if (qemuMonitorTestAddAgentSyncResponse(test) < 0) - return -1; - if (qemuMonitorTestAddItemParams(test, "guest-set-vcpus", "{ \"return\" : 1 }", "vcpus", testQemuAgentCPUArguments2, NULL) < 0) return -1; - if (qemuMonitorTestAddAgentSyncResponse(test) < 0) - return -1; - if (qemuMonitorTestAddItemParams(test, "guest-set-vcpus", "{ \"error\" : \"random error\" }", "vcpus", testQemuAgentCPUArguments3, @@ -1171,9 +1132,6 @@ testQemuAgentUsers(const void *data) checkUserInfo(params, nparams, 1, "test2", NULL, 1561739229190) < 0) goto cleanup; - if (qemuMonitorTestAddAgentSyncResponse(test) < 0) - goto cleanup; - if (qemuMonitorTestAddItem(test, "guest-get-users", testQemuAgentUsersResponse2) < 0) goto cleanup; @@ -1290,9 +1248,6 @@ testQemuAgentOSInfo(const void *data) nparams = 0; maxparams = 0; - if (qemuMonitorTestAddAgentSyncResponse(test) < 0) - goto cleanup; - if (qemuMonitorTestAddItem(test, "guest-get-osinfo", testQemuAgentOSInfoResponse2) < 0) goto cleanup; @@ -1347,13 +1302,14 @@ testQemuAgentTimezone(const void *data) if (!test) return -1; + if (qemuMonitorTestAddAgentSyncResponse(test) < 0) + goto cleanup; + #define VALIDATE_TIMEZONE(response_, expected_name_, expected_offset_) \ do { \ int maxparams_ = 0; \ const char *name_ = NULL; \ int offset_; \ - if (qemuMonitorTestAddAgentSyncResponse(test) < 0) \ - goto cleanup; \ if (qemuMonitorTestAddItem(test, "guest-get-timezone", \ response_) < 0) \ goto cleanup; \ diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c index db0f450e40..310c19dfde 100644 --- a/tests/qemumonitortestutils.c +++ b/tests/qemumonitortestutils.c @@ -1418,7 +1418,7 @@ qemuMonitorTestNewAgent(virDomainXMLOption *xmlopt) &src, virEventThreadGetContext(test->eventThread), &qemuMonitorTestAgentCallbacks, - false))) + true))) goto error; virObjectLock(test->agent); -- 2.37.4
On Tue, Nov 08, 2022 at 09:29:05 +0100, Michal Privoznik wrote:
The qemuAgent has option to issue guest-sync command before each intended command or issue the sync commend just once, right after the socked is opened and before the first intended command is
*socket
issued. The latter is referred to as single sync agent and is enabled by VSERPORT_CHANGED event which allows us to detect when the agent (dis-)connects in the guest.
Now, every QEMU that we support (4.2.0 or newer) has the event and thus will use single sync agent. Therefore, adjust qemuagenttest to make it test what's used in the real world, rather than old approach.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- tests/qemuagenttest.c | 50 +++--------------------------------- tests/qemumonitortestutils.c | 2 +- 2 files changed, 4 insertions(+), 48 deletions(-)
On Tue, Nov 08, 2022 at 09:29:05 +0100, Michal Privoznik wrote:
The qemuAgent has option to issue guest-sync command before each intended command or issue the sync commend just once, right after the socked is opened and before the first intended command is issued. The latter is referred to as single sync agent and is enabled by VSERPORT_CHANGED event which allows us to detect when the agent (dis-)connects in the guest.
Now, every QEMU that we support (4.2.0 or newer) has the event and thus will use single sync agent. Therefore, adjust qemuagenttest to make it test what's used in the real world, rather than old approach.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- tests/qemuagenttest.c | 50 +++--------------------------------- tests/qemumonitortestutils.c | 2 +- 2 files changed, 4 insertions(+), 48 deletions(-)
The 'qemuagenttest' is broken after this commit: 1) FSFreeze ... expected command 'guest-fsfreeze-freeze' got 'guest-sync'
On 11/8/22 09:44, Peter Krempa wrote:
On Tue, Nov 08, 2022 at 09:29:05 +0100, Michal Privoznik wrote:
The qemuAgent has option to issue guest-sync command before each intended command or issue the sync commend just once, right after the socked is opened and before the first intended command is issued. The latter is referred to as single sync agent and is enabled by VSERPORT_CHANGED event which allows us to detect when the agent (dis-)connects in the guest.
Now, every QEMU that we support (4.2.0 or newer) has the event and thus will use single sync agent. Therefore, adjust qemuagenttest to make it test what's used in the real world, rather than old approach.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- tests/qemuagenttest.c | 50 +++--------------------------------- tests/qemumonitortestutils.c | 2 +- 2 files changed, 4 insertions(+), 48 deletions(-)
The 'qemuagenttest' is broken after this commit:
1) FSFreeze ... expected command 'guest-fsfreeze-freeze' got 'guest-sync'
You have to fetch current master. It requires fix to a regression I've merged just before sending these. qemu_agent: Bring back single sync Michal
On a Tuesday in 2022, Michal Privoznik wrote:
The qemuAgent has option to issue guest-sync command before each intended command or issue the sync commend just once, right after the socked is opened and before the first intended command is issued. The latter is referred to as single sync agent and is enabled by VSERPORT_CHANGED event which allows us to detect when the agent (dis-)connects in the guest.
Now, every QEMU that we support (4.2.0 or newer) has the event and thus will use single sync agent. Therefore, adjust qemuagenttest to make it test what's used in the real world, rather than old approach.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- tests/qemuagenttest.c | 50 +++--------------------------------- tests/qemumonitortestutils.c | 2 +- 2 files changed, 4 insertions(+), 48 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Introduced in QEMU's commit of v3.0.0-rc0~124^2~1 the set-numa-node command is always available for all QEMU versions we support (4.2.0, currently). Therefore, we can assume the capability is always set and thus doesn't need to be checked for. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_domain.c | 10 +++------ src/qemu/qemu_validate.c | 21 ------------------- tests/qemuxml2argvdata/cpu-numa-disjoint.err | 1 - .../fd-memory-numa-topology2.args | 2 +- .../fd-memory-numa-topology2.xml | 2 +- .../fd-memory-numa-topology3.args | 2 +- .../fd-memory-numa-topology3.xml | 2 +- tests/qemuxml2argvdata/numatune-memnode.err | 1 - tests/qemuxml2argvtest.c | 21 +++++++------------ tests/qemuxml2xmltest.c | 12 +++++------ 10 files changed, 21 insertions(+), 53 deletions(-) delete mode 100644 tests/qemuxml2argvdata/cpu-numa-disjoint.err delete mode 100644 tests/qemuxml2argvdata/numatune-memnode.err diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 09e213e48d..c9a622e75a 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -4531,16 +4531,12 @@ qemuDomainDefTsegPostParse(virDomainDef *def, * Returns: 0 on success, -1 on error */ int -qemuDomainDefNumaCPUsRectify(virDomainDef *def, virQEMUCaps *qemuCaps) +qemuDomainDefNumaCPUsRectify(virDomainDef *def, + virQEMUCaps *qemuCaps G_GNUC_UNUSED) { unsigned int vcpusMax, numacpus; - /* QEMU_CAPS_NUMA tells us if QEMU is able to handle disjointed - * NUMA CPU ranges. The filling process will create a disjointed - * setup in node0 most of the time. Do not proceed if QEMU - * can't handle it.*/ - if (virDomainNumaGetNodeCount(def->numa) == 0 || - !virQEMUCapsGet(qemuCaps, QEMU_CAPS_NUMA)) + if (virDomainNumaGetNodeCount(def->numa) == 0) return 0; vcpusMax = virDomainDefGetVcpusMax(def); diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 1192bf1804..78c68a99d0 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -983,27 +983,6 @@ static int qemuValidateDomainDefNuma(const virDomainDef *def, virQEMUCaps *qemuCaps) { - size_t ncells = virDomainNumaGetNodeCount(def->numa); - size_t i; - - for (i = 0; i < ncells; i++) { - virBitmap *cpumask = virDomainNumaGetNodeCpumask(def->numa, i); - - if (cpumask) { - g_autofree char * cpumaskStr = NULL; - if (!(cpumaskStr = virBitmapFormat(cpumask))) - return -1; - - if (strchr(cpumaskStr, ',') && - !virQEMUCapsGet(qemuCaps, QEMU_CAPS_NUMA)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("disjoint NUMA cpu ranges are not supported " - "with this QEMU")); - return -1; - } - } - } - if (virDomainNumaHasHMAT(def->numa)) { if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_NUMA_HMAT)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", diff --git a/tests/qemuxml2argvdata/cpu-numa-disjoint.err b/tests/qemuxml2argvdata/cpu-numa-disjoint.err deleted file mode 100644 index ff4b1cce2e..0000000000 --- a/tests/qemuxml2argvdata/cpu-numa-disjoint.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: disjoint NUMA cpu ranges are not supported with this QEMU diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology2.args b/tests/qemuxml2argvdata/fd-memory-numa-topology2.args index 9d8866d914..10952872bf 100644 --- a/tests/qemuxml2argvdata/fd-memory-numa-topology2.args +++ b/tests/qemuxml2argvdata/fd-memory-numa-topology2.args @@ -16,7 +16,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-instance-00000092/.config \ -overcommit mem-lock=off \ -smp 20,sockets=1,cores=8,threads=1 \ -object memory-backend-file,id=ram-node0,mem-path=/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node0,share=off,prealloc=on,size=15032385536 \ --numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \ +-numa node,nodeid=0,cpus=0-7,cpus=16-19,memdev=ram-node0 \ -object memory-backend-file,id=ram-node1,mem-path=/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node1,share=on,prealloc=on,size=15032385536 \ -numa node,nodeid=1,cpus=8-15,memdev=ram-node1 \ -uuid 126f2720-6f8e-45ab-a886-ec9277079a67 \ diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml b/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml index f6af88a2a8..5b84a49796 100644 --- a/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml +++ b/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml @@ -16,7 +16,7 @@ <cpu> <topology sockets='1' dies='1' cores='8' threads='1'/> <numa> - <cell id='0' cpus='0-7' memory='14680064' unit='KiB'/> + <cell id='0' cpus='0-7,16-19' memory='14680064' unit='KiB'/> <cell id='1' cpus='8-15' memory='14680064' unit='KiB' memAccess='shared'/> </numa> </cpu> diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology3.args b/tests/qemuxml2argvdata/fd-memory-numa-topology3.args index 39ab4e0f2d..e9cb1f0fa5 100644 --- a/tests/qemuxml2argvdata/fd-memory-numa-topology3.args +++ b/tests/qemuxml2argvdata/fd-memory-numa-topology3.args @@ -16,7 +16,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-instance-00000092/.config \ -overcommit mem-lock=off \ -smp 32,sockets=1,cores=24,threads=1 \ -object memory-backend-file,id=ram-node0,mem-path=/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node0,share=on,prealloc=on,size=15032385536 \ --numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \ +-numa node,nodeid=0,cpus=0-1,cpus=6-31,memdev=ram-node0 \ -object memory-backend-file,id=ram-node1,mem-path=/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node1,share=on,prealloc=on,size=15032385536 \ -numa node,nodeid=1,cpus=2-3,memdev=ram-node1 \ -object memory-backend-file,id=ram-node2,mem-path=/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node2,share=off,prealloc=on,size=15032385536 \ diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml b/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml index 1bf006c21c..1b8fd7dfee 100644 --- a/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml +++ b/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml @@ -16,7 +16,7 @@ <cpu> <topology sockets='1' dies='1' cores='24' threads='1'/> <numa> - <cell id='0' cpus='0-1' memory='14680064' unit='KiB'/> + <cell id='0' cpus='0-1,6-31' memory='14680064' unit='KiB'/> <cell id='1' cpus='2-3' memory='14680064' unit='KiB' memAccess='shared'/> <cell id='2' cpus='4-5' memory='14680064' unit='KiB' memAccess='private'/> </numa> diff --git a/tests/qemuxml2argvdata/numatune-memnode.err b/tests/qemuxml2argvdata/numatune-memnode.err deleted file mode 100644 index ff4b1cce2e..0000000000 --- a/tests/qemuxml2argvdata/numatune-memnode.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: disjoint NUMA cpu ranges are not supported with this QEMU diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index bf3465ee15..dd2460bc0b 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1866,7 +1866,6 @@ mymain(void) ARG_MIGRATE_FROM, "stdio", ARG_MIGRATE_FD, 7, ARG_QEMU_CAPS, - QEMU_CAPS_NUMA, QEMU_CAPS_LAST, ARG_END); @@ -1904,8 +1903,7 @@ mymain(void) DO_TEST_NOCAPS("cpu-numa2"); DO_TEST_NOCAPS("cpu-numa-no-memory-element"); DO_TEST_PARSE_ERROR_NOCAPS("cpu-numa3"); - DO_TEST_PARSE_ERROR_NOCAPS("cpu-numa-disjoint"); - DO_TEST("cpu-numa-disjoint", QEMU_CAPS_NUMA); + DO_TEST_NOCAPS("cpu-numa-disjoint"); DO_TEST_NOCAPS("cpu-numa-memshared"); DO_TEST("cpu-host-model", QEMU_CAPS_DEVICE_PCI_BRIDGE, @@ -1971,19 +1969,16 @@ mymain(void) DO_TEST_NOCAPS("numatune-memory"); DO_TEST_PARSE_ERROR_NOCAPS("numatune-memory-invalid-nodeset"); - DO_TEST("numatune-memnode", - QEMU_CAPS_NUMA); - DO_TEST_PARSE_ERROR_NOCAPS("numatune-memnode"); + DO_TEST_NOCAPS("numatune-memnode"); DO_TEST_CAPS_VER("numatune-memnode", "5.2.0"); DO_TEST_CAPS_LATEST("numatune-memnode"); DO_TEST_PARSE_ERROR_NOCAPS("numatune-memnode-invalid-mode"); DO_TEST_CAPS_LATEST("numatune-memnode-restrictive-mode"); DO_TEST_CAPS_LATEST("numatune-system-memory"); - DO_TEST("numatune-memnode-no-memory", - QEMU_CAPS_NUMA); + DO_TEST_NOCAPS("numatune-memnode-no-memory"); - DO_TEST("numatune-distances", QEMU_CAPS_NUMA); + DO_TEST_NOCAPS("numatune-distances"); DO_TEST_NOCAPS("numatune-no-vcpu"); DO_TEST_CAPS_LATEST("numatune-hmat"); @@ -2632,16 +2627,16 @@ mymain(void) DO_TEST_PARSE_ERROR("memory-hotplug-nonuma", QEMU_CAPS_DEVICE_PC_DIMM); DO_TEST_PARSE_ERROR_NOCAPS("memory-hotplug-invalid-targetnode"); DO_TEST_NOCAPS("memory-hotplug"); - DO_TEST("memory-hotplug", QEMU_CAPS_DEVICE_PC_DIMM, QEMU_CAPS_NUMA); - DO_TEST("memory-hotplug-dimm", QEMU_CAPS_DEVICE_PC_DIMM, QEMU_CAPS_NUMA); + DO_TEST("memory-hotplug", QEMU_CAPS_DEVICE_PC_DIMM); + DO_TEST("memory-hotplug-dimm", QEMU_CAPS_DEVICE_PC_DIMM); DO_TEST_CAPS_LATEST("memory-hotplug-dimm-addr"); - DO_TEST("memory-hotplug-ppc64-nonuma", QEMU_CAPS_KVM, QEMU_CAPS_DEVICE_PC_DIMM, QEMU_CAPS_NUMA, + DO_TEST("memory-hotplug-ppc64-nonuma", QEMU_CAPS_KVM, QEMU_CAPS_DEVICE_PC_DIMM, QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE); DO_TEST_FULL("memory-hotplug-ppc64-nonuma-abi-update", "", ARG_PARSEFLAGS, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE, ARG_QEMU_CAPS, QEMU_CAPS_KVM, QEMU_CAPS_DEVICE_PC_DIMM, - QEMU_CAPS_NUMA, QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, + QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, QEMU_CAPS_LAST, ARG_END); DO_TEST_CAPS_LATEST("memory-hotplug-nvdimm"); diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 40763607ba..45e16ce02d 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -924,14 +924,14 @@ mymain(void) DO_TEST_NOCAPS("cpu-numa2"); DO_TEST_NOCAPS("cpu-numa-no-memory-element"); DO_TEST_NOCAPS("cpu-numa-disordered"); - DO_TEST("cpu-numa-disjoint", QEMU_CAPS_NUMA); + DO_TEST_NOCAPS("cpu-numa-disjoint"); DO_TEST_NOCAPS("cpu-numa-memshared"); DO_TEST_NOCAPS("numatune-auto-prefer"); - DO_TEST("numatune-memnode", QEMU_CAPS_NUMA); + DO_TEST_NOCAPS("numatune-memnode"); DO_TEST_NOCAPS("numatune-memnode-no-memory"); - DO_TEST("numatune-distances", QEMU_CAPS_NUMA); - DO_TEST("numatune-no-vcpu", QEMU_CAPS_NUMA); + DO_TEST_NOCAPS("numatune-distances"); + DO_TEST_NOCAPS("numatune-no-vcpu"); DO_TEST("numatune-hmat", QEMU_CAPS_NUMA_HMAT); DO_TEST_CAPS_LATEST("numatune-memnode-restrictive-mode"); @@ -1023,13 +1023,13 @@ mymain(void) /* SVE aarch64 CPU features work on modern QEMU */ DO_TEST_CAPS_ARCH_LATEST("aarch64-features-sve", "aarch64"); - DO_TEST("memory-hotplug-ppc64-nonuma", QEMU_CAPS_KVM, QEMU_CAPS_DEVICE_PC_DIMM, QEMU_CAPS_NUMA, + DO_TEST("memory-hotplug-ppc64-nonuma", QEMU_CAPS_KVM, QEMU_CAPS_DEVICE_PC_DIMM, QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE); DO_TEST_FULL("memory-hotplug-ppc64-nonuma-abi-update", "", WHEN_BOTH, ARG_PARSEFLAGS, VIR_DOMAIN_DEF_PARSE_ABI_UPDATE, ARG_QEMU_CAPS, QEMU_CAPS_KVM, QEMU_CAPS_DEVICE_PC_DIMM, - QEMU_CAPS_NUMA, QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, + QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, QEMU_CAPS_LAST, ARG_END); DO_TEST_NOCAPS("memory-hotplug"); DO_TEST("memory-hotplug-dimm", QEMU_CAPS_DEVICE_PC_DIMM); -- 2.37.4
On a Tuesday in 2022, Michal Privoznik wrote:
Introduced in QEMU's commit of v3.0.0-rc0~124^2~1 the set-numa-node command is always available for all QEMU versions we support (4.2.0, currently). Therefore, we can assume the capability is always set and thus doesn't need to be checked for.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_domain.c | 10 +++------ src/qemu/qemu_validate.c | 21 ------------------- tests/qemuxml2argvdata/cpu-numa-disjoint.err | 1 - .../fd-memory-numa-topology2.args | 2 +- .../fd-memory-numa-topology2.xml | 2 +- .../fd-memory-numa-topology3.args | 2 +- .../fd-memory-numa-topology3.xml | 2 +- tests/qemuxml2argvdata/numatune-memnode.err | 1 - tests/qemuxml2argvtest.c | 21 +++++++------------ tests/qemuxml2xmltest.c | 12 +++++------ 10 files changed, 21 insertions(+), 53 deletions(-) delete mode 100644 tests/qemuxml2argvdata/cpu-numa-disjoint.err delete mode 100644 tests/qemuxml2argvdata/numatune-memnode.err
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
All supported QEMUs have this capability. Stop detecting it. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 1 - tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml | 1 - 29 files changed, 29 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 39c2d38969..db918952ac 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1219,7 +1219,6 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = { { "block-export-add", QEMU_CAPS_BLOCK_EXPORT_ADD }, { "query-display-options", QEMU_CAPS_QUERY_DISPLAY_OPTIONS }, { "blockdev-reopen", QEMU_CAPS_BLOCKDEV_REOPEN }, - { "set-numa-node", QEMU_CAPS_NUMA }, { "set-action", QEMU_CAPS_SET_ACTION }, { "query-dirty-rate", QEMU_CAPS_QUERY_DIRTY_RATE }, { "sev-inject-launch-secret", QEMU_CAPS_SEV_INJECT_LAUNCH_SECRET }, diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml index a89a77fbde..5db14f0afc 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml @@ -44,7 +44,6 @@ <flag name='ich9-intel-hda'/> <flag name='enable-fips'/> <flag name='usb-kbd'/> - <flag name='numa'/> <flag name='usb-audio'/> <flag name='iothread'/> <flag name='migrate-rdma'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml index 47529e9c6e..3d12939f0c 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml @@ -43,7 +43,6 @@ <flag name='ich9-intel-hda'/> <flag name='enable-fips'/> <flag name='usb-kbd'/> - <flag name='numa'/> <flag name='usb-audio'/> <flag name='iothread'/> <flag name='migrate-rdma'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml index 7456516422..72381c8065 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -23,7 +23,6 @@ <flag name='pci-bridge'/> <flag name='vfio-pci'/> <flag name='enable-fips'/> - <flag name='numa'/> <flag name='iothread'/> <flag name='migrate-rdma'/> <flag name='aes-key-wrap'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml index 53b1dda4da..3e4453dfa7 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -57,7 +57,6 @@ <flag name='pvpanic'/> <flag name='enable-fips'/> <flag name='usb-kbd'/> - <flag name='numa'/> <flag name='usb-audio'/> <flag name='rtc-reset-reinjection'/> <flag name='iothread'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml index 9002c29711..64a7ae39c6 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml @@ -46,7 +46,6 @@ <flag name='ich9-intel-hda'/> <flag name='enable-fips'/> <flag name='usb-kbd'/> - <flag name='numa'/> <flag name='usb-audio'/> <flag name='iothread'/> <flag name='migrate-rdma'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml index 3b0828efd3..6bbf25fc6c 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml @@ -44,7 +44,6 @@ <flag name='ich9-intel-hda'/> <flag name='enable-fips'/> <flag name='usb-kbd'/> - <flag name='numa'/> <flag name='usb-audio'/> <flag name='iothread'/> <flag name='migrate-rdma'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml index 2db333b322..7d8b64bdae 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml @@ -47,7 +47,6 @@ <flag name='ich9-intel-hda'/> <flag name='enable-fips'/> <flag name='usb-kbd'/> - <flag name='numa'/> <flag name='usb-audio'/> <flag name='iothread'/> <flag name='migrate-rdma'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml index 5fbc028142..93b19c9754 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -57,7 +57,6 @@ <flag name='pvpanic'/> <flag name='enable-fips'/> <flag name='usb-kbd'/> - <flag name='numa'/> <flag name='usb-audio'/> <flag name='rtc-reset-reinjection'/> <flag name='iothread'/> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml index 2ba3ca88a5..01a13aecfc 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml @@ -15,7 +15,6 @@ <flag name='rng-random'/> <flag name='rng-egd'/> <flag name='enable-fips'/> - <flag name='numa'/> <flag name='iothread'/> <flag name='migrate-rdma'/> <flag name='vserport-change-event'/> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml index 6b2faaf51b..0c04999a94 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml @@ -57,7 +57,6 @@ <flag name='pvpanic'/> <flag name='enable-fips'/> <flag name='usb-kbd'/> - <flag name='numa'/> <flag name='usb-audio'/> <flag name='rtc-reset-reinjection'/> <flag name='iothread'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml index b0b9fff8b8..55e0bf1580 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml @@ -45,7 +45,6 @@ <flag name='virtio-mmio'/> <flag name='ich9-intel-hda'/> <flag name='usb-kbd'/> - <flag name='numa'/> <flag name='usb-audio'/> <flag name='iothread'/> <flag name='migrate-rdma'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml index d537801191..47fc5d0c13 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml @@ -43,7 +43,6 @@ <flag name='usb-storage.removable'/> <flag name='ich9-intel-hda'/> <flag name='usb-kbd'/> - <flag name='numa'/> <flag name='usb-audio'/> <flag name='iothread'/> <flag name='migrate-rdma'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml index c775410ced..ea05bb23dc 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml @@ -46,7 +46,6 @@ <flag name='virtio-mmio'/> <flag name='ich9-intel-hda'/> <flag name='usb-kbd'/> - <flag name='numa'/> <flag name='usb-audio'/> <flag name='iothread'/> <flag name='migrate-rdma'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml index a89bf23f48..1f75f00a2e 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml @@ -22,7 +22,6 @@ <flag name='virtio-ccw'/> <flag name='pci-bridge'/> <flag name='vfio-pci'/> - <flag name='numa'/> <flag name='iothread'/> <flag name='migrate-rdma'/> <flag name='aes-key-wrap'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml index b22a8f4efe..22bdb2152a 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml @@ -56,7 +56,6 @@ <flag name='kvm-pit-lost-tick-policy'/> <flag name='pvpanic'/> <flag name='usb-kbd'/> - <flag name='numa'/> <flag name='usb-audio'/> <flag name='rtc-reset-reinjection'/> <flag name='iothread'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml index cef489646a..acc30efaee 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml @@ -44,7 +44,6 @@ <flag name='virtio-mmio'/> <flag name='ich9-intel-hda'/> <flag name='usb-kbd'/> - <flag name='numa'/> <flag name='usb-audio'/> <flag name='iothread'/> <flag name='migrate-rdma'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml index 3c20758fe0..81f64ce654 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml @@ -22,7 +22,6 @@ <flag name='virtio-ccw'/> <flag name='pci-bridge'/> <flag name='vfio-pci'/> - <flag name='numa'/> <flag name='iothread'/> <flag name='migrate-rdma'/> <flag name='aes-key-wrap'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml index 2a1ede597a..031f7c1e4e 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml @@ -55,7 +55,6 @@ <flag name='kvm-pit-lost-tick-policy'/> <flag name='pvpanic'/> <flag name='usb-kbd'/> - <flag name='numa'/> <flag name='usb-audio'/> <flag name='rtc-reset-reinjection'/> <flag name='iothread'/> diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml index c36e457708..781dd9bb6b 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml @@ -55,7 +55,6 @@ <flag name='kvm-pit-lost-tick-policy'/> <flag name='pvpanic'/> <flag name='usb-kbd'/> - <flag name='numa'/> <flag name='usb-audio'/> <flag name='rtc-reset-reinjection'/> <flag name='iothread'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml index da509b777d..7a4883814f 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml @@ -49,7 +49,6 @@ <flag name='virtio-mmio'/> <flag name='ich9-intel-hda'/> <flag name='usb-kbd'/> - <flag name='numa'/> <flag name='usb-audio'/> <flag name='iothread'/> <flag name='migrate-rdma'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml index 88e6957240..7bdd685940 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml @@ -43,7 +43,6 @@ <flag name='usb-storage.removable'/> <flag name='ich9-intel-hda'/> <flag name='usb-kbd'/> - <flag name='numa'/> <flag name='usb-audio'/> <flag name='iothread'/> <flag name='migrate-rdma'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml index 16fe1026b5..69ca8b058b 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml @@ -55,7 +55,6 @@ <flag name='kvm-pit-lost-tick-policy'/> <flag name='pvpanic'/> <flag name='usb-kbd'/> - <flag name='numa'/> <flag name='usb-audio'/> <flag name='rtc-reset-reinjection'/> <flag name='iothread'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml index f6b0c084e4..ff18e057f3 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml @@ -49,7 +49,6 @@ <flag name='virtio-mmio'/> <flag name='ich9-intel-hda'/> <flag name='usb-kbd'/> - <flag name='numa'/> <flag name='usb-audio'/> <flag name='iothread'/> <flag name='migrate-rdma'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml index 0f5b887bcd..04e0a675b1 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml @@ -49,7 +49,6 @@ <flag name='usb-storage.removable'/> <flag name='ich9-intel-hda'/> <flag name='usb-kbd'/> - <flag name='numa'/> <flag name='usb-audio'/> <flag name='iothread'/> <flag name='migrate-rdma'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml index 9eef4f0820..7eb171f433 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml @@ -55,7 +55,6 @@ <flag name='kvm-pit-lost-tick-policy'/> <flag name='pvpanic'/> <flag name='usb-kbd'/> - <flag name='numa'/> <flag name='usb-audio'/> <flag name='rtc-reset-reinjection'/> <flag name='iothread'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml index 6e3b7e00f3..0c06ed1e16 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml @@ -48,7 +48,6 @@ <flag name='usb-storage.removable'/> <flag name='ich9-intel-hda'/> <flag name='usb-kbd'/> - <flag name='numa'/> <flag name='usb-audio'/> <flag name='iothread'/> <flag name='migrate-rdma'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml index 7b92a0b8c8..c8a66bd84a 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml @@ -55,7 +55,6 @@ <flag name='kvm-pit-lost-tick-policy'/> <flag name='pvpanic'/> <flag name='usb-kbd'/> - <flag name='numa'/> <flag name='usb-audio'/> <flag name='rtc-reset-reinjection'/> <flag name='iothread'/> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml index 01dbf72185..c5f3236c18 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml @@ -55,7 +55,6 @@ <flag name='kvm-pit-lost-tick-policy'/> <flag name='pvpanic'/> <flag name='usb-kbd'/> - <flag name='numa'/> <flag name='usb-audio'/> <flag name='rtc-reset-reinjection'/> <flag name='iothread'/> -- 2.37.4
On a Tuesday in 2022, Michal Privoznik wrote:
All supported QEMUs have this capability. Stop detecting it.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 1 - tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml | 1 - 29 files changed, 29 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Now that nothing uses this capability, it can be retired. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_capabilities.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index db918952ac..aa771564e3 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -301,7 +301,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "active-commit", /* X_QEMU_CAPS_ACTIVE_COMMIT */ "change-backing-file", /* X_QEMU_CAPS_CHANGE_BACKING_FILE */ "memory-backend-ram", /* X_QEMU_CAPS_OBJECT_MEMORY_RAM */ - "numa", /* QEMU_CAPS_NUMA */ + "numa", /* X_QEMU_CAPS_NUMA */ /* 170 */ "memory-backend-file", /* X_QEMU_CAPS_OBJECT_MEMORY_FILE */ diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 0e0034663c..dbfa5cc1d8 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -279,7 +279,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ X_QEMU_CAPS_ACTIVE_COMMIT, /* block-commit works without 'top' */ X_QEMU_CAPS_CHANGE_BACKING_FILE, /* change name of backing file in metadata */ X_QEMU_CAPS_OBJECT_MEMORY_RAM, /* -object memory-backend-ram */ - QEMU_CAPS_NUMA, /* newer -numa handling with disjoint cpu ranges */ + X_QEMU_CAPS_NUMA, /* newer -numa handling with disjoint cpu ranges */ /* 170 */ X_QEMU_CAPS_OBJECT_MEMORY_FILE, /* -object memory-backend-file */ -- 2.37.4
On a Tuesday in 2022, Michal Privoznik wrote:
Now that nothing uses this capability, it can be retired.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_capabilities.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Introduced in QEMU's commit of v2.1.0-rc0~18^2~2 the VSERPORT_CHANGE event is always available for all QEMU versions we support (4.2.0, currently). Therefore, we can assume the capability is always set and thus doesn't need to be checked for. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_process.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index e7f92228f5..7d112f5bae 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -214,8 +214,7 @@ qemuConnectAgent(virQEMUDriver *driver, virDomainObj *vm) if (priv->agent) return 0; - if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_VSERPORT_CHANGE) && - config->state != VIR_DOMAIN_CHR_DEVICE_STATE_CONNECTED) { + if (config->state != VIR_DOMAIN_CHR_DEVICE_STATE_CONNECTED) { VIR_DEBUG("Deferring connecting to guest agent"); return 0; } @@ -230,7 +229,7 @@ qemuConnectAgent(virQEMUDriver *driver, virDomainObj *vm) config->source, virEventThreadGetContext(priv->eventThread), &agentCallbacks, - virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_VSERPORT_CHANGE)); + true); if (!virDomainObjIsActive(vm)) { qemuAgentClose(agent); -- 2.37.4
On a Tuesday in 2022, Michal Privoznik wrote:
Introduced in QEMU's commit of v2.1.0-rc0~18^2~2 the VSERPORT_CHANGE event is always available for all QEMU versions we support (4.2.0, currently). Therefore, we can assume the capability is always set and thus doesn't need to be checked for.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_process.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Historically, before sending any guest agent command we would send 'guest-sync' command to make guest agent reset its internal state and flush any partially read command (json). This was because there was no event emitted when the agent (dis-)connected. But now that we have the event we can execute the sync command just once - the first time after we've connected. Should agent disconnect in the middle of reading a command, and then connect back again we would get the event and disconnect and connect back again, resulting in the sync command being executed again. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_agent.c | 7 ++----- src/qemu/qemu_agent.h | 3 +-- src/qemu/qemu_process.c | 3 +-- tests/qemumonitortestutils.c | 3 +-- 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 94782f2bc9..d420b2b901 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -90,7 +90,6 @@ struct _qemuAgent { GSource *watch; bool running; - bool singleSync; bool inSync; virDomainObj *vm; @@ -587,8 +586,7 @@ qemuAgent * qemuAgentOpen(virDomainObj *vm, const virDomainChrSourceDef *config, GMainContext *context, - qemuAgentCallbacks *cb, - bool singleSync) + qemuAgentCallbacks *cb) { qemuAgent *agent; g_autoptr(GError) gerr = NULL; @@ -615,7 +613,6 @@ qemuAgentOpen(virDomainObj *vm, } agent->vm = virObjectRef(vm); agent->cb = cb; - agent->singleSync = singleSync; if (config->type != VIR_DOMAIN_CHR_TYPE_UNIX) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -857,7 +854,7 @@ qemuAgentGuestSync(qemuAgent *agent) int timeout = VIR_DOMAIN_QEMU_AGENT_COMMAND_DEFAULT; int rc; - if (agent->singleSync && agent->inSync) + if (agent->inSync) return 0; /* if user specified a custom agent timeout that is lower than the diff --git a/src/qemu/qemu_agent.h b/src/qemu/qemu_agent.h index c07d8507ba..f98586e8f8 100644 --- a/src/qemu/qemu_agent.h +++ b/src/qemu/qemu_agent.h @@ -38,8 +38,7 @@ struct _qemuAgentCallbacks { qemuAgent *qemuAgentOpen(virDomainObj *vm, const virDomainChrSourceDef *config, GMainContext *context, - qemuAgentCallbacks *cb, - bool singleSync); + qemuAgentCallbacks *cb); void qemuAgentClose(qemuAgent *mon); diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 7d112f5bae..48864a92a5 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -228,8 +228,7 @@ qemuConnectAgent(virQEMUDriver *driver, virDomainObj *vm) agent = qemuAgentOpen(vm, config->source, virEventThreadGetContext(priv->eventThread), - &agentCallbacks, - true); + &agentCallbacks); if (!virDomainObjIsActive(vm)) { qemuAgentClose(agent); diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c index 310c19dfde..46791931b0 100644 --- a/tests/qemumonitortestutils.c +++ b/tests/qemumonitortestutils.c @@ -1417,8 +1417,7 @@ qemuMonitorTestNewAgent(virDomainXMLOption *xmlopt) if (!(test->agent = qemuAgentOpen(test->vm, &src, virEventThreadGetContext(test->eventThread), - &qemuMonitorTestAgentCallbacks, - true))) + &qemuMonitorTestAgentCallbacks))) goto error; virObjectLock(test->agent); -- 2.37.4
On a Tuesday in 2022, Michal Privoznik wrote:
Historically, before sending any guest agent command we would send 'guest-sync' command to make guest agent reset its internal state and flush any partially read command (json). This was because there was no event emitted when the agent (dis-)connected.
But now that we have the event we can execute the sync command just once - the first time after we've connected. Should agent disconnect in the middle of reading a command, and then connect back again we would get the event and disconnect and connect back again, resulting in the sync command being executed again.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_agent.c | 7 ++----- src/qemu/qemu_agent.h | 3 +-- src/qemu/qemu_process.c | 3 +-- tests/qemumonitortestutils.c | 3 +-- 4 files changed, 5 insertions(+), 11 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
All supported QEMUs have this capability. Stop detecting it. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 1 - tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml | 1 - 29 files changed, 29 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index aa771564e3..6d5d994594 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1233,7 +1233,6 @@ struct virQEMUCapsStringFlags virQEMUCapsMigration[] = { /* Use virQEMUCapsQMPSchemaQueries for querying parameters of events */ struct virQEMUCapsStringFlags virQEMUCapsEvents[] = { - { "VSERPORT_CHANGE", QEMU_CAPS_VSERPORT_CHANGE }, { "DUMP_COMPLETED", QEMU_CAPS_DUMP_COMPLETED }, }; diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml index 5db14f0afc..5dae49b184 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml @@ -65,7 +65,6 @@ <flag name='virtio-mouse'/> <flag name='virtio-tablet'/> <flag name='virtio-input-host'/> - <flag name='vserport-change-event'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='query-hotpluggable-cpus'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml index 3d12939f0c..5f2f420acc 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml @@ -61,7 +61,6 @@ <flag name='virtio-mouse'/> <flag name='virtio-tablet'/> <flag name='virtio-input-host'/> - <flag name='vserport-change-event'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='query-hotpluggable-cpus'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml index 72381c8065..ee638dd994 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -34,7 +34,6 @@ <flag name='virtio-mouse'/> <flag name='virtio-tablet'/> <flag name='virtio-input-host'/> - <flag name='vserport-change-event'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='query-hotpluggable-cpus'/> <flag name='virtio-net.rx_queue_size'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml index 3e4453dfa7..d8a44a3cf5 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -81,7 +81,6 @@ <flag name='virtio-input-host'/> <flag name='ich9-disable-s3'/> <flag name='ich9-disable-s4'/> - <flag name='vserport-change-event'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='spice-gl'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml index 64a7ae39c6..8ac3bdb5a4 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml @@ -67,7 +67,6 @@ <flag name='virtio-mouse'/> <flag name='virtio-tablet'/> <flag name='virtio-input-host'/> - <flag name='vserport-change-event'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='query-hotpluggable-cpus'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml index 6bbf25fc6c..a50ffc27f4 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml @@ -62,7 +62,6 @@ <flag name='virtio-mouse'/> <flag name='virtio-tablet'/> <flag name='virtio-input-host'/> - <flag name='vserport-change-event'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='query-hotpluggable-cpus'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml index 7d8b64bdae..c0f4c1e872 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml @@ -66,7 +66,6 @@ <flag name='virtio-mouse'/> <flag name='virtio-tablet'/> <flag name='virtio-input-host'/> - <flag name='vserport-change-event'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='spice-gl'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml index 93b19c9754..340e773acc 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -81,7 +81,6 @@ <flag name='virtio-input-host'/> <flag name='ich9-disable-s3'/> <flag name='ich9-disable-s4'/> - <flag name='vserport-change-event'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='spice-gl'/> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml index 01a13aecfc..9400ea543a 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml @@ -17,7 +17,6 @@ <flag name='enable-fips'/> <flag name='iothread'/> <flag name='migrate-rdma'/> - <flag name='vserport-change-event'/> <flag name='spice-gl'/> <flag name='query-hotpluggable-cpus'/> <flag name='spice-rendernode'/> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml index 0c04999a94..e07e9bfdd3 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml @@ -81,7 +81,6 @@ <flag name='virtio-input-host'/> <flag name='ich9-disable-s3'/> <flag name='ich9-disable-s4'/> - <flag name='vserport-change-event'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='spice-gl'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml index 55e0bf1580..e7776bb370 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml @@ -66,7 +66,6 @@ <flag name='virtio-mouse'/> <flag name='virtio-tablet'/> <flag name='virtio-input-host'/> - <flag name='vserport-change-event'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='query-hotpluggable-cpus'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml index 47fc5d0c13..821180ea17 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml @@ -61,7 +61,6 @@ <flag name='virtio-mouse'/> <flag name='virtio-tablet'/> <flag name='virtio-input-host'/> - <flag name='vserport-change-event'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='query-hotpluggable-cpus'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml index ea05bb23dc..5543f34b41 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml @@ -65,7 +65,6 @@ <flag name='virtio-mouse'/> <flag name='virtio-tablet'/> <flag name='virtio-input-host'/> - <flag name='vserport-change-event'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='spice-gl'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml index 1f75f00a2e..6a4449a70c 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml @@ -33,7 +33,6 @@ <flag name='virtio-mouse'/> <flag name='virtio-tablet'/> <flag name='virtio-input-host'/> - <flag name='vserport-change-event'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='query-hotpluggable-cpus'/> <flag name='virtio-net.rx_queue_size'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml index 22bdb2152a..40ab95425b 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml @@ -81,7 +81,6 @@ <flag name='virtio-input-host'/> <flag name='ich9-disable-s3'/> <flag name='ich9-disable-s4'/> - <flag name='vserport-change-event'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='spice-gl'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml index acc30efaee..74ff39d36a 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml @@ -65,7 +65,6 @@ <flag name='virtio-mouse'/> <flag name='virtio-tablet'/> <flag name='virtio-input-host'/> - <flag name='vserport-change-event'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='pxb'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml index 81f64ce654..c56c47e1a2 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml @@ -33,7 +33,6 @@ <flag name='virtio-mouse'/> <flag name='virtio-tablet'/> <flag name='virtio-input-host'/> - <flag name='vserport-change-event'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='query-hotpluggable-cpus'/> <flag name='virtio-net.rx_queue_size'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml index 031f7c1e4e..b01ffe84d6 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml @@ -80,7 +80,6 @@ <flag name='virtio-input-host'/> <flag name='ich9-disable-s3'/> <flag name='ich9-disable-s4'/> - <flag name='vserport-change-event'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='spice-gl'/> diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml index 781dd9bb6b..6a706201c7 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml @@ -79,7 +79,6 @@ <flag name='virtio-input-host'/> <flag name='ich9-disable-s3'/> <flag name='ich9-disable-s4'/> - <flag name='vserport-change-event'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='spice-gl'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml index 7a4883814f..f9667a6d3c 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml @@ -70,7 +70,6 @@ <flag name='virtio-mouse'/> <flag name='virtio-tablet'/> <flag name='virtio-input-host'/> - <flag name='vserport-change-event'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='spice-gl'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml index 7bdd685940..c632b7daa4 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml @@ -61,7 +61,6 @@ <flag name='virtio-mouse'/> <flag name='virtio-tablet'/> <flag name='virtio-input-host'/> - <flag name='vserport-change-event'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='query-hotpluggable-cpus'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml index 69ca8b058b..4b538787cb 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml @@ -79,7 +79,6 @@ <flag name='virtio-input-host'/> <flag name='ich9-disable-s3'/> <flag name='ich9-disable-s4'/> - <flag name='vserport-change-event'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='spice-gl'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml index ff18e057f3..6117b4d840 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml @@ -70,7 +70,6 @@ <flag name='virtio-mouse'/> <flag name='virtio-tablet'/> <flag name='virtio-input-host'/> - <flag name='vserport-change-event'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='spice-gl'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml index 04e0a675b1..dedac9c0df 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml @@ -67,7 +67,6 @@ <flag name='virtio-mouse'/> <flag name='virtio-tablet'/> <flag name='virtio-input-host'/> - <flag name='vserport-change-event'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='query-hotpluggable-cpus'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml index 7eb171f433..2f060a1a51 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml @@ -79,7 +79,6 @@ <flag name='virtio-input-host'/> <flag name='ich9-disable-s3'/> <flag name='ich9-disable-s4'/> - <flag name='vserport-change-event'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='spice-gl'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml index 0c06ed1e16..b7e8cf44df 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml @@ -66,7 +66,6 @@ <flag name='virtio-mouse'/> <flag name='virtio-tablet'/> <flag name='virtio-input-host'/> - <flag name='vserport-change-event'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='query-hotpluggable-cpus'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml index c8a66bd84a..3cf16a58b0 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml @@ -79,7 +79,6 @@ <flag name='virtio-input-host'/> <flag name='ich9-disable-s3'/> <flag name='ich9-disable-s4'/> - <flag name='vserport-change-event'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='spice-gl'/> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml index c5f3236c18..3a8b677f76 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml @@ -79,7 +79,6 @@ <flag name='virtio-input-host'/> <flag name='ich9-disable-s3'/> <flag name='ich9-disable-s4'/> - <flag name='vserport-change-event'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='spice-gl'/> -- 2.37.4
On a Tuesday in 2022, Michal Privoznik wrote:
All supported QEMUs have this capability. Stop detecting it.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 1 - tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml | 1 - 29 files changed, 29 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Now that nothing uses this capability, it can be retired. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_capabilities.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 6d5d994594..17c1e7fefc 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -356,7 +356,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "chardev-file-append", /* X_QEMU_CAPS_CHARDEV_FILE_APPEND */ "ich9-disable-s3", /* QEMU_CAPS_ICH9_DISABLE_S3 */ "ich9-disable-s4", /* QEMU_CAPS_ICH9_DISABLE_S4 */ - "vserport-change-event", /* QEMU_CAPS_VSERPORT_CHANGE */ + "vserport-change-event", /* X_QEMU_CAPS_VSERPORT_CHANGE */ "virtio-balloon-pci.deflate-on-oom", /* QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE */ /* 210 */ diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index dbfa5cc1d8..884c512265 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -334,7 +334,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ X_QEMU_CAPS_CHARDEV_FILE_APPEND, /* -chardev file,append=on|off */ QEMU_CAPS_ICH9_DISABLE_S3, /* -M q35 S3 BIOS Advertisement on/off */ QEMU_CAPS_ICH9_DISABLE_S4, /* -M q35 S4 BIOS Advertisement on/off */ - QEMU_CAPS_VSERPORT_CHANGE, /* VSERPORT_CHANGE event */ + X_QEMU_CAPS_VSERPORT_CHANGE, /* VSERPORT_CHANGE event */ QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE, /* virtio-balloon-{device,pci,ccw}. * deflate-on-oom */ -- 2.37.4
On a Tuesday in 2022, Michal Privoznik wrote:
Now that nothing uses this capability, it can be retired.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_capabilities.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Introduced in QEMU's commit of v2.6.0-rc0~74^2~6 the DUMP_COMPLETED event is always available for all QEMU versions we support (4.2.0, currently). Therefore, we can assume the capability is always set and thus doesn't need to be checked for. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_driver.c | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 56b809617a..bcdd55b089 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3033,28 +3033,21 @@ qemuDumpToFd(virQEMUDriver *driver, const char *dumpformat) { qemuDomainObjPrivate *priv = vm->privateData; - bool detach = false; - int ret = -1; - - detach = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DUMP_COMPLETED); + int rc = -1; if (qemuSecuritySetImageFDLabel(driver->securityManager, vm->def, fd) < 0) return -1; - if (detach) { - qemuDomainJobSetStatsType(vm->job->current, - QEMU_DOMAIN_JOB_STATS_TYPE_MEMDUMP); - } else { - g_clear_pointer(&vm->job->current, virDomainJobDataFree); - } + qemuDomainJobSetStatsType(vm->job->current, + QEMU_DOMAIN_JOB_STATS_TYPE_MEMDUMP); if (qemuDomainObjEnterMonitorAsync(vm, asyncJob) < 0) return -1; if (dumpformat) { - ret = qemuMonitorGetDumpGuestMemoryCapability(priv->mon, dumpformat); + rc = qemuMonitorGetDumpGuestMemoryCapability(priv->mon, dumpformat); - if (ret <= 0) { + if (rc <= 0) { virReportError(VIR_ERR_INVALID_ARG, _("unsupported dumpformat '%s' " "for this QEMU binary"), @@ -3064,16 +3057,13 @@ qemuDumpToFd(virQEMUDriver *driver, } } - ret = qemuMonitorDumpToFd(priv->mon, fd, dumpformat, detach); + rc = qemuMonitorDumpToFd(priv->mon, fd, dumpformat, true); qemuDomainObjExitMonitor(vm); - if (ret < 0) + if (rc < 0) return -1; - if (detach) - ret = qemuDumpWaitForCompletion(vm); - - return ret; + return qemuDumpWaitForCompletion(vm); } -- 2.37.4
On a Tuesday in 2022, Michal Privoznik wrote:
Introduced in QEMU's commit of v2.6.0-rc0~74^2~6 the DUMP_COMPLETED event is always available for all QEMU versions we support (4.2.0, currently). Therefore, we can assume the capability is always set and thus doesn't need to be checked for.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_driver.c | 26 ++++++++------------------ 1 file changed, 8 insertions(+), 18 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
All supported QEMUs have this capability. Stop detecting it. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 13 ------------- tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml | 1 - 29 files changed, 41 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 17c1e7fefc..c9e4839829 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1231,11 +1231,6 @@ struct virQEMUCapsStringFlags virQEMUCapsMigration[] = { { "rdma-pin-all", QEMU_CAPS_MIGRATE_RDMA }, }; -/* Use virQEMUCapsQMPSchemaQueries for querying parameters of events */ -struct virQEMUCapsStringFlags virQEMUCapsEvents[] = { - { "DUMP_COMPLETED", QEMU_CAPS_DUMP_COMPLETED }, -}; - struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = { { "hda-duplex", QEMU_CAPS_HDA_DUPLEX }, { "hda-micro", QEMU_CAPS_HDA_MICRO }, @@ -5291,14 +5286,6 @@ virQEMUCapsProbeQMPSchemaCapabilities(virQEMUCaps *qemuCaps, virQEMUCapsSet(qemuCaps, entry->flag); } - /* probe also for basic event support */ - for (i = 0; i < G_N_ELEMENTS(virQEMUCapsEvents); i++) { - entry = virQEMUCapsEvents + i; - - if (virQEMUQAPISchemaPathExists(entry->value, schema)) - virQEMUCapsSet(qemuCaps, entry->flag); - } - return 0; } diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml index 5dae49b184..119d259bb9 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml @@ -84,7 +84,6 @@ <flag name='vmcoreinfo'/> <flag name='disk-share-rw'/> <flag name='pl011'/> - <flag name='dump-completed'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> <flag name='nbd-tls'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml index 5f2f420acc..ee09c8eacc 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml @@ -82,7 +82,6 @@ <flag name='spapr-vty'/> <flag name='disk-share-rw'/> <flag name='isa-serial'/> - <flag name='dump-completed'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> <flag name='nbd-tls'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml index ee638dd994..d46ab3ae73 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -48,7 +48,6 @@ <flag name='virtio-blk.num-queues'/> <flag name='sclplmconsole'/> <flag name='disk-share-rw'/> - <flag name='dump-completed'/> <flag name='virtio-gpu-ccw'/> <flag name='virtio-keyboard-ccw'/> <flag name='virtio-mouse-ccw'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml index d8a44a3cf5..0e16046efc 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -113,7 +113,6 @@ <flag name='vmcoreinfo'/> <flag name='disk-share-rw'/> <flag name='isa-serial'/> - <flag name='dump-completed'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> <flag name='nbd-tls'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml index 8ac3bdb5a4..e2cd3367ad 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml @@ -86,7 +86,6 @@ <flag name='vmcoreinfo'/> <flag name='disk-share-rw'/> <flag name='pl011'/> - <flag name='dump-completed'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> <flag name='nbd-tls'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml index a50ffc27f4..c58cff3f51 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml @@ -84,7 +84,6 @@ <flag name='spapr-vty'/> <flag name='disk-share-rw'/> <flag name='isa-serial'/> - <flag name='dump-completed'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> <flag name='nbd-tls'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml index c0f4c1e872..4f10008ffe 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml @@ -83,7 +83,6 @@ <flag name='vxhs'/> <flag name='virtio-blk.num-queues'/> <flag name='disk-share-rw'/> - <flag name='dump-completed'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> <flag name='nbd-tls'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml index 340e773acc..d53b63ad6c 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -113,7 +113,6 @@ <flag name='vmcoreinfo'/> <flag name='disk-share-rw'/> <flag name='isa-serial'/> - <flag name='dump-completed'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> <flag name='nbd-tls'/> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml index 9400ea543a..15b87106c6 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml @@ -23,7 +23,6 @@ <flag name='chardev-reconnect'/> <flag name='disk-share-rw'/> <flag name='isa-serial'/> - <flag name='dump-completed'/> <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='pr-manager-helper'/> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml index e07e9bfdd3..3a758c008f 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml @@ -112,7 +112,6 @@ <flag name='vmcoreinfo'/> <flag name='disk-share-rw'/> <flag name='isa-serial'/> - <flag name='dump-completed'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> <flag name='nbd-tls'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml index e7776bb370..f197f42e6b 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml @@ -85,7 +85,6 @@ <flag name='vmcoreinfo'/> <flag name='disk-share-rw'/> <flag name='pl011'/> - <flag name='dump-completed'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> <flag name='nbd-tls'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml index 821180ea17..b23662fe31 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml @@ -82,7 +82,6 @@ <flag name='spapr-vty'/> <flag name='disk-share-rw'/> <flag name='isa-serial'/> - <flag name='dump-completed'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> <flag name='nbd-tls'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml index 5543f34b41..0b00653aa4 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml @@ -81,7 +81,6 @@ <flag name='chardev-reconnect'/> <flag name='virtio-blk.num-queues'/> <flag name='disk-share-rw'/> - <flag name='dump-completed'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> <flag name='nbd-tls'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml index 6a4449a70c..cb4bca34a7 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml @@ -46,7 +46,6 @@ <flag name='virtio-blk.num-queues'/> <flag name='sclplmconsole'/> <flag name='disk-share-rw'/> - <flag name='dump-completed'/> <flag name='virtio-gpu-ccw'/> <flag name='virtio-keyboard-ccw'/> <flag name='virtio-mouse-ccw'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml index 40ab95425b..7647cc842f 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml @@ -112,7 +112,6 @@ <flag name='vmcoreinfo'/> <flag name='disk-share-rw'/> <flag name='isa-serial'/> - <flag name='dump-completed'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> <flag name='nbd-tls'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml index 74ff39d36a..4974ac67b3 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml @@ -86,7 +86,6 @@ <flag name='vmcoreinfo'/> <flag name='disk-share-rw'/> <flag name='pl011'/> - <flag name='dump-completed'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> <flag name='nbd-tls'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml index c56c47e1a2..8295b69d50 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml @@ -46,7 +46,6 @@ <flag name='virtio-blk.num-queues'/> <flag name='sclplmconsole'/> <flag name='disk-share-rw'/> - <flag name='dump-completed'/> <flag name='virtio-gpu-ccw'/> <flag name='virtio-keyboard-ccw'/> <flag name='virtio-mouse-ccw'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml index b01ffe84d6..a2a77735ba 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml @@ -111,7 +111,6 @@ <flag name='vmcoreinfo'/> <flag name='disk-share-rw'/> <flag name='isa-serial'/> - <flag name='dump-completed'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> <flag name='nbd-tls'/> diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml index 6a706201c7..caca79d93b 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml @@ -110,7 +110,6 @@ <flag name='vmcoreinfo'/> <flag name='disk-share-rw'/> <flag name='isa-serial'/> - <flag name='dump-completed'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> <flag name='nbd-tls'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml index f9667a6d3c..7d71c820b3 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml @@ -93,7 +93,6 @@ <flag name='vmcoreinfo'/> <flag name='disk-share-rw'/> <flag name='pl011'/> - <flag name='dump-completed'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> <flag name='nbd-tls'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml index c632b7daa4..86f262d727 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml @@ -82,7 +82,6 @@ <flag name='spapr-vty'/> <flag name='disk-share-rw'/> <flag name='isa-serial'/> - <flag name='dump-completed'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> <flag name='nbd-tls'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml index 4b538787cb..04a0617883 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml @@ -110,7 +110,6 @@ <flag name='vmcoreinfo'/> <flag name='disk-share-rw'/> <flag name='isa-serial'/> - <flag name='dump-completed'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> <flag name='nbd-tls'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml index 6117b4d840..1d70e827ba 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml @@ -93,7 +93,6 @@ <flag name='vmcoreinfo'/> <flag name='disk-share-rw'/> <flag name='pl011'/> - <flag name='dump-completed'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> <flag name='nbd-tls'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml index dedac9c0df..a2810cb3a8 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml @@ -88,7 +88,6 @@ <flag name='spapr-vty'/> <flag name='disk-share-rw'/> <flag name='isa-serial'/> - <flag name='dump-completed'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> <flag name='nbd-tls'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml index 2f060a1a51..eef749e7a2 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml @@ -110,7 +110,6 @@ <flag name='vmcoreinfo'/> <flag name='disk-share-rw'/> <flag name='isa-serial'/> - <flag name='dump-completed'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> <flag name='nbd-tls'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml index b7e8cf44df..7dd04c5c90 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml @@ -87,7 +87,6 @@ <flag name='spapr-vty'/> <flag name='disk-share-rw'/> <flag name='isa-serial'/> - <flag name='dump-completed'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> <flag name='nbd-tls'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml index 3cf16a58b0..8f45f61f3a 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml @@ -110,7 +110,6 @@ <flag name='vmcoreinfo'/> <flag name='disk-share-rw'/> <flag name='isa-serial'/> - <flag name='dump-completed'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> <flag name='nbd-tls'/> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml index 3a8b677f76..d8c00b3496 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml @@ -110,7 +110,6 @@ <flag name='vmcoreinfo'/> <flag name='disk-share-rw'/> <flag name='isa-serial'/> - <flag name='dump-completed'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> <flag name='nbd-tls'/> -- 2.37.4
On a Tuesday in 2022, Michal Privoznik wrote:
All supported QEMUs have this capability. Stop detecting it.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 13 ------------- tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml | 1 - 29 files changed, 41 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Now that nothing uses this capability, it can be retired. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_capabilities.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index c9e4839829..abb7bb09fd 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -458,7 +458,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "machine.pseries.max-cpu-compat", /* X_QEMU_CAPS_MACHINE_PSERIES_MAX_CPU_COMPAT */ /* 280 */ - "dump-completed", /* QEMU_CAPS_DUMP_COMPLETED */ + "dump-completed", /* X_QEMU_CAPS_DUMP_COMPLETED */ "virtio-gpu-ccw", /* QEMU_CAPS_DEVICE_VIRTIO_GPU_CCW */ "virtio-keyboard-ccw", /* QEMU_CAPS_DEVICE_VIRTIO_KEYBOARD_CCW */ "virtio-mouse-ccw", /* QEMU_CAPS_DEVICE_VIRTIO_MOUSE_CCW */ diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 884c512265..c993eaab67 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -437,7 +437,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ X_QEMU_CAPS_MACHINE_PSERIES_MAX_CPU_COMPAT, /* -machine pseries,max-cpu-compat= */ /* 280 */ - QEMU_CAPS_DUMP_COMPLETED, /* DUMP_COMPLETED event */ + X_QEMU_CAPS_DUMP_COMPLETED, /* DUMP_COMPLETED event */ QEMU_CAPS_DEVICE_VIRTIO_GPU_CCW, /* -device virtio-gpu-ccw */ QEMU_CAPS_DEVICE_VIRTIO_KEYBOARD_CCW, /* -device virtio-keyboard-ccw */ QEMU_CAPS_DEVICE_VIRTIO_MOUSE_CCW, /* -device virtio-mouse-ccw */ -- 2.37.4
On a Tuesday in 2022, Michal Privoznik wrote:
Now that nothing uses this capability, it can be retired.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_capabilities.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Introduced in QEMU's commit of v2.12.0-rc0~48^2~25 the qom-list-properties command is always available for all QEMU versions we support (4.2.0, currently). Therefore, we can assume the capability is always set and thus doesn't need to be checked for. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index abb7bb09fd..cfde657394 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2634,9 +2634,6 @@ virQEMUCapsProbeQMPObjectProperties(virQEMUCaps *qemuCaps, { size_t i; - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_QOM_LIST_PROPERTIES)) - return 0; - for (i = 0; i < G_N_ELEMENTS(virQEMUCapsObjectProps); i++) { virQEMUCapsObjectTypeProps *props = virQEMUCapsObjectProps + i; g_auto(GStrv) values = NULL; @@ -2859,9 +2856,6 @@ virQEMUCapsProbeQMPMachineProps(virQEMUCaps *qemuCaps, { size_t i; - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_QOM_LIST_PROPERTIES)) - return 0; - for (i = 0; i < G_N_ELEMENTS(virQEMUCapsMachineProps); i++) { virQEMUCapsObjectTypeProps props = virQEMUCapsMachineProps[i]; const char *canon = virQEMUCapsGetCanonicalMachine(qemuCaps, virtType, props.type); -- 2.37.4
On a Tuesday in 2022, Michal Privoznik wrote:
Introduced in QEMU's commit of v2.12.0-rc0~48^2~25 the qom-list-properties command is always available for all QEMU versions we support (4.2.0, currently). Therefore, we can assume the capability is always set and thus doesn't need to be checked for.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 6 ------ 1 file changed, 6 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
All supported QEMUs have this capability. Stop detecting it. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 1 - tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml | 1 - 29 files changed, 29 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index cfde657394..ec1077eac5 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1211,7 +1211,6 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = { { "query-hotpluggable-cpus", QEMU_CAPS_QUERY_HOTPLUGGABLE_CPUS }, { "query-cpu-model-expansion", QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION }, { "query-cpu-definitions", QEMU_CAPS_QUERY_CPU_DEFINITIONS }, - { "qom-list-properties", QEMU_CAPS_QOM_LIST_PROPERTIES }, { "query-current-machine", QEMU_CAPS_QUERY_CURRENT_MACHINE }, { "block-dirty-bitmap-merge", QEMU_CAPS_BITMAP_MERGE }, { "query-cpu-model-baseline", QEMU_CAPS_QUERY_CPU_MODEL_BASELINE }, diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml index 119d259bb9..4981fd2f2b 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml @@ -88,7 +88,6 @@ <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='pr-manager-helper'/> - <flag name='qom-list-properties'/> <flag name='screendump_device'/> <flag name='hda-output'/> <flag name='vhost-vsock'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml index ee09c8eacc..eb6d221822 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml @@ -86,7 +86,6 @@ <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='pr-manager-helper'/> - <flag name='qom-list-properties'/> <flag name='screendump_device'/> <flag name='hda-output'/> <flag name='vhost-vsock'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml index d46ab3ae73..5999e3b610 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -55,7 +55,6 @@ <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='pr-manager-helper'/> - <flag name='qom-list-properties'/> <flag name='vfio-ccw'/> <flag name='screendump_device'/> <flag name='vhost-vsock'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml index 0e16046efc..246d2ca3d4 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -118,7 +118,6 @@ <flag name='nbd-tls'/> <flag name='tpm-crb'/> <flag name='pr-manager-helper'/> - <flag name='qom-list-properties'/> <flag name='screendump_device'/> <flag name='hda-output'/> <flag name='vmgenid'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml index e2cd3367ad..21f7e48fd3 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml @@ -90,7 +90,6 @@ <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='pr-manager-helper'/> - <flag name='qom-list-properties'/> <flag name='screendump_device'/> <flag name='hda-output'/> <flag name='vhost-vsock'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml index c58cff3f51..ccd3cab037 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml @@ -88,7 +88,6 @@ <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='pr-manager-helper'/> - <flag name='qom-list-properties'/> <flag name='screendump_device'/> <flag name='hda-output'/> <flag name='vhost-vsock'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml index 4f10008ffe..adf9837944 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml @@ -87,7 +87,6 @@ <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='pr-manager-helper'/> - <flag name='qom-list-properties'/> <flag name='screendump_device'/> <flag name='hda-output'/> <flag name='vhost-vsock'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml index d53b63ad6c..a8835e3f96 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -118,7 +118,6 @@ <flag name='nbd-tls'/> <flag name='tpm-crb'/> <flag name='pr-manager-helper'/> - <flag name='qom-list-properties'/> <flag name='screendump_device'/> <flag name='hda-output'/> <flag name='vmgenid'/> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml index 15b87106c6..cb5d5e7887 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml @@ -26,7 +26,6 @@ <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='pr-manager-helper'/> - <flag name='qom-list-properties'/> <flag name='screendump_device'/> <flag name='egl-headless'/> <flag name='memory-backend-memfd'/> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml index 3a758c008f..7e0f6f1c83 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml @@ -117,7 +117,6 @@ <flag name='nbd-tls'/> <flag name='tpm-crb'/> <flag name='pr-manager-helper'/> - <flag name='qom-list-properties'/> <flag name='screendump_device'/> <flag name='hda-output'/> <flag name='vmgenid'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml index f197f42e6b..978fbd5a31 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml @@ -89,7 +89,6 @@ <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='pr-manager-helper'/> - <flag name='qom-list-properties'/> <flag name='screendump_device'/> <flag name='hda-output'/> <flag name='vhost-vsock'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml index b23662fe31..da014a388a 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml @@ -86,7 +86,6 @@ <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='pr-manager-helper'/> - <flag name='qom-list-properties'/> <flag name='screendump_device'/> <flag name='hda-output'/> <flag name='vhost-vsock'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml index 0b00653aa4..8d21e35c0c 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml @@ -85,7 +85,6 @@ <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='pr-manager-helper'/> - <flag name='qom-list-properties'/> <flag name='screendump_device'/> <flag name='hda-output'/> <flag name='vhost-vsock'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml index cb4bca34a7..90c7cf67c3 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml @@ -53,7 +53,6 @@ <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='pr-manager-helper'/> - <flag name='qom-list-properties'/> <flag name='vfio-ccw'/> <flag name='screendump_device'/> <flag name='vhost-vsock'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml index 7647cc842f..4da05d14f8 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml @@ -117,7 +117,6 @@ <flag name='nbd-tls'/> <flag name='tpm-crb'/> <flag name='pr-manager-helper'/> - <flag name='qom-list-properties'/> <flag name='screendump_device'/> <flag name='hda-output'/> <flag name='vmgenid'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml index 4974ac67b3..64beda4672 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml @@ -90,7 +90,6 @@ <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='pr-manager-helper'/> - <flag name='qom-list-properties'/> <flag name='screendump_device'/> <flag name='hda-output'/> <flag name='vhost-vsock'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml index 8295b69d50..92dd5ec668 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml @@ -53,7 +53,6 @@ <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='pr-manager-helper'/> - <flag name='qom-list-properties'/> <flag name='vfio-ccw'/> <flag name='screendump_device'/> <flag name='vhost-vsock'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml index a2a77735ba..e6e7d3c484 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml @@ -116,7 +116,6 @@ <flag name='nbd-tls'/> <flag name='tpm-crb'/> <flag name='pr-manager-helper'/> - <flag name='qom-list-properties'/> <flag name='screendump_device'/> <flag name='hda-output'/> <flag name='vmgenid'/> diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml index caca79d93b..7c8492fb7d 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml @@ -115,7 +115,6 @@ <flag name='nbd-tls'/> <flag name='tpm-crb'/> <flag name='pr-manager-helper'/> - <flag name='qom-list-properties'/> <flag name='screendump_device'/> <flag name='hda-output'/> <flag name='vmgenid'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml index 7d71c820b3..fd5f7286c5 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml @@ -97,7 +97,6 @@ <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='pr-manager-helper'/> - <flag name='qom-list-properties'/> <flag name='screendump_device'/> <flag name='hda-output'/> <flag name='vhost-vsock'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml index 86f262d727..20e2df81ac 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml @@ -86,7 +86,6 @@ <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='pr-manager-helper'/> - <flag name='qom-list-properties'/> <flag name='screendump_device'/> <flag name='hda-output'/> <flag name='vhost-vsock'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml index 04a0617883..907ed522ac 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml @@ -115,7 +115,6 @@ <flag name='nbd-tls'/> <flag name='tpm-crb'/> <flag name='pr-manager-helper'/> - <flag name='qom-list-properties'/> <flag name='screendump_device'/> <flag name='hda-output'/> <flag name='vmgenid'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml index 1d70e827ba..c229e33bb6 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml @@ -97,7 +97,6 @@ <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='pr-manager-helper'/> - <flag name='qom-list-properties'/> <flag name='screendump_device'/> <flag name='hda-output'/> <flag name='vhost-vsock'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml index a2810cb3a8..e839d2b3f8 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml @@ -92,7 +92,6 @@ <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='pr-manager-helper'/> - <flag name='qom-list-properties'/> <flag name='screendump_device'/> <flag name='hda-output'/> <flag name='vhost-vsock'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml index eef749e7a2..6ee9bf5930 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml @@ -115,7 +115,6 @@ <flag name='nbd-tls'/> <flag name='tpm-crb'/> <flag name='pr-manager-helper'/> - <flag name='qom-list-properties'/> <flag name='screendump_device'/> <flag name='hda-output'/> <flag name='vmgenid'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml index 7dd04c5c90..03841b54ab 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml @@ -91,7 +91,6 @@ <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='pr-manager-helper'/> - <flag name='qom-list-properties'/> <flag name='screendump_device'/> <flag name='hda-output'/> <flag name='vhost-vsock'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml index 8f45f61f3a..13ca5a0027 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml @@ -115,7 +115,6 @@ <flag name='nbd-tls'/> <flag name='tpm-crb'/> <flag name='pr-manager-helper'/> - <flag name='qom-list-properties'/> <flag name='screendump_device'/> <flag name='hda-output'/> <flag name='vmgenid'/> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml index d8c00b3496..e8c175f247 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml @@ -115,7 +115,6 @@ <flag name='nbd-tls'/> <flag name='tpm-crb'/> <flag name='pr-manager-helper'/> - <flag name='qom-list-properties'/> <flag name='screendump_device'/> <flag name='hda-output'/> <flag name='vmgenid'/> -- 2.37.4
On a Tuesday in 2022, Michal Privoznik wrote:
All supported QEMUs have this capability. Stop detecting it.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 1 - tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml | 1 - 29 files changed, 29 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Now that nothing uses this capability, it can be retired. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_capabilities.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index ec1077eac5..4223d0e1fe 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -475,7 +475,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "nbd-tls", /* QEMU_CAPS_NBD_TLS */ "tpm-crb", /* QEMU_CAPS_DEVICE_TPM_CRB */ "pr-manager-helper", /* QEMU_CAPS_PR_MANAGER_HELPER */ - "qom-list-properties", /* QEMU_CAPS_QOM_LIST_PROPERTIES */ + "qom-list-properties", /* X_QEMU_CAPS_QOM_LIST_PROPERTIES */ "memory-backend-file.discard-data", /* X_QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD */ /* 295 */ diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index c993eaab67..83994be86b 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -454,7 +454,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ QEMU_CAPS_NBD_TLS, /* NBD server supports TLS transport */ QEMU_CAPS_DEVICE_TPM_CRB, /* -device tpm-crb */ QEMU_CAPS_PR_MANAGER_HELPER, /* -object pr-manager-helper */ - QEMU_CAPS_QOM_LIST_PROPERTIES, /* qom-list-properties monitor command */ + X_QEMU_CAPS_QOM_LIST_PROPERTIES, /* qom-list-properties monitor command */ X_QEMU_CAPS_OBJECT_MEMORY_FILE_DISCARD, /* -object memory-backend-file,discard-data */ /* 295 */ -- 2.37.4
On a Tuesday in 2022, Michal Privoznik wrote:
Now that nothing uses this capability, it can be retired.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_capabilities.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Introduced in QEMU's commit of v4.0.0-rc0~202^2~3 the query-current-machine command is always available for all QEMU versions we support (4.2.0, currently). Therefore, we can assume the capability is always set and thus doesn't need to be checked for. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_driver.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index bcdd55b089..d793c0f52d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16307,12 +16307,8 @@ static int qemuDomainQueryWakeupSuspendSupport(virDomainObj *vm, bool *wakeupSupported) { - qemuDomainObjPrivate *priv = vm->privateData; int ret = -1; - if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_QUERY_CURRENT_MACHINE)) - return -1; - if (virDomainObjBeginJob(vm, VIR_JOB_QUERY) < 0) return -1; @@ -16389,13 +16385,6 @@ qemuDomainPMSuspendForDuration(virDomainPtr dom, if (!qemuDomainAgentAvailable(vm, true)) goto cleanup; - /* - * The case we want to handle here is when QEMU has the API (i.e. - * QEMU_CAPS_QUERY_CURRENT_MACHINE is set). Otherwise, do not interfere - * with the suspend process. This means that existing running domains, - * that don't know about this cap, will keep their old behavior of - * suspending 'in the dark'. - */ if (qemuDomainQueryWakeupSuspendSupport(vm, &wakeupSupported) == 0) { if (!wakeupSupported) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", -- 2.37.4
On a Tuesday in 2022, Michal Privoznik wrote:
Introduced in QEMU's commit of v4.0.0-rc0~202^2~3 the query-current-machine command is always available for all QEMU versions we support (4.2.0, currently). Therefore, we can assume the capability is always set and thus doesn't need to be checked for.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_driver.c | 11 ----------- 1 file changed, 11 deletions(-)
diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index bcdd55b089..d793c0f52d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16307,12 +16307,8 @@ static int qemuDomainQueryWakeupSuspendSupport(virDomainObj *vm, bool *wakeupSupported) { - qemuDomainObjPrivate *priv = vm->privateData; int ret = -1;
- if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_QUERY_CURRENT_MACHINE)) - return -1; - if (virDomainObjBeginJob(vm, VIR_JOB_QUERY) < 0) return -1;
@@ -16389,13 +16385,6 @@ qemuDomainPMSuspendForDuration(virDomainPtr dom, if (!qemuDomainAgentAvailable(vm, true)) goto cleanup;
- /* - * The case we want to handle here is when QEMU has the API (i.e. - * QEMU_CAPS_QUERY_CURRENT_MACHINE is set). Otherwise, do not interfere - * with the suspend process. This means that existing running domains, - * that don't know about this cap, will keep their old behavior of - * suspending 'in the dark'. - */ if (qemuDomainQueryWakeupSuspendSupport(vm, &wakeupSupported) == 0) {
If query-current-machine is supported by all QEMUs, then we should error out if this cannot be probed. Jano
if (!wakeupSupported) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", -- 2.37.4
All supported QEMUs have this capability. Stop detecting it. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 1 - tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml | 1 - 29 files changed, 29 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 4223d0e1fe..42f2c77061 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1211,7 +1211,6 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = { { "query-hotpluggable-cpus", QEMU_CAPS_QUERY_HOTPLUGGABLE_CPUS }, { "query-cpu-model-expansion", QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION }, { "query-cpu-definitions", QEMU_CAPS_QUERY_CPU_DEFINITIONS }, - { "query-current-machine", QEMU_CAPS_QUERY_CURRENT_MACHINE }, { "block-dirty-bitmap-merge", QEMU_CAPS_BITMAP_MERGE }, { "query-cpu-model-baseline", QEMU_CAPS_QUERY_CPU_MODEL_BASELINE }, { "query-cpu-model-comparison", QEMU_CAPS_QUERY_CPU_MODEL_COMPARISON }, diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml index 4981fd2f2b..ccb2c48947 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml @@ -99,7 +99,6 @@ <flag name='egl-headless.rendernode'/> <flag name='memory-backend-file.pmem'/> <flag name='virtio-pci-non-transitional'/> - <flag name='query-current-machine'/> <flag name='machine.virt.iommu'/> <flag name='bitmap-merge'/> <flag name='nbd-bitmap'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml index eb6d221822..f9e6fa70d2 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml @@ -100,7 +100,6 @@ <flag name='egl-headless.rendernode'/> <flag name='memory-backend-file.pmem'/> <flag name='virtio-pci-non-transitional'/> - <flag name='query-current-machine'/> <flag name='bitmap-merge'/> <flag name='nbd-bitmap'/> <flag name='bochs-display'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml index 5999e3b610..5f813be761 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -68,7 +68,6 @@ <flag name='egl-headless.rendernode'/> <flag name='memory-backend-file.pmem'/> <flag name='virtio-pci-non-transitional'/> - <flag name='query-current-machine'/> <flag name='bitmap-merge'/> <flag name='nbd-bitmap'/> <flag name='migration-file-drop-cache'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml index 246d2ca3d4..48dc757437 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -134,7 +134,6 @@ <flag name='memory-backend-file.pmem'/> <flag name='nvdimm.unarmed'/> <flag name='virtio-pci-non-transitional'/> - <flag name='query-current-machine'/> <flag name='bitmap-merge'/> <flag name='nbd-bitmap'/> <flag name='x86-max-cpu'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml index 21f7e48fd3..1b5efa794b 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml @@ -102,7 +102,6 @@ <flag name='egl-headless.rendernode'/> <flag name='memory-backend-file.pmem'/> <flag name='virtio-pci-non-transitional'/> - <flag name='query-current-machine'/> <flag name='machine.virt.iommu'/> <flag name='bitmap-merge'/> <flag name='nbd-bitmap'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml index ccd3cab037..1048ca36f6 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml @@ -104,7 +104,6 @@ <flag name='memory-backend-file.pmem'/> <flag name='nvdimm.unarmed'/> <flag name='virtio-pci-non-transitional'/> - <flag name='query-current-machine'/> <flag name='bitmap-merge'/> <flag name='nbd-bitmap'/> <flag name='bochs-display'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml index adf9837944..18f2f64b6f 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml @@ -98,7 +98,6 @@ <flag name='egl-headless.rendernode'/> <flag name='memory-backend-file.pmem'/> <flag name='virtio-pci-non-transitional'/> - <flag name='query-current-machine'/> <flag name='bitmap-merge'/> <flag name='nbd-bitmap'/> <flag name='bochs-display'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml index a8835e3f96..2685aef4a1 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -134,7 +134,6 @@ <flag name='memory-backend-file.pmem'/> <flag name='nvdimm.unarmed'/> <flag name='virtio-pci-non-transitional'/> - <flag name='query-current-machine'/> <flag name='bitmap-merge'/> <flag name='nbd-bitmap'/> <flag name='x86-max-cpu'/> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml index cb5d5e7887..87ec61c159 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml @@ -33,7 +33,6 @@ <flag name='iothread.poll-max-ns'/> <flag name='egl-headless.rendernode'/> <flag name='memory-backend-file.pmem'/> - <flag name='query-current-machine'/> <flag name='bitmap-merge'/> <flag name='nbd-bitmap'/> <flag name='migration-file-drop-cache'/> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml index 7e0f6f1c83..6df3bcbb63 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml @@ -133,7 +133,6 @@ <flag name='memory-backend-file.pmem'/> <flag name='nvdimm.unarmed'/> <flag name='virtio-pci-non-transitional'/> - <flag name='query-current-machine'/> <flag name='bitmap-merge'/> <flag name='nbd-bitmap'/> <flag name='x86-max-cpu'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml index 978fbd5a31..f9bd66200e 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml @@ -102,7 +102,6 @@ <flag name='memory-backend-file.pmem'/> <flag name='nvdimm.unarmed'/> <flag name='virtio-pci-non-transitional'/> - <flag name='query-current-machine'/> <flag name='machine.virt.iommu'/> <flag name='bitmap-merge'/> <flag name='nbd-bitmap'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml index da014a388a..5b4e360388 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml @@ -102,7 +102,6 @@ <flag name='memory-backend-file.pmem'/> <flag name='nvdimm.unarmed'/> <flag name='virtio-pci-non-transitional'/> - <flag name='query-current-machine'/> <flag name='bitmap-merge'/> <flag name='nbd-bitmap'/> <flag name='bochs-display'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml index 8d21e35c0c..e5e50743a0 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml @@ -96,7 +96,6 @@ <flag name='egl-headless.rendernode'/> <flag name='memory-backend-file.pmem'/> <flag name='virtio-pci-non-transitional'/> - <flag name='query-current-machine'/> <flag name='bitmap-merge'/> <flag name='nbd-bitmap'/> <flag name='bochs-display'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml index 90c7cf67c3..b2d7a90f15 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml @@ -66,7 +66,6 @@ <flag name='egl-headless.rendernode'/> <flag name='memory-backend-file.pmem'/> <flag name='virtio-pci-non-transitional'/> - <flag name='query-current-machine'/> <flag name='bitmap-merge'/> <flag name='nbd-bitmap'/> <flag name='migration-file-drop-cache'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml index 4da05d14f8..4ad736a7f2 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml @@ -133,7 +133,6 @@ <flag name='memory-backend-file.pmem'/> <flag name='nvdimm.unarmed'/> <flag name='virtio-pci-non-transitional'/> - <flag name='query-current-machine'/> <flag name='bitmap-merge'/> <flag name='nbd-bitmap'/> <flag name='x86-max-cpu'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml index 64beda4672..ba08da19ae 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml @@ -102,7 +102,6 @@ <flag name='egl-headless.rendernode'/> <flag name='nvdimm.unarmed'/> <flag name='virtio-pci-non-transitional'/> - <flag name='query-current-machine'/> <flag name='machine.virt.iommu'/> <flag name='bitmap-merge'/> <flag name='nbd-bitmap'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml index 92dd5ec668..f5d231c2e0 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml @@ -65,7 +65,6 @@ <flag name='iothread.poll-max-ns'/> <flag name='egl-headless.rendernode'/> <flag name='virtio-pci-non-transitional'/> - <flag name='query-current-machine'/> <flag name='bitmap-merge'/> <flag name='nbd-bitmap'/> <flag name='migration-file-drop-cache'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml index e6e7d3c484..9b781fd3fe 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml @@ -133,7 +133,6 @@ <flag name='memory-backend-file.pmem'/> <flag name='nvdimm.unarmed'/> <flag name='virtio-pci-non-transitional'/> - <flag name='query-current-machine'/> <flag name='bitmap-merge'/> <flag name='nbd-bitmap'/> <flag name='x86-max-cpu'/> diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml index 7c8492fb7d..ed8b12c3af 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml @@ -131,7 +131,6 @@ <flag name='memory-backend-file.pmem'/> <flag name='nvdimm.unarmed'/> <flag name='virtio-pci-non-transitional'/> - <flag name='query-current-machine'/> <flag name='bitmap-merge'/> <flag name='nbd-bitmap'/> <flag name='x86-max-cpu'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml index fd5f7286c5..b333eb402d 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml @@ -109,7 +109,6 @@ <flag name='egl-headless.rendernode'/> <flag name='nvdimm.unarmed'/> <flag name='virtio-pci-non-transitional'/> - <flag name='query-current-machine'/> <flag name='machine.virt.iommu'/> <flag name='bitmap-merge'/> <flag name='nbd-bitmap'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml index 20e2df81ac..5127408d73 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml @@ -99,7 +99,6 @@ <flag name='machine.pseries.cap-nested-hv'/> <flag name='nvdimm.unarmed'/> <flag name='virtio-pci-non-transitional'/> - <flag name='query-current-machine'/> <flag name='bitmap-merge'/> <flag name='nbd-bitmap'/> <flag name='bochs-display'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml index 907ed522ac..0347f5f812 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml @@ -131,7 +131,6 @@ <flag name='memory-backend-file.pmem'/> <flag name='nvdimm.unarmed'/> <flag name='virtio-pci-non-transitional'/> - <flag name='query-current-machine'/> <flag name='bitmap-merge'/> <flag name='nbd-bitmap'/> <flag name='x86-max-cpu'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml index c229e33bb6..75e77af3f0 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml @@ -109,7 +109,6 @@ <flag name='egl-headless.rendernode'/> <flag name='nvdimm.unarmed'/> <flag name='virtio-pci-non-transitional'/> - <flag name='query-current-machine'/> <flag name='machine.virt.iommu'/> <flag name='bitmap-merge'/> <flag name='nbd-bitmap'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml index e839d2b3f8..d8f4404e5a 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml @@ -108,7 +108,6 @@ <flag name='memory-backend-file.pmem'/> <flag name='nvdimm.unarmed'/> <flag name='virtio-pci-non-transitional'/> - <flag name='query-current-machine'/> <flag name='bitmap-merge'/> <flag name='nbd-bitmap'/> <flag name='bochs-display'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml index 6ee9bf5930..7d7478e520 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml @@ -131,7 +131,6 @@ <flag name='memory-backend-file.pmem'/> <flag name='nvdimm.unarmed'/> <flag name='virtio-pci-non-transitional'/> - <flag name='query-current-machine'/> <flag name='bitmap-merge'/> <flag name='nbd-bitmap'/> <flag name='x86-max-cpu'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml index 03841b54ab..f9f7e59ee9 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml @@ -105,7 +105,6 @@ <flag name='memory-backend-file.pmem'/> <flag name='nvdimm.unarmed'/> <flag name='virtio-pci-non-transitional'/> - <flag name='query-current-machine'/> <flag name='bitmap-merge'/> <flag name='nbd-bitmap'/> <flag name='bochs-display'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml index 13ca5a0027..efa91653d4 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml @@ -131,7 +131,6 @@ <flag name='memory-backend-file.pmem'/> <flag name='nvdimm.unarmed'/> <flag name='virtio-pci-non-transitional'/> - <flag name='query-current-machine'/> <flag name='bitmap-merge'/> <flag name='nbd-bitmap'/> <flag name='x86-max-cpu'/> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml index e8c175f247..50ae2b15c1 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml @@ -131,7 +131,6 @@ <flag name='memory-backend-file.pmem'/> <flag name='nvdimm.unarmed'/> <flag name='virtio-pci-non-transitional'/> - <flag name='query-current-machine'/> <flag name='bitmap-merge'/> <flag name='nbd-bitmap'/> <flag name='x86-max-cpu'/> -- 2.37.4
On a Tuesday in 2022, Michal Privoznik wrote:
All supported QEMUs have this capability. Stop detecting it.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 1 - tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml | 1 - 29 files changed, 29 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Now that nothing uses this capability, it can be retired. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_capabilities.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 42f2c77061..93a9275196 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -524,7 +524,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "scsi-disk.device_id", /* X_QEMU_CAPS_SCSI_DISK_DEVICE_ID */ "virtio-pci-non-transitional", /* QEMU_CAPS_VIRTIO_PCI_TRANSITIONAL */ "overcommit", /* X_QEMU_CAPS_OVERCOMMIT */ - "query-current-machine", /* QEMU_CAPS_QUERY_CURRENT_MACHINE */ + "query-current-machine", /* X_QEMU_CAPS_QUERY_CURRENT_MACHINE */ "machine.virt.iommu", /* QEMU_CAPS_MACHINE_VIRT_IOMMU */ /* 330 */ diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 83994be86b..cccb6bad83 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -503,7 +503,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ X_QEMU_CAPS_SCSI_DISK_DEVICE_ID, /* 'device_id' property of scsi disk */ QEMU_CAPS_VIRTIO_PCI_TRANSITIONAL, /* virtio *-pci-{non-}transitional devices */ X_QEMU_CAPS_OVERCOMMIT, /* -overcommit */ - QEMU_CAPS_QUERY_CURRENT_MACHINE, /* query-current-machine command */ + X_QEMU_CAPS_QUERY_CURRENT_MACHINE, /* query-current-machine command */ QEMU_CAPS_MACHINE_VIRT_IOMMU, /* -machine virt,iommu */ /* 330 */ -- 2.37.4
On a Tuesday in 2022, Michal Privoznik wrote:
Now that nothing uses this capability, it can be retired.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_capabilities.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
All supported QEMUs have this capability. Stop detecting it. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 1 - tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml | 1 - 29 files changed, 29 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 93a9275196..a16abbd02a 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1211,7 +1211,6 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = { { "query-hotpluggable-cpus", QEMU_CAPS_QUERY_HOTPLUGGABLE_CPUS }, { "query-cpu-model-expansion", QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION }, { "query-cpu-definitions", QEMU_CAPS_QUERY_CPU_DEFINITIONS }, - { "block-dirty-bitmap-merge", QEMU_CAPS_BITMAP_MERGE }, { "query-cpu-model-baseline", QEMU_CAPS_QUERY_CPU_MODEL_BASELINE }, { "query-cpu-model-comparison", QEMU_CAPS_QUERY_CPU_MODEL_COMPARISON }, { "block-export-add", QEMU_CAPS_BLOCK_EXPORT_ADD }, diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml index ccb2c48947..d00ebaa0aa 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml @@ -100,7 +100,6 @@ <flag name='memory-backend-file.pmem'/> <flag name='virtio-pci-non-transitional'/> <flag name='machine.virt.iommu'/> - <flag name='bitmap-merge'/> <flag name='nbd-bitmap'/> <flag name='bochs-display'/> <flag name='migration-file-drop-cache'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml index f9e6fa70d2..3d4b99246e 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml @@ -100,7 +100,6 @@ <flag name='egl-headless.rendernode'/> <flag name='memory-backend-file.pmem'/> <flag name='virtio-pci-non-transitional'/> - <flag name='bitmap-merge'/> <flag name='nbd-bitmap'/> <flag name='bochs-display'/> <flag name='migration-file-drop-cache'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml index 5f813be761..05539c5822 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -68,7 +68,6 @@ <flag name='egl-headless.rendernode'/> <flag name='memory-backend-file.pmem'/> <flag name='virtio-pci-non-transitional'/> - <flag name='bitmap-merge'/> <flag name='nbd-bitmap'/> <flag name='migration-file-drop-cache'/> <flag name='vhost-user-gpu'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml index 48dc757437..6a16855793 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -134,7 +134,6 @@ <flag name='memory-backend-file.pmem'/> <flag name='nvdimm.unarmed'/> <flag name='virtio-pci-non-transitional'/> - <flag name='bitmap-merge'/> <flag name='nbd-bitmap'/> <flag name='x86-max-cpu'/> <flag name='cpu-unavailable-features'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml index 1b5efa794b..2f19631357 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml @@ -103,7 +103,6 @@ <flag name='memory-backend-file.pmem'/> <flag name='virtio-pci-non-transitional'/> <flag name='machine.virt.iommu'/> - <flag name='bitmap-merge'/> <flag name='nbd-bitmap'/> <flag name='bochs-display'/> <flag name='migration-file-drop-cache'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml index 1048ca36f6..3bde244867 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml @@ -104,7 +104,6 @@ <flag name='memory-backend-file.pmem'/> <flag name='nvdimm.unarmed'/> <flag name='virtio-pci-non-transitional'/> - <flag name='bitmap-merge'/> <flag name='nbd-bitmap'/> <flag name='bochs-display'/> <flag name='migration-file-drop-cache'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml index 18f2f64b6f..a7b2645933 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml @@ -98,7 +98,6 @@ <flag name='egl-headless.rendernode'/> <flag name='memory-backend-file.pmem'/> <flag name='virtio-pci-non-transitional'/> - <flag name='bitmap-merge'/> <flag name='nbd-bitmap'/> <flag name='bochs-display'/> <flag name='migration-file-drop-cache'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml index 2685aef4a1..28a67ce62f 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -134,7 +134,6 @@ <flag name='memory-backend-file.pmem'/> <flag name='nvdimm.unarmed'/> <flag name='virtio-pci-non-transitional'/> - <flag name='bitmap-merge'/> <flag name='nbd-bitmap'/> <flag name='x86-max-cpu'/> <flag name='cpu-unavailable-features'/> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml index 87ec61c159..7bd777592f 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml @@ -33,7 +33,6 @@ <flag name='iothread.poll-max-ns'/> <flag name='egl-headless.rendernode'/> <flag name='memory-backend-file.pmem'/> - <flag name='bitmap-merge'/> <flag name='nbd-bitmap'/> <flag name='migration-file-drop-cache'/> <flag name='dbus-vmstate'/> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml index 6df3bcbb63..bd38a09580 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml @@ -133,7 +133,6 @@ <flag name='memory-backend-file.pmem'/> <flag name='nvdimm.unarmed'/> <flag name='virtio-pci-non-transitional'/> - <flag name='bitmap-merge'/> <flag name='nbd-bitmap'/> <flag name='x86-max-cpu'/> <flag name='cpu-unavailable-features'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml index f9bd66200e..02d5cbf811 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml @@ -103,7 +103,6 @@ <flag name='nvdimm.unarmed'/> <flag name='virtio-pci-non-transitional'/> <flag name='machine.virt.iommu'/> - <flag name='bitmap-merge'/> <flag name='nbd-bitmap'/> <flag name='bochs-display'/> <flag name='migration-file-drop-cache'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml index 5b4e360388..7a8e1bfaf5 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml @@ -102,7 +102,6 @@ <flag name='memory-backend-file.pmem'/> <flag name='nvdimm.unarmed'/> <flag name='virtio-pci-non-transitional'/> - <flag name='bitmap-merge'/> <flag name='nbd-bitmap'/> <flag name='bochs-display'/> <flag name='migration-file-drop-cache'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml index e5e50743a0..543f8cccdb 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml @@ -96,7 +96,6 @@ <flag name='egl-headless.rendernode'/> <flag name='memory-backend-file.pmem'/> <flag name='virtio-pci-non-transitional'/> - <flag name='bitmap-merge'/> <flag name='nbd-bitmap'/> <flag name='bochs-display'/> <flag name='migration-file-drop-cache'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml index b2d7a90f15..2ff49c542f 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml @@ -66,7 +66,6 @@ <flag name='egl-headless.rendernode'/> <flag name='memory-backend-file.pmem'/> <flag name='virtio-pci-non-transitional'/> - <flag name='bitmap-merge'/> <flag name='nbd-bitmap'/> <flag name='migration-file-drop-cache'/> <flag name='dbus-vmstate'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml index 4ad736a7f2..b712ba2f79 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml @@ -133,7 +133,6 @@ <flag name='memory-backend-file.pmem'/> <flag name='nvdimm.unarmed'/> <flag name='virtio-pci-non-transitional'/> - <flag name='bitmap-merge'/> <flag name='nbd-bitmap'/> <flag name='x86-max-cpu'/> <flag name='cpu-unavailable-features'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml index ba08da19ae..7ad223562e 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml @@ -103,7 +103,6 @@ <flag name='nvdimm.unarmed'/> <flag name='virtio-pci-non-transitional'/> <flag name='machine.virt.iommu'/> - <flag name='bitmap-merge'/> <flag name='nbd-bitmap'/> <flag name='bochs-display'/> <flag name='migration-file-drop-cache'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml index f5d231c2e0..ca14707e00 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml @@ -65,7 +65,6 @@ <flag name='iothread.poll-max-ns'/> <flag name='egl-headless.rendernode'/> <flag name='virtio-pci-non-transitional'/> - <flag name='bitmap-merge'/> <flag name='nbd-bitmap'/> <flag name='migration-file-drop-cache'/> <flag name='dbus-vmstate'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml index 9b781fd3fe..1744f632e7 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml @@ -133,7 +133,6 @@ <flag name='memory-backend-file.pmem'/> <flag name='nvdimm.unarmed'/> <flag name='virtio-pci-non-transitional'/> - <flag name='bitmap-merge'/> <flag name='nbd-bitmap'/> <flag name='x86-max-cpu'/> <flag name='cpu-unavailable-features'/> diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml index ed8b12c3af..2cd81bf751 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml @@ -131,7 +131,6 @@ <flag name='memory-backend-file.pmem'/> <flag name='nvdimm.unarmed'/> <flag name='virtio-pci-non-transitional'/> - <flag name='bitmap-merge'/> <flag name='nbd-bitmap'/> <flag name='x86-max-cpu'/> <flag name='cpu-unavailable-features'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml index b333eb402d..2b8ea4b605 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml @@ -110,7 +110,6 @@ <flag name='nvdimm.unarmed'/> <flag name='virtio-pci-non-transitional'/> <flag name='machine.virt.iommu'/> - <flag name='bitmap-merge'/> <flag name='nbd-bitmap'/> <flag name='bochs-display'/> <flag name='migration-file-drop-cache'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml index 5127408d73..387ff140c7 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml @@ -99,7 +99,6 @@ <flag name='machine.pseries.cap-nested-hv'/> <flag name='nvdimm.unarmed'/> <flag name='virtio-pci-non-transitional'/> - <flag name='bitmap-merge'/> <flag name='nbd-bitmap'/> <flag name='bochs-display'/> <flag name='migration-file-drop-cache'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml index 0347f5f812..e374621a44 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml @@ -131,7 +131,6 @@ <flag name='memory-backend-file.pmem'/> <flag name='nvdimm.unarmed'/> <flag name='virtio-pci-non-transitional'/> - <flag name='bitmap-merge'/> <flag name='nbd-bitmap'/> <flag name='x86-max-cpu'/> <flag name='cpu-unavailable-features'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml index 75e77af3f0..08aa68581e 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml @@ -110,7 +110,6 @@ <flag name='nvdimm.unarmed'/> <flag name='virtio-pci-non-transitional'/> <flag name='machine.virt.iommu'/> - <flag name='bitmap-merge'/> <flag name='nbd-bitmap'/> <flag name='bochs-display'/> <flag name='migration-file-drop-cache'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml index d8f4404e5a..84f38f5df2 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml @@ -108,7 +108,6 @@ <flag name='memory-backend-file.pmem'/> <flag name='nvdimm.unarmed'/> <flag name='virtio-pci-non-transitional'/> - <flag name='bitmap-merge'/> <flag name='nbd-bitmap'/> <flag name='bochs-display'/> <flag name='migration-file-drop-cache'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml index 7d7478e520..c2465fad4e 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml @@ -131,7 +131,6 @@ <flag name='memory-backend-file.pmem'/> <flag name='nvdimm.unarmed'/> <flag name='virtio-pci-non-transitional'/> - <flag name='bitmap-merge'/> <flag name='nbd-bitmap'/> <flag name='x86-max-cpu'/> <flag name='cpu-unavailable-features'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml index f9f7e59ee9..a847b2ca19 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml @@ -105,7 +105,6 @@ <flag name='memory-backend-file.pmem'/> <flag name='nvdimm.unarmed'/> <flag name='virtio-pci-non-transitional'/> - <flag name='bitmap-merge'/> <flag name='nbd-bitmap'/> <flag name='bochs-display'/> <flag name='migration-file-drop-cache'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml index efa91653d4..2192d1cef1 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml @@ -131,7 +131,6 @@ <flag name='memory-backend-file.pmem'/> <flag name='nvdimm.unarmed'/> <flag name='virtio-pci-non-transitional'/> - <flag name='bitmap-merge'/> <flag name='nbd-bitmap'/> <flag name='x86-max-cpu'/> <flag name='cpu-unavailable-features'/> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml index 50ae2b15c1..259769bd8a 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml @@ -131,7 +131,6 @@ <flag name='memory-backend-file.pmem'/> <flag name='nvdimm.unarmed'/> <flag name='virtio-pci-non-transitional'/> - <flag name='bitmap-merge'/> <flag name='nbd-bitmap'/> <flag name='x86-max-cpu'/> <flag name='cpu-unavailable-features'/> -- 2.37.4
On a Tuesday in 2022, Michal Privoznik wrote:
All supported QEMUs have this capability. Stop detecting it.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 1 - tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml | 1 - 29 files changed, 29 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Now that nothing uses this capability, it can be retired. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_capabilities.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index a16abbd02a..5393764844 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -528,7 +528,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "machine.virt.iommu", /* QEMU_CAPS_MACHINE_VIRT_IOMMU */ /* 330 */ - "bitmap-merge", /* QEMU_CAPS_BITMAP_MERGE */ + "bitmap-merge", /* X_QEMU_CAPS_BITMAP_MERGE */ "nbd-bitmap", /* QEMU_CAPS_NBD_BITMAP */ "x86-max-cpu", /* QEMU_CAPS_X86_MAX_CPU */ "cpu-unavailable-features", /* QEMU_CAPS_CPU_UNAVAILABLE_FEATURES */ diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index cccb6bad83..813b300838 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -507,7 +507,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ QEMU_CAPS_MACHINE_VIRT_IOMMU, /* -machine virt,iommu */ /* 330 */ - QEMU_CAPS_BITMAP_MERGE, /* block-dirty-bitmap-merge */ + X_QEMU_CAPS_BITMAP_MERGE, /* block-dirty-bitmap-merge */ QEMU_CAPS_NBD_BITMAP, /* nbd-server-add supports bitmap */ QEMU_CAPS_X86_MAX_CPU, /* max-x86_64-cpu type exists */ QEMU_CAPS_CPU_UNAVAILABLE_FEATURES, /* "unavailable-features" CPU property */ -- 2.37.4
On a Tuesday in 2022, Michal Privoznik wrote:
Now that nothing uses this capability, it can be retired.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_capabilities.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Introduced in QEMU's commit of v3.1.0-rc3~8^2 the query-display-options command is always available for all QEMU versions we support (4.2.0, currently). Therefore, we can assume the capability is always set and thus doesn't need to be checked for. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 5393764844..b2c28b91ad 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -5227,13 +5227,6 @@ virQEMUCapsInitProcessCapsInterlock(virQEMUCaps *qemuCaps) static void virQEMUCapsInitProcessCaps(virQEMUCaps *qemuCaps) { - /* versions prior to the introduction of 'query-display-options' had SDL - * mostly compiled in */ - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_DISPLAY_OPTIONS)) { - virQEMUCapsSet(qemuCaps, QEMU_CAPS_SDL); - virQEMUCapsSet(qemuCaps, QEMU_CAPS_EGL_HEADLESS); - } - if (ARCH_IS_X86(qemuCaps->arch) && virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION)) { virQEMUCapsSet(qemuCaps, QEMU_CAPS_CPU_CACHE); -- 2.37.4
On a Tuesday in 2022, Michal Privoznik wrote:
Introduced in QEMU's commit of v3.1.0-rc3~8^2 the query-display-options command is always available for all QEMU versions we support (4.2.0, currently). Therefore, we can assume the capability is always set and thus doesn't need to be checked for.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 7 ------- 1 file changed, 7 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
All supported QEMUs have this capability. Stop detecting it. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 1 - tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml | 1 - 29 files changed, 29 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index b2c28b91ad..55fafcec21 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1214,7 +1214,6 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = { { "query-cpu-model-baseline", QEMU_CAPS_QUERY_CPU_MODEL_BASELINE }, { "query-cpu-model-comparison", QEMU_CAPS_QUERY_CPU_MODEL_COMPARISON }, { "block-export-add", QEMU_CAPS_BLOCK_EXPORT_ADD }, - { "query-display-options", QEMU_CAPS_QUERY_DISPLAY_OPTIONS }, { "blockdev-reopen", QEMU_CAPS_BLOCKDEV_REOPEN }, { "set-action", QEMU_CAPS_SET_ACTION }, { "query-dirty-rate", QEMU_CAPS_QUERY_DIRTY_RATE }, diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml index d00ebaa0aa..d240a0da7d 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml @@ -121,7 +121,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='rotation-rate'/> <flag name='input-linux'/> - <flag name='query-display-options'/> <flag name='virtio-blk.queue-size'/> <flag name='usb-host.guest-resets-all'/> <version>4002000</version> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml index 3d4b99246e..c766c0cf4a 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml @@ -123,7 +123,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='rotation-rate'/> <flag name='input-linux'/> - <flag name='query-display-options'/> <flag name='virtio-blk.queue-size'/> <flag name='usb-host.guest-resets-all'/> <version>4002000</version> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml index 05539c5822..2bd0530e5e 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -85,7 +85,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='rotation-rate'/> <flag name='input-linux'/> - <flag name='query-display-options'/> <flag name='virtio-blk.queue-size'/> <flag name='usb-host.guest-resets-all'/> <version>4002000</version> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml index 6a16855793..919f6363ba 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -162,7 +162,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='rotation-rate'/> <flag name='input-linux'/> - <flag name='query-display-options'/> <flag name='virtio-blk.queue-size'/> <flag name='usb-host.guest-resets-all'/> <version>4002000</version> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml index 2f19631357..e380e137fb 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml @@ -131,7 +131,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='rotation-rate'/> <flag name='input-linux'/> - <flag name='query-display-options'/> <flag name='virtio-blk.queue-size'/> <flag name='memory-backend-file.prealloc-threads'/> <flag name='virtio-iommu-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml index 3bde244867..9a689e43f6 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml @@ -137,7 +137,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='rotation-rate'/> <flag name='input-linux'/> - <flag name='query-display-options'/> <flag name='virtio-blk.queue-size'/> <flag name='memory-backend-file.prealloc-threads'/> <flag name='virtio-iommu-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml index a7b2645933..b6bf1b0509 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml @@ -123,7 +123,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='rotation-rate'/> <flag name='input-linux'/> - <flag name='query-display-options'/> <flag name='virtio-blk.queue-size'/> <flag name='memory-backend-file.prealloc-threads'/> <flag name='virtio-iommu-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml index 28a67ce62f..6fb38e874e 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -169,7 +169,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='rotation-rate'/> <flag name='input-linux'/> - <flag name='query-display-options'/> <flag name='virtio-blk.queue-size'/> <flag name='memory-backend-file.prealloc-threads'/> <flag name='virtio-iommu-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml index 7bd777592f..48e001b60f 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml @@ -50,7 +50,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='rotation-rate'/> <flag name='input-linux'/> - <flag name='query-display-options'/> <flag name='memory-backend-file.prealloc-threads'/> <version>5001000</version> <kvmVersion>0</kvmVersion> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml index bd38a09580..3f5577d84f 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml @@ -171,7 +171,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='rotation-rate'/> <flag name='input-linux'/> - <flag name='query-display-options'/> <flag name='virtio-blk.queue-size'/> <flag name='virtio-mem-pci'/> <flag name='memory-backend-file.prealloc-threads'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml index 02d5cbf811..1df8f486b2 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml @@ -135,7 +135,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='rotation-rate'/> <flag name='input-linux'/> - <flag name='query-display-options'/> <flag name='virtio-blk.queue-size'/> <flag name='query-dirty-rate'/> <flag name='calc-dirty-rate'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml index 7a8e1bfaf5..ff358bff1e 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml @@ -139,7 +139,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='rotation-rate'/> <flag name='input-linux'/> - <flag name='query-display-options'/> <flag name='virtio-blk.queue-size'/> <flag name='query-dirty-rate'/> <flag name='calc-dirty-rate'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml index 543f8cccdb..06691ae0e7 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml @@ -125,7 +125,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='rotation-rate'/> <flag name='input-linux'/> - <flag name='query-display-options'/> <flag name='virtio-blk.queue-size'/> <flag name='query-dirty-rate'/> <flag name='calc-dirty-rate'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml index 2ff49c542f..06c4107783 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml @@ -92,7 +92,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='rotation-rate'/> <flag name='input-linux'/> - <flag name='query-display-options'/> <flag name='virtio-blk.queue-size'/> <flag name='query-dirty-rate'/> <flag name='calc-dirty-rate'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml index b712ba2f79..eaed31c884 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml @@ -172,7 +172,6 @@ <flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/> <flag name='rotation-rate'/> <flag name='input-linux'/> - <flag name='query-display-options'/> <flag name='virtio-blk.queue-size'/> <flag name='virtio-mem-pci'/> <flag name='piix4.acpi-root-pci-hotplug'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml index 7ad223562e..b26666c418 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml @@ -142,7 +142,6 @@ <flag name='acpi-index'/> <flag name='input-linux'/> <flag name='confidential-guest-support'/> - <flag name='query-display-options'/> <flag name='set-action'/> <flag name='virtio-blk.queue-size'/> <flag name='query-dirty-rate'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml index ca14707e00..ee3e832914 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml @@ -98,7 +98,6 @@ <flag name='acpi-index'/> <flag name='input-linux'/> <flag name='confidential-guest-support'/> - <flag name='query-display-options'/> <flag name='s390-pv-guest'/> <flag name='set-action'/> <flag name='virtio-blk.queue-size'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml index 1744f632e7..d8432886a2 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml @@ -179,7 +179,6 @@ <flag name='acpi-index'/> <flag name='input-linux'/> <flag name='confidential-guest-support'/> - <flag name='query-display-options'/> <flag name='set-action'/> <flag name='virtio-blk.queue-size'/> <flag name='virtio-mem-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml index 2cd81bf751..2236289dce 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml @@ -181,7 +181,6 @@ <flag name='virtio-gpu-gl-pci'/> <flag name='virtio-vga-gl'/> <flag name='confidential-guest-support'/> - <flag name='query-display-options'/> <flag name='set-action'/> <flag name='virtio-blk.queue-size'/> <flag name='virtio-mem-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml index 2b8ea4b605..954ad8d9c1 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml @@ -151,7 +151,6 @@ <flag name='acpi-index'/> <flag name='input-linux'/> <flag name='confidential-guest-support'/> - <flag name='query-display-options'/> <flag name='set-action'/> <flag name='virtio-blk.queue-size'/> <flag name='memory-backend-file.reserve'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml index 387ff140c7..9bad8cf7d1 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml @@ -144,7 +144,6 @@ <flag name='acpi-index'/> <flag name='input-linux'/> <flag name='confidential-guest-support'/> - <flag name='query-display-options'/> <flag name='set-action'/> <flag name='virtio-blk.queue-size'/> <flag name='memory-backend-file.reserve'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml index e374621a44..ce275745f7 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml @@ -181,7 +181,6 @@ <flag name='virtio-gpu-gl-pci'/> <flag name='virtio-vga-gl'/> <flag name='confidential-guest-support'/> - <flag name='query-display-options'/> <flag name='set-action'/> <flag name='virtio-blk.queue-size'/> <flag name='virtio-mem-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml index 08aa68581e..dee827f4ff 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml @@ -152,7 +152,6 @@ <flag name='acpi-index'/> <flag name='input-linux'/> <flag name='confidential-guest-support'/> - <flag name='query-display-options'/> <flag name='set-action'/> <flag name='virtio-blk.queue-size'/> <flag name='virtio-mem-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml index 84f38f5df2..88171e1312 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml @@ -157,7 +157,6 @@ <flag name='virtio-gpu-gl-pci'/> <flag name='virtio-vga-gl'/> <flag name='confidential-guest-support'/> - <flag name='query-display-options'/> <flag name='set-action'/> <flag name='virtio-blk.queue-size'/> <flag name='memory-backend-file.reserve'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml index c2465fad4e..6a1116d28b 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml @@ -181,7 +181,6 @@ <flag name='virtio-gpu-gl-pci'/> <flag name='virtio-vga-gl'/> <flag name='confidential-guest-support'/> - <flag name='query-display-options'/> <flag name='set-action'/> <flag name='virtio-blk.queue-size'/> <flag name='virtio-mem-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml index a847b2ca19..96a71a19c6 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml @@ -153,7 +153,6 @@ <flag name='virtio-gpu-gl-pci'/> <flag name='virtio-vga-gl'/> <flag name='confidential-guest-support'/> - <flag name='query-display-options'/> <flag name='set-action'/> <flag name='virtio-blk.queue-size'/> <flag name='memory-backend-file.reserve'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml index 2192d1cef1..e41e456597 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml @@ -181,7 +181,6 @@ <flag name='virtio-gpu-gl-pci'/> <flag name='virtio-vga-gl'/> <flag name='confidential-guest-support'/> - <flag name='query-display-options'/> <flag name='set-action'/> <flag name='virtio-blk.queue-size'/> <flag name='virtio-mem-pci'/> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml index 259769bd8a..7d93fce389 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml @@ -181,7 +181,6 @@ <flag name='virtio-gpu-gl-pci'/> <flag name='virtio-vga-gl'/> <flag name='confidential-guest-support'/> - <flag name='query-display-options'/> <flag name='set-action'/> <flag name='virtio-blk.queue-size'/> <flag name='virtio-mem-pci'/> -- 2.37.4
On a Tuesday in 2022, Michal Privoznik wrote:
All supported QEMUs have this capability. Stop detecting it.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 1 - tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml | 1 - 29 files changed, 29 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Now that nothing uses this capability, it can be retired. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_capabilities.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 55fafcec21..1f28c7c772 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -634,7 +634,7 @@ VIR_ENUM_IMPL(virQEMUCaps, /* 405 */ "confidential-guest-support", /* QEMU_CAPS_MACHINE_CONFIDENTAL_GUEST_SUPPORT */ - "query-display-options", /* QEMU_CAPS_QUERY_DISPLAY_OPTIONS */ + "query-display-options", /* X_QEMU_CAPS_QUERY_DISPLAY_OPTIONS */ "s390-pv-guest", /* QEMU_CAPS_S390_PV_GUEST */ "set-action", /* QEMU_CAPS_SET_ACTION */ "virtio-blk.queue-size", /* QEMU_CAPS_VIRTIO_BLK_QUEUE_SIZE */ diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 813b300838..995fd0399e 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -613,7 +613,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ /* 405 */ QEMU_CAPS_MACHINE_CONFIDENTAL_GUEST_SUPPORT, /* -machine confidential-guest-support */ - QEMU_CAPS_QUERY_DISPLAY_OPTIONS, /* 'query-display-options' qmp command present */ + X_QEMU_CAPS_QUERY_DISPLAY_OPTIONS, /* 'query-display-options' qmp command present */ QEMU_CAPS_S390_PV_GUEST, /* -object s390-pv-guest,... */ QEMU_CAPS_SET_ACTION, /* 'set-action' QMP command */ QEMU_CAPS_VIRTIO_BLK_QUEUE_SIZE, /* virtio-blk-*.queue-size */ -- 2.37.4
On a Tuesday in 2022, Michal Privoznik wrote:
Now that nothing uses this capability, it can be retired.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_capabilities.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Introduced in QEMU's commit of v2.8.0-rc0~116^2~26 the .rx_queue_size attribute of virtio-net device is always available for all QEMU versions we support (4.2.0, currently). Therefore, we can assume the capability is always set and thus doesn't need to be checked for. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_validate.c | 6 ------ tests/qemuxml2argvtest.c | 4 +--- tests/qemuxml2xmltest.c | 1 - 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 78c68a99d0..74631378c6 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -1866,12 +1866,6 @@ qemuValidateDomainDeviceDefNetwork(const virDomainNetDef *net, _("rx_queue_size has to be a power of two")); return -1; } - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SIZE)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("virtio rx_queue_size option is not supported " - "with this QEMU binary")); - return -1; - } } if (net->driver.virtio.tx_queue_size) { diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index dd2460bc0b..98ba6633f8 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1466,10 +1466,8 @@ mymain(void) DO_TEST_NOCAPS("net-virtio-netdev"); DO_TEST_CAPS_ARCH_LATEST("net-virtio-ccw", "s390x"); DO_TEST("net-virtio-rxtxqueuesize", - QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SIZE, QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE); - DO_TEST_PARSE_ERROR("net-virtio-rxqueuesize-invalid-size", - QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SIZE); + DO_TEST_PARSE_ERROR_NOCAPS("net-virtio-rxqueuesize-invalid-size"); DO_TEST("net-virtio-teaming", QEMU_CAPS_VIRTIO_NET_FAILOVER, QEMU_CAPS_DEVICE_VFIO_PCI); diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 45e16ce02d..22397f209f 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -468,7 +468,6 @@ mymain(void) DO_TEST_NOCAPS("net-eth-unmanaged-tap"); DO_TEST_NOCAPS("net-virtio-network-portgroup"); DO_TEST("net-virtio-rxtxqueuesize", - QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SIZE, QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE); DO_TEST("net-virtio-teaming", QEMU_CAPS_VIRTIO_NET_FAILOVER, -- 2.37.4
On a Tuesday in 2022, Michal Privoznik wrote:
Introduced in QEMU's commit of v2.8.0-rc0~116^2~26 the .rx_queue_size attribute of virtio-net device is always available for all QEMU versions we support (4.2.0, currently). Therefore, we can assume the capability is always set and thus doesn't need to be checked for.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_validate.c | 6 ------ tests/qemuxml2argvtest.c | 4 +--- tests/qemuxml2xmltest.c | 1 - 3 files changed, 1 insertion(+), 10 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
All supported QEMUs have this capability. Stop detecting it. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 1 - tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml | 1 - 28 files changed, 28 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 1f28c7c772..29a2cf6aaa 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1424,7 +1424,6 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioBlk[] = { }; static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioNet[] = { - { "rx_queue_size", QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SIZE, NULL }, { "tx_queue_size", QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE, NULL }, { "host_mtu", QEMU_CAPS_VIRTIO_NET_HOST_MTU, NULL }, { "failover", QEMU_CAPS_VIRTIO_NET_FAILOVER, NULL }, diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml index d240a0da7d..89f64801f9 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml @@ -68,7 +68,6 @@ <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='query-hotpluggable-cpus'/> - <flag name='virtio-net.rx_queue_size'/> <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> <flag name='vhost-scsi'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml index c766c0cf4a..76cd22ca55 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml @@ -64,7 +64,6 @@ <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='query-hotpluggable-cpus'/> - <flag name='virtio-net.rx_queue_size'/> <flag name='virtio-vga'/> <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml index 2bd0530e5e..80845b2eff 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -36,7 +36,6 @@ <flag name='virtio-input-host'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='query-hotpluggable-cpus'/> - <flag name='virtio-net.rx_queue_size'/> <flag name='vhost-scsi'/> <flag name='query-cpu-model-expansion'/> <flag name='virtio-net.host_mtu'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml index 919f6363ba..773575996f 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -89,7 +89,6 @@ <flag name='pxb-pcie'/> <flag name='intel-iommu'/> <flag name='query-hotpluggable-cpus'/> - <flag name='virtio-net.rx_queue_size'/> <flag name='virtio-vga'/> <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml index e380e137fb..b3a415db32 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml @@ -70,7 +70,6 @@ <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='query-hotpluggable-cpus'/> - <flag name='virtio-net.rx_queue_size'/> <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> <flag name='vhost-scsi'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml index 9a689e43f6..5ec1468373 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml @@ -65,7 +65,6 @@ <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='query-hotpluggable-cpus'/> - <flag name='virtio-net.rx_queue_size'/> <flag name='virtio-vga'/> <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml index b6bf1b0509..cc54899152 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml @@ -70,7 +70,6 @@ <flag name='mptsas1068'/> <flag name='spice-gl'/> <flag name='query-hotpluggable-cpus'/> - <flag name='virtio-net.rx_queue_size'/> <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> <flag name='vhost-scsi'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml index 6fb38e874e..6d07593242 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -89,7 +89,6 @@ <flag name='pxb-pcie'/> <flag name='intel-iommu'/> <flag name='query-hotpluggable-cpus'/> - <flag name='virtio-net.rx_queue_size'/> <flag name='virtio-vga'/> <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml index 3f5577d84f..af6d109c6e 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml @@ -89,7 +89,6 @@ <flag name='pxb-pcie'/> <flag name='intel-iommu'/> <flag name='query-hotpluggable-cpus'/> - <flag name='virtio-net.rx_queue_size'/> <flag name='virtio-vga'/> <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml index 1df8f486b2..59412be9f2 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml @@ -69,7 +69,6 @@ <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='query-hotpluggable-cpus'/> - <flag name='virtio-net.rx_queue_size'/> <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> <flag name='vhost-scsi'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml index ff358bff1e..8071c6f551 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml @@ -64,7 +64,6 @@ <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='query-hotpluggable-cpus'/> - <flag name='virtio-net.rx_queue_size'/> <flag name='virtio-vga'/> <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml index 06691ae0e7..ac0facce09 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml @@ -69,7 +69,6 @@ <flag name='mptsas1068'/> <flag name='spice-gl'/> <flag name='query-hotpluggable-cpus'/> - <flag name='virtio-net.rx_queue_size'/> <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> <flag name='vhost-scsi'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml index 06c4107783..69d7a30822 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml @@ -35,7 +35,6 @@ <flag name='virtio-input-host'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='query-hotpluggable-cpus'/> - <flag name='virtio-net.rx_queue_size'/> <flag name='vhost-scsi'/> <flag name='query-cpu-model-expansion'/> <flag name='virtio-net.host_mtu'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml index eaed31c884..6cd627dafb 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml @@ -89,7 +89,6 @@ <flag name='pxb-pcie'/> <flag name='intel-iommu'/> <flag name='query-hotpluggable-cpus'/> - <flag name='virtio-net.rx_queue_size'/> <flag name='virtio-vga'/> <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml index b26666c418..e011b87c17 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml @@ -70,7 +70,6 @@ <flag name='pxb'/> <flag name='pxb-pcie'/> <flag name='query-hotpluggable-cpus'/> - <flag name='virtio-net.rx_queue_size'/> <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> <flag name='vhost-scsi'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml index ee3e832914..6ef18440be 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml @@ -35,7 +35,6 @@ <flag name='virtio-input-host'/> <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='query-hotpluggable-cpus'/> - <flag name='virtio-net.rx_queue_size'/> <flag name='vhost-scsi'/> <flag name='query-cpu-model-expansion'/> <flag name='virtio-net.host_mtu'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml index d8432886a2..4e986cb73a 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml @@ -88,7 +88,6 @@ <flag name='pxb-pcie'/> <flag name='intel-iommu'/> <flag name='query-hotpluggable-cpus'/> - <flag name='virtio-net.rx_queue_size'/> <flag name='virtio-vga'/> <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml index 2236289dce..8a11065be6 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml @@ -87,7 +87,6 @@ <flag name='pxb-pcie'/> <flag name='intel-iommu'/> <flag name='query-hotpluggable-cpus'/> - <flag name='virtio-net.rx_queue_size'/> <flag name='virtio-vga'/> <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml index 954ad8d9c1..65aaeed167 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml @@ -76,7 +76,6 @@ <flag name='pxb'/> <flag name='pxb-pcie'/> <flag name='query-hotpluggable-cpus'/> - <flag name='virtio-net.rx_queue_size'/> <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> <flag name='vhost-scsi'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml index 9bad8cf7d1..b5a17ece5f 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml @@ -64,7 +64,6 @@ <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='query-hotpluggable-cpus'/> - <flag name='virtio-net.rx_queue_size'/> <flag name='virtio-vga'/> <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml index ce275745f7..f92a93a801 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml @@ -87,7 +87,6 @@ <flag name='pxb-pcie'/> <flag name='intel-iommu'/> <flag name='query-hotpluggable-cpus'/> - <flag name='virtio-net.rx_queue_size'/> <flag name='virtio-vga'/> <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml index dee827f4ff..9c07f29d4c 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml @@ -76,7 +76,6 @@ <flag name='pxb'/> <flag name='pxb-pcie'/> <flag name='query-hotpluggable-cpus'/> - <flag name='virtio-net.rx_queue_size'/> <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> <flag name='vhost-scsi'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml index 88171e1312..d7c24dac4d 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml @@ -70,7 +70,6 @@ <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='query-hotpluggable-cpus'/> - <flag name='virtio-net.rx_queue_size'/> <flag name='virtio-vga'/> <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml index 6a1116d28b..d6a162c4b1 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml @@ -87,7 +87,6 @@ <flag name='pxb-pcie'/> <flag name='intel-iommu'/> <flag name='query-hotpluggable-cpus'/> - <flag name='virtio-net.rx_queue_size'/> <flag name='virtio-vga'/> <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml index 96a71a19c6..b378c1cd3b 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml @@ -69,7 +69,6 @@ <flag name='virtio-balloon-pci.deflate-on-oom'/> <flag name='mptsas1068'/> <flag name='query-hotpluggable-cpus'/> - <flag name='virtio-net.rx_queue_size'/> <flag name='virtio-vga'/> <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml index e41e456597..b8e7fc5eee 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml @@ -87,7 +87,6 @@ <flag name='pxb-pcie'/> <flag name='intel-iommu'/> <flag name='query-hotpluggable-cpus'/> - <flag name='virtio-net.rx_queue_size'/> <flag name='virtio-vga'/> <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml index 7d93fce389..5ff97b088d 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml @@ -87,7 +87,6 @@ <flag name='pxb-pcie'/> <flag name='intel-iommu'/> <flag name='query-hotpluggable-cpus'/> - <flag name='virtio-net.rx_queue_size'/> <flag name='virtio-vga'/> <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> -- 2.37.4
On a Tuesday in 2022, Michal Privoznik wrote:
All supported QEMUs have this capability. Stop detecting it.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 1 - tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml | 1 - 28 files changed, 28 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Now that nothing uses this capability, it can be retired. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_capabilities.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 29a2cf6aaa..e511c279c4 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -391,7 +391,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "smm", /* X_QEMU_CAPS_MACHINE_SMM_OPT */ "virtio-pci-disable-legacy", /* X_QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY */ "query-hotpluggable-cpus", /* QEMU_CAPS_QUERY_HOTPLUGGABLE_CPUS */ - "virtio-net.rx_queue_size", /* QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SIZE */ + "virtio-net.rx_queue_size", /* X_QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SIZE */ "machine-iommu", /* X_QEMU_CAPS_MACHINE_IOMMU */ /* 235 */ diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 995fd0399e..6fcbb5026b 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -370,7 +370,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ X_QEMU_CAPS_MACHINE_SMM_OPT, /* -machine xxx,smm=on/off/auto */ X_QEMU_CAPS_VIRTIO_PCI_DISABLE_LEGACY, /* virtio-*pci.disable-legacy */ QEMU_CAPS_QUERY_HOTPLUGGABLE_CPUS, /* qmp command query-hotpluggable-cpus */ - QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SIZE, /* virtio-net-*.rx_queue_size */ + X_QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SIZE, /* virtio-net-*.rx_queue_size */ X_QEMU_CAPS_MACHINE_IOMMU, /* -machine iommu=on */ /* 235 */ -- 2.37.4
On a Tuesday in 2022, Michal Privoznik wrote:
Now that nothing uses this capability, it can be retired.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_capabilities.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Introduced in QEMU's commit of v2.10.0-rc0~95^2~20 the .tx_queue_size attribute of virtio-net device is always available for all QEMU versions we support (4.2.0, currently). Therefore, we can assume the capability is always set and thus doesn't need to be checked for. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_validate.c | 6 ------ tests/qemuxml2argvtest.c | 3 +-- tests/qemuxml2xmltest.c | 3 +-- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 74631378c6..88f2aa8c49 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -1874,12 +1874,6 @@ qemuValidateDomainDeviceDefNetwork(const virDomainNetDef *net, _("tx_queue_size has to be a power of two")); return -1; } - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("virtio tx_queue_size option is not supported " - "with this QEMU binary")); - return -1; - } } if (net->driver.virtio.rss && diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 98ba6633f8..029e60947f 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1465,8 +1465,7 @@ mymain(void) DO_TEST_NOCAPS("net-virtio-disable-offloads"); DO_TEST_NOCAPS("net-virtio-netdev"); DO_TEST_CAPS_ARCH_LATEST("net-virtio-ccw", "s390x"); - DO_TEST("net-virtio-rxtxqueuesize", - QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE); + DO_TEST_NOCAPS("net-virtio-rxtxqueuesize"); DO_TEST_PARSE_ERROR_NOCAPS("net-virtio-rxqueuesize-invalid-size"); DO_TEST("net-virtio-teaming", QEMU_CAPS_VIRTIO_NET_FAILOVER, diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 22397f209f..e8261b7e8c 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -467,8 +467,7 @@ mymain(void) DO_TEST_NOCAPS("net-eth-hostip"); DO_TEST_NOCAPS("net-eth-unmanaged-tap"); DO_TEST_NOCAPS("net-virtio-network-portgroup"); - DO_TEST("net-virtio-rxtxqueuesize", - QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE); + DO_TEST_NOCAPS("net-virtio-rxtxqueuesize"); DO_TEST("net-virtio-teaming", QEMU_CAPS_VIRTIO_NET_FAILOVER, QEMU_CAPS_DEVICE_VFIO_PCI); -- 2.37.4
On a Tuesday in 2022, Michal Privoznik wrote:
Introduced in QEMU's commit of v2.10.0-rc0~95^2~20 the .tx_queue_size attribute of virtio-net device is always available for all QEMU versions we support (4.2.0, currently). Therefore, we can assume the capability is always set and thus doesn't need to be checked for.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_validate.c | 6 ------ tests/qemuxml2argvtest.c | 3 +-- tests/qemuxml2xmltest.c | 3 +-- 3 files changed, 2 insertions(+), 10 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
All supported QEMUs have this capability. Stop detecting it. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 1 - tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml | 1 - 28 files changed, 28 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index e511c279c4..7091cc3a25 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1424,7 +1424,6 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioBlk[] = { }; static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioNet[] = { - { "tx_queue_size", QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE, NULL }, { "host_mtu", QEMU_CAPS_VIRTIO_NET_HOST_MTU, NULL }, { "failover", QEMU_CAPS_VIRTIO_NET_FAILOVER, NULL }, { "acpi-index", QEMU_CAPS_ACPI_INDEX, NULL }, diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml index 89f64801f9..dee48940c2 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml @@ -76,7 +76,6 @@ <flag name='pcie-root-port'/> <flag name='query-cpu-definitions'/> <flag name='qemu-xhci'/> - <flag name='virtio-net.tx_queue_size'/> <flag name='chardev-reconnect'/> <flag name='vxhs'/> <flag name='virtio-blk.num-queues'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml index 76cd22ca55..a3a0cd6f6f 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml @@ -74,7 +74,6 @@ <flag name='qemu-xhci'/> <flag name='spapr-pci-host-bridge'/> <flag name='spapr-pci-host-bridge.numa_node'/> - <flag name='virtio-net.tx_queue_size'/> <flag name='chardev-reconnect'/> <flag name='vxhs'/> <flag name='virtio-blk.num-queues'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml index 80845b2eff..6e93dffe7d 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -41,7 +41,6 @@ <flag name='virtio-net.host_mtu'/> <flag name='query-cpu-definitions'/> <flag name='loadparm'/> - <flag name='virtio-net.tx_queue_size'/> <flag name='chardev-reconnect'/> <flag name='vxhs'/> <flag name='virtio-blk.num-queues'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml index 773575996f..fab759da81 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -105,7 +105,6 @@ <flag name='intel-iommu.caching-mode'/> <flag name='intel-iommu.eim'/> <flag name='intel-iommu.device-iotlb'/> - <flag name='virtio-net.tx_queue_size'/> <flag name='chardev-reconnect'/> <flag name='vxhs'/> <flag name='virtio-blk.num-queues'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml index b3a415db32..8eb16fb09f 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml @@ -78,7 +78,6 @@ <flag name='pcie-root-port'/> <flag name='query-cpu-definitions'/> <flag name='qemu-xhci'/> - <flag name='virtio-net.tx_queue_size'/> <flag name='chardev-reconnect'/> <flag name='vxhs'/> <flag name='virtio-blk.num-queues'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml index 5ec1468373..2a9d308ede 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml @@ -76,7 +76,6 @@ <flag name='qemu-xhci'/> <flag name='spapr-pci-host-bridge'/> <flag name='spapr-pci-host-bridge.numa_node'/> - <flag name='virtio-net.tx_queue_size'/> <flag name='chardev-reconnect'/> <flag name='vxhs'/> <flag name='virtio-blk.num-queues'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml index cc54899152..8f6bdc9138 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml @@ -77,7 +77,6 @@ <flag name='spice-rendernode'/> <flag name='pcie-root-port'/> <flag name='qemu-xhci'/> - <flag name='virtio-net.tx_queue_size'/> <flag name='chardev-reconnect'/> <flag name='vxhs'/> <flag name='virtio-blk.num-queues'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml index 6d07593242..554c04ed11 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -105,7 +105,6 @@ <flag name='intel-iommu.caching-mode'/> <flag name='intel-iommu.eim'/> <flag name='intel-iommu.device-iotlb'/> - <flag name='virtio-net.tx_queue_size'/> <flag name='chardev-reconnect'/> <flag name='vxhs'/> <flag name='virtio-blk.num-queues'/> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml index af6d109c6e..dd5d19f836 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml @@ -105,7 +105,6 @@ <flag name='intel-iommu.caching-mode'/> <flag name='intel-iommu.eim'/> <flag name='intel-iommu.device-iotlb'/> - <flag name='virtio-net.tx_queue_size'/> <flag name='chardev-reconnect'/> <flag name='virtio-blk.num-queues'/> <flag name='vmcoreinfo'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml index 59412be9f2..b0178d4db0 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml @@ -78,7 +78,6 @@ <flag name='pcie-root-port'/> <flag name='query-cpu-definitions'/> <flag name='qemu-xhci'/> - <flag name='virtio-net.tx_queue_size'/> <flag name='chardev-reconnect'/> <flag name='virtio-blk.num-queues'/> <flag name='vmcoreinfo'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml index 8071c6f551..d73b839a84 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml @@ -75,7 +75,6 @@ <flag name='qemu-xhci'/> <flag name='spapr-pci-host-bridge'/> <flag name='spapr-pci-host-bridge.numa_node'/> - <flag name='virtio-net.tx_queue_size'/> <flag name='chardev-reconnect'/> <flag name='virtio-blk.num-queues'/> <flag name='spapr-vty'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml index ac0facce09..b7bf347186 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml @@ -76,7 +76,6 @@ <flag name='spice-rendernode'/> <flag name='pcie-root-port'/> <flag name='qemu-xhci'/> - <flag name='virtio-net.tx_queue_size'/> <flag name='chardev-reconnect'/> <flag name='virtio-blk.num-queues'/> <flag name='disk-share-rw'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml index 69d7a30822..6d310929a5 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml @@ -40,7 +40,6 @@ <flag name='virtio-net.host_mtu'/> <flag name='query-cpu-definitions'/> <flag name='loadparm'/> - <flag name='virtio-net.tx_queue_size'/> <flag name='chardev-reconnect'/> <flag name='virtio-blk.num-queues'/> <flag name='sclplmconsole'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml index 6cd627dafb..f6f608e6a4 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml @@ -105,7 +105,6 @@ <flag name='intel-iommu.caching-mode'/> <flag name='intel-iommu.eim'/> <flag name='intel-iommu.device-iotlb'/> - <flag name='virtio-net.tx_queue_size'/> <flag name='chardev-reconnect'/> <flag name='virtio-blk.num-queues'/> <flag name='vmcoreinfo'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml index e011b87c17..3cb22c00f1 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml @@ -79,7 +79,6 @@ <flag name='pcie-root-port'/> <flag name='query-cpu-definitions'/> <flag name='qemu-xhci'/> - <flag name='virtio-net.tx_queue_size'/> <flag name='chardev-reconnect'/> <flag name='virtio-blk.num-queues'/> <flag name='vmcoreinfo'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml index 6ef18440be..c13b1fbdb4 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml @@ -40,7 +40,6 @@ <flag name='virtio-net.host_mtu'/> <flag name='query-cpu-definitions'/> <flag name='loadparm'/> - <flag name='virtio-net.tx_queue_size'/> <flag name='chardev-reconnect'/> <flag name='virtio-blk.num-queues'/> <flag name='sclplmconsole'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml index 4e986cb73a..0ea45334db 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml @@ -104,7 +104,6 @@ <flag name='intel-iommu.caching-mode'/> <flag name='intel-iommu.eim'/> <flag name='intel-iommu.device-iotlb'/> - <flag name='virtio-net.tx_queue_size'/> <flag name='chardev-reconnect'/> <flag name='virtio-blk.num-queues'/> <flag name='vmcoreinfo'/> diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml index 8a11065be6..61cec49e73 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml @@ -103,7 +103,6 @@ <flag name='intel-iommu.caching-mode'/> <flag name='intel-iommu.eim'/> <flag name='intel-iommu.device-iotlb'/> - <flag name='virtio-net.tx_queue_size'/> <flag name='chardev-reconnect'/> <flag name='virtio-blk.num-queues'/> <flag name='vmcoreinfo'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml index 65aaeed167..546772bb08 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml @@ -86,7 +86,6 @@ <flag name='pcie-root-port'/> <flag name='query-cpu-definitions'/> <flag name='qemu-xhci'/> - <flag name='virtio-net.tx_queue_size'/> <flag name='chardev-reconnect'/> <flag name='virtio-blk.num-queues'/> <flag name='vmcoreinfo'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml index b5a17ece5f..a8ec01363d 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml @@ -75,7 +75,6 @@ <flag name='qemu-xhci'/> <flag name='spapr-pci-host-bridge'/> <flag name='spapr-pci-host-bridge.numa_node'/> - <flag name='virtio-net.tx_queue_size'/> <flag name='chardev-reconnect'/> <flag name='virtio-blk.num-queues'/> <flag name='spapr-vty'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml index f92a93a801..70e28a53e0 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml @@ -103,7 +103,6 @@ <flag name='intel-iommu.caching-mode'/> <flag name='intel-iommu.eim'/> <flag name='intel-iommu.device-iotlb'/> - <flag name='virtio-net.tx_queue_size'/> <flag name='chardev-reconnect'/> <flag name='virtio-blk.num-queues'/> <flag name='vmcoreinfo'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml index 9c07f29d4c..7b368407ac 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml @@ -86,7 +86,6 @@ <flag name='pcie-root-port'/> <flag name='query-cpu-definitions'/> <flag name='qemu-xhci'/> - <flag name='virtio-net.tx_queue_size'/> <flag name='chardev-reconnect'/> <flag name='virtio-blk.num-queues'/> <flag name='vmcoreinfo'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml index d7c24dac4d..fa1ffe3e83 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml @@ -81,7 +81,6 @@ <flag name='qemu-xhci'/> <flag name='spapr-pci-host-bridge'/> <flag name='spapr-pci-host-bridge.numa_node'/> - <flag name='virtio-net.tx_queue_size'/> <flag name='chardev-reconnect'/> <flag name='virtio-blk.num-queues'/> <flag name='spapr-vty'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml index d6a162c4b1..437fdfde22 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml @@ -103,7 +103,6 @@ <flag name='intel-iommu.caching-mode'/> <flag name='intel-iommu.eim'/> <flag name='intel-iommu.device-iotlb'/> - <flag name='virtio-net.tx_queue_size'/> <flag name='chardev-reconnect'/> <flag name='virtio-blk.num-queues'/> <flag name='vmcoreinfo'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml index b378c1cd3b..4779e01b9e 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml @@ -80,7 +80,6 @@ <flag name='qemu-xhci'/> <flag name='spapr-pci-host-bridge'/> <flag name='spapr-pci-host-bridge.numa_node'/> - <flag name='virtio-net.tx_queue_size'/> <flag name='chardev-reconnect'/> <flag name='virtio-blk.num-queues'/> <flag name='spapr-vty'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml index b8e7fc5eee..93315c6f53 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml @@ -103,7 +103,6 @@ <flag name='intel-iommu.caching-mode'/> <flag name='intel-iommu.eim'/> <flag name='intel-iommu.device-iotlb'/> - <flag name='virtio-net.tx_queue_size'/> <flag name='chardev-reconnect'/> <flag name='virtio-blk.num-queues'/> <flag name='vmcoreinfo'/> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml index 5ff97b088d..49e88a572a 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml @@ -103,7 +103,6 @@ <flag name='intel-iommu.caching-mode'/> <flag name='intel-iommu.eim'/> <flag name='intel-iommu.device-iotlb'/> - <flag name='virtio-net.tx_queue_size'/> <flag name='chardev-reconnect'/> <flag name='virtio-blk.num-queues'/> <flag name='vmcoreinfo'/> -- 2.37.4
On a Tuesday in 2022, Michal Privoznik wrote:
All supported QEMUs have this capability. Stop detecting it.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 1 - tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml | 1 - 28 files changed, 28 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Now that nothing uses this capability, it can be retired. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_capabilities.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 7091cc3a25..33bedbb7e5 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -437,7 +437,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "vnc-multi-servers", /* X_QEMU_CAPS_VNC_MULTI_SERVERS */ /* 265 */ - "virtio-net.tx_queue_size", /* QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE */ + "virtio-net.tx_queue_size", /* X_QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE */ "chardev-reconnect", /* QEMU_CAPS_CHARDEV_RECONNECT */ "virtio-gpu.max_outputs", /* X_QEMU_CAPS_VIRTIO_GPU_MAX_OUTPUTS */ "vxhs", /* QEMU_CAPS_VXHS */ diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 6fcbb5026b..656c769e5c 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -416,7 +416,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ X_QEMU_CAPS_VNC_MULTI_SERVERS, /* -vnc vnc=unix:/path */ /* 265 */ - QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE, /* virtio-net-*.tx_queue_size */ + X_QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE, /* virtio-net-*.tx_queue_size */ QEMU_CAPS_CHARDEV_RECONNECT, /* -chardev reconnect */ X_QEMU_CAPS_VIRTIO_GPU_MAX_OUTPUTS, /* -device virtio-(vga|gpu-*),max-outputs= */ QEMU_CAPS_VXHS, /* -drive file.driver=vxhs via query-qmp-schema */ -- 2.37.4
On a Tuesday in 2022, Michal Privoznik wrote:
Now that nothing uses this capability, it can be retired.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_capabilities.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Introduced in QEMU's commit of v2.9.0-rc0~162^2~10 the .host_mtu attribute of virtio-net device is always available for all QEMU versions we support (4.2.0, currently). Therefore, we can assume the capability is always set and thus doesn't need to be checked for. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_validate.c | 8 -------- tests/qemuxml2xmltest.c | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 88f2aa8c49..c01bc6f8b5 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -1889,14 +1889,6 @@ qemuValidateDomainDeviceDefNetwork(const virDomainNetDef *net, _("virtio rss hash report is not supported with this QEMU binary")); return -1; } - - if (net->mtu && - !virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_NET_HOST_MTU)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("setting MTU is not supported with this " - "QEMU binary")); - return -1; - } } if (net->mtu && diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index e8261b7e8c..3a117ff137 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -493,7 +493,7 @@ mymain(void) DO_TEST_NOCAPS("watchdog"); DO_TEST("net-bandwidth", QEMU_CAPS_DEVICE_VGA, QEMU_CAPS_VNC); DO_TEST("net-bandwidth2", QEMU_CAPS_DEVICE_VGA, QEMU_CAPS_VNC); - DO_TEST("net-mtu", QEMU_CAPS_VIRTIO_NET_HOST_MTU); + DO_TEST_NOCAPS("net-mtu"); DO_TEST_NOCAPS("net-coalesce"); DO_TEST_NOCAPS("net-many-models"); DO_TEST("net-vdpa", QEMU_CAPS_NETDEV_VHOST_VDPA); -- 2.37.4
On a Tuesday in 2022, Michal Privoznik wrote:
Introduced in QEMU's commit of v2.9.0-rc0~162^2~10 the .host_mtu attribute of virtio-net device is always available for all QEMU versions we support (4.2.0, currently). Therefore, we can assume the capability is always set and thus doesn't need to be checked for.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_validate.c | 8 -------- tests/qemuxml2xmltest.c | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
All supported QEMUs have this capability. Stop detecting it. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 1 - tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml | 1 - 28 files changed, 28 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 33bedbb7e5..c91ffe4936 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1424,7 +1424,6 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioBlk[] = { }; static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioNet[] = { - { "host_mtu", QEMU_CAPS_VIRTIO_NET_HOST_MTU, NULL }, { "failover", QEMU_CAPS_VIRTIO_NET_FAILOVER, NULL }, { "acpi-index", QEMU_CAPS_ACPI_INDEX, NULL }, { "rss", QEMU_CAPS_VIRTIO_NET_RSS, NULL }, diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml index dee48940c2..0ca14c0c8a 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml @@ -72,7 +72,6 @@ <flag name='ivshmem-doorbell'/> <flag name='vhost-scsi'/> <flag name='query-cpu-model-expansion'/> - <flag name='virtio-net.host_mtu'/> <flag name='pcie-root-port'/> <flag name='query-cpu-definitions'/> <flag name='qemu-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml index a3a0cd6f6f..d1f129e082 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml @@ -68,7 +68,6 @@ <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> <flag name='vhost-scsi'/> - <flag name='virtio-net.host_mtu'/> <flag name='pcie-root-port'/> <flag name='query-cpu-definitions'/> <flag name='qemu-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml index 6e93dffe7d..0219143b00 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -38,7 +38,6 @@ <flag name='query-hotpluggable-cpus'/> <flag name='vhost-scsi'/> <flag name='query-cpu-model-expansion'/> - <flag name='virtio-net.host_mtu'/> <flag name='query-cpu-definitions'/> <flag name='loadparm'/> <flag name='chardev-reconnect'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml index fab759da81..5cf91a2e82 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -94,7 +94,6 @@ <flag name='ivshmem-doorbell'/> <flag name='vhost-scsi'/> <flag name='query-cpu-model-expansion'/> - <flag name='virtio-net.host_mtu'/> <flag name='spice-rendernode'/> <flag name='nvdimm'/> <flag name='pcie-root-port'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml index 8eb16fb09f..2e06e7db5e 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml @@ -74,7 +74,6 @@ <flag name='ivshmem-doorbell'/> <flag name='vhost-scsi'/> <flag name='query-cpu-model-expansion'/> - <flag name='virtio-net.host_mtu'/> <flag name='pcie-root-port'/> <flag name='query-cpu-definitions'/> <flag name='qemu-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml index 2a9d308ede..ca835b9d4f 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml @@ -69,7 +69,6 @@ <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> <flag name='vhost-scsi'/> - <flag name='virtio-net.host_mtu'/> <flag name='nvdimm'/> <flag name='pcie-root-port'/> <flag name='query-cpu-definitions'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml index 8f6bdc9138..c1ffd75173 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml @@ -73,7 +73,6 @@ <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> <flag name='vhost-scsi'/> - <flag name='virtio-net.host_mtu'/> <flag name='spice-rendernode'/> <flag name='pcie-root-port'/> <flag name='qemu-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml index 554c04ed11..354a03d898 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -94,7 +94,6 @@ <flag name='ivshmem-doorbell'/> <flag name='vhost-scsi'/> <flag name='query-cpu-model-expansion'/> - <flag name='virtio-net.host_mtu'/> <flag name='spice-rendernode'/> <flag name='nvdimm'/> <flag name='pcie-root-port'/> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml index dd5d19f836..3ea4f6bd87 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml @@ -94,7 +94,6 @@ <flag name='ivshmem-doorbell'/> <flag name='vhost-scsi'/> <flag name='query-cpu-model-expansion'/> - <flag name='virtio-net.host_mtu'/> <flag name='spice-rendernode'/> <flag name='nvdimm'/> <flag name='pcie-root-port'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml index b0178d4db0..82f3d77d62 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml @@ -73,7 +73,6 @@ <flag name='ivshmem-doorbell'/> <flag name='vhost-scsi'/> <flag name='query-cpu-model-expansion'/> - <flag name='virtio-net.host_mtu'/> <flag name='nvdimm'/> <flag name='pcie-root-port'/> <flag name='query-cpu-definitions'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml index d73b839a84..bf5f455bf0 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml @@ -68,7 +68,6 @@ <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> <flag name='vhost-scsi'/> - <flag name='virtio-net.host_mtu'/> <flag name='nvdimm'/> <flag name='pcie-root-port'/> <flag name='query-cpu-definitions'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml index b7bf347186..ae0b230f89 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml @@ -72,7 +72,6 @@ <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> <flag name='vhost-scsi'/> - <flag name='virtio-net.host_mtu'/> <flag name='spice-rendernode'/> <flag name='pcie-root-port'/> <flag name='qemu-xhci'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml index 6d310929a5..e61d434026 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml @@ -37,7 +37,6 @@ <flag name='query-hotpluggable-cpus'/> <flag name='vhost-scsi'/> <flag name='query-cpu-model-expansion'/> - <flag name='virtio-net.host_mtu'/> <flag name='query-cpu-definitions'/> <flag name='loadparm'/> <flag name='chardev-reconnect'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml index f6f608e6a4..7dc2839c88 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml @@ -94,7 +94,6 @@ <flag name='ivshmem-doorbell'/> <flag name='vhost-scsi'/> <flag name='query-cpu-model-expansion'/> - <flag name='virtio-net.host_mtu'/> <flag name='spice-rendernode'/> <flag name='nvdimm'/> <flag name='pcie-root-port'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml index 3cb22c00f1..4fce7293fc 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml @@ -74,7 +74,6 @@ <flag name='ivshmem-doorbell'/> <flag name='vhost-scsi'/> <flag name='query-cpu-model-expansion'/> - <flag name='virtio-net.host_mtu'/> <flag name='nvdimm'/> <flag name='pcie-root-port'/> <flag name='query-cpu-definitions'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml index c13b1fbdb4..c66e92a4ef 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml @@ -37,7 +37,6 @@ <flag name='query-hotpluggable-cpus'/> <flag name='vhost-scsi'/> <flag name='query-cpu-model-expansion'/> - <flag name='virtio-net.host_mtu'/> <flag name='query-cpu-definitions'/> <flag name='loadparm'/> <flag name='chardev-reconnect'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml index 0ea45334db..1f7dde4ea0 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml @@ -93,7 +93,6 @@ <flag name='ivshmem-doorbell'/> <flag name='vhost-scsi'/> <flag name='query-cpu-model-expansion'/> - <flag name='virtio-net.host_mtu'/> <flag name='spice-rendernode'/> <flag name='nvdimm'/> <flag name='pcie-root-port'/> diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml index 61cec49e73..2ae7af59dd 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml @@ -92,7 +92,6 @@ <flag name='ivshmem-doorbell'/> <flag name='vhost-scsi'/> <flag name='query-cpu-model-expansion'/> - <flag name='virtio-net.host_mtu'/> <flag name='spice-rendernode'/> <flag name='nvdimm'/> <flag name='pcie-root-port'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml index 546772bb08..1885a7d317 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml @@ -80,7 +80,6 @@ <flag name='ivshmem-doorbell'/> <flag name='vhost-scsi'/> <flag name='query-cpu-model-expansion'/> - <flag name='virtio-net.host_mtu'/> <flag name='spice-rendernode'/> <flag name='nvdimm'/> <flag name='pcie-root-port'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml index a8ec01363d..6a5c8e896c 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml @@ -68,7 +68,6 @@ <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> <flag name='vhost-scsi'/> - <flag name='virtio-net.host_mtu'/> <flag name='nvdimm'/> <flag name='pcie-root-port'/> <flag name='query-cpu-definitions'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml index 70e28a53e0..5a52832a99 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml @@ -92,7 +92,6 @@ <flag name='ivshmem-doorbell'/> <flag name='vhost-scsi'/> <flag name='query-cpu-model-expansion'/> - <flag name='virtio-net.host_mtu'/> <flag name='spice-rendernode'/> <flag name='nvdimm'/> <flag name='pcie-root-port'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml index 7b368407ac..c7a2ce50b9 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml @@ -80,7 +80,6 @@ <flag name='ivshmem-doorbell'/> <flag name='vhost-scsi'/> <flag name='query-cpu-model-expansion'/> - <flag name='virtio-net.host_mtu'/> <flag name='spice-rendernode'/> <flag name='nvdimm'/> <flag name='pcie-root-port'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml index fa1ffe3e83..4022323331 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml @@ -74,7 +74,6 @@ <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> <flag name='vhost-scsi'/> - <flag name='virtio-net.host_mtu'/> <flag name='nvdimm'/> <flag name='pcie-root-port'/> <flag name='query-cpu-definitions'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml index 437fdfde22..2aaf30d4a6 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml @@ -92,7 +92,6 @@ <flag name='ivshmem-doorbell'/> <flag name='vhost-scsi'/> <flag name='query-cpu-model-expansion'/> - <flag name='virtio-net.host_mtu'/> <flag name='spice-rendernode'/> <flag name='nvdimm'/> <flag name='pcie-root-port'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml index 4779e01b9e..35ab888fe2 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml @@ -73,7 +73,6 @@ <flag name='ivshmem-plain'/> <flag name='ivshmem-doorbell'/> <flag name='vhost-scsi'/> - <flag name='virtio-net.host_mtu'/> <flag name='nvdimm'/> <flag name='pcie-root-port'/> <flag name='query-cpu-definitions'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml index 93315c6f53..71654915c6 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml @@ -92,7 +92,6 @@ <flag name='ivshmem-doorbell'/> <flag name='vhost-scsi'/> <flag name='query-cpu-model-expansion'/> - <flag name='virtio-net.host_mtu'/> <flag name='spice-rendernode'/> <flag name='nvdimm'/> <flag name='pcie-root-port'/> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml index 49e88a572a..bb4ee25f98 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml @@ -92,7 +92,6 @@ <flag name='ivshmem-doorbell'/> <flag name='vhost-scsi'/> <flag name='query-cpu-model-expansion'/> - <flag name='virtio-net.host_mtu'/> <flag name='spice-rendernode'/> <flag name='nvdimm'/> <flag name='pcie-root-port'/> -- 2.37.4
On a Tuesday in 2022, Michal Privoznik wrote:
All supported QEMUs have this capability. Stop detecting it.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 1 - tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml | 1 - 28 files changed, 28 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Now that nothing uses this capability, it can be retired. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_capabilities.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index c91ffe4936..a8e4b29349 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -406,7 +406,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "vhost-scsi", /* QEMU_CAPS_DEVICE_VHOST_SCSI */ "drive-iotune-group", /* X_QEMU_CAPS_DRIVE_IOTUNE_GROUP */ "query-cpu-model-expansion", /* QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION */ - "virtio-net.host_mtu", /* QEMU_CAPS_VIRTIO_NET_HOST_MTU */ + "virtio-net.host_mtu", /* X_QEMU_CAPS_VIRTIO_NET_HOST_MTU */ /* 245 */ "spice-rendernode", /* QEMU_CAPS_SPICE_RENDERNODE */ diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 656c769e5c..ff67f58e11 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -385,7 +385,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ QEMU_CAPS_DEVICE_VHOST_SCSI, /* -device vhost-scsi-{ccw,pci} */ X_QEMU_CAPS_DRIVE_IOTUNE_GROUP, /* -drive throttling.group=<name> */ QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION, /* qmp query-cpu-model-expansion */ - QEMU_CAPS_VIRTIO_NET_HOST_MTU, /* virtio-net-*.host_mtu */ + X_QEMU_CAPS_VIRTIO_NET_HOST_MTU, /* virtio-net-*.host_mtu */ /* 245 */ QEMU_CAPS_SPICE_RENDERNODE, /* -spice rendernode */ -- 2.37.4
On a Tuesday in 2022, Michal Privoznik wrote:
Now that nothing uses this capability, it can be retired.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_capabilities.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Introduced in QEMU's commit of v4.2.0-rc0~23^2~4 the .failover attribute of virtio-net device is always available for all QEMU versions we support (4.2.0, currently). Therefore, we can assume the capability is always set and thus doesn't need to be checked for. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_validate.c | 6 ------ tests/qemuxml2argvdata/net-virtio-teaming.err | 1 - tests/qemuxml2argvtest.c | 3 --- tests/qemuxml2xmltest.c | 3 --- 4 files changed, 13 deletions(-) delete mode 100644 tests/qemuxml2argvdata/net-virtio-teaming.err diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index c01bc6f8b5..243ec29c71 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -1900,12 +1900,6 @@ qemuValidateDomainDeviceDefNetwork(const virDomainNetDef *net, } if (net->teaming) { - if (net->teaming->type != VIR_DOMAIN_NET_TEAMING_TYPE_NONE && - !virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_NET_FAILOVER)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("virtio-net failover (teaming) is not supported with this QEMU binary")); - return -1; - } if (net->teaming->type == VIR_DOMAIN_NET_TEAMING_TYPE_PERSISTENT && !virDomainNetIsVirtioModel(net)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, diff --git a/tests/qemuxml2argvdata/net-virtio-teaming.err b/tests/qemuxml2argvdata/net-virtio-teaming.err deleted file mode 100644 index e49a1daa88..0000000000 --- a/tests/qemuxml2argvdata/net-virtio-teaming.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: virtio-net failover (teaming) is not supported with this QEMU binary diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 029e60947f..3b25c99639 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1468,11 +1468,8 @@ mymain(void) DO_TEST_NOCAPS("net-virtio-rxtxqueuesize"); DO_TEST_PARSE_ERROR_NOCAPS("net-virtio-rxqueuesize-invalid-size"); DO_TEST("net-virtio-teaming", - QEMU_CAPS_VIRTIO_NET_FAILOVER, QEMU_CAPS_DEVICE_VFIO_PCI); - DO_TEST_PARSE_ERROR_NOCAPS("net-virtio-teaming"); DO_TEST("net-virtio-teaming-hostdev", - QEMU_CAPS_VIRTIO_NET_FAILOVER, QEMU_CAPS_DEVICE_VFIO_PCI); DO_TEST_NOCAPS("net-eth"); DO_TEST_NOCAPS("net-eth-ifname"); diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 3a117ff137..1b74a81f26 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -469,13 +469,10 @@ mymain(void) DO_TEST_NOCAPS("net-virtio-network-portgroup"); DO_TEST_NOCAPS("net-virtio-rxtxqueuesize"); DO_TEST("net-virtio-teaming", - QEMU_CAPS_VIRTIO_NET_FAILOVER, QEMU_CAPS_DEVICE_VFIO_PCI); DO_TEST("net-virtio-teaming-network", - QEMU_CAPS_VIRTIO_NET_FAILOVER, QEMU_CAPS_DEVICE_VFIO_PCI); DO_TEST("net-virtio-teaming-hostdev", - QEMU_CAPS_VIRTIO_NET_FAILOVER, QEMU_CAPS_DEVICE_VFIO_PCI); DO_TEST_CAPS_LATEST("net-isolated-port"); DO_TEST_NOCAPS("net-hostdev"); -- 2.37.4
On a Tuesday in 2022, Michal Privoznik wrote:
Introduced in QEMU's commit of v4.2.0-rc0~23^2~4 the .failover attribute of virtio-net device is always available for all QEMU versions we support (4.2.0, currently). Therefore, we can assume the capability is always set and thus doesn't need to be checked for.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_validate.c | 6 ------ tests/qemuxml2argvdata/net-virtio-teaming.err | 1 - tests/qemuxml2argvtest.c | 3 --- tests/qemuxml2xmltest.c | 3 --- 4 files changed, 13 deletions(-) delete mode 100644 tests/qemuxml2argvdata/net-virtio-teaming.err
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
All supported QEMUs have this capability. Stop detecting it. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 1 - tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml | 1 - 27 files changed, 27 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index a8e4b29349..b51a0a2767 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1424,7 +1424,6 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioBlk[] = { }; static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioNet[] = { - { "failover", QEMU_CAPS_VIRTIO_NET_FAILOVER, NULL }, { "acpi-index", QEMU_CAPS_ACPI_INDEX, NULL }, { "rss", QEMU_CAPS_VIRTIO_NET_RSS, NULL }, }; diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml index 0ca14c0c8a..06dce09fa9 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml @@ -106,7 +106,6 @@ <flag name='drive-nvme'/> <flag name='smp-dies'/> <flag name='rng-builtin'/> - <flag name='virtio-net.failover'/> <flag name='vhost-user-fs'/> <flag name='fsdev.multidevs'/> <flag name='tcg'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml index 0219143b00..43834e1275 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -73,7 +73,6 @@ <flag name='drive-nvme'/> <flag name='smp-dies'/> <flag name='rng-builtin'/> - <flag name='virtio-net.failover'/> <flag name='vhost-user-fs'/> <flag name='fsdev.multidevs'/> <flag name='tcg'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml index 5cf91a2e82..3a9a89d90a 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -144,7 +144,6 @@ <flag name='smp-dies'/> <flag name='i8042'/> <flag name='rng-builtin'/> - <flag name='virtio-net.failover'/> <flag name='vhost-user-fs'/> <flag name='fsdev.multidevs'/> <flag name='tcg'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml index 2e06e7db5e..e283e96c2c 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml @@ -110,7 +110,6 @@ <flag name='drive-nvme'/> <flag name='smp-dies'/> <flag name='rng-builtin'/> - <flag name='virtio-net.failover'/> <flag name='cpu.kvm-no-adjvtime'/> <flag name='vhost-user-fs'/> <flag name='query-named-block-nodes.flat'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml index ca835b9d4f..a7c8d88f9f 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml @@ -112,7 +112,6 @@ <flag name='smp-dies'/> <flag name='i8042'/> <flag name='rng-builtin'/> - <flag name='virtio-net.failover'/> <flag name='tpm-spapr'/> <flag name='vhost-user-fs'/> <flag name='query-named-block-nodes.flat'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml index c1ffd75173..37a14068d0 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml @@ -103,7 +103,6 @@ <flag name='drive-nvme'/> <flag name='smp-dies'/> <flag name='rng-builtin'/> - <flag name='virtio-net.failover'/> <flag name='vhost-user-fs'/> <flag name='query-named-block-nodes.flat'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml index 354a03d898..06913257ef 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -145,7 +145,6 @@ <flag name='smp-dies'/> <flag name='i8042'/> <flag name='rng-builtin'/> - <flag name='virtio-net.failover'/> <flag name='vhost-user-fs'/> <flag name='query-named-block-nodes.flat'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml index 3ea4f6bd87..fc11c8a70d 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml @@ -144,7 +144,6 @@ <flag name='smp-dies'/> <flag name='i8042'/> <flag name='rng-builtin'/> - <flag name='virtio-net.failover'/> <flag name='vhost-user-fs'/> <flag name='query-named-block-nodes.flat'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml index 82f3d77d62..4beb567146 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml @@ -110,7 +110,6 @@ <flag name='drive-nvme'/> <flag name='smp-dies'/> <flag name='rng-builtin'/> - <flag name='virtio-net.failover'/> <flag name='cpu.kvm-no-adjvtime'/> <flag name='vhost-user-fs'/> <flag name='query-named-block-nodes.flat'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml index bf5f455bf0..229b7e37d1 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml @@ -110,7 +110,6 @@ <flag name='smp-dies'/> <flag name='i8042'/> <flag name='rng-builtin'/> - <flag name='virtio-net.failover'/> <flag name='tpm-spapr'/> <flag name='vhost-user-fs'/> <flag name='query-named-block-nodes.flat'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml index ae0b230f89..738007f72f 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml @@ -101,7 +101,6 @@ <flag name='drive-nvme'/> <flag name='smp-dies'/> <flag name='rng-builtin'/> - <flag name='virtio-net.failover'/> <flag name='vhost-user-fs'/> <flag name='query-named-block-nodes.flat'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml index e61d434026..22ffc34761 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml @@ -72,7 +72,6 @@ <flag name='drive-nvme'/> <flag name='smp-dies'/> <flag name='rng-builtin'/> - <flag name='virtio-net.failover'/> <flag name='vhost-user-fs'/> <flag name='query-named-block-nodes.flat'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml index 7dc2839c88..ee19c01f7c 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml @@ -144,7 +144,6 @@ <flag name='smp-dies'/> <flag name='i8042'/> <flag name='rng-builtin'/> - <flag name='virtio-net.failover'/> <flag name='vhost-user-fs'/> <flag name='query-named-block-nodes.flat'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml index 4fce7293fc..32b11de0a6 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml @@ -110,7 +110,6 @@ <flag name='drive-nvme'/> <flag name='smp-dies'/> <flag name='rng-builtin'/> - <flag name='virtio-net.failover'/> <flag name='cpu.kvm-no-adjvtime'/> <flag name='vhost-user-fs'/> <flag name='query-named-block-nodes.flat'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml index c66e92a4ef..7be2255769 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml @@ -71,7 +71,6 @@ <flag name='drive-nvme'/> <flag name='smp-dies'/> <flag name='rng-builtin'/> - <flag name='virtio-net.failover'/> <flag name='vhost-user-fs'/> <flag name='query-named-block-nodes.flat'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml index 1f7dde4ea0..f5fab26893 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml @@ -144,7 +144,6 @@ <flag name='smp-dies'/> <flag name='i8042'/> <flag name='rng-builtin'/> - <flag name='virtio-net.failover'/> <flag name='vhost-user-fs'/> <flag name='query-named-block-nodes.flat'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml index 2ae7af59dd..ff7c30de69 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml @@ -143,7 +143,6 @@ <flag name='smp-dies'/> <flag name='i8042'/> <flag name='rng-builtin'/> - <flag name='virtio-net.failover'/> <flag name='vhost-user-fs'/> <flag name='query-named-block-nodes.flat'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml index 1885a7d317..c6d0ce0469 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml @@ -118,7 +118,6 @@ <flag name='drive-nvme'/> <flag name='smp-dies'/> <flag name='rng-builtin'/> - <flag name='virtio-net.failover'/> <flag name='cpu.kvm-no-adjvtime'/> <flag name='vhost-user-fs'/> <flag name='query-named-block-nodes.flat'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml index 6a5c8e896c..983b3309f7 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml @@ -108,7 +108,6 @@ <flag name='smp-dies'/> <flag name='i8042'/> <flag name='rng-builtin'/> - <flag name='virtio-net.failover'/> <flag name='tpm-spapr'/> <flag name='vhost-user-fs'/> <flag name='query-named-block-nodes.flat'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml index 5a52832a99..6679ca1bb6 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml @@ -143,7 +143,6 @@ <flag name='smp-dies'/> <flag name='i8042'/> <flag name='rng-builtin'/> - <flag name='virtio-net.failover'/> <flag name='vhost-user-fs'/> <flag name='query-named-block-nodes.flat'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml index c7a2ce50b9..a711b5539d 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml @@ -118,7 +118,6 @@ <flag name='drive-nvme'/> <flag name='smp-dies'/> <flag name='rng-builtin'/> - <flag name='virtio-net.failover'/> <flag name='cpu.kvm-no-adjvtime'/> <flag name='vhost-user-fs'/> <flag name='query-named-block-nodes.flat'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml index 4022323331..7d48f2ed91 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml @@ -117,7 +117,6 @@ <flag name='smp-dies'/> <flag name='i8042'/> <flag name='rng-builtin'/> - <flag name='virtio-net.failover'/> <flag name='tpm-spapr'/> <flag name='vhost-user-fs'/> <flag name='query-named-block-nodes.flat'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml index 2aaf30d4a6..b600e9707c 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml @@ -143,7 +143,6 @@ <flag name='smp-dies'/> <flag name='i8042'/> <flag name='rng-builtin'/> - <flag name='virtio-net.failover'/> <flag name='vhost-user-fs'/> <flag name='query-named-block-nodes.flat'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml index 35ab888fe2..19c3d81fb0 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml @@ -114,7 +114,6 @@ <flag name='smp-dies'/> <flag name='i8042'/> <flag name='rng-builtin'/> - <flag name='virtio-net.failover'/> <flag name='tpm-spapr'/> <flag name='vhost-user-fs'/> <flag name='query-named-block-nodes.flat'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml index 71654915c6..a13de5ac6d 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml @@ -143,7 +143,6 @@ <flag name='smp-dies'/> <flag name='i8042'/> <flag name='rng-builtin'/> - <flag name='virtio-net.failover'/> <flag name='vhost-user-fs'/> <flag name='query-named-block-nodes.flat'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml index bb4ee25f98..3469213697 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml @@ -143,7 +143,6 @@ <flag name='smp-dies'/> <flag name='i8042'/> <flag name='rng-builtin'/> - <flag name='virtio-net.failover'/> <flag name='vhost-user-fs'/> <flag name='query-named-block-nodes.flat'/> <flag name='blockdev-snapshot.allow-write-only-overlay'/> -- 2.37.4
On a Tuesday in 2022, Michal Privoznik wrote:
All supported QEMUs have this capability. Stop detecting it.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 1 - tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml | 1 - 27 files changed, 27 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Now that nothing uses this capability, it can be retired. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_capabilities.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index b51a0a2767..693ce98b3d 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -558,7 +558,7 @@ VIR_ENUM_IMPL(virQEMUCaps, /* 350 */ "i8042", /* QEMU_CAPS_DEVICE_I8042 */ "rng-builtin", /* QEMU_CAPS_OBJECT_RNG_BUILTIN */ - "virtio-net.failover", /* QEMU_CAPS_VIRTIO_NET_FAILOVER */ + "virtio-net.failover", /* X_QEMU_CAPS_VIRTIO_NET_FAILOVER */ "tpm-spapr", /* QEMU_CAPS_DEVICE_TPM_SPAPR */ "cpu.kvm-no-adjvtime", /* QEMU_CAPS_CPU_KVM_NO_ADJVTIME */ diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index ff67f58e11..606731a641 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -537,7 +537,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ /* 350 */ QEMU_CAPS_DEVICE_I8042, /* PS/2 controller */ QEMU_CAPS_OBJECT_RNG_BUILTIN, /* -object rng-builtin */ - QEMU_CAPS_VIRTIO_NET_FAILOVER, /* virtio-net-*.failover */ + X_QEMU_CAPS_VIRTIO_NET_FAILOVER, /* virtio-net-*.failover */ QEMU_CAPS_DEVICE_TPM_SPAPR, /* -device tpm-spapr */ QEMU_CAPS_CPU_KVM_NO_ADJVTIME, /* cpu.kvm-no-adjvtime */ -- 2.37.4
On a Tuesday in 2022, Michal Privoznik wrote:
Now that nothing uses this capability, it can be retired.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_capabilities.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Introduced in QEMU's commit of v0.13.0-rc0~1072 the .logical_block_size attribute of virtio-blk device is always available for all QEMU versions we support (4.2.0, currently). Therefore, we can assume the capability is always set and thus doesn't need to be checked for. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_command.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 256ef4912c..b0c9fb7059 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1751,8 +1751,8 @@ qemuBuildDiskDeviceProps(const virDomainDef *def, g_autofree char *chardev = NULL; g_autofree char *drive = NULL; unsigned int bootindex = 0; - unsigned int logical_block_size = 0; - unsigned int physical_block_size = 0; + unsigned int logical_block_size = disk->blockio.logical_block_size; + unsigned int physical_block_size = disk->blockio.physical_block_size; g_autoptr(virJSONValue) wwn = NULL; g_autofree char *serial = NULL; virTristateSwitch removable = VIR_TRISTATE_SWITCH_ABSENT; @@ -1886,11 +1886,6 @@ qemuBuildDiskDeviceProps(const virDomainDef *def, if (disk->device != VIR_DOMAIN_DISK_DEVICE_FLOPPY) bootindex = disk->info.effectiveBootIndex; - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKIO)) { - logical_block_size = disk->blockio.logical_block_size; - physical_block_size = disk->blockio.physical_block_size; - } - if (disk->wwn) { unsigned long long w = 0; -- 2.37.4
On a Tuesday in 2022, Michal Privoznik wrote:
Introduced in QEMU's commit of v0.13.0-rc0~1072 the .logical_block_size attribute of virtio-blk device is always available for all QEMU versions we support (4.2.0, currently). Therefore, we can assume the capability is always set and thus doesn't need to be checked for.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_command.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
All supported QEMUs have this capability. Stop detecting it. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 1 - tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml | 1 - 28 files changed, 28 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 693ce98b3d..caa988a478 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1415,7 +1415,6 @@ virQEMUCapsDevicePropsVirtioBlkSCSIDefault(virJSONValue *props, static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioBlk[] = { { "scsi", QEMU_CAPS_VIRTIO_BLK_SCSI, virQEMUCapsDevicePropsVirtioBlkSCSIDefault }, - { "logical_block_size", QEMU_CAPS_BLOCKIO, NULL }, { "num-queues", QEMU_CAPS_VIRTIO_BLK_NUM_QUEUES, NULL }, { "queue-size", QEMU_CAPS_VIRTIO_BLK_QUEUE_SIZE, NULL }, { "share-rw", QEMU_CAPS_DISK_SHARE_RW, NULL }, diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml index 06dce09fa9..be96f5e31e 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml @@ -22,7 +22,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='blockio'/> <flag name='ide-drive.wwn'/> <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml index d1f129e082..3210276ed1 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml @@ -21,7 +21,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='blockio'/> <flag name='ide-drive.wwn'/> <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml index 43834e1275..0503b343d0 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -10,7 +10,6 @@ <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='virtio-scsi-pci'/> - <flag name='blockio'/> <flag name='usb-redir.filter'/> <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml index 3a9a89d90a..bbf40d403f 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -27,7 +27,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='blockio'/> <flag name='disable-s3'/> <flag name='disable-s4'/> <flag name='usb-redir.filter'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml index e283e96c2c..c47a2f5375 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml @@ -22,7 +22,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='blockio'/> <flag name='ide-drive.wwn'/> <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml index a7c8d88f9f..c3f4da9f18 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml @@ -21,7 +21,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='blockio'/> <flag name='ide-drive.wwn'/> <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml index 37a14068d0..2f34912311 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml @@ -24,7 +24,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='blockio'/> <flag name='usb-redir.filter'/> <flag name='ide-drive.wwn'/> <flag name='scsi-disk.wwn'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml index 06913257ef..ba60c52251 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -27,7 +27,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='blockio'/> <flag name='disable-s3'/> <flag name='disable-s4'/> <flag name='usb-redir.filter'/> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml index fc11c8a70d..349139c1db 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml @@ -27,7 +27,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='blockio'/> <flag name='disable-s3'/> <flag name='disable-s4'/> <flag name='usb-redir.filter'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml index 4beb567146..60c0393b9e 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml @@ -22,7 +22,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='blockio'/> <flag name='ide-drive.wwn'/> <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml index 229b7e37d1..def3d7f682 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml @@ -21,7 +21,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='blockio'/> <flag name='ide-drive.wwn'/> <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml index 738007f72f..92861e8fa4 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml @@ -24,7 +24,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='blockio'/> <flag name='usb-redir.filter'/> <flag name='ide-drive.wwn'/> <flag name='scsi-disk.wwn'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml index 22ffc34761..e4d7a0423c 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml @@ -10,7 +10,6 @@ <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='virtio-scsi-pci'/> - <flag name='blockio'/> <flag name='usb-redir.filter'/> <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml index ee19c01f7c..ad5fafb979 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml @@ -27,7 +27,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='blockio'/> <flag name='disable-s3'/> <flag name='disable-s4'/> <flag name='usb-redir.filter'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml index 32b11de0a6..d877136199 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml @@ -21,7 +21,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='blockio'/> <flag name='ide-drive.wwn'/> <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml index 7be2255769..d5e9c8d04b 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml @@ -10,7 +10,6 @@ <flag name='scsi-disk.channel'/> <flag name='scsi-block'/> <flag name='virtio-scsi-pci'/> - <flag name='blockio'/> <flag name='usb-redir.filter'/> <flag name='scsi-disk.wwn'/> <flag name='seccomp-sandbox'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml index f5fab26893..38256f4e19 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml @@ -26,7 +26,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='blockio'/> <flag name='disable-s3'/> <flag name='disable-s4'/> <flag name='usb-redir.filter'/> diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml index ff7c30de69..e1890008f5 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml @@ -26,7 +26,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='blockio'/> <flag name='disable-s3'/> <flag name='disable-s4'/> <flag name='usb-redir.filter'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml index c6d0ce0469..ccebad1f76 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml @@ -25,7 +25,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='blockio'/> <flag name='usb-redir.filter'/> <flag name='ide-drive.wwn'/> <flag name='scsi-disk.wwn'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml index 983b3309f7..451f40a4cd 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml @@ -20,7 +20,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='blockio'/> <flag name='disable-s3'/> <flag name='disable-s4'/> <flag name='ide-drive.wwn'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml index 6679ca1bb6..2437b75663 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml @@ -26,7 +26,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='blockio'/> <flag name='disable-s3'/> <flag name='disable-s4'/> <flag name='usb-redir.filter'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml index a711b5539d..38535a51c1 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml @@ -25,7 +25,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='blockio'/> <flag name='usb-redir.filter'/> <flag name='ide-drive.wwn'/> <flag name='scsi-disk.wwn'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml index 7d48f2ed91..4a47b44060 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml @@ -24,7 +24,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='blockio'/> <flag name='disable-s3'/> <flag name='disable-s4'/> <flag name='usb-redir.filter'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml index b600e9707c..9492ee9c80 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml @@ -26,7 +26,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='blockio'/> <flag name='disable-s3'/> <flag name='disable-s4'/> <flag name='usb-redir.filter'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml index 19c3d81fb0..586b702e5c 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml @@ -23,7 +23,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='blockio'/> <flag name='disable-s3'/> <flag name='disable-s4'/> <flag name='usb-redir.filter'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml index a13de5ac6d..a28a88998e 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml @@ -26,7 +26,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='blockio'/> <flag name='disable-s3'/> <flag name='disable-s4'/> <flag name='usb-redir.filter'/> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml index 3469213697..2e96f59313 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml @@ -26,7 +26,6 @@ <flag name='nec-usb-xhci'/> <flag name='lsi'/> <flag name='virtio-scsi-pci'/> - <flag name='blockio'/> <flag name='disable-s3'/> <flag name='disable-s4'/> <flag name='usb-redir.filter'/> -- 2.37.4
On a Tuesday in 2022, Michal Privoznik wrote:
All supported QEMUs have this capability. Stop detecting it.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 1 - tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml | 1 - 28 files changed, 28 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Now that nothing uses this capability, it can be retired. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_capabilities.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index caa988a478..538ebe0ede 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -207,7 +207,7 @@ VIR_ENUM_IMPL(virQEMUCaps, /* 100 */ "virtio-scsi-pci", /* QEMU_CAPS_VIRTIO_SCSI */ - "blockio", /* QEMU_CAPS_BLOCKIO */ + "blockio", /* X_QEMU_CAPS_BLOCKIO */ "disable-s3", /* QEMU_CAPS_PIIX_DISABLE_S3 */ "disable-s4", /* QEMU_CAPS_PIIX_DISABLE_S4 */ "usb-redir.filter", /* QEMU_CAPS_USB_REDIR_FILTER */ diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 606731a641..46ff416eb1 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -185,7 +185,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ /* 100 */ QEMU_CAPS_VIRTIO_SCSI, /* -device virtio-scsi-* */ - QEMU_CAPS_BLOCKIO, /* -device ...logical_block_size & co */ + X_QEMU_CAPS_BLOCKIO, /* -device ...logical_block_size & co */ QEMU_CAPS_PIIX_DISABLE_S3, /* -M pc S3 BIOS Advertisement on/off */ QEMU_CAPS_PIIX_DISABLE_S4, /* -M pc S4 BIOS Advertisement on/off */ QEMU_CAPS_USB_REDIR_FILTER, /* usb-redir.filter */ -- 2.37.4
On a Tuesday in 2022, Michal Privoznik wrote:
Now that nothing uses this capability, it can be retired.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_capabilities.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Introduced in QEMU's commit of v2.7.0-rc0~83^2 the .num-queues attribute of virtio-blk device is always available for all QEMU versions we support (4.2.0, currently). Therefore, we can assume the capability is always set and thus doesn't need to be checked for. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_validate.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 243ec29c71..4a01fe4d14 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -2977,13 +2977,6 @@ qemuValidateDomainDeviceDefDiskFrontend(const virDomainDiskDef *disk, break; case VIR_DOMAIN_DISK_BUS_VIRTIO: - if (disk->queues && - !virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_BLK_NUM_QUEUES)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("num-queues property isn't supported by this " - "QEMU binary")); - return -1; - } if (disk->queue_size > 0 && !virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_BLK_QUEUE_SIZE)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", -- 2.37.4
On a Tuesday in 2022, Michal Privoznik wrote:
Introduced in QEMU's commit of v2.7.0-rc0~83^2 the .num-queues attribute of virtio-blk device is always available for all QEMU versions we support (4.2.0, currently). Therefore, we can assume the capability is always set and thus doesn't need to be checked for.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_validate.c | 7 ------- 1 file changed, 7 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
All supported QEMUs have this capability. Stop detecting it. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 1 - tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml | 1 - 28 files changed, 28 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 538ebe0ede..8202e1ecca 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1415,7 +1415,6 @@ virQEMUCapsDevicePropsVirtioBlkSCSIDefault(virJSONValue *props, static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioBlk[] = { { "scsi", QEMU_CAPS_VIRTIO_BLK_SCSI, virQEMUCapsDevicePropsVirtioBlkSCSIDefault }, - { "num-queues", QEMU_CAPS_VIRTIO_BLK_NUM_QUEUES, NULL }, { "queue-size", QEMU_CAPS_VIRTIO_BLK_QUEUE_SIZE, NULL }, { "share-rw", QEMU_CAPS_DISK_SHARE_RW, NULL }, { "write-cache", QEMU_CAPS_DISK_WRITE_CACHE, NULL }, diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml index be96f5e31e..483e1a5d32 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml @@ -76,7 +76,6 @@ <flag name='qemu-xhci'/> <flag name='chardev-reconnect'/> <flag name='vxhs'/> - <flag name='virtio-blk.num-queues'/> <flag name='vmcoreinfo'/> <flag name='disk-share-rw'/> <flag name='pl011'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml index 3210276ed1..a3eabbd66d 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml @@ -74,7 +74,6 @@ <flag name='spapr-pci-host-bridge.numa_node'/> <flag name='chardev-reconnect'/> <flag name='vxhs'/> - <flag name='virtio-blk.num-queues'/> <flag name='spapr-vty'/> <flag name='disk-share-rw'/> <flag name='isa-serial'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml index 0503b343d0..8f9b7f8e6c 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -41,7 +41,6 @@ <flag name='loadparm'/> <flag name='chardev-reconnect'/> <flag name='vxhs'/> - <flag name='virtio-blk.num-queues'/> <flag name='sclplmconsole'/> <flag name='disk-share-rw'/> <flag name='virtio-gpu-ccw'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml index bbf40d403f..9e92ac61d7 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -105,7 +105,6 @@ <flag name='intel-iommu.device-iotlb'/> <flag name='chardev-reconnect'/> <flag name='vxhs'/> - <flag name='virtio-blk.num-queues'/> <flag name='vmcoreinfo'/> <flag name='disk-share-rw'/> <flag name='isa-serial'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml index c47a2f5375..bd8a49c98a 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml @@ -78,7 +78,6 @@ <flag name='qemu-xhci'/> <flag name='chardev-reconnect'/> <flag name='vxhs'/> - <flag name='virtio-blk.num-queues'/> <flag name='vmcoreinfo'/> <flag name='disk-share-rw'/> <flag name='pl011'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml index c3f4da9f18..3f250c17d9 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml @@ -76,7 +76,6 @@ <flag name='spapr-pci-host-bridge.numa_node'/> <flag name='chardev-reconnect'/> <flag name='vxhs'/> - <flag name='virtio-blk.num-queues'/> <flag name='spapr-vty'/> <flag name='disk-share-rw'/> <flag name='isa-serial'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml index 2f34912311..381f2cb84a 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml @@ -77,7 +77,6 @@ <flag name='qemu-xhci'/> <flag name='chardev-reconnect'/> <flag name='vxhs'/> - <flag name='virtio-blk.num-queues'/> <flag name='disk-share-rw'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml index ba60c52251..d207ed6e30 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -105,7 +105,6 @@ <flag name='intel-iommu.device-iotlb'/> <flag name='chardev-reconnect'/> <flag name='vxhs'/> - <flag name='virtio-blk.num-queues'/> <flag name='vmcoreinfo'/> <flag name='disk-share-rw'/> <flag name='isa-serial'/> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml index 349139c1db..654088af75 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml @@ -104,7 +104,6 @@ <flag name='intel-iommu.eim'/> <flag name='intel-iommu.device-iotlb'/> <flag name='chardev-reconnect'/> - <flag name='virtio-blk.num-queues'/> <flag name='vmcoreinfo'/> <flag name='disk-share-rw'/> <flag name='isa-serial'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml index 60c0393b9e..e25b49fa68 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml @@ -77,7 +77,6 @@ <flag name='query-cpu-definitions'/> <flag name='qemu-xhci'/> <flag name='chardev-reconnect'/> - <flag name='virtio-blk.num-queues'/> <flag name='vmcoreinfo'/> <flag name='disk-share-rw'/> <flag name='pl011'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml index def3d7f682..63ab249b6d 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml @@ -74,7 +74,6 @@ <flag name='spapr-pci-host-bridge'/> <flag name='spapr-pci-host-bridge.numa_node'/> <flag name='chardev-reconnect'/> - <flag name='virtio-blk.num-queues'/> <flag name='spapr-vty'/> <flag name='disk-share-rw'/> <flag name='isa-serial'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml index 92861e8fa4..de3a91fb58 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml @@ -75,7 +75,6 @@ <flag name='pcie-root-port'/> <flag name='qemu-xhci'/> <flag name='chardev-reconnect'/> - <flag name='virtio-blk.num-queues'/> <flag name='disk-share-rw'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml index e4d7a0423c..0f18c2b5dd 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml @@ -39,7 +39,6 @@ <flag name='query-cpu-definitions'/> <flag name='loadparm'/> <flag name='chardev-reconnect'/> - <flag name='virtio-blk.num-queues'/> <flag name='sclplmconsole'/> <flag name='disk-share-rw'/> <flag name='virtio-gpu-ccw'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml index ad5fafb979..d3649604ad 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml @@ -104,7 +104,6 @@ <flag name='intel-iommu.eim'/> <flag name='intel-iommu.device-iotlb'/> <flag name='chardev-reconnect'/> - <flag name='virtio-blk.num-queues'/> <flag name='vmcoreinfo'/> <flag name='disk-share-rw'/> <flag name='isa-serial'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml index d877136199..6ec373e727 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml @@ -78,7 +78,6 @@ <flag name='query-cpu-definitions'/> <flag name='qemu-xhci'/> <flag name='chardev-reconnect'/> - <flag name='virtio-blk.num-queues'/> <flag name='vmcoreinfo'/> <flag name='disk-share-rw'/> <flag name='pl011'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml index d5e9c8d04b..7a8ef27b7c 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml @@ -39,7 +39,6 @@ <flag name='query-cpu-definitions'/> <flag name='loadparm'/> <flag name='chardev-reconnect'/> - <flag name='virtio-blk.num-queues'/> <flag name='sclplmconsole'/> <flag name='disk-share-rw'/> <flag name='virtio-gpu-ccw'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml index 38256f4e19..ad5c43ea6f 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml @@ -103,7 +103,6 @@ <flag name='intel-iommu.eim'/> <flag name='intel-iommu.device-iotlb'/> <flag name='chardev-reconnect'/> - <flag name='virtio-blk.num-queues'/> <flag name='vmcoreinfo'/> <flag name='disk-share-rw'/> <flag name='isa-serial'/> diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml index e1890008f5..14e10b2480 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml @@ -102,7 +102,6 @@ <flag name='intel-iommu.eim'/> <flag name='intel-iommu.device-iotlb'/> <flag name='chardev-reconnect'/> - <flag name='virtio-blk.num-queues'/> <flag name='vmcoreinfo'/> <flag name='disk-share-rw'/> <flag name='isa-serial'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml index ccebad1f76..737e3ce902 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml @@ -85,7 +85,6 @@ <flag name='query-cpu-definitions'/> <flag name='qemu-xhci'/> <flag name='chardev-reconnect'/> - <flag name='virtio-blk.num-queues'/> <flag name='vmcoreinfo'/> <flag name='disk-share-rw'/> <flag name='pl011'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml index 451f40a4cd..8d2d43d916 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml @@ -74,7 +74,6 @@ <flag name='spapr-pci-host-bridge'/> <flag name='spapr-pci-host-bridge.numa_node'/> <flag name='chardev-reconnect'/> - <flag name='virtio-blk.num-queues'/> <flag name='spapr-vty'/> <flag name='disk-share-rw'/> <flag name='isa-serial'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml index 2437b75663..5d1f5dbb5e 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml @@ -102,7 +102,6 @@ <flag name='intel-iommu.eim'/> <flag name='intel-iommu.device-iotlb'/> <flag name='chardev-reconnect'/> - <flag name='virtio-blk.num-queues'/> <flag name='vmcoreinfo'/> <flag name='disk-share-rw'/> <flag name='isa-serial'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml index 38535a51c1..89aaf97e01 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml @@ -85,7 +85,6 @@ <flag name='query-cpu-definitions'/> <flag name='qemu-xhci'/> <flag name='chardev-reconnect'/> - <flag name='virtio-blk.num-queues'/> <flag name='vmcoreinfo'/> <flag name='disk-share-rw'/> <flag name='pl011'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml index 4a47b44060..8a49694013 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml @@ -80,7 +80,6 @@ <flag name='spapr-pci-host-bridge'/> <flag name='spapr-pci-host-bridge.numa_node'/> <flag name='chardev-reconnect'/> - <flag name='virtio-blk.num-queues'/> <flag name='spapr-vty'/> <flag name='disk-share-rw'/> <flag name='isa-serial'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml index 9492ee9c80..b15a52c55a 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml @@ -102,7 +102,6 @@ <flag name='intel-iommu.eim'/> <flag name='intel-iommu.device-iotlb'/> <flag name='chardev-reconnect'/> - <flag name='virtio-blk.num-queues'/> <flag name='vmcoreinfo'/> <flag name='disk-share-rw'/> <flag name='isa-serial'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml index 586b702e5c..6c63704b03 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml @@ -79,7 +79,6 @@ <flag name='spapr-pci-host-bridge'/> <flag name='spapr-pci-host-bridge.numa_node'/> <flag name='chardev-reconnect'/> - <flag name='virtio-blk.num-queues'/> <flag name='spapr-vty'/> <flag name='disk-share-rw'/> <flag name='isa-serial'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml index a28a88998e..8664317266 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml @@ -102,7 +102,6 @@ <flag name='intel-iommu.eim'/> <flag name='intel-iommu.device-iotlb'/> <flag name='chardev-reconnect'/> - <flag name='virtio-blk.num-queues'/> <flag name='vmcoreinfo'/> <flag name='disk-share-rw'/> <flag name='isa-serial'/> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml index 2e96f59313..35b96c2a32 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml @@ -102,7 +102,6 @@ <flag name='intel-iommu.eim'/> <flag name='intel-iommu.device-iotlb'/> <flag name='chardev-reconnect'/> - <flag name='virtio-blk.num-queues'/> <flag name='vmcoreinfo'/> <flag name='disk-share-rw'/> <flag name='isa-serial'/> -- 2.37.4
On a Tuesday in 2022, Michal Privoznik wrote:
All supported QEMUs have this capability. Stop detecting it.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 1 - tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml | 1 - 28 files changed, 28 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Now that nothing uses this capability, it can be retired. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_capabilities.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 8202e1ecca..322c002e84 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -441,7 +441,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "chardev-reconnect", /* QEMU_CAPS_CHARDEV_RECONNECT */ "virtio-gpu.max_outputs", /* X_QEMU_CAPS_VIRTIO_GPU_MAX_OUTPUTS */ "vxhs", /* QEMU_CAPS_VXHS */ - "virtio-blk.num-queues", /* QEMU_CAPS_VIRTIO_BLK_NUM_QUEUES */ + "virtio-blk.num-queues", /* X_QEMU_CAPS_VIRTIO_BLK_NUM_QUEUES */ /* 270 */ "machine.pseries.resize-hpt", /* X_QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT */ diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 46ff416eb1..0a62765a04 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -420,7 +420,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ QEMU_CAPS_CHARDEV_RECONNECT, /* -chardev reconnect */ X_QEMU_CAPS_VIRTIO_GPU_MAX_OUTPUTS, /* -device virtio-(vga|gpu-*),max-outputs= */ QEMU_CAPS_VXHS, /* -drive file.driver=vxhs via query-qmp-schema */ - QEMU_CAPS_VIRTIO_BLK_NUM_QUEUES, /* virtio-blk-*.num-queues */ + X_QEMU_CAPS_VIRTIO_BLK_NUM_QUEUES, /* virtio-blk-*.num-queues */ /* 270 */ X_QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT, /* -machine pseries,resize-hpt */ -- 2.37.4
On a Tuesday in 2022, Michal Privoznik wrote:
Now that nothing uses this capability, it can be retired.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_capabilities.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Introduced in QEMU's commit of v2.9.0-rc0~48^2~25 the .share-rw attribute of virtio-blk device is always available for all QEMU versions we support (4.2.0, currently). Therefore, we can assume the capability is always set and thus doesn't need to be checked for. The change in controller-order.args is justified, because the qemuxml2argvdatatest runs the test case with very minimalistic set of capabilities, that's nowhere near real life scenario. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_command.c | 3 +-- tests/qemuxml2argvdata/controller-order.args | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index b0c9fb7059..f775170e32 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1871,8 +1871,7 @@ qemuBuildDiskDeviceProps(const virDomainDef *def, if (qemuBuildDeviceAddressProps(props, def, &disk->info) < 0) return NULL; - if (disk->src->shared && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_DISK_SHARE_RW)) + if (disk->src->shared) shareRW = VIR_TRISTATE_SWITCH_ON; if (virStorageSourceGetActualType(disk->src) == VIR_STORAGE_TYPE_VHOST_USER) { diff --git a/tests/qemuxml2argvdata/controller-order.args b/tests/qemuxml2argvdata/controller-order.args index fd9eba459a..c0ba064bec 100644 --- a/tests/qemuxml2argvdata/controller-order.args +++ b/tests/qemuxml2argvdata/controller-order.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-fdr/.config \ -device usb-ccid,id=ccid0,bus=usb.0,port=1.1 \ -blockdev '{"driver":"file","filename":"/tmp/fdr.img","aio":"native","node-name":"libvirt-2-storage","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"cache":{"direct":true,"no-flush":false},"driver":"raw","file":"libvirt-2-storage"}' \ --device virtio-blk-pci,bus=pci.0,addr=0x5,drive=libvirt-2-format,id=virtio-disk0,bootindex=1 \ +-device virtio-blk-pci,bus=pci.0,addr=0x5,share-rw=on,drive=libvirt-2-format,id=virtio-disk0,bootindex=1 \ -blockdev '{"driver":"file","filename":"/tmp/Fedora-17-x86_64-Live-Desktop.iso","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw","file":"libvirt-1-storage"}' \ -device ide-cd,bus=ide.1,unit=0,drive=libvirt-1-format,id=ide0-1-0 \ -- 2.37.4
On a Tuesday in 2022, Michal Privoznik wrote:
Introduced in QEMU's commit of v2.9.0-rc0~48^2~25 the .share-rw attribute of virtio-blk device is always available for all QEMU versions we support (4.2.0, currently). Therefore, we can assume the capability is always set and thus doesn't need to be checked for.
The change in controller-order.args is justified, because the qemuxml2argvdatatest runs the test case with very minimalistic set of capabilities, that's nowhere near real life scenario.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_command.c | 3 +-- tests/qemuxml2argvdata/controller-order.args | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
All supported QEMUs have this capability. Stop detecting it. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 4 ---- tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml | 1 - 29 files changed, 32 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 322c002e84..6b9b4e96de 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1416,7 +1416,6 @@ virQEMUCapsDevicePropsVirtioBlkSCSIDefault(virJSONValue *props, static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioBlk[] = { { "scsi", QEMU_CAPS_VIRTIO_BLK_SCSI, virQEMUCapsDevicePropsVirtioBlkSCSIDefault }, { "queue-size", QEMU_CAPS_VIRTIO_BLK_QUEUE_SIZE, NULL }, - { "share-rw", QEMU_CAPS_DISK_SHARE_RW, NULL }, { "write-cache", QEMU_CAPS_DISK_WRITE_CACHE, NULL }, { "acpi-index", QEMU_CAPS_ACPI_INDEX, NULL }, }; @@ -1450,14 +1449,12 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVfioPCI[] = { static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsSCSIDisk[] = { { "channel", QEMU_CAPS_SCSI_DISK_CHANNEL, NULL }, { "wwn", QEMU_CAPS_SCSI_DISK_WWN, NULL }, - { "share-rw", QEMU_CAPS_DISK_SHARE_RW, NULL }, { "write-cache", QEMU_CAPS_DISK_WRITE_CACHE, NULL }, { "rotation_rate", QEMU_CAPS_ROTATION_RATE, NULL }, }; static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsIDEDrive[] = { { "wwn", QEMU_CAPS_IDE_DRIVE_WWN, NULL }, - { "share-rw", QEMU_CAPS_DISK_SHARE_RW, NULL }, { "write-cache", QEMU_CAPS_DISK_WRITE_CACHE, NULL }, }; @@ -1473,7 +1470,6 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsUSBRedir[] = { static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsUSBStorage[] = { { "removable", QEMU_CAPS_USB_STORAGE_REMOVABLE, NULL }, - { "share-rw", QEMU_CAPS_DISK_SHARE_RW, NULL }, { "write-cache", QEMU_CAPS_DISK_WRITE_CACHE, NULL }, }; diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml index 483e1a5d32..d36f3ff6ab 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml @@ -77,7 +77,6 @@ <flag name='chardev-reconnect'/> <flag name='vxhs'/> <flag name='vmcoreinfo'/> - <flag name='disk-share-rw'/> <flag name='pl011'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml index a3eabbd66d..7afd35f5ac 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml @@ -75,7 +75,6 @@ <flag name='chardev-reconnect'/> <flag name='vxhs'/> <flag name='spapr-vty'/> - <flag name='disk-share-rw'/> <flag name='isa-serial'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml index 8f9b7f8e6c..92486c7a4b 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -42,7 +42,6 @@ <flag name='chardev-reconnect'/> <flag name='vxhs'/> <flag name='sclplmconsole'/> - <flag name='disk-share-rw'/> <flag name='virtio-gpu-ccw'/> <flag name='virtio-keyboard-ccw'/> <flag name='virtio-mouse-ccw'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml index 9e92ac61d7..04e8fc40dd 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -106,7 +106,6 @@ <flag name='chardev-reconnect'/> <flag name='vxhs'/> <flag name='vmcoreinfo'/> - <flag name='disk-share-rw'/> <flag name='isa-serial'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml index bd8a49c98a..551eded1a5 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml @@ -79,7 +79,6 @@ <flag name='chardev-reconnect'/> <flag name='vxhs'/> <flag name='vmcoreinfo'/> - <flag name='disk-share-rw'/> <flag name='pl011'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml index 3f250c17d9..32db5ac3dd 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml @@ -77,7 +77,6 @@ <flag name='chardev-reconnect'/> <flag name='vxhs'/> <flag name='spapr-vty'/> - <flag name='disk-share-rw'/> <flag name='isa-serial'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml index 381f2cb84a..0b50236f53 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml @@ -77,7 +77,6 @@ <flag name='qemu-xhci'/> <flag name='chardev-reconnect'/> <flag name='vxhs'/> - <flag name='disk-share-rw'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> <flag name='nbd-tls'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml index d207ed6e30..89cc1e4e70 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -106,7 +106,6 @@ <flag name='chardev-reconnect'/> <flag name='vxhs'/> <flag name='vmcoreinfo'/> - <flag name='disk-share-rw'/> <flag name='isa-serial'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml index 48e001b60f..7ba8152589 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml @@ -21,7 +21,6 @@ <flag name='query-hotpluggable-cpus'/> <flag name='spice-rendernode'/> <flag name='chardev-reconnect'/> - <flag name='disk-share-rw'/> <flag name='isa-serial'/> <flag name='disk-write-cache'/> <flag name='nbd-tls'/> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml index 654088af75..fef56fadf1 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml @@ -105,7 +105,6 @@ <flag name='intel-iommu.device-iotlb'/> <flag name='chardev-reconnect'/> <flag name='vmcoreinfo'/> - <flag name='disk-share-rw'/> <flag name='isa-serial'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml index e25b49fa68..fe46995758 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml @@ -78,7 +78,6 @@ <flag name='qemu-xhci'/> <flag name='chardev-reconnect'/> <flag name='vmcoreinfo'/> - <flag name='disk-share-rw'/> <flag name='pl011'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml index 63ab249b6d..239ce68f1e 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml @@ -75,7 +75,6 @@ <flag name='spapr-pci-host-bridge.numa_node'/> <flag name='chardev-reconnect'/> <flag name='spapr-vty'/> - <flag name='disk-share-rw'/> <flag name='isa-serial'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml index de3a91fb58..241bc4ebc1 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml @@ -75,7 +75,6 @@ <flag name='pcie-root-port'/> <flag name='qemu-xhci'/> <flag name='chardev-reconnect'/> - <flag name='disk-share-rw'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> <flag name='nbd-tls'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml index 0f18c2b5dd..efe85e77e2 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml @@ -40,7 +40,6 @@ <flag name='loadparm'/> <flag name='chardev-reconnect'/> <flag name='sclplmconsole'/> - <flag name='disk-share-rw'/> <flag name='virtio-gpu-ccw'/> <flag name='virtio-keyboard-ccw'/> <flag name='virtio-mouse-ccw'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml index d3649604ad..df4a2cb5a8 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml @@ -105,7 +105,6 @@ <flag name='intel-iommu.device-iotlb'/> <flag name='chardev-reconnect'/> <flag name='vmcoreinfo'/> - <flag name='disk-share-rw'/> <flag name='isa-serial'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml index 6ec373e727..d3e37172bc 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml @@ -79,7 +79,6 @@ <flag name='qemu-xhci'/> <flag name='chardev-reconnect'/> <flag name='vmcoreinfo'/> - <flag name='disk-share-rw'/> <flag name='pl011'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml index 7a8ef27b7c..a020e56a64 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml @@ -40,7 +40,6 @@ <flag name='loadparm'/> <flag name='chardev-reconnect'/> <flag name='sclplmconsole'/> - <flag name='disk-share-rw'/> <flag name='virtio-gpu-ccw'/> <flag name='virtio-keyboard-ccw'/> <flag name='virtio-mouse-ccw'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml index ad5c43ea6f..d3255b1eeb 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml @@ -104,7 +104,6 @@ <flag name='intel-iommu.device-iotlb'/> <flag name='chardev-reconnect'/> <flag name='vmcoreinfo'/> - <flag name='disk-share-rw'/> <flag name='isa-serial'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml index 14e10b2480..d2f871138d 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml @@ -103,7 +103,6 @@ <flag name='intel-iommu.device-iotlb'/> <flag name='chardev-reconnect'/> <flag name='vmcoreinfo'/> - <flag name='disk-share-rw'/> <flag name='isa-serial'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml index 737e3ce902..67f2cf482a 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml @@ -86,7 +86,6 @@ <flag name='qemu-xhci'/> <flag name='chardev-reconnect'/> <flag name='vmcoreinfo'/> - <flag name='disk-share-rw'/> <flag name='pl011'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml index 8d2d43d916..318c962299 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml @@ -75,7 +75,6 @@ <flag name='spapr-pci-host-bridge.numa_node'/> <flag name='chardev-reconnect'/> <flag name='spapr-vty'/> - <flag name='disk-share-rw'/> <flag name='isa-serial'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml index 5d1f5dbb5e..c859553038 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml @@ -103,7 +103,6 @@ <flag name='intel-iommu.device-iotlb'/> <flag name='chardev-reconnect'/> <flag name='vmcoreinfo'/> - <flag name='disk-share-rw'/> <flag name='isa-serial'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml index 89aaf97e01..1707aef39e 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml @@ -86,7 +86,6 @@ <flag name='qemu-xhci'/> <flag name='chardev-reconnect'/> <flag name='vmcoreinfo'/> - <flag name='disk-share-rw'/> <flag name='pl011'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml index 8a49694013..d8f87430d6 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml @@ -81,7 +81,6 @@ <flag name='spapr-pci-host-bridge.numa_node'/> <flag name='chardev-reconnect'/> <flag name='spapr-vty'/> - <flag name='disk-share-rw'/> <flag name='isa-serial'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml index b15a52c55a..4227f95880 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml @@ -103,7 +103,6 @@ <flag name='intel-iommu.device-iotlb'/> <flag name='chardev-reconnect'/> <flag name='vmcoreinfo'/> - <flag name='disk-share-rw'/> <flag name='isa-serial'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml index 6c63704b03..f05143e297 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml @@ -80,7 +80,6 @@ <flag name='spapr-pci-host-bridge.numa_node'/> <flag name='chardev-reconnect'/> <flag name='spapr-vty'/> - <flag name='disk-share-rw'/> <flag name='isa-serial'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml index 8664317266..504ecc0a7f 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml @@ -103,7 +103,6 @@ <flag name='intel-iommu.device-iotlb'/> <flag name='chardev-reconnect'/> <flag name='vmcoreinfo'/> - <flag name='disk-share-rw'/> <flag name='isa-serial'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml index 35b96c2a32..4d7b9c1e7d 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml @@ -103,7 +103,6 @@ <flag name='intel-iommu.device-iotlb'/> <flag name='chardev-reconnect'/> <flag name='vmcoreinfo'/> - <flag name='disk-share-rw'/> <flag name='isa-serial'/> <flag name='pcie-pci-bridge'/> <flag name='disk-write-cache'/> -- 2.37.4
On a Tuesday in 2022, Michal Privoznik wrote:
All supported QEMUs have this capability. Stop detecting it.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 4 ---- tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml | 1 - 29 files changed, 32 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Now that nothing uses this capability, it can be retired. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_capabilities.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 6b9b4e96de..6520f52c40 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -451,7 +451,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "numa.dist", /* X_QEMU_CAPS_NUMA_DIST */ /* 275 */ - "disk-share-rw", /* QEMU_CAPS_DISK_SHARE_RW */ + "disk-share-rw", /* X_QEMU_CAPS_DISK_SHARE_RW */ "iscsi.password-secret", /* X_QEMU_CAPS_ISCSI_PASSWORD_SECRET */ "isa-serial", /* QEMU_CAPS_DEVICE_ISA_SERIAL */ "pl011", /* QEMU_CAPS_DEVICE_PL011 */ diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 0a62765a04..ead8ef45d9 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -430,7 +430,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ X_QEMU_CAPS_NUMA_DIST, /* -numa dist */ /* 275 */ - QEMU_CAPS_DISK_SHARE_RW, /* share-rw=on for concurrent disk access */ + X_QEMU_CAPS_DISK_SHARE_RW, /* share-rw=on for concurrent disk access */ X_QEMU_CAPS_ISCSI_PASSWORD_SECRET, /* -drive file.driver=iscsi,...,password-secret= */ QEMU_CAPS_DEVICE_ISA_SERIAL, /* -device isa-serial */ QEMU_CAPS_DEVICE_PL011, /* -device pl011 (not user-instantiable) */ -- 2.37.4
On a Tuesday in 2022, Michal Privoznik wrote:
Now that nothing uses this capability, it can be retired.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_capabilities.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Introduced in QEMU's commit of v2.7.0-rc0~32^2~5 the .write-cache attribute of virtio-blk dvice is always available for all QEMU versions we support (4.2.0, currently). Therefore, we can assume the capability is always set and thus doesn't need to be checked for. The change in some .args is justified, because the qemuxml2argvdatatest runs these test caseses with very minimalistic set of capabilities, that's nowhere near real life scenario. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_command.c | 3 +-- tests/qemuxml2argvdata/controller-order.args | 2 +- tests/qemuxml2argvdata/video-device-pciaddr-default.args | 2 +- tests/qemuxml2argvdata/video-qxl-device-vgamem.args | 2 +- tests/qemuxml2argvdata/video-qxl-device.args | 2 +- tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args | 2 +- tests/qemuxml2argvdata/video-qxl-sec-device.args | 2 +- tests/qemuxml2argvdata/video-vga-device-vgamem.args | 2 +- tests/qemuxml2argvdata/video-vga-device.args | 2 +- tests/qemuxml2argvdata/video-virtio-gpu-device.args | 2 +- tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args | 2 +- tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args | 2 +- tests/qemuxml2argvdata/video-virtio-gpu-virgl.args | 2 +- tests/qemuxml2argvdata/video-virtio-vga.args | 2 +- 14 files changed, 14 insertions(+), 15 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index f775170e32..3236196c14 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -1900,8 +1900,7 @@ qemuBuildDiskDeviceProps(const virDomainDef *def, if (disk->cachemode != VIR_DOMAIN_DISK_CACHE_DEFAULT) { /* VIR_DOMAIN_DISK_DEVICE_LUN translates into 'scsi-block' * where any caching setting makes no sense. */ - if (disk->device != VIR_DOMAIN_DISK_DEVICE_LUN && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_DISK_WRITE_CACHE)) { + if (disk->device != VIR_DOMAIN_DISK_DEVICE_LUN) { bool wb; if (qemuDomainDiskCachemodeFlags(disk->cachemode, &wb, NULL, diff --git a/tests/qemuxml2argvdata/controller-order.args b/tests/qemuxml2argvdata/controller-order.args index c0ba064bec..242639591c 100644 --- a/tests/qemuxml2argvdata/controller-order.args +++ b/tests/qemuxml2argvdata/controller-order.args @@ -29,7 +29,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-fdr/.config \ -device usb-ccid,id=ccid0,bus=usb.0,port=1.1 \ -blockdev '{"driver":"file","filename":"/tmp/fdr.img","aio":"native","node-name":"libvirt-2-storage","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-2-format","read-only":false,"cache":{"direct":true,"no-flush":false},"driver":"raw","file":"libvirt-2-storage"}' \ --device virtio-blk-pci,bus=pci.0,addr=0x5,share-rw=on,drive=libvirt-2-format,id=virtio-disk0,bootindex=1 \ +-device virtio-blk-pci,bus=pci.0,addr=0x5,share-rw=on,drive=libvirt-2-format,id=virtio-disk0,bootindex=1,write-cache=on \ -blockdev '{"driver":"file","filename":"/tmp/Fedora-17-x86_64-Live-Desktop.iso","node-name":"libvirt-1-storage","auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":true,"driver":"raw","file":"libvirt-1-storage"}' \ -device ide-cd,bus=ide.1,unit=0,drive=libvirt-1-format,id=ide0-1-0 \ diff --git a/tests/qemuxml2argvdata/video-device-pciaddr-default.args b/tests/qemuxml2argvdata/video-device-pciaddr-default.args index e216aacc64..9b421c012d 100644 --- a/tests/qemuxml2argvdata/video-device-pciaddr-default.args +++ b/tests/qemuxml2argvdata/video-device-pciaddr-default.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"direct":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1,write-cache=on \ -audiodev '{"id":"audio1","driver":"none"}' \ -vnc 127.0.0.1:0,audiodev=audio1 \ -device qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x3 \ diff --git a/tests/qemuxml2argvdata/video-qxl-device-vgamem.args b/tests/qemuxml2argvdata/video-qxl-device-vgamem.args index 1332f798da..14b3931140 100644 --- a/tests/qemuxml2argvdata/video-qxl-device-vgamem.args +++ b/tests/qemuxml2argvdata/video-qxl-device-vgamem.args @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"direct":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1,write-cache=on \ -audiodev '{"id":"audio1","driver":"none"}' \ -device qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=67108864,vgamem_mb=16,bus=pci.0,addr=0x2 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ diff --git a/tests/qemuxml2argvdata/video-qxl-device.args b/tests/qemuxml2argvdata/video-qxl-device.args index dc679b7aa5..570bb64323 100644 --- a/tests/qemuxml2argvdata/video-qxl-device.args +++ b/tests/qemuxml2argvdata/video-qxl-device.args @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"direct":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1,write-cache=on \ -audiodev '{"id":"audio1","driver":"none"}' \ -device qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x2 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args b/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args index 42de87528c..1715ee0cf7 100644 --- a/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args +++ b/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"direct":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1,write-cache=on \ -audiodev '{"id":"audio1","driver":"none"}' \ -device qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=67108864,vgamem_mb=16,bus=pci.0,addr=0x2 \ -device qxl,id=video1,max_outputs=1,ram_size=67108864,vram_size=67108864,vgamem_mb=16,bus=pci.0,addr=0x4 \ diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device.args b/tests/qemuxml2argvdata/video-qxl-sec-device.args index c55e3eb9db..6140fffa72 100644 --- a/tests/qemuxml2argvdata/video-qxl-sec-device.args +++ b/tests/qemuxml2argvdata/video-qxl-sec-device.args @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"direct":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1,write-cache=on \ -audiodev '{"id":"audio1","driver":"none"}' \ -device qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x2 \ -device qxl,id=video1,max_outputs=1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x4 \ diff --git a/tests/qemuxml2argvdata/video-vga-device-vgamem.args b/tests/qemuxml2argvdata/video-vga-device-vgamem.args index 8d1108216e..c9ac626b77 100644 --- a/tests/qemuxml2argvdata/video-vga-device-vgamem.args +++ b/tests/qemuxml2argvdata/video-vga-device-vgamem.args @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"direct":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1,write-cache=on \ -audiodev '{"id":"audio1","driver":"none"}' \ -device VGA,id=video0,vgamem_mb=16,bus=pci.0,addr=0x2 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ diff --git a/tests/qemuxml2argvdata/video-vga-device.args b/tests/qemuxml2argvdata/video-vga-device.args index 1a832df4cb..10f3b38e09 100644 --- a/tests/qemuxml2argvdata/video-vga-device.args +++ b/tests/qemuxml2argvdata/video-vga-device.args @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"direct":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1,write-cache=on \ -audiodev '{"id":"audio1","driver":"none"}' \ -device VGA,id=video0,bus=pci.0,addr=0x2 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-device.args b/tests/qemuxml2argvdata/video-virtio-gpu-device.args index 1dd818f5fc..2c31631572 100644 --- a/tests/qemuxml2argvdata/video-virtio-gpu-device.args +++ b/tests/qemuxml2argvdata/video-virtio-gpu-device.args @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"direct":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1,write-cache=on \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-gpu-pci,id=video0,max_outputs=1,bus=pci.0,addr=0x2 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args b/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args index d4ab9fac16..adeab6d53d 100644 --- a/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args +++ b/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"direct":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1,write-cache=on \ -display sdl,gl=on \ -device virtio-gpu-pci,id=video0,virgl=on,max_outputs=1,bus=pci.0,addr=0x2 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args b/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args index f198d4da8b..60862a48d7 100644 --- a/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args +++ b/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args @@ -27,7 +27,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"direct":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1,write-cache=on \ -audiodev '{"id":"audio1","driver":"spice"}' \ -spice port=0,gl=on,rendernode=/dev/dri/foo,seamless-migration=on \ -device virtio-gpu-pci,id=video0,virgl=on,max_outputs=1,bus=pci.0,addr=0x2 \ diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args b/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args index 140bee6187..87c79a4865 100644 --- a/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args +++ b/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"direct":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1,write-cache=on \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-gpu-pci,id=video0,virgl=on,max_outputs=1,bus=pci.0,addr=0x2 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ diff --git a/tests/qemuxml2argvdata/video-virtio-vga.args b/tests/qemuxml2argvdata/video-virtio-vga.args index 704a6334b0..f0352d7583 100644 --- a/tests/qemuxml2argvdata/video-virtio-vga.args +++ b/tests/qemuxml2argvdata/video-virtio-vga.args @@ -28,7 +28,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \ -usb \ -blockdev '{"driver":"file","filename":"/var/lib/libvirt/images/QEMUGuest1","node-name":"libvirt-1-storage","cache":{"direct":true,"no-flush":false},"auto-read-only":true,"discard":"unmap"}' \ -blockdev '{"node-name":"libvirt-1-format","read-only":false,"cache":{"direct":true,"no-flush":false},"driver":"qcow2","file":"libvirt-1-storage"}' \ --device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1 \ +-device ide-hd,bus=ide.0,unit=0,drive=libvirt-1-format,id=ide0-0-0,bootindex=1,write-cache=on \ -audiodev '{"id":"audio1","driver":"none"}' \ -device virtio-vga,id=video0,max_outputs=1,bus=pci.0,addr=0x2 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \ -- 2.37.4
On a Tuesday in 2022, Michal Privoznik wrote:
Introduced in QEMU's commit of v2.7.0-rc0~32^2~5 the .write-cache attribute of virtio-blk dvice is always available for all QEMU versions we support (4.2.0, currently). Therefore, we can assume the capability is always set and thus doesn't need to be checked for.
The change in some .args is justified, because the qemuxml2argvdatatest runs these test caseses with very minimalistic set of capabilities, that's nowhere near real life scenario.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_command.c | 3 +-- tests/qemuxml2argvdata/controller-order.args | 2 +- tests/qemuxml2argvdata/video-device-pciaddr-default.args | 2 +- tests/qemuxml2argvdata/video-qxl-device-vgamem.args | 2 +- tests/qemuxml2argvdata/video-qxl-device.args | 2 +- tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args | 2 +- tests/qemuxml2argvdata/video-qxl-sec-device.args | 2 +- tests/qemuxml2argvdata/video-vga-device-vgamem.args | 2 +- tests/qemuxml2argvdata/video-vga-device.args | 2 +- tests/qemuxml2argvdata/video-virtio-gpu-device.args | 2 +- tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args | 2 +- tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args | 2 +- tests/qemuxml2argvdata/video-virtio-gpu-virgl.args | 2 +- tests/qemuxml2argvdata/video-virtio-vga.args | 2 +- 14 files changed, 14 insertions(+), 15 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
All supported QEMUs have this capability. Stop detecting it. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 4 ---- tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml | 1 - 29 files changed, 32 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 6520f52c40..0b267e4f30 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1416,7 +1416,6 @@ virQEMUCapsDevicePropsVirtioBlkSCSIDefault(virJSONValue *props, static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVirtioBlk[] = { { "scsi", QEMU_CAPS_VIRTIO_BLK_SCSI, virQEMUCapsDevicePropsVirtioBlkSCSIDefault }, { "queue-size", QEMU_CAPS_VIRTIO_BLK_QUEUE_SIZE, NULL }, - { "write-cache", QEMU_CAPS_DISK_WRITE_CACHE, NULL }, { "acpi-index", QEMU_CAPS_ACPI_INDEX, NULL }, }; @@ -1449,13 +1448,11 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVfioPCI[] = { static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsSCSIDisk[] = { { "channel", QEMU_CAPS_SCSI_DISK_CHANNEL, NULL }, { "wwn", QEMU_CAPS_SCSI_DISK_WWN, NULL }, - { "write-cache", QEMU_CAPS_DISK_WRITE_CACHE, NULL }, { "rotation_rate", QEMU_CAPS_ROTATION_RATE, NULL }, }; static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsIDEDrive[] = { { "wwn", QEMU_CAPS_IDE_DRIVE_WWN, NULL }, - { "write-cache", QEMU_CAPS_DISK_WRITE_CACHE, NULL }, }; static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsPiix4PM[] = { @@ -1470,7 +1467,6 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsUSBRedir[] = { static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsUSBStorage[] = { { "removable", QEMU_CAPS_USB_STORAGE_REMOVABLE, NULL }, - { "write-cache", QEMU_CAPS_DISK_WRITE_CACHE, NULL }, }; static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsKVMPit[] = { diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml index d36f3ff6ab..1f42ff6cf9 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml @@ -79,7 +79,6 @@ <flag name='vmcoreinfo'/> <flag name='pl011'/> <flag name='pcie-pci-bridge'/> - <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='pr-manager-helper'/> <flag name='screendump_device'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml index 7afd35f5ac..047abcee8c 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml @@ -77,7 +77,6 @@ <flag name='spapr-vty'/> <flag name='isa-serial'/> <flag name='pcie-pci-bridge'/> - <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='pr-manager-helper'/> <flag name='screendump_device'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml index 92486c7a4b..0baeeccb9b 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -46,7 +46,6 @@ <flag name='virtio-keyboard-ccw'/> <flag name='virtio-mouse-ccw'/> <flag name='virtio-tablet-ccw'/> - <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='pr-manager-helper'/> <flag name='vfio-ccw'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml index 04e8fc40dd..438927aad0 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -108,7 +108,6 @@ <flag name='vmcoreinfo'/> <flag name='isa-serial'/> <flag name='pcie-pci-bridge'/> - <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='tpm-crb'/> <flag name='pr-manager-helper'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml index 551eded1a5..ff989e0878 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml @@ -81,7 +81,6 @@ <flag name='vmcoreinfo'/> <flag name='pl011'/> <flag name='pcie-pci-bridge'/> - <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='pr-manager-helper'/> <flag name='screendump_device'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml index 32db5ac3dd..e336e71831 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml @@ -79,7 +79,6 @@ <flag name='spapr-vty'/> <flag name='isa-serial'/> <flag name='pcie-pci-bridge'/> - <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='pr-manager-helper'/> <flag name='screendump_device'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml index 0b50236f53..4ce2594557 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml @@ -78,7 +78,6 @@ <flag name='chardev-reconnect'/> <flag name='vxhs'/> <flag name='pcie-pci-bridge'/> - <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='pr-manager-helper'/> <flag name='screendump_device'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml index 89cc1e4e70..bf32de2ee4 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -108,7 +108,6 @@ <flag name='vmcoreinfo'/> <flag name='isa-serial'/> <flag name='pcie-pci-bridge'/> - <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='tpm-crb'/> <flag name='pr-manager-helper'/> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml index 7ba8152589..a791a84940 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml @@ -22,7 +22,6 @@ <flag name='spice-rendernode'/> <flag name='chardev-reconnect'/> <flag name='isa-serial'/> - <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='pr-manager-helper'/> <flag name='screendump_device'/> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml index fef56fadf1..f8c64b4cc2 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml @@ -107,7 +107,6 @@ <flag name='vmcoreinfo'/> <flag name='isa-serial'/> <flag name='pcie-pci-bridge'/> - <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='tpm-crb'/> <flag name='pr-manager-helper'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml index fe46995758..7c8b98b600 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml @@ -80,7 +80,6 @@ <flag name='vmcoreinfo'/> <flag name='pl011'/> <flag name='pcie-pci-bridge'/> - <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='pr-manager-helper'/> <flag name='screendump_device'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml index 239ce68f1e..88807f0c3c 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml @@ -77,7 +77,6 @@ <flag name='spapr-vty'/> <flag name='isa-serial'/> <flag name='pcie-pci-bridge'/> - <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='pr-manager-helper'/> <flag name='screendump_device'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml index 241bc4ebc1..1555b5bcb7 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml @@ -76,7 +76,6 @@ <flag name='qemu-xhci'/> <flag name='chardev-reconnect'/> <flag name='pcie-pci-bridge'/> - <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='pr-manager-helper'/> <flag name='screendump_device'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml index efe85e77e2..4433caa492 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml @@ -44,7 +44,6 @@ <flag name='virtio-keyboard-ccw'/> <flag name='virtio-mouse-ccw'/> <flag name='virtio-tablet-ccw'/> - <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='pr-manager-helper'/> <flag name='vfio-ccw'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml index df4a2cb5a8..4c34fcef02 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml @@ -107,7 +107,6 @@ <flag name='vmcoreinfo'/> <flag name='isa-serial'/> <flag name='pcie-pci-bridge'/> - <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='tpm-crb'/> <flag name='pr-manager-helper'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml index d3e37172bc..6f33a827b3 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml @@ -81,7 +81,6 @@ <flag name='vmcoreinfo'/> <flag name='pl011'/> <flag name='pcie-pci-bridge'/> - <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='pr-manager-helper'/> <flag name='screendump_device'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml index a020e56a64..f269a8935f 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml @@ -44,7 +44,6 @@ <flag name='virtio-keyboard-ccw'/> <flag name='virtio-mouse-ccw'/> <flag name='virtio-tablet-ccw'/> - <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='pr-manager-helper'/> <flag name='vfio-ccw'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml index d3255b1eeb..ae511fdb96 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml @@ -106,7 +106,6 @@ <flag name='vmcoreinfo'/> <flag name='isa-serial'/> <flag name='pcie-pci-bridge'/> - <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='tpm-crb'/> <flag name='pr-manager-helper'/> diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml index d2f871138d..72af7d3f01 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml @@ -105,7 +105,6 @@ <flag name='vmcoreinfo'/> <flag name='isa-serial'/> <flag name='pcie-pci-bridge'/> - <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='tpm-crb'/> <flag name='pr-manager-helper'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml index 67f2cf482a..10e67e4c5a 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml @@ -88,7 +88,6 @@ <flag name='vmcoreinfo'/> <flag name='pl011'/> <flag name='pcie-pci-bridge'/> - <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='pr-manager-helper'/> <flag name='screendump_device'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml index 318c962299..698eb14698 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml @@ -77,7 +77,6 @@ <flag name='spapr-vty'/> <flag name='isa-serial'/> <flag name='pcie-pci-bridge'/> - <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='pr-manager-helper'/> <flag name='screendump_device'/> diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml index c859553038..ef1c66a5d7 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml @@ -105,7 +105,6 @@ <flag name='vmcoreinfo'/> <flag name='isa-serial'/> <flag name='pcie-pci-bridge'/> - <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='tpm-crb'/> <flag name='pr-manager-helper'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml index 1707aef39e..a59a91a576 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml @@ -88,7 +88,6 @@ <flag name='vmcoreinfo'/> <flag name='pl011'/> <flag name='pcie-pci-bridge'/> - <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='pr-manager-helper'/> <flag name='screendump_device'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml index d8f87430d6..e8c3886d14 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml @@ -83,7 +83,6 @@ <flag name='spapr-vty'/> <flag name='isa-serial'/> <flag name='pcie-pci-bridge'/> - <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='pr-manager-helper'/> <flag name='screendump_device'/> diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml index 4227f95880..12980ffcf6 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml @@ -105,7 +105,6 @@ <flag name='vmcoreinfo'/> <flag name='isa-serial'/> <flag name='pcie-pci-bridge'/> - <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='tpm-crb'/> <flag name='pr-manager-helper'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml index f05143e297..2cd47a7770 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml @@ -82,7 +82,6 @@ <flag name='spapr-vty'/> <flag name='isa-serial'/> <flag name='pcie-pci-bridge'/> - <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='pr-manager-helper'/> <flag name='screendump_device'/> diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml index 504ecc0a7f..e9210dfd44 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml @@ -105,7 +105,6 @@ <flag name='vmcoreinfo'/> <flag name='isa-serial'/> <flag name='pcie-pci-bridge'/> - <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='tpm-crb'/> <flag name='pr-manager-helper'/> diff --git a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml index 4d7b9c1e7d..56d1ff5fa9 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml @@ -105,7 +105,6 @@ <flag name='vmcoreinfo'/> <flag name='isa-serial'/> <flag name='pcie-pci-bridge'/> - <flag name='disk-write-cache'/> <flag name='nbd-tls'/> <flag name='tpm-crb'/> <flag name='pr-manager-helper'/> -- 2.37.4
On a Tuesday in 2022, Michal Privoznik wrote:
All supported QEMUs have this capability. Stop detecting it.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 4 ---- tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.2.0.x86_64.xml | 1 - 29 files changed, 32 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
Now that nothing uses this capability, it can be retired. Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_capabilities.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 0b267e4f30..4c301c3638 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -469,7 +469,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "pcie-pci-bridge", /* QEMU_CAPS_DEVICE_PCIE_PCI_BRIDGE */ "seccomp-blacklist", /* X_QEMU_CAPS_SECCOMP_BLACKLIST */ "query-cpus-fast", /* X_QEMU_CAPS_QUERY_CPUS_FAST */ - "disk-write-cache", /* QEMU_CAPS_DISK_WRITE_CACHE */ + "disk-write-cache", /* X_QEMU_CAPS_DISK_WRITE_CACHE */ /* 290 */ "nbd-tls", /* QEMU_CAPS_NBD_TLS */ diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index ead8ef45d9..c79bc7cd24 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -448,7 +448,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */ QEMU_CAPS_DEVICE_PCIE_PCI_BRIDGE, /* -device pcie-pci-bridge */ X_QEMU_CAPS_SECCOMP_BLACKLIST, /* -sandbox.elevateprivileges */ X_QEMU_CAPS_QUERY_CPUS_FAST, /* query-cpus-fast command */ - QEMU_CAPS_DISK_WRITE_CACHE, /* qemu block frontends support write-cache param */ + X_QEMU_CAPS_DISK_WRITE_CACHE, /* qemu block frontends support write-cache param */ /* 290 */ QEMU_CAPS_NBD_TLS, /* NBD server supports TLS transport */ -- 2.37.4
On a Tuesday in 2022, Michal Privoznik wrote:
Now that nothing uses this capability, it can be retired.
Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_capabilities.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
Reviewed-by: Ján Tomko <jtomko@redhat.com> Jano
On Tue, Nov 08, 2022 at 09:29:02 +0100, Michal Privoznik wrote:
Chop chop. More capabilities can be retired.
https://gitlab.com/MichalPrivoznik/libvirt/-/pipelines/688345136
Michal Prívozník (48):
[...]
qemu: Drop misleading comment for qemuDomainQueryWakeupSuspendSupport() qemu: Acquire QUERY job in qemuDomainQueryWakeupSuspendSupport() qemu: Assume QEMU_CAPS_NUMA qemu_capabilities: Stop detecting QEMU_CAPS_NUMA qemu: Retire QEMU_CAPS_NUMA qemu: Assume QEMU_CAPS_VSERPORT_CHANGE qemu_capabilities: Stop detecting QEMU_CAPS_VSERPORT_CHANGE qemu: Retire QEMU_CAPS_VSERPORT_CHANGE qemu: Assume QEMU_CAPS_DUMP_COMPLETED qemu_capabilities: Stop detecting QEMU_CAPS_DUMP_COMPLETED qemu: Retire QEMU_CAPS_DUMP_COMPLETED qemu: Assume QEMU_CAPS_QOM_LIST_PROPERTIES qemu_capabilities: Stop detecting QEMU_CAPS_QOM_LIST_PROPERTIES qemu: Retire QEMU_CAPS_QOM_LIST_PROPERTIES qemu: Assume QEMU_CAPS_QUERY_CURRENT_MACHINE qemu_capabilities: Stop detecting QEMU_CAPS_QUERY_CURRENT_MACHINE qemu: Retire QEMU_CAPS_QUERY_CURRENT_MACHINE qemu_capabilities: Stop detecting QEMU_CAPS_BITMAP_MERGE qemu: Retire QEMU_CAPS_BITMAP_MERGE qemu: Assume QEMU_CAPS_QUERY_DISPLAY_OPTIONS qemu_capabilities: Stop detecting QEMU_CAPS_QUERY_DISPLAY_OPTIONS qemu: Retire QEMU_CAPS_QUERY_DISPLAY_OPTIONS qemu: Assume QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SIZE qemu_capabilities: Stop detecting QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SIZE qemu: Retire QEMU_CAPS_VIRTIO_NET_RX_QUEUE_SIZE qemu: Assume QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE qemu_capabilities: Stop detecting QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE qemu: Retire QEMU_CAPS_VIRTIO_NET_TX_QUEUE_SIZE qemu: Assume QEMU_CAPS_VIRTIO_NET_HOST_MTU qemu_capabilities: Stop detecting QEMU_CAPS_VIRTIO_NET_HOST_MTU qemu: Retire QEMU_CAPS_VIRTIO_NET_HOST_MTU qemu: Assume QEMU_CAPS_VIRTIO_NET_FAILOVER qemu_capabilities: Stop detecting QEMU_CAPS_VIRTIO_NET_FAILOVER qemu: Retire QEMU_CAPS_VIRTIO_NET_FAILOVER qemu: Assume QEMU_CAPS_BLOCKIO qemu_capabilities: Stop detecting QEMU_CAPS_BLOCKIO qemu: Retire QEMU_CAPS_BLOCKIO qemu: Assume QEMU_CAPS_VIRTIO_BLK_NUM_QUEUES qemu_capabilities: Stop detecting QEMU_CAPS_VIRTIO_BLK_QUEUE_SIZE qemu: Retire QEMU_CAPS_VIRTIO_BLK_NUM_QUEUES qemu: Assume QEMU_CAPS_DISK_SHARE_RW qemu_capabilities: Stop detecting QEMU_CAPS_DISK_SHARE_RW qemu: Retire QEMU_CAPS_DISK_SHARE_RW qemu: Assume QEMU_CAPS_DISK_WRITE_CACHE qemu_capabilities: Stop detecting QEMU_CAPS_DISK_WRITE_CACHE qemu: Retire QEMU_CAPS_DISK_WRITE_CACHE
For the above patches: Reviewed-by: Peter Krempa <pkrempa@redhat.com> The following two are excluded:
tests: Make qemuAgent single sync qemu_agent: Drop @singleSync from _qemuAgent
First one breaks test-suite, second one can't be applied without first one.
On Tue, Nov 08, 2022 at 09:59:00 +0100, Peter Krempa wrote:
On Tue, Nov 08, 2022 at 09:29:02 +0100, Michal Privoznik wrote:
Chop chop. More capabilities can be retired.
https://gitlab.com/MichalPrivoznik/libvirt/-/pipelines/688345136
Michal Prívozník (48):
[...]
The following two are excluded:
tests: Make qemuAgent single sync qemu_agent: Drop @singleSync from _qemuAgent
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
participants (4)
-
Ján Tomko -
Michal Privoznik -
Michal Prívozník
-
Peter Krempa