bhyve: use G_GNUC_UNUSED

Use G_GNUC_UNUSED from GLib instead of ATTRIBUTE_UNUSED.

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

diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c
index 219e2b8d9ef1b25f2731d7eb8fabdd2cd4aa56b1..912cf996835461a3e90ffd182eb18bb655d6c39b 100644 (file)
--- a/src/bhyve/bhyve_command.c
+++ b/src/bhyve/bhyve_command.c
@@ -286,7 +286,7 @@ bhyveBuildUSBControllerArgStr(const virDomainDef *def,
 }
 
 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 ATTRIBUTE_UNUSED,
 }
 
 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,
 }
 
 virCommandPtr
-virBhyveProcessBuildDestroyCmd(bhyveConnPtr driver ATTRIBUTE_UNUSED,
+virBhyveProcessBuildDestroyCmd(bhyveConnPtr driver G_GNUC_UNUSED,
                                virDomainDefPtr def)
 {
     virCommandPtr cmd = virCommandNew(BHYVECTL);

diff --git a/src/bhyve/bhyve_device.c b/src/bhyve/bhyve_device.c
index 201044d9e620d1340e029433f6067587a9e4086c..4913be8422872db7c9c50380c33e05e81cc97f82 100644 (file)
--- a/src/bhyve/bhyve_device.c
+++ b/src/bhyve/bhyve_device.c
@@ -31,8 +31,8 @@
 VIR_LOG_INIT("bhyve.bhyve_device");
 
 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 ed281d7c683630bc2740285c72300b927c5411ab..bc506bad6647a71a9c16e5706b64ff4fd1a69273 100644 (file)
--- a/src/bhyve/bhyve_domain.c
+++ b/src/bhyve/bhyve_domain.c
@@ -32,7 +32,7 @@
 VIR_LOG_INIT("bhyve.bhyve_domain");
 
 static void *
-bhyveDomainObjPrivateAlloc(void *opaque ATTRIBUTE_UNUSED)
+bhyveDomainObjPrivateAlloc(void *opaque G_GNUC_UNUSED)
 {
     bhyveDomainObjPrivatePtr priv;
 
@@ -74,10 +74,10 @@ bhyveDomainDefNeedsISAController(virDomainDefPtr def)
 
 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 = virDiskNameToIndex(def->dst);
 
@@ -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 = opaque;
 
@@ -156,10 +156,10 @@ bhyveDomainDeviceDefPostParse(virDomainDeviceDefPtr dev,
 
 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 fb0996bd2a77109a7b2d24fc75a510755927be47..52e1895052e2c6a5c0dcf2f811afbd749bc580dd 100644 (file)
--- a/src/bhyve/bhyve_driver.c
+++ b/src/bhyve/bhyve_driver.c
@@ -191,8 +191,8 @@ bhyveConnectURIProbe(char **uri)
 
 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)
 
 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)
 
 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 = true;
 
@@ -1550,20 +1550,20 @@ bhyveConnectGetType(virConnectPtr conn)
     return "BHYVE";
 }
 
-static int bhyveConnectIsAlive(virConnectPtr conn ATTRIBUTE_UNUSED)
+static int bhyveConnectIsAlive(virConnectPtr conn G_GNUC_UNUSED)
 {
     return 1;
 }
 
 static int
-bhyveConnectIsSecure(virConnectPtr conn ATTRIBUTE_UNUSED)
+bhyveConnectIsSecure(virConnectPtr conn G_GNUC_UNUSED)
 {
     /* Trivially secure, since always inside the daemon */
     return 1;
 }
 
 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 faf1ebe5f5e0d834cc765323feefa844a9ff61e8..ad6977e56260f74d88a6db50d8fd6e34e38dcf67 100644 (file)
--- a/src/bhyve/bhyve_monitor.c
+++ b/src/bhyve/bhyve_monitor.c
@@ -44,7 +44,7 @@ struct _bhyveMonitor {
 };
 
 static void
-bhyveMonitorIO(int watch, int kq, int events ATTRIBUTE_UNUSED, void *opaque)
+bhyveMonitorIO(int watch, int kq, int events G_GNUC_UNUSED, void *opaque)
 {
     const struct timespec zerowait = { 0, 0 };
     virDomainObjPtr vm = opaque;

diff --git a/src/bhyve/bhyve_parse_command.c b/src/bhyve/bhyve_parse_command.c
index c9800b7a062f48d45b13e1a8c052b34189f71713..7c72651b0097f614e63ae500b61faaba0356cdb7 100644 (file)
--- a/src/bhyve/bhyve_parse_command.c
+++ b/src/bhyve/bhyve_parse_command.c
@@ -263,7 +263,7 @@ bhyveCommandLineToArgv(const char *nativeConfig,
 
 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,
 
 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,
 
 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 5fea2eb51c1692bb501ae842688a08fd92f57759..5193f6e61229f9a0306a2c3467e925d0971a01ca 100644 (file)
--- a/src/bhyve/bhyve_process.c
+++ b/src/bhyve/bhyve_process.c
@@ -55,7 +55,7 @@ VIR_LOG_INIT("bhyve.bhyve_process");
 
 static void
 bhyveProcessAutoDestroy(virDomainObjPtr vm,
-                        virConnectPtr conn ATTRIBUTE_UNUSED,
+                        virConnectPtr conn G_GNUC_UNUSED,
                         void *opaque)
 {
     bhyveConnPtr driver = opaque;