From: Anthony Liguori <aliguori@amazon.com>
Date: Thu, 10 Oct 2013 17:03:38 +0000 (-0700)
Subject: Merge remote-tracking branch 'sstabellini/xen-2013-10-10' into staging
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f2c6bcfc2e15e1dc5c69c3e579ff2063068ecb85;p=qemu.git

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
---

f2c6bcfc2e15e1dc5c69c3e579ff2063068ecb85