[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-next v2 07/22] virtio-9p: Convert to QOM realize
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH for-next v2 07/22] virtio-9p: Convert to QOM realize |
Date: |
Thu, 1 Aug 2013 04:17:28 +0200 |
Signed-off-by: Andreas Färber <address@hidden>
---
hw/9pfs/virtio-9p-device.c | 44 +++++++++++++++++++++++---------------------
hw/9pfs/virtio-9p.h | 2 ++
2 files changed, 25 insertions(+), 21 deletions(-)
diff --git a/hw/9pfs/virtio-9p-device.c b/hw/9pfs/virtio-9p-device.c
index ea21655..7d2990b 100644
--- a/hw/9pfs/virtio-9p-device.c
+++ b/hw/9pfs/virtio-9p-device.c
@@ -41,9 +41,11 @@ static void virtio_9p_get_config(VirtIODevice *vdev, uint8_t
*config)
g_free(cfg);
}
-static int virtio_9p_device_init(VirtIODevice *vdev)
+static void virtio_9p_device_realize(DeviceState *dev, Error **errp)
{
- V9fsState *s = VIRTIO_9P(vdev);
+ VirtIODevice *vdev = VIRTIO_DEVICE(dev);
+ V9fsState *s = VIRTIO_9P(dev);
+ DeviceClass *parent_dc = DEVICE_CLASS(VIRTIO_9P_GET_PARENT_CLASS(dev));
int i, len;
struct stat stat;
FsDriverEntry *fse;
@@ -67,16 +69,16 @@ static int virtio_9p_device_init(VirtIODevice *vdev)
if (!fse) {
/* We don't have a fsdev identified by fsdev_id */
- fprintf(stderr, "Virtio-9p device couldn't find fsdev with the "
- "id = %s\n",
- s->fsconf.fsdev_id ? s->fsconf.fsdev_id : "NULL");
+ error_setg(errp, "Virtio-9p device couldn't find fsdev with the "
+ "id = %s",
+ s->fsconf.fsdev_id ? s->fsconf.fsdev_id : "NULL");
goto out;
}
if (!s->fsconf.tag) {
/* we haven't specified a mount_tag */
- fprintf(stderr, "fsdev with id %s needs mount_tag arguments\n",
- s->fsconf.fsdev_id);
+ error_setg(errp, "fsdev with id %s needs mount_tag arguments",
+ s->fsconf.fsdev_id);
goto out;
}
@@ -85,8 +87,8 @@ static int virtio_9p_device_init(VirtIODevice *vdev)
s->ctx.exops.get_st_gen = NULL;
len = strlen(s->fsconf.tag);
if (len > MAX_TAG_LEN - 1) {
- fprintf(stderr, "mount tag '%s' (%d bytes) is longer than "
- "maximum (%d bytes)", s->fsconf.tag, len, MAX_TAG_LEN - 1);
+ error_setg(errp, "mount tag '%s' (%d bytes) is longer than "
+ "maximum (%d bytes)", s->fsconf.tag, len, MAX_TAG_LEN - 1);
goto out;
}
@@ -99,12 +101,12 @@ static int virtio_9p_device_init(VirtIODevice *vdev)
qemu_co_rwlock_init(&s->rename_lock);
if (s->ops->init(&s->ctx) < 0) {
- fprintf(stderr, "Virtio-9p Failed to initialize fs-driver with id:%s"
- " and export path:%s\n", s->fsconf.fsdev_id, s->ctx.fs_root);
+ error_setg(errp, "Virtio-9p Failed to initialize fs-driver with id:%s"
+ " and export path:%s", s->fsconf.fsdev_id, s->ctx.fs_root);
goto out;
}
if (v9fs_init_worker_threads() < 0) {
- fprintf(stderr, "worker thread initialization failed\n");
+ error_setg(errp, "worker thread initialization failed");
goto out;
}
@@ -114,28 +116,27 @@ static int virtio_9p_device_init(VirtIODevice *vdev)
* use co-routines here.
*/
if (s->ops->name_to_path(&s->ctx, NULL, "/", &path) < 0) {
- fprintf(stderr,
- "error in converting name to path %s", strerror(errno));
+ error_setg(errp,
+ "error in converting name to path %s", strerror(errno));
goto out;
}
if (s->ops->lstat(&s->ctx, &path, &stat)) {
- fprintf(stderr, "share path %s does not exist\n", fse->path);
+ error_setg(errp, "share path %s does not exist", fse->path);
goto out;
} else if (!S_ISDIR(stat.st_mode)) {
- fprintf(stderr, "share path %s is not a directory\n", fse->path);
+ error_setg(errp, "share path %s is not a directory", fse->path);
goto out;
}
v9fs_path_free(&path);
- return 0;
+ parent_dc->realize(dev, errp);
+
+ return;
out:
g_free(s->ctx.fs_root);
g_free(s->tag);
virtio_cleanup(vdev);
v9fs_path_free(&path);
-
- return -1;
-
}
/* virtio-9p device */
@@ -149,9 +150,10 @@ static void virtio_9p_class_init(ObjectClass *klass, void
*data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass);
+
+ dc->realize = virtio_9p_device_realize;
dc->props = virtio_9p_properties;
set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
- vdc->init = virtio_9p_device_init;
vdc->get_features = virtio_9p_get_features;
vdc->get_config = virtio_9p_get_config;
}
diff --git a/hw/9pfs/virtio-9p.h b/hw/9pfs/virtio-9p.h
index 1d6eedb..51df6c8 100644
--- a/hw/9pfs/virtio-9p.h
+++ b/hw/9pfs/virtio-9p.h
@@ -404,6 +404,8 @@ extern int v9fs_name_to_path(V9fsState *s, V9fsPath
*dirpath,
#define TYPE_VIRTIO_9P "virtio-9p-device"
#define VIRTIO_9P(obj) \
OBJECT_CHECK(V9fsState, (obj), TYPE_VIRTIO_9P)
+#define VIRTIO_9P_GET_PARENT_CLASS(obj) \
+ OBJECT_GET_PARENT_CLASS(obj, TYPE_VIRTIO_9P)
#define DEFINE_VIRTIO_9P_PROPERTIES(_state, _field) \
DEFINE_PROP_STRING("mount_tag", _state, _field.tag), \
--
1.8.1.4
- [Qemu-devel] [PATCH for-next v2 00/22] QOM realize for virtio, Andreas Färber, 2013/07/31
- [Qemu-devel] [PATCH for-next v2 03/22] virtio-9p-device: Avoid freeing uninitialized memory, Andreas Färber, 2013/07/31
- [Qemu-devel] [PATCH for-next v2 01/22] object: Add OBJECT_GET_PARENT_CLASS() macro, Andreas Färber, 2013/07/31
- [Qemu-devel] [PATCH for-next v2 05/22] virtio: Allow NULL VirtioDeviceClass::init hook, Andreas Färber, 2013/07/31
- [Qemu-devel] [PATCH for-next v2 07/22] virtio-9p: Convert to QOM realize,
Andreas Färber <=
- [Qemu-devel] [PATCH for-next v2 08/22] virtio-blk: QOM realize preparations, Andreas Färber, 2013/07/31
- [Qemu-devel] [PATCH for-next v2 02/22] virtio-console: Use exitfn for virtserialport, too, Andreas Färber, 2013/07/31
- [Qemu-devel] [PATCH for-next v2 06/22] virtio-9p: QOM realize preparations, Andreas Färber, 2013/07/31
- [Qemu-devel] [PATCH for-next v2 04/22] virtio-blk-dataplane: Improve error reporting, Andreas Färber, 2013/07/31
- [Qemu-devel] [PATCH for-next v2 10/22] virtio-serial: QOM realize preparations, Andreas Färber, 2013/07/31
- [Qemu-devel] [PATCH for-next v2 09/22] virtio-blk: Convert to QOM realize, Andreas Färber, 2013/07/31
- [Qemu-devel] [PATCH for-next v2 11/22] virtio-serial: Convert to QOM realize, Andreas Färber, 2013/07/31
- [Qemu-devel] [PATCH for-next v2 12/22] virtio-net: QOM realize preparations, Andreas Färber, 2013/07/31
- [Qemu-devel] [PATCH for-next v2 14/22] virtio-balloon: QOM realize preparations, Andreas Färber, 2013/07/31
- [Qemu-devel] [PATCH for-next v2 13/22] virtio-net: Convert to QOM realize, Andreas Färber, 2013/07/31