Commit 2a0c56aa authored by Wei Liu's avatar Wei Liu Committed by Aneesh Kumar K.V
Browse files

9pfs: factor out v9fs_device_{,un}realize_common 



Signed-off-by: default avatarWei Liu <wei.liu2@citrix.com>
Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
parent 60ce86c7

hw/9pfs/9p.c

+95 −0
Original line number Diff line number Diff line
@@ -3266,6 +3266,101 @@ void pdu_submit(V9fsPDU *pdu) 
    qemu_coroutine_enter(co, pdu);

}



/* Returns 0 on success, 1 on failure. */

int v9fs_device_realize_common(V9fsState *s, Error **errp)

{

    int i, len;

    struct stat stat;

    FsDriverEntry *fse;

    V9fsPath path;

    int rc = 1;



    /* initialize pdu allocator */

    QLIST_INIT(&s->free_list);

    QLIST_INIT(&s->active_list);

    for (i = 0; i < (MAX_REQ - 1); i++) {

        QLIST_INSERT_HEAD(&s->free_list, &s->pdus[i], next);

        s->pdus[i].s = s;

    }



    v9fs_path_init(&path);



    fse = get_fsdev_fsentry(s->fsconf.fsdev_id);



    if (!fse) {

        /* We don't have a fsdev identified by fsdev_id */

        error_setg(errp, "9pfs 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 */

        error_setg(errp, "fsdev with id %s needs mount_tag arguments",

                   s->fsconf.fsdev_id);

        goto out;

    }



    s->ctx.export_flags = fse->export_flags;

    s->ctx.fs_root = g_strdup(fse->path);

    s->ctx.exops.get_st_gen = NULL;

    len = strlen(s->fsconf.tag);

    if (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;

    }



    s->tag = g_strdup(s->fsconf.tag);

    s->ctx.uid = -1;



    s->ops = fse->ops;



    s->fid_list = NULL;

    qemu_co_rwlock_init(&s->rename_lock);



    if (s->ops->init(&s->ctx) < 0) {

        error_setg(errp, "9pfs Failed to initialize fs-driver with id:%s"

                   " and export path:%s", s->fsconf.fsdev_id, s->ctx.fs_root);

        goto out;

    }



    /*

     * Check details of export path, We need to use fs driver

     * call back to do that. Since we are in the init path, we don't

     * use co-routines here.

     */

    if (s->ops->name_to_path(&s->ctx, NULL, "/", &path) < 0) {

        error_setg(errp,

                   "error in converting name to path %s", strerror(errno));

        goto out;

    }

    if (s->ops->lstat(&s->ctx, &path, &stat)) {

        error_setg(errp, "share path %s does not exist", fse->path);

        goto out;

    } else if (!S_ISDIR(stat.st_mode)) {

        error_setg(errp, "share path %s is not a directory", fse->path);

        goto out;

    }

    v9fs_path_free(&path);



    rc = 0;

out:

    if (rc) {

        g_free(s->ctx.fs_root);

        g_free(s->tag);

        v9fs_path_free(&path);

    }

    return rc;

}



void v9fs_device_unrealize_common(V9fsState *s, Error **errp)

{

    g_free(s->ctx.fs_root);

    g_free(s->tag);

}



static void __attribute__((__constructor__)) v9fs_set_fd_limit(void)

{

    struct rlimit rlim;

hw/9pfs/9p.h

+2 −0
Original line number Diff line number Diff line
@@ -318,6 +318,8 @@ extern void v9fs_path_free(V9fsPath *path); 
extern void v9fs_path_copy(V9fsPath *lhs, V9fsPath *rhs);

extern int v9fs_name_to_path(V9fsState *s, V9fsPath *dirpath,

                             const char *name, V9fsPath *path);

extern int v9fs_device_realize_common(V9fsState *s, Error **errp);

extern void v9fs_device_unrealize_common(V9fsState *s, Error **errp);



ssize_t pdu_marshal(V9fsPDU *pdu, size_t offset, const char *fmt, ...);

ssize_t pdu_unmarshal(V9fsPDU *pdu, size_t offset, const char *fmt, ...);

hw/9pfs/virtio-9p-device.c

+7 −83
Original line number Diff line number Diff line
@@ -101,93 +101,18 @@ static void virtio_9p_device_realize(DeviceState *dev, Error **errp) 
{

    VirtIODevice *vdev = VIRTIO_DEVICE(dev);

    V9fsState *s = VIRTIO_9P(dev);

    int i, len;

    struct stat stat;

    FsDriverEntry *fse;

    V9fsPath path;



    virtio_init(vdev, "virtio-9p", VIRTIO_ID_9P,

                sizeof(struct virtio_9p_config) + MAX_TAG_LEN);



    /* initialize pdu allocator */

    QLIST_INIT(&s->free_list);

    QLIST_INIT(&s->active_list);

    for (i = 0; i < (MAX_REQ - 1); i++) {

        QLIST_INSERT_HEAD(&s->free_list, &s->pdus[i], next);

        s->pdus[i].s = s;

    }



    s->vq = virtio_add_queue(vdev, MAX_REQ, handle_9p_output);



    v9fs_path_init(&path);



    fse = get_fsdev_fsentry(s->fsconf.fsdev_id);



    if (!fse) {

        /* We don't have a fsdev identified by fsdev_id */

        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 */

        error_setg(errp, "fsdev with id %s needs mount_tag arguments",

                   s->fsconf.fsdev_id);

    if (v9fs_device_realize_common(s, errp)) {

        goto out;

    }



    s->ctx.export_flags = fse->export_flags;

    s->ctx.fs_root = g_strdup(fse->path);

    s->ctx.exops.get_st_gen = NULL;

    len = strlen(s->fsconf.tag);

    if (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;

    }



    s->tag = g_strdup(s->fsconf.tag);

    s->ctx.uid = -1;



    s->ops = fse->ops;

    s->config_size = sizeof(struct virtio_9p_config) + len;

    s->fid_list = NULL;

    qemu_co_rwlock_init(&s->rename_lock);



    if (s->ops->init(&s->ctx) < 0) {

        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;

    }



    /*

     * Check details of export path, We need to use fs driver

     * call back to do that. Since we are in the init path, we don't

     * use co-routines here.

     */

    if (s->ops->name_to_path(&s->ctx, NULL, "/", &path) < 0) {

        error_setg(errp,

                   "error in converting name to path %s", strerror(errno));

        goto out;

    }

    if (s->ops->lstat(&s->ctx, &path, &stat)) {

        error_setg(errp, "share path %s does not exist", fse->path);

        goto out;

    } else if (!S_ISDIR(stat.st_mode)) {

        error_setg(errp, "share path %s is not a directory", fse->path);

        goto out;

    }

    v9fs_path_free(&path);



    s->config_size = sizeof(struct virtio_9p_config) + strlen(s->fsconf.tag);

    virtio_init(vdev, "virtio-9p", VIRTIO_ID_9P, s->config_size);

    s->vq = virtio_add_queue(vdev, MAX_REQ, handle_9p_output);

    register_savevm(dev, "virtio-9p", -1, 1, virtio_9p_save, virtio_9p_load, s);

    return;



out:

    g_free(s->ctx.fs_root);

    g_free(s->tag);

    virtio_cleanup(vdev);

    v9fs_path_free(&path);

    return;

}



static void virtio_9p_device_unrealize(DeviceState *dev, Error **errp)
@@ -197,8 +122,7 @@ static void virtio_9p_device_unrealize(DeviceState *dev, Error **errp) 


    virtio_cleanup(vdev);

    unregister_savevm(dev, "virtio-9p", s);

    g_free(s->ctx.fs_root);

    g_free(s->tag);

    v9fs_device_unrealize_common(s, errp);

}



ssize_t virtio_pdu_vmarshal(V9fsPDU *pdu, size_t offset,