Commit ddac19f5 authored by Juan Quintela's avatar Juan Quintela Committed by Michael S. Tsirkin
Browse files

virtio: split virtio 9p bits from virtio-pci 



Reviewed-by: default avatarLaurent Vivier <lvivier@redhat.com>
Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
Acked-by: default avatarGreg Kurz <groug@kaod.org>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 271458d7

hw/virtio/Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ obj-$(CONFIG_VIRTIO_INPUT_HOST) += virtio-input-host-pci.o 
obj-$(CONFIG_VIRTIO_INPUT) += virtio-input-pci.o

obj-$(CONFIG_VIRTIO_RNG) += virtio-rng-pci.o

obj-$(CONFIG_VIRTIO_BALLOON) += virtio-balloon-pci.o

obj-$(CONFIG_VIRTIO_9P) += virtio-9p-pci.o

endif

endif

hw/virtio/virtio-9p-pci.c

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

 * Virtio 9p PCI Bindings

 *

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

 *

 * Contributions after 2012-01-13 are licensed under the terms of the

 * GNU GPL, version 2 or (at your option) any later version.

 */



#include "qemu/osdep.h"



#include "virtio-pci.h"

#include "hw/9pfs/virtio-9p.h"



/*

 * virtio-9p-pci: This extends VirtioPCIProxy.

 */



#define TYPE_VIRTIO_9P_PCI "virtio-9p-pci-base"

#define VIRTIO_9P_PCI(obj) \

        OBJECT_CHECK(V9fsPCIState, (obj), TYPE_VIRTIO_9P_PCI)



typedef struct V9fsPCIState {

    VirtIOPCIProxy parent_obj;

    V9fsVirtioState vdev;

} V9fsPCIState;



static void virtio_9p_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)

{

    V9fsPCIState *dev = VIRTIO_9P_PCI(vpci_dev);

    DeviceState *vdev = DEVICE(&dev->vdev);



    qdev_set_parent_bus(vdev, BUS(&vpci_dev->bus));

    object_property_set_bool(OBJECT(vdev), true, "realized", errp);

}



static Property virtio_9p_pci_properties[] = {

    DEFINE_PROP_BIT("ioeventfd", VirtIOPCIProxy, flags,

                    VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT, true),

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

    DEFINE_PROP_END_OF_LIST(),

};



static void virtio_9p_pci_class_init(ObjectClass *klass, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(klass);

    PCIDeviceClass *pcidev_k = PCI_DEVICE_CLASS(klass);

    VirtioPCIClass *k = VIRTIO_PCI_CLASS(klass);



    k->realize = virtio_9p_pci_realize;

    pcidev_k->vendor_id = PCI_VENDOR_ID_REDHAT_QUMRANET;

    pcidev_k->device_id = PCI_DEVICE_ID_VIRTIO_9P;

    pcidev_k->revision = VIRTIO_PCI_ABI_VERSION;

    pcidev_k->class_id = 0x2;

    set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);

    dc->props = virtio_9p_pci_properties;

}



static void virtio_9p_pci_instance_init(Object *obj)

{

    V9fsPCIState *dev = VIRTIO_9P_PCI(obj);



    virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),

                                TYPE_VIRTIO_9P);

}



static const VirtioPCIDeviceTypeInfo virtio_9p_pci_info = {

    .base_name              = TYPE_VIRTIO_9P_PCI,

    .generic_name           = "virtio-9p-pci",

    .transitional_name      = "virtio-9p-pci-transitional",

    .non_transitional_name  = "virtio-9p-pci-non-transitional",

    .instance_size = sizeof(V9fsPCIState),

    .instance_init = virtio_9p_pci_instance_init,

    .class_init    = virtio_9p_pci_class_init,

};



static void virtio_9p_pci_register(void)

{

    virtio_pci_types_register(&virtio_9p_pci_info);

}



type_init(virtio_9p_pci_register)

hw/virtio/virtio-pci.c

+0 −54
Original line number Diff line number Diff line
@@ -1077,57 +1077,6 @@ static void virtio_pci_vmstate_change(DeviceState *d, bool running) 
    }

}



#ifdef CONFIG_VIRTFS

static void virtio_9p_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)

{

    V9fsPCIState *dev = VIRTIO_9P_PCI(vpci_dev);

    DeviceState *vdev = DEVICE(&dev->vdev);



    qdev_set_parent_bus(vdev, BUS(&vpci_dev->bus));

    object_property_set_bool(OBJECT(vdev), true, "realized", errp);

}



