diff options
| author | Marcelo Tosatti <mtosatti@redhat.com> | 2010-07-13 19:49:16 -0300 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2010-07-13 19:49:16 -0300 |
| commit | 6b440ef2a97e45f6839413f7609fa16090c5d5ff (patch) | |
| tree | 3563a2aab82ed0fa011a5353acd01b617c8d3947 /hw/heathrow_pic.c | |
| parent | dd09bf100b244a4af389eb5e427e1986836366e5 (diff) | |
| parent | d17b5288d91c935cc8795fa0620721da0a3865e1 (diff) | |
Merge commit 'd17b5288d91c935cc8795fa0620721da0a3865e1' into upstream-merge
* commit 'd17b5288d91c935cc8795fa0620721da0a3865e1': (54 commits)
Remove uses of ram.last_offset (aka last_ram_offset)
make rtc alatm work
scsi: Fix SCSI bus reset
Fix io-thread build breakage of a88790a14f
Include sys/mman.h before qemu-options.h
cris: Avoid debug clobbering for both I & D MMU state.
cris: Dont clobber the MMU state across calls to cpu_get_phys_page_debug.
cris: Break out rand LFSR update into a separate func.
block: Handle multiwrite errors only when all requests have completed
block: Fix early failure in multiwrite
qemu-img: avoid calling exit(1) to release resources properly
pc: Fix CMOS info for drives defined with -device
ide: Make PIIX and ISA IDE init functions return the qdev
block: Fix virtual media change for if=none
block: Clean up bdrv_snapshots()
savevm: Survive hot-unplug of snapshot device
blkdebug: Initialize state as 1
blkdebug: Free QemuOpts after having read the config
blkdebug: Fix set_state_opts definition
qemu-option: New qemu_opts_reset()
...
Conflicts:
exec.c
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'hw/heathrow_pic.c')
0 files changed, 0 insertions, 0 deletions