| commit | 2a6f52dec60dac3c3a94baf02b3d6e0a76318ade | |
| author | Avi Kivity <avi@redhat.com> | |
| Sun, 16 May 2010 14:18:21 +0000 (16 17:18 +0300) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Sun, 16 May 2010 14:18:21 +0000 (16 17:18 +0300) | ||
| tree | 2a646608014748af267f4110d1f0b0fa8642732d | treesnapshot (tar.gz zip) |
| parent | b725a661eb38c93086e0b98f626a3864ae8651b8 | commitdiff |
| parent | 1d914fa0af66024faee8cc6fa3043a935f95f775 | commitdiff |
Merge commit '1d914fa0af66024faee8cc6fa3043a935f95f775' into upstream-merge
* commit '1d914fa0af66024faee8cc6fa3043a935f95f775':
rtc: make rtc_xxx accept/return ISADevice instead of RTCState.
pc: move rtc declarations from pc.h into a dedicated header file.
Conflicts:
hw/pc.c
Signed-off-by: Avi Kivity <avi@redhat.com>
* commit '1d914fa0af66024faee8cc6fa3043a935f95f775':
rtc: make rtc_xxx accept/return ISADevice instead of RTCState.
pc: move rtc declarations from pc.h into a dedicated header file.
Conflicts:
hw/pc.c
Signed-off-by: Avi Kivity <avi@redhat.com>
| hw/pc.c | diff1 | diff2 | blobhistory |
| hw/pc.h | diff1 | diff2 | blobhistory |
| hw/pc_piix.c | diff1 | diff2 | blobhistory |