 02a89b2190
			
		
	
	
		02a89b2190
		
	
	
	
	
		
			
			https://bugs.launchpad.net/bugs/611646 reports that ./i386-softmmu/qemu -M isapc segfaults. This patch fixes the segfault introduced by f885f1eaa8711c06033ceb1599e3750fb37c306f It's because i440fx_state in pc_init1() isn't initialized. > Core was generated by `./i386-softmmu/qemu -M isapc'. > Program terminated with signal 11, Segmentation fault. > [New process 19686] > at qemu/hw/piix_pci.c:136 > (gdb) where > at qemu/hw/piix_pci.c:136 > boot_device=0x7fffe1f5b040 "cad", kernel_filename=0x0, > kernel_cmdline=0x6469bf "", initrd_filename=0x0, > cpu_model=0x654d10 "486", pci_enabled=0) > at qemu/hw/pc_piix.c:178 > boot_device=0x7fffe1f5b040 "cad", kernel_filename=0x0, > kernel_cmdline=0x6469bf "", initrd_filename=0x0, cpu_model=0x654d10 "486") > at qemu/hw/pc_piix.c:207 > envp=0x7fffe1f5b188) > at qemu/vl.c:2871 Signed-off-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
		
			
				
	
	
		
			341 lines
		
	
	
		
			10 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			341 lines
		
	
	
		
			10 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * QEMU PC System Emulator
 | |
|  *
 | |
|  * Copyright (c) 2003-2004 Fabrice Bellard
 | |
|  *
 | |
|  * Permission is hereby granted, free of charge, to any person obtaining a copy
 | |
|  * of this software and associated documentation files (the "Software"), to deal
 | |
|  * in the Software without restriction, including without limitation the rights
 | |
|  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 | |
|  * copies of the Software, and to permit persons to whom the Software is
 | |
|  * furnished to do so, subject to the following conditions:
 | |
|  *
 | |
|  * The above copyright notice and this permission notice shall be included in
 | |
|  * all copies or substantial portions of the Software.
 | |
|  *
 | |
|  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 | |
|  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 | |
|  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
 | |
|  * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 | |
|  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 | |
|  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 | |
|  * THE SOFTWARE.
 | |
|  */
 | |
| 
 | |
| #include "hw.h"
 | |
| #include "pc.h"
 | |
| #include "apic.h"
 | |
| #include "pci.h"
 | |
| #include "usb-uhci.h"
 | |
| #include "usb-ohci.h"
 | |
| #include "net.h"
 | |
| #include "boards.h"
 | |
| #include "ide.h"
 | |
| #include "kvm.h"
 | |
| #include "sysemu.h"
 | |
| #include "sysbus.h"
 | |
| #include "blockdev.h"
 | |
| 
 | |
| #define MAX_IDE_BUS 2
 | |
| 
 | |
| static const int ide_iobase[MAX_IDE_BUS] = { 0x1f0, 0x170 };
 | |
| static const int ide_iobase2[MAX_IDE_BUS] = { 0x3f6, 0x376 };
 | |
| static const int ide_irq[MAX_IDE_BUS] = { 14, 15 };
 | |
| 
 | |
| static void ioapic_init(IsaIrqState *isa_irq_state)
 | |
| {
 | |
|     DeviceState *dev;
 | |
|     SysBusDevice *d;
 | |
|     unsigned int i;
 | |
| 
 | |
|     dev = qdev_create(NULL, "ioapic");
 | |
|     qdev_init_nofail(dev);
 | |
|     d = sysbus_from_qdev(dev);
 | |
|     sysbus_mmio_map(d, 0, 0xfec00000);
 | |
| 
 | |
|     for (i = 0; i < IOAPIC_NUM_PINS; i++) {
 | |
|         isa_irq_state->ioapic[i] = qdev_get_gpio_in(dev, i);
 | |
|     }
 | |
| }
 | |
| 
 | |
| /* PC hardware initialisation */
 | |
| static void pc_init1(ram_addr_t ram_size,
 | |
|                      const char *boot_device,
 | |
|                      const char *kernel_filename,
 | |
|                      const char *kernel_cmdline,
 | |
|                      const char *initrd_filename,
 | |
|                      const char *cpu_model,
 | |
|                      int pci_enabled)
 | |
