capabilities: use bool instead of int

While preparing to add a capability for active commit, I noticed
that the existing code was abusing int for boolean values.

* src/conf/capabilities.h (_virCapsGuestFeature, _virCapsHost)
(virCapabilitiesNew, virCapabilitiesAddGuestFeature): Improve
types.
* src/conf/capabilities.c (virCapabilitiesNew)
(virCapabilitiesAddGuestFeature): Adjust signature.
* src/bhyve/bhyve_capabilities.c (virBhyveCapsBuild): Update
clients.
* src/esx/esx_driver.c (esxCapsInit): Likewise.
* src/libxl/libxl_conf.c (libxlMakeCapabilities): Likewise.
* src/lxc/lxc_conf.c (virLXCDriverCapsInit): Likewise.
* src/openvz/openvz_conf.c (openvzCapsInit): Likewise.
* src/parallels/parallels_driver.c (parallelsBuildCapabilities):
Likewise.
* src/phyp/phyp_driver.c (phypCapsInit): Likewise.
* src/qemu/qemu_capabilities.c (virQEMUCapsInit)
(virQEMUCapsInitGuestFromBinary): Likewise.
* src/security/virt-aa-helper.c (get_definition): Likewise.
* src/test/test_driver.c (testBuildCapabilities): Likewise.
* src/uml/uml_conf.c (umlCapsInit): Likewise.
* src/vbox/vbox_tmpl.c (vboxCapsInit): Likewise.
* src/vmware/vmware_conf.c (vmwareCapsInit): Likewise.
* src/xen/xen_hypervisor.c (xenHypervisorBuildCapabilities):
Likewise.
* src/xenapi/xenapi_driver.c (getCapsObject): Likewise.
* tests/qemucaps2xmltest.c (testGetCaps): Likewise.
* tests/testutils.c (virTestGenericCapsInit): Likewise.
* tests/testutilslxc.c (testLXCCapsInit): Likewise.
* tests/testutilsqemu.c (testQemuCapsInit): Likewise.
* tests/testutilsxen.c (testXenCapsInit): Likewise.
* tests/vircaps2xmltest.c (buildVirCapabilities): Likewise.
* tests/vircapstest.c (buildNUMATopology): Likewise.
* tests/vmx2xmltest.c (testCapsInit): Likewise.
* tests/xml2vmxtest.c (testCapsInit): Likewise.

Signed-off-by: Eric Blake <eblake@redhat.com>

