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

virtio-9p: Move 9p device registration into virtio-9p.c 



This patch move the 9p device registration into its own file

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 1c88c715

Makefile.objs

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ net-nested-$(CONFIG_SLIRP) += slirp.o 
net-nested-$(CONFIG_VDE) += vde.o

net-obj-y += $(addprefix net/, $(net-nested-y))



ifeq ($(CONFIG_VIRTIO)$(CONFIG_VIRTFS),yy)

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

# Lots of the fsdev/9pcode is pulled in by vl.c via qemu_fsdev_add.

# only pull in the actual virtio-9p device if we also enabled virtio.

CONFIG_REALLY_VIRTFS=y

hw/9pfs/virtio-9p.c

+38 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
#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-debug.h"
@@ -3761,3 +3762,40 @@ VirtIODevice *virtio_9p_init(DeviceState *dev, V9fsConf *conf) 


    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/virtio-pci.c

+2 −55
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include "loader.h"

#include "kvm.h"

#include "blockdev.h"

#include "virtio-pci.h"



/* from Linux's linux/virtio_pci.h */
@@ -95,27 +96,6 @@ 
 */

#define wmb() do { } while (0)



/* PCI bindings.  */



typedef struct {

    PCIDevice pci_dev;

    VirtIODevice *vdev;

    uint32_t flags;

    uint32_t addr;

    uint32_t class_code;

    uint32_t nvectors;

    BlockConf block;

    NICConf nic;

    uint32_t host_features;

#ifdef CONFIG_LINUX

    V9fsConf fsconf;

#endif

    virtio_serial_conf serial;

    virtio_net_conf net;

    bool ioeventfd_disabled;

    bool ioeventfd_started;

} VirtIOPCIProxy;



/* virtio device */



static void virtio_pci_notify(void *opaque, uint16_t vector)
@@ -669,7 +649,7 @@ static const VirtIOBindings virtio_pci_bindings = { 
    .vmstate_change = virtio_pci_vmstate_change,

};



static void virtio_init_pci(VirtIOPCIProxy *proxy, VirtIODevice *vdev,

void virtio_init_pci(VirtIOPCIProxy *proxy, VirtIODevice *vdev,

                            uint16_t vendor, uint16_t device,

                            uint16_t class_code, uint8_t pif)

{
@@ -835,25 +815,6 @@ static int virtio_balloon_init_pci(PCIDevice *pci_dev) 
    return 0;

}



#ifdef CONFIG_VIRTFS

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;

}

#endif



static PCIDeviceInfo virtio_info[] = {

    {

        .qdev.name = "virtio-blk-pci",
@@ -922,20 +883,6 @@ static PCIDeviceInfo virtio_info[] = { 
        },

        .qdev.reset = virtio_pci_reset,

    },{

#ifdef CONFIG_VIRTFS

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

        .qdev.alias = "virtio-9p",

        .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(),

        },

    }, {

#endif

        /* end of list */

    }

};

hw/virtio-pci.h

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

 * Virtio PCI Bindings

 *

 * Copyright IBM, Corp. 2007

 * Copyright (c) 2009 CodeSourcery

 *

 * Authors:

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

 *  Paul Brook        <paul@codesourcery.com>

 *

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

 * the COPYING file in the top-level directory.

 */



#ifndef QEMU_VIRTIO_PCI_H

#define QEMU_VIRTIO_PCI_H



#include "virtio-net.h"

#include "virtio-serial.h"



typedef struct {

    PCIDevice pci_dev;

    VirtIODevice *vdev;

    uint32_t flags;

    uint32_t addr;

    uint32_t class_code;

    uint32_t nvectors;

    BlockConf block;

    NICConf nic;

    uint32_t host_features;

#ifdef CONFIG_LINUX

    V9fsConf fsconf;

#endif

    virtio_serial_conf serial;

    virtio_net_conf net;

    bool ioeventfd_disabled;

    bool ioeventfd_started;

} VirtIOPCIProxy;



extern void virtio_init_pci(VirtIOPCIProxy *proxy, VirtIODevice *vdev,

                            uint16_t vendor, uint16_t device,

                            uint16_t class_code, uint8_t pif);

#endif