From eb3caa44b03f5d72a49a18c72443825b58168734 Mon Sep 17 00:00:00 2001 From: Jens Freimann Date: Sun, 22 Apr 2012 23:52:21 +0000 Subject: [PATCH] S390: reboot: reset device pages on reboot This patch fixes reboot on s390 by resetting the device page on reboot. Signed-off-by: Jens Freimann Signed-off-by: Christian Borntraeger Signed-off-by: Alexander Graf --- hw/s390-virtio-bus.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/hw/s390-virtio-bus.c b/hw/s390-virtio-bus.c index be1f5f1061..74419b3725 100644 --- a/hw/s390-virtio-bus.c +++ b/hw/s390-virtio-bus.c @@ -57,6 +57,12 @@ static ram_addr_t s390_virtio_device_num_vq(VirtIOS390Device *dev); /* length of VirtIO device pages */ const target_phys_addr_t virtio_size = S390_DEVICE_PAGES * TARGET_PAGE_SIZE; +static void s390_virtio_bus_reset(void *opaque) +{ + VirtIOS390Bus *bus = opaque; + bus->next_ring = bus->dev_page + TARGET_PAGE_SIZE; +} + VirtIOS390Bus *s390_virtio_bus_init(ram_addr_t *ram_size) { VirtIOS390Bus *bus; @@ -82,6 +88,7 @@ VirtIOS390Bus *s390_virtio_bus_init(ram_addr_t *ram_size) /* Allocate RAM for VirtIO device pages (descriptors, queues, rings) */ *ram_size += S390_DEVICE_PAGES * TARGET_PAGE_SIZE; + qemu_register_reset(s390_virtio_bus_reset, bus); return bus; }