From nobody Tue Apr 16 16:56:51 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1526398031378285.17001426354386; Tue, 15 May 2018 08:27:11 -0700 (PDT) Received: from localhost ([::1]:43675 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fIbqw-0003Pt-2O for importer@patchew.org; Tue, 15 May 2018 11:27:02 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32921) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fIbpB-0002CI-Sg for qemu-devel@nongnu.org; Tue, 15 May 2018 11:25:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fIbpA-0005oS-Ta for qemu-devel@nongnu.org; Tue, 15 May 2018 11:25:13 -0400 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:46620) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fIbpA-0005oJ-Ly; Tue, 15 May 2018 11:25:12 -0400 Received: by mail-qt0-x242.google.com with SMTP id m16-v6so727827qtg.13; Tue, 15 May 2018 08:25:12 -0700 (PDT) Received: from x1.local ([138.117.48.222]) by smtp.gmail.com with ESMTPSA id 2-v6sm198224qkg.70.2018.05.15.08.25.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 May 2018 08:25:11 -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=ybfU+NuHPvfjV/WzoqjUgJ20ghNu/Gxb8LYHMFbNi68=; b=Os2fiqS/O+fW7Y0p6vJeaNxokcpSyzJoBLeSseWpjTqKyWdYXCnjkgMoigPa9+9J1Q GLHNNtaf8pLROVadBkA7h6NNqwqz9+BBeuftNhCxD6r8o3ReOYK/y0ZbSKj2CRCnV39f /KXOKlGAcresyx04ptEZtMh9D7C0q+qfdl6UB8VhwxVZMvYjW7cosUCpbm7nrO29uQWy q/a/VWz+yLsfdE7lAdCWaTNTjy+MVm7+kjdCKIRfKjM6pXPOCBLc+OOIzOpi4vTEYsyo sLW507+ayei28WddyOyCXCDQMBNr9Lqb9xMtW9Ec33tgledZw4wx9XxKCI0+O8TP3DSu VTpg== 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=ybfU+NuHPvfjV/WzoqjUgJ20ghNu/Gxb8LYHMFbNi68=; b=RItscSgyDHpbb7UGwvlcFOoFR4WS7OyHryL/KcH8D3C44Hbejqzfj28h6xJEJ2K8Aa fToDhkDNwCCkwGpozjSqlW3tjKNrHPyeGo/9jYShsxchW0V+W39tLH1tkAXSKSouBk15 vcba7b8PEaaOEOOPmNf8HjuGD5jEuBrrpHLgKIi39Ta5Z+cUcprKb9DSXW7se1QqDHHh cWKWPMWvhu9cZDY3meeXVzM8nyAYr8n6QKk7hOtsSCKz5olEkHHfpbBzW1Z8KmpBNuXu alRQmQq7x1lqjwivudrLcgBvErW/IlKOGGmgaPIQ/6XKQ9HbBlczKGZpQzr3yC887AcS 1EIQ== X-Gm-Message-State: ALKqPwepAPWwNxLrRSmcUvC6zLI8Ms4DihyVb0irCS8yaj3PkCwp33GN Zb50nj+iOhPufMwcS7N4tzc= X-Google-Smtp-Source: AB8JxZrtvTkg/2ZnJaaPJNGtgj7v5GUR4h/4v4wR6BQjDqk7tJtvUISO1/KfhacOXdfoXb9JEEBwzw== X-Received: by 2002:a0c:d80f:: with SMTP id h15-v6mr13763213qvj.3.1526397912152; Tue, 15 May 2018 08:25:12 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Peter Maydell , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , "Michael S. Tsirkin" Date: Tue, 15 May 2018 12:24:59 -0300 Message-Id: <20180515152500.19460-2-f4bug@amsat.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180515152500.19460-1-f4bug@amsat.org> References: <20180515152500.19460-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::242 Subject: [Qemu-devel] [PATCH v2 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: qemu-stable@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 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=C3=A9 Lureau Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau --- 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 76286c81a1..bb88251f95 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 =3D parallel_hds[i]; - if (chr =3D=3D NULL || chr->be) { + if (chr =3D=3D NULL) { name =3D g_strdup_printf("discarding-parallel%d", i); chr =3D 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_hd() */ chr =3D serial_hd(i); - if (chr =3D=3D NULL || chr->be) { + if (chr =3D=3D NULL) { name =3D g_strdup_printf("discarding-serial%d", i); chr =3D qemu_chr_new(name, "null"); } else { --=20 2.17.0 From nobody Tue Apr 16 16:56:51 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1526398031382344.0956799565282; Tue, 15 May 2018 08:27:11 -0700 (PDT) Received: from localhost ([::1]:43676 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fIbr0-0003S2-KX for importer@patchew.org; Tue, 15 May 2018 11:27:06 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32959) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fIbpF-0002ET-0O for qemu-devel@nongnu.org; Tue, 15 May 2018 11:25:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fIbpD-0005px-Eu for qemu-devel@nongnu.org; Tue, 15 May 2018 11:25:16 -0400 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]:44079) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fIbpD-0005pf-8L; Tue, 15 May 2018 11:25:15 -0400 Received: by mail-qt0-x241.google.com with SMTP id d3-v6so738168qtp.11; Tue, 15 May 2018 08:25:15 -0700 (PDT) Received: from x1.local ([138.117.48.222]) by smtp.gmail.com with ESMTPSA id 2-v6sm198224qkg.70.2018.05.15.08.25.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 May 2018 08:25:14 -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=cWnYa7l5Byk32N50oR0ctwjHBg0/SCxPYXPmR87YZiE=; b=Ehdso1lEQ4dcPKXhqdDSHGWSbFAhErAS57BsMOLT8zozL8mpxOCO9yK09JtRqT0R5z 4wnVtbMvOuJzQYCJGkyHfmFTOB35i9X0659PlWS7cCj2s4NCS0RMYVAhGicXbQZii6R4 ooCzSS7zX6A15TyrorUxvG+PvAbf3JuyPbE4V5NRyaZDok6wwistpWAi/6nuvrwe8BvM Y/Jc6EfxE36lRhP5KRd1+WhPiGuvQXxZDZX+6baTIYdxxKAh85MPlU4zU2M5vjRbeOiC jt5OwnPaBStqu27vWP6fEy5btEFQbb8vKJwYaHW2qb6k3gAupsaUCZhUeLBdiL9xPN4D y5yA== 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=cWnYa7l5Byk32N50oR0ctwjHBg0/SCxPYXPmR87YZiE=; b=TAL6knNbjf/jmVU2a21ODJhUKAmlzx2CjRLNeu4r3ZgwXljLx+Yg7dHKmZm8obXg3k cSjYaS0+3zo16yDR/XRVFHvpOZkIzr/IVnZajOQnPOS8xPTzEKfTHX+fuLEPxAlJ/gS4 6t/jFDdiAKoSlAVUAWa1J0pUunLvT6Fqfq0HDqEznswT1bDn/pgIGLuBnZQ9EBcMilWs /l7KufOLBufyhgwQ1COVpjF8N4hg8RFEf5UKXbbkvXinONuAPR7JFWQ0UW+bYELE6ZKr LWtx/bIQ0w54lXYpV6X2gR6udNOUGkNNEZ/I7BKe6+eb/eaxZ+dSsAv1WEltM6tHB026 UJKQ== X-Gm-Message-State: ALKqPwdCp8/zGQXaaom5pEb1Lt6i7oJC/4JyQ2hwCskz5yWeMk8QYfFK JT4SKcNdNpBEiGOMg6viRqo= X-Google-Smtp-Source: AB8JxZoSq8wXOgYZIAq621vJOZwisCmvHk5x9R1VEZ8k4MfJpD4+sOhn40z2GeGG2fond8BLch8S3Q== X-Received: by 2002:a0c:b29e:: with SMTP id r30-v6mr515369qve.17.1526397914708; Tue, 15 May 2018 08:25:14 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Peter Maydell , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , "Michael S. Tsirkin" Date: Tue, 15 May 2018 12:25:00 -0300 Message-Id: <20180515152500.19460-3-f4bug@amsat.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180515152500.19460-1-f4bug@amsat.org> References: <20180515152500.19460-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::241 Subject: [Qemu-devel] [PATCH v2 2/2] mux: fix ctrl-a b again 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: qemu-devel@nongnu.org, qemu-stable@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 From: Marc-Andr=C3=A9 Lureau Commit fb5e19d2e1472e96d72d5e4d89c20033f8ab345c originally fixed the regression, but was inadvertently broken again in merge commit 2d6752d38d8acda. Fixes: https://bugs.launchpad.net/qemu/+bug/1654137 Cc: qemu-stable@nongnu.org Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Peter Maydell --- chardev/char-mux.c | 1 + tests/test-char.c | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/chardev/char-mux.c b/chardev/char-mux.c index 1b925c8dec..6055e76293 100644 --- a/chardev/char-mux.c +++ b/chardev/char-mux.c @@ -304,6 +304,7 @@ void mux_set_focus(Chardev *chr, int focus) } =20 d->focus =3D focus; + chr->be =3D d->backends[focus]; mux_chr_send_event(d, d->focus, CHR_EVENT_MUX_IN); } =20 diff --git a/tests/test-char.c b/tests/test-char.c index 1880d36783..5905d31441 100644 --- a/tests/test-char.c +++ b/tests/test-char.c @@ -214,6 +214,10 @@ static void char_mux_test(void) g_assert_cmpint(h2.last_event, =3D=3D, -1); =20 /* switch focus */ + qemu_chr_be_write(base, (void *)"\1b", 2); + g_assert_cmpint(h1.last_event, =3D=3D, 42); + g_assert_cmpint(h2.last_event, =3D=3D, CHR_EVENT_BREAK); + qemu_chr_be_write(base, (void *)"\1c", 2); g_assert_cmpint(h1.last_event, =3D=3D, CHR_EVENT_MUX_IN); g_assert_cmpint(h2.last_event, =3D=3D, CHR_EVENT_MUX_OUT); @@ -227,6 +231,10 @@ static void char_mux_test(void) g_assert_cmpstr(h1.read_buf, =3D=3D, "hello"); h1.read_count =3D 0; =20 + qemu_chr_be_write(base, (void *)"\1b", 2); + g_assert_cmpint(h1.last_event, =3D=3D, CHR_EVENT_BREAK); + g_assert_cmpint(h2.last_event, =3D=3D, CHR_EVENT_MUX_OUT); + /* remove first handler */ qemu_chr_fe_set_handlers(&chr_be1, NULL, NULL, NULL, NULL, NULL, NULL, true); --=20 2.17.0