From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Kiszka Subject: [PATCH][STABLE] qemu-kvm: Fix save/restore of in-kernel i8259 Date: Wed, 14 Dec 2011 13:09:41 +0100 Message-ID: <4EE89205.9070209@siemens.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: kvm To: Avi Kivity , Marcelo Tosatti Return-path: Received: from david.siemens.de ([192.35.17.14]:32082 "EHLO david.siemens.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755446Ab1LNMJs (ORCPT ); Wed, 14 Dec 2011 07:09:48 -0500 Sender: kvm-owner@vger.kernel.org List-ID: Subject: [PATCH] qemu-kvm: Fix save/restore of in-kernel i8259 As the qemu-kvm version of the i8259 contains KVM bits, it still has to be compiled per target. This unbreaks migration of the i8259. Signed-off-by: Jan Kiszka --- Makefile.objs | 2 +- Makefile.target | 2 +- hw/i8259.c | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Makefile.objs b/Makefile.objs index 13afd19..77237e1 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -223,7 +223,7 @@ hw-obj-$(CONFIG_APPLESMC) += applesmc.o hw-obj-$(CONFIG_SMARTCARD) += usb-ccid.o ccid-card-passthru.o hw-obj-$(CONFIG_SMARTCARD_NSS) += ccid-card-emulated.o hw-obj-$(CONFIG_USB_REDIR) += usb-redir.o -hw-obj-$(CONFIG_I8259) += i8259.o +# hw-obj-$(CONFIG_I8259) += i8259.o # PPC devices hw-obj-$(CONFIG_PREP_PCI) += prep_pci.o diff --git a/Makefile.target b/Makefile.target index 0b610ad..1c9c049 100644 --- a/Makefile.target +++ b/Makefile.target @@ -236,7 +236,7 @@ obj-$(CONFIG_IVSHMEM) += ivshmem.o # Hardware support obj-i386-y += vga.o -obj-i386-y += mc146818rtc.o pc.o +obj-i386-y += mc146818rtc.o pc.o i8259.o obj-i386-y += cirrus_vga.o sga.o apic.o ioapic.o piix_pci.o obj-i386-y += vmport.o obj-i386-y += device-hotplug.o pci-hotplug.o smbios.o wdt_ib700.o diff --git a/hw/i8259.c b/hw/i8259.c index fa63e83..a9ea9c9 100644 --- a/hw/i8259.c +++ b/hw/i8259.c @@ -697,8 +697,6 @@ static int kvm_kernel_pic_load_from_user(PicState *s) return 0; } -extern void apic_set_irq_delivered(void); - static void kvm_i8259_set_irq(void *opaque, int irq, int level) { int pic_ret; -- 1.7.3.4