From nobody Sun May 5 10:00:01 2024 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=1571059009; cv=none; d=zoho.com; s=zohoarc; b=PRvgIw4FzDgq5csWi6/sgkiit5nvVYT51AahaUyClTV6GEHxT41d7PMe2fTn6IRA2b4UKz1FppiG7znJm4bvFmvezorI4v14depxYa6IaAis+8nZGE1/Oaa1pBZ9YSEkJ2rR7K1rmLFg0wT5SQGaxqejigaKS8DqBPcebx2Yd/k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571059009; 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=sKI1CzWTWwBLqxK0PGFdHMsT78NDCwqNsRe2ntLJzQk=; b=gmUstkgJidsuGDY46NI6lKMF9SEGAI+KqT24JAckrnXCPxru0kULYUEIvoR8M0ZzaBPPa2fmFMyu+T4ESh/SRt0iCLYuCP7UEwgCIpfL4jnTwzynRV/8Pwsc4kdsxB91OL9UcPD0+c//ZesaKB6RLZUPPorEbXsdeQMdFSpoHkU= 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 15710590099041001.3671381846464; Mon, 14 Oct 2019 06:16:49 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3041885A07; Mon, 14 Oct 2019 13:16:48 +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 E89A55D9C9; Mon, 14 Oct 2019 13:16:47 +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 34AE3180B76F; Mon, 14 Oct 2019 13:16:47 +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 x9EDG4TB017306 for ; Mon, 14 Oct 2019 09:16:04 -0400 Received: by smtp.corp.redhat.com (Postfix) id 1DF4E6012E; Mon, 14 Oct 2019 13:16:04 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 99E48600CD for ; Mon, 14 Oct 2019 13:16:00 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Mon, 14 Oct 2019 15:15:19 +0200 Message-Id: <095aa284938c1fb87e2c279fc9f520627cdffd64.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 01/35] util: remove MIN and MAX macros 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.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Mon, 14 Oct 2019 13:16:48 +0000 (UTC) They are already defined in glib.h. (libxml2 also has them defined) Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/util/virutil.h | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/util/virutil.h b/src/util/virutil.h index b64a85f49e..15ae67dea2 100644 --- a/src/util/virutil.h +++ b/src/util/virutil.h @@ -26,13 +26,6 @@ #include #include =20 -#ifndef MIN -# define MIN(a, b) ((a) < (b) ? (a) : (b)) -#endif -#ifndef MAX -# define MAX(a, b) ((a) > (b) ? (a) : (b)) -#endif - =20 int virSetBlocking(int fd, bool blocking) ATTRIBUTE_RETURN_CHECK; int virSetNonBlock(int fd) ATTRIBUTE_RETURN_CHECK; --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 10:00:01 2024 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=1571059015; cv=none; d=zoho.com; s=zohoarc; b=GkZ7RORwadorjOxz2plU427PplCYBKV1IOcWokvEXIqB3qo59GW3UQGFl1zL7W6fMm7nZ5ZyRVsmzLKzMcjzeETPHf7AiQrHyEBheQRwmk6w4xlZ8iCrCqay+EVVde+/gzXHm69AKJkWOfnGBSXLWvGQ+wo0U8FbAbDrTd5gaD0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571059015; 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=oNZtlIiNX1BkjhZ3bfJUsVjyl8OkdVtBfWJHk1JVGEM=; b=Ym567fSZfwHKBTMMUoHfXGEipHFGZIXG71jvwpIgB6WFhQVXso4FHnEU/Az6kLN/HAnVU/G97WqDs+IjxMxnME5V9klD3eSYI4Kj2xp6NHkwdxXKNloLOtv/tbJvw6S1INe80m0CUDHJS3pjt+oJwwJr7BzRohWm5BrUxaGTbZo= 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 1571059015143276.72591224289056; Mon, 14 Oct 2019 06:16:55 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3DA658E1CE3; Mon, 14 Oct 2019 13:16:53 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 116CE600CD; Mon, 14 Oct 2019 13:16:53 +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 ADC444EE6A; Mon, 14 Oct 2019 13:16:52 +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 x9EDG8lE017316 for ; Mon, 14 Oct 2019 09:16:08 -0400 Received: by smtp.corp.redhat.com (Postfix) id E3DAE5C6F0; Mon, 14 Oct 2019 13:16:07 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5A5B5600CD for ; Mon, 14 Oct 2019 13:16:04 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Mon, 14 Oct 2019 15:15:20 +0200 Message-Id: <250a3bcaacbc6969f0c489d8ca295dddc6eb2db3.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 02/35] apibuild: ignore GLib macros too 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.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.69]); Mon, 14 Oct 2019 13:16:53 +0000 (UTC) Add an exception for the GLib versions of the macros we already ignore. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- docs/apibuild.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/apibuild.py b/docs/apibuild.py index 92886e1276..b11d3fd5a9 100755 --- a/docs/apibuild.py +++ b/docs/apibuild.py @@ -73,6 +73,8 @@ admin_included_files =3D { ignored_words =3D { "ATTRIBUTE_UNUSED": (0, "macro keyword"), "ATTRIBUTE_SENTINEL": (0, "macro keyword"), + "G_GNUC_UNUSED": (0, "macro keyword"), + "G_GNUC_NULL_TERMINATED": (0, "macro keyword"), "VIR_DEPRECATED": (0, "macro keyword"), "VIR_EXPORT_VAR": (0, "macro keyword"), "WINAPI": (0, "Windows keyword"), --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 10:00:01 2024 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=1571059177; cv=none; d=zoho.com; s=zohoarc; b=JoHnjPNrmTrbU0w3Jx/QjkeGLEBKEDVUjMc54XUIN+wUgzv4iBoG4dBXohDnOgKK9w4ae/IyyT1DRYQBXlz7qI3XvmDwkrL0U58mEYJDaUtVqdslrqRB6YEKLppLDozIDbKLXxUwvzHEC2okBVVtSqgd6JYNH+NV/bAs8RDD9YU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571059177; 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=mr98xPFYsRl/5FIXHVYGrrfRxzdaX9+EffPN1S6XC6k=; b=JXiFHCcPDYi/7Ub1gv+HA1X2GvFeC3eteJ3xogJXNJg35ertSn0zK597aw8FhlrW8ROwCUp2GOueUM3sT5Z3zioUql+MppdZnrP7sE72Ct5JeQe9UHukGzpZ11qrGPHgsnr9BoM0Rauspc55zfr53up8Zt1wzyPeB3/PbGGC/mQ= 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 15710591770161002.8091083869966; Mon, 14 Oct 2019 06:19:37 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 475E33DE31; Mon, 14 Oct 2019 13:19:35 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1122D60126; Mon, 14 Oct 2019 13:19:35 +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 BE93B6B4A9; Mon, 14 Oct 2019 13:19:34 +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 x9EDGAvO017326 for ; Mon, 14 Oct 2019 09:16:10 -0400 Received: by smtp.corp.redhat.com (Postfix) id D6D7B6012E; Mon, 14 Oct 2019 13:16:10 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5E5E760126 for ; Mon, 14 Oct 2019 13:16:08 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Mon, 14 Oct 2019 15:15:21 +0200 Message-Id: <36e22a5755c399c27d5d7a1c176eb022283bee7a.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 03/35] use G_GNUC_NORETURN instead of ATTRIBUTE_NORETURN 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.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Mon, 14 Oct 2019 13:19:35 +0000 (UTC) Remove all usage of ATTRIBUTE_NORETURN in favor of GLib's G_GNUC_NORETURN. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/lxc/lxc_container.c | 2 +- src/network/leaseshelper.c | 2 +- src/util/iohelper.c | 2 +- src/util/virprocess.c | 2 +- src/util/virprocess.h | 2 +- tests/eventtest.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 905645a41c..97f9055506 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -116,7 +116,7 @@ static int lxcContainerMountFSBlock(virDomainFSDefPtr f= s, * in a child pid namespace if container reboot support exists. * Otherwise, it will either succeed or return -EPERM. */ -ATTRIBUTE_NORETURN static int +G_GNUC_NORETURN static int lxcContainerRebootChild(void *argv) { int *cmd =3D argv; diff --git a/src/network/leaseshelper.c b/src/network/leaseshelper.c index 46482ad3ce..dc737879ca 100644 --- a/src/network/leaseshelper.c +++ b/src/network/leaseshelper.c @@ -47,7 +47,7 @@ helperVersion(const char *argv0) printf("%s (%s) %s\n", argv0, PACKAGE_NAME, PACKAGE_VERSION); } =20 -ATTRIBUTE_NORETURN static void +G_GNUC_NORETURN static void usage(int status) { if (status) { diff --git a/src/util/iohelper.c b/src/util/iohelper.c index f3d45b9c03..3dc0488b26 100644 --- a/src/util/iohelper.c +++ b/src/util/iohelper.c @@ -175,7 +175,7 @@ runIO(const char *path, int fd, int oflags) =20 static const char *program_name; =20 -ATTRIBUTE_NORETURN static void +G_GNUC_NORETURN static void usage(int status) { if (status) { diff --git a/src/util/virprocess.c b/src/util/virprocess.c index b1544af730..0fa648ce74 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -1214,7 +1214,7 @@ virProcessSetupPrivateMountNS(void) #endif /* !defined(HAVE_SYS_MOUNT_H) || !defined(HAVE_UNSHARE) */ =20 #if defined(__linux__) -ATTRIBUTE_NORETURN static int +G_GNUC_NORETURN static int virProcessDummyChild(void *argv ATTRIBUTE_UNUSED) { _exit(0); diff --git a/src/util/virprocess.h b/src/util/virprocess.h index 4806c592da..8e2af33c7d 100644 --- a/src/util/virprocess.h +++ b/src/util/virprocess.h @@ -46,7 +46,7 @@ virProcessTranslateStatus(int status); void virProcessAbort(pid_t pid); =20 -void virProcessExitWithStatus(int status) ATTRIBUTE_NORETURN; +void virProcessExitWithStatus(int status) G_GNUC_NORETURN; =20 int virProcessWait(pid_t pid, int *exitstatus, bool raw) diff --git a/tests/eventtest.c b/tests/eventtest.c index f04b416ad2..2a6edc7461 100644 --- a/tests/eventtest.c +++ b/tests/eventtest.c @@ -158,7 +158,7 @@ static pthread_cond_t eventThreadJobCond =3D PTHREAD_CO= ND_INITIALIZER; static int eventThreadJobDone; =20 =20 -ATTRIBUTE_NORETURN static void *eventThreadLoop(void *data ATTRIBUTE_UNUSE= D) { +G_GNUC_NORETURN static void *eventThreadLoop(void *data ATTRIBUTE_UNUSED) { while (1) { pthread_mutex_lock(&eventThreadMutex); while (!eventThreadRunOnce) --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 10:00:01 2024 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=1571059180; cv=none; d=zoho.com; s=zohoarc; b=gxdV/b/yAts1IxIu22yy98xcGSswBsjeeNM3TbLeQEQ5BuF/aiogL1+RnRcy3baHpMo6AhE0jaF+aE0Jo7kufhTdYB6xPlelvqmSHEGquVQ6MOaRwFx1Atq22Ux62hE0tU50HwCTpUifjbSTqMJjD8j93FgfMVeW9NkHjTh3qTs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571059180; 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=YmcOqUyndJAtoEvL+Eo3Xnb4/kB+8ypIn39zjHndJVw=; b=dDNbMOKNSc0BJpnNzxamvm3Au2dxZDtIK0+C7t/CuhcX4iq1GwdFc9lBGxQPL1+bYiHCJUmn7d2n4gHrwQ/W+KdD5UW3hw/fhoh0ZaPkGLu2zPkANiVlggt0nbaE27Qq+Wb5aTe41EJhhF49uSMdHeS7Np7LzMo3bnI9PWAqRzE= 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 1571059180523480.5715267373114; Mon, 14 Oct 2019 06:19:40 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id ED331801674; Mon, 14 Oct 2019 13:19:38 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C3EEC6012D; Mon, 14 Oct 2019 13:19:38 +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 79AF06B4B3; Mon, 14 Oct 2019 13:19:38 +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 x9EDGDUR017337 for ; Mon, 14 Oct 2019 09:16:13 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8D83F600CD; Mon, 14 Oct 2019 13:16:13 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 15FAB60126 for ; Mon, 14 Oct 2019 13:16:11 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Mon, 14 Oct 2019 15:15:22 +0200 Message-Id: <87dcec89660f60465ac20e6816622a35fd83ab34.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 04/35] use G_GNUC_NULL_TERMINATED instead of ATTRIBUTE_SENTINEL 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.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.67]); Mon, 14 Oct 2019 13:19:39 +0000 (UTC) Prefer G_GNUC_NULL_TERMINATED which was introduced in GLib 2.8. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/qemu/qemu_agent.c | 2 +- src/qemu/qemu_monitor_json.c | 2 +- src/util/virbuffer.h | 2 +- src/util/vircommand.h | 4 ++-- src/util/virfile.h | 2 +- src/util/virfirewall.h | 4 ++-- src/util/virjson.h | 4 ++-- src/util/virtypedparam.h | 2 +- src/vz/vz_utils.h | 2 +- tests/domaincapstest.c | 2 +- tests/qemumonitortestutils.h | 2 +- tests/testutils.h | 4 ++-- 12 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index 0ef8b563f5..62edb665a7 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -1159,7 +1159,7 @@ qemuAgentCommand(qemuAgentPtr mon, return ret; } =20 -static virJSONValuePtr ATTRIBUTE_SENTINEL +static virJSONValuePtr G_GNUC_NULL_TERMINATED qemuAgentMakeCommand(const char *cmdname, ...) { diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index dbc32acb5e..6818e726c6 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -557,7 +557,7 @@ qemuMonitorJSONMakeCommandInternal(const char *cmdname, } =20 =20 -static virJSONValuePtr ATTRIBUTE_SENTINEL +static virJSONValuePtr G_GNUC_NULL_TERMINATED qemuMonitorJSONMakeCommand(const char *cmdname, ...) { diff --git a/src/util/virbuffer.h b/src/util/virbuffer.h index d5a7a8dc33..75e26c32ff 100644 --- a/src/util/virbuffer.h +++ b/src/util/virbuffer.h @@ -77,7 +77,7 @@ void virBufferAsprintf(virBufferPtr buf, const char *form= at, ...) void virBufferVasprintf(virBufferPtr buf, const char *format, va_list ap) ATTRIBUTE_FMT_PRINTF(2, 0); void virBufferStrcat(virBufferPtr buf, ...) - ATTRIBUTE_SENTINEL; + G_GNUC_NULL_TERMINATED; void virBufferStrcatVArgs(virBufferPtr buf, va_list ap); =20 void virBufferEscape(virBufferPtr buf, char escape, const char *toescape, diff --git a/src/util/vircommand.h b/src/util/vircommand.h index 1a7158d4c1..632d02bc71 100644 --- a/src/util/vircommand.h +++ b/src/util/vircommand.h @@ -42,7 +42,7 @@ virCommandPtr virCommandNew(const char *binary) ATTRIBUTE= _NONNULL(1); virCommandPtr virCommandNewArgs(const char *const*args) ATTRIBUTE_NONNULL(= 1); =20 virCommandPtr virCommandNewArgList(const char *binary, ...) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_SENTINEL; + ATTRIBUTE_NONNULL(1) G_GNUC_NULL_TERMINATED; =20 virCommandPtr virCommandNewVAList(const char *binary, va_list list) ATTRIBUTE_NONNULL(1); @@ -137,7 +137,7 @@ void virCommandAddArgSet(virCommandPtr cmd, =20 void virCommandAddArgList(virCommandPtr cmd, ... /* const char *arg, ..., NULL */) - ATTRIBUTE_SENTINEL; + G_GNUC_NULL_TERMINATED; =20 void virCommandSetWorkingDirectory(virCommandPtr cmd, const char *pwd) ATTRIBUTE_NONNULL(2); diff --git a/src/util/virfile.h b/src/util/virfile.h index 2b037b00aa..f22380550c 100644 --- a/src/util/virfile.h +++ b/src/util/virfile.h @@ -317,7 +317,7 @@ char *virFileFindMountPoint(const char *type); /* NB: this should be combined with virFileBuildPath */ #define virBuildPath(path, ...) \ virBuildPathInternal(path, __VA_ARGS__, NULL) -int virBuildPathInternal(char **path, ...) ATTRIBUTE_SENTINEL; +int virBuildPathInternal(char **path, ...) G_GNUC_NULL_TERMINATED; =20 int virFilePrintf(FILE *fp, const char *msg, ...) ATTRIBUTE_FMT_PRINTF(2, 3); diff --git a/src/util/virfirewall.h b/src/util/virfirewall.h index ff4626975b..a2c0e9c26d 100644 --- a/src/util/virfirewall.h +++ b/src/util/virfirewall.h @@ -65,7 +65,7 @@ virFirewallRulePtr virFirewallAddRuleFull(virFirewallPtr = firewall, virFirewallQueryCallback cb, void *opaque, ...) - ATTRIBUTE_SENTINEL; + G_GNUC_NULL_TERMINATED; =20 void virFirewallRemoveRule(virFirewallPtr firewall, virFirewallRulePtr rule); @@ -88,7 +88,7 @@ void virFirewallRuleAddArgSet(virFirewallPtr firewall, void virFirewallRuleAddArgList(virFirewallPtr firewall, virFirewallRulePtr rule, ...) - ATTRIBUTE_SENTINEL; + G_GNUC_NULL_TERMINATED; =20 size_t virFirewallRuleGetArgCount(virFirewallRulePtr rule); =20 diff --git a/src/util/virjson.h b/src/util/virjson.h index a5f959595f..65b8d5620a 100644 --- a/src/util/virjson.h +++ b/src/util/virjson.h @@ -48,11 +48,11 @@ void virJSONValueHashFree(void *opaque, const void *nam= e); virJSONType virJSONValueGetType(const virJSONValue *value); =20 int virJSONValueObjectCreate(virJSONValuePtr *obj, ...) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_SENTINEL; + ATTRIBUTE_NONNULL(1) G_GNUC_NULL_TERMINATED; int virJSONValueObjectCreateVArgs(virJSONValuePtr *obj, va_list args) ATTRIBUTE_NONNULL(1); int virJSONValueObjectAdd(virJSONValuePtr obj, ...) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_SENTINEL; + ATTRIBUTE_NONNULL(1) G_GNUC_NULL_TERMINATED; int virJSONValueObjectAddVArgs(virJSONValuePtr obj, va_list args) ATTRIBUTE_NONNULL(1); =20 diff --git a/src/util/virtypedparam.h b/src/util/virtypedparam.h index 34cff1b2b3..2c998978ea 100644 --- a/src/util/virtypedparam.h +++ b/src/util/virtypedparam.h @@ -62,7 +62,7 @@ struct _virTypedParameterRemote { =20 int virTypedParamsValidate(virTypedParameterPtr params, int nparams, /* const char *name, int type ... */ ...) - ATTRIBUTE_SENTINEL ATTRIBUTE_RETURN_CHECK; + G_GNUC_NULL_TERMINATED ATTRIBUTE_RETURN_CHECK; =20 bool virTypedParamsCheck(virTypedParameterPtr params, int nparams, diff --git a/src/vz/vz_utils.h b/src/vz/vz_utils.h index f116f9dd1f..7ebb34bb11 100644 --- a/src/vz/vz_utils.h +++ b/src/vz/vz_utils.h @@ -122,7 +122,7 @@ void vzDomObjFree(void *p); virDomainObjPtr vzDomObjFromDomain(virDomainPtr domain); =20 char * vzGetOutput(const char *binary, ...) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_SENTINEL; + ATTRIBUTE_NONNULL(1) G_GNUC_NULL_TERMINATED; =20 vzDriverPtr vzGetDriverConnection(void); diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c index b6961a986b..db14114cba 100644 --- a/tests/domaincapstest.c +++ b/tests/domaincapstest.c @@ -27,7 +27,7 @@ #define VIR_FROM_THIS VIR_FROM_NONE =20 #if WITH_QEMU || WITH_BHYVE -static int ATTRIBUTE_SENTINEL +static int G_GNUC_NULL_TERMINATED fillStringValues(virDomainCapsStringValuesPtr values, ...) { int ret =3D 0; diff --git a/tests/qemumonitortestutils.h b/tests/qemumonitortestutils.h index 75ea63382d..2333fceed0 100644 --- a/tests/qemumonitortestutils.h +++ b/tests/qemumonitortestutils.h @@ -65,7 +65,7 @@ int qemuMonitorTestAddItemParams(qemuMonitorTestPtr test, const char *cmdname, const char *response, ...) - ATTRIBUTE_SENTINEL; + G_GNUC_NULL_TERMINATED; =20 int qemuMonitorTestAddItemExpect(qemuMonitorTestPtr test, const char *cmdname, diff --git a/tests/testutils.h b/tests/testutils.h index 85ba9fbc0b..9099a77664 100644 --- a/tests/testutils.h +++ b/tests/testutils.h @@ -48,9 +48,9 @@ int virTestRun(const char *title, const void *data); int virTestLoadFile(const char *file, char **buf); char *virTestLoadFilePath(const char *p, ...) - ATTRIBUTE_SENTINEL; + G_GNUC_NULL_TERMINATED; virJSONValuePtr virTestLoadFileJSON(const char *p, ...) - ATTRIBUTE_SENTINEL; + G_GNUC_NULL_TERMINATED; =20 int virTestCaptureProgramOutput(const char *const argv[], char **buf, int = maxlen); =20 --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 10:00:01 2024 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=1571059184; cv=none; d=zoho.com; s=zohoarc; b=ZD15uM1NlE5zVpaH8TgA5QTygR5q4lEbNGcwJ+bB9xXabhrTQ/0Rwis51QNBXKPsQg6b9c68kpMLqo3tH9vLzXj+RUpGyyBAEM+GSQctViL/BZRH1kjVtw7AxoQql107KqoHm6CDqWDIoS36Gxtv/mBKkppr2xZlGFU7XDHZzU4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571059184; 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=/YZ132vIaTWdh59etGte6sL949teyPu3Sd+CBk7h8Ak=; b=fTs3VR1X6Z8EBSwLNVgCjdTXj63X5B0YW6aZSuOWeC3McSc3ms4zawSe5Onv925vpqSlmTEjoAy43k8wbfOe/gQGfgk7Zh+bDUKo/GqI9HaH44EtgrtPC0iVJbJ7tQ+VVWroTSKKhjtpktIbvfvQ/D+JM1usx1hUA5YmNwpnRUI= 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 1571059184235668.5891188012114; Mon, 14 Oct 2019 06:19:44 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 65E2D307D974; Mon, 14 Oct 2019 13:19: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 33F9C5DC1E; Mon, 14 Oct 2019 13:19: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 E78281803B49; Mon, 14 Oct 2019 13:19:41 +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 x9EDGEUM017344 for ; Mon, 14 Oct 2019 09:16:14 -0400 Received: by smtp.corp.redhat.com (Postfix) id D5336600CD; Mon, 14 Oct 2019 13:16:14 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id DEC5860127 for ; Mon, 14 Oct 2019 13:16:13 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Mon, 14 Oct 2019 15:15:23 +0200 Message-Id: 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 05/35] Use G_GNUC_WARN_UNUSED_RESULT instead of ATTRIBUTE_RETURN_CHECK 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.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Mon, 14 Oct 2019 13:19:43 +0000 (UTC) Introduced in GLib 2.10. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/admin/admin_server_dispatch.c | 2 +- src/conf/device_conf.h | 2 +- src/conf/domain_conf.c | 2 +- src/conf/domain_conf.h | 38 ++++++------ src/conf/netdev_bandwidth_conf.h | 2 +- src/conf/virnetworkobj.h | 2 +- src/driver.h | 18 +++--- src/interface/interface_backend_udev.c | 6 +- src/libxl/libxl_domain.h | 4 +- src/lxc/lxc_domain.h | 2 +- src/nwfilter/nwfilter_learnipaddr.h | 2 +- src/qemu/qemu_block.h | 4 +- src/qemu/qemu_blockjob.h | 2 +- src/qemu/qemu_cgroup.h | 4 +- src/qemu/qemu_domain.h | 24 ++++---- src/qemu/qemu_extdevice.h | 8 +-- src/qemu/qemu_migration.c | 2 +- src/qemu/qemu_migration.h | 2 +- src/qemu/qemu_tpm.h | 8 +-- src/qemu/qemu_vhost_user_gpu.h | 6 +- src/remote/remote_daemon_dispatch.c | 24 ++++---- src/rpc/virnetmessage.h | 14 ++--- src/secret/secret_util.h | 2 +- src/storage/storage_driver.h | 2 +- src/storage/storage_util.h | 2 +- src/util/viralloc.h | 14 ++--- src/util/virbitmap.h | 22 +++---- src/util/vircommand.h | 18 +++--- src/util/vircrypto.h | 6 +- src/util/virfile.h | 70 +++++++++++----------- src/util/viriptables.h | 20 +++---- src/util/viriscsi.h | 12 ++-- src/util/virjson.h | 2 +- src/util/virkeyfile.h | 4 +- src/util/virmacaddr.h | 4 +- src/util/virnetdev.h | 80 +++++++++++++------------- src/util/virnetdevbandwidth.h | 12 ++-- src/util/virnetdevbridge.h | 32 +++++------ src/util/virnetdevip.h | 8 +-- src/util/virnetdevmacvlan.h | 18 +++--- src/util/virnetdevmidonet.h | 4 +- src/util/virnetdevopenvswitch.h | 20 +++---- src/util/virnetdevtap.h | 16 +++--- src/util/virnetdevveth.h | 4 +- src/util/virnetdevvportprofile.h | 4 +- src/util/virnetlink.h | 2 +- src/util/virpci.h | 2 +- src/util/virpidfile.h | 16 +++--- src/util/virprocess.h | 2 +- src/util/virrandom.h | 2 +- src/util/virstring.h | 40 ++++++------- src/util/virthread.h | 20 +++---- src/util/virthreadpool.h | 2 +- src/util/virtime.h | 14 ++--- src/util/virtypedparam.h | 20 +++---- src/util/virutil.h | 18 +++--- src/util/viruuid.h | 2 +- src/util/virxml.h | 4 +- tools/virsh-domain-monitor.h | 2 +- tools/virsh-util.h | 4 +- tools/vsh.h | 22 +++---- 61 files changed, 363 insertions(+), 363 deletions(-) diff --git a/src/admin/admin_server_dispatch.c b/src/admin/admin_server_dis= patch.c index 3c4d72dedb..f07ae6df1d 100644 --- a/src/admin/admin_server_dispatch.c +++ b/src/admin/admin_server_dispatch.c @@ -135,7 +135,7 @@ get_nonnull_server(virNetDaemonPtr dmn, admin_nonnull_s= erver srv) return virNetDaemonGetServer(dmn, srv.name); } =20 -static int ATTRIBUTE_RETURN_CHECK +static int G_GNUC_WARN_UNUSED_RESULT make_nonnull_server(admin_nonnull_server *srv_dst, virNetServerPtr srv_src) { diff --git a/src/conf/device_conf.h b/src/conf/device_conf.h index d0854925e3..d98fae775c 100644 --- a/src/conf/device_conf.h +++ b/src/conf/device_conf.h @@ -186,7 +186,7 @@ void virDomainDeviceInfoFree(virDomainDeviceInfoPtr inf= o); =20 bool virDomainDeviceInfoAddressIsEqual(const virDomainDeviceInfo *a, const virDomainDeviceInfo *b) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; =20 bool virDomainDeviceAddressIsValid(virDomainDeviceInfoPtr info, int type); diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index c1705a07b6..35a51f1793 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -17521,7 +17521,7 @@ virDomainChrFind(virDomainDefPtr def, =20 /* Return the address within vmdef to be modified when working with a * chrdefptr of the given type. */ -static int ATTRIBUTE_RETURN_CHECK +static int G_GNUC_WARN_UNUSED_RESULT virDomainChrGetDomainPtrsInternal(virDomainDefPtr vmdef, virDomainChrDeviceType type, virDomainChrDefPtr ***arrPtr, diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index f7404b814f..e2edca149a 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2814,7 +2814,7 @@ int virDomainDefSetVcpus(virDomainDefPtr def, unsigne= d int vcpus); unsigned int virDomainDefGetVcpus(const virDomainDef *def); virBitmapPtr virDomainDefGetOnlineVcpumap(const virDomainDef *def); virDomainVcpuDefPtr virDomainDefGetVcpu(virDomainDefPtr def, unsigned int = vcpu) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; void virDomainDefVcpuOrderClear(virDomainDefPtr def); int virDomainDefGetVcpusTopology(const virDomainDef *def, unsigned int *maxvcpus); @@ -2844,11 +2844,11 @@ int virDomainDiskGetType(virDomainDiskDefPtr def); void virDomainDiskSetType(virDomainDiskDefPtr def, int type); const char *virDomainDiskGetSource(virDomainDiskDef const *def); int virDomainDiskSetSource(virDomainDiskDefPtr def, const char *src) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; void virDomainDiskEmptySource(virDomainDiskDefPtr def); const char *virDomainDiskGetDriver(const virDomainDiskDef *def); int virDomainDiskSetDriver(virDomainDiskDefPtr def, const char *name) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; int virDomainDiskGetFormat(virDomainDiskDefPtr def); void virDomainDiskSetFormat(virDomainDiskDefPtr def, int format); virDomainControllerDefPtr @@ -2910,7 +2910,7 @@ int virDomainDeviceInfoIterate(virDomainDefPtr def, =20 bool virDomainDefHasDeviceAddress(virDomainDefPtr def, virDomainDeviceInfoPtr info) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; =20 void virDomainDefFree(virDomainDefPtr vm); VIR_DEFINE_AUTOPTR_FUNC(virDomainDef, virDomainDefFree); @@ -3160,7 +3160,7 @@ virDomainDiskDefPtr virDomainDiskByName(virDomainDefP= tr def, const char *virDomainDiskPathByName(virDomainDefPtr, const char *name); int virDomainDiskInsert(virDomainDefPtr def, virDomainDiskDefPtr disk) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; void virDomainDiskInsertPreAlloced(virDomainDefPtr def, virDomainDiskDefPtr disk); int virDomainStorageNetworkParseHost(xmlNodePtr hostnode, @@ -3221,7 +3221,7 @@ int virDomainNetAppendIPAddress(virDomainNetDefPtr de= f, =20 int virDomainControllerInsert(virDomainDefPtr def, virDomainControllerDefPtr controller) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; void virDomainControllerInsertPreAlloced(virDomainDefPtr def, virDomainControllerDefPtr control= ler); int virDomainControllerFind(const virDomainDef *def, int type, int idx); @@ -3239,7 +3239,7 @@ int virDomainLeaseIndex(virDomainDefPtr def, int virDomainLeaseInsert(virDomainDefPtr def, virDomainLeaseDefPtr lease); int virDomainLeaseInsertPreAlloc(virDomainDefPtr def) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; void virDomainLeaseInsertPreAlloced(virDomainDefPtr def, virDomainLeaseDefPtr lease); virDomainLeaseDefPtr @@ -3287,7 +3287,7 @@ int virDomainSaveConfig(const char *configDir, int virDomainSaveStatus(virDomainXMLOptionPtr xmlopt, const char *statusDir, virDomainObjPtr obj, - virCapsPtr caps) ATTRIBUTE_RETURN_CHECK; + virCapsPtr caps) G_GNUC_WARN_UNUSED_RESULT; =20 typedef void (*virDomainLoadConfigNotify)(virDomainObjPtr dom, int newDomain, @@ -3357,29 +3357,29 @@ typedef const char* (*virEventActionToStringFunc)(i= nt type); typedef int (*virEventActionFromStringFunc)(const char *type); =20 int virDomainMemoryInsert(virDomainDefPtr def, virDomainMemoryDefPtr mem) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; virDomainMemoryDefPtr virDomainMemoryRemove(virDomainDefPtr def, int idx) ATTRIBUTE_NONNULL(1); int virDomainMemoryFindByDef(virDomainDefPtr def, virDomainMemoryDefPtr me= m) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; int virDomainMemoryFindInactiveByDef(virDomainDefPtr def, virDomainMemoryDefPtr mem) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; =20 int virDomainShmemDefInsert(virDomainDefPtr def, virDomainShmemDefPtr shme= m) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; bool virDomainShmemDefEquals(virDomainShmemDefPtr src, virDomainShmemDefPt= r dst) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; ssize_t virDomainShmemDefFind(virDomainDefPtr def, virDomainShmemDefPtr sh= mem) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; virDomainShmemDefPtr virDomainShmemDefRemove(virDomainDefPtr def, size_t i= dx) ATTRIBUTE_NONNULL(1); ssize_t virDomainInputDefFind(const virDomainDef *def, const virDomainInputDef *input) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; bool virDomainVsockDefEquals(const virDomainVsockDef *a, const virDomainVsockDef *b) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; =20 VIR_ENUM_DECL(virDomainTaint); VIR_ENUM_DECL(virDomainVirt); @@ -3558,7 +3558,7 @@ virStorageSourcePtr virDomainStorageSourceParseBase(const char *type, const char *format, const char *index) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; =20 int virDomainStorageSourceParse(xmlNodePtr node, xmlXPathContextPtr ctxt, @@ -3572,7 +3572,7 @@ virDomainDiskBackingStoreParse(xmlXPathContextPtr ctx= t, virStorageSourcePtr src, unsigned int flags, virDomainXMLOptionPtr xmlopt) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; =20 int virDomainDefGetVcpuPinInfoHelper(virDomainDefPtr def, int maplen, @@ -3580,7 +3580,7 @@ int virDomainDefGetVcpuPinInfoHelper(virDomainDefPtr = def, unsigned char *cpumaps, int hostcpus, virBitmapPtr autoCpuset) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(4) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(4) G_GNUC_WARN_UNUSED_RESULT; =20 bool virDomainDefHasMemballoon(const virDomainDef *def) ATTRIBUTE_NONNULL(= 1); =20 diff --git a/src/conf/netdev_bandwidth_conf.h b/src/conf/netdev_bandwidth_c= onf.h index 42872cc496..898b2fb428 100644 --- a/src/conf/netdev_bandwidth_conf.h +++ b/src/conf/netdev_bandwidth_conf.h @@ -28,7 +28,7 @@ int virNetDevBandwidthParse(virNetDevBandwidthPtr *bandwi= dth, unsigned int *class_id, xmlNodePtr node, bool allowFloor) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; int virNetDevBandwidthFormat(virNetDevBandwidthPtr def, unsigned int class_id, virBufferPtr buf); diff --git a/src/conf/virnetworkobj.h b/src/conf/virnetworkobj.h index a91b4304c6..fe3ec5bbf8 100644 --- a/src/conf/virnetworkobj.h +++ b/src/conf/virnetworkobj.h @@ -202,7 +202,7 @@ virNetworkObjPortForEach(virNetworkObjPtr obj, int virNetworkObjSaveStatus(const char *statusDir, virNetworkObjPtr net, - virNetworkXMLOptionPtr xmlopt) ATTRIBUTE_RETURN_CH= ECK; + virNetworkXMLOptionPtr xmlopt) G_GNUC_WARN_UNUSED_= RESULT; =20 int virNetworkObjLoadAllConfigs(virNetworkObjListPtr nets, diff --git a/src/driver.h b/src/driver.h index faf4788a4f..ca82ac974b 100644 --- a/src/driver.h +++ b/src/driver.h @@ -98,15 +98,15 @@ struct _virConnectDriver { }; =20 int virRegisterConnectDriver(virConnectDriverPtr driver, - bool setSharedDrivers) ATTRIBUTE_RETURN_CHECK; -int virRegisterStateDriver(virStateDriverPtr driver) ATTRIBUTE_RETURN_CHEC= K; - -int virSetSharedInterfaceDriver(virInterfaceDriverPtr driver) ATTRIBUTE_RE= TURN_CHECK; -int virSetSharedNetworkDriver(virNetworkDriverPtr driver) ATTRIBUTE_RETURN= _CHECK; -int virSetSharedNodeDeviceDriver(virNodeDeviceDriverPtr driver) ATTRIBUTE_= RETURN_CHECK; -int virSetSharedNWFilterDriver(virNWFilterDriverPtr driver) ATTRIBUTE_RETU= RN_CHECK; -int virSetSharedSecretDriver(virSecretDriverPtr driver) ATTRIBUTE_RETURN_C= HECK; -int virSetSharedStorageDriver(virStorageDriverPtr driver) ATTRIBUTE_RETURN= _CHECK; + bool setSharedDrivers) G_GNUC_WARN_UNUSED_RES= ULT; +int virRegisterStateDriver(virStateDriverPtr driver) G_GNUC_WARN_UNUSED_RE= SULT; + +int virSetSharedInterfaceDriver(virInterfaceDriverPtr driver) G_GNUC_WARN_= UNUSED_RESULT; +int virSetSharedNetworkDriver(virNetworkDriverPtr driver) G_GNUC_WARN_UNUS= ED_RESULT; +int virSetSharedNodeDeviceDriver(virNodeDeviceDriverPtr driver) G_GNUC_WAR= N_UNUSED_RESULT; +int virSetSharedNWFilterDriver(virNWFilterDriverPtr driver) G_GNUC_WARN_UN= USED_RESULT; +int virSetSharedSecretDriver(virSecretDriverPtr driver) G_GNUC_WARN_UNUSED= _RESULT; +int virSetSharedStorageDriver(virStorageDriverPtr driver) G_GNUC_WARN_UNUS= ED_RESULT; =20 bool virHasDriverForURIScheme(const char *scheme); =20 diff --git a/src/interface/interface_backend_udev.c b/src/interface/interfa= ce_backend_udev.c index 1684b8ed83..4e381db3ef 100644 --- a/src/interface/interface_backend_udev.c +++ b/src/interface/interface_backend_udev.c @@ -588,7 +588,7 @@ udevBridgeScanDirFilter(const struct dirent *entry) =20 static int ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) -ATTRIBUTE_NONNULL(4) ATTRIBUTE_RETURN_CHECK +ATTRIBUTE_NONNULL(4) G_GNUC_WARN_UNUSED_RESULT udevGetIfaceDefBond(struct udev *udev, struct udev_device *dev, const char *name, @@ -813,7 +813,7 @@ udevGetIfaceDefBond(struct udev *udev, =20 static int ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) -ATTRIBUTE_NONNULL(4) ATTRIBUTE_RETURN_CHECK +ATTRIBUTE_NONNULL(4) G_GNUC_WARN_UNUSED_RESULT udevGetIfaceDefBridge(struct udev *udev, struct udev_device *dev, const char *name, @@ -919,7 +919,7 @@ udevGetIfaceDefBridge(struct udev *udev, =20 static int ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) -ATTRIBUTE_NONNULL(4) ATTRIBUTE_RETURN_CHECK +ATTRIBUTE_NONNULL(4) G_GNUC_WARN_UNUSED_RESULT udevGetIfaceDefVlan(struct udev *udev ATTRIBUTE_UNUSED, struct udev_device *dev ATTRIBUTE_UNUSED, const char *name, diff --git a/src/libxl/libxl_domain.h b/src/libxl/libxl_domain.h index 737ae6accd..7e28093722 100644 --- a/src/libxl/libxl_domain.h +++ b/src/libxl/libxl_domain.h @@ -86,7 +86,7 @@ int libxlDomainObjBeginJob(libxlDriverPrivatePtr driver, virDomainObjPtr obj, enum libxlDomainJob job) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; =20 void libxlDomainObjEndJob(libxlDriverPrivatePtr driver, @@ -94,7 +94,7 @@ libxlDomainObjEndJob(libxlDriverPrivatePtr driver, =20 int libxlDomainJobUpdateTime(struct libxlDomainJobObj *job) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; =20 char * libxlDomainManagedSavePath(libxlDriverPrivatePtr driver, diff --git a/src/lxc/lxc_domain.h b/src/lxc/lxc_domain.h index 9cb7090b5b..319f83338f 100644 --- a/src/lxc/lxc_domain.h +++ b/src/lxc/lxc_domain.h @@ -99,7 +99,7 @@ int virLXCDomainObjBeginJob(virLXCDriverPtr driver, virDomainObjPtr obj, enum virLXCDomainJob job) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; =20 void virLXCDomainObjEndJob(virLXCDriverPtr driver, diff --git a/src/nwfilter/nwfilter_learnipaddr.h b/src/nwfilter/nwfilter_le= arnipaddr.h index 5b9294327f..2c214183a1 100644 --- a/src/nwfilter/nwfilter_learnipaddr.h +++ b/src/nwfilter/nwfilter_learnipaddr.h @@ -42,7 +42,7 @@ int virNWFilterLearnIPAddress(virNWFilterTechDriverPtr te= chdriver, bool virNWFilterHasLearnReq(int ifindex); int virNWFilterTerminateLearnReq(const char *ifname); =20 -int virNWFilterLockIface(const char *ifname) ATTRIBUTE_RETURN_CHECK; +int virNWFilterLockIface(const char *ifname) G_GNUC_WARN_UNUSED_RESULT; void virNWFilterUnlockIface(const char *ifname); =20 int virNWFilterLearnInit(void); diff --git a/src/qemu/qemu_block.h b/src/qemu/qemu_block.h index 2de614b159..87525af160 100644 --- a/src/qemu/qemu_block.h +++ b/src/qemu/qemu_block.h @@ -178,12 +178,12 @@ int qemuBlockStorageSourceCreateGetFormatProps(virStorageSourcePtr src, virStorageSourcePtr backing, virJSONValuePtr *props) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3) G_GNUC_WARN_UNUSED_RESULT; =20 int qemuBlockStorageSourceCreateGetStorageProps(virStorageSourcePtr src, virJSONValuePtr *props) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; =20 int qemuBlockStorageSourceCreate(virDomainObjPtr vm, diff --git a/src/qemu/qemu_blockjob.h b/src/qemu/qemu_blockjob.h index 417f253e31..d8da918f2f 100644 --- a/src/qemu/qemu_blockjob.h +++ b/src/qemu/qemu_blockjob.h @@ -212,7 +212,7 @@ void qemuBlockJobSyncEnd(virDomainObjPtr vm, =20 qemuBlockJobDataPtr qemuBlockJobGetByDisk(virDomainDiskDefPtr disk) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; =20 qemuBlockjobState qemuBlockjobConvertMonitorStatus(int monitorstatus); diff --git a/src/qemu/qemu_cgroup.h b/src/qemu/qemu_cgroup.h index 91d0877947..54839b5bfb 100644 --- a/src/qemu/qemu_cgroup.h +++ b/src/qemu/qemu_cgroup.h @@ -40,10 +40,10 @@ int qemuTeardownInputCgroup(virDomainObjPtr vm, virDomainInputDefPtr dev); int qemuSetupHostdevCgroup(virDomainObjPtr vm, virDomainHostdevDefPtr dev) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; int qemuTeardownHostdevCgroup(virDomainObjPtr vm, virDomainHostdevDefPtr dev) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; int qemuSetupMemoryDevicesCgroup(virDomainObjPtr vm, virDomainMemoryDefPtr mem); int qemuTeardownMemoryDevicesCgroup(virDomainObjPtr vm, diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 01a54d4265..282ab2c3ec 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -610,30 +610,30 @@ void qemuDomainEventEmitJobCompleted(virQEMUDriverPtr= driver, int qemuDomainObjBeginJob(virQEMUDriverPtr driver, virDomainObjPtr obj, qemuDomainJob job) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; int qemuDomainObjBeginAgentJob(virQEMUDriverPtr driver, virDomainObjPtr obj, qemuDomainAgentJob agentJob) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; int qemuDomainObjBeginJobWithAgent(virQEMUDriverPtr driver, virDomainObjPtr obj, qemuDomainJob job, qemuDomainAgentJob agentJob) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; int qemuDomainObjBeginAsyncJob(virQEMUDriverPtr driver, virDomainObjPtr obj, qemuDomainAsyncJob asyncJob, virDomainJobOperation operation, unsigned long apiFlags) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; int qemuDomainObjBeginNestedJob(virQEMUDriverPtr driver, virDomainObjPtr obj, qemuDomainAsyncJob asyncJob) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; int qemuDomainObjBeginJobNowait(virQEMUDriverPtr driver, virDomainObjPtr obj, qemuDomainJob job) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; =20 void qemuDomainObjEndJob(virQEMUDriverPtr driver, virDomainObjPtr obj); @@ -662,11 +662,11 @@ void qemuDomainObjEnterMonitor(virQEMUDriverPtr drive= r, int qemuDomainObjExitMonitor(virQEMUDriverPtr driver, virDomainObjPtr obj) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; int qemuDomainObjEnterMonitorAsync(virQEMUDriverPtr driver, virDomainObjPtr obj, qemuDomainAsyncJob asyncJob) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; =20 =20 qemuAgentPtr qemuDomainObjEnterAgent(virDomainObjPtr obj) @@ -679,7 +679,7 @@ void qemuDomainObjEnterRemote(virDomainObjPtr obj) ATTRIBUTE_NONNULL(1); int qemuDomainObjExitRemote(virDomainObjPtr obj, bool checkActive) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; =20 virDomainDefPtr qemuDomainDefCopy(virQEMUDriverPtr driver, virQEMUCapsPtr qemuCaps, @@ -843,7 +843,7 @@ int qemuDomainDiskGetBackendAlias(virDomainDiskDefPtr d= isk, virQEMUCapsPtr qemuCaps, char **backendAlias) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) - ATTRIBUTE_NONNULL(3) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(3) G_GNUC_WARN_UNUSED_RESULT; =20 int qemuDomainStorageSourceChainAccessAllow(virQEMUDriverPtr driver, virDomainObjPtr vm, @@ -1172,7 +1172,7 @@ qemuDomainPrepareDiskSourceData(virDomainDiskDefPtr d= isk, virStorageSourcePtr src, virQEMUDriverConfigPtr cfg, virQEMUCapsPtr qemuCaps) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; =20 =20 int @@ -1220,4 +1220,4 @@ qemuDomainValidateActualNetDef(const virDomainNetDef = *net, =20 int qemuDomainSupportsCheckpointsBlockjobs(virDomainObjPtr vm) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; diff --git a/src/qemu/qemu_extdevice.h b/src/qemu/qemu_extdevice.h index a035c9f638..5cf777ab4b 100644 --- a/src/qemu/qemu_extdevice.h +++ b/src/qemu/qemu_extdevice.h @@ -28,17 +28,17 @@ int qemuExtDeviceLogCommand(virQEMUDriverPtr driver, virCommandPtr cmd, const char *info) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBU= TE_NONNULL(4) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; =20 int qemuExtDevicesPrepareDomain(virQEMUDriverPtr driver, virDomainObjPtr vm) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; =20 int qemuExtDevicesPrepareHost(virQEMUDriverPtr driver, virDomainObjPtr vm) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; =20 void qemuExtDevicesCleanupHost(virQEMUDriverPtr driver, virDomainDefPtr def) @@ -48,7 +48,7 @@ int qemuExtDevicesStart(virQEMUDriverPtr driver, virDomainObjPtr vm, bool incomingMigration) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; =20 void qemuExtDevicesStop(virQEMUDriverPtr driver, virDomainObjPtr vm) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index a98ec2d55a..d75b879a56 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -86,7 +86,7 @@ qemuMigrationJobStart(virQEMUDriverPtr driver, virDomainObjPtr vm, qemuDomainAsyncJob job, unsigned long apiFlags) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; =20 static void qemuMigrationJobSetPhase(virQEMUDriverPtr driver, diff --git a/src/qemu/qemu_migration.h b/src/qemu/qemu_migration.h index 188ccfa7fd..2daae65191 100644 --- a/src/qemu/qemu_migration.h +++ b/src/qemu/qemu_migration.h @@ -206,7 +206,7 @@ qemuMigrationSrcToFile(virQEMUDriverPtr driver, int fd, const char *compressor, qemuDomainAsyncJob asyncJob) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; =20 int qemuMigrationSrcCancel(virQEMUDriverPtr driver, diff --git a/src/qemu/qemu_tpm.h b/src/qemu/qemu_tpm.h index d5a27592fc..3db0797fab 100644 --- a/src/qemu/qemu_tpm.h +++ b/src/qemu/qemu_tpm.h @@ -25,12 +25,12 @@ int qemuExtTPMInitPaths(virQEMUDriverPtr driver, virDomainDefPtr def) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; =20 int qemuExtTPMPrepareHost(virQEMUDriverPtr driver, virDomainDefPtr def) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; =20 void qemuExtTPMCleanupHost(virDomainDefPtr def) ATTRIBUTE_NONNULL(1); @@ -39,7 +39,7 @@ int qemuExtTPMStart(virQEMUDriverPtr driver, virDomainObjPtr vm, bool incomingMigration) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; =20 void qemuExtTPMStop(virQEMUDriverPtr driver, virDomainObjPtr vm) @@ -49,4 +49,4 @@ int qemuExtTPMSetupCgroup(virQEMUDriverPtr driver, virDomainDefPtr def, virCgroupPtr cgroup) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; diff --git a/src/qemu/qemu_vhost_user_gpu.h b/src/qemu/qemu_vhost_user_gpu.h index 40a8567630..2c757fd8d1 100644 --- a/src/qemu/qemu_vhost_user_gpu.h +++ b/src/qemu/qemu_vhost_user_gpu.h @@ -27,13 +27,13 @@ int qemuExtVhostUserGPUPrepareDomain(virQEMUDriverPtr driver, virDomainVideoDefPtr video) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; =20 int qemuExtVhostUserGPUStart(virQEMUDriverPtr driver, virDomainObjPtr vm, virDomainVideoDefPtr video) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; =20 void qemuExtVhostUserGPUStop(virQEMUDriverPtr driver, virDomainObjPtr def, @@ -46,4 +46,4 @@ qemuExtVhostUserGPUSetupCgroup(virQEMUDriverPtr driver, virDomainVideoDefPtr video, virCgroupPtr cgroup) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon= _dispatch.c index 9fc5dc3998..8c9390c1d2 100644 --- a/src/remote/remote_daemon_dispatch.c +++ b/src/remote/remote_daemon_dispatch.c @@ -95,18 +95,18 @@ static virNWFilterBindingPtr get_nonnull_nwfilter_bindi= ng(virConnectPtr conn, re static virDomainCheckpointPtr get_nonnull_domain_checkpoint(virDomainPtr d= om, remote_nonnull_domain_checkpoint checkpoint); static virDomainSnapshotPtr get_nonnull_domain_snapshot(virDomainPtr dom, = remote_nonnull_domain_snapshot snapshot); static virNodeDevicePtr get_nonnull_node_device(virConnectPtr conn, remote= _nonnull_node_device dev); -static int make_nonnull_domain(remote_nonnull_domain *dom_dst, virDomainPt= r dom_src) ATTRIBUTE_RETURN_CHECK; -static int make_nonnull_network(remote_nonnull_network *net_dst, virNetwor= kPtr net_src) ATTRIBUTE_RETURN_CHECK; -static int make_nonnull_network_port(remote_nonnull_network_port *port_dst= , virNetworkPortPtr port_src) ATTRIBUTE_RETURN_CHECK; -static int make_nonnull_interface(remote_nonnull_interface *interface_dst,= virInterfacePtr interface_src) ATTRIBUTE_RETURN_CHECK; -static int make_nonnull_storage_pool(remote_nonnull_storage_pool *pool_dst= , virStoragePoolPtr pool_src) ATTRIBUTE_RETURN_CHECK; -static int make_nonnull_storage_vol(remote_nonnull_storage_vol *vol_dst, v= irStorageVolPtr vol_src) ATTRIBUTE_RETURN_CHECK; -static int make_nonnull_node_device(remote_nonnull_node_device *dev_dst, v= irNodeDevicePtr dev_src) ATTRIBUTE_RETURN_CHECK; -static int make_nonnull_secret(remote_nonnull_secret *secret_dst, virSecre= tPtr secret_src) ATTRIBUTE_RETURN_CHECK; -static int make_nonnull_nwfilter(remote_nonnull_nwfilter *net_dst, virNWFi= lterPtr nwfilter_src) ATTRIBUTE_RETURN_CHECK; -static int make_nonnull_nwfilter_binding(remote_nonnull_nwfilter_binding *= binding_dst, virNWFilterBindingPtr binding_src) ATTRIBUTE_RETURN_CHECK; -static int make_nonnull_domain_checkpoint(remote_nonnull_domain_checkpoint= *checkpoint_dst, virDomainCheckpointPtr checkpoint_src) ATTRIBUTE_RETURN_C= HECK; -static int make_nonnull_domain_snapshot(remote_nonnull_domain_snapshot *sn= apshot_dst, virDomainSnapshotPtr snapshot_src) ATTRIBUTE_RETURN_CHECK; +static int make_nonnull_domain(remote_nonnull_domain *dom_dst, virDomainPt= r dom_src) G_GNUC_WARN_UNUSED_RESULT; +static int make_nonnull_network(remote_nonnull_network *net_dst, virNetwor= kPtr net_src) G_GNUC_WARN_UNUSED_RESULT; +static int make_nonnull_network_port(remote_nonnull_network_port *port_dst= , virNetworkPortPtr port_src) G_GNUC_WARN_UNUSED_RESULT; +static int make_nonnull_interface(remote_nonnull_interface *interface_dst,= virInterfacePtr interface_src) G_GNUC_WARN_UNUSED_RESULT; +static int make_nonnull_storage_pool(remote_nonnull_storage_pool *pool_dst= , virStoragePoolPtr pool_src) G_GNUC_WARN_UNUSED_RESULT; +static int make_nonnull_storage_vol(remote_nonnull_storage_vol *vol_dst, v= irStorageVolPtr vol_src) G_GNUC_WARN_UNUSED_RESULT; +static int make_nonnull_node_device(remote_nonnull_node_device *dev_dst, v= irNodeDevicePtr dev_src) G_GNUC_WARN_UNUSED_RESULT; +static int make_nonnull_secret(remote_nonnull_secret *secret_dst, virSecre= tPtr secret_src) G_GNUC_WARN_UNUSED_RESULT; +static int make_nonnull_nwfilter(remote_nonnull_nwfilter *net_dst, virNWFi= lterPtr nwfilter_src) G_GNUC_WARN_UNUSED_RESULT; +static int make_nonnull_nwfilter_binding(remote_nonnull_nwfilter_binding *= binding_dst, virNWFilterBindingPtr binding_src) G_GNUC_WARN_UNUSED_RESULT; +static int make_nonnull_domain_checkpoint(remote_nonnull_domain_checkpoint= *checkpoint_dst, virDomainCheckpointPtr checkpoint_src) G_GNUC_WARN_UNUSED= _RESULT; +static int make_nonnull_domain_snapshot(remote_nonnull_domain_snapshot *sn= apshot_dst, virDomainSnapshotPtr snapshot_src) G_GNUC_WARN_UNUSED_RESULT; =20 static int remoteSerializeDomainDiskErrors(virDomainDiskErrorPtr errors, diff --git a/src/rpc/virnetmessage.h b/src/rpc/virnetmessage.h index 748421a9fd..94c2947974 100644 --- a/src/rpc/virnetmessage.h +++ b/src/rpc/virnetmessage.h @@ -66,20 +66,20 @@ void virNetMessageQueuePush(virNetMessagePtr *queue, ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); =20 int virNetMessageEncodeHeader(virNetMessagePtr msg) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; int virNetMessageDecodeLength(virNetMessagePtr msg) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; int virNetMessageDecodeHeader(virNetMessagePtr msg) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; =20 int virNetMessageEncodePayload(virNetMessagePtr msg, xdrproc_t filter, void *data) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(2) ATTRIBU= TE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(2) G_GNUC_= WARN_UNUSED_RESULT; int virNetMessageDecodePayload(virNetMessagePtr msg, xdrproc_t filter, void *data) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(2) ATTRIBU= TE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(2) G_GNUC_= WARN_UNUSED_RESULT; =20 int virNetMessageEncodeNumFDs(virNetMessagePtr msg); int virNetMessageDecodeNumFDs(virNetMessagePtr msg); @@ -87,9 +87,9 @@ int virNetMessageDecodeNumFDs(virNetMessagePtr msg); int virNetMessageEncodePayloadRaw(virNetMessagePtr msg, const char *buf, size_t len) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; int virNetMessageEncodePayloadEmpty(virNetMessagePtr msg) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; =20 void virNetMessageSaveError(virNetMessageErrorPtr rerr) ATTRIBUTE_NONNULL(1); diff --git a/src/secret/secret_util.h b/src/secret/secret_util.h index 4fe8f98aa5..ff23df63b7 100644 --- a/src/secret/secret_util.h +++ b/src/secret/secret_util.h @@ -30,4 +30,4 @@ int virSecretGetSecretString(virConnectPtr conn, uint8_t **ret_secret, size_t *ret_secret_size) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(4) - ATTRIBUTE_NONNULL(5) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(5) G_GNUC_WARN_UNUSED_RESULT; diff --git a/src/storage/storage_driver.h b/src/storage/storage_driver.h index 64b3d8bbf8..7d82871852 100644 --- a/src/storage/storage_driver.h +++ b/src/storage/storage_driver.h @@ -36,7 +36,7 @@ storagePoolLookupByTargetPath(virConnectPtr conn, =20 char *virStoragePoolObjBuildTempFilePath(virStoragePoolObjPtr obj, virStorageVolDefPtr voldef) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; =20 int storageRegister(void); int storageRegisterAll(void); diff --git a/src/storage/storage_util.h b/src/storage/storage_util.h index 705e23631d..18c4cf85f3 100644 --- a/src/storage/storage_util.h +++ b/src/storage/storage_util.h @@ -147,7 +147,7 @@ enum { =20 int virStorageBackendVolOpen(const char *path, struct stat *sb, unsigned int flags) - ATTRIBUTE_RETURN_CHECK + G_GNUC_WARN_UNUSED_RESULT ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); =20 #define VIR_STORAGE_DEFAULT_POOL_PERM_MODE 0711 diff --git a/src/util/viralloc.h b/src/util/viralloc.h index 49bf2b86e7..c503bbe19b 100644 --- a/src/util/viralloc.h +++ b/src/util/viralloc.h @@ -54,26 +54,26 @@ =20 /* Don't call these directly - use the macros below */ int virAlloc(void *ptrptr, size_t size) - ATTRIBUTE_RETURN_CHECK ATTRIBUTE_NONNULL(1); + G_GNUC_WARN_UNUSED_RESULT ATTRIBUTE_NONNULL(1); int virAllocN(void *ptrptr, size_t size, size_t count) - ATTRIBUTE_RETURN_CHECK ATTRIBUTE_NONNULL(1); + G_GNUC_WARN_UNUSED_RESULT ATTRIBUTE_NONNULL(1); int virReallocN(void *ptrptr, size_t size, size_t count) - ATTRIBUTE_RETURN_CHECK ATTRIBUTE_NONNULL(1); + G_GNUC_WARN_UNUSED_RESULT ATTRIBUTE_NONNULL(1); int virExpandN(void *ptrptr, size_t size, size_t *count, size_t add) - ATTRIBUTE_RETURN_CHECK ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3); + G_GNUC_WARN_UNUSED_RESULT ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3); int virResizeN(void *ptrptr, size_t size, size_t *alloc, size_t count, siz= e_t desired) - ATTRIBUTE_RETURN_CHECK ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3); + G_GNUC_WARN_UNUSED_RESULT ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3); void virShrinkN(void *ptrptr, size_t size, size_t *count, size_t toremove) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3); int virInsertElementsN(void *ptrptr, size_t size, size_t at, size_t *count= ptr, size_t add, void *newelem, bool clearOriginal, bool inPlace) - ATTRIBUTE_RETURN_CHECK ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(4); + G_GNUC_WARN_UNUSED_RESULT ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(4); int virDeleteElementsN(void *ptrptr, size_t size, size_t at, size_t *count= ptr, size_t toremove, bool inPlace) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(4); int virAllocVar(void *ptrptr, size_t struct_size, size_t element_size, siz= e_t count) - ATTRIBUTE_RETURN_CHECK ATTRIBUTE_NONNULL(1); + G_GNUC_WARN_UNUSED_RESULT ATTRIBUTE_NONNULL(1); void virFree(void *ptrptr) ATTRIBUTE_NONNULL(1); =20 void virDispose(void *ptrptr, size_t count, size_t element_size, size_t *c= ountptr) diff --git a/src/util/virbitmap.h b/src/util/virbitmap.h index 46696e0c70..8d700c88c5 100644 --- a/src/util/virbitmap.h +++ b/src/util/virbitmap.h @@ -33,9 +33,9 @@ typedef virBitmap *virBitmapPtr; /* * Allocate a bitmap capable of containing @size bits. */ -virBitmapPtr virBitmapNewQuiet(size_t size) ATTRIBUTE_RETURN_CHECK; -virBitmapPtr virBitmapNew(size_t size) ATTRIBUTE_RETURN_CHECK; -virBitmapPtr virBitmapNewEmpty(void) ATTRIBUTE_RETURN_CHECK; +virBitmapPtr virBitmapNewQuiet(size_t size) G_GNUC_WARN_UNUSED_RESULT; +virBitmapPtr virBitmapNew(size_t size) G_GNUC_WARN_UNUSED_RESULT; +virBitmapPtr virBitmapNewEmpty(void) G_GNUC_WARN_UNUSED_RESULT; =20 /* * Free previously allocated bitmap @@ -52,38 +52,38 @@ int virBitmapCopy(virBitmapPtr dst, virBitmapPtr src); * Set bit position @b in @bitmap */ int virBitmapSetBit(virBitmapPtr bitmap, size_t b) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; =20 int virBitmapSetBitExpand(virBitmapPtr bitmap, size_t b) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; =20 =20 /* * Clear bit position @b in @bitmap */ int virBitmapClearBit(virBitmapPtr bitmap, size_t b) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; =20 int virBitmapClearBitExpand(virBitmapPtr bitmap, size_t b) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; =20 /* * Get bit @b in @bitmap. Returns false if b is out of range. */ bool virBitmapIsBitSet(virBitmapPtr bitmap, size_t b) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; /* * Get setting of bit position @b in @bitmap and store in @result */ int virBitmapGetBit(virBitmapPtr bitmap, size_t b, bool *result) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3) G_GNUC_WARN_UNUSED_RESULT; =20 virBitmapPtr virBitmapNewString(const char *string) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; =20 char *virBitmapToString(virBitmapPtr bitmap, bool prefix, bool trim) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; =20 char *virBitmapFormat(virBitmapPtr bitmap); =20 diff --git a/src/util/vircommand.h b/src/util/vircommand.h index 632d02bc71..6bc1ef87b0 100644 --- a/src/util/vircommand.h +++ b/src/util/vircommand.h @@ -33,9 +33,9 @@ typedef virCommand *virCommandPtr; * call any function that is not async-signal-safe. */ typedef int (*virExecHook)(void *data); =20 -pid_t virFork(void) ATTRIBUTE_RETURN_CHECK; +pid_t virFork(void) G_GNUC_WARN_UNUSED_RESULT; =20 -int virRun(const char *const*argv, int *status) ATTRIBUTE_RETURN_CHECK; +int virRun(const char *const*argv, int *status) G_GNUC_WARN_UNUSED_RESULT; =20 virCommandPtr virCommandNew(const char *binary) ATTRIBUTE_NONNULL(1); =20 @@ -172,26 +172,26 @@ void virCommandSetPreExecHook(virCommandPtr cmd, void virCommandWriteArgLog(virCommandPtr cmd, int logfd); =20 -char *virCommandToString(virCommandPtr cmd, bool linebreaks) ATTRIBUTE_RET= URN_CHECK; +char *virCommandToString(virCommandPtr cmd, bool linebreaks) G_GNUC_WARN_U= NUSED_RESULT; =20 -int virCommandExec(virCommandPtr cmd, gid_t *groups, int ngroups) ATTRIBUT= E_RETURN_CHECK; +int virCommandExec(virCommandPtr cmd, gid_t *groups, int ngroups) G_GNUC_W= ARN_UNUSED_RESULT; =20 int virCommandRun(virCommandPtr cmd, - int *exitstatus) ATTRIBUTE_RETURN_CHECK; + int *exitstatus) G_GNUC_WARN_UNUSED_RESULT; =20 int virCommandRunAsync(virCommandPtr cmd, - pid_t *pid) ATTRIBUTE_RETURN_CHECK; + pid_t *pid) G_GNUC_WARN_UNUSED_RESULT; =20 int virCommandWait(virCommandPtr cmd, - int *exitstatus) ATTRIBUTE_RETURN_CHECK; + int *exitstatus) G_GNUC_WARN_UNUSED_RESULT; =20 void virCommandRequireHandshake(virCommandPtr cmd); =20 int virCommandHandshakeWait(virCommandPtr cmd) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; =20 int virCommandHandshakeNotify(virCommandPtr cmd) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; =20 void virCommandAbort(virCommandPtr cmd); =20 diff --git a/src/util/vircrypto.h b/src/util/vircrypto.h index 826169276e..bf002d42d5 100644 --- a/src/util/vircrypto.h +++ b/src/util/vircrypto.h @@ -45,14 +45,14 @@ virCryptoHashBuf(virCryptoHash hash, const char *input, unsigned char *output) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; =20 int virCryptoHashString(virCryptoHash hash, const char *input, char **output) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; =20 bool virCryptoHaveCipher(virCryptoCipher algorithm); =20 @@ -62,4 +62,4 @@ int virCryptoEncryptData(virCryptoCipher algorithm, uint8_t *data, size_t datalen, uint8_t **ciphertext, size_t *ciphertextlen) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(6) - ATTRIBUTE_NONNULL(8) ATTRIBUTE_NONNULL(9) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(8) ATTRIBUTE_NONNULL(9) G_GNUC_WARN_UNUSED_RESULT; diff --git a/src/util/virfile.h b/src/util/virfile.h index f22380550c..a66e3569a3 100644 --- a/src/util/virfile.h +++ b/src/util/virfile.h @@ -37,19 +37,19 @@ typedef enum { VIR_FILE_CLOSE_DONT_LOG =3D 1 << 2, } virFileCloseFlags; =20 -ssize_t saferead(int fd, void *buf, size_t count) ATTRIBUTE_RETURN_CHECK; +ssize_t saferead(int fd, void *buf, size_t count) G_GNUC_WARN_UNUSED_RESUL= T; ssize_t safewrite(int fd, const void *buf, size_t count) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; int safezero(int fd, off_t offset, off_t len) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; int virFileAllocate(int fd, off_t offset, off_t len) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; =20 /* Don't call these directly - use the macros below */ int virFileClose(int *fdptr, virFileCloseFlags flags) - ATTRIBUTE_RETURN_CHECK; -int virFileFclose(FILE **file, bool preserve_errno) ATTRIBUTE_RETURN_CHECK; -FILE *virFileFdopen(int *fdptr, const char *mode) ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; +int virFileFclose(FILE **file, bool preserve_errno) G_GNUC_WARN_UNUSED_RES= ULT; +FILE *virFileFdopen(int *fdptr, const char *mode) G_GNUC_WARN_UNUSED_RESUL= T; =20 static inline void virForceCloseHelper(int *fd) { @@ -107,7 +107,7 @@ typedef enum { virFileWrapperFdPtr virFileWrapperFdNew(int *fd, const char *name, unsigned int flags) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; =20 int virFileWrapperFdClose(virFileWrapperFdPtr dfd); =20 @@ -146,20 +146,20 @@ int virFileNBDDeviceAssociate(const char *file, int virFileDeleteTree(const char *dir); =20 int virFileReadHeaderFD(int fd, int maxlen, char **buf) - ATTRIBUTE_RETURN_CHECK ATTRIBUTE_NONNULL(3); + G_GNUC_WARN_UNUSED_RESULT ATTRIBUTE_NONNULL(3); int virFileReadHeaderQuiet(const char *path, int maxlen, char **buf) - ATTRIBUTE_RETURN_CHECK ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3); + G_GNUC_WARN_UNUSED_RESULT ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3); int virFileReadLimFD(int fd, int maxlen, char **buf) - ATTRIBUTE_RETURN_CHECK ATTRIBUTE_NONNULL(3); + G_GNUC_WARN_UNUSED_RESULT ATTRIBUTE_NONNULL(3); int virFileReadAll(const char *path, int maxlen, char **buf) - ATTRIBUTE_RETURN_CHECK ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3); + G_GNUC_WARN_UNUSED_RESULT ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3); int virFileReadAllQuiet(const char *path, int maxlen, char **buf) - ATTRIBUTE_RETURN_CHECK ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3); + G_GNUC_WARN_UNUSED_RESULT ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3); int virFileReadBufQuiet(const char *file, char *buf, int len) - ATTRIBUTE_RETURN_CHECK ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); + G_GNUC_WARN_UNUSED_RESULT ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); =20 int virFileWriteStr(const char *path, const char *str, mode_t mode) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; =20 int virFileLinkPointsTo(const char *checkLink, const char *checkDest) @@ -170,15 +170,15 @@ int virFileRelLinkPointsTo(const char *directory, ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); =20 int virFileResolveLink(const char *linkpath, - char **resultpath) ATTRIBUTE_RETURN_CHECK; + char **resultpath) G_GNUC_WARN_UNUSED_RESULT; int virFileResolveAllLinks(const char *linkpath, - char **resultpath) ATTRIBUTE_RETURN_CHECK; + char **resultpath) G_GNUC_WARN_UNUSED_RESULT; =20 int virFileIsLink(const char *linkpath) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; =20 int virFileReadLink(const char *linkpath, char **resultpath) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; =20 char *virFindFileInPath(const char *file); =20 @@ -219,16 +219,16 @@ int virFileIsSharedFSType(const char *path, int fstyp= es) ATTRIBUTE_NONNULL(1); int virFileIsSharedFS(const char *path) ATTRIBUTE_NONNULL(1); int virFileIsMountPoint(const char *file) ATTRIBUTE_NONNULL(1); int virFileIsCDROM(const char *path) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; =20 int virFileGetMountSubtree(const char *mtabpath, const char *prefix, char ***mountsret, - size_t *nmountsret) ATTRIBUTE_RETURN_CHECK; + size_t *nmountsret) G_GNUC_WARN_UNUSED_RESULT; int virFileGetMountReverseSubtree(const char *mtabpath, const char *prefix, char ***mountsret, - size_t *nmountsret) ATTRIBUTE_RETURN_CHE= CK; + size_t *nmountsret) G_GNUC_WARN_UNUSED_R= ESULT; =20 char *virFileSanitizePath(const char *path); char *virFileCanonicalizePath(const char *path) ATTRIBUTE_NOINLINE; @@ -242,15 +242,15 @@ enum { }; int virFileAccessibleAs(const char *path, int mode, uid_t uid, gid_t gid) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; int virFileOpenAs(const char *path, int openflags, mode_t mode, uid_t uid, gid_t gid, unsigned int flags) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; int virFileRemove(const char *path, uid_t uid, gid_t gid); =20 int virFileChownFiles(const char *name, uid_t uid, gid_t gid) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; =20 enum { VIR_DIR_CREATE_NONE =3D 0, @@ -258,27 +258,27 @@ enum { VIR_DIR_CREATE_ALLOW_EXIST =3D (1 << 1), }; int virDirCreate(const char *path, mode_t mode, uid_t uid, gid_t gid, - unsigned int flags) ATTRIBUTE_RETURN_CHECK; + unsigned int flags) G_GNUC_WARN_UNUSED_RESULT; int virDirOpen(DIR **dirp, const char *dirname) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; int virDirOpenIfExists(DIR **dirp, const char *dirname) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; int virDirOpenQuiet(DIR **dirp, const char *dirname) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; int virDirRead(DIR *dirp, struct dirent **ent, const char *dirname) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; void virDirClose(DIR **dirp) ATTRIBUTE_NONNULL(1); #define VIR_DIR_CLOSE(dir) virDirClose(&(dir)) =20 -int virFileMakePath(const char *path) ATTRIBUTE_RETURN_CHECK; +int virFileMakePath(const char *path) G_GNUC_WARN_UNUSED_RESULT; int virFileMakePathWithMode(const char *path, - mode_t mode) ATTRIBUTE_RETURN_CHECK; -int virFileMakeParentPath(const char *path) ATTRIBUTE_RETURN_CHECK; + mode_t mode) G_GNUC_WARN_UNUSED_RESULT; +int virFileMakeParentPath(const char *path) G_GNUC_WARN_UNUSED_RESULT; =20 char *virFileBuildPath(const char *dir, const char *name, - const char *ext) ATTRIBUTE_RETURN_CHECK; + const char *ext) G_GNUC_WARN_UNUSED_RESULT; =20 =20 #ifdef WIN32 @@ -304,7 +304,7 @@ char *virFileBuildPath(const char *dir, =20 bool virFileIsAbsPath(const char *path); int virFileAbsPath(const char *path, - char **abspath) ATTRIBUTE_RETURN_CHECK; + char **abspath) G_GNUC_WARN_UNUSED_RESULT; const char *virFileSkipRoot(const char *path); void virFileRemoveLastComponent(char *path); =20 diff --git a/src/util/viriptables.h b/src/util/viriptables.h index feea988acd..de26956178 100644 --- a/src/util/viriptables.h +++ b/src/util/viriptables.h @@ -59,38 +59,38 @@ int iptablesAddForwardAllowOut (virFi= rewallPtr fw, unsigned int prefix, const char *iface, const char *physdev) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; int iptablesRemoveForwardAllowOut (virFirewallPtr fw, virSocketAddr *netaddr, unsigned int prefix, const char *iface, const char *physdev) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; int iptablesAddForwardAllowRelatedIn(virFirewallPtr fw, virSocketAddr *netaddr, unsigned int prefix, const char *iface, const char *physdev) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; int iptablesRemoveForwardAllowRelatedIn(virFirewallPtr fw, virSocketAddr *netadd= r, unsigned int prefix, const char *iface, const char *physdev) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; =20 int iptablesAddForwardAllowIn (virFirewallPtr fw, virSocketAddr *netaddr, unsigned int prefix, const char *iface, const char *physdev) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; int iptablesRemoveForwardAllowIn (virFirewallPtr fw, virSocketAddr *netaddr, unsigned int prefix, const char *iface, const char *physdev) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; =20 void iptablesAddForwardAllowCross (virFirewallPtr fw, virFirewallLayer layer, @@ -120,7 +120,7 @@ int iptablesAddForwardMasquerade (virFi= rewallPtr fw, virSocketAddrRangePtr ad= dr, virPortRangePtr port, const char *protocol) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; int iptablesRemoveForwardMasquerade (virFirewallPtr fw, virSocketAddr *netaddr, unsigned int prefix, @@ -128,19 +128,19 @@ int iptablesRemoveForwardMasquerade (vir= FirewallPtr fw, virSocketAddrRangePtr ad= dr, virPortRangePtr port, const char *protocol) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; int iptablesAddDontMasquerade (virFirewallPtr fw, virSocketAddr *netaddr, unsigned int prefix, const char *physdev, const char *destaddr) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; int iptablesRemoveDontMasquerade (virFirewallPtr fw, virSocketAddr *netaddr, unsigned int prefix, const char *physdev, const char *destaddr) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; void iptablesAddOutputFixUdpChecksum (virFirewallPtr fw, const char *iface, int port); diff --git a/src/util/viriscsi.h b/src/util/viriscsi.h index 6eddb504a2..6d17d139eb 100644 --- a/src/util/viriscsi.h +++ b/src/util/viriscsi.h @@ -33,18 +33,18 @@ virISCSIConnectionLogin(const char *portal, const char *initiatoriqn, const char *target) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; =20 int virISCSIConnectionLogout(const char *portal, const char *initiatoriqn, const char *target) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; =20 int virISCSIRescanLUNs(const char *session) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; =20 int virISCSIScanTargets(const char *portal, @@ -52,13 +52,13 @@ virISCSIScanTargets(const char *portal, bool persist, size_t *ntargetsret, char ***targetsret) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; =20 int virISCSINodeNew(const char *portal, const char *target) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; =20 int virISCSINodeUpdate(const char *portal, @@ -66,4 +66,4 @@ virISCSINodeUpdate(const char *portal, const char *name, const char *value) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) - ATTRIBUTE_NONNULL(4) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(4) G_GNUC_WARN_UNUSED_RESULT; diff --git a/src/util/virjson.h b/src/util/virjson.h index 65b8d5620a..b1d0d0e741 100644 --- a/src/util/virjson.h +++ b/src/util/virjson.h @@ -147,7 +147,7 @@ char *virJSONValueToString(virJSONValuePtr object, int virJSONValueToBuffer(virJSONValuePtr object, virBufferPtr buf, bool pretty) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; =20 typedef int (*virJSONValueObjectIteratorFunc)(const char *key, virJSONValuePtr value, diff --git a/src/util/virkeyfile.h b/src/util/virkeyfile.h index 4cae4331fc..4fdac0daf7 100644 --- a/src/util/virkeyfile.h +++ b/src/util/virkeyfile.h @@ -33,13 +33,13 @@ virKeyFilePtr virKeyFileNew(void); =20 int virKeyFileLoadFile(virKeyFilePtr conf, const char *filename) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; =20 int virKeyFileLoadData(virKeyFilePtr conf, const char *filename, const char *data, size_t len) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; =20 void virKeyFileFree(virKeyFilePtr conf); =20 diff --git a/src/util/virmacaddr.h b/src/util/virmacaddr.h index 55cfd12164..cf26a8bbfa 100644 --- a/src/util/virmacaddr.h +++ b/src/util/virmacaddr.h @@ -54,10 +54,10 @@ const char *virMacAddrFormat(const virMacAddr *addr, void virMacAddrGenerate(const unsigned char prefix[VIR_MAC_PREFIX_BUFLEN], virMacAddrPtr addr) ATTRIBUTE_NOINLINE; int virMacAddrParse(const char* str, - virMacAddrPtr addr) ATTRIBUTE_RETURN_CHECK; + virMacAddrPtr addr) G_GNUC_WARN_UNUSED_RESULT; int virMacAddrParseHex(const char* str, virMacAddrPtr addr) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; bool virMacAddrIsUnicast(const virMacAddr *addr); bool virMacAddrIsMulticast(const virMacAddr *addr); bool virMacAddrIsBroadcastRaw(const unsigned char s[VIR_MAC_BUFLEN]); diff --git a/src/util/virnetdev.h b/src/util/virnetdev.h index 6ff98487cb..ff8df31a37 100644 --- a/src/util/virnetdev.h +++ b/src/util/virnetdev.h @@ -147,87 +147,87 @@ struct _virNetDevCoalesce { =20 int virNetDevSetupControl(const char *ifname, virIfreq *ifr) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; =20 int virNetDevExists(const char *brname) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK ATTRIBUTE_NOINLINE; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT ATTRIBUTE_NOINLINE; =20 int virNetDevSetOnline(const char *ifname, bool online) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK ATTRIBUTE_NOINLINE; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT ATTRIBUTE_NOINLINE; int virNetDevGetOnline(const char *ifname, bool *online) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; =20 =20 int virNetDevSetMAC(const char *ifname, const virMacAddr *macaddr) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK ATTRI= BUTE_NOINLINE; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT AT= TRIBUTE_NOINLINE; int virNetDevGetMAC(const char *ifname, virMacAddrPtr macaddr) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; =20 int virNetDevReplaceMacAddress(const char *linkdev, const virMacAddr *macaddress, const char *stateDir) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; =20 int virNetDevRestoreMacAddress(const char *linkdev, const char *stateDir) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; =20 int virNetDevSetCoalesce(const char *ifname, virNetDevCoalescePtr coalesce, bool update) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; =20 int virNetDevSetMTU(const char *ifname, int mtu) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; int virNetDevSetMTUFromDevice(const char *ifname, const char *otherifname) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; int virNetDevGetMTU(const char *ifname) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; int virNetDevSetNamespace(const char *ifname, pid_t pidInNs) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; int virNetDevSetName(const char *ifname, const char *newifname) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; =20 char *virNetDevGetName(int ifindex) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; int virNetDevGetIndex(const char *ifname, int *ifindex) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; =20 int virNetDevGetVLanID(const char *ifname, int *vlanid) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; =20 int virNetDevGetMaster(const char *ifname, char **master) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; =20 int virNetDevValidateConfig(const char *ifname, const virMacAddr *macaddr, int ifindex) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; =20 int virNetDevIsVirtualFunction(const char *ifname) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; =20 int virNetDevGetVirtualFunctionIndex(const char *pfname, const char *vfnam= e, int *vf_index) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; =20 int virNetDevGetPhysicalFunction(const char *ifname, char **pfname) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; =20 int virNetDevPFGetVF(const char *pfname, int vf, char **vfname) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; =20 int virNetDevGetPhysPortID(const char *ifname, char **physPortID) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; =20 int virNetDevGetVirtualFunctions(const char *pfname, char ***vfname, @@ -235,12 +235,12 @@ int virNetDevGetVirtualFunctions(const char *pfname, size_t *n_vfname, unsigned int *max_vfs) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) - ATTRIBUTE_NONNULL(4) ATTRIBUTE_NONNULL(5) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(4) ATTRIBUTE_NONNULL(5) G_GNUC_WARN_UNUSED_RESULT; =20 int virNetDevSaveNetConfig(const char *linkdev, int vf, const char *stateDir, bool saveVlan) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3) G_GNUC_WARN_UNUSED_RESULT; =20 int virNetDevReadNetConfig(const char *linkdev, int vf, @@ -249,7 +249,7 @@ virNetDevReadNetConfig(const char *linkdev, int vf, virNetDevVlanPtr *vlan, virMacAddrPtr *MAC) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4) - ATTRIBUTE_NONNULL(5) ATTRIBUTE_NONNULL(6) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(5) ATTRIBUTE_NONNULL(6) G_GNUC_WARN_UNUSED_RESULT; =20 int virNetDevSetNetConfig(const char *linkdev, int vf, @@ -257,7 +257,7 @@ virNetDevSetNetConfig(const char *linkdev, int vf, virNetDevVlanPtr vlan, const virMacAddr *MAC, bool setVLan) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; =20 int virNetDevGetVirtualFunctionInfo(const char *vfname, char **pfname, int *vf) @@ -265,40 +265,40 @@ int virNetDevGetVirtualFunctionInfo(const char *vfnam= e, char **pfname, =20 int virNetDevGetFeatures(const char *ifname, virBitmapPtr *out) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; =20 int virNetDevGetLinkInfo(const char *ifname, virNetDevIfLinkPtr lnk) ATTRIBUTE_NONNULL(1); =20 virNetDevRxFilterPtr virNetDevRxFilterNew(void) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; void virNetDevRxFilterFree(virNetDevRxFilterPtr filter); int virNetDevGetRxFilter(const char *ifname, virNetDevRxFilterPtr *filter) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; =20 int virNetDevAddMulti(const char *ifname, virMacAddrPtr macaddr) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; int virNetDevDelMulti(const char *ifname, virMacAddrPtr macaddr) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; =20 int virNetDevSetPromiscuous(const char *ifname, bool promiscuous) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; int virNetDevGetPromiscuous(const char *ifname, bool *promiscuous) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; =20 int virNetDevSetRcvMulti(const char *ifname, bool receive) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; int virNetDevGetRcvMulti(const char *ifname, bool *receive) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; =20 int virNetDevSetRcvAllMulti(const char *ifname, bool receive) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; int virNetDevGetRcvAllMulti(const char *ifname, bool *receive) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; =20 #define SYSFS_NET_DIR "/sys/class/net/" #define SYSFS_INFINIBAND_DIR "/sys/class/infiniband/" @@ -306,7 +306,7 @@ int virNetDevSysfsFile(char **pf_sysfs_device_link, const char *ifname, const char *file) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) - ATTRIBUTE_RETURN_CHECK ATTRIBUTE_NOINLINE; + G_GNUC_WARN_UNUSED_RESULT ATTRIBUTE_NOINLINE; =20 int virNetDevRunEthernetScript(const char *ifname, const char *script) ATTRIBUTE_NOINLINE; diff --git a/src/util/virnetdevbandwidth.h b/src/util/virnetdevbandwidth.h index 75da1f7ba6..19323c5ed2 100644 --- a/src/util/virnetdevbandwidth.h +++ b/src/util/virnetdevbandwidth.h @@ -42,11 +42,11 @@ int virNetDevBandwidthSet(const char *ifname, virNetDevBandwidthPtr bandwidth, bool hierarchical_class, bool swapped) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; int virNetDevBandwidthClear(const char *ifname); int virNetDevBandwidthCopy(virNetDevBandwidthPtr *dest, const virNetDevBandwidth *src) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; =20 bool virNetDevBandwidthEqual(virNetDevBandwidthPtr a, virNetDevBandwidthPt= r b); =20 @@ -56,20 +56,20 @@ int virNetDevBandwidthPlug(const char *brname, virNetDevBandwidthPtr bandwidth, unsigned int id) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; =20 int virNetDevBandwidthUnplug(const char *brname, unsigned int id) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; =20 int virNetDevBandwidthUpdateRate(const char *ifname, unsigned int id, virNetDevBandwidthPtr bandwidth, unsigned long long new_rate) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; =20 int virNetDevBandwidthUpdateFilter(const char *ifname, const virMacAddr *ifmac_ptr, unsigned int id) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; diff --git a/src/util/virnetdevbridge.h b/src/util/virnetdevbridge.h index 8df5e51c2e..88284d6bed 100644 --- a/src/util/virnetdevbridge.h +++ b/src/util/virnetdevbridge.h @@ -22,56 +22,56 @@ #include "virmacaddr.h" =20 int virNetDevBridgeCreate(const char *brname) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; int virNetDevBridgeDelete(const char *brname) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; =20 int virNetDevBridgeAddPort(const char *brname, const char *ifname) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; =20 int virNetDevBridgeRemovePort(const char *brname, const char *ifname) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; =20 int virNetDevBridgeSetSTPDelay(const char *brname, int delay) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; int virNetDevBridgeGetSTPDelay(const char *brname, int *delay) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; int virNetDevBridgeSetSTP(const char *brname, bool enable) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; int virNetDevBridgeGetSTP(const char *brname, bool *enable) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; =20 int virNetDevBridgeSetVlanFiltering(const char *brname, bool enable) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; int virNetDevBridgeGetVlanFiltering(const char *brname, bool *enable) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; =20 int virNetDevBridgePortGetLearning(const char *brname, const char *ifname, bool *enable) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; int virNetDevBridgePortSetLearning(const char *brname, const char *ifname, bool enable) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; int virNetDevBridgePortGetUnicastFlood(const char *brname, const char *ifname, bool *enable) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; int virNetDevBridgePortSetUnicastFlood(const char *brname, const char *ifname, bool enable) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; =20 typedef enum { VIR_NETDEVBRIDGE_FDB_FLAG_ROUTER =3D (1 << 0), @@ -84,7 +84,7 @@ typedef enum { =20 int virNetDevBridgeFDBAdd(const virMacAddr *mac, const char *ifname, unsigned int flags) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; int virNetDevBridgeFDBDel(const virMacAddr *mac, const char *ifname, unsigned int flags) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; diff --git a/src/util/virnetdevip.h b/src/util/virnetdevip.h index 9fa5f446b0..43271f827b 100644 --- a/src/util/virnetdevip.h +++ b/src/util/virnetdevip.h @@ -63,20 +63,20 @@ int virNetDevIPAddrAdd(const char *ifname, virSocketAddr *addr, virSocketAddr *peer, unsigned int prefix) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK ATTRI= BUTE_NOINLINE; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT AT= TRIBUTE_NOINLINE; int virNetDevIPRouteAdd(const char *ifname, virSocketAddrPtr addr, unsigned int prefix, virSocketAddrPtr gateway, unsigned int metric) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(4) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; int virNetDevIPAddrDel(const char *ifname, virSocketAddr *addr, unsigned int prefix) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; int virNetDevIPAddrGet(const char *ifname, virSocketAddrPtr addr) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; int virNetDevIPWaitDadFinish(virSocketAddrPtr *addrs, size_t count) ATTRIBUTE_NONNULL(1); bool virNetDevIPCheckIPv6Forwarding(void); diff --git a/src/util/virnetdevmacvlan.h b/src/util/virnetdevmacvlan.h index 24b17b4bd0..4c153dfb5c 100644 --- a/src/util/virnetdevmacvlan.h +++ b/src/util/virnetdevmacvlan.h @@ -58,7 +58,7 @@ int virNetDevMacVLanReserveName(const char *name, bool qu= ietfail); int virNetDevMacVLanReleaseName(const char *name); =20 bool virNetDevMacVLanIsMacvtap(const char *ifname) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK ATTRIBUTE_NOINLINE; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT ATTRIBUTE_NOINLINE; =20 int virNetDevMacVLanCreate(const char *ifname, const char *type, @@ -67,10 +67,10 @@ int virNetDevMacVLanCreate(const char *ifname, uint32_t macvlan_mode, int *retry) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; =20 int virNetDevMacVLanDelete(const char *ifname) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; =20 int virNetDevMacVLanCreateWithVPortProfile(const char *ifname, const virMacAddr *macaddress, @@ -86,16 +86,16 @@ int virNetDevMacVLanCreateWithVPortProfile(const char *= ifname, size_t tapfdSize, unsigned int flags) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(6) - ATTRIBUTE_NONNULL(8) ATTRIBUTE_NONNULL(10) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(8) ATTRIBUTE_NONNULL(10) G_GNUC_WARN_UNUSED_RESULT; =20 int virNetDevMacVLanTapOpen(const char *ifname, int *tapfd, size_t tapfdSize) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; =20 int virNetDevMacVLanTapSetup(int *tapfd, size_t tapfdSize, bool vnet_hdr) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; =20 int virNetDevMacVLanDeleteWithVPortProfile(const char *ifname, const virMacAddr *macaddress, @@ -104,7 +104,7 @@ int virNetDevMacVLanDeleteWithVPortProfile(const char *= ifname, virNetDevVPortProfilePtr virtPo= rtProfile, char *stateDir) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) - ATTRIBUTE_NONNULL(6) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(6) G_GNUC_WARN_UNUSED_RESULT; =20 int virNetDevMacVLanRestartWithVPortProfile(const char *cr_ifname, const virMacAddr *macaddress, @@ -113,7 +113,7 @@ int virNetDevMacVLanRestartWithVPortProfile(const char = *cr_ifname, virNetDevVPortProfilePtr virtP= ortProfile, virNetDevVPortProfileOp vmOp) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) - ATTRIBUTE_NONNULL(4) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(4) G_GNUC_WARN_UNUSED_RESULT; =20 int virNetDevMacVLanVPortProfileRegisterCallback(const char *ifname, const virMacAddr *macaddr= ess, @@ -122,4 +122,4 @@ int virNetDevMacVLanVPortProfileRegisterCallback(const = char *ifname, virNetDevVPortProfilePtr = virtPortProfile, virNetDevVPortProfileOp v= mOp) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) -ATTRIBUTE_NONNULL(4) ATTRIBUTE_RETURN_CHECK; +ATTRIBUTE_NONNULL(4) G_GNUC_WARN_UNUSED_RESULT; diff --git a/src/util/virnetdevmidonet.h b/src/util/virnetdevmidonet.h index aa7fe49103..61927c3edd 100644 --- a/src/util/virnetdevmidonet.h +++ b/src/util/virnetdevmidonet.h @@ -24,7 +24,7 @@ =20 int virNetDevMidonetBindPort(const char *ifname, virNetDevVPortProfilePtr virtualport) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; =20 int virNetDevMidonetUnbindPort(virNetDevVPortProfilePtr virtualport) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; diff --git a/src/util/virnetdevopenvswitch.h b/src/util/virnetdevopenvswitc= h.h index 5bc18f851f..b70ee7a559 100644 --- a/src/util/virnetdevopenvswitch.h +++ b/src/util/virnetdevopenvswitch.h @@ -35,35 +35,35 @@ int virNetDevOpenvswitchAddPort(const char *brname, virNetDevVPortProfilePtr ovsport, virNetDevVlanPtr virtVlan) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; =20 int virNetDevOpenvswitchRemovePort(const char *brname, const char *ifname) - ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; =20 int virNetDevOpenvswitchInterfaceGetMaster(const char *ifname, char **mast= er) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; =20 int virNetDevOpenvswitchGetMigrateData(char **migrate, const char *ifname) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; =20 int virNetDevOpenvswitchSetMigrateData(char *migrate, const char *ifname) - ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; =20 int virNetDevOpenvswitchInterfaceParseStats(const char *json, virDomainInterfaceStatsPtr sta= ts) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; =20 int virNetDevOpenvswitchInterfaceStats(const char *ifname, virDomainInterfaceStatsPtr stats) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; =20 int virNetDevOpenvswitchInterfaceGetMaster(const char *ifname, char **mast= er) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; =20 int virNetDevOpenvswitchGetVhostuserIfname(const char *path, char **ifname) - ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK ATTRIBUTE_NOINLINE; + ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT ATTRIBUTE_NOINLINE; =20 int virNetDevOpenvswitchUpdateVlan(const char *ifname, virNetDevVlanPtr virtVlan) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; diff --git a/src/util/virnetdevtap.h b/src/util/virnetdevtap.h index ec5789959a..36c2be777e 100644 --- a/src/util/virnetdevtap.h +++ b/src/util/virnetdevtap.h @@ -34,17 +34,17 @@ int virNetDevTapCreate(char **ifname, int *tapfd, size_t tapfdSize, unsigned int flags) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK ATTRIBUTE_NOINLINE; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT ATTRIBUTE_NOINLINE; =20 int virNetDevTapDelete(const char *ifname, const char *tunpath) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; =20 int virNetDevTapGetName(int tapfd, char **ifname) - ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; =20 char* virNetDevTapGetRealDeviceName(char *ifname) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK ATTRIBUTE_NOINLINE; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT ATTRIBUTE_NOINLINE; =20 typedef enum { VIR_NETDEV_TAP_CREATE_NONE =3D 0, @@ -68,7 +68,7 @@ virNetDevTapAttachBridge(const char *tapname, unsigned int mtu, unsigned int *actualMTU) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; =20 int virNetDevTapReattachBridge(const char *tapname, @@ -80,7 +80,7 @@ virNetDevTapReattachBridge(const char *tapname, unsigned int mtu, unsigned int *actualMTU) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; =20 int virNetDevTapCreateInBridgePort(const char *brname, char **ifname, @@ -96,9 +96,9 @@ int virNetDevTapCreateInBridgePort(const char *brname, unsigned int *actualMTU, unsigned int flags) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) - ATTRIBUTE_RETURN_CHECK ATTRIBUTE_NOINLINE; + G_GNUC_WARN_UNUSED_RESULT ATTRIBUTE_NOINLINE; =20 int virNetDevTapInterfaceStats(const char *ifname, virDomainInterfaceStatsPtr stats, bool swapped) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; diff --git a/src/util/virnetdevveth.h b/src/util/virnetdevveth.h index 4380b7cfe1..830b37d046 100644 --- a/src/util/virnetdevveth.h +++ b/src/util/virnetdevveth.h @@ -23,6 +23,6 @@ =20 /* Function declarations */ int virNetDevVethCreate(char **veth1, char **veth2) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; int virNetDevVethDelete(const char *veth) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; diff --git a/src/util/virnetdevvportprofile.h b/src/util/virnetdevvportprof= ile.h index d1db8bac6a..5fdd019a09 100644 --- a/src/util/virnetdevvportprofile.h +++ b/src/util/virnetdevvportprofile.h @@ -99,7 +99,7 @@ int virNetDevVPortProfileAssociate(const char *ifname, const unsigned char *vmuuid, virNetDevVPortProfileOp vmOp, bool setlink_only) - ATTRIBUTE_NONNULL(4) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(4) G_GNUC_WARN_UNUSED_RESULT; =20 int virNetDevVPortProfileDisassociate(const char *ifname, const virNetDevVPortProfile *virtPor= t, @@ -107,4 +107,4 @@ int virNetDevVPortProfileDisassociate(const char *ifnam= e, const char *linkdev, int vf, virNetDevVPortProfileOp vmOp) - ATTRIBUTE_NONNULL(4) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(4) G_GNUC_WARN_UNUSED_RESULT; diff --git a/src/util/virnetlink.h b/src/util/virnetlink.h index 6419a775e1..a7e455769d 100644 --- a/src/util/virnetlink.h +++ b/src/util/virnetlink.h @@ -109,7 +109,7 @@ int virNetlinkGetErrorCode(struct nlmsghdr *resp, unsig= ned int recvbuflen); int virNetlinkDumpLink(const char *ifname, int ifindex, void **nlData, struct nlattr **tb, uint32_t src_pid, uint32_t dst_pid) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; int virNetlinkGetNeighbor(void **nlData, uint32_t src_pid, uint32_t dst_pid); =20 diff --git a/src/util/virpci.h b/src/util/virpci.h index f3226f1f1b..017545424d 100644 --- a/src/util/virpci.h +++ b/src/util/virpci.h @@ -228,7 +228,7 @@ int virPCIGetNetName(const char *device_link_sysfs_path, =20 int virPCIGetSysfsFile(char *virPCIDeviceName, char **pci_sysfs_device_link) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; =20 bool virPCIDeviceAddressIsValid(virPCIDeviceAddressPtr addr, bool report); diff --git a/src/util/virpidfile.h b/src/util/virpidfile.h index a42b82ff1d..370a59892e 100644 --- a/src/util/virpidfile.h +++ b/src/util/virpidfile.h @@ -30,24 +30,24 @@ char *virPidFileBuildPath(const char *dir, const char *name); =20 int virPidFileWritePath(const char *path, - pid_t pid) ATTRIBUTE_RETURN_CHECK; + pid_t pid) G_GNUC_WARN_UNUSED_RESULT; int virPidFileWrite(const char *dir, const char *name, - pid_t pid) ATTRIBUTE_RETURN_CHECK; + pid_t pid) G_GNUC_WARN_UNUSED_RESULT; =20 int virPidFileReadPath(const char *path, - pid_t *pid) ATTRIBUTE_RETURN_CHECK; + pid_t *pid) G_GNUC_WARN_UNUSED_RESULT; int virPidFileRead(const char *dir, const char *name, - pid_t *pid) ATTRIBUTE_RETURN_CHECK; + pid_t *pid) G_GNUC_WARN_UNUSED_RESULT; =20 int virPidFileReadPathIfAlive(const char *path, pid_t *pid, - const char *binpath) ATTRIBUTE_RETURN_CHECK; + const char *binpath) G_GNUC_WARN_UNUSED_RESU= LT; int virPidFileReadIfAlive(const char *dir, const char *name, pid_t *pid, - const char *binpath) ATTRIBUTE_RETURN_CHECK; + const char *binpath) G_GNUC_WARN_UNUSED_RESULT; =20 int virPidFileDeletePath(const char *path); int virPidFileDelete(const char *dir, @@ -56,11 +56,11 @@ int virPidFileDelete(const char *dir, =20 int virPidFileAcquirePath(const char *path, bool waitForLock, - pid_t pid) ATTRIBUTE_RETURN_CHECK; + pid_t pid) G_GNUC_WARN_UNUSED_RESULT; int virPidFileAcquire(const char *dir, const char *name, bool waitForLock, - pid_t pid) ATTRIBUTE_RETURN_CHECK; + pid_t pid) G_GNUC_WARN_UNUSED_RESULT; =20 int virPidFileReleasePath(const char *path, int fd); diff --git a/src/util/virprocess.h b/src/util/virprocess.h index 8e2af33c7d..b2a3a0a7a6 100644 --- a/src/util/virprocess.h +++ b/src/util/virprocess.h @@ -50,7 +50,7 @@ void virProcessExitWithStatus(int status) G_GNUC_NORETURN; =20 int virProcessWait(pid_t pid, int *exitstatus, bool raw) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; =20 int virProcessKill(pid_t pid, int sig); =20 diff --git a/src/util/virrandom.h b/src/util/virrandom.h index c33932e8b3..60f9aaf530 100644 --- a/src/util/virrandom.h +++ b/src/util/virrandom.h @@ -24,5 +24,5 @@ uint64_t virRandomBits(int nbits) ATTRIBUTE_NOINLINE; double virRandom(void); uint32_t virRandomInt(uint32_t max); int virRandomBytes(unsigned char *buf, size_t buflen) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK ATTRIBUTE_NOINLINE; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT ATTRIBUTE_NOINLINE; int virRandomGenerateWWN(char **wwn, const char *virt_type) ATTRIBUTE_NOIN= LINE; diff --git a/src/util/virstring.h b/src/util/virstring.h index af6e234d83..a7ef9a36a7 100644 --- a/src/util/virstring.h +++ b/src/util/virstring.h @@ -63,55 +63,55 @@ int virStrToLong_i(char const *s, char **end_ptr, int base, int *result) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; =20 int virStrToLong_ui(char const *s, char **end_ptr, int base, unsigned int *result) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; int virStrToLong_uip(char const *s, char **end_ptr, int base, unsigned int *result) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; int virStrToLong_l(char const *s, char **end_ptr, int base, long *result) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; int virStrToLong_ul(char const *s, char **end_ptr, int base, unsigned long *result) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; int virStrToLong_ulp(char const *s, char **end_ptr, int base, unsigned long *result) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; int virStrToLong_ll(char const *s, char **end_ptr, int base, long long *result) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; int virStrToLong_ull(char const *s, char **end_ptr, int base, unsigned long long *result) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; int virStrToLong_ullp(char const *s, char **end_ptr, int base, unsigned long long *result) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; int virStrToDouble(char const *s, char **end_ptr, double *result) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; =20 int virDoubleToStr(char **strp, double number) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; =20 void virSkipSpaces(const char **str) ATTRIBUTE_NONNULL(1); void virSkipSpacesAndBackslash(const char **str) ATTRIBUTE_NONNULL(1); @@ -122,23 +122,23 @@ void virSkipSpacesBackwards(const char *str, char **e= ndp) bool virStringIsEmpty(const char *str); =20 int virStrncpy(char *dest, const char *src, size_t n, size_t destbytes) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; int virStrcpy(char *dest, const char *src, size_t destbytes) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; #define virStrcpyStatic(dest, src) virStrcpy((dest), (src), sizeof(dest)) =20 /* Don't call these directly - use the macros below */ int virStrdup(char **dest, const char *src) - ATTRIBUTE_RETURN_CHECK ATTRIBUTE_NONNULL(1); + G_GNUC_WARN_UNUSED_RESULT ATTRIBUTE_NONNULL(1); =20 int virStrndup(char **dest, const char *src, ssize_t n) - ATTRIBUTE_RETURN_CHECK ATTRIBUTE_NONNULL(1); + G_GNUC_WARN_UNUSED_RESULT ATTRIBUTE_NONNULL(1); int virAsprintfInternal(char **strp, const char *fmt, ...) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_FMT_PRINTF(2, 3) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; int virVasprintfInternal(char **strp, const char *fmt, va_list list) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_FMT_PRINTF(2, 0) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; =20 /** * VIR_STRDUP: @@ -276,7 +276,7 @@ bool virStringHasSuffix(const char *str, bool virStringHasCaseSuffix(const char *str, const char *suffix); bool virStringStripSuffix(char *str, - const char *suffix) ATTRIBUTE_RETURN_CHECK; + const char *suffix) G_GNUC_WARN_UNUSED_RESULT; bool virStringMatchesNameSuffix(const char *file, const char *name, const char *suffix); @@ -295,11 +295,11 @@ void virStringTrimOptionalNewline(char *str); =20 int virStringParsePort(const char *str, unsigned int *port) - ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; =20 int virStringParseYesNo(const char *str, bool *result) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; /** * VIR_AUTOSTRINGLIST: * diff --git a/src/util/virthread.h b/src/util/virthread.h index 6bbc09fa13..a7960e444a 100644 --- a/src/util/virthread.h +++ b/src/util/virthread.h @@ -92,7 +92,7 @@ int virThreadCreateFull(virThreadPtr thread, virThreadFunc func, const char *funcName, bool worker, - void *opaque) ATTRIBUTE_RETURN_CHECK; + void *opaque) G_GNUC_WARN_UNUSED_RESULT; void virThreadSelf(virThreadPtr thread); bool virThreadIsSelf(virThreadPtr thread); void virThreadJoin(virThreadPtr thread); @@ -121,17 +121,17 @@ unsigned long long virThreadID(virThreadPtr thread); * } */ int virOnce(virOnceControlPtr once, virOnceFunc init) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; =20 -int virMutexInit(virMutexPtr m) ATTRIBUTE_RETURN_CHECK; -int virMutexInitRecursive(virMutexPtr m) ATTRIBUTE_RETURN_CHECK; +int virMutexInit(virMutexPtr m) G_GNUC_WARN_UNUSED_RESULT; +int virMutexInitRecursive(virMutexPtr m) G_GNUC_WARN_UNUSED_RESULT; void virMutexDestroy(virMutexPtr m); =20 void virMutexLock(virMutexPtr m); void virMutexUnlock(virMutexPtr m); =20 =20 -int virRWLockInit(virRWLockPtr m) ATTRIBUTE_RETURN_CHECK; +int virRWLockInit(virRWLockPtr m) G_GNUC_WARN_UNUSED_RESULT; void virRWLockDestroy(virRWLockPtr m); =20 void virRWLockRead(virRWLockPtr m); @@ -139,7 +139,7 @@ void virRWLockWrite(virRWLockPtr m); void virRWLockUnlock(virRWLockPtr m); =20 =20 -int virCondInit(virCondPtr c) ATTRIBUTE_RETURN_CHECK; +int virCondInit(virCondPtr c) G_GNUC_WARN_UNUSED_RESULT; int virCondDestroy(virCondPtr c); =20 /* virCondWait, virCondWaitUntil: @@ -147,8 +147,8 @@ int virCondDestroy(virCondPtr c); * changing value. Therefore in nearly all cases they * should be enclosed in a while loop that checks the predicate. */ -int virCondWait(virCondPtr c, virMutexPtr m) ATTRIBUTE_RETURN_CHECK; -int virCondWaitUntil(virCondPtr c, virMutexPtr m, unsigned long long whenm= s) ATTRIBUTE_RETURN_CHECK; +int virCondWait(virCondPtr c, virMutexPtr m) G_GNUC_WARN_UNUSED_RESULT; +int virCondWaitUntil(virCondPtr c, virMutexPtr m, unsigned long long whenm= s) G_GNUC_WARN_UNUSED_RESULT; =20 void virCondSignal(virCondPtr c); void virCondBroadcast(virCondPtr c); @@ -156,9 +156,9 @@ void virCondBroadcast(virCondPtr c); =20 typedef void (*virThreadLocalCleanup)(void *); int virThreadLocalInit(virThreadLocalPtr l, - virThreadLocalCleanup c) ATTRIBUTE_RETURN_CHECK; + virThreadLocalCleanup c) G_GNUC_WARN_UNUSED_RESULT; void *virThreadLocalGet(virThreadLocalPtr l); -int virThreadLocalSet(virThreadLocalPtr l, void*) ATTRIBUTE_RETURN_CHECK; +int virThreadLocalSet(virThreadLocalPtr l, void*) G_GNUC_WARN_UNUSED_RESUL= T; =20 =20 /** diff --git a/src/util/virthreadpool.h b/src/util/virthreadpool.h index 7dfb511c0a..5a55e22489 100644 --- a/src/util/virthreadpool.h +++ b/src/util/virthreadpool.h @@ -50,7 +50,7 @@ void virThreadPoolFree(virThreadPoolPtr pool); int virThreadPoolSendJob(virThreadPoolPtr pool, unsigned int priority, void *jobdata) ATTRIBUTE_NONNULL(1) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; =20 int virThreadPoolSetParameters(virThreadPoolPtr pool, long long int minWorkers, diff --git a/src/util/virtime.h b/src/util/virtime.h index b8ea38e291..d4fba4aff5 100644 --- a/src/util/virtime.h +++ b/src/util/virtime.h @@ -40,26 +40,26 @@ void virTimeFieldsThen(unsigned long long when, struct = tm *fields) /* These APIs are async signal safe and return -1, setting * errno on failure */ int virTimeMillisNowRaw(unsigned long long *now) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; int virTimeFieldsNowRaw(struct tm *fields) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; int virTimeStringNowRaw(char *buf) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; int virTimeStringThenRaw(unsigned long long when, char *buf) - ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; =20 /* These APIs are *not* async signal safe and return -1, * raising a libvirt error on failure */ int virTimeMillisNow(unsigned long long *now) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; int virTimeFieldsNow(struct tm *fields) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; char *virTimeStringNow(void); char *virTimeStringThen(unsigned long long when); =20 int virTimeLocalOffsetFromUTC(long *offset) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; =20 typedef struct { unsigned long long start_t; diff --git a/src/util/virtypedparam.h b/src/util/virtypedparam.h index 2c998978ea..0e39a19120 100644 --- a/src/util/virtypedparam.h +++ b/src/util/virtypedparam.h @@ -62,7 +62,7 @@ struct _virTypedParameterRemote { =20 int virTypedParamsValidate(virTypedParameterPtr params, int nparams, /* const char *name, int type ... */ ...) - G_GNUC_NULL_TERMINATED ATTRIBUTE_RETURN_CHECK; + G_GNUC_NULL_TERMINATED G_GNUC_WARN_UNUSED_RESULT; =20 bool virTypedParamsCheck(virTypedParameterPtr params, int nparams, @@ -79,12 +79,12 @@ virTypedParamsFilter(virTypedParameterPtr params, int nparams, const char *name, virTypedParameterPtr **ret) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; =20 =20 int virTypedParameterAssign(virTypedParameterPtr param, const char *name, int type, /* TYPE arg */ ...) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; =20 int virTypedParamsReplaceString(virTypedParameterPtr *params, int *nparams, @@ -149,34 +149,34 @@ int virTypedParamListAddInt(virTypedParamListPtr list, int value, const char *namefmt, ...) - ATTRIBUTE_FMT_PRINTF(3, 4) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_FMT_PRINTF(3, 4) G_GNUC_WARN_UNUSED_RESULT; int virTypedParamListAddUInt(virTypedParamListPtr list, unsigned int value, const char *namefmt, ...) - ATTRIBUTE_FMT_PRINTF(3, 4) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_FMT_PRINTF(3, 4) G_GNUC_WARN_UNUSED_RESULT; int virTypedParamListAddLLong(virTypedParamListPtr list, long long value, const char *namefmt, ...) - ATTRIBUTE_FMT_PRINTF(3, 4) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_FMT_PRINTF(3, 4) G_GNUC_WARN_UNUSED_RESULT; int virTypedParamListAddULLong(virTypedParamListPtr list, unsigned long long value, const char *namefmt, ...) - ATTRIBUTE_FMT_PRINTF(3, 4) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_FMT_PRINTF(3, 4) G_GNUC_WARN_UNUSED_RESULT; int virTypedParamListAddString(virTypedParamListPtr list, const char *value, const char *namefmt, ...) - ATTRIBUTE_FMT_PRINTF(3, 4) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_FMT_PRINTF(3, 4) G_GNUC_WARN_UNUSED_RESULT; int virTypedParamListAddBoolean(virTypedParamListPtr list, bool value, const char *namefmt, ...) - ATTRIBUTE_FMT_PRINTF(3, 4) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_FMT_PRINTF(3, 4) G_GNUC_WARN_UNUSED_RESULT; int virTypedParamListAddDouble(virTypedParamListPtr list, double value, const char *namefmt, ...) - ATTRIBUTE_FMT_PRINTF(3, 4) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_FMT_PRINTF(3, 4) G_GNUC_WARN_UNUSED_RESULT; diff --git a/src/util/virutil.h b/src/util/virutil.h index 15ae67dea2..d265d698d0 100644 --- a/src/util/virutil.h +++ b/src/util/virutil.h @@ -27,11 +27,11 @@ #include =20 =20 -int virSetBlocking(int fd, bool blocking) ATTRIBUTE_RETURN_CHECK; -int virSetNonBlock(int fd) ATTRIBUTE_RETURN_CHECK; -int virSetInherit(int fd, bool inherit) ATTRIBUTE_RETURN_CHECK; -int virSetCloseExec(int fd) ATTRIBUTE_RETURN_CHECK; -int virSetSockReuseAddr(int fd, bool fatal) ATTRIBUTE_RETURN_CHECK; +int virSetBlocking(int fd, bool blocking) G_GNUC_WARN_UNUSED_RESULT; +int virSetNonBlock(int fd) G_GNUC_WARN_UNUSED_RESULT; +int virSetInherit(int fd, bool inherit) G_GNUC_WARN_UNUSED_RESULT; +int virSetCloseExec(int fd) G_GNUC_WARN_UNUSED_RESULT; +int virSetSockReuseAddr(int fd, bool fatal) G_GNUC_WARN_UNUSED_RESULT; =20 int virSetUIDGID(uid_t uid, gid_t gid, gid_t *groups, int ngroups); int virSetUIDGIDWithCaps(uid_t uid, gid_t gid, gid_t *groups, int ngroups, @@ -42,7 +42,7 @@ void virWaitForDevices(void); =20 int virScaleInteger(unsigned long long *value, const char *suffix, unsigned long long scale, unsigned long long limit) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; =20 int virHexToBin(unsigned char c); =20 @@ -50,7 +50,7 @@ int virParseVersionString(const char *str, unsigned long = *version, bool allowMissing); =20 char *virFormatIntDecimal(char *buf, size_t buflen, int val) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) G_GNUC_WARN_UNUSED_RESULT; =20 unsigned long long virFormatIntPretty(unsigned long long val, @@ -108,9 +108,9 @@ char *virGetGroupName(gid_t gid) ATTRIBUTE_NOINLINE; int virGetGroupList(uid_t uid, gid_t group, gid_t **groups) ATTRIBUTE_NONNULL(3); int virGetUserID(const char *name, - uid_t *uid) ATTRIBUTE_RETURN_CHECK; + uid_t *uid) G_GNUC_WARN_UNUSED_RESULT; int virGetGroupID(const char *name, - gid_t *gid) ATTRIBUTE_RETURN_CHECK; + gid_t *gid) G_GNUC_WARN_UNUSED_RESULT; =20 bool virDoesUserExist(const char *name); bool virDoesGroupExist(const char *name); diff --git a/src/util/viruuid.h b/src/util/viruuid.h index b709c182ff..54fbd88805 100644 --- a/src/util/viruuid.h +++ b/src/util/viruuid.h @@ -49,7 +49,7 @@ int virUUIDGenerate(unsigned char *uuid) ATTRIBUTE_NOINLI= NE; =20 int virUUIDParse(const char *uuidstr, unsigned char *uuid) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; =20 const char *virUUIDFormat(const unsigned char *uuid, char *uuidstr) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NO= NNULL(2); diff --git a/src/util/virxml.h b/src/util/virxml.h index 39e5a988a2..c7def9ce61 100644 --- a/src/util/virxml.h +++ b/src/util/virxml.h @@ -31,7 +31,7 @@ #include "virautoclean.h" =20 xmlXPathContextPtr virXMLXPathContextNew(xmlDocPtr xml) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; =20 int virXPathBoolean(const char *xpath, xmlXPathContextPtr ctxt); @@ -221,7 +221,7 @@ virXMLFormatElement(virBufferPtr buf, const char *name, virBufferPtr attrBuf, virBufferPtr childBuf) - ATTRIBUTE_RETURN_CHECK; + G_GNUC_WARN_UNUSED_RESULT; =20 struct _virXPathContextNodeSave { xmlXPathContextPtr ctxt; diff --git a/tools/virsh-domain-monitor.h b/tools/virsh-domain-monitor.h index 77e83502db..11a9156ae2 100644 --- a/tools/virsh-domain-monitor.h +++ b/tools/virsh-domain-monitor.h @@ -24,6 +24,6 @@ =20 char *virshGetDomainDescription(vshControl *ctl, virDomainPtr dom, bool title, unsigned int flags) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT; =20 extern const vshCmdDef domMonitoringCmds[]; diff --git a/tools/virsh-util.h b/tools/virsh-util.h index 7fdd39dd12..955d34dcfc 100644 --- a/tools/virsh-util.h +++ b/tools/virsh-util.h @@ -98,7 +98,7 @@ virshDomainGetXMLFromDom(vshControl *ctl, xmlDocPtr *xml, xmlXPathContextPtr *ctxt) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(4) - ATTRIBUTE_NONNULL(5) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(5) G_GNUC_WARN_UNUSED_RESULT; =20 int virshDomainGetXML(vshControl *ctl, @@ -107,4 +107,4 @@ virshDomainGetXML(vshControl *ctl, xmlDocPtr *xml, xmlXPathContextPtr *ctxt) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(4) - ATTRIBUTE_NONNULL(5) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(5) G_GNUC_WARN_UNUSED_RESULT; diff --git a/tools/vsh.h b/tools/vsh.h index 4e02bb177d..947904f6c0 100644 --- a/tools/vsh.h +++ b/tools/vsh.h @@ -255,39 +255,39 @@ bool vshCmdGrpHelp(vshControl *ctl, const vshCmdGrp *= grp); =20 int vshCommandOptInt(vshControl *ctl, const vshCmd *cmd, const char *name, int *value) - ATTRIBUTE_NONNULL(4) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(4) G_GNUC_WARN_UNUSED_RESULT; int vshCommandOptUInt(vshControl *ctl, const vshCmd *cmd, const char *name, unsigned int *value) - ATTRIBUTE_NONNULL(4) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(4) G_GNUC_WARN_UNUSED_RESULT; int vshCommandOptUIntWrap(vshControl *ctl, const vshCmd *cmd, const char *name, unsigned int *value) - ATTRIBUTE_NONNULL(4) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(4) G_GNUC_WARN_UNUSED_RESULT; int vshCommandOptUL(vshControl *ctl, const vshCmd *cmd, const char *name, unsigned long *value) - ATTRIBUTE_NONNULL(4) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(4) G_GNUC_WARN_UNUSED_RESULT; int vshCommandOptULWrap(vshControl *ctl, const vshCmd *cmd, const char *name, unsigned long *value) - ATTRIBUTE_NONNULL(4) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(4) G_GNUC_WARN_UNUSED_RESULT; int vshCommandOptStringQuiet(vshControl *ctl, const vshCmd *cmd, const char *name, const char **value) - ATTRIBUTE_NONNULL(4) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(4) G_GNUC_WARN_UNUSED_RESULT; int vshCommandOptStringReq(vshControl *ctl, const vshCmd *cmd, const char *name, const char **value) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) - ATTRIBUTE_NONNULL(4) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(4) G_GNUC_WARN_UNUSED_RESULT; int vshCommandOptLongLong(vshControl *ctl, const vshCmd *cmd, const char *name, long long *value) - ATTRIBUTE_NONNULL(4) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(4) G_GNUC_WARN_UNUSED_RESULT; int vshCommandOptULongLong(vshControl *ctl, const vshCmd *cmd, const char *name, unsigned long long *value) - ATTRIBUTE_NONNULL(4) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(4) G_GNUC_WARN_UNUSED_RESULT; int vshCommandOptULongLongWrap(vshControl *ctl, const vshCmd *cmd, const char *name, unsigned long long *value) - ATTRIBUTE_NONNULL(4) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(4) G_GNUC_WARN_UNUSED_RESULT; int vshCommandOptScaledInt(vshControl *ctl, const vshCmd *cmd, const char *name, unsigned long long *value, int scale, unsigned long long max) - ATTRIBUTE_NONNULL(4) ATTRIBUTE_RETURN_CHECK; + ATTRIBUTE_NONNULL(4) G_GNUC_WARN_UNUSED_RESULT; int vshBlockJobOptionBandwidth(vshControl *ctl, const vshCmd *cmd, bool bytes, --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 10:00:01 2024 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=1571059023; cv=none; d=zoho.com; s=zohoarc; b=NI7O2O+d7GVeDktc+HDEnUNFRdViuRTu4vnLEkHx2b3BXOcK1FXOjRBtTLHeNhKJieRg6mVikTzAYRmx82TMeyeCq6Xs6FufwTQJJtUKldmQkOMDqLYzm4D2vjTPuE+ifIntikWx4I7Nw2QgzCX8OtMhQCRGFaluLRErKQlqAbg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571059023; 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=0/D00xbI3S7VLsGwCUo5IkJoClLe2uNvi0dVucBFkoQ=; b=CJNlNIxPTJJ1tp3OfgSdqAlkC+PSTo3NSmJ0tGOmhgZVSRV1eEZcthLGIhkbHTPpLiVdTYdzqpE3jhV5mpomX1qpCmKA+Cu2/MVb7jP5FfDHF+SkvzeFXbKlabjm11C0EqtBYlfrVghfzLkdIPqc1f+7de/Ptxzml3RjUvOoF90= 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 1571059023369293.47445558203344; Mon, 14 Oct 2019 06:17:03 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 85B65A3CD62; Mon, 14 Oct 2019 13:17:01 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 596F760126; Mon, 14 Oct 2019 13:17:01 +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 1A3E94EE70; Mon, 14 Oct 2019 13:17:01 +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 x9EDGI3i017359 for ; Mon, 14 Oct 2019 09:16:18 -0400 Received: by smtp.corp.redhat.com (Postfix) id DEF3D60127; Mon, 14 Oct 2019 13:16:18 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 618A160126 for ; Mon, 14 Oct 2019 13:16:15 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Mon, 14 Oct 2019 15:15:24 +0200 Message-Id: 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 06/35] examples: 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.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.68]); Mon, 14 Oct 2019 13:17:02 +0000 (UTC) Name the macro G_GNUC_UNUSED instead of ATTRIBUTE_UNUSED to match the rest of libvirt code. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- examples/c/misc/event-test.c | 140 +++++++++++++++++------------------ 1 file changed, 70 insertions(+), 70 deletions(-) diff --git a/examples/c/misc/event-test.c b/examples/c/misc/event-test.c index fcf4492470..533b8da9bf 100644 --- a/examples/c/misc/event-test.c +++ b/examples/c/misc/event-test.c @@ -21,17 +21,17 @@ # define verify(cond) #endif =20 -#ifndef ATTRIBUTE_UNUSED -# define ATTRIBUTE_UNUSED __attribute__((__unused__)) +#ifndef G_GNUC_UNUSED +# define G_GNUC_UNUSED __attribute__((__unused__)) #endif =20 int run =3D 1; =20 /* Callback functions */ static void -connectClose(virConnectPtr conn ATTRIBUTE_UNUSED, +connectClose(virConnectPtr conn G_GNUC_UNUSED, int reason, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { run =3D 0; =20 @@ -404,11 +404,11 @@ secretEventToString(int event) =20 =20 static int -myDomainEventCallback1(virConnectPtr conn ATTRIBUTE_UNUSED, +myDomainEventCallback1(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, int event, int detail, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { printf("%s EVENT: Domain %s(%d) %s %s\n", __func__, virDomainGetName(d= om), virDomainGetID(dom), eventToString(event), @@ -418,11 +418,11 @@ myDomainEventCallback1(virConnectPtr conn ATTRIBUTE_U= NUSED, =20 =20 static int -myDomainEventCallback2(virConnectPtr conn ATTRIBUTE_UNUSED, +myDomainEventCallback2(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, int event, int detail, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { printf("%s EVENT: Domain %s(%d) %s %s\n", __func__, virDomainGetName(d= om), virDomainGetID(dom), eventToString(event), @@ -432,9 +432,9 @@ myDomainEventCallback2(virConnectPtr conn ATTRIBUTE_UNU= SED, =20 =20 static int -myDomainEventRebootCallback(virConnectPtr conn ATTRIBUTE_UNUSED, +myDomainEventRebootCallback(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { printf("%s EVENT: Domain %s(%d) rebooted\n", __func__, virDomainGetNam= e(dom), virDomainGetID(dom)); @@ -444,10 +444,10 @@ myDomainEventRebootCallback(virConnectPtr conn ATTRIB= UTE_UNUSED, =20 =20 static int -myDomainEventRTCChangeCallback(virConnectPtr conn ATTRIBUTE_UNUSED, +myDomainEventRTCChangeCallback(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, long long offset, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { printf("%s EVENT: Domain %s(%d) rtc change %" PRIdMAX "\n", __func__, virDomainGetName(dom), virDomainGetID(dom), @@ -458,10 +458,10 @@ myDomainEventRTCChangeCallback(virConnectPtr conn ATT= RIBUTE_UNUSED, =20 =20 static int -myDomainEventBalloonChangeCallback(virConnectPtr conn ATTRIBUTE_UNUSED, +myDomainEventBalloonChangeCallback(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, unsigned long long actual, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { printf("%s EVENT: Domain %s(%d) balloon change %" PRIuMAX "KB\n", __func__, virDomainGetName(dom), virDomainGetID(dom), (uintmax_= t)actual); @@ -471,10 +471,10 @@ myDomainEventBalloonChangeCallback(virConnectPtr conn= ATTRIBUTE_UNUSED, =20 =20 static int -myDomainEventWatchdogCallback(virConnectPtr conn ATTRIBUTE_UNUSED, +myDomainEventWatchdogCallback(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, int action, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { printf("%s EVENT: Domain %s(%d) watchdog action=3D%d\n", __func__, virDomainGetName(dom), virDomainGetID(dom), action); @@ -484,12 +484,12 @@ myDomainEventWatchdogCallback(virConnectPtr conn ATTR= IBUTE_UNUSED, =20 =20 static int -myDomainEventIOErrorCallback(virConnectPtr conn ATTRIBUTE_UNUSED, +myDomainEventIOErrorCallback(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, const char *srcPath, const char *devAlias, int action, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { printf("%s EVENT: Domain %s(%d) io error path=3D%s alias=3D%s action= =3D%d\n", __func__, virDomainGetName(dom), virDomainGetID(dom), @@ -500,13 +500,13 @@ myDomainEventIOErrorCallback(virConnectPtr conn ATTRI= BUTE_UNUSED, =20 =20 static int -myDomainEventIOErrorReasonCallback(virConnectPtr conn ATTRIBUTE_UNUSED, +myDomainEventIOErrorReasonCallback(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, const char *srcPath, const char *devAlias, int action, const char *reason, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { printf("%s EVENT: Domain %s(%d) io error (reason) path=3D%s alias=3D%s= " "action=3D%d reason=3D%s\n", @@ -539,14 +539,14 @@ graphicsPhaseToStr(int phase) =20 =20 static int -myDomainEventGraphicsCallback(virConnectPtr conn ATTRIBUTE_UNUSED, +myDomainEventGraphicsCallback(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, int phase, virDomainEventGraphicsAddressPtr local, virDomainEventGraphicsAddressPtr remote, const char *authScheme, virDomainEventGraphicsSubjectPtr subject, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { size_t i; printf("%s EVENT: Domain %s(%d) graphics ", __func__, virDomainGetName= (dom), @@ -572,9 +572,9 @@ myDomainEventGraphicsCallback(virConnectPtr conn ATTRIB= UTE_UNUSED, =20 =20 static int -myDomainEventControlErrorCallback(virConnectPtr conn ATTRIBUTE_UNUSED, +myDomainEventControlErrorCallback(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { printf("%s EVENT: Domain %s(%d) control error\n", __func__, virDomainGetName(dom), virDomainGetID(dom)); @@ -601,13 +601,13 @@ diskChangeReasonToStr(int reason) =20 =20 static int -myDomainEventDiskChangeCallback(virConnectPtr conn ATTRIBUTE_UNUSED, +myDomainEventDiskChangeCallback(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, const char *oldSrcPath, const char *newSrcPath, const char *devAlias, int reason, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { printf("%s EVENT: Domain %s(%d) disk change oldSrcPath: %s newSrcPath:= %s " "devAlias: %s reason: %s\n", @@ -635,11 +635,11 @@ trayChangeReasonToStr(int reason) =20 =20 static int -myDomainEventTrayChangeCallback(virConnectPtr conn ATTRIBUTE_UNUSED, +myDomainEventTrayChangeCallback(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, const char *devAlias, int reason, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { printf("%s EVENT: Domain %s(%d) removable disk's tray change devAlias:= %s " "reason: %s\n", @@ -650,10 +650,10 @@ myDomainEventTrayChangeCallback(virConnectPtr conn AT= TRIBUTE_UNUSED, =20 =20 static int -myDomainEventPMWakeupCallback(virConnectPtr conn ATTRIBUTE_UNUSED, +myDomainEventPMWakeupCallback(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, - int reason ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) + int reason G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED) { printf("%s EVENT: Domain %s(%d) system pmwakeup\n", __func__, virDomainGetName(dom), virDomainGetID(dom)); @@ -662,10 +662,10 @@ myDomainEventPMWakeupCallback(virConnectPtr conn ATTR= IBUTE_UNUSED, =20 =20 static int -myDomainEventPMSuspendCallback(virConnectPtr conn ATTRIBUTE_UNUSED, +myDomainEventPMSuspendCallback(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, - int reason ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) + int reason G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED) { printf("%s EVENT: Domain %s(%d) system pmsuspend\n", __func__, virDomainGetName(dom), virDomainGetID(dom)); @@ -674,10 +674,10 @@ myDomainEventPMSuspendCallback(virConnectPtr conn ATT= RIBUTE_UNUSED, =20 =20 static int -myDomainEventPMSuspendDiskCallback(virConnectPtr conn ATTRIBUTE_UNUSED, +myDomainEventPMSuspendDiskCallback(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, - int reason ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) + int reason G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED) { printf("%s EVENT: Domain %s(%d) system pmsuspend-disk\n", __func__, virDomainGetName(dom), virDomainGetID(dom)); @@ -686,10 +686,10 @@ myDomainEventPMSuspendDiskCallback(virConnectPtr conn= ATTRIBUTE_UNUSED, =20 =20 static int -myDomainEventDeviceRemovedCallback(virConnectPtr conn ATTRIBUTE_UNUSED, +myDomainEventDeviceRemovedCallback(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, const char *devAlias, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { printf("%s EVENT: Domain %s(%d) device removed: %s\n", __func__, virDomainGetName(dom), virDomainGetID(dom), devAlias); @@ -698,11 +698,11 @@ myDomainEventDeviceRemovedCallback(virConnectPtr conn= ATTRIBUTE_UNUSED, =20 =20 static int -myNetworkEventCallback(virConnectPtr conn ATTRIBUTE_UNUSED, +myNetworkEventCallback(virConnectPtr conn G_GNUC_UNUSED, virNetworkPtr dom, int event, int detail, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { printf("%s EVENT: Network %s %s %d\n", __func__, virNetworkGetName(dom= ), networkEventToString(event), detail); @@ -710,11 +710,11 @@ myNetworkEventCallback(virConnectPtr conn ATTRIBUTE_U= NUSED, } =20 static int -myStoragePoolEventCallback(virConnectPtr conn ATTRIBUTE_UNUSED, +myStoragePoolEventCallback(virConnectPtr conn G_GNUC_UNUSED, virStoragePoolPtr pool, int event, int detail, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { printf("%s EVENT: Storage pool %s %s %d\n", __func__, virStoragePoolGetName(pool), @@ -725,9 +725,9 @@ myStoragePoolEventCallback(virConnectPtr conn ATTRIBUTE= _UNUSED, =20 =20 static int -myStoragePoolEventRefreshCallback(virConnectPtr conn ATTRIBUTE_UNUSED, +myStoragePoolEventRefreshCallback(virConnectPtr conn G_GNUC_UNUSED, virStoragePoolPtr pool, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { printf("%s EVENT: Storage pool %s refresh\n", __func__, virStoragePoolGetName(pool)); @@ -736,11 +736,11 @@ myStoragePoolEventRefreshCallback(virConnectPtr conn = ATTRIBUTE_UNUSED, =20 =20 static int -myNodeDeviceEventCallback(virConnectPtr conn ATTRIBUTE_UNUSED, +myNodeDeviceEventCallback(virConnectPtr conn G_GNUC_UNUSED, virNodeDevicePtr dev, int event, int detail, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { printf("%s EVENT: Node device %s %s %d\n", __func__, virNodeDeviceGetName(dev), @@ -751,9 +751,9 @@ myNodeDeviceEventCallback(virConnectPtr conn ATTRIBUTE_= UNUSED, =20 =20 static int -myNodeDeviceEventUpdateCallback(virConnectPtr conn ATTRIBUTE_UNUSED, +myNodeDeviceEventUpdateCallback(virConnectPtr conn G_GNUC_UNUSED, virNodeDevicePtr dev, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { printf("%s EVENT: Node device %s update\n", __func__, virNodeDeviceGetName(dev)); @@ -762,11 +762,11 @@ myNodeDeviceEventUpdateCallback(virConnectPtr conn AT= TRIBUTE_UNUSED, =20 =20 static int -mySecretEventCallback(virConnectPtr conn ATTRIBUTE_UNUSED, +mySecretEventCallback(virConnectPtr conn G_GNUC_UNUSED, virSecretPtr secret, int event, int detail, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { char uuid[VIR_UUID_STRING_BUFLEN]; virSecretGetUUIDString(secret, uuid); @@ -779,9 +779,9 @@ mySecretEventCallback(virConnectPtr conn ATTRIBUTE_UNUS= ED, =20 =20 static int -mySecretEventValueChanged(virConnectPtr conn ATTRIBUTE_UNUSED, +mySecretEventValueChanged(virConnectPtr conn G_GNUC_UNUSED, virSecretPtr secret, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { char uuid[VIR_UUID_STRING_BUFLEN]; virSecretGetUUIDString(secret, uuid); @@ -829,11 +829,11 @@ eventTypedParamsPrint(virTypedParameterPtr params, =20 =20 static int -myDomainEventTunableCallback(virConnectPtr conn ATTRIBUTE_UNUSED, +myDomainEventTunableCallback(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, virTypedParameterPtr params, int nparams, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { printf("%s EVENT: Domain %s(%d) tunable updated:\n", __func__, virDomainGetName(dom), virDomainGetID(dom)); @@ -845,11 +845,11 @@ myDomainEventTunableCallback(virConnectPtr conn ATTRI= BUTE_UNUSED, =20 =20 static int -myDomainEventAgentLifecycleCallback(virConnectPtr conn ATTRIBUTE_UNUSED, +myDomainEventAgentLifecycleCallback(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, int state, int reason, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { printf("%s EVENT: Domain %s(%d) guest agent state changed: %s reason: = %s\n", __func__, virDomainGetName(dom), virDomainGetID(dom), @@ -861,10 +861,10 @@ myDomainEventAgentLifecycleCallback(virConnectPtr con= n ATTRIBUTE_UNUSED, =20 =20 static int -myDomainEventDeviceAddedCallback(virConnectPtr conn ATTRIBUTE_UNUSED, +myDomainEventDeviceAddedCallback(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, const char *devAlias, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { printf("%s EVENT: Domain %s(%d) device added: %s\n", __func__, virDomainGetName(dom), virDomainGetID(dom), devAlias); @@ -922,7 +922,7 @@ blockJobStatusToStr(int status) =20 =20 static int -myDomainEventBlockJobCallback(virConnectPtr conn ATTRIBUTE_UNUSED, +myDomainEventBlockJobCallback(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, const char *disk, int type, @@ -940,13 +940,13 @@ myDomainEventBlockJobCallback(virConnectPtr conn ATTR= IBUTE_UNUSED, =20 =20 static int -myDomainEventBlockThresholdCallback(virConnectPtr conn ATTRIBUTE_UNUSED, +myDomainEventBlockThresholdCallback(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, const char *dev, const char *path, unsigned long long threshold, unsigned long long excess, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { /* Casts to uint64_t to work around mingw not knowing %lld */ printf("%s EVENT: Domain %s(%d) block threshold callback dev '%s'(%s),= " @@ -958,10 +958,10 @@ myDomainEventBlockThresholdCallback(virConnectPtr con= n ATTRIBUTE_UNUSED, =20 =20 static int -myDomainEventMigrationIterationCallback(virConnectPtr conn ATTRIBUTE_UNUSE= D, +myDomainEventMigrationIterationCallback(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, int iteration, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { printf("%s EVENT: Domain %s(%d) migration iteration '%d'\n", __func__, virDomainGetName(dom), virDomainGetID(dom), iteration= ); @@ -970,11 +970,11 @@ myDomainEventMigrationIterationCallback(virConnectPtr= conn ATTRIBUTE_UNUSED, =20 =20 static int -myDomainEventJobCompletedCallback(virConnectPtr conn ATTRIBUTE_UNUSED, +myDomainEventJobCompletedCallback(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, virTypedParameterPtr params, int nparams, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { printf("%s EVENT: Domain %s(%d) job completed:\n", __func__, virDomainGetName(dom), virDomainGetID(dom)); @@ -986,10 +986,10 @@ myDomainEventJobCompletedCallback(virConnectPtr conn = ATTRIBUTE_UNUSED, =20 =20 static int -myDomainEventDeviceRemovalFailedCallback(virConnectPtr conn ATTRIBUTE_UNUS= ED, +myDomainEventDeviceRemovalFailedCallback(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, const char *devAlias, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { printf("%s EVENT: Domain %s(%d) device removal failed: %s\n", __func__, virDomainGetName(dom), virDomainGetID(dom), devAlias); @@ -1018,11 +1018,11 @@ metadataTypeToStr(int status) } =20 static int -myDomainEventMetadataChangeCallback(virConnectPtr conn ATTRIBUTE_UNUSED, +myDomainEventMetadataChangeCallback(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, int type, const char *nsuri, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { const char *typestr =3D metadataTypeToStr(type); printf("%s EVENT: Domain %s(%d) metadata type: %s (%s)\n", --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 10:00:01 2024 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=1571058993; cv=none; d=zoho.com; s=zohoarc; b=byWANdaAFfhitNJnfbdc+P65QCgVSGYDdwtJGtzqGxzK0ssfIv5Eop9zZ3SAa7jkiqiDYOQY55ns9QxsFf+r8wU05MF/e68/Nrt9LIdIytU3JNtOM+inXCFzquBGKdJ+Wl/ev6XlVKxA79mvvqGqQTIvrq5Jwi6iaAiV+FqRV2k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571058993; 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=2ZR8iHvfm6IsGrTdKudbBOcvgiS5f90T2/ViPN5X+WE=; b=RORDG8zL8YtVwAPeLKo5SII5NQkbt2yacrB4ll/Ek3B2OSd46SrzuIi8/e24HUXGB0KKvTq+xVDPpSVO8aeE7MEiaMYjGmvebs4xeJIIIeHjj/sV2+9BJ085tRjYK1AAu6pzlcUJEBOhZbfvD/PB5pJFlPluGyaipG5/VcAPfY8= 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 1571058993888857.2632157891192; Mon, 14 Oct 2019 06:16:33 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7B109308FC4D; Mon, 14 Oct 2019 13:16:30 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C78C31001B03; Mon, 14 Oct 2019 13:16:28 +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 5DB294EDA6; Mon, 14 Oct 2019 13:16:23 +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 x9EDGJBp017364 for ; Mon, 14 Oct 2019 09:16:19 -0400 Received: by smtp.corp.redhat.com (Postfix) id AF80360127; Mon, 14 Oct 2019 13:16:19 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3811860126 for ; Mon, 14 Oct 2019 13:16:19 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Mon, 14 Oct 2019 15:15:25 +0200 Message-Id: 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 07/35] access: 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.22 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:16:32 +0000 (UTC) Use G_GNUC_UNUSED from GLib instead of ATTRIBUTE_UNUSED. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/access/viraccessdrivernop.c | 90 +++++++++++++++--------------- src/access/viraccessdriverpolkit.c | 4 +- 2 files changed, 47 insertions(+), 47 deletions(-) diff --git a/src/access/viraccessdrivernop.c b/src/access/viraccessdriverno= p.c index 5e9d9db759..5772a9c5c6 100644 --- a/src/access/viraccessdrivernop.c +++ b/src/access/viraccessdrivernop.c @@ -23,101 +23,101 @@ #include "access/viraccessdrivernop.h" =20 static int -virAccessDriverNopCheckConnect(virAccessManagerPtr manager ATTRIBUTE_UNUSE= D, - const char *driverName ATTRIBUTE_UNUSED, - virAccessPermConnect perm ATTRIBUTE_UNUSED) +virAccessDriverNopCheckConnect(virAccessManagerPtr manager G_GNUC_UNUSED, + const char *driverName G_GNUC_UNUSED, + virAccessPermConnect perm G_GNUC_UNUSED) { return 1; /* Allow */ } =20 static int -virAccessDriverNopCheckDomain(virAccessManagerPtr manager ATTRIBUTE_UNUSED, - const char *driverName ATTRIBUTE_UNUSED, - virDomainDefPtr domain ATTRIBUTE_UNUSED, - virAccessPermDomain perm ATTRIBUTE_UNUSED) +virAccessDriverNopCheckDomain(virAccessManagerPtr manager G_GNUC_UNUSED, + const char *driverName G_GNUC_UNUSED, + virDomainDefPtr domain G_GNUC_UNUSED, + virAccessPermDomain perm G_GNUC_UNUSED) { return 1; /* Allow */ } =20 static int -virAccessDriverNopCheckInterface(virAccessManagerPtr manager ATTRIBUTE_UNU= SED, - const char *driverName ATTRIBUTE_UNUSED, - virInterfaceDefPtr iface ATTRIBUTE_UNUSED, - virAccessPermInterface perm ATTRIBUTE_UNU= SED) +virAccessDriverNopCheckInterface(virAccessManagerPtr manager G_GNUC_UNUSED, + const char *driverName G_GNUC_UNUSED, + virInterfaceDefPtr iface G_GNUC_UNUSED, + virAccessPermInterface perm G_GNUC_UNUSED) { return 1; /* Allow */ } =20 static int -virAccessDriverNopCheckNetwork(virAccessManagerPtr manager ATTRIBUTE_UNUSE= D, - const char *driverName ATTRIBUTE_UNUSED, - virNetworkDefPtr network ATTRIBUTE_UNUSED, - virAccessPermNetwork perm ATTRIBUTE_UNUSED) +virAccessDriverNopCheckNetwork(virAccessManagerPtr manager G_GNUC_UNUSED, + const char *driverName G_GNUC_UNUSED, + virNetworkDefPtr network G_GNUC_UNUSED, + virAccessPermNetwork perm G_GNUC_UNUSED) { return 1; /* Allow */ } =20 static int -virAccessDriverNopCheckNetworkPort(virAccessManagerPtr manager ATTRIBUTE_U= NUSED, - const char *driverName ATTRIBUTE_UNUSED, - virNetworkDefPtr network ATTRIBUTE_UNUS= ED, - virNetworkPortDefPtr port ATTRIBUTE_UNU= SED, - virAccessPermNetworkPort perm ATTRIBUTE= _UNUSED) +virAccessDriverNopCheckNetworkPort(virAccessManagerPtr manager G_GNUC_UNUS= ED, + const char *driverName G_GNUC_UNUSED, + virNetworkDefPtr network G_GNUC_UNUSED, + virNetworkPortDefPtr port G_GNUC_UNUSED, + virAccessPermNetworkPort perm G_GNUC_UN= USED) { return 1; /* Allow */ } =20 static int -virAccessDriverNopCheckNodeDevice(virAccessManagerPtr manager ATTRIBUTE_UN= USED, - const char *driverName ATTRIBUTE_UNUSED, - virNodeDeviceDefPtr nodedev ATTRIBUTE_UN= USED, - virAccessPermNodeDevice perm ATTRIBUTE_U= NUSED) +virAccessDriverNopCheckNodeDevice(virAccessManagerPtr manager G_GNUC_UNUSE= D, + const char *driverName G_GNUC_UNUSED, + virNodeDeviceDefPtr nodedev G_GNUC_UNUSE= D, + virAccessPermNodeDevice perm G_GNUC_UNUS= ED) { return 1; /* Allow */ } =20 static int -virAccessDriverNopCheckNWFilter(virAccessManagerPtr manager ATTRIBUTE_UNUS= ED, - const char *driverName ATTRIBUTE_UNUSED, - virNWFilterDefPtr nwfilter ATTRIBUTE_UNUSE= D, - virAccessPermNWFilter perm ATTRIBUTE_UNUSE= D) +virAccessDriverNopCheckNWFilter(virAccessManagerPtr manager G_GNUC_UNUSED, + const char *driverName G_GNUC_UNUSED, + virNWFilterDefPtr nwfilter G_GNUC_UNUSED, + virAccessPermNWFilter perm G_GNUC_UNUSED) { return 1; /* Allow */ } =20 static int -virAccessDriverNopCheckNWFilterBinding(virAccessManagerPtr manager ATTRIBU= TE_UNUSED, - const char *driverName ATTRIBUTE_UN= USED, - virNWFilterBindingDefPtr binding AT= TRIBUTE_UNUSED, - virAccessPermNWFilterBinding perm A= TTRIBUTE_UNUSED) +virAccessDriverNopCheckNWFilterBinding(virAccessManagerPtr manager G_GNUC_= UNUSED, + const char *driverName G_GNUC_UNUSE= D, + virNWFilterBindingDefPtr binding G_= GNUC_UNUSED, + virAccessPermNWFilterBinding perm G= _GNUC_UNUSED) { return 1; /* Allow */ } =20 static int -virAccessDriverNopCheckSecret(virAccessManagerPtr manager ATTRIBUTE_UNUSED, - const char *driverName ATTRIBUTE_UNUSED, - virSecretDefPtr secret ATTRIBUTE_UNUSED, - virAccessPermSecret perm ATTRIBUTE_UNUSED) +virAccessDriverNopCheckSecret(virAccessManagerPtr manager G_GNUC_UNUSED, + const char *driverName G_GNUC_UNUSED, + virSecretDefPtr secret G_GNUC_UNUSED, + virAccessPermSecret perm G_GNUC_UNUSED) { return 1; /* Allow */ } =20 static int -virAccessDriverNopCheckStoragePool(virAccessManagerPtr manager ATTRIBUTE_U= NUSED, - const char *driverName ATTRIBUTE_UNUSED, - virStoragePoolDefPtr pool ATTRIBUTE_UNU= SED, - virAccessPermStoragePool perm ATTRIBUTE= _UNUSED) +virAccessDriverNopCheckStoragePool(virAccessManagerPtr manager G_GNUC_UNUS= ED, + const char *driverName G_GNUC_UNUSED, + virStoragePoolDefPtr pool G_GNUC_UNUSED, + virAccessPermStoragePool perm G_GNUC_UN= USED) { return 1; /* Allow */ } =20 static int -virAccessDriverNopCheckStorageVol(virAccessManagerPtr manager ATTRIBUTE_UN= USED, - const char *driverName ATTRIBUTE_UNUSED, - virStoragePoolDefPtr pool ATTRIBUTE_UNUS= ED, - virStorageVolDefPtr vol ATTRIBUTE_UNUSED, - virAccessPermStorageVol perm ATTRIBUTE_U= NUSED) +virAccessDriverNopCheckStorageVol(virAccessManagerPtr manager G_GNUC_UNUSE= D, + const char *driverName G_GNUC_UNUSED, + virStoragePoolDefPtr pool G_GNUC_UNUSED, + virStorageVolDefPtr vol G_GNUC_UNUSED, + virAccessPermStorageVol perm G_GNUC_UNUS= ED) { return 1; /* Allow */ } diff --git a/src/access/viraccessdriverpolkit.c b/src/access/viraccessdrive= rpolkit.c index fbe7789ccd..496210fabe 100644 --- a/src/access/viraccessdriverpolkit.c +++ b/src/access/viraccessdriverpolkit.c @@ -47,7 +47,7 @@ struct _virAccessDriverPolkitPrivate { }; =20 =20 -static void virAccessDriverPolkitCleanup(virAccessManagerPtr manager ATTRI= BUTE_UNUSED) +static void virAccessDriverPolkitCleanup(virAccessManagerPtr manager G_GNU= C_UNUSED) { } =20 @@ -120,7 +120,7 @@ virAccessDriverPolkitGetCaller(const char *actionid, =20 =20 static int -virAccessDriverPolkitCheck(virAccessManagerPtr manager ATTRIBUTE_UNUSED, +virAccessDriverPolkitCheck(virAccessManagerPtr manager G_GNUC_UNUSED, const char *typename, const char *permname, const char **attrs) --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 10:00:01 2024 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=1571059027; cv=none; d=zoho.com; s=zohoarc; b=SO5eJij6qnhaUuxIsyhO1MGNURoR7+lvFhnP5b1LIblnCjbM3mekv8yUF2yRwtzJOt+DpInAIxgQ9YJKrhQkpdtHVcrfY79LajOLVukb1f6vPrecznON7aSTgEq2VcdzBfqtGrmfMastY4gqGGj7ArXKtk+NiuGHbOwUqJOupkA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571059027; 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=s9Fo5Eu0tfTt5A+Q3hFagK7ufKH2kITZ2sfj0FCwHm8=; b=WG3DihxCyAsT+6PQZQy5Nz39G14zLB0Dt18oz3/PWuarD6LYaoX6N/+2qEgFzXHtq9269iATQXw+1AEtsC/gHuc+RK77phgZBHy6Y372d1BAHiIFLO55EFt9MCYbQFb03dp93Hk6ACTF65M/BnjiQl/wk7tDAP0GmMI8ZqsPbwQ= 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 1571059027783425.49559163880815; Mon, 14 Oct 2019 06:17:07 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 02E53C054C52; Mon, 14 Oct 2019 13:17:06 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CD4ED5C541; Mon, 14 Oct 2019 13:17:05 +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 87D294EE75; Mon, 14 Oct 2019 13:17:05 +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 x9EDGKJC017374 for ; Mon, 14 Oct 2019 09:16:20 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8053B60127; Mon, 14 Oct 2019 13:16:20 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 089DC60126 for ; Mon, 14 Oct 2019 13:16:19 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Mon, 14 Oct 2019 15:15:26 +0200 Message-Id: <9ef4fc3528bc498f429c0be8786be7595115a96c.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 08/35] admin: 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.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Mon, 14 Oct 2019 13:17:06 +0000 (UTC) Use G_GNUC_UNUSED from GLib instead of ATTRIBUTE_UNUSED. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/admin/admin_remote.c | 4 +-- src/admin/admin_server_dispatch.c | 60 +++++++++++++++---------------- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/admin/admin_remote.c b/src/admin/admin_remote.c index 0846e72f6d..8e0752746c 100644 --- a/src/admin/admin_remote.c +++ b/src/admin/admin_remote.c @@ -76,7 +76,7 @@ make_nonnull_client(admin_nonnull_client *client_dst, } =20 static int -callFull(virAdmConnectPtr conn ATTRIBUTE_UNUSED, +callFull(virAdmConnectPtr conn G_GNUC_UNUSED, remoteAdminPrivPtr priv, int *fdin, size_t fdinlen, @@ -130,7 +130,7 @@ call(virAdmConnectPtr conn, #include "admin_client.h" =20 static void -remoteAdminClientCloseFunc(virNetClientPtr client ATTRIBUTE_UNUSED, +remoteAdminClientCloseFunc(virNetClientPtr client G_GNUC_UNUSED, int reason, void *opaque) { diff --git a/src/admin/admin_server_dispatch.c b/src/admin/admin_server_dis= patch.c index f07ae6df1d..4cc41428ed 100644 --- a/src/admin/admin_server_dispatch.c +++ b/src/admin/admin_server_dispatch.c @@ -60,7 +60,7 @@ remoteAdmClientFree(void *data) } =20 void * -remoteAdmClientNew(virNetServerClientPtr client ATTRIBUTE_UNUSED, +remoteAdmClientNew(virNetServerClientPtr client G_GNUC_UNUSED, void *opaque) { struct daemonAdmClientPrivate *priv; @@ -107,14 +107,14 @@ remoteAdmClientNew(virNetServerClientPtr client ATTRI= BUTE_UNUSED, } =20 void *remoteAdmClientNewPostExecRestart(virNetServerClientPtr client, - virJSONValuePtr object ATTRIBUTE_U= NUSED, + virJSONValuePtr object G_GNUC_UNUS= ED, void *opaque) { return remoteAdmClientNew(client, opaque); } =20 -virJSONValuePtr remoteAdmClientPreExecRestart(virNetServerClientPtr client= ATTRIBUTE_UNUSED, - void *data ATTRIBUTE_UNUSED) +virJSONValuePtr remoteAdmClientPreExecRestart(virNetServerClientPtr client= G_GNUC_UNUSED, + void *data G_GNUC_UNUSED) { virJSONValuePtr object =3D virJSONValueNewObject(); =20 @@ -162,9 +162,9 @@ make_nonnull_client(admin_nonnull_client *clt_dst, =20 /* Functions */ static int -adminDispatchConnectOpen(virNetServerPtr server ATTRIBUTE_UNUSED, +adminDispatchConnectOpen(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, struct admin_connect_open_args *args) { @@ -188,17 +188,17 @@ adminDispatchConnectOpen(virNetServerPtr server ATTRI= BUTE_UNUSED, } =20 static int -adminDispatchConnectClose(virNetServerPtr server ATTRIBUTE_UNUSED, +adminDispatchConnectClose(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, - virNetMessageErrorPtr rerr ATTRIBUTE_UNUSED) + virNetMessagePtr msg G_GNUC_UNUSED, + virNetMessageErrorPtr rerr G_GNUC_UNUSED) { virNetServerClientDelayedClose(client); return 0; } =20 static int -adminConnectGetLibVersion(virNetDaemonPtr dmn ATTRIBUTE_UNUSED, +adminConnectGetLibVersion(virNetDaemonPtr dmn G_GNUC_UNUSED, unsigned long long *libVer) { if (libVer) @@ -216,9 +216,9 @@ adminGetConn(virNetServerClientPtr client) } =20 static int -adminDispatchServerGetThreadpoolParameters(virNetServerPtr server ATTRIBUT= E_UNUSED, +adminDispatchServerGetThreadpoolParameters(virNetServerPtr server G_GNUC_U= NUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_= UNUSED, + virNetMessagePtr msg G_GNUC_UNU= SED, virNetMessageErrorPtr rerr, struct admin_server_get_threadp= ool_parameters_args *args, struct admin_server_get_threadp= ool_parameters_ret *ret) @@ -254,9 +254,9 @@ adminDispatchServerGetThreadpoolParameters(virNetServer= Ptr server ATTRIBUTE_UNUS } =20 static int -adminDispatchServerSetThreadpoolParameters(virNetServerPtr server ATTRIBUT= E_UNUSED, +adminDispatchServerSetThreadpoolParameters(virNetServerPtr server G_GNUC_U= NUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_= UNUSED, + virNetMessagePtr msg G_GNUC_UNU= SED, virNetMessageErrorPtr rerr, struct admin_server_set_threadp= ool_parameters_args *args) { @@ -297,9 +297,9 @@ adminDispatchServerSetThreadpoolParameters(virNetServer= Ptr server ATTRIBUTE_UNUS } =20 static int -adminDispatchClientGetInfo(virNetServerPtr server ATTRIBUTE_UNUSED, +adminDispatchClientGetInfo(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, struct admin_client_get_info_args *args, struct admin_client_get_info_ret *ret) @@ -349,10 +349,10 @@ adminDispatchClientGetInfo(virNetServerPtr server ATT= RIBUTE_UNUSED, } =20 static int -adminDispatchServerGetClientLimits(virNetServerPtr server ATTRIBUTE_UNUSED, +adminDispatchServerGetClientLimits(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, - virNetMessageErrorPtr rerr ATTRIBUTE_UN= USED, + virNetMessagePtr msg G_GNUC_UNUSED, + virNetMessageErrorPtr rerr G_GNUC_UNUSE= D, admin_server_get_client_limits_args *ar= gs, admin_server_get_client_limits_ret *ret) { @@ -386,10 +386,10 @@ adminDispatchServerGetClientLimits(virNetServerPtr se= rver ATTRIBUTE_UNUSED, } =20 static int -adminDispatchServerSetClientLimits(virNetServerPtr server ATTRIBUTE_UNUSED, +adminDispatchServerSetClientLimits(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, - virNetMessageErrorPtr rerr ATTRIBUTE_UN= USED, + virNetMessagePtr msg G_GNUC_UNUSED, + virNetMessageErrorPtr rerr G_GNUC_UNUSE= D, admin_server_set_client_limits_args *ar= gs) { int rv =3D -1; @@ -455,7 +455,7 @@ adminConnectGetLoggingFilters(char **filters, unsigned = int flags) } =20 static int -adminConnectSetLoggingOutputs(virNetDaemonPtr dmn ATTRIBUTE_UNUSED, +adminConnectSetLoggingOutputs(virNetDaemonPtr dmn G_GNUC_UNUSED, const char *outputs, unsigned int flags) { @@ -465,7 +465,7 @@ adminConnectSetLoggingOutputs(virNetDaemonPtr dmn ATTRI= BUTE_UNUSED, } =20 static int -adminConnectSetLoggingFilters(virNetDaemonPtr dmn ATTRIBUTE_UNUSED, +adminConnectSetLoggingFilters(virNetDaemonPtr dmn G_GNUC_UNUSED, const char *filters, unsigned int flags) { @@ -475,9 +475,9 @@ adminConnectSetLoggingFilters(virNetDaemonPtr dmn ATTRI= BUTE_UNUSED, } =20 static int -adminDispatchConnectGetLoggingOutputs(virNetServerPtr server ATTRIBUTE_UNU= SED, - virNetServerClientPtr client ATTRIBU= TE_UNUSED, - virNetMessagePtr msg ATTRIBUTE_UNUSE= D, +adminDispatchConnectGetLoggingOutputs(virNetServerPtr server G_GNUC_UNUSED, + virNetServerClientPtr client G_GNUC_= UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, admin_connect_get_logging_outputs_ar= gs *args, admin_connect_get_logging_outputs_re= t *ret) @@ -497,9 +497,9 @@ adminDispatchConnectGetLoggingOutputs(virNetServerPtr s= erver ATTRIBUTE_UNUSED, } =20 static int -adminDispatchConnectGetLoggingFilters(virNetServerPtr server ATTRIBUTE_UNU= SED, - virNetServerClientPtr client ATTRIBU= TE_UNUSED, - virNetMessagePtr msg ATTRIBUTE_UNUSE= D, +adminDispatchConnectGetLoggingFilters(virNetServerPtr server G_GNUC_UNUSED, + virNetServerClientPtr client G_GNUC_= UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, admin_connect_get_logging_filters_ar= gs *args, admin_connect_get_logging_filters_re= t *ret) --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 10:00:01 2024 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=1571059187; cv=none; d=zoho.com; s=zohoarc; b=bWkTTWqZSQo8A+0pIIlbrPC5/0CZ8EuVyosp8WQ5jCnRu1SYvMXkGqUoeE/BmSOuGbjEln0r/ch4hzs3yduKNZM70VRK19IRgAQ2ZjAHPr0CoCHRH9W90TC4ol6oQMRcaVGb2OQ0IWo6qa0r9zdCH4V7DsVhODuILpyPyiAqY5A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571059187; 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=dk8y/pgTL6Hv1MLd2DFkS6t11rLi1+FnJpkWfxQ2kzU=; b=gtcK1fdQkrBM3MzBFWwdwsL9LH3hcwnPjQBJL7pKKVMobzKqdoGNAwu/UR/oQ3x72zVvWHjQXq/fDsQ6EdcfOA6xZ90bQ8mqVdez2FXwvT4Fda7EsiVyDgnh3yO34AHNE8rNr2nFADyxc28lZ+8UobdYfSPFl/fqavsHyF7FC24= 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 1571059187635108.26906258398901; Mon, 14 Oct 2019 06:19:47 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0E3DBC04AC50; Mon, 14 Oct 2019 13:19:46 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id DA2B76017E; Mon, 14 Oct 2019 13:19:45 +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 9C21C6B4B7; Mon, 14 Oct 2019 13:19:45 +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 x9EDGLAh017379 for ; Mon, 14 Oct 2019 09:16:21 -0400 Received: by smtp.corp.redhat.com (Postfix) id 515F260127; Mon, 14 Oct 2019 13:16:21 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id CD52E60126 for ; Mon, 14 Oct 2019 13:16:20 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Mon, 14 Oct 2019 15:15:27 +0200 Message-Id: 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 09/35] bhyve: 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.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Mon, 14 Oct 2019 13:19:46 +0000 (UTC) Use G_GNUC_UNUSED from GLib instead of ATTRIBUTE_UNUSED. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/bhyve/bhyve_command.c | 6 +++--- src/bhyve/bhyve_device.c | 4 ++-- src/bhyve/bhyve_domain.c | 26 +++++++++++++------------- src/bhyve/bhyve_driver.c | 16 ++++++++-------- src/bhyve/bhyve_monitor.c | 2 +- src/bhyve/bhyve_parse_command.c | 8 ++++---- src/bhyve/bhyve_process.c | 2 +- 7 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c index 219e2b8d9e..912cf99683 100644 --- a/src/bhyve/bhyve_command.c +++ b/src/bhyve/bhyve_command.c @@ -286,7 +286,7 @@ bhyveBuildUSBControllerArgStr(const virDomainDef *def, } =20 static int -bhyveBuildVirtIODiskArgStr(const virDomainDef *def ATTRIBUTE_UNUSED, +bhyveBuildVirtIODiskArgStr(const virDomainDef *def G_GNUC_UNUSED, virDomainDiskDefPtr disk, virCommandPtr cmd) { @@ -319,7 +319,7 @@ bhyveBuildVirtIODiskArgStr(const virDomainDef *def ATTR= IBUTE_UNUSED, } =20 static int -bhyveBuildLPCArgStr(const virDomainDef *def ATTRIBUTE_UNUSED, +bhyveBuildLPCArgStr(const virDomainDef *def G_GNUC_UNUSED, virCommandPtr cmd) { virCommandAddArgList(cmd, "-s", "1,lpc", NULL); @@ -643,7 +643,7 @@ virBhyveProcessBuildBhyveCmd(virConnectPtr conn, } =20 virCommandPtr -virBhyveProcessBuildDestroyCmd(bhyveConnPtr driver ATTRIBUTE_UNUSED, +virBhyveProcessBuildDestroyCmd(bhyveConnPtr driver G_GNUC_UNUSED, virDomainDefPtr def) { virCommandPtr cmd =3D virCommandNew(BHYVECTL); diff --git a/src/bhyve/bhyve_device.c b/src/bhyve/bhyve_device.c index 201044d9e6..4913be8422 100644 --- a/src/bhyve/bhyve_device.c +++ b/src/bhyve/bhyve_device.c @@ -31,8 +31,8 @@ VIR_LOG_INIT("bhyve.bhyve_device"); =20 static int -bhyveCollectPCIAddress(virDomainDefPtr def ATTRIBUTE_UNUSED, - virDomainDeviceDefPtr device ATTRIBUTE_UNUSED, +bhyveCollectPCIAddress(virDomainDefPtr def G_GNUC_UNUSED, + virDomainDeviceDefPtr device G_GNUC_UNUSED, virDomainDeviceInfoPtr info, void *opaque) { diff --git a/src/bhyve/bhyve_domain.c b/src/bhyve/bhyve_domain.c index ed281d7c68..bc506bad66 100644 --- a/src/bhyve/bhyve_domain.c +++ b/src/bhyve/bhyve_domain.c @@ -32,7 +32,7 @@ VIR_LOG_INIT("bhyve.bhyve_domain"); =20 static void * -bhyveDomainObjPrivateAlloc(void *opaque ATTRIBUTE_UNUSED) +bhyveDomainObjPrivateAlloc(void *opaque G_GNUC_UNUSED) { bhyveDomainObjPrivatePtr priv; =20 @@ -74,10 +74,10 @@ bhyveDomainDefNeedsISAController(virDomainDefPtr def) =20 static int bhyveDomainDefPostParse(virDomainDefPtr def, - virCapsPtr caps ATTRIBUTE_UNUSED, - unsigned int parseFlags ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED, - void *parseOpaque ATTRIBUTE_UNUSED) + virCapsPtr caps G_GNUC_UNUSED, + unsigned int parseFlags G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED, + void *parseOpaque G_GNUC_UNUSED) { /* Add an implicit PCI root controller */ if (virDomainDefMaybeAddController(def, VIR_DOMAIN_CONTROLLER_TYPE_PCI= , 0, @@ -90,7 +90,7 @@ bhyveDomainDefPostParse(virDomainDefPtr def, static int bhyveDomainDiskDefAssignAddress(bhyveConnPtr driver, virDomainDiskDefPtr def, - const virDomainDef *vmdef ATTRIBUTE_UNUSED) + const virDomainDef *vmdef G_GNUC_UNUSED) { int idx =3D virDiskNameToIndex(def->dst); =20 @@ -122,10 +122,10 @@ bhyveDomainDiskDefAssignAddress(bhyveConnPtr driver, static int bhyveDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, const virDomainDef *def, - virCapsPtr caps ATTRIBUTE_UNUSED, - unsigned int parseFlags ATTRIBUTE_UNUSED, + virCapsPtr caps G_GNUC_UNUSED, + unsigned int parseFlags G_GNUC_UNUSED, void *opaque, - void *parseOpaque ATTRIBUTE_UNUSED) + void *parseOpaque G_GNUC_UNUSED) { bhyveConnPtr driver =3D opaque; =20 @@ -156,10 +156,10 @@ bhyveDomainDeviceDefPostParse(virDomainDeviceDefPtr d= ev, =20 static int bhyveDomainDefAssignAddresses(virDomainDef *def, - virCapsPtr caps ATTRIBUTE_UNUSED, - unsigned int parseFlags ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED, - void *parseOpaque ATTRIBUTE_UNUSED) + virCapsPtr caps G_GNUC_UNUSED, + unsigned int parseFlags G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED, + void *parseOpaque G_GNUC_UNUSED) { if (bhyveDomainAssignAddresses(def, NULL) < 0) return -1; diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index fb0996bd2a..52e1895052 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -191,8 +191,8 @@ bhyveConnectURIProbe(char **uri) =20 static virDrvOpenStatus bhyveConnectOpen(virConnectPtr conn, - virConnectAuthPtr auth ATTRIBUTE_UNUSED, - virConfPtr conf ATTRIBUTE_UNUSED, + virConnectAuthPtr auth G_GNUC_UNUSED, + virConfPtr conf G_GNUC_UNUSED, unsigned int flags) { virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); @@ -1049,7 +1049,7 @@ bhyveDomainShutdown(virDomainPtr dom) =20 static int bhyveDomainOpenConsole(virDomainPtr dom, - const char *dev_name ATTRIBUTE_UNUSED, + const char *dev_name G_GNUC_UNUSED, virStreamPtr st, unsigned int flags) { @@ -1215,8 +1215,8 @@ bhyveStateCleanup(void) =20 static int bhyveStateInitialize(bool privileged, - virStateInhibitCallback callback ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) + virStateInhibitCallback callback G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED) { bool autostart =3D true; =20 @@ -1550,20 +1550,20 @@ bhyveConnectGetType(virConnectPtr conn) return "BHYVE"; } =20 -static int bhyveConnectIsAlive(virConnectPtr conn ATTRIBUTE_UNUSED) +static int bhyveConnectIsAlive(virConnectPtr conn G_GNUC_UNUSED) { return 1; } =20 static int -bhyveConnectIsSecure(virConnectPtr conn ATTRIBUTE_UNUSED) +bhyveConnectIsSecure(virConnectPtr conn G_GNUC_UNUSED) { /* Trivially secure, since always inside the daemon */ return 1; } =20 static int -bhyveConnectIsEncrypted(virConnectPtr conn ATTRIBUTE_UNUSED) +bhyveConnectIsEncrypted(virConnectPtr conn G_GNUC_UNUSED) { /* Not encrypted, but remote driver takes care of that */ return 0; diff --git a/src/bhyve/bhyve_monitor.c b/src/bhyve/bhyve_monitor.c index faf1ebe5f5..ad6977e562 100644 --- a/src/bhyve/bhyve_monitor.c +++ b/src/bhyve/bhyve_monitor.c @@ -44,7 +44,7 @@ struct _bhyveMonitor { }; =20 static void -bhyveMonitorIO(int watch, int kq, int events ATTRIBUTE_UNUSED, void *opaqu= e) +bhyveMonitorIO(int watch, int kq, int events G_GNUC_UNUSED, void *opaque) { const struct timespec zerowait =3D { 0, 0 }; virDomainObjPtr vm =3D opaque; diff --git a/src/bhyve/bhyve_parse_command.c b/src/bhyve/bhyve_parse_comman= d.c index c9800b7a06..7c72651b00 100644 --- a/src/bhyve/bhyve_parse_command.c +++ b/src/bhyve/bhyve_parse_command.c @@ -263,7 +263,7 @@ bhyveCommandLineToArgv(const char *nativeConfig, =20 static int bhyveParseBhyveLPCArg(virDomainDefPtr def, - unsigned caps ATTRIBUTE_UNUSED, + unsigned caps G_GNUC_UNUSED, const char *arg) { /* -l emulation[,config] */ @@ -414,7 +414,7 @@ bhyveParsePCISlot(const char *slotdef, =20 static int bhyveParsePCIDisk(virDomainDefPtr def, - unsigned caps ATTRIBUTE_UNUSED, + unsigned caps G_GNUC_UNUSED, unsigned pcislot, unsigned pcibus, unsigned function, @@ -487,7 +487,7 @@ bhyveParsePCIDisk(virDomainDefPtr def, static int bhyveParsePCINet(virDomainDefPtr def, virDomainXMLOptionPtr xmlopt, - unsigned caps ATTRIBUTE_UNUSED, + unsigned caps G_GNUC_UNUSED, unsigned pcislot, unsigned pcibus, unsigned function, @@ -843,7 +843,7 @@ bhyveParseBhyveLoadCommandLine(virDomainDefPtr def, =20 static int bhyveParseCustomLoaderCommandLine(virDomainDefPtr def, - int argc ATTRIBUTE_UNUSED, + int argc G_GNUC_UNUSED, char **argv) { if (!argv) diff --git a/src/bhyve/bhyve_process.c b/src/bhyve/bhyve_process.c index 5fea2eb51c..5193f6e612 100644 --- a/src/bhyve/bhyve_process.c +++ b/src/bhyve/bhyve_process.c @@ -55,7 +55,7 @@ VIR_LOG_INIT("bhyve.bhyve_process"); =20 static void bhyveProcessAutoDestroy(virDomainObjPtr vm, - virConnectPtr conn ATTRIBUTE_UNUSED, + virConnectPtr conn G_GNUC_UNUSED, void *opaque) { bhyveConnPtr driver =3D opaque; --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 10:00:01 2024 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=1571059011; cv=none; d=zoho.com; s=zohoarc; b=YeGs50dtmskkiohqujTNJEJttEzoKqwGgQCTv85y3VpRTOxbOQkAhVek1X/YTNeCQtKVx4iGNltx+UAgzz3ZkPSkZZ5xvM4oriRrGTDA+jQdoP1+0glOUPD6GSuIOlGA5SBZejQoADg5FwXquW5lCuLKxA5a+d4mj7AiUNH9A9U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571059011; 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=55BvGUcrWsDbIqi9th2Ku+aVTMP6scIn0QlO8Tg0tnU=; b=QhVPvf+WOExv+QOwg+Cb4lWM0VWhMokz2/LFui5pkPK3HeOpWLvJuFki3IOx+Xr8X52XwGXPig70iGTvbOPz756p0PlDQwCSMk0H8M1MgnDpwcp9l3OpJcpqnHfSFM6ZvUHM7AUgkpN+i0KFV4KdQU3ckDFnhqTQhhuGU3thDP8= 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 1571059011893840.124951154568; Mon, 14 Oct 2019 06:16:51 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BD7FB18CB8FB; Mon, 14 Oct 2019 13:16:49 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 996AA5C231; Mon, 14 Oct 2019 13:16:49 +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 54AE54EE69; Mon, 14 Oct 2019 13:16:49 +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 x9EDGMJw017385 for ; Mon, 14 Oct 2019 09:16:22 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3F3BC63B8E; Mon, 14 Oct 2019 13:16:22 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id A058360126 for ; Mon, 14 Oct 2019 13:16:21 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Mon, 14 Oct 2019 15:15:28 +0200 Message-Id: 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 10/35] conf: 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.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.63]); Mon, 14 Oct 2019 13:16:50 +0000 (UTC) Use G_GNUC_UNUSED from GLib instead of ATTRIBUTE_UNUSED. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/conf/capabilities.c | 6 +- src/conf/domain_addr.c | 22 ++++---- src/conf/domain_audit.c | 2 +- src/conf/domain_capabilities.c | 2 +- src/conf/domain_conf.c | 28 +++++----- src/conf/domain_event.c | 2 +- src/conf/network_conf.c | 80 +++++++++++++-------------- src/conf/node_device_conf.c | 10 ++-- src/conf/nwfilter_conf.c | 50 ++++++++--------- src/conf/nwfilter_params.c | 2 +- src/conf/object_event.c | 2 +- src/conf/virchrdev.c | 10 ++-- src/conf/virdomaincheckpointobjlist.c | 2 +- src/conf/virdomainmomentobjlist.c | 6 +- src/conf/virdomainobjlist.c | 12 ++-- src/conf/virinterfaceobj.c | 10 ++-- src/conf/virnetworkobj.c | 18 +++--- src/conf/virnodedeviceobj.c | 16 +++--- src/conf/virnwfilterbindingobjlist.c | 4 +- src/conf/virsecretobj.c | 8 +-- src/conf/virstorageobj.c | 22 ++++---- 21 files changed, 157 insertions(+), 157 deletions(-) diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index 7419d9cfc8..1781c1df0a 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -1485,8 +1485,8 @@ virCapabilitiesGetNodeInfo(virNodeInfoPtr nodeinfo) =20 /* returns 1 on success, 0 if the detection failed and -1 on hard error */ static int -virCapabilitiesFillCPUInfo(int cpu_id ATTRIBUTE_UNUSED, - virCapsHostNUMACellCPUPtr cpu ATTRIBUTE_UNUSED) +virCapabilitiesFillCPUInfo(int cpu_id G_GNUC_UNUSED, + virCapsHostNUMACellCPUPtr cpu G_GNUC_UNUSED) { #ifdef __linux__ cpu->id =3D cpu_id; @@ -1592,7 +1592,7 @@ virCapabilitiesInitNUMAFake(virCapsPtr caps) int ncpus; int s, c, t; int id, cid; - int onlinecpus ATTRIBUTE_UNUSED; + int onlinecpus G_GNUC_UNUSED; bool tmp; =20 if (virCapabilitiesGetNodeInfo(&nodeinfo) < 0) diff --git a/src/conf/domain_addr.c b/src/conf/domain_addr.c index 4e02c43375..fc612ee6a2 100644 --- a/src/conf/domain_addr.c +++ b/src/conf/domain_addr.c @@ -1301,8 +1301,8 @@ virDomainPCIAddressReserveNextAddr(virDomainPCIAddres= sSetPtr addrs, =20 =20 static int -virDomainPCIAddressSetMultiIter(virDomainDefPtr def ATTRIBUTE_UNUSED, - virDomainDeviceDefPtr dev ATTRIBUTE_UNUSED, +virDomainPCIAddressSetMultiIter(virDomainDefPtr def G_GNUC_UNUSED, + virDomainDeviceDefPtr dev G_GNUC_UNUSED, virDomainDeviceInfoPtr info, void *data) { @@ -1335,9 +1335,9 @@ virDomainPCIAddressSetMultiIter(virDomainDefPtr def A= TTRIBUTE_UNUSED, =20 static int virDomainPCIAddressSetAllMultiIter(virDomainDefPtr def, - virDomainDeviceDefPtr dev ATTRIBUTE_UNU= SED, + virDomainDeviceDefPtr dev G_GNUC_UNUSED, virDomainDeviceInfoPtr info, - void *data ATTRIBUTE_UNUSED) + void *data G_GNUC_UNUSED) { virPCIDeviceAddressPtr testAddr; =20 @@ -1463,8 +1463,8 @@ virDomainCCWAddressAssign(virDomainDeviceInfoPtr dev, } =20 static int ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4) -virDomainCCWAddressAllocate(virDomainDefPtr def ATTRIBUTE_UNUSED, - virDomainDeviceDefPtr dev ATTRIBUTE_UNUSED, +virDomainCCWAddressAllocate(virDomainDefPtr def G_GNUC_UNUSED, + virDomainDeviceDefPtr dev G_GNUC_UNUSED, virDomainDeviceInfoPtr info, void *data) { @@ -1472,8 +1472,8 @@ virDomainCCWAddressAllocate(virDomainDefPtr def ATTRI= BUTE_UNUSED, } =20 static int ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4) -virDomainCCWAddressValidate(virDomainDefPtr def ATTRIBUTE_UNUSED, - virDomainDeviceDefPtr dev ATTRIBUTE_UNUSED, +virDomainCCWAddressValidate(virDomainDefPtr def G_GNUC_UNUSED, + virDomainDeviceDefPtr dev G_GNUC_UNUSED, virDomainDeviceInfoPtr info, void *data) { @@ -1682,8 +1682,8 @@ virDomainVirtioSerialAddrSetFree(virDomainVirtioSeria= lAddrSetPtr addrs) * opaque should be the address set */ static int ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4) -virDomainVirtioSerialAddrReserve(virDomainDefPtr def ATTRIBUTE_UNUSED, - virDomainDeviceDefPtr dev ATTRIBUTE_UNUSE= D, +virDomainVirtioSerialAddrReserve(virDomainDefPtr def G_GNUC_UNUSED, + virDomainDeviceDefPtr dev G_GNUC_UNUSED, virDomainDeviceInfoPtr info, void *data) { @@ -2422,7 +2422,7 @@ virDomainUSBAddressAssign(virDomainUSBAddressSetPtr a= ddrs, =20 int virDomainUSBAddressPresent(virDomainDeviceInfoPtr info, - void *data ATTRIBUTE_UNUSED) + void *data G_GNUC_UNUSED) { if (info->type =3D=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_USB && virDomainUSBAddressPortIsValid(info->addr.usb.port)) diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c index cc5a55a635..e455661e4f 100644 --- a/src/conf/domain_audit.c +++ b/src/conf/domain_audit.c @@ -59,7 +59,7 @@ virDomainAuditGetRdev(const char *path) } #else static char * -virDomainAuditGetRdev(const char *path ATTRIBUTE_UNUSED) +virDomainAuditGetRdev(const char *path G_GNUC_UNUSED) { return NULL; } diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c index fe93388cce..b0fdd15d6c 100644 --- a/src/conf/domain_capabilities.c +++ b/src/conf/domain_capabilities.c @@ -690,7 +690,7 @@ virDomainCapsDeviceRNGDefValidate(virDomainCapsPtr cons= t caps, int virDomainCapsDeviceDefValidate(virDomainCapsPtr const caps, const virDomainDeviceDef *dev, - const virDomainDef *def ATTRIBUTE_UNUSED) + const virDomainDef *def G_GNUC_UNUSED) { int ret =3D 0; =20 diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 35a51f1793..6bd2d4935d 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -4073,8 +4073,8 @@ virDomainDeviceSetData(virDomainDeviceDefPtr device, =20 =20 static int -virDomainDefHasDeviceAddressIterator(virDomainDefPtr def ATTRIBUTE_UNUSED, - virDomainDeviceDefPtr dev ATTRIBUTE_U= NUSED, +virDomainDefHasDeviceAddressIterator(virDomainDefPtr def G_GNUC_UNUSED, + virDomainDeviceDefPtr dev G_GNUC_UNUS= ED, virDomainDeviceInfoPtr info, void *opaque) { @@ -5191,8 +5191,8 @@ virDomainVsockDefPostParse(virDomainVsockDefPtr vsock) static int virDomainDeviceDefPostParseCommon(virDomainDeviceDefPtr dev, const virDomainDef *def, - virCapsPtr caps ATTRIBUTE_UNUSED, - unsigned int parseFlags ATTRIBUTE_UNUSED, + virCapsPtr caps G_GNUC_UNUSED, + unsigned int parseFlags G_GNUC_UNUSED, virDomainXMLOptionPtr xmlopt) { int ret =3D -1; @@ -5509,7 +5509,7 @@ struct virDomainDefPostParseDeviceIteratorData { static int virDomainDefPostParseDeviceIterator(virDomainDefPtr def, virDomainDeviceDefPtr dev, - virDomainDeviceInfoPtr info ATTRIBUTE_= UNUSED, + virDomainDeviceInfoPtr info G_GNUC_UNU= SED, void *opaque) { struct virDomainDefPostParseDeviceIteratorData *data =3D opaque; @@ -5579,8 +5579,8 @@ virDomainDefPostParseCPU(virDomainDefPtr def) =20 =20 static int -virDomainDefCollectBootOrder(virDomainDefPtr def ATTRIBUTE_UNUSED, - virDomainDeviceDefPtr dev ATTRIBUTE_UNUSED, +virDomainDefCollectBootOrder(virDomainDefPtr def G_GNUC_UNUSED, + virDomainDeviceDefPtr dev G_GNUC_UNUSED, virDomainDeviceInfoPtr info, void *data) { @@ -6612,7 +6612,7 @@ virDomainDeviceDefValidate(const virDomainDeviceDef *= dev, static int virDomainDefValidateDeviceIterator(virDomainDefPtr def, virDomainDeviceDefPtr dev, - virDomainDeviceInfoPtr info ATTRIBUTE_U= NUSED, + virDomainDeviceInfoPtr info G_GNUC_UNUS= ED, void *opaque) { struct virDomainDefPostParseDeviceIteratorData *data =3D opaque; @@ -7461,7 +7461,7 @@ virDomainDeviceAliasIsUserAlias(const char *aliasStr) * @param node XML nodeset to parse for device address definition */ static int -virDomainDeviceInfoParseXML(virDomainXMLOptionPtr xmlopt ATTRIBUTE_UNUSED, +virDomainDeviceInfoParseXML(virDomainXMLOptionPtr xmlopt G_GNUC_UNUSED, xmlNodePtr node, virDomainDeviceInfoPtr info, unsigned int flags) @@ -8506,7 +8506,7 @@ virDomainNetDefCoalesceFormatXML(virBufferPtr buf, =20 =20 static int -virDomainHostdevDefParseXMLCaps(xmlNodePtr node ATTRIBUTE_UNUSED, +virDomainHostdevDefParseXMLCaps(xmlNodePtr node G_GNUC_UNUSED, xmlXPathContextPtr ctxt, const char *type, virDomainHostdevDefPtr def) @@ -29065,8 +29065,8 @@ struct _virDomainCompatibleDeviceData { }; =20 static int -virDomainDeviceInfoCheckBootIndex(virDomainDefPtr def ATTRIBUTE_UNUSED, - virDomainDeviceDefPtr device ATTRIBUTE_U= NUSED, +virDomainDeviceInfoCheckBootIndex(virDomainDefPtr def G_GNUC_UNUSED, + virDomainDeviceDefPtr device G_GNUC_UNUS= ED, virDomainDeviceInfoPtr info, void *opaque) { @@ -30114,7 +30114,7 @@ typedef struct { } virDomainDefFindDeviceCallbackData; =20 static int -virDomainDefFindDeviceCallback(virDomainDefPtr def ATTRIBUTE_UNUSED, +virDomainDefFindDeviceCallback(virDomainDefPtr def G_GNUC_UNUSED, virDomainDeviceDefPtr dev, virDomainDeviceInfoPtr info, void *opaque) @@ -31034,7 +31034,7 @@ virDomainNetNotifyActualDevice(virConnectPtr conn, =20 int virDomainNetReleaseActualDevice(virConnectPtr conn, - virDomainDefPtr dom ATTRIBUTE_UNUSED, + virDomainDefPtr dom G_GNUC_UNUSED, virDomainNetDefPtr iface) { virNetworkPtr net =3D NULL; diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c index 40031a46c8..c0dcf8f716 100644 --- a/src/conf/domain_event.c +++ b/src/conf/domain_event.c @@ -2227,7 +2227,7 @@ virDomainEventStateDeregister(virConnectPtr conn, * event should be dispatched. */ static bool -virDomainQemuMonitorEventFilter(virConnectPtr conn ATTRIBUTE_UNUSED, +virDomainQemuMonitorEventFilter(virConnectPtr conn G_GNUC_UNUSED, virObjectEventPtr event, void *opaque) { diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index beeb760e2d..58a0e32dd7 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -76,7 +76,7 @@ VIR_ENUM_IMPL(virNetworkTaint, static virClassPtr virNetworkXMLOptionClass; =20 static void -virNetworkXMLOptionDispose(void *obj ATTRIBUTE_UNUSED) +virNetworkXMLOptionDispose(void *obj G_GNUC_UNUSED) { return; } @@ -2418,7 +2418,7 @@ virNetworkForwardNatDefFormat(virBufferPtr buf, int virNetworkDefFormatBuf(virBufferPtr buf, const virNetworkDef *def, - virNetworkXMLOptionPtr xmlopt ATTRIBUTE_UNUSED, + virNetworkXMLOptionPtr xmlopt G_GNUC_UNUSED, unsigned int flags) { const unsigned char *uuid; @@ -2812,11 +2812,11 @@ virNetworkDefUpdateCheckElementName(virNetworkDefPt= r def, =20 static int virNetworkDefUpdateBridge(virNetworkDefPtr def, - unsigned int command ATTRIBUTE_UNUSED, - int parentIndex ATTRIBUTE_UNUSED, - xmlXPathContextPtr ctxt ATTRIBUTE_UNUSED, + unsigned int command G_GNUC_UNUSED, + int parentIndex G_GNUC_UNUSED, + xmlXPathContextPtr ctxt G_GNUC_UNUSED, /* virNetworkUpdateFlags */ - unsigned int fflags ATTRIBUTE_UNUSED) + unsigned int fflags G_GNUC_UNUSED) { virNetworkDefUpdateNoSupport(def, "bridge"); return -1; @@ -2825,11 +2825,11 @@ virNetworkDefUpdateBridge(virNetworkDefPtr def, =20 static int virNetworkDefUpdateDomain(virNetworkDefPtr def, - unsigned int command ATTRIBUTE_UNUSED, - int parentIndex ATTRIBUTE_UNUSED, - xmlXPathContextPtr ctxt ATTRIBUTE_UNUSED, + unsigned int command G_GNUC_UNUSED, + int parentIndex G_GNUC_UNUSED, + xmlXPathContextPtr ctxt G_GNUC_UNUSED, /* virNetworkUpdateFlags */ - unsigned int fflags ATTRIBUTE_UNUSED) + unsigned int fflags G_GNUC_UNUSED) { virNetworkDefUpdateNoSupport(def, "domain"); return -1; @@ -2838,11 +2838,11 @@ virNetworkDefUpdateDomain(virNetworkDefPtr def, =20 static int virNetworkDefUpdateIP(virNetworkDefPtr def, - unsigned int command ATTRIBUTE_UNUSED, - int parentIndex ATTRIBUTE_UNUSED, - xmlXPathContextPtr ctxt ATTRIBUTE_UNUSED, + unsigned int command G_GNUC_UNUSED, + int parentIndex G_GNUC_UNUSED, + xmlXPathContextPtr ctxt G_GNUC_UNUSED, /* virNetworkUpdateFlags */ - unsigned int fflags ATTRIBUTE_UNUSED) + unsigned int fflags G_GNUC_UNUSED) { virNetworkDefUpdateNoSupport(def, "ip"); return -1; @@ -2919,7 +2919,7 @@ virNetworkDefUpdateIPDHCPHost(virNetworkDefPtr def, int parentIndex, xmlXPathContextPtr ctxt, /* virNetworkUpdateFlags */ - unsigned int fflags ATTRIBUTE_UNUSED) + unsigned int fflags G_GNUC_UNUSED) { size_t i; int ret =3D -1; @@ -3059,7 +3059,7 @@ virNetworkDefUpdateIPDHCPRange(virNetworkDefPtr def, int parentIndex, xmlXPathContextPtr ctxt, /* virNetworkUpdateFlags */ - unsigned int fflags ATTRIBUTE_UNUSED) + unsigned int fflags G_GNUC_UNUSED) { size_t i; int ret =3D -1; @@ -3157,11 +3157,11 @@ virNetworkDefUpdateIPDHCPRange(virNetworkDefPtr def, =20 static int virNetworkDefUpdateForward(virNetworkDefPtr def, - unsigned int command ATTRIBUTE_UNUSED, - int parentIndex ATTRIBUTE_UNUSED, - xmlXPathContextPtr ctxt ATTRIBUTE_UNUSED, + unsigned int command G_GNUC_UNUSED, + int parentIndex G_GNUC_UNUSED, + xmlXPathContextPtr ctxt G_GNUC_UNUSED, /* virNetworkUpdateFlags */ - unsigned int fflags ATTRIBUTE_UNUSED) + unsigned int fflags G_GNUC_UNUSED) { virNetworkDefUpdateNoSupport(def, "forward"); return -1; @@ -3171,10 +3171,10 @@ virNetworkDefUpdateForward(virNetworkDefPtr def, static int virNetworkDefUpdateForwardInterface(virNetworkDefPtr def, unsigned int command, - int parentIndex ATTRIBUTE_UNUSED, + int parentIndex G_GNUC_UNUSED, xmlXPathContextPtr ctxt, /* virNetworkUpdateFlags */ - unsigned int fflags ATTRIBUTE_UNUSED) + unsigned int fflags G_GNUC_UNUSED) { size_t i; int ret =3D -1; @@ -3265,11 +3265,11 @@ virNetworkDefUpdateForwardInterface(virNetworkDefPt= r def, =20 static int virNetworkDefUpdateForwardPF(virNetworkDefPtr def, - unsigned int command ATTRIBUTE_UNUSED, - int parentIndex ATTRIBUTE_UNUSED, - xmlXPathContextPtr ctxt ATTRIBUTE_UNUSED, + unsigned int command G_GNUC_UNUSED, + int parentIndex G_GNUC_UNUSED, + xmlXPathContextPtr ctxt G_GNUC_UNUSED, /* virNetworkUpdateFlags */ - unsigned int fflags ATTRIBUTE_UNUSED) + unsigned int fflags G_GNUC_UNUSED) { virNetworkDefUpdateNoSupport(def, "forward pf"); return -1; @@ -3279,10 +3279,10 @@ virNetworkDefUpdateForwardPF(virNetworkDefPtr def, static int virNetworkDefUpdatePortGroup(virNetworkDefPtr def, unsigned int command, - int parentIndex ATTRIBUTE_UNUSED, + int parentIndex G_GNUC_UNUSED, xmlXPathContextPtr ctxt, /* virNetworkUpdateFlags */ - unsigned int fflags ATTRIBUTE_UNUSED) + unsigned int fflags G_GNUC_UNUSED) { size_t i; int foundName =3D -1, foundDefault =3D -1; @@ -3373,11 +3373,11 @@ virNetworkDefUpdatePortGroup(virNetworkDefPtr def, =20 static int virNetworkDefUpdateDNSHost(virNetworkDefPtr def, - unsigned int command ATTRIBUTE_UNUSED, - int parentIndex ATTRIBUTE_UNUSED, - xmlXPathContextPtr ctxt ATTRIBUTE_UNUSED, + unsigned int command G_GNUC_UNUSED, + int parentIndex G_GNUC_UNUSED, + xmlXPathContextPtr ctxt G_GNUC_UNUSED, /* virNetworkUpdateFlags */ - unsigned int fflags ATTRIBUTE_UNUSED) + unsigned int fflags G_GNUC_UNUSED) { size_t i, j, k; int foundIdx =3D -1, ret =3D -1; @@ -3468,11 +3468,11 @@ virNetworkDefUpdateDNSHost(virNetworkDefPtr def, =20 static int virNetworkDefUpdateDNSSrv(virNetworkDefPtr def, - unsigned int command ATTRIBUTE_UNUSED, - int parentIndex ATTRIBUTE_UNUSED, - xmlXPathContextPtr ctxt ATTRIBUTE_UNUSED, + unsigned int command G_GNUC_UNUSED, + int parentIndex G_GNUC_UNUSED, + xmlXPathContextPtr ctxt G_GNUC_UNUSED, /* virNetworkUpdateFlags */ - unsigned int fflags ATTRIBUTE_UNUSED) + unsigned int fflags G_GNUC_UNUSED) { size_t i; int foundIdx =3D -1, ret =3D -1; @@ -3555,11 +3555,11 @@ virNetworkDefUpdateDNSSrv(virNetworkDefPtr def, =20 static int virNetworkDefUpdateDNSTxt(virNetworkDefPtr def, - unsigned int command ATTRIBUTE_UNUSED, - int parentIndex ATTRIBUTE_UNUSED, - xmlXPathContextPtr ctxt ATTRIBUTE_UNUSED, + unsigned int command G_GNUC_UNUSED, + int parentIndex G_GNUC_UNUSED, + xmlXPathContextPtr ctxt G_GNUC_UNUSED, /* virNetworkUpdateFlags */ - unsigned int fflags ATTRIBUTE_UNUSED) + unsigned int fflags G_GNUC_UNUSED) { int foundIdx, ret =3D -1; virNetworkDNSDefPtr dns =3D &def->dns; diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 84fcbd3e78..3aba04c54c 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -2619,21 +2619,21 @@ virNodeDeviceGetPCIDynamicCaps(const char *sysfsPat= h, #else =20 int -virNodeDeviceGetSCSIHostCaps(virNodeDevCapSCSIHostPtr scsi_host ATTRIBUTE_= UNUSED) +virNodeDeviceGetSCSIHostCaps(virNodeDevCapSCSIHostPtr scsi_host G_GNUC_UNU= SED) { return -1; } =20 int -virNodeDeviceGetPCIDynamicCaps(const char *sysfsPath ATTRIBUTE_UNUSED, - virNodeDevCapPCIDevPtr pci_dev ATTRIBUTE_UN= USED) +virNodeDeviceGetPCIDynamicCaps(const char *sysfsPath G_GNUC_UNUSED, + virNodeDevCapPCIDevPtr pci_dev G_GNUC_UNUSE= D) { return -1; } =20 =20 -int virNodeDeviceGetSCSITargetCaps(const char *sysfsPath ATTRIBUTE_UNUSED, - virNodeDevCapSCSITargetPtr scsi_target = ATTRIBUTE_UNUSED) +int virNodeDeviceGetSCSITargetCaps(const char *sysfsPath G_GNUC_UNUSED, + virNodeDevCapSCSITargetPtr scsi_target = G_GNUC_UNUSED) { return -1; } diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index d21eebf19d..6b7a606b64 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -448,8 +448,8 @@ static const struct int_map macProtoMap[] =3D { static bool checkMacProtocolID(enum attrDatatype datatype, union data *value, - virNWFilterRuleDefPtr nwf ATTRIBUTE_UNUSED, - nwItemDesc *item ATTRIBUTE_UNUSED) + virNWFilterRuleDefPtr nwf G_GNUC_UNUSED, + nwItemDesc *item G_GNUC_UNUSED) { int32_t res =3D -1; =20 @@ -477,7 +477,7 @@ checkMacProtocolID(enum attrDatatype datatype, static bool macProtocolIDFormatter(virBufferPtr buf, virNWFilterRuleDefPtr nwf, - nwItemDesc *item ATTRIBUTE_UNUSED) + nwItemDesc *item G_GNUC_UNUSED) { const char *str =3D NULL; bool asHex =3D true; @@ -500,7 +500,7 @@ static bool checkVlanVlanID(enum attrDatatype datatype, union data *value, virNWFilterRuleDefPtr nwf, - nwItemDesc *item ATTRIBUTE_UNUSED) + nwItemDesc *item G_GNUC_UNUSED) { int32_t res; =20 @@ -522,7 +522,7 @@ static bool checkVlanProtocolID(enum attrDatatype datatype, union data *value, virNWFilterRuleDefPtr nwf, - nwItemDesc *item ATTRIBUTE_UNUSED) + nwItemDesc *item G_GNUC_UNUSED) { int32_t res =3D -1; =20 @@ -550,7 +550,7 @@ checkVlanProtocolID(enum attrDatatype datatype, static bool vlanProtocolIDFormatter(virBufferPtr buf, virNWFilterRuleDefPtr nwf, - nwItemDesc *item ATTRIBUTE_UNUSED) + nwItemDesc *item G_GNUC_UNUSED) { const char *str =3D NULL; bool asHex =3D true; @@ -600,10 +600,10 @@ checkValidMask(unsigned char *data, =20 =20 static bool -checkMACMask(enum attrDatatype datatype ATTRIBUTE_UNUSED, +checkMACMask(enum attrDatatype datatype G_GNUC_UNUSED, union data *macMask, - virNWFilterRuleDefPtr nwf ATTRIBUTE_UNUSED, - nwItemDesc *item ATTRIBUTE_UNUSED) + virNWFilterRuleDefPtr nwf G_GNUC_UNUSED, + nwItemDesc *item G_GNUC_UNUSED) { return checkValidMask(macMask->uc, 6); } @@ -630,7 +630,7 @@ static bool arpOpcodeValidator(enum attrDatatype datatype, union data *value, virNWFilterRuleDefPtr nwf, - nwItemDesc *item ATTRIBUTE_UNUSED) + nwItemDesc *item G_GNUC_UNUSED) { int32_t res =3D -1; =20 @@ -655,7 +655,7 @@ arpOpcodeValidator(enum attrDatatype datatype, static bool arpOpcodeFormatter(virBufferPtr buf, virNWFilterRuleDefPtr nwf, - nwItemDesc *item ATTRIBUTE_UNUSED) + nwItemDesc *item G_GNUC_UNUSED) { const char *str =3D NULL; =20 @@ -692,7 +692,7 @@ static bool checkIPProtocolID(enum attrDatatype datatype, union data *value, virNWFilterRuleDefPtr nwf, - nwItemDesc *item ATTRIBUTE_UNUSED) + nwItemDesc *item G_GNUC_UNUSED) { int32_t res =3D -1; =20 @@ -717,7 +717,7 @@ checkIPProtocolID(enum attrDatatype datatype, static bool formatIPProtocolID(virBufferPtr buf, virNWFilterRuleDefPtr nwf, - nwItemDesc *item ATTRIBUTE_UNUSED) + nwItemDesc *item G_GNUC_UNUSED) { const char *str =3D NULL; bool asHex =3D true; @@ -740,7 +740,7 @@ static bool dscpValidator(enum attrDatatype datatype, union data *val, virNWFilterRuleDefPtr nwf, - nwItemDesc *item ATTRIBUTE_UNUSED) + nwItemDesc *item G_GNUC_UNUSED) { uint8_t dscp =3D val->ui; if (dscp > 63) @@ -857,7 +857,7 @@ virNWFilterPrintStateMatchFlags(virBufferPtr buf, =20 =20 static bool -stateValidator(enum attrDatatype datatype ATTRIBUTE_UNUSED, +stateValidator(enum attrDatatype datatype G_GNUC_UNUSED, union data *val, virNWFilterRuleDefPtr nwf, nwItemDesc *item) @@ -879,7 +879,7 @@ stateValidator(enum attrDatatype datatype ATTRIBUTE_UNU= SED, =20 static bool stateFormatter(virBufferPtr buf, - virNWFilterRuleDefPtr nwf ATTRIBUTE_UNUSED, + virNWFilterRuleDefPtr nwf G_GNUC_UNUSED, nwItemDesc *item) { virNWFilterPrintStateMatchFlags(buf, "", item->u.u16, true); @@ -902,9 +902,9 @@ static const struct int_map tcpFlags[] =3D { =20 =20 static bool -tcpFlagsValidator(enum attrDatatype datatype ATTRIBUTE_UNUSED, +tcpFlagsValidator(enum attrDatatype datatype G_GNUC_UNUSED, union data *val, - virNWFilterRuleDefPtr nwf ATTRIBUTE_UNUSED, + virNWFilterRuleDefPtr nwf G_GNUC_UNUSED, nwItemDesc *item) { bool rc =3D false; @@ -959,7 +959,7 @@ virNWFilterPrintTCPFlags(uint8_t flags) =20 static bool tcpFlagsFormatter(virBufferPtr buf, - virNWFilterRuleDefPtr nwf ATTRIBUTE_UNUSED, + virNWFilterRuleDefPtr nwf G_GNUC_UNUSED, nwItemDesc *item) { printTCPFlags(buf, item->u.tcpFlags.mask); @@ -971,9 +971,9 @@ tcpFlagsFormatter(virBufferPtr buf, =20 =20 static bool -ipsetValidator(enum attrDatatype datatype ATTRIBUTE_UNUSED, +ipsetValidator(enum attrDatatype datatype G_GNUC_UNUSED, union data *val, - virNWFilterRuleDefPtr nwf ATTRIBUTE_UNUSED, + virNWFilterRuleDefPtr nwf G_GNUC_UNUSED, nwItemDesc *item) { const char *errmsg =3D NULL; @@ -1000,7 +1000,7 @@ ipsetValidator(enum attrDatatype datatype ATTRIBUTE_U= NUSED, =20 static bool ipsetFormatter(virBufferPtr buf, - virNWFilterRuleDefPtr nwf ATTRIBUTE_UNUSED, + virNWFilterRuleDefPtr nwf G_GNUC_UNUSED, nwItemDesc *item) { virBufferAdd(buf, item->u.ipset.setname, -1); @@ -1010,9 +1010,9 @@ ipsetFormatter(virBufferPtr buf, =20 =20 static bool -ipsetFlagsValidator(enum attrDatatype datatype ATTRIBUTE_UNUSED, +ipsetFlagsValidator(enum attrDatatype datatype G_GNUC_UNUSED, union data *val, - virNWFilterRuleDefPtr nwf ATTRIBUTE_UNUSED, + virNWFilterRuleDefPtr nwf G_GNUC_UNUSED, nwItemDesc *item) { const char *errmsg =3D NULL; @@ -1050,7 +1050,7 @@ ipsetFlagsValidator(enum attrDatatype datatype ATTRIB= UTE_UNUSED, =20 static bool ipsetFlagsFormatter(virBufferPtr buf, - virNWFilterRuleDefPtr nwf ATTRIBUTE_UNUSED, + virNWFilterRuleDefPtr nwf G_GNUC_UNUSED, nwItemDesc *item) { uint8_t ctr; diff --git a/src/conf/nwfilter_params.c b/src/conf/nwfilter_params.c index 4b85f22950..7640717948 100644 --- a/src/conf/nwfilter_params.c +++ b/src/conf/nwfilter_params.c @@ -623,7 +623,7 @@ virNWFilterVarCombIterGetVarValue(virNWFilterVarCombIte= rPtr ci, } =20 static void -hashDataFree(void *payload, const void *name ATTRIBUTE_UNUSED) +hashDataFree(void *payload, const void *name G_GNUC_UNUSED) { virNWFilterVarValueFree(payload); } diff --git a/src/conf/object_event.c b/src/conf/object_event.c index a50a09e1a0..453fab74b1 100644 --- a/src/conf/object_event.c +++ b/src/conf/object_event.c @@ -543,7 +543,7 @@ static void virObjectEventStateFlush(virObjectEventStat= ePtr state); * flush the callback queue. */ static void -virObjectEventTimer(int timer ATTRIBUTE_UNUSED, void *opaque) +virObjectEventTimer(int timer G_GNUC_UNUSED, void *opaque) { virObjectEventStatePtr state =3D opaque; =20 diff --git a/src/conf/virchrdev.c b/src/conf/virchrdev.c index 5090a67a4f..59d4864735 100644 --- a/src/conf/virchrdev.c +++ b/src/conf/virchrdev.c @@ -195,12 +195,12 @@ static void virChrdevLockFileRemove(const char *dev) } #else /* #ifdef VIR_CHRDEV_LOCK_FILE_PATH */ /* file locking for character devices is disabled */ -static int virChrdevLockFileCreate(const char *dev ATTRIBUTE_UNUSED) +static int virChrdevLockFileCreate(const char *dev G_GNUC_UNUSED) { return 0; } =20 -static void virChrdevLockFileRemove(const char *dev ATTRIBUTE_UNUSED) +static void virChrdevLockFileRemove(const char *dev G_GNUC_UNUSED) { return; } @@ -245,7 +245,7 @@ static void virChrdevFDStreamCloseCbFree(void *opaque) * @st Pointer to stream being closed. * @opaque Domain's device information structure. */ -static void virChrdevFDStreamCloseCb(virStreamPtr st ATTRIBUTE_UNUSED, +static void virChrdevFDStreamCloseCb(virStreamPtr st G_GNUC_UNUSED, void *opaque) { virChrdevStreamInfoPtr priv =3D opaque; @@ -291,8 +291,8 @@ virChrdevsPtr virChrdevAlloc(void) * Helper to clear stream callbacks when freeing the hash */ static int virChrdevFreeClearCallbacks(void *payload, - const void *name ATTRIBUTE_UNUSED, - void *data ATTRIBUTE_UNUSED) + const void *name G_GNUC_UNUSED, + void *data G_GNUC_UNUSED) { virStreamPtr st =3D payload; =20 diff --git a/src/conf/virdomaincheckpointobjlist.c b/src/conf/virdomainchec= kpointobjlist.c index 03aad9f5ef..41181477f4 100644 --- a/src/conf/virdomaincheckpointobjlist.c +++ b/src/conf/virdomaincheckpointobjlist.c @@ -48,7 +48,7 @@ virDomainCheckpointAssignDef(virDomainCheckpointObjListPt= r checkpoints, =20 =20 static bool -virDomainCheckpointFilter(virDomainMomentObjPtr obj ATTRIBUTE_UNUSED, +virDomainCheckpointFilter(virDomainMomentObjPtr obj G_GNUC_UNUSED, unsigned int flags) { /* For now, we have no further filters than what the common code handl= es. */ diff --git a/src/conf/virdomainmomentobjlist.c b/src/conf/virdomainmomentob= jlist.c index d02efb420a..a4f9ce9c3f 100644 --- a/src/conf/virdomainmomentobjlist.c +++ b/src/conf/virdomainmomentobjlist.c @@ -263,7 +263,7 @@ virDomainMomentAssignDef(virDomainMomentObjListPtr mome= nts, =20 static void virDomainMomentObjListDataFree(void *payload, - const void *name ATTRIBUTE_UNUSED) + const void *name G_GNUC_UNUSED) { virDomainMomentObjPtr obj =3D payload; =20 @@ -310,7 +310,7 @@ struct virDomainMomentNameData { =20 =20 static int virDomainMomentObjListCopyNames(void *payload, - const void *name ATTRIBUTE_UNUS= ED, + const void *name G_GNUC_UNUSED, void *opaque) { virDomainMomentObjPtr obj =3D payload; @@ -497,7 +497,7 @@ struct moment_set_relation { }; static int virDomainMomentSetRelations(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *data) { virDomainMomentObjPtr obj =3D payload; diff --git a/src/conf/virdomainobjlist.c b/src/conf/virdomainobjlist.c index 2eff6768c2..fa1985f474 100644 --- a/src/conf/virdomainobjlist.c +++ b/src/conf/virdomainobjlist.c @@ -95,7 +95,7 @@ static void virDomainObjListDispose(void *obj) =20 =20 static int virDomainObjListSearchID(const void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, const void *data) { virDomainObjPtr obj =3D (virDomainObjPtr)payload; @@ -655,7 +655,7 @@ struct virDomainObjListData { =20 static int virDomainObjListCount(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virDomainObjPtr obj =3D payload; @@ -702,7 +702,7 @@ struct virDomainIDData { =20 static int virDomainObjListCopyActiveIDs(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virDomainObjPtr obj =3D payload; @@ -747,7 +747,7 @@ struct virDomainNameData { =20 static int virDomainObjListCopyInactiveNames(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virDomainObjPtr obj =3D payload; @@ -804,7 +804,7 @@ struct virDomainListIterData { =20 static int virDomainObjListHelper(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { struct virDomainListIterData *data =3D opaque; @@ -932,7 +932,7 @@ struct virDomainListData { =20 static int virDomainObjListCollectIterator(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { struct virDomainListData *data =3D opaque; diff --git a/src/conf/virinterfaceobj.c b/src/conf/virinterfaceobj.c index c8d931a4b6..b77d4152f5 100644 --- a/src/conf/virinterfaceobj.c +++ b/src/conf/virinterfaceobj.c @@ -161,7 +161,7 @@ struct _virInterfaceObjFindMACData { =20 static int virInterfaceObjListFindByMACStringCb(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virInterfaceObjPtr obj =3D payload; @@ -273,7 +273,7 @@ struct _virInterfaceObjListExportData { =20 static int virInterfaceObjListExportCallback(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virInterfaceObjListExportDataPtr data =3D opaque; @@ -366,7 +366,7 @@ struct _virInterfaceObjListCloneData { =20 static int virInterfaceObjListCloneCb(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virInterfaceObjPtr srcObj =3D payload; @@ -485,7 +485,7 @@ struct _virInterfaceObjNumOfInterfacesData { =20 static int virInterfaceObjListNumOfInterfacesCb(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virInterfaceObjPtr obj =3D payload; @@ -527,7 +527,7 @@ struct _virInterfaceObjGetNamesData { =20 static int virInterfaceObjListGetNamesCb(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virInterfaceObjPtr obj =3D payload; diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c index 69a962b466..966956e719 100644 --- a/src/conf/virnetworkobj.c +++ b/src/conf/virnetworkobj.c @@ -94,7 +94,7 @@ virNetworkObjLoadAllPorts(virNetworkObjPtr net, =20 =20 static void -virNetworkObjPortFree(void *val, const void *key ATTRIBUTE_UNUSED) +virNetworkObjPortFree(void *val, const void *key G_GNUC_UNUSED) { virNetworkPortDefFree(val); } @@ -404,7 +404,7 @@ virNetworkObjFindByUUID(virNetworkObjListPtr nets, =20 static int virNetworkObjSearchName(const void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, const void *data) { virNetworkObjPtr obj =3D (virNetworkObjPtr) payload; @@ -1190,7 +1190,7 @@ struct virNetworkObjBridgeInUseHelperData { =20 static int virNetworkObjBridgeInUseHelper(const void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, const void *opaque) { int ret; @@ -1367,7 +1367,7 @@ struct _virNetworkObjListExportData { =20 static int virNetworkObjListExportCallback(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virNetworkObjListExportDataPtr data =3D opaque; @@ -1451,7 +1451,7 @@ struct virNetworkObjListForEachHelperData { =20 static int virNetworkObjListForEachHelper(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { struct virNetworkObjListForEachHelperData *data =3D opaque; @@ -1501,7 +1501,7 @@ struct virNetworkObjListGetHelperData { =20 static int virNetworkObjListGetHelper(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { struct virNetworkObjListGetHelperData *data =3D opaque; @@ -1591,7 +1591,7 @@ struct virNetworkObjListPruneHelperData { =20 static int virNetworkObjListPruneHelper(const void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, const void *opaque) { const struct virNetworkObjListPruneHelperData *data =3D opaque; @@ -1773,7 +1773,7 @@ struct _virNetworkObjPortListExportData { =20 static int virNetworkObjPortListExportCallback(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virNetworkObjPortListExportDataPtr data =3D opaque; @@ -1853,7 +1853,7 @@ struct _virNetworkObjPortListForEachData { =20 static int virNetworkObjPortForEachCallback(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virNetworkObjPortListForEachData *data =3D opaque; diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c index 37d9de478f..7656a5eed2 100644 --- a/src/conf/virnodedeviceobj.c +++ b/src/conf/virnodedeviceobj.c @@ -199,7 +199,7 @@ virNodeDeviceObjListSearch(virNodeDeviceObjListPtr devs, =20 static int virNodeDeviceObjListFindBySysfsPathCallback(const void *payload, - const void *name ATTRIBUTE_UNU= SED, + const void *name G_GNUC_UNUSED, const void *opaque) { virNodeDeviceObjPtr obj =3D (virNodeDeviceObjPtr) payload; @@ -256,7 +256,7 @@ struct virNodeDeviceObjListFindByWWNsData { =20 static int virNodeDeviceObjListFindByWWNsCallback(const void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, const void *opaque) { virNodeDeviceObjPtr obj =3D (virNodeDeviceObjPtr) payload; @@ -292,7 +292,7 @@ virNodeDeviceObjListFindByWWNs(virNodeDeviceObjListPtr = devs, =20 static int virNodeDeviceObjListFindByFabricWWNCallback(const void *payload, - const void *name ATTRIBUTE_UNU= SED, + const void *name G_GNUC_UNUSED, const void *opaque) { virNodeDeviceObjPtr obj =3D (virNodeDeviceObjPtr) payload; @@ -322,7 +322,7 @@ virNodeDeviceObjListFindByFabricWWN(virNodeDeviceObjLis= tPtr devs, =20 static int virNodeDeviceObjListFindByCapCallback(const void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, const void *opaque) { virNodeDeviceObjPtr obj =3D (virNodeDeviceObjPtr) payload; @@ -354,7 +354,7 @@ struct virNodeDeviceObjListFindSCSIHostByWWNsData { =20 static int virNodeDeviceObjListFindSCSIHostByWWNsCallback(const void *payload, - const void *name ATTRIBUTE_= UNUSED, + const void *name G_GNUC_UNU= SED, const void *opaque) { virNodeDeviceObjPtr obj =3D (virNodeDeviceObjPtr) payload; @@ -694,7 +694,7 @@ struct virNodeDeviceCountData { =20 static int virNodeDeviceObjListNumOfDevicesCallback(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virNodeDeviceObjPtr obj =3D payload; @@ -742,7 +742,7 @@ struct virNodeDeviceGetNamesData { =20 static int virNodeDeviceObjListGetNamesCallback(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virNodeDeviceObjPtr obj =3D payload; @@ -852,7 +852,7 @@ struct _virNodeDeviceObjListExportData { =20 static int virNodeDeviceObjListExportCallback(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virNodeDeviceObjPtr obj =3D payload; diff --git a/src/conf/virnwfilterbindingobjlist.c b/src/conf/virnwfilterbin= dingobjlist.c index 9fe62ed4ed..97e4d3c49b 100644 --- a/src/conf/virnwfilterbindingobjlist.c +++ b/src/conf/virnwfilterbindingobjlist.c @@ -345,7 +345,7 @@ struct virNWFilterBindingListIterData { =20 static int virNWFilterBindingObjListHelper(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { struct virNWFilterBindingListIterData *data =3D opaque; @@ -379,7 +379,7 @@ struct virNWFilterBindingListData { =20 static int virNWFilterBindingObjListCollectIterator(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { struct virNWFilterBindingListData *data =3D opaque; diff --git a/src/conf/virsecretobj.c b/src/conf/virsecretobj.c index 5bd84d82ed..f9f222dcd3 100644 --- a/src/conf/virsecretobj.c +++ b/src/conf/virsecretobj.c @@ -197,7 +197,7 @@ virSecretObjListFindByUUID(virSecretObjListPtr secrets, =20 static int virSecretObjSearchName(const void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, const void *opaque) { virSecretObjPtr obj =3D (virSecretObjPtr) payload; @@ -410,7 +410,7 @@ struct virSecretCountData { =20 static int virSecretObjListNumOfSecretsCallback(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { struct virSecretCountData *data =3D opaque; @@ -443,7 +443,7 @@ struct virSecretListData { =20 static int virSecretObjListGetUUIDsCallback(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { struct virSecretListData *data =3D opaque; @@ -537,7 +537,7 @@ struct _virSecretObjListExportData { =20 static int virSecretObjListExportCallback(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virSecretObjListExportDataPtr data =3D opaque; diff --git a/src/conf/virstorageobj.c b/src/conf/virstorageobj.c index 286192172d..664dc12776 100644 --- a/src/conf/virstorageobj.c +++ b/src/conf/virstorageobj.c @@ -421,7 +421,7 @@ struct _virStoragePoolObjListForEachData { =20 static int virStoragePoolObjListForEachCb(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virStoragePoolObjPtr obj =3D payload; @@ -477,7 +477,7 @@ struct _virStoragePoolObjListSearchData { =20 static int virStoragePoolObjListSearchCb(const void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, const void *opaque) { virStoragePoolObjPtr obj =3D (virStoragePoolObjPtr) payload; @@ -728,7 +728,7 @@ struct _virStoragePoolObjForEachVolData { =20 static int virStoragePoolObjForEachVolumeCb(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { int ret =3D 0; @@ -767,7 +767,7 @@ struct _virStoragePoolObjSearchVolData { =20 static int virStoragePoolObjSearchVolumeCb(const void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, const void *opaque) { virStorageVolObjPtr volobj =3D (virStorageVolObjPtr) payload; @@ -864,7 +864,7 @@ struct _virStorageVolObjCountData { =20 static int virStoragePoolObjNumOfVolumesCb(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virStorageVolObjPtr volobj =3D payload; @@ -913,7 +913,7 @@ struct _virStorageVolObjNameData { =20 static int virStoragePoolObjVolumeGetNamesCb(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virStorageVolObjPtr volobj =3D payload; @@ -987,7 +987,7 @@ struct _virStoragePoolObjVolumeListExportData { =20 static int virStoragePoolObjVolumeListExportCallback(void *payload, - const void *name ATTRIBUTE_UNUSE= D, + const void *name G_GNUC_UNUSED, void *opaque) { virStorageVolObjPtr volobj =3D payload; @@ -1437,7 +1437,7 @@ struct _virStoragePoolObjFindDuplicateData { =20 static int virStoragePoolObjSourceFindDuplicateCb(const void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, const void *opaque) { virStoragePoolObjPtr obj =3D (virStoragePoolObjPtr) payload; @@ -1847,7 +1847,7 @@ struct _virStoragePoolCountData { =20 static int virStoragePoolObjNumOfStoragePoolsCb(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virStoragePoolObjPtr obj =3D payload; @@ -1899,7 +1899,7 @@ struct _virStoragePoolNameData { =20 static int virStoragePoolObjGetNamesCb(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virStoragePoolObjPtr obj =3D payload; @@ -2046,7 +2046,7 @@ struct _virStoragePoolObjListExportData { =20 static int virStoragePoolObjListExportCallback(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virStoragePoolObjPtr obj =3D payload; --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 10:00:01 2024 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=1571059017; cv=none; d=zoho.com; s=zohoarc; b=Wm8FxigJkHQ5AjQYQHM0er54B+ekp+5HG3/H0N5lF8Li+HYB4fsx4gH2GlWSws9487kuNfBL/bBSWAI4PxvYrvF26qKxo3O4VGpp9Kyetm734F7mTHJpdKQeLAE+m1e7gPjWCRD+ywjiOob2DnLXu7OjlT+KaX41JXoEI82YLRY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571059017; 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=aME2kvjqYlHf7WxYc3Yerelmm3t8/b/W3cMsaZxxKb4=; b=geGlt2ZMzzRpOzm1j6LOcNLlASV1pIHNtVkw7Bfmkk83lBohqm3vvtTw1E08EmOwyctUc5s0fgdxif9NB8KFdZKIMs270S7vGkgAHPNafoq7GhqeXsLLAmZMB45OmD0nP7Wupqf9D1tn+XJwhytSwdewb/wytlLP2qxPxv7pFpE= 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 1571059017591753.0806032423529; Mon, 14 Oct 2019 06:16:57 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 92D517F743; Mon, 14 Oct 2019 13:16:55 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6CB14425F; Mon, 14 Oct 2019 13:16:55 +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 284744EE6F; Mon, 14 Oct 2019 13:16:55 +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 x9EDGN8S017395 for ; Mon, 14 Oct 2019 09:16:23 -0400 Received: by smtp.corp.redhat.com (Postfix) id 035DD60127; Mon, 14 Oct 2019 13:16:23 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7FFAF5B81B for ; Mon, 14 Oct 2019 13:16:22 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Mon, 14 Oct 2019 15:15:29 +0200 Message-Id: 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 11/35] cpu: 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.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.71]); Mon, 14 Oct 2019 13:16:56 +0000 (UTC) Use G_GNUC_UNUSED from GLib instead of ATTRIBUTE_UNUSED. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/cpu/cpu_arm.c | 14 +++++++------- src/cpu/cpu_ppc64.c | 10 +++++----- src/cpu/cpu_s390.c | 6 +++--- src/cpu/cpu_x86.c | 4 ++-- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/cpu/cpu_arm.c b/src/cpu/cpu_arm.c index 65d69c00af..d464d7add2 100644 --- a/src/cpu/cpu_arm.c +++ b/src/cpu/cpu_arm.c @@ -71,10 +71,10 @@ virCPUarmUpdate(virCPUDefPtr guest, =20 static virCPUDefPtr virCPUarmBaseline(virCPUDefPtr *cpus, - unsigned int ncpus ATTRIBUTE_UNUSED, - virDomainCapsCPUModelsPtr models ATTRIBUTE_UNUSED, - const char **features ATTRIBUTE_UNUSED, - bool migratable ATTRIBUTE_UNUSED) + unsigned int ncpus G_GNUC_UNUSED, + virDomainCapsCPUModelsPtr models G_GNUC_UNUSED, + const char **features G_GNUC_UNUSED, + bool migratable G_GNUC_UNUSED) { virCPUDefPtr cpu =3D NULL; =20 @@ -91,9 +91,9 @@ virCPUarmBaseline(virCPUDefPtr *cpus, } =20 static virCPUCompareResult -virCPUarmCompare(virCPUDefPtr host ATTRIBUTE_UNUSED, - virCPUDefPtr cpu ATTRIBUTE_UNUSED, - bool failMessages ATTRIBUTE_UNUSED) +virCPUarmCompare(virCPUDefPtr host G_GNUC_UNUSED, + virCPUDefPtr cpu G_GNUC_UNUSED, + bool failMessages G_GNUC_UNUSED) { return VIR_CPU_COMPARE_IDENTICAL; } diff --git a/src/cpu/cpu_ppc64.c b/src/cpu/cpu_ppc64.c index 9c75c4a2f2..5194c2adc1 100644 --- a/src/cpu/cpu_ppc64.c +++ b/src/cpu/cpu_ppc64.c @@ -276,7 +276,7 @@ ppc64MapFree(struct ppc64_map *map) } =20 static int -ppc64VendorParse(xmlXPathContextPtr ctxt ATTRIBUTE_UNUSED, +ppc64VendorParse(xmlXPathContextPtr ctxt G_GNUC_UNUSED, const char *name, void *data) { @@ -678,7 +678,7 @@ virCPUppc64GetHost(virCPUDefPtr cpu, =20 static int virCPUppc64Update(virCPUDefPtr guest, - const virCPUDef *host ATTRIBUTE_UNUSED) + const virCPUDef *host G_GNUC_UNUSED) { /* * - host-passthrough doesn't even get here @@ -697,9 +697,9 @@ virCPUppc64Update(virCPUDefPtr guest, static virCPUDefPtr virCPUppc64Baseline(virCPUDefPtr *cpus, unsigned int ncpus, - virDomainCapsCPUModelsPtr models ATTRIBUTE_UNUSED, - const char **features ATTRIBUTE_UNUSED, - bool migratable ATTRIBUTE_UNUSED) + virDomainCapsCPUModelsPtr models G_GNUC_UNUSED, + const char **features G_GNUC_UNUSED, + bool migratable G_GNUC_UNUSED) { struct ppc64_map *map; const struct ppc64_model *model; diff --git a/src/cpu/cpu_s390.c b/src/cpu/cpu_s390.c index 8f52924383..712e249f23 100644 --- a/src/cpu/cpu_s390.c +++ b/src/cpu/cpu_s390.c @@ -31,9 +31,9 @@ static const virArch archs[] =3D { VIR_ARCH_S390, VIR_ARCH_S390X }; =20 static virCPUCompareResult -virCPUs390Compare(virCPUDefPtr host ATTRIBUTE_UNUSED, - virCPUDefPtr cpu ATTRIBUTE_UNUSED, - bool failMessages ATTRIBUTE_UNUSED) +virCPUs390Compare(virCPUDefPtr host G_GNUC_UNUSED, + virCPUDefPtr cpu G_GNUC_UNUSED, + bool failMessages G_GNUC_UNUSED) { /* s390 relies on QEMU to perform all runability checking. Return * VIR_CPU_COMPARE_IDENTICAL to bypass Libvirt checking. diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index 32b9836dd5..b2b16ca512 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -3397,7 +3397,7 @@ virCPUx86FeatureIsMSR(const char *name) */ bool virCPUx86FeatureFilterSelectMSR(const char *name, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { return virCPUx86FeatureIsMSR(name); } @@ -3413,7 +3413,7 @@ virCPUx86FeatureFilterSelectMSR(const char *name, */ bool virCPUx86FeatureFilterDropMSR(const char *name, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { return !virCPUx86FeatureIsMSR(name); } --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 10:00:01 2024 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=1571059021; cv=none; d=zoho.com; s=zohoarc; b=Cynncgupp5VGqTv/fad8w3LyGZGIdwttcqovUj/MEib5xjFbDcEmF+c1A9QSUKpDSBGlWuv1Fb6oWfNNsl5apcsRQ6NnTuiMwLnnWld48dBOsDwyfRxDrnZ+WpXLVb+gIP9RUrhaa5kuNizDDnGkyvSUD/FXCgqi5ng7LQl221Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571059021; 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=El+S2mMpFMaNW9B4CrhAQ4ijElX0y3rusiKqJYedd3s=; b=mqtmTyaXBxTAazYbfHHaKYlHOeWcnuPV6l+4ZnAor+p0mK90ofQZ4MrltqNg0afasKtFfAp3Do6nU7f926hcwxbj9xIvnCh+TdV08BgTzOby+l51RtsGYMkDETyHlq5tOJf1XPnOegFiF451pGInmXyfYB12xGo+lwUMiC62DYU= 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 1571059021019496.2395939104017; Mon, 14 Oct 2019 06:17:01 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1D2503086228; Mon, 14 Oct 2019 13:16:59 +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 DE7ED60C4B; Mon, 14 Oct 2019 13:16:58 +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 9B979180B780; Mon, 14 Oct 2019 13:16:58 +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 x9EDGN5C017408 for ; Mon, 14 Oct 2019 09:16:23 -0400 Received: by smtp.corp.redhat.com (Postfix) id C8B7E6012C; Mon, 14 Oct 2019 13:16:23 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5149D60126 for ; Mon, 14 Oct 2019 13:16:23 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Mon, 14 Oct 2019 15:15:30 +0200 Message-Id: <3661934c6f02847c841c9258230ae67703bd4080.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 12/35] esx: 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.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Mon, 14 Oct 2019 13:16:59 +0000 (UTC) Use G_GNUC_UNUSED from GLib instead of ATTRIBUTE_UNUSED. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/esx/esx_driver.c | 32 ++++++++++++++--------------- src/esx/esx_interface_driver.c | 10 ++++----- src/esx/esx_network_driver.c | 16 +++++++-------- src/esx/esx_storage_backend_iscsi.c | 16 +++++++-------- src/esx/esx_storage_driver.c | 16 +++++++-------- src/esx/esx_vi.c | 20 +++++++++--------- src/esx/esx_vi_types.c | 4 ++-- 7 files changed, 57 insertions(+), 57 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index d6d219c101..b7c80d5c43 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -825,7 +825,7 @@ esxConnectToVCenter(esxPrivate *priv, */ static virDrvOpenStatus esxConnectOpen(virConnectPtr conn, virConnectAuthPtr auth, - virConfPtr conf ATTRIBUTE_UNUSED, + virConfPtr conf G_GNUC_UNUSED, unsigned int flags) { virDrvOpenStatus result =3D VIR_DRV_OPEN_ERROR; @@ -1097,7 +1097,7 @@ esxConnectSupportsFeature(virConnectPtr conn, int fea= ture) =20 =20 static const char * -esxConnectGetType(virConnectPtr conn ATTRIBUTE_UNUSED) +esxConnectGetType(virConnectPtr conn G_GNUC_UNUSED) { return "ESX"; } @@ -1852,7 +1852,7 @@ esxDomainDestroy(virDomainPtr dom) =20 =20 static char * -esxDomainGetOSType(virDomainPtr domain ATTRIBUTE_UNUSED) +esxDomainGetOSType(virDomainPtr domain G_GNUC_UNUSED) { char *osType; =20 @@ -3450,7 +3450,7 @@ esxDomainSetAutostart(virDomainPtr domain, int autost= art) * SharesLevel 'low', 'normal' and 'high'. */ static char * -esxDomainGetSchedulerType(virDomainPtr domain ATTRIBUTE_UNUSED, int *npara= ms) +esxDomainGetSchedulerType(virDomainPtr domain G_GNUC_UNUSED, int *nparams) { char *type; =20 @@ -3736,13 +3736,13 @@ esxDomainSetSchedulerParameters(virDomainPtr domain, =20 static int esxDomainMigratePrepare(virConnectPtr dconn, - char **cookie ATTRIBUTE_UNUSED, - int *cookielen ATTRIBUTE_UNUSED, - const char *uri_in ATTRIBUTE_UNUSED, + char **cookie G_GNUC_UNUSED, + int *cookielen G_GNUC_UNUSED, + const char *uri_in G_GNUC_UNUSED, char **uri_out, unsigned long flags, - const char *dname ATTRIBUTE_UNUSED, - unsigned long resource ATTRIBUTE_UNUSED) + const char *dname G_GNUC_UNUSED, + unsigned long resource G_GNUC_UNUSED) { esxPrivate *priv =3D dconn->privateData; =20 @@ -3763,12 +3763,12 @@ esxDomainMigratePrepare(virConnectPtr dconn, =20 static int esxDomainMigratePerform(virDomainPtr domain, - const char *cookie ATTRIBUTE_UNUSED, - int cookielen ATTRIBUTE_UNUSED, + const char *cookie G_GNUC_UNUSED, + int cookielen G_GNUC_UNUSED, const char *uri, unsigned long flags, const char *dname, - unsigned long bandwidth ATTRIBUTE_UNUSED) + unsigned long bandwidth G_GNUC_UNUSED) { int result =3D -1; esxPrivate *priv =3D domain->conn->privateData; @@ -3906,9 +3906,9 @@ esxDomainMigratePerform(virDomainPtr domain, =20 static virDomainPtr esxDomainMigrateFinish(virConnectPtr dconn, const char *dname, - const char *cookie ATTRIBUTE_UNUSED, - int cookielen ATTRIBUTE_UNUSED, - const char *uri ATTRIBUTE_UNUSED, + const char *cookie G_GNUC_UNUSED, + int cookielen G_GNUC_UNUSED, + const char *uri G_GNUC_UNUSED, unsigned long flags) { virCheckFlags(ESX_MIGRATION_FLAGS, NULL); @@ -4060,7 +4060,7 @@ esxDomainIsPersistent(virDomainPtr domain) =20 =20 static int -esxDomainIsUpdated(virDomainPtr domain ATTRIBUTE_UNUSED) +esxDomainIsUpdated(virDomainPtr domain G_GNUC_UNUSED) { /* ESX domains never have a persistent state that differs from * current state. However, we do want to check for existence. */ diff --git a/src/esx/esx_interface_driver.c b/src/esx/esx_interface_driver.c index e3b41164e7..76dcb3d53c 100644 --- a/src/esx/esx_interface_driver.c +++ b/src/esx/esx_interface_driver.c @@ -107,7 +107,7 @@ esxConnectListInterfaces(virConnectPtr conn, char **con= st names, int maxnames) =20 =20 static int -esxConnectNumOfDefinedInterfaces(virConnectPtr conn ATTRIBUTE_UNUSED) +esxConnectNumOfDefinedInterfaces(virConnectPtr conn G_GNUC_UNUSED) { /* ESX interfaces are always active */ return 0; @@ -116,9 +116,9 @@ esxConnectNumOfDefinedInterfaces(virConnectPtr conn ATT= RIBUTE_UNUSED) =20 =20 static int -esxConnectListDefinedInterfaces(virConnectPtr conn ATTRIBUTE_UNUSED, - char **const names ATTRIBUTE_UNUSED, - int maxnames ATTRIBUTE_UNUSED) +esxConnectListDefinedInterfaces(virConnectPtr conn G_GNUC_UNUSED, + char **const names G_GNUC_UNUSED, + int maxnames G_GNUC_UNUSED) { /* ESX interfaces are always active */ return 0; @@ -250,7 +250,7 @@ esxInterfaceGetXMLDesc(virInterfacePtr iface, unsigned = int flags) =20 =20 static int -esxInterfaceIsActive(virInterfacePtr iface ATTRIBUTE_UNUSED) +esxInterfaceIsActive(virInterfacePtr iface G_GNUC_UNUSED) { /* ESX interfaces are always active */ return 1; diff --git a/src/esx/esx_network_driver.c b/src/esx/esx_network_driver.c index 40bd5c2168..aaf6c77635 100644 --- a/src/esx/esx_network_driver.c +++ b/src/esx/esx_network_driver.c @@ -115,7 +115,7 @@ esxConnectListNetworks(virConnectPtr conn, char **const= names, int maxnames) =20 =20 static int -esxConnectNumOfDefinedNetworks(virConnectPtr conn ATTRIBUTE_UNUSED) +esxConnectNumOfDefinedNetworks(virConnectPtr conn G_GNUC_UNUSED) { /* ESX networks are always active */ return 0; @@ -124,9 +124,9 @@ esxConnectNumOfDefinedNetworks(virConnectPtr conn ATTRI= BUTE_UNUSED) =20 =20 static int -esxConnectListDefinedNetworks(virConnectPtr conn ATTRIBUTE_UNUSED, - char **const names ATTRIBUTE_UNUSED, - int maxnames ATTRIBUTE_UNUSED) +esxConnectListDefinedNetworks(virConnectPtr conn G_GNUC_UNUSED, + char **const names G_GNUC_UNUSED, + int maxnames G_GNUC_UNUSED) { /* ESX networks are always active */ return 0; @@ -823,7 +823,7 @@ esxNetworkGetXMLDesc(virNetworkPtr network_, unsigned i= nt flags) =20 =20 static int -esxNetworkGetAutostart(virNetworkPtr network ATTRIBUTE_UNUSED, +esxNetworkGetAutostart(virNetworkPtr network G_GNUC_UNUSED, int *autostart) { /* ESX networks are always active */ @@ -835,7 +835,7 @@ esxNetworkGetAutostart(virNetworkPtr network ATTRIBUTE_= UNUSED, =20 =20 static int -esxNetworkSetAutostart(virNetworkPtr network ATTRIBUTE_UNUSED, +esxNetworkSetAutostart(virNetworkPtr network G_GNUC_UNUSED, int autostart) { /* Just accept autostart activation, but fail on autostart deactivatio= n */ @@ -853,7 +853,7 @@ esxNetworkSetAutostart(virNetworkPtr network ATTRIBUTE_= UNUSED, =20 =20 static int -esxNetworkIsActive(virNetworkPtr network ATTRIBUTE_UNUSED) +esxNetworkIsActive(virNetworkPtr network G_GNUC_UNUSED) { /* ESX networks are always active */ return 1; @@ -862,7 +862,7 @@ esxNetworkIsActive(virNetworkPtr network ATTRIBUTE_UNUS= ED) =20 =20 static int -esxNetworkIsPersistent(virNetworkPtr network ATTRIBUTE_UNUSED) +esxNetworkIsPersistent(virNetworkPtr network G_GNUC_UNUSED) { /* ESX has no concept of transient networks, so all of them are persis= tent */ return 1; diff --git a/src/esx/esx_storage_backend_iscsi.c b/src/esx/esx_storage_back= end_iscsi.c index 49edf70284..e9a30876bf 100644 --- a/src/esx/esx_storage_backend_iscsi.c +++ b/src/esx/esx_storage_backend_iscsi.c @@ -276,7 +276,7 @@ esxStoragePoolRefresh(virStoragePoolPtr pool, =20 =20 static int -esxStoragePoolGetInfo(virStoragePoolPtr pool ATTRIBUTE_UNUSED, +esxStoragePoolGetInfo(virStoragePoolPtr pool G_GNUC_UNUSED, virStoragePoolInfoPtr info) { /* These fields are not valid for iSCSI pool */ @@ -582,8 +582,8 @@ esxStorageVolLookupByKey(virConnectPtr conn, const char= *key) =20 =20 static virStorageVolPtr -esxStorageVolCreateXML(virStoragePoolPtr pool ATTRIBUTE_UNUSED, - const char *xmldesc ATTRIBUTE_UNUSED, +esxStorageVolCreateXML(virStoragePoolPtr pool G_GNUC_UNUSED, + const char *xmldesc G_GNUC_UNUSED, unsigned int flags) { virCheckFlags(0, NULL); @@ -597,9 +597,9 @@ esxStorageVolCreateXML(virStoragePoolPtr pool ATTRIBUTE= _UNUSED, =20 =20 static virStorageVolPtr -esxStorageVolCreateXMLFrom(virStoragePoolPtr pool ATTRIBUTE_UNUSED, - const char *xmldesc ATTRIBUTE_UNUSED, - virStorageVolPtr sourceVolume ATTRIBUTE_UNUSED, +esxStorageVolCreateXMLFrom(virStoragePoolPtr pool G_GNUC_UNUSED, + const char *xmldesc G_GNUC_UNUSED, + virStorageVolPtr sourceVolume G_GNUC_UNUSED, unsigned int flags) { virCheckFlags(0, NULL); @@ -733,7 +733,7 @@ esxStorageVolGetXMLDesc(virStorageVolPtr volume, =20 =20 static int -esxStorageVolDelete(virStorageVolPtr volume ATTRIBUTE_UNUSED, +esxStorageVolDelete(virStorageVolPtr volume G_GNUC_UNUSED, unsigned int flags) { virCheckFlags(0, -1); @@ -747,7 +747,7 @@ esxStorageVolDelete(virStorageVolPtr volume ATTRIBUTE_U= NUSED, =20 =20 static int -esxStorageVolWipe(virStorageVolPtr volume ATTRIBUTE_UNUSED, +esxStorageVolWipe(virStorageVolPtr volume G_GNUC_UNUSED, unsigned int flags) { virCheckFlags(0, -1); diff --git a/src/esx/esx_storage_driver.c b/src/esx/esx_storage_driver.c index e692e8644d..8a34732b45 100644 --- a/src/esx/esx_storage_driver.c +++ b/src/esx/esx_storage_driver.c @@ -117,7 +117,7 @@ esxConnectListStoragePools(virConnectPtr conn, char **c= onst names, int maxnames) =20 =20 static int -esxConnectNumOfDefinedStoragePools(virConnectPtr conn ATTRIBUTE_UNUSED) +esxConnectNumOfDefinedStoragePools(virConnectPtr conn G_GNUC_UNUSED) { /* ESX storage pools are always active */ return 0; @@ -126,9 +126,9 @@ esxConnectNumOfDefinedStoragePools(virConnectPtr conn A= TTRIBUTE_UNUSED) =20 =20 static int -esxConnectListDefinedStoragePools(virConnectPtr conn ATTRIBUTE_UNUSED, - char **const names ATTRIBUTE_UNUSED, - int maxnames ATTRIBUTE_UNUSED) +esxConnectListDefinedStoragePools(virConnectPtr conn G_GNUC_UNUSED, + char **const names G_GNUC_UNUSED, + int maxnames G_GNUC_UNUSED) { /* ESX storage pools are always active */ return 0; @@ -251,7 +251,7 @@ esxStoragePoolGetXMLDesc(virStoragePoolPtr pool, unsign= ed int flags) =20 =20 static int -esxStoragePoolGetAutostart(virStoragePoolPtr pool ATTRIBUTE_UNUSED, +esxStoragePoolGetAutostart(virStoragePoolPtr pool G_GNUC_UNUSED, int *autostart) { /* ESX storage pools are always active */ @@ -263,7 +263,7 @@ esxStoragePoolGetAutostart(virStoragePoolPtr pool ATTRI= BUTE_UNUSED, =20 =20 static int -esxStoragePoolSetAutostart(virStoragePoolPtr pool ATTRIBUTE_UNUSED, +esxStoragePoolSetAutostart(virStoragePoolPtr pool G_GNUC_UNUSED, int autostart) { /* Just accept autostart activation, but fail on autostart deactivatio= n */ @@ -500,7 +500,7 @@ esxStorageVolGetPath(virStorageVolPtr volume) =20 =20 static int -esxStoragePoolIsActive(virStoragePoolPtr pool ATTRIBUTE_UNUSED) +esxStoragePoolIsActive(virStoragePoolPtr pool G_GNUC_UNUSED) { /* ESX storage pools are always active */ return 1; @@ -509,7 +509,7 @@ esxStoragePoolIsActive(virStoragePoolPtr pool ATTRIBUTE= _UNUSED) =20 =20 static int -esxStoragePoolIsPersistent(virStoragePoolPtr pool ATTRIBUTE_UNUSED) +esxStoragePoolIsPersistent(virStoragePoolPtr pool G_GNUC_UNUSED) { /* ESX has no concept of transient pools, so all of them are persisten= t */ return 1; diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 7e8a174313..fc21a7b6eb 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -64,7 +64,7 @@ VIR_LOG_INIT("esx.esx_vi"); void \ esxVI_##_type##_Free(esxVI_##_type **ptrptr) \ { \ - esxVI_##_type *item ATTRIBUTE_UNUSED; \ + esxVI_##_type *item G_GNUC_UNUSED; \ \ if (!ptrptr || !(*ptrptr)) { \ return; \ @@ -167,8 +167,8 @@ esxVI_CURL_WriteBuffer(char *data, size_t size, size_t = nmemb, void *userdata) =20 #if ESX_VI__CURL__ENABLE_DEBUG_OUTPUT static int -esxVI_CURL_Debug(CURL *curl ATTRIBUTE_UNUSED, curl_infotype type, - char *info, size_t size, void *userdata ATTRIBUTE_UNUSED) +esxVI_CURL_Debug(CURL *curl G_GNUC_UNUSED, curl_infotype type, + char *info, size_t size, void *userdata G_GNUC_UNUSED) { char *buffer =3D NULL; =20 @@ -475,8 +475,8 @@ esxVI_CURL_Upload(esxVI_CURL *curl, const char *url, co= nst char *content) */ =20 static void -esxVI_SharedCURL_Lock(CURL *handle ATTRIBUTE_UNUSED, curl_lock_data data, - curl_lock_access access_ ATTRIBUTE_UNUSED, void *use= rptr) +esxVI_SharedCURL_Lock(CURL *handle G_GNUC_UNUSED, curl_lock_data data, + curl_lock_access access_ G_GNUC_UNUSED, void *userpt= r) { size_t i; esxVI_SharedCURL *shared =3D userptr; @@ -503,7 +503,7 @@ esxVI_SharedCURL_Lock(CURL *handle ATTRIBUTE_UNUSED, cu= rl_lock_data data, } =20 static void -esxVI_SharedCURL_Unlock(CURL *handle ATTRIBUTE_UNUSED, curl_lock_data data, +esxVI_SharedCURL_Unlock(CURL *handle G_GNUC_UNUSED, curl_lock_data data, void *userptr) { size_t i; @@ -649,10 +649,10 @@ esxVI_SharedCURL_Remove(esxVI_SharedCURL *shared, esx= VI_CURL *curl) #if ESX_EMULATE_CURL_MULTI_WAIT =20 static int -esxVI_MultiCURL_SocketCallback(CURL *handle ATTRIBUTE_UNUSED, +esxVI_MultiCURL_SocketCallback(CURL *handle G_GNUC_UNUSED, curl_socket_t fd, int action, void *callback_opaque, - void *socket_opaque ATTRIBUTE_UNUSED) + void *socket_opaque G_GNUC_UNUSED) { esxVI_MultiCURL *multi =3D callback_opaque; size_t i; @@ -695,8 +695,8 @@ esxVI_MultiCURL_SocketCallback(CURL *handle ATTRIBUTE_U= NUSED, } =20 static int -esxVI_MultiCURL_TimerCallback(CURLM *handle ATTRIBUTE_UNUSED, - long timeout_ms ATTRIBUTE_UNUSED, +esxVI_MultiCURL_TimerCallback(CURLM *handle G_GNUC_UNUSED, + long timeout_ms G_GNUC_UNUSED, void *callback_opaque) { esxVI_MultiCURL *multi =3D callback_opaque; diff --git a/src/esx/esx_vi_types.c b/src/esx/esx_vi_types.c index c77e759de2..deb6ebd09f 100644 --- a/src/esx/esx_vi_types.c +++ b/src/esx/esx_vi_types.c @@ -58,7 +58,7 @@ VIR_LOG_INIT("esx.esx_vi_types"); void \ esxVI_##_type##_Free(esxVI_##_type **ptrptr) \ { \ - esxVI_##_type *item ATTRIBUTE_UNUSED; \ + esxVI_##_type *item G_GNUC_UNUSED; \ \ if (!ptrptr || !(*ptrptr)) { \ return; \ @@ -185,7 +185,7 @@ VIR_LOG_INIT("esx.esx_vi_types"); esxVI_##_type##_Cast##_dest_extra##FromAnyType(esxVI_AnyType *anyType,= \ _dest_type **ptrptr) \ { \ - _dest_type *item ATTRIBUTE_UNUSED; \ + _dest_type *item G_GNUC_UNUSED; \ \ if (!anyType || !ptrptr || *ptrptr) { \ virReportError(VIR_ERR_INTERNAL_ERROR, "%s", \ --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 10:00:01 2024 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=1571059031; cv=none; d=zoho.com; s=zohoarc; b=na8ImVQM0rNTp1pmaRVIuqes5NtIkLs8bHMhc54NrDTihAhkdfBIicHGiccNNj3iDFqx2TIKIR/O0t9YoHzerQDqU4yDFQUW07Sz2CWNLLYmccDdRWUDWigxIo6q/kMqE3bZSqAn/ap8gEJKAUdjl48OZHEaRWoucnKRjZFXAXo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571059031; 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=i1rmabiwLH1CMkSYBYCrJl8vrigLafhLmGuF3vpoRwo=; b=ee6Lg+eHWDMsTV4nlZ+tsuEcF7PCosXs4nWWBj7jS/O0DB9P6LBTYv1DUPaUDb35UhLNDJ5siW7Kca+LhWUftqdes0FFTNH4Hi74KGWYPF214jUTnpFqi+xRnqhduPP0TBHLXalowi8rRbfXMLENOadthOOzRt1vzgG86rawLQ4= 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 1571059031870196.96656827058632; Mon, 14 Oct 2019 06:17:11 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B276D18CB901; Mon, 14 Oct 2019 13:17:09 +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 868851001DC0; Mon, 14 Oct 2019 13:17:09 +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 441AE180BA9D; Mon, 14 Oct 2019 13:17:09 +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 x9EDGO1u017415 for ; Mon, 14 Oct 2019 09:16:24 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9AD5060127; Mon, 14 Oct 2019 13:16:24 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 232C560126 for ; Mon, 14 Oct 2019 13:16:23 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Mon, 14 Oct 2019 15:15:31 +0200 Message-Id: <0fe99098cb47f6de397e357a324b4ec5e5c9432c.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 13/35] libxl: 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.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.63]); Mon, 14 Oct 2019 13:17:10 +0000 (UTC) Use G_GNUC_UNUSED from GLib instead of ATTRIBUTE_UNUSED. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/libxl/libxl_conf.h | 2 +- src/libxl/libxl_domain.c | 26 +++++++------- src/libxl/libxl_driver.c | 70 ++++++++++++++++++------------------- src/libxl/libxl_logger.c | 14 ++++---- src/libxl/libxl_migration.c | 12 +++---- 5 files changed, 62 insertions(+), 62 deletions(-) diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h index 80be791b7c..305c8c41ef 100644 --- a/src/libxl/libxl_conf.h +++ b/src/libxl/libxl_conf.h @@ -212,7 +212,7 @@ libxlCreateXMLConf(void); #ifdef LIBXL_HAVE_DEVICE_CHANNEL # define LIBXL_ATTR_UNUSED #else -# define LIBXL_ATTR_UNUSED ATTRIBUTE_UNUSED +# define LIBXL_ATTR_UNUSED G_GNUC_UNUSED #endif int libxlBuildDomainConfig(virPortAllocatorRangePtr graphicsports, diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c index 4073bf8d46..1e4d900ac5 100644 --- a/src/libxl/libxl_domain.c +++ b/src/libxl/libxl_domain.c @@ -108,7 +108,7 @@ libxlDomainObjFreeJob(libxlDomainObjPrivatePtr priv) * successful calls must be followed by EndJob eventually */ int -libxlDomainObjBeginJob(libxlDriverPrivatePtr driver ATTRIBUTE_UNUSED, +libxlDomainObjBeginJob(libxlDriverPrivatePtr driver G_GNUC_UNUSED, virDomainObjPtr obj, enum libxlDomainJob job) { @@ -166,7 +166,7 @@ libxlDomainObjBeginJob(libxlDriverPrivatePtr driver ATT= RIBUTE_UNUSED, * and obj is disposed. */ void -libxlDomainObjEndJob(libxlDriverPrivatePtr driver ATTRIBUTE_UNUSED, +libxlDomainObjEndJob(libxlDriverPrivatePtr driver G_GNUC_UNUSED, virDomainObjPtr obj) { libxlDomainObjPrivatePtr priv =3D obj->privateData; @@ -201,7 +201,7 @@ libxlDomainJobUpdateTime(struct libxlDomainJobObj *job) } =20 static void * -libxlDomainObjPrivateAlloc(void *opaque ATTRIBUTE_UNUSED) +libxlDomainObjPrivateAlloc(void *opaque G_GNUC_UNUSED) { libxlDomainObjPrivatePtr priv; =20 @@ -246,7 +246,7 @@ libxlDomainObjPrivateFree(void *data) static int libxlDomainObjPrivateXMLParse(xmlXPathContextPtr ctxt, virDomainObjPtr vm, - virDomainDefParserConfigPtr config ATTRIBUTE= _UNUSED) + virDomainDefParserConfigPtr config G_GNUC_UN= USED) { libxlDomainObjPrivatePtr priv =3D vm->privateData; =20 @@ -278,10 +278,10 @@ virDomainXMLPrivateDataCallbacks libxlDomainXMLPrivat= eDataCallbacks =3D { static int libxlDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, const virDomainDef *def, - virCapsPtr caps ATTRIBUTE_UNUSED, - unsigned int parseFlags ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED, - void *parseOpaque ATTRIBUTE_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 && @@ -367,10 +367,10 @@ libxlDomainDeviceDefPostParse(virDomainDeviceDefPtr d= ev, =20 static int libxlDomainDefPostParse(virDomainDefPtr def, - virCapsPtr caps ATTRIBUTE_UNUSED, - unsigned int parseFlags ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED, - void *parseOpaque ATTRIBUTE_UNUSED) + virCapsPtr caps G_GNUC_UNUSED, + unsigned int parseFlags G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED, + void *parseOpaque G_GNUC_UNUSED) { /* Xen PV domains always have a PV console, so add one to the domain c= onfig * via post-parse callback if not explicitly specified in the XML. */ @@ -1255,7 +1255,7 @@ libxlDomainCreateChannelPTY(virDomainDefPtr def, libx= l_ctx *ctx) #ifdef LIBXL_HAVE_SRM_V2 # define LIBXL_DOMSTART_RESTORE_VER_ATTR /* empty */ #else -# define LIBXL_DOMSTART_RESTORE_VER_ATTR ATTRIBUTE_UNUSED +# define LIBXL_DOMSTART_RESTORE_VER_ATTR G_GNUC_UNUSED #endif =20 /* diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index ea643b8a3f..7153a82e20 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -131,7 +131,7 @@ libxlOSEventHookInfoFree(void *obj) } =20 static void -libxlFDEventCallback(int watch ATTRIBUTE_UNUSED, +libxlFDEventCallback(int watch G_GNUC_UNUSED, int fd, int vir_events, void *fd_info) @@ -185,8 +185,8 @@ libxlFDRegisterEventHook(void *priv, } =20 static int -libxlFDModifyEventHook(void *priv ATTRIBUTE_UNUSED, - int fd ATTRIBUTE_UNUSED, +libxlFDModifyEventHook(void *priv G_GNUC_UNUSED, + int fd G_GNUC_UNUSED, void **hndp, short events) { @@ -204,8 +204,8 @@ libxlFDModifyEventHook(void *priv ATTRIBUTE_UNUSED, } =20 static void -libxlFDDeregisterEventHook(void *priv ATTRIBUTE_UNUSED, - int fd ATTRIBUTE_UNUSED, +libxlFDDeregisterEventHook(void *priv G_GNUC_UNUSED, + int fd G_GNUC_UNUSED, void *hnd) { libxlOSEventHookInfoPtr info =3D hnd; @@ -214,7 +214,7 @@ libxlFDDeregisterEventHook(void *priv ATTRIBUTE_UNUSED, } =20 static void -libxlTimerCallback(int timer ATTRIBUTE_UNUSED, void *timer_info) +libxlTimerCallback(int timer G_GNUC_UNUSED, void *timer_info) { libxlOSEventHookInfoPtr info =3D timer_info; =20 @@ -280,9 +280,9 @@ libxlTimeoutRegisterEventHook(void *priv, * 2. Timeout deregister hooks will no longer be called. */ static int -libxlTimeoutModifyEventHook(void *priv ATTRIBUTE_UNUSED, +libxlTimeoutModifyEventHook(void *priv G_GNUC_UNUSED, void **hndp, - struct timeval abs_t ATTRIBUTE_UNUSED) + struct timeval abs_t G_GNUC_UNUSED) { libxlOSEventHookInfoPtr info =3D *hndp; =20 @@ -293,7 +293,7 @@ libxlTimeoutModifyEventHook(void *priv ATTRIBUTE_UNUSED, } =20 static void -libxlTimeoutDeregisterEventHook(void *priv ATTRIBUTE_UNUSED, +libxlTimeoutDeregisterEventHook(void *priv G_GNUC_UNUSED, void *hnd) { libxlOSEventHookInfoPtr info =3D hnd; @@ -649,8 +649,8 @@ libxlAddDom0(libxlDriverPrivatePtr driver) =20 static int libxlStateInitialize(bool privileged, - virStateInhibitCallback callback ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) + virStateInhibitCallback callback G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED) { libxlDriverConfigPtr cfg; char *driverConf =3D NULL; @@ -861,8 +861,8 @@ libxlConnectURIProbe(char **uri) =20 static virDrvOpenStatus libxlConnectOpen(virConnectPtr conn, - virConnectAuthPtr auth ATTRIBUTE_UNUSED, - virConfPtr conf ATTRIBUTE_UNUSED, + virConnectAuthPtr auth G_GNUC_UNUSED, + virConfPtr conf G_GNUC_UNUSED, unsigned int flags) { virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); @@ -893,7 +893,7 @@ libxlConnectOpen(virConnectPtr conn, }; =20 static int -libxlConnectClose(virConnectPtr conn ATTRIBUTE_UNUSED) +libxlConnectClose(virConnectPtr conn G_GNUC_UNUSED) { conn->privateData =3D NULL; return 0; @@ -957,7 +957,7 @@ libxlConnectGetSysinfo(virConnectPtr conn, unsigned int= flags) } =20 static int -libxlConnectGetMaxVcpus(virConnectPtr conn, const char *type ATTRIBUTE_UNU= SED) +libxlConnectGetMaxVcpus(virConnectPtr conn, const char *type G_GNUC_UNUSED) { int ret; libxlDriverPrivatePtr driver =3D conn->privateData; @@ -3613,8 +3613,8 @@ libxlDomainAttachDeviceConfig(virDomainDefPtr vmdef, = virDomainDeviceDefPtr dev) } =20 static int -libxlComparePCIDevice(virDomainDefPtr def ATTRIBUTE_UNUSED, - virDomainDeviceDefPtr device ATTRIBUTE_UNUSED, +libxlComparePCIDevice(virDomainDefPtr def G_GNUC_UNUSED, + virDomainDeviceDefPtr device G_GNUC_UNUSED, virDomainDeviceInfoPtr info1, void *opaque) { @@ -5483,9 +5483,9 @@ libxlDomainBlockStatsVBD(virDomainObjPtr vm, } #else static int -libxlDomainBlockStatsVBD(virDomainObjPtr vm ATTRIBUTE_UNUSED, - const char *dev ATTRIBUTE_UNUSED, - libxlBlockStatsPtr stats ATTRIBUTE_UNUSED) +libxlDomainBlockStatsVBD(virDomainObjPtr vm G_GNUC_UNUSED, + const char *dev G_GNUC_UNUSED, + libxlBlockStatsPtr stats G_GNUC_UNUSED) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("platform unsupported")); @@ -5706,7 +5706,7 @@ libxlConnectDomainEventDeregisterAny(virConnectPtr co= nn, int callbackID) =20 =20 static int -libxlConnectIsAlive(virConnectPtr conn ATTRIBUTE_UNUSED) +libxlConnectIsAlive(virConnectPtr conn G_GNUC_UNUSED) { return 1; } @@ -5986,8 +5986,8 @@ libxlDomainMigratePrepareTunnel3Params(virConnectPtr = dconn, int nparams, const char *cookiein, int cookieinlen, - char **cookieout ATTRIBUTE_UNUSED, - int *cookieoutlen ATTRIBUTE_UNUSED, + char **cookieout G_GNUC_UNUSED, + int *cookieoutlen G_GNUC_UNUSED, unsigned int flags) { libxlDriverPrivatePtr driver =3D dconn->privateData; @@ -6040,8 +6040,8 @@ libxlDomainMigratePrepare3Params(virConnectPtr dconn, int nparams, const char *cookiein, int cookieinlen, - char **cookieout ATTRIBUTE_UNUSED, - int *cookieoutlen ATTRIBUTE_UNUSED, + char **cookieout G_GNUC_UNUSED, + int *cookieoutlen G_GNUC_UNUSED, char **uri_out, unsigned int flags) { @@ -6094,10 +6094,10 @@ libxlDomainMigratePerform3Params(virDomainPtr dom, const char *dconnuri, virTypedParameterPtr params, int nparams, - const char *cookiein ATTRIBUTE_UNUSED, - int cookieinlen ATTRIBUTE_UNUSED, - char **cookieout ATTRIBUTE_UNUSED, - int *cookieoutlen ATTRIBUTE_UNUSED, + const char *cookiein G_GNUC_UNUSED, + int cookieinlen G_GNUC_UNUSED, + char **cookieout G_GNUC_UNUSED, + int *cookieoutlen G_GNUC_UNUSED, unsigned int flags) { libxlDriverPrivatePtr driver =3D dom->conn->privateData; @@ -6155,10 +6155,10 @@ static virDomainPtr libxlDomainMigrateFinish3Params(virConnectPtr dconn, virTypedParameterPtr params, int nparams, - const char *cookiein ATTRIBUTE_UNUSED, - int cookieinlen ATTRIBUTE_UNUSED, - char **cookieout ATTRIBUTE_UNUSED, - int *cookieoutlen ATTRIBUTE_UNUSED, + const char *cookiein G_GNUC_UNUSED, + int cookieinlen G_GNUC_UNUSED, + char **cookieout G_GNUC_UNUSED, + int *cookieoutlen G_GNUC_UNUSED, unsigned int flags, int cancelled) { @@ -6207,8 +6207,8 @@ static int libxlDomainMigrateConfirm3Params(virDomainPtr domain, virTypedParameterPtr params, int nparams, - const char *cookiein ATTRIBUTE_UNUSED, - int cookieinlen ATTRIBUTE_UNUSED, + const char *cookiein G_GNUC_UNUSED, + int cookieinlen G_GNUC_UNUSED, unsigned int flags, int cancelled) { diff --git a/src/libxl/libxl_logger.c b/src/libxl/libxl_logger.c index 7c97da45d5..b4a38ae865 100644 --- a/src/libxl/libxl_logger.c +++ b/src/libxl/libxl_logger.c @@ -47,7 +47,7 @@ struct xentoollog_logger_libvirt { }; =20 static void -libxlLoggerFileFree(void *payload, const void *key ATTRIBUTE_UNUSED) +libxlLoggerFileFree(void *payload, const void *key G_GNUC_UNUSED) { FILE *file =3D payload; VIR_FORCE_FCLOSE(file); @@ -114,12 +114,12 @@ libvirt_vmessage(xentoollog_logger *logger_in, } =20 static void -libvirt_progress(xentoollog_logger *logger_in ATTRIBUTE_UNUSED, - const char *context ATTRIBUTE_UNUSED, - const char *doingwhat ATTRIBUTE_UNUSED, - int percent ATTRIBUTE_UNUSED, - unsigned long done ATTRIBUTE_UNUSED, - unsigned long total ATTRIBUTE_UNUSED) +libvirt_progress(xentoollog_logger *logger_in G_GNUC_UNUSED, + const char *context G_GNUC_UNUSED, + const char *doingwhat G_GNUC_UNUSED, + int percent G_GNUC_UNUSED, + unsigned long done G_GNUC_UNUSED, + unsigned long total G_GNUC_UNUSED) { /* This function purposedly does nothing: it's no logging info */ } diff --git a/src/libxl/libxl_migration.c b/src/libxl/libxl_migration.c index a1021d499b..ea325bf2cb 100644 --- a/src/libxl/libxl_migration.c +++ b/src/libxl/libxl_migration.c @@ -287,7 +287,7 @@ libxlDoMigrateDstReceive(void *opaque) =20 static void libxlMigrateDstReceive(virNetSocketPtr sock, - int events ATTRIBUTE_UNUSED, + int events G_GNUC_UNUSED, void *opaque) { libxlMigrationDstArgs *args =3D opaque; @@ -979,7 +979,7 @@ libxlDoMigrateSrcP2P(libxlDriverPrivatePtr driver, virConnectPtr sconn, const char *xmlin, virConnectPtr dconn, - const char *dconnuri ATTRIBUTE_UNUSED, + const char *dconnuri G_GNUC_UNUSED, const char *dname, const char *uri, unsigned int flags) @@ -1152,7 +1152,7 @@ libxlDomainMigrationSrcPerformP2P(libxlDriverPrivateP= tr driver, virConnectPtr sconn, const char *xmlin, const char *dconnuri, - const char *uri_str ATTRIBUTE_UNUSED, + const char *uri_str G_GNUC_UNUSED, const char *dname, unsigned int flags) { @@ -1215,10 +1215,10 @@ libxlDomainMigrationSrcPerformP2P(libxlDriverPrivat= ePtr driver, int libxlDomainMigrationSrcPerform(libxlDriverPrivatePtr driver, virDomainObjPtr vm, - const char *dom_xml ATTRIBUTE_UNUSED, - const char *dconnuri ATTRIBUTE_UNUSED, + const char *dom_xml G_GNUC_UNUSED, + const char *dconnuri G_GNUC_UNUSED, const char *uri_str, - const char *dname ATTRIBUTE_UNUSED, + const char *dname G_GNUC_UNUSED, unsigned int flags) { libxlDomainObjPrivatePtr priv =3D vm->privateData; --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 10:00:01 2024 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=1571059035; cv=none; d=zoho.com; s=zohoarc; b=jLVYjUYF9XrTk4/2X/HZ76ekKUi1TlCn9x2a2dQbs3WP8doOf1su5ch+q9b2ngEChNQWDf+BgiFi83HSxxB1A6HXDLNl0/HO0ywDkTFLQ0WTHoERo6TKi2fGvXt3+QqAnaNaNTe65MT0zKFbuVXlISem9uXsYo3ks85OVX6ngsM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571059035; 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=oz1AiOQ6A6jF93kvs6FzzdREtfouk29x66Lvl7qRFmE=; b=GzZQSVRX2vGCqM2B0TOH5YpYrtVoP/wllbw9VU0Xewi9pbRLe4UxCTZ0LxBGExXTqhP8Hdq66jtjS0ha8uxM3VXe6WWlc0KainDoXOONgypyobHAXyIJqa51D/l0ddzCbk0LBN/Y5AswE5+iGBkcLXe8fewNzFkgOvWLStdgOGc= 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 1571059035417240.37225624790153; Mon, 14 Oct 2019 06:17:15 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7D321300C76A; Mon, 14 Oct 2019 13:17:13 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4EE64600CD; Mon, 14 Oct 2019 13:17:13 +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 F10954EEB8; Mon, 14 Oct 2019 13:17:12 +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 x9EDGP7a017420 for ; Mon, 14 Oct 2019 09:16:25 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6B57B6012C; Mon, 14 Oct 2019 13:16:25 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id E834360126 for ; Mon, 14 Oct 2019 13:16:24 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Mon, 14 Oct 2019 15:15:32 +0200 Message-Id: <7224e331e181302ffff3f9966a6b45bbcd2154b2.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 14/35] locking: 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.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.45]); Mon, 14 Oct 2019 13:17:14 +0000 (UTC) Use G_GNUC_UNUSED from GLib instead of ATTRIBUTE_UNUSED. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/locking/lock_daemon.c | 20 ++++++------- src/locking/lock_daemon_config.c | 2 +- src/locking/lock_daemon_dispatch.c | 32 ++++++++++---------- src/locking/lock_driver_lockd.c | 8 ++--- src/locking/lock_driver_nop.c | 48 +++++++++++++++--------------- src/locking/lock_driver_sanlock.c | 10 +++---- src/locking/lock_manager.c | 10 +++---- src/locking/sanlock_helper.c | 6 ++-- 8 files changed, 68 insertions(+), 68 deletions(-) diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c index c12cb4ea0f..59167d7d31 100644 --- a/src/locking/lock_daemon.c +++ b/src/locking/lock_daemon.c @@ -140,7 +140,7 @@ virLockDaemonUnlock(virLockDaemonPtr lockd) } =20 static void virLockDaemonLockSpaceDataFree(void *data, - const void *key ATTRIBUTE_UNUSE= D) + const void *key G_GNUC_UNUSED) { virLockSpaceFree(data); } @@ -209,7 +209,7 @@ virLockDaemonNew(virLockDaemonConfigPtr config, bool pr= ivileged) =20 =20 static virNetServerPtr -virLockDaemonNewServerPostExecRestart(virNetDaemonPtr dmn ATTRIBUTE_UNUSED, +virLockDaemonNewServerPostExecRestart(virNetDaemonPtr dmn G_GNUC_UNUSED, const char *name, virJSONValuePtr object, void *opaque) @@ -481,8 +481,8 @@ virLockDaemonUnixSocketPaths(bool privileged, =20 =20 static void -virLockDaemonErrorHandler(void *opaque ATTRIBUTE_UNUSED, - virErrorPtr err ATTRIBUTE_UNUSED) +virLockDaemonErrorHandler(void *opaque G_GNUC_UNUSED, + virErrorPtr err G_GNUC_UNUSED) { /* Don't do anything, since logging infrastructure already * took care of reporting the error */ @@ -552,16 +552,16 @@ virLockDaemonVersion(const char *argv0) =20 static void virLockDaemonShutdownHandler(virNetDaemonPtr dmn, - siginfo_t *sig ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) + siginfo_t *sig G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED) { virNetDaemonQuit(dmn); } =20 static void virLockDaemonExecRestartHandler(virNetDaemonPtr dmn, - siginfo_t *sig ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) + siginfo_t *sig G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED) { execRestart =3D true; virNetDaemonQuit(dmn); @@ -590,7 +590,7 @@ struct virLockDaemonClientReleaseData { =20 static int virLockDaemonClientReleaseLockspace(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virLockSpacePtr lockspace =3D payload; @@ -781,7 +781,7 @@ virLockDaemonClientNewPostExecRestart(virNetServerClien= tPtr client, =20 =20 static virJSONValuePtr -virLockDaemonClientPreExecRestart(virNetServerClientPtr client ATTRIBUTE_U= NUSED, +virLockDaemonClientPreExecRestart(virNetServerClientPtr client G_GNUC_UNUS= ED, void *opaque) { virLockDaemonClientPtr priv =3D opaque; diff --git a/src/locking/lock_daemon_config.c b/src/locking/lock_daemon_con= fig.c index 8df7cf89cd..f77d6c9017 100644 --- a/src/locking/lock_daemon_config.c +++ b/src/locking/lock_daemon_config.c @@ -62,7 +62,7 @@ virLockDaemonConfigFilePath(bool privileged, char **confi= gfile) =20 =20 virLockDaemonConfigPtr -virLockDaemonConfigNew(bool privileged ATTRIBUTE_UNUSED) +virLockDaemonConfigNew(bool privileged G_GNUC_UNUSED) { virLockDaemonConfigPtr data; =20 diff --git a/src/locking/lock_daemon_dispatch.c b/src/locking/lock_daemon_d= ispatch.c index 7f3c806220..d68fd9cf01 100644 --- a/src/locking/lock_daemon_dispatch.c +++ b/src/locking/lock_daemon_dispatch.c @@ -36,9 +36,9 @@ VIR_LOG_INIT("locking.lock_daemon_dispatch"); #include "lock_daemon_dispatch_stubs.h" =20 static int -virLockSpaceProtocolDispatchAcquireResource(virNetServerPtr server ATTRIBU= TE_UNUSED, +virLockSpaceProtocolDispatchAcquireResource(virNetServerPtr server G_GNUC_= UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE= _UNUSED, + virNetMessagePtr msg G_GNUC_UN= USED, virNetMessageErrorPtr rerr, virLockSpaceProtocolAcquireRes= ourceArgs *args) { @@ -96,9 +96,9 @@ virLockSpaceProtocolDispatchAcquireResource(virNetServerP= tr server ATTRIBUTE_UNU =20 =20 static int -virLockSpaceProtocolDispatchCreateResource(virNetServerPtr server ATTRIBUT= E_UNUSED, +virLockSpaceProtocolDispatchCreateResource(virNetServerPtr server G_GNUC_U= NUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_= UNUSED, + virNetMessagePtr msg G_GNUC_UNU= SED, virNetMessageErrorPtr rerr, virLockSpaceProtocolCreateResou= rceArgs *args) { @@ -145,9 +145,9 @@ virLockSpaceProtocolDispatchCreateResource(virNetServer= Ptr server ATTRIBUTE_UNUS =20 =20 static int -virLockSpaceProtocolDispatchDeleteResource(virNetServerPtr server ATTRIBUT= E_UNUSED, +virLockSpaceProtocolDispatchDeleteResource(virNetServerPtr server G_GNUC_U= NUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_= UNUSED, + virNetMessagePtr msg G_GNUC_UNU= SED, virNetMessageErrorPtr rerr, virLockSpaceProtocolDeleteResou= rceArgs *args) { @@ -194,9 +194,9 @@ virLockSpaceProtocolDispatchDeleteResource(virNetServer= Ptr server ATTRIBUTE_UNUS =20 =20 static int -virLockSpaceProtocolDispatchNew(virNetServerPtr server ATTRIBUTE_UNUSED, +virLockSpaceProtocolDispatchNew(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, virLockSpaceProtocolNewArgs *args) { @@ -250,9 +250,9 @@ virLockSpaceProtocolDispatchNew(virNetServerPtr server = ATTRIBUTE_UNUSED, =20 =20 static int -virLockSpaceProtocolDispatchRegister(virNetServerPtr server ATTRIBUTE_UNUS= ED, +virLockSpaceProtocolDispatchRegister(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, virLockSpaceProtocolRegisterArgs *arg= s) { @@ -296,9 +296,9 @@ virLockSpaceProtocolDispatchRegister(virNetServerPtr se= rver ATTRIBUTE_UNUSED, =20 =20 static int -virLockSpaceProtocolDispatchReleaseResource(virNetServerPtr server ATTRIBU= TE_UNUSED, +virLockSpaceProtocolDispatchReleaseResource(virNetServerPtr server G_GNUC_= UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE= _UNUSED, + virNetMessagePtr msg G_GNUC_UN= USED, virNetMessageErrorPtr rerr, virLockSpaceProtocolReleaseRes= ourceArgs *args) { @@ -347,9 +347,9 @@ virLockSpaceProtocolDispatchReleaseResource(virNetServe= rPtr server ATTRIBUTE_UNU =20 =20 static int -virLockSpaceProtocolDispatchRestrict(virNetServerPtr server ATTRIBUTE_UNUS= ED, +virLockSpaceProtocolDispatchRestrict(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, virLockSpaceProtocolRestrictArgs *arg= s) { @@ -386,9 +386,9 @@ virLockSpaceProtocolDispatchRestrict(virNetServerPtr se= rver ATTRIBUTE_UNUSED, =20 =20 static int -virLockSpaceProtocolDispatchCreateLockSpace(virNetServerPtr server ATTRIBU= TE_UNUSED, +virLockSpaceProtocolDispatchCreateLockSpace(virNetServerPtr server G_GNUC_= UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE= _UNUSED, + virNetMessagePtr msg G_GNUC_UN= USED, virNetMessageErrorPtr rerr, virLockSpaceProtocolCreateLock= SpaceArgs *args) { diff --git a/src/locking/lock_driver_lockd.c b/src/locking/lock_driver_lock= d.c index 67f512a64e..b29a1da48f 100644 --- a/src/locking/lock_driver_lockd.c +++ b/src/locking/lock_driver_lockd.c @@ -174,7 +174,7 @@ virLockManagerLockDaemonConnectionRegister(virLockManag= erPtr lock, =20 =20 static int -virLockManagerLockDaemonConnectionRestrict(virLockManagerPtr lock ATTRIBUT= E_UNUSED, +virLockManagerLockDaemonConnectionRestrict(virLockManagerPtr lock G_GNUC_U= NUSED, virNetClientPtr client, virNetClientProgramPtr program, int *counter) @@ -621,9 +621,9 @@ static int virLockManagerLockDaemonAddResource(virLockM= anagerPtr lock, =20 =20 static int virLockManagerLockDaemonAcquire(virLockManagerPtr lock, - const char *state ATTRIBUTE_UNU= SED, + const char *state G_GNUC_UNUSED, unsigned int flags, - virDomainLockFailureAction acti= on ATTRIBUTE_UNUSED, + virDomainLockFailureAction acti= on G_GNUC_UNUSED, int *fd) { virNetClientPtr client =3D NULL; @@ -742,7 +742,7 @@ static int virLockManagerLockDaemonRelease(virLockManag= erPtr lock, } =20 =20 -static int virLockManagerLockDaemonInquire(virLockManagerPtr lock ATTRIBUT= E_UNUSED, +static int virLockManagerLockDaemonInquire(virLockManagerPtr lock G_GNUC_U= NUSED, char **state, unsigned int flags) { diff --git a/src/locking/lock_driver_nop.c b/src/locking/lock_driver_nop.c index 227195ff64..1e28a42dc0 100644 --- a/src/locking/lock_driver_nop.c +++ b/src/locking/lock_driver_nop.c @@ -29,9 +29,9 @@ VIR_LOG_INIT("locking.lock_driver_nop"); =20 =20 -static int virLockManagerNopInit(unsigned int version ATTRIBUTE_UNUSED, - const char *configFile ATTRIBUTE_UNUSED, - unsigned int flags_unused ATTRIBUTE_UNUSE= D) +static int virLockManagerNopInit(unsigned int version G_GNUC_UNUSED, + const char *configFile G_GNUC_UNUSED, + unsigned int flags_unused G_GNUC_UNUSED) { VIR_DEBUG("version=3D%u configFile=3D%s flags=3D0x%x", version, NULLSTR(configFile), flags_unused); @@ -47,38 +47,38 @@ static int virLockManagerNopDeinit(void) } =20 =20 -static int virLockManagerNopNew(virLockManagerPtr lock ATTRIBUTE_UNUSED, - unsigned int type ATTRIBUTE_UNUSED, - size_t nparams ATTRIBUTE_UNUSED, - virLockManagerParamPtr params ATTRIBUTE_UN= USED, - unsigned int flags_unused ATTRIBUTE_UNUSED) +static int virLockManagerNopNew(virLockManagerPtr lock G_GNUC_UNUSED, + unsigned int type G_GNUC_UNUSED, + size_t nparams G_GNUC_UNUSED, + virLockManagerParamPtr params G_GNUC_UNUSE= D, + unsigned int flags_unused G_GNUC_UNUSED) { return 0; } =20 -static int virLockManagerNopAddResource(virLockManagerPtr lock ATTRIBUTE_U= NUSED, - unsigned int type ATTRIBUTE_UNUSED, - const char *name ATTRIBUTE_UNUSED, - size_t nparams ATTRIBUTE_UNUSED, - virLockManagerParamPtr params ATTR= IBUTE_UNUSED, - unsigned int flags_unused ATTRIBUT= E_UNUSED) +static int virLockManagerNopAddResource(virLockManagerPtr lock G_GNUC_UNUS= ED, + unsigned int type G_GNUC_UNUSED, + const char *name G_GNUC_UNUSED, + size_t nparams G_GNUC_UNUSED, + virLockManagerParamPtr params G_GN= UC_UNUSED, + unsigned int flags_unused G_GNUC_U= NUSED) { return 0; } =20 =20 -static int virLockManagerNopAcquire(virLockManagerPtr lock ATTRIBUTE_UNUSE= D, - const char *state ATTRIBUTE_UNUSED, - unsigned int flags_unused ATTRIBUTE_UN= USED, - virDomainLockFailureAction action ATTR= IBUTE_UNUSED, - int *fd ATTRIBUTE_UNUSED) +static int virLockManagerNopAcquire(virLockManagerPtr lock G_GNUC_UNUSED, + const char *state G_GNUC_UNUSED, + unsigned int flags_unused G_GNUC_UNUSE= D, + virDomainLockFailureAction action G_GN= UC_UNUSED, + int *fd G_GNUC_UNUSED) { return 0; } =20 -static int virLockManagerNopRelease(virLockManagerPtr lock ATTRIBUTE_UNUSE= D, +static int virLockManagerNopRelease(virLockManagerPtr lock G_GNUC_UNUSED, char **state, - unsigned int flags_unused ATTRIBUTE_UN= USED) + unsigned int flags_unused G_GNUC_UNUSE= D) { if (state) *state =3D NULL; @@ -86,9 +86,9 @@ static int virLockManagerNopRelease(virLockManagerPtr loc= k ATTRIBUTE_UNUSED, return 0; } =20 -static int virLockManagerNopInquire(virLockManagerPtr lock ATTRIBUTE_UNUSE= D, +static int virLockManagerNopInquire(virLockManagerPtr lock G_GNUC_UNUSED, char **state, - unsigned int flags_unused ATTRIBUTE_UN= USED) + unsigned int flags_unused G_GNUC_UNUSE= D) { if (state) *state =3D NULL; @@ -96,7 +96,7 @@ static int virLockManagerNopInquire(virLockManagerPtr loc= k ATTRIBUTE_UNUSED, return 0; } =20 -static void virLockManagerNopFree(virLockManagerPtr lock ATTRIBUTE_UNUSED) +static void virLockManagerNopFree(virLockManagerPtr lock G_GNUC_UNUSED) { } =20 diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sa= nlock.c index 7ebd63913e..5a5d130f3a 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -624,7 +624,7 @@ virLockManagerSanlockAddDisk(virLockManagerSanlockDrive= rPtr driver, virLockManagerPtr lock, const char *name, size_t nparams, - virLockManagerParamPtr params ATTRIBUTE_UNUSE= D, + virLockManagerParamPtr params G_GNUC_UNUSED, bool shared) { virLockManagerSanlockPrivatePtr priv =3D lock->privateData; @@ -920,10 +920,10 @@ virLockManagerSanlockRegisterKillscript(int sock, } #else static int -virLockManagerSanlockRegisterKillscript(int sock ATTRIBUTE_UNUSED, - const char *vmuri ATTRIBUTE_UNUSED, - const char *uuidstr ATTRIBUTE_UNUS= ED, - virDomainLockFailureAction action = ATTRIBUTE_UNUSED) +virLockManagerSanlockRegisterKillscript(int sock G_GNUC_UNUSED, + const char *vmuri G_GNUC_UNUSED, + const char *uuidstr G_GNUC_UNUSED, + virDomainLockFailureAction action = G_GNUC_UNUSED) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("sanlock is too old to support lock failure action")); diff --git a/src/locking/lock_manager.c b/src/locking/lock_manager.c index 1c8705ab11..c6940e5a69 100644 --- a/src/locking/lock_manager.c +++ b/src/locking/lock_manager.c @@ -196,10 +196,10 @@ virLockManagerPluginPtr virLockManagerPluginNew(const= char *name, } #else /* !HAVE_DLFCN_H */ virLockManagerPluginPtr -virLockManagerPluginNew(const char *name ATTRIBUTE_UNUSED, - const char *driverName ATTRIBUTE_UNUSED, - const char *configDir ATTRIBUTE_UNUSED, - unsigned int flags_unused ATTRIBUTE_UNUSED) +virLockManagerPluginNew(const char *name G_GNUC_UNUSED, + const char *driverName G_GNUC_UNUSED, + const char *configDir G_GNUC_UNUSED, + unsigned int flags_unused G_GNUC_UNUSED) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("this platform is missing dlopen")); @@ -253,7 +253,7 @@ void virLockManagerPluginUnref(virLockManagerPluginPtr = plugin) VIR_FREE(plugin); } #else /* !HAVE_DLFCN_H */ -void virLockManagerPluginUnref(virLockManagerPluginPtr plugin ATTRIBUTE_UN= USED) +void virLockManagerPluginUnref(virLockManagerPluginPtr plugin G_GNUC_UNUSE= D) { } #endif /* !HAVE_DLFCN_H */ diff --git a/src/locking/sanlock_helper.c b/src/locking/sanlock_helper.c index d589576f04..e07db8a6df 100644 --- a/src/locking/sanlock_helper.c +++ b/src/locking/sanlock_helper.c @@ -36,9 +36,9 @@ getArgs(int argc, =20 =20 static int -authCallback(virConnectCredentialPtr cred ATTRIBUTE_UNUSED, - unsigned int ncred ATTRIBUTE_UNUSED, - void *cbdata ATTRIBUTE_UNUSED) +authCallback(virConnectCredentialPtr cred G_GNUC_UNUSED, + unsigned int ncred G_GNUC_UNUSED, + void *cbdata G_GNUC_UNUSED) { return -1; } --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 10:00:01 2024 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=1571059191; cv=none; d=zoho.com; s=zohoarc; b=KdBuwLRixqg/qizjMMo48WPNdHM8QfdomOchGs6CnZlGU7yo6z8gFA0BzvL8x9bZ4owzzNNYlGR6oQnjCzEGfj2nSTLGWOng6BTk6LX/+Q1uW9NoQYWQhBte/Um4UlC1DLoBM0+Q2snpHw27/7IMQbitgLaYvvSoyAvGBHMuSS4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571059191; 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=MVQ7uZNmpQclRvrr8i32nmAk+WrXEy3S6dq4Upq0wUU=; b=QyKRU/ruXhBgtf+va4GEFC7/T9J8bGGQpCXGLHfZ2utfy2QfuwdF2YRPCrFqLOzAN3ui7twFyg7eNr4/HkO+mklyJAUKvKTPY2ITmm1tHWVQx7NW81xqN6tE439TCv0b/CCGTVO+upj+hP5AzYbVT+4PD+33qxo+69XsImJSOUQ= 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 1571059191507294.3904146045669; Mon, 14 Oct 2019 06:19:51 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 056BA81127; Mon, 14 Oct 2019 13:19:50 +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 CEB7360BE2; Mon, 14 Oct 2019 13:19:49 +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 8E2AB1803518; Mon, 14 Oct 2019 13:19:49 +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 x9EDGQ08017428 for ; Mon, 14 Oct 2019 09:16:26 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3BEC860127; Mon, 14 Oct 2019 13:16:26 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id B8A7460126 for ; Mon, 14 Oct 2019 13:16:25 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Mon, 14 Oct 2019 15:15:33 +0200 Message-Id: <51d99dc9e0d021b5f8ad1d5d2dad2fc677c24e90.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 15/35] logging: 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.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Mon, 14 Oct 2019 13:19:50 +0000 (UTC) Use G_GNUC_UNUSED from GLib instead of ATTRIBUTE_UNUSED. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/logging/log_daemon.c | 18 +++++++++--------- src/logging/log_daemon_config.c | 2 +- src/logging/log_daemon_dispatch.c | 22 +++++++++++----------- src/logging/log_handler.c | 6 +++--- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/logging/log_daemon.c b/src/logging/log_daemon.c index 9621702138..e56dbf2919 100644 --- a/src/logging/log_daemon.c +++ b/src/logging/log_daemon.c @@ -422,8 +422,8 @@ virLogDaemonUnixSocketPaths(bool privileged, =20 =20 static void -virLogDaemonErrorHandler(void *opaque ATTRIBUTE_UNUSED, - virErrorPtr err ATTRIBUTE_UNUSED) +virLogDaemonErrorHandler(void *opaque G_GNUC_UNUSED, + virErrorPtr err G_GNUC_UNUSED) { /* Don't do anything, since logging infrastructure already * took care of reporting the error */ @@ -487,16 +487,16 @@ virLogDaemonVersion(const char *argv0) =20 static void virLogDaemonShutdownHandler(virNetDaemonPtr dmn, - siginfo_t *sig ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) + siginfo_t *sig G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED) { virNetDaemonQuit(dmn); } =20 static void virLogDaemonExecRestartHandler(virNetDaemonPtr dmn, - siginfo_t *sig ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) + siginfo_t *sig G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED) { execRestart =3D true; virNetDaemonQuit(dmn); @@ -593,7 +593,7 @@ virLogDaemonClientNew(virNetServerClientPtr client, =20 static void * virLogDaemonClientNewPostExecRestart(virNetServerClientPtr client, - virJSONValuePtr object ATTRIBUTE_UNUS= ED, + virJSONValuePtr object G_GNUC_UNUSED, void *opaque) { virLogDaemonClientPtr priv =3D virLogDaemonClientNew(client, opaque); @@ -606,8 +606,8 @@ virLogDaemonClientNewPostExecRestart(virNetServerClient= Ptr client, =20 =20 static virJSONValuePtr -virLogDaemonClientPreExecRestart(virNetServerClientPtr client ATTRIBUTE_UN= USED, - void *opaque ATTRIBUTE_UNUSED) +virLogDaemonClientPreExecRestart(virNetServerClientPtr client G_GNUC_UNUSE= D, + void *opaque G_GNUC_UNUSED) { virJSONValuePtr object =3D virJSONValueNewObject(); =20 diff --git a/src/logging/log_daemon_config.c b/src/logging/log_daemon_confi= g.c index c7dfa19b5d..9895babc2f 100644 --- a/src/logging/log_daemon_config.c +++ b/src/logging/log_daemon_config.c @@ -63,7 +63,7 @@ virLogDaemonConfigFilePath(bool privileged, char **config= file) =20 =20 virLogDaemonConfigPtr -virLogDaemonConfigNew(bool privileged ATTRIBUTE_UNUSED) +virLogDaemonConfigNew(bool privileged G_GNUC_UNUSED) { virLogDaemonConfigPtr data; =20 diff --git a/src/logging/log_daemon_dispatch.c b/src/logging/log_daemon_dis= patch.c index 0442e8cd94..73b5efd5a0 100644 --- a/src/logging/log_daemon_dispatch.c +++ b/src/logging/log_daemon_dispatch.c @@ -37,8 +37,8 @@ VIR_LOG_INIT("logging.log_daemon_dispatch"); #include "log_daemon_dispatch_stubs.h" =20 static int -virLogManagerProtocolDispatchDomainOpenLogFile(virNetServerPtr server ATTR= IBUTE_UNUSED, - virNetServerClientPtr clien= t ATTRIBUTE_UNUSED, +virLogManagerProtocolDispatchDomainOpenLogFile(virNetServerPtr server G_GN= UC_UNUSED, + virNetServerClientPtr clien= t G_GNUC_UNUSED, virNetMessagePtr msg, virNetMessageErrorPtr rerr, virLogManagerProtocolDomain= OpenLogFileArgs *args, @@ -76,9 +76,9 @@ virLogManagerProtocolDispatchDomainOpenLogFile(virNetServ= erPtr server ATTRIBUTE_ =20 =20 static int -virLogManagerProtocolDispatchDomainGetLogFilePosition(virNetServerPtr serv= er ATTRIBUTE_UNUSED, - virNetServerClientPt= r client ATTRIBUTE_UNUSED, - virNetMessagePtr msg= ATTRIBUTE_UNUSED, +virLogManagerProtocolDispatchDomainGetLogFilePosition(virNetServerPtr serv= er G_GNUC_UNUSED, + virNetServerClientPt= r client G_GNUC_UNUSED, + virNetMessagePtr msg= G_GNUC_UNUSED, virNetMessageErrorPt= r rerr, virLogManagerProtoco= lDomainGetLogFilePositionArgs *args, virLogManagerProtoco= lDomainGetLogFilePositionRet *ret) @@ -106,9 +106,9 @@ virLogManagerProtocolDispatchDomainGetLogFilePosition(v= irNetServerPtr server ATT =20 =20 static int -virLogManagerProtocolDispatchDomainReadLogFile(virNetServerPtr server ATTR= IBUTE_UNUSED, - virNetServerClientPtr clien= t ATTRIBUTE_UNUSED, - virNetMessagePtr msg ATTRIB= UTE_UNUSED, +virLogManagerProtocolDispatchDomainReadLogFile(virNetServerPtr server G_GN= UC_UNUSED, + virNetServerClientPtr clien= t G_GNUC_UNUSED, + virNetMessagePtr msg G_GNUC= _UNUSED, virNetMessageErrorPtr rerr, virLogManagerProtocolDomain= ReadLogFileArgs *args, virLogManagerProtocolDomain= ReadLogFileRet *ret) @@ -144,9 +144,9 @@ virLogManagerProtocolDispatchDomainReadLogFile(virNetSe= rverPtr server ATTRIBUTE_ =20 =20 static int -virLogManagerProtocolDispatchDomainAppendLogFile(virNetServerPtr server AT= TRIBUTE_UNUSED, - virNetServerClientPtr cli= ent ATTRIBUTE_UNUSED, - virNetMessagePtr msg ATTR= IBUTE_UNUSED, +virLogManagerProtocolDispatchDomainAppendLogFile(virNetServerPtr server G_= GNUC_UNUSED, + virNetServerClientPtr cli= ent G_GNUC_UNUSED, + virNetMessagePtr msg G_GN= UC_UNUSED, virNetMessageErrorPtr rer= r, virLogManagerProtocolDoma= inAppendLogFileArgs *args, virLogManagerProtocolDoma= inAppendLogFileRet *ret) diff --git a/src/logging/log_handler.c b/src/logging/log_handler.c index 16c5ce0cf2..025a546b51 100644 --- a/src/logging/log_handler.c +++ b/src/logging/log_handler.c @@ -566,9 +566,9 @@ virLogHandlerDomainReadLogFile(virLogHandlerPtr handler, =20 int virLogHandlerDomainAppendLogFile(virLogHandlerPtr handler, - const char *driver ATTRIBUTE_UNUSED, - const unsigned char *domuuid ATTRIBUTE_UN= USED, - const char *domname ATTRIBUTE_UNUSED, + const char *driver G_GNUC_UNUSED, + const unsigned char *domuuid G_GNUC_UNUSE= D, + const char *domname G_GNUC_UNUSED, const char *path, const char *message, unsigned int flags) --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 10:00:01 2024 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 Reviewed-by: Michal Privoznik --- 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 From nobody Sun May 5 10:00:01 2024 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=1571059026; cv=none; d=zoho.com; s=zohoarc; b=lFcNrpnF7qu6fyeFAPNb8YZzcX8vapPVquY5WQVDTNbTyOttxaSTr3LHhynzriQNS0+85n8PZA0ZZU+gFSeiDQqidgX4uiEyOKjKflNr09LQNimKVrCBFBJ8GaYnNfbXkSJVHNRMKNw7Wgh8hlqFkXMsw+jBnUZP3RfedNYMRrU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571059026; 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=FSXeukGp3ENsUYrdnucPXflIcnxEeCPyOEaBd4vS0f4=; b=B3m6txXq+eq0V3b+24HF2Gz77kqEoG5v3wMPezdrQYhNuvPAR5sSNdB1PUr2BUqeCSq64bE0KpznserOdw/0UQg8+Poosm/1fzcZdANJ5jtGOmOP3WG7Rs9UHVC+xlg+3RIRBOf1aPu/HtpmDZdJxWJwGqy67NbTZ0rpbCufaLQ= 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 1571059026785509.1522422378574; Mon, 14 Oct 2019 06:17:06 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 756713084295; Mon, 14 Oct 2019 13:17:04 +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 4EAF11001B07; Mon, 14 Oct 2019 13:17:04 +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 0BA71180BA9A; Mon, 14 Oct 2019 13:17:04 +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 x9EDGRwa017448 for ; Mon, 14 Oct 2019 09:16:27 -0400 Received: by smtp.corp.redhat.com (Postfix) id CFBC960127; 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 58B5C600CD for ; Mon, 14 Oct 2019 13:16:27 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Mon, 14 Oct 2019 15:15:35 +0200 Message-Id: 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 17/35] network: 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.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Mon, 14 Oct 2019 13:17:05 +0000 (UTC) Use G_GNUC_UNUSED from GLib instead of ATTRIBUTE_UNUSED. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/network/bridge_driver.c | 26 +++++++++++++------------- src/network/bridge_driver_linux.c | 2 +- src/network/bridge_driver_nop.c | 12 ++++++------ 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index d10665efa3..4beb28a5d9 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -662,7 +662,7 @@ networkAutostartConfig(virNetworkObjPtr obj, =20 #ifdef WITH_FIREWALLD static DBusHandlerResult -firewalld_dbus_filter_bridge(DBusConnection *connection ATTRIBUTE_UNUSED, +firewalld_dbus_filter_bridge(DBusConnection *connection G_GNUC_UNUSED, DBusMessage *message, void *user_data) { @@ -709,8 +709,8 @@ firewalld_dbus_filter_bridge(DBusConnection *connection= ATTRIBUTE_UNUSED, */ static int networkStateInitialize(bool privileged, - virStateInhibitCallback callback ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) + virStateInhibitCallback callback G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED) { int ret =3D VIR_DRV_STATE_INIT_ERROR; char *configdir =3D NULL; @@ -932,8 +932,8 @@ networkStateCleanup(void) =20 static virDrvOpenStatus networkConnectOpen(virConnectPtr conn, - virConnectAuthPtr auth ATTRIBUTE_UNUSED, - virConfPtr conf ATTRIBUTE_UNUSED, + virConnectAuthPtr auth G_GNUC_UNUSED, + virConfPtr conf G_GNUC_UNUSED, unsigned int flags) { virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); @@ -955,27 +955,27 @@ networkConnectOpen(virConnectPtr conn, return VIR_DRV_OPEN_SUCCESS; } =20 -static int networkConnectClose(virConnectPtr conn ATTRIBUTE_UNUSED) +static int networkConnectClose(virConnectPtr conn G_GNUC_UNUSED) { return 0; } =20 =20 -static int networkConnectIsSecure(virConnectPtr conn ATTRIBUTE_UNUSED) +static int networkConnectIsSecure(virConnectPtr conn G_GNUC_UNUSED) { /* Trivially secure, since always inside the daemon */ return 1; } =20 =20 -static int networkConnectIsEncrypted(virConnectPtr conn ATTRIBUTE_UNUSED) +static int networkConnectIsEncrypted(virConnectPtr conn G_GNUC_UNUSED) { /* Not encrypted, but remote driver takes care of that */ return 0; } =20 =20 -static int networkConnectIsAlive(virConnectPtr conn ATTRIBUTE_UNUSED) +static int networkConnectIsAlive(virConnectPtr conn G_GNUC_UNUSED) { return 1; } @@ -1131,7 +1131,7 @@ networkDnsmasqConfContents(virNetworkObjPtr obj, const char *pidfile, char **configstr, dnsmasqContext *dctx, - dnsmasqCapsPtr caps ATTRIBUTE_UNUSED) + dnsmasqCapsPtr caps G_GNUC_UNUSED) { virNetworkDefPtr def =3D virNetworkObjGetDef(obj); virBuffer configbuf =3D VIR_BUFFER_INITIALIZER; @@ -2213,7 +2213,7 @@ networkRefreshDaemons(virNetworkDriverStatePtr driver) =20 static int networkReloadFirewallRulesHelper(virNetworkObjPtr obj, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { virNetworkDefPtr def; =20 @@ -2760,7 +2760,7 @@ networkStartNetworkBridge(virNetworkObjPtr obj) =20 =20 static int -networkShutdownNetworkBridge(virNetworkObjPtr obj ATTRIBUTE_UNUSED) +networkShutdownNetworkBridge(virNetworkObjPtr obj G_GNUC_UNUSED) { virNetworkDefPtr def =3D virNetworkObjGetDef(obj); =20 @@ -2900,7 +2900,7 @@ networkStartNetworkExternal(virNetworkObjPtr obj) =20 =20 static int -networkShutdownNetworkExternal(virNetworkObjPtr obj ATTRIBUTE_UNUSED) +networkShutdownNetworkExternal(virNetworkObjPtr obj G_GNUC_UNUSED) { /* put anything here that needs to be done each time a network of * type BRIDGE, PRIVATE, VEPA, HOSTDEV or PASSTHROUGH is shutdown. On diff --git a/src/network/bridge_driver_linux.c b/src/network/bridge_driver_= linux.c index 35459c10d1..d62fb899b9 100644 --- a/src/network/bridge_driver_linux.c +++ b/src/network/bridge_driver_linux.c @@ -157,7 +157,7 @@ void networkPreReloadFirewallRules(virNetworkDriverStat= ePtr driver, bool startup } =20 =20 -void networkPostReloadFirewallRules(bool startup ATTRIBUTE_UNUSED) +void networkPostReloadFirewallRules(bool startup G_GNUC_UNUSED) { iptablesSetDeletePrivate(true); } diff --git a/src/network/bridge_driver_nop.c b/src/network/bridge_driver_no= p.c index ec7b1ed8b7..08d737511f 100644 --- a/src/network/bridge_driver_nop.c +++ b/src/network/bridge_driver_nop.c @@ -19,27 +19,27 @@ =20 #include =20 -void networkPreReloadFirewallRules(virNetworkDriverStatePtr driver ATTRIBU= TE_UNUSED, - bool startup ATTRIBUTE_UNUSED) +void networkPreReloadFirewallRules(virNetworkDriverStatePtr driver G_GNUC_= UNUSED, + bool startup G_GNUC_UNUSED) { } =20 =20 -void networkPostReloadFirewallRules(bool startup ATTRIBUTE_UNUSED) +void networkPostReloadFirewallRules(bool startup G_GNUC_UNUSED) { } =20 =20 -int networkCheckRouteCollision(virNetworkDefPtr def ATTRIBUTE_UNUSED) +int networkCheckRouteCollision(virNetworkDefPtr def G_GNUC_UNUSED) { return 0; } =20 -int networkAddFirewallRules(virNetworkDefPtr def ATTRIBUTE_UNUSED) +int networkAddFirewallRules(virNetworkDefPtr def G_GNUC_UNUSED) { return 0; } =20 -void networkRemoveFirewallRules(virNetworkDefPtr def ATTRIBUTE_UNUSED) +void networkRemoveFirewallRules(virNetworkDefPtr def G_GNUC_UNUSED) { } --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 10:00:01 2024 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=1571059194; cv=none; d=zoho.com; s=zohoarc; b=C/TIPNz+xJ16y/PatwufTbKO/ieYVTa7Dj+nR3y8/iezfdLo5QzvjO3HA3yWZkc5083lhqRByfIdySC+7QO/6TMAB/IEuFLEZ7I+E+WZcD2Q2TCNboME3GT1Sam6GBm3na5s5p9Yai6NLZCIQuQ7JNNZzYfSKG8bVm+eSo/Np1g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571059194; 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=MPuc0eLLYDt/utDFCBhBWjvOs24FNqqoeTMKWObzHLQ=; b=bEG8Pht0d1Ep3RPsoUHlGjSZAgNXRu2TRgV4m27HgDaxLgkwjdqAiYlXqpnZTnDg9gk3MY2JeCu//HKyJ0eAVrwu746Gz1CPsZIaeBe5ZwD4nG23A8uV4BkNKMJjXDnrI8HI1S7QwkKyx5VY6EPGP9qCjG67n3l8nc+dfifTjko= 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 1571059194989432.11890884613376; Mon, 14 Oct 2019 06:19:54 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6FD4D8E1CE8; Mon, 14 Oct 2019 13:19:53 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4933A6012C; Mon, 14 Oct 2019 13:19:53 +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 F3AB425540; Mon, 14 Oct 2019 13:19:52 +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 x9EDGSHi017463 for ; Mon, 14 Oct 2019 09:16:28 -0400 Received: by smtp.corp.redhat.com (Postfix) id A17A06012C; Mon, 14 Oct 2019 13:16:28 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 291AA600CD for ; Mon, 14 Oct 2019 13:16:28 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Mon, 14 Oct 2019 15:15:36 +0200 Message-Id: <1d8c26ba86c12160bb0d68746d0f99e5a136b6a8.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 18/35] node_device: 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.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.69]); Mon, 14 Oct 2019 13:19:54 +0000 (UTC) Use G_GNUC_UNUSED from GLib instead of ATTRIBUTE_UNUSED. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/node_device/node_device_driver.c | 14 +++++++------- src/node_device/node_device_hal.c | 18 +++++++++--------- src/node_device/node_device_udev.c | 20 ++++++++++---------- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_de= vice_driver.c index 578489c5be..f95eacf6a2 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -46,8 +46,8 @@ virNodeDeviceDriverStatePtr driver; =20 virDrvOpenStatus nodeConnectOpen(virConnectPtr conn, - virConnectAuthPtr auth ATTRIBUTE_UNUSED, - virConfPtr conf ATTRIBUTE_UNUSED, + virConnectAuthPtr auth G_GNUC_UNUSED, + virConfPtr conf G_GNUC_UNUSED, unsigned int flags) { virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); @@ -69,27 +69,27 @@ nodeConnectOpen(virConnectPtr conn, return VIR_DRV_OPEN_SUCCESS; } =20 -int nodeConnectClose(virConnectPtr conn ATTRIBUTE_UNUSED) +int nodeConnectClose(virConnectPtr conn G_GNUC_UNUSED) { return 0; } =20 =20 -int nodeConnectIsSecure(virConnectPtr conn ATTRIBUTE_UNUSED) +int nodeConnectIsSecure(virConnectPtr conn G_GNUC_UNUSED) { /* Trivially secure, since always inside the daemon */ return 1; } =20 =20 -int nodeConnectIsEncrypted(virConnectPtr conn ATTRIBUTE_UNUSED) +int nodeConnectIsEncrypted(virConnectPtr conn G_GNUC_UNUSED) { /* Not encrypted, but remote driver takes care of that */ return 0; } =20 =20 -int nodeConnectIsAlive(virConnectPtr conn ATTRIBUTE_UNUSED) +int nodeConnectIsAlive(virConnectPtr conn G_GNUC_UNUSED) { return 1; } @@ -142,7 +142,7 @@ nodeDeviceUpdateDriverName(virNodeDeviceDefPtr def) #else /* XXX: Implement me for non-linux */ static int -nodeDeviceUpdateDriverName(virNodeDeviceDefPtr def ATTRIBUTE_UNUSED) +nodeDeviceUpdateDriverName(virNodeDeviceDefPtr def G_GNUC_UNUSED) { return 0; } diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_devic= e_hal.c index c613ca5808..b046f03c83 100644 --- a/src/node_device/node_device_hal.c +++ b/src/node_device/node_device_hal.c @@ -520,7 +520,7 @@ dev_refresh(const char *udi) } =20 static void -device_added(LibHalContext *ctx ATTRIBUTE_UNUSED, +device_added(LibHalContext *ctx G_GNUC_UNUSED, const char *udi) { VIR_DEBUG("%s", hal_name(udi)); @@ -529,7 +529,7 @@ device_added(LibHalContext *ctx ATTRIBUTE_UNUSED, =20 =20 static void -device_removed(LibHalContext *ctx ATTRIBUTE_UNUSED, +device_removed(LibHalContext *ctx G_GNUC_UNUSED, const char *udi) { const char *name =3D hal_name(udi); @@ -565,7 +565,7 @@ device_cap_added(LibHalContext *ctx, =20 =20 static void -device_cap_lost(LibHalContext *ctx ATTRIBUTE_UNUSED, +device_cap_lost(LibHalContext *ctx G_GNUC_UNUSED, const char *udi, const char *cap) { @@ -577,11 +577,11 @@ device_cap_lost(LibHalContext *ctx ATTRIBUTE_UNUSED, =20 =20 static void -device_prop_modified(LibHalContext *ctx ATTRIBUTE_UNUSED, +device_prop_modified(LibHalContext *ctx G_GNUC_UNUSED, const char *udi, const char *key, - dbus_bool_t is_removed ATTRIBUTE_UNUSED, - dbus_bool_t is_added ATTRIBUTE_UNUSED) + dbus_bool_t is_removed G_GNUC_UNUSED, + dbus_bool_t is_added G_GNUC_UNUSED) { const char *name =3D hal_name(udi); VIR_DEBUG("%s %s", name, key); @@ -591,9 +591,9 @@ device_prop_modified(LibHalContext *ctx ATTRIBUTE_UNUSE= D, =20 =20 static int -nodeStateInitialize(bool privileged ATTRIBUTE_UNUSED, - virStateInhibitCallback callback ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) +nodeStateInitialize(bool privileged G_GNUC_UNUSED, + virStateInhibitCallback callback G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED) { LibHalContext *hal_ctx =3D NULL; char **udi =3D NULL; diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_devi= ce_udev.c index 5550ee3a54..80d39e9509 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -606,7 +606,7 @@ udevProcessNetworkInterface(struct udev_device *device, =20 =20 static int -udevProcessSCSIHost(struct udev_device *device ATTRIBUTE_UNUSED, +udevProcessSCSIHost(struct udev_device *device G_GNUC_UNUSED, virNodeDeviceDefPtr def) { virNodeDevCapSCSIHostPtr scsi_host =3D &def->caps->data.scsi_host; @@ -654,7 +654,7 @@ udevProcessSCSITarget(struct udev_device *device, =20 =20 static int -udevGetSCSIType(virNodeDeviceDefPtr def ATTRIBUTE_UNUSED, +udevGetSCSIType(virNodeDeviceDefPtr def G_GNUC_UNUSED, unsigned int type, char **typestring) { @@ -714,7 +714,7 @@ udevGetSCSIType(virNodeDeviceDefPtr def ATTRIBUTE_UNUSE= D, =20 =20 static int -udevProcessSCSIDevice(struct udev_device *device ATTRIBUTE_UNUSED, +udevProcessSCSIDevice(struct udev_device *device G_GNUC_UNUSED, virNodeDeviceDefPtr def) { int ret =3D -1; @@ -1578,7 +1578,7 @@ udevEventMonitorSanityCheck(udevEventDataPtr priv, * would still come into play. */ static void -udevEventHandleThread(void *opaque ATTRIBUTE_UNUSED) +udevEventHandleThread(void *opaque G_GNUC_UNUSED) { udevEventDataPtr priv =3D driver->privateData; struct udev_device *device =3D NULL; @@ -1645,10 +1645,10 @@ udevEventHandleThread(void *opaque ATTRIBUTE_UNUSED) =20 =20 static void -udevEventHandleCallback(int watch ATTRIBUTE_UNUSED, +udevEventHandleCallback(int watch G_GNUC_UNUSED, int fd, - int events ATTRIBUTE_UNUSED, - void *data ATTRIBUTE_UNUSED) + int events G_GNUC_UNUSED, + void *data G_GNUC_UNUSED) { udevEventDataPtr priv =3D driver->privateData; =20 @@ -1783,7 +1783,7 @@ nodeStateInitializeEnumerate(void *opaque) =20 =20 static int -udevPCITranslateInit(bool privileged ATTRIBUTE_UNUSED) +udevPCITranslateInit(bool privileged G_GNUC_UNUSED) { #if defined __s390__ || defined __s390x_ /* On s390(x) system there is no PCI bus. @@ -1808,8 +1808,8 @@ udevPCITranslateInit(bool privileged ATTRIBUTE_UNUSED) =20 static int nodeStateInitialize(bool privileged, - virStateInhibitCallback callback ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) + virStateInhibitCallback callback G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED) { udevEventDataPtr priv =3D NULL; struct udev *udev =3D NULL; --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 10:00:01 2024 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=1571059043; cv=none; d=zoho.com; s=zohoarc; b=ohE33wX0vesho+sJuxqPczAf0qfaIvWjlz7R3726F39YKWcwKcKtiJzG3PymOmmv4vlewrf7E8rLjyPdQ47Y/2kriWsFiLGZ8TuOJxtG+z+pK6ZHMahfbujVtEC8ylYiKezm78SCbtoM7A4Qohb2530OCus9NwFBjjJWlW0C2Ss= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571059043; 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=UzuRFwJ25bI+hME/VpgoBiq99x6I5u0DQVYpHMLww8A=; b=oaP8TLbdP5WdaSN57feREFgu4fzGzid8I+h8NNsrxsOFL/Z9TYUiHEfwKm04U24LQyHCFHAJ+C2yD135/KuKb4c6b/K7IcpjaatpiE4FaylIOQW8Y++pKUnGwTz3dxs1FqAe37e+vDXrEp0vNH6TAEr5Q/QFkusFdHI++j/xd2A= 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 1571059043154147.48058627514956; Mon, 14 Oct 2019 06:17:23 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 02337308404F; Mon, 14 Oct 2019 13:17:21 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C83805D784; Mon, 14 Oct 2019 13:17:20 +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 7E2814EEBD; Mon, 14 Oct 2019 13:17:20 +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 x9EDGTSm017470 for ; Mon, 14 Oct 2019 09:16:29 -0400 Received: by smtp.corp.redhat.com (Postfix) id 724076012C; Mon, 14 Oct 2019 13:16:29 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id EEC86600CD for ; Mon, 14 Oct 2019 13:16:28 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Mon, 14 Oct 2019 15:15:37 +0200 Message-Id: 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 19/35] nwfilter: 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.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Mon, 14 Oct 2019 13:17:22 +0000 (UTC) Use G_GNUC_UNUSED from GLib instead of ATTRIBUTE_UNUSED. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/nwfilter/nwfilter_dhcpsnoop.c | 20 ++++++++++---------- src/nwfilter/nwfilter_driver.c | 22 +++++++++++----------- src/nwfilter/nwfilter_ebiptables_driver.c | 12 ++++++------ src/nwfilter/nwfilter_gentech_driver.c | 2 +- src/nwfilter/nwfilter_learnipaddr.c | 12 ++++++------ 5 files changed, 34 insertions(+), 34 deletions(-) diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcp= snoop.c index c82457989e..dae2ad611d 100644 --- a/src/nwfilter/nwfilter_dhcpsnoop.c +++ b/src/nwfilter/nwfilter_dhcpsnoop.c @@ -661,7 +661,7 @@ virNWFilterSnoopReqUnlock(virNWFilterSnoopReqPtr req) * virNWFilterSnoopReqRelease - hash table free function to kill a request */ static void -virNWFilterSnoopReqRelease(void *req0, const void *name ATTRIBUTE_UNUSED) +virNWFilterSnoopReqRelease(void *req0, const void *name G_GNUC_UNUSED) { virNWFilterSnoopReqPtr req =3D req0; =20 @@ -1826,8 +1826,8 @@ virNWFilterSnoopLeaseFileSave(virNWFilterSnoopIPLease= Ptr ipl) */ static int virNWFilterSnoopPruneIter(const void *payload, - const void *name ATTRIBUTE_UNUSED, - const void *data ATTRIBUTE_UNUSED) + const void *name G_GNUC_UNUSED, + const void *data G_GNUC_UNUSED) { virNWFilterSnoopReqPtr req =3D (virNWFilterSnoopReqPtr)payload; bool del_req; @@ -1856,7 +1856,7 @@ virNWFilterSnoopPruneIter(const void *payload, */ static int virNWFilterSnoopSaveIter(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *data) { virNWFilterSnoopReqPtr req =3D payload; @@ -2023,8 +2023,8 @@ virNWFilterSnoopJoinThreads(void) */ static int virNWFilterSnoopRemAllReqIter(const void *payload, - const void *name ATTRIBUTE_UNUSED, - const void *data ATTRIBUTE_UNUSED) + const void *name G_GNUC_UNUSED, + const void *data G_GNUC_UNUSED) { virNWFilterSnoopReqPtr req =3D (virNWFilterSnoopReqPtr)payload; =20 @@ -2200,7 +2200,7 @@ virNWFilterDHCPSnoopInit(void) } =20 void -virNWFilterDHCPSnoopEnd(const char *ifname ATTRIBUTE_UNUSED) +virNWFilterDHCPSnoopEnd(const char *ifname G_GNUC_UNUSED) { return; } @@ -2212,9 +2212,9 @@ virNWFilterDHCPSnoopShutdown(void) } =20 int -virNWFilterDHCPSnoopReq(virNWFilterTechDriverPtr techdriver ATTRIBUTE_UNUS= ED, - virNWFilterBindingDefPtr binding ATTRIBUTE_UNUSED, - virNWFilterDriverStatePtr driver ATTRIBUTE_UNUSED) +virNWFilterDHCPSnoopReq(virNWFilterTechDriverPtr techdriver G_GNUC_UNUSED, + virNWFilterBindingDefPtr binding G_GNUC_UNUSED, + virNWFilterDriverStatePtr driver G_GNUC_UNUSED) { virReportError(VIR_ERR_INTERNAL_ERROR, _("libvirt was not compiled with libpcap and \"" diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index aef5bd4c7f..fbdf250934 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -80,9 +80,9 @@ static void nwfilterDriverUnlock(void) #ifdef WITH_FIREWALLD =20 static DBusHandlerResult -nwfilterFirewalldDBusFilter(DBusConnection *connection ATTRIBUTE_UNUSED, +nwfilterFirewalldDBusFilter(DBusConnection *connection G_GNUC_UNUSED, DBusMessage *message, - void *user_data ATTRIBUTE_UNUSED) + void *user_data G_GNUC_UNUSED) { if (dbus_message_is_signal(message, DBUS_INTERFACE_DBUS, "NameOwnerChanged") || @@ -154,7 +154,7 @@ nwfilterDriverRemoveDBusMatches(void) } =20 static int -nwfilterDriverInstallDBusMatches(DBusConnection *sysbus ATTRIBUTE_UNUSED) +nwfilterDriverInstallDBusMatches(DBusConnection *sysbus G_GNUC_UNUSED) { return 0; } @@ -177,8 +177,8 @@ virNWFilterTriggerRebuildImpl(void *opaque) */ static int nwfilterStateInitialize(bool privileged, - virStateInhibitCallback callback ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) + virStateInhibitCallback callback G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED) { DBusConnection *sysbus =3D NULL; =20 @@ -384,8 +384,8 @@ nwfilterStateCleanup(void) =20 static virDrvOpenStatus nwfilterConnectOpen(virConnectPtr conn, - virConnectAuthPtr auth ATTRIBUTE_UNUSED, - virConfPtr conf ATTRIBUTE_UNUSED, + virConnectAuthPtr auth G_GNUC_UNUSED, + virConfPtr conf G_GNUC_UNUSED, unsigned int flags) { virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); @@ -409,27 +409,27 @@ nwfilterConnectOpen(virConnectPtr conn, return VIR_DRV_OPEN_SUCCESS; } =20 -static int nwfilterConnectClose(virConnectPtr conn ATTRIBUTE_UNUSED) +static int nwfilterConnectClose(virConnectPtr conn G_GNUC_UNUSED) { return 0; } =20 =20 -static int nwfilterConnectIsSecure(virConnectPtr conn ATTRIBUTE_UNUSED) +static int nwfilterConnectIsSecure(virConnectPtr conn G_GNUC_UNUSED) { /* Trivially secure, since always inside the daemon */ return 1; } =20 =20 -static int nwfilterConnectIsEncrypted(virConnectPtr conn ATTRIBUTE_UNUSED) +static int nwfilterConnectIsEncrypted(virConnectPtr conn G_GNUC_UNUSED) { /* Not encrypted, but remote driver takes care of that */ return 0; } =20 =20 -static int nwfilterConnectIsAlive(virConnectPtr conn ATTRIBUTE_UNUSED) +static int nwfilterConnectIsAlive(virConnectPtr conn G_GNUC_UNUSED) { return 1; } diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfil= ter_ebiptables_driver.c index 32bbf6d05c..50db150151 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.c +++ b/src/nwfilter/nwfilter_ebiptables_driver.c @@ -616,9 +616,9 @@ iptablesLinkTmpRootChainsFW(virFirewallPtr fw, =20 =20 static void -iptablesSetupVirtInPostFW(virFirewallPtr fw ATTRIBUTE_UNUSED, - virFirewallLayer layer ATTRIBUTE_UNUSED, - const char *ifname ATTRIBUTE_UNUSED) +iptablesSetupVirtInPostFW(virFirewallPtr fw G_GNUC_UNUSED, + virFirewallLayer layer G_GNUC_UNUSED, + const char *ifname G_GNUC_UNUSED) { virFirewallAddRuleFull(fw, layer, true, NULL, NULL, @@ -2805,7 +2805,7 @@ static int ebtablesRenameTmpSubAndRootChainsQuery(virFirewallPtr fw, virFirewallLayer layer, const char *const *lines, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { size_t i; char newchain[MAX_CHAINNAME_LENGTH]; @@ -3759,8 +3759,8 @@ ebiptablesDriverProbeCtdir(void) =20 =20 static int -ebiptablesDriverProbeStateMatchQuery(virFirewallPtr fw ATTRIBUTE_UNUSED, - virFirewallLayer layer ATTRIBUTE_UNUS= ED, +ebiptablesDriverProbeStateMatchQuery(virFirewallPtr fw G_GNUC_UNUSED, + virFirewallLayer layer G_GNUC_UNUSED, const char *const *lines, void *opaque) { diff --git a/src/nwfilter/nwfilter_gentech_driver.c b/src/nwfilter/nwfilter= _gentech_driver.c index 6d68189d5f..d39f1ecb6d 100644 --- a/src/nwfilter/nwfilter_gentech_driver.c +++ b/src/nwfilter/nwfilter_gentech_driver.c @@ -140,7 +140,7 @@ struct printString =20 =20 static int -printString(void *payload ATTRIBUTE_UNUSED, const void *name, void *data) +printString(void *payload G_GNUC_UNUSED, const void *name, void *data) { struct printString *ps =3D data; =20 diff --git a/src/nwfilter/nwfilter_learnipaddr.c b/src/nwfilter/nwfilter_le= arnipaddr.c index 34b8d7fcd9..36bc3b06da 100644 --- a/src/nwfilter/nwfilter_learnipaddr.c +++ b/src/nwfilter/nwfilter_learnipaddr.c @@ -307,7 +307,7 @@ virNWFilterHasLearnReq(int ifindex) =20 =20 static void -freeLearnReqEntry(void *payload, const void *name ATTRIBUTE_UNUSED) +freeLearnReqEntry(void *payload, const void *name G_GNUC_UNUSED) { virNWFilterIPAddrLearnReqFree(payload); } @@ -764,11 +764,11 @@ virNWFilterLearnIPAddress(virNWFilterTechDriverPtr te= chdriver, #else =20 int -virNWFilterLearnIPAddress(virNWFilterTechDriverPtr techdriver ATTRIBUTE_UN= USED, - virNWFilterBindingDefPtr binding ATTRIBUTE_UNUSE= D, - int ifindex ATTRIBUTE_UNUSED, - virNWFilterDriverStatePtr driver ATTRIBUTE_UNUSE= D, - int howDetect ATTRIBUTE_UNUSED) +virNWFilterLearnIPAddress(virNWFilterTechDriverPtr techdriver G_GNUC_UNUSE= D, + virNWFilterBindingDefPtr binding G_GNUC_UNUSED, + int ifindex G_GNUC_UNUSED, + virNWFilterDriverStatePtr driver G_GNUC_UNUSED, + int howDetect G_GNUC_UNUSED) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("IP parameter must be given since libvirt " --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 10:00:01 2024 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=1571059198; cv=none; d=zoho.com; s=zohoarc; b=ODYdegyLYzus2eSRNxlTXCCKfyVOc7bGXUe+zw2Uw2zv4byGz50HmYuec900INNd97h5tt0hxiQqKRdUS2Y4rCPs4vaVu8S+3ycqm4ADw/xp9XGoFMnmCF426X6bvN0I36DTKVZh1VPqxQXniJZYjsmfqIneu1Rmh7N7Ir3OHio= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571059198; 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=xvWfylz4iD9+NZjzoYP2HikTGLayy8eK6QeNaxfcfh0=; b=e0/ANOH7q0rHvs7Ba9hpdbSekj4UEs4YesKxQX2UV2RLUgdmgYGzSkeovqDk/0EvLLfDUMdguWsgsIF+ZGQpqvC0mqWOcHNEZouVhP6YRQJRGotLa/cezPzXPl64OX80OsBCpAOC2ox224PG9R7pQg5N1wiFsKhxrCQoAFfCjPc= 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 1571059198835830.3475562922159; Mon, 14 Oct 2019 06:19:58 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 30BD7316D8D2; Mon, 14 Oct 2019 13:19:57 +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 0BA7B6012C; Mon, 14 Oct 2019 13:19:57 +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 BF6F1180B76F; Mon, 14 Oct 2019 13:19:56 +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 x9EDGUEs017478 for ; Mon, 14 Oct 2019 09:16:30 -0400 Received: by smtp.corp.redhat.com (Postfix) id 42D2360127; Mon, 14 Oct 2019 13:16:30 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id BF51260126 for ; Mon, 14 Oct 2019 13:16:29 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Mon, 14 Oct 2019 15:15:38 +0200 Message-Id: <079d7726a63594496536b196abc0759f81602ff6.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 20/35] openvz: 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.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Mon, 14 Oct 2019 13:19:57 +0000 (UTC) Use G_GNUC_UNUSED from GLib instead of ATTRIBUTE_UNUSED. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/openvz/openvz_driver.c | 92 +++++++++++++++++++------------------- 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index 98db7fceec..408b393e30 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -112,10 +112,10 @@ openvzDomObjFromDomain(struct openvz_driver *driver, =20 static int openvzDomainDefPostParse(virDomainDefPtr def, - virCapsPtr caps ATTRIBUTE_UNUSED, - unsigned int parseFlags ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED, - void *parseOpaque ATTRIBUTE_UNUSED) + virCapsPtr caps G_GNUC_UNUSED, + unsigned int parseFlags G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED, + void *parseOpaque G_GNUC_UNUSED) { /* fill the init path */ if (def->os.type =3D=3D VIR_DOMAIN_OSTYPE_EXE && !def->os.init) { @@ -129,11 +129,11 @@ openvzDomainDefPostParse(virDomainDefPtr def, =20 static int openvzDomainDeviceDefPostParse(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 && @@ -358,7 +358,7 @@ static int openvzConnectGetVersion(virConnectPtr conn, = unsigned long *version) } =20 =20 -static char *openvzConnectGetHostname(virConnectPtr conn ATTRIBUTE_UNUSED) +static char *openvzConnectGetHostname(virConnectPtr conn G_GNUC_UNUSED) { return virGetHostname(); } @@ -509,7 +509,7 @@ static int openvzDomainIsPersistent(virDomainPtr dom) return ret; } =20 -static int openvzDomainIsUpdated(virDomainPtr dom ATTRIBUTE_UNUSED) +static int openvzDomainIsUpdated(virDomainPtr dom G_GNUC_UNUSED) { return 0; } @@ -1209,7 +1209,7 @@ openvzDomainGetAutostart(virDomainPtr dom, int *autos= tart) return ret; } =20 -static int openvzConnectGetMaxVcpus(virConnectPtr conn ATTRIBUTE_UNUSED, +static int openvzConnectGetMaxVcpus(virConnectPtr conn G_GNUC_UNUSED, const char *type) { if (type =3D=3D NULL || STRCASEEQ(type, "openvz")) @@ -1221,7 +1221,7 @@ static int openvzConnectGetMaxVcpus(virConnectPtr con= n ATTRIBUTE_UNUSED, } =20 static int -openvzDomainGetVcpusFlags(virDomainPtr dom ATTRIBUTE_UNUSED, +openvzDomainGetVcpusFlags(virDomainPtr dom G_GNUC_UNUSED, unsigned int flags) { if (flags !=3D (VIR_DOMAIN_AFFECT_LIVE | VIR_DOMAIN_VCPU_MAXIMUM)) { @@ -1322,8 +1322,8 @@ openvzConnectURIProbe(char **uri) =20 =20 static virDrvOpenStatus openvzConnectOpen(virConnectPtr conn, - virConnectAuthPtr auth ATTRIBUTE= _UNUSED, - virConfPtr conf ATTRIBUTE_UNUSED, + virConnectAuthPtr auth G_GNUC_UN= USED, + virConfPtr conf G_GNUC_UNUSED, unsigned int flags) { struct openvz_driver *driver; @@ -1391,24 +1391,24 @@ static int openvzConnectClose(virConnectPtr conn) return 0; } =20 -static const char *openvzConnectGetType(virConnectPtr conn ATTRIBUTE_UNUSE= D) { +static const char *openvzConnectGetType(virConnectPtr conn G_GNUC_UNUSED) { return "OpenVZ"; } =20 -static int openvzConnectIsEncrypted(virConnectPtr conn ATTRIBUTE_UNUSED) +static int openvzConnectIsEncrypted(virConnectPtr conn G_GNUC_UNUSED) { /* Encryption is not relevant / applicable to way we talk to openvz */ return 0; } =20 -static int openvzConnectIsSecure(virConnectPtr conn ATTRIBUTE_UNUSED) +static int openvzConnectIsSecure(virConnectPtr conn G_GNUC_UNUSED) { /* We run CLI tools directly so this is secure */ return 1; } =20 static int -openvzConnectIsAlive(virConnectPtr conn ATTRIBUTE_UNUSED) +openvzConnectIsAlive(virConnectPtr conn G_GNUC_UNUSED) { return 1; } @@ -1424,7 +1424,7 @@ static char *openvzConnectGetCapabilities(virConnectP= tr conn) { return ret; } =20 -static int openvzConnectListDomains(virConnectPtr conn ATTRIBUTE_UNUSED, +static int openvzConnectListDomains(virConnectPtr conn G_GNUC_UNUSED, int *ids, int nids) { int got =3D 0; @@ -1480,7 +1480,7 @@ static int openvzConnectNumOfDomains(virConnectPtr co= nn) return n; } =20 -static int openvzConnectListDefinedDomains(virConnectPtr conn ATTRIBUTE_UN= USED, +static int openvzConnectListDefinedDomains(virConnectPtr conn G_GNUC_UNUSE= D, char **const names, int nnames)= { int got =3D 0; int veid, outfd =3D -1, ret; @@ -2003,7 +2003,7 @@ openvzConnectListAllDomains(virConnectPtr conn, =20 =20 static int -openvzNodeGetInfo(virConnectPtr conn ATTRIBUTE_UNUSED, +openvzNodeGetInfo(virConnectPtr conn G_GNUC_UNUSED, virNodeInfoPtr nodeinfo) { return virCapabilitiesGetNodeInfo(nodeinfo); @@ -2011,7 +2011,7 @@ openvzNodeGetInfo(virConnectPtr conn ATTRIBUTE_UNUSED, =20 =20 static int -openvzNodeGetCPUStats(virConnectPtr conn ATTRIBUTE_UNUSED, +openvzNodeGetCPUStats(virConnectPtr conn G_GNUC_UNUSED, int cpuNum, virNodeCPUStatsPtr params, int *nparams, @@ -2022,7 +2022,7 @@ openvzNodeGetCPUStats(virConnectPtr conn ATTRIBUTE_UN= USED, =20 =20 static int -openvzNodeGetMemoryStats(virConnectPtr conn ATTRIBUTE_UNUSED, +openvzNodeGetMemoryStats(virConnectPtr conn G_GNUC_UNUSED, int cellNum, virNodeMemoryStatsPtr params, int *nparams, @@ -2033,7 +2033,7 @@ openvzNodeGetMemoryStats(virConnectPtr conn ATTRIBUTE= _UNUSED, =20 =20 static int -openvzNodeGetCellsFreeMemory(virConnectPtr conn ATTRIBUTE_UNUSED, +openvzNodeGetCellsFreeMemory(virConnectPtr conn G_GNUC_UNUSED, unsigned long long *freeMems, int startCell, int maxCells) @@ -2043,7 +2043,7 @@ openvzNodeGetCellsFreeMemory(virConnectPtr conn ATTRI= BUTE_UNUSED, =20 =20 static unsigned long long -openvzNodeGetFreeMemory(virConnectPtr conn ATTRIBUTE_UNUSED) +openvzNodeGetFreeMemory(virConnectPtr conn G_GNUC_UNUSED) { unsigned long long freeMem; if (virHostMemGetInfo(NULL, &freeMem) < 0) @@ -2053,7 +2053,7 @@ openvzNodeGetFreeMemory(virConnectPtr conn ATTRIBUTE_= UNUSED) =20 =20 static int -openvzNodeGetCPUMap(virConnectPtr conn ATTRIBUTE_UNUSED, +openvzNodeGetCPUMap(virConnectPtr conn G_GNUC_UNUSED, unsigned char **cpumap, unsigned int *online, unsigned int flags) @@ -2063,7 +2063,7 @@ openvzNodeGetCPUMap(virConnectPtr conn ATTRIBUTE_UNUS= ED, =20 =20 static int -openvzConnectSupportsFeature(virConnectPtr conn ATTRIBUTE_UNUSED, int feat= ure) +openvzConnectSupportsFeature(virConnectPtr conn G_GNUC_UNUSED, int feature) { switch ((virDrvFeature) feature) { case VIR_DRV_FEATURE_MIGRATION_PARAMS: @@ -2092,8 +2092,8 @@ static char * openvzDomainMigrateBegin3Params(virDomainPtr domain, virTypedParameterPtr params, int nparams, - char **cookieout ATTRIBUTE_UNUSED, - int *cookieoutlen ATTRIBUTE_UNUSED, + char **cookieout G_GNUC_UNUSED, + int *cookieoutlen G_GNUC_UNUSED, unsigned int flags) { virDomainObjPtr vm =3D NULL; @@ -2132,12 +2132,12 @@ static int openvzDomainMigratePrepare3Params(virConnectPtr dconn, virTypedParameterPtr params, int nparams, - const char *cookiein ATTRIBUTE_UNUSED, - int cookieinlen ATTRIBUTE_UNUSED, - char **cookieout ATTRIBUTE_UNUSED, - int *cookieoutlen ATTRIBUTE_UNUSED, + const char *cookiein G_GNUC_UNUSED, + int cookieinlen G_GNUC_UNUSED, + char **cookieout G_GNUC_UNUSED, + int *cookieoutlen G_GNUC_UNUSED, char **uri_out, - unsigned int fflags ATTRIBUTE_UNUSED) + unsigned int fflags G_GNUC_UNUSED) { struct openvz_driver *driver =3D dconn->privateData; const char *dom_xml =3D NULL; @@ -2230,13 +2230,13 @@ openvzDomainMigratePrepare3Params(virConnectPtr dco= nn, =20 static int openvzDomainMigratePerform3Params(virDomainPtr domain, - const char *dconnuri ATTRIBUTE_UNUSED, + const char *dconnuri G_GNUC_UNUSED, virTypedParameterPtr params, int nparams, - const char *cookiein ATTRIBUTE_UNUSED, - int cookieinlen ATTRIBUTE_UNUSED, - char **cookieout ATTRIBUTE_UNUSED, - int *cookieoutlen ATTRIBUTE_UNUSED, + const char *cookiein G_GNUC_UNUSED, + int cookieinlen G_GNUC_UNUSED, + char **cookieout G_GNUC_UNUSED, + int *cookieoutlen G_GNUC_UNUSED, unsigned int flags) { struct openvz_driver *driver =3D domain->conn->privateData; @@ -2285,10 +2285,10 @@ static virDomainPtr openvzDomainMigrateFinish3Params(virConnectPtr dconn, virTypedParameterPtr params, int nparams, - const char *cookiein ATTRIBUTE_UNUSED, - int cookieinlen ATTRIBUTE_UNUSED, - char **cookieout ATTRIBUTE_UNUSED, - int *cookieoutlen ATTRIBUTE_UNUSED, + const char *cookiein G_GNUC_UNUSED, + int cookieinlen G_GNUC_UNUSED, + char **cookieout G_GNUC_UNUSED, + int *cookieoutlen G_GNUC_UNUSED, unsigned int flags, int cancelled) { @@ -2343,8 +2343,8 @@ static int openvzDomainMigrateConfirm3Params(virDomainPtr domain, virTypedParameterPtr params, int nparams, - const char *cookiein ATTRIBUTE_UNUSED, - int cookieinlen ATTRIBUTE_UNUSED, + const char *cookiein G_GNUC_UNUSED, + int cookieinlen G_GNUC_UNUSED, unsigned int flags, int cancelled) { --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 10:00:01 2024 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=1571059029; cv=none; d=zoho.com; s=zohoarc; b=Uis2XU3eNIPTe7Zqlxz/RJvUJW8Xy3sxzBIAWpoJMXnITyNNCFRtQsM7lNhSK53WfdFyhsIdYEUFO2XqdqkWDDv/Sc2gSltH5uR7xlp48J6UUuN2IuXIYsF9aryXF1eQFUD+uWip1tzBr0NpBlj6fT1rOTtCwmuN0y8rzHLTFW4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571059029; 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=MhI1MDEVwFvobZQ4uleJNBZU0NfrNcgW+4Vl9KbqBTQ=; b=W9kBBb/NMsbnJaYXTgWxaRk09bXr3choAmqDZwq8926ckwYwxEms1mcj08JuuVVjdIpgqdVDkbSBX8bH/0vzHwpXJZBC5Oe/i7CRRGxpYSVQ1z0np1QXue/I6XPjZUYJq6TUpP9R4v5utz3ljeJ7LtFxxv28+2nYqKVrueAAlDo= 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 1571059029993812.7396620527926; Mon, 14 Oct 2019 06:17:09 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 55B6A10DCC8C; Mon, 14 Oct 2019 13:17:08 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2A7C36012C; Mon, 14 Oct 2019 13:17:08 +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 D1A594EE7E; Mon, 14 Oct 2019 13:17:07 +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 x9EDGVki017491 for ; Mon, 14 Oct 2019 09:16:31 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3C23D60127; Mon, 14 Oct 2019 13:16:31 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 91BAD60126 for ; Mon, 14 Oct 2019 13:16:30 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Mon, 14 Oct 2019 15:15:39 +0200 Message-Id: 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 21/35] qemu: 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.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.64]); Mon, 14 Oct 2019 13:17:08 +0000 (UTC) Use G_GNUC_UNUSED from GLib instead of ATTRIBUTE_UNUSED. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/qemu/qemu_block.c | 6 +- src/qemu/qemu_blockjob.c | 4 +- src/qemu/qemu_capabilities.c | 4 +- src/qemu/qemu_cgroup.c | 2 +- src/qemu/qemu_checkpoint.c | 2 +- src/qemu/qemu_command.c | 8 +-- src/qemu/qemu_conf.c | 4 +- src/qemu/qemu_domain.c | 94 ++++++++++++++++---------------- src/qemu/qemu_domain_address.c | 30 +++++----- src/qemu/qemu_driver.c | 64 +++++++++++----------- src/qemu/qemu_hotplug.c | 4 +- src/qemu/qemu_migration.c | 4 +- src/qemu/qemu_migration_cookie.c | 2 +- src/qemu/qemu_monitor.c | 4 +- src/qemu/qemu_monitor_json.c | 18 +++--- src/qemu/qemu_process.c | 84 ++++++++++++++-------------- src/qemu/qemu_qapi.c | 2 +- 17 files changed, 168 insertions(+), 168 deletions(-) diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c index eacb48aa78..599ca629e0 100644 --- a/src/qemu/qemu_block.c +++ b/src/qemu/qemu_block.c @@ -51,7 +51,7 @@ qemuBlockNodeNameValidate(const char *nn) =20 =20 static int -qemuBlockNamedNodesArrayToHash(size_t pos ATTRIBUTE_UNUSED, +qemuBlockNamedNodesArrayToHash(size_t pos G_GNUC_UNUSED, virJSONValuePtr item, void *opaque) { @@ -93,7 +93,7 @@ VIR_DEFINE_AUTOPTR_FUNC(qemuBlockNodeNameBackingChainData, =20 static void qemuBlockNodeNameBackingChainDataHashEntryFree(void *opaque, - const void *name ATTRIBUTE_= UNUSED) + const void *name G_GNUC_UNU= SED) { qemuBlockNodeNameBackingChainDataFree(opaque); } @@ -192,7 +192,7 @@ qemuBlockNodeNameGetBackingChainBacking(virJSONValuePtr= next, =20 =20 static int -qemuBlockNodeNameGetBackingChainDisk(size_t pos ATTRIBUTE_UNUSED, +qemuBlockNodeNameGetBackingChainDisk(size_t pos G_GNUC_UNUSED, virJSONValuePtr item, void *opaque) { diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c index c118f2c298..89c28986b0 100644 --- a/src/qemu/qemu_blockjob.c +++ b/src/qemu/qemu_blockjob.c @@ -419,8 +419,8 @@ qemuBlockJobIsRunning(qemuBlockJobDataPtr job) /* returns 1 for a job we didn't reconnect to */ static int qemuBlockJobRefreshJobsFindInactive(const void *payload, - const void *name ATTRIBUTE_UNUSED, - const void *data ATTRIBUTE_UNUSED) + const void *name G_GNUC_UNUSED, + const void *data G_GNUC_UNUSED) { const qemuBlockJobData *job =3D payload; =20 diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 091e48c7e1..cbd4ebc8ea 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -4112,7 +4112,7 @@ virQEMUCapsFormatCache(virQEMUCapsPtr qemuCaps) static int virQEMUCapsSaveFile(void *data, const char *filename, - void *privData ATTRIBUTE_UNUSED) + void *privData G_GNUC_UNUSED) { virQEMUCapsPtr qemuCaps =3D data; char *xml =3D NULL; @@ -4940,7 +4940,7 @@ virQEMUCapsCacheLookupCopy(virFileCachePtr cache, =20 static int virQEMUCapsCompareArch(const void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, const void *opaque) { struct virQEMUCapsSearchData *data =3D (struct virQEMUCapsSearchData *= )opaque; diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index 740a1b33dc..f1776a7c0b 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -285,7 +285,7 @@ qemuTeardownChrSourceCgroup(virDomainObjPtr vm, =20 =20 static int -qemuSetupChardevCgroupCB(virDomainDefPtr def ATTRIBUTE_UNUSED, +qemuSetupChardevCgroupCB(virDomainDefPtr def G_GNUC_UNUSED, virDomainChrDefPtr dev, void *opaque) { diff --git a/src/qemu/qemu_checkpoint.c b/src/qemu/qemu_checkpoint.c index 8856a90ce8..0c4385083b 100644 --- a/src/qemu/qemu_checkpoint.c +++ b/src/qemu/qemu_checkpoint.c @@ -502,7 +502,7 @@ struct virQEMUCheckpointReparent { =20 static int qemuCheckpointReparentChildren(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *data) { virDomainMomentObjPtr moment =3D payload; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 0f1625d401..a41156476f 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7815,9 +7815,9 @@ qemuBuildMemoryDeviceCommandLine(virCommandPtr cmd, =20 =20 static int -qemuBuildGraphicsSDLCommandLine(virQEMUDriverConfigPtr cfg ATTRIBUTE_UNUSE= D, +qemuBuildGraphicsSDLCommandLine(virQEMUDriverConfigPtr cfg G_GNUC_UNUSED, virCommandPtr cmd, - virQEMUCapsPtr qemuCaps ATTRIBUTE_UNUSED, + virQEMUCapsPtr qemuCaps G_GNUC_UNUSED, virDomainGraphicsDefPtr graphics) { VIR_AUTOCLEAN(virBuffer) opt =3D VIR_BUFFER_INITIALIZER; @@ -8243,7 +8243,7 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfig= Ptr cfg, =20 =20 static int -qemuBuildGraphicsEGLHeadlessCommandLine(virQEMUDriverConfigPtr cfg ATTRIBU= TE_UNUSED, +qemuBuildGraphicsEGLHeadlessCommandLine(virQEMUDriverConfigPtr cfg G_GNUC_= UNUSED, virCommandPtr cmd, virQEMUCapsPtr qemuCaps, virDomainGraphicsDefPtr graphics) @@ -10180,7 +10180,7 @@ qemuBuildCommandLineValidate(virQEMUDriverPtr drive= r, static int qemuBuildSeccompSandboxCommandLine(virCommandPtr cmd, virQEMUDriverConfigPtr cfg, - virQEMUCapsPtr qemuCaps ATTRIBUTE_UNUSE= D) + virQEMUCapsPtr qemuCaps G_GNUC_UNUSED) { if (cfg->seccompSandbox =3D=3D 0) { if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SECCOMP_SANDBOX)) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index db390d358e..4df0ca78f5 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -1346,7 +1346,7 @@ struct virQEMUDriverSearchDomcapsData { =20 static int virQEMUDriverSearchDomcaps(const void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, const void *opaque) { virDomainCapsPtr domCaps =3D (virDomainCapsPtr) payload; @@ -1551,7 +1551,7 @@ qemuSharedDeviceEntryDomainExists(qemuSharedDeviceEnt= ryPtr entry, } =20 void -qemuSharedDeviceEntryFree(void *payload, const void *name ATTRIBUTE_UNUSED) +qemuSharedDeviceEntryFree(void *payload, const void *name G_GNUC_UNUSED) { qemuSharedDeviceEntryPtr entry =3D payload; size_t i; diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 35067c851f..a6c95b7208 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -197,7 +197,7 @@ qemuDomainLogContextDispose(void *obj) =20 const char * qemuDomainAsyncJobPhaseToString(qemuDomainAsyncJob job, - int phase ATTRIBUTE_UNUSED) + int phase G_GNUC_UNUSED) { switch (job) { case QEMU_ASYNC_JOB_MIGRATION_OUT: @@ -1253,7 +1253,7 @@ qemuDomainVsockPrivateNew(void) =20 =20 static void -qemuDomainVsockPrivateDispose(void *obj ATTRIBUTE_UNUSED) +qemuDomainVsockPrivateDispose(void *obj G_GNUC_UNUSED) { qemuDomainVsockPrivatePtr priv =3D obj; =20 @@ -1333,7 +1333,7 @@ qemuDomainNetworkPrivateNew(void) =20 =20 static void -qemuDomainNetworkPrivateDispose(void *obj ATTRIBUTE_UNUSED) +qemuDomainNetworkPrivateDispose(void *obj G_GNUC_UNUSED) { qemuDomainNetworkPrivatePtr priv =3D obj; =20 @@ -2076,7 +2076,7 @@ qemuDomainSetPrivatePaths(virQEMUDriverPtr driver, =20 static void dbusVMStateHashFree(void *opaque, - const void *name ATTRIBUTE_UNUSED) + const void *name G_GNUC_UNUSED) { qemuDBusVMStateFree(opaque); } @@ -2473,7 +2473,7 @@ qemuDomainObjPrivateXMLFormatBlockjobFormatSource(vir= BufferPtr buf, =20 static int qemuDomainObjPrivateXMLFormatBlockjobIterator(void *payload, - const void *name ATTRIBUTE_U= NUSED, + const void *name G_GNUC_UNUS= ED, void *opaque) { VIR_AUTOCLEAN(virBuffer) attrBuf =3D VIR_BUFFER_INITIALIZER; @@ -4598,7 +4598,7 @@ qemuDomainDefTsegPostParse(virDomainDefPtr def, static int qemuDomainDefPostParseBasic(virDomainDefPtr def, virCapsPtr caps, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { /* check for emulator and create a default one if needed */ if (!def->emulator && @@ -4611,7 +4611,7 @@ qemuDomainDefPostParseBasic(virDomainDefPtr def, =20 static int qemuDomainDefPostParse(virDomainDefPtr def, - virCapsPtr caps ATTRIBUTE_UNUSED, + virCapsPtr caps G_GNUC_UNUSED, unsigned int parseFlags, void *opaque, void *parseOpaque) @@ -4868,7 +4868,7 @@ qemuDomainValidateCpuCount(const virDomainDef *def, =20 static int qemuDomainDefValidate(const virDomainDef *def, - virCapsPtr caps ATTRIBUTE_UNUSED, + virCapsPtr caps G_GNUC_UNUSED, void *opaque) { virQEMUDriverPtr driver =3D opaque; @@ -5306,7 +5306,7 @@ qemuDomainSmartcardDefValidate(const virDomainSmartca= rdDef *def) =20 static int qemuDomainRNGDefValidate(const virDomainRNGDef *def, - virQEMUCapsPtr qemuCaps ATTRIBUTE_UNUSED) + virQEMUCapsPtr qemuCaps G_GNUC_UNUSED) { if (def->backend =3D=3D VIR_DOMAIN_RNG_BACKEND_EGD && qemuDomainChrSourceDefValidate(def->source.chardev) < 0) @@ -6879,7 +6879,7 @@ qemuDomainDeviceDefValidateGraphics(const virDomainGr= aphicsDef *graphics, =20 static int qemuDomainDeviceDefValidateInput(const virDomainInputDef *input, - const virDomainDef *def ATTRIBUTE_UNUSED, + const virDomainDef *def G_GNUC_UNUSED, virQEMUCapsPtr qemuCaps) { const char *baseName; @@ -7078,8 +7078,8 @@ qemuDomainDeviceDefValidateIOMMU(const virDomainIOMMU= Def *iommu, =20 static int qemuDomainDeviceDefValidateFS(virDomainFSDefPtr fs, - const virDomainDef *def ATTRIBUTE_UNUSED, - virQEMUCapsPtr qemuCaps ATTRIBUTE_UNUSED) + const virDomainDef *def G_GNUC_UNUSED, + virQEMUCapsPtr qemuCaps G_GNUC_UNUSED) { if (fs->type !=3D VIR_DOMAIN_FS_TYPE_MOUNT) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", @@ -7903,7 +7903,7 @@ qemuDomainHostdevDefPostParse(virDomainHostdevDefPtr = hostdev, static int qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, const virDomainDef *def, - virCapsPtr caps ATTRIBUTE_UNUSED, + virCapsPtr caps G_GNUC_UNUSED, unsigned int parseFlags, void *opaque, void *parseOpaque) @@ -7989,8 +7989,8 @@ qemuDomainDeviceDefPostParse(virDomainDeviceDefPtr de= v, =20 static int qemuDomainDefAssignAddresses(virDomainDef *def, - virCapsPtr caps ATTRIBUTE_UNUSED, - unsigned int parseFlags ATTRIBUTE_UNUSED, + virCapsPtr caps G_GNUC_UNUSED, + unsigned int parseFlags G_GNUC_UNUSED, void *opaque, void *parseOpaque) { @@ -8014,8 +8014,8 @@ qemuDomainDefAssignAddresses(virDomainDef *def, =20 static int qemuDomainPostParseDataAlloc(const virDomainDef *def, - virCapsPtr caps ATTRIBUTE_UNUSED, - unsigned int parseFlags ATTRIBUTE_UNUSED, + virCapsPtr caps G_GNUC_UNUSED, + unsigned int parseFlags G_GNUC_UNUSED, void *opaque, void **parseOpaque) { @@ -9781,7 +9781,7 @@ qemuDomainSnapshotDiscard(virQEMUDriverPtr driver, =20 /* Hash iterator callback to discard multiple snapshots. */ int qemuDomainMomentDiscardAll(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *data) { virDomainMomentObjPtr moment =3D payload; @@ -11100,7 +11100,7 @@ qemuDomainGetMemorySizeAlignment(virDomainDefPtr de= f) =20 static unsigned long long qemuDomainGetMemoryModuleSizeAlignment(const virDomainDef *def, - const virDomainMemoryDef *mem ATTRI= BUTE_UNUSED) + const virDomainMemoryDef *mem G_GNU= C_UNUSED) { /* PPC requires the memory sizes to be rounded to 256MiB increments, so * round them to the size always. */ @@ -13296,7 +13296,7 @@ qemuDomainCreateDevice(const char *device, =20 static int qemuDomainPopulateDevices(virQEMUDriverConfigPtr cfg, - virDomainObjPtr vm ATTRIBUTE_UNUSED, + virDomainObjPtr vm G_GNUC_UNUSED, const struct qemuDomainCreateDeviceData *data) { const char *const *devices =3D (const char *const *) cfg->cgroupDevice= ACL; @@ -13358,7 +13358,7 @@ qemuDomainSetupDev(virQEMUDriverConfigPtr cfg, =20 =20 static int -qemuDomainSetupDisk(virQEMUDriverConfigPtr cfg ATTRIBUTE_UNUSED, +qemuDomainSetupDisk(virQEMUDriverConfigPtr cfg G_GNUC_UNUSED, virDomainDiskDefPtr disk, const struct qemuDomainCreateDeviceData *data) { @@ -13409,7 +13409,7 @@ qemuDomainSetupAllDisks(virQEMUDriverConfigPtr cfg, =20 =20 static int -qemuDomainSetupHostdev(virQEMUDriverConfigPtr cfg ATTRIBUTE_UNUSED, +qemuDomainSetupHostdev(virQEMUDriverConfigPtr cfg G_GNUC_UNUSED, virDomainHostdevDefPtr dev, const struct qemuDomainCreateDeviceData *data) { @@ -13454,7 +13454,7 @@ qemuDomainSetupAllHostdevs(virQEMUDriverConfigPtr c= fg, =20 =20 static int -qemuDomainSetupMemory(virQEMUDriverConfigPtr cfg ATTRIBUTE_UNUSED, +qemuDomainSetupMemory(virQEMUDriverConfigPtr cfg G_GNUC_UNUSED, virDomainMemoryDefPtr mem, const struct qemuDomainCreateDeviceData *data) { @@ -13485,7 +13485,7 @@ qemuDomainSetupAllMemories(virQEMUDriverConfigPtr c= fg, =20 =20 static int -qemuDomainSetupChardev(virDomainDefPtr def ATTRIBUTE_UNUSED, +qemuDomainSetupChardev(virDomainDefPtr def G_GNUC_UNUSED, virDomainChrDefPtr dev, void *opaque) { @@ -13505,7 +13505,7 @@ qemuDomainSetupChardev(virDomainDefPtr def ATTRIBUT= E_UNUSED, =20 =20 static int -qemuDomainSetupAllChardevs(virQEMUDriverConfigPtr cfg ATTRIBUTE_UNUSED, +qemuDomainSetupAllChardevs(virQEMUDriverConfigPtr cfg G_GNUC_UNUSED, virDomainObjPtr vm, const struct qemuDomainCreateDeviceData *data) { @@ -13523,7 +13523,7 @@ qemuDomainSetupAllChardevs(virQEMUDriverConfigPtr c= fg ATTRIBUTE_UNUSED, =20 =20 static int -qemuDomainSetupTPM(virQEMUDriverConfigPtr cfg ATTRIBUTE_UNUSED, +qemuDomainSetupTPM(virQEMUDriverConfigPtr cfg G_GNUC_UNUSED, virDomainObjPtr vm, const struct qemuDomainCreateDeviceData *data) { @@ -13553,7 +13553,7 @@ qemuDomainSetupTPM(virQEMUDriverConfigPtr cfg ATTRI= BUTE_UNUSED, =20 =20 static int -qemuDomainSetupGraphics(virQEMUDriverConfigPtr cfg ATTRIBUTE_UNUSED, +qemuDomainSetupGraphics(virQEMUDriverConfigPtr cfg G_GNUC_UNUSED, virDomainGraphicsDefPtr gfx, const struct qemuDomainCreateDeviceData *data) { @@ -13587,7 +13587,7 @@ qemuDomainSetupAllGraphics(virQEMUDriverConfigPtr c= fg, =20 =20 static int -qemuDomainSetupInput(virQEMUDriverConfigPtr cfg ATTRIBUTE_UNUSED, +qemuDomainSetupInput(virQEMUDriverConfigPtr cfg G_GNUC_UNUSED, virDomainInputDefPtr input, const struct qemuDomainCreateDeviceData *data) { @@ -13620,7 +13620,7 @@ qemuDomainSetupAllInputs(virQEMUDriverConfigPtr cfg, =20 =20 static int -qemuDomainSetupRNG(virQEMUDriverConfigPtr cfg ATTRIBUTE_UNUSED, +qemuDomainSetupRNG(virQEMUDriverConfigPtr cfg G_GNUC_UNUSED, virDomainRNGDefPtr rng, const struct qemuDomainCreateDeviceData *data) { @@ -13660,7 +13660,7 @@ qemuDomainSetupAllRNGs(virQEMUDriverConfigPtr cfg, =20 =20 static int -qemuDomainSetupLoader(virQEMUDriverConfigPtr cfg ATTRIBUTE_UNUSED, +qemuDomainSetupLoader(virQEMUDriverConfigPtr cfg G_GNUC_UNUSED, virDomainObjPtr vm, const struct qemuDomainCreateDeviceData *data) { @@ -13699,7 +13699,7 @@ qemuDomainSetupLoader(virQEMUDriverConfigPtr cfg AT= TRIBUTE_UNUSED, =20 =20 static int -qemuDomainSetupLaunchSecurity(virQEMUDriverConfigPtr cfg ATTRIBUTE_UNUSED, +qemuDomainSetupLaunchSecurity(virQEMUDriverConfigPtr cfg G_GNUC_UNUSED, virDomainObjPtr vm, const struct qemuDomainCreateDeviceData *dat= a) { @@ -13890,7 +13890,7 @@ qemuDomainCreateNamespace(virQEMUDriverPtr driver, =20 =20 void -qemuDomainDestroyNamespace(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, +qemuDomainDestroyNamespace(virQEMUDriverPtr driver G_GNUC_UNUSED, virDomainObjPtr vm) { if (qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT)) @@ -13899,7 +13899,7 @@ qemuDomainDestroyNamespace(virQEMUDriverPtr driver = ATTRIBUTE_UNUSED, =20 =20 bool -qemuDomainNamespaceAvailable(qemuDomainNamespace ns ATTRIBUTE_UNUSED) +qemuDomainNamespaceAvailable(qemuDomainNamespace ns G_GNUC_UNUSED) { #if !defined(__linux__) /* Namespaces are Linux specific. */ @@ -13943,7 +13943,7 @@ struct qemuDomainAttachDeviceMknodData { /* Our way of creating devices is highly linux specific */ #if defined(__linux__) static int -qemuDomainAttachDeviceMknodHelper(pid_t pid ATTRIBUTE_UNUSED, +qemuDomainAttachDeviceMknodHelper(pid_t pid G_GNUC_UNUSED, void *opaque) { struct qemuDomainAttachDeviceMknodData *data =3D opaque; @@ -14232,12 +14232,12 @@ qemuDomainAttachDeviceMknodRecursive(virQEMUDrive= rPtr driver, =20 =20 static int -qemuDomainAttachDeviceMknodRecursive(virQEMUDriverPtr driver ATTRIBUTE_UNU= SED, - virDomainObjPtr vm ATTRIBUTE_UNUSED, - const char *file ATTRIBUTE_UNUSED, - char * const *devMountsPath ATTRIBUTE= _UNUSED, - size_t ndevMountsPath ATTRIBUTE_UNUSE= D, - unsigned int ttl ATTRIBUTE_UNUSED) +qemuDomainAttachDeviceMknodRecursive(virQEMUDriverPtr driver G_GNUC_UNUSED, + virDomainObjPtr vm G_GNUC_UNUSED, + const char *file G_GNUC_UNUSED, + char * const *devMountsPath G_GNUC_UN= USED, + size_t ndevMountsPath G_GNUC_UNUSED, + unsigned int ttl G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Namespaces are not supported on this platform.= ")); @@ -14264,7 +14264,7 @@ qemuDomainAttachDeviceMknod(virQEMUDriverPtr driver, =20 =20 static int -qemuDomainDetachDeviceUnlinkHelper(pid_t pid ATTRIBUTE_UNUSED, +qemuDomainDetachDeviceUnlinkHelper(pid_t pid G_GNUC_UNUSED, void *opaque) { const char *path =3D opaque; @@ -14281,7 +14281,7 @@ qemuDomainDetachDeviceUnlinkHelper(pid_t pid ATTRIB= UTE_UNUSED, =20 =20 static int -qemuDomainDetachDeviceUnlink(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, +qemuDomainDetachDeviceUnlink(virQEMUDriverPtr driver G_GNUC_UNUSED, virDomainObjPtr vm, const char *file, char * const *devMountsPath, @@ -14448,8 +14448,8 @@ qemuDomainNamespaceSetupDisk(virDomainObjPtr vm, =20 =20 int -qemuDomainNamespaceTeardownDisk(virDomainObjPtr vm ATTRIBUTE_UNUSED, - virStorageSourcePtr src ATTRIBUTE_UNUSED) +qemuDomainNamespaceTeardownDisk(virDomainObjPtr vm G_GNUC_UNUSED, + virStorageSourcePtr src G_GNUC_UNUSED) { /* While in hotplug case we create the whole backing chain, * here we must limit ourselves. The disk we want to remove @@ -14703,7 +14703,7 @@ qemuDomainDiskLookupByNodename(virDomainDefPtr def, */ char * qemuDomainDiskBackingStoreGetName(virDomainDiskDefPtr disk, - virStorageSourcePtr src ATTRIBUTE_UNUSED, + virStorageSourcePtr src G_GNUC_UNUSED, unsigned int idx) { char *ret =3D NULL; @@ -14797,7 +14797,7 @@ qemuDomainSaveCookieNew(virDomainObjPtr vm) =20 =20 static int -qemuDomainSaveCookieParse(xmlXPathContextPtr ctxt ATTRIBUTE_UNUSED, +qemuDomainSaveCookieParse(xmlXPathContextPtr ctxt G_GNUC_UNUSED, virObjectPtr *obj) { qemuDomainSaveCookiePtr cookie =3D NULL; @@ -15493,7 +15493,7 @@ qemuDomainPausedReasonToSuspendedEvent(virDomainPau= sedReason reason) =20 static int qemuDomainDefHasManagedPRBlockjobIterator(void *payload, - const void *name ATTRIBUTE_UNUSE= D, + const void *name G_GNUC_UNUSED, void *opaque) { qemuBlockJobDataPtr job =3D payload; diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index ff770c6496..438fa72262 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -163,8 +163,8 @@ qemuDomainAssignVirtioSerialAddresses(virDomainDefPtr d= ef) =20 =20 static int -qemuDomainSpaprVIOFindByReg(virDomainDefPtr def ATTRIBUTE_UNUSED, - virDomainDeviceDefPtr device ATTRIBUTE_UNUSED, +qemuDomainSpaprVIOFindByReg(virDomainDefPtr def G_GNUC_UNUSED, + virDomainDeviceDefPtr device G_GNUC_UNUSED, virDomainDeviceInfoPtr info, void *opaque) { virDomainDeviceInfoPtr target =3D opaque; @@ -422,8 +422,8 @@ qemuDomainAssignS390Addresses(virDomainDefPtr def, =20 =20 static int -qemuDomainHasVirtioMMIODevicesCallback(virDomainDefPtr def ATTRIBUTE_UNUSE= D, - virDomainDeviceDefPtr dev ATTRIBUTE= _UNUSED, +qemuDomainHasVirtioMMIODevicesCallback(virDomainDefPtr def G_GNUC_UNUSED, + virDomainDeviceDefPtr dev G_GNUC_UN= USED, virDomainDeviceInfoPtr info, void *opaque) { @@ -1079,7 +1079,7 @@ qemuDomainFillDevicePCIConnectFlagsIterInit(virDomain= DefPtr def, * Always returns 0 - there is no failure. */ static int -qemuDomainFillDevicePCIConnectFlagsIter(virDomainDefPtr def ATTRIBUTE_UNUS= ED, +qemuDomainFillDevicePCIConnectFlagsIter(virDomainDefPtr def G_GNUC_UNUSED, virDomainDeviceDefPtr dev, virDomainDeviceInfoPtr info, void *opaque) @@ -1135,7 +1135,7 @@ qemuDomainFillAllPCIConnectFlags(virDomainDefPtr def, * Always returns 0 - there is no failure. */ static int -qemuDomainFillDevicePCIExtensionFlagsIter(virDomainDefPtr def ATTRIBUTE_UN= USED, +qemuDomainFillDevicePCIExtensionFlagsIter(virDomainDefPtr def G_GNUC_UNUSE= D, virDomainDeviceDefPtr dev, virDomainDeviceInfoPtr info, void *opaque) @@ -1184,8 +1184,8 @@ qemuDomainFillAllPCIExtensionFlags(virDomainDefPtr de= f, * Return: 0 if the isolation group is not used by the device, <1 otherwis= e. */ static int -qemuDomainFindUnusedIsolationGroupIter(virDomainDefPtr def ATTRIBUTE_UNUSE= D, - virDomainDeviceDefPtr dev ATTRIBUTE= _UNUSED, +qemuDomainFindUnusedIsolationGroupIter(virDomainDefPtr def G_GNUC_UNUSED, + virDomainDeviceDefPtr dev G_GNUC_UN= USED, virDomainDeviceInfoPtr info, void *opaque) { @@ -1353,8 +1353,8 @@ qemuDomainFillDeviceIsolationGroup(virDomainDefPtr de= f, static int qemuDomainFillDeviceIsolationGroupIter(virDomainDefPtr def, virDomainDeviceDefPtr dev, - virDomainDeviceInfoPtr info ATTRIBU= TE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) + virDomainDeviceInfoPtr info G_GNUC_= UNUSED, + void *opaque G_GNUC_UNUSED) { return qemuDomainFillDeviceIsolationGroup(def, dev); } @@ -1476,8 +1476,8 @@ qemuDomainPCIAddressReserveNextAddr(virDomainPCIAddre= ssSetPtr addrs, =20 =20 static int -qemuDomainAssignPCIAddressExtension(virDomainDefPtr def ATTRIBUTE_UNUSED, - virDomainDeviceDefPtr device ATTRIBUTE= _UNUSED, +qemuDomainAssignPCIAddressExtension(virDomainDefPtr def G_GNUC_UNUSED, + virDomainDeviceDefPtr device G_GNUC_UN= USED, virDomainDeviceInfoPtr info, void *opaque) { @@ -1494,7 +1494,7 @@ qemuDomainAssignPCIAddressExtension(virDomainDefPtr d= ef ATTRIBUTE_UNUSED, } =20 static int -qemuDomainCollectPCIAddress(virDomainDefPtr def ATTRIBUTE_UNUSED, +qemuDomainCollectPCIAddress(virDomainDefPtr def G_GNUC_UNUSED, virDomainDeviceDefPtr device, virDomainDeviceInfoPtr info, void *opaque) @@ -1586,7 +1586,7 @@ qemuDomainCollectPCIAddress(virDomainDefPtr def ATTRI= BUTE_UNUSED, } =20 static int -qemuDomainCollectPCIAddressExtension(virDomainDefPtr def ATTRIBUTE_UNUSED, +qemuDomainCollectPCIAddressExtension(virDomainDefPtr def G_GNUC_UNUSED, virDomainDeviceDefPtr device, virDomainDeviceInfoPtr info, void *opaque) @@ -2964,7 +2964,7 @@ qemuDomainAssignUSBPorts(virDomainUSBAddressSetPtr ad= drs, =20 =20 static int -qemuDomainAssignUSBPortsCounter(virDomainDeviceInfoPtr info ATTRIBUTE_UNUS= ED, +qemuDomainAssignUSBPortsCounter(virDomainDeviceInfoPtr info G_GNUC_UNUSED, void *opaque) { struct qemuAssignUSBIteratorInfo *data =3D opaque; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index bc0ede2fb0..681b26814b 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -617,7 +617,7 @@ qemuDomainCheckpointLoad(virDomainObjPtr vm, =20 static int qemuDomainNetsRestart(virDomainObjPtr vm, - void *data ATTRIBUTE_UNUSED) + void *data G_GNUC_UNUSED) { size_t i; virDomainDefPtr def =3D vm->def; @@ -1226,8 +1226,8 @@ qemuConnectURIProbe(char **uri) } =20 static virDrvOpenStatus qemuConnectOpen(virConnectPtr conn, - virConnectAuthPtr auth ATTRIBUTE_U= NUSED, - virConfPtr conf ATTRIBUTE_UNUSED, + virConnectAuthPtr auth G_GNUC_UNUS= ED, + virConfPtr conf G_GNUC_UNUSED, unsigned int flags) { virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); @@ -1300,19 +1300,19 @@ static const char *qemuConnectGetType(virConnectPtr= conn) { } =20 =20 -static int qemuConnectIsSecure(virConnectPtr conn ATTRIBUTE_UNUSED) +static int qemuConnectIsSecure(virConnectPtr conn G_GNUC_UNUSED) { /* Trivially secure, since always inside the daemon */ return 1; } =20 -static int qemuConnectIsEncrypted(virConnectPtr conn ATTRIBUTE_UNUSED) +static int qemuConnectIsEncrypted(virConnectPtr conn G_GNUC_UNUSED) { /* Not encrypted, but remote driver takes care of that */ return 0; } =20 -static int qemuConnectIsAlive(virConnectPtr conn ATTRIBUTE_UNUSED) +static int qemuConnectIsAlive(virConnectPtr conn G_GNUC_UNUSED) { return 1; } @@ -1343,7 +1343,7 @@ qemuConnectGetSysinfo(virConnectPtr conn, unsigned in= t flags) } =20 static int -qemuConnectGetMaxVcpus(virConnectPtr conn ATTRIBUTE_UNUSED, const char *ty= pe) +qemuConnectGetMaxVcpus(virConnectPtr conn G_GNUC_UNUSED, const char *type) { if (virConnectGetMaxVcpusEnsureACL(conn) < 0) return -1; @@ -2235,7 +2235,7 @@ qemuDomainReset(virDomainPtr dom, unsigned int flags) /* Count how many snapshots in a set are external snapshots. */ static int qemuDomainSnapshotCountExternal(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *data) { virDomainMomentObjPtr snap =3D payload; @@ -12608,7 +12608,7 @@ qemuDomainMigratePrepareTunnel(virConnectPtr dconn, virStreamPtr st, unsigned long flags, const char *dname, - unsigned long resource ATTRIBUTE_UNUSED, + unsigned long resource G_GNUC_UNUSED, const char *dom_xml) { virQEMUDriverPtr driver =3D dconn->privateData; @@ -12659,13 +12659,13 @@ qemuDomainMigratePrepareTunnel(virConnectPtr dcon= n, */ static int ATTRIBUTE_NONNULL(5) qemuDomainMigratePrepare2(virConnectPtr dconn, - char **cookie ATTRIBUTE_UNUSED, - int *cookielen ATTRIBUTE_UNUSED, + char **cookie G_GNUC_UNUSED, + int *cookielen G_GNUC_UNUSED, const char *uri_in, char **uri_out, unsigned long flags, const char *dname, - unsigned long resource ATTRIBUTE_UNUSED, + unsigned long resource G_GNUC_UNUSED, const char *dom_xml) { virQEMUDriverPtr driver =3D dconn->privateData; @@ -12782,9 +12782,9 @@ qemuDomainMigratePerform(virDomainPtr dom, static virDomainPtr qemuDomainMigrateFinish2(virConnectPtr dconn, const char *dname, - const char *cookie ATTRIBUTE_UNUSED, - int cookielen ATTRIBUTE_UNUSED, - const char *uri ATTRIBUTE_UNUSED, + const char *cookie G_GNUC_UNUSED, + int cookielen G_GNUC_UNUSED, + const char *uri G_GNUC_UNUSED, unsigned long flags, int retcode) { @@ -12831,7 +12831,7 @@ qemuDomainMigrateBegin3(virDomainPtr domain, int *cookieoutlen, unsigned long flags, const char *dname, - unsigned long resource ATTRIBUTE_UNUSED) + unsigned long resource G_GNUC_UNUSED) { virDomainObjPtr vm; =20 @@ -12911,7 +12911,7 @@ qemuDomainMigratePrepare3(virConnectPtr dconn, char **uri_out, unsigned long flags, const char *dname, - unsigned long resource ATTRIBUTE_UNUSED, + unsigned long resource G_GNUC_UNUSED, const char *dom_xml) { virQEMUDriverPtr driver =3D dconn->privateData; @@ -13056,7 +13056,7 @@ qemuDomainMigratePrepareTunnel3(virConnectPtr dconn, int *cookieoutlen, unsigned long flags, const char *dname, - unsigned long resource ATTRIBUTE_UNUSED, + unsigned long resource G_GNUC_UNUSED, const char *dom_xml) { virQEMUDriverPtr driver =3D dconn->privateData; @@ -13292,8 +13292,8 @@ qemuDomainMigrateFinish3(virConnectPtr dconn, int cookieinlen, char **cookieout, int *cookieoutlen, - const char *dconnuri ATTRIBUTE_UNUSED, - const char *uri ATTRIBUTE_UNUSED, + const char *dconnuri G_GNUC_UNUSED, + const char *uri G_GNUC_UNUSED, unsigned long flags, int cancelled) { @@ -13748,7 +13748,7 @@ qemuConnectCompareHypervisorCPU(virConnectPtr conn, =20 =20 static char * -qemuConnectBaselineCPU(virConnectPtr conn ATTRIBUTE_UNUSED, +qemuConnectBaselineCPU(virConnectPtr conn G_GNUC_UNUSED, const char **xmlCPUs, unsigned int ncpus, unsigned int flags) @@ -14698,7 +14698,7 @@ qemuDomainMigrateStartPostCopy(virDomainPtr dom, * is sent but failed, and number of frozen filesystems on success. If -2 = is * returned, FSThaw should be called revert the quiesced status. */ static int -qemuDomainSnapshotFSFreeze(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, +qemuDomainSnapshotFSFreeze(virQEMUDriverPtr driver G_GNUC_UNUSED, virDomainObjPtr vm, const char **mountpoints, unsigned int nmountpoints) @@ -14718,7 +14718,7 @@ qemuDomainSnapshotFSFreeze(virQEMUDriverPtr driver = ATTRIBUTE_UNUSED, =20 /* Return -1 on error, otherwise number of thawed filesystems. */ static int -qemuDomainSnapshotFSThaw(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, +qemuDomainSnapshotFSThaw(virQEMUDriverPtr driver G_GNUC_UNUSED, virDomainObjPtr vm, bool report) { @@ -17085,7 +17085,7 @@ struct _virQEMUMomentReparent { =20 static int qemuDomainMomentReparentChildren(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *data) { virDomainMomentObjPtr moment =3D payload; @@ -20605,10 +20605,10 @@ qemuConnectGetDomainCapabilities(virConnectPtr co= nn, =20 =20 static int -qemuDomainGetStatsState(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, +qemuDomainGetStatsState(virQEMUDriverPtr driver G_GNUC_UNUSED, virDomainObjPtr dom, virTypedParamListPtr params, - unsigned int privflags ATTRIBUTE_UNUSED) + unsigned int privflags G_GNUC_UNUSED) { if (virTypedParamListAddInt(params, dom->state.state, "state.state") <= 0) return -1; @@ -20836,7 +20836,7 @@ static int qemuDomainGetStatsCpu(virQEMUDriverPtr driver, virDomainObjPtr dom, virTypedParamListPtr params, - unsigned int privflags ATTRIBUTE_UNUSED) + unsigned int privflags G_GNUC_UNUSED) { if (qemuDomainGetStatsCpuCgroup(dom, params) < 0) return -1; @@ -20992,10 +20992,10 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr driver, return -1; =20 static int -qemuDomainGetStatsInterface(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, +qemuDomainGetStatsInterface(virQEMUDriverPtr driver G_GNUC_UNUSED, virDomainObjPtr dom, virTypedParamListPtr params, - unsigned int privflags ATTRIBUTE_UNUSED) + unsigned int privflags G_GNUC_UNUSED) { size_t i; struct _virDomainInterfaceStats tmp; @@ -21418,7 +21418,7 @@ static int qemuDomainGetStatsIOThread(virQEMUDriverPtr driver, virDomainObjPtr dom, virTypedParamListPtr params, - unsigned int privflags ATTRIBUTE_UNUSED) + unsigned int privflags G_GNUC_UNUSED) { qemuDomainObjPrivatePtr priv =3D dom->privateData; size_t i; @@ -21484,10 +21484,10 @@ qemuDomainGetStatsPerfOneEvent(virPerfPtr perf, } =20 static int -qemuDomainGetStatsPerf(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, +qemuDomainGetStatsPerf(virQEMUDriverPtr driver G_GNUC_UNUSED, virDomainObjPtr dom, virTypedParamListPtr params, - unsigned int privflags ATTRIBUTE_UNUSED) + unsigned int privflags G_GNUC_UNUSED) { size_t i; qemuDomainObjPrivatePtr priv =3D dom->privateData; diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index e9285f0964..88984dff67 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -4195,8 +4195,8 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver, } =20 =20 -static int qemuComparePCIDevice(virDomainDefPtr def ATTRIBUTE_UNUSED, - virDomainDeviceDefPtr device ATTRIBUTE_UNU= SED, +static int qemuComparePCIDevice(virDomainDefPtr def G_GNUC_UNUSED, + virDomainDeviceDefPtr device G_GNUC_UNUSED, virDomainDeviceInfoPtr info1, void *opaque) { diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index d75b879a56..1cbb27e104 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1774,7 +1774,7 @@ qemuMigrationSrcGraphicsRelocate(virQEMUDriverPtr dri= ver, =20 =20 static int -qemuMigrationDstOPDRelocate(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, +qemuMigrationDstOPDRelocate(virQEMUDriverPtr driver G_GNUC_UNUSED, virDomainObjPtr vm, qemuMigrationCookiePtr cookie) { @@ -5492,7 +5492,7 @@ qemuMigrationJobFinish(virQEMUDriverPtr driver, virDo= mainObjPtr vm) =20 static void qemuMigrationDstErrorFree(void *data, - const void *name ATTRIBUTE_UNUSED) + const void *name G_GNUC_UNUSED) { virErrorPtr err =3D data; virFreeError(err); diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_coo= kie.c index 25d3fecd74..e7556889cc 100644 --- a/src/qemu/qemu_migration_cookie.c +++ b/src/qemu/qemu_migration_cookie.c @@ -228,7 +228,7 @@ qemuMigrationCookieGraphicsSpiceAlloc(virQEMUDriverPtr = driver, =20 =20 static qemuMigrationCookieNetworkPtr -qemuMigrationCookieNetworkAlloc(virQEMUDriverPtr driver ATTRIBUTE_UNUSED, +qemuMigrationCookieNetworkAlloc(virQEMUDriverPtr driver G_GNUC_UNUSED, virDomainDefPtr def) { qemuMigrationCookieNetworkPtr mig; diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index a53d3b1d60..49f9159315 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -2109,7 +2109,7 @@ qemuMonitorBlockIOStatusToError(const char *status) =20 =20 static void -qemuDomainDiskInfoFree(void *value, const void *name ATTRIBUTE_UNUSED) +qemuDomainDiskInfoFree(void *value, const void *name G_GNUC_UNUSED) { struct qemuDomainDiskInfo *info =3D value; =20 @@ -2763,7 +2763,7 @@ qemuMonitorQueryRxFilter(qemuMonitorPtr mon, const ch= ar *alias, =20 void qemuMonitorChardevInfoFree(void *data, - const void *name ATTRIBUTE_UNUSED) + const void *name G_GNUC_UNUSED) { qemuMonitorChardevInfoPtr info =3D data; =20 diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 6818e726c6..1e55b166fa 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -750,22 +750,22 @@ static void qemuMonitorJSONHandleShutdown(qemuMonitor= Ptr mon, virJSONValuePtr da qemuMonitorEmitShutdown(mon, guest_initiated); } =20 -static void qemuMonitorJSONHandleReset(qemuMonitorPtr mon, virJSONValuePtr= data ATTRIBUTE_UNUSED) +static void qemuMonitorJSONHandleReset(qemuMonitorPtr mon, virJSONValuePtr= data G_GNUC_UNUSED) { qemuMonitorEmitReset(mon); } =20 -static void qemuMonitorJSONHandlePowerdown(qemuMonitorPtr mon, virJSONValu= ePtr data ATTRIBUTE_UNUSED) +static void qemuMonitorJSONHandlePowerdown(qemuMonitorPtr mon, virJSONValu= ePtr data G_GNUC_UNUSED) { qemuMonitorEmitPowerdown(mon); } =20 -static void qemuMonitorJSONHandleStop(qemuMonitorPtr mon, virJSONValuePtr = data ATTRIBUTE_UNUSED) +static void qemuMonitorJSONHandleStop(qemuMonitorPtr mon, virJSONValuePtr = data G_GNUC_UNUSED) { qemuMonitorEmitStop(mon); } =20 -static void qemuMonitorJSONHandleResume(qemuMonitorPtr mon, virJSONValuePt= r data ATTRIBUTE_UNUSED) +static void qemuMonitorJSONHandleResume(qemuMonitorPtr mon, virJSONValuePt= r data G_GNUC_UNUSED) { qemuMonitorEmitResume(mon); } @@ -1230,14 +1230,14 @@ qemuMonitorJSONHandleTrayChange(qemuMonitorPtr mon, =20 static void qemuMonitorJSONHandlePMWakeup(qemuMonitorPtr mon, - virJSONValuePtr data ATTRIBUTE_UNUSED) + virJSONValuePtr data G_GNUC_UNUSED) { qemuMonitorEmitPMWakeup(mon); } =20 static void qemuMonitorJSONHandlePMSuspend(qemuMonitorPtr mon, - virJSONValuePtr data ATTRIBUTE_UNUSED) + virJSONValuePtr data G_GNUC_UNUSED) { qemuMonitorEmitPMSuspend(mon); } @@ -1281,7 +1281,7 @@ qemuMonitorJSONHandleBalloonChange(qemuMonitorPtr mon, =20 static void qemuMonitorJSONHandlePMSuspendDisk(qemuMonitorPtr mon, - virJSONValuePtr data ATTRIBUTE_UNUSED) + virJSONValuePtr data G_GNUC_UNUSED) { qemuMonitorEmitPMSuspendDisk(mon); } @@ -1337,7 +1337,7 @@ qemuMonitorJSONHandleSerialChange(qemuMonitorPtr mon, =20 static void qemuMonitorJSONHandleSpiceMigrated(qemuMonitorPtr mon, - virJSONValuePtr data ATTRIBUTE_UNUSED) + virJSONValuePtr data G_GNUC_UNUSED) { qemuMonitorEmitSpiceMigrated(mon); } @@ -2829,7 +2829,7 @@ qemuMonitorJSONBlockStatsUpdateCapacity(qemuMonitorPt= r mon, =20 =20 static int -qemuMonitorJSONBlockStatsUpdateCapacityBlockdevWorker(size_t pos ATTRIBUTE= _UNUSED, +qemuMonitorJSONBlockStatsUpdateCapacityBlockdevWorker(size_t pos G_GNUC_UN= USED, virJSONValuePtr val, void *opaque) { diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index c6fac01ada..a1c96af4f6 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -180,7 +180,7 @@ qemuProcessHandleAgentEOF(qemuAgentPtr agent, * allowed */ static void -qemuProcessHandleAgentError(qemuAgentPtr agent ATTRIBUTE_UNUSED, +qemuProcessHandleAgentError(qemuAgentPtr agent G_GNUC_UNUSED, virDomainObjPtr vm) { qemuDomainObjPrivatePtr priv; @@ -339,7 +339,7 @@ qemuProcessHandleMonitorEOF(qemuMonitorPtr mon, * allowed */ static void -qemuProcessHandleMonitorError(qemuMonitorPtr mon ATTRIBUTE_UNUSED, +qemuProcessHandleMonitorError(qemuMonitorPtr mon G_GNUC_UNUSED, virDomainObjPtr vm, void *opaque) { @@ -401,7 +401,7 @@ qemuProcessFindDomainDiskByAliasOrQOM(virDomainObjPtr v= m, =20 =20 static int -qemuProcessHandleReset(qemuMonitorPtr mon ATTRIBUTE_UNUSED, +qemuProcessHandleReset(qemuMonitorPtr mon G_GNUC_UNUSED, virDomainObjPtr vm, void *opaque) { @@ -543,7 +543,7 @@ qemuProcessShutdownOrReboot(virQEMUDriverPtr driver, =20 =20 static int -qemuProcessHandleEvent(qemuMonitorPtr mon ATTRIBUTE_UNUSED, +qemuProcessHandleEvent(qemuMonitorPtr mon G_GNUC_UNUSED, virDomainObjPtr vm, const char *eventName, long long seconds, @@ -569,7 +569,7 @@ qemuProcessHandleEvent(qemuMonitorPtr mon ATTRIBUTE_UNU= SED, =20 =20 static int -qemuProcessHandleShutdown(qemuMonitorPtr mon ATTRIBUTE_UNUSED, +qemuProcessHandleShutdown(qemuMonitorPtr mon G_GNUC_UNUSED, virDomainObjPtr vm, virTristateBool guest_initiated, void *opaque) @@ -641,7 +641,7 @@ qemuProcessHandleShutdown(qemuMonitorPtr mon ATTRIBUTE_= UNUSED, =20 =20 static int -qemuProcessHandleStop(qemuMonitorPtr mon ATTRIBUTE_UNUSED, +qemuProcessHandleStop(qemuMonitorPtr mon G_GNUC_UNUSED, virDomainObjPtr vm, void *opaque) { @@ -702,7 +702,7 @@ qemuProcessHandleStop(qemuMonitorPtr mon ATTRIBUTE_UNUS= ED, =20 =20 static int -qemuProcessHandleResume(qemuMonitorPtr mon ATTRIBUTE_UNUSED, +qemuProcessHandleResume(qemuMonitorPtr mon G_GNUC_UNUSED, virDomainObjPtr vm, void *opaque) { @@ -746,7 +746,7 @@ qemuProcessHandleResume(qemuMonitorPtr mon ATTRIBUTE_UN= USED, } =20 static int -qemuProcessHandleRTCChange(qemuMonitorPtr mon ATTRIBUTE_UNUSED, +qemuProcessHandleRTCChange(qemuMonitorPtr mon G_GNUC_UNUSED, virDomainObjPtr vm, long long offset, void *opaque) @@ -791,7 +791,7 @@ qemuProcessHandleRTCChange(qemuMonitorPtr mon ATTRIBUTE= _UNUSED, =20 =20 static int -qemuProcessHandleWatchdog(qemuMonitorPtr mon ATTRIBUTE_UNUSED, +qemuProcessHandleWatchdog(qemuMonitorPtr mon G_GNUC_UNUSED, virDomainObjPtr vm, int action, void *opaque) @@ -853,7 +853,7 @@ qemuProcessHandleWatchdog(qemuMonitorPtr mon ATTRIBUTE_= UNUSED, =20 =20 static int -qemuProcessHandleIOError(qemuMonitorPtr mon ATTRIBUTE_UNUSED, +qemuProcessHandleIOError(qemuMonitorPtr mon G_GNUC_UNUSED, virDomainObjPtr vm, const char *diskAlias, const char *nodename, @@ -924,7 +924,7 @@ qemuProcessHandleIOError(qemuMonitorPtr mon ATTRIBUTE_U= NUSED, } =20 static int -qemuProcessHandleBlockJob(qemuMonitorPtr mon ATTRIBUTE_UNUSED, +qemuProcessHandleBlockJob(qemuMonitorPtr mon G_GNUC_UNUSED, virDomainObjPtr vm, const char *diskAlias, int type, @@ -990,7 +990,7 @@ qemuProcessHandleBlockJob(qemuMonitorPtr mon ATTRIBUTE_= UNUSED, =20 =20 static int -qemuProcessHandleJobStatusChange(qemuMonitorPtr mon ATTRIBUTE_UNUSED, +qemuProcessHandleJobStatusChange(qemuMonitorPtr mon G_GNUC_UNUSED, virDomainObjPtr vm, const char *jobname, int status, @@ -1052,7 +1052,7 @@ qemuProcessHandleJobStatusChange(qemuMonitorPtr mon A= TTRIBUTE_UNUSED, =20 =20 static int -qemuProcessHandleGraphics(qemuMonitorPtr mon ATTRIBUTE_UNUSED, +qemuProcessHandleGraphics(qemuMonitorPtr mon G_GNUC_UNUSED, virDomainObjPtr vm, int phase, int localFamily, @@ -1138,7 +1138,7 @@ qemuProcessHandleGraphics(qemuMonitorPtr mon ATTRIBUT= E_UNUSED, } =20 static int -qemuProcessHandleTrayChange(qemuMonitorPtr mon ATTRIBUTE_UNUSED, +qemuProcessHandleTrayChange(qemuMonitorPtr mon G_GNUC_UNUSED, virDomainObjPtr vm, const char *devAlias, const char *devid, @@ -1176,7 +1176,7 @@ qemuProcessHandleTrayChange(qemuMonitorPtr mon ATTRIB= UTE_UNUSED, } =20 static int -qemuProcessHandlePMWakeup(qemuMonitorPtr mon ATTRIBUTE_UNUSED, +qemuProcessHandlePMWakeup(qemuMonitorPtr mon G_GNUC_UNUSED, virDomainObjPtr vm, void *opaque) { @@ -1215,7 +1215,7 @@ qemuProcessHandlePMWakeup(qemuMonitorPtr mon ATTRIBUT= E_UNUSED, } =20 static int -qemuProcessHandlePMSuspend(qemuMonitorPtr mon ATTRIBUTE_UNUSED, +qemuProcessHandlePMSuspend(qemuMonitorPtr mon G_GNUC_UNUSED, virDomainObjPtr vm, void *opaque) { @@ -1257,7 +1257,7 @@ qemuProcessHandlePMSuspend(qemuMonitorPtr mon ATTRIBU= TE_UNUSED, } =20 static int -qemuProcessHandleBalloonChange(qemuMonitorPtr mon ATTRIBUTE_UNUSED, +qemuProcessHandleBalloonChange(qemuMonitorPtr mon G_GNUC_UNUSED, virDomainObjPtr vm, unsigned long long actual, void *opaque) @@ -1284,7 +1284,7 @@ qemuProcessHandleBalloonChange(qemuMonitorPtr mon ATT= RIBUTE_UNUSED, } =20 static int -qemuProcessHandlePMSuspendDisk(qemuMonitorPtr mon ATTRIBUTE_UNUSED, +qemuProcessHandlePMSuspendDisk(qemuMonitorPtr mon G_GNUC_UNUSED, virDomainObjPtr vm, void *opaque) { @@ -1328,7 +1328,7 @@ qemuProcessHandlePMSuspendDisk(qemuMonitorPtr mon ATT= RIBUTE_UNUSED, =20 =20 static int -qemuProcessHandleGuestPanic(qemuMonitorPtr mon ATTRIBUTE_UNUSED, +qemuProcessHandleGuestPanic(qemuMonitorPtr mon G_GNUC_UNUSED, virDomainObjPtr vm, qemuMonitorEventPanicInfoPtr info, void *opaque) @@ -1363,7 +1363,7 @@ qemuProcessHandleGuestPanic(qemuMonitorPtr mon ATTRIB= UTE_UNUSED, =20 =20 int -qemuProcessHandleDeviceDeleted(qemuMonitorPtr mon ATTRIBUTE_UNUSED, +qemuProcessHandleDeviceDeleted(qemuMonitorPtr mon G_GNUC_UNUSED, virDomainObjPtr vm, const char *devAlias, void *opaque) @@ -1461,7 +1461,7 @@ qemuProcessHandleDeviceDeleted(qemuMonitorPtr mon ATT= RIBUTE_UNUSED, * devices. */ static int -qemuProcessHandleAcpiOstInfo(qemuMonitorPtr mon ATTRIBUTE_UNUSED, +qemuProcessHandleAcpiOstInfo(qemuMonitorPtr mon G_GNUC_UNUSED, virDomainObjPtr vm, const char *alias, const char *slotType, @@ -1501,7 +1501,7 @@ qemuProcessHandleAcpiOstInfo(qemuMonitorPtr mon ATTRI= BUTE_UNUSED, =20 =20 static int -qemuProcessHandleBlockThreshold(qemuMonitorPtr mon ATTRIBUTE_UNUSED, +qemuProcessHandleBlockThreshold(qemuMonitorPtr mon G_GNUC_UNUSED, virDomainObjPtr vm, const char *nodename, unsigned long long threshold, @@ -1541,7 +1541,7 @@ qemuProcessHandleBlockThreshold(qemuMonitorPtr mon AT= TRIBUTE_UNUSED, =20 =20 static int -qemuProcessHandleNicRxFilterChanged(qemuMonitorPtr mon ATTRIBUTE_UNUSED, +qemuProcessHandleNicRxFilterChanged(qemuMonitorPtr mon G_GNUC_UNUSED, virDomainObjPtr vm, const char *devAlias, void *opaque) @@ -1579,7 +1579,7 @@ qemuProcessHandleNicRxFilterChanged(qemuMonitorPtr mo= n ATTRIBUTE_UNUSED, =20 =20 static int -qemuProcessHandleSerialChanged(qemuMonitorPtr mon ATTRIBUTE_UNUSED, +qemuProcessHandleSerialChanged(qemuMonitorPtr mon G_GNUC_UNUSED, virDomainObjPtr vm, const char *devAlias, bool connected, @@ -1619,9 +1619,9 @@ qemuProcessHandleSerialChanged(qemuMonitorPtr mon ATT= RIBUTE_UNUSED, =20 =20 static int -qemuProcessHandleSpiceMigrated(qemuMonitorPtr mon ATTRIBUTE_UNUSED, +qemuProcessHandleSpiceMigrated(qemuMonitorPtr mon G_GNUC_UNUSED, virDomainObjPtr vm, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { qemuDomainObjPrivatePtr priv; =20 @@ -1646,7 +1646,7 @@ qemuProcessHandleSpiceMigrated(qemuMonitorPtr mon ATT= RIBUTE_UNUSED, =20 =20 static int -qemuProcessHandleMigrationStatus(qemuMonitorPtr mon ATTRIBUTE_UNUSED, +qemuProcessHandleMigrationStatus(qemuMonitorPtr mon G_GNUC_UNUSED, virDomainObjPtr vm, int status, void *opaque) @@ -1699,7 +1699,7 @@ qemuProcessHandleMigrationStatus(qemuMonitorPtr mon A= TTRIBUTE_UNUSED, =20 =20 static int -qemuProcessHandleMigrationPass(qemuMonitorPtr mon ATTRIBUTE_UNUSED, +qemuProcessHandleMigrationPass(qemuMonitorPtr mon G_GNUC_UNUSED, virDomainObjPtr vm, int pass, void *opaque) @@ -1728,12 +1728,12 @@ qemuProcessHandleMigrationPass(qemuMonitorPtr mon A= TTRIBUTE_UNUSED, =20 =20 static int -qemuProcessHandleDumpCompleted(qemuMonitorPtr mon ATTRIBUTE_UNUSED, +qemuProcessHandleDumpCompleted(qemuMonitorPtr mon G_GNUC_UNUSED, virDomainObjPtr vm, int status, qemuMonitorDumpStatsPtr stats, const char *error, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { qemuDomainObjPrivatePtr priv; =20 @@ -1767,7 +1767,7 @@ qemuProcessHandleDumpCompleted(qemuMonitorPtr mon ATT= RIBUTE_UNUSED, =20 =20 static int -qemuProcessHandlePRManagerStatusChanged(qemuMonitorPtr mon ATTRIBUTE_UNUSE= D, +qemuProcessHandlePRManagerStatusChanged(qemuMonitorPtr mon G_GNUC_UNUSED, virDomainObjPtr vm, const char *prManager, bool connected, @@ -1821,7 +1821,7 @@ qemuProcessHandlePRManagerStatusChanged(qemuMonitorPt= r mon ATTRIBUTE_UNUSED, =20 =20 static int -qemuProcessHandleRdmaGidStatusChanged(qemuMonitorPtr mon ATTRIBUTE_UNUSED, +qemuProcessHandleRdmaGidStatusChanged(qemuMonitorPtr mon G_GNUC_UNUSED, virDomainObjPtr vm, const char *netdev, bool gid_status, @@ -2088,7 +2088,7 @@ qemuProcessReportLogError(qemuDomainLogContextPtr log= Ctxt, =20 =20 static void -qemuProcessMonitorReportLogError(qemuMonitorPtr mon ATTRIBUTE_UNUSED, +qemuProcessMonitorReportLogError(qemuMonitorPtr mon G_GNUC_UNUSED, const char *msg, void *opaque) { @@ -2568,7 +2568,7 @@ qemuProcessInitCpuAffinity(virDomainObjPtr vm) } #else /* !defined(HAVE_SCHED_GETAFFINITY) && !defined(HAVE_BSD_CPU_AFFINIT= Y) */ static int -qemuProcessInitCpuAffinity(virDomainObjPtr vm ATTRIBUTE_UNUSED) +qemuProcessInitCpuAffinity(virDomainObjPtr vm G_GNUC_UNUSED) { return 0; } @@ -3013,9 +3013,9 @@ qemuProcessInitPasswords(virQEMUDriverPtr driver, =20 =20 static int -qemuProcessPrepareChardevDevice(virDomainDefPtr def ATTRIBUTE_UNUSED, +qemuProcessPrepareChardevDevice(virDomainDefPtr def G_GNUC_UNUSED, virDomainChrDefPtr dev, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { int fd; if (dev->source->type !=3D VIR_DOMAIN_CHR_TYPE_FILE) @@ -3036,9 +3036,9 @@ qemuProcessPrepareChardevDevice(virDomainDefPtr def A= TTRIBUTE_UNUSED, =20 =20 static int -qemuProcessCleanupChardevDevice(virDomainDefPtr def ATTRIBUTE_UNUSED, +qemuProcessCleanupChardevDevice(virDomainDefPtr def G_GNUC_UNUSED, virDomainChrDefPtr dev, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { if (dev->source->type =3D=3D VIR_DOMAIN_CHR_TYPE_UNIX && dev->source->data.nix.listen && @@ -5048,7 +5048,7 @@ qemuProcessSetupGraphics(virQEMUDriverPtr driver, static int qemuProcessSetupRawIO(virQEMUDriverPtr driver, virDomainObjPtr vm, - virCommandPtr cmd ATTRIBUTE_UNUSED) + virCommandPtr cmd G_GNUC_UNUSED) { bool rawio =3D false; size_t i; @@ -8376,9 +8376,9 @@ qemuProcessReconnectAll(virQEMUDriverPtr driver) } =20 =20 -static void virQEMUCapsMonitorNotify(qemuMonitorPtr mon ATTRIBUTE_UNUSED, - virDomainObjPtr vm ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) +static void virQEMUCapsMonitorNotify(qemuMonitorPtr mon G_GNUC_UNUSED, + virDomainObjPtr vm G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED) { } =20 diff --git a/src/qemu/qemu_qapi.c b/src/qemu/qemu_qapi.c index 93fcae0d44..5101ed6aae 100644 --- a/src/qemu/qemu_qapi.c +++ b/src/qemu/qemu_qapi.c @@ -471,7 +471,7 @@ virQEMUQAPISchemaPathExists(const char *query, } =20 static int -virQEMUQAPISchemaEntryProcess(size_t pos ATTRIBUTE_UNUSED, +virQEMUQAPISchemaEntryProcess(size_t pos G_GNUC_UNUSED, virJSONValuePtr item, void *opaque) { --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 10:00:01 2024 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=1571059203; cv=none; d=zoho.com; s=zohoarc; b=WdIewA9FoOEknaFcHW3ErFmHYQsGr22nMFTXn292u6SMf4RfblK4IJ5ZJG6dRj+FBM6BiYu3jjllezmKxnKPjkoOHdgi4NIoFAMaUmFTZx2xOgRm7RGeUrM5+P5OP4uzMBEj/r80A+r1PltI2wbRR0QXCS5+G7vnMc9KInSfhl4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571059203; 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=8OcEaIfdmxOrWearTPfm7cVHjN7BBOE6uaslX7/nF5Y=; b=FqnDHAQaLM2Accx6KlY/U4wD9fZFNMGT028mMMXa0vlQDeLoD/HaGLzc5V1qIR/fVgNINyy4hJMUqvgfv/idL0cZOtB72heM/WH53ZKMvBhGK2UZg6keA7m94K8qMivGhr0NdLhhadOwoKO2gK6W+qixC+EU+AOFTyZCuDXyQQ8= 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 1571059203676160.1756890765746; Mon, 14 Oct 2019 06:20:03 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 91346106E969; Mon, 14 Oct 2019 13:20:01 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0BF7F5D6A7; Mon, 14 Oct 2019 13:20:01 +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 BB0C92551D; Mon, 14 Oct 2019 13:20:00 +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 x9EDGYs4017509 for ; Mon, 14 Oct 2019 09:16:34 -0400 Received: by smtp.corp.redhat.com (Postfix) id A7D6D60126; Mon, 14 Oct 2019 13:16:34 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id D765C600CD for ; Mon, 14 Oct 2019 13:16:31 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Mon, 14 Oct 2019 15:15:40 +0200 Message-Id: <18b7da40be7e20647bfe72e52950be134d748f3e.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 22/35] remote: 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.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.66]); Mon, 14 Oct 2019 13:20:02 +0000 (UTC) Use G_GNUC_UNUSED from GLib instead of ATTRIBUTE_UNUSED. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/remote/remote_daemon.c | 20 +- src/remote/remote_daemon_config.c | 2 +- src/remote/remote_daemon_dispatch.c | 420 ++++++++++++++-------------- src/remote/remote_daemon_stream.c | 2 +- src/remote/remote_driver.c | 270 +++++++++--------- 5 files changed, 357 insertions(+), 357 deletions(-) diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c index 7fcaa31c49..5f50d07002 100644 --- a/src/remote/remote_daemon.c +++ b/src/remote/remote_daemon.c @@ -273,8 +273,8 @@ daemonUnixSocketPaths(struct daemonConfig *config, } =20 =20 -static void daemonErrorHandler(void *opaque ATTRIBUTE_UNUSED, - virErrorPtr err ATTRIBUTE_UNUSED) +static void daemonErrorHandler(void *opaque G_GNUC_UNUSED, + virErrorPtr err G_GNUC_UNUSED) { /* Don't do anything, since logging infrastructure already * took care of reporting the error */ @@ -698,13 +698,13 @@ daemonVersion(const char *argv0) =20 =20 static void daemonShutdownHandler(virNetDaemonPtr dmn, - siginfo_t *sig ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) + siginfo_t *sig G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED) { virNetDaemonQuit(dmn); } =20 -static void daemonReloadHandlerThread(void *opague ATTRIBUTE_UNUSED) +static void daemonReloadHandlerThread(void *opague G_GNUC_UNUSED) { VIR_INFO("Reloading configuration on SIGHUP"); virHookCall(VIR_HOOK_DRIVER_DAEMON, "-", @@ -713,9 +713,9 @@ static void daemonReloadHandlerThread(void *opague ATTR= IBUTE_UNUSED) VIR_WARN("Error while reloading drivers"); } =20 -static void daemonReloadHandler(virNetDaemonPtr dmn ATTRIBUTE_UNUSED, - siginfo_t *sig ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) +static void daemonReloadHandler(virNetDaemonPtr dmn G_GNUC_UNUSED, + siginfo_t *sig G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED) { virThread thr; =20 @@ -787,7 +787,7 @@ static void daemonStop(virNetDaemonPtr dmn) =20 =20 static DBusHandlerResult -handleSessionMessageFunc(DBusConnection *connection ATTRIBUTE_UNUSED, +handleSessionMessageFunc(DBusConnection *connection G_GNUC_UNUSED, DBusMessage *message, void *opaque) { @@ -805,7 +805,7 @@ handleSessionMessageFunc(DBusConnection *connection ATT= RIBUTE_UNUSED, =20 =20 static DBusHandlerResult -handleSystemMessageFunc(DBusConnection *connection ATTRIBUTE_UNUSED, +handleSystemMessageFunc(DBusConnection *connection G_GNUC_UNUSED, DBusMessage *message, void *opaque) { diff --git a/src/remote/remote_daemon_config.c b/src/remote/remote_daemon_c= onfig.c index 0eecb20c34..ce5f8c5278 100644 --- a/src/remote/remote_daemon_config.c +++ b/src/remote/remote_daemon_config.c @@ -100,7 +100,7 @@ daemonConfigFilePath(bool privileged, char **configfile) } =20 struct daemonConfig* -daemonConfigNew(bool privileged ATTRIBUTE_UNUSED) +daemonConfigNew(bool privileged G_GNUC_UNUSED) { struct daemonConfig *data; =20 diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon= _dispatch.c index 8c9390c1d2..cd929c36da 100644 --- a/src/remote/remote_daemon_dispatch.c +++ b/src/remote/remote_daemon_dispatch.c @@ -1822,7 +1822,7 @@ remoteRelayDomainQemuMonitorEvent(virConnectPtr conn, } =20 static -void remoteRelayConnectionClosedEvent(virConnectPtr conn ATTRIBUTE_UNUSED,= int reason, void *opaque) +void remoteRelayConnectionClosedEvent(virConnectPtr conn G_GNUC_UNUSED, in= t reason, void *opaque) { virNetServerClientPtr client =3D opaque; =20 @@ -2109,7 +2109,7 @@ remoteGetStorageConn(virNetServerClientPtr client) =20 =20 void *remoteClientNew(virNetServerClientPtr client, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { struct daemonClientPrivate *priv; =20 @@ -2254,9 +2254,9 @@ remoteDispatchProbeURI(bool readonly, =20 =20 static int -remoteDispatchConnectOpen(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchConnectOpen(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, struct remote_connect_open_args *args) { @@ -2408,10 +2408,10 @@ remoteDispatchConnectOpen(virNetServerPtr server AT= TRIBUTE_UNUSED, =20 =20 static int -remoteDispatchConnectClose(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchConnectClose(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, - virNetMessageErrorPtr rerr ATTRIBUTE_UNUSED) + virNetMessagePtr msg G_GNUC_UNUSED, + virNetMessageErrorPtr rerr G_GNUC_UNUSED) { virNetServerClientDelayedClose(client); return 0; @@ -2419,9 +2419,9 @@ remoteDispatchConnectClose(virNetServerPtr server ATT= RIBUTE_UNUSED, =20 =20 static int -remoteDispatchConnectSetIdentity(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchConnectSetIdentity(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_connect_set_identity_args *args) { @@ -2466,9 +2466,9 @@ remoteDispatchConnectSetIdentity(virNetServerPtr serv= er ATTRIBUTE_UNUSED, =20 =20 static int -remoteDispatchDomainGetSchedulerType(virNetServerPtr server ATTRIBUTE_UNUS= ED, +remoteDispatchDomainGetSchedulerType(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_get_scheduler_type_args= *args, remote_domain_get_scheduler_type_ret = *ret) @@ -2500,9 +2500,9 @@ remoteDispatchDomainGetSchedulerType(virNetServerPtr = server ATTRIBUTE_UNUSED, } =20 static int -remoteDispatchDomainGetSchedulerParameters(virNetServerPtr server ATTRIBUT= E_UNUSED, +remoteDispatchDomainGetSchedulerParameters(virNetServerPtr server G_GNUC_U= NUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_= UNUSED, + virNetMessagePtr msg G_GNUC_UNU= SED, virNetMessageErrorPtr rerr, remote_domain_get_scheduler_par= ameters_args *args, remote_domain_get_scheduler_par= ameters_ret *ret) @@ -2548,9 +2548,9 @@ remoteDispatchDomainGetSchedulerParameters(virNetServ= erPtr server ATTRIBUTE_UNUS } =20 static int -remoteDispatchDomainGetSchedulerParametersFlags(virNetServerPtr server ATT= RIBUTE_UNUSED, +remoteDispatchDomainGetSchedulerParametersFlags(virNetServerPtr server G_G= NUC_UNUSED, virNetServerClientPtr clie= nt, - virNetMessagePtr msg ATTRI= BUTE_UNUSED, + virNetMessagePtr msg G_GNU= C_UNUSED, virNetMessageErrorPtr rerr, remote_domain_get_schedule= r_parameters_flags_args *args, remote_domain_get_schedule= r_parameters_flags_ret *ret) @@ -2597,9 +2597,9 @@ remoteDispatchDomainGetSchedulerParametersFlags(virNe= tServerPtr server ATTRIBUTE } =20 static int -remoteDispatchDomainMemoryStats(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainMemoryStats(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_memory_stats_args *args, remote_domain_memory_stats_ret *ret) @@ -2652,9 +2652,9 @@ remoteDispatchDomainMemoryStats(virNetServerPtr serve= r ATTRIBUTE_UNUSED, } =20 static int -remoteDispatchDomainBlockPeek(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainBlockPeek(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_block_peek_args *args, remote_domain_block_peek_ret *ret) @@ -2703,9 +2703,9 @@ remoteDispatchDomainBlockPeek(virNetServerPtr server = ATTRIBUTE_UNUSED, } =20 static int -remoteDispatchDomainBlockStatsFlags(virNetServerPtr server ATTRIBUTE_UNUSE= D, +remoteDispatchDomainBlockStatsFlags(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_block_stats_flags_args *= args, remote_domain_block_stats_flags_ret *r= et) @@ -2764,9 +2764,9 @@ remoteDispatchDomainBlockStatsFlags(virNetServerPtr s= erver ATTRIBUTE_UNUSED, } =20 static int -remoteDispatchDomainMemoryPeek(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainMemoryPeek(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_memory_peek_args *args, remote_domain_memory_peek_ret *ret) @@ -2813,9 +2813,9 @@ remoteDispatchDomainMemoryPeek(virNetServerPtr server= ATTRIBUTE_UNUSED, } =20 static int -remoteDispatchDomainGetSecurityLabel(virNetServerPtr server ATTRIBUTE_UNUS= ED, +remoteDispatchDomainGetSecurityLabel(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_get_security_label_args= *args, remote_domain_get_security_label_ret = *ret) @@ -2854,9 +2854,9 @@ remoteDispatchDomainGetSecurityLabel(virNetServerPtr = server ATTRIBUTE_UNUSED, } =20 static int -remoteDispatchDomainGetSecurityLabelList(virNetServerPtr server ATTRIBUTE_= UNUSED, +remoteDispatchDomainGetSecurityLabelList(virNetServerPtr server G_GNUC_UNU= SED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UN= USED, + virNetMessagePtr msg G_GNUC_UNUSE= D, virNetMessageErrorPtr rerr, remote_domain_get_security_label_= list_args *args, remote_domain_get_security_label_= list_ret *ret) @@ -2908,9 +2908,9 @@ remoteDispatchDomainGetSecurityLabelList(virNetServer= Ptr server ATTRIBUTE_UNUSED } =20 static int -remoteDispatchNodeGetSecurityModel(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchNodeGetSecurityModel(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_node_get_security_model_ret *ret) { @@ -2944,9 +2944,9 @@ remoteDispatchNodeGetSecurityModel(virNetServerPtr se= rver ATTRIBUTE_UNUSED, } =20 static int -remoteDispatchDomainGetVcpuPinInfo(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainGetVcpuPinInfo(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_get_vcpu_pin_info_args *a= rgs, remote_domain_get_vcpu_pin_info_ret *re= t) @@ -3006,9 +3006,9 @@ remoteDispatchDomainGetVcpuPinInfo(virNetServerPtr se= rver ATTRIBUTE_UNUSED, } =20 static int -remoteDispatchDomainPinEmulator(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainPinEmulator(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_pin_emulator_args *args) { @@ -3039,9 +3039,9 @@ remoteDispatchDomainPinEmulator(virNetServerPtr serve= r ATTRIBUTE_UNUSED, =20 =20 static int -remoteDispatchDomainGetEmulatorPinInfo(virNetServerPtr server ATTRIBUTE_UN= USED, +remoteDispatchDomainGetEmulatorPinInfo(virNetServerPtr server G_GNUC_UNUSE= D, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUS= ED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_get_emulator_pin_info= _args *args, remote_domain_get_emulator_pin_info= _ret *ret) @@ -3085,9 +3085,9 @@ remoteDispatchDomainGetEmulatorPinInfo(virNetServerPt= r server ATTRIBUTE_UNUSED, } =20 static int -remoteDispatchDomainGetVcpus(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainGetVcpus(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_get_vcpus_args *args, remote_domain_get_vcpus_ret *ret) @@ -3163,9 +3163,9 @@ remoteDispatchDomainGetVcpus(virNetServerPtr server A= TTRIBUTE_UNUSED, } =20 static int -remoteDispatchDomainGetIOThreadInfo(virNetServerPtr server ATTRIBUTE_UNUSE= D, +remoteDispatchDomainGetIOThreadInfo(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_get_iothread_info_args *= args, remote_domain_get_iothread_info_ret *r= et) @@ -3233,9 +3233,9 @@ remoteDispatchDomainGetIOThreadInfo(virNetServerPtr s= erver ATTRIBUTE_UNUSED, } =20 static int -remoteDispatchDomainMigratePrepare(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainMigratePrepare(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_migrate_prepare_args *arg= s, remote_domain_migrate_prepare_ret *ret) @@ -3285,9 +3285,9 @@ remoteDispatchDomainMigratePrepare(virNetServerPtr se= rver ATTRIBUTE_UNUSED, } =20 static int -remoteDispatchDomainMigratePrepare2(virNetServerPtr server ATTRIBUTE_UNUSE= D, +remoteDispatchDomainMigratePrepare2(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_migrate_prepare2_args *a= rgs, remote_domain_migrate_prepare2_ret *re= t) @@ -3334,9 +3334,9 @@ remoteDispatchDomainMigratePrepare2(virNetServerPtr s= erver ATTRIBUTE_UNUSED, } =20 static int -remoteDispatchDomainGetMemoryParameters(virNetServerPtr server ATTRIBUTE_U= NUSED, +remoteDispatchDomainGetMemoryParameters(virNetServerPtr server G_GNUC_UNUS= ED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNU= SED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_get_memory_parameter= s_args *args, remote_domain_get_memory_parameter= s_ret *ret) @@ -3394,9 +3394,9 @@ remoteDispatchDomainGetMemoryParameters(virNetServerP= tr server ATTRIBUTE_UNUSED, } =20 static int -remoteDispatchDomainGetNumaParameters(virNetServerPtr server ATTRIBUTE_UNU= SED, +remoteDispatchDomainGetNumaParameters(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSE= D, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_get_numa_parameters_ar= gs *args, remote_domain_get_numa_parameters_re= t *ret) @@ -3454,9 +3454,9 @@ remoteDispatchDomainGetNumaParameters(virNetServerPtr= server ATTRIBUTE_UNUSED, } =20 static int -remoteDispatchDomainGetBlkioParameters(virNetServerPtr server ATTRIBUTE_UN= USED, +remoteDispatchDomainGetBlkioParameters(virNetServerPtr server G_GNUC_UNUSE= D, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUS= ED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_get_blkio_parameters_= args *args, remote_domain_get_blkio_parameters_= ret *ret) @@ -3514,9 +3514,9 @@ remoteDispatchDomainGetBlkioParameters(virNetServerPt= r server ATTRIBUTE_UNUSED, } =20 static int -remoteDispatchNodeGetCPUStats(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchNodeGetCPUStats(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_node_get_cpu_stats_args *args, remote_node_get_cpu_stats_ret *ret) @@ -3583,9 +3583,9 @@ remoteDispatchNodeGetCPUStats(virNetServerPtr server = ATTRIBUTE_UNUSED, } =20 static int -remoteDispatchNodeGetMemoryStats(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchNodeGetMemoryStats(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_node_get_memory_stats_args *args, remote_node_get_memory_stats_ret *ret) @@ -3652,9 +3652,9 @@ remoteDispatchNodeGetMemoryStats(virNetServerPtr serv= er ATTRIBUTE_UNUSED, } =20 static int -remoteDispatchDomainGetLaunchSecurityInfo(virNetServerPtr server ATTRIBUTE= _UNUSED, +remoteDispatchDomainGetLaunchSecurityInfo(virNetServerPtr server G_GNUC_UN= USED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_U= NUSED, + virNetMessagePtr msg G_GNUC_UNUS= ED, virNetMessageErrorPtr rerr, remote_domain_get_launch_securit= y_info_args *args, remote_domain_get_launch_securit= y_info_ret *ret) @@ -3692,9 +3692,9 @@ remoteDispatchDomainGetLaunchSecurityInfo(virNetServe= rPtr server ATTRIBUTE_UNUSE } =20 static int -remoteDispatchDomainGetPerfEvents(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainGetPerfEvents(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_get_perf_events_args *args, remote_domain_get_perf_events_ret *ret) @@ -3732,9 +3732,9 @@ remoteDispatchDomainGetPerfEvents(virNetServerPtr ser= ver ATTRIBUTE_UNUSED, } =20 static int -remoteDispatchDomainGetBlockJobInfo(virNetServerPtr server ATTRIBUTE_UNUSE= D, +remoteDispatchDomainGetBlockJobInfo(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_get_block_job_info_args = *args, remote_domain_get_block_job_info_ret *= ret) @@ -3769,9 +3769,9 @@ remoteDispatchDomainGetBlockJobInfo(virNetServerPtr s= erver ATTRIBUTE_UNUSED, } =20 static int -remoteDispatchDomainGetBlockIoTune(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainGetBlockIoTune(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr hdr ATTRIBUTE_UNUSED, + virNetMessagePtr hdr G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_get_block_io_tune_args *a= rgs, remote_domain_get_block_io_tune_ret *re= t) @@ -3833,7 +3833,7 @@ remoteDispatchDomainGetBlockIoTune(virNetServerPtr se= rver ATTRIBUTE_UNUSED, static int remoteDispatchAuthList(virNetServerPtr server, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_auth_list_ret *ret) { @@ -3897,9 +3897,9 @@ remoteDispatchAuthList(virNetServerPtr server, * and gives the client a list of allowed mechanisms to choose */ static int -remoteDispatchAuthSaslInit(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchAuthSaslInit(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_auth_sasl_init_ret *ret) { @@ -4023,7 +4023,7 @@ remoteSASLFinish(virNetServerPtr server, static int remoteDispatchAuthSaslStart(virNetServerPtr server, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_auth_sasl_start_args *args, remote_auth_sasl_start_ret *ret) @@ -4119,7 +4119,7 @@ remoteDispatchAuthSaslStart(virNetServerPtr server, static int remoteDispatchAuthSaslStep(virNetServerPtr server, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_auth_sasl_step_args *args, remote_auth_sasl_step_ret *ret) @@ -4212,11 +4212,11 @@ remoteDispatchAuthSaslStep(virNetServerPtr server, } #else static int -remoteDispatchAuthSaslInit(virNetServerPtr server ATTRIBUTE_UNUSED, - virNetServerClientPtr client ATTRIBUTE_UNUSED, - virNetMessagePtr msg ATTRIBUTE_UNUSED, +remoteDispatchAuthSaslInit(virNetServerPtr server G_GNUC_UNUSED, + virNetServerClientPtr client G_GNUC_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, - remote_auth_sasl_init_ret *ret ATTRIBUTE_UNUSED) + remote_auth_sasl_init_ret *ret G_GNUC_UNUSED) { VIR_WARN("Client tried unsupported SASL auth"); virReportError(VIR_ERR_AUTH_FAILED, "%s", @@ -4225,12 +4225,12 @@ remoteDispatchAuthSaslInit(virNetServerPtr server A= TTRIBUTE_UNUSED, return -1; } static int -remoteDispatchAuthSaslStart(virNetServerPtr server ATTRIBUTE_UNUSED, - virNetServerClientPtr client ATTRIBUTE_UNUSED, - virNetMessagePtr msg ATTRIBUTE_UNUSED, +remoteDispatchAuthSaslStart(virNetServerPtr server G_GNUC_UNUSED, + virNetServerClientPtr client G_GNUC_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, - remote_auth_sasl_start_args *args ATTRIBUTE_UN= USED, - remote_auth_sasl_start_ret *ret ATTRIBUTE_UNUS= ED) + remote_auth_sasl_start_args *args G_GNUC_UNUSE= D, + remote_auth_sasl_start_ret *ret G_GNUC_UNUSED) { VIR_WARN("Client tried unsupported SASL auth"); virReportError(VIR_ERR_AUTH_FAILED, "%s", @@ -4239,12 +4239,12 @@ remoteDispatchAuthSaslStart(virNetServerPtr server = ATTRIBUTE_UNUSED, return -1; } static int -remoteDispatchAuthSaslStep(virNetServerPtr server ATTRIBUTE_UNUSED, - virNetServerClientPtr client ATTRIBUTE_UNUSED, - virNetMessagePtr msg ATTRIBUTE_UNUSED, +remoteDispatchAuthSaslStep(virNetServerPtr server G_GNUC_UNUSED, + virNetServerClientPtr client G_GNUC_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, - remote_auth_sasl_step_args *args ATTRIBUTE_UNUS= ED, - remote_auth_sasl_step_ret *ret ATTRIBUTE_UNUSED) + remote_auth_sasl_step_args *args G_GNUC_UNUSED, + remote_auth_sasl_step_ret *ret G_GNUC_UNUSED) { VIR_WARN("Client tried unsupported SASL auth"); virReportError(VIR_ERR_AUTH_FAILED, "%s", @@ -4259,7 +4259,7 @@ remoteDispatchAuthSaslStep(virNetServerPtr server ATT= RIBUTE_UNUSED, static int remoteDispatchAuthPolkit(virNetServerPtr server, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_auth_polkit_ret *ret) { @@ -4341,9 +4341,9 @@ remoteDispatchAuthPolkit(virNetServerPtr server, =20 =20 static int -remoteDispatchNodeDeviceGetParent(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchNodeDeviceGetParent(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_node_device_get_parent_args *args, remote_node_device_get_parent_ret *ret) @@ -4380,9 +4380,9 @@ remoteDispatchNodeDeviceGetParent(virNetServerPtr ser= ver ATTRIBUTE_UNUSED, } =20 static int -remoteDispatchConnectRegisterCloseCallback(virNetServerPtr server ATTRIBUT= E_UNUSED, +remoteDispatchConnectRegisterCloseCallback(virNetServerPtr server G_GNUC_U= NUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_= UNUSED, + virNetMessagePtr msg G_GNUC_UNU= SED, virNetMessageErrorPtr rerr) { int rv =3D -1; @@ -4411,9 +4411,9 @@ remoteDispatchConnectRegisterCloseCallback(virNetServ= erPtr server ATTRIBUTE_UNUS } =20 static int -remoteDispatchConnectUnregisterCloseCallback(virNetServerPtr server ATTRIB= UTE_UNUSED, +remoteDispatchConnectUnregisterCloseCallback(virNetServerPtr server G_GNUC= _UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUT= E_UNUSED, + virNetMessagePtr msg G_GNUC_U= NUSED, virNetMessageErrorPtr rerr) { int rv =3D -1; @@ -4441,11 +4441,11 @@ remoteDispatchConnectUnregisterCloseCallback(virNet= ServerPtr server ATTRIBUTE_UN } =20 static int -remoteDispatchConnectDomainEventRegister(virNetServerPtr server ATTRIBUTE_= UNUSED, +remoteDispatchConnectDomainEventRegister(virNetServerPtr server G_GNUC_UNU= SED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UN= USED, - virNetMessageErrorPtr rerr ATTRIB= UTE_UNUSED, - remote_connect_domain_event_regis= ter_ret *ret ATTRIBUTE_UNUSED) + virNetMessagePtr msg G_GNUC_UNUSE= D, + virNetMessageErrorPtr rerr G_GNUC= _UNUSED, + remote_connect_domain_event_regis= ter_ret *ret G_GNUC_UNUSED) { int callbackID; int rv =3D -1; @@ -4505,11 +4505,11 @@ remoteDispatchConnectDomainEventRegister(virNetServ= erPtr server ATTRIBUTE_UNUSED } =20 static int -remoteDispatchConnectDomainEventDeregister(virNetServerPtr server ATTRIBUT= E_UNUSED, +remoteDispatchConnectDomainEventDeregister(virNetServerPtr server G_GNUC_U= NUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_= UNUSED, - virNetMessageErrorPtr rerr ATTR= IBUTE_UNUSED, - remote_connect_domain_event_der= egister_ret *ret ATTRIBUTE_UNUSED) + virNetMessagePtr msg G_GNUC_UNU= SED, + virNetMessageErrorPtr rerr G_GN= UC_UNUSED, + remote_connect_domain_event_der= egister_ret *ret G_GNUC_UNUSED) { int callbackID =3D -1; int rv =3D -1; @@ -4590,9 +4590,9 @@ remoteDispatchObjectEventSend(virNetServerClientPtr c= lient, } =20 static int -remoteDispatchSecretGetValue(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchSecretGetValue(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_secret_get_value_args *args, remote_secret_get_value_ret *ret) @@ -4625,9 +4625,9 @@ remoteDispatchSecretGetValue(virNetServerPtr server A= TTRIBUTE_UNUSED, } =20 static int -remoteDispatchDomainGetState(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainGetState(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_get_state_args *args, remote_domain_get_state_ret *ret) @@ -4661,10 +4661,10 @@ remoteDispatchDomainGetState(virNetServerPtr server= ATTRIBUTE_UNUSED, * VIR_DRV_SUPPORTS_FEATURE(VIR_DRV_FEATURE_REMOTE_EVENT_CALLBACK), * and must not mix the two styles. */ static int -remoteDispatchConnectDomainEventRegisterAny(virNetServerPtr server ATTRIBU= TE_UNUSED, +remoteDispatchConnectDomainEventRegisterAny(virNetServerPtr server G_GNUC_= UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE= _UNUSED, - virNetMessageErrorPtr rerr ATT= RIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UN= USED, + virNetMessageErrorPtr rerr G_G= NUC_UNUSED, remote_connect_domain_event_re= gister_any_args *args) { int callbackID; @@ -4734,10 +4734,10 @@ remoteDispatchConnectDomainEventRegisterAny(virNetS= erverPtr server ATTRIBUTE_UNU =20 =20 static int -remoteDispatchConnectDomainEventCallbackRegisterAny(virNetServerPtr server= ATTRIBUTE_UNUSED, +remoteDispatchConnectDomainEventCallbackRegisterAny(virNetServerPtr server= G_GNUC_UNUSED, virNetServerClientPtr = client, - virNetMessagePtr msg A= TTRIBUTE_UNUSED, - virNetMessageErrorPtr = rerr ATTRIBUTE_UNUSED, + virNetMessagePtr msg G= _GNUC_UNUSED, + virNetMessageErrorPtr = rerr G_GNUC_UNUSED, remote_connect_domain_= event_callback_register_any_args *args, remote_connect_domain_= event_callback_register_any_ret *ret) { @@ -4810,10 +4810,10 @@ remoteDispatchConnectDomainEventCallbackRegisterAny= (virNetServerPtr server ATTRI =20 =20 static int -remoteDispatchConnectDomainEventDeregisterAny(virNetServerPtr server ATTRI= BUTE_UNUSED, +remoteDispatchConnectDomainEventDeregisterAny(virNetServerPtr server G_GNU= C_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBU= TE_UNUSED, - virNetMessageErrorPtr rerr A= TTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_= UNUSED, + virNetMessageErrorPtr rerr G= _GNUC_UNUSED, remote_connect_domain_event_= deregister_any_args *args) { int callbackID =3D -1; @@ -4867,10 +4867,10 @@ remoteDispatchConnectDomainEventDeregisterAny(virNe= tServerPtr server ATTRIBUTE_U =20 =20 static int -remoteDispatchConnectDomainEventCallbackDeregisterAny(virNetServerPtr serv= er ATTRIBUTE_UNUSED, +remoteDispatchConnectDomainEventCallbackDeregisterAny(virNetServerPtr serv= er G_GNUC_UNUSED, virNetServerClientPt= r client, - virNetMessagePtr msg= ATTRIBUTE_UNUSED, - virNetMessageErrorPt= r rerr ATTRIBUTE_UNUSED, + virNetMessagePtr msg= G_GNUC_UNUSED, + virNetMessageErrorPt= r rerr G_GNUC_UNUSED, remote_connect_domai= n_event_callback_deregister_any_args *args) { int rv =3D -1; @@ -4912,9 +4912,9 @@ remoteDispatchConnectDomainEventCallbackDeregisterAny= (virNetServerPtr server ATT =20 =20 static int -qemuDispatchDomainMonitorCommand(virNetServerPtr server ATTRIBUTE_UNUSED, +qemuDispatchDomainMonitorCommand(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, qemu_domain_monitor_command_args *args, qemu_domain_monitor_command_ret *ret) @@ -4944,9 +4944,9 @@ qemuDispatchDomainMonitorCommand(virNetServerPtr serv= er ATTRIBUTE_UNUSED, =20 =20 static int -remoteDispatchDomainMigrateBegin3(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainMigrateBegin3(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_migrate_begin3_args *args, remote_domain_migrate_begin3_ret *ret) @@ -4992,9 +4992,9 @@ remoteDispatchDomainMigrateBegin3(virNetServerPtr ser= ver ATTRIBUTE_UNUSED, =20 =20 static int -remoteDispatchDomainMigratePrepare3(virNetServerPtr server ATTRIBUTE_UNUSE= D, +remoteDispatchDomainMigratePrepare3(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_migrate_prepare3_args *a= rgs, remote_domain_migrate_prepare3_ret *re= t) @@ -5045,9 +5045,9 @@ remoteDispatchDomainMigratePrepare3(virNetServerPtr s= erver ATTRIBUTE_UNUSED, =20 =20 static int -remoteDispatchDomainMigratePerform3(virNetServerPtr server ATTRIBUTE_UNUSE= D, +remoteDispatchDomainMigratePerform3(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_migrate_perform3_args *a= rgs, remote_domain_migrate_perform3_ret *re= t) @@ -5097,9 +5097,9 @@ remoteDispatchDomainMigratePerform3(virNetServerPtr s= erver ATTRIBUTE_UNUSED, =20 =20 static int -remoteDispatchDomainMigrateFinish3(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainMigrateFinish3(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_migrate_finish3_args *arg= s, remote_domain_migrate_finish3_ret *ret) @@ -5148,9 +5148,9 @@ remoteDispatchDomainMigrateFinish3(virNetServerPtr se= rver ATTRIBUTE_UNUSED, =20 =20 static int -remoteDispatchDomainMigrateConfirm3(virNetServerPtr server ATTRIBUTE_UNUSE= D, +remoteDispatchDomainMigrateConfirm3(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_migrate_confirm3_args *a= rgs) { @@ -5180,9 +5180,9 @@ remoteDispatchDomainMigrateConfirm3(virNetServerPtr s= erver ATTRIBUTE_UNUSED, } =20 =20 -static int remoteDispatchConnectSupportsFeature(virNetServerPtr server ATT= RIBUTE_UNUSED, +static int remoteDispatchConnectSupportsFeature(virNetServerPtr server G_G= NUC_UNUSED, virNetServerClientPtr clie= nt, - virNetMessagePtr msg ATTRI= BUTE_UNUSED, + virNetMessagePtr msg G_GNU= C_UNUSED, virNetMessageErrorPtr rerr, remote_connect_supports_fe= ature_args *args, remote_connect_supports_fe= ature_ret *ret) @@ -5244,7 +5244,7 @@ static int remoteDispatchConnectSupportsFeature(virNe= tServerPtr server ATTRIBUTE =20 =20 static int -remoteDispatchDomainOpenGraphics(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainOpenGraphics(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, virNetMessagePtr msg, virNetMessageErrorPtr rerr, @@ -5282,7 +5282,7 @@ remoteDispatchDomainOpenGraphics(virNetServerPtr serv= er ATTRIBUTE_UNUSED, =20 =20 static int -remoteDispatchDomainOpenGraphicsFd(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainOpenGraphicsFd(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, virNetMessagePtr msg, virNetMessageErrorPtr rerr, @@ -5322,9 +5322,9 @@ remoteDispatchDomainOpenGraphicsFd(virNetServerPtr se= rver ATTRIBUTE_UNUSED, =20 =20 static int -remoteDispatchDomainGetInterfaceParameters(virNetServerPtr server ATTRIBUT= E_UNUSED, +remoteDispatchDomainGetInterfaceParameters(virNetServerPtr server G_GNUC_U= NUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_= UNUSED, + virNetMessagePtr msg G_GNUC_UNU= SED, virNetMessageErrorPtr rerr, remote_domain_get_interface_par= ameters_args *args, remote_domain_get_interface_par= ameters_ret *ret) @@ -5383,9 +5383,9 @@ remoteDispatchDomainGetInterfaceParameters(virNetServ= erPtr server ATTRIBUTE_UNUS } =20 static int -remoteDispatchDomainGetCPUStats(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainGetCPUStats(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr hdr ATTRIBUTE_UNUSED, + virNetMessagePtr hdr G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_get_cpu_stats_args *args, remote_domain_get_cpu_stats_ret *ret) @@ -5452,9 +5452,9 @@ remoteDispatchDomainGetCPUStats(virNetServerPtr serve= r ATTRIBUTE_UNUSED, } =20 static int -remoteDispatchDomainGetDiskErrors(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainGetDiskErrors(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_get_disk_errors_args *args, remote_domain_get_disk_errors_ret *ret) @@ -5510,9 +5510,9 @@ remoteDispatchDomainGetDiskErrors(virNetServerPtr ser= ver ATTRIBUTE_UNUSED, =20 =20 static int -remoteDispatchNodeGetSevInfo(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchNodeGetSevInfo(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_node_get_sev_info_args *args, remote_node_get_sev_info_ret *ret) @@ -5546,9 +5546,9 @@ remoteDispatchNodeGetSevInfo(virNetServerPtr server A= TTRIBUTE_UNUSED, =20 =20 static int -remoteDispatchNodeGetMemoryParameters(virNetServerPtr server ATTRIBUTE_UNU= SED, +remoteDispatchNodeGetMemoryParameters(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSE= D, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_node_get_memory_parameters_ar= gs *args, remote_node_get_memory_parameters_re= t *ret) @@ -5601,9 +5601,9 @@ remoteDispatchNodeGetMemoryParameters(virNetServerPtr= server ATTRIBUTE_UNUSED, } =20 static int -remoteDispatchNodeGetCPUMap(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchNodeGetCPUMap(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_node_get_cpu_map_args *args, remote_node_get_cpu_map_ret *ret) @@ -5645,9 +5645,9 @@ remoteDispatchNodeGetCPUMap(virNetServerPtr server AT= TRIBUTE_UNUSED, } =20 static int -lxcDispatchDomainOpenNamespace(virNetServerPtr server ATTRIBUTE_UNUSED, +lxcDispatchDomainOpenNamespace(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, lxc_domain_open_namespace_args *args) { @@ -5692,9 +5692,9 @@ lxcDispatchDomainOpenNamespace(virNetServerPtr server= ATTRIBUTE_UNUSED, } =20 static int -remoteDispatchDomainGetJobStats(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainGetJobStats(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_get_job_stats_args *args, remote_domain_get_job_stats_ret *ret) @@ -5733,9 +5733,9 @@ remoteDispatchDomainGetJobStats(virNetServerPtr serve= r ATTRIBUTE_UNUSED, } =20 static int -remoteDispatchDomainMigrateBegin3Params(virNetServerPtr server ATTRIBUTE_U= NUSED, +remoteDispatchDomainMigrateBegin3Params(virNetServerPtr server G_GNUC_UNUS= ED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNU= SED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_migrate_begin3_param= s_args *args, remote_domain_migrate_begin3_param= s_ret *ret) @@ -5787,9 +5787,9 @@ remoteDispatchDomainMigrateBegin3Params(virNetServerP= tr server ATTRIBUTE_UNUSED, } =20 static int -remoteDispatchDomainMigratePrepare3Params(virNetServerPtr server ATTRIBUTE= _UNUSED, +remoteDispatchDomainMigratePrepare3Params(virNetServerPtr server G_GNUC_UN= USED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_U= NUSED, + virNetMessagePtr msg G_GNUC_UNUS= ED, virNetMessageErrorPtr rerr, remote_domain_migrate_prepare3_p= arams_args *args, remote_domain_migrate_prepare3_p= arams_ret *ret) @@ -5844,7 +5844,7 @@ remoteDispatchDomainMigratePrepare3Params(virNetServe= rPtr server ATTRIBUTE_UNUSE } =20 static int -remoteDispatchDomainMigratePrepareTunnel3Params(virNetServerPtr server ATT= RIBUTE_UNUSED, +remoteDispatchDomainMigratePrepareTunnel3Params(virNetServerPtr server G_G= NUC_UNUSED, virNetServerClientPtr clie= nt, virNetMessagePtr msg, virNetMessageErrorPtr rerr, @@ -5911,9 +5911,9 @@ remoteDispatchDomainMigratePrepareTunnel3Params(virNe= tServerPtr server ATTRIBUTE =20 =20 static int -remoteDispatchDomainMigratePerform3Params(virNetServerPtr server ATTRIBUTE= _UNUSED, +remoteDispatchDomainMigratePerform3Params(virNetServerPtr server G_GNUC_UN= USED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_U= NUSED, + virNetMessagePtr msg G_GNUC_UNUS= ED, virNetMessageErrorPtr rerr, remote_domain_migrate_perform3_p= arams_args *args, remote_domain_migrate_perform3_p= arams_ret *ret) @@ -5969,9 +5969,9 @@ remoteDispatchDomainMigratePerform3Params(virNetServe= rPtr server ATTRIBUTE_UNUSE =20 =20 static int -remoteDispatchDomainMigrateFinish3Params(virNetServerPtr server ATTRIBUTE_= UNUSED, +remoteDispatchDomainMigrateFinish3Params(virNetServerPtr server G_GNUC_UNU= SED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UN= USED, + virNetMessagePtr msg G_GNUC_UNUSE= D, virNetMessageErrorPtr rerr, remote_domain_migrate_finish3_par= ams_args *args, remote_domain_migrate_finish3_par= ams_ret *ret) @@ -6027,9 +6027,9 @@ remoteDispatchDomainMigrateFinish3Params(virNetServer= Ptr server ATTRIBUTE_UNUSED =20 =20 static int -remoteDispatchDomainMigrateConfirm3Params(virNetServerPtr server ATTRIBUTE= _UNUSED, +remoteDispatchDomainMigrateConfirm3Params(virNetServerPtr server G_GNUC_UN= USED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_U= NUSED, + virNetMessagePtr msg G_GNUC_UNUS= ED, virNetMessageErrorPtr rerr, remote_domain_migrate_confirm3_p= arams_args *args) { @@ -6075,9 +6075,9 @@ remoteDispatchDomainMigrateConfirm3Params(virNetServe= rPtr server ATTRIBUTE_UNUSE =20 =20 static int -remoteDispatchConnectGetCPUModelNames(virNetServerPtr server ATTRIBUTE_UNU= SED, +remoteDispatchConnectGetCPUModelNames(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSE= D, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_connect_get_cpu_model_names_a= rgs *args, remote_connect_get_cpu_model_names_r= et *ret) @@ -6124,9 +6124,9 @@ remoteDispatchConnectGetCPUModelNames(virNetServerPtr= server ATTRIBUTE_UNUSED, =20 =20 static int -remoteDispatchDomainCreateXMLWithFiles(virNetServerPtr server ATTRIBUTE_UN= USED, +remoteDispatchDomainCreateXMLWithFiles(virNetServerPtr server G_GNUC_UNUSE= D, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUS= ED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_create_xml_with_files= _args *args, remote_domain_create_xml_with_files= _ret *ret) @@ -6170,9 +6170,9 @@ remoteDispatchDomainCreateXMLWithFiles(virNetServerPt= r server ATTRIBUTE_UNUSED, } =20 =20 -static int remoteDispatchDomainCreateWithFiles(virNetServerPtr server ATTR= IBUTE_UNUSED, +static int remoteDispatchDomainCreateWithFiles(virNetServerPtr server G_GN= UC_UNUSED, virNetServerClientPtr clien= t, - virNetMessagePtr msg ATTRIB= UTE_UNUSED, + virNetMessagePtr msg G_GNUC= _UNUSED, virNetMessageErrorPtr rerr, remote_domain_create_with_f= iles_args *args, remote_domain_create_with_f= iles_ret *ret) @@ -6220,10 +6220,10 @@ static int remoteDispatchDomainCreateWithFiles(virN= etServerPtr server ATTRIBUTE_ =20 =20 static int -remoteDispatchConnectNetworkEventRegisterAny(virNetServerPtr server ATTRIB= UTE_UNUSED, +remoteDispatchConnectNetworkEventRegisterAny(virNetServerPtr server G_GNUC= _UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUT= E_UNUSED, - virNetMessageErrorPtr rerr AT= TRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_U= NUSED, + virNetMessageErrorPtr rerr G_= GNUC_UNUSED, remote_connect_network_event_= register_any_args *args, remote_connect_network_event_= register_any_ret *ret) { @@ -6296,10 +6296,10 @@ remoteDispatchConnectNetworkEventRegisterAny(virNet= ServerPtr server ATTRIBUTE_UN =20 =20 static int -remoteDispatchConnectNetworkEventDeregisterAny(virNetServerPtr server ATTR= IBUTE_UNUSED, +remoteDispatchConnectNetworkEventDeregisterAny(virNetServerPtr server G_GN= UC_UNUSED, virNetServerClientPtr clien= t, - virNetMessagePtr msg ATTRIB= UTE_UNUSED, - virNetMessageErrorPtr rerr = ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC= _UNUSED, + virNetMessageErrorPtr rerr = G_GNUC_UNUSED, remote_connect_network_even= t_deregister_any_args *args) { int rv =3D -1; @@ -6340,10 +6340,10 @@ remoteDispatchConnectNetworkEventDeregisterAny(virN= etServerPtr server ATTRIBUTE_ } =20 static int -remoteDispatchConnectStoragePoolEventRegisterAny(virNetServerPtr server AT= TRIBUTE_UNUSED, +remoteDispatchConnectStoragePoolEventRegisterAny(virNetServerPtr server G_= GNUC_UNUSED, virNetServerClientPtr cli= ent, - virNetMessagePtr msg ATTR= IBUTE_UNUSED, - virNetMessageErrorPtr rer= r ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GN= UC_UNUSED, + virNetMessageErrorPtr rer= r G_GNUC_UNUSED, remote_connect_storage_po= ol_event_register_any_args *args, remote_connect_storage_po= ol_event_register_any_ret *ret) { @@ -6415,10 +6415,10 @@ remoteDispatchConnectStoragePoolEventRegisterAny(vi= rNetServerPtr server ATTRIBUT } =20 static int -remoteDispatchConnectStoragePoolEventDeregisterAny(virNetServerPtr server = ATTRIBUTE_UNUSED, +remoteDispatchConnectStoragePoolEventDeregisterAny(virNetServerPtr server = G_GNUC_UNUSED, virNetServerClientPtr clien= t, - virNetMessagePtr msg ATTRIB= UTE_UNUSED, - virNetMessageErrorPtr rerr = ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC= _UNUSED, + virNetMessageErrorPtr rerr = G_GNUC_UNUSED, remote_connect_storage_pool= _event_deregister_any_args *args) { int rv =3D -1; @@ -6459,10 +6459,10 @@ remoteDispatchConnectStoragePoolEventDeregisterAny(= virNetServerPtr server ATTRIB } =20 static int -remoteDispatchConnectNodeDeviceEventRegisterAny(virNetServerPtr server ATT= RIBUTE_UNUSED, +remoteDispatchConnectNodeDeviceEventRegisterAny(virNetServerPtr server G_G= NUC_UNUSED, virNetServerClientPtr clie= nt, - virNetMessagePtr msg ATTRI= BUTE_UNUSED, - virNetMessageErrorPtr rerr= ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNU= C_UNUSED, + virNetMessageErrorPtr rerr= G_GNUC_UNUSED, remote_connect_node_device= _event_register_any_args *args, remote_connect_node_device= _event_register_any_ret *ret) { @@ -6534,10 +6534,10 @@ remoteDispatchConnectNodeDeviceEventRegisterAny(vir= NetServerPtr server ATTRIBUTE } =20 static int -remoteDispatchConnectNodeDeviceEventDeregisterAny(virNetServerPtr server A= TTRIBUTE_UNUSED, +remoteDispatchConnectNodeDeviceEventDeregisterAny(virNetServerPtr server G= _GNUC_UNUSED, virNetServerClientPtr cl= ient, - virNetMessagePtr msg ATT= RIBUTE_UNUSED, - virNetMessageErrorPtr re= rr ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_G= NUC_UNUSED, + virNetMessageErrorPtr re= rr G_GNUC_UNUSED, remote_connect_node_devi= ce_event_deregister_any_args *args) { int rv =3D -1; @@ -6578,10 +6578,10 @@ remoteDispatchConnectNodeDeviceEventDeregisterAny(v= irNetServerPtr server ATTRIBU } =20 static int -remoteDispatchConnectSecretEventRegisterAny(virNetServerPtr server ATTRIBU= TE_UNUSED, +remoteDispatchConnectSecretEventRegisterAny(virNetServerPtr server G_GNUC_= UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE= _UNUSED, - virNetMessageErrorPtr rerr ATT= RIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UN= USED, + virNetMessageErrorPtr rerr G_G= NUC_UNUSED, remote_connect_secret_event_re= gister_any_args *args, remote_connect_secret_event_re= gister_any_ret *ret) { @@ -6653,10 +6653,10 @@ remoteDispatchConnectSecretEventRegisterAny(virNetS= erverPtr server ATTRIBUTE_UNU } =20 static int -remoteDispatchConnectSecretEventDeregisterAny(virNetServerPtr server ATTRI= BUTE_UNUSED, +remoteDispatchConnectSecretEventDeregisterAny(virNetServerPtr server G_GNU= C_UNUSED, virNetServerClientPtr cl= ient, - virNetMessagePtr msg ATT= RIBUTE_UNUSED, - virNetMessageErrorPtr re= rr ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_G= NUC_UNUSED, + virNetMessageErrorPtr re= rr G_GNUC_UNUSED, remote_connect_secret_ev= ent_deregister_any_args *args) { int rv =3D -1; @@ -6697,10 +6697,10 @@ remoteDispatchConnectSecretEventDeregisterAny(virNe= tServerPtr server ATTRIBUTE_U } =20 static int -qemuDispatchConnectDomainMonitorEventRegister(virNetServerPtr server ATTRI= BUTE_UNUSED, +qemuDispatchConnectDomainMonitorEventRegister(virNetServerPtr server G_GNU= C_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBU= TE_UNUSED, - virNetMessageErrorPtr rerr A= TTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_= UNUSED, + virNetMessageErrorPtr rerr G= _GNUC_UNUSED, qemu_connect_domain_monitor_= event_register_args *args, qemu_connect_domain_monitor_= event_register_ret *ret) { @@ -6769,10 +6769,10 @@ qemuDispatchConnectDomainMonitorEventRegister(virNe= tServerPtr server ATTRIBUTE_U =20 =20 static int -qemuDispatchConnectDomainMonitorEventDeregister(virNetServerPtr server ATT= RIBUTE_UNUSED, +qemuDispatchConnectDomainMonitorEventDeregister(virNetServerPtr server G_G= NUC_UNUSED, virNetServerClientPtr clie= nt, - virNetMessagePtr msg ATTRI= BUTE_UNUSED, - virNetMessageErrorPtr rerr= ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNU= C_UNUSED, + virNetMessageErrorPtr rerr= G_GNUC_UNUSED, qemu_connect_domain_monito= r_event_deregister_args *args) { int rv =3D -1; @@ -6814,9 +6814,9 @@ qemuDispatchConnectDomainMonitorEventDeregister(virNe= tServerPtr server ATTRIBUTE } =20 static int -remoteDispatchDomainGetTime(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainGetTime(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_get_time_args *args, remote_domain_get_time_ret *ret) @@ -6849,9 +6849,9 @@ remoteDispatchDomainGetTime(virNetServerPtr server AT= TRIBUTE_UNUSED, =20 =20 static int -remoteDispatchNodeGetFreePages(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchNodeGetFreePages(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_node_get_free_pages_args *args, remote_node_get_free_pages_ret *ret) @@ -6959,9 +6959,9 @@ remoteSerializeDHCPLease(remote_network_dhcp_lease *l= ease_dst, virNetworkDHCPLea =20 =20 static int -remoteDispatchNetworkGetDHCPLeases(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchNetworkGetDHCPLeases(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_network_get_dhcp_leases_args *ar= gs, remote_network_get_dhcp_leases_ret *ret) @@ -7025,9 +7025,9 @@ remoteDispatchNetworkGetDHCPLeases(virNetServerPtr se= rver ATTRIBUTE_UNUSED, =20 =20 static int -remoteDispatchConnectGetAllDomainStats(virNetServerPtr server ATTRIBUTE_UN= USED, +remoteDispatchConnectGetAllDomainStats(virNetServerPtr server G_GNUC_UNUSE= D, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUS= ED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_connect_get_all_domain_stats= _args *args, remote_connect_get_all_domain_stats= _ret *ret) @@ -7114,9 +7114,9 @@ remoteDispatchConnectGetAllDomainStats(virNetServerPt= r server ATTRIBUTE_UNUSED, =20 =20 static int -remoteDispatchNodeAllocPages(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchNodeAllocPages(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_node_alloc_pages_args *args, remote_node_alloc_pages_ret *ret) @@ -7148,9 +7148,9 @@ remoteDispatchNodeAllocPages(virNetServerPtr server A= TTRIBUTE_UNUSED, =20 =20 static int -remoteDispatchDomainGetFSInfo(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainGetFSInfo(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_get_fsinfo_args *args, remote_domain_get_fsinfo_ret *ret) @@ -7340,9 +7340,9 @@ remoteSerializeDomainInterface(virDomainInterfacePtr = *ifaces, =20 =20 static int -remoteDispatchDomainInterfaceAddresses(virNetServerPtr server ATTRIBUTE_UN= USED, +remoteDispatchDomainInterfaceAddresses(virNetServerPtr server G_GNUC_UNUSE= D, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUS= ED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_interface_addresses_a= rgs *args, remote_domain_interface_addresses_r= et *ret) @@ -7385,9 +7385,9 @@ remoteDispatchDomainInterfaceAddresses(virNetServerPt= r server ATTRIBUTE_UNUSED, =20 =20 static int -remoteDispatchStorageVolGetInfoFlags(virNetServerPtr server ATTRIBUTE_UNUS= ED, +remoteDispatchStorageVolGetInfoFlags(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_storage_vol_get_info_flags_arg= s *args, remote_storage_vol_get_info_flags_ret= *ret) @@ -7420,9 +7420,9 @@ remoteDispatchStorageVolGetInfoFlags(virNetServerPtr = server ATTRIBUTE_UNUSED, =20 =20 static int -remoteDispatchNetworkPortGetParameters(virNetServerPtr server ATTRIBUTE_UN= USED, +remoteDispatchNetworkPortGetParameters(virNetServerPtr server G_GNUC_UNUSE= D, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUS= ED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_network_port_get_parameters_= args *args, remote_network_port_get_parameters_= ret *ret) @@ -7720,9 +7720,9 @@ remoteSerializeDomainDiskErrors(virDomainDiskErrorPtr= errors, } =20 static int -remoteDispatchDomainGetGuestInfo(virNetServerPtr server ATTRIBUTE_UNUSED, +remoteDispatchDomainGetGuestInfo(virNetServerPtr server G_GNUC_UNUSED, virNetServerClientPtr client, - virNetMessagePtr msg ATTRIBUTE_UNUSED, + virNetMessagePtr msg G_GNUC_UNUSED, virNetMessageErrorPtr rerr, remote_domain_get_guest_info_args *args, remote_domain_get_guest_info_ret *ret) diff --git a/src/remote/remote_daemon_stream.c b/src/remote/remote_daemon_s= tream.c index 1f6e783881..d7fcb1bf42 100644 --- a/src/remote/remote_daemon_stream.c +++ b/src/remote/remote_daemon_stream.c @@ -284,7 +284,7 @@ daemonStreamEvent(virStreamPtr st, int events, void *op= aque) * -1 on fatal client error */ static int -daemonStreamFilter(virNetServerClientPtr client ATTRIBUTE_UNUSED, +daemonStreamFilter(virNetServerClientPtr client G_GNUC_UNUSED, virNetMessagePtr msg, void *opaque) { diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 877250d40c..3191f9032e 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -236,9 +236,9 @@ static int remoteSplitURIScheme(virURIPtr uri, =20 =20 static int -remoteStateInitialize(bool privileged ATTRIBUTE_UNUSED, - virStateInhibitCallback callback ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) +remoteStateInitialize(bool privileged G_GNUC_UNUSED, + virStateInhibitCallback callback G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED) { /* Mark that we're inside the daemon so we can avoid * re-entering ourselves @@ -249,21 +249,21 @@ remoteStateInitialize(bool privileged ATTRIBUTE_UNUSE= D, =20 =20 static void -remoteDomainBuildEventLifecycle(virNetClientProgramPtr prog ATTRIBUTE_UNUS= ED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteDomainBuildEventLifecycle(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque); static void -remoteDomainBuildEventCallbackLifecycle(virNetClientProgramPtr prog ATTRIB= UTE_UNUSED, - virNetClientPtr client ATTRIBUTE_U= NUSED, +remoteDomainBuildEventCallbackLifecycle(virNetClientProgramPtr prog G_GNUC= _UNUSED, + virNetClientPtr client G_GNUC_UNUS= ED, void *evdata, void *opaque); =20 static void -remoteDomainBuildEventReboot(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteDomainBuildEventReboot(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque); static void -remoteDomainBuildEventCallbackReboot(virNetClientProgramPtr prog ATTRIBUTE= _UNUSED, - virNetClientPtr client ATTRIBUTE_UNUS= ED, +remoteDomainBuildEventCallbackReboot(virNetClientProgramPtr prog G_GNUC_UN= USED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque); =20 static void @@ -432,38 +432,38 @@ remoteDomainBuildEventCallbackMetadataChange(virNetCl= ientProgramPtr prog, void *evdata, void *opaque); =20 static void -remoteNetworkBuildEventLifecycle(virNetClientProgramPtr prog ATTRIBUTE_UNU= SED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteNetworkBuildEventLifecycle(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque); =20 static void -remoteStoragePoolBuildEventLifecycle(virNetClientProgramPtr prog ATTRIBUTE= _UNUSED, - virNetClientPtr client ATTRIBUTE_UNUS= ED, +remoteStoragePoolBuildEventLifecycle(virNetClientProgramPtr prog G_GNUC_UN= USED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque); =20 static void -remoteStoragePoolBuildEventRefresh(virNetClientProgramPtr prog ATTRIBUTE_U= NUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteStoragePoolBuildEventRefresh(virNetClientProgramPtr prog G_GNUC_UNUS= ED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque); =20 static void -remoteNodeDeviceBuildEventLifecycle(virNetClientProgramPtr prog ATTRIBUTE_= UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSE= D, +remoteNodeDeviceBuildEventLifecycle(virNetClientProgramPtr prog G_GNUC_UNU= SED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque); =20 static void -remoteNodeDeviceBuildEventUpdate(virNetClientProgramPtr prog ATTRIBUTE_UNU= SED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteNodeDeviceBuildEventUpdate(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque); =20 static void -remoteSecretBuildEventLifecycle(virNetClientProgramPtr prog ATTRIBUTE_UNUS= ED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteSecretBuildEventLifecycle(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque); =20 static void -remoteSecretBuildEventValueChanged(virNetClientProgramPtr prog ATTRIBUTE_U= NUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteSecretBuildEventValueChanged(virNetClientProgramPtr prog G_GNUC_UNUS= ED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque); =20 static void @@ -472,8 +472,8 @@ remoteDomainBuildEventBlockThreshold(virNetClientProgra= mPtr prog, void *evdata, void *opaque); =20 static void -remoteConnectNotifyEventConnectionClosed(virNetClientProgramPtr prog ATTRI= BUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_= UNUSED, +remoteConnectNotifyEventConnectionClosed(virNetClientProgramPtr prog G_GNU= C_UNUSED, + virNetClientPtr client G_GNUC_UNU= SED, void *evdata, void *opaque); =20 static virNetClientProgramEvent remoteEvents[] =3D { @@ -685,8 +685,8 @@ static virNetClientProgramEvent remoteEvents[] =3D { }; =20 static void -remoteConnectNotifyEventConnectionClosed(virNetClientProgramPtr prog ATTRI= BUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_= UNUSED, +remoteConnectNotifyEventConnectionClosed(virNetClientProgramPtr prog G_GNU= C_UNUSED, + virNetClientPtr client G_GNUC_UNU= SED, void *evdata, void *opaque) { virConnectPtr conn =3D opaque; @@ -697,8 +697,8 @@ remoteConnectNotifyEventConnectionClosed(virNetClientPr= ogramPtr prog ATTRIBUTE_U } =20 static void -remoteDomainBuildQemuMonitorEvent(virNetClientProgramPtr prog ATTRIBUTE_UN= USED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteDomainBuildQemuMonitorEvent(virNetClientProgramPtr prog G_GNUC_UNUSE= D, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque); =20 static virNetClientProgramEvent qemuEvents[] =3D { @@ -716,7 +716,7 @@ enum virDrvOpenRemoteFlags { =20 =20 static void -remoteClientCloseFunc(virNetClientPtr client ATTRIBUTE_UNUSED, +remoteClientCloseFunc(virNetClientPtr client G_GNUC_UNUSED, int reason, void *opaque) { @@ -939,7 +939,7 @@ doRemoteOpen(virConnectPtr conn, struct private_data *priv, const char *driver_str, const char *transport_str, - virConnectAuthPtr auth ATTRIBUTE_UNUSED, + virConnectAuthPtr auth G_GNUC_UNUSED, virConfPtr conf, unsigned int flags) { @@ -3841,7 +3841,7 @@ remoteNodeDeviceReset(virNodeDevicePtr dev) =20 static int remoteAuthenticate(virConnectPtr conn, struct private_data *priv, - virConnectAuthPtr auth ATTRIBUTE_UNUSED, + virConnectAuthPtr auth G_GNUC_UNUSED, const char *authtype) { struct remote_auth_list_ret ret; @@ -4485,7 +4485,7 @@ remoteAuthSASL(virConnectPtr conn, struct private_dat= a *priv, =20 static int remoteAuthPolkit(virConnectPtr conn, struct private_data *priv, - virConnectAuthPtr auth ATTRIBUTE_UNUSED) + virConnectAuthPtr auth G_GNUC_UNUSED) { remote_auth_polkit_ret ret; VIR_DEBUG("Client initialize PolicyKit authentication"); @@ -4631,8 +4631,8 @@ remoteDomainBuildEventLifecycleHelper(virConnectPtr c= onn, virObjectEventStateQueueRemote(priv->eventState, event, callbackID); } static void -remoteDomainBuildEventLifecycle(virNetClientProgramPtr prog ATTRIBUTE_UNUS= ED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteDomainBuildEventLifecycle(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn =3D opaque; @@ -4640,8 +4640,8 @@ remoteDomainBuildEventLifecycle(virNetClientProgramPt= r prog ATTRIBUTE_UNUSED, remoteDomainBuildEventLifecycleHelper(conn, msg, -1); } static void -remoteDomainBuildEventCallbackLifecycle(virNetClientProgramPtr prog ATTRIB= UTE_UNUSED, - virNetClientPtr client ATTRIBUTE_U= NUSED, +remoteDomainBuildEventCallbackLifecycle(virNetClientProgramPtr prog G_GNUC= _UNUSED, + virNetClientPtr client G_GNUC_UNUS= ED, void *evdata, void *opaque) { virConnectPtr conn =3D opaque; @@ -4669,8 +4669,8 @@ remoteDomainBuildEventRebootHelper(virConnectPtr conn, virObjectEventStateQueueRemote(priv->eventState, event, callbackID); } static void -remoteDomainBuildEventReboot(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteDomainBuildEventReboot(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn =3D opaque; @@ -4678,8 +4678,8 @@ remoteDomainBuildEventReboot(virNetClientProgramPtr p= rog ATTRIBUTE_UNUSED, remoteDomainBuildEventRebootHelper(conn, msg, -1); } static void -remoteDomainBuildEventCallbackReboot(virNetClientProgramPtr prog ATTRIBUTE= _UNUSED, - virNetClientPtr client ATTRIBUTE_UNUS= ED, +remoteDomainBuildEventCallbackReboot(virNetClientProgramPtr prog G_GNUC_UN= USED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn =3D opaque; @@ -4706,8 +4706,8 @@ remoteDomainBuildEventRTCChangeHelper(virConnectPtr c= onn, virObjectEventStateQueueRemote(priv->eventState, event, callbackID); } static void -remoteDomainBuildEventRTCChange(virNetClientProgramPtr prog ATTRIBUTE_UNUS= ED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteDomainBuildEventRTCChange(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn =3D opaque; @@ -4715,8 +4715,8 @@ remoteDomainBuildEventRTCChange(virNetClientProgramPt= r prog ATTRIBUTE_UNUSED, remoteDomainBuildEventRTCChangeHelper(conn, msg, -1); } static void -remoteDomainBuildEventCallbackRTCChange(virNetClientProgramPtr prog ATTRIB= UTE_UNUSED, - virNetClientPtr client ATTRIBUTE_U= NUSED, +remoteDomainBuildEventCallbackRTCChange(virNetClientProgramPtr prog G_GNUC= _UNUSED, + virNetClientPtr client G_GNUC_UNUS= ED, void *evdata, void *opaque) { virConnectPtr conn =3D opaque; @@ -4743,8 +4743,8 @@ remoteDomainBuildEventWatchdogHelper(virConnectPtr co= nn, virObjectEventStateQueueRemote(priv->eventState, event, callbackID); } static void -remoteDomainBuildEventWatchdog(virNetClientProgramPtr prog ATTRIBUTE_UNUSE= D, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteDomainBuildEventWatchdog(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn =3D opaque; @@ -4752,8 +4752,8 @@ remoteDomainBuildEventWatchdog(virNetClientProgramPtr= prog ATTRIBUTE_UNUSED, remoteDomainBuildEventWatchdogHelper(conn, msg, -1); } static void -remoteDomainBuildEventCallbackWatchdog(virNetClientProgramPtr prog ATTRIBU= TE_UNUSED, - virNetClientPtr client ATTRIBUTE_UN= USED, +remoteDomainBuildEventCallbackWatchdog(virNetClientProgramPtr prog G_GNUC_= UNUSED, + virNetClientPtr client G_GNUC_UNUSE= D, void *evdata, void *opaque) { virConnectPtr conn =3D opaque; @@ -4783,8 +4783,8 @@ remoteDomainBuildEventIOErrorHelper(virConnectPtr con= n, virObjectEventStateQueueRemote(priv->eventState, event, callbackID); } static void -remoteDomainBuildEventIOError(virNetClientProgramPtr prog ATTRIBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteDomainBuildEventIOError(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn =3D opaque; @@ -4792,8 +4792,8 @@ remoteDomainBuildEventIOError(virNetClientProgramPtr = prog ATTRIBUTE_UNUSED, remoteDomainBuildEventIOErrorHelper(conn, msg, -1); } static void -remoteDomainBuildEventCallbackIOError(virNetClientProgramPtr prog ATTRIBUT= E_UNUSED, - virNetClientPtr client ATTRIBUTE_UNU= SED, +remoteDomainBuildEventCallbackIOError(virNetClientProgramPtr prog G_GNUC_U= NUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn =3D opaque; @@ -4825,8 +4825,8 @@ remoteDomainBuildEventIOErrorReasonHelper(virConnectP= tr conn, virObjectEventStateQueueRemote(priv->eventState, event, callbackID); } static void -remoteDomainBuildEventIOErrorReason(virNetClientProgramPtr prog ATTRIBUTE_= UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSE= D, +remoteDomainBuildEventIOErrorReason(virNetClientProgramPtr prog G_GNUC_UNU= SED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn =3D opaque; @@ -4834,8 +4834,8 @@ remoteDomainBuildEventIOErrorReason(virNetClientProgr= amPtr prog ATTRIBUTE_UNUSED remoteDomainBuildEventIOErrorReasonHelper(conn, msg, -1); } static void -remoteDomainBuildEventCallbackIOErrorReason(virNetClientProgramPtr prog AT= TRIBUTE_UNUSED, - virNetClientPtr client ATTRIBU= TE_UNUSED, +remoteDomainBuildEventCallbackIOErrorReason(virNetClientProgramPtr prog G_= GNUC_UNUSED, + virNetClientPtr client G_GNUC_= UNUSED, void *evdata, void *opaque) { virConnectPtr conn =3D opaque; @@ -4864,8 +4864,8 @@ remoteDomainBuildEventBlockJobHelper(virConnectPtr co= nn, virObjectEventStateQueueRemote(priv->eventState, event, callbackID); } static void -remoteDomainBuildEventBlockJob(virNetClientProgramPtr prog ATTRIBUTE_UNUSE= D, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteDomainBuildEventBlockJob(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn =3D opaque; @@ -4873,8 +4873,8 @@ remoteDomainBuildEventBlockJob(virNetClientProgramPtr= prog ATTRIBUTE_UNUSED, remoteDomainBuildEventBlockJobHelper(conn, msg, -1); } static void -remoteDomainBuildEventCallbackBlockJob(virNetClientProgramPtr prog ATTRIBU= TE_UNUSED, - virNetClientPtr client ATTRIBUTE_UN= USED, +remoteDomainBuildEventCallbackBlockJob(virNetClientProgramPtr prog G_GNUC_= UNUSED, + virNetClientPtr client G_GNUC_UNUSE= D, void *evdata, void *opaque) { virConnectPtr conn =3D opaque; @@ -4882,8 +4882,8 @@ remoteDomainBuildEventCallbackBlockJob(virNetClientPr= ogramPtr prog ATTRIBUTE_UNU remoteDomainBuildEventBlockJobHelper(conn, &msg->msg, msg->callbackID); } static void -remoteDomainBuildEventBlockJob2(virNetClientProgramPtr prog ATTRIBUTE_UNUS= ED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteDomainBuildEventBlockJob2(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn =3D opaque; @@ -4981,8 +4981,8 @@ remoteDomainBuildEventGraphicsHelper(virConnectPtr co= nn, return; } static void -remoteDomainBuildEventGraphics(virNetClientProgramPtr prog ATTRIBUTE_UNUSE= D, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteDomainBuildEventGraphics(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn =3D opaque; @@ -4990,8 +4990,8 @@ remoteDomainBuildEventGraphics(virNetClientProgramPtr= prog ATTRIBUTE_UNUSED, remoteDomainBuildEventGraphicsHelper(conn, msg, -1); } static void -remoteDomainBuildEventCallbackGraphics(virNetClientProgramPtr prog ATTRIBU= TE_UNUSED, - virNetClientPtr client ATTRIBUTE_UN= USED, +remoteDomainBuildEventCallbackGraphics(virNetClientProgramPtr prog G_GNUC_= UNUSED, + virNetClientPtr client G_GNUC_UNUSE= D, void *evdata, void *opaque) { virConnectPtr conn =3D opaque; @@ -5019,8 +5019,8 @@ remoteDomainBuildEventControlErrorHelper(virConnectPt= r conn, virObjectEventStateQueueRemote(priv->eventState, event, callbackID); } static void -remoteDomainBuildEventControlError(virNetClientProgramPtr prog ATTRIBUTE_U= NUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteDomainBuildEventControlError(virNetClientProgramPtr prog G_GNUC_UNUS= ED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn =3D opaque; @@ -5028,8 +5028,8 @@ remoteDomainBuildEventControlError(virNetClientProgra= mPtr prog ATTRIBUTE_UNUSED, remoteDomainBuildEventControlErrorHelper(conn, msg, -1); } static void -remoteDomainBuildEventCallbackControlError(virNetClientProgramPtr prog ATT= RIBUTE_UNUSED, - virNetClientPtr client ATTRIBUT= E_UNUSED, +remoteDomainBuildEventCallbackControlError(virNetClientProgramPtr prog G_G= NUC_UNUSED, + virNetClientPtr client G_GNUC_U= NUSED, void *evdata, void *opaque) { virConnectPtr conn =3D opaque; @@ -5062,8 +5062,8 @@ remoteDomainBuildEventDiskChangeHelper(virConnectPtr = conn, virObjectEventStateQueueRemote(priv->eventState, event, callbackID); } static void -remoteDomainBuildEventDiskChange(virNetClientProgramPtr prog ATTRIBUTE_UNU= SED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteDomainBuildEventDiskChange(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn =3D opaque; @@ -5071,8 +5071,8 @@ remoteDomainBuildEventDiskChange(virNetClientProgramP= tr prog ATTRIBUTE_UNUSED, remoteDomainBuildEventDiskChangeHelper(conn, msg, -1); } static void -remoteDomainBuildEventCallbackDiskChange(virNetClientProgramPtr prog ATTRI= BUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_= UNUSED, +remoteDomainBuildEventCallbackDiskChange(virNetClientProgramPtr prog G_GNU= C_UNUSED, + virNetClientPtr client G_GNUC_UNU= SED, void *evdata, void *opaque) { virConnectPtr conn =3D opaque; @@ -5103,8 +5103,8 @@ remoteDomainBuildEventTrayChangeHelper(virConnectPtr = conn, virObjectEventStateQueueRemote(priv->eventState, event, callbackID); } static void -remoteDomainBuildEventTrayChange(virNetClientProgramPtr prog ATTRIBUTE_UNU= SED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteDomainBuildEventTrayChange(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn =3D opaque; @@ -5112,8 +5112,8 @@ remoteDomainBuildEventTrayChange(virNetClientProgramP= tr prog ATTRIBUTE_UNUSED, remoteDomainBuildEventTrayChangeHelper(conn, msg, -1); } static void -remoteDomainBuildEventCallbackTrayChange(virNetClientProgramPtr prog ATTRI= BUTE_UNUSED, - virNetClientPtr client ATTRIBUTE_= UNUSED, +remoteDomainBuildEventCallbackTrayChange(virNetClientProgramPtr prog G_GNU= C_UNUSED, + virNetClientPtr client G_GNUC_UNU= SED, void *evdata, void *opaque) { virConnectPtr conn =3D opaque; @@ -5142,8 +5142,8 @@ remoteDomainBuildEventPMWakeupHelper(virConnectPtr co= nn, virObjectEventStateQueueRemote(priv->eventState, event, callbackID); } static void -remoteDomainBuildEventPMWakeup(virNetClientProgramPtr prog ATTRIBUTE_UNUSE= D, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteDomainBuildEventPMWakeup(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn =3D opaque; @@ -5151,8 +5151,8 @@ remoteDomainBuildEventPMWakeup(virNetClientProgramPtr= prog ATTRIBUTE_UNUSED, remoteDomainBuildEventPMWakeupHelper(conn, msg, -1, 0); } static void -remoteDomainBuildEventCallbackPMWakeup(virNetClientProgramPtr prog ATTRIBU= TE_UNUSED, - virNetClientPtr client ATTRIBUTE_UN= USED, +remoteDomainBuildEventCallbackPMWakeup(virNetClientProgramPtr prog G_GNUC_= UNUSED, + virNetClientPtr client G_GNUC_UNUSE= D, void *evdata, void *opaque) { virConnectPtr conn =3D opaque; @@ -5182,8 +5182,8 @@ remoteDomainBuildEventPMSuspendHelper(virConnectPtr c= onn, virObjectEventStateQueueRemote(priv->eventState, event, callbackID); } static void -remoteDomainBuildEventPMSuspend(virNetClientProgramPtr prog ATTRIBUTE_UNUS= ED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteDomainBuildEventPMSuspend(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn =3D opaque; @@ -5191,8 +5191,8 @@ remoteDomainBuildEventPMSuspend(virNetClientProgramPt= r prog ATTRIBUTE_UNUSED, remoteDomainBuildEventPMSuspendHelper(conn, msg, -1, 0); } static void -remoteDomainBuildEventCallbackPMSuspend(virNetClientProgramPtr prog ATTRIB= UTE_UNUSED, - virNetClientPtr client ATTRIBUTE_U= NUSED, +remoteDomainBuildEventCallbackPMSuspend(virNetClientProgramPtr prog G_GNUC= _UNUSED, + virNetClientPtr client G_GNUC_UNUS= ED, void *evdata, void *opaque) { virConnectPtr conn =3D opaque; @@ -5221,8 +5221,8 @@ remoteDomainBuildEventBalloonChangeHelper(virConnectP= tr conn, virObjectEventStateQueueRemote(priv->eventState, event, callbackID); } static void -remoteDomainBuildEventBalloonChange(virNetClientProgramPtr prog ATTRIBUTE_= UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSE= D, +remoteDomainBuildEventBalloonChange(virNetClientProgramPtr prog G_GNUC_UNU= SED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn =3D opaque; @@ -5230,8 +5230,8 @@ remoteDomainBuildEventBalloonChange(virNetClientProgr= amPtr prog ATTRIBUTE_UNUSED remoteDomainBuildEventBalloonChangeHelper(conn, msg, -1); } static void -remoteDomainBuildEventCallbackBalloonChange(virNetClientProgramPtr prog AT= TRIBUTE_UNUSED, - virNetClientPtr client ATTRIBU= TE_UNUSED, +remoteDomainBuildEventCallbackBalloonChange(virNetClientProgramPtr prog G_= GNUC_UNUSED, + virNetClientPtr client G_GNUC_= UNUSED, void *evdata, void *opaque) { virConnectPtr conn =3D opaque; @@ -5261,8 +5261,8 @@ remoteDomainBuildEventPMSuspendDiskHelper(virConnectP= tr conn, virObjectEventStateQueueRemote(priv->eventState, event, callbackID); } static void -remoteDomainBuildEventPMSuspendDisk(virNetClientProgramPtr prog ATTRIBUTE_= UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSE= D, +remoteDomainBuildEventPMSuspendDisk(virNetClientProgramPtr prog G_GNUC_UNU= SED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn =3D opaque; @@ -5270,8 +5270,8 @@ remoteDomainBuildEventPMSuspendDisk(virNetClientProgr= amPtr prog ATTRIBUTE_UNUSED remoteDomainBuildEventPMSuspendDiskHelper(conn, msg, -1, 0); } static void -remoteDomainBuildEventCallbackPMSuspendDisk(virNetClientProgramPtr prog AT= TRIBUTE_UNUSED, - virNetClientPtr client ATTRIBU= TE_UNUSED, +remoteDomainBuildEventCallbackPMSuspendDisk(virNetClientProgramPtr prog G_= GNUC_UNUSED, + virNetClientPtr client G_GNUC_= UNUSED, void *evdata, void *opaque) { virConnectPtr conn =3D opaque; @@ -5301,8 +5301,8 @@ remoteDomainBuildEventDeviceRemovedHelper(virConnectP= tr conn, virObjectEventStateQueueRemote(priv->eventState, event, callbackID); } static void -remoteDomainBuildEventDeviceRemoved(virNetClientProgramPtr prog ATTRIBUTE_= UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSE= D, +remoteDomainBuildEventDeviceRemoved(virNetClientProgramPtr prog G_GNUC_UNU= SED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn =3D opaque; @@ -5310,8 +5310,8 @@ remoteDomainBuildEventDeviceRemoved(virNetClientProgr= amPtr prog ATTRIBUTE_UNUSED remoteDomainBuildEventDeviceRemovedHelper(conn, msg, -1); } static void -remoteDomainBuildEventCallbackDeviceRemoved(virNetClientProgramPtr prog AT= TRIBUTE_UNUSED, - virNetClientPtr client ATTRIBU= TE_UNUSED, +remoteDomainBuildEventCallbackDeviceRemoved(virNetClientProgramPtr prog G_= GNUC_UNUSED, + virNetClientPtr client G_GNUC_= UNUSED, void *evdata, void *opaque) { virConnectPtr conn =3D opaque; @@ -5320,8 +5320,8 @@ remoteDomainBuildEventCallbackDeviceRemoved(virNetCli= entProgramPtr prog ATTRIBUT } =20 static void -remoteDomainBuildEventCallbackDeviceAdded(virNetClientProgramPtr prog ATTR= IBUTE_UNUSED, - virNetClientPtr client ATTRIBUTE= _UNUSED, +remoteDomainBuildEventCallbackDeviceAdded(virNetClientProgramPtr prog G_GN= UC_UNUSED, + virNetClientPtr client G_GNUC_UN= USED, void *evdata, void *opaque) { virConnectPtr conn =3D opaque; @@ -5343,8 +5343,8 @@ remoteDomainBuildEventCallbackDeviceAdded(virNetClien= tProgramPtr prog ATTRIBUTE_ =20 =20 static void -remoteDomainBuildEventCallbackDeviceRemovalFailed(virNetClientProgramPtr p= rog ATTRIBUTE_UNUSED, - virNetClientPtr client A= TTRIBUTE_UNUSED, +remoteDomainBuildEventCallbackDeviceRemovalFailed(virNetClientProgramPtr p= rog G_GNUC_UNUSED, + virNetClientPtr client G= _GNUC_UNUSED, void *evdata, void *opaq= ue) { virConnectPtr conn =3D opaque; @@ -5364,8 +5364,8 @@ remoteDomainBuildEventCallbackDeviceRemovalFailed(vir= NetClientProgramPtr prog AT } =20 static void -remoteDomainBuildEventCallbackTunable(virNetClientProgramPtr prog ATTRIBUT= E_UNUSED, - virNetClientPtr client ATTRIBUTE_UNU= SED, +remoteDomainBuildEventCallbackTunable(virNetClientProgramPtr prog G_GNUC_U= NUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn =3D opaque; @@ -5397,8 +5397,8 @@ remoteDomainBuildEventCallbackTunable(virNetClientPro= gramPtr prog ATTRIBUTE_UNUS =20 =20 static void -remoteDomainBuildEventCallbackAgentLifecycle(virNetClientProgramPtr prog A= TTRIBUTE_UNUSED, - virNetClientPtr client ATTRIB= UTE_UNUSED, +remoteDomainBuildEventCallbackAgentLifecycle(virNetClientProgramPtr prog G= _GNUC_UNUSED, + virNetClientPtr client G_GNUC= _UNUSED, void *evdata, void *opaque) { virConnectPtr conn =3D opaque; @@ -5420,8 +5420,8 @@ remoteDomainBuildEventCallbackAgentLifecycle(virNetCl= ientProgramPtr prog ATTRIBU =20 =20 static void -remoteDomainBuildEventCallbackMigrationIteration(virNetClientProgramPtr pr= og ATTRIBUTE_UNUSED, - virNetClientPtr client AT= TRIBUTE_UNUSED, +remoteDomainBuildEventCallbackMigrationIteration(virNetClientProgramPtr pr= og G_GNUC_UNUSED, + virNetClientPtr client G_= GNUC_UNUSED, void *evdata, void *opaque) { @@ -5443,8 +5443,8 @@ remoteDomainBuildEventCallbackMigrationIteration(virN= etClientProgramPtr prog ATT =20 =20 static void -remoteDomainBuildEventCallbackJobCompleted(virNetClientProgramPtr prog ATT= RIBUTE_UNUSED, - virNetClientPtr client ATTRIBUT= E_UNUSED, +remoteDomainBuildEventCallbackJobCompleted(virNetClientProgramPtr prog G_G= NUC_UNUSED, + virNetClientPtr client G_GNUC_U= NUSED, void *evdata, void *opaque) { @@ -5476,8 +5476,8 @@ remoteDomainBuildEventCallbackJobCompleted(virNetClie= ntProgramPtr prog ATTRIBUTE =20 =20 static void -remoteDomainBuildEventCallbackMetadataChange(virNetClientProgramPtr prog A= TTRIBUTE_UNUSED, - virNetClientPtr client ATTRIB= UTE_UNUSED, +remoteDomainBuildEventCallbackMetadataChange(virNetClientProgramPtr prog G= _GNUC_UNUSED, + virNetClientPtr client G_GNUC= _UNUSED, void *evdata, void *opaque) { virConnectPtr conn =3D opaque; @@ -5498,8 +5498,8 @@ remoteDomainBuildEventCallbackMetadataChange(virNetCl= ientProgramPtr prog ATTRIBU =20 =20 static void -remoteNetworkBuildEventLifecycle(virNetClientProgramPtr prog ATTRIBUTE_UNU= SED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteNetworkBuildEventLifecycle(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn =3D opaque; @@ -5520,8 +5520,8 @@ remoteNetworkBuildEventLifecycle(virNetClientProgramP= tr prog ATTRIBUTE_UNUSED, } =20 static void -remoteStoragePoolBuildEventLifecycle(virNetClientProgramPtr prog ATTRIBUTE= _UNUSED, - virNetClientPtr client ATTRIBUTE_UNUS= ED, +remoteStoragePoolBuildEventLifecycle(virNetClientProgramPtr prog G_GNUC_UN= USED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn =3D opaque; @@ -5542,8 +5542,8 @@ remoteStoragePoolBuildEventLifecycle(virNetClientProg= ramPtr prog ATTRIBUTE_UNUSE } =20 static void -remoteStoragePoolBuildEventRefresh(virNetClientProgramPtr prog ATTRIBUTE_U= NUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteStoragePoolBuildEventRefresh(virNetClientProgramPtr prog G_GNUC_UNUS= ED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn =3D opaque; @@ -5563,8 +5563,8 @@ remoteStoragePoolBuildEventRefresh(virNetClientProgra= mPtr prog ATTRIBUTE_UNUSED, } =20 static void -remoteNodeDeviceBuildEventLifecycle(virNetClientProgramPtr prog ATTRIBUTE_= UNUSED, - virNetClientPtr client ATTRIBUTE_UNUSE= D, +remoteNodeDeviceBuildEventLifecycle(virNetClientProgramPtr prog G_GNUC_UNU= SED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn =3D opaque; @@ -5585,8 +5585,8 @@ remoteNodeDeviceBuildEventLifecycle(virNetClientProgr= amPtr prog ATTRIBUTE_UNUSED } =20 static void -remoteNodeDeviceBuildEventUpdate(virNetClientProgramPtr prog ATTRIBUTE_UNU= SED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteNodeDeviceBuildEventUpdate(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn =3D opaque; @@ -5606,8 +5606,8 @@ remoteNodeDeviceBuildEventUpdate(virNetClientProgramP= tr prog ATTRIBUTE_UNUSED, } =20 static void -remoteSecretBuildEventLifecycle(virNetClientProgramPtr prog ATTRIBUTE_UNUS= ED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteSecretBuildEventLifecycle(virNetClientProgramPtr prog G_GNUC_UNUSED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn =3D opaque; @@ -5628,8 +5628,8 @@ remoteSecretBuildEventLifecycle(virNetClientProgramPt= r prog ATTRIBUTE_UNUSED, } =20 static void -remoteSecretBuildEventValueChanged(virNetClientProgramPtr prog ATTRIBUTE_U= NUSED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteSecretBuildEventValueChanged(virNetClientProgramPtr prog G_GNUC_UNUS= ED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn =3D opaque; @@ -5649,8 +5649,8 @@ remoteSecretBuildEventValueChanged(virNetClientProgra= mPtr prog ATTRIBUTE_UNUSED, } =20 static void -remoteDomainBuildQemuMonitorEvent(virNetClientProgramPtr prog ATTRIBUTE_UN= USED, - virNetClientPtr client ATTRIBUTE_UNUSED, +remoteDomainBuildQemuMonitorEvent(virNetClientProgramPtr prog G_GNUC_UNUSE= D, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn =3D opaque; @@ -5709,8 +5709,8 @@ remoteSecretGetValue(virSecretPtr secret, size_t *val= ue_size, =20 =20 static void -remoteDomainBuildEventBlockThreshold(virNetClientProgramPtr prog ATTRIBUTE= _UNUSED, - virNetClientPtr client ATTRIBUTE_UNUS= ED, +remoteDomainBuildEventBlockThreshold(virNetClientProgramPtr prog G_GNUC_UN= USED, + virNetClientPtr client G_GNUC_UNUSED, void *evdata, void *opaque) { virConnectPtr conn =3D opaque; @@ -5862,7 +5862,7 @@ struct remoteStreamCallbackData { virFreeCallback ff; }; =20 -static void remoteStreamEventCallback(virNetClientStreamPtr stream ATTRIBU= TE_UNUSED, +static void remoteStreamEventCallback(virNetClientStreamPtr stream G_GNUC_= UNUSED, int events, void *opaque) { @@ -6769,7 +6769,7 @@ remoteDomainGetDiskErrors(virDomainPtr dom, * send that to the server and wait for reply */ static int -callFull(virConnectPtr conn ATTRIBUTE_UNUSED, +callFull(virConnectPtr conn G_GNUC_UNUSED, struct private_data *priv, unsigned int flags, int *fdin, --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 10:00:01 2024 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=1571059047; cv=none; d=zoho.com; s=zohoarc; b=UDAI7KWa+/V81DgJqg4GQoH68CRCCbxxnEer2B962m0sruKT6KUk/8muXckCUuuDQ9waRIDbaHeWoATU8fiwaQjXr9fKZQlzAfq4xFEVqepoOOp81COrpL3En5vMUEuJcyYnYGF2TokqwSCGDTrJUSrVfRj+ySyNwi+hQSN8mrM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571059047; 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=GutHwW0h9+2qcm+PB3+e34DdxqvLnLHwNvktAL64DHY=; b=BTFpjwj2ENij9g392rlIR8vyTeFToirty3Dg1nph+qCCKpgdqphWCmzDZmz5cX49YdFcUOiNRSTUCHlbuNL0V2pY4erzIpDJ27jj0zDREA9aT1NqZHkEZO/WgRfo3NEnThBJJIE4A+0T/fz25E6iDKUzByeiTpcJvjREVQNZnSc= 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 1571059047791255.55605041649358; Mon, 14 Oct 2019 06:17:27 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8DBF93084037; Mon, 14 Oct 2019 13:17:25 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6442B1001B39; Mon, 14 Oct 2019 13:17:25 +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 1526CE20E; Mon, 14 Oct 2019 13:17:25 +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 x9EDGbXY017529 for ; Mon, 14 Oct 2019 09:16:37 -0400 Received: by smtp.corp.redhat.com (Postfix) id C3A1E600CD; Mon, 14 Oct 2019 13:16:37 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4B86160127 for ; Mon, 14 Oct 2019 13:16:34 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Mon, 14 Oct 2019 15:15:41 +0200 Message-Id: <770fe2ed1bf0b70d256803402df88692b90ffae8.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 23/35] rpc: 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.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.40]); Mon, 14 Oct 2019 13:17:26 +0000 (UTC) Use G_GNUC_UNUSED from GLib instead of ATTRIBUTE_UNUSED. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/rpc/virkeepalive.c | 2 +- src/rpc/virnetclientprogram.c | 4 +- src/rpc/virnetclientstream.c | 4 +- src/rpc/virnetdaemon.c | 22 ++++----- src/rpc/virnetlibsshsession.c | 2 +- src/rpc/virnetsaslcontext.c | 6 +-- src/rpc/virnetserverprogram.c | 2 +- src/rpc/virnetserverservice.c | 2 +- src/rpc/virnetsocket.c | 90 +++++++++++++++++------------------ src/rpc/virnetsshsession.c | 8 ++-- src/rpc/virnettlscontext.c | 4 +- 11 files changed, 73 insertions(+), 73 deletions(-) diff --git a/src/rpc/virkeepalive.c b/src/rpc/virkeepalive.c index 5906cdfa19..860b91b6b1 100644 --- a/src/rpc/virkeepalive.c +++ b/src/rpc/virkeepalive.c @@ -148,7 +148,7 @@ virKeepAliveTimerInternal(virKeepAlivePtr ka, =20 =20 static void -virKeepAliveTimer(int timer ATTRIBUTE_UNUSED, void *opaque) +virKeepAliveTimer(int timer G_GNUC_UNUSED, void *opaque) { virKeepAlivePtr ka =3D opaque; virNetMessagePtr msg =3D NULL; diff --git a/src/rpc/virnetclientprogram.c b/src/rpc/virnetclientprogram.c index 58f24145ec..4d1a2bc28b 100644 --- a/src/rpc/virnetclientprogram.c +++ b/src/rpc/virnetclientprogram.c @@ -85,7 +85,7 @@ virNetClientProgramPtr virNetClientProgramNew(unsigned pr= ogram, } =20 =20 -void virNetClientProgramDispose(void *obj ATTRIBUTE_UNUSED) +void virNetClientProgramDispose(void *obj G_GNUC_UNUSED) { } =20 @@ -113,7 +113,7 @@ int virNetClientProgramMatches(virNetClientProgramPtr p= rog, =20 =20 static int -virNetClientProgramDispatchError(virNetClientProgramPtr prog ATTRIBUTE_UNU= SED, +virNetClientProgramDispatchError(virNetClientProgramPtr prog G_GNUC_UNUSED, virNetMessagePtr msg) { virNetMessageError err; diff --git a/src/rpc/virnetclientstream.c b/src/rpc/virnetclientstream.c index 834c44843b..f904eaba31 100644 --- a/src/rpc/virnetclientstream.c +++ b/src/rpc/virnetclientstream.c @@ -98,7 +98,7 @@ virNetClientStreamEventTimerUpdate(virNetClientStreamPtr = st) =20 =20 static void -virNetClientStreamEventTimer(int timer ATTRIBUTE_UNUSED, void *opaque) +virNetClientStreamEventTimer(int timer G_GNUC_UNUSED, void *opaque) { virNetClientStreamPtr st =3D opaque; int events =3D 0; @@ -688,7 +688,7 @@ virNetClientStreamSendHole(virNetClientStreamPtr st, =20 =20 int -virNetClientStreamRecvHole(virNetClientPtr client ATTRIBUTE_UNUSED, +virNetClientStreamRecvHole(virNetClientPtr client G_GNUC_UNUSED, virNetClientStreamPtr st, long long *length) { diff --git a/src/rpc/virnetdaemon.c b/src/rpc/virnetdaemon.c index 7b68ddbdf2..570930436a 100644 --- a/src/rpc/virnetdaemon.c +++ b/src/rpc/virnetdaemon.c @@ -210,7 +210,7 @@ struct collectData { =20 static int collectServers(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *opaque) { virNetServerPtr srv =3D virObjectRef(payload); @@ -594,7 +594,7 @@ static int sigWrite =3D -1; =20 static void virNetDaemonSignalHandler(int sig, siginfo_t * siginfo, - void* context ATTRIBUTE_UNUSED) + void* context G_GNUC_UNUSED) { int origerrno; int r; @@ -619,8 +619,8 @@ virNetDaemonSignalHandler(int sig, siginfo_t * siginfo, =20 static void virNetDaemonSignalEvent(int watch, - int fd ATTRIBUTE_UNUSED, - int events ATTRIBUTE_UNUSED, + int fd G_GNUC_UNUSED, + int events G_GNUC_UNUSED, void *opaque) { virNetDaemonPtr dmn =3D opaque; @@ -733,7 +733,7 @@ virNetDaemonAddSignalHandler(virNetDaemonPtr dmn, =20 =20 static void -virNetDaemonAutoShutdownTimer(int timerid ATTRIBUTE_UNUSED, +virNetDaemonAutoShutdownTimer(int timerid G_GNUC_UNUSED, void *opaque) { virNetDaemonPtr dmn =3D opaque; @@ -750,7 +750,7 @@ virNetDaemonAutoShutdownTimer(int timerid ATTRIBUTE_UNU= SED, =20 static int daemonServerUpdateServices(void *payload, - const void *key ATTRIBUTE_UNUSED, + const void *key G_GNUC_UNUSED, void *opaque) { bool *enable =3D opaque; @@ -771,8 +771,8 @@ virNetDaemonUpdateServices(virNetDaemonPtr dmn, =20 static int daemonServerProcessClients(void *payload, - const void *key ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) + const void *key G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED) { virNetServerPtr srv =3D payload; =20 @@ -861,8 +861,8 @@ virNetDaemonQuit(virNetDaemonPtr dmn) =20 static int daemonServerClose(void *payload, - const void *key ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) + const void *key G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED) { virNetServerPtr srv =3D payload; =20 @@ -885,7 +885,7 @@ virNetDaemonClose(virNetDaemonPtr dmn) =20 static int daemonServerHasClients(void *payload, - const void *key ATTRIBUTE_UNUSED, + const void *key G_GNUC_UNUSED, void *opaque) { bool *clients =3D opaque; diff --git a/src/rpc/virnetlibsshsession.c b/src/rpc/virnetlibsshsession.c index 62cbe1e06a..136bb1cc33 100644 --- a/src/rpc/virnetlibsshsession.c +++ b/src/rpc/virnetlibsshsession.c @@ -414,7 +414,7 @@ virNetLibsshAuthenticatePrivkeyCb(const char *prompt, char *buf, size_t len, int echo, - int verify ATTRIBUTE_UNUSED, + int verify G_GNUC_UNUSED, void *userdata) { virNetLibsshSessionPtr sess =3D userdata; diff --git a/src/rpc/virnetsaslcontext.c b/src/rpc/virnetsaslcontext.c index 62b103a428..f579162aa2 100644 --- a/src/rpc/virnetsaslcontext.c +++ b/src/rpc/virnetsaslcontext.c @@ -184,7 +184,7 @@ int virNetSASLContextCheckIdentity(virNetSASLContextPtr= ctxt, } =20 =20 -virNetSASLSessionPtr virNetSASLSessionNewClient(virNetSASLContextPtr ctxt = ATTRIBUTE_UNUSED, +virNetSASLSessionPtr virNetSASLSessionNewClient(virNetSASLContextPtr ctxt = G_GNUC_UNUSED, const char *service, const char *hostname, const char *localAddr, @@ -222,7 +222,7 @@ virNetSASLSessionPtr virNetSASLSessionNewClient(virNetS= ASLContextPtr ctxt ATTRIB return NULL; } =20 -virNetSASLSessionPtr virNetSASLSessionNewServer(virNetSASLContextPtr ctxt = ATTRIBUTE_UNUSED, +virNetSASLSessionPtr virNetSASLSessionNewServer(virNetSASLContextPtr ctxt = G_GNUC_UNUSED, const char *service, const char *localAddr, const char *remoteAddr) @@ -697,7 +697,7 @@ ssize_t virNetSASLSessionDecode(virNetSASLSessionPtr sa= sl, return ret; } =20 -void virNetSASLContextDispose(void *obj ATTRIBUTE_UNUSED) +void virNetSASLContextDispose(void *obj G_GNUC_UNUSED) { return; } diff --git a/src/rpc/virnetserverprogram.c b/src/rpc/virnetserverprogram.c index cca820ca5a..e3fa810a3f 100644 --- a/src/rpc/virnetserverprogram.c +++ b/src/rpc/virnetserverprogram.c @@ -574,6 +574,6 @@ int virNetServerProgramSendStreamHole(virNetServerProgr= amPtr prog, } =20 =20 -void virNetServerProgramDispose(void *obj ATTRIBUTE_UNUSED) +void virNetServerProgramDispose(void *obj G_GNUC_UNUSED) { } diff --git a/src/rpc/virnetserverservice.c b/src/rpc/virnetserverservice.c index 66af27d9f7..5d1178f899 100644 --- a/src/rpc/virnetserverservice.c +++ b/src/rpc/virnetserverservice.c @@ -66,7 +66,7 @@ VIR_ONCE_GLOBAL_INIT(virNetServerService); =20 =20 static void virNetServerServiceAccept(virNetSocketPtr sock, - int events ATTRIBUTE_UNUSED, + int events G_GNUC_UNUSED, void *opaque) { virNetServerServicePtr svc =3D opaque; diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index bd5fa96751..15791ceb35 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -530,11 +530,11 @@ int virNetSocketNewListenUNIX(const char *path, return -1; } #else -int virNetSocketNewListenUNIX(const char *path ATTRIBUTE_UNUSED, - mode_t mask ATTRIBUTE_UNUSED, - uid_t user ATTRIBUTE_UNUSED, - gid_t grp ATTRIBUTE_UNUSED, - virNetSocketPtr *retsock ATTRIBUTE_UNUSED) +int virNetSocketNewListenUNIX(const char *path G_GNUC_UNUSED, + mode_t mask G_GNUC_UNUSED, + uid_t user G_GNUC_UNUSED, + gid_t grp G_GNUC_UNUSED, + virNetSocketPtr *retsock G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("UNIX sockets are not supported on this platfor= m")); @@ -777,10 +777,10 @@ int virNetSocketNewConnectUNIX(const char *path, return ret; } #else -int virNetSocketNewConnectUNIX(const char *path ATTRIBUTE_UNUSED, - bool spawnDaemon ATTRIBUTE_UNUSED, - const char *binary ATTRIBUTE_UNUSED, - virNetSocketPtr *retsock ATTRIBUTE_UNUSED) +int virNetSocketNewConnectUNIX(const char *path G_GNUC_UNUSED, + bool spawnDaemon G_GNUC_UNUSED, + const char *binary G_GNUC_UNUSED, + virNetSocketPtr *retsock G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("UNIX sockets are not supported on this platfor= m")); @@ -845,8 +845,8 @@ int virNetSocketNewConnectCommand(virCommandPtr cmd, return -1; } #else -int virNetSocketNewConnectCommand(virCommandPtr cmd ATTRIBUTE_UNUSED, - virNetSocketPtr *retsock ATTRIBUTE_UNUSE= D) +int virNetSocketNewConnectCommand(virCommandPtr cmd G_GNUC_UNUSED, + virNetSocketPtr *retsock G_GNUC_UNUSED) { virReportSystemError(errno, "%s", _("Tunnelling sockets not supported on this platf= orm")); @@ -1052,18 +1052,18 @@ virNetSocketNewConnectLibSSH2(const char *host, } #else int -virNetSocketNewConnectLibSSH2(const char *host ATTRIBUTE_UNUSED, - const char *port ATTRIBUTE_UNUSED, - int family ATTRIBUTE_UNUSED, - const char *username ATTRIBUTE_UNUSED, - const char *privkey ATTRIBUTE_UNUSED, - const char *knownHosts ATTRIBUTE_UNUSED, - const char *knownHostsVerify ATTRIBUTE_UNUSE= D, - const char *authMethods ATTRIBUTE_UNUSED, - const char *command ATTRIBUTE_UNUSED, - virConnectAuthPtr auth ATTRIBUTE_UNUSED, - virURIPtr uri ATTRIBUTE_UNUSED, - virNetSocketPtr *retsock ATTRIBUTE_UNUSED) +virNetSocketNewConnectLibSSH2(const char *host G_GNUC_UNUSED, + const char *port G_GNUC_UNUSED, + int family G_GNUC_UNUSED, + const char *username G_GNUC_UNUSED, + const char *privkey G_GNUC_UNUSED, + const char *knownHosts G_GNUC_UNUSED, + const char *knownHostsVerify G_GNUC_UNUSED, + const char *authMethods G_GNUC_UNUSED, + const char *command G_GNUC_UNUSED, + virConnectAuthPtr auth G_GNUC_UNUSED, + virURIPtr uri G_GNUC_UNUSED, + virNetSocketPtr *retsock G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("libssh2 transport support was not enabled")); @@ -1189,18 +1189,18 @@ virNetSocketNewConnectLibssh(const char *host, } #else int -virNetSocketNewConnectLibssh(const char *host ATTRIBUTE_UNUSED, - const char *port ATTRIBUTE_UNUSED, - int family ATTRIBUTE_UNUSED, - const char *username ATTRIBUTE_UNUSED, - const char *privkey ATTRIBUTE_UNUSED, - const char *knownHosts ATTRIBUTE_UNUSED, - const char *knownHostsVerify ATTRIBUTE_UNUSED, - const char *authMethods ATTRIBUTE_UNUSED, - const char *command ATTRIBUTE_UNUSED, - virConnectAuthPtr auth ATTRIBUTE_UNUSED, - virURIPtr uri ATTRIBUTE_UNUSED, - virNetSocketPtr *retsock ATTRIBUTE_UNUSED) +virNetSocketNewConnectLibssh(const char *host G_GNUC_UNUSED, + const char *port G_GNUC_UNUSED, + int family G_GNUC_UNUSED, + const char *username G_GNUC_UNUSED, + const char *privkey G_GNUC_UNUSED, + const char *knownHosts G_GNUC_UNUSED, + const char *knownHostsVerify G_GNUC_UNUSED, + const char *authMethods G_GNUC_UNUSED, + const char *command G_GNUC_UNUSED, + virConnectAuthPtr auth G_GNUC_UNUSED, + virURIPtr uri G_GNUC_UNUSED, + virNetSocketPtr *retsock G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("libssh transport support was not enabled")); @@ -1602,11 +1602,11 @@ int virNetSocketGetUNIXIdentity(virNetSocketPtr soc= k, return ret; } #else -int virNetSocketGetUNIXIdentity(virNetSocketPtr sock ATTRIBUTE_UNUSED, - uid_t *uid ATTRIBUTE_UNUSED, - gid_t *gid ATTRIBUTE_UNUSED, - pid_t *pid ATTRIBUTE_UNUSED, - unsigned long long *timestamp ATTRIBUTE_UN= USED) +int virNetSocketGetUNIXIdentity(virNetSocketPtr sock G_GNUC_UNUSED, + uid_t *uid G_GNUC_UNUSED, + gid_t *gid G_GNUC_UNUSED, + pid_t *pid G_GNUC_UNUSED, + unsigned long long *timestamp G_GNUC_UNUSE= D) { /* XXX Many more OS support UNIX socket credentials we could port to. = See dbus ....*/ virReportSystemError(ENOSYS, "%s", @@ -1645,7 +1645,7 @@ int virNetSocketGetSELinuxContext(virNetSocketPtr soc= k, return ret; } #else -int virNetSocketGetSELinuxContext(virNetSocketPtr sock ATTRIBUTE_UNUSED, +int virNetSocketGetSELinuxContext(virNetSocketPtr sock G_GNUC_UNUSED, char **context) { *context =3D NULL; @@ -1725,7 +1725,7 @@ void virNetSocketSetSASLSession(virNetSocketPtr sock, #endif =20 =20 -bool virNetSocketHasCachedData(virNetSocketPtr sock ATTRIBUTE_UNUSED) +bool virNetSocketHasCachedData(virNetSocketPtr sock G_GNUC_UNUSED) { bool hasCached =3D false; virObjectLock(sock); @@ -1780,7 +1780,7 @@ static ssize_t virNetSocketLibsshWrite(virNetSocketPt= r sock, } #endif =20 -bool virNetSocketHasPendingData(virNetSocketPtr sock ATTRIBUTE_UNUSED) +bool virNetSocketHasPendingData(virNetSocketPtr sock G_GNUC_UNUSED) { bool hasPending =3D false; virObjectLock(sock); @@ -2178,8 +2178,8 @@ int virNetSocketAccept(virNetSocketPtr sock, virNetSo= cketPtr *clientsock) } =20 =20 -static void virNetSocketEventHandle(int watch ATTRIBUTE_UNUSED, - int fd ATTRIBUTE_UNUSED, +static void virNetSocketEventHandle(int watch G_GNUC_UNUSED, + int fd G_GNUC_UNUSED, int events, void *opaque) { diff --git a/src/rpc/virnetsshsession.c b/src/rpc/virnetsshsession.c index 04b720014d..de39ba31dc 100644 --- a/src/rpc/virnetsshsession.c +++ b/src/rpc/virnetsshsession.c @@ -191,10 +191,10 @@ virNetSSHSessionAuthMethodNew(virNetSSHSessionPtr ses= s) =20 /* keyboard interactive authentication callback */ static void -virNetSSHKbIntCb(const char *name ATTRIBUTE_UNUSED, - int name_len ATTRIBUTE_UNUSED, - const char *instruction ATTRIBUTE_UNUSED, - int instruction_len ATTRIBUTE_UNUSED, +virNetSSHKbIntCb(const char *name G_GNUC_UNUSED, + int name_len G_GNUC_UNUSED, + const char *instruction G_GNUC_UNUSED, + int instruction_len G_GNUC_UNUSED, int num_prompts, const LIBSSH2_USERAUTH_KBDINT_PROMPT *prompts, LIBSSH2_USERAUTH_KBDINT_RESPONSE *responses, diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c index 416c8308ed..e4fbe6e59a 100644 --- a/src/rpc/virnettlscontext.c +++ b/src/rpc/virnettlscontext.c @@ -115,8 +115,8 @@ virNetTLSContextCheckCertFile(const char *type, const c= har *file, bool allowMiss } =20 =20 -static void virNetTLSLog(int level ATTRIBUTE_UNUSED, - const char *str ATTRIBUTE_UNUSED) +static void virNetTLSLog(int level G_GNUC_UNUSED, + const char *str G_GNUC_UNUSED) { VIR_DEBUG("%d %s", level, str); } --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 10:00:01 2024 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=1571059209; cv=none; d=zoho.com; s=zohoarc; b=elEbntlrcaqHDtNcLz1XjLJMQ3LH8EeR8o2KkT48PCJCFbKXlRRzmU2/qn/QSWOm87U109CaVG94MMYSviqkxeJ01ywW8pPCpgTPQFvKRG6g2wGByxdG4wUdtZPwCRHUo6qna51UJ3Y16sL6DEgWwztC9yvkRJth3k3AgGhW9jg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571059209; 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=Ghorwpy+aAjp+K5JJXFgTtOgDAXtcSgHnCuJSYMbDy0=; b=cxBYsS8nlKJD1Pm1SAdWcX6MLiKwjxDxrJZBcVk/hTY9Xa5G0LIPI8TQXJbr2QFkjZUwmqi4TBWkNrHINICe0jro3k/wvERscpBnZ1yZP4zk61bbVynEBMzrTkgPprvS5ygCGZ4zLFCTqrLjWYZ6M9tnPdU8pR4rmFHm9j3nhYg= 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 1571059209331548.4649258543367; Mon, 14 Oct 2019 06:20:09 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7D907A707; Mon, 14 Oct 2019 13:20:07 +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 437741001B33; Mon, 14 Oct 2019 13:20:07 +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 CD523180BA96; Mon, 14 Oct 2019 13:20:06 +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 x9EDGcwS017536 for ; Mon, 14 Oct 2019 09:16:38 -0400 Received: by smtp.corp.redhat.com (Postfix) id 96E0360127; Mon, 14 Oct 2019 13:16:38 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1DB56600CD for ; Mon, 14 Oct 2019 13:16:37 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Mon, 14 Oct 2019 15:15:42 +0200 Message-Id: <625f97e85225cf9c3252d9f421b5d20c050d1ec1.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 24/35] security: 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.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Mon, 14 Oct 2019 13:20:08 +0000 (UTC) Use G_GNUC_UNUSED from GLib instead of ATTRIBUTE_UNUSED. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/security/security_apparmor.c | 88 ++++++++-------- src/security/security_dac.c | 114 ++++++++++---------- src/security/security_manager.c | 6 +- src/security/security_nop.c | 174 +++++++++++++++---------------- src/security/security_selinux.c | 54 +++++----- src/security/security_stack.c | 8 +- src/security/security_util.c | 6 +- src/security/virt-aa-helper.c | 4 +- 8 files changed, 227 insertions(+), 227 deletions(-) diff --git a/src/security/security_apparmor.c b/src/security/security_appar= mor.c index 77eee9410c..da4aa3c24d 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -163,7 +163,7 @@ profile_status_file(const char *str) * load (add) a profile. Will create one if necessary */ static int -load_profile(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, +load_profile(virSecurityManagerPtr mgr G_GNUC_UNUSED, const char *profile, virDomainDefPtr def, const char *fn, @@ -321,28 +321,28 @@ AppArmorSetSecurityHostdevLabelHelper(const char *fil= e, void *opaque) } =20 static int -AppArmorSetSecurityUSBLabel(virUSBDevicePtr dev ATTRIBUTE_UNUSED, +AppArmorSetSecurityUSBLabel(virUSBDevicePtr dev G_GNUC_UNUSED, const char *file, void *opaque) { return AppArmorSetSecurityHostdevLabelHelper(file, opaque); } =20 static int -AppArmorSetSecurityPCILabel(virPCIDevicePtr dev ATTRIBUTE_UNUSED, +AppArmorSetSecurityPCILabel(virPCIDevicePtr dev G_GNUC_UNUSED, const char *file, void *opaque) { return AppArmorSetSecurityHostdevLabelHelper(file, opaque); } =20 static int -AppArmorSetSecuritySCSILabel(virSCSIDevicePtr dev ATTRIBUTE_UNUSED, +AppArmorSetSecuritySCSILabel(virSCSIDevicePtr dev G_GNUC_UNUSED, const char *file, void *opaque) { return AppArmorSetSecurityHostdevLabelHelper(file, opaque); } =20 static int -AppArmorSetSecurityHostLabel(virSCSIVHostDevicePtr dev ATTRIBUTE_UNUSED, +AppArmorSetSecurityHostLabel(virSCSIVHostDevicePtr dev G_GNUC_UNUSED, const char *file, void *opaque) { return AppArmorSetSecurityHostdevLabelHelper(file, opaque); @@ -350,7 +350,7 @@ AppArmorSetSecurityHostLabel(virSCSIVHostDevicePtr dev = ATTRIBUTE_UNUSED, =20 /* Called on libvirtd startup to see if AppArmor is available */ static int -AppArmorSecurityManagerProbe(const char *virtDriver ATTRIBUTE_UNUSED) +AppArmorSecurityManagerProbe(const char *virtDriver G_GNUC_UNUSED) { char *template_qemu =3D NULL; char *template_lxc =3D NULL; @@ -391,25 +391,25 @@ AppArmorSecurityManagerProbe(const char *virtDriver A= TTRIBUTE_UNUSED) * currently not used. */ static int -AppArmorSecurityManagerOpen(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED) +AppArmorSecurityManagerOpen(virSecurityManagerPtr mgr G_GNUC_UNUSED) { return 0; } =20 static int -AppArmorSecurityManagerClose(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED) +AppArmorSecurityManagerClose(virSecurityManagerPtr mgr G_GNUC_UNUSED) { return 0; } =20 static const char * -AppArmorSecurityManagerGetModel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED) +AppArmorSecurityManagerGetModel(virSecurityManagerPtr mgr G_GNUC_UNUSED) { return SECURITY_APPARMOR_NAME; } =20 static const char * -AppArmorSecurityManagerGetDOI(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED) +AppArmorSecurityManagerGetDOI(virSecurityManagerPtr mgr G_GNUC_UNUSED) { return SECURITY_APPARMOR_VOID_DOI; } @@ -421,7 +421,7 @@ AppArmorSecurityManagerGetDOI(virSecurityManagerPtr mgr= ATTRIBUTE_UNUSED) * called on shutdown. */ static int -AppArmorGenSecurityLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, +AppArmorGenSecurityLabel(virSecurityManagerPtr mgr G_GNUC_UNUSED, virDomainDefPtr def) { int rc =3D -1; @@ -488,7 +488,7 @@ static int AppArmorSetSecurityAllLabel(virSecurityManagerPtr mgr, virDomainDefPtr def, const char *stdin_path, - bool chardevStdioLogd ATTRIBUTE_UNUSED) + bool chardevStdioLogd G_GNUC_UNUSED) { virSecurityLabelDefPtr secdef =3D virDomainDefGetSecurityLabelDef(def, SECURITY_APPARMOR_NAME= ); @@ -507,9 +507,9 @@ AppArmorSetSecurityAllLabel(virSecurityManagerPtr mgr, * running. */ static int -AppArmorGetSecurityProcessLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, +AppArmorGetSecurityProcessLabel(virSecurityManagerPtr mgr G_GNUC_UNUSED, virDomainDefPtr def, - pid_t pid ATTRIBUTE_UNUSED, + pid_t pid G_GNUC_UNUSED, virSecurityLabelPtr sec) { int rc =3D -1; @@ -547,7 +547,7 @@ AppArmorGetSecurityProcessLabel(virSecurityManagerPtr m= gr ATTRIBUTE_UNUSED, * more details. Currently called via qemudShutdownVMDaemon. */ static int -AppArmorReleaseSecurityLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, +AppArmorReleaseSecurityLabel(virSecurityManagerPtr mgr G_GNUC_UNUSED, virDomainDefPtr def) { virSecurityLabelDefPtr secdef =3D virDomainDefGetSecurityLabelDef(def, @@ -563,10 +563,10 @@ AppArmorReleaseSecurityLabel(virSecurityManagerPtr mg= r ATTRIBUTE_UNUSED, =20 =20 static int -AppArmorRestoreSecurityAllLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, +AppArmorRestoreSecurityAllLabel(virSecurityManagerPtr mgr G_GNUC_UNUSED, virDomainDefPtr def, - bool migrated ATTRIBUTE_UNUSED, - bool chardevStdioLogd ATTRIBUTE_UNUSED) + bool migrated G_GNUC_UNUSED, + bool chardevStdioLogd G_GNUC_UNUSED) { int rc =3D 0; virSecurityLabelDefPtr secdef =3D @@ -589,7 +589,7 @@ AppArmorRestoreSecurityAllLabel(virSecurityManagerPtr m= gr ATTRIBUTE_UNUSED, * LOCALSTATEDIR/log/libvirt/qemu/.log */ static int -AppArmorSetSecurityProcessLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, +AppArmorSetSecurityProcessLabel(virSecurityManagerPtr mgr G_GNUC_UNUSED, virDomainDefPtr def) { int rc =3D -1; @@ -633,7 +633,7 @@ AppArmorSetSecurityProcessLabel(virSecurityManagerPtr m= gr ATTRIBUTE_UNUSED, * process*. */ static int -AppArmorSetSecurityChildProcessLabel(virSecurityManagerPtr mgr ATTRIBUTE_U= NUSED, +AppArmorSetSecurityChildProcessLabel(virSecurityManagerPtr mgr G_GNUC_UNUS= ED, virDomainDefPtr def, virCommandPtr cmd) { @@ -671,22 +671,22 @@ AppArmorSetSecurityChildProcessLabel(virSecurityManag= erPtr mgr ATTRIBUTE_UNUSED, } =20 static int -AppArmorSetSecurityDaemonSocketLabel(virSecurityManagerPtr mgr ATTRIBUTE_U= NUSED, - virDomainDefPtr vm ATTRIBUTE_UNUSED) +AppArmorSetSecurityDaemonSocketLabel(virSecurityManagerPtr mgr G_GNUC_UNUS= ED, + virDomainDefPtr vm G_GNUC_UNUSED) { return 0; } =20 static int -AppArmorSetSecuritySocketLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainDefPtr def ATTRIBUTE_UNUSED) +AppArmorSetSecuritySocketLabel(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr def G_GNUC_UNUSED) { return 0; } =20 static int -AppArmorClearSecuritySocketLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSE= D, - virDomainDefPtr def ATTRIBUTE_UNUSED) +AppArmorClearSecuritySocketLabel(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr def G_GNUC_UNUSED) { return 0; } @@ -697,7 +697,7 @@ static int AppArmorRestoreSecurityImageLabel(virSecurityManagerPtr mgr, virDomainDefPtr def, virStorageSourcePtr src, - virSecurityDomainImageLabelFlags flags A= TTRIBUTE_UNUSED) + virSecurityDomainImageLabelFlags flags G= _GNUC_UNUSED) { if (!virStorageSourceIsLocalStorage(src)) return 0; @@ -744,7 +744,7 @@ AppArmorSetMemoryLabel(virSecurityManagerPtr mgr, static int AppArmorRestoreMemoryLabel(virSecurityManagerPtr mgr, virDomainDefPtr def, - virDomainMemoryDefPtr mem ATTRIBUTE_UNUSED) + virDomainMemoryDefPtr mem G_GNUC_UNUSED) { return reload_profile(mgr, def, NULL, false); } @@ -789,7 +789,7 @@ AppArmorSetInputLabel(virSecurityManagerPtr mgr, static int AppArmorRestoreInputLabel(virSecurityManagerPtr mgr, virDomainDefPtr def, - virDomainInputDefPtr input ATTRIBUTE_UNUSED) + virDomainInputDefPtr input G_GNUC_UNUSED) { return reload_profile(mgr, def, NULL, false); } @@ -799,7 +799,7 @@ static int AppArmorSetSecurityImageLabel(virSecurityManagerPtr mgr, virDomainDefPtr def, virStorageSourcePtr src, - virSecurityDomainImageLabelFlags flags ATTRI= BUTE_UNUSED) + virSecurityDomainImageLabelFlags flags G_GNU= C_UNUSED) { int rc =3D -1; char *profile_name =3D NULL; @@ -845,7 +845,7 @@ AppArmorSetSecurityImageLabel(virSecurityManagerPtr mgr, } =20 static int -AppArmorSecurityVerify(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, +AppArmorSecurityVerify(virSecurityManagerPtr mgr G_GNUC_UNUSED, virDomainDefPtr def) { virSecurityLabelDefPtr secdef =3D @@ -866,9 +866,9 @@ AppArmorSecurityVerify(virSecurityManagerPtr mgr ATTRIB= UTE_UNUSED, } =20 static int -AppArmorReserveSecurityLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainDefPtr def ATTRIBUTE_UNUSED, - pid_t pid ATTRIBUTE_UNUSED) +AppArmorReserveSecurityLabel(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr def G_GNUC_UNUSED, + pid_t pid G_GNUC_UNUSED) { /* NOOP. Nothing to reserve with AppArmor */ return 0; @@ -1003,8 +1003,8 @@ AppArmorSetSecurityHostdevLabel(virSecurityManagerPtr= mgr, static int AppArmorRestoreSecurityHostdevLabel(virSecurityManagerPtr mgr, virDomainDefPtr def, - virDomainHostdevDefPtr dev ATTRIBUTE_U= NUSED, - const char *vroot ATTRIBUTE_UNUSED) + virDomainHostdevDefPtr dev G_GNUC_UNUS= ED, + const char *vroot G_GNUC_UNUSED) =20 { virSecurityLabelDefPtr secdef =3D @@ -1020,7 +1020,7 @@ static int AppArmorSetChardevLabel(virSecurityManagerPtr mgr, virDomainDefPtr def, virDomainChrSourceDefPtr dev_source, - bool chardevStdioLogd ATTRIBUTE_UNUSED) + bool chardevStdioLogd G_GNUC_UNUSED) { char *in =3D NULL, *out =3D NULL; int ret =3D -1; @@ -1075,8 +1075,8 @@ AppArmorSetChardevLabel(virSecurityManagerPtr mgr, static int AppArmorRestoreChardevLabel(virSecurityManagerPtr mgr, virDomainDefPtr def, - virDomainChrSourceDefPtr dev_source ATTRIBUTE_= UNUSED, - bool chardevStdioLogd ATTRIBUTE_UNUSED) + virDomainChrSourceDefPtr dev_source G_GNUC_UNU= SED, + bool chardevStdioLogd G_GNUC_UNUSED) { virSecurityLabelDefPtr secdef; =20 @@ -1119,7 +1119,7 @@ AppArmorSetPathLabel(virSecurityManagerPtr mgr, static int AppArmorRestoreSavedStateLabel(virSecurityManagerPtr mgr, virDomainDefPtr def, - const char *savefile ATTRIBUTE_UNUSED) + const char *savefile G_GNUC_UNUSED) { return reload_profile(mgr, def, NULL, false); } @@ -1152,8 +1152,8 @@ AppArmorSetFDLabel(virSecurityManagerPtr mgr, } =20 static char * -AppArmorGetMountOptions(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainDefPtr vm ATTRIBUTE_UNUSED) +AppArmorGetMountOptions(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr vm G_GNUC_UNUSED) { char *opts; =20 @@ -1162,8 +1162,8 @@ AppArmorGetMountOptions(virSecurityManagerPtr mgr ATT= RIBUTE_UNUSED, } =20 static const char * -AppArmorGetBaseLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - int virtType ATTRIBUTE_UNUSED) +AppArmorGetBaseLabel(virSecurityManagerPtr mgr G_GNUC_UNUSED, + int virtType G_GNUC_UNUSED) { return NULL; } diff --git a/src/security/security_dac.c b/src/security/security_dac.c index d6d0a8299b..250e6357b1 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -216,7 +216,7 @@ static int virSecurityDACRestoreFileLabelInternal(virSe= curityManagerPtr mgr, * -1 otherwise. */ static int -virSecurityDACTransactionRun(pid_t pid ATTRIBUTE_UNUSED, +virSecurityDACTransactionRun(pid_t pid G_GNUC_UNUSED, void *opaque) { virSecurityDACChownListPtr list =3D opaque; @@ -432,7 +432,7 @@ virSecurityDACGetImageIds(virSecurityLabelDefPtr seclab= el, * -1 on failure */ static int -virSecurityDACRememberLabel(virSecurityDACDataPtr priv ATTRIBUTE_UNUSED, +virSecurityDACRememberLabel(virSecurityDACDataPtr priv G_GNUC_UNUSED, const char *path, uid_t uid, gid_t gid) @@ -466,7 +466,7 @@ virSecurityDACRememberLabel(virSecurityDACDataPtr priv = ATTRIBUTE_UNUSED, * -1 on failure (@uid and @gid not touched) */ static int -virSecurityDACRecallLabel(virSecurityDACDataPtr priv ATTRIBUTE_UNUSED, +virSecurityDACRecallLabel(virSecurityDACDataPtr priv G_GNUC_UNUSED, const char *path, uid_t *uid, gid_t *gid) @@ -492,13 +492,13 @@ virSecurityDACRecallLabel(virSecurityDACDataPtr priv = ATTRIBUTE_UNUSED, } =20 static virSecurityDriverStatus -virSecurityDACProbe(const char *virtDriver ATTRIBUTE_UNUSED) +virSecurityDACProbe(const char *virtDriver G_GNUC_UNUSED) { return SECURITY_DRIVER_ENABLE; } =20 static int -virSecurityDACOpen(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED) +virSecurityDACOpen(virSecurityManagerPtr mgr G_GNUC_UNUSED) { if (virThreadLocalInit(&chownList, virSecurityDACChownListFree) < 0) { @@ -521,13 +521,13 @@ virSecurityDACClose(virSecurityManagerPtr mgr) =20 =20 static const char * -virSecurityDACGetModel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED) +virSecurityDACGetModel(virSecurityManagerPtr mgr G_GNUC_UNUSED) { return SECURITY_DAC_NAME; } =20 static const char * -virSecurityDACGetDOI(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED) +virSecurityDACGetDOI(virSecurityManagerPtr mgr G_GNUC_UNUSED) { return "0"; } @@ -609,7 +609,7 @@ virSecurityDACTransactionStart(virSecurityManagerPtr mg= r) * -1 otherwise. */ static int -virSecurityDACTransactionCommit(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, +virSecurityDACTransactionCommit(virSecurityManagerPtr mgr G_GNUC_UNUSED, pid_t pid, bool lock) { @@ -659,7 +659,7 @@ virSecurityDACTransactionCommit(virSecurityManagerPtr m= gr ATTRIBUTE_UNUSED, * Cancels and frees any out standing transaction. */ static void -virSecurityDACTransactionAbort(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED) +virSecurityDACTransactionAbort(virSecurityManagerPtr mgr G_GNUC_UNUSED) { virSecurityDACChownListPtr list; =20 @@ -1051,7 +1051,7 @@ static int virSecurityDACRestoreImageLabel(virSecurityManagerPtr mgr, virDomainDefPtr def, virStorageSourcePtr src, - virSecurityDomainImageLabelFlags flags ATT= RIBUTE_UNUSED) + virSecurityDomainImageLabelFlags flags G_G= NUC_UNUSED) { return virSecurityDACRestoreImageLabelInt(mgr, def, src, false); } @@ -1065,7 +1065,7 @@ struct virSecurityDACMoveImageMetadataData { =20 =20 static int -virSecurityDACMoveImageMetadataHelper(pid_t pid ATTRIBUTE_UNUSED, +virSecurityDACMoveImageMetadataHelper(pid_t pid G_GNUC_UNUSED, void *opaque) { struct virSecurityDACMoveImageMetadataData *data =3D opaque; @@ -1137,7 +1137,7 @@ virSecurityDACSetHostdevLabelHelper(const char *file, =20 =20 static int -virSecurityDACSetPCILabel(virPCIDevicePtr dev ATTRIBUTE_UNUSED, +virSecurityDACSetPCILabel(virPCIDevicePtr dev G_GNUC_UNUSED, const char *file, void *opaque) { @@ -1146,7 +1146,7 @@ virSecurityDACSetPCILabel(virPCIDevicePtr dev ATTRIBU= TE_UNUSED, =20 =20 static int -virSecurityDACSetUSBLabel(virUSBDevicePtr dev ATTRIBUTE_UNUSED, +virSecurityDACSetUSBLabel(virUSBDevicePtr dev G_GNUC_UNUSED, const char *file, void *opaque) { @@ -1155,7 +1155,7 @@ virSecurityDACSetUSBLabel(virUSBDevicePtr dev ATTRIBU= TE_UNUSED, =20 =20 static int -virSecurityDACSetSCSILabel(virSCSIDevicePtr dev ATTRIBUTE_UNUSED, +virSecurityDACSetSCSILabel(virSCSIDevicePtr dev G_GNUC_UNUSED, const char *file, void *opaque) { @@ -1164,7 +1164,7 @@ virSecurityDACSetSCSILabel(virSCSIDevicePtr dev ATTRI= BUTE_UNUSED, =20 =20 static int -virSecurityDACSetHostLabel(virSCSIVHostDevicePtr dev ATTRIBUTE_UNUSED, +virSecurityDACSetHostLabel(virSCSIVHostDevicePtr dev G_GNUC_UNUSED, const char *file, void *opaque) { @@ -1305,7 +1305,7 @@ virSecurityDACSetHostdevLabel(virSecurityManagerPtr m= gr, =20 =20 static int -virSecurityDACRestorePCILabel(virPCIDevicePtr dev ATTRIBUTE_UNUSED, +virSecurityDACRestorePCILabel(virPCIDevicePtr dev G_GNUC_UNUSED, const char *file, void *opaque) { @@ -1315,7 +1315,7 @@ virSecurityDACRestorePCILabel(virPCIDevicePtr dev ATT= RIBUTE_UNUSED, =20 =20 static int -virSecurityDACRestoreUSBLabel(virUSBDevicePtr dev ATTRIBUTE_UNUSED, +virSecurityDACRestoreUSBLabel(virUSBDevicePtr dev G_GNUC_UNUSED, const char *file, void *opaque) { @@ -1325,7 +1325,7 @@ virSecurityDACRestoreUSBLabel(virUSBDevicePtr dev ATT= RIBUTE_UNUSED, =20 =20 static int -virSecurityDACRestoreSCSILabel(virSCSIDevicePtr dev ATTRIBUTE_UNUSED, +virSecurityDACRestoreSCSILabel(virSCSIDevicePtr dev G_GNUC_UNUSED, const char *file, void *opaque) { @@ -1335,7 +1335,7 @@ virSecurityDACRestoreSCSILabel(virSCSIDevicePtr dev A= TTRIBUTE_UNUSED, =20 =20 static int -virSecurityDACRestoreHostLabel(virSCSIVHostDevicePtr dev ATTRIBUTE_UNUSED, +virSecurityDACRestoreHostLabel(virSCSIVHostDevicePtr dev G_GNUC_UNUSED, const char *file, void *opaque) { @@ -1577,7 +1577,7 @@ virSecurityDACSetChardevLabel(virSecurityManagerPtr m= gr, =20 static int virSecurityDACRestoreChardevLabelHelper(virSecurityManagerPtr mgr, - virDomainDefPtr def ATTRIBUTE_UNUS= ED, + virDomainDefPtr def G_GNUC_UNUSED, virDomainChrSourceDefPtr dev_sourc= e, bool chardevStdioLogd, bool recall) @@ -1671,7 +1671,7 @@ struct _virSecuritySELinuxChardevCallbackData { =20 static int virSecurityDACRestoreChardevCallback(virDomainDefPtr def, - virDomainChrDefPtr dev ATTRIBUTE_UNUS= ED, + virDomainChrDefPtr dev G_GNUC_UNUSED, void *opaque) { struct _virSecuritySELinuxChardevCallbackData *data =3D opaque; @@ -1765,9 +1765,9 @@ virSecurityDACSetGraphicsLabel(virSecurityManagerPtr = mgr, =20 =20 static int -virSecurityDACRestoreGraphicsLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNU= SED, - virDomainDefPtr def ATTRIBUTE_UNUSED, - virDomainGraphicsDefPtr gfx ATTRIBUTE_UNUSE= D) +virSecurityDACRestoreGraphicsLabel(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr def G_GNUC_UNUSED, + virDomainGraphicsDefPtr gfx G_GNUC_UNUSED) =20 { /* The only graphics labelling we do is dependent on mountNamespaces, @@ -1816,7 +1816,7 @@ virSecurityDACSetInputLabel(virSecurityManagerPtr mgr, =20 static int virSecurityDACRestoreInputLabel(virSecurityManagerPtr mgr, - virDomainDefPtr def ATTRIBUTE_UNUSED, + virDomainDefPtr def G_GNUC_UNUSED, virDomainInputDefPtr input) { int ret =3D -1; @@ -1840,7 +1840,7 @@ virSecurityDACRestoreInputLabel(virSecurityManagerPtr= mgr, =20 static int virSecurityDACRestoreMemoryLabel(virSecurityManagerPtr mgr, - virDomainDefPtr def ATTRIBUTE_UNUSED, + virDomainDefPtr def G_GNUC_UNUSED, virDomainMemoryDefPtr mem) { int ret =3D -1; @@ -1862,8 +1862,8 @@ virSecurityDACRestoreMemoryLabel(virSecurityManagerPt= r mgr, =20 =20 static int -virSecurityDACRestoreSEVLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainDefPtr def ATTRIBUTE_UNUSED) +virSecurityDACRestoreSEVLabel(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr def G_GNUC_UNUSED) { /* we only label /dev/sev when running with namespaces, so we don't ne= ed to * restore anything */ @@ -1972,7 +1972,7 @@ virSecurityDACRestoreAllLabel(virSecurityManagerPtr m= gr, =20 static int virSecurityDACSetChardevCallback(virDomainDefPtr def, - virDomainChrDefPtr dev ATTRIBUTE_UNUSED, + virDomainChrDefPtr dev G_GNUC_UNUSED, void *opaque) { struct _virSecuritySELinuxChardevCallbackData *data =3D opaque; @@ -2052,7 +2052,7 @@ virSecurityDACSetSEVLabel(virSecurityManagerPtr mgr, static int virSecurityDACSetAllLabel(virSecurityManagerPtr mgr, virDomainDefPtr def, - const char *stdin_path ATTRIBUTE_UNUSED, + const char *stdin_path G_GNUC_UNUSED, bool chardevStdioLogd) { virSecurityDACDataPtr priv =3D virSecurityManagerGetPrivateData(mgr); @@ -2181,7 +2181,7 @@ virSecurityDACSetSavedStateLabel(virSecurityManagerPt= r mgr, =20 static int virSecurityDACRestoreSavedStateLabel(virSecurityManagerPtr mgr, - virDomainDefPtr def ATTRIBUTE_UNUSED, + virDomainDefPtr def G_GNUC_UNUSED, const char *savefile) { virSecurityDACDataPtr priv =3D virSecurityManagerGetPrivateData(mgr); @@ -2244,8 +2244,8 @@ virSecurityDACSetChildProcessLabel(virSecurityManager= Ptr mgr, =20 =20 static int -virSecurityDACVerify(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainDefPtr def ATTRIBUTE_UNUSED) +virSecurityDACVerify(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr def G_GNUC_UNUSED) { return 0; } @@ -2320,16 +2320,16 @@ virSecurityDACGenLabel(virSecurityManagerPtr mgr, } =20 static int -virSecurityDACReleaseLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainDefPtr def ATTRIBUTE_UNUSED) +virSecurityDACReleaseLabel(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr def G_GNUC_UNUSED) { return 0; } =20 static int -virSecurityDACReserveLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainDefPtr def ATTRIBUTE_UNUSED, - pid_t pid ATTRIBUTE_UNUSED) +virSecurityDACReserveLabel(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr def G_GNUC_UNUSED, + pid_t pid G_GNUC_UNUSED) { return 0; } @@ -2391,8 +2391,8 @@ virSecurityDACGetProcessLabelInternal(pid_t pid, } #else static int -virSecurityDACGetProcessLabelInternal(pid_t pid ATTRIBUTE_UNUSED, - virSecurityLabelPtr seclabel ATTRIBU= TE_UNUSED) +virSecurityDACGetProcessLabelInternal(pid_t pid G_GNUC_UNUSED, + virSecurityLabelPtr seclabel G_GNUC_= UNUSED) { virReportSystemError(ENOSYS, "%s", _("Cannot get process uid and gid on this platfor= m")); @@ -2401,7 +2401,7 @@ virSecurityDACGetProcessLabelInternal(pid_t pid ATTRI= BUTE_UNUSED, #endif =20 static int -virSecurityDACGetProcessLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, +virSecurityDACGetProcessLabel(virSecurityManagerPtr mgr G_GNUC_UNUSED, virDomainDefPtr def, pid_t pid, virSecurityLabelPtr seclabel) @@ -2426,54 +2426,54 @@ virSecurityDACGetProcessLabel(virSecurityManagerPtr= mgr ATTRIBUTE_UNUSED, } =20 static int -virSecurityDACSetDaemonSocketLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNU= SED, - virDomainDefPtr vm ATTRIBUTE_UNUSED) +virSecurityDACSetDaemonSocketLabel(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr vm G_GNUC_UNUSED) { return 0; } =20 =20 static int -virSecurityDACSetSocketLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainDefPtr def ATTRIBUTE_UNUSED) +virSecurityDACSetSocketLabel(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr def G_GNUC_UNUSED) { return 0; } =20 =20 static int -virSecurityDACClearSocketLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainDefPtr def ATTRIBUTE_UNUSED) +virSecurityDACClearSocketLabel(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr def G_GNUC_UNUSED) { return 0; } =20 static int -virSecurityDACSetImageFDLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainDefPtr def ATTRIBUTE_UNUSED, - int fd ATTRIBUTE_UNUSED) +virSecurityDACSetImageFDLabel(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr def G_GNUC_UNUSED, + int fd G_GNUC_UNUSED) { return 0; } =20 static int -virSecurityDACSetTapFDLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainDefPtr def ATTRIBUTE_UNUSED, - int fd ATTRIBUTE_UNUSED) +virSecurityDACSetTapFDLabel(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr def G_GNUC_UNUSED, + int fd G_GNUC_UNUSED) { return 0; } =20 static char * -virSecurityDACGetMountOptions(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainDefPtr vm ATTRIBUTE_UNUSED) +virSecurityDACGetMountOptions(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr vm G_GNUC_UNUSED) { return NULL; } =20 static const char * virSecurityDACGetBaseLabel(virSecurityManagerPtr mgr, - int virt ATTRIBUTE_UNUSED) + int virt G_GNUC_UNUSED) { virSecurityDACDataPtr priv =3D virSecurityManagerGetPrivateData(mgr); return priv->baselabel; @@ -2483,7 +2483,7 @@ static int virSecurityDACDomainSetPathLabel(virSecurityManagerPtr mgr, virDomainDefPtr def, const char *path, - bool allowSubtree ATTRIBUTE_UNUSED) + bool allowSubtree G_GNUC_UNUSED) { virSecurityDACDataPtr priv =3D virSecurityManagerGetPrivateData(mgr); virSecurityLabelDefPtr seclabel; diff --git a/src/security/security_manager.c b/src/security/security_manage= r.c index 7f187c9068..b5ccfad523 100644 --- a/src/security/security_manager.c +++ b/src/security/security_manager.c @@ -816,7 +816,7 @@ virSecurityManagerCheckChardevLabel(virSecurityManagerP= tr mgr, =20 =20 static int -virSecurityManagerCheckChardevCallback(virDomainDefPtr def ATTRIBUTE_UNUSE= D, +virSecurityManagerCheckChardevCallback(virDomainDefPtr def G_GNUC_UNUSED, virDomainChrDefPtr dev, void *opaque) { @@ -1277,7 +1277,7 @@ cmpstringp(const void *p1, const void *p2) * NULL on failure. */ virSecurityManagerMetadataLockStatePtr -virSecurityManagerMetadataLock(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, +virSecurityManagerMetadataLock(virSecurityManagerPtr mgr G_GNUC_UNUSED, const char **paths, size_t npaths) { @@ -1382,7 +1382,7 @@ virSecurityManagerMetadataLock(virSecurityManagerPtr = mgr ATTRIBUTE_UNUSED, =20 =20 void -virSecurityManagerMetadataUnlock(virSecurityManagerPtr mgr ATTRIBUTE_UNUSE= D, +virSecurityManagerMetadataUnlock(virSecurityManagerPtr mgr G_GNUC_UNUSED, virSecurityManagerMetadataLockStatePtr *s= tate) { size_t i; diff --git a/src/security/security_nop.c b/src/security/security_nop.c index 966b9d41a1..604e65252b 100644 --- a/src/security/security_nop.c +++ b/src/security/security_nop.c @@ -26,172 +26,172 @@ #define VIR_FROM_THIS VIR_FROM_SECURITY =20 static virSecurityDriverStatus -virSecurityDriverProbeNop(const char *virtDriver ATTRIBUTE_UNUSED) +virSecurityDriverProbeNop(const char *virtDriver G_GNUC_UNUSED) { return SECURITY_DRIVER_ENABLE; } =20 static int -virSecurityDriverOpenNop(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED) +virSecurityDriverOpenNop(virSecurityManagerPtr mgr G_GNUC_UNUSED) { return 0; } =20 static int -virSecurityDriverCloseNop(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED) +virSecurityDriverCloseNop(virSecurityManagerPtr mgr G_GNUC_UNUSED) { return 0; } =20 static const char * -virSecurityDriverGetModelNop(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED) +virSecurityDriverGetModelNop(virSecurityManagerPtr mgr G_GNUC_UNUSED) { return "none"; } =20 static const char * -virSecurityDriverGetDOINop(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED) +virSecurityDriverGetDOINop(virSecurityManagerPtr mgr G_GNUC_UNUSED) { return "0"; } =20 static int -virSecurityDomainSetDaemonSocketLabelNop(virSecurityManagerPtr mgr ATTRIBU= TE_UNUSED, - virDomainDefPtr vm ATTRIBUTE_UNUS= ED) +virSecurityDomainSetDaemonSocketLabelNop(virSecurityManagerPtr mgr G_GNUC_= UNUSED, + virDomainDefPtr vm G_GNUC_UNUSED) { return 0; } =20 static int -virSecurityDomainSetSocketLabelNop(virSecurityManagerPtr mgr ATTRIBUTE_UNU= SED, - virDomainDefPtr vm ATTRIBUTE_UNUSED) +virSecurityDomainSetSocketLabelNop(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr vm G_GNUC_UNUSED) { return 0; } =20 static int -virSecurityDomainClearSocketLabelNop(virSecurityManagerPtr mgr ATTRIBUTE_U= NUSED, - virDomainDefPtr vm ATTRIBUTE_UNUSED) +virSecurityDomainClearSocketLabelNop(virSecurityManagerPtr mgr G_GNUC_UNUS= ED, + virDomainDefPtr vm G_GNUC_UNUSED) { return 0; } =20 static int -virSecurityDomainRestoreHostdevLabelNop(virSecurityManagerPtr mgr ATTRIBUT= E_UNUSED, - virDomainDefPtr vm ATTRIBUTE_UNUSE= D, - virDomainHostdevDefPtr dev ATTRIBU= TE_UNUSED, - const char *vroot ATTRIBUTE_UNUSED) +virSecurityDomainRestoreHostdevLabelNop(virSecurityManagerPtr mgr G_GNUC_U= NUSED, + virDomainDefPtr vm G_GNUC_UNUSED, + virDomainHostdevDefPtr dev G_GNUC_= UNUSED, + const char *vroot G_GNUC_UNUSED) { return 0; } =20 static int -virSecurityDomainSetHostdevLabelNop(virSecurityManagerPtr mgr ATTRIBUTE_UN= USED, - virDomainDefPtr vm ATTRIBUTE_UNUSED, - virDomainHostdevDefPtr dev ATTRIBUTE_U= NUSED, - const char *vroot ATTRIBUTE_UNUSED) +virSecurityDomainSetHostdevLabelNop(virSecurityManagerPtr mgr G_GNUC_UNUSE= D, + virDomainDefPtr vm G_GNUC_UNUSED, + virDomainHostdevDefPtr dev G_GNUC_UNUS= ED, + const char *vroot G_GNUC_UNUSED) { return 0; } =20 static int -virSecurityDomainSetSavedStateLabelNop(virSecurityManagerPtr mgr ATTRIBUTE= _UNUSED, - virDomainDefPtr vm ATTRIBUTE_UNUSED, - const char *savefile ATTRIBUTE_UNUS= ED) +virSecurityDomainSetSavedStateLabelNop(virSecurityManagerPtr mgr G_GNUC_UN= USED, + virDomainDefPtr vm G_GNUC_UNUSED, + const char *savefile G_GNUC_UNUSED) { return 0; } =20 static int -virSecurityDomainRestoreSavedStateLabelNop(virSecurityManagerPtr mgr ATTRI= BUTE_UNUSED, - virDomainDefPtr vm ATTRIBUTE_UN= USED, - const char *savefile ATTRIBUTE_= UNUSED) +virSecurityDomainRestoreSavedStateLabelNop(virSecurityManagerPtr mgr G_GNU= C_UNUSED, + virDomainDefPtr vm G_GNUC_UNUSE= D, + const char *savefile G_GNUC_UNU= SED) { return 0; } =20 static int -virSecurityDomainGenLabelNop(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainDefPtr sec ATTRIBUTE_UNUSED) +virSecurityDomainGenLabelNop(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr sec G_GNUC_UNUSED) { return 0; } =20 static int -virSecurityDomainReserveLabelNop(virSecurityManagerPtr mgr ATTRIBUTE_UNUSE= D, - virDomainDefPtr sec ATTRIBUTE_UNUSED, - pid_t pid ATTRIBUTE_UNUSED) +virSecurityDomainReserveLabelNop(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr sec G_GNUC_UNUSED, + pid_t pid G_GNUC_UNUSED) { return 0; } =20 static int -virSecurityDomainReleaseLabelNop(virSecurityManagerPtr mgr ATTRIBUTE_UNUSE= D, - virDomainDefPtr sec ATTRIBUTE_UNUSED) +virSecurityDomainReleaseLabelNop(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr sec G_GNUC_UNUSED) { return 0; } =20 static int -virSecurityDomainSetAllLabelNop(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainDefPtr sec ATTRIBUTE_UNUSED, - const char *stdin_path ATTRIBUTE_UNUSED, - bool chardevStdioLogd ATTRIBUTE_UNUSED) +virSecurityDomainSetAllLabelNop(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr sec G_GNUC_UNUSED, + const char *stdin_path G_GNUC_UNUSED, + bool chardevStdioLogd G_GNUC_UNUSED) { return 0; } =20 static int -virSecurityDomainRestoreAllLabelNop(virSecurityManagerPtr mgr ATTRIBUTE_UN= USED, - virDomainDefPtr vm ATTRIBUTE_UNUSED, - bool migrated ATTRIBUTE_UNUSED, - bool chardevStdioLogd ATTRIBUTE_UNUSED) +virSecurityDomainRestoreAllLabelNop(virSecurityManagerPtr mgr G_GNUC_UNUSE= D, + virDomainDefPtr vm G_GNUC_UNUSED, + bool migrated G_GNUC_UNUSED, + bool chardevStdioLogd G_GNUC_UNUSED) { return 0; } =20 static int -virSecurityDomainGetProcessLabelNop(virSecurityManagerPtr mgr ATTRIBUTE_UN= USED, - virDomainDefPtr vm ATTRIBUTE_UNUSED, - pid_t pid ATTRIBUTE_UNUSED, - virSecurityLabelPtr sec ATTRIBUTE_UNUS= ED) +virSecurityDomainGetProcessLabelNop(virSecurityManagerPtr mgr G_GNUC_UNUSE= D, + virDomainDefPtr vm G_GNUC_UNUSED, + pid_t pid G_GNUC_UNUSED, + virSecurityLabelPtr sec G_GNUC_UNUSED) { return 0; } =20 static int -virSecurityDomainSetProcessLabelNop(virSecurityManagerPtr mgr ATTRIBUTE_UN= USED, - virDomainDefPtr vm ATTRIBUTE_UNUSED) +virSecurityDomainSetProcessLabelNop(virSecurityManagerPtr mgr G_GNUC_UNUSE= D, + virDomainDefPtr vm G_GNUC_UNUSED) { return 0; } =20 static int -virSecurityDomainSetChildProcessLabelNop(virSecurityManagerPtr mgr ATTRIBU= TE_UNUSED, - virDomainDefPtr vm ATTRIBUTE_UNUS= ED, - virCommandPtr cmd ATTRIBUTE_UNUSE= D) +virSecurityDomainSetChildProcessLabelNop(virSecurityManagerPtr mgr G_GNUC_= UNUSED, + virDomainDefPtr vm G_GNUC_UNUSED, + virCommandPtr cmd G_GNUC_UNUSED) { return 0; } =20 static int -virSecurityDomainVerifyNop(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainDefPtr def ATTRIBUTE_UNUSED) +virSecurityDomainVerifyNop(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr def G_GNUC_UNUSED) { return 0; } =20 static int -virSecurityDomainSetFDLabelNop(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainDefPtr sec ATTRIBUTE_UNUSED, - int fd ATTRIBUTE_UNUSED) +virSecurityDomainSetFDLabelNop(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr sec G_GNUC_UNUSED, + int fd G_GNUC_UNUSED) { return 0; } =20 static char * -virSecurityDomainGetMountOptionsNop(virSecurityManagerPtr mgr ATTRIBUTE_UN= USED, - virDomainDefPtr vm ATTRIBUTE_UNUSED) +virSecurityDomainGetMountOptionsNop(virSecurityManagerPtr mgr G_GNUC_UNUSE= D, + virDomainDefPtr vm G_GNUC_UNUSED) { char *opts; =20 @@ -200,77 +200,77 @@ virSecurityDomainGetMountOptionsNop(virSecurityManage= rPtr mgr ATTRIBUTE_UNUSED, } =20 static const char * -virSecurityGetBaseLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - int virtType ATTRIBUTE_UNUSED) +virSecurityGetBaseLabel(virSecurityManagerPtr mgr G_GNUC_UNUSED, + int virtType G_GNUC_UNUSED) { return NULL; } =20 static int -virSecurityDomainRestoreImageLabelNop(virSecurityManagerPtr mgr ATTRIBUTE_= UNUSED, - virDomainDefPtr def ATTRIBUTE_UNUSED, - virStorageSourcePtr src ATTRIBUTE_UN= USED, - virSecurityDomainImageLabelFlags fla= gs ATTRIBUTE_UNUSED) +virSecurityDomainRestoreImageLabelNop(virSecurityManagerPtr mgr G_GNUC_UNU= SED, + virDomainDefPtr def G_GNUC_UNUSED, + virStorageSourcePtr src G_GNUC_UNUSE= D, + virSecurityDomainImageLabelFlags fla= gs G_GNUC_UNUSED) { return 0; } =20 static int -virSecurityDomainSetImageLabelNop(virSecurityManagerPtr mgr ATTRIBUTE_UNUS= ED, - virDomainDefPtr def ATTRIBUTE_UNUSED, - virStorageSourcePtr src ATTRIBUTE_UNUSED, - virSecurityDomainImageLabelFlags flags A= TTRIBUTE_UNUSED) +virSecurityDomainSetImageLabelNop(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr def G_GNUC_UNUSED, + virStorageSourcePtr src G_GNUC_UNUSED, + virSecurityDomainImageLabelFlags flags G= _GNUC_UNUSED) { return 0; } =20 static int -virSecurityDomainMoveImageMetadataNop(virSecurityManagerPtr mgr ATTRIBUTE_= UNUSED, - pid_t pid ATTRIBUTE_UNUSED, - virStorageSourcePtr src ATTRIBUTE_UN= USED, - virStorageSourcePtr dst ATTRIBUTE_UN= USED) +virSecurityDomainMoveImageMetadataNop(virSecurityManagerPtr mgr G_GNUC_UNU= SED, + pid_t pid G_GNUC_UNUSED, + virStorageSourcePtr src G_GNUC_UNUSE= D, + virStorageSourcePtr dst G_GNUC_UNUSE= D) { return 0; } =20 static int -virSecurityDomainSetMemoryLabelNop(virSecurityManagerPtr mgr ATTRIBUTE_UNU= SED, - virDomainDefPtr def ATTRIBUTE_UNUSED, - virDomainMemoryDefPtr mem ATTRIBUTE_UNU= SED) +virSecurityDomainSetMemoryLabelNop(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr def G_GNUC_UNUSED, + virDomainMemoryDefPtr mem G_GNUC_UNUSED) { return 0; } =20 static int -virSecurityDomainRestoreMemoryLabelNop(virSecurityManagerPtr mgr ATTRIBUTE= _UNUSED, - virDomainDefPtr def ATTRIBUTE_UNUSE= D, - virDomainMemoryDefPtr mem ATTRIBUTE= _UNUSED) +virSecurityDomainRestoreMemoryLabelNop(virSecurityManagerPtr mgr G_GNUC_UN= USED, + virDomainDefPtr def G_GNUC_UNUSED, + virDomainMemoryDefPtr mem G_GNUC_UN= USED) { return 0; } =20 static int -virSecurityDomainInputLabelNop(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainDefPtr def ATTRIBUTE_UNUSED, - virDomainInputDefPtr input ATTRIBUTE_UNUSED) +virSecurityDomainInputLabelNop(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr def G_GNUC_UNUSED, + virDomainInputDefPtr input G_GNUC_UNUSED) { return 0; } =20 static int -virSecurityDomainSetChardevLabelNop(virSecurityManagerPtr mgr ATTRIBUTE_UN= USED, - virDomainDefPtr def ATTRIBUTE_UNUSED, - virDomainChrSourceDefPtr dev_source AT= TRIBUTE_UNUSED, - bool chardevStdioLogd ATTRIBUTE_UNUSED) +virSecurityDomainSetChardevLabelNop(virSecurityManagerPtr mgr G_GNUC_UNUSE= D, + virDomainDefPtr def G_GNUC_UNUSED, + virDomainChrSourceDefPtr dev_source G_= GNUC_UNUSED, + bool chardevStdioLogd G_GNUC_UNUSED) { return 0; } =20 static int -virSecurityDomainRestoreChardevLabelNop(virSecurityManagerPtr mgr ATTRIBUT= E_UNUSED, - virDomainDefPtr def ATTRIBUTE_UNUS= ED, - virDomainChrSourceDefPtr dev_sourc= e ATTRIBUTE_UNUSED, - bool chardevStdioLogd ATTRIBUTE_UN= USED) +virSecurityDomainRestoreChardevLabelNop(virSecurityManagerPtr mgr G_GNUC_U= NUSED, + virDomainDefPtr def G_GNUC_UNUSED, + virDomainChrSourceDefPtr dev_sourc= e G_GNUC_UNUSED, + bool chardevStdioLogd G_GNUC_UNUSE= D) { return 0; } diff --git a/src/security/security_selinux.c b/src/security/security_selinu= x.c index 6e6b758497..7c2f1bb51a 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -250,7 +250,7 @@ static int virSecuritySELinuxRestoreFileLabel(virSecuri= tyManagerPtr mgr, * -1 otherwise. */ static int -virSecuritySELinuxTransactionRun(pid_t pid ATTRIBUTE_UNUSED, +virSecuritySELinuxTransactionRun(pid_t pid G_GNUC_UNUSED, void *opaque) { virSecuritySELinuxContextListPtr list =3D opaque; @@ -702,7 +702,7 @@ virSecuritySELinuxLXCInitialize(virSecurityManagerPtr m= gr) } #else static int -virSecuritySELinuxLXCInitialize(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED) +virSecuritySELinuxLXCInitialize(virSecurityManagerPtr mgr G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("libselinux does not support LXC contexts path"= )); @@ -1070,13 +1070,13 @@ virSecuritySELinuxDriverClose(virSecurityManagerPtr= mgr) =20 =20 static const char * -virSecuritySELinuxGetModel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED) +virSecuritySELinuxGetModel(virSecurityManagerPtr mgr G_GNUC_UNUSED) { return SECURITY_SELINUX_NAME; } =20 static const char * -virSecuritySELinuxGetDOI(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED) +virSecuritySELinuxGetDOI(virSecurityManagerPtr mgr G_GNUC_UNUSED) { /* * Where will the DOI come from? SELinux configuration, or qemu @@ -1149,7 +1149,7 @@ virSecuritySELinuxTransactionStart(virSecurityManager= Ptr mgr) * -1 otherwise. */ static int -virSecuritySELinuxTransactionCommit(virSecurityManagerPtr mgr ATTRIBUTE_UN= USED, +virSecuritySELinuxTransactionCommit(virSecurityManagerPtr mgr G_GNUC_UNUSE= D, pid_t pid, bool lock) { @@ -1199,7 +1199,7 @@ virSecuritySELinuxTransactionCommit(virSecurityManage= rPtr mgr ATTRIBUTE_UNUSED, * Cancels and frees any out standing transaction. */ static void -virSecuritySELinuxTransactionAbort(virSecurityManagerPtr mgr ATTRIBUTE_UNU= SED) +virSecuritySELinuxTransactionAbort(virSecurityManagerPtr mgr G_GNUC_UNUSED) { virSecuritySELinuxContextListPtr list; =20 @@ -1213,8 +1213,8 @@ virSecuritySELinuxTransactionAbort(virSecurityManager= Ptr mgr ATTRIBUTE_UNUSED) } =20 static int -virSecuritySELinuxGetProcessLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUS= ED, - virDomainDefPtr def ATTRIBUTE_UNUSED, +virSecuritySELinuxGetProcessLabel(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr def G_GNUC_UNUSED, pid_t pid, virSecurityLabelPtr sec) { @@ -1462,7 +1462,7 @@ virSecuritySELinuxFSetFilecon(int fd, char *tcon) =20 /* Set fcon to the appropriate label for path and mode, or return -1. */ static int -getContext(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, +getContext(virSecurityManagerPtr mgr G_GNUC_UNUSED, const char *newpath, mode_t mode, security_context_t *fcon) { #if HAVE_SELINUX_LABEL_H @@ -1828,7 +1828,7 @@ static int virSecuritySELinuxRestoreImageLabel(virSecurityManagerPtr mgr, virDomainDefPtr def, virStorageSourcePtr src, - virSecurityDomainImageLabelFlags flags= ATTRIBUTE_UNUSED) + virSecurityDomainImageLabelFlags flags= G_GNUC_UNUSED) { return virSecuritySELinuxRestoreImageLabelInt(mgr, def, src, false); } @@ -1966,7 +1966,7 @@ struct virSecuritySELinuxMoveImageMetadataData { =20 =20 static int -virSecuritySELinuxMoveImageMetadataHelper(pid_t pid ATTRIBUTE_UNUSED, +virSecuritySELinuxMoveImageMetadataHelper(pid_t pid G_GNUC_UNUSED, void *opaque) { struct virSecuritySELinuxMoveImageMetadataData *data =3D opaque; @@ -2029,14 +2029,14 @@ virSecuritySELinuxSetHostdevLabelHelper(const char = *file, void *opaque) } =20 static int -virSecuritySELinuxSetPCILabel(virPCIDevicePtr dev ATTRIBUTE_UNUSED, +virSecuritySELinuxSetPCILabel(virPCIDevicePtr dev G_GNUC_UNUSED, const char *file, void *opaque) { return virSecuritySELinuxSetHostdevLabelHelper(file, opaque); } =20 static int -virSecuritySELinuxSetUSBLabel(virUSBDevicePtr dev ATTRIBUTE_UNUSED, +virSecuritySELinuxSetUSBLabel(virUSBDevicePtr dev G_GNUC_UNUSED, const char *file, void *opaque) { return virSecuritySELinuxSetHostdevLabelHelper(file, opaque); @@ -2067,7 +2067,7 @@ virSecuritySELinuxSetSCSILabel(virSCSIDevicePtr dev, } =20 static int -virSecuritySELinuxSetHostLabel(virSCSIVHostDevicePtr dev ATTRIBUTE_UNUSED, +virSecuritySELinuxSetHostLabel(virSCSIVHostDevicePtr dev G_GNUC_UNUSED, const char *file, void *opaque) { return virSecuritySELinuxSetHostdevLabelHelper(file, opaque); @@ -2272,7 +2272,7 @@ virSecuritySELinuxSetHostdevLabel(virSecurityManagerP= tr mgr, } =20 static int -virSecuritySELinuxRestorePCILabel(virPCIDevicePtr dev ATTRIBUTE_UNUSED, +virSecuritySELinuxRestorePCILabel(virPCIDevicePtr dev G_GNUC_UNUSED, const char *file, void *opaque) { @@ -2282,7 +2282,7 @@ virSecuritySELinuxRestorePCILabel(virPCIDevicePtr dev= ATTRIBUTE_UNUSED, } =20 static int -virSecuritySELinuxRestoreUSBLabel(virUSBDevicePtr dev ATTRIBUTE_UNUSED, +virSecuritySELinuxRestoreUSBLabel(virUSBDevicePtr dev G_GNUC_UNUSED, const char *file, void *opaque) { @@ -2309,7 +2309,7 @@ virSecuritySELinuxRestoreSCSILabel(virSCSIDevicePtr d= ev, } =20 static int -virSecuritySELinuxRestoreHostLabel(virSCSIVHostDevicePtr dev ATTRIBUTE_UNU= SED, +virSecuritySELinuxRestoreHostLabel(virSCSIVHostDevicePtr dev G_GNUC_UNUSED, const char *file, void *opaque) { @@ -2672,7 +2672,7 @@ struct _virSecuritySELinuxChardevCallbackData { =20 static int virSecuritySELinuxRestoreSecurityChardevCallback(virDomainDefPtr def, - virDomainChrDefPtr dev AT= TRIBUTE_UNUSED, + virDomainChrDefPtr dev G_= GNUC_UNUSED, void *opaque) { struct _virSecuritySELinuxChardevCallbackData *data =3D opaque; @@ -2874,7 +2874,7 @@ virSecuritySELinuxRestoreSavedStateLabel(virSecurityM= anagerPtr mgr, =20 =20 static int -virSecuritySELinuxVerify(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, +virSecuritySELinuxVerify(virSecurityManagerPtr mgr G_GNUC_UNUSED, virDomainDefPtr def) { virSecurityLabelDefPtr secdef; @@ -2903,7 +2903,7 @@ virSecuritySELinuxVerify(virSecurityManagerPtr mgr AT= TRIBUTE_UNUSED, } =20 static int -virSecuritySELinuxSetProcessLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUS= ED, +virSecuritySELinuxSetProcessLabel(virSecurityManagerPtr mgr G_GNUC_UNUSED, virDomainDefPtr def) { /* TODO: verify DOI */ @@ -2936,7 +2936,7 @@ virSecuritySELinuxSetProcessLabel(virSecurityManagerP= tr mgr ATTRIBUTE_UNUSED, } =20 static int -virSecuritySELinuxSetChildProcessLabel(virSecurityManagerPtr mgr ATTRIBUTE= _UNUSED, +virSecuritySELinuxSetChildProcessLabel(virSecurityManagerPtr mgr G_GNUC_UN= USED, virDomainDefPtr def, virCommandPtr cmd) { @@ -2964,7 +2964,7 @@ virSecuritySELinuxSetChildProcessLabel(virSecurityMan= agerPtr mgr ATTRIBUTE_UNUSE } =20 static int -virSecuritySELinuxSetDaemonSocketLabel(virSecurityManagerPtr mgr ATTRIBUTE= _UNUSED, +virSecuritySELinuxSetDaemonSocketLabel(virSecurityManagerPtr mgr G_GNUC_UN= USED, virDomainDefPtr def) { /* TODO: verify DOI */ @@ -3014,7 +3014,7 @@ virSecuritySELinuxSetDaemonSocketLabel(virSecurityMan= agerPtr mgr ATTRIBUTE_UNUSE } =20 static int -virSecuritySELinuxSetSocketLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUSE= D, +virSecuritySELinuxSetSocketLabel(virSecurityManagerPtr mgr G_GNUC_UNUSED, virDomainDefPtr vm) { virSecurityLabelDefPtr secdef; @@ -3052,7 +3052,7 @@ virSecuritySELinuxSetSocketLabel(virSecurityManagerPt= r mgr ATTRIBUTE_UNUSED, } =20 static int -virSecuritySELinuxClearSocketLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNU= SED, +virSecuritySELinuxClearSocketLabel(virSecurityManagerPtr mgr G_GNUC_UNUSED, virDomainDefPtr def) { /* TODO: verify DOI */ @@ -3085,7 +3085,7 @@ virSecuritySELinuxClearSocketLabel(virSecurityManager= Ptr mgr ATTRIBUTE_UNUSED, =20 static int virSecuritySELinuxSetSecurityChardevCallback(virDomainDefPtr def, - virDomainChrDefPtr dev ATTRIB= UTE_UNUSED, + virDomainChrDefPtr dev G_GNUC= _UNUSED, void *opaque) { struct _virSecuritySELinuxChardevCallbackData *data =3D opaque; @@ -3235,7 +3235,7 @@ virSecuritySELinuxSetAllLabel(virSecurityManagerPtr m= gr, } =20 static int -virSecuritySELinuxSetImageFDLabel(virSecurityManagerPtr mgr ATTRIBUTE_UNUS= ED, +virSecuritySELinuxSetImageFDLabel(virSecurityManagerPtr mgr G_GNUC_UNUSED, virDomainDefPtr def, int fd) { @@ -3379,7 +3379,7 @@ static int virSecuritySELinuxDomainSetPathLabel(virSecurityManagerPtr mgr, virDomainDefPtr def, const char *path, - bool allowSubtree ATTRIBUTE_UNUSED) + bool allowSubtree G_GNUC_UNUSED) { virSecurityLabelDefPtr seclabel; =20 diff --git a/src/security/security_stack.c b/src/security/security_stack.c index d445c0773e..b5a0c6c4d2 100644 --- a/src/security/security_stack.c +++ b/src/security/security_stack.c @@ -72,13 +72,13 @@ virSecurityStackGetPrimary(virSecurityManagerPtr mgr) } =20 static virSecurityDriverStatus -virSecurityStackProbe(const char *virtDriver ATTRIBUTE_UNUSED) +virSecurityStackProbe(const char *virtDriver G_GNUC_UNUSED) { return SECURITY_DRIVER_ENABLE; } =20 static int -virSecurityStackOpen(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED) +virSecurityStackOpen(virSecurityManagerPtr mgr G_GNUC_UNUSED) { return 0; } @@ -526,8 +526,8 @@ virSecurityStackSetTapFDLabel(virSecurityManagerPtr mgr, } =20 static char * -virSecurityStackGetMountOptions(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, - virDomainDefPtr vm ATTRIBUTE_UNUSED) +virSecurityStackGetMountOptions(virSecurityManagerPtr mgr G_GNUC_UNUSED, + virDomainDefPtr vm G_GNUC_UNUSED) { return NULL; } diff --git a/src/security/security_util.c b/src/security/security_util.c index 865b3ec905..4fd8289413 100644 --- a/src/security/security_util.c +++ b/src/security/security_util.c @@ -59,7 +59,7 @@ VIR_LOG_INIT("security.security_util"); #endif =20 static char * -virSecurityGetAttrName(const char *name ATTRIBUTE_UNUSED) +virSecurityGetAttrName(const char *name G_GNUC_UNUSED) { char *ret =3D NULL; #ifdef XATTR_NAMESPACE @@ -74,7 +74,7 @@ virSecurityGetAttrName(const char *name ATTRIBUTE_UNUSED) =20 =20 static char * -virSecurityGetRefCountAttrName(const char *name ATTRIBUTE_UNUSED) +virSecurityGetRefCountAttrName(const char *name G_GNUC_UNUSED) { char *ret =3D NULL; #ifdef XATTR_NAMESPACE @@ -98,7 +98,7 @@ virSecurityGetTimestampAttrName(const char *name) } #else /* !XATTR_NAMESPACE */ static char * -virSecurityGetTimestampAttrName(const char *name ATTRIBUTE_UNUSED) +virSecurityGetTimestampAttrName(const char *name G_GNUC_UNUSED) { errno =3D ENOSYS; virReportSystemError(errno, "%s", diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 509187ac36..6a1aa96078 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -896,7 +896,7 @@ vah_add_file_chardev(virBufferPtr buf, } =20 static int -file_iterate_hostdev_cb(virUSBDevicePtr dev ATTRIBUTE_UNUSED, +file_iterate_hostdev_cb(virUSBDevicePtr dev G_GNUC_UNUSED, const char *file, void *opaque) { virBufferPtr buf =3D opaque; @@ -904,7 +904,7 @@ file_iterate_hostdev_cb(virUSBDevicePtr dev ATTRIBUTE_U= NUSED, } =20 static int -file_iterate_pci_cb(virPCIDevicePtr dev ATTRIBUTE_UNUSED, +file_iterate_pci_cb(virPCIDevicePtr dev G_GNUC_UNUSED, const char *file, void *opaque) { virBufferPtr buf =3D opaque; --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 10:00:01 2024 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=1571059050; cv=none; d=zoho.com; s=zohoarc; b=NXkd7k+vN2wZ8XQcxi0jSVnTmYx80VZw0A+4fOFBzMpVHpY8TxTrly5PxiTvEnd7HNkBoYQt37nD/yWmxh51z/pDhYYPy5zQwQPCZTrmUy+9x4NfK8w/ncWgW4t1gq8ULmFwO1DNVXUPsZVLh59ld+HUazRJezfCl62Om86aVpo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571059050; 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=b4zafH6jUwhd/sCkf+jU2ErA+HFmWFzRar+zU1t/Hy8=; b=ACers62DjIaHvbyUkcZDKG9J1tvOg9VU0S2CbVyhe1K8ilBqj8+dLvsqbEhPM0q/B4VQx+tlC/7AtdXKkvyS/pBH9t3/bkTPQ9utVjZxc7IDFzUQ0YM4QRsfQctiltxEYLopvUUfqU+SEFYHjqch5rB6ugsHXY81Yk+KoDueEfo= 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 1571059050876967.2356881897348; Mon, 14 Oct 2019 06:17:30 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 50AC610DCC9A; Mon, 14 Oct 2019 13:17:29 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2AC485DE5C; Mon, 14 Oct 2019 13:17:29 +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 D046362D0E; Mon, 14 Oct 2019 13:17:28 +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 x9EDGdRB017544 for ; Mon, 14 Oct 2019 09:16:39 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6662B60126; Mon, 14 Oct 2019 13:16:39 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id E447A600CD for ; Mon, 14 Oct 2019 13:16:38 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Mon, 14 Oct 2019 15:15:43 +0200 Message-Id: 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 25/35] storage: 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.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.64]); Mon, 14 Oct 2019 13:17:29 +0000 (UTC) Use G_GNUC_UNUSED from GLib instead of ATTRIBUTE_UNUSED. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/storage/storage_backend.c | 2 +- src/storage/storage_backend_disk.c | 6 ++--- src/storage/storage_backend_fs.c | 4 +-- src/storage/storage_backend_logical.c | 4 +-- src/storage/storage_backend_mpath.c | 2 +- src/storage/storage_backend_rbd.c | 22 ++++++++-------- src/storage/storage_backend_zfs.c | 4 +-- src/storage/storage_driver.c | 22 ++++++++-------- src/storage/storage_util.c | 36 +++++++++++++-------------- 9 files changed, 51 insertions(+), 51 deletions(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index ed5bdd5bad..6ab5844235 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -106,7 +106,7 @@ virStorageDriverLoadBackendModule(const char *name, return -1 =20 int -virStorageBackendDriversRegister(bool allbackends ATTRIBUTE_UNUSED) +virStorageBackendDriversRegister(bool allbackends G_GNUC_UNUSED) { #if WITH_STORAGE_DIR || WITH_STORAGE_FS VIR_STORAGE_BACKEND_REGISTER(virStorageBackendFsRegister, "fs"); diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backe= nd_disk.c index f58b7b294c..5bf704bcc8 100644 --- a/src/storage/storage_backend_disk.c +++ b/src/storage/storage_backend_disk.c @@ -41,7 +41,7 @@ VIR_LOG_INIT("storage.storage_backend_disk"); =20 static bool virStorageVolPartFindExtended(virStorageVolDefPtr def, - const void *opaque ATTRIBUTE_UNUSED) + const void *opaque G_GNUC_UNUSED) { if (def->source.partType =3D=3D VIR_STORAGE_VOL_DISK_TYPE_EXTENDED) return true; @@ -286,7 +286,7 @@ struct virStorageBackendDiskPoolVolData { }; =20 static int -virStorageBackendDiskMakeVol(size_t ntok ATTRIBUTE_UNUSED, +virStorageBackendDiskMakeVol(size_t ntok G_GNUC_UNUSED, char **const groups, void *opaque) { @@ -391,7 +391,7 @@ virStorageBackendDiskReadPartitions(virStoragePoolObjPt= r pool, } =20 static int -virStorageBackendDiskMakePoolGeometry(size_t ntok ATTRIBUTE_UNUSED, +virStorageBackendDiskMakePoolGeometry(size_t ntok G_GNUC_UNUSED, char **const groups, void *data) { diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend= _fs.c index c903677950..ed677058ed 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -438,8 +438,8 @@ virStorageBackendExecuteMKFS(const char *device, } #else /* #ifdef MKFS */ static int -virStorageBackendExecuteMKFS(const char *device ATTRIBUTE_UNUSED, - const char *format ATTRIBUTE_UNUSED) +virStorageBackendExecuteMKFS(const char *device G_GNUC_UNUSED, + const char *format G_GNUC_UNUSED) { virReportError(VIR_ERR_INTERNAL_ERROR, _("mkfs is not supported on this platform: " diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_ba= ckend_logical.c index 603a3f9a42..6e468b3579 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -543,7 +543,7 @@ virStorageBackendLogicalGetPoolSources(virStoragePoolSo= urceListPtr sourceList) =20 =20 static char * -virStorageBackendLogicalFindPoolSources(const char *srcSpec ATTRIBUTE_UNUS= ED, +virStorageBackendLogicalFindPoolSources(const char *srcSpec G_GNUC_UNUSED, unsigned int flags) { virStoragePoolSourceList sourceList; @@ -837,7 +837,7 @@ virStorageBackendLogicalDeletePool(virStoragePoolObjPtr= pool, =20 =20 static int -virStorageBackendLogicalDeleteVol(virStoragePoolObjPtr pool ATTRIBUTE_UNUS= ED, +virStorageBackendLogicalDeleteVol(virStoragePoolObjPtr pool G_GNUC_UNUSED, virStorageVolDefPtr vol, unsigned int flags) { diff --git a/src/storage/storage_backend_mpath.c b/src/storage/storage_back= end_mpath.c index cb1b23288a..4d41ea1107 100644 --- a/src/storage/storage_backend_mpath.c +++ b/src/storage/storage_backend_mpath.c @@ -233,7 +233,7 @@ virStorageBackendGetMaps(virStoragePoolObjPtr pool) } =20 static int -virStorageBackendMpathCheckPool(virStoragePoolObjPtr pool ATTRIBUTE_UNUSED, +virStorageBackendMpathCheckPool(virStoragePoolObjPtr pool G_GNUC_UNUSED, bool *isActive) { *isActive =3D virFileExists("/dev/mapper") || diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backen= d_rbd.c index b10ca1503d..4f4ade9d15 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -450,7 +450,7 @@ volStorageBackendRBDUseFastDiff(uint64_t features, uint= 64_t flags) } =20 static int -virStorageBackendRBDRefreshVolInfoCb(uint64_t offset ATTRIBUTE_UNUSED, +virStorageBackendRBDRefreshVolInfoCb(uint64_t offset G_GNUC_UNUSED, size_t len, int exists, void *arg) @@ -490,8 +490,8 @@ virStorageBackendRBDSetAllocation(virStorageVolDefPtr v= ol, =20 #else static int -volStorageBackendRBDGetFlags(rbd_image_t image ATTRIBUTE_UNUSED, - const char *volname ATTRIBUTE_UNUSED, +volStorageBackendRBDGetFlags(rbd_image_t image G_GNUC_UNUSED, + const char *volname G_GNUC_UNUSED, uint64_t *flags) { *flags =3D 0; @@ -499,16 +499,16 @@ volStorageBackendRBDGetFlags(rbd_image_t image ATTRIB= UTE_UNUSED, } =20 static int -volStorageBackendRBDUseFastDiff(uint64_t features ATTRIBUTE_UNUSED, - uint64_t feature_flags ATTRIBUTE_UNUSED) +volStorageBackendRBDUseFastDiff(uint64_t features G_GNUC_UNUSED, + uint64_t feature_flags G_GNUC_UNUSED) { return false; } =20 static int -virStorageBackendRBDSetAllocation(virStorageVolDefPtr vol ATTRIBUTE_UNUSED, - rbd_image_t *image ATTRIBUTE_UNUSED, - rbd_image_info_t *info ATTRIBUTE_UNUSED) +virStorageBackendRBDSetAllocation(virStorageVolDefPtr vol G_GNUC_UNUSED, + rbd_image_t *image G_GNUC_UNUSED, + rbd_image_info_t *info G_GNUC_UNUSED) { return false; } @@ -1013,9 +1013,9 @@ virStorageBackendRBDImageInfo(rbd_image_t image, =20 /* Callback function for rbd_diff_iterate() */ static int -virStorageBackendRBDIterateCb(uint64_t offset ATTRIBUTE_UNUSED, - size_t length ATTRIBUTE_UNUSED, - int exists ATTRIBUTE_UNUSED, +virStorageBackendRBDIterateCb(uint64_t offset G_GNUC_UNUSED, + size_t length G_GNUC_UNUSED, + int exists G_GNUC_UNUSED, void *arg) { /* diff --git a/src/storage/storage_backend_zfs.c b/src/storage/storage_backen= d_zfs.c index d172a5a165..354d65d8c3 100644 --- a/src/storage/storage_backend_zfs.c +++ b/src/storage/storage_backend_zfs.c @@ -81,7 +81,7 @@ virStorageBackendZFSVolModeNeeded(void) } =20 static int -virStorageBackendZFSCheckPool(virStoragePoolObjPtr pool ATTRIBUTE_UNUSED, +virStorageBackendZFSCheckPool(virStoragePoolObjPtr pool G_GNUC_UNUSED, bool *isActive) { virStoragePoolDefPtr def =3D virStoragePoolObjGetDef(pool); @@ -218,7 +218,7 @@ virStorageBackendZFSFindVols(virStoragePoolObjPtr pool, } =20 static int -virStorageBackendZFSRefreshPool(virStoragePoolObjPtr pool ATTRIBUTE_UNUSED) +virStorageBackendZFSRefreshPool(virStoragePoolObjPtr pool G_GNUC_UNUSED) { virStoragePoolDefPtr def =3D virStoragePoolObjGetDef(pool); char *zpool_props =3D NULL; diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index c536535c6c..6516b0943d 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -132,7 +132,7 @@ virStoragePoolUpdateInactive(virStoragePoolObjPtr obj) =20 static void storagePoolUpdateStateCallback(virStoragePoolObjPtr obj, - const void *opaque ATTRIBUTE_UNUSED) + const void *opaque G_GNUC_UNUSED) { virStoragePoolDefPtr def =3D virStoragePoolObjGetDef(obj); bool active =3D false; @@ -191,7 +191,7 @@ storagePoolUpdateAllState(void) =20 static void storageDriverAutostartCallback(virStoragePoolObjPtr obj, - const void *opaque ATTRIBUTE_UNUSED) + const void *opaque G_GNUC_UNUSED) { virStoragePoolDefPtr def =3D virStoragePoolObjGetDef(obj); virStorageBackendPtr backend; @@ -253,8 +253,8 @@ storageDriverAutostart(void) */ static int storageStateInitialize(bool privileged, - virStateInhibitCallback callback ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) + virStateInhibitCallback callback G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED) { VIR_AUTOFREE(char *) configdir =3D NULL; VIR_AUTOFREE(char *) rundir =3D NULL; @@ -404,8 +404,8 @@ storageStateCleanup(void) =20 static virDrvOpenStatus storageConnectOpen(virConnectPtr conn, - virConnectAuthPtr auth ATTRIBUTE_UNUSED, - virConfPtr conf ATTRIBUTE_UNUSED, + virConnectAuthPtr auth G_GNUC_UNUSED, + virConfPtr conf G_GNUC_UNUSED, unsigned int flags) { virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); @@ -427,27 +427,27 @@ storageConnectOpen(virConnectPtr conn, return VIR_DRV_OPEN_SUCCESS; } =20 -static int storageConnectClose(virConnectPtr conn ATTRIBUTE_UNUSED) +static int storageConnectClose(virConnectPtr conn G_GNUC_UNUSED) { return 0; } =20 =20 -static int storageConnectIsSecure(virConnectPtr conn ATTRIBUTE_UNUSED) +static int storageConnectIsSecure(virConnectPtr conn G_GNUC_UNUSED) { /* Trivially secure, since always inside the daemon */ return 1; } =20 =20 -static int storageConnectIsEncrypted(virConnectPtr conn ATTRIBUTE_UNUSED) +static int storageConnectIsEncrypted(virConnectPtr conn G_GNUC_UNUSED) { /* Not encrypted, but remote driver takes care of that */ return 0; } =20 =20 -static int storageConnectIsAlive(virConnectPtr conn ATTRIBUTE_UNUSED) +static int storageConnectIsAlive(virConnectPtr conn G_GNUC_UNUSED) { return 1; } @@ -2377,7 +2377,7 @@ virStorageVolPoolRefreshThread(void *opaque) * @opaque Buffer to hold the pool name to be refreshed */ static void -virStorageVolFDStreamCloseCb(virStreamPtr st ATTRIBUTE_UNUSED, +virStorageVolFDStreamCloseCb(virStreamPtr st G_GNUC_UNUSED, void *opaque) { virThread thread; diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c index be084119f4..83e93253e4 100644 --- a/src/storage/storage_util.c +++ b/src/storage/storage_util.c @@ -113,8 +113,8 @@ reflinkCloneFile(int dest_fd, int src_fd) } #else static inline int -reflinkCloneFile(int dest_fd ATTRIBUTE_UNUSED, - int src_fd ATTRIBUTE_UNUSED) +reflinkCloneFile(int dest_fd G_GNUC_UNUSED, + int src_fd G_GNUC_UNUSED) { errno =3D ENOTSUP; return -1; @@ -236,7 +236,7 @@ virStorageBackendCopyToFD(virStorageVolDefPtr vol, } =20 static int -storageBackendCreateBlockFrom(virStoragePoolObjPtr pool ATTRIBUTE_UNUSED, +storageBackendCreateBlockFrom(virStoragePoolObjPtr pool G_GNUC_UNUSED, virStorageVolDefPtr vol, virStorageVolDefPtr inputvol, unsigned int flags) @@ -591,7 +591,7 @@ virStorageBackendCreateExecCommand(virStoragePoolObjPtr= pool, /* Create ploop directory with ploop image and DiskDescriptor.xml * if function fails to create image file the directory will be deleted.*/ static int -storageBackendCreatePloop(virStoragePoolObjPtr pool ATTRIBUTE_UNUSED, +storageBackendCreatePloop(virStoragePoolObjPtr pool G_GNUC_UNUSED, virStorageVolDefPtr vol, virStorageVolDefPtr inputvol, unsigned int flags) @@ -2136,7 +2136,7 @@ virStorageBackendVolBuildFromLocal(virStoragePoolObjP= tr pool, * Remove a volume - no support for BLOCK and NETWORK yet */ int -virStorageBackendVolDeleteLocal(virStoragePoolObjPtr pool ATTRIBUTE_UNUSED, +virStorageBackendVolDeleteLocal(virStoragePoolObjPtr pool G_GNUC_UNUSED, virStorageVolDefPtr vol, unsigned int flags) { @@ -2237,7 +2237,7 @@ storageBackendLoadDefaultSecrets(virStorageVolDefPtr = vol) * Update info about a volume's capacity/allocation */ int -virStorageBackendVolRefreshLocal(virStoragePoolObjPtr pool ATTRIBUTE_UNUSE= D, +virStorageBackendVolRefreshLocal(virStoragePoolObjPtr pool G_GNUC_UNUSED, virStorageVolDefPtr vol) { int ret; @@ -2407,7 +2407,7 @@ storageBackendPloopHasSnapshots(char *path) =20 =20 int -virStorageBackendVolUploadLocal(virStoragePoolObjPtr pool ATTRIBUTE_UNUSED, +virStorageBackendVolUploadLocal(virStoragePoolObjPtr pool G_GNUC_UNUSED, virStorageVolDefPtr vol, virStreamPtr stream, unsigned long long offset, @@ -2448,7 +2448,7 @@ virStorageBackendVolUploadLocal(virStoragePoolObjPtr = pool ATTRIBUTE_UNUSED, } =20 int -virStorageBackendVolDownloadLocal(virStoragePoolObjPtr pool ATTRIBUTE_UNUS= ED, +virStorageBackendVolDownloadLocal(virStoragePoolObjPtr pool G_GNUC_UNUSED, virStorageVolDefPtr vol, virStreamPtr stream, unsigned long long offset, @@ -2716,7 +2716,7 @@ storageBackendVolWipePloop(virStorageVolDefPtr vol, =20 =20 int -virStorageBackendVolWipeLocal(virStoragePoolObjPtr pool ATTRIBUTE_UNUSED, +virStorageBackendVolWipeLocal(virStoragePoolObjPtr pool G_GNUC_UNUSED, virStorageVolDefPtr vol, unsigned int algorithm, unsigned int flags) @@ -3145,9 +3145,9 @@ virStorageBackendBLKIDFindEmpty(const char *device, #else /* #if WITH_BLKID */ =20 static int -virStorageBackendBLKIDFindEmpty(const char *device ATTRIBUTE_UNUSED, - const char *format ATTRIBUTE_UNUSED, - bool writelabel ATTRIBUTE_UNUSED) +virStorageBackendBLKIDFindEmpty(const char *device G_GNUC_UNUSED, + const char *format G_GNUC_UNUSED, + bool writelabel G_GNUC_UNUSED) { return -2; } @@ -3303,9 +3303,9 @@ virStorageBackendPARTEDValidLabel(const char *device, #else =20 static int -virStorageBackendPARTEDValidLabel(const char *device ATTRIBUTE_UNUSED, - const char *format ATTRIBUTE_UNUSED, - bool writelabel ATTRIBUTE_UNUSED) +virStorageBackendPARTEDValidLabel(const char *device G_GNUC_UNUSED, + const char *format G_GNUC_UNUSED, + bool writelabel G_GNUC_UNUSED) { return -2; } @@ -3658,7 +3658,7 @@ virStorageBackendSCSISerial(const char *dev, */ static int virStorageBackendSCSINewLun(virStoragePoolObjPtr pool, - uint32_t host ATTRIBUTE_UNUSED, + uint32_t host G_GNUC_UNUSED, uint32_t bus, uint32_t target, uint32_t lun, @@ -3750,7 +3750,7 @@ virStorageBackendSCSINewLun(virStoragePoolObjPtr pool, =20 static int getNewStyleBlockDevice(const char *lun_path, - const char *block_name ATTRIBUTE_UNUSED, + const char *block_name G_GNUC_UNUSED, char **block_device) { DIR *block_dir =3D NULL; @@ -3788,7 +3788,7 @@ getNewStyleBlockDevice(const char *lun_path, =20 =20 static int -getOldStyleBlockDevice(const char *lun_path ATTRIBUTE_UNUSED, +getOldStyleBlockDevice(const char *lun_path G_GNUC_UNUSED, const char *block_name, char **block_device) { --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 10:00:01 2024 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=1571059033; cv=none; d=zoho.com; s=zohoarc; b=hxeydKg3KfC411wnrm1siE/W6gzUAHIdqz0aNDBZluFpqYo9caIQtZdOJz8Ja/SVTPUqtTme8U0WHamfNxXkSaK928c6z1vzc7K7t0ZtHu3Ng8ipctOFjBf/ij3th4buhG1KuBcHKf6vPDwwM3uMORxNc+br/hAhdp4t4JN3RP4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571059033; 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=8IoRw55RfNpWbbC248onZTlhJ+YpOITSvc0XodviReA=; b=beaiJDzS7M5Jv4zDay4B/2eUZFHagQ+EHNgErC0bEVW+KzEgYEBDtlVmGEUa0iUFHyA2aHynjvovBVxK2xdNJqwVcSHuemxBD5EPdfxf+Kao753qva2hYQtq0QLSljbixfIyn/3prBopcSU/gq0iiAcrlc7Wpsz2NciuPcPD9zc= 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 1571059033519497.03762204703503; Mon, 14 Oct 2019 06:17:13 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id D968AC056808; Mon, 14 Oct 2019 13:17:11 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AE2901001B07; Mon, 14 Oct 2019 13:17:11 +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 700644EE95; Mon, 14 Oct 2019 13:17:11 +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 x9EDGeHG017551 for ; Mon, 14 Oct 2019 09:16:40 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3652160126; Mon, 14 Oct 2019 13:16:40 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id B3B6D600CD for ; Mon, 14 Oct 2019 13:16:39 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Mon, 14 Oct 2019 15:15:44 +0200 Message-Id: <4fc420e1e47696c9daf4f4e6911d050478a9215d.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 26/35] test: 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.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Mon, 14 Oct 2019 13:17:12 +0000 (UTC) Use G_GNUC_UNUSED from GLib instead of ATTRIBUTE_UNUSED. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/test/test_driver.c | 80 +++++++++++++++++++++--------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 19b8158ed6..d2a4e100bb 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -1441,7 +1441,7 @@ testDriverCloseInternal(testDriverPtr driver) static virDrvOpenStatus testConnectOpen(virConnectPtr conn, virConnectAuthPtr auth, - virConfPtr conf ATTRIBUTE_UNUSED, + virConfPtr conf G_GNUC_UNUSED, unsigned int flags) { int ret; @@ -1484,42 +1484,42 @@ testConnectClose(virConnectPtr conn) } =20 =20 -static int testConnectGetVersion(virConnectPtr conn ATTRIBUTE_UNUSED, +static int testConnectGetVersion(virConnectPtr conn G_GNUC_UNUSED, unsigned long *hvVer) { *hvVer =3D 2; return 0; } =20 -static char *testConnectGetHostname(virConnectPtr conn ATTRIBUTE_UNUSED) +static char *testConnectGetHostname(virConnectPtr conn G_GNUC_UNUSED) { return virGetHostname(); } =20 =20 -static int testConnectIsSecure(virConnectPtr conn ATTRIBUTE_UNUSED) +static int testConnectIsSecure(virConnectPtr conn G_GNUC_UNUSED) { return 1; } =20 -static int testConnectIsEncrypted(virConnectPtr conn ATTRIBUTE_UNUSED) +static int testConnectIsEncrypted(virConnectPtr conn G_GNUC_UNUSED) { return 0; } =20 -static int testConnectIsAlive(virConnectPtr conn ATTRIBUTE_UNUSED) +static int testConnectIsAlive(virConnectPtr conn G_GNUC_UNUSED) { return 1; } =20 -static int testConnectGetMaxVcpus(virConnectPtr conn ATTRIBUTE_UNUSED, - const char *type ATTRIBUTE_UNUSED) +static int testConnectGetMaxVcpus(virConnectPtr conn G_GNUC_UNUSED, + const char *type G_GNUC_UNUSED) { return 32; } =20 static char * -testConnectBaselineCPU(virConnectPtr conn ATTRIBUTE_UNUSED, +testConnectBaselineCPU(virConnectPtr conn G_GNUC_UNUSED, const char **xmlCPUs, unsigned int ncpus, unsigned int flags) @@ -1570,7 +1570,7 @@ static char *testConnectGetCapabilities(virConnectPtr= conn) } =20 static char * -testConnectGetSysinfo(virConnectPtr conn ATTRIBUTE_UNUSED, +testConnectGetSysinfo(virConnectPtr conn G_GNUC_UNUSED, unsigned int flags) { char *ret; @@ -1590,14 +1590,14 @@ testConnectGetSysinfo(virConnectPtr conn ATTRIBUTE_= UNUSED, } =20 static const char * -testConnectGetType(virConnectPtr conn ATTRIBUTE_UNUSED) +testConnectGetType(virConnectPtr conn G_GNUC_UNUSED) { return "TEST"; } =20 =20 static int -testConnectSupportsFeature(virConnectPtr conn ATTRIBUTE_UNUSED, +testConnectSupportsFeature(virConnectPtr conn G_GNUC_UNUSED, int feature) { switch ((virDrvFeature) feature) { @@ -1662,7 +1662,7 @@ static int testDomainIsPersistent(virDomainPtr dom) return ret; } =20 -static int testDomainIsUpdated(virDomainPtr dom ATTRIBUTE_UNUSED) +static int testDomainIsUpdated(virDomainPtr dom G_GNUC_UNUSED) { return 0; } @@ -1723,8 +1723,8 @@ testDomainCreateXML(virConnectPtr conn, const char *x= ml, static virDomainPtr testDomainCreateXMLWithFiles(virConnectPtr conn, const char *xml, - unsigned int nfiles ATTRIBUTE_UNUSED, - int *files ATTRIBUTE_UNUSED, + unsigned int nfiles G_GNUC_UNUSED, + int *files G_GNUC_UNUSED, unsigned int flags) { return testDomainCreateXML(conn, xml, flags); @@ -2557,7 +2557,7 @@ testDomainCoreDump(virDomainPtr domain, =20 =20 static char * -testDomainGetOSType(virDomainPtr dom ATTRIBUTE_UNUSED) +testDomainGetOSType(virDomainPtr dom G_GNUC_UNUSED) { char *ret; =20 @@ -2567,8 +2567,8 @@ testDomainGetOSType(virDomainPtr dom ATTRIBUTE_UNUSED) =20 =20 static int -testDomainGetLaunchSecurityInfo(virDomainPtr domain ATTRIBUTE_UNUSED, - virTypedParameterPtr *params ATTRIBUTE_UNU= SED, +testDomainGetLaunchSecurityInfo(virDomainPtr domain G_GNUC_UNUSED, + virTypedParameterPtr *params G_GNUC_UNUSED, int *nparams, unsigned int flags) { @@ -2898,8 +2898,8 @@ testDomainSetVcpusFlags(virDomainPtr domain, unsigned= int nrCpus, =20 static int testDomainSetUserPassword(virDomainPtr dom, - const char *user ATTRIBUTE_UNUSED, - const char *password ATTRIBUTE_UNUSED, + const char *user G_GNUC_UNUSED, + const char *password G_GNUC_UNUSED, unsigned int flags) { int ret =3D -1; @@ -4282,8 +4282,8 @@ static int testNodeGetCellsFreeMemory(virConnectPtr c= onn, #define TEST_NB_CPU_STATS 4 =20 static int -testNodeGetCPUStats(virConnectPtr conn ATTRIBUTE_UNUSED, - int cpuNum ATTRIBUTE_UNUSED, +testNodeGetCPUStats(virConnectPtr conn G_GNUC_UNUSED, + int cpuNum G_GNUC_UNUSED, virNodeCPUStatsPtr params, int *nparams, unsigned int flags) @@ -4343,10 +4343,10 @@ testNodeGetFreeMemory(virConnectPtr conn) } =20 static int -testNodeGetFreePages(virConnectPtr conn ATTRIBUTE_UNUSED, +testNodeGetFreePages(virConnectPtr conn G_GNUC_UNUSED, unsigned int npages, - unsigned int *pages ATTRIBUTE_UNUSED, - int startCell ATTRIBUTE_UNUSED, + unsigned int *pages G_GNUC_UNUSED, + int startCell G_GNUC_UNUSED, unsigned int cellCount, unsigned long long *counts, unsigned int flags) @@ -4410,8 +4410,8 @@ static int testDomainCreate(virDomainPtr domain) =20 =20 static int testDomainCreateWithFiles(virDomainPtr domain, - unsigned int nfiles ATTRIBUTE_UNUSED, - int *files ATTRIBUTE_UNUSED, + unsigned int nfiles G_GNUC_UNUSED, + int *files G_GNUC_UNUSED, unsigned int flags) { return testDomainCreateWithFlags(domain, flags); @@ -4607,7 +4607,7 @@ testDomainFSThaw(virDomainPtr dom, static int testDomainFSTrim(virDomainPtr dom, const char *mountPoint, - unsigned long long minimum ATTRIBUTE_UNUSED, + unsigned long long minimum G_GNUC_UNUSED, unsigned int flags) { virDomainObjPtr vm; @@ -4881,7 +4881,7 @@ testDomainGetPerfEvents(virDomainPtr dom, } =20 =20 -static char *testDomainGetSchedulerType(virDomainPtr domain ATTRIBUTE_UNUS= ED, +static char *testDomainGetSchedulerType(virDomainPtr domain G_GNUC_UNUSED, int *nparams) { char *type =3D NULL; @@ -6340,7 +6340,7 @@ testStoragePoolCreate(virStoragePoolPtr pool, =20 =20 static char * -testConnectFindStoragePoolSources(virConnectPtr conn ATTRIBUTE_UNUSED, +testConnectFindStoragePoolSources(virConnectPtr conn G_GNUC_UNUSED, const char *type, const char *srcSpec, unsigned int flags) @@ -6575,8 +6575,8 @@ testStoragePoolBuild(virStoragePoolPtr pool, =20 static int testDestroyVport(testDriverPtr privconn, - const char *wwnn ATTRIBUTE_UNUSED, - const char *wwpn ATTRIBUTE_UNUSED) + const char *wwnn G_GNUC_UNUSED, + const char *wwpn G_GNUC_UNUSED) { virNodeDeviceObjPtr obj =3D NULL; virObjectEventPtr event =3D NULL; @@ -7790,7 +7790,7 @@ static int testConnectListAllDomains(virConnectPtr co= nn, } =20 static int -testNodeGetCPUMap(virConnectPtr conn ATTRIBUTE_UNUSED, +testNodeGetCPUMap(virConnectPtr conn G_GNUC_UNUSED, unsigned char **cpumap, unsigned int *online, unsigned int flags) @@ -7810,9 +7810,9 @@ testNodeGetCPUMap(virConnectPtr conn ATTRIBUTE_UNUSED, } =20 static char * -testDomainScreenshot(virDomainPtr dom ATTRIBUTE_UNUSED, +testDomainScreenshot(virDomainPtr dom G_GNUC_UNUSED, virStreamPtr st, - unsigned int screen ATTRIBUTE_UNUSED, + unsigned int screen G_GNUC_UNUSED, unsigned int flags) { char *ret =3D NULL; @@ -7855,7 +7855,7 @@ testDomainInjectNMI(virDomainPtr domain, static int testDomainSendKey(virDomainPtr domain, unsigned int codeset, - unsigned int holdtime ATTRIBUTE_UNUSED, + unsigned int holdtime G_GNUC_UNUSED, unsigned int *keycodes, int nkeycodes, unsigned int flags) @@ -7891,7 +7891,7 @@ testDomainSendKey(virDomainPtr domain, =20 =20 static int -testConnectGetCPUModelNames(virConnectPtr conn ATTRIBUTE_UNUSED, +testConnectGetCPUModelNames(virConnectPtr conn G_GNUC_UNUSED, const char *archName, char ***models, unsigned int flags) @@ -8672,7 +8672,7 @@ struct _testMomentRemoveData { =20 static int testDomainSnapshotDiscardAll(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *data) { virDomainMomentObjPtr snap =3D payload; @@ -8692,7 +8692,7 @@ struct _testMomentReparentData { =20 static int testDomainMomentReparentChildren(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *data) { virDomainMomentObjPtr moment =3D payload; @@ -8989,7 +8989,7 @@ testDomainRevertToSnapshot(virDomainSnapshotPtr snaps= hot, =20 static int testDomainCheckpointDiscardAll(void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, void *data) { virDomainMomentObjPtr chk =3D payload; --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 10:00:01 2024 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=1571059213; cv=none; d=zoho.com; s=zohoarc; b=MWKkldTZ+TplQKfTai2BLbqla+nxB75RiR91mmvrQK++7M24ULEAeCmmbeCyGbsE+2dSONaL1WEIcWpHg8J1peFbk+LF6dx0U2nSvhggd+M3jJIOXVY018i79RvgruVCj4ZzA+IsP5CYrqA8B1t/Dw3mpSmKDnfJjMR0vTU9yA0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571059213; 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=yEfizd+K7GKPRFQ6+SAjj9d63l8STJAxz4aZv1knba4=; b=VurtvcwfqVbsPSKa0+2CXmrAJ9/bNbSozcBYyPy4BVZ02hTAocbdSbvPJBHGcNfD+3i6e3kVWCsSrTID9W0X9ZYYuEGmnmt2jVH+n8F7Lymi4XKBee9uTE6nStoJ/HRLcIY3GXEkw8qdlrMcZLv5usLAAC3uocCpPvOPYSq+qdE= 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 1571059213937506.8055640393899; Mon, 14 Oct 2019 06:20:13 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0958B4FCC7; Mon, 14 Oct 2019 13:20:12 +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 CF7C95D9C9; Mon, 14 Oct 2019 13:20:11 +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 7F9AA180BA9F; Mon, 14 Oct 2019 13:20:11 +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 x9EDGfrO017561 for ; Mon, 14 Oct 2019 09:16:41 -0400 Received: by smtp.corp.redhat.com (Postfix) id 35E5160127; Mon, 14 Oct 2019 13:16:41 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8854F600CD for ; Mon, 14 Oct 2019 13:16:40 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Mon, 14 Oct 2019 15:15:45 +0200 Message-Id: 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 27/35] tests: 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.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Mon, 14 Oct 2019 13:20:12 +0000 (UTC) Use G_GNUC_UNUSED from GLib instead of ATTRIBUTE_UNUSED. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- tests/bhyvexml2argvmock.c | 36 ++++++++++---------- tests/commandtest.c | 58 ++++++++++++++++---------------- tests/esxutilstest.c | 8 ++--- tests/eventtest.c | 2 +- tests/fchosttest.c | 12 +++---- tests/networkxml2firewalltest.c | 8 ++--- tests/nsslinktest.c | 4 +-- tests/nwfilterebiptablestest.c | 14 ++++---- tests/objecteventtest.c | 30 ++++++++--------- tests/openvzutilstest.c | 8 ++--- tests/qemuagenttest.c | 6 ++-- tests/qemucapsprobe.c | 2 +- tests/qemucpumock.c | 4 +-- tests/qemufirmwaretest.c | 2 +- tests/qemumonitortestutils.c | 22 ++++++------ tests/qemusecuritymock.c | 18 +++++----- tests/qemuvhostusertest.c | 2 +- tests/qemuxml2argvmock.c | 46 ++++++++++++------------- tests/qemuxml2argvtest.c | 10 +++--- tests/scsihosttest.c | 4 +-- tests/securityselinuxtest.c | 2 +- tests/shunloadhelper.c | 4 +-- tests/shunloadtest.c | 2 +- tests/testutils.c | 24 ++++++------- tests/testutilsqemuschema.c | 6 ++-- tests/utiltest.c | 12 +++---- tests/viralloctest.c | 14 ++++---- tests/viratomictest.c | 4 +-- tests/virbitmaptest.c | 24 ++++++------- tests/virbuftest.c | 16 ++++----- tests/vircapstest.c | 10 +++--- tests/vircgrouptest.c | 32 +++++++++--------- tests/virconftest.c | 10 +++--- tests/virdbustest.c | 20 +++++------ tests/virdeterministichashmock.c | 2 +- tests/virendiantest.c | 4 +-- tests/virerrortest.c | 2 +- tests/virfilecachemock.c | 2 +- tests/virfilecachetest.c | 10 +++--- tests/virfiletest.c | 6 ++-- tests/virfirewalltest.c | 36 ++++++++++---------- tests/virhashtest.c | 30 ++++++++--------- tests/virhostdevtest.c | 10 +++--- tests/viridentitytest.c | 6 ++-- tests/viriscsitest.c | 6 ++-- tests/virjsontest.c | 4 +-- tests/virkeycodetest.c | 4 +-- tests/virkeyfiletest.c | 2 +- tests/virkmodtest.c | 2 +- tests/virlockspacetest.c | 14 ++++---- tests/virmock.h | 2 +- tests/virnetdaemontest.c | 8 ++--- tests/virnetmessagetest.c | 10 +++--- tests/virnetserverclientmock.c | 16 ++++----- tests/virnetserverclienttest.c | 6 ++-- tests/virnetsockettest.c | 8 ++--- tests/virnumamock.c | 2 +- tests/virpcimock.c | 2 +- tests/virpcitest.c | 8 ++--- tests/virpolkittest.c | 12 +++---- tests/virportallocatormock.c | 4 +-- tests/virportallocatortest.c | 4 +-- tests/virprocessmock.c | 2 +- tests/virrandommock.c | 2 +- tests/virrotatingfiletest.c | 26 +++++++------- tests/virscsitest.c | 4 +-- tests/virshtest.c | 32 +++++++++--------- tests/virstoragetest.c | 2 +- tests/virstringtest.c | 10 +++--- tests/virsystemdtest.c | 24 ++++++------- tests/virtestmock.c | 2 +- tests/virtypedparamtest.c | 6 ++-- tests/virusbtest.c | 4 +-- tests/vmx2xmltest.c | 2 +- tests/vshtabletest.c | 18 +++++----- tests/xml2vmxtest.c | 6 ++-- 76 files changed, 419 insertions(+), 419 deletions(-) diff --git a/tests/bhyvexml2argvmock.c b/tests/bhyvexml2argvmock.c index f4fac092a5..717ceb4847 100644 --- a/tests/bhyvexml2argvmock.c +++ b/tests/bhyvexml2argvmock.c @@ -19,19 +19,19 @@ void virMacAddrGenerate(const unsigned char prefix[VIR_= MAC_PREFIX_BUFLEN], addr->addr[5] =3D 0; } =20 -int virNetDevTapCreateInBridgePort(const char *brname ATTRIBUTE_UNUSED, +int virNetDevTapCreateInBridgePort(const char *brname G_GNUC_UNUSED, char **ifname, - const virMacAddr *macaddr ATTRIBUTE_UNU= SED, - const unsigned char *vmuuid ATTRIBUTE_U= NUSED, - const char *tunpath ATTRIBUTE_UNUSED, - int *tapfd ATTRIBUTE_UNUSED, - size_t tapfdSize ATTRIBUTE_UNUSED, - virNetDevVPortProfilePtr virtPortProfil= e ATTRIBUTE_UNUSED, - virNetDevVlanPtr virtVlan ATTRIBUTE_UNU= SED, - virNetDevCoalescePtr coalesce ATTRIBUTE= _UNUSED, - unsigned int mtu ATTRIBUTE_UNUSED, - unsigned int *actualMTU ATTRIBUTE_UNUSE= D, - unsigned int fakeflags ATTRIBUTE_UNUSED) + const virMacAddr *macaddr G_GNUC_UNUSED, + const unsigned char *vmuuid G_GNUC_UNUS= ED, + const char *tunpath G_GNUC_UNUSED, + int *tapfd G_GNUC_UNUSED, + size_t tapfdSize G_GNUC_UNUSED, + virNetDevVPortProfilePtr virtPortProfil= e G_GNUC_UNUSED, + virNetDevVlanPtr virtVlan G_GNUC_UNUSED, + virNetDevCoalescePtr coalesce G_GNUC_UN= USED, + unsigned int mtu G_GNUC_UNUSED, + unsigned int *actualMTU G_GNUC_UNUSED, + unsigned int fakeflags G_GNUC_UNUSED) { VIR_FREE(*ifname); if (VIR_STRDUP(*ifname, "vnet0") < 0) @@ -39,7 +39,7 @@ int virNetDevTapCreateInBridgePort(const char *brname ATT= RIBUTE_UNUSED, return 0; } =20 -char *virNetDevTapGetRealDeviceName(char *name ATTRIBUTE_UNUSED) +char *virNetDevTapGetRealDeviceName(char *name G_GNUC_UNUSED) { char *fakename; =20 @@ -48,15 +48,15 @@ char *virNetDevTapGetRealDeviceName(char *name ATTRIBUT= E_UNUSED) return fakename; } =20 -int virNetDevSetOnline(const char *ifname ATTRIBUTE_UNUSED, - bool online ATTRIBUTE_UNUSED) +int virNetDevSetOnline(const char *ifname G_GNUC_UNUSED, + bool online G_GNUC_UNUSED) { return 0; } =20 -int bind(int sockfd ATTRIBUTE_UNUSED, - const struct sockaddr *addr ATTRIBUTE_UNUSED, - socklen_t addrlen ATTRIBUTE_UNUSED) +int bind(int sockfd G_GNUC_UNUSED, + const struct sockaddr *addr G_GNUC_UNUSED, + socklen_t addrlen G_GNUC_UNUSED) { return 0; } diff --git a/tests/commandtest.c b/tests/commandtest.c index 2ec3434f1e..e79baa2946 100644 --- a/tests/commandtest.c +++ b/tests/commandtest.c @@ -115,7 +115,7 @@ static int checkoutput(const char *testname, * Only stdin/out/err open * No slot for return status must log error. */ -static int test0(const void *unused ATTRIBUTE_UNUSED) +static int test0(const void *unused G_GNUC_UNUSED) { virCommandPtr cmd; int ret =3D -1; @@ -140,7 +140,7 @@ static int test0(const void *unused ATTRIBUTE_UNUSED) * Only stdin/out/err open * Capturing return status must not log error. */ -static int test1(const void *unused ATTRIBUTE_UNUSED) +static int test1(const void *unused G_GNUC_UNUSED) { virCommandPtr cmd; int ret =3D -1; @@ -168,7 +168,7 @@ static int test1(const void *unused ATTRIBUTE_UNUSED) * Run program (twice), no args, inherit all ENV, keep CWD. * Only stdin/out/err open */ -static int test2(const void *unused ATTRIBUTE_UNUSED) +static int test2(const void *unused G_GNUC_UNUSED) { virCommandPtr cmd =3D virCommandNew(abs_builddir "/commandhelper"); int ret; @@ -199,7 +199,7 @@ static int test2(const void *unused ATTRIBUTE_UNUSED) * Run program, no args, inherit all ENV, keep CWD. * stdin/out/err + two extra FD open */ -static int test3(const void *unused ATTRIBUTE_UNUSED) +static int test3(const void *unused G_GNUC_UNUSED) { virCommandPtr cmd =3D virCommandNew(abs_builddir "/commandhelper"); int newfd1 =3D dup(STDERR_FILENO); @@ -239,7 +239,7 @@ static int test3(const void *unused ATTRIBUTE_UNUSED) * Only stdin/out/err open. * Daemonized */ -static int test4(const void *unused ATTRIBUTE_UNUSED) +static int test4(const void *unused G_GNUC_UNUSED) { virCommandPtr cmd =3D virCommandNew(abs_builddir "/commandhelper"); char *pidfile =3D virPidFileBuildPath(abs_builddir, "commandhelper"); @@ -279,7 +279,7 @@ static int test4(const void *unused ATTRIBUTE_UNUSED) * Run program, no args, inherit filtered ENV, keep CWD. * Only stdin/out/err open */ -static int test5(const void *unused ATTRIBUTE_UNUSED) +static int test5(const void *unused G_GNUC_UNUSED) { virCommandPtr cmd =3D virCommandNew(abs_builddir "/commandhelper"); =20 @@ -301,7 +301,7 @@ static int test5(const void *unused ATTRIBUTE_UNUSED) * Run program, no args, inherit filtered ENV, keep CWD. * Only stdin/out/err open */ -static int test6(const void *unused ATTRIBUTE_UNUSED) +static int test6(const void *unused G_GNUC_UNUSED) { virCommandPtr cmd =3D virCommandNew(abs_builddir "/commandhelper"); =20 @@ -324,7 +324,7 @@ static int test6(const void *unused ATTRIBUTE_UNUSED) * Run program, no args, inherit filtered ENV, keep CWD. * Only stdin/out/err open */ -static int test7(const void *unused ATTRIBUTE_UNUSED) +static int test7(const void *unused G_GNUC_UNUSED) { virCommandPtr cmd =3D virCommandNew(abs_builddir "/commandhelper"); =20 @@ -347,7 +347,7 @@ static int test7(const void *unused ATTRIBUTE_UNUSED) * Run program, no args, inherit filtered ENV, keep CWD. * Only stdin/out/err open */ -static int test8(const void *unused ATTRIBUTE_UNUSED) +static int test8(const void *unused G_GNUC_UNUSED) { virCommandPtr cmd =3D virCommandNew(abs_builddir "/commandhelper"); =20 @@ -372,7 +372,7 @@ static int test8(const void *unused ATTRIBUTE_UNUSED) * Run program, some args, inherit all ENV, keep CWD. * Only stdin/out/err open */ -static int test9(const void *unused ATTRIBUTE_UNUSED) +static int test9(const void *unused G_GNUC_UNUSED) { virCommandPtr cmd =3D virCommandNew(abs_builddir "/commandhelper"); const char* const args[] =3D { "arg1", "arg2", NULL }; @@ -409,7 +409,7 @@ static int test9(const void *unused ATTRIBUTE_UNUSED) * Run program, some args, inherit all ENV, keep CWD. * Only stdin/out/err open */ -static int test10(const void *unused ATTRIBUTE_UNUSED) +static int test10(const void *unused G_GNUC_UNUSED) { virCommandPtr cmd =3D virCommandNew(abs_builddir "/commandhelper"); const char *const args[] =3D { @@ -433,7 +433,7 @@ static int test10(const void *unused ATTRIBUTE_UNUSED) * Run program, some args, inherit all ENV, keep CWD. * Only stdin/out/err open */ -static int test11(const void *unused ATTRIBUTE_UNUSED) +static int test11(const void *unused G_GNUC_UNUSED) { const char *args[] =3D { abs_builddir "/commandhelper", @@ -456,7 +456,7 @@ static int test11(const void *unused ATTRIBUTE_UNUSED) * Run program, no args, inherit all ENV, keep CWD. * Only stdin/out/err open. Set stdin data */ -static int test12(const void *unused ATTRIBUTE_UNUSED) +static int test12(const void *unused G_GNUC_UNUSED) { virCommandPtr cmd =3D virCommandNew(abs_builddir "/commandhelper"); =20 @@ -477,7 +477,7 @@ static int test12(const void *unused ATTRIBUTE_UNUSED) * Run program, no args, inherit all ENV, keep CWD. * Only stdin/out/err open. Set stdin data */ -static int test13(const void *unused ATTRIBUTE_UNUSED) +static int test13(const void *unused G_GNUC_UNUSED) { virCommandPtr cmd =3D virCommandNew(abs_builddir "/commandhelper"); char *outactual =3D NULL; @@ -516,7 +516,7 @@ static int test13(const void *unused ATTRIBUTE_UNUSED) * Run program, no args, inherit all ENV, keep CWD. * Only stdin/out/err open. Set stdin data */ -static int test14(const void *unused ATTRIBUTE_UNUSED) +static int test14(const void *unused G_GNUC_UNUSED) { virCommandPtr cmd =3D virCommandNew(abs_builddir "/commandhelper"); char *outactual =3D NULL; @@ -589,7 +589,7 @@ static int test14(const void *unused ATTRIBUTE_UNUSED) * Run program, no args, inherit all ENV, change CWD. * Only stdin/out/err open */ -static int test15(const void *unused ATTRIBUTE_UNUSED) +static int test15(const void *unused G_GNUC_UNUSED) { virCommandPtr cmd =3D virCommandNew(abs_builddir "/commandhelper"); char *cwd =3D NULL; @@ -617,7 +617,7 @@ static int test15(const void *unused ATTRIBUTE_UNUSED) /* * Don't run program; rather, log what would be run. */ -static int test16(const void *unused ATTRIBUTE_UNUSED) +static int test16(const void *unused G_GNUC_UNUSED) { virCommandPtr cmd =3D virCommandNew("true"); char *outactual =3D NULL; @@ -662,7 +662,7 @@ static int test16(const void *unused ATTRIBUTE_UNUSED) /* * Test string handling when no output is present. */ -static int test17(const void *unused ATTRIBUTE_UNUSED) +static int test17(const void *unused G_GNUC_UNUSED) { virCommandPtr cmd =3D virCommandNew("true"); int ret =3D -1; @@ -718,7 +718,7 @@ static int test17(const void *unused ATTRIBUTE_UNUSED) /* * Run long-running daemon, to ensure no hang. */ -static int test18(const void *unused ATTRIBUTE_UNUSED) +static int test18(const void *unused G_GNUC_UNUSED) { virCommandPtr cmd =3D virCommandNewArgList("sleep", "100", NULL); char *pidfile =3D virPidFileBuildPath(abs_builddir, "commandhelper"); @@ -766,7 +766,7 @@ static int test18(const void *unused ATTRIBUTE_UNUSED) /* * Asynchronously run long-running daemon, to ensure no hang. */ -static int test19(const void *unused ATTRIBUTE_UNUSED) +static int test19(const void *unused G_GNUC_UNUSED) { virCommandPtr cmd =3D virCommandNewArgList("sleep", "100", NULL); pid_t pid; @@ -803,7 +803,7 @@ static int test19(const void *unused ATTRIBUTE_UNUSED) * Run program, no args, inherit all ENV, keep CWD. * Ignore huge stdin data, to provoke SIGPIPE or EPIPE in parent. */ -static int test20(const void *unused ATTRIBUTE_UNUSED) +static int test20(const void *unused G_GNUC_UNUSED) { virCommandPtr cmd =3D virCommandNewArgList(abs_builddir "/commandhelpe= r", "--close-stdin", NULL); @@ -846,7 +846,7 @@ static const char *const newenv[] =3D { NULL }; =20 -static int test21(const void *unused ATTRIBUTE_UNUSED) +static int test21(const void *unused G_GNUC_UNUSED) { virCommandPtr cmd =3D virCommandNew(abs_builddir "/commandhelper"); int ret =3D -1; @@ -894,7 +894,7 @@ static int test21(const void *unused ATTRIBUTE_UNUSED) } =20 static int -test22(const void *unused ATTRIBUTE_UNUSED) +test22(const void *unused G_GNUC_UNUSED) { int ret =3D -1; virCommandPtr cmd; @@ -947,7 +947,7 @@ test22(const void *unused ATTRIBUTE_UNUSED) =20 =20 static int -test23(const void *unused ATTRIBUTE_UNUSED) +test23(const void *unused G_GNUC_UNUSED) { /* Not strictly a virCommand test, but this is the easiest place * to test this lower-level interface. It takes a double fork to @@ -1003,7 +1003,7 @@ test23(const void *unused ATTRIBUTE_UNUSED) return ret; } =20 -static int test25(const void *unused ATTRIBUTE_UNUSED) +static int test25(const void *unused G_GNUC_UNUSED) { int ret =3D -1; int pipeFD[2] =3D { -1, -1}; @@ -1081,7 +1081,7 @@ static int test25(const void *unused ATTRIBUTE_UNUSED) /* * Don't run program; rather, log what would be run. */ -static int test26(const void *unused ATTRIBUTE_UNUSED) +static int test26(const void *unused G_GNUC_UNUSED) { virCommandPtr cmd =3D virCommandNew("true"); char *outactual =3D NULL; @@ -1139,7 +1139,7 @@ static int test26(const void *unused ATTRIBUTE_UNUSED) return ret; } =20 -static int test27(const void *unused ATTRIBUTE_UNUSED) +static int test27(const void *unused G_GNUC_UNUSED) { virCommandPtr cmd =3D virCommandNew(abs_builddir "/commandhelper"); int pipe1[2]; @@ -1277,8 +1277,8 @@ static void virCommandThreadWorker(void *opaque) } =20 static void -virCommandTestFreeTimer(int timer ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) +virCommandTestFreeTimer(int timer G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED) { /* nothing to be done here */ } diff --git a/tests/esxutilstest.c b/tests/esxutilstest.c index 872987a7d7..49a159a2be 100644 --- a/tests/esxutilstest.c +++ b/tests/esxutilstest.c @@ -33,7 +33,7 @@ static struct testPath paths[] =3D { }; =20 static int -testParseDatastorePath(const void *data ATTRIBUTE_UNUSED) +testParseDatastorePath(const void *data G_GNUC_UNUSED) { int result =3D 0; size_t i; @@ -121,7 +121,7 @@ static struct testDateTime times[] =3D { }; =20 static int -testConvertDateTimeToCalendarTime(const void *data ATTRIBUTE_UNUSED) +testConvertDateTimeToCalendarTime(const void *data G_GNUC_UNUSED) { size_t i; esxVI_DateTime dateTime; @@ -172,7 +172,7 @@ static struct testDatastoreItem datastoreItems[] =3D { }; =20 static int -testEscapeDatastoreItem(const void *data ATTRIBUTE_UNUSED) +testEscapeDatastoreItem(const void *data G_GNUC_UNUSED) { size_t i; char *escaped =3D NULL; @@ -212,7 +212,7 @@ static struct testWindows1252ToUTF8 windows1252ToUTF8[]= =3D { }; =20 static int -testConvertWindows1252ToUTF8(const void *data ATTRIBUTE_UNUSED) +testConvertWindows1252ToUTF8(const void *data G_GNUC_UNUSED) { size_t i; char *utf8 =3D NULL; diff --git a/tests/eventtest.c b/tests/eventtest.c index 2a6edc7461..d64854ecc6 100644 --- a/tests/eventtest.c +++ b/tests/eventtest.c @@ -158,7 +158,7 @@ static pthread_cond_t eventThreadJobCond =3D PTHREAD_CO= ND_INITIALIZER; static int eventThreadJobDone; =20 =20 -G_GNUC_NORETURN static void *eventThreadLoop(void *data ATTRIBUTE_UNUSED) { +G_GNUC_NORETURN static void *eventThreadLoop(void *data G_GNUC_UNUSED) { while (1) { pthread_mutex_lock(&eventThreadMutex); while (!eventThreadRunOnce) diff --git a/tests/fchosttest.c b/tests/fchosttest.c index 05272a2e9e..4e37656576 100644 --- a/tests/fchosttest.c +++ b/tests/fchosttest.c @@ -90,7 +90,7 @@ static const char test11_xml[] =3D =20 /* Test virIsVHBACapable */ static int -test1(const void *data ATTRIBUTE_UNUSED) +test1(const void *data G_GNUC_UNUSED) { if (virVHBAPathExists(TEST_FC_HOST_PREFIX, TEST_FC_HOST_NUM) && virVHBAPathExists(TEST_FC_HOST_PREFIX, TEST_FC_HOST_NUM_NO_FAB)) @@ -101,7 +101,7 @@ test1(const void *data ATTRIBUTE_UNUSED) =20 /* Test virVHBAIsVportCapable */ static int -test2(const void *data ATTRIBUTE_UNUSED) +test2(const void *data G_GNUC_UNUSED) { if (virVHBAIsVportCapable(TEST_FC_HOST_PREFIX, TEST_FC_HOST_NUM)) return 0; @@ -111,7 +111,7 @@ test2(const void *data ATTRIBUTE_UNUSED) =20 /* Test virVHBAGetConfig */ static int -test3(const void *data ATTRIBUTE_UNUSED) +test3(const void *data G_GNUC_UNUSED) { const char *expect_wwnn =3D "2001001b32a9da4e"; const char *expect_wwpn =3D "2101001b32a9da4e"; @@ -165,7 +165,7 @@ test3(const void *data ATTRIBUTE_UNUSED) =20 /* Test virVHBAGetHostByWWN */ static int -test4(const void *data ATTRIBUTE_UNUSED) +test4(const void *data G_GNUC_UNUSED) { const char *expect_hostname =3D "host5"; char *hostname =3D NULL; @@ -190,7 +190,7 @@ test4(const void *data ATTRIBUTE_UNUSED) * NB: host4 is not Online, so it should not be found */ static int -test5(const void *data ATTRIBUTE_UNUSED) +test5(const void *data G_GNUC_UNUSED) { const char *expect_hostname =3D "host5"; char *hostname =3D NULL; @@ -210,7 +210,7 @@ test5(const void *data ATTRIBUTE_UNUSED) =20 /* Test virVHBAGetConfig fabric name optional */ static int -test6(const void *data ATTRIBUTE_UNUSED) +test6(const void *data G_GNUC_UNUSED) { const char *expect_wwnn =3D "2002001b32a9da4e"; const char *expect_wwpn =3D "2102001b32a9da4e"; diff --git a/tests/networkxml2firewalltest.c b/tests/networkxml2firewalltes= t.c index 78844085a0..579eb2ec60 100644 --- a/tests/networkxml2firewalltest.c +++ b/tests/networkxml2firewalltest.c @@ -44,13 +44,13 @@ # endif =20 static void -testCommandDryRun(const char *const*args ATTRIBUTE_UNUSED, - const char *const*env ATTRIBUTE_UNUSED, - const char *input ATTRIBUTE_UNUSED, +testCommandDryRun(const char *const*args G_GNUC_UNUSED, + const char *const*env G_GNUC_UNUSED, + const char *input G_GNUC_UNUSED, char **output, char **error, int *status, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { *status =3D 0; ignore_value(VIR_STRDUP_QUIET(*output, "")); diff --git a/tests/nsslinktest.c b/tests/nsslinktest.c index 5d7d36da9e..a2c4987792 100644 --- a/tests/nsslinktest.c +++ b/tests/nsslinktest.c @@ -21,8 +21,8 @@ #include "internal.h" #include "libvirt_nss.h" =20 -int main(int argc ATTRIBUTE_UNUSED, - char *argv[] ATTRIBUTE_UNUSED) +int main(int argc G_GNUC_UNUSED, + char *argv[] G_GNUC_UNUSED) { int err, herrno; /* Dummy variables to prevent SIGSEGV */ =20 diff --git a/tests/nwfilterebiptablestest.c b/tests/nwfilterebiptablestest.c index 68b69a6e1f..61b3284397 100644 --- a/tests/nwfilterebiptablestest.c +++ b/tests/nwfilterebiptablestest.c @@ -66,7 +66,7 @@ "ebtables -t nat -X libvirt-P-vnet0\n" =20 static int -testNWFilterEBIPTablesAllTeardown(const void *opaque ATTRIBUTE_UNUSED) +testNWFilterEBIPTablesAllTeardown(const void *opaque G_GNUC_UNUSED) { virBuffer buf =3D VIR_BUFFER_INITIALIZER; const char *expected =3D @@ -130,7 +130,7 @@ testNWFilterEBIPTablesAllTeardown(const void *opaque AT= TRIBUTE_UNUSED) =20 =20 static int -testNWFilterEBIPTablesTearOldRules(const void *opaque ATTRIBUTE_UNUSED) +testNWFilterEBIPTablesTearOldRules(const void *opaque G_GNUC_UNUSED) { virBuffer buf =3D VIR_BUFFER_INITIALIZER; const char *expected =3D @@ -201,7 +201,7 @@ testNWFilterEBIPTablesTearOldRules(const void *opaque A= TTRIBUTE_UNUSED) =20 =20 static int -testNWFilterEBIPTablesRemoveBasicRules(const void *opaque ATTRIBUTE_UNUSED) +testNWFilterEBIPTablesRemoveBasicRules(const void *opaque G_GNUC_UNUSED) { virBuffer buf =3D VIR_BUFFER_INITIALIZER; const char *expected =3D @@ -250,7 +250,7 @@ testNWFilterEBIPTablesRemoveBasicRules(const void *opaq= ue ATTRIBUTE_UNUSED) =20 =20 static int -testNWFilterEBIPTablesTearNewRules(const void *opaque ATTRIBUTE_UNUSED) +testNWFilterEBIPTablesTearNewRules(const void *opaque G_GNUC_UNUSED) { virBuffer buf =3D VIR_BUFFER_INITIALIZER; const char *expected =3D @@ -284,7 +284,7 @@ testNWFilterEBIPTablesTearNewRules(const void *opaque A= TTRIBUTE_UNUSED) =20 =20 static int -testNWFilterEBIPTablesApplyBasicRules(const void *opaque ATTRIBUTE_UNUSED) +testNWFilterEBIPTablesApplyBasicRules(const void *opaque G_GNUC_UNUSED) { virBuffer buf =3D VIR_BUFFER_INITIALIZER; const char *expected =3D @@ -356,7 +356,7 @@ testNWFilterEBIPTablesApplyBasicRules(const void *opaqu= e ATTRIBUTE_UNUSED) =20 =20 static int -testNWFilterEBIPTablesApplyDHCPOnlyRules(const void *opaque ATTRIBUTE_UNUS= ED) +testNWFilterEBIPTablesApplyDHCPOnlyRules(const void *opaque G_GNUC_UNUSED) { virBuffer buf =3D VIR_BUFFER_INITIALIZER; const char *expected =3D @@ -447,7 +447,7 @@ testNWFilterEBIPTablesApplyDHCPOnlyRules(const void *op= aque ATTRIBUTE_UNUSED) =20 =20 static int -testNWFilterEBIPTablesApplyDropAllRules(const void *opaque ATTRIBUTE_UNUSE= D) +testNWFilterEBIPTablesApplyDropAllRules(const void *opaque G_GNUC_UNUSED) { virBuffer buf =3D VIR_BUFFER_INITIALIZER; const char *expected =3D diff --git a/tests/objecteventtest.c b/tests/objecteventtest.c index 9ba082d353..dac6938b63 100644 --- a/tests/objecteventtest.c +++ b/tests/objecteventtest.c @@ -101,10 +101,10 @@ typedef struct { =20 =20 static int -domainLifecycleCb(virConnectPtr conn ATTRIBUTE_UNUSED, - virDomainPtr dom ATTRIBUTE_UNUSED, +domainLifecycleCb(virConnectPtr conn G_GNUC_UNUSED, + virDomainPtr dom G_GNUC_UNUSED, int event, - int detail ATTRIBUTE_UNUSED, + int detail G_GNUC_UNUSED, void *opaque) { lifecycleEventCounter *counter =3D opaque; @@ -130,10 +130,10 @@ domainLifecycleCb(virConnectPtr conn ATTRIBUTE_UNUSED, } =20 static void -networkLifecycleCb(virConnectPtr conn ATTRIBUTE_UNUSED, - virNetworkPtr net ATTRIBUTE_UNUSED, +networkLifecycleCb(virConnectPtr conn G_GNUC_UNUSED, + virNetworkPtr net G_GNUC_UNUSED, int event, - int detail ATTRIBUTE_UNUSED, + int detail G_GNUC_UNUSED, void* opaque) { lifecycleEventCounter *counter =3D opaque; @@ -149,10 +149,10 @@ networkLifecycleCb(virConnectPtr conn ATTRIBUTE_UNUSE= D, } =20 static void -storagePoolLifecycleCb(virConnectPtr conn ATTRIBUTE_UNUSED, - virStoragePoolPtr pool ATTRIBUTE_UNUSED, +storagePoolLifecycleCb(virConnectPtr conn G_GNUC_UNUSED, + virStoragePoolPtr pool G_GNUC_UNUSED, int event, - int detail ATTRIBUTE_UNUSED, + int detail G_GNUC_UNUSED, void* opaque) { lifecycleEventCounter *counter =3D opaque; @@ -172,8 +172,8 @@ storagePoolLifecycleCb(virConnectPtr conn ATTRIBUTE_UNU= SED, } =20 static void -storagePoolRefreshCb(virConnectPtr conn ATTRIBUTE_UNUSED, - virStoragePoolPtr pool ATTRIBUTE_UNUSED, +storagePoolRefreshCb(virConnectPtr conn G_GNUC_UNUSED, + virStoragePoolPtr pool G_GNUC_UNUSED, void* opaque) { int *counter =3D opaque; @@ -182,10 +182,10 @@ storagePoolRefreshCb(virConnectPtr conn ATTRIBUTE_UNU= SED, } =20 static void -nodeDeviceLifecycleCb(virConnectPtr conn ATTRIBUTE_UNUSED, - virNodeDevicePtr dev ATTRIBUTE_UNUSED, +nodeDeviceLifecycleCb(virConnectPtr conn G_GNUC_UNUSED, + virNodeDevicePtr dev G_GNUC_UNUSED, int event, - int detail ATTRIBUTE_UNUSED, + int detail G_GNUC_UNUSED, void* opaque) { lifecycleEventCounter *counter =3D opaque; @@ -824,7 +824,7 @@ testNodeDeviceCreateXML(const void *data) } =20 static void -timeout(int id ATTRIBUTE_UNUSED, void *opaque ATTRIBUTE_UNUSED) +timeout(int id G_GNUC_UNUSED, void *opaque G_GNUC_UNUSED) { fputs("test taking too long; giving up", stderr); _exit(EXIT_FAILURE); diff --git a/tests/openvzutilstest.c b/tests/openvzutilstest.c index 283ba03b21..b5e23d4d8d 100644 --- a/tests/openvzutilstest.c +++ b/tests/openvzutilstest.c @@ -14,8 +14,8 @@ # define VIR_FROM_THIS VIR_FROM_OPENVZ =20 static int -testLocateConfFile(int vpsid ATTRIBUTE_UNUSED, char **conffile, - const char *ext ATTRIBUTE_UNUSED) +testLocateConfFile(int vpsid G_GNUC_UNUSED, char **conffile, + const char *ext G_GNUC_UNUSED) { return virAsprintf(conffile, "%s/openvzutilstest.conf", abs_srcdir); } @@ -33,7 +33,7 @@ static struct testConfigParam configParams[] =3D { }; =20 static int -testReadConfigParam(const void *data ATTRIBUTE_UNUSED) +testReadConfigParam(const void *data G_GNUC_UNUSED) { int result =3D -1; size_t i; @@ -68,7 +68,7 @@ testReadConfigParam(const void *data ATTRIBUTE_UNUSED) } =20 static int -testReadNetworkConf(const void *data ATTRIBUTE_UNUSED) +testReadNetworkConf(const void *data G_GNUC_UNUSED) { int result =3D -1; virDomainDefPtr def =3D NULL; diff --git a/tests/qemuagenttest.c b/tests/qemuagenttest.c index 5ae098efa9..58f722cf1b 100644 --- a/tests/qemuagenttest.c +++ b/tests/qemuagenttest.c @@ -831,9 +831,9 @@ testQemuAgentArbitraryCommand(const void *data) =20 =20 static int -qemuAgentTimeoutTestMonitorHandler(qemuMonitorTestPtr test ATTRIBUTE_UNUSE= D, - qemuMonitorTestItemPtr item ATTRIBUTE_U= NUSED, - const char *cmdstr ATTRIBUTE_UNUSED) +qemuAgentTimeoutTestMonitorHandler(qemuMonitorTestPtr test G_GNUC_UNUSED, + qemuMonitorTestItemPtr item G_GNUC_UNUS= ED, + const char *cmdstr G_GNUC_UNUSED) { return 0; } diff --git a/tests/qemucapsprobe.c b/tests/qemucapsprobe.c index 36af01d561..6837f2a0f6 100644 --- a/tests/qemucapsprobe.c +++ b/tests/qemucapsprobe.c @@ -30,7 +30,7 @@ =20 =20 static void -eventLoop(void *opaque ATTRIBUTE_UNUSED) +eventLoop(void *opaque G_GNUC_UNUSED) { while (1) { if (virEventRunDefaultImpl() < 0) { diff --git a/tests/qemucpumock.c b/tests/qemucpumock.c index 501738df36..74f25d8194 100644 --- a/tests/qemucpumock.c +++ b/tests/qemucpumock.c @@ -27,8 +27,8 @@ =20 =20 virCPUDefPtr -virQEMUCapsProbeHostCPU(virArch hostArch ATTRIBUTE_UNUSED, - virDomainCapsCPUModelsPtr models ATTRIBUTE_UNUSED) +virQEMUCapsProbeHostCPU(virArch hostArch G_GNUC_UNUSED, + virDomainCapsCPUModelsPtr models G_GNUC_UNUSED) { const char *model =3D getenv("VIR_TEST_MOCK_FAKE_HOST_CPU"); =20 diff --git a/tests/qemufirmwaretest.c b/tests/qemufirmwaretest.c index 653476fdc1..14710b11f3 100644 --- a/tests/qemufirmwaretest.c +++ b/tests/qemufirmwaretest.c @@ -55,7 +55,7 @@ testParseFormatFW(const void *opaque) =20 =20 static int -testFWPrecedence(const void *opaque ATTRIBUTE_UNUSED) +testFWPrecedence(const void *opaque G_GNUC_UNUSED) { VIR_AUTOFREE(char *) fakehome =3D NULL; VIR_AUTOSTRINGLIST fwList =3D NULL; diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c index 9f2594b09a..64e73dcf01 100644 --- a/tests/qemumonitortestutils.c +++ b/tests/qemumonitortestutils.c @@ -360,8 +360,8 @@ qemuMonitorTestWorker(void *opaque) =20 =20 static void -qemuMonitorTestFreeTimer(int timer ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) +qemuMonitorTestFreeTimer(int timer G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED) { /* nothing to be done here */ } @@ -712,7 +712,7 @@ qemuMonitorTestAddItemVerbatim(qemuMonitorTestPtr test, =20 static int qemuMonitorTestProcessGuestAgentSync(qemuMonitorTestPtr test, - qemuMonitorTestItemPtr item ATTRIBUTE= _UNUSED, + qemuMonitorTestItemPtr item G_GNUC_UN= USED, const char *cmdstr) { virJSONValuePtr val =3D NULL; @@ -1011,17 +1011,17 @@ qemuMonitorTestAddItemExpect(qemuMonitorTestPtr tes= t, =20 =20 static void -qemuMonitorTestEOFNotify(qemuMonitorPtr mon ATTRIBUTE_UNUSED, - virDomainObjPtr vm ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) +qemuMonitorTestEOFNotify(qemuMonitorPtr mon G_GNUC_UNUSED, + virDomainObjPtr vm G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED) { } =20 =20 static void -qemuMonitorTestErrorNotify(qemuMonitorPtr mon ATTRIBUTE_UNUSED, - virDomainObjPtr vm ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) +qemuMonitorTestErrorNotify(qemuMonitorPtr mon G_GNUC_UNUSED, + virDomainObjPtr vm G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED) { } =20 @@ -1034,8 +1034,8 @@ static qemuMonitorCallbacks qemuMonitorTestCallbacks = =3D { =20 =20 static void -qemuMonitorTestAgentNotify(qemuAgentPtr agent ATTRIBUTE_UNUSED, - virDomainObjPtr vm ATTRIBUTE_UNUSED) +qemuMonitorTestAgentNotify(qemuAgentPtr agent G_GNUC_UNUSED, + virDomainObjPtr vm G_GNUC_UNUSED) { } =20 diff --git a/tests/qemusecuritymock.c b/tests/qemusecuritymock.c index 373d64305a..8b857b0cc1 100644 --- a/tests/qemusecuritymock.c +++ b/tests/qemusecuritymock.c @@ -302,7 +302,7 @@ mock_chown(const char *path, #include "virmockstathelpers.c" =20 static int -virMockStatRedirect(const char *path ATTRIBUTE_UNUSED, char **newpath ATTR= IBUTE_UNUSED) +virMockStatRedirect(const char *path G_GNUC_UNUSED, char **newpath G_GNUC_= UNUSED) { return 0; } @@ -364,19 +364,19 @@ close(int fd) } =20 =20 -int virFileLock(int fd ATTRIBUTE_UNUSED, - bool shared ATTRIBUTE_UNUSED, - off_t start ATTRIBUTE_UNUSED, - off_t len ATTRIBUTE_UNUSED, - bool waitForLock ATTRIBUTE_UNUSED) +int virFileLock(int fd G_GNUC_UNUSED, + bool shared G_GNUC_UNUSED, + off_t start G_GNUC_UNUSED, + off_t len G_GNUC_UNUSED, + bool waitForLock G_GNUC_UNUSED) { return 0; } =20 =20 -int virFileUnlock(int fd ATTRIBUTE_UNUSED, - off_t start ATTRIBUTE_UNUSED, - off_t len ATTRIBUTE_UNUSED) +int virFileUnlock(int fd G_GNUC_UNUSED, + off_t start G_GNUC_UNUSED, + off_t len G_GNUC_UNUSED) { return 0; } diff --git a/tests/qemuvhostusertest.c b/tests/qemuvhostusertest.c index 52adf9834a..691c94b8fa 100644 --- a/tests/qemuvhostusertest.c +++ b/tests/qemuvhostusertest.c @@ -55,7 +55,7 @@ testParseFormatVU(const void *opaque) =20 =20 static int -testVUPrecedence(const void *opaque ATTRIBUTE_UNUSED) +testVUPrecedence(const void *opaque G_GNUC_UNUSED) { VIR_AUTOFREE(char *) fakehome =3D NULL; VIR_AUTOSTRINGLIST vuList =3D NULL; diff --git a/tests/qemuxml2argvmock.c b/tests/qemuxml2argvmock.c index a386dd17be..4c114212e9 100644 --- a/tests/qemuxml2argvmock.c +++ b/tests/qemuxml2argvmock.c @@ -111,17 +111,17 @@ virTPMCreateCancelPath(const char *devpath) * variables that support it. */ unsigned long long -virMemoryMaxValue(bool capped ATTRIBUTE_UNUSED) +virMemoryMaxValue(bool capped G_GNUC_UNUSED) { return LLONG_MAX; } =20 char * -virSCSIDeviceGetSgName(const char *sysfs_prefix ATTRIBUTE_UNUSED, - const char *adapter ATTRIBUTE_UNUSED, - unsigned int bus ATTRIBUTE_UNUSED, - unsigned int target ATTRIBUTE_UNUSED, - unsigned long long unit ATTRIBUTE_UNUSED) +virSCSIDeviceGetSgName(const char *sysfs_prefix G_GNUC_UNUSED, + const char *adapter G_GNUC_UNUSED, + unsigned int bus G_GNUC_UNUSED, + unsigned int target G_GNUC_UNUSED, + unsigned long long unit G_GNUC_UNUSED) { char *ret; =20 @@ -139,10 +139,10 @@ virSCSIVHostOpenVhostSCSI(int *vhostfd) =20 int virNetDevTapCreate(char **ifname, - const char *tunpath ATTRIBUTE_UNUSED, + const char *tunpath G_GNUC_UNUSED, int *tapfd, size_t tapfdSize, - unsigned int flags ATTRIBUTE_UNUSED) + unsigned int flags G_GNUC_UNUSED) { size_t i; =20 @@ -158,8 +158,8 @@ virNetDevTapCreate(char **ifname, } =20 int -virNetDevSetMAC(const char *ifname ATTRIBUTE_UNUSED, - const virMacAddr *macaddr ATTRIBUTE_UNUSED) +virNetDevSetMAC(const char *ifname G_GNUC_UNUSED, + const virMacAddr *macaddr G_GNUC_UNUSED) { return 0; } @@ -172,24 +172,24 @@ virNetDevExists(const char *ifname) } =20 =20 -int virNetDevIPAddrAdd(const char *ifname ATTRIBUTE_UNUSED, - virSocketAddr *addr ATTRIBUTE_UNUSED, - virSocketAddr *peer ATTRIBUTE_UNUSED, - unsigned int prefix ATTRIBUTE_UNUSED) +int virNetDevIPAddrAdd(const char *ifname G_GNUC_UNUSED, + virSocketAddr *addr G_GNUC_UNUSED, + virSocketAddr *peer G_GNUC_UNUSED, + unsigned int prefix G_GNUC_UNUSED) { return 0; } =20 int -virNetDevSetOnline(const char *ifname ATTRIBUTE_UNUSED, - bool online ATTRIBUTE_UNUSED) +virNetDevSetOnline(const char *ifname G_GNUC_UNUSED, + bool online G_GNUC_UNUSED) { return 0; } =20 int -virNetDevRunEthernetScript(const char *ifname ATTRIBUTE_UNUSED, - const char *script ATTRIBUTE_UNUSED) +virNetDevRunEthernetScript(const char *ifname G_GNUC_UNUSED, + const char *script G_GNUC_UNUSED) { return 0; } @@ -226,14 +226,14 @@ virCommandPassFD(virCommandPtr cmd, } =20 int -virNetDevOpenvswitchGetVhostuserIfname(const char *path ATTRIBUTE_UNUSED, +virNetDevOpenvswitchGetVhostuserIfname(const char *path G_GNUC_UNUSED, char **ifname) { return VIR_STRDUP(*ifname, "vhost-user0"); } =20 int -qemuInterfaceOpenVhostNet(virDomainDefPtr def ATTRIBUTE_UNUSED, +qemuInterfaceOpenVhostNet(virDomainDefPtr def G_GNUC_UNUSED, virDomainNetDefPtr net, int *vhostfd, size_t *vhostfdSize) @@ -252,7 +252,7 @@ qemuInterfaceOpenVhostNet(virDomainDefPtr def ATTRIBUTE= _UNUSED, =20 =20 int -qemuOpenChrChardevUNIXSocket(const virDomainChrSourceDef *dev ATTRIBUTE_UN= USED) +qemuOpenChrChardevUNIXSocket(const virDomainChrSourceDef *dev G_GNUC_UNUSE= D) =20 { /* We need to return an FD number for a UNIX listener socket, @@ -269,8 +269,8 @@ qemuOpenChrChardevUNIXSocket(const virDomainChrSourceDe= f *dev ATTRIBUTE_UNUSED) =20 =20 int -qemuBuildTPMOpenBackendFDs(const char *tpmdev ATTRIBUTE_UNUSED, - const char *cancel_path ATTRIBUTE_UNUSED, +qemuBuildTPMOpenBackendFDs(const char *tpmdev G_GNUC_UNUSED, + const char *cancel_path G_GNUC_UNUSED, int *tpmfd, int *cancelfd) { diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 834a289532..a84ea0954d 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -37,10 +37,10 @@ static virQEMUDriver driver; =20 static unsigned char * -fakeSecretGetValue(virSecretPtr obj ATTRIBUTE_UNUSED, +fakeSecretGetValue(virSecretPtr obj G_GNUC_UNUSED, size_t *value_size, - unsigned int fakeflags ATTRIBUTE_UNUSED, - unsigned int internalFlags ATTRIBUTE_UNUSED) + unsigned int fakeflags G_GNUC_UNUSED, + unsigned int internalFlags G_GNUC_UNUSED) { char *secret; if (VIR_STRDUP(secret, "AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A") < 0) @@ -199,7 +199,7 @@ fakeStorageVolGetPath(virStorageVolPtr vol) =20 static char * fakeStoragePoolGetXMLDesc(virStoragePoolPtr pool, - unsigned int flags_unused ATTRIBUTE_UNUSED) + unsigned int flags_unused G_GNUC_UNUSED) { char *xmlpath =3D NULL; char *xmlbuf =3D NULL; @@ -278,7 +278,7 @@ fakeNWFilterBindingLookupByPortDev(virConnectPtr conn, =20 =20 static int -fakeNWFilterBindingDelete(virNWFilterBindingPtr binding ATTRIBUTE_UNUSED) +fakeNWFilterBindingDelete(virNWFilterBindingPtr binding G_GNUC_UNUSED) { return 0; } diff --git a/tests/scsihosttest.c b/tests/scsihosttest.c index 6989e4fc4a..c1a7e2d603 100644 --- a/tests/scsihosttest.c +++ b/tests/scsihosttest.c @@ -168,7 +168,7 @@ init_scsihost_sysfs(const char *fakesysfsdir) =20 /* Test virReadSCSIUniqueId */ static int -testVirReadSCSIUniqueId(const void *data ATTRIBUTE_UNUSED) +testVirReadSCSIUniqueId(const void *data G_GNUC_UNUSED) { int hostnum, unique_id; =20 @@ -198,7 +198,7 @@ testVirReadSCSIUniqueId(const void *data ATTRIBUTE_UNUS= ED) =20 /* Test virSCSIHostFindByPCI */ static int -testVirFindSCSIHostByPCI(const void *data ATTRIBUTE_UNUSED) +testVirFindSCSIHostByPCI(const void *data G_GNUC_UNUSED) { unsigned int unique_id1 =3D 1; unsigned int unique_id2 =3D 2; diff --git a/tests/securityselinuxtest.c b/tests/securityselinuxtest.c index a2864cf57c..5dccb708d8 100644 --- a/tests/securityselinuxtest.c +++ b/tests/securityselinuxtest.c @@ -106,7 +106,7 @@ testSELinuxCheckCon(context_t con, const char *role, const char *type, int sensMin, - int sensMax ATTRIBUTE_UNUSED, + int sensMax G_GNUC_UNUSED, int catMin, int catMax) { diff --git a/tests/shunloadhelper.c b/tests/shunloadhelper.c index 952cade741..cc7d4954a5 100644 --- a/tests/shunloadhelper.c +++ b/tests/shunloadhelper.c @@ -30,8 +30,8 @@ =20 #include "internal.h" =20 -static void shunloadError(void *userData ATTRIBUTE_UNUSED, - virErrorPtr error ATTRIBUTE_UNUSED) +static void shunloadError(void *userData G_GNUC_UNUSED, + virErrorPtr error G_GNUC_UNUSED) { } =20 diff --git a/tests/shunloadtest.c b/tests/shunloadtest.c index c5561175b9..65c627ed17 100644 --- a/tests/shunloadtest.c +++ b/tests/shunloadtest.c @@ -90,7 +90,7 @@ static void sigHandler(int sig) * we don't want 'shunloadtest' itself to link against * libvirt.so. We need to test dlopen()'ing of libvirt.so */ -int main(int argc ATTRIBUTE_UNUSED, char **argv) +int main(int argc G_GNUC_UNUSED, char **argv) { void (*startup)(void); pthread_t t; diff --git a/tests/testutils.c b/tests/testutils.c index 1f3718b5cd..80b7b083ff 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -380,9 +380,9 @@ virTestCaptureProgramOutput(const char *const argv[], c= har **buf, int maxlen) } #else /* !WIN32 */ int -virTestCaptureProgramOutput(const char *const argv[] ATTRIBUTE_UNUSED, - char **buf ATTRIBUTE_UNUSED, - int maxlen ATTRIBUTE_UNUSED) +virTestCaptureProgramOutput(const char *const argv[] G_GNUC_UNUSED, + char **buf G_GNUC_UNUSED, + int maxlen G_GNUC_UNUSED) { return -1; } @@ -713,8 +713,8 @@ virTestCompareToString(const char *expect, } =20 static void -virTestErrorFuncQuiet(void *data ATTRIBUTE_UNUSED, - virErrorPtr err ATTRIBUTE_UNUSED) +virTestErrorFuncQuiet(void *data G_GNUC_UNUSED, + virErrorPtr err G_GNUC_UNUSED) { } =20 =20 @@ -733,15 +733,15 @@ struct virtTestLogData { static struct virtTestLogData testLog =3D { VIR_BUFFER_INITIALIZER }; =20 static void -virtTestLogOutput(virLogSourcePtr source ATTRIBUTE_UNUSED, - virLogPriority priority ATTRIBUTE_UNUSED, - const char *filename ATTRIBUTE_UNUSED, - int lineno ATTRIBUTE_UNUSED, - const char *funcname ATTRIBUTE_UNUSED, +virtTestLogOutput(virLogSourcePtr source G_GNUC_UNUSED, + virLogPriority priority G_GNUC_UNUSED, + const char *filename G_GNUC_UNUSED, + int lineno G_GNUC_UNUSED, + const char *funcname G_GNUC_UNUSED, const char *timestamp, - virLogMetadataPtr metadata ATTRIBUTE_UNUSED, + virLogMetadataPtr metadata G_GNUC_UNUSED, unsigned int flags, - const char *rawstr ATTRIBUTE_UNUSED, + const char *rawstr G_GNUC_UNUSED, const char *str, void *data) { diff --git a/tests/testutilsqemuschema.c b/tests/testutilsqemuschema.c index 3773f63ecb..42b2550a03 100644 --- a/tests/testutilsqemuschema.c +++ b/tests/testutilsqemuschema.c @@ -157,7 +157,7 @@ testQEMUSchemaValidateObjectMember(const char *key, =20 =20 static int -testQEMUSchemaValidateObjectMergeVariantMember(size_t pos ATTRIBUTE_UNUSED, +testQEMUSchemaValidateObjectMergeVariantMember(size_t pos G_GNUC_UNUSED, virJSONValuePtr item, void *opaque) { @@ -245,9 +245,9 @@ testQEMUSchemaValidateObjectMergeVariant(virJSONValuePt= r root, =20 =20 static int -testQEMUSchemaValidateObjectMandatoryMember(size_t pos ATTRIBUTE_UNUSED, +testQEMUSchemaValidateObjectMandatoryMember(size_t pos G_GNUC_UNUSED, virJSONValuePtr item, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { struct testQEMUSchemaValidateObjectMemberData *data =3D opaque; =20 diff --git a/tests/utiltest.c b/tests/utiltest.c index 71b8d869bd..176e6ca20a 100644 --- a/tests/utiltest.c +++ b/tests/utiltest.c @@ -39,7 +39,7 @@ static const char* diskNamesInvalid[] =3D { }; =20 static int -testIndexToDiskName(const void *data ATTRIBUTE_UNUSED) +testIndexToDiskName(const void *data G_GNUC_UNUSED) { size_t i; char *diskName =3D NULL; @@ -65,7 +65,7 @@ testIndexToDiskName(const void *data ATTRIBUTE_UNUSED) =20 =20 static int -testDiskNameToIndex(const void *data ATTRIBUTE_UNUSED) +testDiskNameToIndex(const void *data G_GNUC_UNUSED) { size_t i; int idx; @@ -95,7 +95,7 @@ testDiskNameToIndex(const void *data ATTRIBUTE_UNUSED) =20 =20 static int -testDiskNameParse(const void *data ATTRIBUTE_UNUSED) +testDiskNameParse(const void *data G_GNUC_UNUSED) { size_t i; int idx; @@ -155,7 +155,7 @@ static struct testVersionString versions[] =3D { }; =20 static int -testParseVersionString(const void *data ATTRIBUTE_UNUSED) +testParseVersionString(const void *data G_GNUC_UNUSED) { int result; size_t i; @@ -205,7 +205,7 @@ static struct testRoundData roundData[] =3D { }; =20 static int -testRoundValueToPowerOfTwo(const void *data ATTRIBUTE_UNUSED) +testRoundValueToPowerOfTwo(const void *data G_GNUC_UNUSED) { unsigned int result; size_t i; @@ -234,7 +234,7 @@ testRoundValueToPowerOfTwo(const void *data ATTRIBUTE_U= NUSED) } =20 static int -testOverflowCheckMacro(const void *data ATTRIBUTE_UNUSED) +testOverflowCheckMacro(const void *data G_GNUC_UNUSED) { long long tmp; uint8_t luchar; diff --git a/tests/viralloctest.c b/tests/viralloctest.c index 27cbdcbbe4..75e639675b 100644 --- a/tests/viralloctest.c +++ b/tests/viralloctest.c @@ -44,7 +44,7 @@ testCheckNonNull(void *t) } =20 static int -testAllocScalar(const void *opaque ATTRIBUTE_UNUSED) +testAllocScalar(const void *opaque G_GNUC_UNUSED) { testDummyStruct *t; int ret =3D -1; @@ -76,7 +76,7 @@ testAllocScalar(const void *opaque ATTRIBUTE_UNUSED) =20 =20 static int -testAllocArray(const void *opaque ATTRIBUTE_UNUSED) +testAllocArray(const void *opaque G_GNUC_UNUSED) { testDummyStruct *t; size_t nt =3D 10, i; @@ -111,7 +111,7 @@ testAllocArray(const void *opaque ATTRIBUTE_UNUSED) =20 =20 static int -testReallocArray(const void *opaque ATTRIBUTE_UNUSED) +testReallocArray(const void *opaque G_GNUC_UNUSED) { testDummyStruct *t; size_t nt =3D 10, i; @@ -185,7 +185,7 @@ testReallocArray(const void *opaque ATTRIBUTE_UNUSED) =20 =20 static int -testExpandArray(const void *opaque ATTRIBUTE_UNUSED) +testExpandArray(const void *opaque G_GNUC_UNUSED) { testDummyStruct *t; size_t nt =3D 10, i; @@ -265,7 +265,7 @@ testExpandArray(const void *opaque ATTRIBUTE_UNUSED) =20 =20 static int -testResizeArray(const void *opaque ATTRIBUTE_UNUSED) +testResizeArray(const void *opaque G_GNUC_UNUSED) { testDummyStruct *t; size_t nt =3D 10, at, i; @@ -326,7 +326,7 @@ testResizeArray(const void *opaque ATTRIBUTE_UNUSED) =20 =20 static int -testInsertArray(const void *opaque ATTRIBUTE_UNUSED) +testInsertArray(const void *opaque G_GNUC_UNUSED) { testDummyStruct **t; size_t nt =3D 10, i; @@ -384,7 +384,7 @@ testInsertArray(const void *opaque ATTRIBUTE_UNUSED) =20 =20 static int -testDispose(const void *opaque ATTRIBUTE_UNUSED) +testDispose(const void *opaque G_GNUC_UNUSED) { int *num =3D NULL; int *nums =3D NULL; diff --git a/tests/viratomictest.c b/tests/viratomictest.c index a933ab1cbd..8c885a5b96 100644 --- a/tests/viratomictest.c +++ b/tests/viratomictest.c @@ -29,7 +29,7 @@ #include "virthread.h" =20 static int -testTypes(const void *data ATTRIBUTE_UNUSED) +testTypes(const void *data G_GNUC_UNUSED) { unsigned int u, u2; int s, s2; @@ -131,7 +131,7 @@ thread_func(void *data) } =20 static int -testThreads(const void *data ATTRIBUTE_UNUSED) +testThreads(const void *data G_GNUC_UNUSED) { int sum; size_t i; diff --git a/tests/virbitmaptest.c b/tests/virbitmaptest.c index cafe865dde..9fec1fcc6e 100644 --- a/tests/virbitmaptest.c +++ b/tests/virbitmaptest.c @@ -27,7 +27,7 @@ #include "virbitmap.h" =20 static int -test1(const void *data ATTRIBUTE_UNUSED) +test1(const void *data G_GNUC_UNUSED) { virBitmapPtr bitmap; int size; @@ -82,7 +82,7 @@ testBit(virBitmapPtr bitmap, } =20 static int -test2(const void *data ATTRIBUTE_UNUSED) +test2(const void *data G_GNUC_UNUSED) { const char *bitsString1 =3D "1-32,50,88-99,1021-1023"; char *bitsString2 =3D NULL; @@ -145,7 +145,7 @@ test2(const void *data ATTRIBUTE_UNUSED) } =20 static int -test3(const void *data ATTRIBUTE_UNUSED) +test3(const void *data G_GNUC_UNUSED) { virBitmapPtr bitmap =3D NULL; int ret =3D -1; @@ -173,7 +173,7 @@ test3(const void *data ATTRIBUTE_UNUSED) =20 /* test for virBitmapNextSetBit, virBitmapLastSetBit, virBitmapNextClearBi= t */ static int -test4(const void *data ATTRIBUTE_UNUSED) +test4(const void *data G_GNUC_UNUSED) { const char *bitsString =3D "0, 2-4, 6-10, 12, 14-18, 20, 22, 25"; int size =3D 40; @@ -296,7 +296,7 @@ test4(const void *data ATTRIBUTE_UNUSED) =20 /* test for virBitmapNewData/ToData/DataFormat */ static int -test5(const void *v ATTRIBUTE_UNUSED) +test5(const void *v G_GNUC_UNUSED) { char data[] =3D {0x01, 0x02, 0x00, 0x00, 0x04}; unsigned char *data2 =3D NULL; @@ -357,7 +357,7 @@ test5(const void *v ATTRIBUTE_UNUSED) =20 /* test for virBitmapFormat */ static int -test6(const void *v ATTRIBUTE_UNUSED) +test6(const void *v G_GNUC_UNUSED) { virBitmapPtr bitmap =3D NULL; char *str =3D NULL; @@ -439,7 +439,7 @@ test6(const void *v ATTRIBUTE_UNUSED) } =20 static int -test7(const void *v ATTRIBUTE_UNUSED) +test7(const void *v G_GNUC_UNUSED) { virBitmapPtr bitmap; size_t i; @@ -479,7 +479,7 @@ test7(const void *v ATTRIBUTE_UNUSED) } =20 static int -test8(const void *v ATTRIBUTE_UNUSED) +test8(const void *v G_GNUC_UNUSED) { virBitmapPtr bitmap =3D NULL; char data[108] =3D {0x00,}; @@ -507,7 +507,7 @@ test8(const void *v ATTRIBUTE_UNUSED) =20 /* test out of bounds conditions on virBitmapParse */ static int -test9(const void *opaque ATTRIBUTE_UNUSED) +test9(const void *opaque G_GNUC_UNUSED) { int ret =3D -1; virBitmapPtr bitmap =3D NULL; @@ -538,7 +538,7 @@ test9(const void *opaque ATTRIBUTE_UNUSED) } =20 static int -test10(const void *opaque ATTRIBUTE_UNUSED) +test10(const void *opaque G_GNUC_UNUSED) { int ret =3D -1; virBitmapPtr b1 =3D NULL, b2 =3D NULL, b3 =3D NULL, b4 =3D NULL; @@ -630,7 +630,7 @@ test11(const void *opaque) =20 /* test self-expanding bitmap APIs */ static int -test12(const void *opaque ATTRIBUTE_UNUSED) +test12(const void *opaque G_GNUC_UNUSED) { virBitmapPtr map =3D NULL; int ret =3D -1; @@ -672,7 +672,7 @@ test12(const void *opaque ATTRIBUTE_UNUSED) =20 /* virBitmap(New/To)String */ static int -test13(const void *opaque ATTRIBUTE_UNUSED) +test13(const void *opaque G_GNUC_UNUSED) { virBitmapPtr map =3D NULL; const char *strings[] =3D { "1234feebee", "000c0fefe" }; diff --git a/tests/virbuftest.c b/tests/virbuftest.c index a7eaef636d..f547afe7f7 100644 --- a/tests/virbuftest.c +++ b/tests/virbuftest.c @@ -52,7 +52,7 @@ static int testBufInfiniteLoop(const void *data) return ret; } =20 -static int testBufAutoIndent(const void *data ATTRIBUTE_UNUSED) +static int testBufAutoIndent(const void *data G_GNUC_UNUSED) { virBuffer bufinit =3D VIR_BUFFER_INITIALIZER; virBufferPtr buf =3D &bufinit; @@ -144,7 +144,7 @@ static int testBufAutoIndent(const void *data ATTRIBUTE= _UNUSED) return ret; } =20 -static int testBufTrim(const void *data ATTRIBUTE_UNUSED) +static int testBufTrim(const void *data G_GNUC_UNUSED) { virBuffer bufinit =3D VIR_BUFFER_INITIALIZER; virBufferPtr buf =3D NULL; @@ -192,7 +192,7 @@ static int testBufTrim(const void *data ATTRIBUTE_UNUSE= D) return ret; } =20 -static int testBufAddBuffer(const void *data ATTRIBUTE_UNUSED) +static int testBufAddBuffer(const void *data G_GNUC_UNUSED) { virBuffer buf1 =3D VIR_BUFFER_INITIALIZER; virBuffer buf2 =3D VIR_BUFFER_INITIALIZER; @@ -304,7 +304,7 @@ static int testBufAddBuffer(const void *data ATTRIBUTE_= UNUSED) } =20 static int -testBufAddBuffer2(const void *opaque ATTRIBUTE_UNUSED) +testBufAddBuffer2(const void *opaque G_GNUC_UNUSED) { VIR_AUTOCLEAN(virBuffer) buf1 =3D VIR_BUFFER_INITIALIZER; VIR_AUTOCLEAN(virBuffer) buf2 =3D VIR_BUFFER_INITIALIZER; @@ -335,7 +335,7 @@ struct testBufAddStrData { }; =20 static int -testBufAddStr(const void *opaque ATTRIBUTE_UNUSED) +testBufAddStr(const void *opaque G_GNUC_UNUSED) { const struct testBufAddStrData *data =3D opaque; virBuffer buf =3D VIR_BUFFER_INITIALIZER; @@ -368,7 +368,7 @@ testBufAddStr(const void *opaque ATTRIBUTE_UNUSED) =20 =20 static int -testBufEscapeStr(const void *opaque ATTRIBUTE_UNUSED) +testBufEscapeStr(const void *opaque G_GNUC_UNUSED) { const struct testBufAddStrData *data =3D opaque; virBuffer buf =3D VIR_BUFFER_INITIALIZER; @@ -430,7 +430,7 @@ testBufEscapeRegex(const void *opaque) =20 =20 static int -testBufSetIndent(const void *opaque ATTRIBUTE_UNUSED) +testBufSetIndent(const void *opaque G_GNUC_UNUSED) { virBuffer buf =3D VIR_BUFFER_INITIALIZER; char *actual; @@ -459,7 +459,7 @@ testBufSetIndent(const void *opaque ATTRIBUTE_UNUSED) =20 /* Result of this shows up only in valgrind or similar */ static int -testBufferAutoclean(const void *opaque ATTRIBUTE_UNUSED) +testBufferAutoclean(const void *opaque G_GNUC_UNUSED) { VIR_AUTOCLEAN(virBuffer) buf =3D VIR_BUFFER_INITIALIZER; =20 diff --git a/tests/vircapstest.c b/tests/vircapstest.c index 7fc0ebe4f6..8c5982c9ac 100644 --- a/tests/vircapstest.c +++ b/tests/vircapstest.c @@ -30,7 +30,7 @@ =20 =20 static int -test_virCapabilitiesGetCpusForNodemask(const void *data ATTRIBUTE_UNUSED) +test_virCapabilitiesGetCpusForNodemask(const void *data G_GNUC_UNUSED) { const char *nodestr =3D "3,4,5,6"; virBitmapPtr nodemask =3D NULL; @@ -63,7 +63,7 @@ test_virCapabilitiesGetCpusForNodemask(const void *data A= TTRIBUTE_UNUSED) } =20 =20 -static bool ATTRIBUTE_UNUSED +static bool G_GNUC_UNUSED doCapsExpectFailure(virCapsPtr caps, int ostype, virArch arch, @@ -82,7 +82,7 @@ doCapsExpectFailure(virCapsPtr caps, return true; } =20 -static bool ATTRIBUTE_UNUSED +static bool G_GNUC_UNUSED doCapsCompare(virCapsPtr caps, int ostype, virArch arch, @@ -153,7 +153,7 @@ doCapsCompare(virCapsPtr caps, =20 #ifdef WITH_QEMU static int -test_virCapsDomainDataLookupQEMU(const void *data ATTRIBUTE_UNUSED) +test_virCapsDomainDataLookupQEMU(const void *data G_GNUC_UNUSED) { int ret =3D 0; virCapsPtr caps =3D NULL; @@ -212,7 +212,7 @@ test_virCapsDomainDataLookupQEMU(const void *data ATTRI= BUTE_UNUSED) =20 #ifdef WITH_LXC static int -test_virCapsDomainDataLookupLXC(const void *data ATTRIBUTE_UNUSED) +test_virCapsDomainDataLookupLXC(const void *data G_GNUC_UNUSED) { int ret =3D 0; virCapsPtr caps =3D NULL; diff --git a/tests/vircgrouptest.c b/tests/vircgrouptest.c index e862b132f0..ec58d71a63 100644 --- a/tests/vircgrouptest.c +++ b/tests/vircgrouptest.c @@ -228,7 +228,7 @@ testCgroupDetectMounts(const void *args) } =20 =20 -static int testCgroupNewForSelf(const void *args ATTRIBUTE_UNUSED) +static int testCgroupNewForSelf(const void *args G_GNUC_UNUSED) { virCgroupPtr cgroup =3D NULL; int ret =3D -1; @@ -268,7 +268,7 @@ static int testCgroupNewForSelf(const void *args ATTRIB= UTE_UNUSED) /* Asking for impossible combination since CPU is co-mounted */ =20 =20 -static int testCgroupNewForPartition(const void *args ATTRIBUTE_UNUSED) +static int testCgroupNewForPartition(const void *args G_GNUC_UNUSED) { virCgroupPtr cgroup =3D NULL; int ret =3D -1; @@ -342,7 +342,7 @@ static int testCgroupNewForPartition(const void *args A= TTRIBUTE_UNUSED) } =20 =20 -static int testCgroupNewForPartitionNested(const void *args ATTRIBUTE_UNUS= ED) +static int testCgroupNewForPartitionNested(const void *args G_GNUC_UNUSED) { virCgroupPtr cgroup =3D NULL; int ret =3D -1; @@ -392,7 +392,7 @@ static int testCgroupNewForPartitionNested(const void *= args ATTRIBUTE_UNUSED) } =20 =20 -static int testCgroupNewForPartitionNestedDeep(const void *args ATTRIBUTE_= UNUSED) +static int testCgroupNewForPartitionNestedDeep(const void *args G_GNUC_UNU= SED) { virCgroupPtr cgroup =3D NULL; int ret =3D -1; @@ -449,7 +449,7 @@ static int testCgroupNewForPartitionNestedDeep(const vo= id *args ATTRIBUTE_UNUSED =20 =20 =20 -static int testCgroupNewForPartitionDomain(const void *args ATTRIBUTE_UNUS= ED) +static int testCgroupNewForPartitionDomain(const void *args G_GNUC_UNUSED) { virCgroupPtr partitioncgroup =3D NULL; virCgroupPtr domaincgroup =3D NULL; @@ -484,7 +484,7 @@ static int testCgroupNewForPartitionDomain(const void *= args ATTRIBUTE_UNUSED) return ret; } =20 -static int testCgroupNewForPartitionDomainEscaped(const void *args ATTRIBU= TE_UNUSED) +static int testCgroupNewForPartitionDomainEscaped(const void *args G_GNUC_= UNUSED) { virCgroupPtr partitioncgroup1 =3D NULL; virCgroupPtr partitioncgroup2 =3D NULL; @@ -537,7 +537,7 @@ static int testCgroupNewForPartitionDomainEscaped(const= void *args ATTRIBUTE_UNU return ret; } =20 -static int testCgroupNewForSelfAllInOne(const void *args ATTRIBUTE_UNUSED) +static int testCgroupNewForSelfAllInOne(const void *args G_GNUC_UNUSED) { virCgroupPtr cgroup =3D NULL; int ret =3D -1; @@ -564,7 +564,7 @@ static int testCgroupNewForSelfAllInOne(const void *arg= s ATTRIBUTE_UNUSED) } =20 =20 -static int testCgroupNewForSelfLogind(const void *args ATTRIBUTE_UNUSED) +static int testCgroupNewForSelfLogind(const void *args G_GNUC_UNUSED) { virCgroupPtr cgroup =3D NULL; =20 @@ -578,7 +578,7 @@ static int testCgroupNewForSelfLogind(const void *args = ATTRIBUTE_UNUSED) } =20 =20 -static int testCgroupNewForSelfUnified(const void *args ATTRIBUTE_UNUSED) +static int testCgroupNewForSelfUnified(const void *args G_GNUC_UNUSED) { virCgroupPtr cgroup =3D NULL; int ret =3D -1; @@ -602,7 +602,7 @@ static int testCgroupNewForSelfUnified(const void *args= ATTRIBUTE_UNUSED) } =20 =20 -static int testCgroupNewForSelfHybrid(const void *args ATTRIBUTE_UNUSED) +static int testCgroupNewForSelfHybrid(const void *args G_GNUC_UNUSED) { virCgroupPtr cgroup =3D NULL; int ret =3D -1; @@ -655,7 +655,7 @@ static int testCgroupAvailable(const void *args) return 0; } =20 -static int testCgroupControllerAvailable(const void *args ATTRIBUTE_UNUSED) +static int testCgroupControllerAvailable(const void *args G_GNUC_UNUSED) { int ret =3D 0; =20 @@ -683,7 +683,7 @@ static int testCgroupControllerAvailable(const void *ar= gs ATTRIBUTE_UNUSED) return ret; } =20 -static int testCgroupGetPercpuStats(const void *args ATTRIBUTE_UNUSED) +static int testCgroupGetPercpuStats(const void *args G_GNUC_UNUSED) { virCgroupPtr cgroup =3D NULL; size_t i; @@ -768,7 +768,7 @@ static int testCgroupGetPercpuStats(const void *args AT= TRIBUTE_UNUSED) return ret; } =20 -static int testCgroupGetMemoryUsage(const void *args ATTRIBUTE_UNUSED) +static int testCgroupGetMemoryUsage(const void *args G_GNUC_UNUSED) { virCgroupPtr cgroup =3D NULL; int rv, ret =3D -1; @@ -802,7 +802,7 @@ static int testCgroupGetMemoryUsage(const void *args AT= TRIBUTE_UNUSED) =20 =20 static int -testCgroupGetMemoryStat(const void *args ATTRIBUTE_UNUSED) +testCgroupGetMemoryStat(const void *args G_GNUC_UNUSED) { virCgroupPtr cgroup =3D NULL; int rv; @@ -861,7 +861,7 @@ testCgroupGetMemoryStat(const void *args ATTRIBUTE_UNUS= ED) } =20 =20 -static int testCgroupGetBlkioIoServiced(const void *args ATTRIBUTE_UNUSED) +static int testCgroupGetBlkioIoServiced(const void *args G_GNUC_UNUSED) { virCgroupPtr cgroup =3D NULL; size_t i; @@ -911,7 +911,7 @@ static int testCgroupGetBlkioIoServiced(const void *arg= s ATTRIBUTE_UNUSED) return ret; } =20 -static int testCgroupGetBlkioIoDeviceServiced(const void *args ATTRIBUTE_U= NUSED) +static int testCgroupGetBlkioIoDeviceServiced(const void *args G_GNUC_UNUS= ED) { virCgroupPtr cgroup =3D NULL; size_t i; diff --git a/tests/virconftest.c b/tests/virconftest.c index f61e4ea9d5..eb8c9cb579 100644 --- a/tests/virconftest.c +++ b/tests/virconftest.c @@ -72,7 +72,7 @@ static int testConfRoundTrip(const void *opaque) } =20 =20 -static int testConfMemoryNoNewline(const void *opaque ATTRIBUTE_UNUSED) +static int testConfMemoryNoNewline(const void *opaque G_GNUC_UNUSED) { const char *srcdata =3D \ "ullong =3D '123456789'\n" \ @@ -137,7 +137,7 @@ static int testConfMemoryNoNewline(const void *opaque A= TTRIBUTE_UNUSED) } =20 =20 -static int testConfParseInt(const void *opaque ATTRIBUTE_UNUSED) +static int testConfParseInt(const void *opaque G_GNUC_UNUSED) { const char *srcdata =3D \ "int =3D -1729\n" \ @@ -285,7 +285,7 @@ static int testConfParseInt(const void *opaque ATTRIBUT= E_UNUSED) return 0; } =20 -static int testConfParseBool(const void *opaque ATTRIBUTE_UNUSED) +static int testConfParseBool(const void *opaque G_GNUC_UNUSED) { const char *srcdata =3D \ "false =3D 0\n" \ @@ -346,7 +346,7 @@ static int testConfParseBool(const void *opaque ATTRIBU= TE_UNUSED) } =20 =20 -static int testConfParseString(const void *opaque ATTRIBUTE_UNUSED) +static int testConfParseString(const void *opaque G_GNUC_UNUSED) { const char *srcdata =3D \ "int =3D 6963472309248\n" \ @@ -385,7 +385,7 @@ static int testConfParseString(const void *opaque ATTRI= BUTE_UNUSED) } =20 =20 -static int testConfParseStringList(const void *opaque ATTRIBUTE_UNUSED) +static int testConfParseStringList(const void *opaque G_GNUC_UNUSED) { const char *srcdata =3D \ "string_list =3D [\"foo\", \"bar\"]\n" \ diff --git a/tests/virdbustest.c b/tests/virdbustest.c index ec380e8fc2..f9c2fb9587 100644 --- a/tests/virdbustest.c +++ b/tests/virdbustest.c @@ -47,7 +47,7 @@ VIR_LOG_INIT("tests.dbustest"); } \ } while (0) =20 -static int testMessageSimple(const void *args ATTRIBUTE_UNUSED) +static int testMessageSimple(const void *args G_GNUC_UNUSED) { DBusMessage *msg =3D NULL; int ret =3D -1; @@ -123,7 +123,7 @@ static int testMessageSimple(const void *args ATTRIBUTE= _UNUSED) } =20 =20 -static int testMessageVariant(const void *args ATTRIBUTE_UNUSED) +static int testMessageVariant(const void *args G_GNUC_UNUSED) { DBusMessage *msg =3D NULL; int ret =3D -1; @@ -172,7 +172,7 @@ static int testMessageVariant(const void *args ATTRIBUT= E_UNUSED) return ret; } =20 -static int testMessageArray(const void *args ATTRIBUTE_UNUSED) +static int testMessageArray(const void *args G_GNUC_UNUSED) { DBusMessage *msg =3D NULL; int ret =3D -1; @@ -231,7 +231,7 @@ static int testMessageArray(const void *args ATTRIBUTE_= UNUSED) return ret; } =20 -static int testMessageEmptyArrayRef(const void *args ATTRIBUTE_UNUSED) +static int testMessageEmptyArrayRef(const void *args G_GNUC_UNUSED) { DBusMessage *msg =3D NULL; int ret =3D -1; @@ -275,7 +275,7 @@ static int testMessageEmptyArrayRef(const void *args AT= TRIBUTE_UNUSED) return ret; } =20 -static int testMessageSingleArrayRef(const void *args ATTRIBUTE_UNUSED) +static int testMessageSingleArrayRef(const void *args G_GNUC_UNUSED) { DBusMessage *msg =3D NULL; int ret =3D -1; @@ -325,7 +325,7 @@ static int testMessageSingleArrayRef(const void *args A= TTRIBUTE_UNUSED) return ret; } =20 -static int testMessageArrayRef(const void *args ATTRIBUTE_UNUSED) +static int testMessageArrayRef(const void *args G_GNUC_UNUSED) { DBusMessage *msg =3D NULL; int ret =3D -1; @@ -438,7 +438,7 @@ static int testMessageArrayRef(const void *args ATTRIBU= TE_UNUSED) return ret; } =20 -static int testMessageStruct(const void *args ATTRIBUTE_UNUSED) +static int testMessageStruct(const void *args G_GNUC_UNUSED) { DBusMessage *msg =3D NULL; int ret =3D -1; @@ -514,7 +514,7 @@ static int testMessageStruct(const void *args ATTRIBUTE= _UNUSED) } =20 =20 -static int testMessageDict(const void *args ATTRIBUTE_UNUSED) +static int testMessageDict(const void *args G_GNUC_UNUSED) { DBusMessage *msg =3D NULL; int ret =3D -1; @@ -583,7 +583,7 @@ static int testMessageDict(const void *args ATTRIBUTE_U= NUSED) return ret; } =20 -static int testMessageDictRef(const void *args ATTRIBUTE_UNUSED) +static int testMessageDictRef(const void *args G_GNUC_UNUSED) { DBusMessage *msg =3D NULL; int ret =3D -1; @@ -654,7 +654,7 @@ static int testMessageDictRef(const void *args ATTRIBUT= E_UNUSED) return ret; } =20 -static int testMessageEmptyDictRef(const void *args ATTRIBUTE_UNUSED) +static int testMessageEmptyDictRef(const void *args G_GNUC_UNUSED) { DBusMessage *msg =3D NULL; int ret =3D -1; diff --git a/tests/virdeterministichashmock.c b/tests/virdeterministichashm= ock.c index 3237f56a6c..4d0c88f600 100644 --- a/tests/virdeterministichashmock.c +++ b/tests/virdeterministichashmock.c @@ -23,7 +23,7 @@ uint32_t virHashCodeGen(const void *key, size_t len, - uint32_t seed ATTRIBUTE_UNUSED) + uint32_t seed G_GNUC_UNUSED) { const uint8_t *k =3D key; uint32_t h =3D 0; diff --git a/tests/virendiantest.c b/tests/virendiantest.c index 263acc8e52..7e2eff66dc 100644 --- a/tests/virendiantest.c +++ b/tests/virendiantest.c @@ -24,7 +24,7 @@ #include "virendian.h" =20 static int -test1(const void *data ATTRIBUTE_UNUSED) +test1(const void *data G_GNUC_UNUSED) { /* Regular char should work, even if signed, and even with * unaligned access. */ @@ -65,7 +65,7 @@ test1(const void *data ATTRIBUTE_UNUSED) } =20 static int -test2(const void *data ATTRIBUTE_UNUSED) +test2(const void *data G_GNUC_UNUSED) { /* Unsigned char should work without cast, even if unaligned access. = */ unsigned char array[] =3D { 1, 2, 3, 4, 5, 6, 7, 8, diff --git a/tests/virerrortest.c b/tests/virerrortest.c index 63ba84c2f9..85f4071ae8 100644 --- a/tests/virerrortest.c +++ b/tests/virerrortest.c @@ -53,7 +53,7 @@ virErrorTestMsgFormatInfoOne(const char *msg) =20 =20 static int -virErrorTestMsgs(const void *opaque ATTRIBUTE_UNUSED) +virErrorTestMsgs(const void *opaque G_GNUC_UNUSED) { const char *err_noinfo; const char *err_info; diff --git a/tests/virfilecachemock.c b/tests/virfilecachemock.c index a7476bce2e..15091c7af9 100644 --- a/tests/virfilecachemock.c +++ b/tests/virfilecachemock.c @@ -25,7 +25,7 @@ =20 =20 int -unlink(const char *path ATTRIBUTE_UNUSED) +unlink(const char *path G_GNUC_UNUSED) { return 0; } diff --git a/tests/virfilecachetest.c b/tests/virfilecachetest.c index a17086e004..e3c6401934 100644 --- a/tests/virfilecachetest.c +++ b/tests/virfilecachetest.c @@ -103,7 +103,7 @@ testFileCacheIsValid(void *data, =20 =20 static void * -testFileCacheNewData(const char *name ATTRIBUTE_UNUSED, +testFileCacheNewData(const char *name G_GNUC_UNUSED, void *priv) { testFileCachePrivPtr testPriv =3D priv; @@ -114,8 +114,8 @@ testFileCacheNewData(const char *name ATTRIBUTE_UNUSED, =20 static void * testFileCacheLoadFile(const char *filename, - const char *name ATTRIBUTE_UNUSED, - void *priv ATTRIBUTE_UNUSED) + const char *name G_GNUC_UNUSED, + void *priv G_GNUC_UNUSED) { testFileCacheObjPtr obj; char *data; @@ -131,8 +131,8 @@ testFileCacheLoadFile(const char *filename, =20 =20 static int -testFileCacheSaveFile(void *data ATTRIBUTE_UNUSED, - const char *filename ATTRIBUTE_UNUSED, +testFileCacheSaveFile(void *data G_GNUC_UNUSED, + const char *filename G_GNUC_UNUSED, void *priv) { testFileCachePrivPtr testPriv =3D priv; diff --git a/tests/virfiletest.c b/tests/virfiletest.c index 14be2d9d60..cda29bb735 100644 --- a/tests/virfiletest.c +++ b/tests/virfiletest.c @@ -236,8 +236,8 @@ holesSupported(void) #else /* !HAVE_DECL_SEEK_HOLE || !defined(__linux__)*/ =20 static int -makeSparseFile(const off_t offsets[] ATTRIBUTE_UNUSED, - const bool startData ATTRIBUTE_UNUSED) +makeSparseFile(const off_t offsets[] G_GNUC_UNUSED, + const bool startData G_GNUC_UNUSED) { return -1; } @@ -315,7 +315,7 @@ struct testFileIsSharedFSType { }; =20 static int -testFileIsSharedFSType(const void *opaque ATTRIBUTE_UNUSED) +testFileIsSharedFSType(const void *opaque G_GNUC_UNUSED) { #ifndef __linux__ return EXIT_AM_SKIP; diff --git a/tests/virfirewalltest.c b/tests/virfirewalltest.c index 7e4e80e09b..3325986b2d 100644 --- a/tests/virfirewalltest.c +++ b/tests/virfirewalltest.c @@ -322,7 +322,7 @@ testFirewallRemoveRule(const void *opaque) =20 =20 static int -testFirewallManyGroups(const void *opaque ATTRIBUTE_UNUSED) +testFirewallManyGroups(const void *opaque G_GNUC_UNUSED) { virBuffer cmdbuf =3D VIR_BUFFER_INITIALIZER; virFirewallPtr fw =3D NULL; @@ -395,12 +395,12 @@ testFirewallManyGroups(const void *opaque ATTRIBUTE_U= NUSED) =20 static void testFirewallRollbackHook(const char *const*args, - const char *const*env ATTRIBUTE_UNUSED, - const char *input ATTRIBUTE_UNUSED, - char **output ATTRIBUTE_UNUSED, - char **error ATTRIBUTE_UNUSED, + const char *const*env G_GNUC_UNUSED, + const char *input G_GNUC_UNUSED, + char **output G_GNUC_UNUSED, + char **error G_GNUC_UNUSED, int *status, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { bool isAdd =3D false; while (*args) { @@ -416,7 +416,7 @@ testFirewallRollbackHook(const char *const*args, } =20 static int -testFirewallIgnoreFailGroup(const void *opaque ATTRIBUTE_UNUSED) +testFirewallIgnoreFailGroup(const void *opaque G_GNUC_UNUSED) { virBuffer cmdbuf =3D VIR_BUFFER_INITIALIZER; virFirewallPtr fw =3D NULL; @@ -491,7 +491,7 @@ testFirewallIgnoreFailGroup(const void *opaque ATTRIBUT= E_UNUSED) =20 =20 static int -testFirewallIgnoreFailRule(const void *opaque ATTRIBUTE_UNUSED) +testFirewallIgnoreFailRule(const void *opaque G_GNUC_UNUSED) { virBuffer cmdbuf =3D VIR_BUFFER_INITIALIZER; virFirewallPtr fw =3D NULL; @@ -565,7 +565,7 @@ testFirewallIgnoreFailRule(const void *opaque ATTRIBUTE= _UNUSED) =20 =20 static int -testFirewallNoRollback(const void *opaque ATTRIBUTE_UNUSED) +testFirewallNoRollback(const void *opaque G_GNUC_UNUSED) { virBuffer cmdbuf =3D VIR_BUFFER_INITIALIZER; virFirewallPtr fw =3D NULL; @@ -632,7 +632,7 @@ testFirewallNoRollback(const void *opaque ATTRIBUTE_UNU= SED) } =20 static int -testFirewallSingleRollback(const void *opaque ATTRIBUTE_UNUSED) +testFirewallSingleRollback(const void *opaque G_GNUC_UNUSED) { virBuffer cmdbuf =3D VIR_BUFFER_INITIALIZER; virFirewallPtr fw =3D NULL; @@ -719,7 +719,7 @@ testFirewallSingleRollback(const void *opaque ATTRIBUTE= _UNUSED) } =20 static int -testFirewallManyRollback(const void *opaque ATTRIBUTE_UNUSED) +testFirewallManyRollback(const void *opaque G_GNUC_UNUSED) { virBuffer cmdbuf =3D VIR_BUFFER_INITIALIZER; virFirewallPtr fw =3D NULL; @@ -809,7 +809,7 @@ testFirewallManyRollback(const void *opaque ATTRIBUTE_U= NUSED) } =20 static int -testFirewallChainedRollback(const void *opaque ATTRIBUTE_UNUSED) +testFirewallChainedRollback(const void *opaque G_GNUC_UNUSED) { virBuffer cmdbuf =3D VIR_BUFFER_INITIALIZER; virFirewallPtr fw =3D NULL; @@ -957,12 +957,12 @@ static bool expectedLineError; =20 static void testFirewallQueryHook(const char *const*args, - const char *const*env ATTRIBUTE_UNUSED, - const char *input ATTRIBUTE_UNUSED, + const char *const*env G_GNUC_UNUSED, + const char *input G_GNUC_UNUSED, char **output, - char **error ATTRIBUTE_UNUSED, + char **error G_GNUC_UNUSED, int *status, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { if (STREQ(args[0], IPTABLES_PATH) && STREQ(args[1], "-L")) { @@ -982,7 +982,7 @@ static int testFirewallQueryCallback(virFirewallPtr fw, virFirewallLayer layer, const char *const *lines, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { size_t i; virFirewallAddRule(fw, layer, @@ -1008,7 +1008,7 @@ testFirewallQueryCallback(virFirewallPtr fw, } =20 static int -testFirewallQuery(const void *opaque ATTRIBUTE_UNUSED) +testFirewallQuery(const void *opaque G_GNUC_UNUSED) { virBuffer cmdbuf =3D VIR_BUFFER_INITIALIZER; virFirewallPtr fw =3D NULL; diff --git a/tests/virhashtest.c b/tests/virhashtest.c index 2355e7bc63..1e9098e0e6 100644 --- a/tests/virhashtest.c +++ b/tests/virhashtest.c @@ -51,9 +51,9 @@ testHashInit(int size) } =20 static int -testHashCheckForEachCount(void *payload ATTRIBUTE_UNUSED, - const void *name ATTRIBUTE_UNUSED, - void *data ATTRIBUTE_UNUSED) +testHashCheckForEachCount(void *payload G_GNUC_UNUSED, + const void *name G_GNUC_UNUSED, + void *data G_GNUC_UNUSED) { size_t *count =3D data; *count +=3D 1; @@ -110,7 +110,7 @@ testHashGrow(const void *data) =20 =20 static int -testHashUpdate(const void *data ATTRIBUTE_UNUSED) +testHashUpdate(const void *data G_GNUC_UNUSED) { int count =3D ARRAY_CARDINALITY(uuids) + ARRAY_CARDINALITY(uuids_new); virHashTablePtr hash; @@ -148,7 +148,7 @@ testHashUpdate(const void *data ATTRIBUTE_UNUSED) =20 =20 static int -testHashRemove(const void *data ATTRIBUTE_UNUSED) +testHashRemove(const void *data G_GNUC_UNUSED) { int count =3D ARRAY_CARDINALITY(uuids) - ARRAY_CARDINALITY(uuids_subse= t); virHashTablePtr hash; @@ -181,7 +181,7 @@ const int testHashCountRemoveForEachSome =3D ARRAY_CARDINALITY(uuids) - ARRAY_CARDINALITY(uuids_subset); =20 static int -testHashRemoveForEachSome(void *payload ATTRIBUTE_UNUSED, +testHashRemoveForEachSome(void *payload G_GNUC_UNUSED, const void *name, void *data) { @@ -204,7 +204,7 @@ testHashRemoveForEachSome(void *payload ATTRIBUTE_UNUSE= D, const int testHashCountRemoveForEachAll =3D 0; =20 static int -testHashRemoveForEachAll(void *payload ATTRIBUTE_UNUSED, +testHashRemoveForEachAll(void *payload G_GNUC_UNUSED, const void *name, void *data) { @@ -242,7 +242,7 @@ testHashRemoveForEach(const void *data) =20 =20 static int -testHashSteal(const void *data ATTRIBUTE_UNUSED) +testHashSteal(const void *data G_GNUC_UNUSED) { int count =3D ARRAY_CARDINALITY(uuids) - ARRAY_CARDINALITY(uuids_subse= t); virHashTablePtr hash; @@ -272,7 +272,7 @@ testHashSteal(const void *data ATTRIBUTE_UNUSED) =20 =20 static int -testHashRemoveSetIter(const void *payload ATTRIBUTE_UNUSED, +testHashRemoveSetIter(const void *payload G_GNUC_UNUSED, const void *name, const void *data) { @@ -296,7 +296,7 @@ testHashRemoveSetIter(const void *payload ATTRIBUTE_UNU= SED, } =20 static int -testHashRemoveSet(const void *data ATTRIBUTE_UNUSED) +testHashRemoveSet(const void *data G_GNUC_UNUSED) { virHashTablePtr hash; int count =3D 0; @@ -332,15 +332,15 @@ testHashRemoveSet(const void *data ATTRIBUTE_UNUSED) const int testSearchIndex =3D ARRAY_CARDINALITY(uuids_subset) / 2; =20 static int -testHashSearchIter(const void *payload ATTRIBUTE_UNUSED, +testHashSearchIter(const void *payload G_GNUC_UNUSED, const void *name, - const void *data ATTRIBUTE_UNUSED) + const void *data G_GNUC_UNUSED) { return STREQ(uuids_subset[testSearchIndex], name); } =20 static int -testHashSearch(const void *data ATTRIBUTE_UNUSED) +testHashSearch(const void *data G_GNUC_UNUSED) { virHashTablePtr hash; void *entry; @@ -383,7 +383,7 @@ testHashGetItemsCompValue(const virHashKeyValuePair *a, } =20 static int -testHashGetItems(const void *data ATTRIBUTE_UNUSED) +testHashGetItems(const void *data G_GNUC_UNUSED) { virHashTablePtr hash; virHashKeyValuePairPtr array =3D NULL; @@ -450,7 +450,7 @@ testHashEqualCompValue(const void *value1, const void *= value2) } =20 static int -testHashEqual(const void *data ATTRIBUTE_UNUSED) +testHashEqual(const void *data G_GNUC_UNUSED) { virHashTablePtr hash1, hash2 =3D NULL; int ret =3D -1; diff --git a/tests/virhostdevtest.c b/tests/virhostdevtest.c index 46627355c3..2cf2a6decf 100644 --- a/tests/virhostdevtest.c +++ b/tests/virhostdevtest.c @@ -390,7 +390,7 @@ testVirHostdevUpdateActivePCIHostdevs(void) * 2. Reattach devices to the host */ static int -testVirHostdevRoundtripNoGuest(const void *opaque ATTRIBUTE_UNUSED) +testVirHostdevRoundtripNoGuest(const void *opaque G_GNUC_UNUSED) { if (testVirHostdevDetachPCINodeDevice() < 0) return -1; @@ -412,7 +412,7 @@ testVirHostdevRoundtripNoGuest(const void *opaque ATTRI= BUTE_UNUSED) * 4. Reattach devices to the host */ static int -testVirHostdevRoundtripUnmanaged(const void *opaque ATTRIBUTE_UNUSED) +testVirHostdevRoundtripUnmanaged(const void *opaque G_GNUC_UNUSED) { if (testVirHostdevDetachPCINodeDevice() < 0) return -1; @@ -436,7 +436,7 @@ testVirHostdevRoundtripUnmanaged(const void *opaque ATT= RIBUTE_UNUSED) * 2. Detach devices from the guest as managed */ static int -testVirHostdevRoundtripManaged(const void *opaque ATTRIBUTE_UNUSED) +testVirHostdevRoundtripManaged(const void *opaque G_GNUC_UNUSED) { if (testVirHostdevPreparePCIHostdevs_managed(false) < 0) return -1; @@ -459,7 +459,7 @@ testVirHostdevRoundtripManaged(const void *opaque ATTRI= BUTE_UNUSED) * 4. Reattach devices to the host */ static int -testVirHostdevRoundtripMixed(const void *opaque ATTRIBUTE_UNUSED) +testVirHostdevRoundtripMixed(const void *opaque G_GNUC_UNUSED) { if (testVirHostdevDetachPCINodeDevice() < 0) return -1; @@ -483,7 +483,7 @@ testVirHostdevRoundtripMixed(const void *opaque ATTRIBU= TE_UNUSED) * 2. Update list of active devices */ static int -testVirHostdevOther(const void *opaque ATTRIBUTE_UNUSED) +testVirHostdevOther(const void *opaque G_GNUC_UNUSED) { if (testVirHostdevResetPCINodeDevice() < 0) return -1; diff --git a/tests/viridentitytest.c b/tests/viridentitytest.c index 90e7247817..3f87af1c3b 100644 --- a/tests/viridentitytest.c +++ b/tests/viridentitytest.c @@ -36,7 +36,7 @@ =20 VIR_LOG_INIT("tests.identitytest"); =20 -static int testIdentityAttrs(const void *data ATTRIBUTE_UNUSED) +static int testIdentityAttrs(const void *data G_GNUC_UNUSED) { g_autoptr(virIdentity) ident =3D virIdentityNew(); const char *val; @@ -117,7 +117,7 @@ static int testIdentityGetSystem(const void *data) return 0; } =20 -static int testSetFakeSELinuxContext(const void *data ATTRIBUTE_UNUSED) +static int testSetFakeSELinuxContext(const void *data G_GNUC_UNUSED) { #if WITH_SELINUX return setcon_raw((security_context_t)data); @@ -127,7 +127,7 @@ static int testSetFakeSELinuxContext(const void *data A= TTRIBUTE_UNUSED) #endif } =20 -static int testDisableFakeSELinux(const void *data ATTRIBUTE_UNUSED) +static int testDisableFakeSELinux(const void *data G_GNUC_UNUSED) { #if WITH_SELINUX return security_disable(); diff --git a/tests/viriscsitest.c b/tests/viriscsitest.c index 1ce039425b..6ebe404762 100644 --- a/tests/viriscsitest.c +++ b/tests/viriscsitest.c @@ -73,10 +73,10 @@ struct testIscsiadmCbData { }; =20 static void testIscsiadmCb(const char *const*args, - const char *const*env ATTRIBUTE_UNUSED, - const char *input ATTRIBUTE_UNUSED, + const char *const*env G_GNUC_UNUSED, + const char *input G_GNUC_UNUSED, char **output, - char **error ATTRIBUTE_UNUSED, + char **error G_GNUC_UNUSED, int *status, void *opaque) { diff --git a/tests/virjsontest.c b/tests/virjsontest.c index 81da89a6b0..2fe0ea1fb6 100644 --- a/tests/virjsontest.c +++ b/tests/virjsontest.c @@ -385,7 +385,7 @@ testJSONDeflatten(const void *data) =20 =20 static int -testJSONEscapeObj(const void *data ATTRIBUTE_UNUSED) +testJSONEscapeObj(const void *data G_GNUC_UNUSED) { VIR_AUTOPTR(virJSONValue) json =3D NULL; VIR_AUTOPTR(virJSONValue) nestjson =3D NULL; @@ -437,7 +437,7 @@ testJSONEscapeObj(const void *data ATTRIBUTE_UNUSED) =20 =20 static int -testJSONObjectFormatSteal(const void *opaque ATTRIBUTE_UNUSED) +testJSONObjectFormatSteal(const void *opaque G_GNUC_UNUSED) { VIR_AUTOPTR(virJSONValue) a1 =3D NULL; VIR_AUTOPTR(virJSONValue) a2 =3D NULL; diff --git a/tests/virkeycodetest.c b/tests/virkeycodetest.c index 963e9e0977..c2e756cdd0 100644 --- a/tests/virkeycodetest.c +++ b/tests/virkeycodetest.c @@ -33,7 +33,7 @@ =20 VIR_LOG_INIT("tests.keycodetest"); =20 -static int testKeycodeMapping(const void *data ATTRIBUTE_UNUSED) +static int testKeycodeMapping(const void *data G_GNUC_UNUSED) { int ret =3D -1; int got; @@ -66,7 +66,7 @@ static int testKeycodeMapping(const void *data ATTRIBUTE_= UNUSED) } =20 =20 -static int testKeycodeStrings(const void *data ATTRIBUTE_UNUSED) +static int testKeycodeStrings(const void *data G_GNUC_UNUSED) { int ret =3D -1; int got; diff --git a/tests/virkeyfiletest.c b/tests/virkeyfiletest.c index 4276149163..b1236a47e1 100644 --- a/tests/virkeyfiletest.c +++ b/tests/virkeyfiletest.c @@ -31,7 +31,7 @@ =20 VIR_LOG_INIT("tests.keyfiletest"); =20 -static int testParse(const void *args ATTRIBUTE_UNUSED) +static int testParse(const void *args G_GNUC_UNUSED) { static const char *cfg1 =3D "# Some config\n" diff --git a/tests/virkmodtest.c b/tests/virkmodtest.c index 80029244ff..853f4ea14e 100644 --- a/tests/virkmodtest.c +++ b/tests/virkmodtest.c @@ -36,7 +36,7 @@ struct testInfo { # define VIR_FROM_THIS VIR_FROM_NONE =20 static int -testKModConfig(const void *args ATTRIBUTE_UNUSED) +testKModConfig(const void *args G_GNUC_UNUSED) { int ret =3D -1; char *outbuf =3D NULL; diff --git a/tests/virlockspacetest.c b/tests/virlockspacetest.c index 991e587db6..57deb288a9 100644 --- a/tests/virlockspacetest.c +++ b/tests/virlockspacetest.c @@ -36,7 +36,7 @@ VIR_LOG_INIT("tests.lockspacetest"); =20 #define LOCKSPACE_DIR abs_builddir "/virlockspacedata" =20 -static int testLockSpaceCreate(const void *args ATTRIBUTE_UNUSED) +static int testLockSpaceCreate(const void *args G_GNUC_UNUSED) { virLockSpacePtr lockspace; int ret =3D -1; @@ -58,7 +58,7 @@ static int testLockSpaceCreate(const void *args ATTRIBUTE= _UNUSED) } =20 =20 -static int testLockSpaceResourceLifecycle(const void *args ATTRIBUTE_UNUSE= D) +static int testLockSpaceResourceLifecycle(const void *args G_GNUC_UNUSED) { virLockSpacePtr lockspace; int ret =3D -1; @@ -92,7 +92,7 @@ static int testLockSpaceResourceLifecycle(const void *arg= s ATTRIBUTE_UNUSED) } =20 =20 -static int testLockSpaceResourceLockExcl(const void *args ATTRIBUTE_UNUSED) +static int testLockSpaceResourceLockExcl(const void *args G_GNUC_UNUSED) { virLockSpacePtr lockspace; int ret =3D -1; @@ -138,7 +138,7 @@ static int testLockSpaceResourceLockExcl(const void *ar= gs ATTRIBUTE_UNUSED) } =20 =20 -static int testLockSpaceResourceLockExclAuto(const void *args ATTRIBUTE_UN= USED) +static int testLockSpaceResourceLockExclAuto(const void *args G_GNUC_UNUSE= D) { virLockSpacePtr lockspace; int ret =3D -1; @@ -176,7 +176,7 @@ static int testLockSpaceResourceLockExclAuto(const void= *args ATTRIBUTE_UNUSED) } =20 =20 -static int testLockSpaceResourceLockShr(const void *args ATTRIBUTE_UNUSED) +static int testLockSpaceResourceLockShr(const void *args G_GNUC_UNUSED) { virLockSpacePtr lockspace; int ret =3D -1; @@ -230,7 +230,7 @@ static int testLockSpaceResourceLockShr(const void *arg= s ATTRIBUTE_UNUSED) } =20 =20 -static int testLockSpaceResourceLockShrAuto(const void *args ATTRIBUTE_UNU= SED) +static int testLockSpaceResourceLockShrAuto(const void *args G_GNUC_UNUSED) { virLockSpacePtr lockspace; int ret =3D -1; @@ -290,7 +290,7 @@ static int testLockSpaceResourceLockShrAuto(const void = *args ATTRIBUTE_UNUSED) } =20 =20 -static int testLockSpaceResourceLockPath(const void *args ATTRIBUTE_UNUSED) +static int testLockSpaceResourceLockPath(const void *args G_GNUC_UNUSED) { virLockSpacePtr lockspace; int ret =3D -1; diff --git a/tests/virmock.h b/tests/virmock.h index 7520bb5d6e..95feeb0d92 100644 --- a/tests/virmock.h +++ b/tests/virmock.h @@ -34,7 +34,7 @@ #define VIR_MOCK_ARGNAME(a, b) b #define VIR_MOCK_ARGTYPE(a, b) a #define VIR_MOCK_ARGTYPENAME(a, b) a b -#define VIR_MOCK_ARGTYPENAME_UNUSED(a, b) a b ATTRIBUTE_UNUSED +#define VIR_MOCK_ARGTYPENAME_UNUSED(a, b) a b G_GNUC_UNUSED =20 #define VIR_MOCK_GET_ARG2(z, a, b) z(a, b) #define VIR_MOCK_GET_ARG3(z, a, b, c) z(a, b) diff --git a/tests/virnetdaemontest.c b/tests/virnetdaemontest.c index 255ef80642..f0e91763b8 100644 --- a/tests/virnetdaemontest.c +++ b/tests/virnetdaemontest.c @@ -31,8 +31,8 @@ struct testClientPriv { =20 =20 static void * -testClientNew(virNetServerClientPtr client ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) +testClientNew(virNetServerClientPtr client G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED) { struct testClientPriv *priv; =20 @@ -46,7 +46,7 @@ testClientNew(virNetServerClientPtr client ATTRIBUTE_UNUS= ED, =20 =20 static virJSONValuePtr -testClientPreExec(virNetServerClientPtr client ATTRIBUTE_UNUSED, +testClientPreExec(virNetServerClientPtr client G_GNUC_UNUSED, void *data) { struct testClientPriv *priv =3D data; @@ -237,7 +237,7 @@ struct testExecRestartData { }; =20 static virNetServerPtr -testNewServerPostExecRestart(virNetDaemonPtr dmn ATTRIBUTE_UNUSED, +testNewServerPostExecRestart(virNetDaemonPtr dmn G_GNUC_UNUSED, const char *name, virJSONValuePtr object, void *opaque) diff --git a/tests/virnetmessagetest.c b/tests/virnetmessagetest.c index 2d81441626..3251df8873 100644 --- a/tests/virnetmessagetest.c +++ b/tests/virnetmessagetest.c @@ -31,7 +31,7 @@ =20 VIR_LOG_INIT("tests.netmessagetest"); =20 -static int testMessageHeaderEncode(const void *args ATTRIBUTE_UNUSED) +static int testMessageHeaderEncode(const void *args G_GNUC_UNUSED) { virNetMessagePtr msg =3D virNetMessageNew(true); static const char expect[] =3D { @@ -84,7 +84,7 @@ static int testMessageHeaderEncode(const void *args ATTRI= BUTE_UNUSED) return ret; } =20 -static int testMessageHeaderDecode(const void *args ATTRIBUTE_UNUSED) +static int testMessageHeaderDecode(const void *args G_GNUC_UNUSED) { virNetMessagePtr msg =3D virNetMessageNew(true); static char input_buf [] =3D { @@ -180,7 +180,7 @@ static int testMessageHeaderDecode(const void *args ATT= RIBUTE_UNUSED) return ret; } =20 -static int testMessagePayloadEncode(const void *args ATTRIBUTE_UNUSED) +static int testMessagePayloadEncode(const void *args G_GNUC_UNUSED) { virNetMessageError err; virNetMessagePtr msg =3D virNetMessageNew(true); @@ -288,7 +288,7 @@ static int testMessagePayloadEncode(const void *args AT= TRIBUTE_UNUSED) return ret; } =20 -static int testMessagePayloadDecode(const void *args ATTRIBUTE_UNUSED) +static int testMessagePayloadDecode(const void *args G_GNUC_UNUSED) { virNetMessageError err; virNetMessagePtr msg =3D virNetMessageNew(true); @@ -452,7 +452,7 @@ static int testMessagePayloadDecode(const void *args AT= TRIBUTE_UNUSED) return ret; } =20 -static int testMessagePayloadStreamEncode(const void *args ATTRIBUTE_UNUSE= D) +static int testMessagePayloadStreamEncode(const void *args G_GNUC_UNUSED) { char stream[] =3D "The quick brown fox jumps over the lazy dog"; virNetMessagePtr msg =3D virNetMessageNew(true); diff --git a/tests/virnetserverclientmock.c b/tests/virnetserverclientmock.c index 23418de911..d11c66af5d 100644 --- a/tests/virnetserverclientmock.c +++ b/tests/virnetserverclientmock.c @@ -22,15 +22,15 @@ #include "virutil.h" #include "internal.h" =20 -int virEventAddTimeout(int frequency ATTRIBUTE_UNUSED, - virEventTimeoutCallback cb ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED, - virFreeCallback ff ATTRIBUTE_UNUSED) +int virEventAddTimeout(int frequency G_GNUC_UNUSED, + virEventTimeoutCallback cb G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED, + virFreeCallback ff G_GNUC_UNUSED) { return 0; } =20 -int virNetSocketGetUNIXIdentity(virNetSocketPtr sock ATTRIBUTE_UNUSED, +int virNetSocketGetUNIXIdentity(virNetSocketPtr sock G_GNUC_UNUSED, uid_t *uid, gid_t *gid, pid_t *pid, @@ -43,17 +43,17 @@ int virNetSocketGetUNIXIdentity(virNetSocketPtr sock AT= TRIBUTE_UNUSED, return 0; } =20 -char *virGetUserName(uid_t uid ATTRIBUTE_UNUSED) +char *virGetUserName(uid_t uid G_GNUC_UNUSED) { return strdup("astrochicken"); } =20 -char *virGetGroupName(gid_t gid ATTRIBUTE_UNUSED) +char *virGetGroupName(gid_t gid G_GNUC_UNUSED) { return strdup("fictionalusers"); } =20 -int virNetSocketGetSELinuxContext(virNetSocketPtr sock ATTRIBUTE_UNUSED, +int virNetSocketGetSELinuxContext(virNetSocketPtr sock G_GNUC_UNUSED, char **context) { if (!(*context =3D strdup("foo_u:bar_r:wizz_t:s0-s0:c0.c1023"))) diff --git a/tests/virnetserverclienttest.c b/tests/virnetserverclienttest.c index 42393d7dbe..a9a56c48d5 100644 --- a/tests/virnetserverclienttest.c +++ b/tests/virnetserverclienttest.c @@ -27,8 +27,8 @@ #ifdef HAVE_SOCKETPAIR =20 static void * -testClientNew(virNetServerClientPtr client ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) +testClientNew(virNetServerClientPtr client G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED) { char *dummy; =20 @@ -45,7 +45,7 @@ testClientFree(void *opaque) VIR_FREE(opaque); } =20 -static int testIdentity(const void *opaque ATTRIBUTE_UNUSED) +static int testIdentity(const void *opaque G_GNUC_UNUSED) { int sv[2]; int ret =3D -1; diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c index 8cad351605..0934842252 100644 --- a/tests/virnetsockettest.c +++ b/tests/virnetsockettest.c @@ -154,7 +154,7 @@ testSocketClient(void *opaque) =20 static void testSocketIncoming(virNetSocketPtr sock, - int events ATTRIBUTE_UNUSED, + int events G_GNUC_UNUSED, void *opaque) { virNetSocketPtr *retsock =3D opaque; @@ -305,7 +305,7 @@ testSocketAccept(const void *opaque) =20 =20 #ifndef WIN32 -static int testSocketUNIXAddrs(const void *data ATTRIBUTE_UNUSED) +static int testSocketUNIXAddrs(const void *data G_GNUC_UNUSED) { virNetSocketPtr lsock =3D NULL; /* Listen socket */ virNetSocketPtr ssock =3D NULL; /* Server socket */ @@ -393,7 +393,7 @@ static int testSocketUNIXAddrs(const void *data ATTRIBU= TE_UNUSED) return ret; } =20 -static int testSocketCommandNormal(const void *data ATTRIBUTE_UNUSED) +static int testSocketCommandNormal(const void *data G_GNUC_UNUSED) { virNetSocketPtr csock =3D NULL; /* Client socket */ char buf[100]; @@ -421,7 +421,7 @@ static int testSocketCommandNormal(const void *data ATT= RIBUTE_UNUSED) return ret; } =20 -static int testSocketCommandFail(const void *data ATTRIBUTE_UNUSED) +static int testSocketCommandFail(const void *data G_GNUC_UNUSED) { virNetSocketPtr csock =3D NULL; /* Client socket */ char buf[100]; diff --git a/tests/virnumamock.c b/tests/virnumamock.c index 475efc1f34..fe5e9b4940 100644 --- a/tests/virnumamock.c +++ b/tests/virnumamock.c @@ -108,7 +108,7 @@ virNumaGetNodeMemory(int node, } =20 int -virNumaGetDistances(int node ATTRIBUTE_UNUSED, +virNumaGetDistances(int node G_GNUC_UNUSED, int **distances, int *ndistances) { diff --git a/tests/virpcimock.c b/tests/virpcimock.c index edb558b6ec..8f860bb917 100644 --- a/tests/virpcimock.c +++ b/tests/virpcimock.c @@ -909,7 +909,7 @@ pci_driver_handle_drivers_probe(const char *path) } =20 static int -pci_driver_handle_change(int fd ATTRIBUTE_UNUSED, const char *path) +pci_driver_handle_change(int fd G_GNUC_UNUSED, const char *path) { int ret; const char *file =3D last_component(path); diff --git a/tests/virpcitest.c b/tests/virpcitest.c index 6f71c39d03..de96e6eb7e 100644 --- a/tests/virpcitest.c +++ b/tests/virpcitest.c @@ -55,7 +55,7 @@ testVirPCIDeviceCheckDriver(virPCIDevicePtr dev, const ch= ar *expected) } =20 static int -testVirPCIDeviceNew(const void *opaque ATTRIBUTE_UNUSED) +testVirPCIDeviceNew(const void *opaque G_GNUC_UNUSED) { int ret =3D -1; virPCIDevicePtr dev; @@ -87,7 +87,7 @@ testVirPCIDeviceNew(const void *opaque ATTRIBUTE_UNUSED) } =20 static int -testVirPCIDeviceDetach(const void *opaque ATTRIBUTE_UNUSED) +testVirPCIDeviceDetach(const void *opaque G_GNUC_UNUSED) { int ret =3D -1; virPCIDevicePtr dev[] =3D {NULL, NULL, NULL}; @@ -128,7 +128,7 @@ testVirPCIDeviceDetach(const void *opaque ATTRIBUTE_UNU= SED) } =20 static int -testVirPCIDeviceReset(const void *opaque ATTRIBUTE_UNUSED) +testVirPCIDeviceReset(const void *opaque G_GNUC_UNUSED) { int ret =3D -1; virPCIDevicePtr dev[] =3D {NULL, NULL, NULL}; @@ -163,7 +163,7 @@ testVirPCIDeviceReset(const void *opaque ATTRIBUTE_UNUS= ED) } =20 static int -testVirPCIDeviceReattach(const void *opaque ATTRIBUTE_UNUSED) +testVirPCIDeviceReattach(const void *opaque G_GNUC_UNUSED) { int ret =3D -1; virPCIDevicePtr dev[] =3D {NULL, NULL, NULL}; diff --git a/tests/virpolkittest.c b/tests/virpolkittest.c index ce1ff92bf2..e80ccfedb7 100644 --- a/tests/virpolkittest.c +++ b/tests/virpolkittest.c @@ -143,7 +143,7 @@ VIR_MOCK_WRAP_RET_ARGS(dbus_connection_send_with_reply_= and_block, =20 =20 =20 -static int testPolkitAuthSuccess(const void *opaque ATTRIBUTE_UNUSED) +static int testPolkitAuthSuccess(const void *opaque G_GNUC_UNUSED) { int ret =3D -1; =20 @@ -162,7 +162,7 @@ static int testPolkitAuthSuccess(const void *opaque ATT= RIBUTE_UNUSED) } =20 =20 -static int testPolkitAuthDenied(const void *opaque ATTRIBUTE_UNUSED) +static int testPolkitAuthDenied(const void *opaque G_GNUC_UNUSED) { int ret =3D -1; int rv; @@ -196,7 +196,7 @@ static int testPolkitAuthDenied(const void *opaque ATTR= IBUTE_UNUSED) } =20 =20 -static int testPolkitAuthChallenge(const void *opaque ATTRIBUTE_UNUSED) +static int testPolkitAuthChallenge(const void *opaque G_GNUC_UNUSED) { int ret =3D -1; int rv; @@ -231,7 +231,7 @@ static int testPolkitAuthChallenge(const void *opaque A= TTRIBUTE_UNUSED) } =20 =20 -static int testPolkitAuthCancelled(const void *opaque ATTRIBUTE_UNUSED) +static int testPolkitAuthCancelled(const void *opaque G_GNUC_UNUSED) { int ret =3D -1; int rv; @@ -265,7 +265,7 @@ static int testPolkitAuthCancelled(const void *opaque A= TTRIBUTE_UNUSED) } =20 =20 -static int testPolkitAuthDetailsSuccess(const void *opaque ATTRIBUTE_UNUSE= D) +static int testPolkitAuthDetailsSuccess(const void *opaque G_GNUC_UNUSED) { int ret =3D -1; const char *details[] =3D { @@ -288,7 +288,7 @@ static int testPolkitAuthDetailsSuccess(const void *opa= que ATTRIBUTE_UNUSED) } =20 =20 -static int testPolkitAuthDetailsDenied(const void *opaque ATTRIBUTE_UNUSED) +static int testPolkitAuthDetailsDenied(const void *opaque G_GNUC_UNUSED) { int ret =3D -1; int rv; diff --git a/tests/virportallocatormock.c b/tests/virportallocatormock.c index c0f8e8e857..e715f34e04 100644 --- a/tests/virportallocatormock.c +++ b/tests/virportallocatormock.c @@ -68,9 +68,9 @@ int socket(int domain, return realsocket(domain, type, protocol); } =20 -int bind(int sockfd ATTRIBUTE_UNUSED, +int bind(int sockfd G_GNUC_UNUSED, const struct sockaddr *addr, - socklen_t addrlen ATTRIBUTE_UNUSED) + socklen_t addrlen G_GNUC_UNUSED) { struct sockaddr_in saddr; =20 diff --git a/tests/virportallocatortest.c b/tests/virportallocatortest.c index c695b26859..8e62fc4519 100644 --- a/tests/virportallocatortest.c +++ b/tests/virportallocatortest.c @@ -37,7 +37,7 @@ =20 VIR_LOG_INIT("tests.portallocatortest"); =20 -static int testAllocAll(const void *args ATTRIBUTE_UNUSED) +static int testAllocAll(const void *args G_GNUC_UNUSED) { virPortAllocatorRangePtr ports =3D virPortAllocatorRangeNew("test", 59= 00, 5909); int ret =3D -1; @@ -109,7 +109,7 @@ static int testAllocAll(const void *args ATTRIBUTE_UNUS= ED) =20 =20 =20 -static int testAllocReuse(const void *args ATTRIBUTE_UNUSED) +static int testAllocReuse(const void *args G_GNUC_UNUSED) { virPortAllocatorRangePtr ports =3D virPortAllocatorRangeNew("test", 59= 00, 5910); int ret =3D -1; diff --git a/tests/virprocessmock.c b/tests/virprocessmock.c index 79af1e8064..c9386d757a 100644 --- a/tests/virprocessmock.c +++ b/tests/virprocessmock.c @@ -22,7 +22,7 @@ #include "virprocess.h" =20 int -virProcessSetMaxMemLock(pid_t pid ATTRIBUTE_UNUSED, unsigned long long byt= es ATTRIBUTE_UNUSED) +virProcessSetMaxMemLock(pid_t pid G_GNUC_UNUSED, unsigned long long bytes = G_GNUC_UNUSED) { return 0; } diff --git a/tests/virrandommock.c b/tests/virrandommock.c index 3781b0f4ef..a74776efa3 100644 --- a/tests/virrandommock.c +++ b/tests/virrandommock.c @@ -51,7 +51,7 @@ uint64_t virRandomBits(int nbits) } =20 int virRandomGenerateWWN(char **wwn, - const char *virt_type ATTRIBUTE_UNUSED) + const char *virt_type G_GNUC_UNUSED) { return virAsprintf(wwn, "5100000%09llx", (unsigned long long)virRandomBits(36)); diff --git a/tests/virrotatingfiletest.c b/tests/virrotatingfiletest.c index 0d81bbfd6a..3ccd9a8535 100644 --- a/tests/virrotatingfiletest.c +++ b/tests/virrotatingfiletest.c @@ -161,7 +161,7 @@ static int testRotatingFileInitFiles(off_t baseSize, return 0; } =20 -static int testRotatingFileWriterNew(const void *data ATTRIBUTE_UNUSED) +static int testRotatingFileWriterNew(const void *data G_GNUC_UNUSED) { virRotatingFileWriterPtr file; int ret =3D -1; @@ -204,7 +204,7 @@ static int testRotatingFileWriterNew(const void *data A= TTRIBUTE_UNUSED) } =20 =20 -static int testRotatingFileWriterAppend(const void *data ATTRIBUTE_UNUSED) +static int testRotatingFileWriterAppend(const void *data G_GNUC_UNUSED) { virRotatingFileWriterPtr file; int ret =3D -1; @@ -247,7 +247,7 @@ static int testRotatingFileWriterAppend(const void *dat= a ATTRIBUTE_UNUSED) } =20 =20 -static int testRotatingFileWriterTruncate(const void *data ATTRIBUTE_UNUSE= D) +static int testRotatingFileWriterTruncate(const void *data G_GNUC_UNUSED) { virRotatingFileWriterPtr file; int ret =3D -1; @@ -290,7 +290,7 @@ static int testRotatingFileWriterTruncate(const void *d= ata ATTRIBUTE_UNUSED) } =20 =20 -static int testRotatingFileWriterRolloverNone(const void *data ATTRIBUTE_U= NUSED) +static int testRotatingFileWriterRolloverNone(const void *data G_GNUC_UNUS= ED) { virRotatingFileWriterPtr file; int ret =3D -1; @@ -333,7 +333,7 @@ static int testRotatingFileWriterRolloverNone(const voi= d *data ATTRIBUTE_UNUSED) } =20 =20 -static int testRotatingFileWriterRolloverOne(const void *data ATTRIBUTE_UN= USED) +static int testRotatingFileWriterRolloverOne(const void *data G_GNUC_UNUSE= D) { virRotatingFileWriterPtr file; int ret =3D -1; @@ -378,7 +378,7 @@ static int testRotatingFileWriterRolloverOne(const void= *data ATTRIBUTE_UNUSED) } =20 =20 -static int testRotatingFileWriterRolloverAppend(const void *data ATTRIBUTE= _UNUSED) +static int testRotatingFileWriterRolloverAppend(const void *data G_GNUC_UN= USED) { virRotatingFileWriterPtr file; int ret =3D -1; @@ -421,7 +421,7 @@ static int testRotatingFileWriterRolloverAppend(const v= oid *data ATTRIBUTE_UNUSE } =20 =20 -static int testRotatingFileWriterRolloverMany(const void *data ATTRIBUTE_U= NUSED) +static int testRotatingFileWriterRolloverMany(const void *data G_GNUC_UNUS= ED) { virRotatingFileWriterPtr file; int ret =3D -1; @@ -470,7 +470,7 @@ static int testRotatingFileWriterRolloverMany(const voi= d *data ATTRIBUTE_UNUSED) } =20 =20 -static int testRotatingFileWriterRolloverLineBreak(const void *data ATTRIB= UTE_UNUSED) +static int testRotatingFileWriterRolloverLineBreak(const void *data G_GNUC= _UNUSED) { virRotatingFileWriterPtr file; int ret =3D -1; @@ -512,7 +512,7 @@ static int testRotatingFileWriterRolloverLineBreak(cons= t void *data ATTRIBUTE_UN } =20 =20 -static int testRotatingFileWriterLargeFile(const void *data ATTRIBUTE_UNUS= ED) +static int testRotatingFileWriterLargeFile(const void *data G_GNUC_UNUSED) { virRotatingFileWriterPtr file; int ret =3D -1; @@ -554,7 +554,7 @@ static int testRotatingFileWriterLargeFile(const void *= data ATTRIBUTE_UNUSED) } =20 =20 -static int testRotatingFileReaderOne(const void *data ATTRIBUTE_UNUSED) +static int testRotatingFileReaderOne(const void *data G_GNUC_UNUSED) { virRotatingFileReaderPtr file; int ret =3D -1; @@ -586,7 +586,7 @@ static int testRotatingFileReaderOne(const void *data A= TTRIBUTE_UNUSED) return ret; } =20 -static int testRotatingFileReaderAll(const void *data ATTRIBUTE_UNUSED) +static int testRotatingFileReaderAll(const void *data G_GNUC_UNUSED) { virRotatingFileReaderPtr file; int ret =3D -1; @@ -618,7 +618,7 @@ static int testRotatingFileReaderAll(const void *data A= TTRIBUTE_UNUSED) return ret; } =20 -static int testRotatingFileReaderPartial(const void *data ATTRIBUTE_UNUSED) +static int testRotatingFileReaderPartial(const void *data G_GNUC_UNUSED) { virRotatingFileReaderPtr file; int ret =3D -1; @@ -650,7 +650,7 @@ static int testRotatingFileReaderPartial(const void *da= ta ATTRIBUTE_UNUSED) return ret; } =20 -static int testRotatingFileReaderSeek(const void *data ATTRIBUTE_UNUSED) +static int testRotatingFileReaderSeek(const void *data G_GNUC_UNUSED) { virRotatingFileReaderPtr file; int ret =3D -1; diff --git a/tests/virscsitest.c b/tests/virscsitest.c index be3ef6234e..d4019e82f7 100644 --- a/tests/virscsitest.c +++ b/tests/virscsitest.c @@ -33,7 +33,7 @@ VIR_LOG_INIT("tests.scsitest"); static char *virscsi_prefix; =20 static int -test1(const void *data ATTRIBUTE_UNUSED) +test1(const void *data G_GNUC_UNUSED) { char *name =3D NULL; int ret =3D -1; @@ -57,7 +57,7 @@ test1(const void *data ATTRIBUTE_UNUSED) * details. */ static int -test2(const void *data ATTRIBUTE_UNUSED) +test2(const void *data G_GNUC_UNUSED) { virSCSIDeviceListPtr list =3D NULL; virSCSIDevicePtr dev =3D NULL; diff --git a/tests/virshtest.c b/tests/virshtest.c index 673c13fe07..fee6833c9b 100644 --- a/tests/virshtest.c +++ b/tests/virshtest.c @@ -92,7 +92,7 @@ static char *custom_uri; "--connect", \ custom_uri =20 -static int testCompareListDefault(const void *data ATTRIBUTE_UNUSED) +static int testCompareListDefault(const void *data G_GNUC_UNUSED) { const char *const argv[] =3D { VIRSH_DEFAULT, "list", NULL }; const char *exp =3D "\ @@ -103,7 +103,7 @@ static int testCompareListDefault(const void *data ATTR= IBUTE_UNUSED) return testCompareOutputLit(exp, NULL, argv); } =20 -static int testCompareListCustom(const void *data ATTRIBUTE_UNUSED) +static int testCompareListCustom(const void *data G_GNUC_UNUSED) { const char *const argv[] =3D { VIRSH_CUSTOM, "list", NULL }; const char *exp =3D "\ @@ -115,7 +115,7 @@ static int testCompareListCustom(const void *data ATTRI= BUTE_UNUSED) return testCompareOutputLit(exp, NULL, argv); } =20 -static int testCompareNodeinfoDefault(const void *data ATTRIBUTE_UNUSED) +static int testCompareNodeinfoDefault(const void *data G_GNUC_UNUSED) { const char *const argv[] =3D { VIRSH_DEFAULT, "nodeinfo", NULL }; const char *exp =3D "\ @@ -131,7 +131,7 @@ Memory size: 3145728 KiB\n\ return testCompareOutputLit(exp, NULL, argv); } =20 -static int testCompareNodeinfoCustom(const void *data ATTRIBUTE_UNUSED) +static int testCompareNodeinfoCustom(const void *data G_GNUC_UNUSED) { const char *const argv[] =3D { VIRSH_CUSTOM, @@ -151,84 +151,84 @@ Memory size: 8192000 KiB\n\ return testCompareOutputLit(exp, NULL, argv); } =20 -static int testCompareDominfoByID(const void *data ATTRIBUTE_UNUSED) +static int testCompareDominfoByID(const void *data G_GNUC_UNUSED) { const char *const argv[] =3D { VIRSH_CUSTOM, "dominfo", "2", NULL }; const char *exp =3D dominfo_fc4; return testCompareOutputLit(exp, "\nCPU time:", argv); } =20 -static int testCompareDominfoByUUID(const void *data ATTRIBUTE_UNUSED) +static int testCompareDominfoByUUID(const void *data G_GNUC_UNUSED) { const char *const argv[] =3D { VIRSH_CUSTOM, "dominfo", DOM_UUID, NULL= }; const char *exp =3D dominfo_fc4; return testCompareOutputLit(exp, "\nCPU time:", argv); } =20 -static int testCompareDominfoByName(const void *data ATTRIBUTE_UNUSED) +static int testCompareDominfoByName(const void *data G_GNUC_UNUSED) { const char *const argv[] =3D { VIRSH_CUSTOM, "dominfo", "fc4", NULL }; const char *exp =3D dominfo_fc4; return testCompareOutputLit(exp, "\nCPU time:", argv); } =20 -static int testCompareDomuuidByID(const void *data ATTRIBUTE_UNUSED) +static int testCompareDomuuidByID(const void *data G_GNUC_UNUSED) { const char *const argv[] =3D { VIRSH_CUSTOM, "domuuid", "2", NULL }; const char *exp =3D domuuid_fc4; return testCompareOutputLit(exp, NULL, argv); } =20 -static int testCompareDomuuidByName(const void *data ATTRIBUTE_UNUSED) +static int testCompareDomuuidByName(const void *data G_GNUC_UNUSED) { const char *const argv[] =3D { VIRSH_CUSTOM, "domuuid", "fc4", NULL }; const char *exp =3D domuuid_fc4; return testCompareOutputLit(exp, NULL, argv); } =20 -static int testCompareDomidByName(const void *data ATTRIBUTE_UNUSED) +static int testCompareDomidByName(const void *data G_GNUC_UNUSED) { const char *const argv[] =3D { VIRSH_CUSTOM, "domid", "fc4", NULL }; const char *exp =3D domid_fc4; return testCompareOutputLit(exp, NULL, argv); } =20 -static int testCompareDomidByUUID(const void *data ATTRIBUTE_UNUSED) +static int testCompareDomidByUUID(const void *data G_GNUC_UNUSED) { const char *const argv[] =3D { VIRSH_CUSTOM, "domid", DOM_UUID, NULL }; const char *exp =3D domid_fc4; return testCompareOutputLit(exp, NULL, argv); } =20 -static int testCompareDomnameByID(const void *data ATTRIBUTE_UNUSED) +static int testCompareDomnameByID(const void *data G_GNUC_UNUSED) { const char *const argv[] =3D { VIRSH_CUSTOM, "domname", "2", NULL }; const char *exp =3D domname_fc4; return testCompareOutputLit(exp, NULL, argv); } =20 -static int testCompareDomnameByUUID(const void *data ATTRIBUTE_UNUSED) +static int testCompareDomnameByUUID(const void *data G_GNUC_UNUSED) { const char *const argv[] =3D { VIRSH_CUSTOM, "domname", DOM_UUID, NULL= }; const char *exp =3D domname_fc4; return testCompareOutputLit(exp, NULL, argv); } =20 -static int testCompareDomstateByID(const void *data ATTRIBUTE_UNUSED) +static int testCompareDomstateByID(const void *data G_GNUC_UNUSED) { const char *const argv[] =3D { VIRSH_CUSTOM, "domstate", "2", NULL }; const char *exp =3D domstate_fc4; return testCompareOutputLit(exp, NULL, argv); } =20 -static int testCompareDomstateByUUID(const void *data ATTRIBUTE_UNUSED) +static int testCompareDomstateByUUID(const void *data G_GNUC_UNUSED) { const char *const argv[] =3D { VIRSH_CUSTOM, "domstate", DOM_UUID, NUL= L }; const char *exp =3D domstate_fc4; return testCompareOutputLit(exp, NULL, argv); } =20 -static int testCompareDomstateByName(const void *data ATTRIBUTE_UNUSED) +static int testCompareDomstateByName(const void *data G_GNUC_UNUSED) { const char *const argv[] =3D { VIRSH_CUSTOM, "domstate", "fc4", NULL }; const char *exp =3D domstate_fc4; diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c index 8ebad89da7..77e8e0e404 100644 --- a/tests/virstoragetest.c +++ b/tests/virstoragetest.c @@ -472,7 +472,7 @@ static const char *testPathCanonicalizeSymlinks[][2] = =3D static int testPathCanonicalizeReadlink(const char *path, char **linkpath, - void *data ATTRIBUTE_UNUSED) + void *data G_GNUC_UNUSED) { size_t i; =20 diff --git a/tests/virstringtest.c b/tests/virstringtest.c index cbbfaa259d..12dab85ab8 100644 --- a/tests/virstringtest.c +++ b/tests/virstringtest.c @@ -261,7 +261,7 @@ testStrdupLookup2(size_t i) } =20 static int -testStrdup(const void *data ATTRIBUTE_UNUSED) +testStrdup(const void *data G_GNUC_UNUSED) { char *array[] =3D { NULL, NULL }; size_t i =3D 0; @@ -331,7 +331,7 @@ testStrdup(const void *data ATTRIBUTE_UNUSED) } =20 static int -testStrndupNegative(const void *opaque ATTRIBUTE_UNUSED) +testStrndupNegative(const void *opaque G_GNUC_UNUSED) { int ret =3D -1; char *dst; @@ -367,7 +367,7 @@ testStrndupNegative(const void *opaque ATTRIBUTE_UNUSED) =20 =20 static int -testStringSortCompare(const void *opaque ATTRIBUTE_UNUSED) +testStringSortCompare(const void *opaque G_GNUC_UNUSED) { const char *randlist[] =3D { "tasty", "astro", "goat", "chicken", "turducken", @@ -513,7 +513,7 @@ struct stringReplaceData { }; =20 static int -testStringReplace(const void *opaque ATTRIBUTE_UNUSED) +testStringReplace(const void *opaque G_GNUC_UNUSED) { const struct stringReplaceData *data =3D opaque; char *result; @@ -690,7 +690,7 @@ testStringToDouble(const void *opaque) /* The point of this test is to check whether all members of the array are * freed. The test has to be checked using valgrind. */ static int -testVirStringListFreeCount(const void *opaque ATTRIBUTE_UNUSED) +testVirStringListFreeCount(const void *opaque G_GNUC_UNUSED) { char **list; =20 diff --git a/tests/virsystemdtest.c b/tests/virsystemdtest.c index d33a7c192f..0a97443779 100644 --- a/tests/virsystemdtest.c +++ b/tests/virsystemdtest.c @@ -160,7 +160,7 @@ VIR_MOCK_WRAP_RET_ARGS(dbus_connection_send_with_reply_= and_block, } =20 =20 -static int testCreateContainer(const void *opaque ATTRIBUTE_UNUSED) +static int testCreateContainer(const void *opaque G_GNUC_UNUSED) { unsigned char uuid[VIR_UUID_BUFLEN] =3D { 1, 1, 1, 1, @@ -183,7 +183,7 @@ static int testCreateContainer(const void *opaque ATTRI= BUTE_UNUSED) return 0; } =20 -static int testTerminateContainer(const void *opaque ATTRIBUTE_UNUSED) +static int testTerminateContainer(const void *opaque G_GNUC_UNUSED) { if (virSystemdTerminateMachine("lxc-demo") < 0) { fprintf(stderr, "%s", "Failed to terminate LXC machine\n"); @@ -193,7 +193,7 @@ static int testTerminateContainer(const void *opaque AT= TRIBUTE_UNUSED) return 0; } =20 -static int testCreateMachine(const void *opaque ATTRIBUTE_UNUSED) +static int testCreateMachine(const void *opaque G_GNUC_UNUSED) { unsigned char uuid[VIR_UUID_BUFLEN] =3D { 1, 1, 1, 1, @@ -216,7 +216,7 @@ static int testCreateMachine(const void *opaque ATTRIBU= TE_UNUSED) return 0; } =20 -static int testTerminateMachine(const void *opaque ATTRIBUTE_UNUSED) +static int testTerminateMachine(const void *opaque G_GNUC_UNUSED) { if (virSystemdTerminateMachine("test-qemu-demo") < 0) { fprintf(stderr, "%s", "Failed to terminate KVM machine\n"); @@ -226,7 +226,7 @@ static int testTerminateMachine(const void *opaque ATTR= IBUTE_UNUSED) return 0; } =20 -static int testCreateNoSystemd(const void *opaque ATTRIBUTE_UNUSED) +static int testCreateNoSystemd(const void *opaque G_GNUC_UNUSED) { unsigned char uuid[VIR_UUID_BUFLEN] =3D { 1, 1, 1, 1, @@ -260,7 +260,7 @@ static int testCreateNoSystemd(const void *opaque ATTRI= BUTE_UNUSED) return 0; } =20 -static int testCreateSystemdNotRunning(const void *opaque ATTRIBUTE_UNUSED) +static int testCreateSystemdNotRunning(const void *opaque G_GNUC_UNUSED) { unsigned char uuid[VIR_UUID_BUFLEN] =3D { 1, 1, 1, 1, @@ -294,7 +294,7 @@ static int testCreateSystemdNotRunning(const void *opaq= ue ATTRIBUTE_UNUSED) return 0; } =20 -static int testCreateBadSystemd(const void *opaque ATTRIBUTE_UNUSED) +static int testCreateBadSystemd(const void *opaque G_GNUC_UNUSED) { unsigned char uuid[VIR_UUID_BUFLEN] =3D { 1, 1, 1, 1, @@ -329,7 +329,7 @@ static int testCreateBadSystemd(const void *opaque ATTR= IBUTE_UNUSED) } =20 =20 -static int testCreateNetwork(const void *opaque ATTRIBUTE_UNUSED) +static int testCreateNetwork(const void *opaque G_GNUC_UNUSED) { unsigned char uuid[VIR_UUID_BUFLEN] =3D { 1, 1, 1, 1, @@ -358,7 +358,7 @@ static int testCreateNetwork(const void *opaque ATTRIBU= TE_UNUSED) =20 =20 static int -testGetMachineName(const void *opaque ATTRIBUTE_UNUSED) +testGetMachineName(const void *opaque G_GNUC_UNUSED) { char *tmp =3D virSystemdGetMachineNameByPID(1234); int ret =3D -1; @@ -639,7 +639,7 @@ testActivation(bool useNames) =20 =20 static int -testActivationEmpty(const void *opaque ATTRIBUTE_UNUSED) +testActivationEmpty(const void *opaque G_GNUC_UNUSED) { virSystemdActivationPtr act; =20 @@ -659,14 +659,14 @@ testActivationEmpty(const void *opaque ATTRIBUTE_UNUS= ED) =20 =20 static int -testActivationFDNames(const void *opaque ATTRIBUTE_UNUSED) +testActivationFDNames(const void *opaque G_GNUC_UNUSED) { return testActivation(true); } =20 =20 static int -testActivationFDAddrs(const void *opaque ATTRIBUTE_UNUSED) +testActivationFDAddrs(const void *opaque G_GNUC_UNUSED) { return testActivation(false); } diff --git a/tests/virtestmock.c b/tests/virtestmock.c index fa52667a2b..daae8ef41b 100644 --- a/tests/virtestmock.c +++ b/tests/virtestmock.c @@ -198,7 +198,7 @@ int access(const char *path, int mode) =20 #include "virmockstathelpers.c" =20 -static int virMockStatRedirect(const char *path ATTRIBUTE_UNUSED, char **n= ewpath ATTRIBUTE_UNUSED) +static int virMockStatRedirect(const char *path G_GNUC_UNUSED, char **newp= ath G_GNUC_UNUSED) { return 0; } diff --git a/tests/virtypedparamtest.c b/tests/virtypedparamtest.c index ec389c65aa..9714a0a4c6 100644 --- a/tests/virtypedparamtest.c +++ b/tests/virtypedparamtest.c @@ -81,7 +81,7 @@ testTypedParamsValidate(const void *opaque) .nparams =3D PARAMS_SIZE(__VA_ARGS__), =20 static int -testTypedParamsFilter(const void *opaque ATTRIBUTE_UNUSED) +testTypedParamsFilter(const void *opaque G_GNUC_UNUSED) { size_t i, nfiltered; int rv =3D -1; @@ -126,7 +126,7 @@ testTypedParamsFilter(const void *opaque ATTRIBUTE_UNUS= ED) } =20 static int -testTypedParamsAddStringList(const void *opaque ATTRIBUTE_UNUSED) +testTypedParamsAddStringList(const void *opaque G_GNUC_UNUSED) { int rv =3D 0; virTypedParameterPtr params =3D NULL; @@ -151,7 +151,7 @@ testTypedParamsAddStringList(const void *opaque ATTRIBU= TE_UNUSED) } =20 static int -testTypedParamsGetStringList(const void *opaque ATTRIBUTE_UNUSED) +testTypedParamsGetStringList(const void *opaque G_GNUC_UNUSED) { size_t i; int picked; diff --git a/tests/virusbtest.c b/tests/virusbtest.c index 1f04f283f5..b26173248b 100644 --- a/tests/virusbtest.c +++ b/tests/virusbtest.c @@ -47,7 +47,7 @@ struct findTestInfo { =20 static int testDeviceFileActor(virUSBDevicePtr dev, const char *path, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { char *str =3D NULL; int ret =3D 0; @@ -147,7 +147,7 @@ testCheckNdevs(const char* occasion, =20 =20 static int -testUSBList(const void *opaque ATTRIBUTE_UNUSED) +testUSBList(const void *opaque G_GNUC_UNUSED) { virUSBDeviceListPtr list =3D NULL; virUSBDeviceListPtr devlist =3D NULL; diff --git a/tests/vmx2xmltest.c b/tests/vmx2xmltest.c index d7d03f1753..b2c56a15fe 100644 --- a/tests/vmx2xmltest.c +++ b/tests/vmx2xmltest.c @@ -131,7 +131,7 @@ testCompareHelper(const void *data) } =20 static char * -testParseVMXFileName(const char *fileName, void *opaque ATTRIBUTE_UNUSED) +testParseVMXFileName(const char *fileName, void *opaque G_GNUC_UNUSED) { char *copyOfFileName =3D NULL; char *tmp =3D NULL; diff --git a/tests/vshtabletest.c b/tests/vshtabletest.c index b07db3cf23..f2e0554f0a 100644 --- a/tests/vshtabletest.c +++ b/tests/vshtabletest.c @@ -27,7 +27,7 @@ #include "../tools/vsh-table.h" =20 static int -testVshTableNew(const void *opaque ATTRIBUTE_UNUSED) +testVshTableNew(const void *opaque G_GNUC_UNUSED) { if (vshTableNew(NULL)) { fprintf(stderr, "expected failure when passing null to vshTableNew= \n"); @@ -38,7 +38,7 @@ testVshTableNew(const void *opaque ATTRIBUTE_UNUSED) } =20 static int -testVshTableHeader(const void *opaque ATTRIBUTE_UNUSED) +testVshTableHeader(const void *opaque G_GNUC_UNUSED) { int ret =3D 0; char *act =3D NULL; @@ -76,7 +76,7 @@ testVshTableHeader(const void *opaque ATTRIBUTE_UNUSED) } =20 static int -testVshTableRowAppend(const void *opaque ATTRIBUTE_UNUSED) +testVshTableRowAppend(const void *opaque G_GNUC_UNUSED) { int ret =3D 0; =20 @@ -112,7 +112,7 @@ testVshTableRowAppend(const void *opaque ATTRIBUTE_UNUS= ED) } =20 static int -testUnicode(const void *opaque ATTRIBUTE_UNUSED) +testUnicode(const void *opaque G_GNUC_UNUSED) { int ret =3D 0; char *act =3D NULL; @@ -144,7 +144,7 @@ testUnicode(const void *opaque ATTRIBUTE_UNUSED) =20 /* Point of this test is to see how table behaves with right to left writi= ng*/ static int -testUnicodeArabic(const void *opaque ATTRIBUTE_UNUSED) +testUnicodeArabic(const void *opaque G_GNUC_UNUSED) { int ret =3D 0; char *act =3D NULL; @@ -187,7 +187,7 @@ testUnicodeArabic(const void *opaque ATTRIBUTE_UNUSED) =20 /* Testing zero-width characters by inserting few zero-width spaces */ static int -testUnicodeZeroWidthChar(const void *opaque ATTRIBUTE_UNUSED) +testUnicodeZeroWidthChar(const void *opaque G_GNUC_UNUSED) { int ret =3D 0; vshTablePtr table =3D NULL; @@ -224,7 +224,7 @@ testUnicodeZeroWidthChar(const void *opaque ATTRIBUTE_U= NUSED) } =20 static int -testUnicodeCombiningChar(const void *opaque ATTRIBUTE_UNUSED) +testUnicodeCombiningChar(const void *opaque G_GNUC_UNUSED) { int ret =3D 0; vshTablePtr table =3D NULL; @@ -253,7 +253,7 @@ testUnicodeCombiningChar(const void *opaque ATTRIBUTE_U= NUSED) =20 /* Testing zero-width characters by inserting few zero-width spaces */ static int -testUnicodeNonPrintableChar(const void *opaque ATTRIBUTE_UNUSED) +testUnicodeNonPrintableChar(const void *opaque G_GNUC_UNUSED) { int ret =3D 0; vshTablePtr table =3D NULL; @@ -281,7 +281,7 @@ testUnicodeNonPrintableChar(const void *opaque ATTRIBUT= E_UNUSED) } =20 static int -testNTables(const void *opaque ATTRIBUTE_UNUSED) +testNTables(const void *opaque G_GNUC_UNUSED) { int ret =3D 0; vshTablePtr table1 =3D NULL; diff --git a/tests/xml2vmxtest.c b/tests/xml2vmxtest.c index 5d5dc0a518..2078f5c7cf 100644 --- a/tests/xml2vmxtest.c +++ b/tests/xml2vmxtest.c @@ -132,8 +132,8 @@ testCompareHelper(const void *data) } =20 static int -testAutodetectSCSIControllerModel(virDomainDiskDefPtr def ATTRIBUTE_UNUSED, - int *model, void *opaque ATTRIBUTE_UNUSE= D) +testAutodetectSCSIControllerModel(virDomainDiskDefPtr def G_GNUC_UNUSED, + int *model, void *opaque G_GNUC_UNUSED) { *model =3D VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSILOGIC; =20 @@ -141,7 +141,7 @@ testAutodetectSCSIControllerModel(virDomainDiskDefPtr d= ef ATTRIBUTE_UNUSED, } =20 static char * -testFormatVMXFileName(const char *src, void *opaque ATTRIBUTE_UNUSED) +testFormatVMXFileName(const char *src, void *opaque G_GNUC_UNUSED) { bool success =3D false; char *copyOfDatastorePath =3D NULL; --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 10:00:01 2024 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=1571059055; cv=none; d=zoho.com; s=zohoarc; b=Lk/5cMpToGXUWM9GQzifK7QBXUu9py/uQc5YVTsBINHNL3UIIeUt3oWXYmHt859n2YqEFxkg8pWuVIjPiTT6+hVJOM+YsbRJaeF7PRAX9wQ0oujBM+rkPL2yu3ShkcicG1P8NM26ebDQwesI9MxVPMoNQo6Dr8pGNSYUhX12xU4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571059055; 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=2k7CAHfsrFqcHNpCVrip0xuULoVvYFwDNmJKAP2idOw=; b=JUCeW7ohcr83G+Tq3hc/kd7vXTJBWU+fQAW8atMDcy2lxvwYKNduyZTSJIjAx3ySU75bAKexLh4fIFC0nXxDB+ptdTuW+w/cQ5e1+Xm40JI8JxI+iVRL316nd2SspYMoTYQyGppDmwwMWRnSHcvA18lvw+zTZMj38NhhiMbjwUA= 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 1571059055983882.4856097794687; Mon, 14 Oct 2019 06:17:35 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C3C23302C060; Mon, 14 Oct 2019 13:17:33 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9D1DB5C241; Mon, 14 Oct 2019 13:17:33 +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 5469062D10; Mon, 14 Oct 2019 13:17:33 +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 x9EDGg3U017566 for ; Mon, 14 Oct 2019 09:16:42 -0400 Received: by smtp.corp.redhat.com (Postfix) id 077C260126; Mon, 14 Oct 2019 13:16:42 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 847226012C for ; Mon, 14 Oct 2019 13:16:41 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Mon, 14 Oct 2019 15:15:46 +0200 Message-Id: <57028dd3b9eeca9808545ce4c9edd2178d68bb10.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 28/35] tools: 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.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.46]); Mon, 14 Oct 2019 13:17:34 +0000 (UTC) Use G_GNUC_UNUSED from GLib instead of ATTRIBUTE_UNUSED. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- tools/virsh-completer-domain.c | 6 +-- tools/virsh-completer-host.c | 4 +- tools/virsh-completer-interface.c | 2 +- tools/virsh-completer-network.c | 8 ++-- tools/virsh-completer-nodedev.c | 6 +-- tools/virsh-completer-nwfilter.c | 4 +- tools/virsh-completer-pool.c | 6 +-- tools/virsh-completer-secret.c | 6 +-- tools/virsh-console.c | 8 ++-- tools/virsh-domain-monitor.c | 4 +- tools/virsh-domain.c | 62 ++++++++++++++-------------- tools/virsh-host.c | 14 +++---- tools/virsh-interface.c | 8 ++-- tools/virsh-network.c | 6 +-- tools/virsh-nodedev.c | 8 ++-- tools/virsh-nwfilter.c | 4 +- tools/virsh-pool.c | 14 +++---- tools/virsh-secret.c | 8 ++-- tools/virsh-util.c | 10 ++--- tools/virsh-volume.c | 2 +- tools/virsh.c | 4 +- tools/virt-admin-completer.c | 2 +- tools/virt-admin.c | 12 +++--- tools/virt-host-validate-common.c | 4 +- tools/virt-login-shell-helper.c | 4 +- tools/vsh.c | 56 ++++++++++++------------- tools/wireshark/src/packet-libvirt.c | 6 +-- 27 files changed, 139 insertions(+), 139 deletions(-) diff --git a/tools/virsh-completer-domain.c b/tools/virsh-completer-domain.c index 9c10e38aba..8f5c711097 100644 --- a/tools/virsh-completer-domain.c +++ b/tools/virsh-completer-domain.c @@ -31,7 +31,7 @@ =20 char ** virshDomainNameCompleter(vshControl *ctl, - const vshCmd *cmd ATTRIBUTE_UNUSED, + const vshCmd *cmd G_GNUC_UNUSED, unsigned int flags) { virshControlPtr priv =3D ctl->privData; @@ -168,8 +168,8 @@ virshDomainDiskTargetCompleter(vshControl *ctl, =20 =20 char ** -virshDomainEventNameCompleter(vshControl *ctl ATTRIBUTE_UNUSED, - const vshCmd *cmd ATTRIBUTE_UNUSED, +virshDomainEventNameCompleter(vshControl *ctl G_GNUC_UNUSED, + const vshCmd *cmd G_GNUC_UNUSED, unsigned int flags) { size_t i =3D 0; diff --git a/tools/virsh-completer-host.c b/tools/virsh-completer-host.c index 7e31ca2bf3..839c8cc420 100644 --- a/tools/virsh-completer-host.c +++ b/tools/virsh-completer-host.c @@ -51,7 +51,7 @@ virshPagesizeNodeToString(xmlNodePtr node) =20 char ** virshAllocpagesPagesizeCompleter(vshControl *ctl, - const vshCmd *cmd ATTRIBUTE_UNUSED, + const vshCmd *cmd G_GNUC_UNUSED, unsigned int flags) { VIR_AUTOPTR(xmlXPathContext) ctxt =3D NULL; @@ -107,7 +107,7 @@ virshAllocpagesPagesizeCompleter(vshControl *ctl, =20 char ** virshCellnoCompleter(vshControl *ctl, - const vshCmd *cmd ATTRIBUTE_UNUSED, + const vshCmd *cmd G_GNUC_UNUSED, unsigned int flags) { VIR_AUTOPTR(xmlXPathContext) ctxt =3D NULL; diff --git a/tools/virsh-completer-interface.c b/tools/virsh-completer-inte= rface.c index 5dcdab8e92..24a69d30b9 100644 --- a/tools/virsh-completer-interface.c +++ b/tools/virsh-completer-interface.c @@ -27,7 +27,7 @@ =20 char ** virshInterfaceNameCompleter(vshControl *ctl, - const vshCmd *cmd ATTRIBUTE_UNUSED, + const vshCmd *cmd G_GNUC_UNUSED, unsigned int flags) { virshControlPtr priv =3D ctl->privData; diff --git a/tools/virsh-completer-network.c b/tools/virsh-completer-networ= k.c index 6f92780feb..404260b20c 100644 --- a/tools/virsh-completer-network.c +++ b/tools/virsh-completer-network.c @@ -28,7 +28,7 @@ =20 char ** virshNetworkNameCompleter(vshControl *ctl, - const vshCmd *cmd ATTRIBUTE_UNUSED, + const vshCmd *cmd G_GNUC_UNUSED, unsigned int flags) { virshControlPtr priv =3D ctl->privData; @@ -70,8 +70,8 @@ virshNetworkNameCompleter(vshControl *ctl, =20 =20 char ** -virshNetworkEventNameCompleter(vshControl *ctl ATTRIBUTE_UNUSED, - const vshCmd *cmd ATTRIBUTE_UNUSED, +virshNetworkEventNameCompleter(vshControl *ctl G_GNUC_UNUSED, + const vshCmd *cmd G_GNUC_UNUSED, unsigned int flags) { size_t i =3D 0; @@ -97,7 +97,7 @@ virshNetworkEventNameCompleter(vshControl *ctl ATTRIBUTE_= UNUSED, =20 char ** virshNetworkPortUUIDCompleter(vshControl *ctl, - const vshCmd *cmd ATTRIBUTE_UNUSED, + const vshCmd *cmd G_GNUC_UNUSED, unsigned int flags) { virshControlPtr priv =3D ctl->privData; diff --git a/tools/virsh-completer-nodedev.c b/tools/virsh-completer-nodede= v.c index 36f38acd57..9bd1d20945 100644 --- a/tools/virsh-completer-nodedev.c +++ b/tools/virsh-completer-nodedev.c @@ -29,7 +29,7 @@ =20 char ** virshNodeDeviceNameCompleter(vshControl *ctl, - const vshCmd *cmd ATTRIBUTE_UNUSED, + const vshCmd *cmd G_GNUC_UNUSED, unsigned int flags) { virshControlPtr priv =3D ctl->privData; @@ -68,8 +68,8 @@ virshNodeDeviceNameCompleter(vshControl *ctl, =20 =20 char ** -virshNodeDeviceEventNameCompleter(vshControl *ctl ATTRIBUTE_UNUSED, - const vshCmd *cmd ATTRIBUTE_UNUSED, +virshNodeDeviceEventNameCompleter(vshControl *ctl G_GNUC_UNUSED, + const vshCmd *cmd G_GNUC_UNUSED, unsigned int flags) { size_t i =3D 0; diff --git a/tools/virsh-completer-nwfilter.c b/tools/virsh-completer-nwfil= ter.c index 0942526f22..5a86602101 100644 --- a/tools/virsh-completer-nwfilter.c +++ b/tools/virsh-completer-nwfilter.c @@ -27,7 +27,7 @@ =20 char ** virshNWFilterNameCompleter(vshControl *ctl, - const vshCmd *cmd ATTRIBUTE_UNUSED, + const vshCmd *cmd G_GNUC_UNUSED, unsigned int flags) { virshControlPtr priv =3D ctl->privData; @@ -67,7 +67,7 @@ virshNWFilterNameCompleter(vshControl *ctl, =20 char ** virshNWFilterBindingNameCompleter(vshControl *ctl, - const vshCmd *cmd ATTRIBUTE_UNUSED, + const vshCmd *cmd G_GNUC_UNUSED, unsigned int flags) { virshControlPtr priv =3D ctl->privData; diff --git a/tools/virsh-completer-pool.c b/tools/virsh-completer-pool.c index 9703589522..e646d07e65 100644 --- a/tools/virsh-completer-pool.c +++ b/tools/virsh-completer-pool.c @@ -29,7 +29,7 @@ =20 char ** virshStoragePoolNameCompleter(vshControl *ctl, - const vshCmd *cmd ATTRIBUTE_UNUSED, + const vshCmd *cmd G_GNUC_UNUSED, unsigned int flags) { virshControlPtr priv =3D ctl->privData; @@ -71,8 +71,8 @@ virshStoragePoolNameCompleter(vshControl *ctl, =20 =20 char ** -virshPoolEventNameCompleter(vshControl *ctl ATTRIBUTE_UNUSED, - const vshCmd *cmd ATTRIBUTE_UNUSED, +virshPoolEventNameCompleter(vshControl *ctl G_GNUC_UNUSED, + const vshCmd *cmd G_GNUC_UNUSED, unsigned int flags) { size_t i =3D 0; diff --git a/tools/virsh-completer-secret.c b/tools/virsh-completer-secret.c index a6924b6b8c..38403f275a 100644 --- a/tools/virsh-completer-secret.c +++ b/tools/virsh-completer-secret.c @@ -28,7 +28,7 @@ =20 char ** virshSecretUUIDCompleter(vshControl *ctl, - const vshCmd *cmd ATTRIBUTE_UNUSED, + const vshCmd *cmd G_GNUC_UNUSED, unsigned int flags) { virshControlPtr priv =3D ctl->privData; @@ -68,8 +68,8 @@ virshSecretUUIDCompleter(vshControl *ctl, =20 =20 char ** -virshSecretEventNameCompleter(vshControl *ctl ATTRIBUTE_UNUSED, - const vshCmd *cmd ATTRIBUTE_UNUSED, +virshSecretEventNameCompleter(vshControl *ctl G_GNUC_UNUSED, + const vshCmd *cmd G_GNUC_UNUSED, unsigned int flags) { size_t i; diff --git a/tools/virsh-console.c b/tools/virsh-console.c index 3b7c39a1a4..a087d82776 100644 --- a/tools/virsh-console.c +++ b/tools/virsh-console.c @@ -91,7 +91,7 @@ virConsoleOnceInit(void) VIR_ONCE_GLOBAL_INIT(virConsole); =20 static void -virConsoleHandleSignal(int sig ATTRIBUTE_UNUSED) +virConsoleHandleSignal(int sig G_GNUC_UNUSED) { } =20 @@ -232,8 +232,8 @@ virConsoleEventOnStream(virStreamPtr st, =20 =20 static void -virConsoleEventOnStdin(int watch ATTRIBUTE_UNUSED, - int fd ATTRIBUTE_UNUSED, +virConsoleEventOnStdin(int watch G_GNUC_UNUSED, + int fd G_GNUC_UNUSED, int events, void *opaque) { @@ -306,7 +306,7 @@ virConsoleEventOnStdin(int watch ATTRIBUTE_UNUSED, =20 =20 static void -virConsoleEventOnStdout(int watch ATTRIBUTE_UNUSED, +virConsoleEventOnStdout(int watch G_GNUC_UNUSED, int fd, int events, void *opaque) diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c index b69283b2da..92dcbd1eb7 100644 --- a/tools/virsh-domain-monitor.c +++ b/tools/virsh-domain-monitor.c @@ -2169,9 +2169,9 @@ static const vshCmdOptDef opts_domstats[] =3D { =20 =20 static bool -virshDomainStatsPrintRecord(vshControl *ctl ATTRIBUTE_UNUSED, +virshDomainStatsPrintRecord(vshControl *ctl G_GNUC_UNUSED, virDomainStatsRecordPtr record, - bool raw ATTRIBUTE_UNUSED) + bool raw G_GNUC_UNUSED) { char *param; size_t i; diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index c2e7c2b227..e188c0a34f 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -1708,9 +1708,9 @@ virshPrintJobProgress(const char *label, unsigned lon= g long remaining, =20 static volatile sig_atomic_t intCaught; =20 -static void virshCatchInt(int sig ATTRIBUTE_UNUSED, - siginfo_t *siginfo ATTRIBUTE_UNUSED, - void *context ATTRIBUTE_UNUSED) +static void virshCatchInt(int sig G_GNUC_UNUSED, + siginfo_t *siginfo G_GNUC_UNUSED, + void *context G_GNUC_UNUSED) { intCaught =3D 1; } @@ -1735,10 +1735,10 @@ struct _virshBlockJobWaitData { =20 =20 static void -virshBlockJobStatusHandler(virConnectPtr conn ATTRIBUTE_UNUSED, - virDomainPtr dom ATTRIBUTE_UNUSED, +virshBlockJobStatusHandler(virConnectPtr conn G_GNUC_UNUSED, + virDomainPtr dom G_GNUC_UNUSED, const char *disk, - int type ATTRIBUTE_UNUSED, + int type G_GNUC_UNUSED, int status, void *opaque) { @@ -9563,7 +9563,7 @@ struct virshQemuEventData { typedef struct virshQemuEventData virshQemuEventData; =20 static void -virshEventQemuPrint(virConnectPtr conn ATTRIBUTE_UNUSED, +virshEventQemuPrint(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, const char *event, long long seconds, @@ -10904,7 +10904,7 @@ virshMigrateTimeout(vshControl *ctl, } =20 static void -virshMigrateIteration(virConnectPtr conn ATTRIBUTE_UNUSED, +virshMigrateIteration(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, int iteration, void *opaque) @@ -11765,7 +11765,7 @@ cmdDomHostname(vshControl *ctl, const vshCmd *cmd) * @n2 second node * returns true in case n1 covers n2, false otherwise. */ -ATTRIBUTE_UNUSED +G_GNUC_UNUSED static bool virshNodeIsSuperset(xmlNodePtr n1, xmlNodePtr n2) { @@ -13029,7 +13029,7 @@ virshEventPrint(virshDomEventData *data, } =20 static void -virshEventGenericPrint(virConnectPtr conn ATTRIBUTE_UNUSED, +virshEventGenericPrint(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, void *opaque) { @@ -13042,7 +13042,7 @@ virshEventGenericPrint(virConnectPtr conn ATTRIBUTE= _UNUSED, } =20 static void -virshEventLifecyclePrint(virConnectPtr conn ATTRIBUTE_UNUSED, +virshEventLifecyclePrint(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, int event, int detail, @@ -13058,7 +13058,7 @@ virshEventLifecyclePrint(virConnectPtr conn ATTRIBU= TE_UNUSED, } =20 static void -virshEventRTCChangePrint(virConnectPtr conn ATTRIBUTE_UNUSED, +virshEventRTCChangePrint(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, long long utcoffset, void *opaque) @@ -13072,7 +13072,7 @@ virshEventRTCChangePrint(virConnectPtr conn ATTRIBU= TE_UNUSED, } =20 static void -virshEventWatchdogPrint(virConnectPtr conn ATTRIBUTE_UNUSED, +virshEventWatchdogPrint(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, int action, void *opaque) @@ -13086,7 +13086,7 @@ virshEventWatchdogPrint(virConnectPtr conn ATTRIBUT= E_UNUSED, } =20 static void -virshEventIOErrorPrint(virConnectPtr conn ATTRIBUTE_UNUSED, +virshEventIOErrorPrint(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, const char *srcPath, const char *devAlias, @@ -13104,7 +13104,7 @@ virshEventIOErrorPrint(virConnectPtr conn ATTRIBUTE= _UNUSED, } =20 static void -virshEventGraphicsPrint(virConnectPtr conn ATTRIBUTE_UNUSED, +virshEventGraphicsPrint(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, int phase, const virDomainEventGraphicsAddress *local, @@ -13136,7 +13136,7 @@ virshEventGraphicsPrint(virConnectPtr conn ATTRIBUT= E_UNUSED, } =20 static void -virshEventIOErrorReasonPrint(virConnectPtr conn ATTRIBUTE_UNUSED, +virshEventIOErrorReasonPrint(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, const char *srcPath, const char *devAlias, @@ -13157,7 +13157,7 @@ virshEventIOErrorReasonPrint(virConnectPtr conn ATT= RIBUTE_UNUSED, } =20 static void -virshEventBlockJobPrint(virConnectPtr conn ATTRIBUTE_UNUSED, +virshEventBlockJobPrint(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, const char *disk, int type, @@ -13176,7 +13176,7 @@ virshEventBlockJobPrint(virConnectPtr conn ATTRIBUT= E_UNUSED, } =20 static void -virshEventDiskChangePrint(virConnectPtr conn ATTRIBUTE_UNUSED, +virshEventDiskChangePrint(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, const char *oldSrc, const char *newSrc, @@ -13197,7 +13197,7 @@ virshEventDiskChangePrint(virConnectPtr conn ATTRIB= UTE_UNUSED, } =20 static void -virshEventTrayChangePrint(virConnectPtr conn ATTRIBUTE_UNUSED, +virshEventTrayChangePrint(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, const char *alias, int reason, @@ -13213,9 +13213,9 @@ virshEventTrayChangePrint(virConnectPtr conn ATTRIB= UTE_UNUSED, } =20 static void -virshEventPMChangePrint(virConnectPtr conn ATTRIBUTE_UNUSED, +virshEventPMChangePrint(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, - int reason ATTRIBUTE_UNUSED, + int reason G_GNUC_UNUSED, void *opaque) { /* As long as libvirt.h doesn't define any reasons, we might as @@ -13224,7 +13224,7 @@ virshEventPMChangePrint(virConnectPtr conn ATTRIBUT= E_UNUSED, } =20 static void -virshEventBalloonChangePrint(virConnectPtr conn ATTRIBUTE_UNUSED, +virshEventBalloonChangePrint(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, unsigned long long actual, void *opaque) @@ -13238,7 +13238,7 @@ virshEventBalloonChangePrint(virConnectPtr conn ATT= RIBUTE_UNUSED, } =20 static void -virshEventDeviceRemovedPrint(virConnectPtr conn ATTRIBUTE_UNUSED, +virshEventDeviceRemovedPrint(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, const char *alias, void *opaque) @@ -13252,7 +13252,7 @@ virshEventDeviceRemovedPrint(virConnectPtr conn ATT= RIBUTE_UNUSED, } =20 static void -virshEventDeviceAddedPrint(virConnectPtr conn ATTRIBUTE_UNUSED, +virshEventDeviceAddedPrint(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, const char *alias, void *opaque) @@ -13266,7 +13266,7 @@ virshEventDeviceAddedPrint(virConnectPtr conn ATTRI= BUTE_UNUSED, } =20 static void -virshEventTunablePrint(virConnectPtr conn ATTRIBUTE_UNUSED, +virshEventTunablePrint(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, virTypedParameterPtr params, int nparams, @@ -13304,7 +13304,7 @@ VIR_ENUM_IMPL(virshEventAgentLifecycleReason, =20 #define UNKNOWNSTR(str) (str ? str : N_("unsupported value")) static void -virshEventAgentLifecyclePrint(virConnectPtr conn ATTRIBUTE_UNUSED, +virshEventAgentLifecyclePrint(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, int state, int reason, @@ -13321,7 +13321,7 @@ virshEventAgentLifecyclePrint(virConnectPtr conn AT= TRIBUTE_UNUSED, } =20 static void -virshEventMigrationIterationPrint(virConnectPtr conn ATTRIBUTE_UNUSED, +virshEventMigrationIterationPrint(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, int iteration, void *opaque) @@ -13337,7 +13337,7 @@ virshEventMigrationIterationPrint(virConnectPtr con= n ATTRIBUTE_UNUSED, } =20 static void -virshEventJobCompletedPrint(virConnectPtr conn ATTRIBUTE_UNUSED, +virshEventJobCompletedPrint(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, virTypedParameterPtr params, int nparams, @@ -13361,7 +13361,7 @@ virshEventJobCompletedPrint(virConnectPtr conn ATTR= IBUTE_UNUSED, =20 =20 static void -virshEventDeviceRemovalFailedPrint(virConnectPtr conn ATTRIBUTE_UNUSED, +virshEventDeviceRemovalFailedPrint(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, const char *alias, void *opaque) @@ -13382,7 +13382,7 @@ VIR_ENUM_IMPL(virshEventMetadataChangeType, N_("element")); =20 static void -virshEventMetadataChangePrint(virConnectPtr conn ATTRIBUTE_UNUSED, +virshEventMetadataChangePrint(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, int type, const char *nsuri, @@ -13399,7 +13399,7 @@ virshEventMetadataChangePrint(virConnectPtr conn AT= TRIBUTE_UNUSED, =20 =20 static void -virshEventBlockThresholdPrint(virConnectPtr conn ATTRIBUTE_UNUSED, +virshEventBlockThresholdPrint(virConnectPtr conn G_GNUC_UNUSED, virDomainPtr dom, const char *dev, const char *path, diff --git a/tools/virsh-host.c b/tools/virsh-host.c index da269f4c4c..9ecbdb5af6 100644 --- a/tools/virsh-host.c +++ b/tools/virsh-host.c @@ -50,7 +50,7 @@ static const vshCmdInfo info_capabilities[] =3D { }; =20 static bool -cmdCapabilities(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) +cmdCapabilities(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) { char *caps; virshControlPtr priv =3D ctl->privData; @@ -654,7 +654,7 @@ static const vshCmdInfo info_nodeinfo[] =3D { }; =20 static bool -cmdNodeinfo(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) +cmdNodeinfo(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) { virNodeInfo info; virshControlPtr priv =3D ctl->privData; @@ -699,7 +699,7 @@ static const vshCmdOptDef opts_node_cpumap[] =3D { }; =20 static bool -cmdNodeCpuMap(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) +cmdNodeCpuMap(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) { int cpu, cpunum; unsigned char *cpumap =3D NULL; @@ -1029,7 +1029,7 @@ static const vshCmdInfo info_sysinfo[] =3D { }; =20 static bool -cmdSysinfo(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) +cmdSysinfo(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) { char *sysinfo; virshControlPtr priv =3D ctl->privData; @@ -1060,7 +1060,7 @@ static const vshCmdInfo info_hostname[] =3D { }; =20 static bool -cmdHostname(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) +cmdHostname(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) { char *hostname; virshControlPtr priv =3D ctl->privData; @@ -1091,7 +1091,7 @@ static const vshCmdInfo info_uri[] =3D { }; =20 static bool -cmdURI(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) +cmdURI(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) { char *uri; virshControlPtr priv =3D ctl->privData; @@ -1409,7 +1409,7 @@ static const vshCmdOptDef opts_version[] =3D { }; =20 static bool -cmdVersion(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) +cmdVersion(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) { unsigned long hvVersion; const char *hvType; diff --git a/tools/virsh-interface.c b/tools/virsh-interface.c index 7e84ee3c52..b83e385d00 100644 --- a/tools/virsh-interface.c +++ b/tools/virsh-interface.c @@ -345,7 +345,7 @@ static const vshCmdOptDef opts_interface_list[] =3D { }; =20 static bool -cmdInterfaceList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) +cmdInterfaceList(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) { bool inactive =3D vshCommandOptBool(cmd, "inactive"); bool all =3D vshCommandOptBool(cmd, "all"); @@ -695,7 +695,7 @@ static const vshCmdOptDef opts_interface_begin[] =3D { }; =20 static bool -cmdInterfaceBegin(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) +cmdInterfaceBegin(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) { virshControlPtr priv =3D ctl->privData; =20 @@ -726,7 +726,7 @@ static const vshCmdOptDef opts_interface_commit[] =3D { }; =20 static bool -cmdInterfaceCommit(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) +cmdInterfaceCommit(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) { virshControlPtr priv =3D ctl->privData; =20 @@ -757,7 +757,7 @@ static const vshCmdOptDef opts_interface_rollback[] =3D= { }; =20 static bool -cmdInterfaceRollback(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) +cmdInterfaceRollback(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) { virshControlPtr priv =3D ctl->privData; =20 diff --git a/tools/virsh-network.c b/tools/virsh-network.c index be16f7970e..163cf21af9 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -703,7 +703,7 @@ static const vshCmdOptDef opts_network_list[] =3D { if (vshCommandOptBool(cmd, NAME)) \ flags |=3D (FLAG) static bool -cmdNetworkList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) +cmdNetworkList(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) { virshNetworkListPtr list =3D NULL; size_t i; @@ -1208,10 +1208,10 @@ VIR_ENUM_IMPL(virshNetworkEventId, "lifecycle"); =20 static void -vshEventLifecyclePrint(virConnectPtr conn ATTRIBUTE_UNUSED, +vshEventLifecyclePrint(virConnectPtr conn G_GNUC_UNUSED, virNetworkPtr net, int event, - int detail ATTRIBUTE_UNUSED, + int detail G_GNUC_UNUSED, void *opaque) { virshNetEventData *data =3D opaque; diff --git a/tools/virsh-nodedev.c b/tools/virsh-nodedev.c index b21e2e2fcc..9236d159ed 100644 --- a/tools/virsh-nodedev.c +++ b/tools/virsh-nodedev.c @@ -382,7 +382,7 @@ static const vshCmdOptDef opts_node_list_devices[] =3D { }; =20 static bool -cmdNodeListDevices(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) +cmdNodeListDevices(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) { const char *cap_str =3D NULL; size_t i; @@ -780,10 +780,10 @@ struct virshNodeDeviceEventData { typedef struct virshNodeDeviceEventData virshNodeDeviceEventData; =20 static void -vshEventLifecyclePrint(virConnectPtr conn ATTRIBUTE_UNUSED, +vshEventLifecyclePrint(virConnectPtr conn G_GNUC_UNUSED, virNodeDevicePtr dev, int event, - int detail ATTRIBUTE_UNUSED, + int detail G_GNUC_UNUSED, void *opaque) { virshNodeDeviceEventData *data =3D opaque; @@ -811,7 +811,7 @@ vshEventLifecyclePrint(virConnectPtr conn ATTRIBUTE_UNU= SED, } =20 static void -vshEventGenericPrint(virConnectPtr conn ATTRIBUTE_UNUSED, +vshEventGenericPrint(virConnectPtr conn G_GNUC_UNUSED, virNodeDevicePtr dev, void *opaque) { diff --git a/tools/virsh-nwfilter.c b/tools/virsh-nwfilter.c index 952fb2f391..b87040ee6e 100644 --- a/tools/virsh-nwfilter.c +++ b/tools/virsh-nwfilter.c @@ -351,7 +351,7 @@ static const vshCmdOptDef opts_nwfilter_list[] =3D { }; =20 static bool -cmdNWFilterList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) +cmdNWFilterList(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) { size_t i; char uuid[VIR_UUID_STRING_BUFLEN]; @@ -716,7 +716,7 @@ static const vshCmdOptDef opts_nwfilter_binding_list[] = =3D { }; =20 static bool -cmdNWFilterBindingList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) +cmdNWFilterBindingList(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) { size_t i; bool ret =3D false; diff --git a/tools/virsh-pool.c b/tools/virsh-pool.c index 96ef626346..55af2e4e4e 100644 --- a/tools/virsh-pool.c +++ b/tools/virsh-pool.c @@ -1114,7 +1114,7 @@ static const vshCmdOptDef opts_pool_list[] =3D { }; =20 static bool -cmdPoolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) +cmdPoolList(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) { virStoragePoolInfo info; size_t i; @@ -1445,7 +1445,7 @@ static const vshCmdOptDef opts_find_storage_pool_sour= ces_as[] =3D { }; =20 static bool -cmdPoolDiscoverSourcesAs(vshControl * ctl, const vshCmd * cmd ATTRIBUTE_UN= USED) +cmdPoolDiscoverSourcesAs(vshControl * ctl, const vshCmd * cmd G_GNUC_UNUSE= D) { const char *type =3D NULL, *host =3D NULL; char *srcSpec =3D NULL; @@ -1528,7 +1528,7 @@ static const vshCmdOptDef opts_find_storage_pool_sour= ces[] =3D { }; =20 static bool -cmdPoolDiscoverSources(vshControl * ctl, const vshCmd * cmd ATTRIBUTE_UNUS= ED) +cmdPoolDiscoverSources(vshControl * ctl, const vshCmd * cmd G_GNUC_UNUSED) { const char *type =3D NULL, *srcSpecFile =3D NULL; char *srcSpec =3D NULL, *srcList; @@ -1918,10 +1918,10 @@ typedef struct virshPoolEventData virshPoolEventDat= a; =20 =20 static void -vshEventLifecyclePrint(virConnectPtr conn ATTRIBUTE_UNUSED, +vshEventLifecyclePrint(virConnectPtr conn G_GNUC_UNUSED, virStoragePoolPtr pool, int event, - int detail ATTRIBUTE_UNUSED, + int detail G_GNUC_UNUSED, void *opaque) { virshPoolEventData *data =3D opaque; @@ -1951,7 +1951,7 @@ vshEventLifecyclePrint(virConnectPtr conn ATTRIBUTE_U= NUSED, } =20 static void -vshEventGenericPrint(virConnectPtr conn ATTRIBUTE_UNUSED, +vshEventGenericPrint(virConnectPtr conn G_GNUC_UNUSED, virStoragePoolPtr pool, void *opaque) { @@ -2126,7 +2126,7 @@ static const vshCmdOptDef opts_pool_capabilities[] = =3D { =20 static bool cmdPoolCapabilities(vshControl *ctl, - const vshCmd *cmd ATTRIBUTE_UNUSED) + const vshCmd *cmd G_GNUC_UNUSED) { const unsigned int flags =3D 0; /* No flags so far */ virshControlPtr priv =3D ctl->privData; diff --git a/tools/virsh-secret.c b/tools/virsh-secret.c index 48058bea05..7558c4c476 100644 --- a/tools/virsh-secret.c +++ b/tools/virsh-secret.c @@ -488,7 +488,7 @@ static const vshCmdOptDef opts_secret_list[] =3D { }; =20 static bool -cmdSecretList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) +cmdSecretList(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) { size_t i; virshSecretListPtr list =3D NULL; @@ -579,10 +579,10 @@ struct virshSecretEventData { typedef struct virshSecretEventData virshSecretEventData; =20 static void -vshEventLifecyclePrint(virConnectPtr conn ATTRIBUTE_UNUSED, +vshEventLifecyclePrint(virConnectPtr conn G_GNUC_UNUSED, virSecretPtr secret, int event, - int detail ATTRIBUTE_UNUSED, + int detail G_GNUC_UNUSED, void *opaque) { virshSecretEventData *data =3D opaque; @@ -611,7 +611,7 @@ vshEventLifecyclePrint(virConnectPtr conn ATTRIBUTE_UNU= SED, } =20 static void -vshEventGenericPrint(virConnectPtr conn ATTRIBUTE_UNUSED, +vshEventGenericPrint(virConnectPtr conn G_GNUC_UNUSED, virSecretPtr secret, void *opaque) { diff --git a/tools/virsh-util.c b/tools/virsh-util.c index 933d1c825d..f436fbb486 100644 --- a/tools/virsh-util.c +++ b/tools/virsh-util.c @@ -141,7 +141,7 @@ virshDomainState(vshControl *ctl, =20 =20 int -virshStreamSink(virStreamPtr st ATTRIBUTE_UNUSED, +virshStreamSink(virStreamPtr st G_GNUC_UNUSED, const char *bytes, size_t nbytes, void *opaque) @@ -153,7 +153,7 @@ virshStreamSink(virStreamPtr st ATTRIBUTE_UNUSED, =20 =20 int -virshStreamSource(virStreamPtr st ATTRIBUTE_UNUSED, +virshStreamSource(virStreamPtr st G_GNUC_UNUSED, char *bytes, size_t nbytes, void *opaque) @@ -166,7 +166,7 @@ virshStreamSource(virStreamPtr st ATTRIBUTE_UNUSED, =20 =20 int -virshStreamSourceSkip(virStreamPtr st ATTRIBUTE_UNUSED, +virshStreamSourceSkip(virStreamPtr st G_GNUC_UNUSED, long long offset, void *opaque) { @@ -182,7 +182,7 @@ virshStreamSourceSkip(virStreamPtr st ATTRIBUTE_UNUSED, =20 =20 int -virshStreamSkip(virStreamPtr st ATTRIBUTE_UNUSED, +virshStreamSkip(virStreamPtr st G_GNUC_UNUSED, long long offset, void *opaque) { @@ -200,7 +200,7 @@ virshStreamSkip(virStreamPtr st ATTRIBUTE_UNUSED, =20 =20 int -virshStreamInData(virStreamPtr st ATTRIBUTE_UNUSED, +virshStreamInData(virStreamPtr st G_GNUC_UNUSED, int *inData, long long *offset, void *opaque) diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c index 97803b21be..702d0109ad 100644 --- a/tools/virsh-volume.c +++ b/tools/virsh-volume.c @@ -1376,7 +1376,7 @@ static const vshCmdOptDef opts_vol_list[] =3D { }; =20 static bool -cmdVolList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) +cmdVolList(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) { virStorageVolInfo volumeInfo; virStoragePoolPtr pool; diff --git a/tools/virsh.c b/tools/virsh.c index ec20f35a77..0ed46e0e64 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -392,7 +392,7 @@ virshInit(vshControl *ctl) } =20 static void -virshDeinitTimer(int timer ATTRIBUTE_UNUSED, void *opaque ATTRIBUTE_UNUSED) +virshDeinitTimer(int timer G_GNUC_UNUSED, void *opaque G_GNUC_UNUSED) { /* nothing to be done here */ } @@ -498,7 +498,7 @@ virshUsage(void) * Show version and options compiled in */ static void -virshShowVersion(vshControl *ctl ATTRIBUTE_UNUSED) +virshShowVersion(vshControl *ctl G_GNUC_UNUSED) { /* FIXME - list a copyright blurb, as in GNU programs? */ vshPrint(ctl, _("Virsh command line tool of libvirt %s\n"), VERSION); diff --git a/tools/virt-admin-completer.c b/tools/virt-admin-completer.c index e0e36f9756..b8602efaf9 100644 --- a/tools/virt-admin-completer.c +++ b/tools/virt-admin-completer.c @@ -29,7 +29,7 @@ =20 char ** vshAdmServerCompleter(vshControl *ctl, - const vshCmd *cmd ATTRIBUTE_UNUSED, + const vshCmd *cmd G_GNUC_UNUSED, unsigned int flags) { vshAdmControlPtr priv =3D ctl->privData; diff --git a/tools/virt-admin.c b/tools/virt-admin.c index e549ec1f83..95a3c3d30e 100644 --- a/tools/virt-admin.c +++ b/tools/virt-admin.c @@ -112,7 +112,7 @@ vshAdmGetTimeStr(vshControl *ctl, time_t then, char **r= esult) * check if the communication channel has not been closed by remote party. */ static void -vshAdmCatchDisconnect(virAdmConnectPtr conn ATTRIBUTE_UNUSED, +vshAdmCatchDisconnect(virAdmConnectPtr conn G_GNUC_UNUSED, int reason, void *opaque) { @@ -231,7 +231,7 @@ static const vshCmdInfo info_uri[] =3D { }; =20 static bool -cmdURI(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) +cmdURI(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) { char *uri; vshAdmControlPtr priv =3D ctl->privData; @@ -263,7 +263,7 @@ static const vshCmdInfo info_version[] =3D { }; =20 static bool -cmdVersion(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) +cmdVersion(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) { unsigned long libVersion; unsigned long long includeVersion; @@ -373,7 +373,7 @@ static const vshCmdInfo info_srv_list[] =3D { }; =20 static bool -cmdSrvList(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) +cmdSrvList(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) { int nsrvs =3D 0; size_t i; @@ -1168,7 +1168,7 @@ vshAdmInit(vshControl *ctl) } =20 static void -vshAdmDeinitTimer(int timer ATTRIBUTE_UNUSED, void *opaque ATTRIBUTE_UNUSE= D) +vshAdmDeinitTimer(int timer G_GNUC_UNUSED, void *opaque G_GNUC_UNUSED) { /* nothing to be done here */ } @@ -1256,7 +1256,7 @@ vshAdmUsage(void) * Show version and options compiled in */ static void -vshAdmShowVersion(vshControl *ctl ATTRIBUTE_UNUSED) +vshAdmShowVersion(vshControl *ctl G_GNUC_UNUSED) { /* FIXME - list a copyright blurb, as in GNU programs? */ vshPrint(ctl, _("Virt-admin command line tool of libvirt %s\n"), VERSI= ON); diff --git a/tools/virt-host-validate-common.c b/tools/virt-host-validate-c= ommon.c index 804c0adc2d..7fb1335194 100644 --- a/tools/virt-host-validate-common.c +++ b/tools/virt-host-validate-common.c @@ -323,8 +323,8 @@ int virHostValidateCGroupControllers(const char *hvname, return ret; } #else /* !__linux__ */ -int virHostValidateCGroupControllers(const char *hvname ATTRIBUTE_UNUSED, - int controllers ATTRIBUTE_UNUSED, +int virHostValidateCGroupControllers(const char *hvname G_GNUC_UNUSED, + int controllers G_GNUC_UNUSED, virHostValidateLevel level) { virHostMsgFail(level, "%s", "This platform does not support cgroups"); diff --git a/tools/virt-login-shell-helper.c b/tools/virt-login-shell-helpe= r.c index 1a621ae53c..a24a14d1d3 100644 --- a/tools/virt-login-shell-helper.c +++ b/tools/virt-login-shell-helper.c @@ -144,8 +144,8 @@ show_version(void) =20 =20 static void -hideErrorFunc(void *opaque ATTRIBUTE_UNUSED, - virErrorPtr err ATTRIBUTE_UNUSED) +hideErrorFunc(void *opaque G_GNUC_UNUSED, + virErrorPtr err G_GNUC_UNUSED) { } =20 diff --git a/tools/vsh.c b/tools/vsh.c index bf8b6b412b..a9b2a84122 100644 --- a/tools/vsh.c +++ b/tools/vsh.c @@ -230,8 +230,8 @@ virErrorPtr last_error; * Quieten libvirt until we're done with the command. */ void -vshErrorHandler(void *opaque ATTRIBUTE_UNUSED, - virErrorPtr error ATTRIBUTE_UNUSED) +vshErrorHandler(void *opaque G_GNUC_UNUSED, + virErrorPtr error G_GNUC_UNUSED) { virFreeError(last_error); last_error =3D virSaveLastError(); @@ -1026,7 +1026,7 @@ vshCommandOptULWrap(vshControl *ctl, const vshCmd *cm= d, * <0 in all other cases (@value untouched) */ int -vshCommandOptStringQuiet(vshControl *ctl ATTRIBUTE_UNUSED, const vshCmd *c= md, +vshCommandOptStringQuiet(vshControl *ctl G_GNUC_UNUSED, const vshCmd *cmd, const char *name, const char **value) { vshCmdOpt *arg; @@ -1245,7 +1245,7 @@ vshCommandOptBool(const vshCmd *cmd, const char *name) * list of supported options in CMD->def->opts. */ const vshCmdOpt * -vshCommandOptArgv(vshControl *ctl ATTRIBUTE_UNUSED, const vshCmd *cmd, +vshCommandOptArgv(vshControl *ctl G_GNUC_UNUSED, const vshCmd *cmd, const vshCmdOpt *opt) { opt =3D opt ? opt->next : cmd->opts; @@ -1645,7 +1645,7 @@ vshCommandParse(vshControl *ctl, vshCommandParser *pa= rser, vshCmd **partial) =20 static vshCommandToken ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) vshCommandArgvGetArg(vshControl *ctl, vshCommandParser *parser, char **res, - bool report ATTRIBUTE_UNUSED) + bool report G_GNUC_UNUSED) { if (parser->arg_pos =3D=3D parser->arg_end) { *res =3D NULL; @@ -1897,7 +1897,7 @@ vshPrintExtra(vshControl *ctl, const char *format, ..= .) =20 =20 void -vshPrint(vshControl *ctl ATTRIBUTE_UNUSED, const char *format, ...) +vshPrint(vshControl *ctl G_GNUC_UNUSED, const char *format, ...) { va_list ap; char *str; @@ -1912,8 +1912,8 @@ vshPrint(vshControl *ctl ATTRIBUTE_UNUSED, const char= *format, ...) =20 =20 bool -vshTTYIsInterruptCharacter(vshControl *ctl ATTRIBUTE_UNUSED, - const char chr ATTRIBUTE_UNUSED) +vshTTYIsInterruptCharacter(vshControl *ctl G_GNUC_UNUSED, + const char chr G_GNUC_UNUSED) { #ifndef WIN32 if (ctl->istty && @@ -1933,7 +1933,7 @@ vshTTYAvailable(vshControl *ctl) =20 =20 int -vshTTYDisableInterrupt(vshControl *ctl ATTRIBUTE_UNUSED) +vshTTYDisableInterrupt(vshControl *ctl G_GNUC_UNUSED) { #ifndef WIN32 struct termios termset =3D ctl->termattr; @@ -1957,7 +1957,7 @@ vshTTYDisableInterrupt(vshControl *ctl ATTRIBUTE_UNUS= ED) =20 =20 int -vshTTYRestore(vshControl *ctl ATTRIBUTE_UNUSED) +vshTTYRestore(vshControl *ctl G_GNUC_UNUSED) { #ifndef WIN32 if (!ctl->istty) @@ -1987,8 +1987,8 @@ cfmakeraw(struct termios *attr) =20 =20 int -vshTTYMakeRaw(vshControl *ctl ATTRIBUTE_UNUSED, - bool report_errors ATTRIBUTE_UNUSED) +vshTTYMakeRaw(vshControl *ctl G_GNUC_UNUSED, + bool report_errors G_GNUC_UNUSED) { #ifndef WIN32 struct termios rawattr =3D ctl->termattr; @@ -2079,9 +2079,9 @@ static struct sigaction vshEventOldAction; =20 /* Signal handler installed in vshEventStart, removed in vshEventCleanup. = */ static void -vshEventInt(int sig ATTRIBUTE_UNUSED, - siginfo_t *siginfo ATTRIBUTE_UNUSED, - void *context ATTRIBUTE_UNUSED) +vshEventInt(int sig G_GNUC_UNUSED, + siginfo_t *siginfo G_GNUC_UNUSED, + void *context G_GNUC_UNUSED) { char reason =3D VSH_EVENT_INTERRUPT; if (vshEventFd >=3D 0) @@ -2091,7 +2091,7 @@ vshEventInt(int sig ATTRIBUTE_UNUSED, =20 /* Event loop handler used to limit length of waiting for any other event.= */ void -vshEventTimeout(int timer ATTRIBUTE_UNUSED, +vshEventTimeout(int timer G_GNUC_UNUSED, void *opaque) { vshControl *ctl =3D opaque; @@ -2410,8 +2410,8 @@ vshAskReedit(vshControl *ctl, const char *msg, bool r= elax_avail) #else /* WIN32 */ int vshAskReedit(vshControl *ctl, - const char *msg ATTRIBUTE_UNUSED, - bool relax_avail ATTRIBUTE_UNUSED) + const char *msg G_GNUC_UNUSED, + bool relax_avail G_GNUC_UNUSED) { vshDebug(ctl, VSH_ERR_WARNING, "%s", _("This function is not " "supported on WIN32 platform")); @@ -2907,8 +2907,8 @@ vshReadlineParse(const char *text, int state) =20 static char ** vshReadlineCompletion(const char *text, - int start ATTRIBUTE_UNUSED, - int end ATTRIBUTE_UNUSED) + int start G_GNUC_UNUSED, + int end G_GNUC_UNUSED) { char **matches =3D (char **) NULL; =20 @@ -3017,7 +3017,7 @@ vshReadlineDeinit(vshControl *ctl) } =20 char * -vshReadline(vshControl *ctl ATTRIBUTE_UNUSED, const char *prompt) +vshReadline(vshControl *ctl G_GNUC_UNUSED, const char *prompt) { return readline(prompt); } @@ -3025,14 +3025,14 @@ vshReadline(vshControl *ctl ATTRIBUTE_UNUSED, const= char *prompt) #else /* !WITH_READLINE */ =20 static int -vshReadlineInit(vshControl *ctl ATTRIBUTE_UNUSED) +vshReadlineInit(vshControl *ctl G_GNUC_UNUSED) { /* empty */ return 0; } =20 static void -vshReadlineDeinit(vshControl *ctl ATTRIBUTE_UNUSED) +vshReadlineDeinit(vshControl *ctl G_GNUC_UNUSED) { /* empty */ } @@ -3380,7 +3380,7 @@ const vshCmdInfo info_pwd[] =3D { }; =20 bool -cmdPwd(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) +cmdPwd(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) { char *cwd; bool ret =3D true; @@ -3410,7 +3410,7 @@ const vshCmdInfo info_quit[] =3D { }; =20 bool -cmdQuit(vshControl *ctl, const vshCmd *cmd ATTRIBUTE_UNUSED) +cmdQuit(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED) { ctl->imode =3D false; return true; @@ -3435,7 +3435,7 @@ const vshCmdInfo info_selftest[] =3D { * the per-command options structure. */ bool cmdSelfTest(vshControl *ctl, - const vshCmd *cmd ATTRIBUTE_UNUSED) + const vshCmd *cmd G_GNUC_UNUSED) { const vshCmdGrp *grp; const vshCmdDef *def; @@ -3538,8 +3538,8 @@ cmdComplete(vshControl *ctl, const vshCmd *cmd) =20 =20 bool -cmdComplete(vshControl *ctl ATTRIBUTE_UNUSED, - const vshCmd *cmd ATTRIBUTE_UNUSED) +cmdComplete(vshControl *ctl G_GNUC_UNUSED, + const vshCmd *cmd G_GNUC_UNUSED) { return false; } diff --git a/tools/wireshark/src/packet-libvirt.c b/tools/wireshark/src/pac= ket-libvirt.c index dc3aa410e5..7096e72e67 100644 --- a/tools/wireshark/src/packet-libvirt.c +++ b/tools/wireshark/src/packet-libvirt.c @@ -443,7 +443,7 @@ dissect_libvirt_payload(tvbuff_t *tvb, proto_tree *tree, =20 static int dissect_libvirt_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tre= e, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { goffset offset; guint32 prog, proc, type, serial, status; @@ -508,14 +508,14 @@ dissect_libvirt_message(tvbuff_t *tvb, packet_info *p= info, proto_tree *tree, } =20 static guint -get_message_len(packet_info *pinfo ATTRIBUTE_UNUSED, tvbuff_t *tvb, int of= fset, void *data ATTRIBUTE_UNUSED) +get_message_len(packet_info *pinfo G_GNUC_UNUSED, tvbuff_t *tvb, int offse= t, void *data G_GNUC_UNUSED) { return tvb_get_ntohl(tvb, offset); } =20 static int dissect_libvirt(tvbuff_t *tvb, packet_info *pinfo, - proto_tree *tree, void *data ATTRIBUTE_UNUSED) + proto_tree *tree, void *data G_GNUC_UNUSED) { /* Another magic const - 4; simply, how much bytes * is needed to tell the length of libvirt packet. */ --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 10:00:01 2024 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=1571059062; cv=none; d=zoho.com; s=zohoarc; b=eje1OCNuCPAk9lJXUuiS0zsbmRIwCEMc9J7WUPd7/N03O11T/tgsxBKVm/tGIFFESbIa9P7bxkIs5VwobKP+Se0rEHLDNO3Aw+Tvd4wQy31EP9JZBUP5SiCE3D152/+quhl4SfYk9T5P+Mm8HAnUPHUGUm2FXT5P/yFQnD9kZWg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571059062; 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=SLzVq496tfta4rJ3AaTJCQXBgs+apAdOUHFYdNSAwCI=; b=dli++aJHuMtbStQluI+K8ZxBo50YEXiaZCzWzb8jxhB9hyH2AtQKLKR8bnkwTXof+AlEoABaDiXLWINX/VKaSmq8TcE0AS3C+Lhvfs9itbGN8QCXtj1lCdh2ndwnG8ZoLSALuTOwgmaW6DHfVoZqPK2ic3sENAFy/+BAx1ikZ8g= 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 1571059062705267.4693015605792; Mon, 14 Oct 2019 06:17:42 -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 9518E308FFB1; Mon, 14 Oct 2019 13:17:37 +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 6864160A9F; Mon, 14 Oct 2019 13:17:37 +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 1C992180BAA2; Mon, 14 Oct 2019 13:17:37 +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 x9EDGhBJ017579 for ; Mon, 14 Oct 2019 09:16:43 -0400 Received: by smtp.corp.redhat.com (Postfix) id 09D7C60126; Mon, 14 Oct 2019 13:16:43 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5C261600CD for ; Mon, 14 Oct 2019 13:16:42 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Mon, 14 Oct 2019 15:15:47 +0200 Message-Id: <2df44fe1b2d96a59fa9c7d0bd090ab4de1bb2076.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 29/35] util: 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.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.49]); Mon, 14 Oct 2019 13:17:38 +0000 (UTC) Use G_GNUC_UNUSED from GLib instead of ATTRIBUTE_UNUSED. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/util/viraudit.c | 8 +- src/util/vircgroup.c | 398 +++++++++++++++---------------- src/util/vircgroupv1.c | 2 +- src/util/vircgroupv2.c | 14 +- src/util/vircommand.c | 48 ++-- src/util/virdbus.c | 76 +++--- src/util/virdevmapper.c | 14 +- src/util/virdnsmasq.c | 2 +- src/util/vireventpoll.c | 6 +- src/util/virfcp.c | 8 +- src/util/virfdstream.c | 10 +- src/util/virfile.c | 150 ++++++------ src/util/virhash.c | 8 +- src/util/virhostcpu.c | 26 +- src/util/virhostmem.c | 16 +- src/util/virinitctl.c | 4 +- src/util/virjson.c | 10 +- src/util/virkeyfile.c | 2 +- src/util/virlockspace.c | 6 +- src/util/virlog.c | 38 +-- src/util/virlog.h | 4 +- src/util/virmacmap.c | 4 +- src/util/virmdev.c | 4 +- src/util/virmodule.c | 2 +- src/util/virnetdev.c | 134 +++++------ src/util/virnetdevbridge.c | 58 ++--- src/util/virnetdevip.c | 12 +- src/util/virnetdevmacvlan.c | 100 ++++---- src/util/virnetdevopenvswitch.c | 2 +- src/util/virnetdevtap.c | 30 +-- src/util/virnetdevvportprofile.c | 28 +-- src/util/virnetlink.c | 92 +++---- src/util/virnodesuspend.c | 4 +- src/util/virnuma.c | 42 ++-- src/util/virobject.c | 2 +- src/util/virpci.c | 50 ++-- src/util/virperf.c | 20 +- src/util/virpidfile.c | 2 +- src/util/virpolkit.c | 14 +- src/util/virprocess.c | 38 +-- src/util/virscsihost.c | 24 +- src/util/virsocketaddr.c | 2 +- src/util/virstoragefile.c | 26 +- src/util/virstring.c | 6 +- src/util/virutil.c | 54 ++--- src/util/virvhba.c | 34 +-- src/util/virvsock.c | 4 +- src/util/virxml.c | 6 +- 48 files changed, 822 insertions(+), 822 deletions(-) diff --git a/src/util/viraudit.c b/src/util/viraudit.c index a02e5b36fd..23bc44734e 100644 --- a/src/util/viraudit.c +++ b/src/util/viraudit.c @@ -54,7 +54,7 @@ static int auditfd =3D -1; #endif static bool auditlog; =20 -int virAuditOpen(unsigned int audit_level ATTRIBUTE_UNUSED) +int virAuditOpen(unsigned int audit_level G_GNUC_UNUSED) { #if WITH_AUDIT if ((auditfd =3D audit_open()) < 0) { @@ -91,9 +91,9 @@ void virAuditSend(virLogSourcePtr source, const char *filename, size_t linenr, const char *funcname, - const char *clienttty ATTRIBUTE_UNUSED, - const char *clientaddr ATTRIBUTE_UNUSED, - virAuditRecordType type ATTRIBUTE_UNUSED, bool success, + const char *clienttty G_GNUC_UNUSED, + const char *clientaddr G_GNUC_UNUSED, + virAuditRecordType type G_GNUC_UNUSED, bool success, const char *fmt, ...) { VIR_AUTOFREE(char *) str =3D NULL; diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index 70d41c4ba5..c6e4cf2dde 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -2802,10 +2802,10 @@ virCgroupAvailable(void) =20 =20 int -virCgroupNewPartition(const char *path ATTRIBUTE_UNUSED, - bool create ATTRIBUTE_UNUSED, - int controllers ATTRIBUTE_UNUSED, - virCgroupPtr *group ATTRIBUTE_UNUSED) +virCgroupNewPartition(const char *path G_GNUC_UNUSED, + bool create G_GNUC_UNUSED, + int controllers G_GNUC_UNUSED, + virCgroupPtr *group G_GNUC_UNUSED) { virReportSystemError(ENXIO, "%s", _("Control groups not supported on this platform"= )); @@ -2814,7 +2814,7 @@ virCgroupNewPartition(const char *path ATTRIBUTE_UNUS= ED, =20 =20 int -virCgroupNewSelf(virCgroupPtr *group ATTRIBUTE_UNUSED) +virCgroupNewSelf(virCgroupPtr *group G_GNUC_UNUSED) { virReportSystemError(ENXIO, "%s", _("Control groups not supported on this platform"= )); @@ -2823,11 +2823,11 @@ virCgroupNewSelf(virCgroupPtr *group ATTRIBUTE_UNUS= ED) =20 =20 int -virCgroupNewDomainPartition(virCgroupPtr partition ATTRIBUTE_UNUSED, - const char *driver ATTRIBUTE_UNUSED, - const char *name ATTRIBUTE_UNUSED, - bool create ATTRIBUTE_UNUSED, - virCgroupPtr *group ATTRIBUTE_UNUSED) +virCgroupNewDomainPartition(virCgroupPtr partition G_GNUC_UNUSED, + const char *driver G_GNUC_UNUSED, + const char *name G_GNUC_UNUSED, + bool create G_GNUC_UNUSED, + virCgroupPtr *group G_GNUC_UNUSED) { virReportSystemError(ENXIO, "%s", _("Control groups not supported on this platform"= )); @@ -2836,11 +2836,11 @@ virCgroupNewDomainPartition(virCgroupPtr partition = ATTRIBUTE_UNUSED, =20 =20 int -virCgroupNewThread(virCgroupPtr domain ATTRIBUTE_UNUSED, - virCgroupThreadName nameval ATTRIBUTE_UNUSED, - int id ATTRIBUTE_UNUSED, - bool create ATTRIBUTE_UNUSED, - virCgroupPtr *group ATTRIBUTE_UNUSED) +virCgroupNewThread(virCgroupPtr domain G_GNUC_UNUSED, + virCgroupThreadName nameval G_GNUC_UNUSED, + int id G_GNUC_UNUSED, + bool create G_GNUC_UNUSED, + virCgroupPtr *group G_GNUC_UNUSED) { virReportSystemError(ENXIO, "%s", _("Control groups not supported on this platform"= )); @@ -2849,9 +2849,9 @@ virCgroupNewThread(virCgroupPtr domain ATTRIBUTE_UNUS= ED, =20 =20 int -virCgroupNewDetect(pid_t pid ATTRIBUTE_UNUSED, - int controllers ATTRIBUTE_UNUSED, - virCgroupPtr *group ATTRIBUTE_UNUSED) +virCgroupNewDetect(pid_t pid G_GNUC_UNUSED, + int controllers G_GNUC_UNUSED, + virCgroupPtr *group G_GNUC_UNUSED) { virReportSystemError(ENXIO, "%s", _("Control groups not supported on this platform"= )); @@ -2860,12 +2860,12 @@ virCgroupNewDetect(pid_t pid ATTRIBUTE_UNUSED, =20 =20 int -virCgroupNewDetectMachine(const char *name ATTRIBUTE_UNUSED, - const char *drivername ATTRIBUTE_UNUSED, - pid_t pid ATTRIBUTE_UNUSED, - int controllers ATTRIBUTE_UNUSED, - char *machinename ATTRIBUTE_UNUSED, - virCgroupPtr *group ATTRIBUTE_UNUSED) +virCgroupNewDetectMachine(const char *name G_GNUC_UNUSED, + const char *drivername G_GNUC_UNUSED, + pid_t pid G_GNUC_UNUSED, + int controllers G_GNUC_UNUSED, + char *machinename G_GNUC_UNUSED, + virCgroupPtr *group G_GNUC_UNUSED) { virReportSystemError(ENXIO, "%s", _("Control groups not supported on this platform"= )); @@ -2873,7 +2873,7 @@ virCgroupNewDetectMachine(const char *name ATTRIBUTE_= UNUSED, } =20 =20 -int virCgroupTerminateMachine(const char *name ATTRIBUTE_UNUSED) +int virCgroupTerminateMachine(const char *name G_GNUC_UNUSED) { virReportSystemError(ENXIO, "%s", _("Control groups not supported on this platform"= )); @@ -2882,18 +2882,18 @@ int virCgroupTerminateMachine(const char *name ATTR= IBUTE_UNUSED) =20 =20 int -virCgroupNewMachine(const char *name ATTRIBUTE_UNUSED, - const char *drivername ATTRIBUTE_UNUSED, - const unsigned char *uuid ATTRIBUTE_UNUSED, - const char *rootdir ATTRIBUTE_UNUSED, - pid_t pidleader ATTRIBUTE_UNUSED, - bool isContainer ATTRIBUTE_UNUSED, - size_t nnicindexes ATTRIBUTE_UNUSED, - int *nicindexes ATTRIBUTE_UNUSED, - const char *partition ATTRIBUTE_UNUSED, - int controllers ATTRIBUTE_UNUSED, - unsigned int maxthreads ATTRIBUTE_UNUSED, - virCgroupPtr *group ATTRIBUTE_UNUSED) +virCgroupNewMachine(const char *name G_GNUC_UNUSED, + const char *drivername G_GNUC_UNUSED, + const unsigned char *uuid G_GNUC_UNUSED, + const char *rootdir G_GNUC_UNUSED, + pid_t pidleader G_GNUC_UNUSED, + bool isContainer G_GNUC_UNUSED, + size_t nnicindexes G_GNUC_UNUSED, + int *nicindexes G_GNUC_UNUSED, + const char *partition G_GNUC_UNUSED, + int controllers G_GNUC_UNUSED, + unsigned int maxthreads G_GNUC_UNUSED, + virCgroupPtr *group G_GNUC_UNUSED) { virReportSystemError(ENXIO, "%s", _("Control groups not supported on this platform"= )); @@ -2910,18 +2910,18 @@ virCgroupNewIgnoreError(void) =20 =20 bool -virCgroupHasController(virCgroupPtr cgroup ATTRIBUTE_UNUSED, - int controller ATTRIBUTE_UNUSED) +virCgroupHasController(virCgroupPtr cgroup G_GNUC_UNUSED, + int controller G_GNUC_UNUSED) { return false; } =20 =20 int -virCgroupPathOfController(virCgroupPtr group ATTRIBUTE_UNUSED, - unsigned int controller ATTRIBUTE_UNUSED, - const char *key ATTRIBUTE_UNUSED, - char **path ATTRIBUTE_UNUSED) +virCgroupPathOfController(virCgroupPtr group G_GNUC_UNUSED, + unsigned int controller G_GNUC_UNUSED, + const char *key G_GNUC_UNUSED, + char **path G_GNUC_UNUSED) { virReportSystemError(ENXIO, "%s", _("Control groups not supported on this platform"= )); @@ -2930,8 +2930,8 @@ virCgroupPathOfController(virCgroupPtr group ATTRIBUT= E_UNUSED, =20 =20 int -virCgroupAddProcess(virCgroupPtr group ATTRIBUTE_UNUSED, - pid_t pid ATTRIBUTE_UNUSED) +virCgroupAddProcess(virCgroupPtr group G_GNUC_UNUSED, + pid_t pid G_GNUC_UNUSED) { virReportSystemError(ENXIO, "%s", _("Control groups not supported on this platform"= )); @@ -2940,8 +2940,8 @@ virCgroupAddProcess(virCgroupPtr group ATTRIBUTE_UNUS= ED, =20 =20 int -virCgroupAddMachineProcess(virCgroupPtr group ATTRIBUTE_UNUSED, - pid_t pid ATTRIBUTE_UNUSED) +virCgroupAddMachineProcess(virCgroupPtr group G_GNUC_UNUSED, + pid_t pid G_GNUC_UNUSED) { virReportSystemError(ENXIO, "%s", _("Control groups not supported on this platform"= )); @@ -2950,8 +2950,8 @@ virCgroupAddMachineProcess(virCgroupPtr group ATTRIBU= TE_UNUSED, =20 =20 int -virCgroupAddThread(virCgroupPtr group ATTRIBUTE_UNUSED, - pid_t pid ATTRIBUTE_UNUSED) +virCgroupAddThread(virCgroupPtr group G_GNUC_UNUSED, + pid_t pid G_GNUC_UNUSED) { virReportSystemError(ENXIO, "%s", _("Control groups not supported on this platform"= )); @@ -2960,11 +2960,11 @@ virCgroupAddThread(virCgroupPtr group ATTRIBUTE_UNU= SED, =20 =20 int -virCgroupGetBlkioIoServiced(virCgroupPtr group ATTRIBUTE_UNUSED, - long long *bytes_read ATTRIBUTE_UNUSED, - long long *bytes_write ATTRIBUTE_UNUSED, - long long *requests_read ATTRIBUTE_UNUSED, - long long *requests_write ATTRIBUTE_UNUSED) +virCgroupGetBlkioIoServiced(virCgroupPtr group G_GNUC_UNUSED, + long long *bytes_read G_GNUC_UNUSED, + long long *bytes_write G_GNUC_UNUSED, + long long *requests_read G_GNUC_UNUSED, + long long *requests_write G_GNUC_UNUSED) { virReportSystemError(ENXIO, "%s", _("Control groups not supported on this platform"= )); @@ -2973,12 +2973,12 @@ virCgroupGetBlkioIoServiced(virCgroupPtr group ATTR= IBUTE_UNUSED, =20 =20 int -virCgroupGetBlkioIoDeviceServiced(virCgroupPtr group ATTRIBUTE_UNUSED, - const char *path ATTRIBUTE_UNUSED, - long long *bytes_read ATTRIBUTE_UNUSED, - long long *bytes_write ATTRIBUTE_UNUSED, - long long *requests_read ATTRIBUTE_UNUSE= D, - long long *requests_write ATTRIBUTE_UNUS= ED) +virCgroupGetBlkioIoDeviceServiced(virCgroupPtr group G_GNUC_UNUSED, + const char *path G_GNUC_UNUSED, + long long *bytes_read G_GNUC_UNUSED, + long long *bytes_write G_GNUC_UNUSED, + long long *requests_read G_GNUC_UNUSED, + long long *requests_write G_GNUC_UNUSED) { virReportSystemError(ENXIO, "%s", _("Control groups not supported on this platform"= )); @@ -2987,8 +2987,8 @@ virCgroupGetBlkioIoDeviceServiced(virCgroupPtr group = ATTRIBUTE_UNUSED, =20 =20 int -virCgroupSetBlkioWeight(virCgroupPtr group ATTRIBUTE_UNUSED, - unsigned int weight ATTRIBUTE_UNUSED) +virCgroupSetBlkioWeight(virCgroupPtr group G_GNUC_UNUSED, + unsigned int weight G_GNUC_UNUSED) { virReportSystemError(ENXIO, "%s", _("Control groups not supported on this platform"= )); @@ -2997,8 +2997,8 @@ virCgroupSetBlkioWeight(virCgroupPtr group ATTRIBUTE_= UNUSED, =20 =20 int -virCgroupGetBlkioWeight(virCgroupPtr group ATTRIBUTE_UNUSED, - unsigned int *weight ATTRIBUTE_UNUSED) +virCgroupGetBlkioWeight(virCgroupPtr group G_GNUC_UNUSED, + unsigned int *weight G_GNUC_UNUSED) { virReportSystemError(ENXIO, "%s", _("Control groups not supported on this platform"= )); @@ -3007,9 +3007,9 @@ virCgroupGetBlkioWeight(virCgroupPtr group ATTRIBUTE_= UNUSED, =20 =20 int -virCgroupSetBlkioDeviceWeight(virCgroupPtr group ATTRIBUTE_UNUSED, - const char *path ATTRIBUTE_UNUSED, - unsigned int weight ATTRIBUTE_UNUSED) +virCgroupSetBlkioDeviceWeight(virCgroupPtr group G_GNUC_UNUSED, + const char *path G_GNUC_UNUSED, + unsigned int weight G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Control groups not supported on this platform"= )); @@ -3017,9 +3017,9 @@ virCgroupSetBlkioDeviceWeight(virCgroupPtr group ATTR= IBUTE_UNUSED, } =20 int -virCgroupSetBlkioDeviceReadIops(virCgroupPtr group ATTRIBUTE_UNUSED, - const char *path ATTRIBUTE_UNUSED, - unsigned int riops ATTRIBUTE_UNUSED) +virCgroupSetBlkioDeviceReadIops(virCgroupPtr group G_GNUC_UNUSED, + const char *path G_GNUC_UNUSED, + unsigned int riops G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Control groups not supported on this platform"= )); @@ -3027,9 +3027,9 @@ virCgroupSetBlkioDeviceReadIops(virCgroupPtr group AT= TRIBUTE_UNUSED, } =20 int -virCgroupSetBlkioDeviceWriteIops(virCgroupPtr group ATTRIBUTE_UNUSED, - const char *path ATTRIBUTE_UNUSED, - unsigned int wiops ATTRIBUTE_UNUSED) +virCgroupSetBlkioDeviceWriteIops(virCgroupPtr group G_GNUC_UNUSED, + const char *path G_GNUC_UNUSED, + unsigned int wiops G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Control groups not supported on this platform"= )); @@ -3037,9 +3037,9 @@ virCgroupSetBlkioDeviceWriteIops(virCgroupPtr group A= TTRIBUTE_UNUSED, } =20 int -virCgroupSetBlkioDeviceReadBps(virCgroupPtr group ATTRIBUTE_UNUSED, - const char *path ATTRIBUTE_UNUSED, - unsigned long long rbps ATTRIBUTE_UNUSED) +virCgroupSetBlkioDeviceReadBps(virCgroupPtr group G_GNUC_UNUSED, + const char *path G_GNUC_UNUSED, + unsigned long long rbps G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Control groups not supported on this platform"= )); @@ -3047,9 +3047,9 @@ virCgroupSetBlkioDeviceReadBps(virCgroupPtr group ATT= RIBUTE_UNUSED, } =20 int -virCgroupSetBlkioDeviceWriteBps(virCgroupPtr group ATTRIBUTE_UNUSED, - const char *path ATTRIBUTE_UNUSED, - unsigned long long wbps ATTRIBUTE_UNUSED) +virCgroupSetBlkioDeviceWriteBps(virCgroupPtr group G_GNUC_UNUSED, + const char *path G_GNUC_UNUSED, + unsigned long long wbps G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Control groups not supported on this platform"= )); @@ -3057,9 +3057,9 @@ virCgroupSetBlkioDeviceWriteBps(virCgroupPtr group AT= TRIBUTE_UNUSED, } =20 int -virCgroupGetBlkioDeviceWeight(virCgroupPtr group ATTRIBUTE_UNUSED, - const char *path ATTRIBUTE_UNUSED, - unsigned int *weight ATTRIBUTE_UNUSED) +virCgroupGetBlkioDeviceWeight(virCgroupPtr group G_GNUC_UNUSED, + const char *path G_GNUC_UNUSED, + unsigned int *weight G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Control groups not supported on this platform"= )); @@ -3067,9 +3067,9 @@ virCgroupGetBlkioDeviceWeight(virCgroupPtr group ATTR= IBUTE_UNUSED, } =20 int -virCgroupGetBlkioDeviceReadIops(virCgroupPtr group ATTRIBUTE_UNUSED, - const char *path ATTRIBUTE_UNUSED, - unsigned int *riops ATTRIBUTE_UNUSED) +virCgroupGetBlkioDeviceReadIops(virCgroupPtr group G_GNUC_UNUSED, + const char *path G_GNUC_UNUSED, + unsigned int *riops G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Control groups not supported on this platform"= )); @@ -3077,9 +3077,9 @@ virCgroupGetBlkioDeviceReadIops(virCgroupPtr group AT= TRIBUTE_UNUSED, } =20 int -virCgroupGetBlkioDeviceWriteIops(virCgroupPtr group ATTRIBUTE_UNUSED, - const char *path ATTRIBUTE_UNUSED, - unsigned int *wiops ATTRIBUTE_UNUSED) +virCgroupGetBlkioDeviceWriteIops(virCgroupPtr group G_GNUC_UNUSED, + const char *path G_GNUC_UNUSED, + unsigned int *wiops G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Control groups not supported on this platform"= )); @@ -3087,9 +3087,9 @@ virCgroupGetBlkioDeviceWriteIops(virCgroupPtr group A= TTRIBUTE_UNUSED, } =20 int -virCgroupGetBlkioDeviceReadBps(virCgroupPtr group ATTRIBUTE_UNUSED, - const char *path ATTRIBUTE_UNUSED, - unsigned long long *rbps ATTRIBUTE_UNUSED) +virCgroupGetBlkioDeviceReadBps(virCgroupPtr group G_GNUC_UNUSED, + const char *path G_GNUC_UNUSED, + unsigned long long *rbps G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Control groups not supported on this platform"= )); @@ -3097,9 +3097,9 @@ virCgroupGetBlkioDeviceReadBps(virCgroupPtr group ATT= RIBUTE_UNUSED, } =20 int -virCgroupGetBlkioDeviceWriteBps(virCgroupPtr group ATTRIBUTE_UNUSED, - const char *path ATTRIBUTE_UNUSED, - unsigned long long *wbps ATTRIBUTE_UNUSED) +virCgroupGetBlkioDeviceWriteBps(virCgroupPtr group G_GNUC_UNUSED, + const char *path G_GNUC_UNUSED, + unsigned long long *wbps G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Control groups not supported on this platform"= )); @@ -3107,8 +3107,8 @@ virCgroupGetBlkioDeviceWriteBps(virCgroupPtr group AT= TRIBUTE_UNUSED, } =20 int -virCgroupSetMemory(virCgroupPtr group ATTRIBUTE_UNUSED, - unsigned long long kb ATTRIBUTE_UNUSED) +virCgroupSetMemory(virCgroupPtr group G_GNUC_UNUSED, + unsigned long long kb G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Control groups not supported on this platform"= )); @@ -3117,13 +3117,13 @@ virCgroupSetMemory(virCgroupPtr group ATTRIBUTE_UNU= SED, =20 =20 int -virCgroupGetMemoryStat(virCgroupPtr group ATTRIBUTE_UNUSED, - unsigned long long *cache ATTRIBUTE_UNUSED, - unsigned long long *activeAnon ATTRIBUTE_UNUSED, - unsigned long long *inactiveAnon ATTRIBUTE_UNUSED, - unsigned long long *activeFile ATTRIBUTE_UNUSED, - unsigned long long *inactiveFile ATTRIBUTE_UNUSED, - unsigned long long *unevictable ATTRIBUTE_UNUSED) +virCgroupGetMemoryStat(virCgroupPtr group G_GNUC_UNUSED, + unsigned long long *cache G_GNUC_UNUSED, + unsigned long long *activeAnon G_GNUC_UNUSED, + unsigned long long *inactiveAnon G_GNUC_UNUSED, + unsigned long long *activeFile G_GNUC_UNUSED, + unsigned long long *inactiveFile G_GNUC_UNUSED, + unsigned long long *unevictable G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Control groups not supported on this platform"= )); @@ -3132,8 +3132,8 @@ virCgroupGetMemoryStat(virCgroupPtr group ATTRIBUTE_U= NUSED, =20 =20 int -virCgroupGetMemoryUsage(virCgroupPtr group ATTRIBUTE_UNUSED, - unsigned long *kb ATTRIBUTE_UNUSED) +virCgroupGetMemoryUsage(virCgroupPtr group G_GNUC_UNUSED, + unsigned long *kb G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Control groups not supported on this platform"= )); @@ -3142,8 +3142,8 @@ virCgroupGetMemoryUsage(virCgroupPtr group ATTRIBUTE_= UNUSED, =20 =20 int -virCgroupSetMemoryHardLimit(virCgroupPtr group ATTRIBUTE_UNUSED, - unsigned long long kb ATTRIBUTE_UNUSED) +virCgroupSetMemoryHardLimit(virCgroupPtr group G_GNUC_UNUSED, + unsigned long long kb G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Control groups not supported on this platform"= )); @@ -3152,8 +3152,8 @@ virCgroupSetMemoryHardLimit(virCgroupPtr group ATTRIB= UTE_UNUSED, =20 =20 int -virCgroupGetMemoryHardLimit(virCgroupPtr group ATTRIBUTE_UNUSED, - unsigned long long *kb ATTRIBUTE_UNUSED) +virCgroupGetMemoryHardLimit(virCgroupPtr group G_GNUC_UNUSED, + unsigned long long *kb G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Control groups not supported on this platform"= )); @@ -3162,8 +3162,8 @@ virCgroupGetMemoryHardLimit(virCgroupPtr group ATTRIB= UTE_UNUSED, =20 =20 int -virCgroupSetMemorySoftLimit(virCgroupPtr group ATTRIBUTE_UNUSED, - unsigned long long kb ATTRIBUTE_UNUSED) +virCgroupSetMemorySoftLimit(virCgroupPtr group G_GNUC_UNUSED, + unsigned long long kb G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Control groups not supported on this platform"= )); @@ -3172,8 +3172,8 @@ virCgroupSetMemorySoftLimit(virCgroupPtr group ATTRIB= UTE_UNUSED, =20 =20 int -virCgroupGetMemorySoftLimit(virCgroupPtr group ATTRIBUTE_UNUSED, - unsigned long long *kb ATTRIBUTE_UNUSED) +virCgroupGetMemorySoftLimit(virCgroupPtr group G_GNUC_UNUSED, + unsigned long long *kb G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Control groups not supported on this platform"= )); @@ -3182,8 +3182,8 @@ virCgroupGetMemorySoftLimit(virCgroupPtr group ATTRIB= UTE_UNUSED, =20 =20 int -virCgroupSetMemSwapHardLimit(virCgroupPtr group ATTRIBUTE_UNUSED, - unsigned long long kb ATTRIBUTE_UNUSED) +virCgroupSetMemSwapHardLimit(virCgroupPtr group G_GNUC_UNUSED, + unsigned long long kb G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Control groups not supported on this platform"= )); @@ -3192,8 +3192,8 @@ virCgroupSetMemSwapHardLimit(virCgroupPtr group ATTRI= BUTE_UNUSED, =20 =20 int -virCgroupGetMemSwapHardLimit(virCgroupPtr group ATTRIBUTE_UNUSED, - unsigned long long *kb ATTRIBUTE_UNUSED) +virCgroupGetMemSwapHardLimit(virCgroupPtr group G_GNUC_UNUSED, + unsigned long long *kb G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Control groups not supported on this platform"= )); @@ -3202,8 +3202,8 @@ virCgroupGetMemSwapHardLimit(virCgroupPtr group ATTRI= BUTE_UNUSED, =20 =20 int -virCgroupGetMemSwapUsage(virCgroupPtr group ATTRIBUTE_UNUSED, - unsigned long long *kb ATTRIBUTE_UNUSED) +virCgroupGetMemSwapUsage(virCgroupPtr group G_GNUC_UNUSED, + unsigned long long *kb G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Control groups not supported on this platform"= )); @@ -3212,8 +3212,8 @@ virCgroupGetMemSwapUsage(virCgroupPtr group ATTRIBUTE= _UNUSED, =20 =20 int -virCgroupSetCpusetMems(virCgroupPtr group ATTRIBUTE_UNUSED, - const char *mems ATTRIBUTE_UNUSED) +virCgroupSetCpusetMems(virCgroupPtr group G_GNUC_UNUSED, + const char *mems G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Control groups not supported on this platform"= )); @@ -3222,8 +3222,8 @@ virCgroupSetCpusetMems(virCgroupPtr group ATTRIBUTE_U= NUSED, =20 =20 int -virCgroupGetCpusetMems(virCgroupPtr group ATTRIBUTE_UNUSED, - char **mems ATTRIBUTE_UNUSED) +virCgroupGetCpusetMems(virCgroupPtr group G_GNUC_UNUSED, + char **mems G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Control groups not supported on this platform"= )); @@ -3232,8 +3232,8 @@ virCgroupGetCpusetMems(virCgroupPtr group ATTRIBUTE_U= NUSED, =20 =20 int -virCgroupSetCpusetMemoryMigrate(virCgroupPtr group ATTRIBUTE_UNUSED, - bool migrate ATTRIBUTE_UNUSED) +virCgroupSetCpusetMemoryMigrate(virCgroupPtr group G_GNUC_UNUSED, + bool migrate G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Control groups not supported on this platform"= )); @@ -3242,8 +3242,8 @@ virCgroupSetCpusetMemoryMigrate(virCgroupPtr group AT= TRIBUTE_UNUSED, =20 =20 int -virCgroupGetCpusetMemoryMigrate(virCgroupPtr group ATTRIBUTE_UNUSED, - bool *migrate ATTRIBUTE_UNUSED) +virCgroupGetCpusetMemoryMigrate(virCgroupPtr group G_GNUC_UNUSED, + bool *migrate G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Control groups not supported on this platform"= )); @@ -3252,8 +3252,8 @@ virCgroupGetCpusetMemoryMigrate(virCgroupPtr group AT= TRIBUTE_UNUSED, =20 =20 int -virCgroupSetCpusetCpus(virCgroupPtr group ATTRIBUTE_UNUSED, - const char *cpus ATTRIBUTE_UNUSED) +virCgroupSetCpusetCpus(virCgroupPtr group G_GNUC_UNUSED, + const char *cpus G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Control groups not supported on this platform"= )); @@ -3262,8 +3262,8 @@ virCgroupSetCpusetCpus(virCgroupPtr group ATTRIBUTE_U= NUSED, =20 =20 int -virCgroupGetCpusetCpus(virCgroupPtr group ATTRIBUTE_UNUSED, - char **cpus ATTRIBUTE_UNUSED) +virCgroupGetCpusetCpus(virCgroupPtr group G_GNUC_UNUSED, + char **cpus G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Control groups not supported on this platform"= )); @@ -3271,8 +3271,8 @@ virCgroupGetCpusetCpus(virCgroupPtr group ATTRIBUTE_U= NUSED, } =20 int -virCgroupAllowAllDevices(virCgroupPtr group ATTRIBUTE_UNUSED, - int perms ATTRIBUTE_UNUSED) +virCgroupAllowAllDevices(virCgroupPtr group G_GNUC_UNUSED, + int perms G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Control groups not supported on this platform"= )); @@ -3280,7 +3280,7 @@ virCgroupAllowAllDevices(virCgroupPtr group ATTRIBUTE= _UNUSED, } =20 int -virCgroupDenyAllDevices(virCgroupPtr group ATTRIBUTE_UNUSED) +virCgroupDenyAllDevices(virCgroupPtr group G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Control groups not supported on this platform"= )); @@ -3289,11 +3289,11 @@ virCgroupDenyAllDevices(virCgroupPtr group ATTRIBUT= E_UNUSED) =20 =20 int -virCgroupAllowDevice(virCgroupPtr group ATTRIBUTE_UNUSED, - char type ATTRIBUTE_UNUSED, - int major ATTRIBUTE_UNUSED, - int minor ATTRIBUTE_UNUSED, - int perms ATTRIBUTE_UNUSED) +virCgroupAllowDevice(virCgroupPtr group G_GNUC_UNUSED, + char type G_GNUC_UNUSED, + int major G_GNUC_UNUSED, + int minor G_GNUC_UNUSED, + int perms G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Control groups not supported on this platform"= )); @@ -3302,10 +3302,10 @@ virCgroupAllowDevice(virCgroupPtr group ATTRIBUTE_U= NUSED, =20 =20 int -virCgroupAllowDevicePath(virCgroupPtr group ATTRIBUTE_UNUSED, - const char *path ATTRIBUTE_UNUSED, - int perms ATTRIBUTE_UNUSED, - bool ignoreEaccess ATTRIBUTE_UNUSED) +virCgroupAllowDevicePath(virCgroupPtr group G_GNUC_UNUSED, + const char *path G_GNUC_UNUSED, + int perms G_GNUC_UNUSED, + bool ignoreEaccess G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Control groups not supported on this platform"= )); @@ -3314,11 +3314,11 @@ virCgroupAllowDevicePath(virCgroupPtr group ATTRIBU= TE_UNUSED, =20 =20 int -virCgroupDenyDevice(virCgroupPtr group ATTRIBUTE_UNUSED, - char type ATTRIBUTE_UNUSED, - int major ATTRIBUTE_UNUSED, - int minor ATTRIBUTE_UNUSED, - int perms ATTRIBUTE_UNUSED) +virCgroupDenyDevice(virCgroupPtr group G_GNUC_UNUSED, + char type G_GNUC_UNUSED, + int major G_GNUC_UNUSED, + int minor G_GNUC_UNUSED, + int perms G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Control groups not supported on this platform"= )); @@ -3327,10 +3327,10 @@ virCgroupDenyDevice(virCgroupPtr group ATTRIBUTE_UN= USED, =20 =20 int -virCgroupDenyDevicePath(virCgroupPtr group ATTRIBUTE_UNUSED, - const char *path ATTRIBUTE_UNUSED, - int perms ATTRIBUTE_UNUSED, - bool ignoreEacces ATTRIBUTE_UNUSED) +virCgroupDenyDevicePath(virCgroupPtr group G_GNUC_UNUSED, + const char *path G_GNUC_UNUSED, + int perms G_GNUC_UNUSED, + bool ignoreEacces G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Control groups not supported on this platform"= )); @@ -3339,8 +3339,8 @@ virCgroupDenyDevicePath(virCgroupPtr group ATTRIBUTE_= UNUSED, =20 =20 int -virCgroupSetCpuShares(virCgroupPtr group ATTRIBUTE_UNUSED, - unsigned long long shares ATTRIBUTE_UNUSED) +virCgroupSetCpuShares(virCgroupPtr group G_GNUC_UNUSED, + unsigned long long shares G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Control groups not supported on this platform"= )); @@ -3349,8 +3349,8 @@ virCgroupSetCpuShares(virCgroupPtr group ATTRIBUTE_UN= USED, =20 =20 int -virCgroupGetCpuShares(virCgroupPtr group ATTRIBUTE_UNUSED, - unsigned long long *shares ATTRIBUTE_UNUSED) +virCgroupGetCpuShares(virCgroupPtr group G_GNUC_UNUSED, + unsigned long long *shares G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Control groups not supported on this platform"= )); @@ -3359,8 +3359,8 @@ virCgroupGetCpuShares(virCgroupPtr group ATTRIBUTE_UN= USED, =20 =20 int -virCgroupSetCpuCfsPeriod(virCgroupPtr group ATTRIBUTE_UNUSED, - unsigned long long cfs_period ATTRIBUTE_UNUSED) +virCgroupSetCpuCfsPeriod(virCgroupPtr group G_GNUC_UNUSED, + unsigned long long cfs_period G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Control groups not supported on this platform"= )); @@ -3369,8 +3369,8 @@ virCgroupSetCpuCfsPeriod(virCgroupPtr group ATTRIBUTE= _UNUSED, =20 =20 int -virCgroupGetCpuCfsPeriod(virCgroupPtr group ATTRIBUTE_UNUSED, - unsigned long long *cfs_period ATTRIBUTE_UNUSED) +virCgroupGetCpuCfsPeriod(virCgroupPtr group G_GNUC_UNUSED, + unsigned long long *cfs_period G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Control groups not supported on this platform"= )); @@ -3379,8 +3379,8 @@ virCgroupGetCpuCfsPeriod(virCgroupPtr group ATTRIBUTE= _UNUSED, =20 =20 int -virCgroupSetCpuCfsQuota(virCgroupPtr group ATTRIBUTE_UNUSED, - long long cfs_quota ATTRIBUTE_UNUSED) +virCgroupSetCpuCfsQuota(virCgroupPtr group G_GNUC_UNUSED, + long long cfs_quota G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Control groups not supported on this platform"= )); @@ -3389,7 +3389,7 @@ virCgroupSetCpuCfsQuota(virCgroupPtr group ATTRIBUTE_= UNUSED, =20 =20 int -virCgroupRemove(virCgroupPtr group ATTRIBUTE_UNUSED) +virCgroupRemove(virCgroupPtr group G_GNUC_UNUSED) { virReportSystemError(ENXIO, "%s", _("Control groups not supported on this platform"= )); @@ -3398,8 +3398,8 @@ virCgroupRemove(virCgroupPtr group ATTRIBUTE_UNUSED) =20 =20 int -virCgroupKillRecursive(virCgroupPtr group ATTRIBUTE_UNUSED, - int signum ATTRIBUTE_UNUSED) +virCgroupKillRecursive(virCgroupPtr group G_GNUC_UNUSED, + int signum G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Control groups not supported on this platform"= )); @@ -3408,7 +3408,7 @@ virCgroupKillRecursive(virCgroupPtr group ATTRIBUTE_U= NUSED, =20 =20 int -virCgroupKillPainfully(virCgroupPtr group ATTRIBUTE_UNUSED) +virCgroupKillPainfully(virCgroupPtr group G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Control groups not supported on this platform"= )); @@ -3417,8 +3417,8 @@ virCgroupKillPainfully(virCgroupPtr group ATTRIBUTE_U= NUSED) =20 =20 int -virCgroupGetCpuCfsQuota(virCgroupPtr group ATTRIBUTE_UNUSED, - long long *cfs_quota ATTRIBUTE_UNUSED) +virCgroupGetCpuCfsQuota(virCgroupPtr group G_GNUC_UNUSED, + long long *cfs_quota G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Control groups not supported on this platform"= )); @@ -3427,8 +3427,8 @@ virCgroupGetCpuCfsQuota(virCgroupPtr group ATTRIBUTE_= UNUSED, =20 =20 int -virCgroupGetCpuacctUsage(virCgroupPtr group ATTRIBUTE_UNUSED, - unsigned long long *usage ATTRIBUTE_UNUSED) +virCgroupGetCpuacctUsage(virCgroupPtr group G_GNUC_UNUSED, + unsigned long long *usage G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Control groups not supported on this platform"= )); @@ -3437,8 +3437,8 @@ virCgroupGetCpuacctUsage(virCgroupPtr group ATTRIBUTE= _UNUSED, =20 =20 int -virCgroupGetCpuacctPercpuUsage(virCgroupPtr group ATTRIBUTE_UNUSED, - char **usage ATTRIBUTE_UNUSED) +virCgroupGetCpuacctPercpuUsage(virCgroupPtr group G_GNUC_UNUSED, + char **usage G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Control groups not supported on this platform"= )); @@ -3447,9 +3447,9 @@ virCgroupGetCpuacctPercpuUsage(virCgroupPtr group ATT= RIBUTE_UNUSED, =20 =20 int -virCgroupGetCpuacctStat(virCgroupPtr group ATTRIBUTE_UNUSED, - unsigned long long *user ATTRIBUTE_UNUSED, - unsigned long long *sys ATTRIBUTE_UNUSED) +virCgroupGetCpuacctStat(virCgroupPtr group G_GNUC_UNUSED, + unsigned long long *user G_GNUC_UNUSED, + unsigned long long *sys G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Control groups not supported on this platform"= )); @@ -3458,9 +3458,9 @@ virCgroupGetCpuacctStat(virCgroupPtr group ATTRIBUTE_= UNUSED, =20 =20 int -virCgroupGetDomainTotalCpuStats(virCgroupPtr group ATTRIBUTE_UNUSED, - virTypedParameterPtr params ATTRIBUTE_UNUS= ED, - int nparams ATTRIBUTE_UNUSED) +virCgroupGetDomainTotalCpuStats(virCgroupPtr group G_GNUC_UNUSED, + virTypedParameterPtr params G_GNUC_UNUSED, + int nparams G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Control groups not supported on this platform"= )); @@ -3469,8 +3469,8 @@ virCgroupGetDomainTotalCpuStats(virCgroupPtr group AT= TRIBUTE_UNUSED, =20 =20 int -virCgroupSetFreezerState(virCgroupPtr group ATTRIBUTE_UNUSED, - const char *state ATTRIBUTE_UNUSED) +virCgroupSetFreezerState(virCgroupPtr group G_GNUC_UNUSED, + const char *state G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Control groups not supported on this platform"= )); @@ -3479,8 +3479,8 @@ virCgroupSetFreezerState(virCgroupPtr group ATTRIBUTE= _UNUSED, =20 =20 int -virCgroupGetFreezerState(virCgroupPtr group ATTRIBUTE_UNUSED, - char **state ATTRIBUTE_UNUSED) +virCgroupGetFreezerState(virCgroupPtr group G_GNUC_UNUSED, + char **state G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Control groups not supported on this platform"= )); @@ -3489,9 +3489,9 @@ virCgroupGetFreezerState(virCgroupPtr group ATTRIBUTE= _UNUSED, =20 =20 int -virCgroupBindMount(virCgroupPtr group ATTRIBUTE_UNUSED, - const char *oldroot ATTRIBUTE_UNUSED, - const char *mountopts ATTRIBUTE_UNUSED) +virCgroupBindMount(virCgroupPtr group G_GNUC_UNUSED, + const char *oldroot G_GNUC_UNUSED, + const char *mountopts G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Control groups not supported on this platform"= )); @@ -3500,7 +3500,7 @@ virCgroupBindMount(virCgroupPtr group ATTRIBUTE_UNUSE= D, =20 =20 bool -virCgroupSupportsCpuBW(virCgroupPtr cgroup ATTRIBUTE_UNUSED) +virCgroupSupportsCpuBW(virCgroupPtr cgroup G_GNUC_UNUSED) { VIR_DEBUG("Control groups not supported on this platform"); return false; @@ -3508,12 +3508,12 @@ virCgroupSupportsCpuBW(virCgroupPtr cgroup ATTRIBUT= E_UNUSED) =20 =20 int -virCgroupGetPercpuStats(virCgroupPtr group ATTRIBUTE_UNUSED, - virTypedParameterPtr params ATTRIBUTE_UNUSED, - unsigned int nparams ATTRIBUTE_UNUSED, - int start_cpu ATTRIBUTE_UNUSED, - unsigned int ncpus ATTRIBUTE_UNUSED, - virBitmapPtr guestvcpus ATTRIBUTE_UNUSED) +virCgroupGetPercpuStats(virCgroupPtr group G_GNUC_UNUSED, + virTypedParameterPtr params G_GNUC_UNUSED, + unsigned int nparams G_GNUC_UNUSED, + int start_cpu G_GNUC_UNUSED, + unsigned int ncpus G_GNUC_UNUSED, + virBitmapPtr guestvcpus G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Control groups not supported on this platform"= )); @@ -3522,10 +3522,10 @@ virCgroupGetPercpuStats(virCgroupPtr group ATTRIBUT= E_UNUSED, =20 =20 int -virCgroupSetOwner(virCgroupPtr cgroup ATTRIBUTE_UNUSED, - uid_t uid ATTRIBUTE_UNUSED, - gid_t gid ATTRIBUTE_UNUSED, - int controllers ATTRIBUTE_UNUSED) +virCgroupSetOwner(virCgroupPtr cgroup G_GNUC_UNUSED, + uid_t uid G_GNUC_UNUSED, + gid_t gid G_GNUC_UNUSED, + int controllers G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Control groups not supported on this platform"= )); @@ -3533,8 +3533,8 @@ virCgroupSetOwner(virCgroupPtr cgroup ATTRIBUTE_UNUSE= D, } =20 int -virCgroupHasEmptyTasks(virCgroupPtr cgroup ATTRIBUTE_UNUSED, - int controller ATTRIBUTE_UNUSED) +virCgroupHasEmptyTasks(virCgroupPtr cgroup G_GNUC_UNUSED, + int controller G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Control groups not supported on this platform"= )); @@ -3542,7 +3542,7 @@ virCgroupHasEmptyTasks(virCgroupPtr cgroup ATTRIBUTE_= UNUSED, } =20 bool -virCgroupControllerAvailable(int controller ATTRIBUTE_UNUSED) +virCgroupControllerAvailable(int controller G_GNUC_UNUSED) { return false; } diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c index 4231d8d6fa..23908d769d 100644 --- a/src/util/vircgroupv1.c +++ b/src/util/vircgroupv1.c @@ -421,7 +421,7 @@ virCgroupV1StealPlacement(virCgroupPtr group) static int virCgroupV1DetectControllers(virCgroupPtr group, int controllers, - virCgroupPtr parent ATTRIBUTE_UNUSED) + virCgroupPtr parent G_GNUC_UNUSED) { size_t i; size_t j; diff --git a/src/util/vircgroupv2.c b/src/util/vircgroupv2.c index ace04bba04..ce8851f800 100644 --- a/src/util/vircgroupv2.c +++ b/src/util/vircgroupv2.c @@ -96,7 +96,7 @@ virCgroupV2Available(void) =20 static bool virCgroupV2ValidateMachineGroup(virCgroupPtr group, - const char *name ATTRIBUTE_UNUSED, + const char *name G_GNUC_UNUSED, const char *drivername, const char *machinename) { @@ -181,7 +181,7 @@ virCgroupV2CopyPlacement(virCgroupPtr group, static int virCgroupV2DetectMounts(virCgroupPtr group, const char *mntType, - const char *mntOpts ATTRIBUTE_UNUSED, + const char *mntOpts G_GNUC_UNUSED, const char *mntDir) { if (STRNEQ(mntType, "cgroup2")) @@ -227,7 +227,7 @@ virCgroupV2DetectPlacement(virCgroupPtr group, =20 static int virCgroupV2ValidatePlacement(virCgroupPtr group, - pid_t pid ATTRIBUTE_UNUSED) + pid_t pid G_GNUC_UNUSED) { if (!group->unified.placement) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", @@ -587,7 +587,7 @@ static int virCgroupV2SetOwner(virCgroupPtr cgroup, uid_t uid, gid_t gid, - int controllers ATTRIBUTE_UNUSED) + int controllers G_GNUC_UNUSED) { VIR_AUTOFREE(char *) base =3D NULL; =20 @@ -1725,15 +1725,15 @@ virCgroupV2GetCpusetMems(virCgroupPtr group, =20 =20 static int -virCgroupV2SetCpusetMemoryMigrate(virCgroupPtr group ATTRIBUTE_UNUSED, - bool migrate ATTRIBUTE_UNUSED) +virCgroupV2SetCpusetMemoryMigrate(virCgroupPtr group G_GNUC_UNUSED, + bool migrate G_GNUC_UNUSED) { return 0; } =20 =20 static int -virCgroupV2GetCpusetMemoryMigrate(virCgroupPtr group ATTRIBUTE_UNUSED, +virCgroupV2GetCpusetMemoryMigrate(virCgroupPtr group G_GNUC_UNUSED, bool *migrate) { *migrate =3D true; diff --git a/src/util/vircommand.c b/src/util/vircommand.c index 79e1e87964..763bcb6d12 100644 --- a/src/util/vircommand.c +++ b/src/util/vircommand.c @@ -437,7 +437,7 @@ virExecCommon(virCommandPtr cmd, gid_t *groups, int ngr= oups) * onto child process (well, the one we will exec soon since this * is called from the child). */ static int -virCommandMassCloseGetFDsLinux(virCommandPtr cmd ATTRIBUTE_UNUSED, +virCommandMassCloseGetFDsLinux(virCommandPtr cmd G_GNUC_UNUSED, virBitmapPtr fds) { DIR *dp =3D NULL; @@ -474,7 +474,7 @@ virCommandMassCloseGetFDsLinux(virCommandPtr cmd ATTRIB= UTE_UNUSED, # else /* !__linux__ */ =20 static int -virCommandMassCloseGetFDsGeneric(virCommandPtr cmd ATTRIBUTE_UNUSED, +virCommandMassCloseGetFDsGeneric(virCommandPtr cmd G_GNUC_UNUSED, virBitmapPtr fds) { virBitmapSetAll(fds); @@ -847,7 +847,7 @@ virRun(const char *const*argv, int *status) #else /* WIN32 */ =20 int -virRun(const char *const *argv ATTRIBUTE_UNUSED, +virRun(const char *const *argv G_GNUC_UNUSED, int *status) { if (status) @@ -859,7 +859,7 @@ virRun(const char *const *argv ATTRIBUTE_UNUSED, } =20 static int -virExec(virCommandPtr cmd ATTRIBUTE_UNUSED) +virExec(virCommandPtr cmd G_GNUC_UNUSED) { /* XXX: Some day we can implement pieces of virCommand/virExec on * top of _spawn() or CreateProcess(), but we can't implement @@ -1187,7 +1187,7 @@ virCommandAllowCap(virCommandPtr cmd, */ void virCommandSetSELinuxLabel(virCommandPtr cmd, - const char *label ATTRIBUTE_UNUSED) + const char *label G_GNUC_UNUSED) { if (!cmd || cmd->has_error) return; @@ -1212,7 +1212,7 @@ virCommandSetSELinuxLabel(virCommandPtr cmd, */ void virCommandSetAppArmorProfile(virCommandPtr cmd, - const char *profile ATTRIBUTE_UNUSED) + const char *profile G_GNUC_UNUSED) { if (!cmd || cmd->has_error) return; @@ -1779,9 +1779,9 @@ virCommandSetSendBuffer(virCommandPtr cmd, =20 int virCommandSetSendBuffer(virCommandPtr cmd, - int fd ATTRIBUTE_UNUSED, - unsigned char *buffer ATTRIBUTE_UNUSED, - size_t buflen ATTRIBUTE_UNUSED) + int fd G_GNUC_UNUSED, + unsigned char *buffer G_GNUC_UNUSED, + size_t buflen G_GNUC_UNUSED) { if (!cmd || cmd->has_error) return -1; @@ -2355,8 +2355,8 @@ int virCommandExec(virCommandPtr cmd, gid_t *groups, = int ngroups) return -1; } #else -int virCommandExec(virCommandPtr cmd ATTRIBUTE_UNUSED, gid_t *groups ATTRI= BUTE_UNUSED, - int ngroups ATTRIBUTE_UNUSED) +int virCommandExec(virCommandPtr cmd G_GNUC_UNUSED, gid_t *groups G_GNUC_U= NUSED, + int ngroups G_GNUC_UNUSED) { /* Mingw execve() has a broken signature. Disable this * function until gnulib fixes the signature, since we @@ -2795,7 +2795,7 @@ virCommandAbort(virCommandPtr cmd) } #else /* WIN32 */ void -virCommandAbort(virCommandPtr cmd ATTRIBUTE_UNUSED) +virCommandAbort(virCommandPtr cmd G_GNUC_UNUSED) { /* Mingw lacks WNOHANG and kill(). But since we haven't ported * virExec to mingw yet, there's no process to be killed, @@ -3317,14 +3317,14 @@ virCommandRunNul(virCommandPtr cmd, #else /* WIN32 */ =20 int -virCommandRunRegex(virCommandPtr cmd ATTRIBUTE_UNUSED, - int nregex ATTRIBUTE_UNUSED, - const char **regex ATTRIBUTE_UNUSED, - int *nvars ATTRIBUTE_UNUSED, - virCommandRunRegexFunc func ATTRIBUTE_UNUSED, - void *data ATTRIBUTE_UNUSED, - const char *prefix ATTRIBUTE_UNUSED, - int *exitstatus ATTRIBUTE_UNUSED) +virCommandRunRegex(virCommandPtr cmd G_GNUC_UNUSED, + int nregex G_GNUC_UNUSED, + const char **regex G_GNUC_UNUSED, + int *nvars G_GNUC_UNUSED, + virCommandRunRegexFunc func G_GNUC_UNUSED, + void *data G_GNUC_UNUSED, + const char *prefix G_GNUC_UNUSED, + int *exitstatus G_GNUC_UNUSED) { virReportError(VIR_ERR_INTERNAL_ERROR, _("%s not implemented on Win32"), __FUNCTION__); @@ -3332,10 +3332,10 @@ virCommandRunRegex(virCommandPtr cmd ATTRIBUTE_UNUS= ED, } =20 int -virCommandRunNul(virCommandPtr cmd ATTRIBUTE_UNUSED, - size_t n_columns ATTRIBUTE_UNUSED, - virCommandRunNulFunc func ATTRIBUTE_UNUSED, - void *data ATTRIBUTE_UNUSED) +virCommandRunNul(virCommandPtr cmd G_GNUC_UNUSED, + size_t n_columns G_GNUC_UNUSED, + virCommandRunNulFunc func G_GNUC_UNUSED, + void *data G_GNUC_UNUSED) { virReportError(VIR_ERR_INTERNAL_ERROR, _("%s not implemented on Win32"), __FUNCTION__); diff --git a/src/util/virdbus.c b/src/util/virdbus.c index b0ac8d7055..1e59294fc3 100644 --- a/src/util/virdbus.c +++ b/src/util/virdbus.c @@ -179,8 +179,8 @@ struct virDBusWatch DBusConnection *bus; }; =20 -static void virDBusWatchCallback(int fdatch ATTRIBUTE_UNUSED, - int fd ATTRIBUTE_UNUSED, +static void virDBusWatchCallback(int fdatch G_GNUC_UNUSED, + int fd G_GNUC_UNUSED, int events, void *opaque) { DBusWatch *watch =3D opaque; @@ -262,7 +262,7 @@ static dbus_bool_t virDBusAddWatch(DBusWatch *watch, =20 =20 static void virDBusRemoveWatch(DBusWatch *watch, - void *data ATTRIBUTE_UNUSED) + void *data G_GNUC_UNUSED) { struct virDBusWatch *info; =20 @@ -273,7 +273,7 @@ static void virDBusRemoveWatch(DBusWatch *watch, =20 =20 static void virDBusToggleWatch(DBusWatch *watch, - void *data ATTRIBUTE_UNUSED) + void *data G_GNUC_UNUSED) { int flags =3D 0; struct virDBusWatch *info; @@ -1754,7 +1754,7 @@ void virDBusMessageUnref(DBusMessage *msg) } =20 #else /* ! WITH_DBUS */ -void virDBusSetSharedBus(bool shared ATTRIBUTE_UNUSED) +void virDBusSetSharedBus(bool shared G_GNUC_UNUSED) { /* nothing */ } @@ -1786,56 +1786,56 @@ DBusConnection *virDBusGetSessionBus(void) return NULL; } =20 -int virDBusCreateMethod(DBusMessage **call ATTRIBUTE_UNUSED, - const char *destination ATTRIBUTE_UNUSED, - const char *path ATTRIBUTE_UNUSED, - const char *iface ATTRIBUTE_UNUSED, - const char *member ATTRIBUTE_UNUSED, - const char *types ATTRIBUTE_UNUSED, ...) +int virDBusCreateMethod(DBusMessage **call G_GNUC_UNUSED, + const char *destination G_GNUC_UNUSED, + const char *path G_GNUC_UNUSED, + const char *iface G_GNUC_UNUSED, + const char *member G_GNUC_UNUSED, + const char *types G_GNUC_UNUSED, ...) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("DBus support not compiled into this binary")); return -1; } =20 -int virDBusCreateMethodV(DBusMessage **call ATTRIBUTE_UNUSED, - const char *destination ATTRIBUTE_UNUSED, - const char *path ATTRIBUTE_UNUSED, - const char *iface ATTRIBUTE_UNUSED, - const char *member ATTRIBUTE_UNUSED, - const char *types ATTRIBUTE_UNUSED, - va_list args ATTRIBUTE_UNUSED) +int virDBusCreateMethodV(DBusMessage **call G_GNUC_UNUSED, + const char *destination G_GNUC_UNUSED, + const char *path G_GNUC_UNUSED, + const char *iface G_GNUC_UNUSED, + const char *member G_GNUC_UNUSED, + const char *types G_GNUC_UNUSED, + va_list args G_GNUC_UNUSED) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("DBus support not compiled into this binary")); return -1; } =20 -int virDBusCreateReplyV(DBusMessage **reply ATTRIBUTE_UNUSED, - const char *types ATTRIBUTE_UNUSED, - va_list args ATTRIBUTE_UNUSED) +int virDBusCreateReplyV(DBusMessage **reply G_GNUC_UNUSED, + const char *types G_GNUC_UNUSED, + va_list args G_GNUC_UNUSED) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("DBus support not compiled into this binary")); return -1; } =20 -int virDBusCreateReply(DBusMessage **reply ATTRIBUTE_UNUSED, - const char *types ATTRIBUTE_UNUSED, ...) +int virDBusCreateReply(DBusMessage **reply G_GNUC_UNUSED, + const char *types G_GNUC_UNUSED, ...) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("DBus support not compiled into this binary")); return -1; } =20 -int virDBusCallMethod(DBusConnection *conn ATTRIBUTE_UNUSED, - DBusMessage **reply ATTRIBUTE_UNUSED, - virErrorPtr error ATTRIBUTE_UNUSED, - const char *destination ATTRIBUTE_UNUSED, - const char *path ATTRIBUTE_UNUSED, - const char *iface ATTRIBUTE_UNUSED, - const char *member ATTRIBUTE_UNUSED, - const char *types ATTRIBUTE_UNUSED, ...) +int virDBusCallMethod(DBusConnection *conn G_GNUC_UNUSED, + DBusMessage **reply G_GNUC_UNUSED, + virErrorPtr error G_GNUC_UNUSED, + const char *destination G_GNUC_UNUSED, + const char *path G_GNUC_UNUSED, + const char *iface G_GNUC_UNUSED, + const char *member G_GNUC_UNUSED, + const char *types G_GNUC_UNUSED, ...) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("DBus support not compiled into this binary")); @@ -1843,8 +1843,8 @@ int virDBusCallMethod(DBusConnection *conn ATTRIBUTE_= UNUSED, } =20 =20 -int virDBusMessageEncode(DBusMessage* msg ATTRIBUTE_UNUSED, - const char *types ATTRIBUTE_UNUSED, +int virDBusMessageEncode(DBusMessage* msg G_GNUC_UNUSED, + const char *types G_GNUC_UNUSED, ...) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -1852,8 +1852,8 @@ int virDBusMessageEncode(DBusMessage* msg ATTRIBUTE_U= NUSED, return -1; } =20 -int virDBusMessageDecode(DBusMessage* msg ATTRIBUTE_UNUSED, - const char *types ATTRIBUTE_UNUSED, +int virDBusMessageDecode(DBusMessage* msg G_GNUC_UNUSED, + const char *types G_GNUC_UNUSED, ...) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -1861,19 +1861,19 @@ int virDBusMessageDecode(DBusMessage* msg ATTRIBUTE= _UNUSED, return -1; } =20 -int virDBusIsServiceEnabled(const char *name ATTRIBUTE_UNUSED) +int virDBusIsServiceEnabled(const char *name G_GNUC_UNUSED) { VIR_DEBUG("DBus support not compiled into this binary"); return -2; } =20 -int virDBusIsServiceRegistered(const char *name ATTRIBUTE_UNUSED) +int virDBusIsServiceRegistered(const char *name G_GNUC_UNUSED) { VIR_DEBUG("DBus support not compiled into this binary"); return -2; } =20 -void virDBusMessageUnref(DBusMessage *msg ATTRIBUTE_UNUSED) +void virDBusMessageUnref(DBusMessage *msg G_GNUC_UNUSED) { /* nothing */ } diff --git a/src/util/virdevmapper.c b/src/util/virdevmapper.c index 81e20c9df0..1abd8044e7 100644 --- a/src/util/virdevmapper.c +++ b/src/util/virdevmapper.c @@ -38,11 +38,11 @@ =20 #ifdef WITH_DEVMAPPER static void -virDevMapperDummyLogger(int level ATTRIBUTE_UNUSED, - const char *file ATTRIBUTE_UNUSED, - int line ATTRIBUTE_UNUSED, - int dm_errno ATTRIBUTE_UNUSED, - const char *fmt ATTRIBUTE_UNUSED, +virDevMapperDummyLogger(int level G_GNUC_UNUSED, + const char *file G_GNUC_UNUSED, + int line G_GNUC_UNUSED, + int dm_errno G_GNUC_UNUSED, + const char *fmt G_GNUC_UNUSED, ...) { return; @@ -198,8 +198,8 @@ virDevMapperGetTargets(const char *path, #else /* ! WITH_DEVMAPPER */ =20 int -virDevMapperGetTargets(const char *path ATTRIBUTE_UNUSED, - char ***devPaths ATTRIBUTE_UNUSED) +virDevMapperGetTargets(const char *path G_GNUC_UNUSED, + char ***devPaths G_GNUC_UNUSED) { errno =3D ENOSYS; return -1; diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c index 42f62682c4..9aeb7b120d 100644 --- a/src/util/virdnsmasq.c +++ b/src/util/virdnsmasq.c @@ -595,7 +595,7 @@ dnsmasqDelete(const dnsmasqContext *ctx) * Reloads all the configurations associated to a context */ int -dnsmasqReload(pid_t pid ATTRIBUTE_UNUSED) +dnsmasqReload(pid_t pid G_GNUC_UNUSED) { #ifndef WIN32 if (kill(pid, SIGHUP) !=3D 0) { diff --git a/src/util/vireventpoll.c b/src/util/vireventpoll.c index db01088769..b57b300446 100644 --- a/src/util/vireventpoll.c +++ b/src/util/vireventpoll.c @@ -674,10 +674,10 @@ int virEventPollRunOnce(void) } =20 =20 -static void virEventPollHandleWakeup(int watch ATTRIBUTE_UNUSED, +static void virEventPollHandleWakeup(int watch G_GNUC_UNUSED, int fd, - int events ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) + int events G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED) { char c; virMutexLock(&eventLoop.lock); diff --git a/src/util/virfcp.c b/src/util/virfcp.c index 3cb6811f78..9fe86e362e 100644 --- a/src/util/virfcp.c +++ b/src/util/virfcp.c @@ -71,16 +71,16 @@ virFCReadRportValue(const char *rport, #else =20 bool -virFCIsCapableRport(const char *rport ATTRIBUTE_UNUSED) +virFCIsCapableRport(const char *rport G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Not supported on this platform")= ); return false; } =20 int -virFCReadRportValue(const char *rport ATTRIBUTE_UNUSED, - const char *entry ATTRIBUTE_UNUSED, - char **result ATTRIBUTE_UNUSED) +virFCReadRportValue(const char *rport G_GNUC_UNUSED, + const char *entry G_GNUC_UNUSED, + char **result G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Not supported on this platform")= ); return -1; diff --git a/src/util/virfdstream.c b/src/util/virfdstream.c index 1bc43e20a1..693f1619b3 100644 --- a/src/util/virfdstream.c +++ b/src/util/virfdstream.c @@ -289,8 +289,8 @@ static int virFDStreamUpdateCallback(virStreamPtr strea= m, int events) return ret; } =20 -static void virFDStreamEvent(int watch ATTRIBUTE_UNUSED, - int fd ATTRIBUTE_UNUSED, +static void virFDStreamEvent(int watch G_GNUC_UNUSED, + int fd G_GNUC_UNUSED, int events, void *opaque) { @@ -1212,9 +1212,9 @@ int virFDStreamConnectUNIX(virStreamPtr st, return -1; } #else -int virFDStreamConnectUNIX(virStreamPtr st ATTRIBUTE_UNUSED, - const char *path ATTRIBUTE_UNUSED, - bool abstract ATTRIBUTE_UNUSED) +int virFDStreamConnectUNIX(virStreamPtr st G_GNUC_UNUSED, + const char *path G_GNUC_UNUSED, + bool abstract G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("UNIX domain sockets are not supported on this = platform")); diff --git a/src/util/virfile.c b/src/util/virfile.c index dead335c62..7d6a9011c6 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -106,7 +106,7 @@ int virFileClose(int *fdptr, virFileCloseFlags flags) if (!(flags & VIR_FILE_CLOSE_IGNORE_EBADF)) VIR_WARN("Tried to close invalid fd %d", *fdptr); } else { - char ebuf[1024] ATTRIBUTE_UNUSED; + char ebuf[1024] G_GNUC_UNUSED; VIR_DEBUG("Failed to close fd %d: %s", *fdptr, virStrerror(errno, ebuf, sizeof(ebuf))); } @@ -304,9 +304,9 @@ virFileWrapperFdNew(int *fd, const char *name, unsigned= int flags) } #else virFileWrapperFdPtr -virFileWrapperFdNew(int *fd ATTRIBUTE_UNUSED, - const char *name ATTRIBUTE_UNUSED, - unsigned int fdflags ATTRIBUTE_UNUSED) +virFileWrapperFdNew(int *fd G_GNUC_UNUSED, + const char *name G_GNUC_UNUSED, + unsigned int fdflags G_GNUC_UNUSED) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("virFileWrapperFd unsupported on this platform")); @@ -469,27 +469,27 @@ int virFileFlock(int fd, bool lock, bool shared) =20 #else =20 -int virFileLock(int fd ATTRIBUTE_UNUSED, - bool shared ATTRIBUTE_UNUSED, - off_t start ATTRIBUTE_UNUSED, - off_t len ATTRIBUTE_UNUSED, - bool waitForLock ATTRIBUTE_UNUSED) +int virFileLock(int fd G_GNUC_UNUSED, + bool shared G_GNUC_UNUSED, + off_t start G_GNUC_UNUSED, + off_t len G_GNUC_UNUSED, + bool waitForLock G_GNUC_UNUSED) { return -ENOSYS; } =20 =20 -int virFileUnlock(int fd ATTRIBUTE_UNUSED, - off_t start ATTRIBUTE_UNUSED, - off_t len ATTRIBUTE_UNUSED) +int virFileUnlock(int fd G_GNUC_UNUSED, + off_t start G_GNUC_UNUSED, + off_t len G_GNUC_UNUSED) { return -ENOSYS; } =20 =20 -int virFileFlock(int fd ATTRIBUTE_UNUSED, - bool lock ATTRIBUTE_UNUSED, - bool shared ATTRIBUTE_UNUSED) +int virFileFlock(int fd G_GNUC_UNUSED, + bool lock G_GNUC_UNUSED, + bool shared G_GNUC_UNUSED) { errno =3D ENOSYS; return -1; @@ -960,7 +960,7 @@ int virFileNBDDeviceAssociate(const char *file, #else /* __linux__ */ =20 int virFileLoopDeviceAssociate(const char *file, - char **dev ATTRIBUTE_UNUSED) + char **dev G_GNUC_UNUSED) { virReportSystemError(ENOSYS, _("Unable to associate file %s with loop device"), @@ -970,9 +970,9 @@ int virFileLoopDeviceAssociate(const char *file, } =20 int virFileNBDDeviceAssociate(const char *file, - virStorageFileFormat fmt ATTRIBUTE_UNUSED, - bool readonly ATTRIBUTE_UNUSED, - char **dev ATTRIBUTE_UNUSED) + virStorageFileFormat fmt G_GNUC_UNUSED, + bool readonly G_GNUC_UNUSED, + char **dev G_GNUC_UNUSED) { virReportSystemError(ENOSYS, _("Unable to associate file %s with NBD device"), @@ -1113,9 +1113,9 @@ safezero_posix_fallocate(int fd, off_t offset, off_t = len) } #else /* !HAVE_POSIX_FALLOCATE */ static int -safezero_posix_fallocate(int fd ATTRIBUTE_UNUSED, - off_t offset ATTRIBUTE_UNUSED, - off_t len ATTRIBUTE_UNUSED) +safezero_posix_fallocate(int fd G_GNUC_UNUSED, + off_t offset G_GNUC_UNUSED, + off_t len G_GNUC_UNUSED) { return -2; } @@ -1131,9 +1131,9 @@ safezero_sys_fallocate(int fd, } #else /* !HAVE_SYS_SYSCALL_H || !defined(SYS_fallocate) */ static int -safezero_sys_fallocate(int fd ATTRIBUTE_UNUSED, - off_t offset ATTRIBUTE_UNUSED, - off_t len ATTRIBUTE_UNUSED) +safezero_sys_fallocate(int fd G_GNUC_UNUSED, + off_t offset G_GNUC_UNUSED, + off_t len G_GNUC_UNUSED) { return -2; } @@ -1175,9 +1175,9 @@ safezero_mmap(int fd, off_t offset, off_t len) } #else /* !HAVE_MMAP */ static int -safezero_mmap(int fd ATTRIBUTE_UNUSED, - off_t offset ATTRIBUTE_UNUSED, - off_t len ATTRIBUTE_UNUSED) +safezero_mmap(int fd G_GNUC_UNUSED, + off_t offset G_GNUC_UNUSED, + off_t len G_GNUC_UNUSED) { return -2; } @@ -1281,7 +1281,7 @@ virFileFindMountPoint(const char *type) #else /* defined HAVE_MNTENT_H && defined HAVE_GETMNTENT_R */ =20 char * -virFileFindMountPoint(const char *type ATTRIBUTE_UNUSED) +virFileFindMountPoint(const char *type G_GNUC_UNUSED) { errno =3D ENOSYS; =20 @@ -2043,11 +2043,11 @@ virFileGetMountSubtreeImpl(const char *mtabpath, } #else /* ! defined HAVE_MNTENT_H && defined HAVE_GETMNTENT_R */ static int -virFileGetMountSubtreeImpl(const char *mtabpath ATTRIBUTE_UNUSED, - const char *prefix ATTRIBUTE_UNUSED, - char ***mountsret ATTRIBUTE_UNUSED, - size_t *nmountsret ATTRIBUTE_UNUSED, - bool reverse ATTRIBUTE_UNUSED) +virFileGetMountSubtreeImpl(const char *mtabpath G_GNUC_UNUSED, + const char *prefix G_GNUC_UNUSED, + char ***mountsret G_GNUC_UNUSED, + size_t *nmountsret G_GNUC_UNUSED, + bool reverse G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Unable to determine mount table on this platfo= rm")); @@ -2803,8 +2803,8 @@ virDirCreate(const char *path, int virFileAccessibleAs(const char *path, int mode, - uid_t uid ATTRIBUTE_UNUSED, - gid_t gid ATTRIBUTE_UNUSED) + uid_t uid G_GNUC_UNUSED, + gid_t gid G_GNUC_UNUSED) { VIR_WARN("Ignoring uid/gid due to WIN32"); =20 @@ -2813,12 +2813,12 @@ virFileAccessibleAs(const char *path, =20 /* return -errno on failure, or 0 on success */ int -virFileOpenAs(const char *path ATTRIBUTE_UNUSED, - int openflags ATTRIBUTE_UNUSED, - mode_t mode ATTRIBUTE_UNUSED, - uid_t uid ATTRIBUTE_UNUSED, - gid_t gid ATTRIBUTE_UNUSED, - unsigned int flags_unused ATTRIBUTE_UNUSED) +virFileOpenAs(const char *path G_GNUC_UNUSED, + int openflags G_GNUC_UNUSED, + mode_t mode G_GNUC_UNUSED, + uid_t uid G_GNUC_UNUSED, + gid_t gid G_GNUC_UNUSED, + unsigned int flags_unused G_GNUC_UNUSED) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("virFileOpenAs is not implemented for WIN32")); @@ -2827,11 +2827,11 @@ virFileOpenAs(const char *path ATTRIBUTE_UNUSED, } =20 int -virDirCreate(const char *path ATTRIBUTE_UNUSED, - mode_t mode ATTRIBUTE_UNUSED, - uid_t uid ATTRIBUTE_UNUSED, - gid_t gid ATTRIBUTE_UNUSED, - unsigned int flags_unused ATTRIBUTE_UNUSED) +virDirCreate(const char *path G_GNUC_UNUSED, + mode_t mode G_GNUC_UNUSED, + uid_t uid G_GNUC_UNUSED, + gid_t gid G_GNUC_UNUSED, + unsigned int flags_unused G_GNUC_UNUSED) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("virDirCreate is not implemented for WIN32")); @@ -2841,8 +2841,8 @@ virDirCreate(const char *path ATTRIBUTE_UNUSED, =20 int virFileRemove(const char *path, - uid_t uid ATTRIBUTE_UNUSED, - gid_t gid ATTRIBUTE_UNUSED) + uid_t uid G_GNUC_UNUSED, + gid_t gid G_GNUC_UNUSED) { if (unlink(path) < 0) { virReportSystemError(errno, _("Unable to unlink path '%s'"), @@ -3198,9 +3198,9 @@ virFileOpenTty(int *ttymaster, char **ttyName, int ra= wmode) } #else /* WIN32 */ int -virFileOpenTty(int *ttymaster ATTRIBUTE_UNUSED, - char **ttyName ATTRIBUTE_UNUSED, - int rawmode ATTRIBUTE_UNUSED) +virFileOpenTty(int *ttymaster G_GNUC_UNUSED, + char **ttyName G_GNUC_UNUSED, + int rawmode G_GNUC_UNUSED) { /* mingw completely lacks pseudo-terminals, and the gnulib * replacements are not (yet) license compatible. */ @@ -3741,16 +3741,16 @@ virFileFindHugeTLBFS(virHugeTLBFSPtr *ret_fs, =20 #else /* defined __linux__ */ =20 -int virFileIsSharedFSType(const char *path ATTRIBUTE_UNUSED, - int fstypes ATTRIBUTE_UNUSED) +int virFileIsSharedFSType(const char *path G_GNUC_UNUSED, + int fstypes G_GNUC_UNUSED) { /* XXX implement me :-) */ return 0; } =20 int -virFileGetHugepageSize(const char *path ATTRIBUTE_UNUSED, - unsigned long long *size ATTRIBUTE_UNUSED) +virFileGetHugepageSize(const char *path G_GNUC_UNUSED, + unsigned long long *size G_GNUC_UNUSED) { /* XXX implement me :-) */ virReportUnsupportedError(); @@ -3758,8 +3758,8 @@ virFileGetHugepageSize(const char *path ATTRIBUTE_UNU= SED, } =20 int -virFileFindHugeTLBFS(virHugeTLBFSPtr *ret_fs ATTRIBUTE_UNUSED, - size_t *ret_nfs ATTRIBUTE_UNUSED) +virFileFindHugeTLBFS(virHugeTLBFSPtr *ret_fs G_GNUC_UNUSED, + size_t *ret_nfs G_GNUC_UNUSED) { /* XXX implement me :-) */ virReportUnsupportedError(); @@ -3874,8 +3874,8 @@ virFileMoveMount(const char *src, #else /* !defined(__linux__) || !defined(HAVE_SYS_MOUNT_H) */ =20 int -virFileSetupDev(const char *path ATTRIBUTE_UNUSED, - const char *mount_options ATTRIBUTE_UNUSED) +virFileSetupDev(const char *path G_GNUC_UNUSED, + const char *mount_options G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("mount is not supported on this platform.")); @@ -3884,8 +3884,8 @@ virFileSetupDev(const char *path ATTRIBUTE_UNUSED, =20 =20 int -virFileBindMountDevice(const char *src ATTRIBUTE_UNUSED, - const char *dst ATTRIBUTE_UNUSED) +virFileBindMountDevice(const char *src G_GNUC_UNUSED, + const char *dst G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("mount is not supported on this platform.")); @@ -3894,8 +3894,8 @@ virFileBindMountDevice(const char *src ATTRIBUTE_UNUS= ED, =20 =20 int -virFileMoveMount(const char *src ATTRIBUTE_UNUSED, - const char *dst ATTRIBUTE_UNUSED) +virFileMoveMount(const char *src G_GNUC_UNUSED, + const char *dst G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("mount move is not supported on this platform."= )); @@ -3937,8 +3937,8 @@ virFileFreeACLs(void **acl) #else /* !defined(HAVE_SYS_ACL_H) */ =20 int -virFileGetACLs(const char *file ATTRIBUTE_UNUSED, - void **acl ATTRIBUTE_UNUSED) +virFileGetACLs(const char *file G_GNUC_UNUSED, + void **acl G_GNUC_UNUSED) { errno =3D ENOTSUP; return -1; @@ -3946,8 +3946,8 @@ virFileGetACLs(const char *file ATTRIBUTE_UNUSED, =20 =20 int -virFileSetACLs(const char *file ATTRIBUTE_UNUSED, - void *acl ATTRIBUTE_UNUSED) +virFileSetACLs(const char *file G_GNUC_UNUSED, + void *acl G_GNUC_UNUSED) { errno =3D ENOTSUP; return -1; @@ -4140,9 +4140,9 @@ virFileInData(int fd, #else /* !HAVE_DECL_SEEK_HOLE */ =20 int -virFileInData(int fd ATTRIBUTE_UNUSED, - int *inData ATTRIBUTE_UNUSED, - long long *length ATTRIBUTE_UNUSED) +virFileInData(int fd G_GNUC_UNUSED, + int *inData G_GNUC_UNUSED, + long long *length G_GNUC_UNUSED) { errno =3D ENOSYS; virReportSystemError(errno, "%s", @@ -4497,9 +4497,9 @@ virFileRemoveXAttr(const char *path, #else /* !HAVE_LIBATTR */ =20 int -virFileGetXAttrQuiet(const char *path ATTRIBUTE_UNUSED, - const char *name ATTRIBUTE_UNUSED, - char **value ATTRIBUTE_UNUSED) +virFileGetXAttrQuiet(const char *path G_GNUC_UNUSED, + const char *name G_GNUC_UNUSED, + char **value G_GNUC_UNUSED) { errno =3D ENOSYS; return -1; @@ -4508,7 +4508,7 @@ virFileGetXAttrQuiet(const char *path ATTRIBUTE_UNUSE= D, int virFileSetXAttr(const char *path, const char *name, - const char *value ATTRIBUTE_UNUSED) + const char *value G_GNUC_UNUSED) { errno =3D ENOSYS; virReportSystemError(errno, diff --git a/src/util/virhash.c b/src/util/virhash.c index 0e30106041..a7fc620567 100644 --- a/src/util/virhash.c +++ b/src/util/virhash.c @@ -105,7 +105,7 @@ static void virHashStrFree(void *name) =20 =20 void -virHashValueFree(void *value, const void *name ATTRIBUTE_UNUSED) +virHashValueFree(void *value, const void *name G_GNUC_UNUSED) { VIR_FREE(value); } @@ -640,9 +640,9 @@ virHashRemoveSet(virHashTablePtr table, } =20 static int -_virHashRemoveAllIter(const void *payload ATTRIBUTE_UNUSED, - const void *name ATTRIBUTE_UNUSED, - const void *data ATTRIBUTE_UNUSED) +_virHashRemoveAllIter(const void *payload G_GNUC_UNUSED, + const void *name G_GNUC_UNUSED, + const void *data G_GNUC_UNUSED) { return 1; } diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c index 83e4853006..952766dc3a 100644 --- a/src/util/virhostcpu.c +++ b/src/util/virhostcpu.c @@ -910,13 +910,13 @@ virHostCPUStatsAssign(virNodeCPUStatsPtr param, =20 =20 int -virHostCPUGetInfo(virArch hostarch ATTRIBUTE_UNUSED, - unsigned int *cpus ATTRIBUTE_UNUSED, - unsigned int *mhz ATTRIBUTE_UNUSED, - unsigned int *nodes ATTRIBUTE_UNUSED, - unsigned int *sockets ATTRIBUTE_UNUSED, - unsigned int *cores ATTRIBUTE_UNUSED, - unsigned int *threads ATTRIBUTE_UNUSED) +virHostCPUGetInfo(virArch hostarch G_GNUC_UNUSED, + unsigned int *cpus G_GNUC_UNUSED, + unsigned int *mhz G_GNUC_UNUSED, + unsigned int *nodes G_GNUC_UNUSED, + unsigned int *sockets G_GNUC_UNUSED, + unsigned int *cores G_GNUC_UNUSED, + unsigned int *threads G_GNUC_UNUSED) { #ifdef __linux__ int ret =3D -1; @@ -984,9 +984,9 @@ virHostCPUGetInfo(virArch hostarch ATTRIBUTE_UNUSED, =20 =20 int -virHostCPUGetStats(int cpuNum ATTRIBUTE_UNUSED, - virNodeCPUStatsPtr params ATTRIBUTE_UNUSED, - int *nparams ATTRIBUTE_UNUSED, +virHostCPUGetStats(int cpuNum G_GNUC_UNUSED, + virNodeCPUStatsPtr params G_GNUC_UNUSED, + int *nparams G_GNUC_UNUSED, unsigned int flags) { virCheckFlags(0, -1); @@ -1160,7 +1160,7 @@ virHostCPUGetThreadsPerSubcore(virArch arch) /* Fallback for nodeGetThreadsPerSubcore() used when KVM headers * are not available on the system */ int -virHostCPUGetThreadsPerSubcore(virArch arch ATTRIBUTE_UNUSED) +virHostCPUGetThreadsPerSubcore(virArch arch G_GNUC_UNUSED) { return 0; } @@ -1389,8 +1389,8 @@ virHostCPUGetTscInfo(void) #else =20 int -virHostCPUGetMSR(unsigned long index ATTRIBUTE_UNUSED, - uint64_t *msr ATTRIBUTE_UNUSED) +virHostCPUGetMSR(unsigned long index G_GNUC_UNUSED, + uint64_t *msr G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Reading MSRs is not supported on this platform= ")); diff --git a/src/util/virhostmem.c b/src/util/virhostmem.c index d16e0217e5..8e86bedaab 100644 --- a/src/util/virhostmem.c +++ b/src/util/virhostmem.c @@ -245,9 +245,9 @@ virHostMemGetStatsLinux(FILE *meminfo, =20 =20 int -virHostMemGetStats(int cellNum ATTRIBUTE_UNUSED, - virNodeMemoryStatsPtr params ATTRIBUTE_UNUSED, - int *nparams ATTRIBUTE_UNUSED, +virHostMemGetStats(int cellNum G_GNUC_UNUSED, + virNodeMemoryStatsPtr params G_GNUC_UNUSED, + int *nparams G_GNUC_UNUSED, unsigned int flags) { virCheckFlags(0, -1); @@ -364,8 +364,8 @@ virHostMemParametersAreAllSupported(virTypedParameterPt= r params, #endif =20 int -virHostMemSetParameters(virTypedParameterPtr params ATTRIBUTE_UNUSED, - int nparams ATTRIBUTE_UNUSED, +virHostMemSetParameters(virTypedParameterPtr params G_GNUC_UNUSED, + int nparams G_GNUC_UNUSED, unsigned int flags) { virCheckFlags(0, -1); @@ -449,8 +449,8 @@ virHostMemGetParameterValue(const char *field, =20 #define NODE_MEMORY_PARAMETERS_NUM 8 int -virHostMemGetParameters(virTypedParameterPtr params ATTRIBUTE_UNUSED, - int *nparams ATTRIBUTE_UNUSED, +virHostMemGetParameters(virTypedParameterPtr params G_GNUC_UNUSED, + int *nparams G_GNUC_UNUSED, unsigned int flags) { virCheckFlags(VIR_TYPED_PARAM_STRING_OKAY, -1); @@ -595,7 +595,7 @@ virHostMemGetParameters(virTypedParameterPtr params ATT= RIBUTE_UNUSED, static int virHostMemGetCellsFreeFake(unsigned long long *freeMems, int startCell, - int maxCells ATTRIBUTE_UNUSED) + int maxCells G_GNUC_UNUSED) { double avail =3D physmem_available(); =20 diff --git a/src/util/virinitctl.c b/src/util/virinitctl.c index 6966e8a3e9..955e8f398e 100644 --- a/src/util/virinitctl.c +++ b/src/util/virinitctl.c @@ -189,8 +189,8 @@ const char *virInitctlFifos[] =3D { NULL }; =20 -int virInitctlSetRunLevel(const char *fifo ATTRIBUTE_UNUSED, - virInitctlRunLevel level ATTRIBUTE_UNUSED) +int virInitctlSetRunLevel(const char *fifo G_GNUC_UNUSED, + virInitctlRunLevel level G_GNUC_UNUSED) { virReportUnsupportedError(); return -1; diff --git a/src/util/virjson.c b/src/util/virjson.c index 1cf2fb1e5c..07b3e8823c 100644 --- a/src/util/virjson.c +++ b/src/util/virjson.c @@ -432,7 +432,7 @@ virJSONValueFree(virJSONValuePtr value) =20 void virJSONValueHashFree(void *opaque, - const void *name ATTRIBUTE_UNUSED) + const void *name G_GNUC_UNUSED) { virJSONValueFree(opaque); } @@ -2001,7 +2001,7 @@ virJSONValueToBuffer(virJSONValuePtr object, =20 #else virJSONValuePtr -virJSONValueFromString(const char *jsonstring ATTRIBUTE_UNUSED) +virJSONValueFromString(const char *jsonstring G_GNUC_UNUSED) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("No JSON parser implementation is available")); @@ -2010,9 +2010,9 @@ virJSONValueFromString(const char *jsonstring ATTRIBU= TE_UNUSED) =20 =20 int -virJSONValueToBuffer(virJSONValuePtr object ATTRIBUTE_UNUSED, - virBufferPtr buf ATTRIBUTE_UNUSED, - bool pretty ATTRIBUTE_UNUSED) +virJSONValueToBuffer(virJSONValuePtr object G_GNUC_UNUSED, + virBufferPtr buf G_GNUC_UNUSED, + bool pretty G_GNUC_UNUSED) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("No JSON parser implementation is available")); diff --git a/src/util/virkeyfile.c b/src/util/virkeyfile.c index 201fabe8bf..c7e756d26a 100644 --- a/src/util/virkeyfile.c +++ b/src/util/virkeyfile.c @@ -265,7 +265,7 @@ static int virKeyFileParse(virKeyFilePtr conf, } =20 =20 -static void virKeyFileEntryFree(void *payload, const void *name ATTRIBUTE_= UNUSED) +static void virKeyFileEntryFree(void *payload, const void *name G_GNUC_UNU= SED) { virHashFree(payload); } diff --git a/src/util/virlockspace.c b/src/util/virlockspace.c index 0736b4b85b..c8e520c672 100644 --- a/src/util/virlockspace.c +++ b/src/util/virlockspace.c @@ -174,7 +174,7 @@ virLockSpaceResourceNew(virLockSpacePtr lockspace, * one that now exists on the filesystem */ if (stat(res->path, &a) < 0) { - char ebuf[1024] ATTRIBUTE_UNUSED; + char ebuf[1024] G_GNUC_UNUSED; VIR_DEBUG("Resource '%s' disappeared: %s", res->path, virStrerror(errno, ebuf, sizeof(ebuf)= )); VIR_FORCE_CLOSE(res->fd); @@ -232,7 +232,7 @@ virLockSpaceResourceNew(virLockSpacePtr lockspace, } =20 =20 -static void virLockSpaceResourceDataFree(void *opaque, const void *name AT= TRIBUTE_UNUSED) +static void virLockSpaceResourceDataFree(void *opaque, const void *name G_= GNUC_UNUSED) { virLockSpaceResourcePtr res =3D opaque; virLockSpaceResourceFree(res); @@ -712,7 +712,7 @@ struct virLockSpaceRemoveData { =20 static int virLockSpaceRemoveResourcesForOwner(const void *payload, - const void *name ATTRIBUTE_UNUSED, + const void *name G_GNUC_UNUSED, const void *opaque) { virLockSpaceResourcePtr res =3D (virLockSpaceResourcePtr)payload; diff --git a/src/util/virlog.c b/src/util/virlog.c index 4c76fbc5a4..4414a8fa63 100644 --- a/src/util/virlog.c +++ b/src/util/virlog.c @@ -714,15 +714,15 @@ virLogStackTraceToFd(int fd) } =20 static void -virLogOutputToFd(virLogSourcePtr source ATTRIBUTE_UNUSED, - virLogPriority priority ATTRIBUTE_UNUSED, - const char *filename ATTRIBUTE_UNUSED, - int linenr ATTRIBUTE_UNUSED, - const char *funcname ATTRIBUTE_UNUSED, +virLogOutputToFd(virLogSourcePtr source G_GNUC_UNUSED, + virLogPriority priority G_GNUC_UNUSED, + const char *filename G_GNUC_UNUSED, + int linenr G_GNUC_UNUSED, + const char *funcname G_GNUC_UNUSED, const char *timestamp, - virLogMetadataPtr metadata ATTRIBUTE_UNUSED, + virLogMetadataPtr metadata G_GNUC_UNUSED, unsigned int flags, - const char *rawstr ATTRIBUTE_UNUSED, + const char *rawstr G_GNUC_UNUSED, const char *str, void *data) { @@ -820,17 +820,17 @@ virLogPrioritySyslog(virLogPriority priority) =20 #if HAVE_SYSLOG_H static void -virLogOutputToSyslog(virLogSourcePtr source ATTRIBUTE_UNUSED, +virLogOutputToSyslog(virLogSourcePtr source G_GNUC_UNUSED, virLogPriority priority, - const char *filename ATTRIBUTE_UNUSED, - int linenr ATTRIBUTE_UNUSED, - const char *funcname ATTRIBUTE_UNUSED, - const char *timestamp ATTRIBUTE_UNUSED, - virLogMetadataPtr metadata ATTRIBUTE_UNUSED, + const char *filename G_GNUC_UNUSED, + int linenr G_GNUC_UNUSED, + const char *funcname G_GNUC_UNUSED, + const char *timestamp G_GNUC_UNUSED, + virLogMetadataPtr metadata G_GNUC_UNUSED, unsigned int flags, - const char *rawstr ATTRIBUTE_UNUSED, + const char *rawstr G_GNUC_UNUSED, const char *str, - void *data ATTRIBUTE_UNUSED) + void *data G_GNUC_UNUSED) { virCheckFlags(VIR_LOG_STACK_TRACE,); =20 @@ -841,7 +841,7 @@ static char *current_ident; =20 =20 static void -virLogCloseSyslog(void *data ATTRIBUTE_UNUSED) +virLogCloseSyslog(void *data G_GNUC_UNUSED) { closelog(); VIR_FREE(current_ident); @@ -973,11 +973,11 @@ virLogOutputToJournald(virLogSourcePtr source, const char *filename, int linenr, const char *funcname, - const char *timestamp ATTRIBUTE_UNUSED, + const char *timestamp G_GNUC_UNUSED, virLogMetadataPtr metadata, unsigned int flags, const char *rawstr, - const char *str ATTRIBUTE_UNUSED, + const char *str G_GNUC_UNUSED, void *data) { virCheckFlags(VIR_LOG_STACK_TRACE,); @@ -1133,7 +1133,7 @@ int virLogPriorityFromSyslog(int priority) } =20 #else /* HAVE_SYSLOG_H */ -int virLogPriorityFromSyslog(int priority ATTRIBUTE_UNUSED) +int virLogPriorityFromSyslog(int priority G_GNUC_UNUSED) { return VIR_LOG_ERROR; } diff --git a/src/util/virlog.h b/src/util/virlog.h index a30b760fb4..b4feb5b1b9 100644 --- a/src/util/virlog.h +++ b/src/util/virlog.h @@ -68,12 +68,12 @@ struct _virLogSource { }; =20 /* - * ATTRIBUTE_UNUSED is to make gcc keep quiet if all the + * G_GNUC_UNUSED is to make gcc keep quiet if all the * log statements in a file are conditionally disabled * at compile time due to configure options. */ #define VIR_LOG_INIT(n) \ - static ATTRIBUTE_UNUSED virLogSource virLogSelf =3D { \ + static G_GNUC_UNUSED virLogSource virLogSelf =3D { \ .name =3D "" n "", \ .priority =3D VIR_LOG_ERROR, \ .serial =3D 0, \ diff --git a/src/util/virmacmap.c b/src/util/virmacmap.c index 9b25683963..43cefc1e8e 100644 --- a/src/util/virmacmap.c +++ b/src/util/virmacmap.c @@ -52,8 +52,8 @@ static virClassPtr virMacMapClass; =20 static int virMacMapHashFree(void *payload, - const void *name ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) + const void *name G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED) { virStringListFree(payload); return 0; diff --git a/src/util/virmdev.c b/src/util/virmdev.c index 3d5488cdae..7700ae2ae8 100644 --- a/src/util/virmdev.c +++ b/src/util/virmdev.c @@ -173,8 +173,8 @@ virMediatedDeviceNew(const char *uuidstr, virMediatedDe= viceModelType model) #else =20 virMediatedDevicePtr -virMediatedDeviceNew(const char *uuidstr ATTRIBUTE_UNUSED, - virMediatedDeviceModelType model ATTRIBUTE_UNUSED) +virMediatedDeviceNew(const char *uuidstr G_GNUC_UNUSED, + virMediatedDeviceModelType model G_GNUC_UNUSED) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("mediated devices are not supported on non-linux " diff --git a/src/util/virmodule.c b/src/util/virmodule.c index b0a019497c..da64fbd1c3 100644 --- a/src/util/virmodule.c +++ b/src/util/virmodule.c @@ -143,7 +143,7 @@ virModuleLoad(const char *path, #else /* ! HAVE_DLFCN_H */ int virModuleLoad(const char *path, - const char *regfunc ATTRIBUTE_UNUSED, + const char *regfunc G_GNUC_UNUSED, bool required) { VIR_DEBUG("dlopen not available on this platform"); diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 5fef0b79aa..d3f1595ae4 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -175,8 +175,8 @@ virNetDevSetupControl(const char *ifname, } #else /* !HAVE_STRUCT_IFREQ */ int -virNetDevSetupControl(const char *ifname ATTRIBUTE_UNUSED, - void *ifr ATTRIBUTE_UNUSED) +virNetDevSetupControl(const char *ifname G_GNUC_UNUSED, + void *ifr G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Network device configuration is not supported " @@ -330,8 +330,8 @@ virNetDevSetMACInternal(const char *ifname, =20 static int virNetDevSetMACInternal(const char *ifname, - const virMacAddr *macaddr ATTRIBUTE_UNUSED, - bool quiet ATTRIBUTE_UNUSED) + const virMacAddr *macaddr G_GNUC_UNUSED, + bool quiet G_GNUC_UNUSED) { virReportSystemError(ENOSYS, _("Cannot set interface MAC on '%s'"), @@ -383,7 +383,7 @@ int virNetDevGetMAC(const char *ifname, } #else int virNetDevGetMAC(const char *ifname, - virMacAddrPtr macaddr ATTRIBUTE_UNUSED) + virMacAddrPtr macaddr G_GNUC_UNUSED) { virReportSystemError(ENOSYS, _("Cannot get interface MAC on '%s'"), @@ -461,7 +461,7 @@ int virNetDevSetMTU(const char *ifname, int mtu) return 0; } #else -int virNetDevSetMTU(const char *ifname, int mtu ATTRIBUTE_UNUSED) +int virNetDevSetMTU(const char *ifname, int mtu G_GNUC_UNUSED) { virReportSystemError(ENOSYS, _("Cannot set interface MTU on '%s'"), @@ -637,8 +637,8 @@ virNetDevSetIFFlag(const char *ifname, int flag, bool v= al) #else static int virNetDevSetIFFlag(const char *ifname, - int flag ATTRIBUTE_UNUSED, - bool val ATTRIBUTE_UNUSED) + int flag G_GNUC_UNUSED, + bool val G_GNUC_UNUSED) { virReportSystemError(ENOSYS, _("Cannot set interface flags on '%s'"), @@ -743,8 +743,8 @@ virNetDevGetIFFlag(const char *ifname, int flag, bool *= val) #else static int virNetDevGetIFFlag(const char *ifname, - int flag ATTRIBUTE_UNUSED, - bool *val ATTRIBUTE_UNUSED) + int flag G_GNUC_UNUSED, + bool *val G_GNUC_UNUSED) { virReportSystemError(ENOSYS, _("Cannot get interface flags on '%s'"), @@ -895,8 +895,8 @@ int virNetDevGetIndex(const char *ifname, int *ifindex) return 0; } #else /* ! SIOCGIFINDEX */ -int virNetDevGetIndex(const char *ifname ATTRIBUTE_UNUSED, - int *ifindex ATTRIBUTE_UNUSED) +int virNetDevGetIndex(const char *ifname G_GNUC_UNUSED, + int *ifindex G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Unable to get interface index on this platform= ")); @@ -944,8 +944,8 @@ virNetDevGetMaster(const char *ifname, char **master) =20 =20 int -virNetDevGetMaster(const char *ifname ATTRIBUTE_UNUSED, - char **master ATTRIBUTE_UNUSED) +virNetDevGetMaster(const char *ifname G_GNUC_UNUSED, + char **master G_GNUC_UNUSED) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Unable to get device master from netlink on this pla= tform")); @@ -987,8 +987,8 @@ int virNetDevGetVLanID(const char *ifname, int *vlanid) return 0; } #else /* ! SIOCGIFVLAN */ -int virNetDevGetVLanID(const char *ifname ATTRIBUTE_UNUSED, - int *vlanid ATTRIBUTE_UNUSED) +int virNetDevGetVLanID(const char *ifname G_GNUC_UNUSED, + int *vlanid G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Unable to get VLAN on this platform")); @@ -1052,9 +1052,9 @@ int virNetDevValidateConfig(const char *ifname, return 1; } #else -int virNetDevValidateConfig(const char *ifname ATTRIBUTE_UNUSED, - const virMacAddr *macaddr ATTRIBUTE_UNUSED, - int ifindex ATTRIBUTE_UNUSED) +int virNetDevValidateConfig(const char *ifname G_GNUC_UNUSED, + const virMacAddr *macaddr G_GNUC_UNUSED, + int ifindex G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Unable to check interface config on this platf= orm")); @@ -1461,7 +1461,7 @@ virNetDevGetVirtualFunctionInfo(const char *vfname, c= har **pfname, =20 #else /* !__linux__ */ int -virNetDevGetPhysPortID(const char *ifname ATTRIBUTE_UNUSED, +virNetDevGetPhysPortID(const char *ifname G_GNUC_UNUSED, char **physPortID) { /* this actually should never be called, and is just here to @@ -1472,11 +1472,11 @@ virNetDevGetPhysPortID(const char *ifname ATTRIBUTE= _UNUSED, } =20 int -virNetDevGetVirtualFunctions(const char *pfname ATTRIBUTE_UNUSED, - char ***vfname ATTRIBUTE_UNUSED, - virPCIDeviceAddressPtr **virt_fns ATTRIBUTE_U= NUSED, - size_t *n_vfname ATTRIBUTE_UNUSED, - unsigned int *max_vfs ATTRIBUTE_UNUSED) +virNetDevGetVirtualFunctions(const char *pfname G_GNUC_UNUSED, + char ***vfname G_GNUC_UNUSED, + virPCIDeviceAddressPtr **virt_fns G_GNUC_UNUS= ED, + size_t *n_vfname G_GNUC_UNUSED, + unsigned int *max_vfs G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Unable to get virtual functions on this platfo= rm")); @@ -1484,7 +1484,7 @@ virNetDevGetVirtualFunctions(const char *pfname ATTRI= BUTE_UNUSED, } =20 int -virNetDevIsVirtualFunction(const char *ifname ATTRIBUTE_UNUSED) +virNetDevIsVirtualFunction(const char *ifname G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Unable to check virtual function status on thi= s platform")); @@ -1492,9 +1492,9 @@ virNetDevIsVirtualFunction(const char *ifname ATTRIBU= TE_UNUSED) } =20 int -virNetDevGetVirtualFunctionIndex(const char *pfname ATTRIBUTE_UNUSED, - const char *vfname ATTRIBUTE_UNUSED, - int *vf_index ATTRIBUTE_UNUSED) +virNetDevGetVirtualFunctionIndex(const char *pfname G_GNUC_UNUSED, + const char *vfname G_GNUC_UNUSED, + int *vf_index G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Unable to get virtual function index on this p= latform")); @@ -1502,8 +1502,8 @@ virNetDevGetVirtualFunctionIndex(const char *pfname A= TTRIBUTE_UNUSED, } =20 int -virNetDevGetPhysicalFunction(const char *ifname ATTRIBUTE_UNUSED, - char **pfname ATTRIBUTE_UNUSED) +virNetDevGetPhysicalFunction(const char *ifname G_GNUC_UNUSED, + char **pfname G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Unable to get physical function status on this= platform")); @@ -1511,9 +1511,9 @@ virNetDevGetPhysicalFunction(const char *ifname ATTRI= BUTE_UNUSED, } =20 int -virNetDevPFGetVF(const char *pfname ATTRIBUTE_UNUSED, - int vf ATTRIBUTE_UNUSED, - char **vfname ATTRIBUTE_UNUSED) +virNetDevPFGetVF(const char *pfname G_GNUC_UNUSED, + int vf G_GNUC_UNUSED, + char **vfname G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Unable to get virtual function name on this pl= atform")); @@ -1521,9 +1521,9 @@ virNetDevPFGetVF(const char *pfname ATTRIBUTE_UNUSED, } =20 int -virNetDevGetVirtualFunctionInfo(const char *vfname ATTRIBUTE_UNUSED, - char **pfname ATTRIBUTE_UNUSED, - int *vf ATTRIBUTE_UNUSED) +virNetDevGetVirtualFunctionInfo(const char *vfname G_GNUC_UNUSED, + char **pfname G_GNUC_UNUSED, + int *vf G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Unable to get virtual function info on this pl= atform")); @@ -1531,9 +1531,9 @@ virNetDevGetVirtualFunctionInfo(const char *vfname AT= TRIBUTE_UNUSED, } =20 int -virNetDevSysfsFile(char **pf_sysfs_device_link ATTRIBUTE_UNUSED, - const char *ifname ATTRIBUTE_UNUSED, - const char *file ATTRIBUTE_UNUSED) +virNetDevSysfsFile(char **pf_sysfs_device_link G_GNUC_UNUSED, + const char *ifname G_GNUC_UNUSED, + const char *file G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Unable to get sysfs info on this platform")); @@ -2372,10 +2372,10 @@ virNetDevSetNetConfig(const char *linkdev, int vf, =20 =20 int -virNetDevSaveNetConfig(const char *linkdev ATTRIBUTE_UNUSED, - int vf ATTRIBUTE_UNUSED, - const char *stateDir ATTRIBUTE_UNUSED, - bool saveVlan ATTRIBUTE_UNUSED) +virNetDevSaveNetConfig(const char *linkdev G_GNUC_UNUSED, + int vf G_GNUC_UNUSED, + const char *stateDir G_GNUC_UNUSED, + bool saveVlan G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Unable to save net device config on this platf= orm")); @@ -2384,12 +2384,12 @@ virNetDevSaveNetConfig(const char *linkdev ATTRIBUT= E_UNUSED, =20 =20 int -virNetDevReadNetConfig(const char *linkdev ATTRIBUTE_UNUSED, - int vf ATTRIBUTE_UNUSED, - const char *stateDir ATTRIBUTE_UNUSED, - virMacAddrPtr *adminMAC ATTRIBUTE_UNUSED, - virNetDevVlanPtr *vlan ATTRIBUTE_UNUSED, - virMacAddrPtr *MAC ATTRIBUTE_UNUSED) +virNetDevReadNetConfig(const char *linkdev G_GNUC_UNUSED, + int vf G_GNUC_UNUSED, + const char *stateDir G_GNUC_UNUSED, + virMacAddrPtr *adminMAC G_GNUC_UNUSED, + virNetDevVlanPtr *vlan G_GNUC_UNUSED, + virMacAddrPtr *MAC G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Unable to read net device config on this platf= orm")); @@ -2398,12 +2398,12 @@ virNetDevReadNetConfig(const char *linkdev ATTRIBUT= E_UNUSED, =20 =20 int -virNetDevSetNetConfig(const char *linkdev ATTRIBUTE_UNUSED, - int vf ATTRIBUTE_UNUSED, - const virMacAddr *adminMAC ATTRIBUTE_UNUSED, - virNetDevVlanPtr vlan ATTRIBUTE_UNUSED, - const virMacAddr *MAC ATTRIBUTE_UNUSED, - bool setVlan ATTRIBUTE_UNUSED) +virNetDevSetNetConfig(const char *linkdev G_GNUC_UNUSED, + int vf G_GNUC_UNUSED, + const virMacAddr *adminMAC G_GNUC_UNUSED, + virNetDevVlanPtr vlan G_GNUC_UNUSED, + const virMacAddr *MAC G_GNUC_UNUSED, + bool setVlan G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Unable to set net device config on this platfo= rm")); @@ -2576,8 +2576,8 @@ int virNetDevAddMulti(const char *ifname, return 0; } #else -int virNetDevAddMulti(const char *ifname ATTRIBUTE_UNUSED, - virMacAddrPtr macaddr ATTRIBUTE_UNUSED) +int virNetDevAddMulti(const char *ifname G_GNUC_UNUSED, + virMacAddrPtr macaddr G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Unable to add address to interface " @@ -2621,8 +2621,8 @@ int virNetDevDelMulti(const char *ifname, return 0; } #else -int virNetDevDelMulti(const char *ifname ATTRIBUTE_UNUSED, - virMacAddrPtr macaddr ATTRIBUTE_UNUSED) +int virNetDevDelMulti(const char *ifname G_GNUC_UNUSED, + virMacAddrPtr macaddr G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Unable to delete address from interface " @@ -3222,8 +3222,8 @@ virNetDevSwitchdevFeature(const char *ifname, } # else static int -virNetDevSwitchdevFeature(const char *ifname ATTRIBUTE_UNUSED, - virBitmapPtr *out ATTRIBUTE_UNUSED) +virNetDevSwitchdevFeature(const char *ifname G_GNUC_UNUSED, + virBitmapPtr *out G_GNUC_UNUSED) { return 0; } @@ -3273,9 +3273,9 @@ virNetDevGetEthtoolGFeatures(virBitmapPtr bitmap, } # else static int -virNetDevGetEthtoolGFeatures(virBitmapPtr bitmap ATTRIBUTE_UNUSED, - int fd ATTRIBUTE_UNUSED, - struct ifreq *ifr ATTRIBUTE_UNUSED) +virNetDevGetEthtoolGFeatures(virBitmapPtr bitmap G_GNUC_UNUSED, + int fd G_GNUC_UNUSED, + struct ifreq *ifr G_GNUC_UNUSED) { return 0; } @@ -3432,8 +3432,8 @@ virNetDevGetFeatures(const char *ifname, } #else int -virNetDevGetFeatures(const char *ifname ATTRIBUTE_UNUSED, - virBitmapPtr *out ATTRIBUTE_UNUSED) +virNetDevGetFeatures(const char *ifname G_GNUC_UNUSED, + virBitmapPtr *out G_GNUC_UNUSED) { VIR_DEBUG("Getting network device features on %s is not implemented on= this platform", ifname); diff --git a/src/util/virnetdevbridge.c b/src/util/virnetdevbridge.c index 4f21a82fb7..50e90e2792 100644 --- a/src/util/virnetdevbridge.c +++ b/src/util/virnetdevbridge.c @@ -325,9 +325,9 @@ virNetDevBridgePortSetUnicastFlood(const char *brname, =20 #else int -virNetDevBridgePortGetLearning(const char *brname ATTRIBUTE_UNUSED, - const char *ifname ATTRIBUTE_UNUSED, - bool *enable ATTRIBUTE_UNUSED) +virNetDevBridgePortGetLearning(const char *brname G_GNUC_UNUSED, + const char *ifname G_GNUC_UNUSED, + bool *enable G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Unable to get bridge port learning on this pla= tform")); @@ -336,9 +336,9 @@ virNetDevBridgePortGetLearning(const char *brname ATTRI= BUTE_UNUSED, =20 =20 int -virNetDevBridgePortSetLearning(const char *brname ATTRIBUTE_UNUSED, - const char *ifname ATTRIBUTE_UNUSED, - bool enable ATTRIBUTE_UNUSED) +virNetDevBridgePortSetLearning(const char *brname G_GNUC_UNUSED, + const char *ifname G_GNUC_UNUSED, + bool enable G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Unable to set bridge port learning on this pla= tform")); @@ -347,9 +347,9 @@ virNetDevBridgePortSetLearning(const char *brname ATTRI= BUTE_UNUSED, =20 =20 int -virNetDevBridgePortGetUnicastFlood(const char *brname ATTRIBUTE_UNUSED, - const char *ifname ATTRIBUTE_UNUSED, - bool *enable ATTRIBUTE_UNUSED) +virNetDevBridgePortGetUnicastFlood(const char *brname G_GNUC_UNUSED, + const char *ifname G_GNUC_UNUSED, + bool *enable G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Unable to get bridge port unicast_flood on thi= s platform")); @@ -358,9 +358,9 @@ virNetDevBridgePortGetUnicastFlood(const char *brname A= TTRIBUTE_UNUSED, =20 =20 int -virNetDevBridgePortSetUnicastFlood(const char *brname ATTRIBUTE_UNUSED, - const char *ifname ATTRIBUTE_UNUSED, - bool enable ATTRIBUTE_UNUSED) +virNetDevBridgePortSetUnicastFlood(const char *brname G_GNUC_UNUSED, + const char *ifname G_GNUC_UNUSED, + bool enable G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Unable to set bridge port unicast_flood on thi= s platform")); @@ -533,7 +533,7 @@ virNetDevBridgeDelete(const char *brname) return 0; } #else -int virNetDevBridgeDelete(const char *brname ATTRIBUTE_UNUSED) +int virNetDevBridgeDelete(const char *brname G_GNUC_UNUSED) { virReportSystemError(ENOSYS, _("Unable to delete bridge %s"), brname); @@ -787,7 +787,7 @@ int virNetDevBridgeSetSTPDelay(const char *brname, return 0; } int virNetDevBridgeGetSTPDelay(const char *brname, - int *delay ATTRIBUTE_UNUSED) + int *delay G_GNUC_UNUSED) { virReportSystemError(ENOSYS, _("Unable to get STP delay on %s on this platform= "), @@ -795,8 +795,8 @@ int virNetDevBridgeGetSTPDelay(const char *brname, return -1; } =20 -int virNetDevBridgeSetSTP(const char *brname ATTRIBUTE_UNUSED, - bool enable ATTRIBUTE_UNUSED) +int virNetDevBridgeSetSTP(const char *brname G_GNUC_UNUSED, + bool enable G_GNUC_UNUSED) =20 { /* FreeBSD doesn't allow to set STP per bridge, @@ -804,7 +804,7 @@ int virNetDevBridgeSetSTP(const char *brname ATTRIBUTE_= UNUSED, return 0; } int virNetDevBridgeGetSTP(const char *brname, - bool *enable ATTRIBUTE_UNUSED) + bool *enable G_GNUC_UNUSED) { virReportSystemError(ENOSYS, _("Unable to get STP on %s on this platform"), @@ -813,7 +813,7 @@ int virNetDevBridgeGetSTP(const char *brname, } #else int virNetDevBridgeSetSTPDelay(const char *brname, - int delay ATTRIBUTE_UNUSED) + int delay G_GNUC_UNUSED) { virReportSystemError(ENOSYS, _("Unable to set STP delay on %s on this platform= "), @@ -821,7 +821,7 @@ int virNetDevBridgeSetSTPDelay(const char *brname, return -1; } int virNetDevBridgeGetSTPDelay(const char *brname, - int *delay ATTRIBUTE_UNUSED) + int *delay G_GNUC_UNUSED) { virReportSystemError(ENOSYS, _("Unable to get STP delay on %s on this platform= "), @@ -830,7 +830,7 @@ int virNetDevBridgeGetSTPDelay(const char *brname, } =20 int virNetDevBridgeSetSTP(const char *brname, - bool enable ATTRIBUTE_UNUSED) + bool enable G_GNUC_UNUSED) =20 { virReportSystemError(ENOSYS, @@ -839,7 +839,7 @@ int virNetDevBridgeSetSTP(const char *brname, return -1; } int virNetDevBridgeGetSTP(const char *brname, - bool *enable ATTRIBUTE_UNUSED) + bool *enable G_GNUC_UNUSED) { virReportSystemError(ENOSYS, _("Unable to get STP on %s on this platform"), @@ -896,8 +896,8 @@ virNetDevBridgeSetVlanFiltering(const char *brname, =20 #else int -virNetDevBridgeGetVlanFiltering(const char *brname ATTRIBUTE_UNUSED, - bool *enable ATTRIBUTE_UNUSED) +virNetDevBridgeGetVlanFiltering(const char *brname G_GNUC_UNUSED, + bool *enable G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Unable to get bridge vlan_filtering on this pl= atform")); @@ -906,8 +906,8 @@ virNetDevBridgeGetVlanFiltering(const char *brname ATTR= IBUTE_UNUSED, =20 =20 int -virNetDevBridgeSetVlanFiltering(const char *brname ATTRIBUTE_UNUSED, - bool enable ATTRIBUTE_UNUSED) +virNetDevBridgeSetVlanFiltering(const char *brname G_GNUC_UNUSED, + bool enable G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Unable to set bridge vlan_filtering on this pl= atform")); @@ -1035,10 +1035,10 @@ virNetDevBridgeFDBAddDel(const virMacAddr *mac, con= st char *ifname, =20 #else static int -virNetDevBridgeFDBAddDel(const virMacAddr *mac ATTRIBUTE_UNUSED, - const char *ifname ATTRIBUTE_UNUSED, - unsigned int fdbFlags ATTRIBUTE_UNUSED, - bool isAdd ATTRIBUTE_UNUSED) +virNetDevBridgeFDBAddDel(const virMacAddr *mac G_GNUC_UNUSED, + const char *ifname G_GNUC_UNUSED, + unsigned int fdbFlags G_GNUC_UNUSED, + bool isAdd G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Unable to add/delete fdb entries on this platf= orm")); diff --git a/src/util/virnetdevip.c b/src/util/virnetdevip.c index e9d1ce0831..dea3de6514 100644 --- a/src/util/virnetdevip.c +++ b/src/util/virnetdevip.c @@ -802,8 +802,8 @@ virNetDevIPRouteAdd(const char *ifname, =20 /* return after DAD finishes for all known IPv6 addresses or an error */ int -virNetDevIPWaitDadFinish(virSocketAddrPtr *addrs ATTRIBUTE_UNUSED, - size_t count ATTRIBUTE_UNUSED) +virNetDevIPWaitDadFinish(virSocketAddrPtr *addrs G_GNUC_UNUSED, + size_t count G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Unable to wait for IPv6 DAD on this platform")= ); @@ -862,8 +862,8 @@ virNetDevGetIPv4AddressIoctl(const char *ifname, #else /* ! SIOCGIFADDR */ =20 static int -virNetDevGetIPv4AddressIoctl(const char *ifname ATTRIBUTE_UNUSED, - virSocketAddrPtr addr ATTRIBUTE_UNUSED) +virNetDevGetIPv4AddressIoctl(const char *ifname G_GNUC_UNUSED, + virSocketAddrPtr addr G_GNUC_UNUSED) { return -2; } @@ -931,8 +931,8 @@ virNetDevGetifaddrsAddress(const char *ifname, #else /* ! HAVE_GETIFADDRS */ =20 static int -virNetDevGetifaddrsAddress(const char *ifname ATTRIBUTE_UNUSED, - virSocketAddrPtr addr ATTRIBUTE_UNUSED) +virNetDevGetifaddrsAddress(const char *ifname G_GNUC_UNUSED, + virSocketAddrPtr addr G_GNUC_UNUSED) { return -2; } diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index efd81c3aa0..1ee503afb6 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -816,8 +816,8 @@ virNetlinkCallbackDataFree(virNetlinkCallbackDataPtr ca= lld) * data, and the opaque object itself. */ static void -virNetDevMacVLanVPortProfileDestroyCallback(int watch ATTRIBUTE_UNUSED, - const virMacAddr *macaddr ATTR= IBUTE_UNUSED, +virNetDevMacVLanVPortProfileDestroyCallback(int watch G_GNUC_UNUSED, + const virMacAddr *macaddr G_GN= UC_UNUSED, void *opaque) { virNetlinkCallbackDataFree((virNetlinkCallbackDataPtr)opaque); @@ -1178,26 +1178,26 @@ int virNetDevMacVLanRestartWithVPortProfile(const c= har *cr_ifname, } =20 #else /* ! WITH_MACVTAP */ -bool virNetDevMacVLanIsMacvtap(const char *ifname ATTRIBUTE_UNUSED) +bool virNetDevMacVLanIsMacvtap(const char *ifname G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Cannot create macvlan devices on this platform= ")); return false; } =20 -int virNetDevMacVLanCreate(const char *ifname ATTRIBUTE_UNUSED, - const char *type ATTRIBUTE_UNUSED, - const virMacAddr *macaddress ATTRIBUTE_UNUSED, - const char *srcdev ATTRIBUTE_UNUSED, - uint32_t macvlan_mode ATTRIBUTE_UNUSED, - int *retry ATTRIBUTE_UNUSED) +int virNetDevMacVLanCreate(const char *ifname G_GNUC_UNUSED, + const char *type G_GNUC_UNUSED, + const virMacAddr *macaddress G_GNUC_UNUSED, + const char *srcdev G_GNUC_UNUSED, + uint32_t macvlan_mode G_GNUC_UNUSED, + int *retry G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Cannot create macvlan devices on this platform= ")); return -1; } =20 -int virNetDevMacVLanDelete(const char *ifname ATTRIBUTE_UNUSED) +int virNetDevMacVLanDelete(const char *ifname G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Cannot create macvlan devices on this platform= ")); @@ -1205,9 +1205,9 @@ int virNetDevMacVLanDelete(const char *ifname ATTRIBU= TE_UNUSED) } =20 int -virNetDevMacVLanTapOpen(const char *ifname ATTRIBUTE_UNUSED, - int *tapfd ATTRIBUTE_UNUSED, - size_t tapfdSize ATTRIBUTE_UNUSED) +virNetDevMacVLanTapOpen(const char *ifname G_GNUC_UNUSED, + int *tapfd G_GNUC_UNUSED, + size_t tapfdSize G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Cannot create macvlan devices on this platform= ")); @@ -1215,79 +1215,79 @@ virNetDevMacVLanTapOpen(const char *ifname ATTRIBUT= E_UNUSED, } =20 int -virNetDevMacVLanTapSetup(int *tapfd ATTRIBUTE_UNUSED, - size_t tapfdSize ATTRIBUTE_UNUSED, - bool vnet_hdr ATTRIBUTE_UNUSED) +virNetDevMacVLanTapSetup(int *tapfd G_GNUC_UNUSED, + size_t tapfdSize G_GNUC_UNUSED, + bool vnet_hdr G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Cannot create macvlan devices on this platform= ")); return -1; } =20 -int virNetDevMacVLanCreateWithVPortProfile(const char *ifname ATTRIBUTE_UN= USED, - const virMacAddr *macaddress AT= TRIBUTE_UNUSED, - const char *linkdev ATTRIBUTE_U= NUSED, - virNetDevMacVLanMode mode ATTRI= BUTE_UNUSED, - virNetDevVlanPtr vlan ATTRIBUTE= _UNUSED, - const unsigned char *vmuuid ATT= RIBUTE_UNUSED, - virNetDevVPortProfilePtr virtPo= rtProfile ATTRIBUTE_UNUSED, - char **res_ifname ATTRIBUTE_UNU= SED, - virNetDevVPortProfileOp vmop AT= TRIBUTE_UNUSED, - char *stateDir ATTRIBUTE_UNUSED, - int *tapfd ATTRIBUTE_UNUSED, - size_t tapfdSize ATTRIBUTE_UNUS= ED, - unsigned int unused_flags ATTRI= BUTE_UNUSED) +int virNetDevMacVLanCreateWithVPortProfile(const char *ifname G_GNUC_UNUSE= D, + const virMacAddr *macaddress G_= GNUC_UNUSED, + const char *linkdev G_GNUC_UNUS= ED, + virNetDevMacVLanMode mode G_GNU= C_UNUSED, + virNetDevVlanPtr vlan G_GNUC_UN= USED, + const unsigned char *vmuuid G_G= NUC_UNUSED, + virNetDevVPortProfilePtr virtPo= rtProfile G_GNUC_UNUSED, + char **res_ifname G_GNUC_UNUSED, + virNetDevVPortProfileOp vmop G_= GNUC_UNUSED, + char *stateDir G_GNUC_UNUSED, + int *tapfd G_GNUC_UNUSED, + size_t tapfdSize G_GNUC_UNUSED, + unsigned int unused_flags G_GNU= C_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Cannot create macvlan devices on this platform= ")); return -1; } =20 -int virNetDevMacVLanDeleteWithVPortProfile(const char *ifname ATTRIBUTE_UN= USED, - const virMacAddr *macaddress AT= TRIBUTE_UNUSED, - const char *linkdev ATTRIBUTE_U= NUSED, - int mode ATTRIBUTE_UNUSED, - virNetDevVPortProfilePtr virtPo= rtProfile ATTRIBUTE_UNUSED, - char *stateDir ATTRIBUTE_UNUSED) +int virNetDevMacVLanDeleteWithVPortProfile(const char *ifname G_GNUC_UNUSE= D, + const virMacAddr *macaddress G_= GNUC_UNUSED, + const char *linkdev G_GNUC_UNUS= ED, + int mode G_GNUC_UNUSED, + virNetDevVPortProfilePtr virtPo= rtProfile G_GNUC_UNUSED, + char *stateDir G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Cannot create macvlan devices on this platform= ")); return -1; } =20 -int virNetDevMacVLanRestartWithVPortProfile(const char *cr_ifname ATTRIBUT= E_UNUSED, - const virMacAddr *macaddress A= TTRIBUTE_UNUSED, - const char *linkdev ATTRIBUTE_= UNUSED, - const unsigned char *vmuuid AT= TRIBUTE_UNUSED, - virNetDevVPortProfilePtr virtP= ortProfile ATTRIBUTE_UNUSED, - virNetDevVPortProfileOp vmOp A= TTRIBUTE_UNUSED) +int virNetDevMacVLanRestartWithVPortProfile(const char *cr_ifname G_GNUC_U= NUSED, + const virMacAddr *macaddress G= _GNUC_UNUSED, + const char *linkdev G_GNUC_UNU= SED, + const unsigned char *vmuuid G_= GNUC_UNUSED, + virNetDevVPortProfilePtr virtP= ortProfile G_GNUC_UNUSED, + virNetDevVPortProfileOp vmOp G= _GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Cannot create macvlan devices on this platform= ")); return -1; } =20 -int virNetDevMacVLanVPortProfileRegisterCallback(const char *ifname ATTRIB= UTE_UNUSED, - const virMacAddr *macaddr= ess ATTRIBUTE_UNUSED, - const char *linkdev ATTRI= BUTE_UNUSED, - const unsigned char *vmuu= id ATTRIBUTE_UNUSED, - virNetDevVPortProfilePtr = virtPortProfile ATTRIBUTE_UNUSED, - virNetDevVPortProfileOp v= mOp ATTRIBUTE_UNUSED) +int virNetDevMacVLanVPortProfileRegisterCallback(const char *ifname G_GNUC= _UNUSED, + const virMacAddr *macaddr= ess G_GNUC_UNUSED, + const char *linkdev G_GNU= C_UNUSED, + const unsigned char *vmuu= id G_GNUC_UNUSED, + virNetDevVPortProfilePtr = virtPortProfile G_GNUC_UNUSED, + virNetDevVPortProfileOp v= mOp G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Cannot create macvlan devices on this platform= ")); return -1; } =20 -int virNetDevMacVLanReleaseName(const char *name ATTRIBUTE_UNUSED) +int virNetDevMacVLanReleaseName(const char *name G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Cannot create macvlan devices on this platform= ")); return -1; } =20 -int virNetDevMacVLanReserveName(const char *name ATTRIBUTE_UNUSED, - bool quietFail ATTRIBUTE_UNUSED) +int virNetDevMacVLanReserveName(const char *name G_GNUC_UNUSED, + bool quietFail G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Cannot create macvlan devices on this platform= ")); diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitc= h.c index 2afc30f485..3066ef9cde 100644 --- a/src/util/virnetdevopenvswitch.c +++ b/src/util/virnetdevopenvswitch.c @@ -211,7 +211,7 @@ int virNetDevOpenvswitchAddPort(const char *brname, con= st char *ifname, * * Returns 0 in case of success or -1 in case of failure. */ -int virNetDevOpenvswitchRemovePort(const char *brname ATTRIBUTE_UNUSED, co= nst char *ifname) +int virNetDevOpenvswitchRemovePort(const char *brname G_GNUC_UNUSED, const= char *ifname) { VIR_AUTOPTR(virCommand) cmd =3D NULL; =20 diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c index 4548b51b5b..c2d7040938 100644 --- a/src/util/virnetdevtap.c +++ b/src/util/virnetdevtap.c @@ -62,7 +62,7 @@ VIR_LOG_INIT("util.netdevtap"); * Returns 0 if the interface name is successfully queried, -1 otherwise */ int -virNetDevTapGetName(int tapfd ATTRIBUTE_UNUSED, char **ifname ATTRIBUTE_UN= USED) +virNetDevTapGetName(int tapfd G_GNUC_UNUSED, char **ifname G_GNUC_UNUSED) { #ifdef TUNGETIFF struct ifreq ifr; @@ -92,7 +92,7 @@ virNetDevTapGetName(int tapfd ATTRIBUTE_UNUSED, char **if= name ATTRIBUTE_UNUSED) * found. */ char* -virNetDevTapGetRealDeviceName(char *ifname ATTRIBUTE_UNUSED) +virNetDevTapGetRealDeviceName(char *ifname G_GNUC_UNUSED) { #ifdef IFDATA_DRIVERNAME int ifindex =3D 0; @@ -356,10 +356,10 @@ int virNetDevTapDelete(const char *ifname, } #elif defined(SIOCIFCREATE2) && defined(SIOCIFDESTROY) && defined(IF_MAXUN= IT) int virNetDevTapCreate(char **ifname, - const char *tunpath ATTRIBUTE_UNUSED, + const char *tunpath G_GNUC_UNUSED, int *tapfd, size_t tapfdSize, - unsigned int flags ATTRIBUTE_UNUSED) + unsigned int flags G_GNUC_UNUSED) { int s; struct ifreq ifr; @@ -439,7 +439,7 @@ int virNetDevTapCreate(char **ifname, } =20 int virNetDevTapDelete(const char *ifname, - const char *tunpath ATTRIBUTE_UNUSED) + const char *tunpath G_GNUC_UNUSED) { int s; struct ifreq ifr; @@ -462,18 +462,18 @@ int virNetDevTapDelete(const char *ifname, } =20 #else -int virNetDevTapCreate(char **ifname ATTRIBUTE_UNUSED, - const char *tunpath ATTRIBUTE_UNUSED, - int *tapfd ATTRIBUTE_UNUSED, - size_t tapfdSize ATTRIBUTE_UNUSED, - unsigned int flags ATTRIBUTE_UNUSED) +int virNetDevTapCreate(char **ifname G_GNUC_UNUSED, + const char *tunpath G_GNUC_UNUSED, + int *tapfd G_GNUC_UNUSED, + size_t tapfdSize G_GNUC_UNUSED, + unsigned int flags G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Unable to create TAP devices on this platform"= )); return -1; } -int virNetDevTapDelete(const char *ifname ATTRIBUTE_UNUSED, - const char *tunpath ATTRIBUTE_UNUSED) +int virNetDevTapDelete(const char *ifname G_GNUC_UNUSED, + const char *tunpath G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Unable to delete TAP devices on this platform"= )); @@ -891,9 +891,9 @@ virNetDevTapInterfaceStats(const char *ifname, } #else int -virNetDevTapInterfaceStats(const char *ifname ATTRIBUTE_UNUSED, - virDomainInterfaceStatsPtr stats ATTRIBUTE_UNUS= ED, - bool swapped ATTRIBUTE_UNUSED) +virNetDevTapInterfaceStats(const char *ifname G_GNUC_UNUSED, + virDomainInterfaceStatsPtr stats G_GNUC_UNUSED, + bool swapped G_GNUC_UNUSED) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("interface stats not implemented on this platform")); diff --git a/src/util/virnetdevvportprofile.c b/src/util/virnetdevvportprof= ile.c index 048f891920..b001aea3ec 100644 --- a/src/util/virnetdevvportprofile.c +++ b/src/util/virnetdevvportprofile.c @@ -1359,26 +1359,26 @@ virNetDevVPortProfileDisassociate(const char *macvt= ap_ifname, } =20 #else /* ! WITH_VIRTUALPORT */ -int virNetDevVPortProfileAssociate(const char *macvtap_ifname ATTRIBUTE_UN= USED, - const virNetDevVPortProfile *virtPort A= TTRIBUTE_UNUSED, - const virMacAddr *macvtap_macaddr ATTRI= BUTE_UNUSED, - const char *linkdev ATTRIBUTE_UNUSED, - int vf ATTRIBUTE_UNUSED, - const unsigned char *vmuuid ATTRIBUTE_U= NUSED, - virNetDevVPortProfileOp vmOp ATTRIBUTE_= UNUSED, - bool setlink_only ATTRIBUTE_UNUSED) +int virNetDevVPortProfileAssociate(const char *macvtap_ifname G_GNUC_UNUSE= D, + const virNetDevVPortProfile *virtPort G= _GNUC_UNUSED, + const virMacAddr *macvtap_macaddr G_GNU= C_UNUSED, + const char *linkdev G_GNUC_UNUSED, + int vf G_GNUC_UNUSED, + const unsigned char *vmuuid G_GNUC_UNUS= ED, + virNetDevVPortProfileOp vmOp G_GNUC_UNU= SED, + bool setlink_only G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Virtual port profile association not supported= on this platform")); return -1; } =20 -int virNetDevVPortProfileDisassociate(const char *macvtap_ifname ATTRIBUTE= _UNUSED, - const virNetDevVPortProfile *virtPor= t ATTRIBUTE_UNUSED, - const virMacAddr *macvtap_macaddr AT= TRIBUTE_UNUSED, - const char *linkdev ATTRIBUTE_UNUSED, - int vf ATTRIBUTE_UNUSED, - virNetDevVPortProfileOp vmOp ATTRIBU= TE_UNUSED) +int virNetDevVPortProfileDisassociate(const char *macvtap_ifname G_GNUC_UN= USED, + const virNetDevVPortProfile *virtPor= t G_GNUC_UNUSED, + const virMacAddr *macvtap_macaddr G_= GNUC_UNUSED, + const char *linkdev G_GNUC_UNUSED, + int vf G_GNUC_UNUSED, + virNetDevVPortProfileOp vmOp G_GNUC_= UNUSED) { virReportSystemError(ENOSYS, "%s", _("Virtual port profile association not supported= on this platform")); diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c index 7b3c6bf05f..0b1f3262f4 100644 --- a/src/util/virnetlink.c +++ b/src/util/virnetlink.c @@ -838,8 +838,8 @@ virNetlinkEventRemoveClientPrimitive(size_t i, unsigned= int protocol) =20 static void virNetlinkEventCallback(int watch, - int fd ATTRIBUTE_UNUSED, - int events ATTRIBUTE_UNUSED, + int fd G_GNUC_UNUSED, + int events G_GNUC_UNUSED, void *opaque) { virNetlinkEventSrvPrivatePtr srv =3D opaque; @@ -1238,38 +1238,38 @@ virNetlinkShutdown(void) return; } =20 -int virNetlinkCommand(struct nl_msg *nl_msg ATTRIBUTE_UNUSED, - struct nlmsghdr **resp ATTRIBUTE_UNUSED, - unsigned int *respbuflen ATTRIBUTE_UNUSED, - uint32_t src_pid ATTRIBUTE_UNUSED, - uint32_t dst_pid ATTRIBUTE_UNUSED, - unsigned int protocol ATTRIBUTE_UNUSED, - unsigned int groups ATTRIBUTE_UNUSED) +int virNetlinkCommand(struct nl_msg *nl_msg G_GNUC_UNUSED, + struct nlmsghdr **resp G_GNUC_UNUSED, + unsigned int *respbuflen G_GNUC_UNUSED, + uint32_t src_pid G_GNUC_UNUSED, + uint32_t dst_pid G_GNUC_UNUSED, + unsigned int protocol G_GNUC_UNUSED, + unsigned int groups G_GNUC_UNUSED) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported)); return -1; } =20 int -virNetlinkDumpCommand(struct nl_msg *nl_msg ATTRIBUTE_UNUSED, - virNetlinkDumpCallback callback ATTRIBUTE_UNUSED, - uint32_t src_pid ATTRIBUTE_UNUSED, - uint32_t dst_pid ATTRIBUTE_UNUSED, - unsigned int protocol ATTRIBUTE_UNUSED, - unsigned int groups ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) +virNetlinkDumpCommand(struct nl_msg *nl_msg G_GNUC_UNUSED, + virNetlinkDumpCallback callback G_GNUC_UNUSED, + uint32_t src_pid G_GNUC_UNUSED, + uint32_t dst_pid G_GNUC_UNUSED, + unsigned int protocol G_GNUC_UNUSED, + unsigned int groups G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported)); return -1; } =20 int -virNetlinkDumpLink(const char *ifname ATTRIBUTE_UNUSED, - int ifindex ATTRIBUTE_UNUSED, - void **nlData ATTRIBUTE_UNUSED, - struct nlattr **tb ATTRIBUTE_UNUSED, - uint32_t src_pid ATTRIBUTE_UNUSED, - uint32_t dst_pid ATTRIBUTE_UNUSED) +virNetlinkDumpLink(const char *ifname G_GNUC_UNUSED, + int ifindex G_GNUC_UNUSED, + void **nlData G_GNUC_UNUSED, + struct nlattr **tb G_GNUC_UNUSED, + uint32_t src_pid G_GNUC_UNUSED, + uint32_t dst_pid G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Unable to dump link info on this platform")); @@ -1278,8 +1278,8 @@ virNetlinkDumpLink(const char *ifname ATTRIBUTE_UNUSE= D, =20 =20 int -virNetlinkDelLink(const char *ifname ATTRIBUTE_UNUSED, - virNetlinkDelLinkFallback fallback ATTRIBUTE_UNUSED) +virNetlinkDelLink(const char *ifname G_GNUC_UNUSED, + virNetlinkDelLinkFallback fallback G_GNUC_UNUSED) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported)); return -1; @@ -1287,10 +1287,10 @@ virNetlinkDelLink(const char *ifname ATTRIBUTE_UNUS= ED, =20 =20 int -virNetlinkNewLink(const char *ifname ATTRIBUTE_UNUSED, - const char *type ATTRIBUTE_UNUSED, - virNetlinkNewLinkDataPtr extra_args ATTRIBUTE_UNUSED, - int *error ATTRIBUTE_UNUSED) +virNetlinkNewLink(const char *ifname G_GNUC_UNUSED, + const char *type G_GNUC_UNUSED, + virNetlinkNewLinkDataPtr extra_args G_GNUC_UNUSED, + int *error G_GNUC_UNUSED) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported)); return -1; @@ -1298,9 +1298,9 @@ virNetlinkNewLink(const char *ifname ATTRIBUTE_UNUSED, =20 =20 int -virNetlinkGetNeighbor(void **nlData ATTRIBUTE_UNUSED, - uint32_t src_pid ATTRIBUTE_UNUSED, - uint32_t dst_pid ATTRIBUTE_UNUSED) +virNetlinkGetNeighbor(void **nlData G_GNUC_UNUSED, + uint32_t src_pid G_GNUC_UNUSED, + uint32_t dst_pid G_GNUC_UNUSED) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported)); return -1; @@ -1311,7 +1311,7 @@ virNetlinkGetNeighbor(void **nlData ATTRIBUTE_UNUSED, * stopNetlinkEventServer: stop the monitor to receive netlink * messages for libvirtd */ -int virNetlinkEventServiceStop(unsigned int protocol ATTRIBUTE_UNUSED) +int virNetlinkEventServiceStop(unsigned int protocol G_GNUC_UNUSED) { VIR_DEBUG("%s", _(unsupported)); return 0; @@ -1331,8 +1331,8 @@ int virNetlinkEventServiceStopAll(void) * startNetlinkEventServer: start a monitor to receive netlink * messages for libvirtd */ -int virNetlinkEventServiceStart(unsigned int protocol ATTRIBUTE_UNUSED, - unsigned int groups ATTRIBUTE_UNUSED) +int virNetlinkEventServiceStart(unsigned int protocol G_GNUC_UNUSED, + unsigned int groups G_GNUC_UNUSED) { VIR_DEBUG("%s", _(unsupported)); return 0; @@ -1342,13 +1342,13 @@ int virNetlinkEventServiceStart(unsigned int protoc= ol ATTRIBUTE_UNUSED, * virNetlinkEventServiceIsRunning: returns if the netlink event * service is running. */ -bool virNetlinkEventServiceIsRunning(unsigned int protocol ATTRIBUTE_UNUSE= D) +bool virNetlinkEventServiceIsRunning(unsigned int protocol G_GNUC_UNUSED) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported)); return 0; } =20 -int virNetlinkEventServiceLocalPid(unsigned int protocol ATTRIBUTE_UNUSED) +int virNetlinkEventServiceLocalPid(unsigned int protocol G_GNUC_UNUSED) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported)); return -1; @@ -1358,11 +1358,11 @@ int virNetlinkEventServiceLocalPid(unsigned int pro= tocol ATTRIBUTE_UNUSED) * virNetlinkEventAddClient: register a callback for handling of * netlink messages */ -int virNetlinkEventAddClient(virNetlinkEventHandleCallback handleCB ATTRIB= UTE_UNUSED, - virNetlinkEventRemoveCallback removeCB ATTRIB= UTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED, - const virMacAddr *macaddr ATTRIBUTE_UNUSED, - unsigned int protocol ATTRIBUTE_UNUSED) +int virNetlinkEventAddClient(virNetlinkEventHandleCallback handleCB G_GNUC= _UNUSED, + virNetlinkEventRemoveCallback removeCB G_GNUC= _UNUSED, + void *opaque G_GNUC_UNUSED, + const virMacAddr *macaddr G_GNUC_UNUSED, + unsigned int protocol G_GNUC_UNUSED) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported)); return -1; @@ -1371,9 +1371,9 @@ int virNetlinkEventAddClient(virNetlinkEventHandleCal= lback handleCB ATTRIBUTE_UN /** * virNetlinkEventRemoveClient: unregister a callback from a netlink monit= or */ -int virNetlinkEventRemoveClient(int watch ATTRIBUTE_UNUSED, - const virMacAddr *macaddr ATTRIBUTE_UNUSED, - unsigned int protocol ATTRIBUTE_UNUSED) +int virNetlinkEventRemoveClient(int watch G_GNUC_UNUSED, + const virMacAddr *macaddr G_GNUC_UNUSED, + unsigned int protocol G_GNUC_UNUSED) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported)); return -1; @@ -1381,8 +1381,8 @@ int virNetlinkEventRemoveClient(int watch ATTRIBUTE_U= NUSED, =20 =20 int -virNetlinkGetErrorCode(struct nlmsghdr *resp ATTRIBUTE_UNUSED, - unsigned int recvbuflen ATTRIBUTE_UNUSED) +virNetlinkGetErrorCode(struct nlmsghdr *resp G_GNUC_UNUSED, + unsigned int recvbuflen G_GNUC_UNUSED) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported)); return -EINVAL; diff --git a/src/util/virnodesuspend.c b/src/util/virnodesuspend.c index 93b0685ca6..9ce3566ecf 100644 --- a/src/util/virnodesuspend.c +++ b/src/util/virnodesuspend.c @@ -276,8 +276,8 @@ virNodeSuspendSupportsTargetPMUtils(unsigned int target= , bool *supported) } #else /* ! WITH_PM_UTILS */ static int -virNodeSuspendSupportsTargetPMUtils(unsigned int target ATTRIBUTE_UNUSED, - bool *supported ATTRIBUTE_UNUSED) +virNodeSuspendSupportsTargetPMUtils(unsigned int target G_GNUC_UNUSED, + bool *supported G_GNUC_UNUSED) { return -2; } diff --git a/src/util/virnuma.c b/src/util/virnuma.c index 34f2c5c38d..f5704e7722 100644 --- a/src/util/virnuma.c +++ b/src/util/virnuma.c @@ -77,8 +77,8 @@ virNumaGetAutoPlacementAdvice(unsigned short vcpus, } #else /* !HAVE_NUMAD */ char * -virNumaGetAutoPlacementAdvice(unsigned short vcpus ATTRIBUTE_UNUSED, - unsigned long long balloon ATTRIBUTE_UNUSED) +virNumaGetAutoPlacementAdvice(unsigned short vcpus G_GNUC_UNUSED, + unsigned long long balloon G_GNUC_UNUSED) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("numad is not available on this host")); @@ -345,7 +345,7 @@ virNumaNodesetToCPUset(virBitmapPtr nodeset, #else /* !WITH_NUMACTL */ =20 int -virNumaSetupMemoryPolicy(virDomainNumatuneMemMode mode ATTRIBUTE_UNUSED, +virNumaSetupMemoryPolicy(virDomainNumatuneMemMode mode G_GNUC_UNUSED, virBitmapPtr nodeset) { if (!virNumaNodesetIsAvailable(nodeset)) @@ -371,7 +371,7 @@ virNumaGetMaxNode(void) =20 =20 int -virNumaGetNodeMemory(int node ATTRIBUTE_UNUSED, +virNumaGetNodeMemory(int node G_GNUC_UNUSED, unsigned long long *memsize, unsigned long long *memfree) { @@ -387,7 +387,7 @@ virNumaGetNodeMemory(int node ATTRIBUTE_UNUSED, =20 =20 int -virNumaGetNodeCPUs(int node ATTRIBUTE_UNUSED, +virNumaGetNodeCPUs(int node G_GNUC_UNUSED, virBitmapPtr *cpus) { *cpus =3D NULL; @@ -398,7 +398,7 @@ virNumaGetNodeCPUs(int node ATTRIBUTE_UNUSED, } =20 int -virNumaNodesetToCPUset(virBitmapPtr nodeset ATTRIBUTE_UNUSED, +virNumaNodesetToCPUset(virBitmapPtr nodeset G_GNUC_UNUSED, virBitmapPtr *cpuset) { *cpuset =3D NULL; @@ -513,7 +513,7 @@ virNumaNodeIsAvailable(int node) =20 =20 int -virNumaGetDistances(int node ATTRIBUTE_UNUSED, +virNumaGetDistances(int node G_GNUC_UNUSED, int **distances, int *ndistances) { @@ -965,11 +965,11 @@ virNumaSetPagePoolSize(int node, =20 #else /* #ifdef __linux__ */ int -virNumaGetPageInfo(int node ATTRIBUTE_UNUSED, - unsigned int page_size ATTRIBUTE_UNUSED, - unsigned long long huge_page_sum ATTRIBUTE_UNUSED, - unsigned long long *page_avail ATTRIBUTE_UNUSED, - unsigned long long *page_free ATTRIBUTE_UNUSED) +virNumaGetPageInfo(int node G_GNUC_UNUSED, + unsigned int page_size G_GNUC_UNUSED, + unsigned long long huge_page_sum G_GNUC_UNUSED, + unsigned long long *page_avail G_GNUC_UNUSED, + unsigned long long *page_free G_GNUC_UNUSED) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("page info is not supported on this platform")); @@ -978,11 +978,11 @@ virNumaGetPageInfo(int node ATTRIBUTE_UNUSED, =20 =20 int -virNumaGetPages(int node ATTRIBUTE_UNUSED, - unsigned int **pages_size ATTRIBUTE_UNUSED, - unsigned long long **pages_avail ATTRIBUTE_UNUSED, - unsigned long long **pages_free ATTRIBUTE_UNUSED, - size_t *npages ATTRIBUTE_UNUSED) +virNumaGetPages(int node G_GNUC_UNUSED, + unsigned int **pages_size G_GNUC_UNUSED, + unsigned long long **pages_avail G_GNUC_UNUSED, + unsigned long long **pages_free G_GNUC_UNUSED, + size_t *npages G_GNUC_UNUSED) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("page info is not supported on this platform")); @@ -991,10 +991,10 @@ virNumaGetPages(int node ATTRIBUTE_UNUSED, =20 =20 int -virNumaSetPagePoolSize(int node ATTRIBUTE_UNUSED, - unsigned int page_size ATTRIBUTE_UNUSED, - unsigned long long page_count ATTRIBUTE_UNUSED, - bool add ATTRIBUTE_UNUSED) +virNumaSetPagePoolSize(int node G_GNUC_UNUSED, + unsigned int page_size G_GNUC_UNUSED, + unsigned long long page_count G_GNUC_UNUSED, + bool add G_GNUC_UNUSED) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", _("page pool allocation is not supported on this platfo= rm")); diff --git a/src/util/virobject.c b/src/util/virobject.c index 919519735a..33feeb659a 100644 --- a/src/util/virobject.c +++ b/src/util/virobject.c @@ -605,7 +605,7 @@ void virObjectFreeCallback(void *opaque) */ void virObjectFreeHashData(void *opaque, - const void *name ATTRIBUTE_UNUSED) + const void *name G_GNUC_UNUSED) { virObjectUnref(opaque); } diff --git a/src/util/virpci.c b/src/util/virpci.c index 9b828b7781..169501e731 100644 --- a/src/util/virpci.c +++ b/src/util/virpci.c @@ -2663,7 +2663,7 @@ virPCIGetMdevTypes(const char *sysfspath, static const char *unsupported =3D N_("not supported on non-linux platform= s"); =20 virPCIDeviceAddressPtr -virPCIGetDeviceAddressFromSysfsLink(const char *device_link ATTRIBUTE_UNUS= ED) +virPCIGetDeviceAddressFromSysfsLink(const char *device_link G_GNUC_UNUSED) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported)); return NULL; @@ -2671,34 +2671,34 @@ virPCIGetDeviceAddressFromSysfsLink(const char *dev= ice_link ATTRIBUTE_UNUSED) =20 =20 int -virPCIGetPhysicalFunction(const char *vf_sysfs_path ATTRIBUTE_UNUSED, - virPCIDeviceAddressPtr *pf ATTRIBUTE_UNUSED) +virPCIGetPhysicalFunction(const char *vf_sysfs_path G_GNUC_UNUSED, + virPCIDeviceAddressPtr *pf G_GNUC_UNUSED) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported)); return -1; } =20 int -virPCIGetVirtualFunctions(const char *sysfs_path ATTRIBUTE_UNUSED, - virPCIDeviceAddressPtr **virtual_functions ATTRI= BUTE_UNUSED, - size_t *num_virtual_functions ATTRIBUTE_UNUSED, - unsigned int *max_virtual_functions ATTRIBUTE_UN= USED) +virPCIGetVirtualFunctions(const char *sysfs_path G_GNUC_UNUSED, + virPCIDeviceAddressPtr **virtual_functions G_GNU= C_UNUSED, + size_t *num_virtual_functions G_GNUC_UNUSED, + unsigned int *max_virtual_functions G_GNUC_UNUSE= D) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported)); return -1; } =20 int -virPCIIsVirtualFunction(const char *vf_sysfs_device_link ATTRIBUTE_UNUSED) +virPCIIsVirtualFunction(const char *vf_sysfs_device_link G_GNUC_UNUSED) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported)); return -1; } =20 int -virPCIGetVirtualFunctionIndex(const char *pf_sysfs_device_link ATTRIBUTE_U= NUSED, - const char *vf_sysfs_device_link ATTRIBUTE_U= NUSED, - int *vf_index ATTRIBUTE_UNUSED) +virPCIGetVirtualFunctionIndex(const char *pf_sysfs_device_link G_GNUC_UNUS= ED, + const char *vf_sysfs_device_link G_GNUC_UNUS= ED, + int *vf_index G_GNUC_UNUSED) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported)); return -1; @@ -2706,36 +2706,36 @@ virPCIGetVirtualFunctionIndex(const char *pf_sysfs_= device_link ATTRIBUTE_UNUSED, } =20 int -virPCIGetSysfsFile(char *virPCIDeviceName ATTRIBUTE_UNUSED, - char **pci_sysfs_device_link ATTRIBUTE_UNUSED) +virPCIGetSysfsFile(char *virPCIDeviceName G_GNUC_UNUSED, + char **pci_sysfs_device_link G_GNUC_UNUSED) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported)); return -1; } =20 int -virPCIDeviceAddressGetSysfsFile(virPCIDeviceAddressPtr dev ATTRIBUTE_UNUSE= D, - char **pci_sysfs_device_link ATTRIBUTE_UNU= SED) +virPCIDeviceAddressGetSysfsFile(virPCIDeviceAddressPtr dev G_GNUC_UNUSED, + char **pci_sysfs_device_link G_GNUC_UNUSED) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported)); return -1; } =20 int -virPCIGetNetName(const char *device_link_sysfs_path ATTRIBUTE_UNUSED, - size_t idx ATTRIBUTE_UNUSED, - char *physPortID ATTRIBUTE_UNUSED, - char **netname ATTRIBUTE_UNUSED) +virPCIGetNetName(const char *device_link_sysfs_path G_GNUC_UNUSED, + size_t idx G_GNUC_UNUSED, + char *physPortID G_GNUC_UNUSED, + char **netname G_GNUC_UNUSED) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported)); return -1; } =20 int -virPCIGetVirtualFunctionInfo(const char *vf_sysfs_device_path ATTRIBUTE_UN= USED, - int pfNetDevIdx ATTRIBUTE_UNUSED, - char **pfname ATTRIBUTE_UNUSED, - int *vf_index ATTRIBUTE_UNUSED) +virPCIGetVirtualFunctionInfo(const char *vf_sysfs_device_path G_GNUC_UNUSE= D, + int pfNetDevIdx G_GNUC_UNUSED, + char **pfname G_GNUC_UNUSED, + int *vf_index G_GNUC_UNUSED) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported)); return -1; @@ -2743,8 +2743,8 @@ virPCIGetVirtualFunctionInfo(const char *vf_sysfs_dev= ice_path ATTRIBUTE_UNUSED, =20 =20 ssize_t -virPCIGetMdevTypes(const char *sysfspath ATTRIBUTE_UNUSED, - virMediatedDeviceTypePtr **types ATTRIBUTE_UNUSED) +virPCIGetMdevTypes(const char *sysfspath G_GNUC_UNUSED, + virMediatedDeviceTypePtr **types G_GNUC_UNUSED) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _(unsupported)); return -1; diff --git a/src/util/virperf.c b/src/util/virperf.c index 7c328da574..7714d57f6b 100644 --- a/src/util/virperf.c +++ b/src/util/virperf.c @@ -322,9 +322,9 @@ virPerfRdtAttrInit(void) =20 =20 int -virPerfEventEnable(virPerfPtr perf ATTRIBUTE_UNUSED, - virPerfEventType type ATTRIBUTE_UNUSED, - pid_t pid ATTRIBUTE_UNUSED) +virPerfEventEnable(virPerfPtr perf G_GNUC_UNUSED, + virPerfEventType type G_GNUC_UNUSED, + pid_t pid G_GNUC_UNUSED) { virReportSystemError(ENXIO, "%s", _("Perf not supported on this platform")); @@ -332,8 +332,8 @@ virPerfEventEnable(virPerfPtr perf ATTRIBUTE_UNUSED, } =20 int -virPerfEventDisable(virPerfPtr perf ATTRIBUTE_UNUSED, - virPerfEventType type ATTRIBUTE_UNUSED) +virPerfEventDisable(virPerfPtr perf G_GNUC_UNUSED, + virPerfEventType type G_GNUC_UNUSED) { virReportSystemError(ENXIO, "%s", _("Perf not supported on this platform")); @@ -341,16 +341,16 @@ virPerfEventDisable(virPerfPtr perf ATTRIBUTE_UNUSED, } =20 bool -virPerfEventIsEnabled(virPerfPtr perf ATTRIBUTE_UNUSED, - virPerfEventType type ATTRIBUTE_UNUSED) +virPerfEventIsEnabled(virPerfPtr perf G_GNUC_UNUSED, + virPerfEventType type G_GNUC_UNUSED) { return false; } =20 int -virPerfReadEvent(virPerfPtr perf ATTRIBUTE_UNUSED, - virPerfEventType type ATTRIBUTE_UNUSED, - uint64_t *value ATTRIBUTE_UNUSED) +virPerfReadEvent(virPerfPtr perf G_GNUC_UNUSED, + virPerfEventType type G_GNUC_UNUSED, + uint64_t *value G_GNUC_UNUSED) { virReportSystemError(ENXIO, "%s", _("Perf not supported on this platform")); diff --git a/src/util/virpidfile.c b/src/util/virpidfile.c index a600cfc662..9c2206c618 100644 --- a/src/util/virpidfile.c +++ b/src/util/virpidfile.c @@ -384,7 +384,7 @@ int virPidFileAcquirePath(const char *path, * one that now exists on the filesystem */ if (stat(path, &a) < 0) { - char ebuf[1024] ATTRIBUTE_UNUSED; + char ebuf[1024] G_GNUC_UNUSED; VIR_DEBUG("Pid file '%s' disappeared: %s", path, virStrerror(errno, ebuf, sizeof(ebuf))); VIR_FORCE_CLOSE(fd); diff --git a/src/util/virpolkit.c b/src/util/virpolkit.c index 634b46e82b..88bcc64472 100644 --- a/src/util/virpolkit.c +++ b/src/util/virpolkit.c @@ -209,12 +209,12 @@ virPolkitAgentCreate(void) =20 #else /* ! WITH_POLKIT */ =20 -int virPolkitCheckAuth(const char *actionid ATTRIBUTE_UNUSED, - pid_t pid ATTRIBUTE_UNUSED, - unsigned long long startTime ATTRIBUTE_UNUSED, - uid_t uid ATTRIBUTE_UNUSED, - const char **details ATTRIBUTE_UNUSED, - bool allowInteraction ATTRIBUTE_UNUSED) +int virPolkitCheckAuth(const char *actionid G_GNUC_UNUSED, + pid_t pid G_GNUC_UNUSED, + unsigned long long startTime G_GNUC_UNUSED, + uid_t uid G_GNUC_UNUSED, + const char **details G_GNUC_UNUSED, + bool allowInteraction G_GNUC_UNUSED) { VIR_ERROR(_("Polkit auth attempted, even though polkit is not availabl= e")); virReportError(VIR_ERR_AUTH_FAILED, "%s", @@ -224,7 +224,7 @@ int virPolkitCheckAuth(const char *actionid ATTRIBUTE_U= NUSED, =20 =20 void -virPolkitAgentDestroy(virPolkitAgentPtr agent ATTRIBUTE_UNUSED) +virPolkitAgentDestroy(virPolkitAgentPtr agent G_GNUC_UNUSED) { return; /* do nothing */ } diff --git a/src/util/virprocess.c b/src/util/virprocess.c index 0fa648ce74..c91301e525 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -99,7 +99,7 @@ static inline int setns(int fd, int nstype) # endif # endif #else /* !__linux__ */ -static inline int setns(int fd ATTRIBUTE_UNUSED, int nstype ATTRIBUTE_UNUS= ED) +static inline int setns(int fd G_GNUC_UNUSED, int nstype G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Namespaces are not supported on this platform.= ")); @@ -557,8 +557,8 @@ virProcessGetAffinity(pid_t pid) =20 #else /* HAVE_SCHED_GETAFFINITY */ =20 -int virProcessSetAffinity(pid_t pid ATTRIBUTE_UNUSED, - virBitmapPtr map ATTRIBUTE_UNUSED) +int virProcessSetAffinity(pid_t pid G_GNUC_UNUSED, + virBitmapPtr map G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Process CPU affinity is not supported on this = platform")); @@ -566,7 +566,7 @@ int virProcessSetAffinity(pid_t pid ATTRIBUTE_UNUSED, } =20 virBitmapPtr -virProcessGetAffinity(pid_t pid ATTRIBUTE_UNUSED) +virProcessGetAffinity(pid_t pid G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Process CPU affinity is not supported on this = platform")); @@ -699,10 +699,10 @@ virProcessPrLimit(pid_t pid, } #elif HAVE_SETRLIMIT static int -virProcessPrLimit(pid_t pid ATTRIBUTE_UNUSED, - int resource ATTRIBUTE_UNUSED, - const struct rlimit *new_limit ATTRIBUTE_UNUSED, - struct rlimit *old_limit ATTRIBUTE_UNUSED) +virProcessPrLimit(pid_t pid G_GNUC_UNUSED, + int resource G_GNUC_UNUSED, + const struct rlimit *new_limit G_GNUC_UNUSED, + struct rlimit *old_limit G_GNUC_UNUSED) { errno =3D ENOSYS; return -1; @@ -751,7 +751,7 @@ virProcessSetMaxMemLock(pid_t pid, unsigned long long b= ytes) } #else /* ! (HAVE_SETRLIMIT && defined(RLIMIT_MEMLOCK)) */ int -virProcessSetMaxMemLock(pid_t pid ATTRIBUTE_UNUSED, unsigned long long byt= es) +virProcessSetMaxMemLock(pid_t pid G_GNUC_UNUSED, unsigned long long bytes) { if (bytes =3D=3D 0) return 0; @@ -802,7 +802,7 @@ virProcessGetMaxMemLock(pid_t pid, } #else /* ! (HAVE_GETRLIMIT && defined(RLIMIT_MEMLOCK)) */ int -virProcessGetMaxMemLock(pid_t pid ATTRIBUTE_UNUSED, +virProcessGetMaxMemLock(pid_t pid G_GNUC_UNUSED, unsigned long long *bytes) { if (!bytes) @@ -843,7 +843,7 @@ virProcessSetMaxProcesses(pid_t pid, unsigned int procs) } #else /* ! (HAVE_SETRLIMIT && defined(RLIMIT_NPROC)) */ int -virProcessSetMaxProcesses(pid_t pid ATTRIBUTE_UNUSED, unsigned int procs) +virProcessSetMaxProcesses(pid_t pid G_GNUC_UNUSED, unsigned int procs) { if (procs =3D=3D 0) return 0; @@ -891,7 +891,7 @@ virProcessSetMaxFiles(pid_t pid, unsigned int files) } #else /* ! (HAVE_SETRLIMIT && defined(RLIMIT_NOFILE)) */ int -virProcessSetMaxFiles(pid_t pid ATTRIBUTE_UNUSED, unsigned int files) +virProcessSetMaxFiles(pid_t pid G_GNUC_UNUSED, unsigned int files) { if (files =3D=3D 0) return 0; @@ -928,7 +928,7 @@ virProcessSetMaxCoreSize(pid_t pid, unsigned long long = bytes) } #else /* ! (HAVE_SETRLIMIT && defined(RLIMIT_CORE)) */ int -virProcessSetMaxCoreSize(pid_t pid ATTRIBUTE_UNUSED, +virProcessSetMaxCoreSize(pid_t pid G_GNUC_UNUSED, unsigned long long bytes) { if (bytes =3D=3D 0) @@ -1046,7 +1046,7 @@ struct _virProcessNamespaceHelperData { void *opaque; }; =20 -static int virProcessNamespaceHelper(pid_t pid ATTRIBUTE_UNUSED, +static int virProcessNamespaceHelper(pid_t pid G_GNUC_UNUSED, void *opaque) { virProcessNamespaceHelperData *data =3D opaque; @@ -1215,7 +1215,7 @@ virProcessSetupPrivateMountNS(void) =20 #if defined(__linux__) G_GNUC_NORETURN static int -virProcessDummyChild(void *argv ATTRIBUTE_UNUSED) +virProcessDummyChild(void *argv G_GNUC_UNUSED) { _exit(0); } @@ -1263,7 +1263,7 @@ virProcessNamespaceAvailable(unsigned int ns) cpid =3D clone(virProcessDummyChild, childStack, flags, NULL); =20 if (cpid < 0) { - char ebuf[1024] ATTRIBUTE_UNUSED; + char ebuf[1024] G_GNUC_UNUSED; VIR_DEBUG("clone call returned %s, container support is not enable= d", virStrerror(errno, ebuf, sizeof(ebuf))); return -1; @@ -1278,7 +1278,7 @@ virProcessNamespaceAvailable(unsigned int ns) #else /* !defined(__linux__) */ =20 int -virProcessNamespaceAvailable(unsigned int ns ATTRIBUTE_UNUSED) +virProcessNamespaceAvailable(unsigned int ns G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Namespaces are not supported on this platform.= ")); @@ -1422,9 +1422,9 @@ virProcessSetScheduler(pid_t pid, #else /* ! HAVE_SCHED_SETSCHEDULER */ =20 int -virProcessSetScheduler(pid_t pid ATTRIBUTE_UNUSED, +virProcessSetScheduler(pid_t pid G_GNUC_UNUSED, virProcessSchedPolicy policy, - int priority ATTRIBUTE_UNUSED) + int priority G_GNUC_UNUSED) { if (!policy) return 0; diff --git a/src/util/virscsihost.c b/src/util/virscsihost.c index eea04743db..a5e8583b2b 100644 --- a/src/util/virscsihost.c +++ b/src/util/virscsihost.c @@ -259,36 +259,36 @@ virSCSIHostGetNameByParentaddr(unsigned int domain, #else =20 int -virSCSIHostGetUniqueId(const char *sysfs_prefix ATTRIBUTE_UNUSED, - int host ATTRIBUTE_UNUSED) +virSCSIHostGetUniqueId(const char *sysfs_prefix G_GNUC_UNUSED, + int host G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Not supported on this platform")= ); return -1; } =20 char * -virSCSIHostFindByPCI(const char *sysfs_prefix ATTRIBUTE_UNUSED, - const char *parentaddr ATTRIBUTE_UNUSED, - unsigned int unique_id ATTRIBUTE_UNUSED) +virSCSIHostFindByPCI(const char *sysfs_prefix G_GNUC_UNUSED, + const char *parentaddr G_GNUC_UNUSED, + unsigned int unique_id G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Not supported on this platform")= ); return NULL; } =20 int -virSCSIHostGetNumber(const char *adapter_name ATTRIBUTE_UNUSED, - unsigned int *result ATTRIBUTE_UNUSED) +virSCSIHostGetNumber(const char *adapter_name G_GNUC_UNUSED, + unsigned int *result G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Not supported on this platform")= ); return -1; } =20 char * -virSCSIHostGetNameByParentaddr(unsigned int domain ATTRIBUTE_UNUSED, - unsigned int bus ATTRIBUTE_UNUSED, - unsigned int slot ATTRIBUTE_UNUSED, - unsigned int function ATTRIBUTE_UNUSED, - unsigned int unique_id ATTRIBUTE_UNUSED) +virSCSIHostGetNameByParentaddr(unsigned int domain G_GNUC_UNUSED, + unsigned int bus G_GNUC_UNUSED, + unsigned int slot G_GNUC_UNUSED, + unsigned int function G_GNUC_UNUSED, + unsigned int unique_id G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Not supported on this platform")= ); return NULL; diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c index bba2089436..77fadb008e 100644 --- a/src/util/virsocketaddr.c +++ b/src/util/virsocketaddr.c @@ -584,7 +584,7 @@ virSocketAddrGetPort(virSocketAddrPtr addr) * address of type AF_UNIX; */ char * -virSocketAddrGetPath(virSocketAddrPtr addr ATTRIBUTE_UNUSED) +virSocketAddrGetPath(virSocketAddrPtr addr G_GNUC_UNUSED) { #ifndef WIN32 char *path =3D NULL; diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index 497ade927e..ef6d7f3ba5 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -1414,7 +1414,7 @@ int virStorageFileGetLVMKey(const char *path, } #else int virStorageFileGetLVMKey(const char *path, - char **key ATTRIBUTE_UNUSED) + char **key G_GNUC_UNUSED) { virReportSystemError(ENOSYS, _("Unable to get LVM key for %s"), path); return -1; @@ -1439,7 +1439,7 @@ int virStorageFileGetLVMKey(const char *path, int virStorageFileGetSCSIKey(const char *path, char **key, - bool ignoreError ATTRIBUTE_UNUSED) + bool ignoreError G_GNUC_UNUSED) { int status; VIR_AUTOPTR(virCommand) cmd =3D NULL; @@ -1474,7 +1474,7 @@ virStorageFileGetSCSIKey(const char *path, } #else int virStorageFileGetSCSIKey(const char *path, - char **key ATTRIBUTE_UNUSED, + char **key G_GNUC_UNUSED, bool ignoreError) { if (!ignoreError) @@ -1551,8 +1551,8 @@ virStorageFileGetNPIVKey(const char *path, return 0; } #else -int virStorageFileGetNPIVKey(const char *path ATTRIBUTE_UNUSED, - char **key ATTRIBUTE_UNUSED) +int virStorageFileGetNPIVKey(const char *path G_GNUC_UNUSED, + char **key G_GNUC_UNUSED) { return -1; } @@ -3218,7 +3218,7 @@ virStorageSourceParseBackingJSONSocketAddress(virStor= ageNetHostDefPtr host, static int virStorageSourceParseBackingJSONGluster(virStorageSourcePtr src, virJSONValuePtr json, - int opaque ATTRIBUTE_UNUSED) + int opaque G_GNUC_UNUSED) { const char *uri =3D virJSONValueObjectGetString(json, "filename"); const char *volume =3D virJSONValueObjectGetString(json, "volume"); @@ -3272,7 +3272,7 @@ virStorageSourceParseBackingJSONGluster(virStorageSou= rcePtr src, static int virStorageSourceParseBackingJSONiSCSI(virStorageSourcePtr src, virJSONValuePtr json, - int opaque ATTRIBUTE_UNUSED) + int opaque G_GNUC_UNUSED) { const char *transport =3D virJSONValueObjectGetString(json, "transport= "); const char *portal =3D virJSONValueObjectGetString(json, "portal"); @@ -3343,7 +3343,7 @@ virStorageSourceParseBackingJSONiSCSI(virStorageSourc= ePtr src, static int virStorageSourceParseBackingJSONNbd(virStorageSourcePtr src, virJSONValuePtr json, - int opaque ATTRIBUTE_UNUSED) + int opaque G_GNUC_UNUSED) { const char *path =3D virJSONValueObjectGetString(json, "path"); const char *host =3D virJSONValueObjectGetString(json, "host"); @@ -3393,7 +3393,7 @@ virStorageSourceParseBackingJSONNbd(virStorageSourceP= tr src, static int virStorageSourceParseBackingJSONSheepdog(virStorageSourcePtr src, virJSONValuePtr json, - int opaque ATTRIBUTE_UNUSED) + int opaque G_GNUC_UNUSED) { const char *filename; const char *vdi =3D virJSONValueObjectGetString(json, "vdi"); @@ -3437,7 +3437,7 @@ virStorageSourceParseBackingJSONSheepdog(virStorageSo= urcePtr src, static int virStorageSourceParseBackingJSONSSH(virStorageSourcePtr src, virJSONValuePtr json, - int opaque ATTRIBUTE_UNUSED) + int opaque G_GNUC_UNUSED) { const char *path =3D virJSONValueObjectGetString(json, "path"); const char *host =3D virJSONValueObjectGetString(json, "host"); @@ -3480,7 +3480,7 @@ virStorageSourceParseBackingJSONSSH(virStorageSourceP= tr src, static int virStorageSourceParseBackingJSONRBD(virStorageSourcePtr src, virJSONValuePtr json, - int opaque ATTRIBUTE_UNUSED) + int opaque G_GNUC_UNUSED) { const char *filename; const char *pool =3D virJSONValueObjectGetString(json, "pool"); @@ -3535,7 +3535,7 @@ virStorageSourceParseBackingJSONRBD(virStorageSourceP= tr src, static int virStorageSourceParseBackingJSONRaw(virStorageSourcePtr src, virJSONValuePtr json, - int opaque ATTRIBUTE_UNUSED) + int opaque G_GNUC_UNUSED) { /* There are no interesting attributes in raw driver. * Treat it as pass-through. @@ -3547,7 +3547,7 @@ virStorageSourceParseBackingJSONRaw(virStorageSourceP= tr src, static int virStorageSourceParseBackingJSONVxHS(virStorageSourcePtr src, virJSONValuePtr json, - int opaque ATTRIBUTE_UNUSED) + int opaque G_GNUC_UNUSED) { const char *vdisk_id =3D virJSONValueObjectGetString(json, "vdisk-id"); virJSONValuePtr server =3D virJSONValueObjectGetObject(json, "server"); diff --git a/src/util/virstring.c b/src/util/virstring.c index 0abdcd8b04..6453a23ada 100644 --- a/src/util/virstring.c +++ b/src/util/virstring.c @@ -630,7 +630,7 @@ virLocaleRevert(virLocale *oldlocale) } =20 static void -virLocaleFixupRadix(char **strp ATTRIBUTE_UNUSED) +virLocaleFixupRadix(char **strp G_GNUC_UNUSED) { } =20 @@ -639,13 +639,13 @@ virLocaleFixupRadix(char **strp ATTRIBUTE_UNUSED) typedef int virLocale; =20 static int -virLocaleSetRaw(virLocale *oldlocale ATTRIBUTE_UNUSED) +virLocaleSetRaw(virLocale *oldlocale G_GNUC_UNUSED) { return 0; } =20 static void -virLocaleRevert(virLocale *oldlocale ATTRIBUTE_UNUSED) +virLocaleRevert(virLocale *oldlocale G_GNUC_UNUSED) { } =20 diff --git a/src/util/virutil.c b/src/util/virutil.c index 89d2cf011f..587540ae03 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -102,7 +102,7 @@ int virSetInherit(int fd, bool inherit) =20 #else /* WIN32 */ =20 -int virSetInherit(int fd ATTRIBUTE_UNUSED, bool inherit ATTRIBUTE_UNUSED) +int virSetInherit(int fd G_GNUC_UNUSED, bool inherit G_GNUC_UNUSED) { /* FIXME: Currently creating child processes is not supported on * Win32, so there is no point in failing calls that are only relevant @@ -129,7 +129,7 @@ int virSetCloseExec(int fd) } =20 #ifdef WIN32 -int virSetSockReuseAddr(int fd ATTRIBUTE_UNUSED, bool fatal ATTRIBUTE_UNUS= ED) +int virSetSockReuseAddr(int fd G_GNUC_UNUSED, bool fatal G_GNUC_UNUSED) { /* * SO_REUSEADDR on Windows is actually akin to SO_REUSEPORT @@ -1032,8 +1032,8 @@ virGetGroupList(uid_t uid, gid_t gid, gid_t **list) * failure (the original system error remains in errno). */ int -virSetUIDGID(uid_t uid, gid_t gid, gid_t *groups ATTRIBUTE_UNUSED, - int ngroups ATTRIBUTE_UNUSED) +virSetUIDGID(uid_t uid, gid_t gid, gid_t *groups G_GNUC_UNUSED, + int ngroups G_GNUC_UNUSED) { if (gid !=3D (gid_t)-1 && setregid(gid, gid) < 0) { virReportSystemError(errno, @@ -1063,7 +1063,7 @@ virSetUIDGID(uid_t uid, gid_t gid, gid_t *groups ATTR= IBUTE_UNUSED, #else /* ! HAVE_GETPWUID_R */ =20 int -virGetGroupList(uid_t uid ATTRIBUTE_UNUSED, gid_t gid ATTRIBUTE_UNUSED, +virGetGroupList(uid_t uid G_GNUC_UNUSED, gid_t gid G_GNUC_UNUSED, gid_t **list) { *list =3D NULL; @@ -1071,13 +1071,13 @@ virGetGroupList(uid_t uid ATTRIBUTE_UNUSED, gid_t g= id ATTRIBUTE_UNUSED, } =20 bool -virDoesUserExist(const char *name ATTRIBUTE_UNUSED) +virDoesUserExist(const char *name G_GNUC_UNUSED) { return false; } =20 bool -virDoesGroupExist(const char *name ATTRIBUTE_UNUSED) +virDoesGroupExist(const char *name G_GNUC_UNUSED) { return false; } @@ -1129,7 +1129,7 @@ virGetWin32DirectoryRoot(char **path) =20 =20 char * -virGetUserDirectoryByUID(uid_t uid ATTRIBUTE_UNUSED) +virGetUserDirectoryByUID(uid_t uid G_GNUC_UNUSED) { /* Since Windows lacks setuid binaries, and since we already fake * geteuid(), we can safely assume that this is only called when @@ -1180,7 +1180,7 @@ virGetUserDirectoryByUID(uid_t uid ATTRIBUTE_UNUSED) } =20 char * -virGetUserShell(uid_t uid ATTRIBUTE_UNUSED) +virGetUserShell(uid_t uid G_GNUC_UNUSED) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("virGetUserShell is not available")); @@ -1226,7 +1226,7 @@ virGetUserRuntimeDirectory(void) =20 # else /* !HAVE_GETPWUID_R && !WIN32 */ char * -virGetUserDirectoryByUID(uid_t uid ATTRIBUTE_UNUSED) +virGetUserDirectoryByUID(uid_t uid G_GNUC_UNUSED) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("virGetUserDirectory is not available")); @@ -1235,7 +1235,7 @@ virGetUserDirectoryByUID(uid_t uid ATTRIBUTE_UNUSED) } =20 char * -virGetUserShell(uid_t uid ATTRIBUTE_UNUSED) +virGetUserShell(uid_t uid G_GNUC_UNUSED) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("virGetUserShell is not available")); @@ -1272,7 +1272,7 @@ virGetUserRuntimeDirectory(void) # endif /* ! HAVE_GETPWUID_R && ! WIN32 */ =20 char * -virGetUserName(uid_t uid ATTRIBUTE_UNUSED) +virGetUserName(uid_t uid G_GNUC_UNUSED) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("virGetUserName is not available")); @@ -1280,8 +1280,8 @@ virGetUserName(uid_t uid ATTRIBUTE_UNUSED) return NULL; } =20 -int virGetUserID(const char *name ATTRIBUTE_UNUSED, - uid_t *uid ATTRIBUTE_UNUSED) +int virGetUserID(const char *name G_GNUC_UNUSED, + uid_t *uid G_GNUC_UNUSED) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("virGetUserID is not available")); @@ -1290,8 +1290,8 @@ int virGetUserID(const char *name ATTRIBUTE_UNUSED, } =20 =20 -int virGetGroupID(const char *name ATTRIBUTE_UNUSED, - gid_t *gid ATTRIBUTE_UNUSED) +int virGetGroupID(const char *name G_GNUC_UNUSED, + gid_t *gid G_GNUC_UNUSED) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("virGetGroupID is not available")); @@ -1300,10 +1300,10 @@ int virGetGroupID(const char *name ATTRIBUTE_UNUSED, } =20 int -virSetUIDGID(uid_t uid ATTRIBUTE_UNUSED, - gid_t gid ATTRIBUTE_UNUSED, - gid_t *groups ATTRIBUTE_UNUSED, - int ngroups ATTRIBUTE_UNUSED) +virSetUIDGID(uid_t uid G_GNUC_UNUSED, + gid_t gid G_GNUC_UNUSED, + gid_t *groups G_GNUC_UNUSED, + int ngroups G_GNUC_UNUSED) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("virSetUIDGID is not available")); @@ -1311,7 +1311,7 @@ virSetUIDGID(uid_t uid ATTRIBUTE_UNUSED, } =20 char * -virGetGroupName(gid_t gid ATTRIBUTE_UNUSED) +virGetGroupName(gid_t gid G_GNUC_UNUSED) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("virGetGroupName is not available")); @@ -1471,8 +1471,8 @@ virSetUIDGIDWithCaps(uid_t uid, gid_t gid, gid_t *gro= ups, int ngroups, =20 int virSetUIDGIDWithCaps(uid_t uid, gid_t gid, gid_t *groups, int ngroups, - unsigned long long capBits ATTRIBUTE_UNUSED, - bool clearExistingCaps ATTRIBUTE_UNUSED) + unsigned long long capBits G_GNUC_UNUSED, + bool clearExistingCaps G_GNUC_UNUSED) { return virSetUIDGID(uid, gid, groups, ngroups); } @@ -1512,7 +1512,7 @@ virIsDevMapperDevice(const char *dev_name) return false; } #else -bool virIsDevMapperDevice(const char *dev_name ATTRIBUTE_UNUSED) +bool virIsDevMapperDevice(const char *dev_name G_GNUC_UNUSED) { return false; } @@ -1562,9 +1562,9 @@ virGetDeviceID(const char *path, int *maj, int *min) } #else int -virGetDeviceID(const char *path ATTRIBUTE_UNUSED, - int *maj ATTRIBUTE_UNUSED, - int *min ATTRIBUTE_UNUSED) +virGetDeviceID(const char *path G_GNUC_UNUSED, + int *maj G_GNUC_UNUSED, + int *min G_GNUC_UNUSED) { return -ENOSYS; } diff --git a/src/util/virvhba.c b/src/util/virvhba.c index 203ba43a3d..ac80d9bd79 100644 --- a/src/util/virvhba.c +++ b/src/util/virvhba.c @@ -467,8 +467,8 @@ virVHBAGetHostByFabricWWN(const char *sysfs_prefix, #else =20 bool -virVHBAPathExists(const char *sysfs_prefix ATTRIBUTE_UNUSED, - int host ATTRIBUTE_UNUSED) +virVHBAPathExists(const char *sysfs_prefix G_GNUC_UNUSED, + int host G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Not supported on this platform")= ); return false; @@ -476,8 +476,8 @@ virVHBAPathExists(const char *sysfs_prefix ATTRIBUTE_UN= USED, =20 =20 bool -virVHBAIsVportCapable(const char *sysfs_prefix ATTRIBUTE_UNUSED, - int host ATTRIBUTE_UNUSED) +virVHBAIsVportCapable(const char *sysfs_prefix G_GNUC_UNUSED, + int host G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Not supported on this platform")= ); return false; @@ -485,9 +485,9 @@ virVHBAIsVportCapable(const char *sysfs_prefix ATTRIBUT= E_UNUSED, =20 =20 char * -virVHBAGetConfig(const char *sysfs_prefix ATTRIBUTE_UNUSED, - int host ATTRIBUTE_UNUSED, - const char *entry ATTRIBUTE_UNUSED) +virVHBAGetConfig(const char *sysfs_prefix G_GNUC_UNUSED, + int host G_GNUC_UNUSED, + const char *entry G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Not supported on this platform")= ); return NULL; @@ -495,7 +495,7 @@ virVHBAGetConfig(const char *sysfs_prefix ATTRIBUTE_UNU= SED, =20 =20 char * -virVHBAFindVportHost(const char *sysfs_prefix ATTRIBUTE_UNUSED) +virVHBAFindVportHost(const char *sysfs_prefix G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Not supported on this platform")= ); return NULL; @@ -503,10 +503,10 @@ virVHBAFindVportHost(const char *sysfs_prefix ATTRIBU= TE_UNUSED) =20 =20 int -virVHBAManageVport(const int parent_host ATTRIBUTE_UNUSED, - const char *wwpn ATTRIBUTE_UNUSED, - const char *wwnn ATTRIBUTE_UNUSED, - int operation ATTRIBUTE_UNUSED) +virVHBAManageVport(const int parent_host G_GNUC_UNUSED, + const char *wwpn G_GNUC_UNUSED, + const char *wwnn G_GNUC_UNUSED, + int operation G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Not supported on this platform")= ); return -1; @@ -514,9 +514,9 @@ virVHBAManageVport(const int parent_host ATTRIBUTE_UNUS= ED, =20 =20 char * -virVHBAGetHostByWWN(const char *sysfs_prefix ATTRIBUTE_UNUSED, - const char *wwnn ATTRIBUTE_UNUSED, - const char *wwpn ATTRIBUTE_UNUSED) +virVHBAGetHostByWWN(const char *sysfs_prefix G_GNUC_UNUSED, + const char *wwnn G_GNUC_UNUSED, + const char *wwpn G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Not supported on this platform")= ); return NULL; @@ -524,8 +524,8 @@ virVHBAGetHostByWWN(const char *sysfs_prefix ATTRIBUTE_= UNUSED, =20 =20 char * -virVHBAGetHostByFabricWWN(const char *sysfs_prefix ATTRIBUTE_UNUSED, - const char *fabric_wwn ATTRIBUTE_UNUSED) +virVHBAGetHostByFabricWWN(const char *sysfs_prefix G_GNUC_UNUSED, + const char *fabric_wwn G_GNUC_UNUSED) { virReportSystemError(ENOSYS, "%s", _("Not supported on this platform")= ); return NULL; diff --git a/src/util/virvsock.c b/src/util/virvsock.c index ebb5182619..b28287fdee 100644 --- a/src/util/virvsock.c +++ b/src/util/virvsock.c @@ -45,8 +45,8 @@ virVsockSetGuestCidQuiet(int fd, =20 #else static int -virVsockSetGuestCidQuiet(int fd ATTRIBUTE_UNUSED, - unsigned int guest_cid ATTRIBUTE_UNUSED) +virVsockSetGuestCidQuiet(int fd G_GNUC_UNUSED, + unsigned int guest_cid G_GNUC_UNUSED) { errno =3D ENOSYS; return -1; diff --git a/src/util/virxml.c b/src/util/virxml.c index 245ca0a752..46c79e2d94 100644 --- a/src/util/virxml.c +++ b/src/util/virxml.c @@ -703,7 +703,7 @@ virXPathNodeSet(const char *xpath, * This version is heavily based on xmlParserPrintFileContextInternal from= libxml2. */ static void -catchXMLError(void *ctx, const char *msg ATTRIBUTE_UNUSED, ...) +catchXMLError(void *ctx, const char *msg G_GNUC_UNUSED, ...) { xmlParserCtxtPtr ctxt =3D (xmlParserCtxtPtr) ctx; =20 @@ -1246,8 +1246,8 @@ static void catchRNGError(void *ctx, } =20 =20 -static void ignoreRNGError(void *ctx ATTRIBUTE_UNUSED, - const char *msg ATTRIBUTE_UNUSED, +static void ignoreRNGError(void *ctx G_GNUC_UNUSED, + const char *msg G_GNUC_UNUSED, ...) {} =20 --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 10:00:01 2024 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=1571059218; cv=none; d=zoho.com; s=zohoarc; b=TrcLUwmRcPPuxGNWqDispoQZPd8FGSJb6/iK5Pp2MGfUQuVKsSY8c3HBo1vFTY+SKAGoiEZgSleJgU2W5zV8KQg/ASl9BCmWcGcfCpUVLK7PPr1OSzHKmRZyB+zeYXKFCWURH3iosWoZ6z3BSs6aY4/nZcwdq/OgKLGovnn4M1Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571059218; 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=iUUU2uZ+1OdyMfNQ9Y2a2YPi6sZDicffb8BTzB3jG4Q=; b=eT/3aKuzU3pchvQl2nrYIvTO3nclj0D1P/dndADd7d1NQU3pUEtQD/mpC7UCvJJbbD28JB+eng/adAZpfUalDqRAeDE5hbWA7dkmBMMW0RGiF53zRHf1oOj62MVg6THE6GKRtKNEflrLSgKRM9vh9tGR7uuTV+BaasgLyAFIgtY= 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 1571059218176430.38152066226473; Mon, 14 Oct 2019 06:20:18 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 823C518C8931; Mon, 14 Oct 2019 13:20:16 +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 54BF6601B7; Mon, 14 Oct 2019 13:20:16 +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 F26EB1803B4A; Mon, 14 Oct 2019 13:20:15 +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 x9EDGhxp017590 for ; Mon, 14 Oct 2019 09:16:43 -0400 Received: by smtp.corp.redhat.com (Postfix) id D003360126; Mon, 14 Oct 2019 13:16:43 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 58414600CD for ; Mon, 14 Oct 2019 13:16:43 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Mon, 14 Oct 2019 15:15:48 +0200 Message-Id: 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 30/35] vbox: 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.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.70]); Mon, 14 Oct 2019 13:20:17 +0000 (UTC) Use G_GNUC_UNUSED from GLib instead of ATTRIBUTE_UNUSED. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/vbox/vbox_MSCOMGlue.c | 100 +++++++++++++++++++------------------- src/vbox/vbox_common.c | 38 +++++++-------- src/vbox/vbox_driver.c | 4 +- src/vbox/vbox_storage.c | 4 +- src/vbox/vbox_tmpl.c | 92 +++++++++++++++++------------------ 5 files changed, 119 insertions(+), 119 deletions(-) diff --git a/src/vbox/vbox_MSCOMGlue.c b/src/vbox/vbox_MSCOMGlue.c index 7208d73b53..db000385bc 100644 --- a/src/vbox/vbox_MSCOMGlue.c +++ b/src/vbox/vbox_MSCOMGlue.c @@ -99,45 +99,45 @@ static ISession *vboxSession; */ =20 static nsresult __stdcall -vboxSupports_QueryInterface(nsISupports *pThis ATTRIBUTE_UNUSED, - const nsID *iid ATTRIBUTE_UNUSED, - void **resultp ATTRIBUTE_UNUSED) +vboxSupports_QueryInterface(nsISupports *pThis G_GNUC_UNUSED, + const nsID *iid G_GNUC_UNUSED, + void **resultp G_GNUC_UNUSED) { return NS_ERROR_NOT_IMPLEMENTED; } =20 static nsresult __stdcall -vboxSupports_AddRef(nsISupports *pThis ATTRIBUTE_UNUSED) +vboxSupports_AddRef(nsISupports *pThis G_GNUC_UNUSED) { return NS_ERROR_NOT_IMPLEMENTED; } =20 static nsresult __stdcall -vboxSupports_Release(nsISupports *pThis ATTRIBUTE_UNUSED) +vboxSupports_Release(nsISupports *pThis G_GNUC_UNUSED) { return NS_ERROR_NOT_IMPLEMENTED; } =20 static nsresult __stdcall -vboxSupports_GetTypeInfoCount(nsISupports *pThis ATTRIBUTE_UNUSED) +vboxSupports_GetTypeInfoCount(nsISupports *pThis G_GNUC_UNUSED) { return NS_ERROR_NOT_IMPLEMENTED; } =20 static nsresult __stdcall -vboxSupports_GetTypeInfo(nsISupports *pThis ATTRIBUTE_UNUSED) +vboxSupports_GetTypeInfo(nsISupports *pThis G_GNUC_UNUSED) { return NS_ERROR_NOT_IMPLEMENTED; } =20 static nsresult __stdcall -vboxSupports_GetIDsOfNames(nsISupports *pThis ATTRIBUTE_UNUSED) +vboxSupports_GetIDsOfNames(nsISupports *pThis G_GNUC_UNUSED) { return NS_ERROR_NOT_IMPLEMENTED; } =20 static nsresult __stdcall -vboxSupports_Invoke(nsISupports *pThis ATTRIBUTE_UNUSED) +vboxSupports_Invoke(nsISupports *pThis G_GNUC_UNUSED) { return NS_ERROR_NOT_IMPLEMENTED; } @@ -149,15 +149,15 @@ vboxSupports_Invoke(nsISupports *pThis ATTRIBUTE_UNUS= ED) */ =20 static nsresult __stdcall -vboxEventTarget_PostEvent(nsIEventTarget *pThis ATTRIBUTE_UNUSED, - PLEvent *aEvent ATTRIBUTE_UNUSED) +vboxEventTarget_PostEvent(nsIEventTarget *pThis G_GNUC_UNUSED, + PLEvent *aEvent G_GNUC_UNUSED) { return NS_ERROR_NOT_IMPLEMENTED; } =20 static nsresult __stdcall -vboxEventTarget_IsOnCurrentThread(nsIEventTarget *pThis ATTRIBUTE_UNUSED, - PRBool *_retval ATTRIBUTE_UNUSED) +vboxEventTarget_IsOnCurrentThread(nsIEventTarget *pThis G_GNUC_UNUSED, + PRBool *_retval G_GNUC_UNUSED) { return NS_ERROR_NOT_IMPLEMENTED; } @@ -169,133 +169,133 @@ vboxEventTarget_IsOnCurrentThread(nsIEventTarget *p= This ATTRIBUTE_UNUSED, */ =20 static nsresult __stdcall -vboxEventQueue_InitEvent(nsIEventQueue *pThis ATTRIBUTE_UNUSED, - PLEvent *aEvent ATTRIBUTE_UNUSED, - void *owner ATTRIBUTE_UNUSED, - PLHandleEventProc handler ATTRIBUTE_UNUSED, - PLDestroyEventProc destructor ATTRIBUTE_UNUSED) +vboxEventQueue_InitEvent(nsIEventQueue *pThis G_GNUC_UNUSED, + PLEvent *aEvent G_GNUC_UNUSED, + void *owner G_GNUC_UNUSED, + PLHandleEventProc handler G_GNUC_UNUSED, + PLDestroyEventProc destructor G_GNUC_UNUSED) { return NS_ERROR_NOT_IMPLEMENTED; } =20 static nsresult __stdcall -vboxEventQueue_PostSynchronousEvent(nsIEventQueue *pThis ATTRIBUTE_UNUSED, - PLEvent *aEvent ATTRIBUTE_UNUSED, - void **aResult ATTRIBUTE_UNUSED) +vboxEventQueue_PostSynchronousEvent(nsIEventQueue *pThis G_GNUC_UNUSED, + PLEvent *aEvent G_GNUC_UNUSED, + void **aResult G_GNUC_UNUSED) { return NS_ERROR_NOT_IMPLEMENTED; } =20 static nsresult __stdcall -vboxEventQueue_PendingEvents(nsIEventQueue *pThis ATTRIBUTE_UNUSED, - PRBool *_retval ATTRIBUTE_UNUSED) +vboxEventQueue_PendingEvents(nsIEventQueue *pThis G_GNUC_UNUSED, + PRBool *_retval G_GNUC_UNUSED) { return NS_ERROR_NOT_IMPLEMENTED; } =20 static nsresult __stdcall -vboxEventQueue_ProcessPendingEvents(nsIEventQueue *pThis ATTRIBUTE_UNUSED) +vboxEventQueue_ProcessPendingEvents(nsIEventQueue *pThis G_GNUC_UNUSED) { return NS_ERROR_NOT_IMPLEMENTED; } =20 static nsresult __stdcall -vboxEventQueue_EventLoop(nsIEventQueue *pThis ATTRIBUTE_UNUSED) +vboxEventQueue_EventLoop(nsIEventQueue *pThis G_GNUC_UNUSED) { return NS_ERROR_NOT_IMPLEMENTED; } =20 static nsresult __stdcall -vboxEventQueue_EventAvailable(nsIEventQueue *pThis ATTRIBUTE_UNUSED, - PRBool *aResult ATTRIBUTE_UNUSED) +vboxEventQueue_EventAvailable(nsIEventQueue *pThis G_GNUC_UNUSED, + PRBool *aResult G_GNUC_UNUSED) { return NS_ERROR_NOT_IMPLEMENTED; } =20 static nsresult __stdcall -vboxEventQueue_GetEvent(nsIEventQueue *pThis ATTRIBUTE_UNUSED, - PLEvent **_retval ATTRIBUTE_UNUSED) +vboxEventQueue_GetEvent(nsIEventQueue *pThis G_GNUC_UNUSED, + PLEvent **_retval G_GNUC_UNUSED) { return NS_ERROR_NOT_IMPLEMENTED; } =20 static nsresult __stdcall -vboxEventQueue_HandleEvent(nsIEventQueue *pThis ATTRIBUTE_UNUSED, - PLEvent *aEvent ATTRIBUTE_UNUSED) +vboxEventQueue_HandleEvent(nsIEventQueue *pThis G_GNUC_UNUSED, + PLEvent *aEvent G_GNUC_UNUSED) { return NS_ERROR_NOT_IMPLEMENTED; } =20 static nsresult __stdcall -vboxEventQueue_WaitForEvent(nsIEventQueue *pThis ATTRIBUTE_UNUSED, - PLEvent **_retval ATTRIBUTE_UNUSED) +vboxEventQueue_WaitForEvent(nsIEventQueue *pThis G_GNUC_UNUSED, + PLEvent **_retval G_GNUC_UNUSED) { return NS_ERROR_NOT_IMPLEMENTED; } =20 static PRInt32 __stdcall -vboxEventQueue_GetEventQueueSelectFD(nsIEventQueue *pThis ATTRIBUTE_UNUSED) +vboxEventQueue_GetEventQueueSelectFD(nsIEventQueue *pThis G_GNUC_UNUSED) { return -1; } =20 static nsresult __stdcall -vboxEventQueue_Init(nsIEventQueue *pThis ATTRIBUTE_UNUSED, - PRBool aNative ATTRIBUTE_UNUSED) +vboxEventQueue_Init(nsIEventQueue *pThis G_GNUC_UNUSED, + PRBool aNative G_GNUC_UNUSED) { return NS_ERROR_NOT_IMPLEMENTED; } =20 static nsresult __stdcall -vboxEventQueue_InitFromPRThread(nsIEventQueue *pThis ATTRIBUTE_UNUSED, - PRThread *thread ATTRIBUTE_UNUSED, - PRBool aNative ATTRIBUTE_UNUSED) +vboxEventQueue_InitFromPRThread(nsIEventQueue *pThis G_GNUC_UNUSED, + PRThread *thread G_GNUC_UNUSED, + PRBool aNative G_GNUC_UNUSED) { return NS_ERROR_NOT_IMPLEMENTED; } =20 static nsresult __stdcall -vboxEventQueue_InitFromPLQueue(nsIEventQueue *pThis ATTRIBUTE_UNUSED, - PLEventQueue *aQueue ATTRIBUTE_UNUSED) +vboxEventQueue_InitFromPLQueue(nsIEventQueue *pThis G_GNUC_UNUSED, + PLEventQueue *aQueue G_GNUC_UNUSED) { return NS_ERROR_NOT_IMPLEMENTED; } =20 static nsresult __stdcall -vboxEventQueue_EnterMonitor(nsIEventQueue *pThis ATTRIBUTE_UNUSED) +vboxEventQueue_EnterMonitor(nsIEventQueue *pThis G_GNUC_UNUSED) { return NS_ERROR_NOT_IMPLEMENTED; } =20 static nsresult __stdcall -vboxEventQueue_ExitMonitor(nsIEventQueue *pThis ATTRIBUTE_UNUSED) +vboxEventQueue_ExitMonitor(nsIEventQueue *pThis G_GNUC_UNUSED) { return NS_ERROR_NOT_IMPLEMENTED; } =20 static nsresult __stdcall -vboxEventQueue_RevokeEvents(nsIEventQueue *pThis ATTRIBUTE_UNUSED, - void *owner ATTRIBUTE_UNUSED) +vboxEventQueue_RevokeEvents(nsIEventQueue *pThis G_GNUC_UNUSED, + void *owner G_GNUC_UNUSED) { return NS_ERROR_NOT_IMPLEMENTED; } =20 static nsresult __stdcall -vboxEventQueue_GetPLEventQueue(nsIEventQueue *pThis ATTRIBUTE_UNUSED, - PLEventQueue **_retval ATTRIBUTE_UNUSED) +vboxEventQueue_GetPLEventQueue(nsIEventQueue *pThis G_GNUC_UNUSED, + PLEventQueue **_retval G_GNUC_UNUSED) { return NS_ERROR_NOT_IMPLEMENTED; } =20 static nsresult __stdcall -vboxEventQueue_IsQueueNative(nsIEventQueue *pThis ATTRIBUTE_UNUSED, - PRBool *_retval ATTRIBUTE_UNUSED) +vboxEventQueue_IsQueueNative(nsIEventQueue *pThis G_GNUC_UNUSED, + PRBool *_retval G_GNUC_UNUSED) { return NS_ERROR_NOT_IMPLEMENTED; } =20 static nsresult __stdcall -vboxEventQueue_StopAcceptingEvents(nsIEventQueue *pThis ATTRIBUTE_UNUSED) +vboxEventQueue_StopAcceptingEvents(nsIEventQueue *pThis G_GNUC_UNUSED) { return NS_ERROR_NOT_IMPLEMENTED; } diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c index 748133933c..50c7de3e02 100644 --- a/src/vbox/vbox_common.c +++ b/src/vbox/vbox_common.c @@ -508,8 +508,8 @@ vboxConnectURIProbe(char **uri) =20 static virDrvOpenStatus vboxConnectOpen(virConnectPtr conn, - virConnectAuthPtr auth ATTRIBUTE_UNUSED, - virConfPtr conf ATTRIBUTE_UNUSED, + virConnectAuthPtr auth G_GNUC_UNUSED, + virConfPtr conf G_GNUC_UNUSED, unsigned int flags) { vboxDriverPtr driver =3D NULL; @@ -541,7 +541,7 @@ static int vboxConnectClose(virConnectPtr conn) } =20 static int -vboxDomainSave(virDomainPtr dom, const char *path ATTRIBUTE_UNUSED) +vboxDomainSave(virDomainPtr dom, const char *path G_GNUC_UNUSED) { vboxDriverPtr data =3D dom->conn->privateData; IConsole *console =3D NULL; @@ -557,7 +557,7 @@ vboxDomainSave(virDomainPtr dom, const char *path ATTRI= BUTE_UNUSED) =20 /* VirtualBox currently doesn't support saving to a file * at a location other then the machine folder and thus - * setting path to ATTRIBUTE_UNUSED for now, will change + * setting path to G_GNUC_UNUSED for now, will change * this behaviour once get the VirtualBox API in right * shape to do this */ @@ -607,30 +607,30 @@ static int vboxConnectGetVersion(virConnectPtr conn, = unsigned long *version) return 0; } =20 -static char *vboxConnectGetHostname(virConnectPtr conn ATTRIBUTE_UNUSED) +static char *vboxConnectGetHostname(virConnectPtr conn G_GNUC_UNUSED) { return virGetHostname(); } =20 -static int vboxConnectIsSecure(virConnectPtr conn ATTRIBUTE_UNUSED) +static int vboxConnectIsSecure(virConnectPtr conn G_GNUC_UNUSED) { /* Driver is using local, non-network based transport */ return 1; } =20 -static int vboxConnectIsEncrypted(virConnectPtr conn ATTRIBUTE_UNUSED) +static int vboxConnectIsEncrypted(virConnectPtr conn G_GNUC_UNUSED) { /* No encryption is needed, or used on the local transport*/ return 0; } =20 -static int vboxConnectIsAlive(virConnectPtr conn ATTRIBUTE_UNUSED) +static int vboxConnectIsAlive(virConnectPtr conn G_GNUC_UNUSED) { return 1; } =20 static int -vboxConnectGetMaxVcpus(virConnectPtr conn, const char *type ATTRIBUTE_UNUS= ED) +vboxConnectGetMaxVcpus(virConnectPtr conn, const char *type G_GNUC_UNUSED) { vboxDriverPtr data =3D conn->privateData; PRUint32 maxCPUCount =3D 0; @@ -640,7 +640,7 @@ vboxConnectGetMaxVcpus(virConnectPtr conn, const char *= type ATTRIBUTE_UNUSED) return ret; =20 /* VirtualBox Supports only hvm and thus the type passed to it - * has no meaning, setting it to ATTRIBUTE_UNUSED + * has no meaning, setting it to G_GNUC_UNUSED */ ISystemProperties *systemProperties =3D NULL; =20 @@ -2693,7 +2693,7 @@ static int vboxDomainDestroy(virDomainPtr dom) return vboxDomainDestroyFlags(dom, 0); } =20 -static char *vboxDomainGetOSType(virDomainPtr dom ATTRIBUTE_UNUSED) { +static char *vboxDomainGetOSType(virDomainPtr dom G_GNUC_UNUSED) { /* Returning "hvm" always as suggested on list, cause * this functions seems to be badly named and it * is supposed to pass the ABI name and not the domain @@ -3448,7 +3448,7 @@ vboxDumpDisks(virDomainDefPtr def, vboxDriverPtr data= , IMachine *machine) } =20 static int -vboxDumpVideo(virDomainDefPtr def, vboxDriverPtr data ATTRIBUTE_UNUSED, +vboxDumpVideo(virDomainDefPtr def, vboxDriverPtr data G_GNUC_UNUSED, IMachine *machine) { /* dump video options vram/2d/3d/directx/etc. */ @@ -3797,7 +3797,7 @@ vboxDumpNetworks(virDomainDefPtr def, vboxDriverPtr d= ata, IMachine *machine, PRU } =20 static void -vboxDumpAudio(virDomainDefPtr def, vboxDriverPtr data ATTRIBUTE_UNUSED, +vboxDumpAudio(virDomainDefPtr def, vboxDriverPtr data G_GNUC_UNUSED, IMachine *machine) { /* dump sound card if active */ @@ -4281,7 +4281,7 @@ static int vboxConnectNumOfDefinedDomains(virConnectP= tr conn) =20 static int vboxDomainAttachDeviceImpl(virDomainPtr dom, const char *xml, - int mediaChangeOnly ATTRIBUTE_UNUSED) + int mediaChangeOnly G_GNUC_UNUSED) { vboxDriverPtr data =3D dom->conn->privateData; IMachine *machine =3D NULL; @@ -7714,14 +7714,14 @@ vboxConnectListAllDomains(virConnectPtr conn, #undef MATCH =20 static int -vboxNodeGetInfo(virConnectPtr conn ATTRIBUTE_UNUSED, +vboxNodeGetInfo(virConnectPtr conn G_GNUC_UNUSED, virNodeInfoPtr nodeinfo) { return virCapabilitiesGetNodeInfo(nodeinfo); } =20 static int -vboxNodeGetCellsFreeMemory(virConnectPtr conn ATTRIBUTE_UNUSED, +vboxNodeGetCellsFreeMemory(virConnectPtr conn G_GNUC_UNUSED, unsigned long long *freeMems, int startCell, int maxCells) @@ -7730,7 +7730,7 @@ vboxNodeGetCellsFreeMemory(virConnectPtr conn ATTRIBU= TE_UNUSED, } =20 static unsigned long long -vboxNodeGetFreeMemory(virConnectPtr conn ATTRIBUTE_UNUSED) +vboxNodeGetFreeMemory(virConnectPtr conn G_GNUC_UNUSED) { unsigned long long freeMem; if (virHostMemGetInfo(NULL, &freeMem) < 0) @@ -7739,7 +7739,7 @@ vboxNodeGetFreeMemory(virConnectPtr conn ATTRIBUTE_UN= USED) } =20 static int -vboxNodeGetFreePages(virConnectPtr conn ATTRIBUTE_UNUSED, +vboxNodeGetFreePages(virConnectPtr conn G_GNUC_UNUSED, unsigned int npages, unsigned int *pages, int startCell, @@ -7753,7 +7753,7 @@ vboxNodeGetFreePages(virConnectPtr conn ATTRIBUTE_UNU= SED, } =20 static int -vboxNodeAllocPages(virConnectPtr conn ATTRIBUTE_UNUSED, +vboxNodeAllocPages(virConnectPtr conn G_GNUC_UNUSED, unsigned int npages, unsigned int *pageSizes, unsigned long long *pageCounts, diff --git a/src/vbox/vbox_driver.c b/src/vbox/vbox_driver.c index d7e80828ab..5bc9ae6102 100644 --- a/src/vbox/vbox_driver.c +++ b/src/vbox/vbox_driver.c @@ -50,8 +50,8 @@ VIR_LOG_INIT("vbox.vbox_driver"); =20 #if defined(VBOX_DRIVER) static virDrvOpenStatus dummyConnectOpen(virConnectPtr conn, - virConnectAuthPtr auth ATTRIBUTE_= UNUSED, - virConfPtr conf ATTRIBUTE_UNUSED, + virConnectAuthPtr auth G_GNUC_UNU= SED, + virConfPtr conf G_GNUC_UNUSED, unsigned int flags) { uid_t uid =3D geteuid(); diff --git a/src/vbox/vbox_storage.c b/src/vbox/vbox_storage.c index f879e287cb..1ef4a39667 100644 --- a/src/vbox/vbox_storage.c +++ b/src/vbox/vbox_storage.c @@ -42,7 +42,7 @@ static vboxUniformedAPI gVBoxAPI; * The Storage Functions here on */ =20 -static int vboxConnectNumOfStoragePools(virConnectPtr conn ATTRIBUTE_UNUSE= D) +static int vboxConnectNumOfStoragePools(virConnectPtr conn G_GNUC_UNUSED) { /** Currently only one pool supported, the default one * given by ISystemProperties::defaultHardDiskFolder() @@ -51,7 +51,7 @@ static int vboxConnectNumOfStoragePools(virConnectPtr con= n ATTRIBUTE_UNUSED) return 1; } =20 -static int vboxConnectListStoragePools(virConnectPtr conn ATTRIBUTE_UNUSED, +static int vboxConnectListStoragePools(virConnectPtr conn G_GNUC_UNUSED, char **const names, int nnames) { int numActive =3D 0; diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index 88b712c8cb..72011199cf 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -500,9 +500,9 @@ static void _DEBUGIID(vboxDriverPtr data, const char *m= sg, vboxIID *iid) } =20 static void -_vboxIIDToUtf8(vboxDriverPtr data ATTRIBUTE_UNUSED, - vboxIID *iid ATTRIBUTE_UNUSED, - char **utf8 ATTRIBUTE_UNUSED) +_vboxIIDToUtf8(vboxDriverPtr data G_GNUC_UNUSED, + vboxIID *iid G_GNUC_UNUSED, + char **utf8 G_GNUC_UNUSED) { data->pFuncs->pfnUtf16ToUtf8(iid->value, utf8); } @@ -548,7 +548,7 @@ static void* _handleSnapshotGetChildren(ISnapshot *snap= shot) return snapshot->vtbl->GetChildren; } =20 -static void* _handleMediumGetChildren(IMedium *medium ATTRIBUTE_UNUSED) +static void* _handleMediumGetChildren(IMedium *medium G_GNUC_UNUSED) { return medium->vtbl->GetChildren; } @@ -609,7 +609,7 @@ _virtualboxGetHost(IVirtualBox *vboxObj, IHost **host) } =20 static nsresult -_virtualboxCreateMachine(vboxDriverPtr data, virDomainDefPtr def, IMachine= **machine, char *uuidstr ATTRIBUTE_UNUSED) +_virtualboxCreateMachine(vboxDriverPtr data, virDomainDefPtr def, IMachine= **machine, char *uuidstr G_GNUC_UNUSED) { vboxIID iid =3D VBOX_IID_INITIALIZER; PRUnichar *machineNameUtf16 =3D NULL; @@ -662,7 +662,7 @@ static nsresult _virtualboxFindHardDisk(IVirtualBox *vboxObj, PRUnichar *location, PRUint32 deviceType, - PRUint32 accessMode ATTRIBUTE_UNUSED, + PRUint32 accessMode G_GNUC_UNUSED, IMedium **medium) { return vboxObj->vtbl->OpenMedium(vboxObj, location, deviceType, access= Mode, @@ -737,7 +737,7 @@ _machineAttachDevice(IMachine *machine, static nsresult _machineCreateSharedFolder(IMachine *machine, PRUnichar *name, PRUnichar *hostPath, PRBool writable, - PRBool automount ATTRIBUTE_UNUSED) + PRBool automount G_GNUC_UNUSED) { return machine->vtbl->CreateSharedFolder(machine, name, hostPath, writable, automount); @@ -751,8 +751,8 @@ _machineRemoveSharedFolder(IMachine *machine, PRUnichar= *name) =20 static nsresult _machineLaunchVMProcess(vboxDriverPtr data, - IMachine *machine ATTRIBUTE_UNUSED, - vboxIID *iid ATTRIBUTE_UNUSED, + IMachine *machine G_GNUC_UNUSED, + vboxIID *iid G_GNUC_UNUSED, PRUnichar *sessionType, PRUnichar *env, IProgress **progress) { @@ -761,10 +761,10 @@ _machineLaunchVMProcess(vboxDriverPtr data, } =20 static nsresult -_machineUnregister(IMachine *machine ATTRIBUTE_UNUSED, - PRUint32 cleanupMode ATTRIBUTE_UNUSED, - PRUint32 *aMediaSize ATTRIBUTE_UNUSED, - IMedium ***aMedia ATTRIBUTE_UNUSED) +_machineUnregister(IMachine *machine G_GNUC_UNUSED, + PRUint32 cleanupMode G_GNUC_UNUSED, + PRUint32 *aMediaSize G_GNUC_UNUSED, + IMedium ***aMedia G_GNUC_UNUSED) { return machine->vtbl->Unregister(machine, cleanupMode, aMediaSize, aMe= dia); } @@ -825,7 +825,7 @@ _machineGetNetworkAdapter(IMachine *machine, PRUint32 s= lot, INetworkAdapter **ad } =20 static nsresult -_machineGetChipsetType(IMachine *machine ATTRIBUTE_UNUSED, PRUint32 *chips= etType ATTRIBUTE_UNUSED) +_machineGetChipsetType(IMachine *machine G_GNUC_UNUSED, PRUint32 *chipsetT= ype G_GNUC_UNUSED) { return machine->vtbl->GetChipsetType(machine, chipsetType); } @@ -891,13 +891,13 @@ _machineSetMemorySize(IMachine *machine, PRUint32 mem= orySize) } =20 static nsresult -_machineGetCPUProperty(IMachine *machine, PRUint32 property ATTRIBUTE_UNUS= ED, PRBool *value) +_machineGetCPUProperty(IMachine *machine, PRUint32 property G_GNUC_UNUSED,= PRBool *value) { return machine->vtbl->GetCPUProperty(machine, property, value); } =20 static nsresult -_machineSetCPUProperty(IMachine *machine, PRUint32 property ATTRIBUTE_UNUS= ED, PRBool value) +_machineSetCPUProperty(IMachine *machine, PRUint32 property G_GNUC_UNUSED,= PRBool value) { return machine->vtbl->SetCPUProperty(machine, property, value); } @@ -989,13 +989,13 @@ _machineSaveSettings(IMachine *machine) } =20 static nsresult -_sessionOpen(vboxDriverPtr data, vboxIID *iid ATTRIBUTE_UNUSED, IMachine *= machine) +_sessionOpen(vboxDriverPtr data, vboxIID *iid G_GNUC_UNUSED, IMachine *mac= hine) { return machine->vtbl->LockMachine(machine, data->vboxSession, LockType= _Write); } =20 static nsresult -_sessionOpenExisting(vboxDriverPtr data, vboxIID *iid ATTRIBUTE_UNUSED, IM= achine *machine) +_sessionOpenExisting(vboxDriverPtr data, vboxIID *iid G_GNUC_UNUSED, IMach= ine *machine) { return machine->vtbl->LockMachine(machine, data->vboxSession, LockType= _Shared); } @@ -1156,7 +1156,7 @@ _systemPropertiesGetMaxBootPosition(ISystemProperties= *systemProperties, PRUint3 } =20 static nsresult -_systemPropertiesGetMaxNetworkAdapters(ISystemProperties *systemProperties= , PRUint32 chipset ATTRIBUTE_UNUSED, +_systemPropertiesGetMaxNetworkAdapters(ISystemProperties *systemProperties= , PRUint32 chipset G_GNUC_UNUSED, PRUint32 *maxNetworkAdapters) { return systemProperties->vtbl->GetMaxNetworkAdapters(systemProperties,= chipset, @@ -1580,7 +1580,7 @@ _vrdeServerSetAllowMultiConnection(IVRDEServer *VRDES= erver, PRBool enabled) } =20 static nsresult -_vrdeServerGetNetAddress(vboxDriverPtr data ATTRIBUTE_UNUSED, +_vrdeServerGetNetAddress(vboxDriverPtr data G_GNUC_UNUSED, IVRDEServer *VRDEServer, PRUnichar **netAddress) { PRUnichar *VRDENetAddressKey =3D NULL; @@ -1594,7 +1594,7 @@ _vrdeServerGetNetAddress(vboxDriverPtr data ATTRIBUTE= _UNUSED, } =20 static nsresult -_vrdeServerSetNetAddress(vboxDriverPtr data ATTRIBUTE_UNUSED, +_vrdeServerSetNetAddress(vboxDriverPtr data G_GNUC_UNUSED, IVRDEServer *VRDEServer, PRUnichar *netAddress) { PRUnichar *netAddressKey =3D NULL; @@ -1609,14 +1609,14 @@ _vrdeServerSetNetAddress(vboxDriverPtr data ATTRIBU= TE_UNUSED, } =20 static nsresult -_usbCommonEnable(IUSBCommon *USBCommon ATTRIBUTE_UNUSED) +_usbCommonEnable(IUSBCommon *USBCommon G_GNUC_UNUSED) { /* We don't need to set usb enabled for vbox 4.3 and later */ return 0; } =20 static nsresult -_usbCommonGetEnabled(IUSBCommon *USBCommon ATTRIBUTE_UNUSED, PRBool *enabl= ed) +_usbCommonGetEnabled(IUSBCommon *USBCommon G_GNUC_UNUSED, PRBool *enabled) { *enabled =3D true; return 0; @@ -1703,8 +1703,8 @@ static nsresult _mediumGetSize(IMedium *medium, PRUin= t64 *uSize) return rc; } =20 -static nsresult _mediumGetReadOnly(IMedium *medium ATTRIBUTE_UNUSED, - PRBool *readOnly ATTRIBUTE_UNUSED) +static nsresult _mediumGetReadOnly(IMedium *medium G_GNUC_UNUSED, + PRBool *readOnly G_GNUC_UNUSED) { return medium->vtbl->GetReadOnly(medium, readOnly); } @@ -1743,18 +1743,18 @@ static nsresult _mediumClose(IMedium *medium) return medium->vtbl->Close(medium); } =20 -static nsresult _mediumSetType(IMedium *medium ATTRIBUTE_UNUSED, - PRUint32 type ATTRIBUTE_UNUSED) +static nsresult _mediumSetType(IMedium *medium G_GNUC_UNUSED, + PRUint32 type G_GNUC_UNUSED) { return medium->vtbl->SetType(medium, type); } =20 static nsresult -_mediumCreateDiffStorage(IMedium *medium ATTRIBUTE_UNUSED, - IMedium *target ATTRIBUTE_UNUSED, - PRUint32 variantSize ATTRIBUTE_UNUSED, - PRUint32 *variant ATTRIBUTE_UNUSED, - IProgress **progress ATTRIBUTE_UNUSED) +_mediumCreateDiffStorage(IMedium *medium G_GNUC_UNUSED, + IMedium *target G_GNUC_UNUSED, + PRUint32 variantSize G_GNUC_UNUSED, + PRUint32 *variant G_GNUC_UNUSED, + IProgress **progress G_GNUC_UNUSED) { return medium->vtbl->CreateDiffStorage(medium, target, variantSize, va= riant, progress); } @@ -1793,8 +1793,8 @@ _mediumAttachmentGetController(IMediumAttachment *med= iumAttachment, } =20 static nsresult -_mediumAttachmentGetType(IMediumAttachment *mediumAttachment ATTRIBUTE_UNU= SED, - PRUint32 *type ATTRIBUTE_UNUSED) +_mediumAttachmentGetType(IMediumAttachment *mediumAttachment G_GNUC_UNUSED, + PRUint32 *type G_GNUC_UNUSED) { return mediumAttachment->vtbl->GetType(mediumAttachment, type); } @@ -1890,13 +1890,13 @@ _snapshotGetOnline(ISnapshot *snapshot, PRBool *onl= ine) } =20 static nsresult -_displayGetScreenResolution(IDisplay *display ATTRIBUTE_UNUSED, - PRUint32 screenId ATTRIBUTE_UNUSED, - PRUint32 *width ATTRIBUTE_UNUSED, - PRUint32 *height ATTRIBUTE_UNUSED, - PRUint32 *bitsPerPixel ATTRIBUTE_UNUSED, - PRInt32 *xOrigin ATTRIBUTE_UNUSED, - PRInt32 *yOrigin ATTRIBUTE_UNUSED) +_displayGetScreenResolution(IDisplay *display G_GNUC_UNUSED, + PRUint32 screenId G_GNUC_UNUSED, + PRUint32 *width G_GNUC_UNUSED, + PRUint32 *height G_GNUC_UNUSED, + PRUint32 *bitsPerPixel G_GNUC_UNUSED, + PRInt32 *xOrigin G_GNUC_UNUSED, + PRInt32 *yOrigin G_GNUC_UNUSED) { PRUint32 gms; =20 @@ -1933,8 +1933,8 @@ _hostFindHostNetworkInterfaceByName(IHost *host, PRUn= ichar *name, } =20 static nsresult -_hostCreateHostOnlyNetworkInterface(vboxDriverPtr data ATTRIBUTE_UNUSED, - IHost *host, char *name ATTRIBUTE_UNUS= ED, +_hostCreateHostOnlyNetworkInterface(vboxDriverPtr data G_GNUC_UNUSED, + IHost *host, char *name G_GNUC_UNUSED, IHostNetworkInterface **networkInterfa= ce) { nsresult rc =3D -1; @@ -1952,9 +1952,9 @@ _hostCreateHostOnlyNetworkInterface(vboxDriverPtr dat= a ATTRIBUTE_UNUSED, } =20 static nsresult -_hostRemoveHostOnlyNetworkInterface(IHost *host ATTRIBUTE_UNUSED, - vboxIID *iid ATTRIBUTE_UNUSED, - IProgress **progress ATTRIBUTE_UNUSED) +_hostRemoveHostOnlyNetworkInterface(IHost *host G_GNUC_UNUSED, + vboxIID *iid G_GNUC_UNUSED, + IProgress **progress G_GNUC_UNUSED) { return host->vtbl->RemoveHostOnlyNetworkInterface(host, iid->value, pr= ogress); } --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 10:00:01 2024 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=1571059222; cv=none; d=zoho.com; s=zohoarc; b=YtGKwcsydA/qaVRw7kg2rggzMv333GrShHfEY+ppd5D9qY4wNx+5elDLTjmmpAfTwd9+xlJwHMrepqlm7Vabwq+3T2+Ivp8s55juDtZ1ToFzloFi48eTcp+Cjve0uo0HN4FGgapN3llJTjApLdDV1n0g+9bQkwcobllw1U9AVZ0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571059222; 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=8MKhrNPL2aPJDNIoX+GxMxMSgzg0MTCd25YwKCfjc0o=; b=CWzhCc6H3lP//18hJl4kiFT8lKu9pfduAka3C1pavTjXiPDXO8YBB8i8AN5zLeS5m0rmY4LOPQPXxbuzbir9gF8UHLplO7lwLGhRIoBq8lK/yrJjv8U0G/zgmxy+ZckbuAaznRDBU+fzsJ4339BPejZ/FG3loZcT7Q7imG/dSzo= 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 1571059222033936.1136034419295; Mon, 14 Oct 2019 06:20:22 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3BBC28980EE; Mon, 14 Oct 2019 13:20:20 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0A53460F8E; Mon, 14 Oct 2019 13:20:20 +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 B169224F2F; Mon, 14 Oct 2019 13:20:19 +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 x9EDGiPM017597 for ; Mon, 14 Oct 2019 09:16:44 -0400 Received: by smtp.corp.redhat.com (Postfix) id 9FAA660126; Mon, 14 Oct 2019 13:16:44 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2843F600CD for ; Mon, 14 Oct 2019 13:16:43 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Mon, 14 Oct 2019 15:15:49 +0200 Message-Id: <5d8ed0da7f33c0e3f429c6042a02b6fd449cc530.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 31/35] vz: 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.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.67]); Mon, 14 Oct 2019 13:20:21 +0000 (UTC) Use G_GNUC_UNUSED from GLib instead of ATTRIBUTE_UNUSED. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/vz/vz_driver.c | 60 +++++++++++++++++++++++----------------------- src/vz/vz_sdk.c | 8 +++---- src/vz/vz_utils.c | 2 +- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index eb3fcf1fcc..c5fe59376e 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -243,10 +243,10 @@ vzDomainDefAddDefaultInputDevices(virDomainDefPtr def) =20 static int vzDomainDefPostParse(virDomainDefPtr def, - virCapsPtr caps ATTRIBUTE_UNUSED, - unsigned int parseFlags ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED, - void *parseOpaque ATTRIBUTE_UNUSED) + virCapsPtr caps G_GNUC_UNUSED, + unsigned int parseFlags G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED, + void *parseOpaque G_GNUC_UNUSED) { if (vzDomainDefAddDefaultInputDevices(def) < 0) return -1; @@ -256,7 +256,7 @@ vzDomainDefPostParse(virDomainDefPtr def, =20 static int vzDomainDefValidate(const virDomainDef *def, - virCapsPtr caps ATTRIBUTE_UNUSED, + virCapsPtr caps G_GNUC_UNUSED, void *opaque) { if (vzCheckUnsupportedControllers(def, opaque) < 0) @@ -268,10 +268,10 @@ vzDomainDefValidate(const virDomainDef *def, static int vzDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, const virDomainDef *def, - virCapsPtr caps ATTRIBUTE_UNUSED, - unsigned int parseFlags ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED, - void *parseOpaque ATTRIBUTE_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_NET && (dev->data.net->type =3D=3D VIR_DOMAIN_NET_TYPE_NETWORK || @@ -286,7 +286,7 @@ vzDomainDeviceDefPostParse(virDomainDeviceDefPtr dev, static int vzDomainDeviceDefValidate(const virDomainDeviceDef *dev, const virDomainDef *def, - void *opaque ATTRIBUTE_UNUSED) + void *opaque G_GNUC_UNUSED) { if (dev->type =3D=3D VIR_DOMAIN_DEVICE_DISK) return vzCheckUnsupportedDisk(def, dev->data.disk, opaque); @@ -346,8 +346,8 @@ vzDriverObjNew(void) =20 static virDrvOpenStatus vzConnectOpen(virConnectPtr conn, - virConnectAuthPtr auth ATTRIBUTE_UNUSED, - virConfPtr conf ATTRIBUTE_UNUSED, + virConnectAuthPtr auth G_GNUC_UNUSED, + virConfPtr conf G_GNUC_UNUSED, unsigned int flags) { vzDriverPtr driver =3D NULL; @@ -898,19 +898,19 @@ vzNodeGetInfo(virConnectPtr conn, return virCapabilitiesGetNodeInfo(nodeinfo); } =20 -static int vzConnectIsEncrypted(virConnectPtr conn ATTRIBUTE_UNUSED) +static int vzConnectIsEncrypted(virConnectPtr conn G_GNUC_UNUSED) { /* Encryption is not relevant / applicable to way we talk to PCS */ return 0; } =20 -static int vzConnectIsSecure(virConnectPtr conn ATTRIBUTE_UNUSED) +static int vzConnectIsSecure(virConnectPtr conn G_GNUC_UNUSED) { /* We run CLI tools directly so this is secure */ return 1; } =20 -static int vzConnectIsAlive(virConnectPtr conn ATTRIBUTE_UNUSED) +static int vzConnectIsAlive(virConnectPtr conn G_GNUC_UNUSED) { return 1; } @@ -2967,8 +2967,8 @@ static int vzDomainMigratePrepare3Params(virConnectPtr conn, virTypedParameterPtr params, int nparams, - const char *cookiein ATTRIBUTE_UNUSED, - int cookieinlen ATTRIBUTE_UNUSED, + const char *cookiein G_GNUC_UNUSED, + int cookieinlen G_GNUC_UNUSED, char **cookieout, int *cookieoutlen, char **uri_out, @@ -3030,7 +3030,7 @@ vzDomainMigratePrepare3Params(virConnectPtr conn, } =20 static int -vzConnectSupportsFeature(virConnectPtr conn ATTRIBUTE_UNUSED, int feature) +vzConnectSupportsFeature(virConnectPtr conn G_GNUC_UNUSED, int feature) { if (virConnectSupportsFeatureEnsureACL(conn) < 0) return -1; @@ -3262,8 +3262,8 @@ vzDomainMigratePerform3Params(virDomainPtr domain, int nparams, const char *cookiein, int cookieinlen, - char **cookieout ATTRIBUTE_UNUSED, - int *cookieoutlen ATTRIBUTE_UNUSED, + char **cookieout G_GNUC_UNUSED, + int *cookieoutlen G_GNUC_UNUSED, unsigned int flags) { int ret =3D -1; @@ -3298,10 +3298,10 @@ static virDomainPtr vzDomainMigrateFinish3Params(virConnectPtr dconn, virTypedParameterPtr params, int nparams, - const char *cookiein ATTRIBUTE_UNUSED, - int cookieinlen ATTRIBUTE_UNUSED, - char **cookieout ATTRIBUTE_UNUSED, - int *cookieoutlen ATTRIBUTE_UNUSED, + const char *cookiein G_GNUC_UNUSED, + int cookieinlen G_GNUC_UNUSED, + char **cookieout G_GNUC_UNUSED, + int *cookieoutlen G_GNUC_UNUSED, unsigned int flags, int cancelled) { @@ -3344,13 +3344,13 @@ vzDomainMigrateFinish3Params(virConnectPtr dconn, } =20 static int -vzDomainMigrateConfirm3Params(virDomainPtr domain ATTRIBUTE_UNUSED, +vzDomainMigrateConfirm3Params(virDomainPtr domain G_GNUC_UNUSED, virTypedParameterPtr params, int nparams, - const char *cookiein ATTRIBUTE_UNUSED, - int cookieinlen ATTRIBUTE_UNUSED, + const char *cookiein G_GNUC_UNUSED, + int cookieinlen G_GNUC_UNUSED, unsigned int flags, - int cancelled ATTRIBUTE_UNUSED) + int cancelled G_GNUC_UNUSED) { virCheckFlags(VZ_MIGRATION_FLAGS, -1); =20 @@ -4114,8 +4114,8 @@ vzStateCleanup(void) =20 static int vzStateInitialize(bool privileged, - virStateInhibitCallback callback ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) + virStateInhibitCallback callback G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED) { if (!privileged) return VIR_DRV_STATE_INIT_SKIPPED; diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index 7ac4888ecb..cef840fb9f 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -3083,7 +3083,7 @@ static int prlsdkApplyGraphicsParams(PRL_HANDLE sdkdo= m, return ret; } =20 -static int prlsdkApplyVideoParams(PRL_HANDLE sdkdom ATTRIBUTE_UNUSED, virD= omainDefPtr def) +static int prlsdkApplyVideoParams(PRL_HANDLE sdkdom G_GNUC_UNUSED, virDoma= inDefPtr def) { PRL_RESULT pret; =20 @@ -3283,8 +3283,8 @@ static int prlsdkConfigureGateways(PRL_HANDLE sdknet,= virDomainNetDefPtr net) return ret; } =20 -static int prlsdkConfigureNet(vzDriverPtr driver ATTRIBUTE_UNUSED, - virDomainObjPtr dom ATTRIBUTE_UNUSED, +static int prlsdkConfigureNet(vzDriverPtr driver G_GNUC_UNUSED, + virDomainObjPtr dom G_GNUC_UNUSED, PRL_HANDLE sdkdom, virDomainNetDefPtr net, bool isCt, bool create) @@ -3665,7 +3665,7 @@ prlsdkAttachDevice(vzDriverPtr driver, } =20 int -prlsdkDetachDevice(vzDriverPtr driver ATTRIBUTE_UNUSED, +prlsdkDetachDevice(vzDriverPtr driver G_GNUC_UNUSED, virDomainObjPtr dom, virDomainDeviceDefPtr dev) { diff --git a/src/vz/vz_utils.c b/src/vz/vz_utils.c index 13f5deeaa5..001c3e96af 100644 --- a/src/vz/vz_utils.c +++ b/src/vz/vz_utils.c @@ -551,7 +551,7 @@ int vzCheckUnsupportedGraphics(virDomainGraphicsDefPtr = gr) } =20 void* -vzDomObjAlloc(void *opaque ATTRIBUTE_UNUSED) +vzDomObjAlloc(void *opaque G_GNUC_UNUSED) { vzDomObjPtr pdom =3D NULL; =20 --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 10:00:01 2024 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=1571059063; cv=none; d=zoho.com; s=zohoarc; b=PTHeaXSvH6z4vO0kw3spD1FgTirpeRxRFmU5W+Y6tBYqatUzxd3a8+2uP7CyoGiw/XV3RelAL4FwDLbyeHhGJHuCZ2qIwfbnveSMB55LxMDMT306mTcydODLYQait0mIEg3kjgT8oTTBYswmNhotTklAZU9Dx0JhGaeMqkEE7/g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571059063; 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=bOjyej3lTgJgupIVixwZqpsoM5yrxaiTftTBOuiL/bA=; b=bEDFCcZu5lTwXcKhmkspMXnv23rqrtdQ2Xt4R92kx5JW0XXzguSDLQomavg1TFvFbBB7Lcgp5ls8z8H0yhytNmJmcyE7n4olcN0qzFwQLl0KjjLI1N/sOpPj2Zl+Q8LPcQ1pBbBUwyMOeoloHw8DuV90pOfeTXEvLJYBA1P2LMs= 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 1571059063099748.8676478634621; Mon, 14 Oct 2019 06:17:43 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 4B149811DE; Mon, 14 Oct 2019 13:17:41 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 165951001DF0; Mon, 14 Oct 2019 13:17:41 +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 C61CA6B49D; Mon, 14 Oct 2019 13:17:40 +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 x9EDGjeU017602 for ; Mon, 14 Oct 2019 09:16:45 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6F9B960127; Mon, 14 Oct 2019 13:16:45 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id ED11B600CD for ; Mon, 14 Oct 2019 13:16:44 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Mon, 14 Oct 2019 15:15:50 +0200 Message-Id: <62b5807cc01d40dd82269cbfbc7ee8e994b3e2f1.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 32/35] Use G_GNUC_UNUSED everywhere 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.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Mon, 14 Oct 2019 13:17:41 +0000 (UTC) Use G_GNUC_UNUSED from GLib instead of ATTRIBUTE_UNUSED. Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/hyperv/hyperv_driver.c | 12 ++++----- src/hyperv/hyperv_wmi.c | 2 +- src/interface/interface_backend_netcf.c | 16 ++++++------ src/interface/interface_backend_udev.c | 20 +++++++-------- src/libvirt.c | 8 +++--- src/phyp/phyp_driver.c | 34 ++++++++++++------------- src/secret/secret_driver.c | 16 ++++++------ src/vmware/vmware_conf.c | 2 +- src/vmware/vmware_driver.c | 32 +++++++++++------------ src/vmx/vmx.c | 24 ++++++++--------- 10 files changed, 83 insertions(+), 83 deletions(-) diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c index ceaf528dd3..4e99721d37 100644 --- a/src/hyperv/hyperv_driver.c +++ b/src/hyperv/hyperv_driver.c @@ -118,7 +118,7 @@ hypervInitConnection(virConnectPtr conn, hypervPrivate = *priv, =20 static virDrvOpenStatus hypervConnectOpen(virConnectPtr conn, virConnectAuthPtr auth, - virConfPtr conf ATTRIBUTE_UNUSED, + virConfPtr conf G_GNUC_UNUSED, unsigned int flags) { virDrvOpenStatus result =3D VIR_DRV_OPEN_ERROR; @@ -194,7 +194,7 @@ hypervConnectClose(virConnectPtr conn) =20 =20 static const char * -hypervConnectGetType(virConnectPtr conn ATTRIBUTE_UNUSED) +hypervConnectGetType(virConnectPtr conn G_GNUC_UNUSED) { return "Hyper-V"; } @@ -598,7 +598,7 @@ hypervDomainDestroy(virDomainPtr domain) =20 =20 static char * -hypervDomainGetOSType(virDomainPtr domain ATTRIBUTE_UNUSED) +hypervDomainGetOSType(virDomainPtr domain G_GNUC_UNUSED) { char *osType; =20 @@ -1100,7 +1100,7 @@ hypervDomainIsActive(virDomainPtr domain) =20 =20 static int -hypervDomainIsPersistent(virDomainPtr domain ATTRIBUTE_UNUSED) +hypervDomainIsPersistent(virDomainPtr domain G_GNUC_UNUSED) { /* Hyper-V has no concept of transient domains, so all of them are per= sistent */ return 1; @@ -1109,7 +1109,7 @@ hypervDomainIsPersistent(virDomainPtr domain ATTRIBUT= E_UNUSED) =20 =20 static int -hypervDomainIsUpdated(virDomainPtr domain ATTRIBUTE_UNUSED) +hypervDomainIsUpdated(virDomainPtr domain G_GNUC_UNUSED) { return 0; } @@ -1607,7 +1607,7 @@ static virHypervisorDriver hypervHypervisorDriver =3D= { =20 static void hypervDebugHandler(const char *message, debug_level_e level, - void *user_data ATTRIBUTE_UNUSED) + void *user_data G_GNUC_UNUSED) { switch (level) { case DEBUG_LEVEL_ERROR: diff --git a/src/hyperv/hyperv_wmi.c b/src/hyperv/hyperv_wmi.c index c2c1f082e1..04f82389c1 100644 --- a/src/hyperv/hyperv_wmi.c +++ b/src/hyperv/hyperv_wmi.c @@ -1127,7 +1127,7 @@ hypervEnumAndPull(hypervPrivate *priv, hypervWqlQuery= Ptr wqlQuery, } =20 void -hypervFreeObject(hypervPrivate *priv ATTRIBUTE_UNUSED, hypervObject *objec= t) +hypervFreeObject(hypervPrivate *priv G_GNUC_UNUSED, hypervObject *object) { hypervObject *next; #if WS_SERIALIZER_FREE_MEM_WORKS diff --git a/src/interface/interface_backend_netcf.c b/src/interface/interf= ace_backend_netcf.c index 5ef8ac33db..a45d429973 100644 --- a/src/interface/interface_backend_netcf.c +++ b/src/interface/interface_backend_netcf.c @@ -89,8 +89,8 @@ virNetcfDriverStateDispose(void *obj) =20 static int netcfStateInitialize(bool privileged, - virStateInhibitCallback callback ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) + virStateInhibitCallback callback G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED) { if (virNetcfDriverStateInitialize() < 0) return VIR_DRV_STATE_INIT_ERROR; @@ -188,8 +188,8 @@ netcfStateReload(void) =20 static virDrvOpenStatus netcfConnectOpen(virConnectPtr conn, - virConnectAuthPtr auth ATTRIBUTE_UNUSED, - virConfPtr conf ATTRIBUTE_UNUSED, + virConnectAuthPtr auth G_GNUC_UNUSED, + virConfPtr conf G_GNUC_UNUSED, unsigned int flags) { virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); @@ -211,27 +211,27 @@ netcfConnectOpen(virConnectPtr conn, return VIR_DRV_OPEN_SUCCESS; } =20 -static int netcfConnectClose(virConnectPtr conn ATTRIBUTE_UNUSED) +static int netcfConnectClose(virConnectPtr conn G_GNUC_UNUSED) { return 0; } =20 =20 -static int netcfConnectIsSecure(virConnectPtr conn ATTRIBUTE_UNUSED) +static int netcfConnectIsSecure(virConnectPtr conn G_GNUC_UNUSED) { /* Trivially secure, since always inside the daemon */ return 1; } =20 =20 -static int netcfConnectIsEncrypted(virConnectPtr conn ATTRIBUTE_UNUSED) +static int netcfConnectIsEncrypted(virConnectPtr conn G_GNUC_UNUSED) { /* Not encrypted, but remote driver takes care of that */ return 0; } =20 =20 -static int netcfConnectIsAlive(virConnectPtr conn ATTRIBUTE_UNUSED) +static int netcfConnectIsAlive(virConnectPtr conn G_GNUC_UNUSED) { return 1; } diff --git a/src/interface/interface_backend_udev.c b/src/interface/interfa= ce_backend_udev.c index 4e381db3ef..1e5bf067fe 100644 --- a/src/interface/interface_backend_udev.c +++ b/src/interface/interface_backend_udev.c @@ -920,8 +920,8 @@ udevGetIfaceDefBridge(struct udev *udev, static int ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4) G_GNUC_WARN_UNUSED_RESULT -udevGetIfaceDefVlan(struct udev *udev ATTRIBUTE_UNUSED, - struct udev_device *dev ATTRIBUTE_UNUSED, +udevGetIfaceDefVlan(struct udev *udev G_GNUC_UNUSED, + struct udev_device *dev G_GNUC_UNUSED, const char *name, virInterfaceDef *ifacedef) { @@ -1169,8 +1169,8 @@ udevStateCleanup(void); =20 static int udevStateInitialize(bool privileged, - virStateInhibitCallback callback ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) + virStateInhibitCallback callback G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED) { int ret =3D VIR_DRV_STATE_INIT_ERROR; =20 @@ -1238,8 +1238,8 @@ udevStateCleanup(void) =20 static virDrvOpenStatus udevConnectOpen(virConnectPtr conn, - virConnectAuthPtr auth ATTRIBUTE_UNUSED, - virConfPtr conf ATTRIBUTE_UNUSED, + virConnectAuthPtr auth G_GNUC_UNUSED, + virConfPtr conf G_GNUC_UNUSED, unsigned int flags) { virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); @@ -1261,27 +1261,27 @@ udevConnectOpen(virConnectPtr conn, return VIR_DRV_OPEN_SUCCESS; } =20 -static int udevConnectClose(virConnectPtr conn ATTRIBUTE_UNUSED) +static int udevConnectClose(virConnectPtr conn G_GNUC_UNUSED) { return 0; } =20 =20 -static int udevConnectIsSecure(virConnectPtr conn ATTRIBUTE_UNUSED) +static int udevConnectIsSecure(virConnectPtr conn G_GNUC_UNUSED) { /* Trivially secure, since always inside the daemon */ return 1; } =20 =20 -static int udevConnectIsEncrypted(virConnectPtr conn ATTRIBUTE_UNUSED) +static int udevConnectIsEncrypted(virConnectPtr conn G_GNUC_UNUSED) { /* Not encrypted, but remote driver takes care of that */ return 0; } =20 =20 -static int udevConnectIsAlive(virConnectPtr conn ATTRIBUTE_UNUSED) +static int udevConnectIsAlive(virConnectPtr conn G_GNUC_UNUSED) { return 1; } diff --git a/src/libvirt.c b/src/libvirt.c index 8aad20e4d4..a5113b9206 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -113,7 +113,7 @@ static virNWFilterDriverPtr virSharedNWFilterDriver; static int virConnectAuthCallbackDefault(virConnectCredentialPtr cred, unsigned int ncred, - void *cbdata ATTRIBUTE_UNUSED) + void *cbdata G_GNUC_UNUSED) { size_t i; =20 @@ -354,9 +354,9 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID ignore); =20 BOOL WINAPI -DllMain(HINSTANCE instance ATTRIBUTE_UNUSED, +DllMain(HINSTANCE instance G_GNUC_UNUSED, DWORD reason, - LPVOID ignore ATTRIBUTE_UNUSED) + LPVOID ignore G_GNUC_UNUSED) { switch (reason) { case DLL_PROCESS_ATTACH: @@ -772,7 +772,7 @@ virStateStop(void) * @typeVer have the format major * 1,000,000 + minor * 1,000 + rele= ase. */ int -virGetVersion(unsigned long *libVer, const char *type ATTRIBUTE_UNUSED, +virGetVersion(unsigned long *libVer, const char *type G_GNUC_UNUSED, unsigned long *typeVer) { if (virInitialize() < 0) diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index 1638d527fd..572ca9e2cb 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -1070,23 +1070,23 @@ openSSHSession(virConnectPtr conn, virConnectAuthPt= r auth, =20 =20 static int -phypDomainDefPostParse(virDomainDefPtr def ATTRIBUTE_UNUSED, - virCapsPtr caps ATTRIBUTE_UNUSED, - unsigned int parseFlags ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED, - void *parseOpaque ATTRIBUTE_UNUSED) +phypDomainDefPostParse(virDomainDefPtr 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) { return 0; } =20 =20 static int -phypDomainDeviceDefPostParse(virDomainDeviceDefPtr dev ATTRIBUTE_UNUSED, - const virDomainDef *def ATTRIBUTE_UNUSED, - virCapsPtr caps ATTRIBUTE_UNUSED, - unsigned int parseFlags ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED, - void *parseOpaque ATTRIBUTE_UNUSED) +phypDomainDeviceDefPostParse(virDomainDeviceDefPtr dev G_GNUC_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) { return 0; } @@ -1102,7 +1102,7 @@ virDomainDefParserConfig virPhypDriverDomainDefParser= Config =3D { static virDrvOpenStatus phypConnectOpen(virConnectPtr conn, virConnectAuthPtr auth, - virConfPtr conf ATTRIBUTE_UNUSED, + virConfPtr conf G_GNUC_UNUSED, unsigned int flags) { LIBSSH2_SESSION *session =3D NULL; @@ -1223,7 +1223,7 @@ phypConnectClose(virConnectPtr conn) =20 =20 static int -phypConnectIsEncrypted(virConnectPtr conn ATTRIBUTE_UNUSED) +phypConnectIsEncrypted(virConnectPtr conn G_GNUC_UNUSED) { /* Phyp uses an SSH tunnel, so is always encrypted */ return 1; @@ -1231,7 +1231,7 @@ phypConnectIsEncrypted(virConnectPtr conn ATTRIBUTE_U= NUSED) =20 =20 static int -phypConnectIsSecure(virConnectPtr conn ATTRIBUTE_UNUSED) +phypConnectIsSecure(virConnectPtr conn G_GNUC_UNUSED) { /* Phyp uses an SSH tunnel, so is always secure */ return 1; @@ -1254,7 +1254,7 @@ phypConnectIsAlive(virConnectPtr conn) =20 =20 static int -phypDomainIsUpdated(virDomainPtr conn ATTRIBUTE_UNUSED) +phypDomainIsUpdated(virDomainPtr conn G_GNUC_UNUSED) { return 0; } @@ -1420,7 +1420,7 @@ phypGetRemoteSlot(virConnectPtr conn, const char *man= aged_system, =20 /* XXX - is this needed? */ static char *phypGetBackingDevice(virConnectPtr, const char *, char *) - ATTRIBUTE_UNUSED; + G_GNUC_UNUSED; static char * phypGetBackingDevice(virConnectPtr conn, const char *managed_system, char *lpar_name) @@ -3059,7 +3059,7 @@ phypGetLparState(virConnectPtr conn, unsigned int lpa= r_id) } =20 /* XXX - is this needed? */ -static int phypDiskType(virConnectPtr, char *) ATTRIBUTE_UNUSED; +static int phypDiskType(virConnectPtr, char *) G_GNUC_UNUSED; static int phypDiskType(virConnectPtr conn, char *backing_device) { diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c index 13f75ee4fa..7e0a8351b4 100644 --- a/src/secret/secret_driver.c +++ b/src/secret/secret_driver.c @@ -452,8 +452,8 @@ secretStateCleanup(void) =20 static int secretStateInitialize(bool privileged, - virStateInhibitCallback callback ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED) + virStateInhibitCallback callback G_GNUC_UNUSED, + void *opaque G_GNUC_UNUSED) { if (VIR_ALLOC(driver) < 0) return VIR_DRV_STATE_INIT_ERROR; @@ -539,8 +539,8 @@ secretStateReload(void) =20 static virDrvOpenStatus secretConnectOpen(virConnectPtr conn, - virConnectAuthPtr auth ATTRIBUTE_UNUSED, - virConfPtr conf ATTRIBUTE_UNUSED, + virConnectAuthPtr auth G_GNUC_UNUSED, + virConfPtr conf G_GNUC_UNUSED, unsigned int flags) { virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); @@ -562,27 +562,27 @@ secretConnectOpen(virConnectPtr conn, return VIR_DRV_OPEN_SUCCESS; } =20 -static int secretConnectClose(virConnectPtr conn ATTRIBUTE_UNUSED) +static int secretConnectClose(virConnectPtr conn G_GNUC_UNUSED) { return 0; } =20 =20 -static int secretConnectIsSecure(virConnectPtr conn ATTRIBUTE_UNUSED) +static int secretConnectIsSecure(virConnectPtr conn G_GNUC_UNUSED) { /* Trivially secure, since always inside the daemon */ return 1; } =20 =20 -static int secretConnectIsEncrypted(virConnectPtr conn ATTRIBUTE_UNUSED) +static int secretConnectIsEncrypted(virConnectPtr conn G_GNUC_UNUSED) { /* Not encrypted, but remote driver takes care of that */ return 0; } =20 =20 -static int secretConnectIsAlive(virConnectPtr conn ATTRIBUTE_UNUSED) +static int secretConnectIsAlive(virConnectPtr conn G_GNUC_UNUSED) { return 1; } diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c index 963e7a9876..701062e440 100644 --- a/src/vmware/vmware_conf.c +++ b/src/vmware/vmware_conf.c @@ -537,7 +537,7 @@ vmwareExtractPid(const char * vmxPath) } =20 char * -vmwareCopyVMXFileName(const char *datastorePath, void *opaque ATTRIBUTE_UN= USED) +vmwareCopyVMXFileName(const char *datastorePath, void *opaque G_GNUC_UNUSE= D) { char *path; =20 diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c index a87af85916..08fc84e002 100644 --- a/src/vmware/vmware_driver.c +++ b/src/vmware/vmware_driver.c @@ -93,7 +93,7 @@ vmwareDomObjFromDomain(struct vmware_driver *driver, =20 =20 static void * -vmwareDataAllocFunc(void *opaque ATTRIBUTE_UNUSED) +vmwareDataAllocFunc(void *opaque G_GNUC_UNUSED) { vmwareDomainPtr dom; =20 @@ -116,22 +116,22 @@ vmwareDataFreeFunc(void *data) } =20 static int -vmwareDomainDefPostParse(virDomainDefPtr def ATTRIBUTE_UNUSED, - virCapsPtr caps ATTRIBUTE_UNUSED, - unsigned int parseFlags ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED, - void *parseOpaque ATTRIBUTE_UNUSED) +vmwareDomainDefPostParse(virDomainDefPtr 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) { return 0; } =20 static int -vmwareDomainDeviceDefPostParse(virDomainDeviceDefPtr dev ATTRIBUTE_UNUSED, - const virDomainDef *def ATTRIBUTE_UNUSED, - virCapsPtr caps ATTRIBUTE_UNUSED, - unsigned int parseFlags ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED, - void *parseOpaque ATTRIBUTE_UNUSED) +vmwareDomainDeviceDefPostParse(virDomainDeviceDefPtr dev G_GNUC_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) { return 0; } @@ -153,8 +153,8 @@ vmwareDomainXMLConfigInit(void) =20 static virDrvOpenStatus vmwareConnectOpen(virConnectPtr conn, - virConnectAuthPtr auth ATTRIBUTE_UNUSED, - virConfPtr conf ATTRIBUTE_UNUSED, + virConnectAuthPtr auth G_GNUC_UNUSED, + virConfPtr conf G_GNUC_UNUSED, unsigned int flags) { struct vmware_driver *driver; @@ -258,7 +258,7 @@ vmwareConnectClose(virConnectPtr conn) } =20 static const char * -vmwareConnectGetType(virConnectPtr conn ATTRIBUTE_UNUSED) +vmwareConnectGetType(virConnectPtr conn G_GNUC_UNUSED) { return "VMware"; } @@ -1103,7 +1103,7 @@ vmwareDomainGetState(virDomainPtr dom, } =20 static int -vmwareConnectIsAlive(virConnectPtr conn ATTRIBUTE_UNUSED) +vmwareConnectIsAlive(virConnectPtr conn G_GNUC_UNUSED) { return 1; } diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index d8f15b5b47..6e0467d251 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -529,22 +529,22 @@ VIR_ENUM_IMPL(virVMXControllerModelSCSI, */ =20 static int -virVMXDomainDefPostParse(virDomainDefPtr def ATTRIBUTE_UNUSED, - virCapsPtr caps ATTRIBUTE_UNUSED, - unsigned int parseFlags ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED, - void *parseOpaque ATTRIBUTE_UNUSED) +virVMXDomainDefPostParse(virDomainDefPtr 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) { return 0; } =20 static int -virVMXDomainDevicesDefPostParse(virDomainDeviceDefPtr dev ATTRIBUTE_UNUSED, - const virDomainDef *def ATTRIBUTE_UNUSED, - virCapsPtr caps ATTRIBUTE_UNUSED, - unsigned int parseFlags ATTRIBUTE_UNUSED, - void *opaque ATTRIBUTE_UNUSED, - void *parseOpaque ATTRIBUTE_UNUSED) +virVMXDomainDevicesDefPostParse(virDomainDeviceDefPtr dev G_GNUC_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) { return 0; } @@ -1238,7 +1238,7 @@ struct virVMXConfigScanResults { =20 static int virVMXConfigScanResultsCollector(const char* name, - virConfValuePtr value ATTRIBUTE_UNUSED, + virConfValuePtr value G_GNUC_UNUSED, void *opaque) { struct virVMXConfigScanResults *results =3D opaque; --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 10:00:01 2024 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=1571059067; cv=none; d=zoho.com; s=zohoarc; b=odXEY7lnNaSaEvQVSdoZydZL6SyRdtReNt7maXDOVO3sxZSBTZqvlD83e77ICNHoyjBTGaVWabWfCII5aHzJkUSF8ETojHAkXIE/bx1QW7BeWzQPrxGkMFMStrMv75YDF+bDQsamzXG5Zlh+H13vvhe/TzMjP/dUYH4VIY3eJZU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571059067; 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=uCuNzjJryGP5HvoeXFsy3F2FErFCDMyEJiGJm1LN2L8=; b=YLRa+EdcNC+QGUwUbL9nCoQLhK8+nJsrU81Tu4Y60R+Stj9C+6qOmpDEOldkgxl74mT7TaY+lL3QMlS0SWhgbFU9l5JLL1mxOIzVMM+8arGyG54fIBjSbJJZEJRTfNpLL0DMAzAf+STbrnh9fNSRwAeTPm6FI02shO6/Bwzeayw= 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 1571059067483191.3465718488021; Mon, 14 Oct 2019 06:17:47 -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 BAF1711A38; Mon, 14 Oct 2019 13:17:45 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 843C880A6; Mon, 14 Oct 2019 13:17:45 +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 2B9F06B4A9; Mon, 14 Oct 2019 13:17:45 +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 x9EDGkWv017610 for ; Mon, 14 Oct 2019 09:16:46 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3ED6060126; Mon, 14 Oct 2019 13:16:46 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id BC4FB600CD for ; Mon, 14 Oct 2019 13:16:45 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Mon, 14 Oct 2019 15:15:51 +0200 Message-Id: <1770c6091b7de941346e0553c7bd8e616f86b867.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 33/35] syntax-check: check for G_GNUC_UNUSED instead of ATTRIBUTE_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.28]); Mon, 14 Oct 2019 13:17:46 +0000 (UTC) Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- build-aux/syntax-check.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index f4712c24c3..c220dadd6c 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -370,7 +370,7 @@ sc_flags_usage: | $(GREP) -c '\(long\|unsigned\) flags')" !=3D 4 && \ { echo '$(ME): new API should use "unsigned int flags"' 1>&2; \ exit 1; } || : - @prohibit=3D' flags ATTRIBUTE_UNUSED' \ + @prohibit=3D' flags G_GNUC_UNUSED' \ exclude=3D'virSecurityDomainImageLabelFlags' \ halt=3D'flags should be checked with virCheckFlags' \ $(_sc_search_regexp) @@ -620,12 +620,12 @@ sc_prohibit_return_as_function: halt=3D'avoid extra () with return statements' \ $(_sc_search_regexp) =20 -# ATTRIBUTE_UNUSED should only be applied in implementations, not +# G_GNUC_UNUSED should only be applied in implementations, not # header declarations -sc_avoid_attribute_unused_in_header: - @prohibit=3D'^[^#]*ATTRIBUTE_UNUSED([^:]|$$)' \ +sc_avoid_g_gnuc_unused_in_header: + @prohibit=3D'^[^#]*G_GNUC_UNUSED([^:]|$$)' \ in_vc_files=3D'\.h$$' \ - halt=3D'use ATTRIBUTE_UNUSED in .c rather than .h files' \ + halt=3D'use G_GNUC_UNUSED in .c rather than .h files' \ $(_sc_search_regexp) =20 sc_prohibit_int_index: @@ -2295,7 +2295,7 @@ exclude_file_name_regexp--sc_prohibit_int_ijk =3D \ exclude_file_name_regexp--sc_prohibit_unsigned_pid =3D \ ^(include/libvirt/.*\.h|src/(qemu/qemu_driver\.c|driver-hypervisor\.h|li= bvirt(-[a-z]*)?\.c|.*\.x|util/vir(polkit|systemd)\.c)|tests/virpolkittest\.= c|tools/virsh-domain\.c)$$ =20 -exclude_file_name_regexp--sc_avoid_attribute_unused_in_header =3D \ +exclude_file_name_regexp--sc_avoid_g_gnuc_unused_in_header =3D \ ^(src/util/virlog\.h|src/network/bridge_driver\.h)$$ =20 exclude_file_name_regexp--sc_prohibit_mixed_case_abbreviations =3D \ --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 10:00:01 2024 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=1571059227; cv=none; d=zoho.com; s=zohoarc; b=OVdN0DgcPoHvODGmd4w10CLewvHx29g99xyzvBNHiZF9HqtSG5fBZstSDYhm1YTDzg1owL2SEN8B0MJwYuK5s8xS8nOwLS063AhDgxH4LOgac3cXehGEBydXqLwU7MdDfX4NiM2VVh8p4Np2Ql+xz0XICrg2opktZ2UMq/c6rBQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571059227; 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=25/SWyjYh6GiuqvNNnzx/gRNpd8/YNUbMz/h7A55u94=; b=WbGa2kKxeqeOMB4NhDaUXBaKmIn1p5P7Wvu5RK2+xKrwXVdqGXo0oTD0/nlFDRl/Vx791aG21clgTj9QqY7bZ/1yS2tcd4Bk/bqRe2cr7tf2GoCQaQn/C3shjwHO0gQ1IhBw1KwiZfztsswKsLuRX8pWhcPG6eeT4Gu0EnK6rNM= 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 1571059227047220.5945102769574; Mon, 14 Oct 2019 06:20:27 -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 56F8B44BD7; Mon, 14 Oct 2019 13:20:25 +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 211D0608C2; Mon, 14 Oct 2019 13:20:25 +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 CC35B180B780; Mon, 14 Oct 2019 13:20:24 +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 x9EDGl8c017620 for ; Mon, 14 Oct 2019 09:16:47 -0400 Received: by smtp.corp.redhat.com (Postfix) id 0D78C60126; Mon, 14 Oct 2019 13:16:47 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8B139600CD for ; Mon, 14 Oct 2019 13:16:46 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Mon, 14 Oct 2019 15:15:52 +0200 Message-Id: <55d3f454ef9f3db522b91d72ad5be73c0ed027f6.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 34/35] gendispatch: generate G_GNUC_UNUSED instead of ATTRIBUTE_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.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.30]); Mon, 14 Oct 2019 13:20:26 +0000 (UTC) Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/rpc/gendispatch.pl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl index 9d3cc5b145..5d1583980e 100755 --- a/src/rpc/gendispatch.pl +++ b/src/rpc/gendispatch.pl @@ -487,8 +487,8 @@ elsif ($mode eq "server") { my $argtype =3D $call->{args}; my $rettype =3D $call->{ret}; =20 - my $argann =3D $argtype ne "void" ? "" : " ATTRIBUTE_UNUSED"; - my $retann =3D $rettype ne "void" ? "" : " ATTRIBUTE_UNUSED"; + my $argann =3D $argtype ne "void" ? "" : " G_GNUC_UNUSED"; + my $retann =3D $rettype ne "void" ? "" : " G_GNUC_UNUSED"; =20 # First we print out a function declaration for the # real dispatcher body @@ -1027,9 +1027,9 @@ elsif ($mode eq "server") { =20 # print functions signature print "static int $name(\n"; - print " virNetServerPtr server ATTRIBUTE_UNUSED,\n"; + print " virNetServerPtr server G_GNUC_UNUSED,\n"; print " virNetServerClientPtr client,\n"; - print " virNetMessagePtr msg ATTRIBUTE_UNUSED,\n"; + print " virNetMessagePtr msg G_GNUC_UNUSED,\n"; print " virNetMessageErrorPtr rerr"; if ($argtype ne "void") { print ",\n $argtype *args"; --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 10:00:01 2024 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=1571059230; cv=none; d=zoho.com; s=zohoarc; b=m5XtbsOpL75/cqHBAJHV5Xr3IGY/njpNyxUo5olYQkVf8PqHFGFpXEF1B9YMg+JgFImmyCTKUF+nOLFxRvEENeXMelkYlU77MRsZtgr+aexWA0vj6iAlV85TV+uouNWzqlP5L1KC0+3C9zbV18BnJ04Xon73l5ID/W7qbEPc4VY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571059230; 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=jMHff39AnlwqamiiJ5m83wI04NEkqtW7Ko3PSINAzHI=; b=c98ciulouKBbCFGNkrOqDYpDThXCNkniwfDs2nKyPXTjslrCeiANMtH0pPua7VJS6l8p6WLFmpI/RjR256XGXGYcxT7ktctxCHc6HXLleeAgjH3eCQ9dbzON/ZXgu10igr8kvm7lMPQ6RPdN0o20tipUij9s/1sr+tS5oRv3D8c= 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 1571059230697448.30964757599656; Mon, 14 Oct 2019 06:20:30 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 11574793CC; Mon, 14 Oct 2019 13:20:29 +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 DF0335C890; Mon, 14 Oct 2019 13:20:28 +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 97E17180BAA0; Mon, 14 Oct 2019 13:20:28 +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 x9EDGlun017630 for ; Mon, 14 Oct 2019 09:16:47 -0400 Received: by smtp.corp.redhat.com (Postfix) id D221060126; Mon, 14 Oct 2019 13:16:47 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5BE0E600CD for ; Mon, 14 Oct 2019 13:16:47 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Mon, 14 Oct 2019 15:15:53 +0200 Message-Id: <34c3d454b96d747af97fe55e130f6a7f4d5a92d3.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 35/35] internal: remove no longer used ATTRIBUTE macros 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.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Mon, 14 Oct 2019 13:20:29 +0000 (UTC) Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- docs/apibuild.py | 2 -- src/internal.h | 31 ------------------------------- 2 files changed, 33 deletions(-) diff --git a/docs/apibuild.py b/docs/apibuild.py index b11d3fd5a9..4f0d170975 100755 --- a/docs/apibuild.py +++ b/docs/apibuild.py @@ -71,8 +71,6 @@ admin_included_files =3D { } =20 ignored_words =3D { - "ATTRIBUTE_UNUSED": (0, "macro keyword"), - "ATTRIBUTE_SENTINEL": (0, "macro keyword"), "G_GNUC_UNUSED": (0, "macro keyword"), "G_GNUC_NULL_TERMINATED": (0, "macro keyword"), "VIR_DEPRECATED": (0, "macro keyword"), diff --git a/src/internal.h b/src/internal.h index 56e99241b0..7737d9a209 100644 --- a/src/internal.h +++ b/src/internal.h @@ -93,33 +93,6 @@ #define NUL_TERMINATE(buf) do { (buf)[sizeof(buf)-1] =3D '\0'; } while (0) #define ARRAY_CARDINALITY(Array) (sizeof(Array) / sizeof(*(Array))) =20 -/** - * ATTRIBUTE_UNUSED: - * - * Macro to flag consciously unused parameters to functions - */ -#ifndef ATTRIBUTE_UNUSED -# define ATTRIBUTE_UNUSED __attribute__((__unused__)) -#endif - -/** - * ATTRIBUTE_NORETURN: - * - * Macro to indicate that a function won't return to the caller - */ -#ifndef ATTRIBUTE_NORETURN -# define ATTRIBUTE_NORETURN __attribute__((__noreturn__)) -#endif - -/** - * ATTRIBUTE_SENTINEL: - * - * Macro to check for NULL-terminated varargs lists - */ -#ifndef ATTRIBUTE_SENTINEL -# define ATTRIBUTE_SENTINEL __attribute__((__sentinel__)) -#endif - /** * ATTRIBUTE_NOINLINE: * @@ -150,10 +123,6 @@ # endif #endif =20 -#ifndef ATTRIBUTE_RETURN_CHECK -# define ATTRIBUTE_RETURN_CHECK __attribute__((__warn_unused_result__)) -#endif - /** * ATTRIBUTE_PACKED * --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list From nobody Sun May 5 10:00:01 2024 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=1571068089; cv=none; d=zoho.com; s=zohoarc; b=Lhx7Ef1p5DE8fSmDBnT/pNfca0Px5P6a2LMeAy/1UiaL2jYJyxJRW7gCiIGCn3jLXiIQnlYQIs7wXnrLmeY+/tLvaNzbHdi4Zbv4mUqOis0x7a40QUk1xaAG32Sb5w7cPpT/0Y2fMsoT2TYSo8/kS79M2F7b4hQWbWqEO4vZS8o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1571068089; 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=2cuVLHVHM+TUj3EBQpZn0bPTbFJmSu9Te5CdUe9y3Jk=; b=UDNhtxECFQdbgOMpeuqQHqolIVRqXX1GjK4rncXRVZrxJmhpMcjdKvG0pRoAv6VCniSISHXiYzjourl7s7VxTuqNA3sO3Sw2cTr7/OtSWFrLESTvp4yEVVZxjg0w0Z6YLyfnVEltGPjfCFTeGPsihuz1VLmS2FI6FoLgKq0rU9s= 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 1571068089572438.14872700643707; Mon, 14 Oct 2019 08:48:09 -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 590703B717; Mon, 14 Oct 2019 15:48:06 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 86D044513; Mon, 14 Oct 2019 15:48:04 +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 C17F04EE68; Mon, 14 Oct 2019 15:47:59 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x9EFlqi9025045 for ; Mon, 14 Oct 2019 11:47:52 -0400 Received: by smtp.corp.redhat.com (Postfix) id 22B715D6A9; Mon, 14 Oct 2019 15:47:52 +0000 (UTC) Received: from icr.brq.redhat.com (unknown [10.43.2.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9FFE35D6A7 for ; Mon, 14 Oct 2019 15:47:49 +0000 (UTC) From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Date: Mon, 14 Oct 2019 17:47:45 +0200 Message-Id: <3d239911407205ea239582caa24b6f0f5f007c7b.1571068052.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-loop: libvir-list@redhat.com Subject: [libvirt] [PATCH 36/35] syntax-check: forbid ATTRIBUTE macros with a GLib replacement 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.30]); Mon, 14 Oct 2019 15:48:07 +0000 (UTC) Signed-off-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- build-aux/syntax-check.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/build-aux/syntax-check.mk b/build-aux/syntax-check.mk index c220dadd6c..c30d575e77 100644 --- a/build-aux/syntax-check.mk +++ b/build-aux/syntax-check.mk @@ -628,6 +628,12 @@ sc_avoid_g_gnuc_unused_in_header: halt=3D'use G_GNUC_UNUSED in .c rather than .h files' \ $(_sc_search_regexp) =20 +sc_prohibit_attribute_macros: + @prohibit=3D'ATTRIBUTE_(UNUSED|NORETURN|SENTINEL|RETURN_CHECK)' \ + in_vc_files=3D'\.[ch]$$' \ + halt=3D'use GLib macros: G_GNUC_{UNUSED,NORETURN,NULL_TERMINATED,WARN_UNU= SED_RESULT}' \ + $(_sc_search_regexp) + sc_prohibit_int_index: @prohibit=3D'\<(int|unsigned)\s*\*?index\>(\s|,|;)' \ halt=3D'use different name than 'index' for declaration' \ --=20 2.19.2 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list