[Qemu-devel] [PATCH 01/14] apic: rename apic.id -> apic.index

[Anthony Liguori]

This clashes with the qdev name property.  This shouldn't affect compatibility
since the apic is a no_user device.

Signed-off-by: Anthony Liguori <address@hidden>
---
 hw/apic.c |    2 +-
 hw/pc.c   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/apic.c b/hw/apic.c
index d8f56c8..e92be49 100644
--- a/hw/apic.c
+++ b/hw/apic.c
@@ -1010,7 +1010,7 @@ static SysBusDeviceInfo apic_info = {
     .qdev.reset = apic_reset,
     .qdev.no_user = 1,
     .qdev.props = (Property[]) {
-        DEFINE_PROP_UINT8("id", APICState, id, -1),
+        DEFINE_PROP_UINT8("index", APICState, id, -1),
         DEFINE_PROP_PTR("cpu_env", APICState, cpu_env),
         DEFINE_PROP_END_OF_LIST(),
     }
diff --git a/hw/pc.c b/hw/pc.c
index 5bc845a..f0f7db0 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -876,7 +876,7 @@ static DeviceState *apic_init(void *env, uint8_t apic_id)
     static int apic_mapped;
 
     dev = qdev_create(NULL, "apic");
-    qdev_prop_set_uint8(dev, "id", apic_id);
+    qdev_prop_set_uint8(dev, "index", apic_id);
     qdev_prop_set_ptr(dev, "cpu_env", env);
     qdev_init_nofail(dev);
     d = sysbus_from_qdev(dev);
-- 
1.7.4.1