lib: Don't check for virCapabilitiesAddGuest() retval

The virCapabilitiesAddGuest() function can't fail. It aborts on OOM. Therefore, there's no need to check for its return value. Signed-off-by: Michal Privoznik <[email protected]> Reviewed-by: Ján Tomko <[email protected]>
niteeshkd · Nov 1, 2021 · c18d9e2 · c18d9e2
1 parent 42cc2f9
commit c18d9e2
Show file tree

Hide file tree

Showing 19 changed files with 79 additions and 178 deletions.
diff --git a/src/bhyve/bhyve_capabilities.c b/src/bhyve/bhyve_capabilities.c
@@ -50,11 +50,9 @@ virBhyveCapsBuild(void)
  false, false)) == NULL)
  return NULL;
 
- if ((guest = virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM,
- VIR_ARCH_X86_64,
- "bhyve",
- NULL, 0, NULL)) == NULL)
- goto error;
+ guest = virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM,
+ VIR_ARCH_X86_64, "bhyve",
+ NULL, 0, NULL);
 
  if (virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_BHYVE,
  NULL, NULL, 0, NULL) == NULL)

diff --git a/src/ch/ch_conf.c b/src/ch/ch_conf.c
@@ -65,14 +65,8 @@ virCaps *virCHDriverCapsInit(void)
  if (virCapabilitiesInitCaches(caps) < 0)
  goto cleanup;
 
- if ((guest = virCapabilitiesAddGuest(caps,
- VIR_DOMAIN_OSTYPE_HVM,
- caps->host.arch,
- NULL,
- NULL,
- 0,
- NULL)) == NULL)
- goto cleanup;
+ guest = virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM,
+ caps->host.arch, NULL, NULL, 0, NULL);
 
  if (virCapabilitiesAddGuestDomain(guest,
  VIR_DOMAIN_VIRT_KVM,

diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c
@@ -567,9 +567,6 @@ esxCapsInit(esxPrivate *priv)
  NULL, NULL, 0,
  NULL);
 
- if (!guest)
- goto failure;
-
  if (!virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_VMWARE, NULL, NULL, 0, NULL))
  goto failure;
 
@@ -580,9 +577,6 @@ esxCapsInit(esxPrivate *priv)
  NULL, NULL,
  0, NULL);
 
- if (!guest)
- goto failure;
-
  if (!virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_VMWARE, NULL, NULL, 0, NULL))
  goto failure;
  }

diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c
@@ -276,17 +276,13 @@ hypervCapsInit(hypervPrivate *priv)
  /* i686 caps */
  guest = virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_I686,
  NULL, NULL, 0, NULL);
- if (!guest)
- goto error;
 
  if (!virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_HYPERV, NULL, NULL, 0, NULL))
  goto error;
 
  /* x86_64 caps */
  guest = virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_X86_64,
  NULL, NULL, 0, NULL);
- if (!guest)
- goto error;
 
  if (!virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_HYPERV, NULL, NULL, 0, NULL))
  goto error;

diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c
@@ -473,20 +473,17 @@ libxlCapsInitGuests(libxl_ctx *ctx, virCaps *caps)
  if ((machines = virCapabilitiesAllocMachines(xen_machines, 1)) == NULL)
  return -1;
 
