qemu: use bool in monitor struct

Follows on the heels of other bool cleanups, such as commit 93002b98.

* src/qemu/qemu_monitor.h (qemuMonitorOpen, qemuMonitorOpenFD):
Update json parameter type.
* src/qemu/qemu_monitor.c (qemuMonitorOpen, qemuMonitorOpenFD):
Likewise.
(_qemuMonitor): Adjust field type.
* src/qemu/qemu_domain.h (_qemuDomainObjPrivate): Likewise.
* src/qemu/qemu_domain.c (qemuDomainObjPrivateXMLParse): Adjust
client.
* src/qemu/qemu_process.c (qemuProcessStart): Likewise.
* tests/qemumonitortestutils.c (qemuMonitorTestNew): Likewise.

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

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 97a8307fcee8833420497408b7bac58d77d9a909..d7c29754dcaa53b98d8188534b55a997d54ac37e 100644 (file)
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -364,11 +364,8 @@ qemuDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt, void *data)
         priv->monConfig->type = VIR_DOMAIN_CHR_TYPE_PTY;
     VIR_FREE(tmp);
 
-    if (virXPathBoolean("count(./monitor[@json = '1']) > 0", ctxt)) {
-        priv->monJSON = 1;
-    } else {
-        priv->monJSON = 0;
-    }
+    priv->monJSON = virXPathBoolean("count(./monitor[@json = '1']) > 0",
+                                    ctxt) > 0;
 
     switch (priv->monConfig->type) {
     case VIR_DOMAIN_CHR_TYPE_PTY:

diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
index 042e57d9a63f4c03f3a41f501556023596a614f2..f241296133a7d067bad904a0d5ac51a26c10177a 100644 (file)
--- a/src/qemu/qemu_domain.h
+++ b/src/qemu/qemu_domain.h
@@ -131,7 +131,7 @@ struct _qemuDomainObjPrivate {
 
     qemuMonitorPtr mon;
     virDomainChrSourceDefPtr monConfig;
-    int monJSON;
+    bool monJSON;
     bool monError;
     unsigned long long monStart;
 

diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
index 4deb2d60ac7869a2b5f7412b2183a81d61c839ea..0671bdc852b364fd6502db45b5e23a665ffb01bf 100644 (file)
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -77,8 +77,8 @@ struct _qemuMonitor {
 
     int nextSerial;
 
-    unsigned json: 1;
-    unsigned wait_greeting: 1;
+    bool json;
+    bool waitGreeting;
 };
 
 static virClassPtr qemuMonitorClass;
@@ -357,8 +357,8 @@ qemuMonitorIOProcess(qemuMonitorPtr mon)
     if (len < 0)
         return -1;
 
-    if (len && mon->wait_greeting)
-        mon->wait_greeting = 0;
+    if (len && mon->waitGreeting)
+        mon->waitGreeting = false;
 
     if (len < mon->bufferOffset) {
         memmove(mon->buffer, mon->buffer + len, mon->bufferOffset - len);
@@ -537,7 +537,7 @@ static void qemuMonitorUpdateWatch(qemuMonitorPtr mon)
         events |= VIR_EVENT_HANDLE_READABLE;
 
         if ((mon->msg && mon->msg->txOffset < mon->msg->txLength) &&
-            !mon->wait_greeting)
+            !mon->waitGreeting)
             events |= VIR_EVENT_HANDLE_WRITABLE;
     }
 
@@ -683,7 +683,7 @@ static qemuMonitorPtr
 qemuMonitorOpenInternal(virDomainObjPtr vm,
                         int fd,
                         bool hasSendFD,
-                        int json,
+                        bool json,
                         qemuMonitorCallbacksPtr cb)
 {
     qemuMonitorPtr mon;
@@ -716,7 +716,7 @@ qemuMonitorOpenInternal(virDomainObjPtr vm,
     mon->vm = vm;
     mon->json = json;
     if (json)
-        mon->wait_greeting = 1;
+        mon->waitGreeting = true;
     mon->cb = cb;
 
     if (virSetCloseExec(mon->fd) < 0) {
@@ -770,7 +770,7 @@ cleanup:
 qemuMonitorPtr
 qemuMonitorOpen(virDomainObjPtr vm,
                 virDomainChrSourceDefPtr config,
-                int json,
+                bool json,
                 qemuMonitorCallbacksPtr cb)
 {
     int fd;
@@ -805,7 +805,7 @@ qemuMonitorOpen(virDomainObjPtr vm,
 
 qemuMonitorPtr qemuMonitorOpenFD(virDomainObjPtr vm,
                                  int sockfd,
-                                 int json,
+                                 bool json,
                                  qemuMonitorCallbacksPtr cb)
 {
     return qemuMonitorOpenInternal(vm, sockfd, true, json, cb);

diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index f39f00904b94c7bb805437d2f0ec7ff3ca31edb8..527da0a8a2a1b4f3b9db9e9071ad086fc562aa53 100644 (file)
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -147,12 +147,12 @@ char *qemuMonitorUnescapeArg(const char *in);
 
 qemuMonitorPtr qemuMonitorOpen(virDomainObjPtr vm,
                                virDomainChrSourceDefPtr config,
-                               int json,
+                               bool json,
                                qemuMonitorCallbacksPtr cb)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(4);
 qemuMonitorPtr qemuMonitorOpenFD(virDomainObjPtr vm,
                                  int sockfd,
-                                 int json,
+                                 bool json,
                                  qemuMonitorCallbacksPtr cb)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(4);
 

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 54a79df13fb9ceed09a165548fb0ae2c3ab1aa70..6499f4af96a44f99348f89216d7029e8adcaeeb4 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -3578,11 +3578,7 @@ int qemuProcessStart(virConnectPtr conn,
     if (qemuProcessPrepareMonitorChr(cfg, priv->monConfig, vm->def->name) < 0)
         goto cleanup;
 
-    if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MONITOR_JSON))
-        priv->monJSON = 1;
-    else
-        priv->monJSON = 0;
-
+    priv->monJSON = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MONITOR_JSON);
     priv->monError = false;
     priv->monStart = 0;
     priv->gotShutdown = false;
@@ -3622,7 +3618,7 @@ int qemuProcessStart(virConnectPtr conn,
 
     VIR_DEBUG("Building emulator command line");
     if (!(cmd = qemuBuildCommandLine(conn, driver, vm->def, priv->monConfig,
-                                     priv->monJSON != 0, priv->qemuCaps,
+                                     priv->monJSON, priv->qemuCaps,
                                      migrateFrom, stdin_fd, snapshot, vmop)))
         goto cleanup;
 

diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c
index df09802b5c7b60ef276c50d520707e993a2d3846..87f35d63406677bcba1dff206c4c23c57f35aa8e 100644 (file)
--- a/tests/qemumonitortestutils.c
+++ b/tests/qemumonitortestutils.c
@@ -501,7 +501,7 @@ qemuMonitorTestPtr qemuMonitorTestNew(bool json, virDomainXMLOptionPtr xmlopt)
 
     if (!(test->mon = qemuMonitorOpen(test->vm,
                                       &src,
-                                      json ? 1 : 0,
+                                      json,
                                       &qemuCallbacks)))
         goto error;
     virObjectLock(test->mon);