diff options
| author | David Woodhouse <dwmw@amazon.co.uk> | 2023-10-18 13:31:20 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw@amazon.co.uk> | 2023-11-06 10:03:45 +0000 |
| commit | 3de75ed352411899dbc9222e82fe164890c77e78 (patch) | |
| tree | 2f4497c55b690a9df3bdb9b162439176a1cb5c47 /hw/i386 | |
| parent | 18e83f28bf39ffd2784aeb2e4e229096a86d349b (diff) | |
| download | qemu-3de75ed352411899dbc9222e82fe164890c77e78.zip qemu-3de75ed352411899dbc9222e82fe164890c77e78.tar.gz qemu-3de75ed352411899dbc9222e82fe164890c77e78.tar.bz2 | |
hw/xen: don't clear map_track[] in xen_gnttab_reset()
The refcounts actually correspond to 'active_ref' structures stored in a
GHashTable per "user" on the backend side (mostly, per XenDevice).
If we zero map_track[] on reset, then when the backend drivers get torn
down and release their mapping we hit the assert(s->map_track[ref] != 0)
in gnt_unref().
So leave them in place. Each backend driver will disconnect and reconnect
as the guest comes back up again and reconnects, and it all works out OK
in the end as the old refs get dropped.
Cc: qemu-stable@nongnu.org
Fixes: de26b2619789 ("hw/xen: Implement soft reset for emulated gnttab")
Signed-off-by: David Woodhouse <dwmw@amazon.co.uk>
Reviewed-by: Paul Durrant <paul@xen.org>
Diffstat (limited to 'hw/i386')
| -rw-r--r-- | hw/i386/kvm/xen_gnttab.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/hw/i386/kvm/xen_gnttab.c b/hw/i386/kvm/xen_gnttab.c index 21c30e3..839ec92 100644 --- a/hw/i386/kvm/xen_gnttab.c +++ b/hw/i386/kvm/xen_gnttab.c @@ -541,7 +541,5 @@ int xen_gnttab_reset(void) s->entries.v1[GNTTAB_RESERVED_XENSTORE].flags = GTF_permit_access; s->entries.v1[GNTTAB_RESERVED_XENSTORE].frame = XEN_SPECIAL_PFN(XENSTORE); - memset(s->map_track, 0, s->max_frames * ENTRIES_PER_FRAME_V1); - return 0; } |