On 02/15/2018 11:43 AM, Daniel P. Berrangé wrote: There's a few places where in the code where model is compared against -1 that could perhaps use the VIR_DOMAIN_CONTROLLER_MODEL_*_DEFAULT (I used 'model.*=.*-1' in the Find this egrep pattern in cscope). At least one of them (below) caused a Coverity complaint. So should any of those be altered or should we just live with the fact that using/knowing -1 is the 'default' model? [...] Coverity points out that because at the top of this function, we have: if (model == -1) model = VIR_DOMAIN_CONTROLLER_MODEL_USB_PIIX3_UHCI; this particular condition cannot be met - IOW: DEADCODE Since the code isn't changing cont->model - we could just remove the @model local and move the DEFAULT into the return 2 leaving some sort of comment (perhaps) that DEFAULT == PIIX3_UHCI? [...] [...] PCI-Express [...] I think it was Laine that asked at one time about re-ordering things - /me taking a brief look caused my head to spin ;-) and I think this is a fine alternative (at least for now) until someone gets the gumption to attempt to fix it. [...] For what's here w/ the issue Coverity noted handled... Adding setting the model to *_DEFAULT is an add on if it's done... Reviewed-by: John Ferlan <jferlan(a)redhat.com&gt; John

On Thu, Feb 15, 2018 at 04:43:06PM +0000, Daniel P. Berrangé wrote: s/fallthough/fallthrough/ Unlike '-usb' for USB controllers, there is no -pci for pci controllers - we need to know the model at the time of building the command line. Not having one set here is either an error in the user input or the part of our code that should have filled the model in. If we want to be robust, this should be grouped with the next case. [...] qemuDomainControllerDefPostParse should have filled this one in for most QEMU machine/capabilities combinations. If it's still at default at this point, we're going to use "-usb", which should be a PCI device. Slightly different: a default SCSI controller cannot be formatted unless we turn it into a model. qemuDomainSetSCSIControllerModel in qemuDomainControllerDefPostParse errors out if we have no QEMU capabilities, (which probably should be relaxed as it might break loading of existing domains if the QEMU binary is not present). But the test suite passes even with return 0, so the comment is misleading. Jan

Ensure all enum cases are listed in switch statements. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- src/util/virconf.c | 13 ++++++++++++- src/util/virfirewall.c | 7 +++++-- src/util/virlog.c | 10 +++++++++- src/util/virnetdevvportprofile.c | 11 ++++++++++- 4 files changed, 36 insertions(+), 5 deletions(-) diff --git a/src/util/virconf.c b/src/util/virconf.c index a82a509ca3..af806dd735 100644 --- a/src/util/virconf.c +++ b/src/util/virconf.c @@ -296,7 +296,10 @@ virConfSaveValue(virBufferPtr buf, virConfValuePtr val) virBufferAddLit(buf, " ]"); break; } + case VIR_CONF_LAST: default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected conf value type %d"), val->type); return -1; } return 0; @@ -986,13 +989,21 @@ int virConfGetValueStringList(virConfPtr conf, } ATTRIBUTE_FALLTHROUGH; - default: + case VIR_CONF_LLONG: + case VIR_CONF_ULLONG: + case VIR_CONF_NONE: virReportError(VIR_ERR_INTERNAL_ERROR, compatString ? _("%s: expected a string or string list for '%s' parameter") : _("%s: expected a string list for '%s' parameter"), conf->filename, setting); return -1; + + case VIR_CONF_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected value type %d"), cval->type); + return -1; } return 1; diff --git a/src/util/virfirewall.c b/src/util/virfirewall.c index ff1bb83073..e7da482640 100644 --- a/src/util/virfirewall.c +++ b/src/util/virfirewall.c @@ -827,9 +827,12 @@ virFirewallApplyRule(virFirewallPtr firewall, if (virFirewallApplyRuleFirewallD(rule, ignoreErrors, &output) < 0) return -1; break; + + case VIR_FIREWALL_BACKEND_AUTOMATIC: + case VIR_FIREWALL_BACKEND_LAST: default: - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Unexpected firewall engine backend")); + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected firewall engine backend %d"), currentBackend); return -1; } diff --git a/src/util/virlog.c b/src/util/virlog.c index 4f66cc5e5c..ecbee71cfb 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -1206,10 +1206,18 @@ virLogGetOutputs(void) virLogDestinationTypeToString(dest), virLogOutputs[i]->name); break; - default: + case VIR_LOG_TO_STDERR: + case VIR_LOG_TO_JOURNALD: virBufferAsprintf(&outputbuf, "%d:%s", virLogOutputs[i]->priority, virLogDestinationTypeToString(dest)); + break; + case VIR_LOG_TO_OUTPUT_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected log output type %d"), dest); + virLogUnlock(); + return NULL; } } virLogUnlock(); diff --git a/src/util/virnetdevvportprofile.c b/src/util/virnetdevvportprofile.c index db495a7549..4c0a64e439 100644 --- a/src/util/virnetdevvportprofile.c +++ b/src/util/virnetdevvportprofile.c @@ -1071,6 +1071,9 @@ virNetDevVPortProfileOp8021Qbg(const char *ifname, case VIR_NETDEV_VPORT_PROFILE_LINK_OP_PREASSOCIATE: op = PORT_REQUEST_PREASSOCIATE; break; + case VIR_NETDEV_VPORT_PROFILE_LINK_OP_PREASSOCIATE_RR: + op = PORT_REQUEST_PREASSOCIATE_RR; + break; case VIR_NETDEV_VPORT_PROFILE_LINK_OP_ASSOCIATE: op = PORT_REQUEST_ASSOCIATE; break; @@ -1191,10 +1194,16 @@ virNetDevVPortProfileOp8021Qbh(const char *ifname, false); break; - default: + case VIR_NETDEV_VPORT_PROFILE_LINK_OP_PREASSOCIATE: virReportError(VIR_ERR_INTERNAL_ERROR, _("operation type %d not supported"), virtPortOp); rc = -1; + break; + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected operation type %d"), virtPortOp); + rc = -1; + break; } cleanup: -- 2.14.3

On Thu, Feb 15, 2018 at 04:43:07PM +0000, Daniel P. Berrangé wrote: All these errors are presumably dead code that we only keep around in case we broke something in other parts of the code. Do we need specific user-friendly translated errors? Since we log the function name as well, something like: "unhandled enum value %d" would do. Jan

On 02/15/2018 11:43 AM, Daniel P. Berrangé wrote: [...] Something Coverity noted long ago, but I've just held onto the patch... At this point (e.g. when ret != 0 in cleanup:), @veth can only defined if DIRECT, BRIDGE, NETWORK, or ETHERNET, so it's not happy with the switch and cases. The way I worked around this in Coverity was: if (actualType == VIR_DOMAIN_NET_TYPE_DIRECT) ignore_value(virNetDevMacVLanDelete(veth)); else /* BRIDGE, NETWORK, ETHERNET */ ignore_value(virNetDevVethDelete(veth)); I don't think that's perfect either, but it sufficed. IDC if you keep the code as is, but figured I'd note it. Since they'd all be included here - if you adjust the comment to indicate "It'd be nice to support DIRECT" instead of just "this" (or somehow indicate that DIRECT is possible, but the others really aren't). [...] I'll leave it up to you for deciding on the comment above... Reviewed-by: John Ferlan <jferlan(a)redhat.com&gt; John

On 02/15/2018 11:43 AM, Daniel P. Berrangé wrote: [...] Could add a VIR_DEBUG() in this just to "track" the reason it was EINVAL since there's so many ways it could be EINVAL, not that important... Reviewed-by: John Ferlan <jferlan(a)redhat.com&gt; John

On 02/15/2018 11:43 AM, Daniel P. Berrangé wrote: [...] Can this be "undefined" instead of "no"? Looking at the caller you could get output such as "operation failed: no job: %s" where %s could be "is not active", "unexpectedly failed", "canceled by client", or "failed due to I/O error" Could also jus lump it in with LAST and default. Reviewed-by: John Ferlan <jferlan(a)redhat.com&gt; John

On Thu, Feb 15, 2018 at 04:43:20PM +0000, Daniel P. Berrangé wrote: FYI, I'm going to push just this patch as a build-fixer, since in retrospect is it not really related to the rest of the changes in this huge series. Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|

On 02/15/2018 11:43 AM, Daniel P. Berrangé wrote: [...] Above here at the top of the function there is a : if ((driver < VIR_HOOK_DRIVER_DAEMON) || (driver >= VIR_HOOK_DRIVER_LAST)) return 1; thus the "default:" case added achieves DEAD_ERROR from Coverity. Removing default: "works" because @driver is an int. BTW: @drvstr would be NULL here, right? If the initial condition is removed, then that makes Coverity happy. [...] Here we are in a for loop from 0 to NODE_MEMORY_PARAMETERS_NUM (or 8), so Coverity complains that default is DEAD... This one's a little trickier because removing default: leaves open the possibility of the constant changing and someone not adding the next number in the sequence. The "easier" path is remove default:, the other option to avoid Coverity notification is adding a "/* coverity[dead_error_begin] */" right above default:. [...] Similar to virhostmem, we're in a for loop where ifindex starts at VIR_MCAST_TYPE_INDEX_TOKEN and must be less than VIR_MCAST_TYPE_LAST, so we get a DEAD_ERROR for both of these. Removing the (virMCastType) and leaving as an int removes the error, but leaves open the possibility of a new type being missed. Modifying the code to be: /* coverity[dead_error_condition] */ case VIR_MCAST_TYPE_LAST: /* coverity[dead_error_begin] */ default: Fixes things, but IMO is butt-ugly. So maybe we just leave this one as is and I keep a local filter for it. [...] I think the first one could be easily adjusted - the last two - IDC, keep them as is and I'll filter them or adjust them later in my Coverity branch. Reviewed-by: John Ferlan <jferlan(a)redhat.com&gt; John

On 02/15/2018 11:43 AM, Daniel P. Berrangé wrote: Ugh... A few more DEAD_ERROR* from switch stuff - I'm just going to disable it in my coverity check scripts. It'll be easier that way. Maybe some day in the far future gcc8 will be used in/for Coverity and they'll fix the problem ;-) Given the comments about a common enum error, I'll provide some feedback here without trying to cloud my mind with that... LAST changes from a return true because of break ... ... to a return false (and of course the default: case is added) ... Later on in virDomainChrSourceDefIsEqual the _LAST continues to return true when the default case is added and returns false. [...] For consistency, shouldn't LAST and default elicit the same Unexpected message? Could just return 0 instead of break (like done above in virDomainPCIControllerModelToConnectType) [...] [...] ... and here's an example where _LAST still returned true, but default returns false Shouldn't this follow the model of virDomainDeviceInfoAddressIsEqual where _LAST was changed from returning TRUE (because of break) to returning false? IDC which way we head with this, as long as it's consistent. Someday someone will "copy" one example or the other and someone else will note well it's done differently elsewhere leading to the conundrum of which approach is better. [...] The return NULL could be moved inside the switch, right? [...] With default: in place, the following is perhaps more "readable" if it's moved up into the one place where we break in the action switch and could fall through. I don't think anything else can fall thru [...] The switch w/ VIR_DOMAIN_FEATURE_LAST is missing the default: label [...] [...] Comment can probably be removed... [...] [...] Not reachable now, right? [...] > diff --git a/src/conf/storage_event.c b/src/conf/storage_event.c > index f9b796878a..2f37adb875 100644 > --- a/src/conf/storage_event.c > +++ b/src/conf/storage_event.c > @@ -147,6 +147,7 @@ virStoragePoolEventDispatchDefaultFunc(virConnectPtr conn, > } > > case VIR_STORAGE_POOL_EVENT_ID_LAST: > + default: > VIR_WARN("Unexpected event ID %d", event->eventID); Probably could move the VIR_WARN inside the switch now. [...] John

Even if the compiler has validated that all enum constants have case statements in a switch, it is not safe to omit a default: case statement. When assigning a value to a variable / struct field that is defined with an enum type, nothing prevents an invalid value being assigned. So defensive code must assume existance of invalid values and thus all switches should have a default: case. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- po/POTFILES.in | 1 + src/secret/secret_util.c | 11 ++++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index 2859554690..e06aa730f8 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -166,6 +166,7 @@ src/rpc/virnetsocket.c src/rpc/virnetsshsession.c src/rpc/virnettlscontext.c src/secret/secret_driver.c +src/secret/secret_util.c src/security/security_apparmor.c src/security/security_dac.c src/security/security_driver.c diff --git a/src/secret/secret_util.c b/src/secret/secret_util.c index 16e43ab2cc..64d3e7b8bd 100644 --- a/src/secret/secret_util.c +++ b/src/secret/secret_util.c @@ -57,7 +57,7 @@ virSecretGetSecretString(virConnectPtr conn, virSecretPtr sec = NULL; int ret = -1; - switch (seclookupdef->type) { + switch ((virSecretLookupType)seclookupdef->type) { case VIR_SECRET_LOOKUP_TYPE_UUID: sec = conn->secretDriver->secretLookupByUUID(conn, seclookupdef->u.uuid); break; @@ -66,6 +66,15 @@ virSecretGetSecretString(virConnectPtr conn, sec = conn->secretDriver->secretLookupByUsage(conn, secretUsageType, seclookupdef->u.usage); break; + + case VIR_SECRET_LOOKUP_TYPE_NONE: + break; + + case VIR_SECRET_LOOKUP_TYPE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected secret lookup type %d"), seclookupdef->type); + goto cleanup; } if (!sec) -- 2.14.3

Even if the compiler has validated that all enum constants have case statements in a switch, it is not safe to omit a default: case statement. When assigning a value to a variable / struct field that is defined with an enum type, nothing prevents an invalid value being assigned. So defensive code must assume existance of invalid values and thus all switches should have a default: case. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- src/locking/lock_driver_sanlock.c | 6 +++++- src/locking/lock_manager.c | 2 ++ src/locking/sanlock_helper.c | 5 ++++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index 345cf0a772..4a9971ac9f 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -859,11 +859,15 @@ virLockManagerSanlockRegisterKillscript(int sock, case VIR_DOMAIN_LOCK_FAILURE_RESTART: case VIR_DOMAIN_LOCK_FAILURE_IGNORE: - case VIR_DOMAIN_LOCK_FAILURE_LAST: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Failure action %s is not supported by sanlock"), virDomainLockFailureTypeToString(action)); goto cleanup; + case VIR_DOMAIN_LOCK_FAILURE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected lock failure action %d"), action); + goto cleanup; } virBufferEscape(&buf, '\\', "\\ ", "%s", vmuri); diff --git a/src/locking/lock_manager.c b/src/locking/lock_manager.c index 4ef9f9e692..03e28f1159 100644 --- a/src/locking/lock_manager.c +++ b/src/locking/lock_manager.c @@ -97,6 +97,8 @@ static void virLockManagerLogParams(size_t nparams, virUUIDFormat(params[i].value.uuid, uuidstr); VIR_DEBUG(" key=%s type=uuid value=%s", params[i].key, uuidstr); break; + default: + break; } } } diff --git a/src/locking/sanlock_helper.c b/src/locking/sanlock_helper.c index 57e1cfb031..6a2f59e866 100644 --- a/src/locking/sanlock_helper.c +++ b/src/locking/sanlock_helper.c @@ -94,10 +94,13 @@ main(int argc, char **argv) case VIR_DOMAIN_LOCK_FAILURE_DEFAULT: case VIR_DOMAIN_LOCK_FAILURE_RESTART: case VIR_DOMAIN_LOCK_FAILURE_IGNORE: - case VIR_DOMAIN_LOCK_FAILURE_LAST: fprintf(stderr, _("unsupported failure action: '%s'\n"), virDomainLockFailureTypeToString(action)); break; + case VIR_DOMAIN_LOCK_FAILURE_LAST: + default: + fprintf(stderr, _("Unexpected failure action: %d\n"), action); + break; } cleanup: -- 2.14.3

