| commit | 7a8f3ed9ec8bd7527ffcdf7a3287a5e739601c5a | |
| author | Avi Kivity <avi@redhat.com> | |
| Thu, 25 Jun 2009 15:08:37 +0000 (25 18:08 +0300) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Thu, 25 Jun 2009 15:08:37 +0000 (25 18:08 +0300) | ||
| tree | 1c2dda1be02f6c45a8393aeaf47c8fc99ecb9eb9 | treesnapshot (tar.gz zip) |
| parent | a3b371477e3cbcf8bafe7b08ea1b5982e17d74cb | commitdiff |
| parent | c2cc47a449c3e16f7dd4d19a536c649ec56a9ac9 | commitdiff |
Merge commit 'c2cc47a449c3e16f7dd4d19a536c649ec56a9ac9' into upstream-merge
* commit 'c2cc47a449c3e16f7dd4d19a536c649ec56a9ac9':
Support addr=... in option argument of -drive if=virtio
Conflicts:
qemu-options.hx
vl.c
Signed-off-by: Avi Kivity <avi@redhat.com>
* commit 'c2cc47a449c3e16f7dd4d19a536c649ec56a9ac9':
Support addr=... in option argument of -drive if=virtio
Conflicts:
qemu-options.hx
vl.c
Signed-off-by: Avi Kivity <avi@redhat.com>
| hw/pc.c | diff1 | diff2 | blobhistory |
| hw/pci-hotplug.c | diff1 | diff2 | blobhistory |
| qemu-options.hx | diff1 | diff2 | blobhistory |
| sysemu.h | diff1 | diff2 | blobhistory |
| vl.c | diff1 | diff2 | blobhistory |