From nobody Sat Sep 6 17:19:46 2025 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=yandex-team.ru ARC-Seal: i=1; a=rsa-sha256; t=1756892677; cv=none; d=zohomail.com; s=zohoarc; b=H5xS9FQkfkZTE2htMvxF6Apmo0rwmqbt8RpQ2nPb8RIwnvuSvO9W3CniD6S2e5/XOZe1gAyIEY5gWnafNh7mVKY9Waqn/SVDtLJ56gRDqllbI63VtPlN1OJ+CJcc+gfG9P/8TWYbQ9i7SaZZlC6Wv4iE6acBTpK0T7Kn/QS+Mr0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756892677; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=hUj5xMUecTx8X16HPNS7q8D78Nrs6/uPNPUtPM98KSc=; b=ndlcBIVQHgh5S5dHeCv5IhbEIfIo57HX25G/Zblaeos2WYZSJSR/N6exkb8yXln53L0ryhkhgOWoLlggNLfABjMkFU7lhuCAqspkRd2pSLoJJ0kI4olplDK9CaWuxA30plGyP6DyEyo0yhwc5hPtlmUI5ElVfApIQl0oP2iTFDo= 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 1756892677818655.4928936216808; Wed, 3 Sep 2025 02:44:37 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1utk2S-00063r-7X; Wed, 03 Sep 2025 05:44:24 -0400 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 1utk2Q-00063L-27; Wed, 03 Sep 2025 05:44:22 -0400 Received: from forwardcorp1b.mail.yandex.net ([178.154.239.136]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1utk2N-0007ua-PR; Wed, 03 Sep 2025 05:44:21 -0400 Received: from mail-nwsmtp-smtp-corp-main-34.sas.yp-c.yandex.net (mail-nwsmtp-smtp-corp-main-34.sas.yp-c.yandex.net [IPv6:2a02:6b8:c21:2d8b:0:640:7d49:0]) by forwardcorp1b.mail.yandex.net (Yandex) with ESMTPS id 77E458073C; Wed, 03 Sep 2025 12:44:17 +0300 (MSK) Received: from vsementsov-lin.. (unknown [2a02:6bf:8080:b8f::1:11]) by mail-nwsmtp-smtp-corp-main-34.sas.yp-c.yandex.net (smtpcorp/Yandex) with ESMTPSA id EicMoq3GhCg0-vSakBBTS; Wed, 03 Sep 2025 12:44:17 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex-team.ru; s=default; t=1756892657; bh=hUj5xMUecTx8X16HPNS7q8D78Nrs6/uPNPUtPM98KSc=; h=Message-ID:Date:In-Reply-To:Cc:Subject:References:To:From; b=No93VDNRuH1ywvNHUdJYxMFFfitrRLvSwI0D+/3y1LU6Q3sZjwSZtvFpkM8jlMvNi jE8NLieu2qzHE1rGuv8Nc/B4A7+1eWxcGSRqs9Uo9V6RtPPSgvtO/gvADXfz/1oiMC E+l+vZyByCbHnYjY8WpJd+nytw58JN3B03cuw2eU= Authentication-Results: mail-nwsmtp-smtp-corp-main-34.sas.yp-c.yandex.net; dkim=pass header.i=@yandex-team.ru From: Vladimir Sementsov-Ogievskiy To: berrange@redhat.com Cc: qemu-devel@nongnu.org, qemu-block@nongnu.org, peterx@redhat.com, vsementsov@yandex-team.ru, Paolo Bonzini , Stefan Weil Subject: [PATCH 03/10] util: add qemu_set_blocking() function Date: Wed, 3 Sep 2025 12:44:03 +0300 Message-ID: <20250903094411.1029449-4-vsementsov@yandex-team.ru> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250903094411.1029449-1-vsementsov@yandex-team.ru> References: <20250903094411.1029449-1-vsementsov@yandex-team.ru> MIME-Version: 1.0 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=178.154.239.136; envelope-from=vsementsov@yandex-team.ru; helo=forwardcorp1b.mail.yandex.net 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_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @yandex-team.ru) X-ZM-MESSAGEID: 1756892681381124100 Content-Type: text/plain; charset="utf-8" In generic code we have qio_channel_set_blocking(), which takes bool parameter, and qemu_file_set_blocking(), which as well takes bool parameter. At lower fd-layer we have a mess of functions: - enough direct calls to g_unix_set_fd_nonblocking() and several wrappers without bool parameter: - qemu_scoket_set_nonblock(), which asserts success for posix (still, in most cases we can handle the error in better way) and ignores error for win32 realization - qemu_socket_try_set_nonblock(), the best one - qemu_socket_set_block(), which simply ignores an error, the worst case And all three lack errp argument, so we have to handle it after the call. So let's introduce a new socket-layer wrapper, and use it consistently in following commits. Signed-off-by: Vladimir Sementsov-Ogievskiy --- include/qemu/osdep.h | 1 + util/oslib-posix.c | 12 ++++++++++++ util/oslib-win32.c | 18 ++++++++++++++++++ 3 files changed, 31 insertions(+) diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index be3460b32f..1b38cb7e45 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -687,6 +687,7 @@ ssize_t qemu_write_full(int fd, const void *buf, size_t= count) G_GNUC_WARN_UNUSED_RESULT; =20 void qemu_set_cloexec(int fd); +bool qemu_set_blocking(int fd, bool block, Error **errp); =20 /* Return a dynamically allocated directory path that is appropriate for s= toring * local state. diff --git a/util/oslib-posix.c b/util/oslib-posix.c index 4ff577e5de..e473938195 100644 --- a/util/oslib-posix.c +++ b/util/oslib-posix.c @@ -250,6 +250,18 @@ void qemu_anon_ram_free(void *ptr, size_t size) #endif } =20 +bool qemu_set_blocking(int fd, bool block, Error **errp) +{ + if (!g_unix_set_fd_nonblocking(fd, !block, NULL)) { + error_setg_errno(errp, errno, + "Can't set file descriptor %d %s", fd, + block ? "blocking" : "non-blocking"); + return false; + } + + return true; +} + void qemu_socket_set_block(int fd) { g_unix_set_fd_nonblocking(fd, false, NULL); diff --git a/util/oslib-win32.c b/util/oslib-win32.c index b7351634ec..03044f5b59 100644 --- a/util/oslib-win32.c +++ b/util/oslib-win32.c @@ -177,6 +177,24 @@ static int socket_error(void) } } =20 +bool qemu_set_blocking(int fd, bool block, Error **errp) +{ + unsigned long opt =3D block ? 0 : 1; + + if (block) { + qemu_socket_unselect(fd, NULL); + } + + if (ioctlsocket(fd, FIONBIO, &opt) !=3D NO_ERROR) { + error_setg_errno(errp, socket_error(), + "Can't set file descriptor %d %s", fd, + block ? "blocking" : "non-blocking"); + return false; + } + + return true; +} + void qemu_socket_set_block(int fd) { unsigned long opt =3D 0; --=20 2.48.1