mirror of
https://github.com/clearlinux/kvmtool.git
synced 2026-09-05 13:11:44 +00:00
kvm tools: Emulate RTC to fix system time in guests
This patch fixes system time in guests by implementing proper CMOS RTC clock support. # Before: sh-2.05b# date Fri Aug 7 04:02:01 UTC 2009 # After: sh-2.05b# date Thu Apr 28 19:12:21 UTC 2011 Cc: Asias He <asias.hejun@gmail.com> Cc: Cyrill Gorcunov <gorcunov@gmail.com> Cc: Ingo Molnar <mingo@elte.hu> Cc: Prasad Joshi <prasadjoshi124@gmail.com> Cc: Sasha Levin <levinsasha928@gmail.com> Signed-off-by: Pekka Enberg <penberg@kernel.org>
This commit is contained in:
committed by
Will Deacon
parent
8e5accedb8
commit
64136c1c52
@@ -26,12 +26,13 @@ OBJS += kvm-cpu.o
|
||||
OBJS += main.o
|
||||
OBJS += mmio.o
|
||||
OBJS += pci.o
|
||||
OBJS += util.o
|
||||
OBJS += rtc.o
|
||||
OBJS += term.o
|
||||
OBJS += util.o
|
||||
OBJS += virtio.o
|
||||
OBJS += util/parse-options.o
|
||||
OBJS += util/strbuf.o
|
||||
OBJS += kvm-help.o
|
||||
OBJS += util/parse-options.o
|
||||
OBJS += util/strbuf.o
|
||||
OBJS += kvm-help.o
|
||||
OBJS += kvm-cmd.o
|
||||
OBJS += kvm-run.o
|
||||
OBJS += qcow.o
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
#ifndef KVM__RTC_H
|
||||
#define KVM__RTC_H
|
||||
|
||||
void rtc__init(void);
|
||||
|
||||
#endif /* KVM__RTC_H */
|
||||
@@ -12,28 +12,6 @@
|
||||
|
||||
bool ioport_debug;
|
||||
|
||||
static uint8_t ioport_to_uint8(void *data)
|
||||
{
|
||||
uint8_t *p = data;
|
||||
|
||||
return *p;
|
||||
}
|
||||
|
||||
static bool cmos_ram_rtc_io_out(struct kvm *self, uint16_t port, void *data, int size, uint32_t count)
|
||||
{
|
||||
uint8_t value;
|
||||
|
||||
value = ioport_to_uint8(data);
|
||||
|
||||
self->nmi_disabled = value & (1UL << 7);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
static struct ioport_operations cmos_ram_rtc_ops = {
|
||||
.io_out = cmos_ram_rtc_io_out,
|
||||
};
|
||||
|
||||
static bool debug_io_out(struct kvm *self, uint16_t port, void *data, int size, uint32_t count)
|
||||
{
|
||||
exit(EXIT_SUCCESS);
|
||||
@@ -128,10 +106,6 @@ void ioport__setup_legacy(void)
|
||||
ioport__register(0x0060, &dummy_read_write_ioport_ops, 2);
|
||||
ioport__register(0x0064, &dummy_read_write_ioport_ops, 1);
|
||||
|
||||
/* PORT 0070-007F - CMOS RAM/RTC (REAL TIME CLOCK) */
|
||||
ioport__register(0x0070, &cmos_ram_rtc_ops, 1);
|
||||
ioport__register(0x0071, &dummy_read_write_ioport_ops, 1);
|
||||
|
||||
/* 0x00A0 - 0x00AF - 8259A PIC 2 */
|
||||
ioport__register(0x00A0, &dummy_read_write_ioport_ops, 2);
|
||||
|
||||
|
||||
@@ -22,6 +22,7 @@
|
||||
#include <kvm/disk-image.h>
|
||||
#include <kvm/util.h>
|
||||
#include <kvm/pci.h>
|
||||
#include <kvm/rtc.h>
|
||||
#include <kvm/term.h>
|
||||
#include <kvm/ioport.h>
|
||||
#include <kvm/threadpool.h>
|
||||
@@ -416,6 +417,8 @@ int kvm_cmd_run(int argc, const char **argv, const char *prefix)
|
||||
|
||||
ioport__setup_legacy();
|
||||
|
||||
rtc__init();
|
||||
|
||||
kvm__setup_bios(kvm);
|
||||
|
||||
serial8250__init(kvm);
|
||||
|
||||
@@ -0,0 +1,87 @@
|
||||
#include "kvm/rtc.h"
|
||||
|
||||
#include "kvm/ioport.h"
|
||||
#include "kvm/kvm.h"
|
||||
|
||||
#include <time.h>
|
||||
|
||||
static uint8_t cmos_index;
|
||||
|
||||
#define CMOS_RTC_SECONDS 0x00
|
||||
#define CMOS_RTC_MINUTES 0x02
|
||||
#define CMOS_RTC_HOURS 0x04
|
||||
#define CMOS_RTC_DATE_OF_MONTH 0x07
|
||||
#define CMOS_RTC_MONTH 0x08
|
||||
#define CMOS_RTC_YEAR 0x09
|
||||
|
||||
static inline unsigned char bin2bcd(unsigned val)
|
||||
{
|
||||
return ((val / 10) << 4) + val % 10;
|
||||
}
|
||||
|
||||
static bool cmos_ram_data_in(struct kvm *self, uint16_t port, void *data, int size, uint32_t count)
|
||||
{
|
||||
struct tm *tm;
|
||||
time_t ti;
|
||||
|
||||
time(&ti);
|
||||
|
||||
tm = gmtime(&ti);
|
||||
|
||||
switch (cmos_index) {
|
||||
case CMOS_RTC_SECONDS:
|
||||
ioport__write8(data, bin2bcd(tm->tm_sec));
|
||||
break;
|
||||
case CMOS_RTC_MINUTES:
|
||||
ioport__write8(data, bin2bcd(tm->tm_min));
|
||||
break;
|
||||
case CMOS_RTC_HOURS:
|
||||
ioport__write8(data, bin2bcd(tm->tm_hour));
|
||||
break;
|
||||
case CMOS_RTC_DATE_OF_MONTH:
|
||||
ioport__write8(data, bin2bcd(tm->tm_mday));
|
||||
break;
|
||||
case CMOS_RTC_MONTH:
|
||||
ioport__write8(data, bin2bcd(tm->tm_mon + 1));
|
||||
break;
|
||||
case CMOS_RTC_YEAR:
|
||||
ioport__write8(data, bin2bcd(tm->tm_year));
|
||||
break;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
static bool cmos_ram_data_out(struct kvm *self, uint16_t port, void *data, int size, uint32_t count)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
static struct ioport_operations cmos_ram_data_ioport_ops = {
|
||||
.io_out = cmos_ram_data_out,
|
||||
.io_in = cmos_ram_data_in,
|
||||
};
|
||||
|
||||
static bool cmos_ram_index_out(struct kvm *self, uint16_t port, void *data, int size, uint32_t count)
|
||||
{
|
||||
uint8_t value;
|
||||
|
||||
value = ioport__read8(data);
|
||||
|
||||
self->nmi_disabled = value & (1UL << 7);
|
||||
|
||||
cmos_index = value & ~(1UL << 7);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
static struct ioport_operations cmos_ram_index_ioport_ops = {
|
||||
.io_out = cmos_ram_index_out,
|
||||
};
|
||||
|
||||
void rtc__init(void)
|
||||
{
|
||||
/* PORT 0070-007F - CMOS RAM/RTC (REAL TIME CLOCK) */
|
||||
ioport__register(0x0070, &cmos_ram_index_ioport_ops, 1);
|
||||
ioport__register(0x0071, &cmos_ram_data_ioport_ops, 1);
|
||||
}
|
||||
Reference in New Issue
Block a user