- if ((guest = virCapabilitiesAddGuest(caps,
- guest_archs[i].hvm ? VIR_DOMAIN_OSTYPE_HVM :
- (guest_archs[i].pvh ? VIR_DOMAIN_OSTYPE_XENPVH :
- VIR_DOMAIN_OSTYPE_XEN),
- guest_archs[i].arch,
- LIBXL_EXECBIN_DIR "/qemu-system-i386",
- (guest_archs[i].hvm ?
- LIBXL_FIRMWARE_DIR "/hvmloader" :
- NULL),
- 1,
- machines)) == NULL) {
- virCapabilitiesFreeMachines(machines, 1);
- return -1;
- }
+ guest = virCapabilitiesAddGuest(caps,
+ guest_archs[i].hvm ? VIR_DOMAIN_OSTYPE_HVM :
+ (guest_archs[i].pvh ? VIR_DOMAIN_OSTYPE_XENPVH :
+ VIR_DOMAIN_OSTYPE_XEN),
+ guest_archs[i].arch,
+ LIBXL_EXECBIN_DIR "/qemu-system-i386",
+ (guest_archs[i].hvm ?
+ LIBXL_FIRMWARE_DIR "/hvmloader" :
+ NULL),
+ 1,
+ machines);
  machines = NULL;
 
  if (virCapabilitiesAddGuestDomain(guest,

diff --git a/src/lxc/lxc_conf.c b/src/lxc/lxc_conf.c
@@ -97,14 +97,8 @@ virCaps *virLXCDriverCapsInit(virLXCDriver *driver)
  LIBEXECDIR)))
  goto error;
 
