Merge remote-tracking branch 'spice/spice.v39' into staging

[qemu.git] / hw / syborg_fb.c

diff --git a/hw/syborg_fb.c b/hw/syborg_fb.c
index 11d90bf3fde3e9506ac0d63a6d0e4d1c907bdf5d..7e373645400e34ac7ce02780900d74f16d0131ea 100644 (file)
--- a/hw/syborg_fb.c
+++ b/hw/syborg_fb.c
@@ -503,14 +503,15 @@ static int syborg_fb_load(QEMUFile *f, void *opaque, int version_id)
     return 0;
 }
 
-static void syborg_fb_init(SysBusDevice *dev)
+static int syborg_fb_init(SysBusDevice *dev)
 {
     SyborgFBState *s = FROM_SYSBUS(SyborgFBState, dev);
     int iomemtype;
 
     sysbus_init_irq(dev, &s->irq);
     iomemtype = cpu_register_io_memory(syborg_fb_readfn,
-                                       syborg_fb_writefn, s);
+                                       syborg_fb_writefn, s,
+                                       DEVICE_NATIVE_ENDIAN);
     sysbus_init_mmio(dev, 0x1000, iomemtype);
 
     s->ds = graphic_console_init(syborg_fb_update_display,
@@ -526,8 +527,9 @@ static void syborg_fb_init(SysBusDevice *dev)
     if (!s->rows)
         s->rows = ds_get_height(s->ds);
 
-    register_savevm("syborg_framebuffer", -1, 1,
+    register_savevm(&dev->qdev, "syborg_framebuffer", -1, 1,
                     syborg_fb_save, syborg_fb_load, s);
+    return 0;
 }
 
 static SysBusDeviceInfo syborg_fb_info = {