summaryrefslogtreecommitdiff
path: root/hw/i386
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2015-02-04 18:33:05 +0100
committerAndreas Färber <afaerber@suse.de>2015-02-24 00:19:06 +0100
commitb6607a1a204d52fe13746cc9c3d2da4303e39b18 (patch)
tree6b3ea8bd8e36c6186b309b62577aaa5b2a7a5e8b /hw/i386
parentaef0d55a4bc52b1713de88c100ba6dc451578e50 (diff)
downloadqemu-b6607a1a204d52fe13746cc9c3d2da4303e39b18.tar.gz
serial: Factor out common serial_hds_isa_init()
It's the same old loop copied five times, plus another instance where it's clipped to two iterations and unrolled. No external users of serial_isa_init() are left, so give it internal linkage. Maintainers of affected machines cc'ed. Cc: Richard Henderson <rth@twiddle.net> 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/i386')
-rw-r--r--hw/i386/pc.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index c7af6aae01..18ed2634f3 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1419,11 +1419,7 @@ void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi,
pcspk_init(isa_bus, pit);
}
- for(i = 0; i < MAX_SERIAL_PORTS; i++) {
- if (serial_hds[i]) {
- serial_isa_init(isa_bus, i, serial_hds[i]);
- }
- }
+ serial_hds_isa_init(isa_bus, MAX_SERIAL_PORTS);
for(i = 0; i < MAX_PARALLEL_PORTS; i++) {
if (parallel_hds[i]) {