static Property virtio_9p_pci_properties[] = {

    DEFINE_PROP_BIT("ioeventfd", VirtIOPCIProxy, flags,

                    VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT, true),

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

    DEFINE_PROP_END_OF_LIST(),

};



static void virtio_9p_pci_class_init(ObjectClass *klass, void *data)

{

    DeviceClass *dc = DEVICE_CLASS(klass);

    PCIDeviceClass *pcidev_k = PCI_DEVICE_CLASS(klass);

    VirtioPCIClass *k = VIRTIO_PCI_CLASS(klass);



    k->realize = virtio_9p_pci_realize;

    pcidev_k->vendor_id = PCI_VENDOR_ID_REDHAT_QUMRANET;

    pcidev_k->device_id = PCI_DEVICE_ID_VIRTIO_9P;

    pcidev_k->revision = VIRTIO_PCI_ABI_VERSION;

    pcidev_k->class_id = 0x2;

    set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);

    dc->props = virtio_9p_pci_properties;

}



static void virtio_9p_pci_instance_init(Object *obj)

{

    V9fsPCIState *dev = VIRTIO_9P_PCI(obj);



    virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev),

                                TYPE_VIRTIO_9P);

}



static const VirtioPCIDeviceTypeInfo virtio_9p_pci_info = {

    .base_name              = TYPE_VIRTIO_9P_PCI,

    .generic_name           = "virtio-9p-pci",

    .transitional_name      = "virtio-9p-pci-transitional",

    .non_transitional_name  = "virtio-9p-pci-non-transitional",

    .instance_size = sizeof(V9fsPCIState),

    .instance_init = virtio_9p_pci_instance_init,

    .class_init    = virtio_9p_pci_class_init,

};

#endif /* CONFIG_VIRTFS */



/*

 * virtio-pci: This is the PCIDevice which has a virtio-pci-bus.

 */
@@ -2539,9 +2488,6 @@ static void virtio_pci_register_types(void) 
    type_register_static(&virtio_pci_info);



    /* Implementations: */

#ifdef CONFIG_VIRTFS

    virtio_pci_types_register(&virtio_9p_pci_info);

#endif

    virtio_pci_types_register(&virtio_blk_pci_info);

#if defined(CONFIG_VHOST_USER) && defined(CONFIG_LINUX)

    virtio_pci_types_register(&vhost_user_blk_pci_info);

hw/virtio/virtio-pci.h

+0 −20
Original line number Diff line number Diff line
@@ -28,9 +28,6 @@ 
#include "hw/virtio/vhost-user-blk.h"

#endif



#ifdef CONFIG_VIRTFS

#include "hw/9pfs/virtio-9p.h"

#endif

#ifdef CONFIG_VHOST_SCSI

#include "hw/virtio/vhost-scsi.h"

#endif
@@ -286,23 +283,6 @@ struct VirtIONetPCI { 
    VirtIONet vdev;

};



/*

 * virtio-9p-pci: This extends VirtioPCIProxy.

 */



#ifdef CONFIG_VIRTFS



#define TYPE_VIRTIO_9P_PCI "virtio-9p-pci-base"

#define VIRTIO_9P_PCI(obj) \

        OBJECT_CHECK(V9fsPCIState, (obj), TYPE_VIRTIO_9P_PCI)



typedef struct V9fsPCIState {

    VirtIOPCIProxy parent_obj;

    V9fsVirtioState vdev;

} V9fsPCIState;



#endif



/*

 * virtio-input-pci: This extends VirtioPCIProxy.

 */

tests/Makefile.include

+1 −1
Original line number Diff line number Diff line
@@ -152,7 +152,7 @@ check-qtest-virtio-y += tests/virtio-blk-test$(EXESUF) 
check-qtest-virtio-$(CONFIG_VIRTIO_RNG) += tests/virtio-rng-test$(EXESUF)

check-qtest-virtio-y += tests/virtio-scsi-test$(EXESUF)

ifeq ($(CONFIG_VIRTIO)$(CONFIG_VIRTFS)$(CONFIG_PCI),yyy)

check-qtest-virtio-y += tests/virtio-9p-test$(EXESUF)

check-qtest-virtio-$(CONFIG_VIRTIO_9P) += tests/virtio-9p-test$(EXESUF)

endif

check-qtest-virtio-y += tests/virtio-serial-test$(EXESUF)

check-qtest-virtio-y += $(check-qtest-virtioserial-y)