savevm: Add DeviceState param

[mirror_qemu.git] / hw / pl011.c

diff --git a/hw/pl011.c b/hw/pl011.c
index 14c00eb00a627f9da60df9c3b03a22bb1772ac25..02cf84aee190b668ff2e3ff4ddef0910747a730d 100644 (file)
--- a/hw/pl011.c
+++ b/hw/pl011.c
@@ -53,7 +53,7 @@ static void pl011_update(pl011_state *s)
     qemu_set_irq(s->irq, flags != 0);
 }
 
-static uint32_t pl011_read(void *opaque, a_target_phys_addr offset)
+static uint32_t pl011_read(void *opaque, target_phys_addr_t offset)
 {
     pl011_state *s = (pl011_state *)opaque;
     uint32_t c;
@@ -122,7 +122,7 @@ static void pl011_set_read_trigger(pl011_state *s)
         s->read_trigger = 1;
 }
 
-static void pl011_write(void *opaque, a_target_phys_addr offset,
+static void pl011_write(void *opaque, target_phys_addr_t offset,
                           uint32_t value)
 {
     pl011_state *s = (pl011_state *)opaque;
@@ -306,7 +306,7 @@ static int pl011_init(SysBusDevice *dev, const unsigned char *id)
         qemu_chr_add_handlers(s->chr, pl011_can_receive, pl011_receive,
                               pl011_event, s);
     }
-    register_savevm("pl011_uart", -1, 1, pl011_save, pl011_load, s);
+    register_savevm(&dev->qdev, "pl011_uart", -1, 1, pl011_save, pl011_load, s);
     return 0;
 }