lib: Don't check for virCapabilitiesAddGuestDomain() retval

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@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/bhyve/bhyve_capabilities.c b/src/bhyve/bhyve_capabilities.c
index cc1c7b66b3e39ce2da7296f3926c7b213349a7f3..5a0c6c2b773c1fe5ceeae1c8f6790ca9dcff1be0 100644 (file)
--- a/src/bhyve/bhyve_capabilities.c
+++ b/src/bhyve/bhyve_capabilities.c
@@ -54,18 +54,13 @@ 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");
 
     return caps;
-
- error:
-    virObjectUnref(caps);
-    return NULL;
 }
 
 int

diff --git a/src/ch/ch_conf.c b/src/ch/ch_conf.c
index d0c56f689058f7a252e872ac531c5d95681e49e9..ef6f4b5ba85e29b842cb15b221a74271ea21cb86 100644 (file)
--- 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 fc28765118610e90617b978a94be64aa42273533..99e433ce930f8f978e90588d071cd40a002f3d07 100644 (file)
--- 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 cf25cae48cd217dfde0d0700737732cbb5a7603d..bafec27a88cd79ee4dc6346fad1cfac83f55d5f8 100644 (file)
--- 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 c8020ee801260c5c4f2a1d15af83cee9fdf06a3a..e03b6fd3c3d6e85959b8275f0b3896eb0411bcd9 100644 (file)
--- 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 a0a8dccae9bfaff29eb942b33d202d5c3c964ed4..73156f15a351da3201276927b3211259c14f9ef5 100644 (file)
--- 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 c6230baab4f90dc3ac8a182d45abc384670b4173..9f879e90eb4b8179d8950cc4fde58b3411f355ef 100644 (file)
--- 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 bc57c7ece4f67179dbb41e27e261338bde30b961..47b488213f847fdfec08fce841c58475bfe90979 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1065,25 +1065,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 a28bec1f202a518a5e181cbe9d5fc2986646eb89..7c21ab9515f67c92d8170f67b078fa241347cc28 100644 (file)
--- 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 b7c761e6d90dc400a2571db2ceb3b90265803090..13d07e570e8b667ae31e2c7780035d35a3c5142c 100644 (file)
--- 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 6854f2876e365d9b8cee9480fec83d4feee37cb3..4c174e0a69c9f07cb647c41674f0764e3149e48b 100644 (file)
--- 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 3be0a845a0bd0e0b2945f3e835b404d861d9bc09..811507cd555f50ce7c4cb45f450279ce9beae23f 100644 (file)
--- 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 e798ddf5ee0175903f5053da401c3ff1198b287a..b47266290cefcff65b90091f100f6e324ea78b63 100644 (file)
--- 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 68208173fc384f551dbcb08a12492224ec4de39d..e460c9ecc5227fdd207cf1e9f90bf39faa412353 100644 (file)
--- 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 1ee034c7b34f3fa50b32af15d5f0e555eac441f9..857407dfb2eb329153d76d7e32403a51cda351c6 100644 (file)
--- 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 6ab7a10fb1b266171e552c03cf33393b1c9ecb06..5bd1d40ad4603cea8e896250b591fc5722086492 100644 (file)
--- 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 0f69a712008413e0c70719e5169dd125d5debe7c..1b584e34b1c3a149726c5785d3fc4f2855fd9594 100644 (file)
--- 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 e976148a29991bf140f6cbc1bc83135094f93d24..257bda3b0eed1ca100a8ec3523200b4d99f2a9d9 100644 (file)
--- 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 6c65a8bcf36007e5928241eeb9f350df0ea12231..cd6d81947b4b3db880a4ad03d26f12ce2174e224 100644 (file)
--- 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