diff options
author | Anthony Liguori | 2013-10-10 19:03:38 +0200 |
---|---|---|
committer | Anthony Liguori | 2013-10-10 19:03:38 +0200 |
commit | f2c6bcfc2e15e1dc5c69c3e579ff2063068ecb85 (patch) | |
tree | bec2c8cf30704b368e37eb216b86bdd162efa72c /tests/qemu-iotests/socket_scm_helper.c | |
parent | Merge remote-tracking branch 'bonzini/scsi-next' into staging (diff) | |
parent | qemu/xen: make use of xenstore relative paths (diff) | |
download | qemu-f2c6bcfc2e15e1dc5c69c3e579ff2063068ecb85.tar.gz qemu-f2c6bcfc2e15e1dc5c69c3e579ff2063068ecb85.tar.xz qemu-f2c6bcfc2e15e1dc5c69c3e579ff2063068ecb85.zip |
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 'tests/qemu-iotests/socket_scm_helper.c')
0 files changed, 0 insertions, 0 deletions