]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 634ebf4 33876df)
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)
# 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


Trivial merge
Qemu copy for testing