From patchwork Thu Apr 19 22:09:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 10351635 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DBE7160231 for ; Thu, 19 Apr 2018 22:12:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C59FB2856F for ; Thu, 19 Apr 2018 22:12:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BA6FF28574; Thu, 19 Apr 2018 22:12:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2AF522856F for ; Thu, 19 Apr 2018 22:12:32 +0000 (UTC) Received: from localhost ([::1]:53010 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f9Hn6-0002qH-4U for patchwork-qemu-devel@patchwork.kernel.org; Thu, 19 Apr 2018 18:12:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50998) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f9Hk7-0000q8-HB for qemu-devel@nongnu.org; Thu, 19 Apr 2018 18:09:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f9Hk6-0003cD-Fb for qemu-devel@nongnu.org; Thu, 19 Apr 2018 18:09:27 -0400 Received: from mail-qk0-x242.google.com ([2607:f8b0:400d:c09::242]:47071) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f9Hk6-0003c2-Ai for qemu-devel@nongnu.org; Thu, 19 Apr 2018 18:09:26 -0400 Received: by mail-qk0-x242.google.com with SMTP id s70so6984608qks.13 for ; Thu, 19 Apr 2018 15:09:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=BFKPUe9XeWPPrTd08Qa1lKsOCtumkw0vPB+2wDDJfJc=; b=VpwvRUOzHQLPlZLsDNUnmv62LXAu9UvcE91gzTSn1ymlxBpUgqIqtz0QBfpx2dAARv 07suMxpsIKuFMDNXCPO2uc+bF5Qmfgbco6qQETTQMXfpsBX311zDD06S6KEDmOXfkb8O SyERJZONF7mYNO+kqKx2H6zZ8IfBF49Icy74kRIYBW7P+qQVBkALoTikpmKZm2T1A20e rRyVacbz6I3b6xH6vTIkr70ux8afWh7Bmmf0Lr/RobeJ/PY9boIbcBXgcPsYzwlN7DIe fouGfA4hiYnoMmBjwAgUbHAkVLnbyQbRdNPM07ygT3pprBprP+7uhY+ZTUN3F8KfqG41 oeKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=BFKPUe9XeWPPrTd08Qa1lKsOCtumkw0vPB+2wDDJfJc=; b=Rk7SnbNRT5Udv0cegoSi2cu9iwHw2cHSTB6FlVufZ6kEZYcEL8p2MAcWjw3S3E4hOl TCO3jS/koNONz/2dr4p6cyTuT7EfiW6OAC4oISR2ZZflh5df9BkKfJnmAtZUO5wk8CTy 4RDL+7MurVS0MvHuUilRF147/Y9+GFFanU93wv6ucuTnSiJyAON5KOdw0SDenWVP3vDu /RjpZjuiLZxQMaHUanjcPqvEkl/kDojD3GDM3zCH3D0qPUk0HEuX+JT+ziQgZp9bc4Wd IXcy3ZLyD7hrxhkPKhCd5AkXrnpu7dGYZyVO3NqM4L8PMoELitERsNUmx2Y2kD8OnspW /DoA== X-Gm-Message-State: ALQs6tDfr0+Nq8t6r9WqGFMp2y0wDKp0oYEi34jA9vGYziRP28ViaYUX GVCXQ/aRJZMY2Vtog60/jvc= X-Google-Smtp-Source: AB8JxZrMbFhq51TbS2Yz0TD/pdn+NQ/m5AifO8aoQ++lXlog3TY/uV4PxoBC+Yg5fpR+FxHUj0M3tQ== X-Received: by 10.55.79.9 with SMTP id d9mr7881773qkb.2.1524175765923; Thu, 19 Apr 2018 15:09:25 -0700 (PDT) Received: from x1.local ([138.117.48.212]) by smtp.gmail.com with ESMTPSA id n7-v6sm3578937qtl.89.2018.04.19.15.09.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 19 Apr 2018 15:09:25 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Peter Maydell , Paolo Bonzini Date: Thu, 19 Apr 2018 19:09:13 -0300 Message-Id: <20180419220914.959-2-f4bug@amsat.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180419220914.959-1-f4bug@amsat.org> References: <20180419220914.959-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::242 Subject: [Qemu-devel] [PATCH 1/2] hw/isa/superio: Fix inconsistent use of Chardev->be X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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. Reported-by: Marc-André Lureau Signed-off-by: Philippe Mathieu-Daudé --- 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 b95608a003..08afe44731 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 { @@ -83,7 +83,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_hds[] */ 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 {