[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 19/19] target-arm: fix build with gcc 4.8.2
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 19/19] target-arm: fix build with gcc 4.8.2 |
Date: |
Mon, 23 Dec 2013 18:12:24 +0200 |
commit 5ce4f35781028ce1aee3341e6002f925fdc7aaf3
"target-arm: A64: add set_pc cpu method"
introduces an array aarch64_cpus which is zero
size if this code is built without CONFIG_USER_ONLY.
In particular an attempt to iterate over this array produces a warning
under gcc 4.8.2:
CC aarch64-softmmu/target-arm/cpu64.o
/scm/qemu/target-arm/cpu64.c: In function ‘aarch64_cpu_register_types’:
/scm/qemu/target-arm/cpu64.c:124:5: error: comparison of unsigned
expression < 0 is always false [-Werror=type-limits]
for (i = 0; i < ARRAY_SIZE(aarch64_cpus); i++) {
^
cc1: all warnings being treated as errors
This is the result of ARRAY_SIZE being an unsigned type,
causing "i" to be promoted to unsigned int as well.
As zero size arrays are a gcc extension, it seems
cleanest to add a dummy element with NULL name,
and test for it during registration.
We'll be able to drop this when we add more CPUs.
Cc: Alexander Graf <address@hidden>
Cc: Peter Maydell <address@hidden>
Cc: Richard Henderson <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Reviewed-by: Stefan Weil <address@hidden>
---
target-arm/cpu64.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/target-arm/cpu64.c b/target-arm/cpu64.c
index 04ce879..60acd24 100644
--- a/target-arm/cpu64.c
+++ b/target-arm/cpu64.c
@@ -58,6 +58,7 @@ static const ARMCPUInfo aarch64_cpus[] = {
#ifdef CONFIG_USER_ONLY
{ .name = "any", .initfn = aarch64_any_initfn },
#endif
+ { .name = NULL } /* TODO: drop when we support more CPUs */
};
static void aarch64_cpu_initfn(Object *obj)
@@ -100,6 +101,11 @@ static void aarch64_cpu_register(const ARMCPUInfo *info)
.class_init = info->class_init,
};
+ /* TODO: drop when we support more CPUs - all entries will have name set */
+ if (!info->name) {
+ return;
+ }
+
type_info.name = g_strdup_printf("%s-" TYPE_ARM_CPU, info->name);
type_register(&type_info);
g_free((void *)type_info.name);
--
MST
- [Qemu-devel] [PULL 09/19] acpi: factor out common pm_update_sci() into acpi core, (continued)
- [Qemu-devel] [PULL 09/19] acpi: factor out common pm_update_sci() into acpi core, Michael S. Tsirkin, 2013/12/23
- [Qemu-devel] [PULL 10/19] acpi: ich9: allow guest to clear SCI rised by GPE, Michael S. Tsirkin, 2013/12/23
- [Qemu-devel] [PULL 11/19] ACPI: Q35 DSDT: fix CPU hotplug GPE0.2 handler, Michael S. Tsirkin, 2013/12/23
- [Qemu-devel] [PULL 12/19] ACPI/DSDT-CPU: cleanup bogus comment, Michael S. Tsirkin, 2013/12/23
- [Qemu-devel] [PULL 13/19] pci: do not export pci_bus_reset, Michael S. Tsirkin, 2013/12/23
- [Qemu-devel] [PULL 15/19] qdev: allow both pre- and post-order vists in qdev walking functions, Michael S. Tsirkin, 2013/12/23
- [Qemu-devel] [PULL 14/19] pci: clean up resetting of IRQs, Michael S. Tsirkin, 2013/12/23
- [Qemu-devel] [PULL 17/19] piix: fix 32bit pci hole, Michael S. Tsirkin, 2013/12/23
- [Qemu-devel] [PULL 16/19] qdev: switch reset to post-order, Michael S. Tsirkin, 2013/12/23
- [Qemu-devel] [PULL 18/19] virtio: add back call to virtio_bus_device_unplugged, Michael S. Tsirkin, 2013/12/23
- [Qemu-devel] [PULL 19/19] target-arm: fix build with gcc 4.8.2,
Michael S. Tsirkin <=