From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 19 Feb 2013 10:08:05 +0000 (+0100)
Subject: conf: Ensure that new devices are added to conf copy function
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=1550d3165b8afbf403b0e8aa437b3b9e4d2d57d3;p=libvirt.git

conf: Ensure that new devices are added to conf copy function

Use the correct type and get rid of "default" label in switch to make
the compiler complain if a new device type is added.
---

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index bd1ea2597b..218a28be28 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -16030,7 +16030,7 @@ virDomainDeviceDefCopy(virCapsPtr caps,
     char *xmlStr = NULL;
     int rc = -1;
 
-    switch (src->type) {
+    switch ((virDomainDeviceType) src->type) {
     case VIR_DOMAIN_DEVICE_DISK:
         rc = virDomainDiskDefFormat(&buf, src->data.disk, flags);
         break;
@@ -16070,7 +16070,11 @@ virDomainDeviceDefCopy(virCapsPtr caps,
     case VIR_DOMAIN_DEVICE_REDIRDEV:
         rc = virDomainRedirdevDefFormat(&buf, src->data.redirdev, flags);
         break;
-    default:
+    case VIR_DOMAIN_DEVICE_NONE:
+    case VIR_DOMAIN_DEVICE_SMARTCARD:
+    case VIR_DOMAIN_DEVICE_CHR:
+    case VIR_DOMAIN_DEVICE_MEMBALLOON:
+    case VIR_DOMAIN_DEVICE_LAST:
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        _("Copying definition of '%d' type "
                          "is not implemented yet."),