From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:37355) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R4b0i-0002KM-6M for qemu-devel@nongnu.org; Fri, 16 Sep 2011 12:11:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R4b0e-0004Zs-S4 for qemu-devel@nongnu.org; Fri, 16 Sep 2011 12:11:28 -0400 Received: from e36.co.us.ibm.com ([32.97.110.154]:56387) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R4b0e-0004Zh-Jn for qemu-devel@nongnu.org; Fri, 16 Sep 2011 12:11:24 -0400 Received: from d03relay02.boulder.ibm.com (d03relay02.boulder.ibm.com [9.17.195.227]) by e36.co.us.ibm.com (8.14.4/8.13.1) with ESMTP id p8GG4a5f002616 for ; Fri, 16 Sep 2011 10:04:36 -0600 Received: from d03av05.boulder.ibm.com (d03av05.boulder.ibm.com [9.17.195.85]) by d03relay02.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p8GGBGqb043574 for ; Fri, 16 Sep 2011 10:11:16 -0600 Received: from d03av05.boulder.ibm.com (loopback [127.0.0.1]) by d03av05.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p8GGBEgm026419 for ; Fri, 16 Sep 2011 10:11:15 -0600 From: Anthony Liguori Date: Fri, 16 Sep 2011 11:00:21 -0500 Message-Id: <1316188834-13675-2-git-send-email-aliguori@us.ibm.com> In-Reply-To: <1316188834-13675-1-git-send-email-aliguori@us.ibm.com> References: <1316188834-13675-1-git-send-email-aliguori@us.ibm.com> Subject: [Qemu-devel] [PATCH 01/14] apic: rename apic.id -> apic.index List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Anthony Liguori , Jan Kiszka , Markus Armbruster , Paolo Bonzini 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 --- 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