From nobody Sun Jan 25 11:58:21 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=suse.de ARC-Seal: i=1; a=rsa-sha256; t=1769198269; cv=none; d=zohomail.com; s=zohoarc; b=Q98HpEEJfu1/S3WnQWnZK6v35ptzB0IVn2dtcqWo4q86djdvoEGSHa5FQtq/zbNvb8YTjzXZLCs43VMj1PmtLEDtvIW9p6T+zbR4315deqzg/hwfBG3WLN0gZ/whXAxd8WCYLi2htPCFES9fDrsXFvqXNfhk7xDAQv73En+wY5A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1769198269; 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=zxddm5U6APu7XOwfsBVhki7+UpshfKnR0yF/8exGvAk=; b=ChE4qFXCkQ/8A5jcJ1b5gXKAtgXiYEcwCmjqHLDLtNljSydUf/HaHt2iTTfdfUHOXSPBjvLB7fHLIQYrqdIeua3GTVGC/lZBUYSd5sWrAFh68/TbRkRnSdqtOrJJlKKQqsVrTYzhzM4+3AsG8ZRsfwToQJPAk/q7QIcV7+anmXM= 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 1769198269629578.6767908525349; Fri, 23 Jan 2026 11:57:49 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vjNEi-00023W-P0; Fri, 23 Jan 2026 14:54:28 -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 1vjNEh-00022X-6i for qemu-devel@nongnu.org; Fri, 23 Jan 2026 14:54:27 -0500 Received: from smtp-out1.suse.de ([2a07:de40:b251:101:10:150:64:1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vjNEf-0003Uu-FT for qemu-devel@nongnu.org; Fri, 23 Jan 2026 14:54:26 -0500 Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id B9F1633863; Fri, 23 Jan 2026 19:54:08 +0000 (UTC) Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 5EA891395E; Fri, 23 Jan 2026 19:54:07 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id qNb7B9/Rc2lFZQAAD6G6ig (envelope-from ); Fri, 23 Jan 2026 19:54:07 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1769198048; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zxddm5U6APu7XOwfsBVhki7+UpshfKnR0yF/8exGvAk=; b=fuMF/NMQkntSUOEBvQR2WUsH2Xk6Sh4Qgy5vbz5OgTwki1swuVy3U+qH05PDXrP73Ub54t ytffRDsF+BPz7R5c987yB4MLMOG8ISdANfJ1xsTKcnw3z4ntNTq6MGoMROFQUTfxW7jNZN S3cJvtLZ5jZOgslbCOzX4GyAfcsRAoU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1769198048; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zxddm5U6APu7XOwfsBVhki7+UpshfKnR0yF/8exGvAk=; b=G6Sl7wULl1cmgDCxHO1/OdInEDVNpzEZQ5nwalWuPhsBldymIJYe9Xixpf6dlsKDPpgljq w+uG8lf+OPWffgAg== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1769198048; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zxddm5U6APu7XOwfsBVhki7+UpshfKnR0yF/8exGvAk=; b=fuMF/NMQkntSUOEBvQR2WUsH2Xk6Sh4Qgy5vbz5OgTwki1swuVy3U+qH05PDXrP73Ub54t ytffRDsF+BPz7R5c987yB4MLMOG8ISdANfJ1xsTKcnw3z4ntNTq6MGoMROFQUTfxW7jNZN S3cJvtLZ5jZOgslbCOzX4GyAfcsRAoU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1769198048; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zxddm5U6APu7XOwfsBVhki7+UpshfKnR0yF/8exGvAk=; b=G6Sl7wULl1cmgDCxHO1/OdInEDVNpzEZQ5nwalWuPhsBldymIJYe9Xixpf6dlsKDPpgljq w+uG8lf+OPWffgAg== From: Fabiano Rosas To: qemu-devel@nongnu.org Cc: Peter Xu , Vladimir Sementsov-Ogievskiy Subject: [PULL 07/36] qemu-file: qemu_file_get_fd(): improve interface Date: Fri, 23 Jan 2026 16:53:22 -0300 Message-ID: <20260123195352.12850-8-farosas@suse.de> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260123195352.12850-1-farosas@suse.de> References: <20260123195352.12850-1-farosas@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; RCVD_VIA_SMTP_AUTH(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; ARC_NA(0.00)[]; FUZZY_RATELIMITED(0.00)[rspamd.com]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; FROM_EQ_ENVFROM(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[] X-Spam-Score: -2.80 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=2a07:de40:b251:101:10:150:64:1; envelope-from=farosas@suse.de; helo=smtp-out1.suse.de 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, 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: qemu development 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 @suse.de) X-ZM-MESSAGEID: 1769198271314158500 Content-Type: text/plain; charset="utf-8" From: Vladimir Sementsov-Ogievskiy Make it symmetrical with qemu_file_put_fd() and simplify callers. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Fabiano Rosas Link: https://lore.kernel.org/qemu-devel/20260114064710.176268-6-vsementsov= @yandex-team.ru Signed-off-by: Fabiano Rosas --- migration/qemu-file.c | 9 ++++----- migration/qemu-file.h | 2 +- migration/vmstate-types.c | 10 +--------- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/migration/qemu-file.c b/migration/qemu-file.c index 8fdb6c87ea..9cf7dc3bd5 100644 --- a/migration/qemu-file.c +++ b/migration/qemu-file.c @@ -385,9 +385,8 @@ int qemu_file_put_fd(QEMUFile *f, int fd) return ret; } =20 -int qemu_file_get_fd(QEMUFile *f) +int qemu_file_get_fd(QEMUFile *f, int *fd) { - int fd =3D -1; FdEntry *fde; Error *err =3D NULL; int service_byte; @@ -410,12 +409,12 @@ int qemu_file_get_fd(QEMUFile *f) goto fail; } =20 - fd =3D fde->fd; + *fd =3D fde->fd; QTAILQ_REMOVE(&f->fds, fde, entry); g_free(fde); =20 - trace_qemu_file_get_fd(f->ioc->name, fd); - return fd; + trace_qemu_file_get_fd(f->ioc->name, *fd); + return 0; =20 fail: error_report_err(error_copy(err)); diff --git a/migration/qemu-file.h b/migration/qemu-file.h index c13c967167..a8e9bb2ccb 100644 --- a/migration/qemu-file.h +++ b/migration/qemu-file.h @@ -82,6 +82,6 @@ size_t qemu_get_buffer_at(QEMUFile *f, const uint8_t *buf= , size_t buflen, =20 QIOChannel *qemu_file_get_ioc(QEMUFile *file); int qemu_file_put_fd(QEMUFile *f, int fd); -int qemu_file_get_fd(QEMUFile *f); +int qemu_file_get_fd(QEMUFile *f, int *fd); =20 #endif diff --git a/migration/vmstate-types.c b/migration/vmstate-types.c index e34bf4486e..89cb211472 100644 --- a/migration/vmstate-types.c +++ b/migration/vmstate-types.c @@ -321,7 +321,6 @@ const VMStateInfo vmstate_info_uint64 =3D { static int get_fd(QEMUFile *f, void *pv, size_t size, const VMStateField *field) { - int fd; int32_t *v =3D pv; =20 if (migrate_mode() =3D=3D MIG_MODE_CPR_EXEC) { @@ -329,14 +328,7 @@ static int get_fd(QEMUFile *f, void *pv, size_t size, return 0; } =20 - fd =3D qemu_file_get_fd(f); - if (fd < 0) { - return -1; - } - - *v =3D fd; - - return 0; + return qemu_file_get_fd(f, v); } =20 static int put_fd(QEMUFile *f, void *pv, size_t size, --=20 2.51.0