Commit f4f61d27 authored by Aneesh Kumar K.V's avatar Aneesh Kumar K.V Committed by Venkateswararao Jujjuri (JV)
Browse files

virtio-9p: Move device specific code to virtio-9p-device 



Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: default avatarVenkateswararao Jujjuri (JV) <jvrao@linux.vnet.ibm.com>
parent 9fe1ebeb

Makefile.objs

+1 −1
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ sound-obj-$(CONFIG_HDA) += intel-hda.o hda-audio.o 
adlib.o fmopl.o: QEMU_CFLAGS += -DBUILD_Y8950=0

hw-obj-$(CONFIG_SOUND) += $(sound-obj-y)



9pfs-nested-$(CONFIG_VIRTFS) = virtio-9p-debug.o

9pfs-nested-$(CONFIG_VIRTFS) = virtio-9p.o virtio-9p-debug.o

9pfs-nested-$(CONFIG_VIRTFS) +=  virtio-9p-local.o virtio-9p-xattr.o

9pfs-nested-$(CONFIG_VIRTFS) +=   virtio-9p-xattr-user.o virtio-9p-posix-acl.o

Makefile.target

+2 −2
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ obj-$(CONFIG_VIRTIO) += virtio-blk.o virtio-balloon.o virtio-net.o virtio-serial 
obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o

obj-y += vhost_net.o

obj-$(CONFIG_VHOST_NET) += vhost.o

obj-$(CONFIG_REALLY_VIRTFS) += 9pfs/virtio-9p.o

obj-$(CONFIG_REALLY_VIRTFS) += 9pfs/virtio-9p-device.o

obj-y += rwhandler.o

obj-$(CONFIG_KVM) += kvm.o kvm-all.o

obj-$(CONFIG_NO_KVM) += kvm-stub.o
@@ -413,7 +413,7 @@ hmp-commands.h: $(SRC_PATH)/hmp-commands.hx 
qmp-commands.h: $(SRC_PATH)/qmp-commands.hx

	$(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"  GEN   $(TARGET_DIR)$@")



9pfs/virtio-9p.o: CFLAGS +=  -I$(SRC_PATH)/hw/

9pfs/virtio-9p-device.o: CFLAGS +=  -I$(SRC_PATH)/hw/



clean:

	rm -f *.o *.a *~ $(PROGS) nwfpe/*.o fpu/*.o

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

0 → 100644
+173 −0
Original line number Diff line number Diff line 
/*

 * Virtio 9p backend

 *

 * Copyright IBM, Corp. 2010

 *

 * Authors:

 *  Anthony Liguori   <aliguori@us.ibm.com>

 *

 * This work is licensed under the terms of the GNU GPL, version 2.  See

 * the COPYING file in the top-level directory.

 *

 */



#include "virtio.h"

#include "pc.h"

#include "qemu_socket.h"

#include "virtio-pci.h"

#include "virtio-9p.h"

#include "fsdev/qemu-fsdev.h"

#include "virtio-9p-xattr.h"



static uint32_t virtio_9p_get_features(VirtIODevice *vdev, uint32_t features)

{

    features |= 1 << VIRTIO_9P_MOUNT_TAG;

    return features;

}



static V9fsState *to_virtio_9p(VirtIODevice *vdev)

{

    return (V9fsState *)vdev;

}



static void virtio_9p_get_config(VirtIODevice *vdev, uint8_t *config)

{

    struct virtio_9p_config *cfg;

    V9fsState *s = to_virtio_9p(vdev);



    cfg = qemu_mallocz(sizeof(struct virtio_9p_config) +

                        s->tag_len);

    stw_raw(&cfg->tag_len, s->tag_len);

    memcpy(cfg->tag, s->tag, s->tag_len);

    memcpy(config, cfg, s->config_size);

    qemu_free(cfg);

}



