From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:38129) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sce3G-0003vF-UE for qemu-devel@nongnu.org; Thu, 07 Jun 2012 10:51:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Sce3D-0003jK-Lj for qemu-devel@nongnu.org; Thu, 07 Jun 2012 10:51:06 -0400 Received: from cantor2.suse.de ([195.135.220.15]:40075 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Sce3D-0003g8-Ez for qemu-devel@nongnu.org; Thu, 07 Jun 2012 10:51:03 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Thu, 7 Jun 2012 16:50:52 +0200 Message-Id: <1339080652-26063-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH qom-next] arm_l2x0: Rename "type" property to "cache-type" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?UTF-8?q?Andreas=20F=C3=A4rber?= , mark.langsdorf@calxeda.com, pbonzini@redhat.com Resolves a name conflict with the qdev "type" property that is about to be moved to Object. Signed-off-by: Andreas F=C3=A4rber Acked-by: Mark Langsdorf --- Going to insert this in the qom-next queue before 'qdev: Push "type" property up to Object'. hw/arm_l2x0.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/arm_l2x0.c b/hw/arm_l2x0.c index 09f290c..de6a086 100644 --- a/hw/arm_l2x0.c +++ b/hw/arm_l2x0.c @@ -161,7 +161,7 @@ static int l2x0_priv_init(SysBusDevice *dev) } =20 static Property l2x0_properties[] =3D { - DEFINE_PROP_UINT32("type", l2x0_state, cache_type, 0x1c100100), + DEFINE_PROP_UINT32("cache-type", l2x0_state, cache_type, 0x1c100100)= , DEFINE_PROP_END_OF_LIST(), }; =20 --=20 1.7.7