- if ((guest = virCapabilitiesAddGuest(caps,
- VIR_DOMAIN_OSTYPE_EXE,
- caps->host.arch,
- lxc_path,
- NULL,
- 0,
- NULL)) == NULL)
- goto error;
+ guest = virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_EXE,
+ caps->host.arch, lxc_path, NULL, 0, NULL);
 
  if (virCapabilitiesAddGuestDomain(guest,
  VIR_DOMAIN_VIRT_LXC,
@@ -116,14 +110,8 @@ virCaps *virLXCDriverCapsInit(virLXCDriver *driver)
 
  /* On 64-bit hosts, we can use personality() to request a 32bit process */
  if ((altArch = lxcContainerGetAlt32bitArch(caps->host.arch)) != VIR_ARCH_NONE) {
- if ((guest = virCapabilitiesAddGuest(caps,
- VIR_DOMAIN_OSTYPE_EXE,
- altArch,
- lxc_path,
- NULL,
- 0,
- NULL)) == NULL)
- goto error;
+ guest = virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_EXE,
+ altArch, lxc_path, NULL, 0, NULL);
 
  if (virCapabilitiesAddGuestDomain(guest,
  VIR_DOMAIN_VIRT_LXC,

diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c
@@ -156,14 +156,8 @@ virCaps *openvzCapsInit(void)
  if (virCapabilitiesInitCaches(caps) < 0)
  return NULL;
 
- if ((guest = virCapabilitiesAddGuest(caps,
- VIR_DOMAIN_OSTYPE_EXE,
- caps->host.arch,
- NULL,
- NULL,
- 0,
- NULL)) == NULL)
- return NULL;
+ guest = virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_EXE,
+ caps->host.arch, NULL, NULL, 0, NULL);
 
  if (virCapabilitiesAddGuestDomain(guest,
  VIR_DOMAIN_VIRT_OPENVZ,

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
@@ -1050,14 +1050,9 @@ virQEMUCapsInitGuestFromBinary(virCaps *caps,
 
  /* We register kvm as the base emulator too, since we can
  * just give -no-kvm to disable acceleration if required */
- if ((guest = virCapabilitiesAddGuest(caps,
- VIR_DOMAIN_OSTYPE_HVM,
- guestarch,
- binary,
- NULL,
- nmachines,
- machines)) == NULL)
- goto cleanup;
+ guest = virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM,
+ guestarch, binary,
+ NULL, nmachines, machines);
 
  machines = NULL;
  nmachines = 0;

diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
@@ -642,16 +642,8 @@ get_definition(vahControl * ctl, const char *xmlStr)
  return -1;
  }
 
- if ((guest = virCapabilitiesAddGuest(ctl->caps,
- ostype,
- ctl->arch,
- NULL,
- NULL,
- 0,
- NULL)) == NULL) {
- vah_error(ctl, 0, _("could not allocate memory"));
- return -1;
- }
+ guest = virCapabilitiesAddGuest(ctl->caps, ostype, ctl->arch,
+ NULL, NULL, 0, NULL);
 
  if ((virtType = virDomainVirtTypeFromString(ctl->virtType)) < 0) {
  vah_error(ctl, 0, _("unknown virtualization type"));

diff --git a/src/test/test_driver.c b/src/test/test_driver.c
@@ -345,14 +345,8 @@ testBuildCapabilities(virConnectPtr conn)
  }
 
  for (i = 0; i < G_N_ELEMENTS(guest_types); i++) {
- if ((guest = virCapabilitiesAddGuest(caps,
- guest_types[i],
- VIR_ARCH_I686,
- TEST_EMULATOR,
- NULL,
- 0,
- NULL)) == NULL)
- goto error;
+ guest = virCapabilitiesAddGuest(caps, guest_types[i], VIR_ARCH_I686,
+ TEST_EMULATOR, NULL, 0, NULL);
 
  if (virCapabilitiesAddGuestDomain(guest,
  VIR_DOMAIN_VIRT_TEST,

diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c
@@ -100,13 +100,8 @@ vboxCapsInit(void)
  if (virCapabilitiesInitCaches(caps) < 0)
  return NULL;
 
- if ((guest = virCapabilitiesAddGuest(caps,
- VIR_DOMAIN_OSTYPE_HVM,
- caps->host.arch,
- NULL,
- NULL,
- 0,
- NULL)) == NULL)
+ guest = virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM,
+ caps->host.arch, NULL, NULL, 0, NULL);
  return NULL;
 
  if (virCapabilitiesAddGuestDomain(guest,

diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c
@@ -78,11 +78,8 @@ vmwareCapsInit(void)
  VIR_WARN("Failed to get host CPU cache info");
 
  /* i686 guests are always supported */
- if ((guest = virCapabilitiesAddGuest(caps,
- VIR_DOMAIN_OSTYPE_HVM,
- VIR_ARCH_I686,
- NULL, NULL, 0, NULL)) == NULL)
- goto error;
+ guest = virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM,
+ VIR_ARCH_I686, NULL, NULL, 0, NULL);
 
  if (virCapabilitiesAddGuestDomain(guest,
  VIR_DOMAIN_VIRT_VMWARE,
@@ -103,11 +100,8 @@ vmwareCapsInit(void)
  (virCPUCheckFeature(caps->host.cpu->arch, caps->host.cpu, "vmx") ||
  virCPUCheckFeature(caps->host.cpu->arch, caps->host.cpu, "svm")))) {
 
- if ((guest = virCapabilitiesAddGuest(caps,
- VIR_DOMAIN_OSTYPE_HVM,
- VIR_ARCH_X86_64,
- NULL, NULL, 0, NULL)) == NULL)
- goto error;
+ guest = virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM,
+ VIR_ARCH_X86_64, NULL, NULL, 0, NULL);
 
  if (virCapabilitiesAddGuestDomain(guest,
  VIR_DOMAIN_VIRT_VMWARE,

diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c
@@ -83,8 +83,8 @@ vzCapsAddGuestDomain(virCaps *caps,
 {
  virCapsGuest *guest;
 
- if ((guest = virCapabilitiesAddGuest(caps, ostype, arch, emulator,
-  NULL, 0, NULL)) == NULL)
+ guest = virCapabilitiesAddGuest(caps, ostype, arch,
+ emulator, NULL, 0, NULL);
  return -1;
 
 

diff --git a/tests/testutils.c b/tests/testutils.c
@@ -903,10 +903,8 @@ virTestGenericCapsInit(void)
  false, false)) == NULL)
  return NULL;
 
- if ((guest = virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_I686,
- "/usr/bin/acme-virt", NULL,
- 0, NULL)) == NULL)
- return NULL;
+ 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;
@@ -917,10 +915,8 @@ virTestGenericCapsInit(void)
  NULL, NULL, 0, NULL))
  return NULL;
 
- if ((guest = virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM, VIR_ARCH_X86_64,
- "/usr/bin/acme-virt", NULL,
- 0, NULL)) == NULL)
- return 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;

diff --git a/tests/testutilslxc.c b/tests/testutilslxc.c
@@ -18,21 +18,19 @@ testLXCCapsInit(void)
  false, false)) == NULL)
  return NULL;
 
- if ((guest = virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_EXE,
- VIR_ARCH_I686,
- "/usr/libexec/libvirt_lxc", NULL,
- 0, NULL)) == NULL)
- goto error;
+ guest = virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_EXE,
+ VIR_ARCH_I686,
+ "/usr/libexec/libvirt_lxc", NULL,
+ 0, NULL);
 
  if (!virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_LXC, NULL, NULL, 0, NULL))
  goto error;
 
 
