From nobody Mon Nov 17 09:48:35 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1603472841; cv=none; d=zohomail.com; s=zohoarc; b=Vut146ERE3NtHwrG1bql5mzKtgIw5VNhIbU1EbgdGRdp+1jCjqPMwsU7Km+9tDVsQ+EJYGW8aR9ozA1Ig6v6FG60sD8oy1JcsXHi4+VPu+1HbosPF0b3x0U0lP8ttgthi/Me33edpj10JH98rGN0MwPJ3m3F3fLW+9uCeqiDarI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603472841; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=4hAcHBxfAsWMIPxoDg2wZqNqjmzQ3sOup2C/MfbYCi4=; b=ENkxNRcHyZYQptVRU2ma/eVZocBTV4uKnvoxYQkWN3hd68gyaFW8qdyNFyZgS8QhajNuAo6LzugjxJM+kMIPkhNwsL5IUod1bCCuuQ1vWk3QjyHINqPNs4owcsIOaFoilCw2Bfa8kW8CS2/ECd3k5y0D41lfajoy0vVTd/kxyl4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1603472841326737.3902577892219; Fri, 23 Oct 2020 10:07:21 -0700 (PDT) Received: from localhost ([::1]:41348 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kW0XA-00010G-4B for importer@patchew.org; Fri, 23 Oct 2020 13:07:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45170) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kVzhN-00088y-At for qemu-devel@nongnu.org; Fri, 23 Oct 2020 12:13:49 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:23409) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kVzhF-0007jh-DD for qemu-devel@nongnu.org; Fri, 23 Oct 2020 12:13:48 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-312-MljUXI3yMPylNt4ck-QaqQ-1; Fri, 23 Oct 2020 12:13:38 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A82101054FB9; Fri, 23 Oct 2020 16:13:31 +0000 (UTC) Received: from merkur.redhat.com (ovpn-113-206.ams2.redhat.com [10.36.113.206]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3DD355C1CF; Fri, 23 Oct 2020 16:13:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603469620; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4hAcHBxfAsWMIPxoDg2wZqNqjmzQ3sOup2C/MfbYCi4=; b=YREgWw7RUJwiu1nimnhQM0XeTt7DWsSCPNguyKE8jEMPcDhWzj78PYeyTVwRqspHTbLiEh 4YsGK+LgnF+D/HTxGXEmWHrYl/8kibANihbhIDP5Rbs8U97TuNUXydcnxRlQq+iMMsu4go lHhmoWNi4YqgYbFi5IOIVnHisbOAXzU= X-MC-Unique: MljUXI3yMPylNt4ck-QaqQ-1 From: Kevin Wolf To: qemu-block@nongnu.org Subject: [PATCH v2 1/6] char/stdio: Fix QMP default for 'signal' Date: Fri, 23 Oct 2020 18:13:07 +0200 Message-Id: <20201023161312.460406-2-kwolf@redhat.com> In-Reply-To: <20201023161312.460406-1-kwolf@redhat.com> References: <20201023161312.460406-1-kwolf@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=kwolf@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=63.128.21.124; envelope-from=kwolf@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/23 02:46:25 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, qemu-devel@nongnu.org, armbru@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Commit 02c4bdf1 tried to make signal=3Don the default for stdio chardevs except for '-serial mon:stdio', but it forgot about QMP and accidentally switched the QMP default from true (except for -nographic) to false (always). The QMP documentation was kept unchanged and still describes the opposite of the old behaviour (which is an even older documentation bug). Fix all of this by making signal=3Dtrue the default in ChardevStdio and documenting it as such. Fixes: 02c4bdf1d2ca8c02a9bae16398f260b5c08d08bf Signed-off-by: Kevin Wolf Reviewed-by: Markus Armbruster Reviewed-by: Marc-Andr=C3=A9 Lureau --- qapi/char.json | 3 +-- chardev/char-stdio.c | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/qapi/char.json b/qapi/char.json index b4d66ec90b..43486d1daa 100644 --- a/qapi/char.json +++ b/qapi/char.json @@ -321,8 +321,7 @@ # Configuration info for stdio chardevs. # # @signal: Allow signals (such as SIGINT triggered by ^C) -# be delivered to qemu. Default: true in -nographic mode, -# false otherwise. +# be delivered to qemu. Default: true. # # Since: 1.5 ## diff --git a/chardev/char-stdio.c b/chardev/char-stdio.c index 82eaebc1db..403da308c9 100644 --- a/chardev/char-stdio.c +++ b/chardev/char-stdio.c @@ -112,9 +112,7 @@ static void qemu_chr_open_stdio(Chardev *chr, =20 qemu_chr_open_fd(chr, 0, 1); =20 - if (opts->has_signal) { - stdio_allow_signal =3D opts->signal; - } + stdio_allow_signal =3D !opts->has_signal || opts->signal; qemu_chr_set_echo_stdio(chr, false); } #endif --=20 2.28.0