diff options
author | Anthony Liguori | 2012-07-30 16:59:38 +0200 |
---|---|---|
committer | Anthony Liguori | 2012-07-30 16:59:38 +0200 |
commit | 4dd533aa03d6844f61e95558d75d8dbec72d899c (patch) | |
tree | 18dbd2b12fe1375f3396a0f47b822b2439271724 /hw/ide/piix.c | |
parent | Merge remote-tracking branch 'bonzini/scsi-next' into staging (diff) | |
parent | qemu-nbd: add --cache and --aio options (diff) | |
download | qemu-4dd533aa03d6844f61e95558d75d8dbec72d899c.tar.gz qemu-4dd533aa03d6844f61e95558d75d8dbec72d899c.tar.xz qemu-4dd533aa03d6844f61e95558d75d8dbec72d899c.zip |
Merge remote-tracking branch 'bonzini/nbd-next' into staging
* bonzini/nbd-next:
qemu-nbd: add --cache and --aio options
qemu-nbd: reorganize help message
Diffstat (limited to 'hw/ide/piix.c')
0 files changed, 0 insertions, 0 deletions