[libvirt] [PATCH v3 26/52] qemu: Introduce virQEMUCapsAccelClear

Jiri Denemark jdenemar at redhat.com
Tue Nov 5 13:27:24 UTC 2019


Signed-off-by: Jiri Denemark <jdenemar at redhat.com>
---

Notes:
    Version 3:
    - new patch

 src/qemu/qemu_capabilities.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 92041190eb..a0b5047276 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1674,6 +1674,14 @@ virQEMUCapsPtr virQEMUCapsNewCopy(virQEMUCapsPtr qemuCaps)
 }
 
 
+static void
+virQEMUCapsAccelClear(virQEMUCapsAccelPtr caps)
+{
+    virQEMUCapsHostCPUDataClear(&caps->hostCPU);
+    virObjectUnref(caps->cpuModels);
+}
+
+
 void virQEMUCapsDispose(void *obj)
 {
     virQEMUCapsPtr qemuCaps = obj;
@@ -1686,9 +1694,6 @@ void virQEMUCapsDispose(void *obj)
     VIR_FREE(qemuCaps->machineTypes);
 
     virHashFree(qemuCaps->domCapsCache);
-    virObjectUnref(qemuCaps->kvm.cpuModels);
-    virObjectUnref(qemuCaps->tcg.cpuModels);
-
     virBitmapFree(qemuCaps->flags);
 
     VIR_FREE(qemuCaps->package);
@@ -1699,8 +1704,8 @@ void virQEMUCapsDispose(void *obj)
 
     virSEVCapabilitiesFree(qemuCaps->sevCapabilities);
 
-    virQEMUCapsHostCPUDataClear(&qemuCaps->kvm.hostCPU);
-    virQEMUCapsHostCPUDataClear(&qemuCaps->tcg.hostCPU);
+    virQEMUCapsAccelClear(&qemuCaps->kvm);
+    virQEMUCapsAccelClear(&qemuCaps->tcg);
 }
 
 void
-- 
2.23.0




More information about the libvir-list mailing list