From nobody Tue Feb 10 03:55:44 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1651615156; cv=none; d=zohomail.com; s=zohoarc; b=EzYHuzAI1Bkiee+HrpeZ1Y7imBkEsfuAEQha1e4l6pgUhCCzXlvIg9EuU5i7ifKvwTJxNMIRmvEoCyR+/rVs0uVkSj4B65Tnur56yTt3H2RfbV1asNWftZKQgYzSaqTn1Pz7AN8M4OYhfLz2CPS7thXLbUSMNnm1lt/j/5JQKZI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1651615156; 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=kh5wpND6rfzlVoSuObqAw+C4AMVRJDb7YQyc66fcC3E=; b=d4DIB0bnIDEWrPsuY5hjIGaU+1vvpDlV7Hl0asZ16PsLnn98Rr8XI7ze+u5/HdunK1K+YTzll3J5A3Xj6HiejMtiQq2DjEyV0vJbGcnlkOY8sahMwTOSe7lhq+RzpoTTWx/hP+nmawEcuUZyruMuC9Y/Sm3VE4Xrxf3jSkyGRS8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1651615156256639.1114834146891; Tue, 3 May 2022 14:59:16 -0700 (PDT) Received: from localhost ([::1]:51556 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nm0Y7-0006WW-7R for importer@patchew.org; Tue, 03 May 2022 17:59:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45970) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nlz01-0001Lp-Nk for qemu-devel@nongnu.org; Tue, 03 May 2022 16:19:57 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:52972) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nlyzz-0004a4-Vf for qemu-devel@nongnu.org; Tue, 03 May 2022 16:19:57 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-88-WMDJ4m8INzKStVvnWFsqqw-1; Tue, 03 May 2022 11:42:28 -0400 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2E5F4140EB8C; Tue, 3 May 2022 13:14:21 +0000 (UTC) Received: from localhost (unknown [10.39.208.46]) by smtp.corp.redhat.com (Postfix) with ESMTP id 56538463E17; Tue, 3 May 2022 13:14:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1651609195; 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=kh5wpND6rfzlVoSuObqAw+C4AMVRJDb7YQyc66fcC3E=; b=RV1LXGQby6e8jgs2s4lVHVNE1fD3dKMrS5sWeUsQgbph7J+1rS7zROqeuZKew0sYEBsOPN ifbgl/qAcdUGNSHb0GnVsiTIhGruGNzHeWynHGI1vRuEXpGYi55avJEg2fpB5mJmsShlu5 feOUpYLYGtR6rNbiXqH0+1od8wnQvtQ= X-MC-Unique: WMDJ4m8INzKStVvnWFsqqw-1 From: marcandre.lureau@redhat.com To: qemu-devel@nongnu.org Cc: Peter Maydell , Richard Henderson , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PULL 16/23] chardev: replace qemu_set_nonblock() Date: Tue, 3 May 2022 17:12:49 +0400 Message-Id: <20220503131256.187238-17-marcandre.lureau@redhat.com> In-Reply-To: <20220503131256.187238-1-marcandre.lureau@redhat.com> References: <20220503131256.187238-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.85 on 10.11.54.10 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=170.10.129.124; envelope-from=marcandre.lureau@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -28 X-Spam_score: -2.9 X-Spam_bar: -- X-Spam_report: (-2.9 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.082, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1651615158409100001 From: Marc-Andr=C3=A9 Lureau Those calls are either for non-socket fd, or are POSIX-specific. Use the dedicated GLib API. (qemu_set_nonblock() is for socket-like) (this is a preliminary patch before renaming qemu_set_nonblock()) Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Daniel P. Berrang=C3=A9 --- chardev/char-fd.c | 4 ++-- chardev/char-pty.c | 5 ++++- chardev/char-serial.c | 5 ++++- chardev/char-stdio.c | 5 ++++- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/chardev/char-fd.c b/chardev/char-fd.c index 6ec9682b22f2..cf7845484174 100644 --- a/chardev/char-fd.c +++ b/chardev/char-fd.c @@ -212,8 +212,8 @@ void qemu_chr_open_fd(Chardev *chr, FDChardev *s =3D FD_CHARDEV(chr); g_autofree char *name =3D NULL; =20 - if (fd_out >=3D 0) { - qemu_set_nonblock(fd_out); + if (fd_out >=3D 0 && !g_unix_set_fd_nonblocking(fd_out, true, NULL)) { + assert(!"Failed to set FD nonblocking"); } =20 if (fd_out =3D=3D fd_in && fd_in >=3D 0) { diff --git a/chardev/char-pty.c b/chardev/char-pty.c index 1e2863f532a8..53f25c6bbd0c 100644 --- a/chardev/char-pty.c +++ b/chardev/char-pty.c @@ -324,7 +324,10 @@ static void char_pty_open(Chardev *chr, } =20 close(slave_fd); - qemu_set_nonblock(master_fd); + if (!g_unix_set_fd_nonblocking(master_fd, true, NULL)) { + error_setg_errno(errp, errno, "Failed to set FD nonblocking"); + return; + } =20 chr->filename =3D g_strdup_printf("pty:%s", pty_name); qemu_printf("char device redirected to %s (label %s)\n", diff --git a/chardev/char-serial.c b/chardev/char-serial.c index 7c3d84ae243e..4b0b83d5b45e 100644 --- a/chardev/char-serial.c +++ b/chardev/char-serial.c @@ -271,7 +271,10 @@ static void qmp_chardev_open_serial(Chardev *chr, if (fd < 0) { return; } - qemu_set_nonblock(fd); + if (!g_unix_set_fd_nonblocking(fd, true, NULL)) { + error_setg_errno(errp, errno, "Failed to set FD nonblocking"); + return; + } tty_serial_init(fd, 115200, 'N', 8, 1); =20 qemu_chr_open_fd(chr, fd, fd); diff --git a/chardev/char-stdio.c b/chardev/char-stdio.c index 403da308c980..3c648678ab14 100644 --- a/chardev/char-stdio.c +++ b/chardev/char-stdio.c @@ -103,7 +103,10 @@ static void qemu_chr_open_stdio(Chardev *chr, stdio_in_use =3D true; old_fd0_flags =3D fcntl(0, F_GETFL); tcgetattr(0, &oldtty); - qemu_set_nonblock(0); + if (!g_unix_set_fd_nonblocking(0, true, NULL)) { + error_setg_errno(errp, errno, "Failed to set FD nonblocking"); + return; + } atexit(term_exit); =20 memset(&act, 0, sizeof(act)); --=20 2.36.0.44.g0f828332d5ac