cleanup: Change datatype of graphic's members to boolean

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 56011fefdbbb86c2ba86962f373084972c930427..6ee575f78ff7eedae0845b86bc599ecaf72d046f 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -7419,18 +7419,18 @@ virDomainGraphicsDefParseXML(xmlNodePtr node,
             if (def->data.vnc.port == -1) {
                 if (flags & VIR_DOMAIN_XML_INACTIVE)
                     def->data.vnc.port = 0;
-                def->data.vnc.autoport = 1;
+                def->data.vnc.autoport = true;
             }
         } else {
             def->data.vnc.port = 0;
-            def->data.vnc.autoport = 1;
+            def->data.vnc.autoport = true;
         }
 
         if ((autoport = virXMLPropString(node, "autoport")) != NULL) {
             if (STREQ(autoport, "yes")) {
                 if (flags & VIR_DOMAIN_XML_INACTIVE)
                     def->data.vnc.port = 0;
-                def->data.vnc.autoport = 1;
+                def->data.vnc.autoport = true;
             }
             VIR_FREE(autoport);
         }
@@ -7446,9 +7446,9 @@ virDomainGraphicsDefParseXML(xmlNodePtr node,
 
         if (fullscreen != NULL) {
             if (STREQ(fullscreen, "yes")) {
-                def->data.sdl.fullscreen = 1;
+                def->data.sdl.fullscreen = true;
             } else if (STREQ(fullscreen, "no")) {
-                def->data.sdl.fullscreen = 0;
+                def->data.sdl.fullscreen = false;
             } else {
                 virReportError(VIR_ERR_INTERNAL_ERROR,
                                _("unknown fullscreen value '%s'"), fullscreen);
@@ -7457,7 +7457,7 @@ virDomainGraphicsDefParseXML(xmlNodePtr node,
             }
             VIR_FREE(fullscreen);
         } else {
-            def->data.sdl.fullscreen = 0;
+            def->data.sdl.fullscreen = false;
         }
         def->data.sdl.xauth = virXMLPropString(node, "xauth");
         def->data.sdl.display = virXMLPropString(node, "display");
@@ -7476,17 +7476,17 @@ virDomainGraphicsDefParseXML(xmlNodePtr node,
             }
             /* Legacy compat syntax, used -1 for auto-port */
             if (def->data.rdp.port == -1)
-                def->data.rdp.autoport = 1;
+                def->data.rdp.autoport = true;
 
             VIR_FREE(port);
         } else {
             def->data.rdp.port = 0;
-            def->data.rdp.autoport = 1;
+            def->data.rdp.autoport = true;
         }
 
         if ((autoport = virXMLPropString(node, "autoport")) != NULL) {
             if (STREQ(autoport, "yes"))
-                def->data.rdp.autoport = 1;
+                def->data.rdp.autoport = true;
 
             VIR_FREE(autoport);
         }
@@ -7496,14 +7496,14 @@ virDomainGraphicsDefParseXML(xmlNodePtr node,
 
         if ((replaceUser = virXMLPropString(node, "replaceUser")) != NULL) {
             if (STREQ(replaceUser, "yes")) {
-                def->data.rdp.replaceUser = 1;
+                def->data.rdp.replaceUser = true;
             }
             VIR_FREE(replaceUser);
         }
 
         if ((multiUser = virXMLPropString(node, "multiUser")) != NULL) {
             if (STREQ(multiUser, "yes")) {
-                def->data.rdp.multiUser = 1;
+                def->data.rdp.multiUser = true;
             }
             VIR_FREE(multiUser);
         }
@@ -7513,9 +7513,9 @@ virDomainGraphicsDefParseXML(xmlNodePtr node,
 
         if (fullscreen != NULL) {
             if (STREQ(fullscreen, "yes")) {
-                def->data.desktop.fullscreen = 1;
+                def->data.desktop.fullscreen = true;
             } else if (STREQ(fullscreen, "no")) {
-                def->data.desktop.fullscreen = 0;
+                def->data.desktop.fullscreen = false;
             } else {
                 virReportError(VIR_ERR_INTERNAL_ERROR,
                                _("unknown fullscreen value '%s'"), fullscreen);
@@ -7524,7 +7524,7 @@ virDomainGraphicsDefParseXML(xmlNodePtr node,
             }
             VIR_FREE(fullscreen);
         } else {
-            def->data.desktop.fullscreen = 0;
+            def->data.desktop.fullscreen = false;
         }
 
         def->data.desktop.display = virXMLPropString(node, "display");
@@ -7563,7 +7563,7 @@ virDomainGraphicsDefParseXML(xmlNodePtr node,
 
         if ((autoport = virXMLPropString(node, "autoport")) != NULL) {
             if (STREQ(autoport, "yes"))
-                def->data.spice.autoport = 1;
+                def->data.spice.autoport = true;
             VIR_FREE(autoport);
         }
 
@@ -7583,7 +7583,7 @@ virDomainGraphicsDefParseXML(xmlNodePtr node,
 
         if (def->data.spice.port == -1 && def->data.spice.tlsPort == -1) {
             /* Legacy compat syntax, used -1 for auto-port */
-            def->data.spice.autoport = 1;
+            def->data.spice.autoport = true;
         }
 
         if (def->data.spice.autoport && (flags & VIR_DOMAIN_XML_INACTIVE)) {

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 092acabec70e2a3459788804f8db6f4ac5d5444c..47143d43d8955750387d84478c57acb6bd88593b 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -1375,7 +1375,7 @@ struct _virDomainGraphicsDef {
     union {
         struct {
             int port;
-            unsigned int autoport :1;
+            bool autoport;
             char *keymap;
             char *socket;
             virDomainGraphicsAuthDef auth;
@@ -1383,17 +1383,17 @@ struct _virDomainGraphicsDef {
         struct {
             char *display;
             char *xauth;
-            int fullscreen;
+            bool fullscreen;
         } sdl;
         struct {
             int port;
-            unsigned int autoport :1;
-            unsigned int replaceUser :1;
-            unsigned int multiUser :1;
+            bool autoport;
+            bool replaceUser;
+            bool multiUser;
         } rdp;
         struct {
             char *display;
-            unsigned int fullscreen :1;
+            bool fullscreen;
         } desktop;
         struct {
             int port;
@@ -1401,7 +1401,7 @@ struct _virDomainGraphicsDef {
             int mousemode;
             char *keymap;
             virDomainGraphicsAuthDef auth;
-            unsigned int autoport :1;
+            bool autoport;
             int channels[VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_LAST];
             int defaultMode; /* enum virDomainGraphicsSpiceChannelMode */
             int image;

diff --git a/src/parallels/parallels_driver.c b/src/parallels/parallels_driver.c
index 451e948527579f5ef7613bfab3f65eec146c9f84..5b8d85fb7c7ae2e5cbea35f5efbd8e26f9f8bbeb 100644 (file)
--- a/src/parallels/parallels_driver.c
+++ b/src/parallels/parallels_driver.c
@@ -615,13 +615,13 @@ parallelsAddVNCInfo(virDomainDefPtr def, virJSONValuePtr jobj_root)
     if (STREQ(tmp, "auto")) {
         if (virJSONValueObjectGetNumberUint(jobj, "port", &port) < 0)
             port = 0;
-        gr->data.vnc.autoport = 1;
+        gr->data.vnc.autoport = true;
     } else {
         if (virJSONValueObjectGetNumberUint(jobj, "port", &port) < 0) {
             parallelsParseError();
             goto cleanup;
         }
-        gr->data.vnc.autoport = 0;
+        gr->data.vnc.autoport = false;
     }
 
     gr->type = VIR_DOMAIN_GRAPHICS_TYPE_VNC;

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index f60b3766652a3bddde8fff99eb7f16d294b63975..63b9350c2b0502c44d61319262fe9692fec70971 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -9189,7 +9189,7 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr qemuCaps,
     virDomainDefPtr def;
     int i;
     int nographics = 0;
-    int fullscreen = 0;
+    bool fullscreen = false;
     char *path;
     int nnics = 0;
     const char **nics = NULL;
@@ -9354,7 +9354,7 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr qemuCaps,
                     goto no_memory;
                 }
                 vnc->data.vnc.port += 5900;
-                vnc->data.vnc.autoport = 0;
+                vnc->data.vnc.autoport = false;
             }
 
             if (VIR_REALLOC_N(def->graphics, def->ngraphics+1) < 0) {
@@ -9511,7 +9511,7 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr qemuCaps,
         } else if (STREQ(arg, "-nographic")) {
             nographics = 1;
         } else if (STREQ(arg, "-full-screen")) {
-            fullscreen = 1;
+            fullscreen = true;
         } else if (STREQ(arg, "-localtime")) {
             def->clock.offset = VIR_DOMAIN_CLOCK_OFFSET_LOCALTIME;
         } else if (STREQ(arg, "-kernel")) {

diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c
index ff8f9d1d65b0dfe5b16f512048443f8c5dc1b961..0c826755f621a64337674ebe47d4922766eeccf9 100644 (file)
--- a/src/vbox/vbox_tmpl.c
+++ b/src/vbox/vbox_tmpl.c
@@ -2566,7 +2566,7 @@ static char *vboxDomainGetXMLDesc(virDomainPtr dom, unsigned int flags) {
                                 VBOX_UTF16_FREE(VRDEPortsValue);
 #endif /* VBOX_API_VERSION >= 4000 */
                             } else {
-                                def->graphics[def->ngraphics]->data.rdp.autoport = 1;
+                                def->graphics[def->ngraphics]->data.rdp.autoport = true;
                             }
 
                             def->graphics[def->ngraphics]->type = VIR_DOMAIN_GRAPHICS_TYPE_RDP;
@@ -2590,12 +2590,12 @@ static char *vboxDomainGetXMLDesc(virDomainPtr dom, unsigned int flags) {
 
                             VRDxServer->vtbl->GetAllowMultiConnection(VRDxServer, &allowMultiConnection);
                             if (allowMultiConnection) {
-                                def->graphics[def->ngraphics]->data.rdp.multiUser = 1;
+                                def->graphics[def->ngraphics]->data.rdp.multiUser = true;
                             }
 
                             VRDxServer->vtbl->GetReuseSingleConnection(VRDxServer, &reuseSingleConnection);
                             if (reuseSingleConnection) {
-                                def->graphics[def->ngraphics]->data.rdp.replaceUser = 1;
+                                def->graphics[def->ngraphics]->data.rdp.replaceUser = true;
                             }
 
                             def->ngraphics++;

diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c
index 5dc5046187aeaf9227fd31998fa9f11db46dbed6..f520a85e72d6d056e63cfd8f6a9454a2a81ab98a 100644 (file)
--- a/src/vmx/vmx.c
+++ b/src/vmx/vmx.c
@@ -1870,14 +1870,14 @@ virVMXParseVNC(virConfPtr conf, virDomainGraphicsDefPtr *def)
                   "is missing, the VNC port is unknown");
 
         (*def)->data.vnc.port = 0;
-        (*def)->data.vnc.autoport = 1;
+        (*def)->data.vnc.autoport = true;
     } else {
         if (port < 5900 || port > 5964) {
             VIR_WARN("VNC port %lld it out of [5900..5964] range", port);
         }
 
         (*def)->data.vnc.port = port;
-        (*def)->data.vnc.autoport = 0;
+        (*def)->data.vnc.autoport = false;
     }
 
     return 0;

diff --git a/src/xenxs/xen_sxpr.c b/src/xenxs/xen_sxpr.c
index a179612cd5af37ce59467f8e4902396dd35e8f1d..f2c345be92cafc15d326d1ee0a8a963838088dc3 100644 (file)
--- a/src/xenxs/xen_sxpr.c
+++ b/src/xenxs/xen_sxpr.c
@@ -825,7 +825,7 @@ xenParseSxprGraphicsOld(virDomainDefPtr def,
             port = 5900 + def->id;
 
         if ((unused && STREQ(unused, "1")) || port == -1)
-            graphics->data.vnc.autoport = 1;
+            graphics->data.vnc.autoport = true;
         graphics->data.vnc.port = port;
 
         if (listenAddr &&
@@ -949,7 +949,7 @@ xenParseSxprGraphicsNew(virDomainDefPtr def,
                 }
 
                 if ((unused && STREQ(unused, "1")) || port == -1)
-                    graphics->data.vnc.autoport = 1;
+                    graphics->data.vnc.autoport = true;
 
                 if (port >= 0 && port < 5900)
                     port += 5900;

diff --git a/src/xenxs/xen_xm.c b/src/xenxs/xen_xm.c
index b2e7645030bbe3f18243eeb86eae8468a91cd42d..0e9f8d29b483c5e66beb0c217525d6283b926dc8 100644 (file)
--- a/src/xenxs/xen_xm.c
+++ b/src/xenxs/xen_xm.c
@@ -1012,7 +1012,7 @@ xenParseXM(virConfPtr conf, int xendConfigVersion,
                 if (graphics->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) {
                     if (STRPREFIX(key, "vncunused=")) {
                         if (STREQ(key + 10, "1"))
-                            graphics->data.vnc.autoport = 1;
+                            graphics->data.vnc.autoport = true;
                     } else if (STRPREFIX(key, "vnclisten=")) {
                         if (virDomainGraphicsListenSetAddress(graphics, 0, key+10,
                                                               -1, true) < 0)