VirtIODevice *virtio_9p_init(DeviceState *dev, V9fsConf *conf)

 {

    V9fsState *s;

    int i, len;

    struct stat stat;

    FsTypeEntry *fse;





    s = (V9fsState *)virtio_common_init("virtio-9p",

                                    VIRTIO_ID_9P,

                                    sizeof(struct virtio_9p_config)+

                                    MAX_TAG_LEN,

                                    sizeof(V9fsState));



    /* initialize pdu allocator */

    QLIST_INIT(&s->free_list);

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

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

    }



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



    fse = get_fsdev_fsentry(conf->fsdev_id);



    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", conf->fsdev_id ? conf->fsdev_id : "NULL");

        exit(1);

    }



    if (!fse->path || !conf->tag) {

        /* we haven't specified a mount_tag or the path */

        fprintf(stderr, "fsdev with id %s needs path "

                "and Virtio-9p device needs mount_tag arguments\n",

                conf->fsdev_id);

        exit(1);

    }



    if (!strcmp(fse->security_model, "passthrough")) {

        /* Files on the Fileserver set to client user credentials */

        s->ctx.fs_sm = SM_PASSTHROUGH;

        s->ctx.xops = passthrough_xattr_ops;

    } else if (!strcmp(fse->security_model, "mapped")) {

        /* Files on the fileserver are set to QEMU credentials.

         * Client user credentials are saved in extended attributes.

         */

        s->ctx.fs_sm = SM_MAPPED;

        s->ctx.xops = mapped_xattr_ops;

    } else if (!strcmp(fse->security_model, "none")) {

        /*

         * Files on the fileserver are set to QEMU credentials.

         */

        s->ctx.fs_sm = SM_NONE;

        s->ctx.xops = none_xattr_ops;

    } else {

        fprintf(stderr, "Default to security_model=none. You may want"

                " enable advanced security model using "

                "security option:\n\t security_model=passthrough\n\t "

                "security_model=mapped\n");

        s->ctx.fs_sm = SM_NONE;

        s->ctx.xops = none_xattr_ops;

    }



    if (lstat(fse->path, &stat)) {

        fprintf(stderr, "share path %s does not exist\n", fse->path);

        exit(1);

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

        fprintf(stderr, "share path %s is not a directory\n", fse->path);

        exit(1);

    }



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

    len = strlen(conf->tag);

    if (len > MAX_TAG_LEN) {

        len = MAX_TAG_LEN;

    }

    /* s->tag is non-NULL terminated string */

    s->tag = qemu_malloc(len);

    memcpy(s->tag, conf->tag, len);

    s->tag_len = len;

    s->ctx.uid = -1;



    s->ops = fse->ops;

    s->vdev.get_features = virtio_9p_get_features;

    s->config_size = sizeof(struct virtio_9p_config) +

                        s->tag_len;

    s->vdev.get_config = virtio_9p_get_config;



    return &s->vdev;

}



static int virtio_9p_init_pci(PCIDevice *pci_dev)

{

    VirtIOPCIProxy *proxy = DO_UPCAST(VirtIOPCIProxy, pci_dev, pci_dev);

    VirtIODevice *vdev;



    vdev = virtio_9p_init(&pci_dev->qdev, &proxy->fsconf);

    vdev->nvectors = proxy->nvectors;

    virtio_init_pci(proxy, vdev,

                    PCI_VENDOR_ID_REDHAT_QUMRANET,

                    0x1009,

                    0x2,

                    0x00);

    /* make the actual value visible */

    proxy->nvectors = vdev->nvectors;

    return 0;

}



static PCIDeviceInfo virtio_9p_info = {

    .qdev.name = "virtio-9p-pci",

    .qdev.size = sizeof(VirtIOPCIProxy),

    .init      = virtio_9p_init_pci,

    .qdev.props = (Property[]) {

        DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors, 2),

        DEFINE_VIRTIO_COMMON_FEATURES(VirtIOPCIProxy, host_features),

        DEFINE_PROP_STRING("mount_tag", VirtIOPCIProxy, fsconf.tag),

        DEFINE_PROP_STRING("fsdev", VirtIOPCIProxy, fsconf.fsdev_id),

        DEFINE_PROP_END_OF_LIST(),

    }

};



static void virtio_9p_register_devices(void)

{

    pci_qdev_register(&virtio_9p_info);

}



device_init(virtio_9p_register_devices)

hw/9pfs/virtio-9p.c

+1 −154
Original line number Diff line number Diff line
@@ -3622,7 +3622,7 @@ static void submit_pdu(V9fsState *s, V9fsPDU *pdu) 
    handler(s, pdu);

}



static void handle_9p_output(VirtIODevice *vdev, VirtQueue *vq)

void handle_9p_output(VirtIODevice *vdev, VirtQueue *vq)

{

    V9fsState *s = (V9fsState *)vdev;

    V9fsPDU *pdu;
@@ -3646,156 +3646,3 @@ static void handle_9p_output(VirtIODevice *vdev, VirtQueue *vq) 


    free_pdu(s, pdu);

}
 


static uint32_t virtio_9p_get_features(VirtIODevice *vdev, uint32_t features)

{

    features |= 1 << VIRTIO_9P_MOUNT_TAG;

    return features;

}



static V9fsState *to_virtio_9p(VirtIODevice *vdev)

{

    return (V9fsState *)vdev;

}



static void virtio_9p_get_config(VirtIODevice *vdev, uint8_t *config)

{

    struct virtio_9p_config *cfg;

    V9fsState *s = to_virtio_9p(vdev);



    cfg = qemu_mallocz(sizeof(struct virtio_9p_config) +

                        s->tag_len);

    stw_raw(&cfg->tag_len, s->tag_len);

    memcpy(cfg->tag, s->tag, s->tag_len);

    memcpy(config, cfg, s->config_size);

    qemu_free(cfg);

}



