| commit | 6681c5dba40117779c46332e099748d58183eb2c | |
| author | Avi Kivity <avi@redhat.com> | |
| Sat, 9 May 2009 10:14:33 +0000 (9 13:14 +0300) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Sat, 9 May 2009 10:14:33 +0000 (9 13:14 +0300) | ||
| tree | e41eb7eb1f6b4f39f8b161637e7b3645a61bcc47 | treesnapshot (tar.gz zip) |
| parent | a7292021481b3122a4f1a2544a7e2e257bfa347d | commitdiff |
| parent | 9fd0e57dc9d5601d5d62366639e593b9bd1d0b24 | commitdiff |
Merge branch 'stable-0.10' of git://git.sv.gnu.org/qemu into stable-0.10
* 'stable-0.10' of git://git.sv.gnu.org/qemu:
Improve block range checks
e1000: Do not reinit pci config space to 0
AIO deletion race fix
reset state for load_linux
register reset handler for option_roms
Fix cluster freeing in qcow2
Enable power button even generation.
Conflicts:
pc-bios/bios.bin
Signed-off-by: Avi Kivity <avi@redhat.com>
* 'stable-0.10' of git://git.sv.gnu.org/qemu:
Improve block range checks
e1000: Do not reinit pci config space to 0
AIO deletion race fix
reset state for load_linux
register reset handler for option_roms
Fix cluster freeing in qcow2
Enable power button even generation.
Conflicts:
pc-bios/bios.bin
Signed-off-by: Avi Kivity <avi@redhat.com>
| block.c | diff1 | diff2 | blobhistory |
| hw/e1000.c | diff1 | diff2 | blobhistory |
| hw/pc.c | diff1 | diff2 | blobhistory |