[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 30/53] hw/isa/superio: Fix inconsistent use of Charde
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 30/53] hw/isa/superio: Fix inconsistent use of Chardev->be |
Date: |
Thu, 31 May 2018 19:12:30 +0200 |
From: Philippe Mathieu-Daudé <address@hidden>
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: address@hidden
Reported-by: Marc-André Lureau <address@hidden>
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
---
hw/isa/isa-superio.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/isa/isa-superio.c b/hw/isa/isa-superio.c
index 9359be7008..8bc2f69eaa 100644
--- a/hw/isa/isa-superio.c
+++ b/hw/isa/isa-superio.c
@@ -42,7 +42,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 {
@@ -82,7 +82,7 @@ static void isa_superio_realize(DeviceState *dev, Error
**errp)
if (!k->serial.is_enabled || k->serial.is_enabled(sio, i)) {
/* FIXME use a qdev chardev prop instead of serial_hd() */
chr = serial_hd(i);
- if (chr == NULL || chr->be) {
+ if (chr == NULL) {
name = g_strdup_printf("discarding-serial%d", i);
chr = qemu_chr_new(name, "null");
} else {
--
2.17.0
- [Qemu-devel] [PULL 14/53] hw: Do not include "sysemu/block-backend.h" if it is not necessary, (continued)
- [Qemu-devel] [PULL 14/53] hw: Do not include "sysemu/block-backend.h" if it is not necessary, Paolo Bonzini, 2018/05/31
- [Qemu-devel] [PULL 22/53] hw/ide: Remove unused include, Paolo Bonzini, 2018/05/31
- [Qemu-devel] [PULL 21/53] hw/i386/pc: Remove unused include, Paolo Bonzini, 2018/05/31
- [Qemu-devel] [PULL 20/53] hw/hppa: Remove unused include, Paolo Bonzini, 2018/05/31
- [Qemu-devel] [PULL 23/53] hw: Clean "hw/devices.h" includes, Paolo Bonzini, 2018/05/31
- [Qemu-devel] [PULL 24/53] qom: Document qom/device-list-properties implementation specific, Paolo Bonzini, 2018/05/31
- [Qemu-devel] [PULL 25/53] qom: support orphan objects in object_get_canonical_path, Paolo Bonzini, 2018/05/31
- [Qemu-devel] [PULL 26/53] virtio: free MemoryRegionCache when initialization fails, Paolo Bonzini, 2018/05/31
- [Qemu-devel] [PULL 27/53] memory.h: Fix typo in documentation comment, Paolo Bonzini, 2018/05/31
- [Qemu-devel] [PULL 28/53] memory: get rid of memory_region_init_reservation, Paolo Bonzini, 2018/05/31
- [Qemu-devel] [PULL 30/53] hw/isa/superio: Fix inconsistent use of Chardev->be,
Paolo Bonzini <=
- [Qemu-devel] [PULL 31/53] mux: fix ctrl-a b again, Paolo Bonzini, 2018/05/31
- [Qemu-devel] [PULL 32/53] memfd: Avoid Coverity warning about integer overflow, Paolo Bonzini, 2018/05/31
- [Qemu-devel] [PULL 33/53] exec.c: Initialize sa_flags passed to sigaction(), Paolo Bonzini, 2018/05/31
- [Qemu-devel] [PULL 29/53] memory: delete struct AddressSpaceOps, Paolo Bonzini, 2018/05/31
- [Qemu-devel] [PULL 36/53] qemu-options: Mark the non-functional -clock option as deprecated, Paolo Bonzini, 2018/05/31
- [Qemu-devel] [PULL 35/53] WHPX: fix some compiler warnings, Paolo Bonzini, 2018/05/31
- [Qemu-devel] [PULL 37/53] tcg: remove softfloat from --disable-tcg builds, Paolo Bonzini, 2018/05/31
- [Qemu-devel] [PULL 34/53] WHPX: dynamically load WHP libraries, Paolo Bonzini, 2018/05/31
- [Qemu-devel] [PULL 39/53] ipmi: Use proper struct reference for KCS vmstate, Paolo Bonzini, 2018/05/31