From: Michal Privoznik <mprivozn@redhat.com>
Date: Mon, 7 Nov 2022 12:13:57 +0000 (+0100)
Subject: qemu: Assume QEMU_CAPS_VSERPORT_CHANGE
X-Git-Tag: v8.10.0-rc1~149
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3cf0a764cd0e0cf124803ba493a6a090835b3169;p=thirdparty%2Flibvirt.git

qemu: Assume QEMU_CAPS_VSERPORT_CHANGE

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>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

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);