[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [COMMIT bc19fca] Unbreak Sparc32 and PPC
From: |
Anthony Liguori |
Subject: |
[Qemu-commits] [COMMIT bc19fca] Unbreak Sparc32 and PPC |
Date: |
Thu, 13 Aug 2009 17:45:33 -0000 |
From: Blue Swirl <address@hidden>
Convert qdev ptr type to chr, allow a NULL pointer.
Signed-off-by: Blue Swirl <address@hidden>
diff --git a/hw/escc.c b/hw/escc.c
index 74a96cd..031dae3 100644
--- a/hw/escc.c
+++ b/hw/escc.c
@@ -737,8 +737,8 @@ int escc_init(target_phys_addr_t base, qemu_irq irqA,
qemu_irq irqB,
qdev_prop_set_uint32(dev, "disabled", 0);
qdev_prop_set_uint32(dev, "frequency", clock);
qdev_prop_set_uint32(dev, "it_shift", it_shift);
- qdev_prop_set_ptr(dev, "chrB", chrB);
- qdev_prop_set_ptr(dev, "chrA", chrA);
+ qdev_prop_set_chr(dev, "chrB", chrB);
+ qdev_prop_set_chr(dev, "chrA", chrA);
qdev_prop_set_uint32(dev, "chnBtype", ser);
qdev_prop_set_uint32(dev, "chnAtype", ser);
qdev_init(dev);
@@ -900,8 +900,8 @@ void slavio_serial_ms_kbd_init(target_phys_addr_t base,
qemu_irq irq,
qdev_prop_set_uint32(dev, "disabled", disabled);
qdev_prop_set_uint32(dev, "frequency", clock);
qdev_prop_set_uint32(dev, "it_shift", it_shift);
- qdev_prop_set_ptr(dev, "chrB", NULL);
- qdev_prop_set_ptr(dev, "chrA", NULL);
+ qdev_prop_set_chr(dev, "chrB", NULL);
+ qdev_prop_set_chr(dev, "chrA", NULL);
qdev_prop_set_uint32(dev, "chnBtype", mouse);
qdev_prop_set_uint32(dev, "chnAtype", kbd);
qdev_init(dev);
diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c
index df3d209..c9703c2 100644
--- a/hw/qdev-properties.c
+++ b/hw/qdev-properties.c
@@ -173,7 +173,12 @@ PropertyInfo qdev_prop_drive = {
static int print_chr(DeviceState *dev, Property *prop, char *dest, size_t len)
{
CharDriverState **ptr = qdev_get_prop_ptr(dev, prop);
- return snprintf(dest, len, "%s", (*ptr)->label);
+
+ if (*ptr && (*ptr)->label) {
+ return snprintf(dest, len, "%s", (*ptr)->label);
+ } else {
+ return snprintf(dest, len, "<null>");
+ }
}
PropertyInfo qdev_prop_chr = {
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-commits] [COMMIT bc19fca] Unbreak Sparc32 and PPC,
Anthony Liguori <=