The vCPU APIs have API-specific flag enums that alias the generic VIR_DOMAIN_AFFECT_* values for live and config state. Use the vCPU-specific aliases in the public API checks, QEMU driver flag masks, and virsh flag construction. The values are unchanged; this is only a consistency cleanup. Signed-off-by: Akash Kulhalli <akash.kulhalli@oracle.com> --- src/libvirt-domain.c | 4 ++-- src/qemu/qemu_driver.c | 8 ++++---- tools/virsh-domain.c | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index a4cbeb8ad486..a37cc741351a 100644 --- a/src/libvirt-domain.c +++ b/src/libvirt-domain.c @@ -7803,11 +7803,11 @@ virDomainSetVcpusFlags(virDomainPtr domain, unsigned int nvcpus, virCheckReadOnlyGoto(domain->conn->flags, error); VIR_REQUIRE_FLAG_GOTO(VIR_DOMAIN_VCPU_MAXIMUM, - VIR_DOMAIN_AFFECT_CONFIG, + VIR_DOMAIN_VCPU_CONFIG, error); VIR_EXCLUSIVE_FLAGS_GOTO(VIR_DOMAIN_VCPU_GUEST, - VIR_DOMAIN_AFFECT_CONFIG, + VIR_DOMAIN_VCPU_CONFIG, error); virCheckNonZeroArgGoto(nvcpus, error); diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index c6d18f6575b7..48cad937d8bb 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4331,8 +4331,8 @@ qemuDomainSetVcpusFlags(virDomainPtr dom, bool useAgent = !!(flags & VIR_DOMAIN_VCPU_GUEST); int ret = -1; - virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | - VIR_DOMAIN_AFFECT_CONFIG | + virCheckFlags(VIR_DOMAIN_VCPU_LIVE | + VIR_DOMAIN_VCPU_CONFIG | VIR_DOMAIN_VCPU_MAXIMUM | VIR_DOMAIN_VCPU_GUEST | VIR_DOMAIN_VCPU_HOTPLUGGABLE | @@ -19377,8 +19377,8 @@ qemuDomainSetVcpu(virDomainPtr dom, ssize_t lastvcpu; int ret = -1; - virCheckFlags(VIR_DOMAIN_AFFECT_LIVE | - VIR_DOMAIN_AFFECT_CONFIG | + virCheckFlags(VIR_DOMAIN_SETVCPU_AFFECT_LIVE | + VIR_DOMAIN_SETVCPU_AFFECT_CONFIG | VIR_DOMAIN_SETVCPU_ASYNC_UNPLUG, -1); if (state != 0 && state != 1) { diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 76369e8694ce..513129cda71b 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -7696,9 +7696,9 @@ cmdSetvcpus(vshControl *ctl, const vshCmd *cmd) VSH_REQUIRE_OPTION_VAR(maximum, config); if (config) - flags |= VIR_DOMAIN_AFFECT_CONFIG; + flags |= VIR_DOMAIN_VCPU_CONFIG; if (live) - flags |= VIR_DOMAIN_AFFECT_LIVE; + flags |= VIR_DOMAIN_VCPU_LIVE; if (guest) flags |= VIR_DOMAIN_VCPU_GUEST; if (maximum) @@ -7867,9 +7867,9 @@ cmdSetvcpu(vshControl *ctl, const vshCmd *cmd) VSH_EXCLUSIVE_OPTIONS("async", "enable"); if (config) - flags |= VIR_DOMAIN_AFFECT_CONFIG; + flags |= VIR_DOMAIN_SETVCPU_AFFECT_CONFIG; if (live) - flags |= VIR_DOMAIN_AFFECT_LIVE; + flags |= VIR_DOMAIN_SETVCPU_AFFECT_LIVE; if (async) flags |= VIR_DOMAIN_SETVCPU_ASYNC_UNPLUG; -- 2.47.3