[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 25/43] bcm2835_fb: use {get, set}_uint() for "vcr
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH v3 25/43] bcm2835_fb: use {get, set}_uint() for "vcram-size" and "vcram-base" |
Date: |
Wed, 7 Jun 2017 20:36:17 +0400 |
Both properties are defined with DEFINE_PROP_UINT32().
Signed-off-by: Marc-André Lureau <address@hidden>
---
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 502f04c02a..12e0dd11af 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 = NULL;
- uint32_t ram_size, vcram_size;
+ uint64_t ram_size, vcram_size;
int n;
obj = object_property_get_link(OBJECT(dev), "ram", &err);
@@ -207,15 +207,14 @@ static void bcm2835_peripherals_realize(DeviceState *dev,
Error **errp)
INTERRUPT_ARM_MAILBOX));
/* Framebuffer */
- vcram_size = (uint32_t)object_property_get_int(OBJECT(s), "vcram-size",
- &err);
+ vcram_size = object_property_get_uint(OBJECT(s), "vcram-size", &err);
if (err) {
error_propagate(errp, err);
return;
}
- 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 2b295f14c4..32cdc98c6d 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_fatal);
- vcram_size = object_property_get_int(OBJECT(&s->soc), "vcram-size",
- &error_abort);
+ vcram_size = object_property_get_uint(OBJECT(&s->soc), "vcram-size",
+ &error_abort);
setup_boot(machine, 2, machine->ram_size - vcram_size);
}
--
2.13.0.91.g00982b8dd
- [Qemu-devel] [PATCH v3 15/43] qdev: rename DEFINE_PROP_DEFAULT() to DEFINE_PROP_SIGNED(), (continued)
- [Qemu-devel] [PATCH v3 15/43] qdev: rename DEFINE_PROP_DEFAULT() to DEFINE_PROP_SIGNED(), Marc-André Lureau, 2017/06/07
- [Qemu-devel] [PATCH v3 16/43] qdev: wrap default property value in an union, Marc-André Lureau, 2017/06/07
- [Qemu-devel] [PATCH v3 17/43] qdev: avoid type casts between signed and unsigned, Marc-André Lureau, 2017/06/07
- [Qemu-devel] [PATCH v3 18/43] apic-common: make "id" property a uint32, Marc-André Lureau, 2017/06/07
- [Qemu-devel] [PATCH v3 19/43] qdev: use appropriate getter/setters type, Marc-André Lureau, 2017/06/07
- [Qemu-devel] [PATCH v3 20/43] isa: use get_uint() for "io-base", Marc-André Lureau, 2017/06/07
- [Qemu-devel] [PATCH v3 21/43] pc-dimm: use get_uint() for dimm properties, Marc-André Lureau, 2017/06/07
- [Qemu-devel] [PATCH v3 22/43] pc-dimm: make "size" property uint64, Marc-André Lureau, 2017/06/07
- [Qemu-devel] [PATCH v3 23/43] pcihp: use get_uint() for "bsel" property, Marc-André Lureau, 2017/06/07
- [Qemu-devel] [PATCH v3 24/43] aspeed: use {set, get}_uint() for "ram-size" property, Marc-André Lureau, 2017/06/07
- [Qemu-devel] [PATCH v3 25/43] bcm2835_fb: use {get, set}_uint() for "vcram-size" and "vcram-base",
Marc-André Lureau <=
- [Qemu-devel] [PATCH v3 26/43] platform-bus: use get_uint() for "addr" property, Marc-André Lureau, 2017/06/07
- [Qemu-devel] [PATCH v3 27/43] acpi: use get_uint() for "acpi-pcihp-io*" properties, Marc-André Lureau, 2017/06/07
- [Qemu-devel] [PATCH v3 28/43] acpi: use get_uint() for various acpi properties, Marc-André Lureau, 2017/06/07
- [Qemu-devel] [PATCH v3 29/43] acpi: use get_uint() for "pci-hole*" properties, Marc-André Lureau, 2017/06/07
- [Qemu-devel] [PATCH v3 30/43] pc: use get_uint() for "iobase" property, Marc-André Lureau, 2017/06/07
- [Qemu-devel] [PATCH v3 31/43] pc: use get_uint() for "apic-id" property, Marc-André Lureau, 2017/06/07
- [Qemu-devel] [PATCH v3 32/43] pc: use get_uint() for "hpet-intcap" property, Marc-André Lureau, 2017/06/07
- [Qemu-devel] [PATCH v3 33/43] xen: use get_uint() for "max-ram-below-4g" property, Marc-André Lureau, 2017/06/07
- [Qemu-devel] [PATCH v3 34/43] arm: use get_uint() for "mp-affinity" property, Marc-André Lureau, 2017/06/07
- [Qemu-devel] [PATCH v3 35/43] auxbus: use get_uint() for "addr" property, Marc-André Lureau, 2017/06/07