Changeset 13078 in vbox

Timestamp:

Oct 8, 2008 12:57:12 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

37558

Message:

• saved state compatibility

File:

• trunk/src/VBox/Devices/PC/DevAPIC.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/PC/DevAPIC.cpp

@@ -764 +764 @@
     //LogRel(("nike: RDMSR on %d: read from %x\n", idCpu, index));
     APICState* apic = getLapicById(dev, idCpu);
-    uint64_t val;
+    uint64_t val = 0;
 
     switch (index) 
@@ -1587 +1587 @@
     int i;
 
-    if (version_id != 2)
+#ifdef VBOX
+    if ((version_id < 1) || (version_id > 2))
+        return -EINVAL;
+    
+     /* XXX: what if the base changes? (registered memory regions) */
+    qemu_get_be32s(f, &s->apicbase);
+
+    switch (version_id)
+    {
+        case 1:
+        {
+            uint8_t val = 0;
+            qemu_get_8s(f, &val);
+            s->id = val;
+            /* UP only in old saved states */
+            s->phys_id = 0;
+            qemu_get_8s(f, &val);
+            s->arb_id = val;
+            break;
+        }
+        case 2:
+            qemu_get_be32s(f, &s->id);
+            qemu_get_be32s(f, &s->phys_id);
+            qemu_get_be32s(f, &s->arb_id);
+            break;
+    }
+    qemu_get_be32s(f, &s->tpr);
+#else
+     if (version_id != 1)
         return -EINVAL;
 
     /* XXX: what if the base changes? (registered memory regions) */
     qemu_get_be32s(f, &s->apicbase);
-#ifdef VBOX
-    qemu_get_be32s(f, &s->id);
-    qemu_get_be32s(f, &s->phys_id);
-    qemu_get_be32s(f, &s->arb_id);
-    qemu_get_be32s(f, &s->tpr);
-#else
     qemu_get_8s(f, &s->id);
     qemu_get_8s(f, &s->arb_id);