From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1IKcIJ-0007ja-7m
	for qemu-devel@nongnu.org; Mon, 13 Aug 2007 11:57:27 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1IKcII-0007jN-2K
	for qemu-devel@nongnu.org; Mon, 13 Aug 2007 11:57:26 -0400
Received: from [199.232.76.173] (helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1IKcIH-0007jK-SQ
	for qemu-devel@nongnu.org; Mon, 13 Aug 2007 11:57:25 -0400
Received: from il.qumranet.com ([82.166.9.18])
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <avi@qumranet.com>) id 1IKcIH-0000xK-C4
	for qemu-devel@nongnu.org; Mon, 13 Aug 2007 11:57:25 -0400
From: Avi Kivity <avi@qumranet.com>
Date: Mon, 13 Aug 2007 18:57:35 +0300
Message-Id: <1187020655319-git-send-email-avi@qumranet.com>
Subject: [Qemu-devel] [PATCH] Set apic instance number for savevm
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org
Cc: kvm-devel@lists.sourceforge.net

This allows save/restore (and live migration on kvm) of smp guests.

Index: hw/apic.c
===================================================================
RCS file: /sources/qemu/qemu/hw/apic.c,v
retrieving revision 1.13
diff -u -r1.13 apic.c
--- hw/apic.c	3 Apr 2007 16:38:34 -0000	1.13
+++ hw/apic.c	13 Aug 2007 15:54:50 -0000
@@ -832,7 +832,7 @@
     }
     s->timer = qemu_new_timer(vm_clock, apic_timer, s);
 
-    register_savevm("apic", 0, 2, apic_save, apic_load, s);
+    register_savevm("apic", s->id, 2, apic_save, apic_load, s);
     qemu_register_reset(apic_reset, s);
     
     local_apics[s->id] = s;