From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59726) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bT8GU-0000pA-2j for qemu-devel@nongnu.org; Fri, 29 Jul 2016 09:55:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bT8GR-0006xT-1J for qemu-devel@nongnu.org; Fri, 29 Jul 2016 09:55:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55418) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bT8GQ-0006xM-Rb for qemu-devel@nongnu.org; Fri, 29 Jul 2016 09:55:46 -0400 From: Igor Mammedov Date: Fri, 29 Jul 2016 15:55:42 +0200 Message-Id: <1469800542-11402-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH for-2.7] apic: fix broken migration for kvm-apic List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mst@redhat.com, ehabkost@redhat.com, pbonzini@redhat.com, dgilbert@redhat.com, peter.maydell@linaro.org commit f6e98444 (apic: Use apic_id as apic's migration instance_id) breaks migration when in kernel irqchip is used for 2.6 and older machine types. It applies compat property only for userspace 'apic' type instead of applying it to all apic types inherited from 'apic-common' type as it was supposed to do. Fix it by setting compat property 'legacy-instance-id' for 'apic-common' type which affects inherited types (i.e. not only 'apic' but also 'kvm-apic' types) Signed-off-by: Igor Mammedov --- include/hw/i386/pc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index c87c5c1..74c175c 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -388,7 +388,7 @@ bool e820_get_entry(int, uint32_t, uint64_t *, uint64_t *); .value = "off",\ },\ {\ - .driver = "apic",\ + .driver = "apic-common",\ .property = "legacy-instance-id",\ .value = "on",\ }, -- 2.7.4