[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 27/45] bcm2835_fb: use {get, set}_uint() for "vcr
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH v2 27/45] bcm2835_fb: use {get, set}_uint() for "vcram-size" and "vcram-base" |
Date: |
Wed, 31 May 2017 17:56:51 +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 369ef1e3bd..b168c6f83e 100644
--- a/hw/arm/bcm2835_peripherals.c
+++ b/hw/arm/bcm2835_peripherals.c
@@ -126,7 +126,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);
@@ -208,15 +208,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 v2 16/45] q35: fix get_mmcfg_size to use uint64 visitor, (continued)
- [Qemu-devel] [PATCH v2 16/45] q35: fix get_mmcfg_size to use uint64 visitor, Marc-André Lureau, 2017/05/31
- [Qemu-devel] [PATCH v2 17/45] object: use more specific property type names, Marc-André Lureau, 2017/05/31
- [Qemu-devel] [PATCH v2 18/45] qdev: make default property int, Marc-André Lureau, 2017/05/31
- [Qemu-devel] [PATCH v2 19/45] qdev: add unsigned properties, Marc-André Lureau, 2017/05/31
- [Qemu-devel] [PATCH v2 20/45] apic-common: make "id" property a uint32, Marc-André Lureau, 2017/05/31
- [Qemu-devel] [PATCH v2 21/45] qdev: use appropriate getter/setters type, Marc-André Lureau, 2017/05/31
- [Qemu-devel] [PATCH v2 22/45] isa: use get_uint() for "io-base", Marc-André Lureau, 2017/05/31
- [Qemu-devel] [PATCH v2 23/45] pc-dimm: use get_uint() for dimm properties, Marc-André Lureau, 2017/05/31
- [Qemu-devel] [PATCH v2 24/45] pc-dimm: make "size" property uint64, Marc-André Lureau, 2017/05/31
- [Qemu-devel] [PATCH v2 25/45] pcihp: use get_uint() for "bsel" property, Marc-André Lureau, 2017/05/31
- [Qemu-devel] [PATCH v2 27/45] bcm2835_fb: use {get, set}_uint() for "vcram-size" and "vcram-base",
Marc-André Lureau <=
- [Qemu-devel] [PATCH v2 26/45] aspeed: use {set, get}_uint() for "ram-size" property, Marc-André Lureau, 2017/05/31
- [Qemu-devel] [PATCH v2 28/45] platform-bus: use get_uint() for "addr" property, Marc-André Lureau, 2017/05/31
- [Qemu-devel] [PATCH v2 29/45] acpi: use get_uint() for "acpi-pcihp-io*" properties, Marc-André Lureau, 2017/05/31
- [Qemu-devel] [PATCH v2 30/45] acpi: use get_uint() for various acpi properties, Marc-André Lureau, 2017/05/31
- [Qemu-devel] [PATCH v2 31/45] acpi: use get_uint() for "pci-hole*" properties, Marc-André Lureau, 2017/05/31
- [Qemu-devel] [PATCH v2 32/45] pc: use get_uint() for "iobase" property, Marc-André Lureau, 2017/05/31
- [Qemu-devel] [PATCH v2 33/45] pc: use get_uint() for "apic-id" property, Marc-André Lureau, 2017/05/31
- [Qemu-devel] [PATCH v2 34/45] pc: use get_uint() for "hpet-intcap" property, Marc-André Lureau, 2017/05/31
- [Qemu-devel] [PATCH v2 35/45] xen: use get_uint() for "max-ram-below-4g" property, Marc-André Lureau, 2017/05/31
- [Qemu-devel] [PATCH v2 36/45] arm: use get_uint() for "mp-affinity" property, Marc-André Lureau, 2017/05/31