debuggers.hg

view tools/ioemu/patches/hypervisor-pit @ 0:7d21f7218375

Exact replica of unstable on 051908 + README-this
author Mukesh Rathor
date Mon May 19 15:34:57 2008 -0700 (2008-05-19)
parents
children
line source
1 Index: ioemu/Makefile.target
2 ===================================================================
3 --- ioemu.orig/Makefile.target 2007-05-03 19:09:54.000000000 +0100
4 +++ ioemu/Makefile.target 2007-05-03 19:15:05.000000000 +0100
5 @@ -386,7 +386,7 @@
6 ifeq ($(TARGET_BASE_ARCH), i386)
7 # Hardware support
8 VL_OBJS+= ide.o pckbd.o ps2.o vga.o $(SOUND_HW) dma.o $(AUDIODRV)
9 -VL_OBJS+= fdc.o mc146818rtc.o serial.o i8254.o pcspk.o pc.o
10 +VL_OBJS+= fdc.o mc146818rtc.o serial.o pc.o
11 VL_OBJS+= cirrus_vga.o mixeng.o parallel.o acpi.o piix_pci.o
12 VL_OBJS+= usb-uhci.o smbus_eeprom.o
13 CPPFLAGS += -DHAS_AUDIO
14 Index: ioemu/hw/pc.c
15 ===================================================================
16 --- ioemu.orig/hw/pc.c 2007-05-03 19:11:08.000000000 +0100
17 +++ ioemu/hw/pc.c 2007-05-03 19:15:05.000000000 +0100
18 @@ -38,7 +38,9 @@
20 static fdctrl_t *floppy_controller;
21 static RTCState *rtc_state;
22 +#ifndef CONFIG_DM
23 static PITState *pit;
24 +#endif /* !CONFIG_DM */
25 #ifndef CONFIG_DM
26 static IOAPICState *ioapic;
27 #endif /* !CONFIG_DM */
28 @@ -664,8 +666,10 @@
29 }
30 #endif /* !CONFIG_DM */
31 isa_pic = pic_init(pic_irq_request, first_cpu);
32 +#ifndef CONFIG_DM
33 pit = pit_init(0x40, 0);
34 pcspk_init(pit);
35 +#endif /* !CONFIG_DM */
36 #ifndef CONFIG_DM
37 if (pci_enabled) {
38 pic_set_alt_irq_func(isa_pic, ioapic_set_irq, ioapic);
39 Index: ioemu/vl.c
40 ===================================================================
41 --- ioemu.orig/vl.c 2007-05-03 19:14:57.000000000 +0100
42 +++ ioemu/vl.c 2007-05-03 19:15:05.000000000 +0100
43 @@ -6537,6 +6537,7 @@
45 #ifdef HAS_AUDIO
46 struct soundhw soundhw[] = {
47 +#ifndef CONFIG_DM
48 #ifdef TARGET_I386
49 {
50 "pcspk",
51 @@ -6546,6 +6547,7 @@
52 { .init_isa = pcspk_audio_init }
53 },
54 #endif
55 +#endif /* !CONFIG_DM */
56 {
57 "sb16",
58 "Creative Sound Blaster 16",