- if ((guest = virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_EXE,
- VIR_ARCH_X86_64,
- "/usr/libexec/libvirt_lxc", NULL,
- 0, NULL)) == NULL)
- goto error;
+ 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;

diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
@@ -165,14 +165,9 @@ testQemuAddGuest(virCaps *caps,
  if (machines == NULL)
  goto error;
 
- if (!(guest = virCapabilitiesAddGuest(caps,
- VIR_DOMAIN_OSTYPE_HVM,
- arch,
- qemu_emulators[emu_arch],
- NULL,
- nmachines,
- machines)))
- goto error;
+ guest = virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM,
+ arch, qemu_emulators[emu_arch],
+ NULL, nmachines, machines);
 
  machines = NULL;
  nmachines = 0;

diff --git a/tests/testutilsxen.c b/tests/testutilsxen.c
@@ -34,12 +34,11 @@ testXLInitCaps(void)
  nmachines = G_N_ELEMENTS(x86_machines);
  if ((machines = virCapabilitiesAllocMachines(x86_machines, nmachines)) == NULL)
  goto cleanup;
- if ((guest = virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM,
- VIR_ARCH_X86_64,
- "/usr/lib/xen/bin/qemu-system-i386",
- "/usr/lib/xen/boot/hvmloader",
- nmachines, machines)) == NULL)
- goto cleanup;
+ guest = virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_HVM,
+ VIR_ARCH_X86_64,
+ "/usr/lib/xen/bin/qemu-system-i386",
+ "/usr/lib/xen/boot/hvmloader",
+ nmachines, machines);
  machines = NULL;
  if (virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_XEN, NULL,
  NULL, 0, NULL) == NULL)
@@ -48,12 +47,11 @@ testXLInitCaps(void)
  if ((machines = virCapabilitiesAllocMachines(xen_machines, nmachines)) == NULL)
  goto cleanup;
 
- if ((guest = virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_XEN,
- VIR_ARCH_X86_64,
- "/usr/lib/xen/bin/qemu-system-i386",
- NULL,
- nmachines, machines)) == NULL)
- goto cleanup;
+ guest = virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_XEN,
+ VIR_ARCH_X86_64,
+ "/usr/lib/xen/bin/qemu-system-i386",
+ NULL,
+ nmachines, machines);
  machines = NULL;
 
  if (virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_XEN, NULL,
@@ -63,12 +61,11 @@ testXLInitCaps(void)
  if ((machines = virCapabilitiesAllocMachines(pvh_machines, nmachines)) == NULL)
  goto cleanup;
 
- if ((guest = virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_XENPVH,
- VIR_ARCH_X86_64,
- "/usr/lib/xen/bin/qemu-system-i386",
- NULL,
- nmachines, machines)) == NULL)
- goto cleanup;
+ guest = virCapabilitiesAddGuest(caps, VIR_DOMAIN_OSTYPE_XENPVH,
+ VIR_ARCH_X86_64,
+ "/usr/lib/xen/bin/qemu-system-i386",
+ NULL,
+ nmachines, machines);
  machines = NULL;
 
  if (virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_XEN, NULL,