ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

virtio: add virtio_device_set_child_bus_name. 

Add virtio_device_set_child_bus_name function.

It will be used with virtio-serial-x and virtio-scsi-x to set the
child bus name before calling virtio-x-device's init.

Signed-off-by: KONRAD Frederic <fred.konrad@greensocs.com>
Tested-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Message-id: 1367330931-12994-3-git-send-email-fred.konrad@greensocs.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
KONRAD Frederic 2013-04-30 16:08:48 +02:00 committed by Anthony Liguori
parent f4dd69aa4c
commit 1034e9cf4d
2 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
hw/virtio/virtio.c
View File

@ -1087,6 +1087,18 @@ EventNotifier *virtio_queue_get_host_notifier(VirtQueue *vq)
return &vq->host_notifier; return &vq->host_notifier;
} }
void virtio_device_set_child_bus_name(VirtIODevice *vdev, char *bus_name)
{
if (vdev->bus_name) {
g_free(vdev->bus_name);
vdev->bus_name = NULL;
}
if (bus_name) {
vdev->bus_name = g_strdup(bus_name);
}
}
static int virtio_device_init(DeviceState *qdev) static int virtio_device_init(DeviceState *qdev)
{ {
VirtIODevice *vdev = VIRTIO_DEVICE(qdev); VirtIODevice *vdev = VIRTIO_DEVICE(qdev);
@ -1099,11 +1111,23 @@ static int virtio_device_init(DeviceState *qdev)
return 0; return 0;
} }
static int virtio_device_exit(DeviceState *qdev)
{
VirtIODevice *vdev = VIRTIO_DEVICE(qdev);
if (vdev->bus_name) {
g_free(vdev->bus_name);
vdev->bus_name = NULL;
}
return 0;
}
static void virtio_device_class_init(ObjectClass *klass, void *data) static void virtio_device_class_init(ObjectClass *klass, void *data)
{ {
/* Set the default value here. */ /* Set the default value here. */
DeviceClass *dc = DEVICE_CLASS(klass); DeviceClass *dc = DEVICE_CLASS(klass);
dc->init = virtio_device_init; dc->init = virtio_device_init;
dc->exit = virtio_device_exit;
dc->bus_type = TYPE_VIRTIO_BUS; dc->bus_type = TYPE_VIRTIO_BUS;
} }

4
include/hw/virtio/virtio.h
View File

@ -118,6 +118,7 @@ struct VirtIODevice
uint16_t device_id; uint16_t device_id;
bool vm_running; bool vm_running;
VMChangeStateEntry *vmstate; VMChangeStateEntry *vmstate;
char *bus_name;
}; };
typedef struct VirtioDeviceClass { typedef struct VirtioDeviceClass {
@ -149,6 +150,9 @@ void virtio_init(VirtIODevice *vdev, const char *name,
uint16_t device_id, size_t config_size); uint16_t device_id, size_t config_size);
void virtio_cleanup(VirtIODevice *vdev); void virtio_cleanup(VirtIODevice *vdev);
/* Set the child bus name. */
void virtio_device_set_child_bus_name(VirtIODevice *vdev, char *bus_name);
VirtQueue *virtio_add_queue(VirtIODevice *vdev, int queue_size, VirtQueue *virtio_add_queue(VirtIODevice *vdev, int queue_size,
void (*handle_output)(VirtIODevice *, void (*handle_output)(VirtIODevice *,
VirtQueue *)); VirtQueue *));