Even if the compiler has validated that all enum constants have case statements in a switch, it is not safe to omit a default: case statement. When assigning a value to a variable / struct field that is defined with an enum type, nothing prevents an invalid value being assigned. So defensive code must assume existance of invalid values and thus all switches should have a default: case. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- src/remote/remote_driver.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 9ea726dc45..bc4842fca6 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -1131,6 +1131,11 @@ doRemoteOpen(virConnectPtr conn, goto failed; #endif /* WIN32 */ + + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected remote transport type %d"), transport); + goto failed; } /* switch (transport) */ @@ -3742,7 +3747,7 @@ remoteAuthenticate(virConnectPtr conn, struct private_data *priv, #if WITH_SASL static int remoteAuthCredVir2SASL(int vircred) { - switch (vircred) { + switch ((virConnectCredentialType)vircred) { case VIR_CRED_USERNAME: return SASL_CB_USER; @@ -3766,9 +3771,12 @@ static int remoteAuthCredVir2SASL(int vircred) case VIR_CRED_REALM: return SASL_CB_GETREALM; - } - return 0; + case VIR_CRED_EXTERNAL: + case VIR_CRED_LAST: + default: + return 0; + } } static int remoteAuthCredSASL2Vir(int vircred) @@ -3797,9 +3805,10 @@ static int remoteAuthCredSASL2Vir(int vircred) case SASL_CB_GETREALM: return VIR_CRED_REALM; - } - return 0; + default: + return 0; + } } /* -- 2.14.3

Even if the compiler has validated that all enum constants have case statements in a switch, it is not safe to omit a default: case statement. When assigning a value to a variable / struct field that is defined with an enum type, nothing prevents an invalid value being assigned. So defensive code must assume existance of invalid values and thus all switches should have a default: case. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- src/security/security_apparmor.c | 12 +++++-- src/security/security_dac.c | 59 ++++++++++++++++++++++++++++------ src/security/security_selinux.c | 69 ++++++++++++++++++++++++++++++++-------- 3 files changed, 115 insertions(+), 25 deletions(-) diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c index a9899923ac..7943743494 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -919,7 +919,10 @@ AppArmorSetSecurityHostdevLabel(virSecurityManagerPtr mgr, } case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST: - ret = 0; + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected hostdev subsystem type %d"), + dev->source.subsys.type); break; } @@ -990,9 +993,14 @@ AppArmorSetChardevLabel(virSecurityManagerPtr mgr, case VIR_DOMAIN_CHR_TYPE_TCP: case VIR_DOMAIN_CHR_TYPE_SPICEVMC: case VIR_DOMAIN_CHR_TYPE_NMDM: - case VIR_DOMAIN_CHR_TYPE_LAST: ret = 0; break; + case VIR_DOMAIN_CHR_TYPE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected chardev type %d"), + dev_source->type); + break; } done: diff --git a/src/security/security_dac.c b/src/security/security_dac.c index 74446d6644..7142b802f9 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -1009,7 +1009,10 @@ virSecurityDACSetHostdevLabel(virSecurityManagerPtr mgr, } case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST: - ret = 0; + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected hostdev subsys type %d"), + dev->source.subsys.type); break; } @@ -1177,7 +1180,10 @@ virSecurityDACRestoreHostdevLabel(virSecurityManagerPtr mgr, } case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST: - ret = 0; + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected hostdev subsys type %d"), + dev->source.subsys.type); break; } @@ -1265,9 +1271,13 @@ virSecurityDACSetChardevLabel(virSecurityManagerPtr mgr, case VIR_DOMAIN_CHR_TYPE_TCP: case VIR_DOMAIN_CHR_TYPE_SPICEVMC: case VIR_DOMAIN_CHR_TYPE_NMDM: - case VIR_DOMAIN_CHR_TYPE_LAST: ret = 0; break; + case VIR_DOMAIN_CHR_TYPE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected chardev type %d"), dev_source->type); + break; } done: @@ -1328,9 +1338,13 @@ virSecurityDACRestoreChardevLabel(virSecurityManagerPtr mgr, case VIR_DOMAIN_CHR_TYPE_SPICEVMC: case VIR_DOMAIN_CHR_TYPE_SPICEPORT: case VIR_DOMAIN_CHR_TYPE_NMDM: - case VIR_DOMAIN_CHR_TYPE_LAST: ret = 0; break; + case VIR_DOMAIN_CHR_TYPE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected chardev type %d"), dev_source->type); + break; } done: @@ -1372,6 +1386,10 @@ virSecurityDACSetTPMFileLabel(virSecurityManagerPtr mgr, false); break; case VIR_DOMAIN_TPM_TYPE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected TPM type %d"), tpm->type); + ret = -1; break; } @@ -1393,6 +1411,10 @@ virSecurityDACRestoreTPMFileLabel(virSecurityManagerPtr mgr, false); break; case VIR_DOMAIN_TPM_TYPE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected TPM type %d"), tpm->type); + ret = -1; break; } @@ -1475,9 +1497,13 @@ virSecurityDACSetInputLabel(virSecurityManagerPtr mgr, case VIR_DOMAIN_INPUT_TYPE_MOUSE: case VIR_DOMAIN_INPUT_TYPE_TABLET: case VIR_DOMAIN_INPUT_TYPE_KBD: - case VIR_DOMAIN_INPUT_TYPE_LAST: ret = 0; break; + case VIR_DOMAIN_INPUT_TYPE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected input type %d"), input->type); + break; } return ret; @@ -1499,9 +1525,13 @@ virSecurityDACRestoreInputLabel(virSecurityManagerPtr mgr, case VIR_DOMAIN_INPUT_TYPE_MOUSE: case VIR_DOMAIN_INPUT_TYPE_TABLET: case VIR_DOMAIN_INPUT_TYPE_KBD: - case VIR_DOMAIN_INPUT_TYPE_LAST: ret = 0; break; + case VIR_DOMAIN_INPUT_TYPE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected input type %d"), input->type); + break; } return ret; @@ -1522,10 +1552,14 @@ virSecurityDACRestoreMemoryLabel(virSecurityManagerPtr mgr, break; case VIR_DOMAIN_MEMORY_MODEL_DIMM: - case VIR_DOMAIN_MEMORY_MODEL_LAST: case VIR_DOMAIN_MEMORY_MODEL_NONE: ret = 0; break; + case VIR_DOMAIN_MEMORY_MODEL_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected memory model %d"), mem->model); + break; } return ret; @@ -1647,10 +1681,14 @@ virSecurityDACSetMemoryLabel(virSecurityManagerPtr mgr, break; case VIR_DOMAIN_MEMORY_MODEL_DIMM: - case VIR_DOMAIN_MEMORY_MODEL_LAST: case VIR_DOMAIN_MEMORY_MODEL_NONE: ret = 0; break; + case VIR_DOMAIN_MEMORY_MODEL_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected memory model %d"), mem->model); + break; } return ret; @@ -1903,9 +1941,10 @@ virSecurityDACGenLabel(virSecurityManagerPtr mgr, return 0; case VIR_DOMAIN_SECLABEL_DEFAULT: case VIR_DOMAIN_SECLABEL_LAST: + default: virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected security label type '%s'"), - virDomainSeclabelTypeToString(seclabel->type)); + _("unexpected security label type %d"), + seclabel->type); return rc; } diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index c26cdacd9f..a33d07b6ab 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -763,7 +763,7 @@ virSecuritySELinuxGenLabel(virSecurityManagerPtr mgr, VIR_DEBUG("type=%d", seclabel->type); - switch (seclabel->type) { + switch ((virDomainSeclabelType)seclabel->type) { case VIR_DOMAIN_SECLABEL_STATIC: if (!(ctx = context_new(seclabel->label))) { virReportSystemError(errno, @@ -832,10 +832,12 @@ virSecuritySELinuxGenLabel(virSecurityManagerPtr mgr, break; + case VIR_DOMAIN_SECLABEL_DEFAULT: + case VIR_DOMAIN_SECLABEL_LAST: default: virReportError(VIR_ERR_INTERNAL_ERROR, - _("unexpected security label type '%s'"), - virDomainSeclabelTypeToString(seclabel->type)); + _("unexpected security label type '%d'"), + seclabel->type); goto cleanup; } @@ -1346,8 +1348,12 @@ virSecuritySELinuxSetInputLabel(virSecurityManagerPtr mgr, case VIR_DOMAIN_INPUT_TYPE_MOUSE: case VIR_DOMAIN_INPUT_TYPE_TABLET: case VIR_DOMAIN_INPUT_TYPE_KBD: - case VIR_DOMAIN_INPUT_TYPE_LAST: break; + case VIR_DOMAIN_INPUT_TYPE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected input type %d"), input->type); + return -1; } return 0; @@ -1374,8 +1380,12 @@ virSecuritySELinuxRestoreInputLabel(virSecurityManagerPtr mgr, case VIR_DOMAIN_INPUT_TYPE_MOUSE: case VIR_DOMAIN_INPUT_TYPE_TABLET: case VIR_DOMAIN_INPUT_TYPE_KBD: - case VIR_DOMAIN_INPUT_TYPE_LAST: break; + case VIR_DOMAIN_INPUT_TYPE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected input type %d"), input->type); + return -1; } return rc; @@ -1402,8 +1412,12 @@ virSecuritySELinuxSetMemoryLabel(virSecurityManagerPtr mgr, case VIR_DOMAIN_MEMORY_MODEL_NONE: case VIR_DOMAIN_MEMORY_MODEL_DIMM: - case VIR_DOMAIN_MEMORY_MODEL_LAST: break; + case VIR_DOMAIN_MEMORY_MODEL_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected memory model %d"), mem->model); + return -1; } return 0; @@ -1429,9 +1443,13 @@ virSecuritySELinuxRestoreMemoryLabel(virSecurityManagerPtr mgr, case VIR_DOMAIN_MEMORY_MODEL_DIMM: case VIR_DOMAIN_MEMORY_MODEL_NONE: - case VIR_DOMAIN_MEMORY_MODEL_LAST: ret = 0; break; + case VIR_DOMAIN_MEMORY_MODEL_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected memory model %d"), mem->model); + return -1; } return ret; @@ -1473,6 +1491,9 @@ virSecuritySELinuxSetTPMFileLabel(virSecurityManagerPtr mgr, } break; case VIR_DOMAIN_TPM_TYPE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected TPM type %d"), tpm->type); break; } @@ -1506,6 +1527,9 @@ virSecuritySELinuxRestoreTPMFileLabelInt(virSecurityManagerPtr mgr, } break; case VIR_DOMAIN_TPM_TYPE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected TPM type %d"), tpm->type); break; } @@ -1860,7 +1884,10 @@ virSecuritySELinuxSetHostdevSubsysLabel(virSecurityManagerPtr mgr, } case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST: - ret = 0; + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected hostdev subsystem type %d"), + dev->source.subsys.type); break; } @@ -1883,7 +1910,7 @@ virSecuritySELinuxSetHostdevCapsLabel(virSecurityManagerPtr mgr, if (secdef == NULL) return 0; - switch (dev->source.caps.type) { + switch ((virDomainHostdevCapsType)dev->source.caps.type) { case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_STORAGE: { if (vroot) { if (virAsprintf(&path, "%s/%s", vroot, @@ -1912,9 +1939,15 @@ virSecuritySELinuxSetHostdevCapsLabel(virSecurityManagerPtr mgr, break; } - default: + case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_NET: ret = 0; break; + case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected hostdev caps type %d"), + dev->source.caps.type); + break; } return ret; @@ -2101,7 +2134,10 @@ virSecuritySELinuxRestoreHostdevSubsysLabel(virSecurityManagerPtr mgr, } case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST: - ret = 0; + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected hostdev subsystem type %d"), + dev->source.subsys.type); break; } @@ -2118,7 +2154,7 @@ virSecuritySELinuxRestoreHostdevCapsLabel(virSecurityManagerPtr mgr, int ret = -1; char *path; - switch (dev->source.caps.type) { + switch ((virDomainHostdevCapsType)dev->source.caps.type) { case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_STORAGE: { if (vroot) { if (virAsprintf(&path, "%s/%s", vroot, @@ -2147,9 +2183,16 @@ virSecuritySELinuxRestoreHostdevCapsLabel(virSecurityManagerPtr mgr, break; } - default: + case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_NET: ret = 0; break; + + case VIR_DOMAIN_HOSTDEV_CAPS_TYPE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected hostdev subsystem type %d"), + dev->source.subsys.type); + break; } return ret; -- 2.14.3

Even if the compiler has validated that all enum constants have case statements in a switch, it is not safe to omit a default: case statement. When assigning a value to a variable / struct field that is defined with an enum type, nothing prevents an invalid value being assigned. So defensive code must assume existance of invalid values and thus all switches should have a default: case. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- src/vbox/vbox_common.c | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 07f4308784..b7b8ddb2be 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -331,7 +331,7 @@ vboxGenerateMediumName(PRUint32 storageBus, break; case StorageBus_Null: - + default: return NULL; } @@ -380,11 +380,16 @@ vboxSetStorageController(virDomainControllerDefPtr controller, case VIR_DOMAIN_CONTROLLER_TYPE_CCID: case VIR_DOMAIN_CONTROLLER_TYPE_USB: case VIR_DOMAIN_CONTROLLER_TYPE_PCI: - case VIR_DOMAIN_CONTROLLER_TYPE_LAST: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("The vbox driver does not support %s controller type"), virDomainControllerTypeToString(controller->type)); return -1; + case VIR_DOMAIN_CONTROLLER_TYPE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected controller type %d"), + controller->type); + return -1; } /* libvirt scsi model => vbox scsi model */ @@ -417,6 +422,7 @@ vboxSetStorageController(virDomainControllerDefPtr controller, goto cleanup; case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_DEFAULT: case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAST: + default: virReportError(VIR_ERR_INTERNAL_ERROR, _("Unexpected SCSI controller model %d"), controller->model); @@ -439,6 +445,7 @@ vboxSetStorageController(virDomainControllerDefPtr controller, break; case VIR_DOMAIN_CONTROLLER_MODEL_IDE_LAST: case VIR_DOMAIN_CONTROLLER_MODEL_IDE_DEFAULT: + default: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unexpected IDE controller model %d"), controller->model); @@ -1110,12 +1117,17 @@ vboxAttachDrives(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine) break; case VIR_DOMAIN_DISK_DEVICE_LUN: - case VIR_DOMAIN_DISK_DEVICE_LAST: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("The vbox driver does not support %s disk device"), virDomainDiskDeviceTypeToString(disk->device)); ret = -1; goto cleanup; + case VIR_DOMAIN_DISK_DEVICE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected disk device type %d"), disk->device); + ret = -1; + goto cleanup; } switch ((virDomainDiskBus) disk->bus) { @@ -1150,12 +1162,17 @@ vboxAttachDrives(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine) case VIR_DOMAIN_DISK_BUS_USB: case VIR_DOMAIN_DISK_BUS_UML: case VIR_DOMAIN_DISK_BUS_SD: - case VIR_DOMAIN_DISK_BUS_LAST: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("The vbox driver does not support %s bus type"), virDomainDiskBusTypeToString(disk->bus)); ret = -1; goto cleanup; + case VIR_DOMAIN_DISK_BUS_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected disk device type %d"), disk->device); + ret = -1; + goto cleanup; } /* If disk source is specified, lookup IMedium - removable drives don't @@ -3158,6 +3175,7 @@ vboxDumpStorageControllers(virDomainDefPtr def, IMachine *machine) case StorageControllerType_IntelAhci: case StorageControllerType_I82078: case StorageControllerType_Null: + default: model = -1; break; @@ -3183,6 +3201,7 @@ vboxDumpStorageControllers(virDomainDefPtr def, IMachine *machine) break; case StorageBus_Null: + default: virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Unsupported null storage bus")); @@ -3415,6 +3434,7 @@ vboxDumpDisks(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine) break; case StorageBus_Null: + default: virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Unsupported null storage bus")); goto cleanup; @@ -3437,6 +3457,7 @@ vboxDumpDisks(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine) case DeviceType_USB: case DeviceType_SharedFolder: case DeviceType_Null: + default: virReportError(VIR_ERR_INTERNAL_ERROR, _("Unsupported vbox device type: %d"), deviceType); goto cleanup; -- 2.14.3

Even if the compiler has validated that all enum constants have case statements in a switch, it is not safe to omit a default: case statement. When assigning a value to a variable / struct field that is defined with an enum type, nothing prevents an invalid value being assigned. So defensive code must assume existance of invalid values and thus all switches should have a default: case. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- src/libvirt_private.syms | 2 + src/qemu/qemu_alias.c | 3 + src/qemu/qemu_block.c | 22 ++- src/qemu/qemu_blockjob.c | 1 + src/qemu/qemu_capabilities.c | 23 ++- src/qemu/qemu_cgroup.c | 9 +- src/qemu/qemu_command.c | 395 ++++++++++++++++++++++++++++++++------- src/qemu/qemu_domain.c | 197 ++++++++++++++----- src/qemu/qemu_domain_address.c | 46 ++++- src/qemu/qemu_driver.c | 109 +++++++++-- src/qemu/qemu_hostdev.c | 5 +- src/qemu/qemu_hotplug.c | 58 +++++- src/qemu/qemu_interface.c | 12 +- src/qemu/qemu_migration.c | 24 ++- src/qemu/qemu_migration_cookie.c | 6 +- src/qemu/qemu_monitor.c | 13 +- src/qemu/qemu_monitor_json.c | 67 +++++-- src/qemu/qemu_monitor_text.c | 3 + src/qemu/qemu_parse_command.c | 12 +- src/qemu/qemu_process.c | 108 ++++++++++- 20 files changed, 918 insertions(+), 197 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 87a9c85f09..6a9e109855 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -198,6 +198,8 @@ virDomainBootTypeFromString; virDomainBootTypeToString; virDomainCapabilitiesPolicyTypeToString; virDomainCapsFeatureTypeToString; +virDomainChrChannelTargetTypeFromString; +virDomainChrChannelTargetTypeToString; virDomainChrConsoleTargetTypeFromString; virDomainChrConsoleTargetTypeToString; virDomainChrDefForeach; diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c index ae30f7df82..834cc4a319 100644 --- a/src/qemu/qemu_alias.c +++ b/src/qemu/qemu_alias.c @@ -110,6 +110,9 @@ qemuAssignDeviceChrAlias(virDomainDefPtr def, break; case VIR_DOMAIN_CHR_DEVICE_TYPE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected chardev device type %d"), chr->deviceType); return -1; } diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index 585f0255ee..13fcd5a6a8 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -515,11 +515,17 @@ qemuBlockStorageSourceBuildJSONSocketAddress(virStorageNetHostDefPtr host, break; case VIR_STORAGE_NET_HOST_TRANS_RDMA: - case VIR_STORAGE_NET_HOST_TRANS_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, _("transport protocol '%s' is not yet supported"), virStorageNetHostTransportTypeToString(host->transport)); goto cleanup; + + case VIR_STORAGE_NET_HOST_TRANS_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected storage transport %d"), + host->transport); + goto cleanup; } VIR_STEAL_PTR(ret, server); @@ -1005,7 +1011,9 @@ qemuBlockStorageSourceGetBackendProps(virStorageSourcePtr src) case VIR_STORAGE_TYPE_VOLUME: case VIR_STORAGE_TYPE_NONE: - case VIR_STORAGE_TYPE_LAST: + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Unsupported storage type %s"), + virStorageTypeToString(actualType)); return NULL; case VIR_STORAGE_TYPE_NETWORK: @@ -1056,9 +1064,19 @@ qemuBlockStorageSourceGetBackendProps(virStorageSourcePtr src) case VIR_STORAGE_NET_PROTOCOL_NONE: case VIR_STORAGE_NET_PROTOCOL_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected storage protocol %d"), + src->protocol); return NULL; } break; + + case VIR_STORAGE_TYPE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected storage type %d"), actualType); + return NULL; } if (virJSONValueObjectAdd(fileprops, "S:node-name", src->nodestorage, NULL) < 0) { diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c index 617e4ee564..2a08e09d99 100644 --- a/src/qemu/qemu_blockjob.c +++ b/src/qemu/qemu_blockjob.c @@ -199,6 +199,7 @@ qemuBlockJobEventProcess(virQEMUDriverPtr driver, break; case VIR_DOMAIN_BLOCK_JOB_LAST: + default: break; } diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index b5eb8cf46a..a07bf00ebc 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2598,9 +2598,12 @@ virQEMUCapsGetHostModel(virQEMUCapsPtr qemuCaps, /* 'full' is non-NULL only if we have data from both QEMU and * virCPUGetHost */ return cpuData->full ? cpuData->full : cpuData->reported; - } - return NULL; + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected CPU model type %d"), cpuType); + return NULL; + } } @@ -2643,11 +2646,10 @@ virQEMUCapsIsCPUModeSupported(virQEMUCapsPtr qemuCaps, cpus = qemuCaps->tcgCPUModels; return cpus && cpus->nmodels > 0; + default: case VIR_CPU_MODE_LAST: - break; + return false; } - - return false; } @@ -3447,7 +3449,10 @@ virQEMUCapsInitCPUModelX86(virQEMUCapsPtr qemuCaps, break; case QEMU_MONITOR_CPU_PROPERTY_LAST: - break; + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected monitor CPU property type %d"), prop->type); + goto cleanup; } } @@ -3705,7 +3710,10 @@ virQEMUCapsLoadHostCPUModelInfo(virQEMUCapsPtr qemuCaps, break; case QEMU_MONITOR_CPU_PROPERTY_LAST: - break; + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected monitor CPU property type %d"), prop->type); + goto cleanup; } if ((str = virXMLPropString(ctxt->node, "migratable"))) { @@ -4161,6 +4169,7 @@ virQEMUCapsFormatHostCPUModelInfo(virQEMUCapsPtr qemuCaps, break; case QEMU_MONITOR_CPU_PROPERTY_LAST: + default: break; } diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index b604edb31c..6c32303c18 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -239,7 +239,10 @@ qemuSetupTPMCgroup(virDomainObjPtr vm) ret = qemuSetupChrSourceCgroup(vm, &dev->data.passthrough.source); break; case VIR_DOMAIN_TPM_TYPE_LAST: - break; + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected TPM type %d"), dev->type); + return -1; } return ret; @@ -263,6 +266,8 @@ qemuSetupInputCgroup(virDomainObjPtr vm, VIR_CGROUP_DEVICE_RW, false); virDomainAuditCgroupPath(vm, priv->cgroup, "allow", dev->source.evdev, "rw", ret); break; + default: + break; } return ret; @@ -286,6 +291,8 @@ qemuTeardownInputCgroup(virDomainObjPtr vm, VIR_CGROUP_DEVICE_RWM, false); virDomainAuditCgroupPath(vm, priv->cgroup, "deny", dev->source.evdev, "rwm", ret); break; + default: + break; } return ret; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 33ca1e0960..71e697dd41 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -642,7 +642,13 @@ qemuBuildGeneralSecinfoURI(virURIPtr uri, break; case VIR_DOMAIN_SECRET_INFO_TYPE_AES: + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Unsupported secret info type aes")); + return -1; case VIR_DOMAIN_SECRET_INFO_TYPE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected secret info type %d"), secinfo->type); return -1; } @@ -690,6 +696,9 @@ qemuBuildRBDSecinfoURI(virBufferPtr buf, break; case VIR_DOMAIN_SECRET_INFO_TYPE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected secret info type %d"), secinfo->type); return -1; } @@ -1013,9 +1022,9 @@ qemuBuildNetworkDriveStr(virStorageSourcePtr src, case VIR_STORAGE_NET_PROTOCOL_LAST: case VIR_STORAGE_NET_PROTOCOL_NONE: + default: virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unexpected network protocol '%s'"), - virStorageNetProtocolTypeToString(src->protocol)); + _("Unexpected network protocol %d"), src->protocol); goto cleanup; } @@ -1056,8 +1065,12 @@ qemuGetDriveSourceString(virStorageSourcePtr src, case VIR_STORAGE_TYPE_VOLUME: case VIR_STORAGE_TYPE_NONE: - case VIR_STORAGE_TYPE_LAST: break; + case VIR_STORAGE_TYPE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected storage type %d"), actualType); + goto cleanup; } ret = 0; @@ -1259,7 +1272,7 @@ qemuCheckDiskConfig(virDomainDiskDefPtr disk, } } - switch (disk->bus) { + switch ((virDomainDiskBus)disk->bus) { case VIR_DOMAIN_DISK_BUS_SCSI: if (disk->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_DRIVE) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -1319,7 +1332,14 @@ qemuCheckDiskConfig(virDomainDiskDefPtr disk, case VIR_DOMAIN_DISK_BUS_VIRTIO: case VIR_DOMAIN_DISK_BUS_XEN: case VIR_DOMAIN_DISK_BUS_SD: + case VIR_DOMAIN_DISK_BUS_USB: + case VIR_DOMAIN_DISK_BUS_UML: + case VIR_DOMAIN_DISK_BUS_SATA: break; + case VIR_DOMAIN_DISK_BUS_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected disk bus %d"), disk->bus); } if (disk->src->readonly && @@ -1868,11 +1888,15 @@ qemuCheckIOThreads(const virDomainDef *def, case VIR_DOMAIN_DISK_BUS_UML: case VIR_DOMAIN_DISK_BUS_SATA: case VIR_DOMAIN_DISK_BUS_SD: - case VIR_DOMAIN_DISK_BUS_LAST: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("IOThreads not available for bus %s target %s"), virDomainDiskBusTypeToString(disk->bus), disk->dst); return false; + case VIR_DOMAIN_DISK_BUS_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected disk bus %d"), disk->bus); + return false; } /* Can we find the disk iothread in the iothreadid list? */ @@ -2277,7 +2301,7 @@ qemuBuildDiskDriveCommandLine(virCommandPtr cmd, /* bootDevs will get translated into either bootindex=N or boot=on * depending on what qemu supports */ for (i = 0; i < def->os.nBootDevs; i++) { - switch (def->os.bootDevs[i]) { + switch ((virDomainBootOrder)def->os.bootDevs[i]) { case VIR_DOMAIN_BOOT_CDROM: bootCD = i + 1; break; @@ -2287,6 +2311,13 @@ qemuBuildDiskDriveCommandLine(virCommandPtr cmd, case VIR_DOMAIN_BOOT_DISK: bootDisk = i + 1; break; + case VIR_DOMAIN_BOOT_NET: + break; + case VIR_DOMAIN_BOOT_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected disk boot device %d"), def->os.bootDevs[i]); + return -1; } } } @@ -2308,7 +2339,7 @@ qemuBuildDiskDriveCommandLine(virCommandPtr cmd, if (disk->info.bootIndex) { bootindex = disk->info.bootIndex; } else { - switch (disk->device) { + switch ((virDomainDiskDevice)disk->device) { case VIR_DOMAIN_DISK_DEVICE_CDROM: bootindex = bootCD; bootCD = 0; @@ -2322,6 +2353,11 @@ qemuBuildDiskDriveCommandLine(virCommandPtr cmd, bootindex = bootDisk; bootDisk = 0; break; + case VIR_DOMAIN_DISK_DEVICE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected disk device type %d"), disk->device); + return -1; } if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_BOOTINDEX)) { driveBoot = !!bootindex; @@ -2677,6 +2713,7 @@ qemuBuildControllerDevStr(const virDomainDef *domainDef, goto error; case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_DEFAULT: case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAST: + default: virReportError(VIR_ERR_INTERNAL_ERROR, _("Unexpected SCSI controller model %d"), def->model); @@ -2782,6 +2819,7 @@ qemuBuildControllerDevStr(const virDomainDef *domainDef, goto error; case VIR_DOMAIN_CONTROLLER_MODEL_PCI_DEFAULT: case VIR_DOMAIN_CONTROLLER_MODEL_PCI_LAST: + default: virReportError(VIR_ERR_INTERNAL_ERROR, _("Unexpected PCI controller model %d"), def->model); @@ -2791,11 +2829,15 @@ qemuBuildControllerDevStr(const virDomainDef *domainDef, case VIR_DOMAIN_CONTROLLER_TYPE_IDE: case VIR_DOMAIN_CONTROLLER_TYPE_FDC: - case VIR_DOMAIN_CONTROLLER_TYPE_LAST: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("Unsupported controller type: %s"), virDomainControllerTypeToString(def->type)); goto error; + case VIR_DOMAIN_CONTROLLER_TYPE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected controller type %d"), def->type); + goto error; } if (def->queues) @@ -3146,8 +3188,12 @@ qemuBuildMemoryBackendStr(virJSONValuePtr *backendProps, break; case VIR_DOMAIN_MEMORY_ACCESS_DEFAULT: - case VIR_DOMAIN_MEMORY_ACCESS_LAST: break; + case VIR_DOMAIN_MEMORY_ACCESS_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected memory access mode %d"), memAccess); + goto cleanup; } } else { *backendType = "memory-backend-ram"; @@ -3329,9 +3375,13 @@ qemuBuildMemoryDeviceStr(virDomainMemoryDefPtr mem) break; case VIR_DOMAIN_MEMORY_MODEL_NONE: - case VIR_DOMAIN_MEMORY_MODEL_LAST: break; + case VIR_DOMAIN_MEMORY_MODEL_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected memory model %d"), mem->model); + return NULL; } if (virBufferCheckError(&buf) < 0) @@ -3664,8 +3714,12 @@ qemuBuildHostNetStr(virDomainNetDefPtr net, case VIR_DOMAIN_NET_TYPE_HOSTDEV: /* Should have been handled earlier via PCI/USB hotplug code. */ - case VIR_DOMAIN_NET_TYPE_LAST: break; + case VIR_DOMAIN_NET_TYPE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected net type %d"), netType); + goto cleanup; } if (vlan >= 0) { @@ -3959,7 +4013,10 @@ qemuBuildVirtioInputDevStr(const virDomainDef *def, virQEMUBuildBufferEscapeComma(&buf, dev->source.evdev); break; case VIR_DOMAIN_INPUT_TYPE_LAST: - break; + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected input type %d"), dev->type); + goto error; } if (qemuBuildDeviceAddressStr(&buf, def, &dev->info, qemuCaps) < 0) @@ -3985,7 +4042,7 @@ qemuBuildUSBInputDevStr(const virDomainDef *def, { virBuffer buf = VIR_BUFFER_INITIALIZER; - switch (dev->type) { + switch ((virDomainInputType)dev->type) { case VIR_DOMAIN_INPUT_TYPE_MOUSE: virBufferAsprintf(&buf, "usb-mouse,id=%s", dev->info.alias); break; @@ -4001,6 +4058,16 @@ qemuBuildUSBInputDevStr(const virDomainDef *def, } virBufferAsprintf(&buf, "usb-kbd,id=%s", dev->info.alias); break; + case VIR_DOMAIN_INPUT_TYPE_PASSTHROUGH: + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Unsupported input type %s"), + virDomainInputTypeToString(dev->type)); + goto error; + case VIR_DOMAIN_INPUT_TYPE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected input type %d"), dev->type); + goto error; } if (qemuBuildDeviceAddressStr(&buf, def, &dev->info, qemuCaps) < 0) @@ -4023,7 +4090,7 @@ qemuBuildInputDevStr(char **devstr, virDomainInputDefPtr input, virQEMUCapsPtr qemuCaps) { - switch (input->bus) { + switch ((virDomainInputBus)input->bus) { case VIR_DOMAIN_INPUT_BUS_USB: if (!(*devstr = qemuBuildUSBInputDevStr(def, input, qemuCaps))) return -1; @@ -4033,6 +4100,21 @@ qemuBuildInputDevStr(char **devstr, if (!(*devstr = qemuBuildVirtioInputDevStr(def, input, qemuCaps))) return -1; break; + + case VIR_DOMAIN_INPUT_BUS_PS2: + /* nada */ + break; + case VIR_DOMAIN_INPUT_BUS_XEN: + case VIR_DOMAIN_INPUT_BUS_PARALLELS: + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Unsupported input bus %s"), + virDomainInputBusTypeToString(input->bus)); + return -1; + case VIR_DOMAIN_INPUT_BUS_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected input bus %d"), input->bus); + return -1; } return 0; } @@ -4105,11 +4187,15 @@ qemuBuildSoundDevStr(const virDomainDef *def, model = "sb16"; break; case VIR_DOMAIN_SOUND_MODEL_PCSPK: /* pc-speaker is handled separately */ - case VIR_DOMAIN_SOUND_MODEL_LAST: - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("sound card model '%s' is not supported by qemu"), virDomainSoundModelTypeToString(sound->model)); goto error; + case VIR_DOMAIN_SOUND_MODEL_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected sound model %d"), sound->model); + goto error; } virBufferAsprintf(&buf, "%s,id=%s", model, sound->info.alias); @@ -4488,11 +4574,15 @@ qemuBuildPCIHostdevDevStr(const virDomainDef *def, case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_DEFAULT: case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_XEN: - case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_TYPE_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, _("invalid PCI passthrough type '%s'"), virDomainHostdevSubsysPCIBackendTypeToString(backend)); goto error; + case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_TYPE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected hostdev PCI backend %d"), backend); + goto error; } virBufferAddLit(&buf, ",host="); @@ -5432,13 +5522,30 @@ qemuBuildSclpDevStr(virDomainChrDefPtr dev) { virBuffer buf = VIR_BUFFER_INITIALIZER; if (dev->deviceType == VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE) { - switch (dev->targetType) { + switch ((virDomainChrConsoleTargetType)dev->targetType) { case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SCLP: virBufferAddLit(&buf, "sclpconsole"); break; case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SCLPLM: virBufferAddLit(&buf, "sclplmconsole"); break; + case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_NONE: + case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SERIAL: + case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_XEN: + case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_UML: + case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_VIRTIO: + case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_LXC: + case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_OPENVZ: + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Unsupported console target type %s"), + virDomainChrConsoleTargetTypeToString(dev->targetType)); + goto error; + case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected console target type %d"), + dev->targetType); + goto error; } } else { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -5472,7 +5579,6 @@ qemuBuildRNGBackendChrdevStr(virLogManagerPtr logManager, switch ((virDomainRNGBackend) rng->backend) { case VIR_DOMAIN_RNG_BACKEND_RANDOM: - case VIR_DOMAIN_RNG_BACKEND_LAST: /* no chardev backend is needed */ return 0; @@ -5482,6 +5588,12 @@ qemuBuildRNGBackendChrdevStr(virLogManagerPtr logManager, rng->info.alias, qemuCaps, true, chardevStdioLogd))) return -1; + break; + case VIR_DOMAIN_RNG_BACKEND_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected RNG backend %d"), rng->backend); + return -1; } return 0; @@ -5533,8 +5645,9 @@ qemuBuildRNGBackendProps(virDomainRNGDefPtr rng, break; case VIR_DOMAIN_RNG_BACKEND_LAST: - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("unknown rng-random backend")); + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected RNG backend %d"), rng->backend); goto cleanup; } @@ -6028,6 +6141,11 @@ qemuBuildClockArgStr(virDomainClockDefPtr def) case VIR_DOMAIN_TIMER_TRACK_WALL: virBufferAddLit(&buf, ",clock=host"); break; + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected timer tracking mode %d"), + def->timers[i]->track); + goto error; } switch (def->timers[i]->tickpolicy) { @@ -6046,6 +6164,11 @@ qemuBuildClockArgStr(virDomainClockDefPtr def) _("unsupported rtc timer tickpolicy '%s'"), virDomainTimerTickpolicyTypeToString(def->timers[i]->tickpolicy)); goto error; + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected timer tick policy %d"), + def->timers[i]->tickpolicy); + goto error; } break; /* no need to check other timers - there is only one rtc */ } @@ -6115,7 +6238,6 @@ qemuBuildClockCommandLine(virCommandPtr cmd, case VIR_DOMAIN_TIMER_NAME_KVMCLOCK: case VIR_DOMAIN_TIMER_NAME_HYPERVCLOCK: /* Timers above are handled when building -cpu. */ - case VIR_DOMAIN_TIMER_NAME_LAST: break; case VIR_DOMAIN_TIMER_NAME_RTC: @@ -6137,6 +6259,11 @@ qemuBuildClockCommandLine(virCommandPtr cmd, _("unsupported rtc tickpolicy '%s'"), virDomainTimerTickpolicyTypeToString(def->clock.timers[i]->tickpolicy)); return -1; + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected timer tick policy %d"), + def->clock.timers[i]->tickpolicy); + return -1; } } else if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_RTC) && (def->clock.timers[i]->tickpolicy @@ -6191,6 +6318,11 @@ qemuBuildClockCommandLine(virCommandPtr cmd, _("unsupported pit tickpolicy '%s'"), virDomainTimerTickpolicyTypeToString(def->clock.timers[i]->tickpolicy)); return -1; + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected timer tick policy %d"), + def->clock.timers[i]->tickpolicy); + return -1; } break; @@ -6215,6 +6347,12 @@ qemuBuildClockCommandLine(virCommandPtr cmd, } } break; + case VIR_DOMAIN_TIMER_NAME_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected timer name %d"), + def->clock.timers[i]->name); + return -1; } } @@ -6480,7 +6618,11 @@ qemuBuildIOMMUCommandLine(virCommandPtr cmd, } break; case VIR_DOMAIN_IOMMU_MODEL_LAST: - break; + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unsupported iommu model %d"), + iommu->model); + return -1; } if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_MACHINE_IOMMU)) @@ -6519,13 +6661,19 @@ qemuBuildIOMMUCommandLine(virCommandPtr cmd, virBufferAsprintf(&opts, ",device-iotlb=%s", virTristateSwitchTypeToString(iommu->iotlb)); } - case VIR_DOMAIN_IOMMU_MODEL_LAST: break; + case VIR_DOMAIN_IOMMU_MODEL_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unsupported iommu model %d"), + iommu->model); + goto cleanup; } virCommandAddArg(cmd, "-device"); virCommandAddArgBuffer(cmd, &opts); ret = 0; + cleanup: virBufferFreeAndReset(&opts); return ret; } @@ -6641,7 +6789,11 @@ qemuBuildCpuModelArgStr(virQEMUDriverPtr driver, break; case VIR_CPU_MODE_LAST: - break; + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected CPU mode %d"), + cpu->mode); + goto cleanup; } if (ARCH_IS_S390(def->os.arch) && cpu->features && @@ -6674,8 +6826,13 @@ qemuBuildCpuModelArgStr(virQEMUDriverPtr driver, break; case VIR_CPU_FEATURE_OPTIONAL: - case VIR_CPU_FEATURE_LAST: break; + case VIR_CPU_FEATURE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected CPU feature policy %d"), + cpu->features[i].policy); + goto cleanup; } } @@ -6811,6 +6968,7 @@ qemuBuildCpuCommandLine(virCommandPtr cmd, /* coverity[dead_error_begin] */ case VIR_DOMAIN_HYPERV_LAST: + default: break; } } @@ -6833,6 +6991,7 @@ qemuBuildCpuCommandLine(virCommandPtr cmd, /* coverity[dead_error_begin] */ case VIR_DOMAIN_KVM_LAST: + default: break; } } @@ -6865,7 +7024,11 @@ qemuBuildCpuCommandLine(virCommandPtr cmd, break; case VIR_CPU_CACHE_MODE_LAST: - break; + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected CPU cache mode %d"), + cache->mode); + goto cleanup; } if (hostOff && @@ -7226,12 +7389,16 @@ qemuBuildMachineCommandLine(virCommandPtr cmd, _("IOMMU device: '%s' is only supported with " "Q35 machines"), virDomainIOMMUModelTypeToString(def->iommu->model)); - return -1; + goto cleanup; } virBufferAddLit(&buf, ",iommu=on"); break; case VIR_DOMAIN_IOMMU_MODEL_LAST: - break; + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected iommu model %d"), + def->iommu->model); + goto cleanup; } } @@ -7268,7 +7435,11 @@ qemuBuildMachineCommandLine(virCommandPtr cmd, virBufferAddLit(&buf, ",kernel_irqchip=on"); break; case VIR_DOMAIN_IOAPIC_LAST: - break; + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected ioapic type %d"), + def->ioapic); + goto cleanup; } } @@ -7757,7 +7928,11 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfigPtr cfg, break; case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_LAST: - break; + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected graphics listen type %d"), + glisten->type); + goto error; } if (graphics->data.vnc.sharePolicy) { @@ -7888,7 +8063,11 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfigPtr cfg, hasInsecure = true; break; case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_LAST: - break; + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected graphics listen type %d"), + glisten->type); + goto error; } if (cfg->spiceSASL) { @@ -7952,9 +8131,14 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfigPtr cfg, virBufferAddLit(&opt, "plaintext-channel=default,"); break; case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_ANY: - case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_LAST: /* nothing */ break; + case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected spice channel mode %d"), + graphics->data.spice.defaultMode); + goto error; } for (i = 0; i < VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_LAST; i++) { @@ -7985,6 +8169,12 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfigPtr cfg, case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_ANY: break; + case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected spice channel mode %d"), + graphics->data.spice.channels[i]); + goto error; } } @@ -8110,11 +8300,15 @@ qemuBuildGraphicsCommandLine(virQEMUDriverConfigPtr cfg, case VIR_DOMAIN_GRAPHICS_TYPE_RDP: case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP: - case VIR_DOMAIN_GRAPHICS_TYPE_LAST: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unsupported graphics type '%s'"), virDomainGraphicsTypeToString(graphics->type)); return -1; + case VIR_DOMAIN_GRAPHICS_TYPE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected graphics type %d"), graphics->type); + return -1; } return 0; @@ -8163,11 +8357,16 @@ qemuBuildVhostuserCommandLine(virQEMUDriverPtr driver, case VIR_DOMAIN_CHR_TYPE_SPICEVMC: case VIR_DOMAIN_CHR_TYPE_SPICEPORT: case VIR_DOMAIN_CHR_TYPE_NMDM: - case VIR_DOMAIN_CHR_TYPE_LAST: - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("vhost-user type '%s' not supported"), virDomainChrTypeToString(net->data.vhostuser->type)); goto error; + case VIR_DOMAIN_CHR_TYPE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected chardev type %d"), + net->data.vhostuser->type); + goto error; } if (queues > 1 && @@ -8349,14 +8548,12 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, */ ret = 0; goto cleanup; - break; case VIR_DOMAIN_NET_TYPE_VHOSTUSER: ret = qemuBuildVhostuserCommandLine(driver, logManager, cmd, def, net, qemuCaps, bootindex, chardevStdioLogd); goto cleanup; - break; case VIR_DOMAIN_NET_TYPE_USER: case VIR_DOMAIN_NET_TYPE_SERVER: @@ -8364,9 +8561,13 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, case VIR_DOMAIN_NET_TYPE_MCAST: case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_UDP: - case VIR_DOMAIN_NET_TYPE_LAST: /* nada */ break; + case VIR_DOMAIN_NET_TYPE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected net type %d"), actualType); + goto cleanup; } /* For types whose implementations use a netdev on the host, add @@ -8400,7 +8601,6 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_HOSTDEV: - case VIR_DOMAIN_NET_TYPE_LAST: /* These types don't use a network device on the host, but * instead use some other type of connection to the emulated * device in the qemu process. @@ -8411,7 +8611,12 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver, * up in the list of interfaces on the host - it's just some * PCI device.) */ - break; + break; + case VIR_DOMAIN_NET_TYPE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected net type %d"), actualType); + goto cleanup; } /* Set bandwidth or warn if requested and not supported. */ @@ -8926,7 +9131,10 @@ qemuBuildShmemCommandLine(virLogManagerPtr logManager, break; case VIR_DOMAIN_SHMEM_MODEL_LAST: - break; + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected shmem model %d"), shmem->model); + return -1; } if (!devstr) @@ -8970,10 +9178,9 @@ qemuChrSerialTargetModelToCaps(virDomainChrSerialTargetModel targetModel) return QEMU_CAPS_DEVICE_PL011; case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_NONE: case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_LAST: - break; + default: + return 0; } - - return 0; } @@ -9127,7 +9334,7 @@ qemuBuildChannelsCommandLine(virLogManagerPtr logManager, virDomainChrDefPtr channel = def->channels[i]; char *devstr; - switch (channel->targetType) { + switch ((virDomainChrChannelTargetType)channel->targetType) { case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_GUESTFWD: if (!(devstr = qemuBuildChrChardevStr(logManager, cmd, cfg, def, channel->source, @@ -9167,6 +9374,19 @@ qemuBuildChannelsCommandLine(virLogManagerPtr logManager, if (qemuBuildChrDeviceCommandLine(cmd, def, channel, qemuCaps) < 0) return -1; break; + + case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_NONE: + case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_XEN: + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Unsupported channel target type %s"), + virDomainChrChannelTargetTypeToString(channel->targetType)); + return -1; + + case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected channel target type %d"), channel->targetType); + return -1; } } @@ -9387,7 +9607,7 @@ qemuBuildRedirdevCommandLine(virLogManagerPtr logManager, } -static void +static int qemuBuildDomainLoaderCommandLine(virCommandPtr cmd, virDomainDefPtr def) { @@ -9396,7 +9616,7 @@ qemuBuildDomainLoaderCommandLine(virCommandPtr cmd, int unit = 0; if (!loader) - return; + return 0; switch ((virDomainLoader) loader->type) { case VIR_DOMAIN_LOADER_TYPE_ROM: @@ -9438,11 +9658,14 @@ qemuBuildDomainLoaderCommandLine(virCommandPtr cmd, break; case VIR_DOMAIN_LOADER_TYPE_LAST: - /* nada */ - break; + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected loader type %d"), loader->type); + return -1; } virBufferFreeAndReset(&buf); + return 0; } @@ -9496,8 +9719,13 @@ qemuBuildTPMBackendStr(const virDomainDef *def, switch (tpm->type) { case VIR_DOMAIN_TPM_TYPE_PASSTHROUGH: - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_TPM_PASSTHROUGH)) - goto no_support; + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_TPM_PASSTHROUGH)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("The QEMU executable %s does not support TPM " + "backend type %s"), + def->emulator, type); + goto error; + } tpmdev = tpm->data.passthrough.source.data.file.path; if (!(cancel_path = virTPMCreateCancelPath(tpmdev))) @@ -9543,6 +9771,9 @@ qemuBuildTPMBackendStr(const virDomainDef *def, break; case VIR_DOMAIN_TPM_TYPE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected TPM type %d"), tpm->type); goto error; } @@ -9551,12 +9782,6 @@ qemuBuildTPMBackendStr(const virDomainDef *def, return virBufferContentAndReset(&buf); - no_support: - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("The QEMU executable %s does not support TPM " - "backend type %s"), - def->emulator, type); - error: VIR_FREE(devset); VIR_FREE(cancel_path); @@ -9730,8 +9955,13 @@ qemuBuildPanicCommandLine(virCommandPtr cmd, /* default model value was changed before in post parse */ case VIR_DOMAIN_PANIC_MODEL_DEFAULT: - case VIR_DOMAIN_PANIC_MODEL_LAST: break; + case VIR_DOMAIN_PANIC_MODEL_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected panic model %d"), + def->panics[i]->model); + return -1; } } @@ -9787,7 +10017,7 @@ qemuBuildCommandLineValidate(virQEMUDriverPtr driver, } for (i = 0; i < def->ngraphics; ++i) { - switch (def->graphics[i]->type) { + switch ((virDomainGraphicsType)def->graphics[i]->type) { case VIR_DOMAIN_GRAPHICS_TYPE_SDL: ++sdl; break; @@ -9799,8 +10029,16 @@ qemuBuildCommandLineValidate(virQEMUDriverPtr driver, break; case VIR_DOMAIN_GRAPHICS_TYPE_RDP: case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP: + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Unsupported graphics type %s"), + virDomainGraphicsTypeToString(def->graphics[i]->type)); + return -1; case VIR_DOMAIN_GRAPHICS_TYPE_LAST: - break; + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected graphics type %d"), + def->graphics[i]->type); + return -1; } } @@ -9900,7 +10138,8 @@ qemuBuildCommandLine(virQEMUDriverPtr driver, if (qemuBuildCpuCommandLine(cmd, driver, def, qemuCaps) < 0) goto error; - qemuBuildDomainLoaderCommandLine(cmd, def); + if (qemuBuildDomainLoaderCommandLine(cmd, def) < 0) + goto error; if (!migrateURI && !snapshot && qemuDomainAlignMemorySizes(def) < 0) goto error; @@ -10144,14 +10383,18 @@ qemuBuildSerialChrDeviceStr(char **deviceStr, case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_PL011: case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_NONE: - case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_LAST: - /* Except from _LAST, which is just a guard value and will never - * be used, all of the above are platform devices, which means + /* All of the above are platform devices, which means * qemuBuildSerialCommandLine() will have taken the appropriate * branch and we will not have ended up here. */ virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid target model for serial device")); goto error; + case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected serial target model %d"), + serial->targetModel); + goto error; } virBufferAsprintf(&cmd, "%s,chardev=char%s,id=%s", @@ -10213,8 +10456,16 @@ qemuBuildChannelChrDeviceStr(char **deviceStr, case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_XEN: case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_NONE: + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unsupported channel target type %s"), + virDomainChrChannelTargetTypeToString(chr->targetType)); + goto cleanup; case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_LAST: - return ret; + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected channel target type %d"), + chr->targetType); + goto cleanup; } ret = 0; @@ -10251,10 +10502,15 @@ qemuBuildConsoleChrDeviceStr(char **deviceStr, case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_UML: case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_LXC: case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_OPENVZ: - case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_LAST: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unsupported console target type %s"), - NULLSTR(virDomainChrConsoleTargetTypeToString(chr->targetType))); + virDomainChrConsoleTargetTypeToString(chr->targetType)); + goto cleanup; + case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected console target type %d"), + chr->targetType); goto cleanup; } @@ -10289,6 +10545,9 @@ qemuBuildChrDeviceStr(char **deviceStr, break; case VIR_DOMAIN_CHR_DEVICE_TYPE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected chardev device type %d"), chr->deviceType); return ret; } diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 7697de69e4..28aba63fb3 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -175,9 +175,9 @@ qemuDomainAsyncJobPhaseToString(qemuDomainAsyncJob job, case QEMU_ASYNC_JOB_NONE: case QEMU_ASYNC_JOB_LAST: ATTRIBUTE_FALLTHROUGH; + default: + return "none"; } - - return "none"; } int @@ -199,12 +199,12 @@ qemuDomainAsyncJobPhaseFromString(qemuDomainAsyncJob job, case QEMU_ASYNC_JOB_NONE: case QEMU_ASYNC_JOB_LAST: ATTRIBUTE_FALLTHROUGH; + default: + if (STREQ(phase, "none")) + return 0; + else + return -1; } - - if (STREQ(phase, "none")) - return 0; - else - return -1; } @@ -416,9 +416,6 @@ static virDomainJobType qemuDomainJobStatusToType(qemuDomainJobStatus status) { switch (status) { - case QEMU_DOMAIN_JOB_STATUS_NONE: - break; - case QEMU_DOMAIN_JOB_STATUS_ACTIVE: case QEMU_DOMAIN_JOB_STATUS_MIGRATING: case QEMU_DOMAIN_JOB_STATUS_QEMU_COMPLETED: @@ -434,9 +431,11 @@ qemuDomainJobStatusToType(qemuDomainJobStatus status) case QEMU_DOMAIN_JOB_STATUS_CANCELED: return VIR_DOMAIN_JOB_CANCELLED; - } - return VIR_DOMAIN_JOB_NONE; + case QEMU_DOMAIN_JOB_STATUS_NONE: + default: + return VIR_DOMAIN_JOB_NONE; + } } int @@ -473,6 +472,7 @@ qemuDomainJobInfoToInfo(qemuDomainJobInfoPtr jobInfo, break; case QEMU_DOMAIN_JOB_STATS_TYPE_NONE: + default: break; } @@ -716,10 +716,12 @@ qemuDomainJobInfoToParams(qemuDomainJobInfoPtr jobInfo, return qemuDomainDumpJobInfoToParams(jobInfo, type, params, nparams); case QEMU_DOMAIN_JOB_STATS_TYPE_NONE: - break; + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected job stats type %d"), jobInfo->statsType); + return -1; } - return -1; } @@ -973,6 +975,7 @@ qemuDomainSecretInfoFree(qemuDomainSecretInfoPtr *secinfo) break; case VIR_DOMAIN_SECRET_INFO_TYPE_LAST: + default: break; } @@ -3186,7 +3189,10 @@ qemuDomainDefCPUPostParse(virDomainDefPtr def) break; case VIR_CPU_CACHE_MODE_LAST: - break; + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected CPU cache mode %d"), cache->mode); + return -1; } } @@ -3216,7 +3222,10 @@ qemuDomainDefCPUPostParse(virDomainDefPtr def) break; case VIR_CPU_MODE_LAST: - break; + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected CPU mode %d"), def->cpu->mode); + return -1; } return 0; @@ -3498,6 +3507,7 @@ qemuDomainNetSupportsCoalesce(virDomainNetType type) case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_LAST: + default: break; } return false; @@ -3544,6 +3554,7 @@ qemuDomainChrSourceDefValidate(const virDomainChrSourceDef *def) case VIR_DOMAIN_CHR_TYPE_SPICEPORT: case VIR_DOMAIN_CHR_TYPE_NMDM: case VIR_DOMAIN_CHR_TYPE_LAST: + default: break; } @@ -3567,10 +3578,9 @@ qemuDomainChrSerialTargetTypeToAddressType(int targetType) case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SCLP: case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_LAST: case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_NONE: - break; + default: + return VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE; } - - return VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE; } @@ -3593,10 +3603,9 @@ qemuDomainChrSerialTargetModelToTargetType(int targetModel) return VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SCLP; case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_NONE: case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_LAST: - break; + default: + return VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_NONE; } - - return VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_NONE; } @@ -3639,8 +3648,12 @@ qemuDomainChrTargetDefValidate(const virDomainChrDef *chr) break; case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_NONE: - case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_LAST: break; + case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected serial target type %d"), chr->targetType); + return -1; } /* Validate target model */ @@ -3665,17 +3678,25 @@ qemuDomainChrTargetDefValidate(const virDomainChrDef *chr) break; case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_NONE: - case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_LAST: break; + case VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected serial target model %d"), chr->targetModel); + return -1; } break; case VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE: case VIR_DOMAIN_CHR_DEVICE_TYPE_PARALLEL: case VIR_DOMAIN_CHR_DEVICE_TYPE_CHANNEL: - case VIR_DOMAIN_CHR_DEVICE_TYPE_LAST: /* Nothing to do */ break; + case VIR_DOMAIN_CHR_DEVICE_TYPE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected chardev device type %d"), chr->deviceType); + return -1; } return 0; @@ -3809,7 +3830,10 @@ qemuDomainWatchdogDefValidate(const virDomainWatchdogDef *dev, break; case VIR_DOMAIN_WATCHDOG_MODEL_LAST: - break; + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected watchdog model %d"), dev->model); + return -1; } return 0; @@ -3932,11 +3956,12 @@ qemuDomainDeviceDefValidateHostdev(const virDomainHostdevDef *hostdev, static int qemuDomainDeviceDefValidateVideo(const virDomainVideoDef *video) { - switch (video->type) { + switch ((virDomainVideoType)video->type) { case VIR_DOMAIN_VIDEO_TYPE_XEN: case VIR_DOMAIN_VIDEO_TYPE_VBOX: case VIR_DOMAIN_VIDEO_TYPE_PARALLELS: case VIR_DOMAIN_VIDEO_TYPE_DEFAULT: + case VIR_DOMAIN_VIDEO_TYPE_GOP: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("video type '%s' is not supported with QEMU"), virDomainVideoTypeToString(video->type)); @@ -3946,8 +3971,12 @@ qemuDomainDeviceDefValidateVideo(const virDomainVideoDef *video) case VIR_DOMAIN_VIDEO_TYPE_VMVGA: case VIR_DOMAIN_VIDEO_TYPE_QXL: case VIR_DOMAIN_VIDEO_TYPE_VIRTIO: - case VIR_DOMAIN_VIDEO_TYPE_LAST: break; + case VIR_DOMAIN_VIDEO_TYPE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected video type %d"), video->type); + return -1; } if (!video->primary && @@ -4125,6 +4154,7 @@ qemuDomainCheckSCSIControllerModel(virQEMUCapsPtr qemuCaps, return false; case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_DEFAULT: case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAST: + default: virReportError(VIR_ERR_INTERNAL_ERROR, _("Unexpected SCSI controller model %d"), model); @@ -4216,8 +4246,12 @@ qemuDomainDeviceDefValidateControllerSCSI(const virDomainControllerDef *controll case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_IBMVSCSI: case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSISAS1078: case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_DEFAULT: - case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAST: break; + case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected controller SCSI model %d"), controller->model); + return -1; } return 0; @@ -4264,8 +4298,12 @@ qemuDomainDeviceDefValidateControllerPCI(const virDomainControllerDef *controlle case VIR_DOMAIN_CONTROLLER_MODEL_PCI_ROOT: case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT: case VIR_DOMAIN_CONTROLLER_MODEL_PCI_DEFAULT: - case VIR_DOMAIN_CONTROLLER_MODEL_PCI_LAST: break; + case VIR_DOMAIN_CONTROLLER_MODEL_PCI_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected controller PCI model %d"), model); + return -1; } pciopts = &controller->opts.pciopts; @@ -4495,9 +4533,13 @@ qemuDomainDeviceDefValidateControllerPCI(const virDomainControllerDef *controlle break; case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT: - case VIR_DOMAIN_CONTROLLER_MODEL_PCI_LAST: case VIR_DOMAIN_CONTROLLER_MODEL_PCI_DEFAULT: break; + case VIR_DOMAIN_CONTROLLER_MODEL_PCI_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected controller PCI model %d"), model); + return -1; } return 0; @@ -4563,8 +4605,12 @@ qemuDomainDeviceDefValidateController(const virDomainControllerDef *controller, case VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL: case VIR_DOMAIN_CONTROLLER_TYPE_CCID: case VIR_DOMAIN_CONTROLLER_TYPE_USB: - case VIR_DOMAIN_CONTROLLER_TYPE_LAST: break; + case VIR_DOMAIN_CONTROLLER_TYPE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected controller type %d"), controller->type); + return -1; } return ret; @@ -4667,8 +4713,12 @@ qemuDomainDeviceDefValidate(const virDomainDeviceDef *dev, case VIR_DOMAIN_DEVICE_PANIC: case VIR_DOMAIN_DEVICE_IOMMU: case VIR_DOMAIN_DEVICE_NONE: - case VIR_DOMAIN_DEVICE_LAST: break; + case VIR_DOMAIN_DEVICE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected device type %d"), dev->type); + return -1; } virObjectUnref(qemuCaps); @@ -4969,8 +5019,12 @@ qemuDomainControllerDefPostParse(virDomainControllerDefPtr cont, case VIR_DOMAIN_CONTROLLER_TYPE_CCID: case VIR_DOMAIN_CONTROLLER_TYPE_IDE: case VIR_DOMAIN_CONTROLLER_TYPE_FDC: - case VIR_DOMAIN_CONTROLLER_TYPE_LAST: break; + case VIR_DOMAIN_CONTROLLER_TYPE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected controller type %d"), cont->type); + return -1; } return 0; @@ -5027,9 +5081,12 @@ qemuDomainChrDefPostParse(virDomainChrDefPtr chr, chr->targetModel = VIR_DOMAIN_CHR_SERIAL_TARGET_MODEL_SCLPCONSOLE; break; case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_NONE: - case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_LAST: - /* Nothing to do */ break; + case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected serial target type %d"), chr->targetType); + return -1; } } @@ -5951,9 +6008,14 @@ qemuDomainDefFormatBufInternal(virQEMUDriverPtr driver, case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_USB: case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SCLP: case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_NONE: - case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_LAST: /* Nothing to do */ break; + case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected serial target type %d"), + serial->targetType); + goto cleanup; } } } @@ -6919,8 +6981,8 @@ qemuDomainCheckDiskStartupPolicy(virQEMUDriverPtr driver, break; case VIR_DOMAIN_STARTUP_POLICY_LAST: - /* this should never happen */ - break; + default: + return -1; } qemuDomainCheckRemoveOptionalDisk(driver, vm, diskIndex); @@ -8117,6 +8179,9 @@ qemuDomainDefValidateMemoryHotplugDevice(const virDomainMemoryDef *mem, case VIR_DOMAIN_MEMORY_MODEL_NONE: case VIR_DOMAIN_MEMORY_MODEL_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected memory model %d"), mem->model); return -1; } @@ -8203,8 +8268,12 @@ qemuDomainDefValidateMemoryHotplug(const virDomainDef *def, break; case VIR_DOMAIN_MEMORY_MODEL_NONE: - case VIR_DOMAIN_MEMORY_MODEL_LAST: break; + case VIR_DOMAIN_MEMORY_MODEL_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected memory model %d"), def->mems[i]->model); + return -1; } /* already existing devices don't need to be checked on hotplug */ @@ -8821,9 +8890,9 @@ qemuDomainNetSupportsMTU(virDomainNetType type) case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_LAST: - break; + default: + return false; } - return false; } int @@ -9276,14 +9345,22 @@ qemuDomainGetHostdevPath(virDomainDefPtr def, perm = VIR_CGROUP_DEVICE_RW; break; case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST: - break; + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected hostdev subsystem type %d"), + dev->source.subsys.type); + goto cleanup; } break; case VIR_DOMAIN_HOSTDEV_MODE_CAPABILITIES: - case VIR_DOMAIN_HOSTDEV_MODE_LAST: /* nada */ break; + case VIR_DOMAIN_HOSTDEV_MODE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected hostdev mode %d"), dev->mode); + goto cleanup; } if (tmpPath) { @@ -9965,8 +10042,10 @@ qemuDomainSetupTPM(virQEMUDriverConfigPtr cfg ATTRIBUTE_UNUSED, break; case VIR_DOMAIN_TPM_TYPE_LAST: - /* nada */ - break; + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected TPM type %d"), dev->type); + return -1; } VIR_DEBUG("Setup TPM"); @@ -10054,9 +10133,12 @@ qemuDomainSetupRNG(virQEMUDriverConfigPtr cfg ATTRIBUTE_UNUSED, return -1; case VIR_DOMAIN_RNG_BACKEND_EGD: - case VIR_DOMAIN_RNG_BACKEND_LAST: - /* nada */ break; + case VIR_DOMAIN_RNG_BACKEND_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected RNG backend %d"), rng->backend); + return -1; } return 0; @@ -10110,7 +10192,10 @@ qemuDomainSetupLoader(virQEMUDriverConfigPtr cfg ATTRIBUTE_UNUSED, break; case VIR_DOMAIN_LOADER_TYPE_LAST: - break; + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected loader type %d"), loader->type); + goto cleanup; } } @@ -10319,6 +10404,7 @@ qemuDomainNamespaceAvailable(qemuDomainNamespace ns ATTRIBUTE_UNUSED) # endif break; case QEMU_DOMAIN_NS_LAST: + default: break; } @@ -10988,8 +11074,12 @@ qemuDomainNamespaceSetupRNG(virDomainObjPtr vm, break; case VIR_DOMAIN_RNG_BACKEND_EGD: - case VIR_DOMAIN_RNG_BACKEND_LAST: break; + case VIR_DOMAIN_RNG_BACKEND_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected RNG backend %d"), rng->backend); + return -1; } if (path && qemuDomainNamespaceMknodPath(vm, path) < 0) @@ -11011,8 +11101,12 @@ qemuDomainNamespaceTeardownRNG(virDomainObjPtr vm, break; case VIR_DOMAIN_RNG_BACKEND_EGD: - case VIR_DOMAIN_RNG_BACKEND_LAST: break; + case VIR_DOMAIN_RNG_BACKEND_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected RNG backend %d"), rng->backend); + return -1; } if (path && qemuDomainNamespaceUnlinkPath(vm, path) < 0) @@ -11529,6 +11623,7 @@ qemuProcessEventFree(struct qemuProcessEvent *event) VIR_FREE(event->data); break; case QEMU_PROCESS_EVENT_LAST: + default: break; } VIR_FREE(event); diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index de565dbf74..8695e7cc07 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -542,6 +542,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDefPtr dev, case VIR_DOMAIN_CONTROLLER_MODEL_USB_QUSB2: /* xen only */ case VIR_DOMAIN_CONTROLLER_MODEL_USB_NONE: case VIR_DOMAIN_CONTROLLER_MODEL_USB_LAST: + default: return 0; } @@ -573,6 +574,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDefPtr dev, return pciFlags; case VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LAST: + default: return 0; } @@ -582,6 +584,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDefPtr dev, case VIR_DOMAIN_CONTROLLER_TYPE_FDC: case VIR_DOMAIN_CONTROLLER_TYPE_CCID: case VIR_DOMAIN_CONTROLLER_TYPE_LAST: + default: /* should be 0 */ return pciFlags; } @@ -625,6 +628,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDefPtr dev, case VIR_DOMAIN_SOUND_MODEL_PCSPK: case VIR_DOMAIN_SOUND_MODEL_USB: case VIR_DOMAIN_SOUND_MODEL_LAST: + default: return 0; } @@ -642,6 +646,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDefPtr dev, case VIR_DOMAIN_DISK_BUS_SATA: case VIR_DOMAIN_DISK_BUS_SD: case VIR_DOMAIN_DISK_BUS_LAST: + default: return 0; } @@ -754,6 +759,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDefPtr dev, case VIR_DOMAIN_MEMBALLOON_MODEL_XEN: case VIR_DOMAIN_MEMBALLOON_MODEL_NONE: case VIR_DOMAIN_MEMBALLOON_MODEL_LAST: + default: return 0; } @@ -763,6 +769,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDefPtr dev, return virtioFlags; case VIR_DOMAIN_RNG_MODEL_LAST: + default: return 0; } @@ -775,6 +782,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDefPtr dev, case VIR_DOMAIN_WATCHDOG_MODEL_IB700: case VIR_DOMAIN_WATCHDOG_MODEL_DIAG288: case VIR_DOMAIN_WATCHDOG_MODEL_LAST: + default: return 0; } @@ -795,6 +803,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDefPtr dev, case VIR_DOMAIN_VIDEO_TYPE_DEFAULT: case VIR_DOMAIN_VIDEO_TYPE_GOP: case VIR_DOMAIN_VIDEO_TYPE_LAST: + default: return 0; } @@ -811,6 +820,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDefPtr dev, case VIR_DOMAIN_INPUT_BUS_XEN: case VIR_DOMAIN_INPUT_BUS_PARALLELS: case VIR_DOMAIN_INPUT_BUS_LAST: + default: return 0; } @@ -826,6 +836,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDefPtr dev, case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_SCLP: case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_NONE: case VIR_DOMAIN_CHR_SERIAL_TARGET_TYPE_LAST: + default: return 0; } @@ -841,17 +852,14 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDefPtr dev, case VIR_DOMAIN_DEVICE_LEASE: case VIR_DOMAIN_DEVICE_GRAPHICS: case VIR_DOMAIN_DEVICE_IOMMU: + return 0; case VIR_DOMAIN_DEVICE_LAST: case VIR_DOMAIN_DEVICE_NONE: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected device type %d"), dev->type); return 0; } - - /* We can never get here, because all cases are covered in the - * switch, and they all return, but the compiler will still - * complain "control reaches end of non-void function" unless - * we add the following return. - */ - return 0; } @@ -1576,7 +1584,7 @@ qemuDomainValidateDevicePCISlotsQ35(virDomainDefPtr def, for (i = 0; i < def->ncontrollers; i++) { virDomainControllerDefPtr cont = def->controllers[i]; - switch (cont->type) { + switch ((virDomainControllerType)cont->type) { case VIR_DOMAIN_CONTROLLER_TYPE_SATA: /* Verify that the first SATA controller is at 00:1F.2 the * q35 machine type *always* has a SATA controller at this @@ -1660,6 +1668,19 @@ qemuDomainValidateDevicePCISlotsQ35(virDomainDefPtr def, } } break; + + case VIR_DOMAIN_CONTROLLER_TYPE_IDE: + case VIR_DOMAIN_CONTROLLER_TYPE_FDC: + case VIR_DOMAIN_CONTROLLER_TYPE_SCSI: + case VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL: + case VIR_DOMAIN_CONTROLLER_TYPE_CCID: + break; + + case VIR_DOMAIN_CONTROLLER_TYPE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected controller type %d"), cont->type); + goto cleanup; } } @@ -1958,6 +1979,8 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def, addr.function = 2; addr.multi = VIR_TRISTATE_SWITCH_ABSENT; break; + default: + break; } if (foundAddr) { @@ -2187,6 +2210,7 @@ qemuDomainPCIControllerSetDefaultModelName(virDomainControllerDefPtr cont, case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT: case VIR_DOMAIN_CONTROLLER_MODEL_PCI_DEFAULT: case VIR_DOMAIN_CONTROLLER_MODEL_PCI_LAST: + default: break; } } @@ -2574,8 +2598,12 @@ qemuDomainAssignPCIAddresses(virDomainDefPtr def, case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_SWITCH_UPSTREAM_PORT: case VIR_DOMAIN_CONTROLLER_MODEL_PCIE_ROOT: case VIR_DOMAIN_CONTROLLER_MODEL_PCI_DEFAULT: - case VIR_DOMAIN_CONTROLLER_MODEL_PCI_LAST: break; + case VIR_DOMAIN_CONTROLLER_MODEL_PCI_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected controller PCI model %d"), cont->model); + goto cleanup; } /* check if every PCI bridge controller's index is larger than diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 0b8976010f..54da651c65 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4563,6 +4563,8 @@ syncNicRxFilterMultiMode(char *ifname, virNetDevRxFilterPtr guestFilter, ifname); } break; + default: + break; } } } @@ -4889,6 +4891,7 @@ static void qemuProcessEventHandler(void *data, void *opaque) processMonitorEOFEvent(driver, vm); break; case QEMU_PROCESS_EVENT_LAST: + default: break; } @@ -7753,11 +7756,15 @@ qemuDomainAttachDeviceLive(virDomainObjPtr vm, case VIR_DOMAIN_DEVICE_TPM: case VIR_DOMAIN_DEVICE_PANIC: case VIR_DOMAIN_DEVICE_IOMMU: - case VIR_DOMAIN_DEVICE_LAST: virReportError(VIR_ERR_OPERATION_UNSUPPORTED, _("live attach of device '%s' is not supported"), virDomainDeviceTypeToString(dev->type)); break; + case VIR_DOMAIN_DEVICE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected device type %d"), dev->type); + return -1; } if (alias) { @@ -7852,11 +7859,15 @@ qemuDomainDetachDeviceLive(virDomainObjPtr vm, case VIR_DOMAIN_DEVICE_TPM: case VIR_DOMAIN_DEVICE_PANIC: case VIR_DOMAIN_DEVICE_IOMMU: - case VIR_DOMAIN_DEVICE_LAST: virReportError(VIR_ERR_OPERATION_UNSUPPORTED, _("live detach of device '%s' is not supported"), virDomainDeviceTypeToString(dev->type)); break; + case VIR_DOMAIN_DEVICE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected device type %d"), dev->type); + return -1; } if (ret == 0) @@ -7968,11 +7979,15 @@ qemuDomainUpdateDeviceLive(virConnectPtr conn, case VIR_DOMAIN_DEVICE_TPM: case VIR_DOMAIN_DEVICE_PANIC: case VIR_DOMAIN_DEVICE_IOMMU: - case VIR_DOMAIN_DEVICE_LAST: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("live update of device '%s' is not supported"), virDomainDeviceTypeToString(dev->type)); break; + case VIR_DOMAIN_DEVICE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected device type %d"), dev->type); + return -1; } return ret; @@ -8155,11 +8170,15 @@ qemuDomainAttachDeviceConfig(virDomainDefPtr vmdef, case VIR_DOMAIN_DEVICE_TPM: case VIR_DOMAIN_DEVICE_PANIC: case VIR_DOMAIN_DEVICE_IOMMU: - case VIR_DOMAIN_DEVICE_LAST: virReportError(VIR_ERR_OPERATION_UNSUPPORTED, _("persistent attach of device '%s' is not supported"), virDomainDeviceTypeToString(dev->type)); return -1; + case VIR_DOMAIN_DEVICE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected device type %d"), dev->type); + return -1; } if (virDomainDefPostParse(vmdef, caps, parse_flags, xmlopt, NULL) < 0) @@ -8338,11 +8357,15 @@ qemuDomainDetachDeviceConfig(virDomainDefPtr vmdef, case VIR_DOMAIN_DEVICE_TPM: case VIR_DOMAIN_DEVICE_PANIC: case VIR_DOMAIN_DEVICE_IOMMU: - case VIR_DOMAIN_DEVICE_LAST: virReportError(VIR_ERR_OPERATION_UNSUPPORTED, _("persistent detach of device '%s' is not supported"), virDomainDeviceTypeToString(dev->type)); return -1; + case VIR_DOMAIN_DEVICE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected device type %d"), dev->type); + return -1; } if (virDomainDefPostParse(vmdef, caps, parse_flags, xmlopt, NULL) < 0) @@ -8425,11 +8448,15 @@ qemuDomainUpdateDeviceConfig(virDomainDefPtr vmdef, case VIR_DOMAIN_DEVICE_TPM: case VIR_DOMAIN_DEVICE_PANIC: case VIR_DOMAIN_DEVICE_IOMMU: - case VIR_DOMAIN_DEVICE_LAST: virReportError(VIR_ERR_OPERATION_UNSUPPORTED, _("persistent update of device '%s' is not supported"), virDomainDeviceTypeToString(dev->type)); return -1; + case VIR_DOMAIN_DEVICE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected device type %d"), dev->type); + return -1; } if (virDomainDefPostParse(vmdef, caps, parse_flags, xmlopt, NULL) < 0) @@ -13268,6 +13295,11 @@ qemuDomainGetJobInfoDumpStats(virQEMUDriverPtr driver, VIR_DEBUG("dump completed, bytes written='%llu'", jobInfo->stats.dump.completed); break; + + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected dump status %d"), jobInfo->stats.dump.status); + return -1; } return 0; @@ -13329,6 +13361,11 @@ qemuDomainGetJobStatsInternal(virQEMUDriverPtr driver, case QEMU_DOMAIN_JOB_STATS_TYPE_NONE: break; + + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected job stats type %d"), jobInfo->statsType); + goto cleanup; } ret = 0; @@ -14120,23 +14157,30 @@ qemuDomainSnapshotPrepareDiskExternalInactive(virDomainSnapshotDiskDefPtr snapdi case VIR_STORAGE_NET_PROTOCOL_TFTP: case VIR_STORAGE_NET_PROTOCOL_SSH: case VIR_STORAGE_NET_PROTOCOL_VXHS: - case VIR_STORAGE_NET_PROTOCOL_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, _("external inactive snapshots are not supported on " "'network' disks using '%s' protocol"), virStorageNetProtocolTypeToString(domdisk->src->protocol)); return -1; + case VIR_STORAGE_NET_PROTOCOL_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected storage protocol %d"), snapdisk->src->protocol); + return -1; } break; case VIR_STORAGE_TYPE_DIR: case VIR_STORAGE_TYPE_VOLUME: case VIR_STORAGE_TYPE_NONE: - case VIR_STORAGE_TYPE_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, _("external inactive snapshots are not supported on " "'%s' disks"), virStorageTypeToString(domDiskType)); return -1; + case VIR_STORAGE_TYPE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected storage type %d"), domDiskType); } switch ((virStorageType) snapDiskType) { @@ -14148,11 +14192,14 @@ qemuDomainSnapshotPrepareDiskExternalInactive(virDomainSnapshotDiskDefPtr snapdi case VIR_STORAGE_TYPE_DIR: case VIR_STORAGE_TYPE_VOLUME: case VIR_STORAGE_TYPE_NONE: - case VIR_STORAGE_TYPE_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, _("external inactive snapshots are not supported on " "'%s' disks"), virStorageTypeToString(snapDiskType)); return -1; + case VIR_STORAGE_TYPE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected storage type %d"), snapDiskType); } if (qemuDomainSnapshotPrepareDiskShared(snapdisk, domdisk) < 0) @@ -14197,24 +14244,31 @@ qemuDomainSnapshotPrepareDiskExternalActive(virDomainSnapshotDiskDefPtr snapdisk case VIR_STORAGE_NET_PROTOCOL_TFTP: case VIR_STORAGE_NET_PROTOCOL_SSH: case VIR_STORAGE_NET_PROTOCOL_VXHS: - case VIR_STORAGE_NET_PROTOCOL_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, _("external active snapshots are not supported on " "'network' disks using '%s' protocol"), virStorageNetProtocolTypeToString(snapdisk->src->protocol)); return -1; - + case VIR_STORAGE_NET_PROTOCOL_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected storage protocol %d"), snapdisk->src->protocol); + return -1; } break; case VIR_STORAGE_TYPE_DIR: case VIR_STORAGE_TYPE_VOLUME: case VIR_STORAGE_TYPE_NONE: - case VIR_STORAGE_TYPE_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, _("external active snapshots are not supported on " "'%s' disks"), virStorageTypeToString(actualType)); return -1; + case VIR_STORAGE_TYPE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected storage type %d"), actualType); + return -1; } if (qemuDomainSnapshotPrepareDiskShared(snapdisk, domdisk) < 0) @@ -14315,23 +14369,31 @@ qemuDomainSnapshotPrepareDiskInternal(virConnectPtr conn, case VIR_STORAGE_NET_PROTOCOL_TFTP: case VIR_STORAGE_NET_PROTOCOL_SSH: case VIR_STORAGE_NET_PROTOCOL_VXHS: - case VIR_STORAGE_NET_PROTOCOL_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, _("internal inactive snapshots are not supported on " "'network' disks using '%s' protocol"), virStorageNetProtocolTypeToString(disk->src->protocol)); return -1; + case VIR_STORAGE_NET_PROTOCOL_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected storage protocol %d"), disk->src->protocol); + return -1; } break; case VIR_STORAGE_TYPE_DIR: case VIR_STORAGE_TYPE_VOLUME: case VIR_STORAGE_TYPE_NONE: - case VIR_STORAGE_TYPE_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, _("internal inactive snapshots are not supported on " "'%s' disks"), virStorageTypeToString(actualType)); return -1; + case VIR_STORAGE_TYPE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected storage type %d"), actualType); + return -1; } return 0; @@ -14425,10 +14487,14 @@ qemuDomainSnapshotPrepare(virConnectPtr conn, break; case VIR_DOMAIN_SNAPSHOT_LOCATION_DEFAULT: - case VIR_DOMAIN_SNAPSHOT_LOCATION_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("unexpected code path")); goto cleanup; + case VIR_DOMAIN_SNAPSHOT_LOCATION_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected snapshot location type %d"), disk->snapshot); + goto cleanup; } } @@ -15176,10 +15242,14 @@ qemuDomainSnapshotCreateXML(virDomainPtr domain, /* invalid states */ case VIR_DOMAIN_NOSTATE: case VIR_DOMAIN_BLOCKED: /* invalid state, unused in qemu */ - case VIR_DOMAIN_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, _("Invalid domain state %s"), virDomainStateTypeToString(vm->state.state)); goto cleanup; + case VIR_DOMAIN_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected domain state %d"), vm->state.state); + goto endjob; } /* We are going to modify the domain below. Internal snapshots would use @@ -16089,12 +16159,16 @@ qemuDomainRevertToSnapshot(virDomainSnapshotPtr snapshot, case VIR_DOMAIN_NOSTATE: case VIR_DOMAIN_BLOCKED: - case VIR_DOMAIN_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, _("Invalid target domain state '%s'. Refusing " "snapshot reversion"), virDomainStateTypeToString(snap->def->state)); goto endjob; + case VIR_DOMAIN_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected domain state %d"), snap->def->state); + goto endjob; } ret = 0; @@ -21182,6 +21256,7 @@ qemuDomainModifyLifecycleAction(virDomainDefPtr def, def->onCrash = action; break; case VIR_DOMAIN_LIFECYCLE_LAST: + default: break; } } diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c index 73d26f4c63..724a72867a 100644 --- a/src/qemu/qemu_hostdev.c +++ b/src/qemu/qemu_hostdev.c @@ -240,7 +240,10 @@ qemuHostdevPreparePCIDevicesCheckSupport(virDomainHostdevDefPtr *hostdevs, case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_XEN: case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_TYPE_LAST: - break; + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected hostdev PCI backend %d"), *backend); + return false; } } diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 0d7d02c25b..ac66df9ab9 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -778,15 +778,23 @@ qemuDomainAttachDeviceDiskLive(virConnectPtr conn, case VIR_DOMAIN_DISK_BUS_UML: case VIR_DOMAIN_DISK_BUS_SATA: case VIR_DOMAIN_DISK_BUS_SD: - case VIR_DOMAIN_DISK_BUS_LAST: virReportError(VIR_ERR_OPERATION_UNSUPPORTED, _("disk bus '%s' cannot be hotplugged."), virDomainDiskBusTypeToString(disk->bus)); + goto cleanup; + case VIR_DOMAIN_DISK_BUS_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected disk bus %d"), disk->bus); + goto cleanup; } break; case VIR_DOMAIN_DISK_DEVICE_LAST: - break; + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected disk device type %d"), disk->device); + goto cleanup; } cleanup: @@ -986,11 +994,16 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver, case VIR_DOMAIN_NET_TYPE_MCAST: case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_UDP: - case VIR_DOMAIN_NET_TYPE_LAST: virReportError(VIR_ERR_OPERATION_UNSUPPORTED, _("hotplug of interface type of %s is not implemented yet"), virDomainNetTypeToString(actualType)); goto cleanup; + + case VIR_DOMAIN_NET_TYPE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected net type %d"), actualType); + goto cleanup; } /* Set device online immediately */ @@ -1297,12 +1310,15 @@ qemuDomainAttachHostPCIDevice(virQEMUDriverPtr driver, break; case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_XEN: - case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_TYPE_LAST: virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("QEMU does not support device assignment mode '%s'"), virDomainHostdevSubsysPCIBackendTypeToString(backend)); goto error; - break; + case VIR_DOMAIN_HOSTDEV_PCI_BACKEND_TYPE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected hostdev PCI backend %d"), backend); + goto error; } /* Temporarily add the hostdev to the domain definition. This is needed @@ -2662,6 +2678,9 @@ qemuDomainAttachShmemDevice(virQEMUDriverPtr driver, virDomainShmemModelTypeToString(shmem->model)); ATTRIBUTE_FALLTHROUGH; case VIR_DOMAIN_SHMEM_MODEL_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected shmem device type %d"), shmem->model); return -1; } @@ -3590,9 +3609,15 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver, break; case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NONE: - case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_LAST: /* nada */ break; + + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected graphics listen type %d"), + newlisten->type); + goto cleanup; } } @@ -4077,7 +4102,11 @@ qemuDomainRemoveHostDevice(virQEMUDriverPtr driver, case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV: break; case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST: - break; + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected hostdev subsystem type %d"), + hostdev->source.subsys.type); + goto cleanup; } virDomainHostdevDefFree(hostdev); @@ -4536,11 +4565,15 @@ qemuDomainRemoveDevice(virQEMUDriverPtr driver, case VIR_DOMAIN_DEVICE_TPM: case VIR_DOMAIN_DEVICE_PANIC: case VIR_DOMAIN_DEVICE_IOMMU: - case VIR_DOMAIN_DEVICE_LAST: virReportError(VIR_ERR_OPERATION_UNSUPPORTED, _("don't know how to remove a %s device"), virDomainDeviceTypeToString(dev->type)); break; + case VIR_DOMAIN_DEVICE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected device type %d"), dev->type); + break; } return ret; } @@ -5153,6 +5186,9 @@ qemuDomainDetachShmemDevice(virQEMUDriverPtr driver, virDomainShmemModelTypeToString(shmem->model)); ATTRIBUTE_FALLTHROUGH; case VIR_DOMAIN_SHMEM_MODEL_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected shmem model %d"), shmem->model); return -1; } @@ -6282,10 +6318,14 @@ qemuDomainDetachInputDevice(virDomainObjPtr vm, virDomainInputBusTypeToString(input->bus)); return -1; - case VIR_DOMAIN_INPUT_BUS_LAST: case VIR_DOMAIN_INPUT_BUS_USB: case VIR_DOMAIN_INPUT_BUS_VIRTIO: break; + case VIR_DOMAIN_INPUT_BUS_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected input bus %d"), input->bus); + return -1; } qemuDomainMarkDeviceForRemoval(vm, &input->info); diff --git a/src/qemu/qemu_interface.c b/src/qemu/qemu_interface.c index cebb490221..93f5a9185a 100644 --- a/src/qemu/qemu_interface.c +++ b/src/qemu/qemu_interface.c @@ -122,9 +122,13 @@ qemuInterfaceStartDevice(virDomainNetDefPtr net) case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_HOSTDEV: - case VIR_DOMAIN_NET_TYPE_LAST: /* these types all require no action */ break; + case VIR_DOMAIN_NET_TYPE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected net type %d"), actualType); + goto cleanup; } ret = 0; @@ -210,9 +214,13 @@ qemuInterfaceStopDevice(virDomainNetDefPtr net) case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_INTERNAL: case VIR_DOMAIN_NET_TYPE_HOSTDEV: - case VIR_DOMAIN_NET_TYPE_LAST: /* these types all require no action */ break; + case VIR_DOMAIN_NET_TYPE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected net type %d"), actualType); + goto cleanup; } ret = 0; diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index fe3342b38d..39d4ba7709 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -352,11 +352,15 @@ qemuMigrationPrecreateDisk(virConnectPtr conn, case VIR_STORAGE_TYPE_BLOCK: case VIR_STORAGE_TYPE_DIR: case VIR_STORAGE_TYPE_NONE: - case VIR_STORAGE_TYPE_LAST: virReportError(VIR_ERR_INTERNAL_ERROR, _("cannot precreate storage for disk type '%s'"), virStorageTypeToString(disk->src->type)); goto cleanup; + case VIR_STORAGE_TYPE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unespected storage type %d"), disk->src->type); + goto cleanup; } if ((vol = virStorageVolLookupByName(pool, volName))) { @@ -775,6 +779,11 @@ qemuMigrationCancelOneDriveMirror(virQEMUDriverPtr driver, case VIR_DOMAIN_BLOCK_JOB_COMPLETED: ret = 1; goto cleanup; + + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("UJnexpected block job status %d"), status); + goto cleanup; } if (!(diskAlias = qemuAliasFromDisk(disk))) @@ -1400,6 +1409,7 @@ qemuMigrationUpdateJobType(qemuDomainJobInfoPtr jobInfo) case QEMU_MONITOR_MIGRATION_STATUS_ACTIVE: case QEMU_MONITOR_MIGRATION_STATUS_CANCELLING: case QEMU_MONITOR_MIGRATION_STATUS_LAST: + default: break; } } @@ -1500,6 +1510,11 @@ qemuMigrationCheckJobStatus(virQEMUDriverPtr driver, case QEMU_DOMAIN_JOB_STATUS_POSTCOPY: case QEMU_DOMAIN_JOB_STATUS_PAUSED: break; + + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected job status %d"), jobInfo->status); + goto cleanup; } ret = 0; @@ -1603,6 +1618,7 @@ qemuMigrationCompleted(virQEMUDriverPtr driver, case QEMU_DOMAIN_JOB_STATUS_ACTIVE: case QEMU_DOMAIN_JOB_STATUS_COMPLETED: case QEMU_DOMAIN_JOB_STATUS_NONE: + default: /* Impossible. */ break; } @@ -1961,6 +1977,7 @@ qemuMigrationCleanup(virDomainObjPtr vm, /* single phase outgoing migration; unreachable */ case QEMU_MIGRATION_PHASE_NONE: case QEMU_MIGRATION_PHASE_LAST: + default: /* unreachable */ ; } @@ -3899,6 +3916,11 @@ qemuMigrationRun(virQEMUDriverPtr driver, spec->dest.fd.qemu); VIR_FORCE_CLOSE(spec->dest.fd.qemu); break; + + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected migration dest type %d"), spec->destType); + goto exit_monitor; } if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0) diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_cookie.c index 945530c409..5c721e7fe1 100644 --- a/src/qemu/qemu_migration_cookie.c +++ b/src/qemu/qemu_migration_cookie.c @@ -340,8 +340,12 @@ qemuMigrationCookieAddGraphics(qemuMigrationCookiePtr mig, case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_SOCKET: case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NONE: - case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_LAST: break; + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected graphics listen type %d"), glisten->type); + return -1; } /* Seamless migration is supported only for one graphics. */ diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 9b5ad72cf9..455a4eff17 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -2234,9 +2234,11 @@ qemuMonitorBlockIOStatusToError(const char *status) /* unreachable */ case QEMU_MONITOR_BLOCK_IO_STATUS_LAST: - break; + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected block IO status %d"), st); + return -1; } - return -1; } @@ -3680,6 +3682,7 @@ qemuMonitorVMStatusToPausedReason(const char *status) /* unreachable from this point on */ case QEMU_MONITOR_VM_STATUS_LAST: + default: ; } return VIR_DOMAIN_PAUSED_UNKNOWN; @@ -3865,7 +3868,10 @@ qemuMonitorCPUModelInfoCopy(const qemuMonitorCPUModelInfo *orig) break; case QEMU_MONITOR_CPU_PROPERTY_LAST: - break; + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected CPU property %d"), orig->props[i].type); + goto error; } } @@ -4366,6 +4372,7 @@ qemuMonitorGuestPanicEventInfoFormatMsg(qemuMonitorEventPanicInfoPtr info) case QEMU_MONITOR_EVENT_PANIC_INFO_TYPE_NONE: case QEMU_MONITOR_EVENT_PANIC_INFO_TYPE_LAST: + default: break; } diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 242b92ea3f..790ea0277c 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -899,6 +899,7 @@ qemuMonitorJSONHandleBlockJobImpl(qemuMonitorPtr mon, break; case VIR_DOMAIN_BLOCK_JOB_FAILED: case VIR_DOMAIN_BLOCK_JOB_LAST: + default: VIR_DEBUG("should not get here"); break; } @@ -1619,7 +1620,7 @@ qemuMonitorJSONUpdateVideoMemorySize(qemuMonitorPtr mon, {0} }; - switch (video->type) { + switch ((virDomainVideoType)video->type) { case VIR_DOMAIN_VIDEO_TYPE_VGA: if (qemuMonitorJSONGetObjectProperty(mon, path, "vgamem_mb", &prop) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -1663,10 +1664,22 @@ qemuMonitorJSONUpdateVideoMemorySize(qemuMonitorPtr mon, video->vram = prop.val.ul * 1024; break; case VIR_DOMAIN_VIDEO_TYPE_CIRRUS: + case VIR_DOMAIN_VIDEO_TYPE_DEFAULT: + case VIR_DOMAIN_VIDEO_TYPE_VIRTIO: + break; case VIR_DOMAIN_VIDEO_TYPE_XEN: case VIR_DOMAIN_VIDEO_TYPE_VBOX: + case VIR_DOMAIN_VIDEO_TYPE_GOP: + case VIR_DOMAIN_VIDEO_TYPE_PARALLELS: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unsupported video type %s"), + virDomainVideoTypeToString(video->type)); + return -1; case VIR_DOMAIN_VIDEO_TYPE_LAST: - break; + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected video type %d"), video->type); + return -1; } return 0; @@ -1689,7 +1702,7 @@ qemuMonitorJSONUpdateVideoVram64Size(qemuMonitorPtr mon, {0} }; - switch (video->type) { + switch ((virDomainVideoType)video->type) { case VIR_DOMAIN_VIDEO_TYPE_QXL: if (video->vram64 != 0) { if (qemuMonitorJSONGetObjectProperty(mon, path, @@ -1705,10 +1718,22 @@ qemuMonitorJSONUpdateVideoVram64Size(qemuMonitorPtr mon, case VIR_DOMAIN_VIDEO_TYPE_VGA: case VIR_DOMAIN_VIDEO_TYPE_VMVGA: case VIR_DOMAIN_VIDEO_TYPE_CIRRUS: + case VIR_DOMAIN_VIDEO_TYPE_DEFAULT: + case VIR_DOMAIN_VIDEO_TYPE_VIRTIO: + break; case VIR_DOMAIN_VIDEO_TYPE_XEN: case VIR_DOMAIN_VIDEO_TYPE_VBOX: + case VIR_DOMAIN_VIDEO_TYPE_GOP: + case VIR_DOMAIN_VIDEO_TYPE_PARALLELS: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unsupported video type %s"), + virDomainVideoTypeToString(video->type)); + return -1; case VIR_DOMAIN_VIDEO_TYPE_LAST: - break; + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected video type %d"), video->type); + return -1; } return 0; @@ -3075,6 +3100,11 @@ qemuMonitorJSONGetMigrationStatsReply(virJSONValuePtr reply, } } break; + + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected migration status %d"), stats->status); + return -1; } return 0; @@ -5297,6 +5327,11 @@ qemuMonitorJSONParseCPUModelProperty(const char *key, case VIR_JSON_TYPE_ARRAY: case VIR_JSON_TYPE_NULL: return 0; + + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected JSON value type %d"), value->type); + return -1; } machine_model->nprops++; @@ -5351,6 +5386,10 @@ qemuMonitorJSONGetCPUModelExpansion(qemuMonitorPtr mon, case QEMU_MONITOR_CPU_MODEL_EXPANSION_FULL: typeStr = "full"; break; + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected CPU model expansion %d"), type); + goto cleanup; } if (!(cmd = qemuMonitorJSONMakeCommand("query-cpu-model-expansion", @@ -5935,11 +5974,11 @@ int qemuMonitorJSONGetObjectProperty(qemuMonitorPtr mon, ret = 0; break; case QEMU_MONITOR_OBJECT_PROPERTY_LAST: + default: virReportError(VIR_ERR_INTERNAL_ERROR, _("qom-get invalid object property type %d"), prop->type); goto cleanup; - break; } if (ret == -1) { @@ -5998,6 +6037,7 @@ int qemuMonitorJSONSetObjectProperty(qemuMonitorPtr mon, MAKE_SET_CMD("s:value", prop->val.str); break; case QEMU_MONITOR_OBJECT_PROPERTY_LAST: + default: virReportError(VIR_ERR_INTERNAL_ERROR, _("qom-set invalid object property type %d"), prop->type); @@ -6708,16 +6748,15 @@ qemuMonitorJSONAttachCharDevCommand(const char *chrID, case VIR_DOMAIN_CHR_TYPE_PIPE: case VIR_DOMAIN_CHR_TYPE_STDIO: case VIR_DOMAIN_CHR_TYPE_NMDM: + virReportError(VIR_ERR_OPERATION_FAILED, + _("Hotplug unsupported for char device type '%s'"), + virDomainChrTypeToString(chr->type)); + goto cleanup; case VIR_DOMAIN_CHR_TYPE_LAST: - if (virDomainChrTypeToString(chr->type)) { - virReportError(VIR_ERR_OPERATION_FAILED, - _("Hotplug unsupported for char device type '%s'"), - virDomainChrTypeToString(chr->type)); - } else { - virReportError(VIR_ERR_OPERATION_FAILED, - _("Hotplug unsupported for char device type '%d'"), - chr->type); - } + default: + virReportError(VIR_ERR_OPERATION_FAILED, + _("Unexpected chardev type %d"), + chr->type); goto cleanup; } diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index 2db71548cb..ddab0e7d5a 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -618,6 +618,9 @@ static int parseMemoryStat(char **text, unsigned int tag, case VIR_DOMAIN_MEMORY_STAT_UNUSED: case VIR_DOMAIN_MEMORY_STAT_AVAILABLE: value >>= 10; + break; + default: + break; } mstat->tag = tag; mstat->val = value; diff --git a/src/qemu/qemu_parse_command.c b/src/qemu/qemu_parse_command.c index 5fe3f97d03..3f5c4c0cbc 100644 --- a/src/qemu/qemu_parse_command.c +++ b/src/qemu/qemu_parse_command.c @@ -1577,7 +1577,10 @@ qemuParseCommandLineCPU(virDomainDefPtr dom, break; case VIR_DOMAIN_HYPERV_LAST: - break; + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected hyperv feature %d"), f); + goto cleanup; } virStringListFree(hv_tokens); hv_tokens = NULL; @@ -2174,10 +2177,15 @@ qemuParseCommandLine(virCapsPtr caps, case VIR_STORAGE_NET_PROTOCOL_FTPS: case VIR_STORAGE_NET_PROTOCOL_TFTP: case VIR_STORAGE_NET_PROTOCOL_SSH: - case VIR_STORAGE_NET_PROTOCOL_LAST: case VIR_STORAGE_NET_PROTOCOL_NONE: /* ignored for now */ break; + case VIR_STORAGE_NET_PROTOCOL_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected storage protocol %d"), + disk->src->protocol); + goto error; } } diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index b86ecda93f..9f30e80046 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2702,7 +2702,7 @@ qemuProcessUpdateVideoRamSize(virQEMUDriverPtr driver, for (i = 0; i < vm->def->nvideos; i++) { video = vm->def->videos[i]; - switch (video->type) { + switch ((virDomainVideoType)video->type) { case VIR_DOMAIN_VIDEO_TYPE_VGA: if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_VGA_VGAMEM)) { if (qemuMonitorUpdateVideoMemorySize(priv->mon, video, "VGA") < 0) @@ -2740,10 +2740,22 @@ qemuProcessUpdateVideoRamSize(virQEMUDriverPtr driver, } break; case VIR_DOMAIN_VIDEO_TYPE_CIRRUS: + case VIR_DOMAIN_VIDEO_TYPE_DEFAULT: + case VIR_DOMAIN_VIDEO_TYPE_VIRTIO: + break; + case VIR_DOMAIN_VIDEO_TYPE_GOP: + case VIR_DOMAIN_VIDEO_TYPE_PARALLELS: case VIR_DOMAIN_VIDEO_TYPE_XEN: case VIR_DOMAIN_VIDEO_TYPE_VBOX: + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Unsupported video type %s"), + virDomainVideoTypeToString(video->type)); + goto error; case VIR_DOMAIN_VIDEO_TYPE_LAST: - break; + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected video type %d"), video->type); + goto error; } } @@ -3092,6 +3104,11 @@ qemuProcessRecoverMigrationIn(virQEMUDriverPtr driver, return -1; } break; + + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected migration phase %d"), phase); + return -1; } qemuMigrationReset(driver, vm, QEMU_ASYNC_JOB_NONE); @@ -3172,6 +3189,11 @@ qemuProcessRecoverMigrationOut(virQEMUDriverPtr driver, /* migration completed, we need to kill the domain here */ *stopFlags |= VIR_QEMU_PROCESS_STOP_MIGRATED; return -1; + + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected migration phase %d"), phase); + return -1; } if (resume) { @@ -3253,8 +3275,12 @@ qemuProcessRecoverJob(virQEMUDriverPtr driver, break; case QEMU_ASYNC_JOB_NONE: - case QEMU_ASYNC_JOB_LAST: break; + case QEMU_ASYNC_JOB_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected job type %d"), job->asyncJob); + return -1; } if (!virDomainObjIsActive(vm)) @@ -3290,8 +3316,12 @@ qemuProcessRecoverJob(virQEMUDriverPtr driver, case QEMU_JOB_ASYNC_NESTED: /* async job was already handled above */ case QEMU_JOB_NONE: - case QEMU_JOB_LAST: break; + case QEMU_JOB_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected job type %d"), job->active); + return -1; } return 0; @@ -3612,6 +3642,12 @@ qemuProcessSPICEAllocatePorts(virQEMUDriverPtr driver, case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_ANY: /* default mode will be used */ break; + + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected SPICE channel mode %d"), + graphics->data.spice.channels[i]); + goto cleanup; } } switch (defaultMode) { @@ -3628,6 +3664,12 @@ qemuProcessSPICEAllocatePorts(virQEMUDriverPtr driver, needTLSPort = true; needPort = true; break; + + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected SPICE channel mode %d"), + defaultMode); + goto cleanup; } } @@ -3748,6 +3790,7 @@ qemuProcessVerifyHypervFeatures(virDomainDefPtr def, /* coverity[dead_error_begin] */ case VIR_DOMAIN_HYPERV_VENDOR_ID: case VIR_DOMAIN_HYPERV_LAST: + default: break; } } @@ -4297,10 +4340,18 @@ qemuProcessGraphicsReservePorts(virQEMUDriverPtr driver, break; case VIR_DOMAIN_GRAPHICS_TYPE_SDL: + break; case VIR_DOMAIN_GRAPHICS_TYPE_RDP: case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP: + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Unsupported graphics type %s"), + virDomainGraphicsTypeToString(graphics->type)); + return -1; case VIR_DOMAIN_GRAPHICS_TYPE_LAST: - break; + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected graphics type %d"), graphics->type); + return -1; } return 0; @@ -4335,9 +4386,17 @@ qemuProcessGraphicsAllocatePorts(virQEMUDriverPtr driver, break; case VIR_DOMAIN_GRAPHICS_TYPE_SDL: + break; case VIR_DOMAIN_GRAPHICS_TYPE_RDP: case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP: + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Unsupported graphics type %s"), + virDomainGraphicsTypeToString(graphics->type)); + return -1; case VIR_DOMAIN_GRAPHICS_TYPE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected graphics type %d"), graphics->type); break; } @@ -4371,7 +4430,7 @@ qemuProcessGetNetworkAddress(virConnectPtr conn, if (!netdef) goto cleanup; - switch (netdef->forward.type) { + switch ((virNetworkForwardType)netdef->forward.type) { case VIR_NETWORK_FORWARD_NONE: case VIR_NETWORK_FORWARD_NAT: case VIR_NETWORK_FORWARD_ROUTE: @@ -4408,6 +4467,16 @@ qemuProcessGetNetworkAddress(virConnectPtr conn, goto cleanup; } break; + + case VIR_NETWORK_FORWARD_HOSTDEV: + break; + + case VIR_NETWORK_FORWARD_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected network forward type %d"), + netdef->forward.type); + goto cleanup; } if (dev_name) { @@ -4484,10 +4553,18 @@ qemuProcessGraphicsSetupListen(virConnectPtr conn, break; case VIR_DOMAIN_GRAPHICS_TYPE_SDL: + break; case VIR_DOMAIN_GRAPHICS_TYPE_RDP: case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP: + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Unsupported graphics type %s"), + virDomainGraphicsTypeToString(graphics->type)); + goto cleanup; case VIR_DOMAIN_GRAPHICS_TYPE_LAST: - break; + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected graphics type %d"), graphics->type); + goto cleanup; } for (i = 0; i < graphics->nListens; i++) { @@ -4534,8 +4611,12 @@ qemuProcessGraphicsSetupListen(virConnectPtr conn, break; case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_NONE: - case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_LAST: break; + case VIR_DOMAIN_GRAPHICS_LISTEN_TYPE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected graphics listen type %d"), glisten->type); + goto cleanup; } } @@ -4773,10 +4854,18 @@ qemuProcessStartValidateGraphics(virDomainObjPtr vm) break; case VIR_DOMAIN_GRAPHICS_TYPE_SDL: + break; case VIR_DOMAIN_GRAPHICS_TYPE_RDP: case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP: + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Unsupported graphics type %s"), + virDomainGraphicsTypeToString(graphics->type)); + return -1; case VIR_DOMAIN_GRAPHICS_TYPE_LAST: - break; + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected graphics type %d"), graphics->type); + return -1; } } @@ -6708,6 +6797,7 @@ void qemuProcessStop(virQEMUDriverPtr driver, case VIR_DOMAIN_NET_TYPE_HOSTDEV: case VIR_DOMAIN_NET_TYPE_UDP: case VIR_DOMAIN_NET_TYPE_LAST: + default: /* No special cleanup procedure for these types. */ break; } -- 2.14.3

