[PATCH 2/2] lib: Don't check for virCapabilitiesAddGuestDomain() retval

Michal Privoznik mprivozn at redhat.com
Thu Oct 7 08:47:28 UTC 2021


The virCapabilitiesAddGuestDomain() function can't fail. It
aborts on OOM. Therefore, there's no need to check for its
return value.

Signed-off-by: Michal Privoznik <mprivozn at redhat.com>
---
 src/bhyve/bhyve_capabilities.c |  5 ++---
 src/ch/ch_conf.c               | 10 ++--------
 src/esx/esx_driver.c           |  8 ++++----
 src/hyperv/hyperv_driver.c     |  8 ++++----
 src/libxl/libxl_capabilities.c |  9 ++-------
 src/lxc/lxc_conf.c             | 18 ++++--------------
 src/openvz/openvz_conf.c       |  9 ++-------
 src/qemu/qemu_capabilities.c   | 20 ++++----------------
 src/security/virt-aa-helper.c  | 11 ++---------
 src/test/test_driver.c         |  9 ++-------
 src/vbox/vbox_common.c         |  9 ++-------
 src/vmware/vmware_conf.c       | 12 ++++--------
 src/vz/vz_driver.c             |  4 +---
 tests/testutils.c              | 29 ++++++++++++-----------------
 tests/testutilslxc.c           |  8 ++------
 tests/testutilsqemu.c          | 19 +++++--------------
 tests/testutilsxen.c           | 15 ++++++---------
 tests/vmx2xmltest.c            | 18 ++++--------------
 tests/xml2vmxtest.c            | 19 ++++---------------
 19 files changed, 68 insertions(+), 172 deletions(-)

diff --git a/src/bhyve/bhyve_capabilities.c b/src/bhyve/bhyve_capabilities.c
index cc1c7b66b3..bbcdee724f 100644
--- a/src/bhyve/bhyve_capabilities.c
+++ b/src/bhyve/bhyve_capabilities.c
@@ -54,9 +54,8 @@ virBhyveCapsBuild(void)
                                     VIR_ARCH_X86_64, "bhyve",
                                     NULL, 0, NULL);
 
-    if (virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_BHYVE,
-                                      NULL, NULL, 0, NULL) == NULL)
-        goto error;
+    virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_BHYVE,
+                                  NULL, NULL, 0, NULL);
 
     if (!(caps->host.cpu = virCPUProbeHost(caps->host.arch)))
         VIR_WARN("Failed to get host CPU");
diff --git a/src/ch/ch_conf.c b/src/ch/ch_conf.c
index d0c56f6890..ef6f4b5ba8 100644
--- a/src/ch/ch_conf.c
+++ b/src/ch/ch_conf.c
@@ -68,14 +68,8 @@ virCaps *virCHDriverCapsInit(void)
     guest = virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM,
                                     caps->host.arch, NULL, NULL, 0, NULL);
 
-    if (virCapabilitiesAddGuestDomain(guest,
-                                      VIR_DOMAIN_VIRT_KVM,
-                                      NULL,
-                                      NULL,
-                                      0,
-                                      NULL) == NULL)
-        goto cleanup;
-
+    virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_KVM,
+                                  NULL, NULL, 0, NULL);
     return caps;
 
  cleanup:
diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c
index f90af3c9c4..d14d6e6308 100644
--- a/src/esx/esx_driver.c
+++ b/src/esx/esx_driver.c
@@ -567,8 +567,8 @@ esxCapsInit(esxPrivate *priv)
                                     NULL, NULL, 0,
                                     NULL);
 
-    if (!virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_VMWARE, NULL, NULL, 0, NULL))
-        goto failure;
+    virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_VMWARE,
+                                  NULL, NULL, 0, NULL);
 
     /* x86_64 */
     if (supportsLongMode == esxVI_Boolean_True) {
@@ -577,8 +577,8 @@ esxCapsInit(esxPrivate *priv)
                                         NULL, NULL,
                                         0, NULL);
 
-        if (!virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_VMWARE, NULL, NULL, 0, NULL))
-            goto failure;
+        virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_VMWARE,
+                                      NULL, NULL, 0, NULL);
     }
 
     return caps;
diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c
index aa70fdbfec..4ef3a36253 100644
--- a/src/hyperv/hyperv_driver.c
+++ b/src/hyperv/hyperv_driver.c
@@ -277,15 +277,15 @@ hypervCapsInit(hypervPrivate *priv)
     guest = virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_I686,
                                     NULL, NULL, 0, NULL);
 
-    if (!virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_HYPERV, NULL, NULL, 0, NULL))
-        goto error;
+    virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_HYPERV,
+                                  NULL, NULL, 0, NULL);
 
     /* x86_64 caps */
     guest = virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_X86_64,
                                     NULL, NULL, 0, NULL);
 
-    if (!virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_HYPERV, NULL, NULL, 0, NULL))
-        goto error;
+    virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_HYPERV,
+                                  NULL, NULL, 0, NULL);
 
     return caps;
 
diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c
index c8020ee801..e03b6fd3c3 100644
--- a/src/libxl/libxl_capabilities.c
+++ b/src/libxl/libxl_capabilities.c
@@ -486,13 +486,8 @@ libxlCapsInitGuests(libxl_ctx *ctx, virCaps *caps)
                                         machines);
         machines = NULL;
 
-        if (virCapabilitiesAddGuestDomain(guest,
-                                          VIR_DOMAIN_VIRT_XEN,
-                                          NULL,
-                                          NULL,
-                                          0,
-                                          NULL) == NULL)
-            return -1;
+        virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_XEN,
+                                      NULL, NULL, 0, NULL);
 
         if (guest_archs[i].pae)
             virCapabilitiesAddGuestFeature(guest, VIR_CAPS_GUEST_FEATURE_TYPE_PAE);
diff --git a/src/lxc/lxc_conf.c b/src/lxc/lxc_conf.c
index a0a8dccae9..73156f15a3 100644
--- a/src/lxc/lxc_conf.c
+++ b/src/lxc/lxc_conf.c
@@ -100,26 +100,16 @@ virCaps *virLXCDriverCapsInit(virLXCDriver *driver)
     guest = virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_EXE,
                                     caps->host.arch, lxc_path, NULL, 0, NULL);
 
-    if (virCapabilitiesAddGuestDomain(guest,
-                                      VIR_DOMAIN_VIRT_LXC,
-                                      NULL,
-                                      NULL,
-                                      0,
-                                      NULL) == NULL)
-        goto error;
+    virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_LXC,
+                                  NULL, NULL, 0, NULL);
 
     /* On 64-bit hosts, we can use personality() to request a 32bit process */
     if ((altArch = lxcContainerGetAlt32bitArch(caps->host.arch)) != VIR_ARCH_NONE) {
         guest = virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_EXE,
                                         altArch, lxc_path, NULL, 0, NULL);
 
-        if (virCapabilitiesAddGuestDomain(guest,
-                                          VIR_DOMAIN_VIRT_LXC,
-                                          NULL,
-                                          NULL,
-                                          0,
-                                          NULL) == NULL)
-            goto error;
+        virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_LXC,
+                                      NULL, NULL, 0, NULL);
     }
 
     if (driver) {
diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c
index c6230baab4..9f879e90eb 100644
--- a/src/openvz/openvz_conf.c
+++ b/src/openvz/openvz_conf.c
@@ -159,13 +159,8 @@ virCaps *openvzCapsInit(void)
     guest = virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_EXE,
                                     caps->host.arch, NULL, NULL, 0, NULL);
 
-    if (virCapabilitiesAddGuestDomain(guest,
-                                      VIR_DOMAIN_VIRT_OPENVZ,
-                                      NULL,
-                                      NULL,
-                                      0,
-                                      NULL) == NULL)
-        return NULL;
+    virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_OPENVZ,
+                                  NULL, NULL, 0, NULL);
 
     return g_steal_pointer(&caps);
 }
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 2b1b1236ce..5358696209 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1058,25 +1058,13 @@ virQEMUCapsInitGuestFromBinary(virCaps *caps,
                                              true, false);
 
     if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_TCG)) {
-        if (virCapabilitiesAddGuestDomain(guest,
-                                          VIR_DOMAIN_VIRT_QEMU,
-                                          NULL,
-                                          NULL,
-                                          0,
-                                          NULL) == NULL) {
-            goto cleanup;
-        }
+        virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_QEMU,
+                                      NULL, NULL, 0, NULL);
     }
 
     if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM)) {
-        if (virCapabilitiesAddGuestDomain(guest,
-                                          VIR_DOMAIN_VIRT_KVM,
-                                          NULL,
-                                          NULL,
-                                          0,
-                                          NULL) == NULL) {
-            goto cleanup;
-        }
+        virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_KVM,
+                                      NULL, NULL, 0, NULL);
     }
 
     if ((ARCH_IS_X86(guestarch) || guestarch == VIR_ARCH_AARCH64))
diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
index a28bec1f20..7c21ab9515 100644
--- a/src/security/virt-aa-helper.c
+++ b/src/security/virt-aa-helper.c
@@ -650,15 +650,8 @@ get_definition(vahControl * ctl, const char *xmlStr)
         return -1;
     }
 
-    if (virCapabilitiesAddGuestDomain(guest,
-                                      virtType,
-                                      NULL,
-                                      NULL,
-                                      0,
-                                      NULL) == NULL) {
-        vah_error(ctl, 0, _("could not allocate memory"));
-        return -1;
-    }
+    virCapabilitiesAddGuestDomain(guest, virtType,
+                                  NULL, NULL, 0, NULL);
 
     ctl->def = virDomainDefParseString(xmlStr,
                                        ctl->xmlopt, NULL,
diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index d6d1efc8a3..e761baca7f 100644
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -348,13 +348,8 @@ testBuildCapabilities(virConnectPtr conn)
         guest = virCapabilitiesAddGuest(caps, guest_types[i], VIR_ARCH_I686,
                                         TEST_EMULATOR, NULL, 0, NULL);
 
-        if (virCapabilitiesAddGuestDomain(guest,
-                                          VIR_DOMAIN_VIRT_TEST,
-                                          NULL,
-                                          NULL,
-                                          0,
-                                          NULL) == NULL)
-            goto error;
+        virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_TEST,
+                                      NULL, NULL, 0, NULL);
 
         virCapabilitiesAddGuestFeature(guest, VIR_CAPS_GUEST_FEATURE_TYPE_PAE);
         virCapabilitiesAddGuestFeature(guest, VIR_CAPS_GUEST_FEATURE_TYPE_NONPAE);
diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c
index 6f6b7e321a..d6f96f7742 100644
--- a/src/vbox/vbox_common.c
+++ b/src/vbox/vbox_common.c
@@ -104,13 +104,8 @@ vboxCapsInit(void)
                                     caps->host.arch, NULL, NULL, 0, NULL);
         return NULL;
 
-    if (virCapabilitiesAddGuestDomain(guest,
-                                      VIR_DOMAIN_VIRT_VBOX,
-                                      NULL,
-                                      NULL,
-                                      0,
-                                      NULL) == NULL)
-        return NULL;
+    virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_VBOX,
+                                  NULL, NULL, 0, NULL);
 
     return g_steal_pointer(&caps);
 }
diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c
index 3be0a845a0..811507cd55 100644
--- a/src/vmware/vmware_conf.c
+++ b/src/vmware/vmware_conf.c
@@ -81,10 +81,8 @@ vmwareCapsInit(void)
     guest = virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM,
                                     VIR_ARCH_I686, NULL, NULL, 0, NULL);
 
-    if (virCapabilitiesAddGuestDomain(guest,
-                                      VIR_DOMAIN_VIRT_VMWARE,
-                                      NULL, NULL, 0, NULL) == NULL)
-        goto error;
+    virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_VMWARE,
+                                  NULL, NULL, 0, NULL);
     guest = NULL;
 
     if (!(caps->host.cpu = virCPUProbeHost(caps->host.arch)))
@@ -103,10 +101,8 @@ vmwareCapsInit(void)
         guest = virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM,
                                         VIR_ARCH_X86_64, NULL, NULL, 0, NULL);
 
-        if (virCapabilitiesAddGuestDomain(guest,
-                                          VIR_DOMAIN_VIRT_VMWARE,
-                                          NULL, NULL, 0, NULL) == NULL)
-            goto error;
+        virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_VMWARE,
+                                      NULL, NULL, 0, NULL);
         guest = NULL;
     }
 
diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c
index e798ddf5ee..b47266290c 100644
--- a/src/vz/vz_driver.c
+++ b/src/vz/vz_driver.c
@@ -88,9 +88,7 @@ vzCapsAddGuestDomain(virCaps *caps,
         return -1;
 
 
-    if (virCapabilitiesAddGuestDomain(guest, virt_type,
-                                      NULL, NULL, 0, NULL) == NULL)
-        return -1;
+    virCapabilitiesAddGuestDomain(guest, virt_type, NULL, NULL, 0, NULL);
 
     return 0;
 }
diff --git a/tests/testutils.c b/tests/testutils.c
index 1841d92061..517afa7957 100644
--- a/tests/testutils.c
+++ b/tests/testutils.c
@@ -906,27 +906,22 @@ virTestGenericCapsInit(void)
     guest = virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_I686,
                                     "/usr/bin/acme-virt", NULL, 0, NULL);
 
-    if (!virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_TEST, NULL, NULL, 0, NULL))
-        return NULL;
-    if (!virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_QEMU,
-                                       NULL, NULL, 0, NULL))
-        return NULL;
-    if (!virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_KVM,
-                                       NULL, NULL, 0, NULL))
-        return NULL;
+    virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_TEST,
+                                  NULL, NULL, 0, NULL);
+    virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_QEMU,
+                                  NULL, NULL, 0, NULL);
+    virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_KVM,
+                                  NULL, NULL, 0, NULL);
 
     guest = virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_X86_64,
                                     "/usr/bin/acme-virt", NULL, 0, NULL);
 
-    if (!virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_TEST, NULL, NULL, 0, NULL))
-        return NULL;
-    if (!virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_QEMU,
-                                       NULL, NULL, 0, NULL))
-        return NULL;
-    if (!virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_KVM,
-                                       NULL, NULL, 0, NULL))
-        return NULL;
-
+    virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_TEST,
+                                  NULL, NULL, 0, NULL);
+    virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_QEMU,
+                                  NULL, NULL, 0, NULL);
+    virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_KVM,
+                                  NULL, NULL, 0, NULL);
 
     if (virTestGetDebug() > 1) {
         g_autofree char *caps_str = NULL;
diff --git a/tests/testutilslxc.c b/tests/testutilslxc.c
index 1ee034c7b3..857407dfb2 100644
--- a/tests/testutilslxc.c
+++ b/tests/testutilslxc.c
@@ -23,18 +23,14 @@ testLXCCapsInit(void)
                                     "/usr/libexec/libvirt_lxc", NULL,
                                     0, NULL);
 
-    if (!virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_LXC, NULL, NULL, 0, NULL))
-        goto error;
-
+    virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_LXC, NULL, NULL, 0, NULL);
 
     guest = virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_EXE,
                                     VIR_ARCH_X86_64,
                                     "/usr/libexec/libvirt_lxc", NULL,
                                     0, NULL);
 
-    if (!virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_LXC, NULL, NULL, 0, NULL))
-        goto error;
-
+    virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_LXC, NULL, NULL, 0, NULL);
 
     if (virTestGetDebug()) {
         g_autofree char *caps_str = NULL;
diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
index 6ab7a10fb1..5bd1d40ad4 100644
--- a/tests/testutilsqemu.c
+++ b/tests/testutilsqemu.c
@@ -176,13 +176,8 @@ testQemuAddGuest(virCaps *caps,
         arch == VIR_ARCH_X86_64)
         virCapabilitiesAddGuestFeature(guest, VIR_CAPS_GUEST_FEATURE_TYPE_CPUSELECTION);
 
-    if (!virCapabilitiesAddGuestDomain(guest,
-                                       VIR_DOMAIN_VIRT_QEMU,
-                                       NULL,
-                                       NULL,
-                                       0,
-                                       NULL))
-        goto error;
+    virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_QEMU,
+                                  NULL, NULL, 0, NULL);
 
     if (kvm_machines[emu_arch] != NULL) {
         nmachines = g_strv_length((char **)kvm_machines[emu_arch]);
@@ -191,13 +186,9 @@ testQemuAddGuest(virCaps *caps,
         if (machines == NULL)
             goto error;
 
-        if (!virCapabilitiesAddGuestDomain(guest,
-                                           VIR_DOMAIN_VIRT_KVM,
-                                           qemu_emulators[emu_arch],
-                                           NULL,
-                                           nmachines,
-                                           machines))
-            goto error;
+        virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_KVM,
+                                      qemu_emulators[emu_arch],
+                                      NULL, nmachines, machines);
     }
 
     return 0;