diff --git a/src/bhyve/bhyve_capabilities.c b/src/bhyve/bhyve_capabilities.c
index bbca924cb9cca8dad037e46fb9c558eab60378a2..132ce9169e2de7da6f61e8e67dfc207c6a2eeb66 100644 (file)
--- a/src/bhyve/bhyve_capabilities.c
+++ b/src/bhyve/bhyve_capabilities.c
@@ -82,7 +82,7 @@ virBhyveCapsBuild(void)
     virCapsGuestPtr guest;
 
     if ((caps = virCapabilitiesNew(virArchFromHost(),
-                                   0, 0)) == NULL)
+                                   false, false)) == NULL)
         return NULL;
 
     if ((guest = virCapabilitiesAddGuest(caps, "hvm",

diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c
index 8504d3442a89bf53a9b41e00fa98abfd4617c5d4..dc2c01a02d76723a7a7defe068dcb30ac208a6c2 100644 (file)
--- a/src/conf/capabilities.c
+++ b/src/conf/capabilities.c
@@ -58,15 +58,15 @@ VIR_ONCE_GLOBAL_INIT(virCapabilities)
 /**
  * virCapabilitiesNew:
  * @hostarch: host machine architecture
- * @offlineMigrate: non-zero if offline migration is available
- * @liveMigrate: non-zero if live migration is available
+ * @offlineMigrate: true if offline migration is available
+ * @liveMigrate: true if live migration is available
  *
  * Allocate a new capabilities object
  */
 virCapsPtr
 virCapabilitiesNew(virArch hostarch,
-                   int offlineMigrate,
-                   int liveMigrate)
+                   bool offlineMigrate,
+                   bool liveMigrate)
 {
     virCapsPtr caps;
 
@@ -502,16 +502,16 @@ virCapabilitiesAddGuestDomain(virCapsGuestPtr guest,
  * virCapabilitiesAddGuestFeature:
  * @guest: guest to associate feature with
  * @name: name of feature ('pae', 'acpi', 'apic')
- * @defaultOn: non-zero if it defaults to on
- * @toggle: non-zero if its state can be toggled
+ * @defaultOn: true if it defaults to on
+ * @toggle: true if its state can be toggled
  *
- * Registers a feature for a guest domain
+ * Registers a feature for a guest domain.
  */
 virCapsGuestFeaturePtr
 virCapabilitiesAddGuestFeature(virCapsGuestPtr guest,
                                const char *name,
-                               int defaultOn,
-                               int toggle)
+                               bool defaultOn,
+                               bool toggle)
 {
     virCapsGuestFeaturePtr feature;
 

diff --git a/src/conf/capabilities.h b/src/conf/capabilities.h
index 2f944514ce3652bc6fe28445462ba194717e40f5..476debaa0f7614e4323c2bd0739f0fce84eb36ae 100644 (file)
--- a/src/conf/capabilities.h
+++ b/src/conf/capabilities.h
@@ -1,7 +1,7 @@
 /*
  * capabilities.h: hypervisor capabilities
  *
- * Copyright (C) 2006-2013 Red Hat, Inc.
+ * Copyright (C) 2006-2014 Red Hat, Inc.
  * Copyright (C) 2006-2008 Daniel P. Berrange
  *
  * This library is free software; you can redistribute it and/or
@@ -37,8 +37,8 @@ typedef struct _virCapsGuestFeature virCapsGuestFeature;
 typedef virCapsGuestFeature *virCapsGuestFeaturePtr;
 struct _virCapsGuestFeature {
     char *name;
-    int defaultOn;
-    int toggle;
+    bool defaultOn;
+    bool toggle;
 };
 
 typedef struct _virCapsGuestMachine virCapsGuestMachine;
@@ -148,8 +148,8 @@ struct _virCapsHost {
     unsigned int powerMgmt;    /* Bitmask of the PM capabilities.
                                 * See enum virHostPMCapability.
                                 */
-    int offlineMigrate;
-    int liveMigrate;
+    bool offlineMigrate;
+    bool liveMigrate;
     size_t nmigrateTrans;
     size_t nmigrateTrans_max;
     char **migrateTrans;
@@ -195,8 +195,8 @@ struct _virCaps {
 
 extern virCapsPtr
 virCapabilitiesNew(virArch hostarch,
-                   int offlineMigrate,
-                   int liveMigrate);
+                   bool offlineMigrate,
+                   bool liveMigrate);
 
 extern void
 virCapabilitiesFreeNUMAInfo(virCapsPtr caps);
@@ -254,8 +254,8 @@ virCapabilitiesAddGuestDomain(virCapsGuestPtr guest,
 extern virCapsGuestFeaturePtr
 virCapabilitiesAddGuestFeature(virCapsGuestPtr guest,
                                const char *name,
-                               int defaultOn,
-                               int toggle);
+                               bool defaultOn,
+                               bool toggle);
 
 extern int
 virCapabilitiesHostSecModelAddBaseLabel(virCapsHostSecModelPtr secmodel,

diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c
index d2cc230ec7b87f3c288bc602b0fba6292286f6db..f0a52788f3b5425947419f92ef7822cf13cbc3b0 100644 (file)
--- a/src/esx/esx_driver.c
+++ b/src/esx/esx_driver.c
@@ -575,9 +575,9 @@ esxCapsInit(esxPrivate *priv)
     }
 
     if (supportsLongMode == esxVI_Boolean_True) {
-        caps = virCapabilitiesNew(VIR_ARCH_X86_64, 1, 1);
+        caps = virCapabilitiesNew(VIR_ARCH_X86_64, true, true);
     } else {
-        caps = virCapabilitiesNew(VIR_ARCH_I686, 1, 1);
+        caps = virCapabilitiesNew(VIR_ARCH_I686, true, true);
     }
 
     if (!caps)

diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c
index f620d475755b8f32ebe23e679b550e027982a09e..a39dc4f3d9e7af8486f2ee7bea552017e173282c 100644 (file)
--- a/src/libxl/libxl_conf.c
+++ b/src/libxl/libxl_conf.c
@@ -1372,9 +1372,9 @@ libxlMakeCapabilities(libxl_ctx *ctx)
     virCapsPtr caps;
 
 #ifdef LIBXL_HAVE_NO_SUSPEND_RESUME
-    if ((caps = virCapabilitiesNew(virArchFromHost(), 0, 0)) == NULL)
+    if ((caps = virCapabilitiesNew(virArchFromHost(), false, false)) == NULL)
 #else
-    if ((caps = virCapabilitiesNew(virArchFromHost(), 1, 1)) == NULL)
+    if ((caps = virCapabilitiesNew(virArchFromHost(), true, true)) == NULL)
 #endif
         return NULL;
 

diff --git a/src/lxc/lxc_conf.c b/src/lxc/lxc_conf.c
index a35a5e04b9095d051043eb779493f9f73e8335b8..b5fd3cb3ad3d67ca81a854737c72deb54d8841d7 100644 (file)
--- a/src/lxc/lxc_conf.c
+++ b/src/lxc/lxc_conf.c
@@ -70,11 +70,11 @@ virCapsPtr virLXCDriverCapsInit(virLXCDriverPtr driver)
     char *lxc_path = NULL;
 
     if ((caps = virCapabilitiesNew(virArchFromHost(),
-                                   0, 0)) == NULL)
+                                   false, false)) == NULL)
         goto error;
 
     /* Some machines have problematic NUMA toplogy causing
-     * unexpected failures. We don't want to break the QEMU
+     * unexpected failures. We don't want to break the lxc
      * driver in this scenario, so log errors & carry on
      */
     if (nodeCapsInitNUMA(caps) < 0) {

diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c
index 38d3ea72e1f6f4627bfdabfd2c1b9ee0d62883fc..856c9f5b7074c543192c8e5d970127cb1cca208d 100644 (file)
--- a/src/openvz/openvz_conf.c
+++ b/src/openvz/openvz_conf.c
@@ -172,7 +172,7 @@ virCapsPtr openvzCapsInit(void)
     virCapsGuestPtr guest;
 
     if ((caps = virCapabilitiesNew(virArchFromHost(),
-                                   0, 0)) == NULL)
+                                   false, false)) == NULL)
         goto no_memory;
 
     if (nodeCapsInitNUMA(caps) < 0)

