hwkey, keyboard: modified virtio device class init and exit

Change-Id: Ia6aaaa06ca5cfb4e6e097de95d149f735e6e5e8a
Signed-off-by: sungmin ha <sungmin82.ha@samsung.com>

diff --git a/tizen/src/hw/maru_virtio_hwkey.c b/tizen/src/hw/maru_virtio_hwkey.c
index e1891ac3dfbf3b1c432d4b9532bc34b822b316cb..dbb4beac8eb9ec3ec73933ef4a3bae7d1a52db20 100644 (file)
--- a/tizen/src/hw/maru_virtio_hwkey.c
+++ b/tizen/src/hw/maru_virtio_hwkey.c
@@ -188,22 +188,22 @@ static void maru_hwkey_bh(void *opaque)
     maru_virtio_hwkey_notify();
 }
 
-static int virtio_hwkey_device_init(VirtIODevice *vdev)
+static void virtio_hwkey_device_realize(DeviceState *dev, Error **errp)
 {
     INFO("initialize the hwkey device\n");
-    DeviceState *qdev = DEVICE(vdev);
-    vhk = VIRTIO_HWKEY(vdev);
+    VirtIODevice *vdev = VIRTIO_DEVICE(dev);
+    vhk = VIRTIO_HWKEY(dev);
 
     if (vdev == NULL) {
         ERR("failed to initialize the hwkey device\n");
-        return -1;
+        return;
     }
 
     virtio_init(vdev, TYPE_VIRTIO_HWKEY, VIRTIO_ID_HWKEY, 0);
 
     vhk->vq = virtio_add_queue(vdev, MAX_BUF_COUNT, maru_virtio_hwkey_handle);
 
-    vhk->qdev = qdev;
+    vhk->qdev = dev;
 
     /* reset the counters */
     pthread_mutex_lock(&event_mutex);
@@ -214,13 +214,11 @@ static int virtio_hwkey_device_init(VirtIODevice *vdev)
 
     /* bottom-half */
     vhk->bh = qemu_bh_new(maru_hwkey_bh, vhk);
-
-    return 0;
 }
 
-static int virtio_hwkey_device_exit(DeviceState *qdev)
+static void virtio_hwkey_device_unrealize(DeviceState *dev, Error **errp)
 {
-    VirtIODevice *vdev = VIRTIO_DEVICE(qdev);
+    VirtIODevice *vdev = VIRTIO_DEVICE(dev);
 
     INFO("exit the hwkey device\n");
 
@@ -231,8 +229,6 @@ static int virtio_hwkey_device_exit(DeviceState *qdev)
     virtio_cleanup(vdev);
 
     pthread_mutex_destroy(&event_mutex);
-
-    return 0;
 }
 
 static void virtio_hwkey_device_reset(VirtIODevice *vdev)
@@ -243,10 +239,9 @@ static void virtio_hwkey_device_reset(VirtIODevice *vdev)
 
 static void virtio_hwkey_class_init(ObjectClass *klass, void *data)
 {
-    DeviceClass *dc = DEVICE_CLASS(klass);
     VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass);
-    dc->exit = virtio_hwkey_device_exit;
-    vdc->init = virtio_hwkey_device_init;
+    vdc->unrealize = virtio_hwkey_device_unrealize;
+    vdc->realize = virtio_hwkey_device_realize;
     vdc->reset = virtio_hwkey_device_reset;
     vdc->get_features = virtio_hwkey_get_features;
 }

diff --git a/tizen/src/hw/maru_virtio_keyboard.c b/tizen/src/hw/maru_virtio_keyboard.c
index 9722b631ba5a3831a4996add5fb9d89e48844057..5d9b5b6a225ae54b11b88dbd46f07b0e851daaee 100644 (file)
--- a/tizen/src/hw/maru_virtio_keyboard.c
+++ b/tizen/src/hw/maru_virtio_keyboard.c
@@ -225,16 +225,16 @@ static void virtio_keyboard_bh(void *opaque)
     virtio_keyboard_notify(opaque);
 }
 
-static int virtio_keyboard_device_init(VirtIODevice *vdev)
+static void virtio_keyboard_device_realize(DeviceState *dev, Error **errp)
 {
-    DeviceState *qdev = DEVICE(vdev);
+    VirtIODevice *vdev = VIRTIO_DEVICE(dev);
     vkbd = VIRTIO_KEYBOARD(vdev);
 
     INFO("initialize virtio-keyboard device\n");
 
     if (vdev == NULL) {
         ERR("failed to initialize virtio-keyboard device\n");
-        return -1;
+        return;
     }
 
     virtio_init(vdev, TYPE_VIRTIO_KEYBOARD, VIRTIO_ID_KEYBOARD, 0);
@@ -244,17 +244,15 @@ static int virtio_keyboard_device_init(VirtIODevice *vdev)
     qemu_mutex_init(&vkbd->event_mutex);
 
     vkbd->vq = virtio_add_queue(vdev, 128, virtio_keyboard_handle);
-    vkbd->qdev = qdev;
+    vkbd->qdev = dev;
 
     /* bottom half */
     vkbd->bh = qemu_bh_new(virtio_keyboard_bh, vkbd);
-
-    return 0;
 }
 
-static int virtio_keyboard_device_exit(DeviceState *qdev)
+static void virtio_keyboard_device_unrealize(DeviceState *dev, Error **errp)
 {
-    VirtIODevice *vdev = VIRTIO_DEVICE(qdev);
+    VirtIODevice *vdev = VIRTIO_DEVICE(dev);
     VirtIOKeyboard *vkbd = (VirtIOKeyboard *)vdev;
 
     INFO("destroy device\n");
@@ -266,8 +264,6 @@ static int virtio_keyboard_device_exit(DeviceState *qdev)
     qemu_mutex_destroy(&vkbd->event_mutex);
 
     virtio_cleanup(vdev);
-
-    return 0;
 }
 
 static void virtio_keyboard_device_reset(VirtIODevice *vdev)
@@ -281,10 +277,9 @@ static void virtio_keyboard_device_reset(VirtIODevice *vdev)
 
 static void virtio_keyboard_class_init(ObjectClass *klass, void *data)
 {
-    DeviceClass *dc = DEVICE_CLASS(klass);
     VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass);
-    dc->exit = virtio_keyboard_device_exit;
-    vdc->init = virtio_keyboard_device_init;
+    vdc->unrealize = virtio_keyboard_device_unrealize;
+    vdc->realize = virtio_keyboard_device_realize;
     vdc->reset = virtio_keyboard_device_reset;
     vdc->get_features = virtio_keyboard_get_features;
 }