From c7a0a0fe117eedad204a1394cb86d767f71dfac4 Mon Sep 17 00:00:00 2001 From: Peter Krempa Date: Thu, 20 Jul 2023 17:55:33 +0200 Subject: [PATCH] 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 Reviewed-by: Michal Privoznik --- 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 5a79424f64..af1b29772c 100644 --- 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 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 5a25f81d7a..177ca87d11 100644 --- 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;