From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38415) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dJKGJ-0000gl-Cb for qemu-devel@nongnu.org; Fri, 09 Jun 2017 09:47:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dJKGH-0003aL-8O for qemu-devel@nongnu.org; Fri, 09 Jun 2017 09:47:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33654) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dJKGG-0003Yw-Ow for qemu-devel@nongnu.org; Fri, 09 Jun 2017 09:47:36 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B6EC580471 for ; Fri, 9 Jun 2017 13:47:35 +0000 (UTC) From: Markus Armbruster Date: Fri, 9 Jun 2017 15:47:09 +0200 Message-Id: <1497016045-6009-26-git-send-email-armbru@redhat.com> In-Reply-To: <1497016045-6009-1-git-send-email-armbru@redhat.com> References: <1497016045-6009-1-git-send-email-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 25/41] bcm2835_fb: use {get, set}_uint() for "vcram-size" and "vcram-base" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= From: Marc-Andr=C3=A9 Lureau Both properties are defined with DEFINE_PROP_UINT32(). Signed-off-by: Marc-Andr=C3=A9 Lureau Message-Id: <20170607163635.17635-26-marcandre.lureau@redhat.com> Signed-off-by: Markus Armbruster --- hw/arm/bcm2835_peripherals.c | 9 ++++----- hw/arm/raspi.c | 4 ++-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/hw/arm/bcm2835_peripherals.c b/hw/arm/bcm2835_peripherals.c index 502f04c..12e0dd1 100644 --- a/hw/arm/bcm2835_peripherals.c +++ b/hw/arm/bcm2835_peripherals.c @@ -125,7 +125,7 @@ static void bcm2835_peripherals_realize(DeviceState *= dev, Error **errp) Object *obj; MemoryRegion *ram; Error *err =3D NULL; - uint32_t ram_size, vcram_size; + uint64_t ram_size, vcram_size; int n; =20 obj =3D object_property_get_link(OBJECT(dev), "ram", &err); @@ -207,15 +207,14 @@ static void bcm2835_peripherals_realize(DeviceState= *dev, Error **errp) INTERRUPT_ARM_MAILBOX)); =20 /* Framebuffer */ - vcram_size =3D (uint32_t)object_property_get_int(OBJECT(s), "vcram-s= ize", - &err); + vcram_size =3D object_property_get_uint(OBJECT(s), "vcram-size", &er= r); if (err) { error_propagate(errp, err); return; } =20 - object_property_set_int(OBJECT(&s->fb), ram_size - vcram_size, - "vcram-base", &err); + object_property_set_uint(OBJECT(&s->fb), ram_size - vcram_size, + "vcram-base", &err); if (err) { error_propagate(errp, err); return; diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c index 2b295f1..32cdc98 100644 --- a/hw/arm/raspi.c +++ b/hw/arm/raspi.c @@ -153,8 +153,8 @@ static void raspi2_init(MachineState *machine) qdev_prop_set_drive(carddev, "drive", blk, &error_fatal); object_property_set_bool(OBJECT(carddev), true, "realized", &error_f= atal); =20 - vcram_size =3D object_property_get_int(OBJECT(&s->soc), "vcram-size"= , - &error_abort); + vcram_size =3D object_property_get_uint(OBJECT(&s->soc), "vcram-size= ", + &error_abort); setup_boot(machine, 2, machine->ram_size - vcram_size); } =20 --=20 2.7.5