| commit | 9d83741bf7194ce3d9f6f1782fe713f0ca20d173 | |
| author | Marcelo Tosatti <mtosatti@redhat.com> | |
| Mon, 1 Feb 2010 01:58:01 +0000 (31 23:58 -0200) | ||
| committer | Marcelo Tosatti <mtosatti@redhat.com> | |
| Mon, 1 Feb 2010 01:58:01 +0000 (31 23:58 -0200) | ||
| tree | 9c8af1485505f467c9861ab3a37b538c8f9a9c67 | treesnapshot (tar.gz zip) |
| parent | d6f5eba67670d50672c76bbab6db415dcb8ee1f5 | commitdiff |
| parent | 4516e45f82b7ee0cedce875477e785989a719b67 | commitdiff |
Merge commit '4516e45f82b7ee0cedce875477e785989a719b67' into upstream-merge
* commit '4516e45f82b7ee0cedce875477e785989a719b67':
cirrus: Properly re-register cirrus_linear_io_addr on vram unmap
virtio-serial-bus: Fix bus initialisation and allow for bus identification
softmmu: Dont clobber retaddr in slow_ldx().
Solaris: test for presence of commands with has()
Add and use has() and path_of() funcs
Check for sdl-config before calling it
Monitor: Fix command execution regression
sparc64: reimplement tick timers v4
sparc64: correct write extra bits to cwp
Fix BSD build
Fix regression in option parsing
pflash: Buffer block writes
Conflicts:
hw/cirrus_vga.c
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
* commit '4516e45f82b7ee0cedce875477e785989a719b67':
cirrus: Properly re-register cirrus_linear_io_addr on vram unmap
virtio-serial-bus: Fix bus initialisation and allow for bus identification
softmmu: Dont clobber retaddr in slow_ldx().
Solaris: test for presence of commands with has()
Add and use has() and path_of() funcs
Check for sdl-config before calling it
Monitor: Fix command execution regression
sparc64: reimplement tick timers v4
sparc64: correct write extra bits to cwp
Fix BSD build
Fix regression in option parsing
pflash: Buffer block writes
Conflicts:
hw/cirrus_vga.c
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
| configure | diff1 | diff2 | blobhistory |
| hw/cirrus_vga.c | diff1 | diff2 | blobhistory |
| monitor.c | diff1 | diff2 | blobhistory |
| vl.c | diff1 | diff2 | blobhistory |