From: Andreas Färber <afaerber@suse.de>
Date: Thu, 7 Jun 2012 14:32:53 +0000 (+0200)
Subject: arm_l2x0: Rename "type" property to "cache-type"
X-Git-Tag: qemu-xen-4.3.0-rc1~984^2~13
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=edc92115a9300cca65946d5b2d56bec637a38f26;p=qemu-xen.git

arm_l2x0: Rename "type" property to "cache-type"

Resolves a name conflict with the qdev "type" property that is about to
be moved to Object.

Signed-off-by: Andreas Färber <afaerber@suse.de>
Acked-by: Mark Langsdorf <mark.langsdorf@calxeda.com>
---

diff --git a/hw/arm_l2x0.c b/hw/arm_l2x0.c
index 09f290c85f..de6a0863d8 100644
--- a/hw/arm_l2x0.c
+++ b/hw/arm_l2x0.c
@@ -161,7 +161,7 @@ static int l2x0_priv_init(SysBusDevice *dev)
 }
 
 static Property l2x0_properties[] = {
-    DEFINE_PROP_UINT32("type", l2x0_state, cache_type, 0x1c100100),
+    DEFINE_PROP_UINT32("cache-type", l2x0_state, cache_type, 0x1c100100),
     DEFINE_PROP_END_OF_LIST(),
 };