[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 01/16] [S390] Add hotplug support
From: |
Alexander Graf |
Subject: |
[Qemu-devel] [PATCH 01/16] [S390] Add hotplug support |
Date: |
Fri, 11 Nov 2011 18:49:08 +0100 |
I just submitted a few patches that enable the s390 virtio bus to receive
a hotplug add event. This patch implements the qemu side of it, so that new
hotplug events can be submitted to the guest.
Signed-off-by: Alexander Graf <address@hidden>
---
v1 -> v2:
- make s390 virtio hoplug code emulate-capable
---
hw/s390-virtio-bus.c | 24 +++++++++++++++++++-----
hw/s390-virtio-bus.h | 5 +++++
2 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/hw/s390-virtio-bus.c b/hw/s390-virtio-bus.c
index 0ce6406..3760561 100644
--- a/hw/s390-virtio-bus.c
+++ b/hw/s390-virtio-bus.c
@@ -82,12 +82,24 @@ VirtIOS390Bus *s390_virtio_bus_init(ram_addr_t *ram_size)
bus->dev_offs = bus->dev_page;
bus->next_ring = bus->dev_page + TARGET_PAGE_SIZE;
+ /* Enable hotplugging */
+ _bus->allow_hotplug = 1;
+
/* Allocate RAM for VirtIO device pages (descriptors, queues, rings) */
*ram_size += S390_DEVICE_PAGES * TARGET_PAGE_SIZE;
return bus;
}
+static void s390_virtio_irq(CPUState *env, int config_change, uint64_t token)
+{
+ if (kvm_enabled()) {
+ kvm_s390_virtio_irq(env, config_change, token);
+ } else {
+ cpu_inject_ext(env, VIRTIO_EXT_CODE, config_change, token);
+ }
+}
+
static int s390_virtio_device_init(VirtIOS390Device *dev, VirtIODevice *vdev)
{
VirtIOS390Bus *bus;
@@ -109,6 +121,11 @@ static int s390_virtio_device_init(VirtIOS390Device *dev,
VirtIODevice *vdev)
dev->host_features = vdev->get_features(vdev, dev->host_features);
s390_virtio_device_sync(dev);
+ if (dev->qdev.hotplugged) {
+ CPUState *env = s390_cpu_addr2state(0);
+ s390_virtio_irq(env, VIRTIO_PARAM_DEV_ADD, dev->dev_offs);
+ }
+
return 0;
}
@@ -313,11 +330,7 @@ static void virtio_s390_notify(void *opaque, uint16_t
vector)
uint64_t token = s390_virtio_device_vq_token(dev, vector);
CPUState *env = s390_cpu_addr2state(0);
- if (kvm_enabled()) {
- kvm_s390_virtio_irq(env, 0, token);
- } else {
- cpu_inject_ext(env, VIRTIO_EXT_CODE, 0, token);
- }
+ s390_virtio_irq(env, 0, token);
}
static unsigned virtio_s390_get_features(void *opaque)
@@ -385,6 +398,7 @@ static void
s390_virtio_bus_register_withprop(VirtIOS390DeviceInfo *info)
{
info->qdev.init = s390_virtio_busdev_init;
info->qdev.bus_info = &s390_virtio_bus_info;
+ info->qdev.unplug = qdev_simple_unplug_cb;
assert(info->qdev.size >= sizeof(VirtIOS390Device));
qdev_register(&info->qdev);
diff --git a/hw/s390-virtio-bus.h b/hw/s390-virtio-bus.h
index f1bece7..d02a907 100644
--- a/hw/s390-virtio-bus.h
+++ b/hw/s390-virtio-bus.h
@@ -35,6 +35,11 @@
#define VIRTIO_RING_LEN (TARGET_PAGE_SIZE * 3)
#define S390_DEVICE_PAGES 512
+#define VIRTIO_PARAM_MASK 0xff
+#define VIRTIO_PARAM_VRING_INTERRUPT 0x0
+#define VIRTIO_PARAM_CONFIG_CHANGED 0x1
+#define VIRTIO_PARAM_DEV_ADD 0x2
+
typedef struct VirtIOS390Device {
DeviceState qdev;
ram_addr_t dev_offs;
--
1.6.0.2
- [Qemu-devel] [PATCH 13/16] s390x: Add shutdown for TCG s390-virtio machine, (continued)
- [Qemu-devel] [PATCH 13/16] s390x: Add shutdown for TCG s390-virtio machine, Alexander Graf, 2011/11/11
- [Qemu-devel] [PATCH 07/16] s390x: update R and C bits in storage key, Alexander Graf, 2011/11/11
- [Qemu-devel] [PATCH 14/16] tcg: Standardize on TCGReg as the enum for hard registers, Alexander Graf, 2011/11/11
- [Qemu-devel] [PATCH 09/16] s390x: implement SIGP restart and shutdown, Alexander Graf, 2011/11/11
- [Qemu-devel] [PATCH 03/16] Add generic drive hotplugging, Alexander Graf, 2011/11/11
- [Qemu-devel] [PATCH 10/16] s390: fix reset hypercall to reset the status, Alexander Graf, 2011/11/11
- [Qemu-devel] [PATCH 16/16] s390x: initialize virtio dev region, Alexander Graf, 2011/11/11
- [Qemu-devel] [PATCH 12/16] s390: Fix cpu shutdown for KVM, Alexander Graf, 2011/11/11
- [Qemu-devel] [PATCH 01/16] [S390] Add hotplug support,
Alexander Graf <=
- [Qemu-devel] [PATCH 11/16] s390: fix short kernel command lines, Alexander Graf, 2011/11/11
- [Qemu-devel] [PATCH 15/16] tcg: Use TCGReg for standard tcg-target entry points., Alexander Graf, 2011/11/11
- [Qemu-devel] [PATCH 08/16] s390x: implement rrbe instruction properly, Alexander Graf, 2011/11/11
- Re: [Qemu-devel] [PULL 00/16] s390 patch queue 2011-11-11 for 1.0, Blue Swirl, 2011/11/13