[libvirt] [PATCH 11/35] cpu: use G_GNUC_UNUSED
Use G_GNUC_UNUSED from GLib instead of ATTRIBUTE_UNUSED.
Signed-off-by: Ján Tomko <jtomko(a)redhat.com>
---
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,
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 = NULL;
@@ -91,9 +91,9 @@ virCPUarmBaseline(virCPUDefPtr *cpus,
}
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)
}
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,
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[] = { VIR_ARCH_S390, VIR_ARCH_S390X };
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);
}
--
2.19.2