dcavalca / rpms / qemu

Forked from rpms/qemu a year ago
Clone

Blame Fix_save-restore_of_in-kernel_i8259.patch

Justin M. Forbes 45e84a
As the qemu-kvm version of the i8259 contains KVM bits, it still has to
Justin M. Forbes 45e84a
be compiled per target. This unbreaks migration of the i8259.
Justin M. Forbes 45e84a
Justin M. Forbes 45e84a
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Justin M. Forbes 45e84a
---
Justin M. Forbes 45e84a
Justin M. Forbes 45e84a
Not sure if anyone bothers (no one should actually use qemu-kvm for
Justin M. Forbes 45e84a
targets != x86), but let's avoid needless breakages of other targets
Justin M. Forbes 45e84a
requiring the i8259.
Justin M. Forbes 45e84a
Justin M. Forbes 45e84a
 Makefile.objs   |    2 +-
Justin M. Forbes 45e84a
 Makefile.target |    8 ++++----
Justin M. Forbes 45e84a
 hw/i8259.c      |    2 --
Justin M. Forbes 45e84a
 3 files changed, 5 insertions(+), 7 deletions(-)
Justin M. Forbes 45e84a
Justin M. Forbes 45e84a
diff --git a/Makefile.objs b/Makefile.objs
Justin M. Forbes 45e84a
index 13afd19..77237e1 100644
Justin M. Forbes 45e84a
--- a/Makefile.objs
Justin M. Forbes 45e84a
+++ b/Makefile.objs
Justin M. Forbes 45e84a
@@ -223,7 +223,7 @@ hw-obj-$(CONFIG_APPLESMC) += applesmc.o
Justin M. Forbes 45e84a
 hw-obj-$(CONFIG_SMARTCARD) += usb-ccid.o ccid-card-passthru.o
Justin M. Forbes 45e84a
 hw-obj-$(CONFIG_SMARTCARD_NSS) += ccid-card-emulated.o
Justin M. Forbes 45e84a
 hw-obj-$(CONFIG_USB_REDIR) += usb-redir.o
Justin M. Forbes 45e84a
-hw-obj-$(CONFIG_I8259) += i8259.o
Justin M. Forbes 45e84a
+# hw-obj-$(CONFIG_I8259) += i8259.o
Justin M. Forbes 45e84a
 
Justin M. Forbes 45e84a
 # PPC devices
Justin M. Forbes 45e84a
 hw-obj-$(CONFIG_PREP_PCI) += prep_pci.o
Justin M. Forbes 45e84a
diff --git a/Makefile.target b/Makefile.target
Justin M. Forbes 45e84a
index 0b610ad..29eaa68 100644
Justin M. Forbes 45e84a
--- a/Makefile.target
Justin M. Forbes 45e84a
+++ b/Makefile.target
Justin M. Forbes 45e84a
@@ -236,7 +236,7 @@ obj-$(CONFIG_IVSHMEM) += ivshmem.o
Justin M. Forbes 45e84a
 
Justin M. Forbes 45e84a
 # Hardware support
Justin M. Forbes 45e84a
 obj-i386-y += vga.o
Justin M. Forbes 45e84a
-obj-i386-y += mc146818rtc.o pc.o
Justin M. Forbes 45e84a
+obj-i386-y += mc146818rtc.o pc.o i8259.o
Justin M. Forbes 45e84a
 obj-i386-y += cirrus_vga.o sga.o apic.o ioapic.o piix_pci.o
Justin M. Forbes 45e84a
 obj-i386-y += vmport.o
Justin M. Forbes 45e84a
 obj-i386-y += device-hotplug.o pci-hotplug.o smbios.o wdt_ib700.o
Justin M. Forbes 45e84a
@@ -255,7 +255,7 @@ obj-i386-$(CONFIG_KVM_DEVICE_ASSIGNMENT) += device-assignment.o
Justin M. Forbes 45e84a
 obj-ppc-y = ppc.o ppc_booke.o
Justin M. Forbes 45e84a
 obj-ppc-y += vga.o
Justin M. Forbes 45e84a
 # PREP target
Justin M. Forbes 45e84a
-obj-ppc-y += mc146818rtc.o
Justin M. Forbes 45e84a
+obj-ppc-y += mc146818rtc.o i8259.o
Justin M. Forbes 45e84a
 obj-ppc-y += ppc_prep.o
Justin M. Forbes 45e84a
 # OldWorld PowerMac
Justin M. Forbes 45e84a
 obj-ppc-y += ppc_oldworld.o
Justin M. Forbes 45e84a
@@ -311,7 +311,7 @@ obj-mips-y += acpi.o acpi_piix4.o
Justin M. Forbes 45e84a
 obj-mips-y += mips_addr.o mips_timer.o mips_int.o
Justin M. Forbes 45e84a
 obj-mips-y += vga.o
Justin M. Forbes 45e84a
 obj-mips-y += jazz_led.o
Justin M. Forbes 45e84a
-obj-mips-y += gt64xxx.o mc146818rtc.o
Justin M. Forbes 45e84a
+obj-mips-y += gt64xxx.o mc146818rtc.o i8259.o
Justin M. Forbes 45e84a
 obj-mips-y += cirrus_vga.o
Justin M. Forbes 45e84a
 obj-mips-$(CONFIG_FULONG) += bonito.o vt82c686.o mips_fulong2e.o
Justin M. Forbes 45e84a
 
Justin M. Forbes 45e84a
@@ -392,7 +392,7 @@ obj-m68k-y += m68k-semi.o dummy_m68k.o
Justin M. Forbes 45e84a
 
Justin M. Forbes 45e84a
 obj-s390x-y = s390-virtio-bus.o s390-virtio.o
Justin M. Forbes 45e84a
 
Justin M. Forbes 45e84a
-obj-alpha-y = mc146818rtc.o
Justin M. Forbes 45e84a
+obj-alpha-y = mc146818rtc.o i8259.o
Justin M. Forbes 45e84a
 obj-alpha-y += vga.o cirrus_vga.o
Justin M. Forbes 45e84a
 obj-alpha-y += alpha_pci.o alpha_dp264.o alpha_typhoon.o
Justin M. Forbes 45e84a
 
Justin M. Forbes 45e84a
diff --git a/hw/i8259.c b/hw/i8259.c
Justin M. Forbes 45e84a
index fa63e83..a9ea9c9 100644
Justin M. Forbes 45e84a
--- a/hw/i8259.c
Justin M. Forbes 45e84a
+++ b/hw/i8259.c
Justin M. Forbes 45e84a
@@ -697,8 +697,6 @@ static int kvm_kernel_pic_load_from_user(PicState *s)
Justin M. Forbes 45e84a
     return 0;
Justin M. Forbes 45e84a
 }
Justin M. Forbes 45e84a
 
Justin M. Forbes 45e84a
-extern void apic_set_irq_delivered(void);
Justin M. Forbes 45e84a
-
Justin M. Forbes 45e84a
 static void kvm_i8259_set_irq(void *opaque, int irq, int level)
Justin M. Forbes 45e84a
 {
Justin M. Forbes 45e84a
     int pic_ret;
Justin M. Forbes 45e84a
-- 
Justin M. Forbes 45e84a
1.7.3.4
Justin M. Forbes 45e84a
--
Justin M. Forbes 45e84a
To unsubscribe from this list: send the line "unsubscribe kvm" in
Justin M. Forbes 45e84a
the body of a message to majordomo@vger.kernel.org
Justin M. Forbes 45e84a
More majordomo info at  http://vger.kernel.org/majordomo-info.html