Devfn number for the PIIX3 southbridge, by Aurelien Jarno.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2315 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
parent
abcebc7e80
commit
8f1c91d801
2
hw/pc.c
2
hw/pc.c
@ -599,7 +599,7 @@ static void pc_init1(int ram_size, int vga_ram_size, int boot_device,
|
||||
|
||||
if (pci_enabled) {
|
||||
pci_bus = i440fx_init(&i440fx_state);
|
||||
piix3_devfn = piix3_init(pci_bus);
|
||||
piix3_devfn = piix3_init(pci_bus, -1);
|
||||
} else {
|
||||
pci_bus = NULL;
|
||||
}
|
||||
|
@ -196,7 +196,7 @@ PCIBus *i440fx_init(PCIDevice **pi440fx_state)
|
||||
|
||||
/* PIIX3 PCI to ISA bridge */
|
||||
|
||||
static PCIDevice *piix3_dev;
|
||||
PCIDevice *piix3_dev;
|
||||
|
||||
/* just used for simpler irq handling. */
|
||||
#define PCI_IRQ_WORDS ((PCI_DEVICES_MAX + 31) / 32)
|
||||
@ -273,13 +273,13 @@ static int piix_load(QEMUFile* f, void *opaque, int version_id)
|
||||
return pci_device_load(d, f);
|
||||
}
|
||||
|
||||
int piix3_init(PCIBus *bus)
|
||||
int piix3_init(PCIBus *bus, int devfn)
|
||||
{
|
||||
PCIDevice *d;
|
||||
uint8_t *pci_conf;
|
||||
|
||||
d = pci_register_device(bus, "PIIX3", sizeof(PCIDevice),
|
||||
-1, NULL, NULL);
|
||||
devfn, NULL, NULL);
|
||||
register_savevm("PIIX3", 0, 2, piix_save, piix_load, d);
|
||||
|
||||
piix3_dev = d;
|
||||
|
2
vl.h
2
vl.h
@ -821,7 +821,7 @@ PCIBus *pci_vpb_init(void *pic, int irq, int realview);
|
||||
/* piix_pci.c */
|
||||
PCIBus *i440fx_init(PCIDevice **pi440fx_state);
|
||||
void i440fx_set_smm(PCIDevice *d, int val);
|
||||
int piix3_init(PCIBus *bus);
|
||||
int piix3_init(PCIBus *bus, int devfn);
|
||||
void i440fx_init_memory_mappings(PCIDevice *d);
|
||||
|
||||
/* openpic.c */
|
||||
|
Loading…
Reference in New Issue
Block a user