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

virtio: split virtio balloon bits from virtio-pci 



Reviewed-by: default avatarThomas Huth <thuth@redhat.com>
Reviewed-by: default avatarLaurent Vivier <lvivier@redhat.com>
Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 06d97bb6

hw/virtio/Makefile.objs

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ obj-$(CONFIG_VHOST_VSOCK) += vhost-vsock-pci.o 
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

endif

endif

hw/virtio/virtio-balloon-pci.c

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

 * Virtio balloon PCI Bindings

 *

 * Copyright IBM, Corp. 2007

 * Copyright (c) 2009 CodeSourcery

 *

 * Authors:

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

 *  Paul Brook        <paul@codesourcery.com>

 *

 * 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/virtio/virtio-balloon.h"

#include "qapi/error.h"



typedef struct VirtIOBalloonPCI VirtIOBalloonPCI;



/*

 * virtio-balloon-pci: This extends VirtioPCIProxy.

 */

#define TYPE_VIRTIO_BALLOON_PCI "virtio-balloon-pci-base"

#define VIRTIO_BALLOON_PCI(obj) \

        OBJECT_CHECK(VirtIOBalloonPCI, (obj), TYPE_VIRTIO_BALLOON_PCI)



struct VirtIOBalloonPCI {

    VirtIOPCIProxy parent_obj;

    VirtIOBalloon vdev;

};

static Property virtio_balloon_pci_properties[] = {

    DEFINE_PROP_UINT32("class", VirtIOPCIProxy, class_code, 0),

    DEFINE_PROP_END_OF_LIST(),

};



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

{

    VirtIOBalloonPCI *dev = VIRTIO_BALLOON_PCI(vpci_dev);

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



    if (vpci_dev->class_code != PCI_CLASS_OTHERS &&

        vpci_dev->class_code != PCI_CLASS_MEMORY_RAM) { /* qemu < 1.1 */

        vpci_dev->class_code = PCI_CLASS_OTHERS;

    }



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

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

}



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

{

    DeviceClass *dc = DEVICE_CLASS(klass);

    VirtioPCIClass *k = VIRTIO_PCI_CLASS(klass);

    PCIDeviceClass *pcidev_k = PCI_DEVICE_CLASS(klass);

    k->realize = virtio_balloon_pci_realize;

    set_bit(DEVICE_CATEGORY_MISC, dc->categories);

    dc->props = virtio_balloon_pci_properties;

    pcidev_k->vendor_id = PCI_VENDOR_ID_REDHAT_QUMRANET;

    pcidev_k->device_id = PCI_DEVICE_ID_VIRTIO_BALLOON;

    pcidev_k->revision = VIRTIO_PCI_ABI_VERSION;

    pcidev_k->class_id = PCI_CLASS_OTHERS;

}



static void virtio_balloon_pci_instance_init(Object *obj)

{

    VirtIOBalloonPCI *dev = VIRTIO_BALLOON_PCI(obj);



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

                                TYPE_VIRTIO_BALLOON);

    object_property_add_alias(obj, "guest-stats", OBJECT(&dev->vdev),

                                  "guest-stats", &error_abort);

    object_property_add_alias(obj, "guest-stats-polling-interval",

                              OBJECT(&dev->vdev),

                              "guest-stats-polling-interval", &error_abort);

}



static const VirtioPCIDeviceTypeInfo virtio_balloon_pci_info = {

    .base_name             = TYPE_VIRTIO_BALLOON_PCI,

    .generic_name          = "virtio-balloon-pci",

    .transitional_name     = "virtio-balloon-pci-transitional",

    .non_transitional_name = "virtio-balloon-pci-non-transitional",

    .instance_size = sizeof(VirtIOBalloonPCI),

    .instance_init = virtio_balloon_pci_instance_init,

    .class_init    = virtio_balloon_pci_class_init,

};



static void virtio_balloon_pci_register(void)

{

    virtio_pci_types_register(&virtio_balloon_pci_info);

}



type_init(virtio_balloon_pci_register)

hw/virtio/virtio-pci.c

+1 −60
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#include "hw/virtio/virtio-net.h"

#include "hw/virtio/virtio-serial.h"

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

#include "hw/virtio/virtio-balloon.h"

#include "hw/pci/pci.h"

#include "qapi/error.h"

#include "qemu/error-report.h"
@@ -2356,64 +2355,6 @@ static const VirtioPCIDeviceTypeInfo vhost_user_scsi_pci_info = { 
};

#endif



/* virtio-balloon-pci */



static Property virtio_balloon_pci_properties[] = {

    DEFINE_PROP_UINT32("class", VirtIOPCIProxy, class_code, 0),

    DEFINE_PROP_END_OF_LIST(),

};



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

