Use G_GNUC_FALLTHROUGH instead of ATTRIBUTE_FALLTHROUGH

Also define the macro for building with GLib older than 2.60

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk
index cfcc339c957e52c073b1e1c2e9787bf02cfbd91c..63b9ce70f6f981657ce38256ed36d0139233a505 100644 (file)
--- a/build-aux/syntax-check.mk
+++ b/build-aux/syntax-check.mk
@@ -629,7 +629,7 @@ sc_avoid_g_gnuc_unused_in_header:
          $(_sc_search_regexp)
 
 sc_prohibit_attribute_macros:
-       @prohibit='ATTRIBUTE_(UNUSED|NORETURN|SENTINEL|RETURN_CHECK|NOINLINE|FMT_PRINTF)' \
+       @prohibit='ATTRIBUTE_(UNUSED|NORETURN|SENTINEL|RETURN_CHECK|NOINLINE|FMT_PRINTF|FALLTHROUGH)' \
        in_vc_files='\.[ch]$$' \
        halt='use GLib macros: G_GNUC_<ATTRIBUTE_SUFFIX> for most' \
          $(_sc_search_regexp)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 6bd2d4935d77d361325479d934e578fd23eaf5f8..c128d34ba2c12c1a6751932885529de4b1248caa 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -17486,7 +17486,7 @@ virDomainChrEquals(virDomainChrDefPtr src,
         if (src->targetType != tgt->targetType)
             return false;
 
-        ATTRIBUTE_FALLTHROUGH;
+        G_GNUC_FALLTHROUGH;
 
     case VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE:
     case VIR_DOMAIN_CHR_DEVICE_TYPE_PARALLEL:
@@ -20290,7 +20290,7 @@ virDomainDefParseXML(xmlDocPtr xml,
                 def->apic_eoi = eoi;
                 VIR_FREE(tmp);
             }
-            ATTRIBUTE_FALLTHROUGH;
+            G_GNUC_FALLTHROUGH;
         case VIR_DOMAIN_FEATURE_ACPI:
         case VIR_DOMAIN_FEATURE_PAE:
         case VIR_DOMAIN_FEATURE_VIRIDIAN:
@@ -31205,7 +31205,7 @@ virDomainNetResolveActualType(virDomainNetDefPtr iface)
         /* intentionally fall through to the direct case for
          * VIR_NETWORK_FORWARD_BRIDGE with no bridge device defined
          */
-        ATTRIBUTE_FALLTHROUGH;
+        G_GNUC_FALLTHROUGH;
 
     case VIR_NETWORK_FORWARD_PRIVATE:
     case VIR_NETWORK_FORWARD_VEPA:
@@ -31471,7 +31471,7 @@ virDomainDiskTranslateSourcePool(virDomainDiskDefPtr def)
        case VIR_STORAGE_SOURCE_POOL_MODE_DEFAULT:
        case VIR_STORAGE_SOURCE_POOL_MODE_LAST:
            def->src->srcpool->mode = VIR_STORAGE_SOURCE_POOL_MODE_HOST;
-           ATTRIBUTE_FALLTHROUGH;
+           G_GNUC_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/conf/network_conf.c b/src/conf/network_conf.c
index 58a0e32dd7180111345e3912c846528a68f067fb..75ec5ccc2767a5763d2ad7fcfbb7152985a6f9b5 100644 (file)
--- a/src/conf/network_conf.c
+++ b/src/conf/network_conf.c
@@ -1984,7 +1984,7 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt,
                            def->name);
             goto error;
         }
