]> git.proxmox.com Git - qemu.git/commit
Merge remote-tracking branch 'sstabellini/xen-2013-10-10' into staging
authorAnthony Liguori <aliguori@amazon.com>
Thu, 10 Oct 2013 17:03:38 +0000 (10:03 -0700)
committerAnthony Liguori <aliguori@amazon.com>
Thu, 10 Oct 2013 17:03:38 +0000 (10:03 -0700)
commitf2c6bcfc2e15e1dc5c69c3e579ff2063068ecb85
treebec2c8cf30704b368e37eb216b86bdd162efa72c
parent634ebf4b177723f2cf329a719f31913cf9ce5de6
parent33876dfad64bc481f59c5e9ccf60db78624c4b93
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