From nobody Sun Feb 8 14:57:01 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1571142104; cv=none; d=zoho.com; s=zohoarc; b=GAnnAlKAACKykwX4Y/49cZhoWGBZnKRdGhwZPu8A2YhLy0IRdPPUzAZo+Q1MzpaSssJAHGRwD7OG/anSuh42RT0actgxF6lXDJVw7RY3U9P26q59yBq4m9e0PBfxrte47/9QgBzzKd80iyjUUESEvNAGCR3t1O/s/mqJVJqdOEo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571142104; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=N1ywyGx/Ap6n+U4STt6ZJFYIYdZVb4RWDZvIJhGTorE=; b=S7ciMT3vBsehpeRr+pBiMI1m3tehgT43pf4Ak1p6goJ8/rwqP3bSCiEbu0WjHiFXWBFZAKxgcVonCPGP4FBSXD4ZGDKhx5CgacTbdaWUuPeXseOKeJ8v7cjepJr1HNMwpcCCBFskkRKumDEonZpwZh7C4oz1DJg8E2hfeHIa81Q= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1571142104119397.6901583095165; Tue, 15 Oct 2019 05:21:44 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6D7A2308C386; Tue, 15 Oct 2019 12:21:42 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 48D7860A35; Tue, 15 Oct 2019 12:21:42 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 0BAB6180B536; Tue, 15 Oct 2019 12:21:42 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9FCLd7L013740 for ; Tue, 15 Oct 2019 08:21:39 -0400 Received: by smtp.corp.redhat.com (Postfix) id 79072608C2; Tue, 15 Oct 2019 12:21:39 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 022BA608C0 for ; Tue, 15 Oct 2019 12:21:38 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Tue, 15 Oct 2019 14:21:28 +0200 Message-Id: <22c9b73e5f8273c1eaeb7d323f2a44d4762517aa.1571141730.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 6/8] Use G_GNUC_FALLTHROUGH instead of ATTRIBUTE_FALLTHROUGH X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Tue, 15 Oct 2019 12:21:42 +0000 (UTC) Also define the macro for building with GLib older than 2.60 Signed-off-by: J=C3=A1n Tomko --- build-aux/syntax-check.mk | 2 +- src/conf/domain_conf.c | 8 ++++---- src/conf/network_conf.c | 2 +- src/conf/nwfilter_conf.c | 14 +++++++------- src/cpu/cpu_ppc64.c | 2 +- src/internal.h | 9 +++++---- src/libvirt-domain.c | 2 +- src/libxl/libxl_conf.c | 2 +- src/lxc/lxc_container.c | 2 +- src/network/bridge_driver.c | 8 ++++---- src/network/leaseshelper.c | 4 ++-- src/qemu/qemu_command.c | 4 ++-- src/qemu/qemu_domain.c | 6 +++--- src/qemu/qemu_driver.c | 4 ++-- src/qemu/qemu_hotplug.c | 4 ++-- src/qemu/qemu_migration.c | 4 ++-- src/qemu/qemu_process.c | 2 +- src/remote/remote_driver.c | 2 +- src/util/virconf.c | 2 +- src/util/virhashcode.c | 6 +++--- src/util/viriscsi.c | 2 +- src/util/virutil.c | 10 +++++----- tools/virsh-domain.c | 4 ++-- tools/virsh-edit.c | 2 +- tools/virsh.c | 2 +- tools/virt-admin.c | 2 +- 26 files changed, 56 insertions(+), 55 deletions(-) diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index cfcc339c95..63b9ce70f6 100644 --- 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) =20 sc_prohibit_attribute_macros: - @prohibit=3D'ATTRIBUTE_(UNUSED|NORETURN|SENTINEL|RETURN_CHECK|NOINLINE|FM= T_PRINTF)' \ + @prohibit=3D'ATTRIBUTE_(UNUSED|NORETURN|SENTINEL|RETURN_CHECK|NOINLINE|FM= T_PRINTF|FALLTHROUGH)' \ in_vc_files=3D'\.[ch]$$' \ halt=3D'use GLib macros: G_GNUC_ for most' \ $(_sc_search_regexp) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 6bd2d4935d..c128d34ba2 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -17486,7 +17486,7 @@ virDomainChrEquals(virDomainChrDefPtr src, if (src->targetType !=3D tgt->targetType) return false; =20 - ATTRIBUTE_FALLTHROUGH; + G_GNUC_FALLTHROUGH; =20 case VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOLE: case VIR_DOMAIN_CHR_DEVICE_TYPE_PARALLEL: @@ -20290,7 +20290,7 @@ virDomainDefParseXML(xmlDocPtr xml, def->apic_eoi =3D 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 if= ace) /* intentionally fall through to the direct case for * VIR_NETWORK_FORWARD_BRIDGE with no bridge device defined */ - ATTRIBUTE_FALLTHROUGH; + G_GNUC_FALLTHROUGH; =20 case VIR_NETWORK_FORWARD_PRIVATE: case VIR_NETWORK_FORWARD_VEPA: @@ -31471,7 +31471,7 @@ virDomainDiskTranslateSourcePool(virDomainDiskDefPt= r def) case VIR_STORAGE_SOURCE_POOL_MODE_DEFAULT: case VIR_STORAGE_SOURCE_POOL_MODE_LAST: def->src->srcpool->mode =3D VIR_STORAGE_SOURCE_POOL_MODE_HOST; - ATTRIBUTE_FALLTHROUGH; + G_GNUC_FALLTHROUGH; case VIR_STORAGE_SOURCE_POOL_MODE_HOST: def->src->srcpool->actualtype =3D VIR_STORAGE_TYPE_BLOCK; if (!(def->src->path =3D virStorageVolGetPath(vol))) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 58a0e32dd7..75ec5ccc27 100644 --- 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; =20 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 6b7a606b64..aba12cd698 100644 --- 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 =3D 16; - ATTRIBUTE_FALLTHROUGH; + G_GNUC_FALLTHROUGH; case DATATYPE_UINT8: if (virStrToLong_ui(prop, NULL, base, &uint_va= l) >=3D 0) { if (uint_val <=3D 0xff) { @@ -1880,7 +1880,7 @@ virNWFilterRuleDetailsParse(xmlNodePtr node, =20 case DATATYPE_UINT16_HEX: base =3D 16; - ATTRIBUTE_FALLTHROUGH; + G_GNUC_FALLTHROUGH; case DATATYPE_UINT16: if (virStrToLong_ui(prop, NULL, base, &uint_va= l) >=3D 0) { if (uint_val <=3D 0xffff) { @@ -1897,7 +1897,7 @@ virNWFilterRuleDetailsParse(xmlNodePtr node, =20 case DATATYPE_UINT32_HEX: base =3D 16; - ATTRIBUTE_FALLTHROUGH; + G_GNUC_FALLTHROUGH; case DATATYPE_UINT32: if (virStrToLong_ui(prop, NULL, base, &uint_va= l) >=3D 0) { item->u.u32 =3D uint_val; @@ -2131,7 +2131,7 @@ virNWFilterRuleValidate(virNWFilterRuleDefPtr rule) portData =3D &rule->p.ipHdrFilter.portData; protocol =3D "IP"; dataProtocolID =3D &rule->p.ipHdrFilter.ipHdr.dataProtocolID; - ATTRIBUTE_FALLTHROUGH; + G_GNUC_FALLTHROUGH; case VIR_NWFILTER_RULE_PROTOCOL_IPV6: if (portData =3D=3D NULL) { portData =3D &rule->p.ipv6HdrFilter.portData; @@ -2926,7 +2926,7 @@ virNWFilterRuleDefDetailsFormat(virBufferPtr buf, =20 case DATATYPE_UINT8_HEX: asHex =3D 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, =20 case DATATYPE_UINT16_HEX: asHex =3D 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, =20 case DATATYPE_UINT32_HEX: asHex =3D 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 5194c2adc1..b11695f24d 100644 --- a/src/cpu/cpu_ppc64.c +++ b/src/cpu/cpu_ppc64.c @@ -510,7 +510,7 @@ ppc64Compute(virCPUDefPtr host, ret =3D tmp; goto cleanup; } - ATTRIBUTE_FALLTHROUGH; + G_GNUC_FALLTHROUGH; =20 case VIR_CPU_MODE_HOST_PASSTHROUGH: /* host-model and host-passthrough: diff --git a/src/internal.h b/src/internal.h index 1f70123e47..59c58a72e1 100644 --- a/src/internal.h +++ b/src/internal.h @@ -137,16 +137,17 @@ =20 /** * - * ATTRIBUTE_FALLTHROUGH + * G_GNUC_FALLTHROUGH * * silence the compiler warning when falling through a switch case * + * TODO: Remove after upgrading to GLib >=3D 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 =20 diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c index 65c73be312..6b12ff5a03 100644 --- 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 443c6fb114..74246e7b3a 100644 --- 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 2a0b04117e..7fcbbb424a 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -2044,7 +2044,7 @@ static int lxcContainerDropCapabilities(virDomainDefP= tr def, default: /* User specified capabilities to drop */ toDrop =3D (state =3D=3D VIR_TRISTATE_SWITCH_OFF); } - ATTRIBUTE_FALLTHROUGH; + G_GNUC_FALLTHROUGH; =20 case VIR_DOMAIN_CAPABILITIES_POLICY_ALLOW: if (policy =3D=3D VIR_DOMAIN_CAPABILITIES_POLICY_ALLOW) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 4beb28a5d9..fe47668d4d 100644 --- 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; =20 case VIR_NETWORK_FORWARD_PRIVATE: case VIR_NETWORK_FORWARD_VEPA: @@ -3048,7 +3048,7 @@ networkShutdownNetwork(virNetworkDriverStatePtr drive= r, * VIR_NETWORK_FORWARD_BRIDGE with no bridge device defined * (since that is macvtap bridge mode). */ - ATTRIBUTE_FALLTHROUGH; + G_GNUC_FALLTHROUGH; =20 case VIR_NETWORK_FORWARD_PRIVATE: case VIR_NETWORK_FORWARD_VEPA: @@ -3433,7 +3433,7 @@ networkValidate(virNetworkDriverStatePtr driver, if (def->bridge !=3D NULL) bandwidthAllowed =3D true; =20 - ATTRIBUTE_FALLTHROUGH; + G_GNUC_FALLTHROUGH; =20 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; =20 case VIR_NETWORK_FORWARD_PRIVATE: case VIR_NETWORK_FORWARD_VEPA: diff --git a/src/network/leaseshelper.c b/src/network/leaseshelper.c index dc737879ca..959162b814 100644 --- a/src/network/leaseshelper.c +++ b/src/network/leaseshelper.c @@ -193,7 +193,7 @@ main(int argc, char **argv) if (!lease_new) break; =20 - ATTRIBUTE_FALLTHROUGH; + G_GNUC_FALLTHROUGH; case VIR_LEASE_ACTION_DEL: /* Delete the corresponding lease, if it already exists */ delete =3D true; @@ -230,7 +230,7 @@ main(int argc, char **argv) } lease_new =3D NULL; =20 - ATTRIBUTE_FALLTHROUGH; + G_GNUC_FALLTHROUGH; case VIR_LEASE_ACTION_DEL: if (!(leases_str =3D 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 a41156476f..d2fc7b6f1e 100644 --- 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; =20 case VIR_GIC_VERSION_3: case VIR_GIC_VERSION_HOST: @@ -9053,7 +9053,7 @@ qemuBuildShmemCommandLine(virLogManagerPtr logManager, virCommandAddArg(cmd, "-object"); virCommandAddArgBuffer(cmd, &buf); =20 - ATTRIBUTE_FALLTHROUGH; + G_GNUC_FALLTHROUGH; case VIR_DOMAIN_SHMEM_MODEL_IVSHMEM_DOORBELL: devstr =3D qemuBuildShmemDevStr(def, shmem, qemuCaps); break; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index b257db44b0..e11c0c8ea2 100644 --- 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 jo= b, 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(qemu= BlockJobDataPtr job, if (!job->data.commit.topparent) goto broken; =20 - ATTRIBUTE_FALLTHROUGH; + G_GNUC_FALLTHROUGH; case QEMU_BLOCKJOB_TYPE_ACTIVE_COMMIT: qemuDomainObjPrivateXMLParseBlockjobNodename(job, "string(./top/@no= de)", diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 42866c6060..6ce6348593 100644 --- 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; =20 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; =20 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 88984dff67..fcb206a8af 100644 --- 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 1cbb27e104..59661fd6b0 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -582,7 +582,7 @@ qemuMigrationSrcNBDCopyCancelled(virDomainObjPtr vm, qemuMigrationNBDReportMirrorError(job, disk->dst); failed =3D true; } - ATTRIBUTE_FALLTHROUGH; + G_GNUC_FALLTHROUGH; case VIR_DOMAIN_BLOCK_JOB_CANCELED: case VIR_DOMAIN_BLOCK_JOB_COMPLETED: diskPriv->migrating =3D false; @@ -656,7 +656,7 @@ qemuMigrationSrcNBDCopyCancelOne(virQEMUDriverPtr drive= r, qemuMigrationNBDReportMirrorError(job, disk->dst); goto cleanup; } - ATTRIBUTE_FALLTHROUGH; + G_GNUC_FALLTHROUGH; case VIR_DOMAIN_BLOCK_JOB_COMPLETED: ret =3D 1; goto cleanup; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 0afb7c79e4..9c50c4a1d8 100644 --- 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; =20 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 3191f9032e..bd4017c4dc 100644 --- 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 =3D 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 665805b7cf..6f7bf3be8e 100644 --- a/src/util/virconf.c +++ b/src/util/virconf.c @@ -984,7 +984,7 @@ int virConfGetValueStringList(virConfPtr conf, } break; } - ATTRIBUTE_FALLTHROUGH; + G_GNUC_FALLTHROUGH; =20 case VIR_CONF_LLONG: case VIR_CONF_ULLONG: diff --git a/src/util/virhashcode.c b/src/util/virhashcode.c index 98d5dceeba..07d9e16fc4 100644 --- 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 ^=3D tail[2] << 16; - ATTRIBUTE_FALLTHROUGH; + G_GNUC_FALLTHROUGH; case 2: k1 ^=3D tail[1] << 8; - ATTRIBUTE_FALLTHROUGH; + G_GNUC_FALLTHROUGH; case 1: k1 ^=3D tail[0]; k1 *=3D c1; k1 =3D rotl32(k1, 15); k1 *=3D c2; h1 ^=3D k1; - ATTRIBUTE_FALLTHROUGH; + G_GNUC_FALLTHROUGH; default: break; } diff --git a/src/util/viriscsi.c b/src/util/viriscsi.c index b869c4cacd..25b77eead7 100644 --- 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 587540ae03..aae07d48e6 100644 --- 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 *=3D base; - ATTRIBUTE_FALLTHROUGH; + G_GNUC_FALLTHROUGH; case 'p': scale *=3D base; - ATTRIBUTE_FALLTHROUGH; + G_GNUC_FALLTHROUGH; case 't': scale *=3D base; - ATTRIBUTE_FALLTHROUGH; + G_GNUC_FALLTHROUGH; case 'g': scale *=3D base; - ATTRIBUTE_FALLTHROUGH; + G_GNUC_FALLTHROUGH; case 'm': scale *=3D base; - ATTRIBUTE_FALLTHROUGH; + G_GNUC_FALLTHROUGH; case 'k': scale *=3D base; break; diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index e188c0a34f..5c0aa0e588 100644 --- 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 =3D 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 5091ac74b7..5dc1a1fe5a 100644 --- a/tools/virsh-edit.c +++ b/tools/virsh-edit.c @@ -137,7 +137,7 @@ do { relax_avail =3D false; goto redefine; } - ATTRIBUTE_FALLTHROUGH; + G_GNUC_FALLTHROUGH; #endif =20 default: diff --git a/tools/virsh.c b/tools/virsh.c index 0ed46e0e64..4aae877160 100644 --- 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 95a3c3d30e..c0cc0999cb 100644 --- a/tools/virt-admin.c +++ b/tools/virt-admin.c @@ -1329,7 +1329,7 @@ vshAdmParseArgv(vshControl *ctl, int argc, char **arg= v) puts(VERSION); exit(EXIT_SUCCESS); } - ATTRIBUTE_FALLTHROUGH; + G_GNUC_FALLTHROUGH; case 'V': vshAdmShowVersion(ctl); exit(EXIT_SUCCESS); --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list