tree bec2c8cf30704b368e37eb216b86bdd162efa72c
parent 634ebf4b177723f2cf329a719f31913cf9ce5de6
parent 33876dfad64bc481f59c5e9ccf60db78624c4b93
author Anthony Liguori <aliguori@amazon.com> 1381424618 -0700
committer Anthony Liguori <aliguori@amazon.com> 1381424618 -0700

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