virtio-s390-bus: add virtio-s390-bus.
This add the virtio-s390-bus which extends virtio-bus. So one VirtIODevice can be connected on this bus. Signed-off-by: KONRAD Frederic <fred.konrad@greensocs.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
parent
085bccb72c
commit
ea35d4f1e9
|
@ -32,6 +32,7 @@
|
||||||
#include "sysemu/kvm.h"
|
#include "sysemu/kvm.h"
|
||||||
|
|
||||||
#include "hw/s390-virtio-bus.h"
|
#include "hw/s390-virtio-bus.h"
|
||||||
|
#include "hw/virtio-bus.h"
|
||||||
|
|
||||||
/* #define DEBUG_S390 */
|
/* #define DEBUG_S390 */
|
||||||
|
|
||||||
|
@ -569,8 +570,36 @@ static const TypeInfo s390_virtio_bridge_info = {
|
||||||
.class_init = s390_virtio_bridge_class_init,
|
.class_init = s390_virtio_bridge_class_init,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/* virtio-s390-bus */
|
||||||
|
|
||||||
|
void virtio_s390_bus_new(VirtioBusState *bus, VirtIOS390Device *dev)
|
||||||
|
{
|
||||||
|
DeviceState *qdev = DEVICE(dev);
|
||||||
|
BusState *qbus;
|
||||||
|
qbus_create_inplace((BusState *)bus, TYPE_VIRTIO_S390_BUS, qdev, NULL);
|
||||||
|
qbus = BUS(bus);
|
||||||
|
qbus->allow_hotplug = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void virtio_s390_bus_class_init(ObjectClass *klass, void *data)
|
||||||
|
{
|
||||||
|
VirtioBusClass *k = VIRTIO_BUS_CLASS(klass);
|
||||||
|
BusClass *bus_class = BUS_CLASS(klass);
|
||||||
|
bus_class->max_dev = 1;
|
||||||
|
k->notify = virtio_s390_notify;
|
||||||
|
k->get_features = virtio_s390_get_features;
|
||||||
|
}
|
||||||
|
|
||||||
|
static const TypeInfo virtio_s390_bus_info = {
|
||||||
|
.name = TYPE_VIRTIO_S390_BUS,
|
||||||
|
.parent = TYPE_VIRTIO_BUS,
|
||||||
|
.instance_size = sizeof(VirtioS390BusState),
|
||||||
|
.class_init = virtio_s390_bus_class_init,
|
||||||
|
};
|
||||||
|
|
||||||
static void s390_virtio_register_types(void)
|
static void s390_virtio_register_types(void)
|
||||||
{
|
{
|
||||||
|
type_register_static(&virtio_s390_bus_info);
|
||||||
type_register_static(&s390_virtio_bus_info);
|
type_register_static(&s390_virtio_bus_info);
|
||||||
type_register_static(&virtio_s390_device_info);
|
type_register_static(&virtio_s390_device_info);
|
||||||
type_register_static(&s390_virtio_serial);
|
type_register_static(&s390_virtio_serial);
|
||||||
|
|
|
@ -24,6 +24,7 @@
|
||||||
#include "virtio-rng.h"
|
#include "virtio-rng.h"
|
||||||
#include "virtio-serial.h"
|
#include "virtio-serial.h"
|
||||||
#include "virtio-scsi.h"
|
#include "virtio-scsi.h"
|
||||||
|
#include "virtio-bus.h"
|
||||||
|
|
||||||
#define VIRTIO_DEV_OFFS_TYPE 0 /* 8 bits */
|
#define VIRTIO_DEV_OFFS_TYPE 0 /* 8 bits */
|
||||||
#define VIRTIO_DEV_OFFS_NUM_VQ 1 /* 8 bits */
|
#define VIRTIO_DEV_OFFS_NUM_VQ 1 /* 8 bits */
|
||||||
|
@ -59,8 +60,24 @@
|
||||||
#define S390_VIRTIO_BUS(obj) \
|
#define S390_VIRTIO_BUS(obj) \
|
||||||
OBJECT_CHECK(VirtIOS390Bus, (obj), TYPE_S390_VIRTIO_BUS)
|
OBJECT_CHECK(VirtIOS390Bus, (obj), TYPE_S390_VIRTIO_BUS)
|
||||||
|
|
||||||
|
/* virtio-s390-bus */
|
||||||
|
|
||||||
|
typedef struct VirtioBusState VirtioS390BusState;
|
||||||
|
typedef struct VirtioBusClass VirtioS390BusClass;
|
||||||
|
|
||||||
|
#define TYPE_VIRTIO_S390_BUS "virtio-s390-bus"
|
||||||
|
#define VIRTIO_S390_BUS(obj) \
|
||||||
|
OBJECT_CHECK(VirtioS390BusState, (obj), TYPE_VIRTIO_S390_BUS)
|
||||||
|
#define VIRTIO_S390_BUS_GET_CLASS(obj) \
|
||||||
|
OBJECT_GET_CLASS(VirtioS390BusClass, obj, TYPE_VIRTIO_S390_BUS)
|
||||||
|
#define VIRTIO_S390_BUS_CLASS(klass) \
|
||||||
|
OBJECT_CLASS_CHECK(VirtioS390BusClass, klass, TYPE_VIRTIO_S390_BUS)
|
||||||
|
|
||||||
|
|
||||||
typedef struct VirtIOS390Device VirtIOS390Device;
|
typedef struct VirtIOS390Device VirtIOS390Device;
|
||||||
|
|
||||||
|
void virtio_s390_bus_new(VirtioBusState *bus, VirtIOS390Device *dev);
|
||||||
|
|
||||||
typedef struct VirtIOS390DeviceClass {
|
typedef struct VirtIOS390DeviceClass {
|
||||||
DeviceClass qdev;
|
DeviceClass qdev;
|
||||||
int (*init)(VirtIOS390Device *dev);
|
int (*init)(VirtIOS390Device *dev);
|
||||||
|
|
Loading…
Reference in New Issue