| {
 | |
|     int i;
 | |
|     ram_addr_t below_4g_mem_size, above_4g_mem_size;
 | |
|     PCIBus *pci_bus;
 | |
|     PCII440FXState *i440fx_state;
 | |
|     int piix3_devfn = -1;
 | |
|     qemu_irq *cpu_irq;
 | |
|     qemu_irq *isa_irq;
 | |
|     qemu_irq *i8259;
 | |
|     qemu_irq *cmos_s3;
 | |
|     qemu_irq *smi_irq;
 | |
|     IsaIrqState *isa_irq_state;
 | |
|     DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS];
 | |
|     FDCtrl *floppy_controller;
 | |
|     BusState *idebus[MAX_IDE_BUS];
 | |
|     ISADevice *rtc_state;
 | |
| 
 | |
|     pc_cpus_init(cpu_model);
 | |
| 
 | |
|     vmport_init();
 | |
| 
 | |
|     /* allocate ram and load rom/bios */
 | |
|     pc_memory_init(ram_size, kernel_filename, kernel_cmdline, initrd_filename,
 | |
|                    &below_4g_mem_size, &above_4g_mem_size);
 | |
| 
 | |
|     cpu_irq = pc_allocate_cpu_irq();
 | |
|     i8259 = i8259_init(cpu_irq[0]);
 | |
|     isa_irq_state = qemu_mallocz(sizeof(*isa_irq_state));
 | |
|     isa_irq_state->i8259 = i8259;
 | |
|     if (pci_enabled) {
 | |
|         ioapic_init(isa_irq_state);
 | |
|     }
 | |
|     isa_irq = qemu_allocate_irqs(isa_irq_handler, isa_irq_state, 24);
 | |
| 
 | |
|     if (pci_enabled) {
 | |
|         pci_bus = i440fx_init(&i440fx_state, &piix3_devfn, isa_irq, ram_size);
 | |
|     } else {
 | |
|         pci_bus = NULL;
 | |
|         i440fx_state = NULL;
 | |
|         isa_bus_new(NULL);
 | |
|     }
 | |
|     isa_bus_irqs(isa_irq);
 | |
| 
 | |
|     pc_register_ferr_irq(isa_reserve_irq(13));
 | |
| 
 | |
|     pc_vga_init(pci_enabled? pci_bus: NULL);
 | |
| 
 | |
|     /* init basic PC hardware */
 | |
|     pc_basic_device_init(isa_irq, &floppy_controller, &rtc_state);
 | |
| 
 | |
|     for(i = 0; i < nb_nics; i++) {
 | |
|         NICInfo *nd = &nd_table[i];
 | |
| 
 | |
|         if (!pci_enabled || (nd->model && strcmp(nd->model, "ne2k_isa") == 0))
 | |
|             pc_init_ne2k_isa(nd);
 | |
|         else
 | |
|             pci_nic_init_nofail(nd, "e1000", NULL);
 | |
|     }
 | |
| 
 | |
|     if (drive_get_max_bus(IF_IDE) >= MAX_IDE_BUS) {
 | |
|         fprintf(stderr, "qemu: too many IDE bus\n");
 | |
|         exit(1);
 | |
|     }
 | |
| 
 | |
|     for(i = 0; i < MAX_IDE_BUS * MAX_IDE_DEVS; i++) {
 | |
|         hd[i] = drive_get(IF_IDE, i / MAX_IDE_DEVS, i % MAX_IDE_DEVS);
 | |
|     }
 | |
| 
 | |
|     if (pci_enabled) {
 | |
|         PCIDevice *dev;
 | |
|         dev = pci_piix3_ide_init(pci_bus, hd, piix3_devfn + 1);
 | |
|         idebus[0] = qdev_get_child_bus(&dev->qdev, "ide.0");
 | |
|         idebus[1] = qdev_get_child_bus(&dev->qdev, "ide.1");
 | |
|     } else {
 | |
|         for(i = 0; i < MAX_IDE_BUS; i++) {
 | |
|             ISADevice *dev;
 | |
|             dev = isa_ide_init(ide_iobase[i], ide_iobase2[i], ide_irq[i],
 | |
|                                hd[MAX_IDE_DEVS * i], hd[MAX_IDE_DEVS * i + 1]);
 | |
|             idebus[i] = qdev_get_child_bus(&dev->qdev, "ide.0");
 | |
|         }
 | |
|     }
 | |
