qemu: Use virDomainMemoryIsVirtioModel()

Instead of having these big switch()-es that enumerate all memory
models (but act only on virtio models), let's use
virDomainMemoryIsVirtioModel() helper instead.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>

diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c
index 774541ca063195f1f8636797bf56e1c167633d10..6d5c4785e8ff59e077488a2eaa5406a8cc00ba65 100644 (file)
--- a/src/qemu/qemu_domain_address.c
+++ b/src/qemu/qemu_domain_address.c
@@ -293,18 +293,9 @@ qemuDomainPrimeVirtioDeviceAddresses(virDomainDef *def,
     }
 
     for (i = 0; i < def->nmems; i++) {
-        switch (def->mems[i]->model) {
-        case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM:
-        case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:
-            if (def->mems[i]->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE)
-                def->mems[i]->info.type = type;
-            break;
-        case VIR_DOMAIN_MEMORY_MODEL_NONE:
-        case VIR_DOMAIN_MEMORY_MODEL_DIMM:
-        case VIR_DOMAIN_MEMORY_MODEL_NVDIMM:
-        case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
-        case VIR_DOMAIN_MEMORY_MODEL_LAST:
-            break;
+        if (virDomainMemoryIsVirtioModel(def->mems[i]) &&
+            def->mems[i]->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) {
+            def->mems[i]->info.type = type;
         }
     }
 
@@ -1024,18 +1015,10 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDef *dev,
         break;
 
     case VIR_DOMAIN_DEVICE_MEMORY:
-        switch (dev->data.memory->model) {
-        case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM:
-        case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:
+        if (virDomainMemoryIsVirtioModel(dev->data.memory))
             return virtioFlags;
 
-        case VIR_DOMAIN_MEMORY_MODEL_NONE:
-        case VIR_DOMAIN_MEMORY_MODEL_DIMM:
-        case VIR_DOMAIN_MEMORY_MODEL_NVDIMM:
-        case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
-        case VIR_DOMAIN_MEMORY_MODEL_LAST:
-            return 0;
-        }
+        return 0;
         break;
 
     case VIR_DOMAIN_DEVICE_CRYPTO:
@@ -2444,19 +2427,10 @@ qemuDomainAssignDevicePCISlots(virDomainDef *def,
     for (i = 0; i < def->nmems; i++) {
         virDomainMemoryDef *mem = def->mems[i];
 
-        switch (mem->model) {
-        case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_PMEM:
-        case VIR_DOMAIN_MEMORY_MODEL_VIRTIO_MEM:
-            if (virDeviceInfoPCIAddressIsWanted(&mem->info) &&
-                qemuDomainPCIAddressReserveNextAddr(addrs, &mem->info) < 0)
-                return -1;
-            break;
-        case VIR_DOMAIN_MEMORY_MODEL_NONE:
-        case VIR_DOMAIN_MEMORY_MODEL_DIMM:
-        case VIR_DOMAIN_MEMORY_MODEL_NVDIMM:
-        case VIR_DOMAIN_MEMORY_MODEL_SGX_EPC:
-        case VIR_DOMAIN_MEMORY_MODEL_LAST:
-            break;
+        if (virDomainMemoryIsVirtioModel(mem) &&
+            virDeviceInfoPCIAddressIsWanted(&mem->info) &&
+            qemuDomainPCIAddressReserveNextAddr(addrs, &mem->info) < 0) {
+            return -1;
         }
     }