source: trunk/packages/xen-3.1/xen-3.1/tools/ioemu/patches/qemu-no-apic @ 34

Last change on this file since 34 was 34, checked in by hartmans, 18 years ago

Add xen and xen-common

File size: 1.7 KB
Line 
1Index: ioemu/Makefile.target
2===================================================================
3--- ioemu.orig/Makefile.target  2006-12-08 01:41:11.000000000 +0000
4+++ ioemu/Makefile.target       2006-12-08 01:41:12.000000000 +0000
5@@ -356,7 +356,7 @@
6 # Hardware support
7 VL_OBJS+= ide.o pckbd.o ps2.o vga.o $(SOUND_HW) dma.o $(AUDIODRV)
8 VL_OBJS+= fdc.o mc146818rtc.o serial.o i8254.o pcspk.o pc.o
9-VL_OBJS+= cirrus_vga.o mixeng.o apic.o parallel.o acpi.o piix_pci.o
10+VL_OBJS+= cirrus_vga.o mixeng.o parallel.o acpi.o piix_pci.o
11 VL_OBJS+= usb-uhci.o
12 DEFINES += -DHAS_AUDIO
13 endif
14Index: ioemu/hw/pc.c
15===================================================================
16--- ioemu.orig/hw/pc.c  2006-12-08 01:41:12.000000000 +0000
17+++ ioemu/hw/pc.c       2006-12-08 01:41:12.000000000 +0000
18@@ -39,7 +39,9 @@
19 static fdctrl_t *floppy_controller;
20 static RTCState *rtc_state;
21 static PITState *pit;
22+#ifndef CONFIG_DM
23 static IOAPICState *ioapic;
24+#endif /* !CONFIG_DM */
25 
26 static void ioport80_write(void *opaque, uint32_t addr, uint32_t data)
27 {
28@@ -640,9 +642,11 @@
29 #endif /* !CONFIG_DM */
30         register_savevm("cpu", i, 3, cpu_save, cpu_load, env);
31         qemu_register_reset(main_cpu_reset, env);
32+#ifndef CONFIG_DM
33         if (pci_enabled) {
34             apic_init(env);
35         }
36+#endif /* !CONFIG_DM */
37     }
38 
39     /* allocate RAM */
40@@ -789,9 +793,11 @@
41     register_ioport_read(0x92, 1, 1, ioport92_read, NULL);
42     register_ioport_write(0x92, 1, 1, ioport92_write, NULL);
43 
44+#ifndef CONFIG_DM
45     if (pci_enabled) {
46         ioapic = ioapic_init();
47     }
48+#endif /* !CONFIG_DM */
49     isa_pic = pic_init(pic_irq_request, first_cpu);
50     pit = pit_init(0x40, 0);
51     pcspk_init(pit);
Note: See TracBrowser for help on using the repository browser.