diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-01-28 12:54:06 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-01-28 12:54:06 +0000 |
| commit | 5f39a91dbd9a186edb999afd4d17524f4b1da14f (patch) | |
| tree | 193ba234c87de9179e961ab984fffb4ca2970725 /hw/mips/mips_fulong2e.c | |
| parent | ad7a21e81231ae64540310384fb0f87ac8758b02 (diff) | |
| parent | 4ea98d317eb442c738f898f16cfdd47a18b7ca49 (diff) | |
| download | focaccia-qemu-5f39a91dbd9a186edb999afd4d17524f4b1da14f.tar.gz focaccia-qemu-5f39a91dbd9a186edb999afd4d17524f4b1da14f.zip | |
Merge remote-tracking branch 'remotes/jnsnow/tags/ide-pull-request' into staging
Pull request # gpg: Signature made Fri 25 Jan 2019 22:06:08 GMT # gpg: using RSA key 7DEF8106AAFC390E # gpg: Good signature from "John Snow (John Huston) <jsnow@redhat.com>" [full] # Primary key fingerprint: FAEB 9711 A12C F475 812F 18F2 88A9 064D 1835 61EB # Subkey fingerprint: F9B7 ABDB BCAC DF95 BE76 CBD0 7DEF 8106 AAFC 390E * remotes/jnsnow/tags/ide-pull-request: ide/via: Implement and use native PCI IDE mode ide/via: Rename functions to match device name ide/via: Remove vt82c686b_init_ports() function sii3112: Remove duplicated code and use PCI IDE ops instead ide: Get rid of CMD646BAR struct cmd646: Move PCI IDE specific functions to ide/pci.c cmd646: Remove IDEBus from CMD646BAR cmd646: Remove unused variable Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/mips/mips_fulong2e.c')
| -rw-r--r-- | hw/mips/mips_fulong2e.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c index 2fbba32c48..42d09f6892 100644 --- a/hw/mips/mips_fulong2e.c +++ b/hw/mips/mips_fulong2e.c @@ -249,7 +249,7 @@ static void vt82c686b_southbridge_init(PCIBus *pci_bus, int slot, qemu_irq intc, isa_create_simple(isa_bus, TYPE_VT82C686B_SUPERIO); ide_drive_get(hd, ARRAY_SIZE(hd)); - vt82c686b_ide_init(pci_bus, hd, PCI_DEVFN(slot, 1)); + via_ide_init(pci_bus, hd, PCI_DEVFN(slot, 1)); pci_create_simple(pci_bus, PCI_DEVFN(slot, 2), "vt82c686b-usb-uhci"); pci_create_simple(pci_bus, PCI_DEVFN(slot, 3), "vt82c686b-usb-uhci"); |