qemu: 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/qemu/qemu_block.c b/src/qemu/qemu_block.c
index eacb48aa7873435c1e402315fbc66b2f24aa0b53..599ca629e0b03e459e352f4578e7c26c6be351ab 100644 (file)
--- a/src/qemu/qemu_block.c
+++ b/src/qemu/qemu_block.c
@@ -51,7 +51,7 @@ qemuBlockNodeNameValidate(const char *nn)
 
 
 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,
 
 static void
 qemuBlockNodeNameBackingChainDataHashEntryFree(void *opaque,
-                                               const void *name ATTRIBUTE_UNUSED)
+                                               const void *name G_GNUC_UNUSED)
 {
     qemuBlockNodeNameBackingChainDataFree(opaque);
 }
@@ -192,7 +192,7 @@ qemuBlockNodeNameGetBackingChainBacking(virJSONValuePtr next,
 
 
 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 c118f2c298032a4d660a122538374349758d1c34..89c28986b085c3b838852b49a93840144acdd2c0 100644 (file)
--- 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 = payload;
 

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 091e48c7e16242566b4cdf499d432c0d21bd60ff..cbd4ebc8ea094129b360f7daba2e6bb5d6dd60bd 100644 (file)
--- 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 = data;
     char *xml = NULL;
@@ -4940,7 +4940,7 @@ virQEMUCapsCacheLookupCopy(virFileCachePtr cache,
 
 static int
 virQEMUCapsCompareArch(const void *payload,
-                       const void *name ATTRIBUTE_UNUSED,
+                       const void *name G_GNUC_UNUSED,
                        const void *opaque)
 {
     struct virQEMUCapsSearchData *data = (struct virQEMUCapsSearchData *)opaque;

diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c
index 740a1b33dc1184ea9241f23042ae1d4961661106..f1776a7c0b7687fca4630280d4b6b12ccc08bb20 100644 (file)
--- a/src/qemu/qemu_cgroup.c
+++ b/src/qemu/qemu_cgroup.c
@@ -285,7 +285,7 @@ qemuTeardownChrSourceCgroup(virDomainObjPtr vm,
 
 
 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 8856a90ce88493ac2606bc0c55b65265282e04b5..0c4385083b984b23c7abfb7beab06e5e22719478 100644 (file)
--- a/src/qemu/qemu_checkpoint.c
+++ b/src/qemu/qemu_checkpoint.c
@@ -502,7 +502,7 @@ struct virQEMUCheckpointReparent {
 
 static int
 qemuCheckpointReparentChildren(void *payload,
-                               const void *name ATTRIBUTE_UNUSED,
+                               const void *name G_GNUC_UNUSED,
                                void *data)
 {
     virDomainMomentObjPtr moment = payload;

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 0f1625d401a1fbe694985d826a145894d361dcc8..a41156476f0198e3fe819f0dcc21f023880e6424 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -7815,9 +7815,9 @@ qemuBuildMemoryDeviceCommandLine(virCommandPtr cmd,
 
 
 static int
-qemuBuildGraphicsSDLCommandLine(virQEMUDriverConfigPtr cfg ATTRIBUTE_UNUSED,
+qemuBuildGraphicsSDLCommandLine(virQEMUDriverConfigPtr cfg G_GNUC_UNUSED,
                                 virCommandPtr cmd,
-                                virQEMUCapsPtr qemuCaps ATTRIBUTE_UNUSED,
+                                virQEMUCapsPtr qemuCaps G_GNUC_UNUSED,
                                 virDomainGraphicsDefPtr graphics)
 {
     VIR_AUTOCLEAN(virBuffer) opt = VIR_BUFFER_INITIALIZER;
@@ -8243,7 +8243,7 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfigPtr cfg,
 
 
 static int
-qemuBuildGraphicsEGLHeadlessCommandLine(virQEMUDriverConfigPtr cfg ATTRIBUTE_UNUSED,
+qemuBuildGraphicsEGLHeadlessCommandLine(virQEMUDriverConfigPtr cfg G_GNUC_UNUSED,
                                         virCommandPtr cmd,
                                         virQEMUCapsPtr qemuCaps,
                                         virDomainGraphicsDefPtr graphics)
@@ -10180,7 +10180,7 @@ qemuBuildCommandLineValidate(virQEMUDriverPtr driver,
 static int
 qemuBuildSeccompSandboxCommandLine(virCommandPtr cmd,
                                    virQEMUDriverConfigPtr cfg,
-                                   virQEMUCapsPtr qemuCaps ATTRIBUTE_UNUSED)
+                                   virQEMUCapsPtr qemuCaps G_GNUC_UNUSED)
 {
     if (cfg->seccompSandbox == 0) {
         if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SECCOMP_SANDBOX))

diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
index db390d358e1b7b1e2307205a1b89d31ffd256719..4df0ca78f5e46fd5ffcdf072955e807e0dc42908 100644 (file)
--- a/src/qemu/qemu_conf.c
+++ b/src/qemu/qemu_conf.c
@@ -1346,7 +1346,7 @@ struct virQEMUDriverSearchDomcapsData {
 
 static int
 virQEMUDriverSearchDomcaps(const void *payload,
-                           const void *name ATTRIBUTE_UNUSED,
+                           const void *name G_GNUC_UNUSED,
                            const void *opaque)
 {
     virDomainCapsPtr domCaps = (virDomainCapsPtr) payload;
@@ -1551,7 +1551,7 @@ qemuSharedDeviceEntryDomainExists(qemuSharedDeviceEntryPtr entry,
 }
 
 void
-qemuSharedDeviceEntryFree(void *payload, const void *name ATTRIBUTE_UNUSED)
+qemuSharedDeviceEntryFree(void *payload, const void *name G_GNUC_UNUSED)
 {
     qemuSharedDeviceEntryPtr entry = payload;
     size_t i;

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 35067c851fd574f48eef3e929c9474f5db6d527f..a6c95b7208ef32277f0f32d12af45a7033f0ee25 100644 (file)
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -197,7 +197,7 @@ qemuDomainLogContextDispose(void *obj)
 
 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)
 
 
 static void
-qemuDomainVsockPrivateDispose(void *obj ATTRIBUTE_UNUSED)
+qemuDomainVsockPrivateDispose(void *obj G_GNUC_UNUSED)
 {
     qemuDomainVsockPrivatePtr priv = obj;
 
@@ -1333,7 +1333,7 @@ qemuDomainNetworkPrivateNew(void)
 
 
 static void
-qemuDomainNetworkPrivateDispose(void *obj ATTRIBUTE_UNUSED)
+qemuDomainNetworkPrivateDispose(void *obj G_GNUC_UNUSED)
 {
     qemuDomainNetworkPrivatePtr priv = obj;
 
@@ -2076,7 +2076,7 @@ qemuDomainSetPrivatePaths(virQEMUDriverPtr driver,
 
 static void
 dbusVMStateHashFree(void *opaque,
-                    const void *name ATTRIBUTE_UNUSED)
+                    const void *name G_GNUC_UNUSED)
 {
     qemuDBusVMStateFree(opaque);
 }
@@ -2473,7 +2473,7 @@ qemuDomainObjPrivateXMLFormatBlockjobFormatSource(virBufferPtr buf,
 
 static int
 qemuDomainObjPrivateXMLFormatBlockjobIterator(void *payload,
-                                              const void *name ATTRIBUTE_UNUSED,
+                                              const void *name G_GNUC_UNUSED,
                                               void *opaque)
 {
     VIR_AUTOCLEAN(virBuffer) attrBuf = 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,
 
 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,
 
 static int
 qemuDomainDefValidate(const virDomainDef *def,
-                      virCapsPtr caps ATTRIBUTE_UNUSED,
+                      virCapsPtr caps G_GNUC_UNUSED,
                       void *opaque)
 {
     virQEMUDriverPtr driver = opaque;
@@ -5306,7 +5306,7 @@ qemuDomainSmartcardDefValidate(const virDomainSmartcardDef *def)
 
 static int
 qemuDomainRNGDefValidate(const virDomainRNGDef *def,
-                         virQEMUCapsPtr qemuCaps ATTRIBUTE_UNUSED)
+                         virQEMUCapsPtr qemuCaps G_GNUC_UNUSED)
 {
     if (def->backend == VIR_DOMAIN_RNG_BACKEND_EGD &&
         qemuDomainChrSourceDefValidate(def->source.chardev) < 0)
@@ -6879,7 +6879,7 @@ qemuDomainDeviceDefValidateGraphics(const virDomainGraphicsDef *graphics,
 
 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 virDomainIOMMUDef *iommu,
 
 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 != 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 dev,
 
 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,
 
 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,
 
 /* 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 = payload;
@@ -11100,7 +11100,7 @@ qemuDomainGetMemorySizeAlignment(virDomainDefPtr def)
 
 static unsigned long long
 qemuDomainGetMemoryModuleSizeAlignment(const virDomainDef *def,
-                                       const virDomainMemoryDef *mem ATTRIBUTE_UNUSED)
+                                       const virDomainMemoryDef *mem G_GNUC_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,
 
 static int
 qemuDomainPopulateDevices(virQEMUDriverConfigPtr cfg,
-                          virDomainObjPtr vm ATTRIBUTE_UNUSED,
+                          virDomainObjPtr vm G_GNUC_UNUSED,
                           const struct qemuDomainCreateDeviceData *data)
 {
     const char *const *devices = (const char *const *) cfg->cgroupDeviceACL;
@@ -13358,7 +13358,7 @@ qemuDomainSetupDev(virQEMUDriverConfigPtr cfg,
 
 
 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,
 
 
 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 cfg,
 
 
 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 cfg,
 
 
 static int
-qemuDomainSetupChardev(virDomainDefPtr def ATTRIBUTE_UNUSED,
+qemuDomainSetupChardev(virDomainDefPtr def G_GNUC_UNUSED,
                        virDomainChrDefPtr dev,
                        void *opaque)
 {
@@ -13505,7 +13505,7 @@ qemuDomainSetupChardev(virDomainDefPtr def ATTRIBUTE_UNUSED,
 
 
 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 cfg ATTRIBUTE_UNUSED,
 
 
 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 ATTRIBUTE_UNUSED,
 
 
 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 cfg,
 
 
 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,
 
 
 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,
 
 
 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 ATTRIBUTE_UNUSED,
 
 
 static int
-qemuDomainSetupLaunchSecurity(virQEMUDriverConfigPtr cfg ATTRIBUTE_UNUSED,
+qemuDomainSetupLaunchSecurity(virQEMUDriverConfigPtr cfg G_GNUC_UNUSED,
                               virDomainObjPtr vm,
                               const struct qemuDomainCreateDeviceData *data)
 {
@@ -13890,7 +13890,7 @@ qemuDomainCreateNamespace(virQEMUDriverPtr driver,
 
 
 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,
 
 
 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 = opaque;
@@ -14232,12 +14232,12 @@ qemuDomainAttachDeviceMknodRecursive(virQEMUDriverPtr driver,
 
 
 static int
-qemuDomainAttachDeviceMknodRecursive(virQEMUDriverPtr driver ATTRIBUTE_UNUSED,
-                                     virDomainObjPtr vm ATTRIBUTE_UNUSED,
-                                     const char *file ATTRIBUTE_UNUSED,
-                                     char * const *devMountsPath ATTRIBUTE_UNUSED,
-                                     size_t ndevMountsPath ATTRIBUTE_UNUSED,
-                                     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_UNUSED,
+                                     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,
 
 
 static int
-qemuDomainDetachDeviceUnlinkHelper(pid_t pid ATTRIBUTE_UNUSED,
+qemuDomainDetachDeviceUnlinkHelper(pid_t pid G_GNUC_UNUSED,
                                    void *opaque)
 {
     const char *path = opaque;
@@ -14281,7 +14281,7 @@ qemuDomainDetachDeviceUnlinkHelper(pid_t pid ATTRIBUTE_UNUSED,
 
 
 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,
 
 
 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 = NULL;
@@ -14797,7 +14797,7 @@ qemuDomainSaveCookieNew(virDomainObjPtr vm)
 
 
 static int
-qemuDomainSaveCookieParse(xmlXPathContextPtr ctxt ATTRIBUTE_UNUSED,
+qemuDomainSaveCookieParse(xmlXPathContextPtr ctxt G_GNUC_UNUSED,
                           virObjectPtr *obj)
 {
     qemuDomainSaveCookiePtr cookie = NULL;
@@ -15493,7 +15493,7 @@ qemuDomainPausedReasonToSuspendedEvent(virDomainPausedReason reason)
 
 static int
 qemuDomainDefHasManagedPRBlockjobIterator(void *payload,
-                                          const void *name ATTRIBUTE_UNUSED,
+                                          const void *name G_GNUC_UNUSED,
                                           void *opaque)
 {
     qemuBlockJobDataPtr job = payload;

diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c
index ff770c6496bf10e8ed4c69523662f422b84fb9b0..438fa72262b03512a244e80ac35275348f6190b6 100644 (file)
--- a/src/qemu/qemu_domain_address.c
+++ b/src/qemu/qemu_domain_address.c
@@ -163,8 +163,8 @@ qemuDomainAssignVirtioSerialAddresses(virDomainDefPtr def)
 
 
 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 = opaque;
@@ -422,8 +422,8 @@ qemuDomainAssignS390Addresses(virDomainDefPtr def,
 
 
 static int
-qemuDomainHasVirtioMMIODevicesCallback(virDomainDefPtr def ATTRIBUTE_UNUSED,
-                                       virDomainDeviceDefPtr dev ATTRIBUTE_UNUSED,
+qemuDomainHasVirtioMMIODevicesCallback(virDomainDefPtr def G_GNUC_UNUSED,
+                                       virDomainDeviceDefPtr dev G_GNUC_UNUSED,
                                        virDomainDeviceInfoPtr info,
                                        void *opaque)
 {
@@ -1079,7 +1079,7 @@ qemuDomainFillDevicePCIConnectFlagsIterInit(virDomainDefPtr def,
  * Always returns 0 - there is no failure.
  */
 static int
-qemuDomainFillDevicePCIConnectFlagsIter(virDomainDefPtr def ATTRIBUTE_UNUSED,
+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_UNUSED,
+qemuDomainFillDevicePCIExtensionFlagsIter(virDomainDefPtr def G_GNUC_UNUSED,
                                           virDomainDeviceDefPtr dev,
                                           virDomainDeviceInfoPtr info,
                                           void *opaque)
@@ -1184,8 +1184,8 @@ qemuDomainFillAllPCIExtensionFlags(virDomainDefPtr def,
  * Return: 0 if the isolation group is not used by the device, <1 otherwise.
  */
 static int
-qemuDomainFindUnusedIsolationGroupIter(virDomainDefPtr def ATTRIBUTE_UNUSED,
-                                       virDomainDeviceDefPtr dev ATTRIBUTE_UNUSED,
+qemuDomainFindUnusedIsolationGroupIter(virDomainDefPtr def G_GNUC_UNUSED,
+                                       virDomainDeviceDefPtr dev G_GNUC_UNUSED,
                                        virDomainDeviceInfoPtr info,
                                        void *opaque)
 {
@@ -1353,8 +1353,8 @@ qemuDomainFillDeviceIsolationGroup(virDomainDefPtr def,
 static int
 qemuDomainFillDeviceIsolationGroupIter(virDomainDefPtr def,
                                        virDomainDeviceDefPtr dev,
-                                       virDomainDeviceInfoPtr info ATTRIBUTE_UNUSED,
-                                       void *opaque ATTRIBUTE_UNUSED)
+                                       virDomainDeviceInfoPtr info G_GNUC_UNUSED,
+                                       void *opaque G_GNUC_UNUSED)
 {
     return qemuDomainFillDeviceIsolationGroup(def, dev);
 }
@@ -1476,8 +1476,8 @@ qemuDomainPCIAddressReserveNextAddr(virDomainPCIAddressSetPtr addrs,
 
 
 static int
-qemuDomainAssignPCIAddressExtension(virDomainDefPtr def ATTRIBUTE_UNUSED,
-                                    virDomainDeviceDefPtr device ATTRIBUTE_UNUSED,
+qemuDomainAssignPCIAddressExtension(virDomainDefPtr def G_GNUC_UNUSED,
+                                    virDomainDeviceDefPtr device G_GNUC_UNUSED,
                                     virDomainDeviceInfoPtr info,
                                     void *opaque)
 {
@@ -1494,7 +1494,7 @@ qemuDomainAssignPCIAddressExtension(virDomainDefPtr def ATTRIBUTE_UNUSED,
 }
 
 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 ATTRIBUTE_UNUSED,
 }
 
 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 addrs,
 
 
 static int
-qemuDomainAssignUSBPortsCounter(virDomainDeviceInfoPtr info ATTRIBUTE_UNUSED,
+qemuDomainAssignUSBPortsCounter(virDomainDeviceInfoPtr info G_GNUC_UNUSED,
                                 void *opaque)
 {
     struct qemuAssignUSBIteratorInfo *data = opaque;

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index bc0ede2fb0c56b78947ddddae9faeefead6446b0..681b26814b94ec5f7953ab85e71764a47815388a 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -617,7 +617,7 @@ qemuDomainCheckpointLoad(virDomainObjPtr vm,
 
 static int
 qemuDomainNetsRestart(virDomainObjPtr vm,
-                      void *data ATTRIBUTE_UNUSED)
+                      void *data G_GNUC_UNUSED)
 {
     size_t i;
     virDomainDefPtr def = vm->def;
@@ -1226,8 +1226,8 @@ qemuConnectURIProbe(char **uri)
 }
 
 static virDrvOpenStatus qemuConnectOpen(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);
@@ -1300,19 +1300,19 @@ static const char *qemuConnectGetType(virConnectPtr conn) {
 }
 
 
-static int qemuConnectIsSecure(virConnectPtr conn ATTRIBUTE_UNUSED)
+static int qemuConnectIsSecure(virConnectPtr conn G_GNUC_UNUSED)
 {
     /* Trivially secure, since always inside the daemon */
     return 1;
 }
 
-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;
 }
 
-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 int flags)
 }
 
 static int
-qemuConnectGetMaxVcpus(virConnectPtr conn ATTRIBUTE_UNUSED, const char *type)
+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 = 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 = dconn->privateData;
@@ -12659,13 +12659,13 @@ qemuDomainMigratePrepareTunnel(virConnectPtr dconn,
  */
 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 = 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;
 
@@ -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 = 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 = 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,
 
 
 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,
 
 /* 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 {
 
 static int
 qemuDomainMomentReparentChildren(void *payload,
-                                 const void *name ATTRIBUTE_UNUSED,
+                                 const void *name G_GNUC_UNUSED,
                                  void *data)
 {
     virDomainMomentObjPtr moment = payload;
@@ -20605,10 +20605,10 @@ qemuConnectGetDomainCapabilities(virConnectPtr conn,
 
 
 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;
 
 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 = dom->privateData;
     size_t i;
@@ -21484,10 +21484,10 @@ qemuDomainGetStatsPerfOneEvent(virPerfPtr perf,
 }
 
 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 = dom->privateData;

diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
index e9285f0964b16580c013685dd368b72c18949692..88984dff676d4c1143a63866b4fd69f092bc84ba 100644 (file)
--- a/src/qemu/qemu_hotplug.c
+++ b/src/qemu/qemu_hotplug.c
@@ -4195,8 +4195,8 @@ qemuDomainChangeGraphics(virQEMUDriverPtr driver,
 }
 
 
-static int qemuComparePCIDevice(virDomainDefPtr def ATTRIBUTE_UNUSED,
-                                virDomainDeviceDefPtr device ATTRIBUTE_UNUSED,
+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 d75b879a56df1dcaa34b490a6d007747fa7a96f0..1cbb27e10414e17ef05e31a65cdd7fa8371dafd1 100644 (file)
--- a/src/qemu/qemu_migration.c
+++ b/src/qemu/qemu_migration.c
@@ -1774,7 +1774,7 @@ qemuMigrationSrcGraphicsRelocate(virQEMUDriverPtr driver,
 
 
 static int
-qemuMigrationDstOPDRelocate(virQEMUDriverPtr driver ATTRIBUTE_UNUSED,
+qemuMigrationDstOPDRelocate(virQEMUDriverPtr driver G_GNUC_UNUSED,
                             virDomainObjPtr vm,
                             qemuMigrationCookiePtr cookie)
 {
@@ -5492,7 +5492,7 @@ qemuMigrationJobFinish(virQEMUDriverPtr driver, virDomainObjPtr vm)
 
 static void
 qemuMigrationDstErrorFree(void *data,
-                       const void *name ATTRIBUTE_UNUSED)
+                       const void *name G_GNUC_UNUSED)
 {
     virErrorPtr err = data;
     virFreeError(err);

diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_cookie.c
index 25d3fecd74b54cc417f9a3feded08cfcb397eebd..e7556889cc15549c5015810dcfc852d0ea34ef9d 100644 (file)
--- a/src/qemu/qemu_migration_cookie.c
+++ b/src/qemu/qemu_migration_cookie.c
@@ -228,7 +228,7 @@ qemuMigrationCookieGraphicsSpiceAlloc(virQEMUDriverPtr driver,
 
 
 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 a53d3b1d609b8aa1deeee90256aeea22cf0e6715..49f9159315b3f810bdb578fb7fb357156d06d85c 100644 (file)
--- a/src/qemu/qemu_monitor.c
+++ b/src/qemu/qemu_monitor.c
@@ -2109,7 +2109,7 @@ qemuMonitorBlockIOStatusToError(const char *status)
 
 
 static void
-qemuDomainDiskInfoFree(void *value, const void *name ATTRIBUTE_UNUSED)
+qemuDomainDiskInfoFree(void *value, const void *name G_GNUC_UNUSED)
 {
     struct qemuDomainDiskInfo *info = value;
 
@@ -2763,7 +2763,7 @@ qemuMonitorQueryRxFilter(qemuMonitorPtr mon, const char *alias,
 
 void
 qemuMonitorChardevInfoFree(void *data,
-                           const void *name ATTRIBUTE_UNUSED)
+                           const void *name G_GNUC_UNUSED)
 {
     qemuMonitorChardevInfoPtr info = data;
 

diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 6818e726c63799f7484d015db9e2fd99a9139664..1e55b166fae2ced00d99af268ca4f147c65b3083 100644 (file)
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -750,22 +750,22 @@ static void qemuMonitorJSONHandleShutdown(qemuMonitorPtr mon, virJSONValuePtr da
     qemuMonitorEmitShutdown(mon, guest_initiated);
 }
 
-static void qemuMonitorJSONHandleReset(qemuMonitorPtr mon, virJSONValuePtr data ATTRIBUTE_UNUSED)
+static void qemuMonitorJSONHandleReset(qemuMonitorPtr mon, virJSONValuePtr data G_GNUC_UNUSED)
 {
     qemuMonitorEmitReset(mon);
 }
 
-static void qemuMonitorJSONHandlePowerdown(qemuMonitorPtr mon, virJSONValuePtr data ATTRIBUTE_UNUSED)
+static void qemuMonitorJSONHandlePowerdown(qemuMonitorPtr mon, virJSONValuePtr data G_GNUC_UNUSED)
 {
     qemuMonitorEmitPowerdown(mon);
 }
 
-static void qemuMonitorJSONHandleStop(qemuMonitorPtr mon, virJSONValuePtr data ATTRIBUTE_UNUSED)
+static void qemuMonitorJSONHandleStop(qemuMonitorPtr mon, virJSONValuePtr data G_GNUC_UNUSED)
 {
     qemuMonitorEmitStop(mon);
 }
 
-static void qemuMonitorJSONHandleResume(qemuMonitorPtr mon, virJSONValuePtr data ATTRIBUTE_UNUSED)
+static void qemuMonitorJSONHandleResume(qemuMonitorPtr mon, virJSONValuePtr data G_GNUC_UNUSED)
 {
     qemuMonitorEmitResume(mon);
 }
@@ -1230,14 +1230,14 @@ qemuMonitorJSONHandleTrayChange(qemuMonitorPtr mon,
 
 static void
 qemuMonitorJSONHandlePMWakeup(qemuMonitorPtr mon,
-                              virJSONValuePtr data ATTRIBUTE_UNUSED)
+                              virJSONValuePtr data G_GNUC_UNUSED)
 {
     qemuMonitorEmitPMWakeup(mon);
 }
 
 static void
 qemuMonitorJSONHandlePMSuspend(qemuMonitorPtr mon,
-                               virJSONValuePtr data ATTRIBUTE_UNUSED)
+                               virJSONValuePtr data G_GNUC_UNUSED)
 {
     qemuMonitorEmitPMSuspend(mon);
 }
@@ -1281,7 +1281,7 @@ qemuMonitorJSONHandleBalloonChange(qemuMonitorPtr mon,
 
 static void
 qemuMonitorJSONHandlePMSuspendDisk(qemuMonitorPtr mon,
-                                   virJSONValuePtr data ATTRIBUTE_UNUSED)
+                                   virJSONValuePtr data G_GNUC_UNUSED)
 {
     qemuMonitorEmitPMSuspendDisk(mon);
 }
@@ -1337,7 +1337,7 @@ qemuMonitorJSONHandleSerialChange(qemuMonitorPtr mon,
 
 static void
 qemuMonitorJSONHandleSpiceMigrated(qemuMonitorPtr mon,
-                                   virJSONValuePtr data ATTRIBUTE_UNUSED)
+                                   virJSONValuePtr data G_GNUC_UNUSED)
 {
     qemuMonitorEmitSpiceMigrated(mon);
 }
@@ -2829,7 +2829,7 @@ qemuMonitorJSONBlockStatsUpdateCapacity(qemuMonitorPtr mon,
 
 
 static int
-qemuMonitorJSONBlockStatsUpdateCapacityBlockdevWorker(size_t pos ATTRIBUTE_UNUSED,
+qemuMonitorJSONBlockStatsUpdateCapacityBlockdevWorker(size_t pos G_GNUC_UNUSED,
                                                       virJSONValuePtr val,
                                                       void *opaque)
 {

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 4135418c01500684c7efbe16d6a8dac4790d79b1..0afb7c79e46036fdd6e3f1dc8f0dbf5569d61a89 100644 (file)
--- 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 vm,
 
 
 static int
-qemuProcessHandleReset(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
+qemuProcessHandleReset(qemuMonitorPtr mon G_GNUC_UNUSED,
                        virDomainObjPtr vm,
                        void *opaque)
 {
@@ -543,7 +543,7 @@ qemuProcessShutdownOrReboot(virQEMUDriverPtr driver,
 
 
 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_UNUSED,
 
 
 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,
 
 
 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_UNUSED,
 
 
 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_UNUSED,
 }
 
 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,
 
 
 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,
 
 
 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_UNUSED,
 }
 
 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,
 
 
 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 ATTRIBUTE_UNUSED,
 
 
 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 ATTRIBUTE_UNUSED,
 }
 
 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 ATTRIBUTE_UNUSED,
 }
 
 static int
-qemuProcessHandlePMWakeup(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
+qemuProcessHandlePMWakeup(qemuMonitorPtr mon G_GNUC_UNUSED,
                           virDomainObjPtr vm,
                           void *opaque)
 {
@@ -1215,7 +1215,7 @@ qemuProcessHandlePMWakeup(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
 }
 
 static int
-qemuProcessHandlePMSuspend(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
+qemuProcessHandlePMSuspend(qemuMonitorPtr mon G_GNUC_UNUSED,
                            virDomainObjPtr vm,
                            void *opaque)
 {
@@ -1257,7 +1257,7 @@ qemuProcessHandlePMSuspend(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
 }
 
 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 ATTRIBUTE_UNUSED,
 }
 
 static int
-qemuProcessHandlePMSuspendDisk(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
+qemuProcessHandlePMSuspendDisk(qemuMonitorPtr mon G_GNUC_UNUSED,
                                virDomainObjPtr vm,
                                void *opaque)
 {
@@ -1328,7 +1328,7 @@ qemuProcessHandlePMSuspendDisk(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
 
 
 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 ATTRIBUTE_UNUSED,
 
 
 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 ATTRIBUTE_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 ATTRIBUTE_UNUSED,
 
 
 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 ATTRIBUTE_UNUSED,
 
 
 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 mon ATTRIBUTE_UNUSED,
 
 
 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 ATTRIBUTE_UNUSED,
 
 
 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;
 
@@ -1646,7 +1646,7 @@ qemuProcessHandleSpiceMigrated(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
 
 
 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 ATTRIBUTE_UNUSED,
 
 
 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 ATTRIBUTE_UNUSED,
 
 
 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;
 
@@ -1767,7 +1767,7 @@ qemuProcessHandleDumpCompleted(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
 
 
 static int
-qemuProcessHandlePRManagerStatusChanged(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
+qemuProcessHandlePRManagerStatusChanged(qemuMonitorPtr mon G_GNUC_UNUSED,
                                         virDomainObjPtr vm,
                                         const char *prManager,
                                         bool connected,
@@ -1821,7 +1821,7 @@ qemuProcessHandlePRManagerStatusChanged(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
 
 
 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 logCtxt,
 
 
 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_AFFINITY) */
 static int
-qemuProcessInitCpuAffinity(virDomainObjPtr vm ATTRIBUTE_UNUSED)
+qemuProcessInitCpuAffinity(virDomainObjPtr vm G_GNUC_UNUSED)
 {
     return 0;
 }
@@ -3013,9 +3013,9 @@ qemuProcessInitPasswords(virQEMUDriverPtr driver,
 
 
 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 != VIR_DOMAIN_CHR_TYPE_FILE)
@@ -3036,9 +3036,9 @@ qemuProcessPrepareChardevDevice(virDomainDefPtr def ATTRIBUTE_UNUSED,
 
 
 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 == 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 = false;
     size_t i;
@@ -8377,9 +8377,9 @@ qemuProcessReconnectAll(virQEMUDriverPtr driver)
 }
 
 
-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)
 {
 }
 

diff --git a/src/qemu/qemu_qapi.c b/src/qemu/qemu_qapi.c
index 93fcae0d44a6200eea53bbbdf15803d52a36d02f..5101ed6aaec5e0096b09a04c3f88195512f36020 100644 (file)
--- a/src/qemu/qemu_qapi.c
+++ b/src/qemu/qemu_qapi.c
@@ -471,7 +471,7 @@ virQEMUQAPISchemaPathExists(const char *query,
 }
 
 static int
-virQEMUQAPISchemaEntryProcess(size_t pos ATTRIBUTE_UNUSED,
+virQEMUQAPISchemaEntryProcess(size_t pos G_GNUC_UNUSED,
                               virJSONValuePtr item,
                               void *opaque)
 {