Use ATTRIBUTE_FALLTHROUGH

Use ATTRIBUTE_FALLTHROUGH, introduced by commit
5d84f5961b8e28e802f600bb2d2c6903e219092e, instead of comments to
indicate that the fall through is an intentional behavior.

Signed-off-by: Marc Hartmayer <mhartmay@linux.vnet.ibm.com>
Reviewed-by: Boris Fiuczynski <fiuczy@linux.vnet.ibm.com>
Reviewed-by: Bjoern Walk <bwalk@linux.vnet.ibm.com>
(cherry picked from commit adf846d3c96ce5d45594c718003852684ddf0cb9)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index c2c104488529d58a28496b6bf8cef8f2d8df4349..dc8e07ca4f9a87c2c910652624f6ffe6cabd301e 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -16454,7 +16454,7 @@ virDomainDefParseXML(xmlDocPtr xml,
                 def->apic_eoi = eoi;
                 VIR_FREE(tmp);
             }
-            /* fallthrough */
+            ATTRIBUTE_FALLTHROUGH;
         case VIR_DOMAIN_FEATURE_ACPI:
         case VIR_DOMAIN_FEATURE_PAE:
         case VIR_DOMAIN_FEATURE_VIRIDIAN:

diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c
index 2cdcfa74eb235b5bcbf6ad77f08b69ee8afd0d3c..d808c252ebaab0bf883a22d054a7bedcfd1f1591 100644 (file)
--- a/src/conf/nwfilter_conf.c
+++ b/src/conf/nwfilter_conf.c
@@ -1868,7 +1868,7 @@ virNWFilterRuleDetailsParse(xmlNodePtr node,
                     switch (datatype) {
                         case DATATYPE_UINT8_HEX:
                             base = 16;
-                            /* fallthrough */
+                            ATTRIBUTE_FALLTHROUGH;
                         case DATATYPE_UINT8:
                             if (virStrToLong_ui(prop, NULL, base, &uint_val) >= 0) {
                                 if (uint_val <= 0xff) {
@@ -1885,7 +1885,7 @@ virNWFilterRuleDetailsParse(xmlNodePtr node,
 
                         case DATATYPE_UINT16_HEX:
                             base = 16;
-                            /* fallthrough */
+                            ATTRIBUTE_FALLTHROUGH;
                         case DATATYPE_UINT16:
                             if (virStrToLong_ui(prop, NULL, base, &uint_val) >= 0) {
                                 if (uint_val <= 0xffff) {
@@ -1902,7 +1902,7 @@ virNWFilterRuleDetailsParse(xmlNodePtr node,
 
                         case DATATYPE_UINT32_HEX:
                             base = 16;
-                            /* fallthrough */
+                            ATTRIBUTE_FALLTHROUGH;
                         case DATATYPE_UINT32:
                             if (virStrToLong_ui(prop, NULL, base, &uint_val) >= 0) {
                                 item->u.u32 = uint_val;
@@ -2137,7 +2137,7 @@ virNWFilterRuleValidate(virNWFilterRuleDefPtr rule)
         portData = &rule->p.ipHdrFilter.portData;
         protocol = "IP";
         dataProtocolID = &rule->p.ipHdrFilter.ipHdr.dataProtocolID;
-        /* fall through */
+        ATTRIBUTE_FALLTHROUGH;
     case VIR_NWFILTER_RULE_PROTOCOL_IPV6:
         if (portData == NULL) {
             portData = &rule->p.ipv6HdrFilter.portData;
@@ -3371,7 +3371,7 @@ virNWFilterRuleDefDetailsFormat(virBufferPtr buf,
 
                case DATATYPE_UINT8_HEX:
                    asHex = true;
-                   /* fallthrough */
+                   ATTRIBUTE_FALLTHROUGH;
                case DATATYPE_IPMASK:
                case DATATYPE_IPV6MASK:
                    /* display all masks in CIDR format */
@@ -3382,7 +3382,7 @@ virNWFilterRuleDefDetailsFormat(virBufferPtr buf,
 
                case DATATYPE_UINT16_HEX:
                    asHex = true;
-                   /* fallthrough */
+                   ATTRIBUTE_FALLTHROUGH;
                case DATATYPE_UINT16:
                    virBufferAsprintf(buf, asHex ? "0x%x" : "%d",
                                      item->u.u16);
@@ -3390,7 +3390,7 @@ virNWFilterRuleDefDetailsFormat(virBufferPtr buf,
 
                case DATATYPE_UINT32_HEX:
                    asHex = true;
-                   /* fallthrough */
+                   ATTRIBUTE_FALLTHROUGH;
                case DATATYPE_UINT32:
                    virBufferAsprintf(buf, asHex ? "0x%x" : "%u",
                                      item->u.u32);

diff --git a/src/cpu/cpu_ppc64.c b/src/cpu/cpu_ppc64.c
index ad2d6a7ea1bfa8647f5355508570b41c7bd1aad5..2b1b2eb8b15fcd77c0337e21a82d16aadfb327ec 100644 (file)
--- a/src/cpu/cpu_ppc64.c
+++ b/src/cpu/cpu_ppc64.c
@@ -583,7 +583,7 @@ ppc64Compute(virCPUDefPtr host,
                 ret = tmp;
                 goto cleanup;
             }
-            /* fallthrough */
+            ATTRIBUTE_FALLTHROUGH;
 
         case VIR_CPU_MODE_HOST_PASSTHROUGH:
             /* host-model and host-passthrough:

diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c
index 4f083494e12b6c5716d444ac999715121c43f9ef..17b76c34374cac240b7020c4a3b86f6876d3db05 100644 (file)
--- a/src/libvirt-domain.c
+++ b/src/libvirt-domain.c
@@ -8214,7 +8214,7 @@ virDomainSetMetadata(virDomainPtr domain,
                                   "newlines"));
             goto error;
         }
-        /* fallthrough */
+        ATTRIBUTE_FALLTHROUGH;
     case VIR_DOMAIN_METADATA_DESCRIPTION:
         virCheckNullArgGoto(uri, error);
         virCheckNullArgGoto(key, error);

diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c
index 5202ca12deb3bc19ffadd8cc0e9dce2787ec72fd..e45d7c4e57c11718cbfcef7475f215ba03b92d6e 100644 (file)
--- a/src/libxl/libxl_conf.c
+++ b/src/libxl/libxl_conf.c
@@ -900,7 +900,7 @@ libxlMakeNic(virDomainDefPtr def,
             if (VIR_STRDUP(x_nic->bridge,
                            virDomainNetGetActualBridgeName(l_nic)) < 0)
                 goto cleanup;
-            /* fallthrough */
+            ATTRIBUTE_FALLTHROUGH;
         case VIR_DOMAIN_NET_TYPE_ETHERNET:
             if (VIR_STRDUP(x_nic->script, l_nic->script) < 0)
                 goto cleanup;

diff --git a/src/network/leaseshelper.c b/src/network/leaseshelper.c
index 16f6eb87b53ca30887eccb52a296103e98b1d1b3..d364e7b0e42233a714fd2e2bf01132d63eba1393 100644 (file)
--- a/src/network/leaseshelper.c
+++ b/src/network/leaseshelper.c
@@ -206,7 +206,7 @@ main(int argc, char **argv)
         if (!lease_new)
             break;
 
-        /* fallthrough */
+        ATTRIBUTE_FALLTHROUGH;
     case VIR_LEASE_ACTION_DEL:
         /* Delete the corresponding lease, if it already exists */
         delete = true;
@@ -243,7 +243,7 @@ main(int argc, char **argv)
         }
         lease_new = NULL;
 
-        /* fallthrough */
+        ATTRIBUTE_FALLTHROUGH;
     case VIR_LEASE_ACTION_DEL:
         if (!(leases_str = virJSONValueToString(leases_array_new, true))) {
             virReportError(VIR_ERR_INTERNAL_ERROR, "%s",

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index db59d07edc2395f3712537bccd2c3def3ec332ca..f383191117a07eeb2682f582188a0cc826cea288 100644 (file)
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -112,7 +112,7 @@ qemuDomainAsyncJobPhaseToString(qemuDomainAsyncJob job,
     case QEMU_ASYNC_JOB_START:
     case QEMU_ASYNC_JOB_NONE:
     case QEMU_ASYNC_JOB_LAST:
-        ; /* fall through */
+        ATTRIBUTE_FALLTHROUGH;
     }
 
     return "none";
@@ -136,7 +136,7 @@ qemuDomainAsyncJobPhaseFromString(qemuDomainAsyncJob job,
     case QEMU_ASYNC_JOB_START:
     case QEMU_ASYNC_JOB_NONE:
     case QEMU_ASYNC_JOB_LAST:
-        ; /* fall through */
+        ATTRIBUTE_FALLTHROUGH;
     }
 
     if (STREQ(phase, "none"))

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 101fe4b19d80e920add2f0e766cae70ae4ae5d1c..fc0ed45cc705d4f8ff2bc0f2ca6f5ea65543ba86 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -4003,7 +4003,7 @@ processGuestPanicEvent(virQEMUDriverPtr driver,
     case VIR_DOMAIN_LIFECYCLE_CRASH_COREDUMP_DESTROY:
         if (doCoreDumpToAutoDumpPath(driver, vm, VIR_DUMP_MEMORY_ONLY) < 0)
             goto endjob;
-        /* fall through */
+        ATTRIBUTE_FALLTHROUGH;
 
     case VIR_DOMAIN_LIFECYCLE_CRASH_DESTROY:
         qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_CRASHED,
@@ -4020,7 +4020,7 @@ processGuestPanicEvent(virQEMUDriverPtr driver,
     case VIR_DOMAIN_LIFECYCLE_CRASH_COREDUMP_RESTART:
         if (doCoreDumpToAutoDumpPath(driver, vm, VIR_DUMP_MEMORY_ONLY) < 0)
             goto endjob;
-        /* fall through */
+        ATTRIBUTE_FALLTHROUGH;
 
     case VIR_DOMAIN_LIFECYCLE_CRASH_RESTART:
         qemuDomainSetFakeReboot(driver, vm, true);

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index e451ef6f876b5e0ac89c3a48282300e7bd9b13ba..79f79b5eface37193573c71d1caf7b3c89e0f1f2 100644 (file)
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -1915,7 +1915,7 @@ qemuMigrationDriveMirrorCancelled(virQEMUDriverPtr driver,
                                disk->dst);
                 failed = true;
             }
-            /* fallthrough */
+            ATTRIBUTE_FALLTHROUGH;
         case VIR_DOMAIN_BLOCK_JOB_CANCELED:
         case VIR_DOMAIN_BLOCK_JOB_COMPLETED:
             qemuBlockJobSyncEnd(driver, vm, disk);

diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index 3b8b796f0cce85f5fbf8d058cf68b36f6caf8ea4..71a078a98dcce16cb1aae8d29189fd0d1a59ba03 100644 (file)
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -906,7 +906,7 @@ doRemoteOpen(virConnectPtr conn,
         goto failed;
 #endif
 
-        /*FALLTHROUGH*/
+        ATTRIBUTE_FALLTHROUGH;
     case trans_tcp:
         priv->client = virNetClientNewTCP(priv->hostname, port, AF_UNSPEC);
         if (!priv->client)

diff --git a/src/rpc/virnetservermdns.c b/src/rpc/virnetservermdns.c
index 7f12a294736314de94080c6e164be9f6a7b9890d..c93de39c0bab34d5cbc79a45075d73b5c23f1070 100644 (file)
--- a/src/rpc/virnetservermdns.c
+++ b/src/rpc/virnetservermdns.c
@@ -231,7 +231,7 @@ static void virNetServerMDNSClientCallback(AvahiClient *c,
              * in AVAHI_SERVER_RUNNING state we will register them
              * again with the new host name. */
 
-            /* Fallthrough */
+            ATTRIBUTE_FALLTHROUGH;
 
         case AVAHI_CLIENT_S_REGISTERING:
             /* The server records are now being established. This

diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c
index 2e313bcbb6d4a9e3b66b401d5e17df0c7fb5b549..519842d65b3dce5deb9564073015c8c8c41187c0 100644 (file)
--- a/src/storage/storage_driver.c
+++ b/src/storage/storage_driver.c
@@ -3548,7 +3548,7 @@ virStorageTranslateDiskSourcePool(virConnectPtr conn,
        case VIR_STORAGE_SOURCE_POOL_MODE_DEFAULT:
        case VIR_STORAGE_SOURCE_POOL_MODE_LAST:
            def->src->srcpool->mode = VIR_STORAGE_SOURCE_POOL_MODE_HOST;
-           /* fallthrough */
+           ATTRIBUTE_FALLTHROUGH;
        case VIR_STORAGE_SOURCE_POOL_MODE_HOST:
            def->src->srcpool->actualtype = VIR_STORAGE_TYPE_BLOCK;
            if (!(def->src->path = virStorageVolGetPath(vol)))

diff --git a/src/util/virconf.c b/src/util/virconf.c
index 3e49f41b603ed9752626e671cf0d449587c04273..293e1a9a8b84412f1bc44400238a4afe4edc1d0e 100644 (file)
--- a/src/util/virconf.c
+++ b/src/util/virconf.c
@@ -1021,7 +1021,7 @@ int virConfGetValueStringList(virConfPtr conf,
             }
             break;
         }
-        /* fallthrough */
+        ATTRIBUTE_FALLTHROUGH;
 
     default:
         virReportError(VIR_ERR_INTERNAL_ERROR,

diff --git a/src/util/virhashcode.c b/src/util/virhashcode.c
index 357c05fe246aa303e98bcb2614741aa5d73a0de1..310ec891c809ce6a32f40eda8cc86d42fe64967e 100644 (file)
--- a/src/util/virhashcode.c
+++ b/src/util/virhashcode.c
@@ -97,17 +97,17 @@ uint32_t virHashCodeGen(const void *key, size_t len, uint32_t seed)
     switch (len & 3) {
     case 3:
         k1 ^= tail[2] << 16;
-        /* fallthrough */
+        ATTRIBUTE_FALLTHROUGH;
     case 2:
         k1 ^= tail[1] << 8;
-        /* fallthrough */
+        ATTRIBUTE_FALLTHROUGH;
     case 1:
         k1 ^= tail[0];
         k1 *= c1;
         k1 = rotl32(k1, 15);
         k1 *= c2;
         h1 ^= k1;
-        /* fallthrough */
+        ATTRIBUTE_FALLTHROUGH;
     default:
         break;
     }

diff --git a/src/util/virnetdevbridge.c b/src/util/virnetdevbridge.c
index ebe9dba9c7f2930e057791bb5ef7f067d475150f..11b03b426420095e9aecf9b0b12b9ccb48eb160d 100644 (file)
--- a/src/util/virnetdevbridge.c
+++ b/src/util/virnetdevbridge.c
@@ -482,6 +482,7 @@ virNetDevBridgeCreate(const char *brname)
             /* intentionally fall through if virNetDevBridgeCreateWithIoctl()
              * isn't available.
              */
+            ATTRIBUTE_FALLTHROUGH;
         default:
             virReportSystemError(-err->error,
                                  _("error creating bridge interface %s"),

diff --git a/src/util/virutil.c b/src/util/virutil.c
index 170dd59a2b14aabb0d6ef0c3ba2d243c9d4a9f44..336427c4f45a92d8fad76c94ea998c19582320cc 100644 (file)
--- a/src/util/virutil.c
+++ b/src/util/virutil.c
@@ -313,19 +313,19 @@ virScaleInteger(unsigned long long *value, const char *suffix,
         switch (c_tolower(*suffix)) {
         case 'e':
             scale *= base;
-            /* fallthrough */
+            ATTRIBUTE_FALLTHROUGH;
         case 'p':
             scale *= base;
-            /* fallthrough */
+            ATTRIBUTE_FALLTHROUGH;
         case 't':
             scale *= base;
-            /* fallthrough */
+            ATTRIBUTE_FALLTHROUGH;
         case 'g':
             scale *= base;
-            /* fallthrough */
+            ATTRIBUTE_FALLTHROUGH;
         case 'm':
             scale *= base;
-            /* fallthrough */
+            ATTRIBUTE_FALLTHROUGH;
         case 'k':
             scale *= base;
             break;

diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index a614512838f8057d6383f2b9e20077c0b3c1a811..4449d733f477827a978270b36633cae8f619e198 100644 (file)
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -2562,14 +2562,14 @@ virshBlockJobInfo(vshControl *ctl,
             switch (last_error->code) {
             case VIR_ERR_INVALID_ARG:
                 priv->blockJobNoBytes = true;
-                /* fallthrough */
+                ATTRIBUTE_FALLTHROUGH;
             case VIR_ERR_OVERFLOW:
                 if (!bytes && !raw) {
                     /* try again with MiB/s, unless forcing bytes */
                     vshResetLibvirtError();
                     break;
                 }
-                /* fallthrough */
+                ATTRIBUTE_FALLTHROUGH;
             default:
                 goto cleanup;
             }

diff --git a/tools/virsh.c b/tools/virsh.c
index cb60edcfc9dfdadf0f9edb462617ed1a2a7c22a4..ea59d636330b28645339e0a24031471323d63ca4 100644 (file)
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -844,7 +844,7 @@ virshParseArgv(vshControl *ctl, int argc, char **argv)
                 puts(VERSION);
                 exit(EXIT_SUCCESS);
             }
-            /* fall through */
+            ATTRIBUTE_FALLTHROUGH;
         case 'V':
             virshShowVersion(ctl);
             exit(EXIT_SUCCESS);

diff --git a/tools/virt-admin.c b/tools/virt-admin.c
index 513054b38b9951a44cc4a55552e77ce4b6ec9ce8..834514adf9431c15160a94c0c849968c2e0bb8b2 100644 (file)
--- a/tools/virt-admin.c
+++ b/tools/virt-admin.c
@@ -1192,7 +1192,7 @@ vshAdmParseArgv(vshControl *ctl, int argc, char **argv)
                 puts(VERSION);
                 exit(EXIT_SUCCESS);
             }
-            /* fall through */
+            ATTRIBUTE_FALLTHROUGH;
         case 'V':
             vshAdmShowVersion(ctl);
             exit(EXIT_SUCCESS);