qemu: Rename qemuDomainSupportsNewVcpuHotplug to qemuDomainSupportsVcpuHotplug

Support for legacy cpu hotplug was removed a long time ago. At this
point this function only checks whether the current machine type
supports cpu hotplug.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 5a79424f6418c966bd450d7a96276d84ec65d88a..af1b29772cae81230502b89caeb704ff59efb631 100644 (file)
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -9981,7 +9981,7 @@ qemuDomainValidateVcpuInfo(virDomainObj *vm)
 
 
 bool
-qemuDomainSupportsNewVcpuHotplug(virDomainObj *vm)
+qemuDomainSupportsVcpuHotplug(virDomainObj *vm)
 {
     qemuDomainObjPrivate *priv = vm->privateData;
 
@@ -10018,7 +10018,7 @@ qemuDomainRefreshVcpuInfo(virDomainObj *vm,
     int rc;
     int ret = -1;
 
-    hotplug = qemuDomainSupportsNewVcpuHotplug(vm);
+    hotplug = qemuDomainSupportsVcpuHotplug(vm);
     VIR_DEBUG("Maxvcpus %zu hotplug %d", maxvcpus, hotplug);
 
     if (qemuDomainObjEnterMonitorAsync(vm, asyncJob) < 0)

diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index 786f239495db84b1e6f9cd5ccc7968b8e82ea89e..15d1bb4900166be791dbb428e660efb36155bc8d 100644 (file)
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -860,7 +860,7 @@ int qemuDomainSetMaxMemLock(virDomainObj *vm,
 int qemuDomainDefValidateMemoryHotplug(const virDomainDef *def,
                                        const virDomainMemoryDef *mem);
 
-bool qemuDomainSupportsNewVcpuHotplug(virDomainObj *vm);
+bool qemuDomainSupportsVcpuHotplug(virDomainObj *vm);
 bool qemuDomainHasVcpuPids(virDomainObj *vm);
 pid_t qemuDomainGetVcpuPid(virDomainObj *vm, unsigned int vcpuid);
 int qemuDomainValidateVcpuInfo(virDomainObj *vm);

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 5a25f81d7a45009af1184442427fc12a1721b283..177ca87d11acfbb919777554fa47767193105ef8 100644 (file)
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -6399,7 +6399,7 @@ qemuDomainHotplugAddVcpu(virQEMUDriver *driver,
     size_t i;
     bool vcpuTidMissing = false;
 
-    if (!qemuDomainSupportsNewVcpuHotplug(vm)) {
+    if (!qemuDomainSupportsVcpuHotplug(vm)) {
         virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
                        _("cpu hotplug is not supported"));
         return -1;
@@ -6842,7 +6842,7 @@ qemuDomainSetVcpuInternal(virQEMUDriver *driver,
     g_autoptr(virBitmap) livevcpus = NULL;
 
     if (def) {
-        if (!qemuDomainSupportsNewVcpuHotplug(vm)) {
+        if (!qemuDomainSupportsVcpuHotplug(vm)) {
             virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
                            _("this qemu version does not support specific vCPU hotplug"));
             return -1;