External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

qemu: Resolve Coverity DEADCODE

Browse Source 
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
This commit is contained in:
John Ferlan 2015-04-27 07:25:22 -04:00
parent 1f7e811249
commit d8082d2d44
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/qemu/qemu_driver.c
View File

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