[PATCH 1/9] 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(a)redhat.com>
---
src/qemu/qemu_domain.c | 4 ++--
src/qemu/qemu_domain.h | 2 +-
src/qemu/qemu_hotplug.c | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index bfeddc7746..49ae44fcbf 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -9998,7 +9998,7 @@ qemuDomainValidateVcpuInfo(virDomainObj *vm)
bool
-qemuDomainSupportsNewVcpuHotplug(virDomainObj *vm)
+qemuDomainSupportsVcpuHotplug(virDomainObj *vm)
{
qemuDomainObjPrivate *priv = vm->privateData;
@@ -10035,7 +10035,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 786f239495..15d1bb4900 100644
--- 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 d7d1db8ecc..d845731aee 100644
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -6400,7 +6400,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;
@@ -6846,7 +6846,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"));
--
2.41.0