| commit | 2d458c9a7d87fff02e345f3e091cb2565b1eede0 | |
| author | Avi Kivity <avi@redhat.com> | |
| Mon, 21 Jun 2010 14:01:59 +0000 (21 17:01 +0300) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Mon, 21 Jun 2010 14:04:59 +0000 (21 17:04 +0300) | ||
| tree | 40cefb1fcceb327f6b2e25c2004ffa7a0d48b392 | treesnapshot (tar.gz zip) |
| parent | 5a885d3d1bbfda309970251e349d3d34b0ec48a0 | commitdiff |
| parent | 27bb0b2d6f80f058bdb6fcc8fcdfa69b0c8a6d71 | commitdiff |
Merge commit '27bb0b2d6f80f058bdb6fcc8fcdfa69b0c8a6d71' into upstream-merge
* commit '27bb0b2d6f80f058bdb6fcc8fcdfa69b0c8a6d71':
hpet: Coding style cleanups and some refactorings
hpet: Catch out-of-bounds timer access
configure: Fix evaluation of config-host.mak in create_config
tcg-s390: correctly detect s390 with a 64-bit kernel
Compile OS specific files only once for all targets
Move set_proc_name() to OS specific files.
Move line-buffering setup to OS specific files.
Make os_change_process_uid and os_change_root os-posix.c local
Move daemonize handling to OS specific files
Conflicts:
hw/hpet.c
Signed-off-by: Avi Kivity <avi@redhat.com>
* commit '27bb0b2d6f80f058bdb6fcc8fcdfa69b0c8a6d71':
hpet: Coding style cleanups and some refactorings
hpet: Catch out-of-bounds timer access
configure: Fix evaluation of config-host.mak in create_config
tcg-s390: correctly detect s390 with a 64-bit kernel
Compile OS specific files only once for all targets
Move set_proc_name() to OS specific files.
Move line-buffering setup to OS specific files.
Make os_change_process_uid and os_change_root os-posix.c local
Move daemonize handling to OS specific files
Conflicts:
hw/hpet.c
Signed-off-by: Avi Kivity <avi@redhat.com>
| Makefile.objs | diff1 | diff2 | blobhistory |
| configure | diff1 | diff2 | blobhistory |
| hw/hpet.c | diff1 | diff2 | blobhistory |
| sysemu.h | diff1 | diff2 | blobhistory |
| vl.c | diff1 | diff2 | blobhistory |