]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: capabilities: Extract code from virQEMUCapsStripMachineAliases
authorPeter Krempa <pkrempa@redhat.com>
Thu, 23 Jan 2020 12:11:08 +0000 (13:11 +0100)
committerPeter Krempa <pkrempa@redhat.com>
Mon, 27 Jan 2020 13:55:03 +0000 (14:55 +0100)
Separate out the internals as they will become more complex soon.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
src/qemu/qemu_capabilities.c

index 073001607e8f1bb70007ebc762951c9cda0ce989..3358a9892083fbeaabb60b7bb4a14989386592b7 100644 (file)
@@ -6020,6 +6020,21 @@ virQEMUCapsSetMicrocodeVersion(virQEMUCapsPtr qemuCaps,
 }
 
 
+static void
+virQEMUCapsStripMachineAliasesForVirtType(virQEMUCapsPtr qemuCaps,
+                                          virDomainVirtType virtType)
+{
+    virQEMUCapsAccelPtr accel = virQEMUCapsGetAccel(qemuCaps, virtType);
+    size_t i;
+
+    for (i = 0; i < accel->nmachineTypes; i++) {
+        virQEMUCapsMachineTypePtr mach = &accel->machineTypes[i];
+
+        VIR_FREE(mach->alias);
+    }
+}
+
+
 /**
  * virQEMUCapsStripMachineAliases:
  * @qemuCaps: capabilities object to process
@@ -6030,11 +6045,6 @@ virQEMUCapsSetMicrocodeVersion(virQEMUCapsPtr qemuCaps,
 void
 virQEMUCapsStripMachineAliases(virQEMUCapsPtr qemuCaps)
 {
-    size_t i;
-
-    for (i = 0; i < qemuCaps->kvm.nmachineTypes; i++)
-        VIR_FREE(qemuCaps->kvm.machineTypes[i].alias);
-
-    for (i = 0; i < qemuCaps->tcg.nmachineTypes; i++)
-        VIR_FREE(qemuCaps->tcg.machineTypes[i].alias);
+    virQEMUCapsStripMachineAliasesForVirtType(qemuCaps, VIR_DOMAIN_VIRT_KVM);
+    virQEMUCapsStripMachineAliasesForVirtType(qemuCaps, VIR_DOMAIN_VIRT_QEMU);
 }