diff --git a/tests/testutilsxen.c b/tests/testutilsxen.c
index 0f69a71200..1b584e34b1 100644
--- a/tests/testutilsxen.c
+++ b/tests/testutilsxen.c
@@ -40,9 +40,8 @@ testXLInitCaps(void)
                                     "/usr/lib/xen/boot/hvmloader",
                                     nmachines, machines);
     machines = NULL;
-    if (virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_XEN, NULL,
-                                      NULL, 0, NULL) == NULL)
-        goto cleanup;
+    virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_XEN,
+                                  NULL, NULL, 0, NULL);
     nmachines = G_N_ELEMENTS(xen_machines);
     if ((machines = virCapabilitiesAllocMachines(xen_machines, nmachines)) == NULL)
         goto cleanup;
@@ -54,9 +53,8 @@ testXLInitCaps(void)
                                     nmachines, machines);
     machines = NULL;
 
-    if (virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_XEN, NULL,
-                                      NULL, 0, NULL) == NULL)
-        goto cleanup;
+    virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_XEN,
+                                  NULL, NULL, 0, NULL);
     nmachines = G_N_ELEMENTS(pvh_machines);
     if ((machines = virCapabilitiesAllocMachines(pvh_machines, nmachines)) == NULL)
         goto cleanup;
@@ -68,9 +66,8 @@ testXLInitCaps(void)
                                     nmachines, machines);
     machines = NULL;
 
-    if (virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_XEN, NULL,
-                                      NULL, 0, NULL) == NULL)
-        goto cleanup;
+    virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_XEN,
+                                  NULL, NULL, 0, NULL);
     return caps;
 
  cleanup:
diff --git a/tests/vmx2xmltest.c b/tests/vmx2xmltest.c
index e976148a29..257bda3b0e 100644
--- a/tests/vmx2xmltest.c
+++ b/tests/vmx2xmltest.c
@@ -35,26 +35,16 @@ testCapsInit(void)
                                     VIR_ARCH_I686,
                                     NULL, NULL, 0, NULL);
 
-    if (virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_VMWARE, NULL, NULL, 0,
-                                      NULL) == NULL) {
-        goto failure;
-    }
+    virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_VMWARE,
+                                  NULL, NULL, 0, NULL);
 
     /* x86_64 guest */
     guest = virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM,
                                     VIR_ARCH_X86_64,
                                     NULL, NULL, 0, NULL);
 
-    if (virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_VMWARE, NULL, NULL, 0,
-                                      NULL) == NULL) {
-        goto failure;
-    }
-
-    return;
-
- failure:
-    virObjectUnref(caps);
-    caps = NULL;
+    virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_VMWARE,
+                                  NULL, NULL, 0, NULL);
 }
 
 static int
diff --git a/tests/xml2vmxtest.c b/tests/xml2vmxtest.c
index 6c65a8bcf3..cd6d81947b 100644
--- a/tests/xml2vmxtest.c
+++ b/tests/xml2vmxtest.c
@@ -36,27 +36,16 @@ testCapsInit(void)
                                     VIR_ARCH_I686,
                                     NULL, NULL, 0, NULL);
 
-    if (virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_VMWARE, NULL, NULL, 0,
-                                      NULL) == NULL) {
-        goto failure;
-    }
+    virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_VMWARE,
+                                  NULL, NULL, 0, NULL);
 
     /* x86_64 guest */
     guest = virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM,
                                     VIR_ARCH_X86_64,
                                     NULL, NULL, 0, NULL);
 
-    if (virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_VMWARE, NULL, NULL, 0,
-                                      NULL) == NULL) {
-        goto failure;
-    }
-
-    return;
-
- failure:
-    virObjectUnref(caps);
-    virObjectUnref(xmlopt);
-    caps = NULL;
+    virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_VMWARE,
+                                  NULL, NULL, 0, NULL);
 }
 
 static int
-- 
2.32.0




More information about the libvir-list mailing list