ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

virtio-9p: Convert to QOM realize 

Signed-off-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Andreas Färber 2013-07-30 01:04:01 +02:00 committed by Paolo Bonzini
parent 1d244b42d2
commit 59be75227d
1 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
hw/9pfs/virtio-9p-device.c
View File

@ -41,9 +41,10 @@ static void virtio_9p_get_config(VirtIODevice *vdev, uint8_t *config)
g_free(cfg); 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);
int i, len; int i, len;
struct stat stat; struct stat stat;
FsDriverEntry *fse; FsDriverEntry *fse;
@ -67,16 +68,16 @@ static int virtio_9p_device_init(VirtIODevice *vdev)
if (!fse) { if (!fse) {
/* We don't have a fsdev identified by fsdev_id */ /* We don't have a fsdev identified by fsdev_id */
fprintf(stderr, "Virtio-9p device couldn't find fsdev with the " error_setg(errp, "Virtio-9p device couldn't find fsdev with the "
"id = %s\n", "id = %s",
s->fsconf.fsdev_id ? s->fsconf.fsdev_id : "NULL"); s->fsconf.fsdev_id ? s->fsconf.fsdev_id : "NULL");
goto out; goto out;
} }
if (!s->fsconf.tag) { if (!s->fsconf.tag) {
/* we haven't specified a mount_tag */ /* we haven't specified a mount_tag */
fprintf(stderr, "fsdev with id %s needs mount_tag arguments\n", error_setg(errp, "fsdev with id %s needs mount_tag arguments",
s->fsconf.fsdev_id); s->fsconf.fsdev_id);
goto out; goto out;
} }
@ -85,8 +86,8 @@ static int virtio_9p_device_init(VirtIODevice *vdev)
s->ctx.exops.get_st_gen = NULL; s->ctx.exops.get_st_gen = NULL;
len = strlen(s->fsconf.tag); len = strlen(s->fsconf.tag);
if (len > MAX_TAG_LEN - 1) { if (len > MAX_TAG_LEN - 1) {
fprintf(stderr, "mount tag '%s' (%d bytes) is longer than " error_setg(errp, "mount tag '%s' (%d bytes) is longer than "
"maximum (%d bytes)", s->fsconf.tag, len, MAX_TAG_LEN - 1); "maximum (%d bytes)", s->fsconf.tag, len, MAX_TAG_LEN - 1);
goto out; goto out;
} }
@ -99,12 +100,12 @@ static int virtio_9p_device_init(VirtIODevice *vdev)
qemu_co_rwlock_init(&s->rename_lock); qemu_co_rwlock_init(&s->rename_lock);
if (s->ops->init(&s->ctx) < 0) { if (s->ops->init(&s->ctx) < 0) {
fprintf(stderr, "Virtio-9p Failed to initialize fs-driver with id:%s" error_setg(errp, "Virtio-9p Failed to initialize fs-driver with id:%s"
" and export path:%s\n", s->fsconf.fsdev_id, s->ctx.fs_root); " and export path:%s", s->fsconf.fsdev_id, s->ctx.fs_root);
goto out; goto out;
} }
if (v9fs_init_worker_threads() < 0) { if (v9fs_init_worker_threads() < 0) {
fprintf(stderr, "worker thread initialization failed\n"); error_setg(errp, "worker thread initialization failed");
goto out; goto out;
} }
@ -114,28 +115,25 @@ static int virtio_9p_device_init(VirtIODevice *vdev)
* use co-routines here. * use co-routines here.
*/ */
if (s->ops->name_to_path(&s->ctx, NULL, "/", &path) < 0) { if (s->ops->name_to_path(&s->ctx, NULL, "/", &path) < 0) {
fprintf(stderr, error_setg(errp,
"error in converting name to path %s", strerror(errno)); "error in converting name to path %s", strerror(errno));
goto out; goto out;
} }
if (s->ops->lstat(&s->ctx, &path, &stat)) { 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; goto out;
} else if (!S_ISDIR(stat.st_mode)) { } 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; goto out;
} }
v9fs_path_free(&path); v9fs_path_free(&path);
return 0; return;
out: out:
g_free(s->ctx.fs_root); g_free(s->ctx.fs_root);
g_free(s->tag); g_free(s->tag);
virtio_cleanup(vdev); virtio_cleanup(vdev);
v9fs_path_free(&path); v9fs_path_free(&path);
return -1;
} }
/* virtio-9p device */ /* virtio-9p device */
@ -149,9 +147,10 @@ static void virtio_9p_class_init(ObjectClass *klass, void *data)
{ {
DeviceClass *dc = DEVICE_CLASS(klass); DeviceClass *dc = DEVICE_CLASS(klass);
VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass); VirtioDeviceClass *vdc = VIRTIO_DEVICE_CLASS(klass);
dc->props = virtio_9p_properties; dc->props = virtio_9p_properties;
set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
vdc->init = virtio_9p_device_init; vdc->realize = virtio_9p_device_realize;
vdc->get_features = virtio_9p_get_features; vdc->get_features = virtio_9p_get_features;
vdc->get_config = virtio_9p_get_config; vdc->get_config = virtio_9p_get_config;
} }