Even if the compiler has validated that all enum constants have case statements in a switch, it is not safe to omit a default: case statement. When assigning a value to a variable / struct field that is defined with an enum type, nothing prevents an invalid value being assigned. So defensive code must assume existance of invalid values and thus all switches should have a default: case. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- src/uml/uml_conf.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/uml/uml_conf.c b/src/uml/uml_conf.c index 49589b33c9..e93aede797 100644 --- a/src/uml/uml_conf.c +++ b/src/uml/uml_conf.c @@ -259,7 +259,10 @@ umlBuildCommandLineNet(virConnectPtr conn, goto error; case VIR_DOMAIN_NET_TYPE_LAST: - break; + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected net type %d"), def->type); + goto error; } if (def->script) { -- 2.14.3

Even if the compiler has validated that all enum constants have case statements in a switch, it is not safe to omit a default: case statement. When assigning a value to a variable / struct field that is defined with an enum type, nothing prevents an invalid value being assigned. So defensive code must assume existance of invalid values and thus all switches should have a default: case. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- src/network/bridge_driver.c | 46 ++++++++++++++++++++++++++++++++++++++++----- src/network/leaseshelper.c | 11 +++++++++-- 2 files changed, 50 insertions(+), 7 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index dd6e3402ea..ce79a8ec7b 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -445,7 +445,7 @@ networkUpdateState(virNetworkObjPtr obj, } def = virNetworkObjGetDef(obj); - switch (def->forward.type) { + switch ((virNetworkForwardType)def->forward.type) { case VIR_NETWORK_FORWARD_NONE: case VIR_NETWORK_FORWARD_NAT: case VIR_NETWORK_FORWARD_ROUTE: @@ -484,6 +484,13 @@ networkUpdateState(virNetworkObjPtr obj, case VIR_NETWORK_FORWARD_HOSTDEV: /* so far no extra checks */ break; + + case VIR_NETWORK_FORWARD_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected network forward type %d"), + def->forward.type); + goto cleanup; } /* Try and read dnsmasq/radvd pids of active networks */ @@ -2731,9 +2738,14 @@ networkCreateInterfacePool(virNetworkDefPtr netdef) case VIR_NETWORK_FORWARD_NAT: case VIR_NETWORK_FORWARD_ROUTE: case VIR_NETWORK_FORWARD_OPEN: - case VIR_NETWORK_FORWARD_LAST: /* by definition these will never be encountered here */ break; + case VIR_NETWORK_FORWARD_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected network forward type %d"), + netdef->forward.type); + goto cleanup; } } @@ -2823,7 +2835,7 @@ networkStartNetwork(virNetworkDriverStatePtr driver, VIR_HOOK_SUBOP_BEGIN) < 0) goto cleanup; - switch (def->forward.type) { + switch ((virNetworkForwardType)def->forward.type) { case VIR_NETWORK_FORWARD_NONE: case VIR_NETWORK_FORWARD_NAT: @@ -2852,6 +2864,13 @@ networkStartNetwork(virNetworkDriverStatePtr driver, if (networkStartNetworkExternal(obj) < 0) goto cleanup; break; + + case VIR_NETWORK_FORWARD_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected network forward type %d"), + def->forward.type); + goto cleanup; } /* finally we can call the 'started' hook script if any */ @@ -2905,7 +2924,7 @@ networkShutdownNetwork(virNetworkDriverStatePtr driver, unlink(stateFile); VIR_FREE(stateFile); - switch (def->forward.type) { + switch ((virNetworkForwardType)def->forward.type) { case VIR_NETWORK_FORWARD_NONE: case VIR_NETWORK_FORWARD_NAT: @@ -2931,6 +2950,12 @@ networkShutdownNetwork(virNetworkDriverStatePtr driver, case VIR_NETWORK_FORWARD_HOSTDEV: ret = networkShutdownNetworkExternal(obj); break; + case VIR_NETWORK_FORWARD_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected network forward type %d"), + def->forward.type); + ret = -1; } /* now that we know it's stopped call the hook if present */ @@ -3408,8 +3433,14 @@ networkValidate(virNetworkDriverStatePtr driver, } case VIR_NETWORK_FORWARD_HOSTDEV_DEVICE_NONE: - case VIR_NETWORK_FORWARD_HOSTDEV_DEVICE_LAST: break; + + case VIR_NETWORK_FORWARD_HOSTDEV_DEVICE_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected network forward hostdev type %d"), + iface->type); + return -1; } } if ((def->forward.npfs > 0) + usesInterface + usesAddress > 1) { @@ -4616,6 +4647,11 @@ networkAllocateActualDevice(virDomainDefPtr dom, case VIR_NETWORK_FORWARD_PASSTHROUGH: iface->data.network.actual->data.direct.mode = VIR_NETDEV_MACVLAN_MODE_PASSTHRU; break; + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected network forward type %d"), + netdef->forward.type); + goto error; } /* merge virtualports from interface, network, and portgroup to diff --git a/src/network/leaseshelper.c b/src/network/leaseshelper.c index b4d87ee651..95cd2ee910 100644 --- a/src/network/leaseshelper.c +++ b/src/network/leaseshelper.c @@ -202,8 +202,12 @@ main(int argc, char **argv) break; case VIR_LEASE_ACTION_INIT: - case VIR_LEASE_ACTION_LAST: break; + case VIR_LEASE_ACTION_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected lease action %d"), action); + goto cleanup; } if (!(leases_array_new = virJSONValueNewArray())) { @@ -246,7 +250,10 @@ main(int argc, char **argv) break; case VIR_LEASE_ACTION_LAST: - break; + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected lease action %d"), action); + goto cleanup; } rv = EXIT_SUCCESS; -- 2.14.3

Even if the compiler has validated that all enum constants have case statements in a switch, it is not safe to omit a default: case statement. When assigning a value to a variable / struct field that is defined with an enum type, nothing prevents an invalid value being assigned. So defensive code must assume existance of invalid values and thus all switches should have a default: case. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- src/storage/storage_backend_gluster.c | 12 ++++++++++-- src/storage/storage_backend_rbd.c | 6 +++++- src/storage/storage_driver.c | 1 + src/storage/storage_util.c | 18 ++++++++++++++++-- 4 files changed, 32 insertions(+), 5 deletions(-) diff --git a/src/storage/storage_backend_gluster.c b/src/storage/storage_backend_gluster.c index c6cc531e2f..68c3ad0fab 100644 --- a/src/storage/storage_backend_gluster.c +++ b/src/storage/storage_backend_gluster.c @@ -436,7 +436,6 @@ virStorageBackendGlusterVolDelete(virStoragePoolObjPtr pool, case VIR_STORAGE_VOL_DIR: case VIR_STORAGE_VOL_BLOCK: case VIR_STORAGE_VOL_PLOOP: - case VIR_STORAGE_VOL_LAST: virReportError(VIR_ERR_NO_SUPPORT, _("removing of '%s' volumes is not supported " "by the gluster backend: %s"), @@ -472,6 +471,12 @@ virStorageBackendGlusterVolDelete(virStoragePoolObjPtr pool, } } break; + + case VIR_STORAGE_VOL_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected storage vol type %d"), vol->type); + goto cleanup; } ret = 0; @@ -606,7 +611,10 @@ virStorageFileBackendGlusterInitServer(virStorageFileBackendGlusterPrivPtr priv, break; case VIR_STORAGE_NET_HOST_TRANS_LAST: - break; + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected storage host transport %d"), host->transport); + return -1; } VIR_DEBUG("adding gluster host for %p: transport=%s host=%s port=%d", diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index 642cacb673..e5d9d59ca0 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -1252,10 +1252,14 @@ virStorageBackendRBDVolWipe(virStoragePoolObjPtr pool, case VIR_STORAGE_VOL_WIPE_ALG_PFITZNER7: case VIR_STORAGE_VOL_WIPE_ALG_PFITZNER33: case VIR_STORAGE_VOL_WIPE_ALG_RANDOM: - case VIR_STORAGE_VOL_WIPE_ALG_LAST: virReportError(VIR_ERR_INVALID_ARG, _("unsupported algorithm %d"), algorithm); goto cleanup; + case VIR_STORAGE_VOL_WIPE_ALG_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected storage vol wipe algorith %d"), algorithm); + goto cleanup; } if (r < 0) { diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index d5e38af5aa..10bf2e0bda 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -1602,6 +1602,7 @@ storageVolLookupByPathCallback(virStoragePoolObjPtr obj, case VIR_STORAGE_POOL_SHEEPDOG: case VIR_STORAGE_POOL_ZFS: case VIR_STORAGE_POOL_LAST: + default: ignore_value(VIR_STRDUP(stable_path, data->path)); break; } diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index b4aed0f700..83a8494f78 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -2256,11 +2256,15 @@ virStorageBackendVolDeleteLocal(virStoragePoolObjPtr pool ATTRIBUTE_UNUSED, case VIR_STORAGE_VOL_BLOCK: case VIR_STORAGE_VOL_NETWORK: case VIR_STORAGE_VOL_NETDIR: - case VIR_STORAGE_VOL_LAST: virReportError(VIR_ERR_NO_SUPPORT, _("removing block or network volumes is not supported: %s"), vol->target.path); return -1; + case VIR_STORAGE_VOL_LAST: + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected storage vol type %d"), vol->type); + return -1; } return 0; } @@ -2749,8 +2753,9 @@ storageBackendVolWipeLocalFile(const char *path, _("'trim' algorithm not supported")); goto cleanup; case VIR_STORAGE_VOL_WIPE_ALG_LAST: + default: virReportError(VIR_ERR_INVALID_ARG, - _("unsupported algorithm %d"), + _("Unexpected storage vol wipe algorithm %d"), algorithm); goto cleanup; } @@ -3273,6 +3278,10 @@ virStorageBackendBLKIDFindEmpty(const char *device, "expected format '%s'"), device, format); break; + + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected storage blkid result %d"), rc); } if (ret == 0 && blkid_do_probe(probe) != 1) { @@ -3448,6 +3457,11 @@ virStorageBackendPARTEDValidLabel(const char *device, virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("Unknown Partition Type, requires build --overwrite")); break; + + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected parted result %d"), check); + break; } return ret; -- 2.14.3

Even if the compiler has validated that all enum constants have case statements in a switch, it is not safe to omit a default: case statement. When assigning a value to a variable / struct field that is defined with an enum type, nothing prevents an invalid value being assigned. So defensive code must assume existance of invalid values and thus all switches should have a default: case. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- src/nwfilter/nwfilter_ebiptables_driver.c | 2 ++ src/nwfilter/nwfilter_gentech_driver.c | 23 ++++++++++++++++++++++- src/nwfilter/nwfilter_learnipaddr.c | 13 ++++++++++--- 3 files changed, 34 insertions(+), 4 deletions(-) diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c index c624337f4d..3d49884e2e 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.c +++ b/src/nwfilter/nwfilter_ebiptables_driver.c @@ -1129,6 +1129,8 @@ iptablesEnforceDirection(virFirewallPtr fw, break; case CTDIR_STATUS_OLD: break; + default: + break; } if (rule->tt != VIR_NWFILTER_RULE_DIRECTION_INOUT) diff --git a/src/nwfilter/nwfilter_gentech_driver.c b/src/nwfilter/nwfilter_gentech_driver.c index 840d419bb4..25822d5185 100644 --- a/src/nwfilter/nwfilter_gentech_driver.c +++ b/src/nwfilter/nwfilter_gentech_driver.c @@ -405,6 +405,10 @@ virNWFilterIncludeDefToRuleInst(virNWFilterDriverStatePtr driver, break; case INSTANTIATE_ALWAYS: break; + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected new filter action %d"), useNewFilter); + goto cleanup; } if (VIR_APPEND_ELEMENT(inst->filters, @@ -555,6 +559,11 @@ virNWFilterDetermineMissingVarsRec(virNWFilterDefPtr filter, break; case INSTANTIATE_ALWAYS: break; + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected new filter action %d"), useNewFilter); + rc = -1; + goto error; } rc = virNWFilterDetermineMissingVarsRec(next_filter, @@ -562,7 +571,7 @@ virNWFilterDetermineMissingVarsRec(virNWFilterDefPtr filter, missing_vars, useNewFilter, driver); - + error: virNWFilterHashTableFree(tmpvars); virNWFilterObjUnlock(obj); @@ -701,6 +710,10 @@ virNWFilterDoInstantiate(const unsigned char *vmuuid, case INSTANTIATE_ALWAYS: instantiate = true; break; + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected new filter action %d"), useNewFilter); + goto err_exit; } if (instantiate) { @@ -825,6 +838,10 @@ virNWFilterInstantiateFilterUpdate(virNWFilterDriverStatePtr driver, case INSTANTIATE_ALWAYS: break; + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected new filter action %d"), useNewFilter); + goto err_exit_vars1; } rc = virNWFilterDoInstantiate(vmuuid, techdriver, filter, @@ -1102,6 +1119,10 @@ virNWFilterDomainFWUpdateCB(virDomainObjPtr obj, _("Failure while applying current filter on " "VM %s"), vm->name); break; + default: + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unexpected filter step %d"), cb->step); + ret = -1; } if (ret) break; diff --git a/src/nwfilter/nwfilter_learnipaddr.c b/src/nwfilter/nwfilter_learnipaddr.c index 9ca0639576..e2a3704289 100644 --- a/src/nwfilter/nwfilter_learnipaddr.c +++ b/src/nwfilter/nwfilter_learnipaddr.c @@ -351,9 +351,14 @@ procDHCPOpts(struct dhcp *dhcp, int dhcp_opts_len, case DHCP_MSGT_DHCPOFFER: *vmaddr = dhcp->yiaddr; *howDetected = DETECT_DHCP; - break; + break; + default: + break; } } + break; + default: + break; } dhcp_opts_len -= (2 + dhcpopt->len); dhcpopt = (struct dhcp_option*)((char *)dhcpopt + 2 + dhcpopt->len); @@ -542,11 +547,13 @@ learnIPAddressThread(void *arg) case ARPOP_REPLY: vmaddr = arphdr->ar_sip; howDetected = DETECT_STATIC; - break; + break; case ARPOP_REQUEST: vmaddr = arphdr->ar_tip; howDetected = DETECT_STATIC; - break; + break; + default: + break; } } } else if (virMacAddrCmpRaw(&req->macaddr, -- 2.14.3

Even if the compiler has validated that all enum constants have case statements in a switch, it is not safe to omit a default: case statement. When assigning a value to a variable / struct field that is defined with an enum type, nothing prevents an invalid value being assigned. So defensive code must assume existance of invalid values and thus all switches should have a default: case. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- tests/cputest.c | 31 +++++++++++++++++++------------ tests/domaincapstest.c | 1 + tests/qemuhotplugtest.c | 4 ++++ tests/storagevolxml2argvtest.c | 2 ++ tests/virusbtest.c | 6 ++++++ 5 files changed, 32 insertions(+), 12 deletions(-) diff --git a/tests/cputest.c b/tests/cputest.c index 1e79edbef7..f29a6967dd 100644 --- a/tests/cputest.c +++ b/tests/cputest.c @@ -178,14 +178,18 @@ static const char * cpuTestCompResStr(virCPUCompareResult result) { switch (result) { - case VIR_CPU_COMPARE_ERROR: return "ERROR"; - case VIR_CPU_COMPARE_INCOMPATIBLE: return "INCOMPATIBLE"; - case VIR_CPU_COMPARE_IDENTICAL: return "IDENTICAL"; - case VIR_CPU_COMPARE_SUPERSET: return "SUPERSET"; - case VIR_CPU_COMPARE_LAST: break; + case VIR_CPU_COMPARE_ERROR: + return "ERROR"; + case VIR_CPU_COMPARE_INCOMPATIBLE: + return "INCOMPATIBLE"; + case VIR_CPU_COMPARE_IDENTICAL: + return "IDENTICAL"; + case VIR_CPU_COMPARE_SUPERSET: + return "SUPERSET"; + case VIR_CPU_COMPARE_LAST: + default: + return "unknown"; } - - return "unknown"; } @@ -193,12 +197,15 @@ static const char * cpuTestBoolWithErrorStr(enum cpuTestBoolWithError result) { switch (result) { - case FAIL: return "FAIL"; - case NO: return "NO"; - case YES: return "YES"; + case FAIL: + return "FAIL"; + case NO: + return "NO"; + case YES: + return "YES"; + default: + return "unknown"; } - - return "unknown"; } diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c index 533a4b3791..1d9fe0fd0f 100644 --- a/tests/domaincapstest.c +++ b/tests/domaincapstest.c @@ -301,6 +301,7 @@ test_virDomainCapsFormat(const void *opaque) switch (data->capsType) { case CAPS_NONE: + default: break; case CAPS_ALL: diff --git a/tests/qemuhotplugtest.c b/tests/qemuhotplugtest.c index 63bfe44145..47de86792a 100644 --- a/tests/qemuhotplugtest.c +++ b/tests/qemuhotplugtest.c @@ -329,6 +329,10 @@ testQemuHotplug(const void *data) case UPDATE: ret = testQemuHotplugUpdate(vm, dev); + break; + + default: + ret = -1; } cleanup: diff --git a/tests/storagevolxml2argvtest.c b/tests/storagevolxml2argvtest.c index 5857d5e350..f8330cb4d2 100644 --- a/tests/storagevolxml2argvtest.c +++ b/tests/storagevolxml2argvtest.c @@ -29,6 +29,8 @@ testSetVolumeType(virStorageVolDefPtr vol, case VIR_STORAGE_POOL_LOGICAL: vol->type = VIR_STORAGE_VOL_BLOCK; return; + default: + return; } } diff --git a/tests/virusbtest.c b/tests/virusbtest.c index 8728fe9092..a5bbbdbf32 100644 --- a/tests/virusbtest.c +++ b/tests/virusbtest.c @@ -93,6 +93,9 @@ static int testDeviceFind(const void *opaque) rv = virUSBDeviceFindByBus(info->bus, info->devno, info->vroot, info->mandatory, &dev); break; + default: + rv = -1; + break; } if (info->expectFailure) { @@ -123,6 +126,9 @@ static int testDeviceFind(const void *opaque) goto cleanup; } break; + default: + ret = -1; + goto cleanup; } ret = 0; -- 2.14.3

Even if the compiler has validated that all enum constants have case statements in a switch, it is not safe to omit a default: case statement. When assigning a value to a variable / struct field that is defined with an enum type, nothing prevents an invalid value being assigned. So defensive code must assume existance of invalid values and thus all switches should have a default: case. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- examples/object-events/event-test.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/examples/object-events/event-test.c b/examples/object-events/event-test.c index 8499e0b38e..edb17af82e 100644 --- a/examples/object-events/event-test.c +++ b/examples/object-events/event-test.c @@ -49,6 +49,7 @@ connectClose(virConnectPtr conn ATTRIBUTE_UNUSED, return; case VIR_CONNECT_CLOSE_REASON_LAST: + default: break; }; @@ -88,6 +89,7 @@ eventToString(int event) return "Crashed"; case VIR_DOMAIN_EVENT_LAST: + default: break; } @@ -115,6 +117,7 @@ eventDetailToString(int event, return "Snapshot"; case VIR_DOMAIN_EVENT_DEFINED_LAST: + default: break; } break; @@ -128,6 +131,7 @@ eventDetailToString(int event, return "Renamed"; case VIR_DOMAIN_EVENT_UNDEFINED_LAST: + default: break; } break; @@ -150,6 +154,7 @@ eventDetailToString(int event, return "Event wakeup"; case VIR_DOMAIN_EVENT_STARTED_LAST: + default: break; } break; @@ -184,6 +189,7 @@ eventDetailToString(int event, return "Post-copy Error"; case VIR_DOMAIN_EVENT_SUSPENDED_LAST: + default: break; } break; @@ -203,6 +209,7 @@ eventDetailToString(int event, return "Post-copy"; case VIR_DOMAIN_EVENT_RESUMED_LAST: + default: break; } break; @@ -231,6 +238,7 @@ eventDetailToString(int event, return "Snapshot"; case VIR_DOMAIN_EVENT_STOPPED_LAST: + default: break; } break; @@ -247,6 +255,7 @@ eventDetailToString(int event, return "Host request"; case VIR_DOMAIN_EVENT_SHUTDOWN_LAST: + default: break; } break; @@ -260,6 +269,7 @@ eventDetailToString(int event, return "Disk"; case VIR_DOMAIN_EVENT_PMSUSPENDED_LAST: + default: break; } break; @@ -270,11 +280,13 @@ eventDetailToString(int event, return "Panicked"; case VIR_DOMAIN_EVENT_CRASHED_LAST: + default: break; } break; case VIR_DOMAIN_EVENT_LAST: + default: break; } @@ -299,6 +311,7 @@ networkEventToString(int event) return "Stopped"; case VIR_NETWORK_EVENT_LAST: + default: break; } @@ -317,6 +330,7 @@ guestAgentLifecycleEventStateToString(int event) return "Connected"; case VIR_CONNECT_DOMAIN_EVENT_AGENT_LIFECYCLE_STATE_LAST: + default: break; } @@ -338,6 +352,7 @@ guestAgentLifecycleEventReasonToString(int event) return "Channel event"; case VIR_CONNECT_DOMAIN_EVENT_AGENT_LIFECYCLE_REASON_LAST: + default: break; } @@ -361,6 +376,7 @@ storagePoolEventToString(int event) case VIR_STORAGE_POOL_EVENT_DELETED: return "Deleted"; case VIR_STORAGE_POOL_EVENT_LAST: + default: break; } return "unknown"; @@ -375,6 +391,7 @@ nodeDeviceEventToString(int event) case VIR_NODE_DEVICE_EVENT_DELETED: return "Deleted"; case VIR_NODE_DEVICE_EVENT_LAST: + default: break; } return "unknown"; @@ -392,6 +409,7 @@ secretEventToString(int event) return "Undefined"; case VIR_SECRET_EVENT_LAST: + default: break; } @@ -527,6 +545,7 @@ graphicsPhaseToStr(int phase) return "disconnected"; case VIR_DOMAIN_EVENT_GRAPHICS_LAST: + default: break; } @@ -589,6 +608,7 @@ diskChangeReasonToStr(int reason) return "disk dropped due to startupPolicy"; case VIR_DOMAIN_EVENT_DISK_CHANGE_LAST: + default: break; } @@ -623,6 +643,7 @@ trayChangeReasonToStr(int reason) return "close"; case VIR_DOMAIN_EVENT_TRAY_CHANGE_LAST: + default: break; } @@ -874,6 +895,7 @@ blockJobTypeToStr(int type) switch ((virDomainBlockJobType) type) { case VIR_DOMAIN_BLOCK_JOB_TYPE_UNKNOWN: case VIR_DOMAIN_BLOCK_JOB_TYPE_LAST: + default: break; case VIR_DOMAIN_BLOCK_JOB_TYPE_PULL: @@ -910,6 +932,7 @@ blockJobStatusToStr(int status) return "ready"; case VIR_DOMAIN_BLOCK_JOB_LAST: + default: break; } @@ -1006,6 +1029,7 @@ metadataTypeToStr(int status) return "element"; case VIR_DOMAIN_METADATA_LAST: + default: break; } -- 2.14.3