From: Philippe Mathieu-Daudé Date: Tue, 15 May 2018 15:24:59 +0000 (-0300) Subject: hw/isa/superio: Fix inconsistent use of Chardev->be X-Git-Tag: v2.12.1~22 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5e10c00f61f913ea67722d16834714e4e9eb530a;p=thirdparty%2Fqemu.git hw/isa/superio: Fix inconsistent use of Chardev->be 4c3119a6e3e and cd9526ab7c0 introduced an incorrect and inconsistent use of Chardev->be. Also, this CharBackend member is private and is not supposed to be accessible. Fix it by removing the inconsistent check. Cc: qemu-stable@nongnu.org Reported-by: Marc-André Lureau Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20180515152500.19460-2-f4bug@amsat.org> Signed-off-by: Paolo Bonzini Reviewed-by: Marc-André Lureau (cherry picked from commit d4c8fcd91abba584f2788dfe5fba5245cea380f0) Conflicts: hw/isa/isa-superio.c * avoid context dep on 9bca0edb28 Signed-off-by: Michael Roth --- diff --git a/hw/isa/isa-superio.c b/hw/isa/isa-superio.c index b95608a0035..8ae6ea6f7ba 100644 --- a/hw/isa/isa-superio.c +++ b/hw/isa/isa-superio.c @@ -43,7 +43,7 @@ static void isa_superio_realize(DeviceState *dev, Error **errp) if (!k->parallel.is_enabled || k->parallel.is_enabled(sio, i)) { /* FIXME use a qdev chardev prop instead of parallel_hds[] */ chr = parallel_hds[i]; - if (chr == NULL || chr->be) { + if (chr == NULL) { name = g_strdup_printf("discarding-parallel%d", i); chr = qemu_chr_new(name, "null"); } else { @@ -81,9 +81,9 @@ static void isa_superio_realize(DeviceState *dev, Error **errp) break; } if (!k->serial.is_enabled || k->serial.is_enabled(sio, i)) { - /* FIXME use a qdev chardev prop instead of serial_hds[] */ + /* FIXME use a qdev chardev prop instead of serial_hd() */ chr = serial_hds[i]; - if (chr == NULL || chr->be) { + if (chr == NULL) { name = g_strdup_printf("discarding-serial%d", i); chr = qemu_chr_new(name, "null"); } else {