diff --git a/src/parallels/parallels_driver.c b/src/parallels/parallels_driver.c
index b388e2d77ce7aa1c351bc66bf6f7f40b5f2f0b76..43568d1e0abaac96c319a8abd40afab08de08316 100644 (file)
--- a/src/parallels/parallels_driver.c
+++ b/src/parallels/parallels_driver.c
@@ -125,7 +125,7 @@ parallelsBuildCapabilities(void)
     virNodeInfo nodeinfo;
 
     if ((caps = virCapabilitiesNew(virArchFromHost(),
-                                   0, 0)) == NULL)
+                                   false, false)) == NULL)
         return NULL;
 
     if (nodeCapsInitNUMA(caps) < 0)

diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c
index 056d28921f7544880ae36b875b6559c77a359246..fa9afd03ac204d1369d85d92da6eb1171116338d 100644 (file)
--- a/src/phyp/phyp_driver.c
+++ b/src/phyp/phyp_driver.c
@@ -286,7 +286,7 @@ phypCapsInit(void)
     virCapsGuestPtr guest;
 
     if ((caps = virCapabilitiesNew(virArchFromHost(),
-                                   0, 0)) == NULL)
+                                   false, false)) == NULL)
         goto no_memory;
 
     /* Some machines have problematic NUMA toplogy causing

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index c665e2ba2755b3274ccce161af88a20c163ba1f1..37e0588fc94e0a7f8738a50c309cc4640523ab82 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -815,17 +815,18 @@ virQEMUCapsInitGuestFromBinary(virCapsPtr caps,
     if (caps->host.cpu &&
         caps->host.cpu->model &&
         virQEMUCapsGetCPUDefinitions(qemubinCaps, NULL) > 0 &&
-        !virCapabilitiesAddGuestFeature(guest, "cpuselection", 1, 0))
+        !virCapabilitiesAddGuestFeature(guest, "cpuselection", true, false))
         goto cleanup;
 
     if (virQEMUCapsGet(qemubinCaps, QEMU_CAPS_BOOTINDEX) &&
-        !virCapabilitiesAddGuestFeature(guest, "deviceboot", 1, 0))
+        !virCapabilitiesAddGuestFeature(guest, "deviceboot", true, false))
         goto cleanup;
 
     if (virQEMUCapsGet(qemubinCaps, QEMU_CAPS_DISK_SNAPSHOT))
         hasdisksnapshot = true;
 
-    if (!virCapabilitiesAddGuestFeature(guest, "disksnapshot", hasdisksnapshot, 0))
+    if (!virCapabilitiesAddGuestFeature(guest, "disksnapshot", hasdisksnapshot,
+                                        false))
         goto cleanup;
 
     if (virCapabilitiesAddGuestDomain(guest,
@@ -868,13 +869,13 @@ virQEMUCapsInitGuestFromBinary(virCapsPtr caps,
 
     if (((guestarch == VIR_ARCH_I686) ||
          (guestarch == VIR_ARCH_X86_64)) &&
-        (virCapabilitiesAddGuestFeature(guest, "acpi", 1, 1) == NULL ||
-         virCapabilitiesAddGuestFeature(guest, "apic", 1, 0) == NULL))
+        (virCapabilitiesAddGuestFeature(guest, "acpi", true, true) == NULL ||
+         virCapabilitiesAddGuestFeature(guest, "apic", true, false) == NULL))
         goto cleanup;
 
     if ((guestarch == VIR_ARCH_I686) &&
-        (virCapabilitiesAddGuestFeature(guest, "pae", 1, 0) == NULL ||
-         virCapabilitiesAddGuestFeature(guest, "nonpae", 1, 0) == NULL))
+        (virCapabilitiesAddGuestFeature(guest, "pae", true, false) == NULL ||
+         virCapabilitiesAddGuestFeature(guest, "nonpae", true, false) == NULL))
         goto cleanup;
 
     ret = 0;
@@ -957,7 +958,7 @@ virCapsPtr virQEMUCapsInit(virQEMUCapsCachePtr cache)
     virArch hostarch = virArchFromHost();
 
     if ((caps = virCapabilitiesNew(hostarch,
-                                   1, 1)) == NULL)
+                                   true, true)) == NULL)
         goto error;
 
     /* Some machines have problematic NUMA toplogy causing

diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
index c8f17f9b05d8f320e616f91a4dbae3edcc8864b3..f11855ddb871f0c21813d2f366bf04071ab44116 100644 (file)
--- a/src/security/virt-aa-helper.c
+++ b/src/security/virt-aa-helper.c
@@ -727,7 +727,7 @@ get_definition(vahControl * ctl, const char *xmlStr)
     if (caps_mockup(ctl, xmlStr) != 0)
         goto exit;
 
-    if ((ctl->caps = virCapabilitiesNew(ctl->arch, 1, 1)) == NULL) {
+    if ((ctl->caps = virCapabilitiesNew(ctl->arch, true, true)) == NULL) {
         vah_error(ctl, 0, _("could not allocate memory"));
         goto exit;
     }

diff --git a/src/test/test_driver.c b/src/test/test_driver.c
index 7bfc88d981b745c55118c33912f691753b94ea77..42af2315228274336e5e6b53d184de70956df504 100644 (file)
--- a/src/test/test_driver.c
+++ b/src/test/test_driver.c
@@ -318,7 +318,7 @@ testBuildCapabilities(virConnectPtr conn)
     const char *const guest_types[] = { "hvm", "xen" };
     size_t i;
 
-    if ((caps = virCapabilitiesNew(VIR_ARCH_I686, 0, 0)) == NULL)
+    if ((caps = virCapabilitiesNew(VIR_ARCH_I686, false, false)) == NULL)
         goto error;
 
     if (virCapabilitiesAddHostFeature(caps, "pae") < 0)
@@ -360,9 +360,9 @@ testBuildCapabilities(virConnectPtr conn)
                                           NULL) == NULL)
             goto error;
 
-        if (virCapabilitiesAddGuestFeature(guest, "pae", 1, 1) == NULL)
+        if (virCapabilitiesAddGuestFeature(guest, "pae", true, true) == NULL)
             goto error;
-        if (virCapabilitiesAddGuestFeature(guest, "nonpae", 1, 1) == NULL)
+        if (virCapabilitiesAddGuestFeature(guest, "nonpae", true, true) == NULL)
             goto error;
     }
 

diff --git a/src/uml/uml_conf.c b/src/uml/uml_conf.c
index 7a206d2d63c67121d86e1a40692f748f26503c57..e25bf8ccf10a8a3fc5684237bfb8613f4020ff47 100644 (file)
--- a/src/uml/uml_conf.c
+++ b/src/uml/uml_conf.c
@@ -58,7 +58,7 @@ virCapsPtr umlCapsInit(void)
     virCapsGuestPtr guest;
 
     if ((caps = virCapabilitiesNew(virArchFromHost(),
-                                   0, 0)) == NULL)
+                                   false, false)) == NULL)
         goto error;
 
     /* Some machines have problematic NUMA toplogy causing

diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c
index 382508368c40c40debf980d99340be48950f7932..fa5020f084604111e26246afaba1c5f42a5b9916 100644 (file)
--- a/src/vbox/vbox_tmpl.c
+++ b/src/vbox/vbox_tmpl.c
@@ -885,7 +885,7 @@ static virCapsPtr vboxCapsInit(void)
     virCapsGuestPtr guest;
 
     if ((caps = virCapabilitiesNew(virArchFromHost(),
-                                   0, 0)) == NULL)
+                                   false, false)) == NULL)
         goto no_memory;
 
     if (nodeCapsInitNUMA(caps) < 0)

diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c
index b77330313be88b23cea52b74d83b8ac166233cb3..81ac4ae36c3224aede1b862b2b09ed3235d7104e 100644 (file)
--- a/src/vmware/vmware_conf.c
+++ b/src/vmware/vmware_conf.c
@@ -65,7 +65,7 @@ vmwareCapsInit(void)
     virCPUDataPtr data = NULL;
 
     if ((caps = virCapabilitiesNew(virArchFromHost(),
-                                   0, 0)) == NULL)
+                                   false, false)) == NULL)
         goto error;
 
     if (nodeCapsInitNUMA(caps) < 0)

diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c
index 524b21f34a9a560f59996d6a0092c48b649365ef..b52c9375594edf299088a2585f3138d65931084c 100644 (file)
--- a/src/xen/xen_hypervisor.c
+++ b/src/xen/xen_hypervisor.c
@@ -2108,7 +2108,7 @@ xenHypervisorBuildCapabilities(virConnectPtr conn, virArch hostarch,
     int hv_major = hv_versions.hv >> 16;
     int hv_minor = hv_versions.hv & 0xFFFF;
 
-    if ((caps = virCapabilitiesNew(hostarch, 1, 1)) == NULL)
+    if ((caps = virCapabilitiesNew(hostarch, true, true)) == NULL)
         goto no_memory;
 
     if (hvm_type && STRNEQ(hvm_type, "") &&
@@ -2166,37 +2166,36 @@ xenHypervisorBuildCapabilities(virConnectPtr conn, virArch hostarch,
         if (guest_archs[i].pae &&
             virCapabilitiesAddGuestFeature(guest,
                                            "pae",
-                                           1,
-                                           0) == NULL)
+                                           true,
+                                           false) == NULL)
             goto no_memory;
 
         if (guest_archs[i].nonpae &&
             virCapabilitiesAddGuestFeature(guest,
                                            "nonpae",
-                                           1,
-                                           0) == NULL)
+                                           true,
+                                           false) == NULL)
             goto no_memory;
 
         if (guest_archs[i].ia64_be &&
             virCapabilitiesAddGuestFeature(guest,
                                            "ia64_be",
-                                           1,
-                                           0) == NULL)
+                                           true,
+                                           false) == NULL)
             goto no_memory;
 
         if (guest_archs[i].hvm) {
             if (virCapabilitiesAddGuestFeature(guest,
                                                "acpi",
-                                               1, 1) == NULL)
+                                               true, true) == NULL)
                 goto no_memory;
 
             /* In Xen 3.1.0, APIC is always on and can't be toggled */
             if (virCapabilitiesAddGuestFeature(guest,
                                                "apic",
-                                               1,
-                                               (hv_major > 3 &&
-                                                hv_minor > 0 ?
-                                                0 : 1)) == NULL)
+                                               true,
+                                               !(hv_major > 3 &&
+                                                 hv_minor > 0)) == NULL)
                 goto no_memory;
 
             /* Xen 3.3.x and beyond supports enabling/disabling
@@ -2205,8 +2204,8 @@ xenHypervisorBuildCapabilities(virConnectPtr conn, virArch hostarch,
             if ((hv_major == 3 && hv_minor >= 3) || (hv_major > 3))
                 if (virCapabilitiesAddGuestFeature(guest,
                                                    "hap",
-                                                   0,
-                                                   1) == NULL)
+                                                   false,
+                                                   true) == NULL)
                     goto no_memory;
 
             /* Xen 3.4.x and beyond supports the Viridian (Hyper-V)
@@ -2215,8 +2214,8 @@ xenHypervisorBuildCapabilities(virConnectPtr conn, virArch hostarch,
             if ((hv_major == 3 && hv_minor >= 4) || (hv_major > 3))
                 if (virCapabilitiesAddGuestFeature(guest,
                                                    "viridian",
-                                                   0,
-                                                   1) == NULL)
+                                                   false,
+                                                   true) == NULL)
                     goto no_memory;
         }
 

diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c
index 316e2740425634584439f1a4c7e830c351865090..d86fbb661dd6e73ac89d5bac2f95ab371d672dc3 100644 (file)
--- a/src/xenapi/xenapi_driver.c
+++ b/src/xenapi/xenapi_driver.c
@@ -85,7 +85,7 @@ getCapsObject(void)
 {
     virCapsGuestPtr guest1, guest2;
     virCapsGuestDomainPtr domain1, domain2;
-    virCapsPtr caps = virCapabilitiesNew(virArchFromHost(), 0, 0);
+    virCapsPtr caps = virCapabilitiesNew(virArchFromHost(), false, false);
 
     if (!caps)
         return NULL;

diff --git a/tests/qemucaps2xmltest.c b/tests/qemucaps2xmltest.c
index cef57354e2319b0636b926c16e6cd409d42ae49c..3529acb7dad64a8cf30aade50447025d1e7d9657 100644 (file)
--- a/tests/qemucaps2xmltest.c
+++ b/tests/qemucaps2xmltest.c
@@ -110,7 +110,7 @@ testGetCaps(char *capsData, const testQemuData *data)
         goto error;
     }
 
-    if ((caps = virCapabilitiesNew(data->guestarch, 0, 0)) == NULL) {
+    if ((caps = virCapabilitiesNew(data->guestarch, false, false)) == NULL) {
         fprintf(stderr, "failed to create the fake capabilities");
         goto error;
     }

diff --git a/tests/testutils.c b/tests/testutils.c
index dbe4773f145642d7d89d440e37151630e6633da8..5bdfcc5e04f4b54320780d09aea15ab4cc26fc05 100644 (file)
--- a/tests/testutils.c
+++ b/tests/testutils.c
@@ -912,7 +912,7 @@ virCapsPtr virTestGenericCapsInit(void)
     virCapsGuestPtr guest;
 
     if ((caps = virCapabilitiesNew(VIR_ARCH_X86_64,
-                                   0, 0)) == NULL)
+                                   false, false)) == NULL)
         return NULL;
 
     if ((guest = virCapabilitiesAddGuest(caps, "hvm", VIR_ARCH_I686,

diff --git a/tests/testutilslxc.c b/tests/testutilslxc.c
index 968d8d0b2f431717b6890bafc7a1079d6f062792..09dfd02b14603ee4b5e646093e6c57ec3df02fb2 100644 (file)
--- a/tests/testutilslxc.c
+++ b/tests/testutilslxc.c
@@ -14,7 +14,7 @@ virCapsPtr testLXCCapsInit(void)
     virCapsGuestPtr guest;
 
     if ((caps = virCapabilitiesNew(VIR_ARCH_X86_64,
-                                   0, 0)) == NULL)
+                                   false, false)) == NULL)
         return NULL;
 
     if ((guest = virCapabilitiesAddGuest(caps, "exe", VIR_ARCH_I686,

diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
index 85f03560a9305939c4bc213cbb4f25f504ee5fe4..52abb8c47a49f65f9bcbb8d1a67ae52ad1d41c5d 100644 (file)
--- a/tests/testutilsqemu.c
+++ b/tests/testutilsqemu.c
@@ -249,7 +249,7 @@ virCapsPtr testQemuCapsInit(void)
     };
 
     if ((caps = virCapabilitiesNew(host_cpu.arch,
-                                   0, 0)) == NULL)
+                                   false, false)) == NULL)
         return NULL;
 
     if ((caps->host.cpu = virCPUDefCopy(&host_cpu)) == NULL ||
@@ -259,7 +259,7 @@ virCapsPtr testQemuCapsInit(void)
     if ((guest = virCapabilitiesAddGuest(caps, "hvm", VIR_ARCH_I686,
                                          "/usr/bin/qemu", NULL,
                                          nmachines, machines)) == NULL ||
-        !virCapabilitiesAddGuestFeature(guest, "cpuselection", 1, 0))
+        !virCapabilitiesAddGuestFeature(guest, "cpuselection", true, false))
         goto cleanup;
     machines = NULL;
 
@@ -277,7 +277,7 @@ virCapsPtr testQemuCapsInit(void)
     if ((guest = virCapabilitiesAddGuest(caps, "hvm", VIR_ARCH_X86_64,
                                          "/usr/bin/qemu-system-x86_64", NULL,
                                          nmachines, machines)) == NULL ||
-        !virCapabilitiesAddGuestFeature(guest, "cpuselection", 1, 0))
+        !virCapabilitiesAddGuestFeature(guest, "cpuselection", true, false))
         goto cleanup;
     machines = NULL;
 

diff --git a/tests/testutilsxen.c b/tests/testutilsxen.c
index 3c8b60f08bb8aa43494cf44ebf115d34e247bd26..a50a8a2af754c0caf481f484b0214854e76b7a37 100644 (file)
--- a/tests/testutilsxen.c
+++ b/tests/testutilsxen.c
@@ -23,7 +23,7 @@ virCapsPtr testXenCapsInit(void)
 
     uname(&utsname);
     if ((caps = virCapabilitiesNew(VIR_ARCH_I686,
-                                   0, 0)) == NULL)
+                                   false, false)) == NULL)
         return NULL;
 
     nmachines = ARRAY_CARDINALITY(x86_machines);

diff --git a/tests/vircaps2xmltest.c b/tests/vircaps2xmltest.c
index d8b61aa972c35d3f0ebcd1860248a2873136eb7f..b5b4f4829d2f6efc7a6210c8c082fbe5269f52e5 100644 (file)
--- a/tests/vircaps2xmltest.c
+++ b/tests/vircaps2xmltest.c
@@ -41,7 +41,7 @@ buildVirCapabilities(int max_cells,
     int id;
     size_t i;
 
-    if ((caps = virCapabilitiesNew(VIR_ARCH_X86_64, 0, 0)) == NULL)
+    if ((caps = virCapabilitiesNew(VIR_ARCH_X86_64, false, false)) == NULL)
         goto error;
 
     id = 0;

diff --git a/tests/vircapstest.c b/tests/vircapstest.c
index 59e9c2bcd8c8b5344d9b3f2121afcf508548d953..deabc7a9914bbb3fb16959788c190126091a42f5 100644 (file)
--- a/tests/vircapstest.c
+++ b/tests/vircapstest.c
@@ -44,7 +44,7 @@ buildNUMATopology(int seq)
     int core_id, cell_id;
     int id;
 
-    if ((caps = virCapabilitiesNew(VIR_ARCH_X86_64, 0, 0)) == NULL)
+    if ((caps = virCapabilitiesNew(VIR_ARCH_X86_64, false, false)) == NULL)
         goto error;
 
     id = 0;

diff --git a/tests/vmx2xmltest.c b/tests/vmx2xmltest.c
index 1d2e012f94391d116844b3a92a7573ce04b9bd7e..5c103dd691728962a5f6ad46ef6f9be0d40db50d 100644 (file)
--- a/tests/vmx2xmltest.c
+++ b/tests/vmx2xmltest.c
@@ -25,7 +25,7 @@ testCapsInit(void)
 {
     virCapsGuestPtr guest = NULL;
 
-    caps = virCapabilitiesNew(VIR_ARCH_I686, 1, 1);
+    caps = virCapabilitiesNew(VIR_ARCH_I686, true, true);
 
     if (caps == NULL) {
         return;

diff --git a/tests/xml2vmxtest.c b/tests/xml2vmxtest.c
index 058b19faab69fa281f0c403f535e45f9842c55e9..58418dcca34c226a81c0387314553f86b68cc8b5 100644 (file)
--- a/tests/xml2vmxtest.c
+++ b/tests/xml2vmxtest.c
@@ -25,7 +25,7 @@ testCapsInit(void)
 {
     virCapsGuestPtr guest = NULL;
 
-    caps = virCapabilitiesNew(VIR_ARCH_I686, 1, 1);
+    caps = virCapabilitiesNew(VIR_ARCH_I686, true, true);
 
     if (caps == NULL) {
         return;