From nobody Sun Feb 8 18:09:18 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=1571059039; cv=none; d=zoho.com; s=zohoarc; b=UfO+U94xyx5A5AQiZefJykUWYy0FMocRn4VXZBfr4GBRI/mFMples+mtn3HX8FQGUZUH9I2tCFN+cM4oH9JGGQw/NFKH5ghPyiiouseR2juKT755jhyXiGM7YeO2cKkOw8jDu2Ro82694jYzfCHHy4/BfXuIlGWI42rkZA+HWvw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571059039; 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=QWBU6LQbd48gldxzSAd7tpqr+aZ6p8nNyapFN8bsxN4=; b=OguT28XJ18tGO9zOrQTZE2gbapBK4CSjCrzEfFpGlEws3fiLpFN/1YPb0QA6lWp8IPB1+VTLIiRhEwcLCDGvUJvtNsnToqEBX8gNRgpLmBHc/iD5V0YX2AZ/Tnqd3h1rkpjweAf+U4ahHcnuuQBBJQn3znW9MtF5gCgr4NbeIjk= 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 157105903957042.69963771826576; Mon, 14 Oct 2019 06:17:19 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4121B308FC4D; Mon, 14 Oct 2019 13:17:17 +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 10569194B6; Mon, 14 Oct 2019 13:17:17 +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 C01DC180BA9F; Mon, 14 Oct 2019 13:17:16 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9EDGR5L017438 for ; Mon, 14 Oct 2019 09:16:27 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0E14560126; Mon, 14 Oct 2019 13:16:27 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 88BA1600CD for ; Mon, 14 Oct 2019 13:16:26 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Mon, 14 Oct 2019 15:15:34 +0200 Message-Id: <3beff7805493e43cca755b3c1b943052dc25852e.1571058852.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 16/35] lxc: use G_GNUC_UNUSED 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.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Mon, 14 Oct 2019 13:17:18 +0000 (UTC) Use G_GNUC_UNUSED from GLib instead of ATTRIBUTE_UNUSED. Signed-off-by: J=C3=A1n Tomko --- src/lxc/lxc_cgroup.c | 4 ++-- src/lxc/lxc_container.c | 10 +++++----- src/lxc/lxc_controller.c | 4 ++-- src/lxc/lxc_domain.c | 26 +++++++++++++------------- src/lxc/lxc_driver.c | 18 +++++++++--------- src/lxc/lxc_fuse.c | 26 +++++++++++++------------- src/lxc/lxc_monitor.c | 12 ++++++------ src/lxc/lxc_process.c | 4 ++-- 8 files changed, 52 insertions(+), 52 deletions(-) diff --git a/src/lxc/lxc_cgroup.c b/src/lxc/lxc_cgroup.c index 76014f3bfd..5efb495b56 100644 --- a/src/lxc/lxc_cgroup.c +++ b/src/lxc/lxc_cgroup.c @@ -272,7 +272,7 @@ struct _virLXCCgroupDevicePolicy { =20 =20 int -virLXCSetupHostUSBDeviceCgroup(virUSBDevicePtr dev ATTRIBUTE_UNUSED, +virLXCSetupHostUSBDeviceCgroup(virUSBDevicePtr dev G_GNUC_UNUSED, const char *path, void *opaque) { @@ -288,7 +288,7 @@ virLXCSetupHostUSBDeviceCgroup(virUSBDevicePtr dev ATTR= IBUTE_UNUSED, =20 =20 int -virLXCTeardownHostUSBDeviceCgroup(virUSBDevicePtr dev ATTRIBUTE_UNUSED, +virLXCTeardownHostUSBDeviceCgroup(virUSBDevicePtr dev G_GNUC_UNUSED, const char *path, void *opaque) { diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 97f9055506..2a0b04117e 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -1035,8 +1035,8 @@ static int lxcContainerMountProcFuse(virDomainDefPtr = def, return ret; } #else -static int lxcContainerMountProcFuse(virDomainDefPtr def ATTRIBUTE_UNUSED, - const char *stateDir ATTRIBUTE_UNUSED) +static int lxcContainerMountProcFuse(virDomainDefPtr def G_GNUC_UNUSED, + const char *stateDir G_GNUC_UNUSED) { return 0; } @@ -1305,7 +1305,7 @@ lxcContainerMountDetectFilesystem(const char *src, ch= ar **type) } #else /* ! WITH_BLKID */ static int -lxcContainerMountDetectFilesystem(const char *src ATTRIBUTE_UNUSED, +lxcContainerMountDetectFilesystem(const char *src G_GNUC_UNUSED, char **type) { /* No libblkid, so just return success with no detected type */ @@ -2083,8 +2083,8 @@ static int lxcContainerDropCapabilities(virDomainDefP= tr def, return 0; } #else -static int lxcContainerDropCapabilities(virDomainDefPtr def ATTRIBUTE_UNUS= ED, - bool keepReboot ATTRIBUTE_UNUSED) +static int lxcContainerDropCapabilities(virDomainDefPtr def G_GNUC_UNUSED, + bool keepReboot G_GNUC_UNUSED) { VIR_WARN("libcap-ng support not compiled in, unable to clear capabilit= ies"); return 0; diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 9097655b4d..a1f4ae8812 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -150,7 +150,7 @@ static void virLXCControllerFree(virLXCControllerPtr ct= rl); static int virLXCControllerEventSendInit(virLXCControllerPtr ctrl, pid_t initpid); =20 -static void virLXCControllerQuitTimer(int timer ATTRIBUTE_UNUSED, void *op= aque) +static void virLXCControllerQuitTimer(int timer G_GNUC_UNUSED, void *opaqu= e) { virLXCControllerPtr ctrl =3D opaque; =20 @@ -1027,7 +1027,7 @@ static virMutex lock =3D VIR_MUTEX_INITIALIZER; =20 =20 static void virLXCControllerSignalChildIO(virNetDaemonPtr dmn, - siginfo_t *info ATTRIBUTE_UNUSED, + siginfo_t *info G_GNUC_UNUSED, void *opaque) { virLXCControllerPtr ctrl =3D opaque; diff --git a/src/lxc/lxc_domain.c b/src/lxc/lxc_domain.c index c4360f25f6..4339d305a9 100644 --- a/src/lxc/lxc_domain.c +++ b/src/lxc/lxc_domain.c @@ -84,7 +84,7 @@ virLXCDomainObjFreeJob(virLXCDomainObjPrivatePtr priv) * Successful calls must be followed by EndJob eventually. */ int -virLXCDomainObjBeginJob(virLXCDriverPtr driver ATTRIBUTE_UNUSED, +virLXCDomainObjBeginJob(virLXCDriverPtr driver G_GNUC_UNUSED, virDomainObjPtr obj, enum virLXCDomainJob job) { @@ -136,7 +136,7 @@ virLXCDomainObjBeginJob(virLXCDriverPtr driver ATTRIBUT= E_UNUSED, * earlier virLXCDomainBeginJob() call */ void -virLXCDomainObjEndJob(virLXCDriverPtr driver ATTRIBUTE_UNUSED, +virLXCDomainObjEndJob(virLXCDriverPtr driver G_GNUC_UNUSED, virDomainObjPtr obj) { virLXCDomainObjPrivatePtr priv =3D obj->privateData; @@ -151,7 +151,7 @@ virLXCDomainObjEndJob(virLXCDriverPtr driver ATTRIBUTE_= UNUSED, =20 =20 static void * -virLXCDomainObjPrivateAlloc(void *opaque ATTRIBUTE_UNUSED) +virLXCDomainObjPrivateAlloc(void *opaque G_GNUC_UNUSED) { virLXCDomainObjPrivatePtr priv; =20 @@ -326,7 +326,7 @@ virLXCDomainObjPrivateXMLFormat(virBufferPtr buf, static int virLXCDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt, virDomainObjPtr vm, - virDomainDefParserConfigPtr config ATTRIBUT= E_UNUSED) + virDomainDefParserConfigPtr config G_GNUC_U= NUSED) { virLXCDomainObjPrivatePtr priv =3D vm->privateData; long long thepid; @@ -352,9 +352,9 @@ virDomainXMLPrivateDataCallbacks virLXCDriverPrivateDat= aCallbacks =3D { static int virLXCDomainDefPostParse(virDomainDefPtr def, virCapsPtr caps, - unsigned int parseFlags ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED, - void *parseOpaque ATTRIBUTE_UNUSED) + unsigned int parseFlags G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED, + void *parseOpaque G_GNUC_UNUSED) { /* check for emulator and create a default one if needed */ if (!def->emulator && @@ -367,11 +367,11 @@ virLXCDomainDefPostParse(virDomainDefPtr def, =20 static int virLXCDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, - const virDomainDef *def ATTRIBUTE_UNUSED, - virCapsPtr caps ATTRIBUTE_UNUSED, - unsigned int parseFlags ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED, - void *parseOpaque ATTRIBUTE_UNUSED) + const virDomainDef *def G_GNUC_UNUSED, + virCapsPtr caps G_GNUC_UNUSED, + unsigned int parseFlags G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED, + void *parseOpaque G_GNUC_UNUSED) { if (dev->type =3D=3D VIR_DOMAIN_DEVICE_CHR && dev->data.chr->deviceType =3D=3D VIR_DOMAIN_CHR_DEVICE_TYPE_CONSOL= E && @@ -415,7 +415,7 @@ struct _lxcDomainInitctlCallbackData { =20 =20 static int -lxcDomainInitctlCallback(pid_t pid ATTRIBUTE_UNUSED, +lxcDomainInitctlCallback(pid_t pid G_GNUC_UNUSED, void *opaque) { lxcDomainInitctlCallbackData *data =3D opaque; diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index c0bbeb09e8..5c7a9140b2 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -133,8 +133,8 @@ lxcConnectURIProbe(char **uri) =20 =20 static virDrvOpenStatus lxcConnectOpen(virConnectPtr conn, - virConnectAuthPtr auth ATTRIBUTE_UN= USED, - virConfPtr conf ATTRIBUTE_UNUSED, + virConnectAuthPtr auth G_GNUC_UNUSE= D, + virConfPtr conf G_GNUC_UNUSED, unsigned int flags) { virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); @@ -174,21 +174,21 @@ static int lxcConnectClose(virConnectPtr conn) } =20 =20 -static int lxcConnectIsSecure(virConnectPtr conn ATTRIBUTE_UNUSED) +static int lxcConnectIsSecure(virConnectPtr conn G_GNUC_UNUSED) { /* Trivially secure, since always inside the daemon */ return 1; } =20 =20 -static int lxcConnectIsEncrypted(virConnectPtr conn ATTRIBUTE_UNUSED) +static int lxcConnectIsEncrypted(virConnectPtr conn G_GNUC_UNUSED) { /* Not encrypted, but remote driver takes care of that */ return 0; } =20 =20 -static int lxcConnectIsAlive(virConnectPtr conn ATTRIBUTE_UNUSED) +static int lxcConnectIsAlive(virConnectPtr conn G_GNUC_UNUSED) { return 1; } @@ -1536,8 +1536,8 @@ lxcSecurityInit(virLXCDriverConfigPtr cfg) =20 =20 static int lxcStateInitialize(bool privileged, - virStateInhibitCallback callback ATTRIBUTE_U= NUSED, - void *opaque ATTRIBUTE_UNUSED) + virStateInhibitCallback callback G_GNUC_UNUS= ED, + void *opaque G_GNUC_UNUSED) { virCapsPtr caps =3D NULL; virLXCDriverConfigPtr cfg =3D NULL; @@ -3577,7 +3577,7 @@ struct lxcDomainAttachDeviceMknodData { }; =20 static int -lxcDomainAttachDeviceMknodHelper(pid_t pid ATTRIBUTE_UNUSED, +lxcDomainAttachDeviceMknodHelper(pid_t pid G_GNUC_UNUSED, void *opaque) { struct lxcDomainAttachDeviceMknodData *data =3D opaque; @@ -3685,7 +3685,7 @@ lxcDomainAttachDeviceMknod(virLXCDriverPtr driver, =20 =20 static int -lxcDomainAttachDeviceUnlinkHelper(pid_t pid ATTRIBUTE_UNUSED, +lxcDomainAttachDeviceUnlinkHelper(pid_t pid G_GNUC_UNUSED, void *opaque) { const char *path =3D opaque; diff --git a/src/lxc/lxc_fuse.c b/src/lxc/lxc_fuse.c index 4137d1b04f..b64b275a87 100644 --- a/src/lxc/lxc_fuse.c +++ b/src/lxc/lxc_fuse.c @@ -82,8 +82,8 @@ static int lxcProcGetattr(const char *path, struct stat *= stbuf) =20 static int lxcProcReaddir(const char *path, void *buf, fuse_fill_dir_t filler, - off_t offset ATTRIBUTE_UNUSED, - struct fuse_file_info *fi ATTRIBUTE_UNUSED) + off_t offset G_GNUC_UNUSED, + struct fuse_file_info *fi G_GNUC_UNUSED) { if (STRNEQ(path, "/")) return -ENOENT; @@ -95,8 +95,8 @@ static int lxcProcReaddir(const char *path, void *buf, return 0; } =20 -static int lxcProcOpen(const char *path ATTRIBUTE_UNUSED, - struct fuse_file_info *fi ATTRIBUTE_UNUSED) +static int lxcProcOpen(const char *path G_GNUC_UNUSED, + struct fuse_file_info *fi G_GNUC_UNUSED) { if (STRNEQ(path, fuse_meminfo_path)) return -ENOENT; @@ -240,11 +240,11 @@ static int lxcProcReadMeminfo(char *hostpath, virDoma= inDefPtr def, return res; } =20 -static int lxcProcRead(const char *path ATTRIBUTE_UNUSED, - char *buf ATTRIBUTE_UNUSED, - size_t size ATTRIBUTE_UNUSED, - off_t offset ATTRIBUTE_UNUSED, - struct fuse_file_info *fi ATTRIBUTE_UNUSED) +static int lxcProcRead(const char *path G_GNUC_UNUSED, + char *buf G_GNUC_UNUSED, + size_t size G_GNUC_UNUSED, + off_t offset G_GNUC_UNUSED, + struct fuse_file_info *fi G_GNUC_UNUSED) { int res =3D -ENOENT; char *hostpath =3D NULL; @@ -376,18 +376,18 @@ void lxcFreeFuse(virLXCFusePtr *f) } } #else -int lxcSetupFuse(virLXCFusePtr *f ATTRIBUTE_UNUSED, - virDomainDefPtr def ATTRIBUTE_UNUSED) +int lxcSetupFuse(virLXCFusePtr *f G_GNUC_UNUSED, + virDomainDefPtr def G_GNUC_UNUSED) { return 0; } =20 -int lxcStartFuse(virLXCFusePtr f ATTRIBUTE_UNUSED) +int lxcStartFuse(virLXCFusePtr f G_GNUC_UNUSED) { return 0; } =20 -void lxcFreeFuse(virLXCFusePtr *f ATTRIBUTE_UNUSED) +void lxcFreeFuse(virLXCFusePtr *f G_GNUC_UNUSED) { } #endif diff --git a/src/lxc/lxc_monitor.c b/src/lxc/lxc_monitor.c index 6d3db9629a..4e67e29293 100644 --- a/src/lxc/lxc_monitor.c +++ b/src/lxc/lxc_monitor.c @@ -81,8 +81,8 @@ static virNetClientProgramEvent virLXCMonitorEvents[] =3D= { =20 =20 static void -virLXCMonitorHandleEventExit(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +virLXCMonitorHandleEventExit(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virLXCMonitorPtr mon =3D opaque; @@ -95,8 +95,8 @@ virLXCMonitorHandleEventExit(virNetClientProgramPtr prog = ATTRIBUTE_UNUSED, =20 =20 static void -virLXCMonitorHandleEventInit(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +virLXCMonitorHandleEventInit(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virLXCMonitorPtr mon =3D opaque; @@ -108,8 +108,8 @@ virLXCMonitorHandleEventInit(virNetClientProgramPtr pro= g ATTRIBUTE_UNUSED, } =20 =20 -static void virLXCMonitorEOFNotify(virNetClientPtr client ATTRIBUTE_UNUSED, - int reason ATTRIBUTE_UNUSED, +static void virLXCMonitorEOFNotify(virNetClientPtr client G_GNUC_UNUSED, + int reason G_GNUC_UNUSED, void *opaque) { virLXCMonitorPtr mon =3D opaque; diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 318b4c1653..d3017e9b05 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -720,7 +720,7 @@ static void virLXCProcessMonitorEOFNotify(virLXCMonitor= Ptr mon, virObjectEventStateQueue(driver->domainEventState, event); } =20 -static void virLXCProcessMonitorExitNotify(virLXCMonitorPtr mon ATTRIBUTE_= UNUSED, +static void virLXCProcessMonitorExitNotify(virLXCMonitorPtr mon G_GNUC_UNU= SED, virLXCMonitorExitStatus status, virDomainObjPtr vm) { @@ -779,7 +779,7 @@ virLXCProcessGetNsInode(pid_t pid, =20 /* XXX a little evil */ extern virLXCDriverPtr lxc_driver; -static void virLXCProcessMonitorInitNotify(virLXCMonitorPtr mon ATTRIBUTE_= UNUSED, +static void virLXCProcessMonitorInitNotify(virLXCMonitorPtr mon G_GNUC_UNU= SED, pid_t initpid, virDomainObjPtr vm) { --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list