diff options
| author | Markus Armbruster <armbru@redhat.com> | 2015-02-04 18:33:07 +0100 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2015-02-24 00:19:06 +0100 |
| commit | 07dc788054d714a07df08e2eacc8c2e1c47b9a58 (patch) | |
| tree | 5a5436a35e76190b98b7c6ac23a293792376b3f2 /hw/mips | |
| parent | c6f10a5876a81f7a016714df06730c48210ee419 (diff) | |
| download | qemu-07dc788054d714a07df08e2eacc8c2e1c47b9a58.zip qemu-07dc788054d714a07df08e2eacc8c2e1c47b9a58.tar.gz qemu-07dc788054d714a07df08e2eacc8c2e1c47b9a58.tar.bz2 | |
parallel: Factor out common parallel_hds_isa_init()
Maintainers of affected machines cc'ed.
Cc: Anthony Liguori <aliguori@amazon.com>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Aurelien Jarno <aurelien@aurel32.net>
Cc: Leon Alrae <leon.alrae@imgtec.com>
Cc: Blue Swirl <blauwirbel@gmail.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'hw/mips')
| -rw-r--r-- | hw/mips/mips_fulong2e.c | 5 | ||||
| -rw-r--r-- | hw/mips/mips_malta.c | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c index bebf7de..ea73585 100644 --- a/hw/mips/mips_fulong2e.c +++ b/hw/mips/mips_fulong2e.c @@ -384,10 +384,7 @@ static void mips_fulong2e_init(MachineState *machine) rtc_init(isa_bus, 2000, NULL); serial_hds_isa_init(isa_bus, MAX_SERIAL_PORTS); - - if (parallel_hds[0]) { - parallel_init(isa_bus, 0, parallel_hds[0]); - } + parallel_hds_isa_init(isa_bus, 1); /* Sound card */ audio_init(pci_bus); diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c index e57f78c..533b2e6 100644 --- a/hw/mips/mips_malta.c +++ b/hw/mips/mips_malta.c @@ -1173,8 +1173,8 @@ void mips_malta_init(MachineState *machine) rtc_init(isa_bus, 2000, NULL); serial_hds_isa_init(isa_bus, 2); - if (parallel_hds[0]) - parallel_init(isa_bus, 0, parallel_hds[0]); + parallel_hds_isa_init(isa_bus, 1); + for(i = 0; i < MAX_FD; i++) { fd[i] = drive_get(IF_FLOPPY, 0, i); } |