From nobody Mon Dec 15 03:09:03 2025 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 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1520871724101222.02630306811272; Mon, 12 Mar 2018 09:22:04 -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 52D248051A; Mon, 12 Mar 2018 16:22:02 +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 21EBC17B60; Mon, 12 Mar 2018 16:22:02 +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 60ADE180BAD3; Mon, 12 Mar 2018 16:22:01 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w2CGLo83024935 for ; Mon, 12 Mar 2018 12:21:50 -0400 Received: by smtp.corp.redhat.com (Postfix) id 32BDE2166BB2; Mon, 12 Mar 2018 16:21:50 +0000 (UTC) Received: from antique-work.brq.redhat.com (unknown [10.43.2.152]) by smtp.corp.redhat.com (Postfix) with ESMTP id B199D215CDA7 for ; Mon, 12 Mar 2018 16:21:49 +0000 (UTC) From: Pavel Hrdina To: libvir-list@redhat.com Date: Mon, 12 Mar 2018 17:21:31 +0100 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-loop: libvir-list@redhat.com Subject: [libvirt] [dbus PATCH 01/18] util: rename VIR_ATTR_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: , MIME-Version: 1.0 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.27]); Mon, 12 Mar 2018 16:22:02 +0000 (UTC) X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The correct prefix is VIRT. Signed-off-by: Pavel Hrdina Reviewed-by: Daniel P. Berrang=C3=A9 --- src/connect.c | 8 +++--- src/domain.c | 78 +++++++++++++++++++++++++++++--------------------------= ---- src/events.c | 12 ++++----- src/main.c | 12 ++++----- src/util.h | 3 ++- 5 files changed, 57 insertions(+), 56 deletions(-) diff --git a/src/connect.c b/src/connect.c index 360f922..b44d247 100644 --- a/src/connect.c +++ b/src/connect.c @@ -17,8 +17,8 @@ static int virtDBusConnectCredType[] =3D { }; =20 static int -virtDBusConnectAuthCallback(virConnectCredentialPtr cred VIR_ATTR_UNUSED, - unsigned int ncred VIR_ATTR_UNUSED, +virtDBusConnectAuthCallback(virConnectCredentialPtr cred VIRT_ATTR_UNUSED, + unsigned int ncred VIRT_ATTR_UNUSED, void *cbdata) { sd_bus_error *error =3D cbdata; @@ -78,8 +78,8 @@ virtDBusConnectOpen(virtDBusConnect *connect, } =20 static int -virtDBusConnectEnumarateDomains(sd_bus *bus VIR_ATTR_UNUSED, - const char *path VIR_ATTR_UNUSED, +virtDBusConnectEnumarateDomains(sd_bus *bus VIRT_ATTR_UNUSED, + const char *path VIRT_ATTR_UNUSED, void *userdata, char ***nodes, sd_bus_error *error) diff --git a/src/domain.c b/src/domain.c index 33ed2b3..ebcd142 100644 --- a/src/domain.c +++ b/src/domain.c @@ -5,13 +5,13 @@ #include =20 static int -virtDBusDomainGetName(sd_bus *bus VIR_ATTR_UNUSED, +virtDBusDomainGetName(sd_bus *bus VIRT_ATTR_UNUSED, const char *path, - const char *interface VIR_ATTR_UNUSED, - const char *property VIR_ATTR_UNUSED, + const char *interface VIRT_ATTR_UNUSED, + const char *property VIRT_ATTR_UNUSED, sd_bus_message *reply, void *userdata, - sd_bus_error *error VIR_ATTR_UNUSED) + sd_bus_error *error VIRT_ATTR_UNUSED) { virtDBusConnect *connect =3D userdata; _cleanup_(virtDBusUtilVirDomainFreep) virDomainPtr domain =3D NULL; @@ -30,13 +30,13 @@ virtDBusDomainGetName(sd_bus *bus VIR_ATTR_UNUSED, } =20 static int -virtDBusDomainGetUUID(sd_bus *bus VIR_ATTR_UNUSED, +virtDBusDomainGetUUID(sd_bus *bus VIRT_ATTR_UNUSED, const char *path, - const char *interface VIR_ATTR_UNUSED, - const char *property VIR_ATTR_UNUSED, + const char *interface VIRT_ATTR_UNUSED, + const char *property VIRT_ATTR_UNUSED, sd_bus_message *reply, void *userdata, - sd_bus_error *error VIR_ATTR_UNUSED) + sd_bus_error *error VIRT_ATTR_UNUSED) { virtDBusConnect *connect =3D userdata; _cleanup_(virtDBusUtilVirDomainFreep) virDomainPtr domain =3D NULL; @@ -53,13 +53,13 @@ virtDBusDomainGetUUID(sd_bus *bus VIR_ATTR_UNUSED, } =20 static int -virtDBusDomainGetId(sd_bus *bus VIR_ATTR_UNUSED, +virtDBusDomainGetId(sd_bus *bus VIRT_ATTR_UNUSED, const char *path, - const char *interface VIR_ATTR_UNUSED, - const char *property VIR_ATTR_UNUSED, + const char *interface VIRT_ATTR_UNUSED, + const char *property VIRT_ATTR_UNUSED, sd_bus_message *reply, void *userdata, - sd_bus_error *error VIR_ATTR_UNUSED) + sd_bus_error *error VIRT_ATTR_UNUSED) { virtDBusConnect *connect =3D userdata; _cleanup_(virtDBusUtilVirDomainFreep) virDomainPtr domain =3D NULL; @@ -73,13 +73,13 @@ virtDBusDomainGetId(sd_bus *bus VIR_ATTR_UNUSED, } =20 static int -virtDBusDomainGetVcpus(sd_bus *bus VIR_ATTR_UNUSED, +virtDBusDomainGetVcpus(sd_bus *bus VIRT_ATTR_UNUSED, const char *path, - const char *interface VIR_ATTR_UNUSED, - const char *property VIR_ATTR_UNUSED, + const char *interface VIRT_ATTR_UNUSED, + const char *property VIRT_ATTR_UNUSED, sd_bus_message *reply, void *userdata, - sd_bus_error *error VIR_ATTR_UNUSED) + sd_bus_error *error VIRT_ATTR_UNUSED) { virtDBusConnect *connect =3D userdata; _cleanup_(virtDBusUtilVirDomainFreep) virDomainPtr domain =3D NULL; @@ -93,13 +93,13 @@ virtDBusDomainGetVcpus(sd_bus *bus VIR_ATTR_UNUSED, } =20 static int -virtDBusDomainGetOsType(sd_bus *bus VIR_ATTR_UNUSED, +virtDBusDomainGetOsType(sd_bus *bus VIRT_ATTR_UNUSED, const char *path, - const char *interface VIR_ATTR_UNUSED, - const char *property VIR_ATTR_UNUSED, + const char *interface VIRT_ATTR_UNUSED, + const char *property VIRT_ATTR_UNUSED, sd_bus_message *reply, void *userdata, - sd_bus_error *error VIR_ATTR_UNUSED) + sd_bus_error *error VIRT_ATTR_UNUSED) { virtDBusConnect *connect =3D userdata; _cleanup_(virtDBusUtilVirDomainFreep) virDomainPtr domain =3D NULL; @@ -118,13 +118,13 @@ virtDBusDomainGetOsType(sd_bus *bus VIR_ATTR_UNUSED, } =20 static int -virtDBusDomainGetActive(sd_bus *bus VIR_ATTR_UNUSED, +virtDBusDomainGetActive(sd_bus *bus VIRT_ATTR_UNUSED, const char *path, - const char *interface VIR_ATTR_UNUSED, - const char *property VIR_ATTR_UNUSED, + const char *interface VIRT_ATTR_UNUSED, + const char *property VIRT_ATTR_UNUSED, sd_bus_message *reply, void *userdata, - sd_bus_error *error VIR_ATTR_UNUSED) + sd_bus_error *error VIRT_ATTR_UNUSED) { virtDBusConnect *connect =3D userdata; _cleanup_(virtDBusUtilVirDomainFreep) virDomainPtr domain =3D NULL; @@ -143,13 +143,13 @@ virtDBusDomainGetActive(sd_bus *bus VIR_ATTR_UNUSED, } =20 static int -virtDBusDomainGetPersistent(sd_bus *bus VIR_ATTR_UNUSED, +virtDBusDomainGetPersistent(sd_bus *bus VIRT_ATTR_UNUSED, const char *path, - const char *interface VIR_ATTR_UNUSED, - const char *property VIR_ATTR_UNUSED, + const char *interface VIRT_ATTR_UNUSED, + const char *property VIRT_ATTR_UNUSED, sd_bus_message *reply, void *userdata, - sd_bus_error *error VIR_ATTR_UNUSED) + sd_bus_error *error VIRT_ATTR_UNUSED) { virtDBusConnect *connect =3D userdata; _cleanup_(virtDBusUtilVirDomainFreep) virDomainPtr domain =3D NULL; @@ -168,13 +168,13 @@ virtDBusDomainGetPersistent(sd_bus *bus VIR_ATTR_UNUS= ED, } =20 static int -virtDBusDomainGetState(sd_bus *bus VIR_ATTR_UNUSED, +virtDBusDomainGetState(sd_bus *bus VIRT_ATTR_UNUSED, const char *path, - const char *interface VIR_ATTR_UNUSED, - const char *property VIR_ATTR_UNUSED, + const char *interface VIRT_ATTR_UNUSED, + const char *property VIRT_ATTR_UNUSED, sd_bus_message *reply, void *userdata, - sd_bus_error *error VIR_ATTR_UNUSED) + sd_bus_error *error VIRT_ATTR_UNUSED) { virtDBusConnect *connect =3D userdata; _cleanup_(virtDBusUtilVirDomainFreep) virDomainPtr domain =3D NULL; @@ -220,13 +220,13 @@ virtDBusDomainGetState(sd_bus *bus VIR_ATTR_UNUSED, } =20 static int -virtDBusDomainGetAutostart(sd_bus *bus VIR_ATTR_UNUSED, +virtDBusDomainGetAutostart(sd_bus *bus VIRT_ATTR_UNUSED, const char *path, - const char *interface VIR_ATTR_UNUSED, - const char *property VIR_ATTR_UNUSED, + const char *interface VIRT_ATTR_UNUSED, + const char *property VIRT_ATTR_UNUSED, sd_bus_message *reply, void *userdata, - sd_bus_error *error VIR_ATTR_UNUSED) + sd_bus_error *error VIRT_ATTR_UNUSED) { virtDBusConnect *connect =3D userdata; _cleanup_(virtDBusUtilVirDomainFreep) virDomainPtr domain =3D NULL; @@ -522,12 +522,12 @@ static const sd_bus_vtable virt_domain_vtable[] =3D { }; =20 static int -virtDBusDomainLookup(sd_bus *bus VIR_ATTR_UNUSED, +virtDBusDomainLookup(sd_bus *bus VIRT_ATTR_UNUSED, const char *path, - const char *interface VIR_ATTR_UNUSED, + const char *interface VIRT_ATTR_UNUSED, void *userdata, void **found, - sd_bus_error *error VIR_ATTR_UNUSED) + sd_bus_error *error VIRT_ATTR_UNUSED) { virtDBusConnect *connect =3D userdata; _cleanup_(virtDBusUtilFreep) char *name =3D NULL; diff --git a/src/events.c b/src/events.c index 05d5940..ca1418b 100644 --- a/src/events.c +++ b/src/events.c @@ -6,10 +6,10 @@ #include =20 static int -virtDBusEventsDomainLifecycle(virConnectPtr connection VIR_ATTR_UNUSED, +virtDBusEventsDomainLifecycle(virConnectPtr connection VIRT_ATTR_UNUSED, virDomainPtr domain, int event, - int detail VIR_ATTR_UNUSED, + int detail VIRT_ATTR_UNUSED, void *opaque) { virtDBusConnect *connect =3D opaque; @@ -70,7 +70,7 @@ virtDBusEventsDomainLifecycle(virConnectPtr connection VI= R_ATTR_UNUSED, } =20 static int -virtDBusEventsDomainDeviceAdded(virConnectPtr connection VIR_ATTR_UNUSED, +virtDBusEventsDomainDeviceAdded(virConnectPtr connection VIRT_ATTR_UNUSED, virDomainPtr domain, const char *device, void *opaque) @@ -98,7 +98,7 @@ virtDBusEventsDomainDeviceAdded(virConnectPtr connection = VIR_ATTR_UNUSED, } =20 static int -virtDBusEventsDomainDeviceRemoved(virConnectPtr connection VIR_ATTR_UNUSED, +virtDBusEventsDomainDeviceRemoved(virConnectPtr connection VIRT_ATTR_UNUSE= D, virDomainPtr domain, const char *device, void *opaque) @@ -126,7 +126,7 @@ virtDBusEventsDomainDeviceRemoved(virConnectPtr connect= ion VIR_ATTR_UNUSED, } =20 static int -virtDBusEventsDomainDiskChange(virConnectPtr connection VIR_ATTR_UNUSED, +virtDBusEventsDomainDiskChange(virConnectPtr connection VIRT_ATTR_UNUSED, virDomainPtr domain, const char *device, int reason, @@ -168,7 +168,7 @@ virtDBusEventsDomainDiskChange(virConnectPtr connection= VIR_ATTR_UNUSED, } =20 static int -virtDBusEventsDomainTrayChange(virConnectPtr connection VIR_ATTR_UNUSED, +virtDBusEventsDomainTrayChange(virConnectPtr connection VIRT_ATTR_UNUSED, virDomainPtr domain, const char *old_src_path, const char *new_src_path, diff --git a/src/main.c b/src/main.c index d41970a..e0f9434 100644 --- a/src/main.c +++ b/src/main.c @@ -55,18 +55,18 @@ virtDBusVirEventRemoveHandlep(int *watchp) } =20 static void -virtDBusHandleSignal(int watch VIR_ATTR_UNUSED, - int fd VIR_ATTR_UNUSED, - int events VIR_ATTR_UNUSED, - void *opaque VIR_ATTR_UNUSED) +virtDBusHandleSignal(int watch VIRT_ATTR_UNUSED, + int fd VIRT_ATTR_UNUSED, + int events VIRT_ATTR_UNUSED, + void *opaque VIRT_ATTR_UNUSED) { loop_status =3D -ECANCELED; } =20 static void virtDBusHandleBusEvent(int watch, - int fd VIR_ATTR_UNUSED, - int events VIR_ATTR_UNUSED, + int fd VIRT_ATTR_UNUSED, + int events VIRT_ATTR_UNUSED, void *opaque) { sd_bus *bus =3D opaque; diff --git a/src/util.h b/src/util.h index fcbcf8e..9779d29 100644 --- a/src/util.h +++ b/src/util.h @@ -6,7 +6,8 @@ #include =20 #define _cleanup_(_x) __attribute__((__cleanup__(_x))) -#define VIR_ATTR_UNUSED __attribute__((__unused__)) + +#define VIRT_ATTR_UNUSED __attribute__((__unused__)) =20 #define VIRT_N_ELEMENTS(array) (sizeof(array) / sizeof(*(array))) =20 --=20 2.14.3 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list