From: Peter Krempa Date: Thu, 2 Apr 2026 13:41:24 +0000 (+0200) Subject: qemu: attach/detach device: Move 'virCheckFlags' to top level functions X-Git-Tag: v12.4.0-rc1~107 X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=a55ca07c8ab207ca1968df95835df2211ee013f7;p=thirdparty%2Flibvirt.git qemu: attach/detach device: Move 'virCheckFlags' to top level functions Move the flag check to the top level to allow programatic introspection of supported flags. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko --- diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index f29211e422..38705ef161 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7423,9 +7423,6 @@ qemuDomainAttachDeviceLiveAndConfig(virDomainObj *vm, unsigned int parse_flags = VIR_DOMAIN_DEF_PARSE_INACTIVE | VIR_DOMAIN_DEF_PARSE_ABI_UPDATE; - virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | - VIR_DOMAIN_AFFECT_CONFIG, -1); - cfg = virQEMUDriverGetConfig(driver); /* The config and live post processing address auto-generation algorithms @@ -7518,6 +7515,9 @@ qemuDomainAttachDeviceFlags(virDomainPtr dom, virDomainObj *vm = NULL; int ret = -1; + virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | + VIR_DOMAIN_AFFECT_CONFIG, -1); + if (!(vm = qemuDomainObjFromDomain(dom))) goto cleanup; @@ -7666,9 +7666,6 @@ qemuDomainDetachDeviceLiveAndConfig(virQEMUDriver *driver, unsigned int parse_flags = VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE; g_autoptr(virDomainDef) vmdef = NULL; - virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | - VIR_DOMAIN_AFFECT_CONFIG, -1); - cfg = virQEMUDriverGetConfig(driver); if ((flags & VIR_DOMAIN_AFFECT_CONFIG) && @@ -7802,6 +7799,9 @@ qemuDomainDetachDeviceFlags(virDomainPtr dom, virDomainObj *vm = NULL; int ret = -1; + virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | + VIR_DOMAIN_AFFECT_CONFIG, -1); + if (!(vm = qemuDomainObjFromDomain(dom))) goto cleanup;