22 lines
778 B
Diff
22 lines
778 B
Diff
|
# HG changeset patch
|
||
|
|
# User Tim Deegan <Tim.Deegan@xensource.com>
|
||
|
|
# Date 1181570210 -3600
|
||
|
|
# Node ID ed254cf78f7ca758539ba3314932fbbd808807d2
|
||
|
|
# Parent 2c8c6ca1296b82e31bb0a50fcf9f63d0bfa11176
|
||
|
|
[QEMU] Fix up ioemu timer save/restore after version changes.
|
||
|
|
Signed-off-by: Tim Deegan <Tim.Deegan@xensource.com>
|
||
|
|
|
||
|
|
Index: xen-3.1-testing/tools/ioemu/vl.c
|
||
|
|
===================================================================
|
||
|
|
--- xen-3.1-testing.orig/tools/ioemu/vl.c
|
||
|
|
+++ xen-3.1-testing/tools/ioemu/vl.c
|
||
|
|
@@ -872,7 +872,7 @@ static void timer_save(QEMUFile *f, void
|
||
|
|
|
||
|
|
static int timer_load(QEMUFile *f, void *opaque, int version_id)
|
||
|
|
{
|
||
|
|
- if (version_id != 1)
|
||
|
|
+ if (version_id != 1 && version_id != 2)
|
||
|
|
return -EINVAL;
|
||
|
|
if (cpu_ticks_enabled) {
|
||
|
|
return -EINVAL;
|