| 
 | |
|     pc_audio_init(pci_enabled ? pci_bus : NULL, isa_irq);
 | |
| 
 | |
|     pc_cmos_init(below_4g_mem_size, above_4g_mem_size, boot_device,
 | |
|                  idebus[0], idebus[1], floppy_controller, rtc_state);
 | |
| 
 | |
|     if (pci_enabled && usb_enabled) {
 | |
|         usb_uhci_piix3_init(pci_bus, piix3_devfn + 2);
 | |
|     }
 | |
| 
 | |
|     if (pci_enabled && acpi_enabled) {
 | |
|         uint8_t *eeprom_buf = qemu_mallocz(8 * 256); /* XXX: make this persistent */
 | |
|         i2c_bus *smbus;
 | |
| 
 | |
|         cmos_s3 = qemu_allocate_irqs(pc_cmos_set_s3_resume, rtc_state, 1);
 | |
|         smi_irq = qemu_allocate_irqs(pc_acpi_smi_interrupt, first_cpu, 1);
 | |
|         /* TODO: Populate SPD eeprom data.  */
 | |
|         smbus = piix4_pm_init(pci_bus, piix3_devfn + 3, 0xb100,
 | |
|                               isa_reserve_irq(9), *cmos_s3, *smi_irq,
 | |
|                               kvm_enabled());
 | |
|         for (i = 0; i < 8; i++) {
 | |
|             DeviceState *eeprom;
 | |
|             eeprom = qdev_create((BusState *)smbus, "smbus-eeprom");
 | |
|             qdev_prop_set_uint8(eeprom, "address", 0x50 + i);
 | |
|             qdev_prop_set_ptr(eeprom, "data", eeprom_buf + (i * 256));
 | |
|             qdev_init_nofail(eeprom);
 | |
|         }
 | |
|     }
 | |
| 
 | |
|     if (i440fx_state) {
 | |
|         i440fx_init_memory_mappings(i440fx_state);
 | |
|     }
 | |
| 
 | |
|     if (pci_enabled) {
 | |
|         pc_pci_device_init(pci_bus);
 | |
|     }
 | |
| }
 | |
| 
 | |
| static void pc_init_pci(ram_addr_t ram_size,
 | |
|                         const char *boot_device,
 | |
|                         const char *kernel_filename,
 | |
|                         const char *kernel_cmdline,
 | |
|                         const char *initrd_filename,
 | |
|                         const char *cpu_model)
 | |
| {
 | |
|     pc_init1(ram_size, boot_device,
 | |
|              kernel_filename, kernel_cmdline,
 | |
|              initrd_filename, cpu_model, 1);
 | |
| }
 | |
| 
 | |
| static void pc_init_isa(ram_addr_t ram_size,
 | |
|                         const char *boot_device,
 | |
|                         const char *kernel_filename,
 | |
|                         const char *kernel_cmdline,
 | |
|                         const char *initrd_filename,
 | |
|                         const char *cpu_model)
 | |
| {
 | |
|     if (cpu_model == NULL)
 | |
|         cpu_model = "486";
 | |
|     pc_init1(ram_size, boot_device,
 | |
|              kernel_filename, kernel_cmdline,
 | |
|              initrd_filename, cpu_model, 0);
 | |
| }
 | |
| 
 | |
| static QEMUMachine pc_machine = {
 | |
|     .name = "pc-0.13",
 | |
|     .alias = "pc",
 | |
|     .desc = "Standard PC",
 | |
|     .init = pc_init_pci,
 | |
|     .max_cpus = 255,
 | |
|     .is_default = 1,
 | |
| };
 | |
| 
 | |
| static QEMUMachine pc_machine_v0_12 = {
 | |
|     .name = "pc-0.12",
 | |
|     .desc = "Standard PC",
 | |
|     .init = pc_init_pci,
 | |
|     .max_cpus = 255,
 | |
|     .compat_props = (GlobalProperty[]) {
 | |
|         {
 | |
|             .driver   = "virtio-serial-pci",
 | |
|             .property = "max_ports",
 | |
|             .value    = stringify(1),
 | |
|         },{
 | |
|             .driver   = "virtio-serial-pci",
 | |
|             .property = "vectors",
 | |
|             .value    = stringify(0),
 | |
|         },
 | |
|         { /* end of list */ }
 | |
|     }
 | |
| };
 | |
