From 3cf0a764cd0e0cf124803ba493a6a090835b3169 Mon Sep 17 00:00:00 2001 From: Michal Privoznik Date: Mon, 7 Nov 2022 13:13:57 +0100 Subject: [PATCH] qemu: Assume QEMU_CAPS_VSERPORT_CHANGE MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Peter Krempa Reviewed-by: Ján Tomko --- 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.47.2