conf: cpu: Remove NULL check from virCPUDefCopyWithoutModel

Make all callers always pass a valid pointer which in turn allows us to
remove return value check from the callers.

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

diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c
index 1227db1201a08c13f9bc6b563b1131b0d34b51c7..3b824e85d2ef464299ebd2d3b04936f43cdaba2b 100644 (file)
--- a/src/conf/cpu_conf.c
+++ b/src/conf/cpu_conf.c
@@ -233,9 +233,6 @@ virCPUDefCopyWithoutModel(const virCPUDef *cpu)
 {
     g_autoptr(virCPUDef) copy = NULL;
 
-    if (!cpu)
-        return NULL;
-
     copy = virCPUDefNew();
     copy->type = cpu->type;
     copy->mode = cpu->mode;
@@ -276,9 +273,11 @@ virCPUDefCopy(const virCPUDef *cpu)
 {
     g_autoptr(virCPUDef) copy = NULL;
 
-    if (!(copy = virCPUDefCopyWithoutModel(cpu)))
+    if (!cpu)
         return NULL;
 
+    copy = virCPUDefCopyWithoutModel(cpu);
+
     virCPUDefCopyModel(copy, cpu, false);
 
     return g_steal_pointer(&copy);

diff --git a/src/conf/cpu_conf.h b/src/conf/cpu_conf.h
index 5d69b4d2e088fcd6f3cc5fad37f5e85d498e97ac..560b59777706b46d8f4381f648219c68509b2dbd 100644 (file)
--- a/src/conf/cpu_conf.h
+++ b/src/conf/cpu_conf.h
@@ -204,7 +204,8 @@ virCPUDef *
 virCPUDefCopy(const virCPUDef *cpu);
 
 virCPUDef *
-virCPUDefCopyWithoutModel(const virCPUDef *cpu);
+virCPUDefCopyWithoutModel(const virCPUDef *cpu)
+    ATTRIBUTE_NONNULL(1);
 
 int
 virCPUDefParseXMLString(const char *xml,

diff --git a/src/cpu/cpu_arm.c b/src/cpu/cpu_arm.c
index a890ed6ba3157b936384f28418c74404d94bb1c3..8e562bd7a3e84cab6818c8eacacaacfac69fd83b 100644 (file)
--- a/src/cpu/cpu_arm.c
+++ b/src/cpu/cpu_arm.c
@@ -450,7 +450,7 @@ virCPUarmUpdate(virCPUDef *guest,
                 const virCPUDef *host,
                 bool relative)
 {
-    g_autoptr(virCPUDef) updated = NULL;
+    g_autoptr(virCPUDef) updated = virCPUDefCopyWithoutModel(guest);
 
     if (!relative || guest->mode != VIR_CPU_MODE_HOST_MODEL)
         return 0;
@@ -461,9 +461,6 @@ virCPUarmUpdate(virCPUDef *guest,
         return -1;
     }
 
-    if (!(updated = virCPUDefCopyWithoutModel(guest)))
-        return -1;
-
     updated->mode = VIR_CPU_MODE_CUSTOM;
     virCPUDefCopyModel(updated, host, true);
 

diff --git a/src/cpu/cpu_s390.c b/src/cpu/cpu_s390.c
index 0f3b5c6820134e43a0cc19a8558d4fb33503d139..1de525197479aad9250a6790754219414a3c9a72 100644 (file)
--- a/src/cpu/cpu_s390.c
+++ b/src/cpu/cpu_s390.c
@@ -44,7 +44,7 @@ virCPUs390Update(virCPUDef *guest,
                  const virCPUDef *host,
                  bool relative)
 {
-    g_autoptr(virCPUDef) updated = NULL;
+    g_autoptr(virCPUDef) updated = virCPUDefCopyWithoutModel(guest);
     size_t i;
 
     if (!relative)
@@ -68,9 +68,6 @@ virCPUs390Update(virCPUDef *guest,
         return -1;
     }
 
-    if (!(updated = virCPUDefCopyWithoutModel(guest)))
-        return -1;
-
     updated->mode = VIR_CPU_MODE_CUSTOM;
     virCPUDefCopyModel(updated, host, true);
 

diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c
index 2fede8e5faee6d60a8aef290ee1b1e6717c28986..6560b7a5029d330a74d2f9d5aa10542e4d4c6a2e 100644 (file)
--- a/src/cpu/cpu_x86.c
+++ b/src/cpu/cpu_x86.c
@@ -2935,12 +2935,9 @@ static int
 x86UpdateHostModel(virCPUDef *guest,
                    const virCPUDef *host)
 {
-    g_autoptr(virCPUDef) updated = NULL;
+    g_autoptr(virCPUDef) updated = virCPUDefCopyWithoutModel(host);
     size_t i;
 
-    if (!(updated = virCPUDefCopyWithoutModel(host)))
-        return -1;
-
     updated->type = VIR_CPU_TYPE_GUEST;
     updated->mode = VIR_CPU_MODE_CUSTOM;
     virCPUDefCopyModel(updated, host, true);
@@ -3169,7 +3166,7 @@ static int
 virCPUx86Translate(virCPUDef *cpu,
                    virDomainCapsCPUModels *models)
 {
-    g_autoptr(virCPUDef) translated = NULL;
+    g_autoptr(virCPUDef) translated = virCPUDefCopyWithoutModel(cpu);
     virCPUx86Map *map;
     g_autoptr(virCPUx86Model) model = NULL;
     size_t i;
@@ -3191,9 +3188,6 @@ virCPUx86Translate(virCPUDef *cpu,
             return -1;
     }
 
-    if (!(translated = virCPUDefCopyWithoutModel(cpu)))
-        return -1;
-
     if (x86Decode(translated, &model->data, models, NULL, false) < 0)
         return -1;
 
@@ -3280,9 +3274,10 @@ virCPUx86CopyMigratable(virCPUDef *cpu)
     if (!(map = virCPUx86GetMap()))
         return NULL;
 
-    if (!(copy = virCPUDefCopyWithoutModel(cpu)))
+    if (!cpu)
         return NULL;
 
+    copy = virCPUDefCopyWithoutModel(cpu);
     virCPUDefCopyModelFilter(copy, cpu, false, x86FeatureFilterMigratable, map);
 
     return g_steal_pointer(&copy);

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 8e65a0f9b71a7c374f28e590db4cf05951f3152a..aa567f652af555a24aa32b2957226b8643ececed 100644 (file)
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -10822,9 +10822,6 @@ qemuDomainFixupCPUs(virDomainObj *vm,
     if (virCPUDefFindFeature(vm->def->cpu, "cmt")) {
         g_autoptr(virCPUDef) fixedCPU = virCPUDefCopyWithoutModel(vm->def->cpu);
 
-        if (!fixedCPU)
-            return -1;
-
         virCPUDefCopyModelFilter(fixedCPU, vm->def->cpu, false,
                                  virQEMUCapsCPUFilterFeatures, &arch);
 
@@ -10835,9 +10832,6 @@ qemuDomainFixupCPUs(virDomainObj *vm,
     if (virCPUDefFindFeature(*origCPU, "cmt")) {
         g_autoptr(virCPUDef) fixedOrig = virCPUDefCopyWithoutModel(*origCPU);
 
-        if (!fixedOrig)
-            return -1;
-
         virCPUDefCopyModelFilter(fixedOrig, *origCPU, false,
                                  virQEMUCapsCPUFilterFeatures, &arch);
 

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 6d117c090a5e161bee4f8021fd474bf51289dd78..c546e359536e60c8dcbe7273f422f6a246cb583c 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -12171,8 +12171,7 @@ qemuConnectBaselineCPU(virConnectPtr conn G_GNUC_UNUSED,
                                     !!(flags & VIR_CONNECT_BASELINE_CPU_MIGRATABLE))))
         goto cleanup;
 
-    if (!(cpu = virCPUDefCopyWithoutModel(baseline)))
-        goto cleanup;
+    cpu = virCPUDefCopyWithoutModel(baseline);
 
     virCPUDefCopyModelFilter(cpu, baseline, false, virQEMUCapsCPUFilterFeatures,
                              &cpus[0]->arch);

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 60a2e244115c67473968779b261e7286dd86c352..942f75b6250130493abc64dc1731504194fcc225 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -8829,8 +8829,7 @@ qemuProcessRefreshCPU(virQEMUDriver *driver,
         if (!(hostmig = virCPUCopyMigratable(host->arch, host)))
             return -1;
 
-        if (!(cpu = virCPUDefCopyWithoutModel(hostmig)))
-            return -1;
+        cpu = virCPUDefCopyWithoutModel(hostmig);
 
         virCPUDefCopyModelFilter(cpu, hostmig, false, virQEMUCapsCPUFilterFeatures,
                                  &host->arch);