| 
 | |
| static QEMUMachine pc_machine_v0_11 = {
 | |
|     .name = "pc-0.11",
 | |
|     .desc = "Standard PC, qemu 0.11",
 | |
|     .init = pc_init_pci,
 | |
|     .max_cpus = 255,
 | |
|     .compat_props = (GlobalProperty[]) {
 | |
|         {
 | |
|             .driver   = "virtio-blk-pci",
 | |
|             .property = "vectors",
 | |
|             .value    = stringify(0),
 | |
|         },{
 | |
|             .driver   = "virtio-serial-pci",
 | |
|             .property = "max_ports",
 | |
|             .value    = stringify(1),
 | |
|         },{
 | |
|             .driver   = "virtio-serial-pci",
 | |
|             .property = "vectors",
 | |
|             .value    = stringify(0),
 | |
|         },{
 | |
|             .driver   = "ide-drive",
 | |
|             .property = "ver",
 | |
|             .value    = "0.11",
 | |
|         },{
 | |
|             .driver   = "scsi-disk",
 | |
|             .property = "ver",
 | |
|             .value    = "0.11",
 | |
|         },{
 | |
|             .driver   = "PCI",
 | |
|             .property = "rombar",
 | |
|             .value    = stringify(0),
 | |
|         },
 | |
|         { /* end of list */ }
 | |
|     }
 | |
| };
 | |
| 
 | |
| static QEMUMachine pc_machine_v0_10 = {
 | |
|     .name = "pc-0.10",
 | |
|     .desc = "Standard PC, qemu 0.10",
 | |
|     .init = pc_init_pci,
 | |
|     .max_cpus = 255,
 | |
|     .compat_props = (GlobalProperty[]) {
 | |
|         {
 | |
|             .driver   = "virtio-blk-pci",
 | |
|             .property = "class",
 | |
|             .value    = stringify(PCI_CLASS_STORAGE_OTHER),
 | |
|         },{
 | |
|             .driver   = "virtio-serial-pci",
 | |
|             .property = "class",
 | |
|             .value    = stringify(PCI_CLASS_DISPLAY_OTHER),
 | |
|         },{
 | |
|             .driver   = "virtio-serial-pci",
 | |
|             .property = "max_ports",
 | |
|             .value    = stringify(1),
 | |
|         },{
 | |
|             .driver   = "virtio-serial-pci",
 | |
|             .property = "vectors",
 | |
|             .value    = stringify(0),
 | |
|         },{
 | |
|             .driver   = "virtio-net-pci",
 | |
|             .property = "vectors",
 | |
|             .value    = stringify(0),
 | |
|         },{
 | |
|             .driver   = "virtio-blk-pci",
 | |
|             .property = "vectors",
 | |
|             .value    = stringify(0),
 | |
|         },{
 | |
|             .driver   = "ide-drive",
 | |
|             .property = "ver",
 | |
|             .value    = "0.10",
 | |
|         },{
 | |
|             .driver   = "scsi-disk",
 | |
|             .property = "ver",
 | |
|             .value    = "0.10",
 | |
|         },{
 | |
|             .driver   = "PCI",
 | |
|             .property = "rombar",
 | |
|             .value    = stringify(0),
 | |
|         },
 | |
|         { /* end of list */ }
 | |
|     },
 | |
| };
 | |
| 
 | |
| static QEMUMachine isapc_machine = {
 | |
|     .name = "isapc",
 | |
|     .desc = "ISA-only PC",
 | |
|     .init = pc_init_isa,
 | |
|     .max_cpus = 1,
 | |
| };
 | |
| 
 | |
| static void pc_machine_init(void)
 | |
| {
 | |
|     qemu_register_machine(&pc_machine);
 | |
|     qemu_register_machine(&pc_machine_v0_12);
 | |
|     qemu_register_machine(&pc_machine_v0_11);
 | |
|     qemu_register_machine(&pc_machine_v0_10);
 | |
|     qemu_register_machine(&isapc_machine);
 | |
| }
 | |
| 
 | |
| machine_init(pc_machine_init);
 |