Re: [PATCH 02/40] conf: capabilities: convert virCaps to GOBject

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Wed, May 13, 2020 at 01:56:46PM +0200, Rafael Fonseca wrote:
> Signed-off-by: Rafael Fonseca <r4f4rfs@xxxxxxxxx>
> ---
>  src/bhyve/bhyve_capabilities.c  | 16 ++++--------
>  src/bhyve/bhyve_driver.c        | 29 ++++++++--------------
>  src/conf/capabilities.c         | 39 ++++++++++++++---------------
>  src/conf/capabilities.h         |  6 ++---
>  src/conf/storage_capabilities.c |  4 +--
>  src/conf/virconftypes.h         |  3 +--
>  src/esx/esx_driver.c            | 24 ++++++------------
>  src/libvirt_private.syms        |  1 +
>  src/libxl/libxl_capabilities.c  | 19 ++++++--------
>  src/libxl/libxl_conf.c          |  2 +-
>  src/lxc/lxc_conf.c              | 15 +++++------
>  src/lxc/lxc_controller.c        |  2 +-
>  src/lxc/lxc_driver.c            | 44 +++++++++++----------------------
>  src/lxc/lxc_process.c           |  2 +-
>  src/openvz/openvz_conf.c        |  6 ++---
>  src/qemu/qemu_capabilities.c    | 14 +++--------
>  src/qemu/qemu_conf.c            |  6 ++---
>  src/qemu/qemu_driver.c          |  2 +-
>  src/security/virt-aa-helper.c   |  7 ++----
>  src/storage/storage_backend.c   |  3 +--
>  src/test/test_driver.c          | 27 +++++++++-----------
>  src/vbox/vbox_common.c          |  6 ++---
>  src/vmware/vmware_conf.c        | 11 +++------
>  src/vz/vz_driver.c              | 26 ++++++++-----------
>  tests/bhyveargv2xmltest.c       |  2 +-
>  tests/bhyvexml2argvtest.c       |  2 +-
>  tests/bhyvexml2xmltest.c        |  2 +-
>  tests/domainconftest.c          |  2 +-
>  tests/genericxml2xmltest.c      |  2 +-
>  tests/openvzutilstest.c         |  2 +-
>  tests/qemucaps2xmltest.c        | 13 +++-------
>  tests/qemuhotplugtest.c         |  6 ++---
>  tests/testutils.c               |  4 +--
>  tests/testutilslxc.c            | 20 ++++++---------
>  tests/testutilsqemu.c           | 10 +++-----
>  tests/testutilsxen.c            |  3 +--
>  tests/vircaps2xmltest.c         |  6 +----
>  tests/vircapstest.c             | 14 +++--------
>  tests/virresctrltest.c          |  3 +--
>  tests/vmx2xmltest.c             |  8 ++----
>  tests/xml2vmxtest.c             |  8 ++----
>  41 files changed, 156 insertions(+), 265 deletions(-)

> diff --git a/tests/testutilsxen.c b/tests/testutilsxen.c
> index d50c3003da..7da90cdd1e 100644
> --- a/tests/testutilsxen.c
> +++ b/tests/testutilsxen.c
> @@ -11,7 +11,7 @@
>  static virCapsPtr
>  testXLInitCaps(void)
>  {
> -    virCapsPtr caps;
> +    g_autoptr(virCaps) caps = NULL;
>      virCapsGuestPtr guest;
>      virCapsGuestMachinePtr *machines;
>      int nmachines;
> @@ -78,7 +78,6 @@ testXLInitCaps(void)
>  
>   cleanup:
>      virCapabilitiesFreeMachines(machines, nmachines);
> -    virObjectUnref(caps);
>      return NULL;
>  }

Needs

diff --git a/tests/testutilsxen.c b/tests/testutilsxen.c
index 7da90cdd1e..80284c5b49 100644
--- a/tests/testutilsxen.c
+++ b/tests/testutilsxen.c
@@ -74,7 +74,7 @@ testXLInitCaps(void)
     if (virCapabilitiesAddGuestDomain(guest, VIR_DOMAIN_VIRT_XEN, NULL,
                                       NULL, 0, NULL) == NULL)
         goto cleanup;
-    return caps;
+    return g_steal_pointer(&caps);
 
  cleanup:
     virCapabilitiesFreeMachines(machines, nmachines);


To fix the test suite crash

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|




[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]

  Powered by Linux