diff options
| author | Alexander Graf <agraf@suse.de> | 2010-04-01 18:42:40 +0200 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2010-04-09 22:06:22 +0200 |
| commit | baf0b55a9e57b909b1f8b0f732c0b10242867418 (patch) | |
| tree | a700a4fea9c5a50eacea8a0052c4211c135720d6 /hw | |
| parent | 73cdf3f2c97703a89b026d3a42c1120ba05fe37d (diff) | |
Implement virtio reset
The guest may issue a RESET command for virtio. So far we didn't bother
to implement it, but with my new bootloader we actually need it for Linux
to get back to a safe state.
Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/s390-virtio-bus.c | 3 | ||||
| -rw-r--r-- | hw/s390-virtio-bus.h | 1 | ||||
| -rw-r--r-- | hw/s390-virtio.c | 9 |
3 files changed, 7 insertions, 6 deletions
diff --git a/hw/s390-virtio-bus.c b/hw/s390-virtio-bus.c index 3efbaabb66..fe6884d47d 100644 --- a/hw/s390-virtio-bus.c +++ b/hw/s390-virtio-bus.c @@ -56,7 +56,6 @@ typedef struct { static const VirtIOBindings virtio_s390_bindings; static ram_addr_t s390_virtio_device_num_vq(VirtIOS390Device *dev); -static void s390_virtio_device_sync(VirtIOS390Device *dev); VirtIOS390Bus *s390_virtio_bus_init(ram_addr_t *ram_size) { @@ -185,7 +184,7 @@ static ram_addr_t s390_virtio_next_ring(VirtIOS390Bus *bus) return r; } -static void s390_virtio_device_sync(VirtIOS390Device *dev) +void s390_virtio_device_sync(VirtIOS390Device *dev) { VirtIOS390Bus *bus = DO_UPCAST(VirtIOS390Bus, bus, dev->qdev.parent_bus); ram_addr_t cur_offs; diff --git a/hw/s390-virtio-bus.h b/hw/s390-virtio-bus.h index 0ea8f54745..333fea8963 100644 --- a/hw/s390-virtio-bus.h +++ b/hw/s390-virtio-bus.h @@ -65,3 +65,4 @@ extern VirtIOS390Device *s390_virtio_bus_find_vring(VirtIOS390Bus *bus, int *vq_num); extern VirtIOS390Device *s390_virtio_bus_find_mem(VirtIOS390Bus *bus, ram_addr_t mem); +extern void s390_virtio_device_sync(VirtIOS390Device *dev); diff --git a/hw/s390-virtio.c b/hw/s390-virtio.c index ad3386f607..c36a8b2336 100644 --- a/hw/s390-virtio.c +++ b/hw/s390-virtio.c @@ -99,10 +99,11 @@ int s390_virtio_hypercall(CPUState *env) break; case KVM_S390_VIRTIO_RESET: { - /* Virtio_reset resets the internal addresses, so we'd have to sync - them up again. We don't want to reallocate a vring though, so let's - just not reset. */ - /* virtio_reset(dev->vdev); */ + VirtIOS390Device *dev; + + dev = s390_virtio_bus_find_mem(s390_bus, mem); + virtio_reset(dev->vdev); + s390_virtio_device_sync(dev); break; } case KVM_S390_VIRTIO_SET_STATUS: |