hw/isa/piix4.c: Introduce variable to store devfn
To avoid any problem with reassigning pci variable store devfn in a variable instead of acessing it from the PCIDevice. Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-id: 1020e0bfcfc6e364f967ccb2a9a3778ac174ccbe.1584457537.git.balaton@eik.bme.hu Signed-off-by: John Snow <jsnow@redhat.com>
This commit is contained in:
parent
df45d38f73
commit
902283c1df
|
@ -247,9 +247,10 @@ DeviceState *piix4_create(PCIBus *pci_bus, ISABus **isa_bus,
|
||||||
DriveInfo **hd;
|
DriveInfo **hd;
|
||||||
PCIDevice *pci;
|
PCIDevice *pci;
|
||||||
DeviceState *dev;
|
DeviceState *dev;
|
||||||
|
int devfn = PCI_DEVFN(10, 0);
|
||||||
|
|
||||||
pci = pci_create_simple_multifunction(pci_bus, PCI_DEVFN(10, 0),
|
pci = pci_create_simple_multifunction(pci_bus, devfn, true,
|
||||||
true, TYPE_PIIX4_PCI_DEVICE);
|
TYPE_PIIX4_PCI_DEVICE);
|
||||||
dev = DEVICE(pci);
|
dev = DEVICE(pci);
|
||||||
if (isa_bus) {
|
if (isa_bus) {
|
||||||
*isa_bus = ISA_BUS(qdev_get_child_bus(dev, "isa.0"));
|
*isa_bus = ISA_BUS(qdev_get_child_bus(dev, "isa.0"));
|
||||||
|
@ -257,11 +258,12 @@ DeviceState *piix4_create(PCIBus *pci_bus, ISABus **isa_bus,
|
||||||
|
|
||||||
hd = g_new(DriveInfo *, ide_drives);
|
hd = g_new(DriveInfo *, ide_drives);
|
||||||
ide_drive_get(hd, ide_drives);
|
ide_drive_get(hd, ide_drives);
|
||||||
pci_piix4_ide_init(pci_bus, hd, pci->devfn + 1);
|
pci_piix4_ide_init(pci_bus, hd, devfn + 1);
|
||||||
g_free(hd);
|
g_free(hd);
|
||||||
pci_create_simple(pci_bus, pci->devfn + 2, "piix4-usb-uhci");
|
|
||||||
|
pci_create_simple(pci_bus, devfn + 2, "piix4-usb-uhci");
|
||||||
if (smbus) {
|
if (smbus) {
|
||||||
*smbus = piix4_pm_init(pci_bus, pci->devfn + 3, 0x1100,
|
*smbus = piix4_pm_init(pci_bus, devfn + 3, 0x1100,
|
||||||
isa_get_irq(NULL, 9), NULL, 0, NULL);
|
isa_get_irq(NULL, 9), NULL, 0, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue