diff options
author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2016-10-22 12:52:44 +0300 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2016-10-24 15:27:20 +0200 |
commit | 4496dc49ec9a6e24e9eeb2da970ed0ec0051968e (patch) | |
tree | 02ea8e0a559ce61ec361838c2f7313531d3f4781 /hw/char/serial-isa.c | |
parent | 5c936a83c3301f6919d2e0ba9eb977370a8a1ac7 (diff) | |
download | qemu-4496dc49ec9a6e24e9eeb2da970ed0ec0051968e.zip qemu-4496dc49ec9a6e24e9eeb2da970ed0ec0051968e.tar.gz qemu-4496dc49ec9a6e24e9eeb2da970ed0ec0051968e.tar.bz2 |
sun4uv: fix serial initialization regression
Since commit b6607a1a204d, serial_hds_isa_init() was introduced to
factor out serial_isa_init() loops. However, sun4uv shouldn't start from
0 when there is a mm serial on 0 already. Add a "from" argument to
serial_hds_isa_init().
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20161022095318.17775-5-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/char/serial-isa.c')
-rw-r--r-- | hw/char/serial-isa.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/hw/char/serial-isa.c b/hw/char/serial-isa.c index 1594ec4..54d3a12 100644 --- a/hw/char/serial-isa.c +++ b/hw/char/serial-isa.c @@ -133,13 +133,14 @@ static void serial_isa_init(ISABus *bus, int index, CharDriverState *chr) qdev_init_nofail(dev); } -void serial_hds_isa_init(ISABus *bus, int n) +void serial_hds_isa_init(ISABus *bus, int from, int to) { int i; - assert(n <= MAX_SERIAL_PORTS); + assert(from >= 0); + assert(to <= MAX_SERIAL_PORTS); - for (i = 0; i < n; ++i) { + for (i = from; i < to; ++i) { if (serial_hds[i]) { serial_isa_init(bus, i, serial_hds[i]); } |