On 16.12.14 01:43, David Gibson wrote:
> The virtual RTC time is used in two places in the pseries machine. First
> is in the RTAS get-time-of-day function which returns the RTC time to the
> guest. Second is in the spapr events code which is used to timestamp
> event messages from the hypervisor to the guest.
>
> Currently both call qemu_get_timedate() directly, but we want to change
> that so we can properly handle the various -rtc options. In preparation,
> create a helper function to return the virtual RTC time.
>
> Signed-off-by: David Gibson <da...@gibson.dropbear.id.au>
> ---
> hw/ppc/spapr_events.c | 2 +-
> hw/ppc/spapr_rtc.c | 12 ++++++++++--
> include/hw/ppc/spapr.h | 1 +
> 3 files changed, 12 insertions(+), 3 deletions(-)
>
> diff --git a/hw/ppc/spapr_events.c b/hw/ppc/spapr_events.c
> index 1b6157d..80c0266 100644
> --- a/hw/ppc/spapr_events.c
> +++ b/hw/ppc/spapr_events.c
> @@ -246,7 +246,7 @@ static void spapr_powerdown_req(Notifier *n, void *opaque)
> maina->hdr.section_id = cpu_to_be16(RTAS_LOG_V6_SECTION_ID_MAINA);
> maina->hdr.section_length = cpu_to_be16(sizeof(*maina));
> /* FIXME: section version, subtype and creator id? */
> - qemu_get_timedate(&tm, spapr->rtc_offset);
> + spapr_rtc_read(spapr, &tm, NULL);
> year = tm.tm_year + 1900;
> maina->creation_date = cpu_to_be32((to_bcd(year / 100) << 24)
> | (to_bcd(year % 100) << 16)
> diff --git a/hw/ppc/spapr_rtc.c b/hw/ppc/spapr_rtc.c
> index e290ac0..9ccefbc 100644
> --- a/hw/ppc/spapr_rtc.c
> +++ b/hw/ppc/spapr_rtc.c
> @@ -29,19 +29,27 @@
> #include "hw/ppc/spapr.h"
> #include "qapi-event.h"
>
> +void spapr_rtc_read(sPAPREnvironment *spapr, struct tm *tm, uint32_t *ns)
> +{
> + qemu_get_timedate(tm, spapr->rtc_offset);
> + if (ns)
checkpatch? ;)
Alex