-        ATTRIBUTE_FALLTHROUGH;
+        G_GNUC_FALLTHROUGH;
 
     case VIR_NETWORK_FORWARD_BRIDGE:
         if (def->delay || stp || def->bridgeZone) {

diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c
index 6b7a606b641269306a1477c1dc34c5192e7fd801..aba12cd698bed76ae0c8bbcba3b63fac57e950ff 100644 (file)
--- a/src/conf/nwfilter_conf.c
+++ b/src/conf/nwfilter_conf.c
@@ -1863,7 +1863,7 @@ virNWFilterRuleDetailsParse(xmlNodePtr node,
                     switch (datatype) {
                         case DATATYPE_UINT8_HEX:
                             base = 16;
-                            ATTRIBUTE_FALLTHROUGH;
+                            G_GNUC_FALLTHROUGH;
                         case DATATYPE_UINT8:
                             if (virStrToLong_ui(prop, NULL, base, &uint_val) >= 0) {
                                 if (uint_val <= 0xff) {
@@ -1880,7 +1880,7 @@ virNWFilterRuleDetailsParse(xmlNodePtr node,
 
                         case DATATYPE_UINT16_HEX:
                             base = 16;
-                            ATTRIBUTE_FALLTHROUGH;
+                            G_GNUC_FALLTHROUGH;
                         case DATATYPE_UINT16:
                             if (virStrToLong_ui(prop, NULL, base, &uint_val) >= 0) {
                                 if (uint_val <= 0xffff) {
@@ -1897,7 +1897,7 @@ virNWFilterRuleDetailsParse(xmlNodePtr node,
 
                         case DATATYPE_UINT32_HEX:
                             base = 16;
-                            ATTRIBUTE_FALLTHROUGH;
+                            G_GNUC_FALLTHROUGH;
                         case DATATYPE_UINT32:
                             if (virStrToLong_ui(prop, NULL, base, &uint_val) >= 0) {
                                 item->u.u32 = uint_val;
@@ -2131,7 +2131,7 @@ virNWFilterRuleValidate(virNWFilterRuleDefPtr rule)
         portData = &rule->p.ipHdrFilter.portData;
         protocol = "IP";
         dataProtocolID = &rule->p.ipHdrFilter.ipHdr.dataProtocolID;
-        ATTRIBUTE_FALLTHROUGH;
+        G_GNUC_FALLTHROUGH;
     case VIR_NWFILTER_RULE_PROTOCOL_IPV6:
         if (portData == NULL) {
             portData = &rule->p.ipv6HdrFilter.portData;
@@ -2926,7 +2926,7 @@ virNWFilterRuleDefDetailsFormat(virBufferPtr buf,
 
                case DATATYPE_UINT8_HEX:
                    asHex = true;
-                   ATTRIBUTE_FALLTHROUGH;
+                   G_GNUC_FALLTHROUGH;
                case DATATYPE_IPMASK:
                case DATATYPE_IPV6MASK:
                    /* display all masks in CIDR format */
@@ -2937,7 +2937,7 @@ virNWFilterRuleDefDetailsFormat(virBufferPtr buf,
 
                case DATATYPE_UINT16_HEX:
                    asHex = true;
-                   ATTRIBUTE_FALLTHROUGH;
+                   G_GNUC_FALLTHROUGH;
                case DATATYPE_UINT16:
                    virBufferAsprintf(buf, asHex ? "0x%x" : "%d",
                                      item->u.u16);
@@ -2945,7 +2945,7 @@ virNWFilterRuleDefDetailsFormat(virBufferPtr buf,
 
                case DATATYPE_UINT32_HEX:
                    asHex = true;
-                   ATTRIBUTE_FALLTHROUGH;
+                   G_GNUC_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 5194c2adc103b794db4b304ac0485a0cede4e758..b11695f24d732d2749b615a429c39aa610e49f4a 100644 (file)
--- a/src/cpu/cpu_ppc64.c
+++ b/src/cpu/cpu_ppc64.c
@@ -510,7 +510,7 @@ ppc64Compute(virCPUDefPtr host,
                 ret = tmp;
                 goto cleanup;
             }
-            ATTRIBUTE_FALLTHROUGH;
+            G_GNUC_FALLTHROUGH;
 
         case VIR_CPU_MODE_HOST_PASSTHROUGH:
             /* host-model and host-passthrough:

diff --git a/src/internal.h b/src/internal.h
index 1f70123e47d19cabe869d9a1e12f8ae997fb87d6..59c58a72e157c2b65dbbd28b006c09ebbbd6b45b 100644 (file)
--- a/src/internal.h
+++ b/src/internal.h
@@ -137,16 +137,17 @@
 
 /**
  *
- * ATTRIBUTE_FALLTHROUGH
+ * G_GNUC_FALLTHROUGH
  *
  * silence the compiler warning when falling through a switch case
  *
+ * TODO: Remove after upgrading to GLib >= 2.60
  */
-#ifndef ATTRIBUTE_FALLTHROUGH
+#ifndef G_GNUC_FALLTHROUGH
 # if __GNUC_PREREQ (7, 0)
-#  define ATTRIBUTE_FALLTHROUGH __attribute__((fallthrough))
+#  define G_GNUC_FALLTHROUGH __attribute__((fallthrough))
 # else
-#  define ATTRIBUTE_FALLTHROUGH do {} while(0)
+#  define G_GNUC_FALLTHROUGH do {} while(0)
 # endif
 #endif
 

diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c
index 65c73be312e5e7d8641f9a0e08d3d3135674fc62..6b12ff5a0319e188fbf16d33987ac06e1d78cfe5 100644 (file)
--- a/src/libvirt-domain.c
+++ b/src/libvirt-domain.c
@@ -8037,7 +8037,7 @@ virDomainSetMetadata(virDomainPtr domain,
                                   "newlines"));
             goto error;
         }
-        ATTRIBUTE_FALLTHROUGH;
+        G_GNUC_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 443c6fb1142d945f44fb72ab0bf09bb88f29beb0..74246e7b3af3e66f5991422536746b6710e7136f 100644 (file)
--- a/src/libxl/libxl_conf.c
+++ b/src/libxl/libxl_conf.c
@@ -1346,7 +1346,7 @@ libxlMakeNic(virDomainDefPtr def,
             if (VIR_STRDUP(x_nic->bridge,
                            virBufferCurrentContent(&buf)) < 0)
                 goto cleanup;
-            ATTRIBUTE_FALLTHROUGH;
+            G_GNUC_FALLTHROUGH;
         case VIR_DOMAIN_NET_TYPE_ETHERNET:
             if (VIR_STRDUP(x_nic->script, script) < 0)
                 goto cleanup;

diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
index 2a0b04117e6b31d34eb501ff411d4cd64712c50a..7fcbbb424afb16f9bb3c9f828b44fe67debf1475 100644 (file)
--- a/src/lxc/lxc_container.c
+++ b/src/lxc/lxc_container.c
@@ -2044,7 +2044,7 @@ static int lxcContainerDropCapabilities(virDomainDefPtr def,
             default: /* User specified capabilities to drop */
                 toDrop = (state == VIR_TRISTATE_SWITCH_OFF);
             }
-            ATTRIBUTE_FALLTHROUGH;
+            G_GNUC_FALLTHROUGH;
 
         case VIR_DOMAIN_CAPABILITIES_POLICY_ALLOW:
             if (policy == VIR_DOMAIN_CAPABILITIES_POLICY_ALLOW)

diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
index 4beb28a5d914da130ffe932119a80ee125f88a8e..fe47668d4df95987942c246e05c0f294ae9bd1f7 100644 (file)
--- a/src/network/bridge_driver.c
+++ b/src/network/bridge_driver.c
@@ -2961,7 +2961,7 @@ networkStartNetwork(virNetworkDriverStatePtr driver,
          * VIR_NETWORK_FORWARD_BRIDGE with no bridge device defined
          * (since that is macvtap bridge mode).
          */
-        ATTRIBUTE_FALLTHROUGH;
+        G_GNUC_FALLTHROUGH;
 
     case VIR_NETWORK_FORWARD_PRIVATE:
     case VIR_NETWORK_FORWARD_VEPA:
@@ -3048,7 +3048,7 @@ networkShutdownNetwork(virNetworkDriverStatePtr driver,
          * VIR_NETWORK_FORWARD_BRIDGE with no bridge device defined
          * (since that is macvtap bridge mode).
          */
-        ATTRIBUTE_FALLTHROUGH;
+        G_GNUC_FALLTHROUGH;
 
     case VIR_NETWORK_FORWARD_PRIVATE:
     case VIR_NETWORK_FORWARD_VEPA:
@@ -3433,7 +3433,7 @@ networkValidate(virNetworkDriverStatePtr driver,
         if (def->bridge != NULL)
             bandwidthAllowed = true;
 
-        ATTRIBUTE_FALLTHROUGH;
+        G_GNUC_FALLTHROUGH;
 
     case VIR_NETWORK_FORWARD_PRIVATE:
     case VIR_NETWORK_FORWARD_VEPA:
@@ -4710,7 +4710,7 @@ networkAllocatePort(virNetworkObjPtr obj,
         /* intentionally fall through to the direct case for
          * VIR_NETWORK_FORWARD_BRIDGE with no bridge device defined
          */
-        ATTRIBUTE_FALLTHROUGH;
+        G_GNUC_FALLTHROUGH;
 
     case VIR_NETWORK_FORWARD_PRIVATE:
     case VIR_NETWORK_FORWARD_VEPA:

diff --git a/src/network/leaseshelper.c b/src/network/leaseshelper.c
index dc737879ca1dbd76f3f07663264709a0e9e9653e..959162b81448519b65cc9cecc57631c47707bb89 100644 (file)
--- a/src/network/leaseshelper.c
+++ b/src/network/leaseshelper.c
@@ -193,7 +193,7 @@ main(int argc, char **argv)
         if (!lease_new)
             break;
 
-        ATTRIBUTE_FALLTHROUGH;
+        G_GNUC_FALLTHROUGH;
     case VIR_LEASE_ACTION_DEL:
         /* Delete the corresponding lease, if it already exists */
         delete = true;
@@ -230,7 +230,7 @@ main(int argc, char **argv)
         }
         lease_new = NULL;
 
-        ATTRIBUTE_FALLTHROUGH;
+        G_GNUC_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_command.c b/src/qemu/qemu_command.c
index a41156476f0198e3fe819f0dcc21f023880e6424..d2fc7b6f1e330ab8ef7bb7e01c2ed2453333a0b7 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -7254,7 +7254,7 @@ qemuBuildMachineCommandLine(virCommandPtr cmd,
                  * early instead of erroring out */
                 break;
             }
-            ATTRIBUTE_FALLTHROUGH;
+            G_GNUC_FALLTHROUGH;
 
         case VIR_GIC_VERSION_3:
         case VIR_GIC_VERSION_HOST:
@@ -9053,7 +9053,7 @@ qemuBuildShmemCommandLine(virLogManagerPtr logManager,
         virCommandAddArg(cmd, "-object");
         virCommandAddArgBuffer(cmd, &buf);
 
-        ATTRIBUTE_FALLTHROUGH;
+        G_GNUC_FALLTHROUGH;
     case VIR_DOMAIN_SHMEM_MODEL_IVSHMEM_DOORBELL:
         devstr = qemuBuildShmemDevStr(def, shmem, qemuCaps);
         break;

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index b257db44b0ca95763b3815dadc5da47d9d2548b0..e11c0c8ea2ad96e28f3049e4a0090e9c3d777c6a 100644 (file)
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -209,7 +209,7 @@ qemuDomainAsyncJobPhaseToString(qemuDomainAsyncJob job,
     case QEMU_ASYNC_JOB_SNAPSHOT:
     case QEMU_ASYNC_JOB_START:
     case QEMU_ASYNC_JOB_NONE:
-        ATTRIBUTE_FALLTHROUGH;
+        G_GNUC_FALLTHROUGH;
     case QEMU_ASYNC_JOB_LAST:
         break;
     }
@@ -234,7 +234,7 @@ qemuDomainAsyncJobPhaseFromString(qemuDomainAsyncJob job,
     case QEMU_ASYNC_JOB_SNAPSHOT:
     case QEMU_ASYNC_JOB_START:
     case QEMU_ASYNC_JOB_NONE:
-        ATTRIBUTE_FALLTHROUGH;
+        G_GNUC_FALLTHROUGH;
     case QEMU_ASYNC_JOB_LAST:
         break;
     }
@@ -3102,7 +3102,7 @@ qemuDomainObjPrivateXMLParseBlockjobDataSpecific(qemuBlockJobDataPtr job,
             if (!job->data.commit.topparent)
                 goto broken;
 
-            ATTRIBUTE_FALLTHROUGH;
+            G_GNUC_FALLTHROUGH;
         case QEMU_BLOCKJOB_TYPE_ACTIVE_COMMIT:
             qemuDomainObjPrivateXMLParseBlockjobNodename(job,
                                                          "string(./top/@node)",

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 42866c6060db7fc9258faee958db4d7aa09f8733..6ce63485932705d137dca21dd279e3363ca1490c 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -4324,7 +4324,7 @@ processGuestPanicEvent(virQEMUDriverPtr driver,
     case VIR_DOMAIN_LIFECYCLE_ACTION_COREDUMP_DESTROY:
         if (doCoreDumpToAutoDumpPath(driver, vm, flags) < 0)
             goto endjob;
-        ATTRIBUTE_FALLTHROUGH;
+        G_GNUC_FALLTHROUGH;
 
     case VIR_DOMAIN_LIFECYCLE_ACTION_DESTROY:
         qemuProcessStop(driver, vm, VIR_DOMAIN_SHUTOFF_CRASHED,
@@ -4341,7 +4341,7 @@ processGuestPanicEvent(virQEMUDriverPtr driver,
     case VIR_DOMAIN_LIFECYCLE_ACTION_COREDUMP_RESTART:
         if (doCoreDumpToAutoDumpPath(driver, vm, flags) < 0)
             goto endjob;
-        ATTRIBUTE_FALLTHROUGH;
+        G_GNUC_FALLTHROUGH;
 
     case VIR_DOMAIN_LIFECYCLE_ACTION_RESTART:
         qemuDomainSetFakeReboot(driver, vm, true);

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index 88984dff676d4c1143a63866b4fd69f092bc84ba..fcb206a8af940ae6a210f3220eac26bf3e78c6a3 100644 (file)
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -2957,7 +2957,7 @@ qemuDomainAttachShmemDevice(virQEMUDriverPtr driver,
         virReportError(VIR_ERR_OPERATION_UNSUPPORTED,
                        _("live attach of shmem model '%s' is not supported"),
                        virDomainShmemModelTypeToString(shmem->model));
-        ATTRIBUTE_FALLTHROUGH;
+        G_GNUC_FALLTHROUGH;
     case VIR_DOMAIN_SHMEM_MODEL_LAST:
         return -1;
     }
@@ -5454,7 +5454,7 @@ qemuDomainDetachPrepShmem(virDomainObjPtr vm,
         virReportError(VIR_ERR_OPERATION_UNSUPPORTED,
                        _("live detach of shmem model '%s' is not supported"),
                        virDomainShmemModelTypeToString(shmem->model));
-        ATTRIBUTE_FALLTHROUGH;
+        G_GNUC_FALLTHROUGH;
     case VIR_DOMAIN_SHMEM_MODEL_LAST:
         return -1;
     }

diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
index 1cbb27e10414e17ef05e31a65cdd7fa8371dafd1..59661fd6b0114537162e4abf4467362bebc289f5 100644 (file)
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -582,7 +582,7 @@ qemuMigrationSrcNBDCopyCancelled(virDomainObjPtr vm,
                 qemuMigrationNBDReportMirrorError(job, disk->dst);
                 failed = true;
             }
-            ATTRIBUTE_FALLTHROUGH;
+            G_GNUC_FALLTHROUGH;
         case VIR_DOMAIN_BLOCK_JOB_CANCELED:
         case VIR_DOMAIN_BLOCK_JOB_COMPLETED:
             diskPriv->migrating = false;
@@ -656,7 +656,7 @@ qemuMigrationSrcNBDCopyCancelOne(virQEMUDriverPtr driver,
             qemuMigrationNBDReportMirrorError(job, disk->dst);
             goto cleanup;
         }
-        ATTRIBUTE_FALLTHROUGH;
+        G_GNUC_FALLTHROUGH;
     case VIR_DOMAIN_BLOCK_JOB_COMPLETED:
         ret = 1;
         goto cleanup;

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 0afb7c79e46036fdd6e3f1dc8f0dbf5569d61a89..9c50c4a1d82e0d247ac7477ecec693c4ea849219 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -4811,7 +4811,7 @@ qemuProcessGetNetworkAddress(const char *netname,
          * fall through if netdef->bridge wasn't set, since that is
          * macvtap bridge mode network.
          */
-        ATTRIBUTE_FALLTHROUGH;
+        G_GNUC_FALLTHROUGH;
 
     case VIR_NETWORK_FORWARD_PRIVATE:
     case VIR_NETWORK_FORWARD_VEPA:

diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
index 3191f9032eda2feb9f2ad187313c8ad383865c6e..bd4017c4dc9fed3e4fa6355027d995f968d196f4 100644 (file)
--- a/src/remote/remote_driver.c
+++ b/src/remote/remote_driver.c
@@ -1159,7 +1159,7 @@ doRemoteOpen(virConnectPtr conn,
         if (!priv->tls)
             goto failed;
         priv->is_secure = 1;
-        ATTRIBUTE_FALLTHROUGH;
+        G_GNUC_FALLTHROUGH;
 #else
         (void)tls_priority;
         (void)sanity;

diff --git a/src/util/virconf.c b/src/util/virconf.c
index 665805b7cf9aa905cd85d88bb87070c6d78307e5..6f7bf3be8eb4222e67a77ad2d84f71a68c82e289 100644 (file)
--- a/src/util/virconf.c
+++ b/src/util/virconf.c
@@ -984,7 +984,7 @@ int virConfGetValueStringList(virConfPtr conf,
             }
             break;
         }
-        ATTRIBUTE_FALLTHROUGH;
+        G_GNUC_FALLTHROUGH;
 
     case VIR_CONF_LLONG:
     case VIR_CONF_ULLONG:

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

diff --git a/src/util/viriscsi.c b/src/util/viriscsi.c
index b869c4cacde3e16009481d423043351415b71868..25b77eead748ad68079caab77518f75a9e3db9fb 100644 (file)
--- a/src/util/viriscsi.c
+++ b/src/util/viriscsi.c
@@ -487,7 +487,7 @@ virISCSIScanTargets(const char *portal,
             virReportError(VIR_ERR_OPERATION_FAILED,
                            _("no iSCSI interface defined for IQN %s"),
                            initiatoriqn);
-            ATTRIBUTE_FALLTHROUGH;
+            G_GNUC_FALLTHROUGH;
         case IQN_ERROR:
         default:
             return -1;

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

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

diff --git a/tools/virsh-edit.c b/tools/virsh-edit.c
index 5091ac74b7b098422531692e7ad05a01adf3e2fb..5dc1a1fe5a0d83c918c63a11892a68a3aaa8ae19 100644 (file)
--- a/tools/virsh-edit.c
+++ b/tools/virsh-edit.c
@@ -137,7 +137,7 @@ do {
                 relax_avail = false;
                 goto redefine;
             }
-            ATTRIBUTE_FALLTHROUGH;
+            G_GNUC_FALLTHROUGH;
 #endif
 
         default:

diff --git a/tools/virsh.c b/tools/virsh.c
index 0ed46e0e643e4e20a27697084fc16a47ee36bdaa..4aae87716078c1354fd4621543254e17d6f1e157 100644 (file)
--- a/tools/virsh.c
+++ b/tools/virsh.c
@@ -762,7 +762,7 @@ virshParseArgv(vshControl *ctl, int argc, char **argv)
                 puts(VERSION);
                 exit(EXIT_SUCCESS);
             }
-            ATTRIBUTE_FALLTHROUGH;
+            G_GNUC_FALLTHROUGH;
         case 'V':
             virshShowVersion(ctl);
             exit(EXIT_SUCCESS);

diff --git a/tools/virt-admin.c b/tools/virt-admin.c
index 95a3c3d30eabcc8c7886fe23ee3bf37c26e3e5a6..c0cc0999cbf8661a48036f99385241b7c6ca40ea 100644 (file)
--- a/tools/virt-admin.c
+++ b/tools/virt-admin.c
@@ -1329,7 +1329,7 @@ vshAdmParseArgv(vshControl *ctl, int argc, char **argv)
                 puts(VERSION);
                 exit(EXIT_SUCCESS);
             }
-            ATTRIBUTE_FALLTHROUGH;
+            G_GNUC_FALLTHROUGH;
         case 'V':
             vshAdmShowVersion(ctl);
             exit(EXIT_SUCCESS);