From: Hu Tao <hutao@cn.fujitsu.com>
Date: Mon, 1 Jul 2013 10:18:39 +0000 (+0800)
Subject: kvm/clock: Use QOM realize for kvmclock
X-Git-Tag: v1.6.0-rc0~96^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=913bc63844395f07e317dbc1a5b38612cc75ebec;p=thirdparty%2Fqemu.git

kvm/clock: Use QOM realize for kvmclock

Signed-off-by: Hu Tao <hutao@cn.fujitsu.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
---

diff --git a/hw/i386/kvm/clock.c b/hw/i386/kvm/clock.c
index 62654584d66..e89e2f768e1 100644
--- a/hw/i386/kvm/clock.c
+++ b/hw/i386/kvm/clock.c
@@ -91,12 +91,11 @@ static void kvmclock_vm_state_change(void *opaque, int running,
     }
 }
 
-static int kvmclock_init(SysBusDevice *dev)
+static void kvmclock_realize(DeviceState *dev, Error **errp)
 {
     KVMClockState *s = KVM_CLOCK(dev);
 
     qemu_add_vm_change_state_handler(kvmclock_vm_state_change, s);
-    return 0;
 }
 
 static const VMStateDescription kvmclock_vmsd = {
@@ -113,9 +112,8 @@ static const VMStateDescription kvmclock_vmsd = {
 static void kvmclock_class_init(ObjectClass *klass, void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(klass);
-    SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
 
-    k->init = kvmclock_init;
+    dc->realize = kvmclock_realize;
     dc->no_user = 1;
     dc->vmsd = &kvmclock_vmsd;
 }