]> xenbits.xensource.com Git - people/liuw/libxenctrl-split/libvirt.git/commitdiff
qemu: Resolve Coverity DEADCODE
authorJohn Ferlan <jferlan@redhat.com>
Mon, 27 Apr 2015 11:25:22 +0000 (07:25 -0400)
committerJohn Ferlan <jferlan@redhat.com>
Mon, 27 Apr 2015 18:55:35 +0000 (14:55 -0400)
Coverity notes that the switch() used to check 'connected' values has
two DEADCODE paths (_DEFAULT & _LAST).  Since 'connected' is a boolean
it can only be one or the other (CONNECTED or DISCONNECTED), so it just
seems pointless to use a switch to get "all" values.  Convert to if-else

src/qemu/qemu_driver.c

index 443341baa3a8649af6f4e5e6f7b87ef5908b1f24..74dcb0a53dd4f44fce65306d2f88bfed47a0e5a5 100644 (file)
@@ -4497,8 +4497,7 @@ processSerialChangedEvent(virQEMUDriverPtr driver,
         goto endjob;
 
     if (STREQ_NULLABLE(dev.data.chr->target.name, "org.qemu.guest_agent.0")) {
-        switch (newstate) {
-        case VIR_DOMAIN_CHR_DEVICE_STATE_CONNECTED:
+        if (newstate == VIR_DOMAIN_CHR_DEVICE_STATE_CONNECTED) {
             if (!priv->agent) {
                 if ((rc = qemuConnectAgent(driver, vm)) == -2)
                     goto endjob;
@@ -4506,20 +4505,13 @@ processSerialChangedEvent(virQEMUDriverPtr driver,
                 if (rc < 0)
                     priv->agentError = true;
             }
-            break;
-
-        case VIR_DOMAIN_CHR_DEVICE_STATE_DISCONNECTED:
+        } else {
             if (priv->agent) {
                 qemuAgentClose(priv->agent);
                 priv->agent = NULL;
                 priv->agentError = false;
             }
-            break;
-
-        case VIR_DOMAIN_CHR_DEVICE_STATE_DEFAULT:
-        case VIR_DOMAIN_CHR_DEVICE_STATE_LAST:
-            break;
-        };
+        }
 
         if ((event = virDomainEventAgentLifecycleNewFromObj(vm, newstate,
                                                             VIR_CONNECT_DOMAIN_EVENT_AGENT_LIFECYCLE_REASON_CHANNEL)))