| commit | b8d62707d2b408983c605d8c5f1b3d27d8d694f5 | |
| author | Avi Kivity <avi@redhat.com> | |
| Sun, 15 May 2011 09:38:18 +0000 (15 05:38 -0400) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Sun, 15 May 2011 09:38:18 +0000 (15 05:38 -0400) | ||
| tree | 36c5d7012f542b087d10ada87536a3ac58a1b8fe | treesnapshot (tar.gz zip) |
| parent | 71b8a2673749d84b7fcbcc4017adc1f615c7a1a6 | commitdiff |
| parent | 1291eb35404b077ec96e5c06c7a70935597fe7c6 | commitdiff |
Merge commit '1291eb35404b077ec96e5c06c7a70935597fe7c6' into upstream-merge
* commit '1291eb35404b077ec96e5c06c7a70935597fe7c6':
vl.c: Introduce getter for shutdown_requested and reset_requested.
pci: Use of qemu_put_ram_ptr in pci_add_option_rom.
configure: Always use 64bits target physical addresses with xen enabled.
Conflicts:
vl.c
Signed-off-by: Avi Kivity <avi@redhat.com>
* commit '1291eb35404b077ec96e5c06c7a70935597fe7c6':
vl.c: Introduce getter for shutdown_requested and reset_requested.
pci: Use of qemu_put_ram_ptr in pci_add_option_rom.
configure: Always use 64bits target physical addresses with xen enabled.
Conflicts:
vl.c
Signed-off-by: Avi Kivity <avi@redhat.com>
| configure | diff1 | diff2 | blobhistory |
| hw/pci.c | diff1 | diff2 | blobhistory |
| sysemu.h | diff1 | diff2 | blobhistory |
| vl.c | diff1 | diff2 | blobhistory |