[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-2.4 1/8] virtio-ccw: complete handling of guest-
From: |
Cornelia Huck |
Subject: |
[Qemu-devel] [PATCH for-2.4 1/8] virtio-ccw: complete handling of guest-initiated resets |
Date: |
Fri, 26 Jun 2015 12:47:27 +0200 |
For a guest-initiated reset, we need to not only reset the virtio device,
but also reset the VirtioCcwDevice into a clean state. This includes
resetting the indicators, or else a guest will not be able to e.g.
switch from classic interrupts to adapter interrupts.
Split off this routine into a new function virtio_ccw_reset_virtio()
to make the distinction between resetting the virtio-related devices
and the base subchannel device clear.
CC: address@hidden
Signed-off-by: Cornelia Huck <address@hidden>
Reviewed-by: Christian Borntraeger <address@hidden>
---
hw/s390x/virtio-ccw.c | 39 ++++++++++++++++++++++-----------------
1 file changed, 22 insertions(+), 17 deletions(-)
diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
index 9605bf4..2c81771 100644
--- a/hw/s390x/virtio-ccw.c
+++ b/hw/s390x/virtio-ccw.c
@@ -296,6 +296,25 @@ static int virtio_ccw_set_vqs(SubchDev *sch, uint64_t
addr, uint32_t align,
return 0;
}
+static void virtio_ccw_reset_virtio(VirtioCcwDevice *dev, VirtIODevice *vdev)
+{
+ virtio_ccw_stop_ioeventfd(dev);
+ virtio_reset(vdev);
+ if (dev->indicators) {
+ release_indicator(&dev->routes.adapter, dev->indicators);
+ dev->indicators = NULL;
+ }
+ if (dev->indicators2) {
+ release_indicator(&dev->routes.adapter, dev->indicators2);
+ dev->indicators2 = NULL;
+ }
+ if (dev->summary_indicator) {
+ release_indicator(&dev->routes.adapter, dev->summary_indicator);
+ dev->summary_indicator = NULL;
+ }
+ dev->sch->thinint_active = false;
+}
+
static int virtio_ccw_cb(SubchDev *sch, CCW1 ccw)
{
int ret;
@@ -359,8 +378,7 @@ static int virtio_ccw_cb(SubchDev *sch, CCW1 ccw)
}
break;
case CCW_CMD_VDEV_RESET:
- virtio_ccw_stop_ioeventfd(dev);
- virtio_reset(vdev);
+ virtio_ccw_reset_virtio(dev, vdev);
ret = 0;
break;
case CCW_CMD_READ_FEAT:
@@ -500,7 +518,7 @@ static int virtio_ccw_cb(SubchDev *sch, CCW1 ccw)
}
if (virtio_set_status(vdev, status) == 0) {
if (vdev->status == 0) {
- virtio_reset(vdev);
+ virtio_ccw_reset_virtio(dev, vdev);
}
if (status & VIRTIO_CONFIG_S_DRIVER_OK) {
virtio_ccw_start_ioeventfd(dev);
@@ -1081,21 +1099,8 @@ static void virtio_ccw_reset(DeviceState *d)
VirtioCcwDevice *dev = VIRTIO_CCW_DEVICE(d);
VirtIODevice *vdev = virtio_bus_get_device(&dev->bus);
- virtio_ccw_stop_ioeventfd(dev);
- virtio_reset(vdev);
+ virtio_ccw_reset_virtio(dev, vdev);
css_reset_sch(dev->sch);
- if (dev->indicators) {
- release_indicator(&dev->routes.adapter, dev->indicators);
- dev->indicators = NULL;
- }
- if (dev->indicators2) {
- release_indicator(&dev->routes.adapter, dev->indicators2);
- dev->indicators2 = NULL;
- }
- if (dev->summary_indicator) {
- release_indicator(&dev->routes.adapter, dev->summary_indicator);
- dev->summary_indicator = NULL;
- }
}
static void virtio_ccw_vmstate_change(DeviceState *d, bool running)
--
2.4.5
- [Qemu-devel] [PATCH for-2.4 0/8] s390x patches for 2.4, Cornelia Huck, 2015/06/26
- [Qemu-devel] [PATCH for-2.4 2/8] css: mss/mcss-e vs. migration, Cornelia Huck, 2015/06/26
- [Qemu-devel] [PATCH for-2.4 5/8] s390x/css: Add a callback for when subchannel gets disabled, Cornelia Huck, 2015/06/26
- [Qemu-devel] [PATCH for-2.4 1/8] virtio-ccw: complete handling of guest-initiated resets,
Cornelia Huck <=
- [Qemu-devel] [PATCH for-2.4 3/8] s390-ccw.img: Consume service interrupts, Cornelia Huck, 2015/06/26
- [Qemu-devel] [PATCH for-2.4 6/8] s390x/virtio-ccw: add virtio set-revision call, Cornelia Huck, 2015/06/26
- [Qemu-devel] [PATCH for-2.4 4/8] s390-ccw.img: update, Cornelia Huck, 2015/06/26
- [Qemu-devel] [PATCH for-2.4 7/8] s390x/virtio-ccw: support virtio-1 set_vq format, Cornelia Huck, 2015/06/26
- [Qemu-devel] [PATCH for-2.4 8/8] virtio-ccw: migrate ->revision, Cornelia Huck, 2015/06/26