qemu: remove unnecessary virQEMUCapsFreeHostCPUModel

After removing the host CPU model re-computation,
this function is no longer necessary.

This reverts commits:
commit d0498881a04dddd772f9f63b03de80fb4c33d090
  virQEMUCapsFreeHostCPUModel: Don't always free host cpuData
commit 5276ec712a44b3680569a096e8fe56a925f0d495
  testUpdateQEMUCaps: Don't leak host cpuData

Signed-off-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 1b60c13ee7860303ff3a0e2fc6194834e56d7716..e04a3d775f8d3e159d961b56f2f794164210ba71 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1526,19 +1526,12 @@ virQEMUCapsHostCPUDataCopy(virQEMUCapsHostCPUDataPtr dst,
 
 
 static void
-virQEMUCapsHostCPUDataClearModels(virQEMUCapsHostCPUDataPtr cpuData)
+virQEMUCapsHostCPUDataClear(virQEMUCapsHostCPUDataPtr cpuData)
 {
+    qemuMonitorCPUModelInfoFree(cpuData->info);
     virCPUDefFree(cpuData->reported);
     virCPUDefFree(cpuData->migratable);
     virCPUDefFree(cpuData->full);
-}
-
-
-static void
-virQEMUCapsHostCPUDataClear(virQEMUCapsHostCPUDataPtr cpuData)
-{
-    qemuMonitorCPUModelInfoFree(cpuData->info);
-    virQEMUCapsHostCPUDataClearModels(cpuData);
 
     memset(cpuData, 0, sizeof(*cpuData));
 }
@@ -2981,20 +2974,6 @@ virQEMUCapsNewHostCPUModel(void)
 }
 
 
-void
-virQEMUCapsFreeHostCPUModel(virQEMUCapsPtr qemuCaps,
-                            virArch hostArch,
-                            virDomainVirtType type)
-{
-    virQEMUCapsHostCPUDataPtr cpuData = virQEMUCapsGetHostCPUData(qemuCaps, type);
-
-    if (!virQEMUCapsGuestIsNative(hostArch, qemuCaps->arch))
-        return;
-
-    virQEMUCapsHostCPUDataClearModels(cpuData);
-}
-
-
 void
 virQEMUCapsInitHostCPUModel(virQEMUCapsPtr qemuCaps,
                             virArch hostArch,

diff --git a/src/qemu/qemu_capspriv.h b/src/qemu/qemu_capspriv.h
index cb5e0dd9a9f8174c06d3effcbba07c154947880b..8d1a40fe74a14973a525ad55152c5bb76fb23b23 100644 (file)
--- a/src/qemu/qemu_capspriv.h
+++ b/src/qemu/qemu_capspriv.h
@@ -56,11 +56,6 @@ void
 virQEMUCapsSetArch(virQEMUCapsPtr qemuCaps,
                    virArch arch);
 
-void
-virQEMUCapsFreeHostCPUModel(virQEMUCapsPtr qemuCaps,
-                            virArch hostArch,
-                            virDomainVirtType type);
-
 void
 virQEMUCapsInitHostCPUModel(virQEMUCapsPtr qemuCaps,
                             virArch hostArch,

diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index f94a3df75683a79f00f942651f185fd71b5df0a7..3d84cb346afa2ec7a797c90cf83c5ddcc0b3fa57 100644 (file)
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -418,11 +418,6 @@ testUpdateQEMUCaps(const struct testInfo *info,
                          !!(info->flags & FLAG_SKIP_LEGACY_CPUS)) < 0)
         goto cleanup;
 
-    virQEMUCapsFreeHostCPUModel(info->qemuCaps, caps->host.arch,
-                                VIR_DOMAIN_VIRT_KVM);
-    virQEMUCapsFreeHostCPUModel(info->qemuCaps, caps->host.arch,
-                                VIR_DOMAIN_VIRT_QEMU);
-
     virQEMUCapsInitHostCPUModel(info->qemuCaps, caps->host.arch,
                                 VIR_DOMAIN_VIRT_KVM);
     virQEMUCapsInitHostCPUModel(info->qemuCaps, caps->host.arch,