qemu: Drop @qemuCaps argument from qemuDomainDefValidateMemoryHotplug()

After previous cleanup the @qemuCaps argument in
qemuDomainDefValidateMemoryHotplug() is unused and thus doesn't
need to be passed.

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

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index e705e8d8d54883bb67541a7dd50bb066e247a354..5b58ccbf0e4326f599be9a506f8533b68f3bacc6 100644 (file)
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -8532,7 +8532,6 @@ qemuDomainDefValidateMemoryHotplugDevice(const virDomainMemoryDef *mem,
 /**
  * qemuDomainDefValidateMemoryHotplug:
  * @def: domain definition
- * @qemuCaps: qemu capabilities object
  * @mem: definition of memory device that is to be added to @def with hotplug,
  *       NULL in case of regular VM startup
  *
@@ -8544,7 +8543,6 @@ qemuDomainDefValidateMemoryHotplugDevice(const virDomainMemoryDef *mem,
  */
 int
 qemuDomainDefValidateMemoryHotplug(const virDomainDef *def,
-                                   virQEMUCapsPtr qemuCaps G_GNUC_UNUSED,
                                    const virDomainMemoryDef *mem)
 {
     unsigned int nmems = def->nmems;

diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index 010bae285d117bf3f1a8627735c8ae80402fdc80..9e870ff1e23b17db17894ec1d037d0c9f5131cec 100644 (file)
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -795,7 +795,6 @@ int qemuDomainAdjustMaxMemLockHostdev(virDomainObjPtr vm,
                                       virDomainHostdevDefPtr hostdev);
 
 int qemuDomainDefValidateMemoryHotplug(const virDomainDef *def,
-                                       virQEMUCapsPtr qemuCaps,
                                        const virDomainMemoryDef *mem);
 
 bool qemuDomainSupportsNewVcpuHotplug(virDomainObjPtr vm);

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 29a30c68123db19e037ea7c4a1fbe30c772977c3..9b93f256e8a7e6e51a3508231489703ed1e0930c 100644 (file)
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -2399,7 +2399,7 @@ qemuDomainAttachMemory(virQEMUDriverPtr driver,
     if (qemuDomainMemoryDeviceAlignSize(vm->def, mem) < 0)
         goto cleanup;
 
-    if (qemuDomainDefValidateMemoryHotplug(vm->def, priv->qemuCaps, mem) < 0)
+    if (qemuDomainDefValidateMemoryHotplug(vm->def, mem) < 0)
         goto cleanup;
 
     if (qemuDomainAssignMemoryDeviceSlot(vm->def, mem) < 0)

diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
index 8ceea022d728c86f362b01ee52119d0caaa0a191..52d15defed22e9d3ccd46372681cd1a6b45cd9fe 100644 (file)
--- a/src/qemu/qemu_validate.c
+++ b/src/qemu/qemu_validate.c
@@ -1156,7 +1156,7 @@ qemuValidateDomainDef(const virDomainDef *def,
     if (qemuValidateDomainDefCpu(driver, def, qemuCaps) < 0)
         return -1;
 
-    if (qemuDomainDefValidateMemoryHotplug(def, qemuCaps, NULL) < 0)
+    if (qemuDomainDefValidateMemoryHotplug(def, NULL) < 0)
         return -1;
 
     if (qemuValidateDomainDefClockTimers(def, qemuCaps) < 0)