{

    VirtIOBalloonPCI *dev = VIRTIO_BALLOON_PCI(vpci_dev);

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



    if (vpci_dev->class_code != PCI_CLASS_OTHERS &&

        vpci_dev->class_code != PCI_CLASS_MEMORY_RAM) { /* qemu < 1.1 */

        vpci_dev->class_code = PCI_CLASS_OTHERS;

    }



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

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

}



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

{

    DeviceClass *dc = DEVICE_CLASS(klass);

    VirtioPCIClass *k = VIRTIO_PCI_CLASS(klass);

    PCIDeviceClass *pcidev_k = PCI_DEVICE_CLASS(klass);

    k->realize = virtio_balloon_pci_realize;

    set_bit(DEVICE_CATEGORY_MISC, dc->categories);

    dc->props = virtio_balloon_pci_properties;

    pcidev_k->vendor_id = PCI_VENDOR_ID_REDHAT_QUMRANET;

    pcidev_k->device_id = PCI_DEVICE_ID_VIRTIO_BALLOON;

    pcidev_k->revision = VIRTIO_PCI_ABI_VERSION;

    pcidev_k->class_id = PCI_CLASS_OTHERS;

}



static void virtio_balloon_pci_instance_init(Object *obj)

{

    VirtIOBalloonPCI *dev = VIRTIO_BALLOON_PCI(obj);



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

                                TYPE_VIRTIO_BALLOON);

    object_property_add_alias(obj, "guest-stats", OBJECT(&dev->vdev),

                                  "guest-stats", &error_abort);

    object_property_add_alias(obj, "guest-stats-polling-interval",

                              OBJECT(&dev->vdev),

                              "guest-stats-polling-interval", &error_abort);

}



static const VirtioPCIDeviceTypeInfo virtio_balloon_pci_info = {

    .base_name             = TYPE_VIRTIO_BALLOON_PCI,

    .generic_name          = "virtio-balloon-pci",

    .transitional_name     = "virtio-balloon-pci-transitional",

    .non_transitional_name = "virtio-balloon-pci-non-transitional",

    .instance_size = sizeof(VirtIOBalloonPCI),

    .instance_init = virtio_balloon_pci_instance_init,

    .class_init    = virtio_balloon_pci_class_init,

};



/* virtio-serial-pci */



static void virtio_serial_pci_realize(VirtIOPCIProxy *vpci_dev, Error **errp)
@@ -2606,7 +2547,6 @@ static void virtio_pci_register_types(void) 
    virtio_pci_types_register(&vhost_user_blk_pci_info);

#endif

    virtio_pci_types_register(&virtio_scsi_pci_info);

    virtio_pci_types_register(&virtio_balloon_pci_info);

    virtio_pci_types_register(&virtio_serial_pci_info);

    virtio_pci_types_register(&virtio_net_pci_info);

#ifdef CONFIG_VHOST_SCSI
@@ -2618,3 +2558,4 @@ static void virtio_pci_register_types(void) 
}



type_init(virtio_pci_register_types)

hw/virtio/virtio-pci.h

+0 −14
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
#include "hw/virtio/virtio-net.h"

#include "hw/virtio/virtio-serial.h"

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

#include "hw/virtio/virtio-balloon.h"

#include "hw/virtio/virtio-bus.h"

#include "hw/virtio/virtio-gpu.h"

#include "hw/virtio/virtio-crypto.h"
@@ -39,7 +38,6 @@ 
typedef struct VirtIOPCIProxy VirtIOPCIProxy;

typedef struct VirtIOBlkPCI VirtIOBlkPCI;

typedef struct VirtIOSCSIPCI VirtIOSCSIPCI;

typedef struct VirtIOBalloonPCI VirtIOBalloonPCI;

typedef struct VirtIOSerialPCI VirtIOSerialPCI;

typedef struct VirtIONetPCI VirtIONetPCI;

typedef struct VHostSCSIPCI VHostSCSIPCI;
@@ -264,18 +262,6 @@ struct VirtIOBlkPCI { 
    VirtIOBlock vdev;

};



/*

 * virtio-balloon-pci: This extends VirtioPCIProxy.

 */

#define TYPE_VIRTIO_BALLOON_PCI "virtio-balloon-pci-base"

#define VIRTIO_BALLOON_PCI(obj) \

        OBJECT_CHECK(VirtIOBalloonPCI, (obj), TYPE_VIRTIO_BALLOON_PCI)



struct VirtIOBalloonPCI {

    VirtIOPCIProxy parent_obj;

    VirtIOBalloon vdev;

};



/*

 * virtio-serial-pci: This extends VirtioPCIProxy.

 */

tests/Makefile.include

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ check-qtest-ipack-y += tests/ipoctal232-test$(EXESUF) 
check-qtest-virtioserial-y += tests/virtio-console-test$(EXESUF)



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

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

check-qtest-virtio-$(CONFIG_VIRTIO_BALLOON) += tests/virtio-balloon-test$(EXESUF)

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)