diff options
| author | Anthony Liguori <aliguori@amazon.com> | 2013-10-10 10:03:38 -0700 |
|---|---|---|
| committer | Anthony Liguori <aliguori@amazon.com> | 2013-10-10 10:03:38 -0700 |
| commit | f2c6bcfc2e15e1dc5c69c3e579ff2063068ecb85 (patch) | |
| tree | bec2c8cf30704b368e37eb216b86bdd162efa72c /hw/block | |
| parent | 634ebf4b177723f2cf329a719f31913cf9ce5de6 (diff) | |
| parent | 33876dfad64bc481f59c5e9ccf60db78624c4b93 (diff) | |
Merge remote-tracking branch 'sstabellini/xen-2013-10-10' into staging
# By Matthew Daley (1) and Roger Pau Monné (1)
# Via Stefano Stabellini
* sstabellini/xen-2013-10-10:
qemu/xen: make use of xenstore relative paths
xen_disk: mark ioreq as mapped before unmapping in error case
Diffstat (limited to 'hw/block')
| -rw-r--r-- | hw/block/xen_disk.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/block/xen_disk.c b/hw/block/xen_disk.c index f35fc5944a..8742294dfb 100644 --- a/hw/block/xen_disk.c +++ b/hw/block/xen_disk.c @@ -405,6 +405,7 @@ static int ioreq_map(struct ioreq *ioreq) xen_be_printf(&ioreq->blkdev->xendev, 0, "can't map grant ref %d (%s, %d maps)\n", refs[i], strerror(errno), ioreq->blkdev->cnt_map); + ioreq->mapped = 1; ioreq_unmap(ioreq); return -1; } |