diff options
| author | Glauber Costa <glommer@redhat.com> | 2009-10-22 10:26:56 -0200 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2009-12-12 07:59:49 -0600 |
| commit | 1a03675db146dfc760b3b48b3448075189f142cc (patch) | |
| tree | 5bd0d493d170c980752cac354035b26e914b8fbb /target-i386/machine.c | |
| parent | d96fd29cca420d1ff3d34cde233cf41a3818c550 (diff) | |
| download | qemu-1a03675db146dfc760b3b48b3448075189f142cc.tar.gz | |
v2: properly save kvm system time msr registers
Currently, the msrs involved in setting up pvclock are not saved over
migration and/or save/restore. This patch puts their value in special
fields in our CPUState, and deal with them using vmstate.
kvm also has to account for it, by including them in the msr list
for the ioctls.
This is a backport from qemu-kvm.git
[v2: sucessfully build without kerneldir ]
Signed-off-by: Glauber Costa <glommer@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'target-i386/machine.c')
| -rw-r--r-- | target-i386/machine.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/target-i386/machine.c b/target-i386/machine.c index ab4633e652..2fb8faba9f 100644 --- a/target-i386/machine.c +++ b/target-i386/machine.c @@ -461,6 +461,9 @@ static const VMStateDescription vmstate_cpu = { VMSTATE_UINT64_ARRAY_V(mce_banks, CPUState, MCE_BANKS_DEF *4, 10), /* rdtscp */ VMSTATE_UINT64_V(tsc_aux, CPUState, 11), + /* KVM pvclock msr */ + VMSTATE_UINT64_V(system_time_msr, CPUState, 11), + VMSTATE_UINT64_V(wall_clock_msr, CPUState, 11), VMSTATE_END_OF_LIST() /* The above list is not sorted /wrt version numbers, watch out! */ } |