VirtIODevice *virtio_9p_init(DeviceState *dev, V9fsConf *conf)

 {

    V9fsState *s;

    int i, len;

    struct stat stat;

    FsTypeEntry *fse;





    s = (V9fsState *)virtio_common_init("virtio-9p",

                                    VIRTIO_ID_9P,

                                    sizeof(struct virtio_9p_config)+

                                    MAX_TAG_LEN,

                                    sizeof(V9fsState));



    /* initialize pdu allocator */

    QLIST_INIT(&s->free_list);

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

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

    }



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



    fse = get_fsdev_fsentry(conf->fsdev_id);



    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", conf->fsdev_id ? conf->fsdev_id : "NULL");

        exit(1);

    }



    if (!fse->path || !conf->tag) {

        /* we haven't specified a mount_tag or the path */

        fprintf(stderr, "fsdev with id %s needs path "

                "and Virtio-9p device needs mount_tag arguments\n",

                conf->fsdev_id);

        exit(1);

    }



    if (!strcmp(fse->security_model, "passthrough")) {

        /* Files on the Fileserver set to client user credentials */

        s->ctx.fs_sm = SM_PASSTHROUGH;

        s->ctx.xops = passthrough_xattr_ops;

    } else if (!strcmp(fse->security_model, "mapped")) {

        /* Files on the fileserver are set to QEMU credentials.

         * Client user credentials are saved in extended attributes.

         */

        s->ctx.fs_sm = SM_MAPPED;

        s->ctx.xops = mapped_xattr_ops;

    } else if (!strcmp(fse->security_model, "none")) {

        /*

         * Files on the fileserver are set to QEMU credentials.

         */

        s->ctx.fs_sm = SM_NONE;

        s->ctx.xops = none_xattr_ops;

    } else {

        fprintf(stderr, "Default to security_model=none. You may want"

                " enable advanced security model using "

                "security option:\n\t security_model=passthrough \n\t "

                "security_model=mapped\n");

        s->ctx.fs_sm = SM_NONE;

        s->ctx.xops = none_xattr_ops;

    }



    if (lstat(fse->path, &stat)) {

        fprintf(stderr, "share path %s does not exist\n", fse->path);

        exit(1);

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

        fprintf(stderr, "share path %s is not a directory \n", fse->path);

        exit(1);

    }



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

    len = strlen(conf->tag);

    if (len > MAX_TAG_LEN) {

        len = MAX_TAG_LEN;

    }

    /* s->tag is non-NULL terminated string */

    s->tag = qemu_malloc(len);

    memcpy(s->tag, conf->tag, len);

    s->tag_len = len;

    s->ctx.uid = -1;



    s->ops = fse->ops;

    s->vdev.get_features = virtio_9p_get_features;

    s->config_size = sizeof(struct virtio_9p_config) +

                        s->tag_len;

    s->vdev.get_config = virtio_9p_get_config;



    return &s->vdev;

}



static int virtio_9p_init_pci(PCIDevice *pci_dev)

{

    VirtIOPCIProxy *proxy = DO_UPCAST(VirtIOPCIProxy, pci_dev, pci_dev);

    VirtIODevice *vdev;



    vdev = virtio_9p_init(&pci_dev->qdev, &proxy->fsconf);

    vdev->nvectors = proxy->nvectors;

    virtio_init_pci(proxy, vdev,

                    PCI_VENDOR_ID_REDHAT_QUMRANET,

                    0x1009,

                    0x2,

                    0x00);

    /* make the actual value visible */

    proxy->nvectors = vdev->nvectors;

    return 0;

}



static PCIDeviceInfo virtio_9p_info = {

    .qdev.name = "virtio-9p-pci",

    .qdev.size = sizeof(VirtIOPCIProxy),

    .init      = virtio_9p_init_pci,

    .qdev.props = (Property[]) {

        DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors, 2),

        DEFINE_VIRTIO_COMMON_FEATURES(VirtIOPCIProxy, host_features),

        DEFINE_PROP_STRING("mount_tag", VirtIOPCIProxy, fsconf.tag),

        DEFINE_PROP_STRING("fsdev", VirtIOPCIProxy, fsconf.fsdev_id),

        DEFINE_PROP_END_OF_LIST(),

    }

};



static void virtio_9p_register_devices(void)

{

    pci_qdev_register(&virtio_9p_info);

}



device_init(virtio_9p_register_devices)

hw/9pfs/virtio-9p.h

+2 −0
Original line number Diff line number Diff line
@@ -504,4 +504,6 @@ static inline size_t do_pdu_unpack(void *dst, struct iovec *sg, int sg_count, 
    return pdu_packunpack(dst, sg, sg_count, offset, size, 0);

}



extern void handle_9p_output(VirtIODevice *vdev, VirtQueue *vq);



#endif