From patchwork Wed Jan 3 17:33:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 759622 Delivered-To: patch@linaro.org Received: by 2002:a5d:67c6:0:b0:336:6142:bf13 with SMTP id n6csp6611080wrw; Wed, 3 Jan 2024 09:37:22 -0800 (PST) X-Google-Smtp-Source: AGHT+IFbIG8PwTAVBClCzW4b1pCsP1SNqyXHZ8RoPiojynKLuwZ/W7AfD4nF1kyKixqYhQ/xC+gR X-Received: by 2002:ae9:e404:0:b0:781:e3ce:60bc with SMTP id q4-20020ae9e404000000b00781e3ce60bcmr1855922qkc.33.1704303442050; Wed, 03 Jan 2024 09:37:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704303442; cv=none; d=google.com; s=arc-20160816; b=IUBbK+FeqkXhlwto3jneFGVwd7Qbyq81NOfyCq/8dNEyUiRdg2Y3y8nKXycxR26+HT oCpAeqdLT9uoxiJpCYvC69d1UvmV6y3w8JaNzkqO9Vktxf5ag6dkMU8JarUMOe83Ich0 RZ7ZxROYdSI679b+PyStw5E7X5FbCRjjPv+XrOymAsZw/wwVor+8k0u0T+B06xAlfVan 0sYEuhxCad+PwPogcT5HWkWZ27y1bLZF0I9rpurslePJDZAne3Ilj/eh3Kf5BZtSCpgA 8kHxfP9geDtkPUXVu0FUUYMJZkVx5y4i9cAa/4Ug6m8QWjsvxPS+Z6yDxqvy8srhgd0g RFXg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=rOpjk5Xc89URXPry+uTcPrYjjlL9ZRbEnDqtNUUFVo4=; fh=5s6F1VpUg/LkqHSyTlr7gneXArwgJkl0qAfGr3eFpAs=; b=wPiFqR6ck0rOnUTz78V9jieaDGuzsMHdV2uy4GfFcvtBt4eLMrSqp7nzWuFDhgfazB z/+69gvG/vphJUctecqKaz9c31udDKi8dm/kzeuP0I/2wDcK5ZpdhNQA2x6Ou1f9i/4h 3aehs5uVZhpex7ozV6aNXnBoV3fkWCbb1e9BWMOR+xOLR8kwe08sMI07C4jokpwsVgnm vApaYW28T71nAvIrDf8iDQbmCNMyFVW1xgVuJOqJrKWQrN/76ywOWk2w9pYoPTUdWHfU //3wyGNYO9Oy848/fFT1crrGhcUExQJ8HySY4ZNxHtfmgv5q21uURSGFVlCKnZ7uEunP DCcQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=j7R+G2pJ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id m21-20020a05620a24d500b0077f60bceed5si32001934qkn.351.2024.01.03.09.37.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 03 Jan 2024 09:37:22 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=j7R+G2pJ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rL58A-0003cz-D1; Wed, 03 Jan 2024 12:34:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rL580-0003VI-JR for qemu-devel@nongnu.org; Wed, 03 Jan 2024 12:34:06 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rL57p-0002Nz-Ub for qemu-devel@nongnu.org; Wed, 03 Jan 2024 12:34:01 -0500 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-40d5ac76667so55663305e9.1 for ; Wed, 03 Jan 2024 09:33:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1704303231; x=1704908031; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=rOpjk5Xc89URXPry+uTcPrYjjlL9ZRbEnDqtNUUFVo4=; b=j7R+G2pJWTMP9nz9N56OlOSgXJYdnt1QbdmbCheotup826UTwL7TO3/sUqhmPQ6eNG fSrZ2lIHg08wRb+613ubQ47Pu4cy743voWDbKgzXahU4ZSqIeQmMMCZcXoycVf7L8O4g ikIFEzJ5PXzlMSqj24sWKAtO/bX3DmaCKwajVfp5DmdBg7hNmaVzBBoRg+mdMOYH/t5l 7dwz4ECfIlCDFJ0qZP0+ydHpaRQYtqWgjEjWWjVeGy5DmEiJIJp7xJjbVK96yZxFK550 f6aWCJy3NJHYphH7mlDBE/wFKyfb7j/MLfW9B5ufYOliv91lTXo/gwP+Mclm+lPbKOry bNjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704303231; x=1704908031; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rOpjk5Xc89URXPry+uTcPrYjjlL9ZRbEnDqtNUUFVo4=; b=PX6VmDBOq+q/iVeA9WLPBWZfdbIMQT6BQAHKu1ffgd6gBTOT64kHHuVsQzQACQpkaW hDc2yqE2TPcNrfo1WjnLfE/n0m1ntgbkKPuY6OLfTFlegWNn+ldBmKfWVl0Z/gO7If/5 3NyhfhhMY/WA9NSm6OLGU7eHOUn0jDcVmJB4BP9avcbV5jWfE/DECFTzw4sxwsvDswWz S7EB/vYR13I4UIGF2awqbt//Ze/UeF3kOv1bSwLx8puWvPpIbFinBIbJlZBggK6zFbVq 8yT511Bskqe4/O1Im8tNta0k2kYpxzh2lIsqOBqPMhgV2DPnonakqqT0NOsZeyWxnlVe i1qg== X-Gm-Message-State: AOJu0Yzv0pK3EPnjTGR9idUa8ADVd3rHjwhlw1cWaJFiYbJ6ksmJOpc/ rijm3tHD9GHlE80Jxj+P51cKIqmL3v8kMA== X-Received: by 2002:a05:600c:a003:b0:404:4b6f:d70d with SMTP id jg3-20020a05600ca00300b004044b6fd70dmr11754074wmb.17.1704303231383; Wed, 03 Jan 2024 09:33:51 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id fl27-20020a05600c0b9b00b0040d2dfb10e0sm2979265wmb.11.2024.01.03.09.33.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 03 Jan 2024 09:33:50 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id AB9515F933; Wed, 3 Jan 2024 17:33:49 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, Richard Henderson , Song Gao , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , David Hildenbrand , Aurelien Jarno , Yoshinori Sato , Yanan Wang , Bin Meng , Laurent Vivier , Michael Rolnik , Alexandre Iooss , David Woodhouse , Laurent Vivier , Paolo Bonzini , Brian Cain , Daniel Henrique Barboza , Beraldo Leal , Paul Durrant , Mahmoud Mandour , Thomas Huth , Liu Zhiwei , Cleber Rosa , kvm@vger.kernel.org, Peter Maydell , Wainer dos Santos Moschetta , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , qemu-arm@nongnu.org, Weiwei Li , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , John Snow , Daniel Henrique Barboza , Nicholas Piggin , Palmer Dabbelt , Marcel Apfelbaum , Ilya Leoshkevich , =?utf-8?q?C=C3=A9dric_Le_Goater?= , "Edgar E. Iglesias" , Eduardo Habkost , Pierrick Bouvier , qemu-riscv@nongnu.org, Alistair Francis Subject: [PATCH v2 04/43] chardev: use bool for fe_is_open Date: Wed, 3 Jan 2024 17:33:10 +0000 Message-Id: <20240103173349.398526-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240103173349.398526-1-alex.bennee@linaro.org> References: <20240103173349.398526-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32e.google.com 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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org The function qemu_chr_fe_init already treats be->fe_open as a bool and if it acts like a bool it should be one. While we are at it make the variable name more descriptive and add kdoc decorations. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée Message-Id: <20231211145959.93759-1-alex.bennee@linaro.org> --- v2 - rename to fe_is_open at f4bug's request --- include/chardev/char-fe.h | 19 ++++++++++++------- chardev/char-fe.c | 16 ++++++++-------- chardev/char.c | 2 +- 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/include/chardev/char-fe.h b/include/chardev/char-fe.h index 0ff6f875116..ecef1828355 100644 --- a/include/chardev/char-fe.h +++ b/include/chardev/char-fe.h @@ -7,8 +7,12 @@ typedef void IOEventHandler(void *opaque, QEMUChrEvent event); typedef int BackendChangeHandler(void *opaque); -/* This is the backend as seen by frontend, the actual backend is - * Chardev */ +/** + * struct CharBackend - back end as seen by front end + * @fe_is_open: the front end is ready for IO + * + * The actual backend is Chardev + */ struct CharBackend { Chardev *chr; IOEventHandler *chr_event; @@ -17,7 +21,7 @@ struct CharBackend { BackendChangeHandler *chr_be_change; void *opaque; int tag; - int fe_open; + bool fe_is_open; }; /** @@ -156,12 +160,13 @@ void qemu_chr_fe_set_echo(CharBackend *be, bool echo); /** * qemu_chr_fe_set_open: + * @be: a CharBackend + * @is_open: the front end open status * - * Set character frontend open status. This is an indication that the - * front end is ready (or not) to begin doing I/O. - * Without associated Chardev, do nothing. + * This is an indication that the front end is ready (or not) to begin + * doing I/O. Without associated Chardev, do nothing. */ -void qemu_chr_fe_set_open(CharBackend *be, int fe_open); +void qemu_chr_fe_set_open(CharBackend *be, bool is_open); /** * qemu_chr_fe_printf: diff --git a/chardev/char-fe.c b/chardev/char-fe.c index 7789f7be9c8..20222a4cad5 100644 --- a/chardev/char-fe.c +++ b/chardev/char-fe.c @@ -211,7 +211,7 @@ bool qemu_chr_fe_init(CharBackend *b, Chardev *s, Error **errp) } } - b->fe_open = false; + b->fe_is_open = false; b->tag = tag; b->chr = s; return true; @@ -257,7 +257,7 @@ void qemu_chr_fe_set_handlers_full(CharBackend *b, bool sync_state) { Chardev *s; - int fe_open; + bool fe_open; s = b->chr; if (!s) { @@ -265,10 +265,10 @@ void qemu_chr_fe_set_handlers_full(CharBackend *b, } if (!opaque && !fd_can_read && !fd_read && !fd_event) { - fe_open = 0; + fe_open = false; remove_fd_in_watch(s); } else { - fe_open = 1; + fe_open = true; } b->chr_can_read = fd_can_read; b->chr_read = fd_read; @@ -336,7 +336,7 @@ void qemu_chr_fe_set_echo(CharBackend *be, bool echo) } } -void qemu_chr_fe_set_open(CharBackend *be, int fe_open) +void qemu_chr_fe_set_open(CharBackend *be, bool is_open) { Chardev *chr = be->chr; @@ -344,12 +344,12 @@ void qemu_chr_fe_set_open(CharBackend *be, int fe_open) return; } - if (be->fe_open == fe_open) { + if (be->fe_is_open == is_open) { return; } - be->fe_open = fe_open; + be->fe_is_open = is_open; if (CHARDEV_GET_CLASS(chr)->chr_set_fe_open) { - CHARDEV_GET_CLASS(chr)->chr_set_fe_open(chr, fe_open); + CHARDEV_GET_CLASS(chr)->chr_set_fe_open(chr, is_open); } } diff --git a/chardev/char.c b/chardev/char.c index 996a024c7a2..0653b112e92 100644 --- a/chardev/char.c +++ b/chardev/char.c @@ -750,7 +750,7 @@ static int qmp_query_chardev_foreach(Object *obj, void *data) value->label = g_strdup(chr->label); value->filename = g_strdup(chr->filename); - value->frontend_open = chr->be && chr->be->fe_open; + value->frontend_open = chr->be && chr->be->fe_is_open; QAPI_LIST_PREPEND(*list, value);