From nobody Sun Dec 14 08:04:34 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1754637681; cv=none; d=zohomail.com; s=zohoarc; b=XTvVxba/kNUx6blcQfS3lRzvzdVZLCjdxj6/SRF6hRrJU95bbDM9SjnVAxq0CEJelWnwviiCfyAeqvr5VnPP1Q3hfFR0rmNr/ndhWlMm/DNHZ01Qnba0UrYNyPP6c6ACpp9FHopyc6gaOA6M+ROVMrsPEPW3phfCc3TL+IWP3T0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754637681; h=Content-Type: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=x1eMFN91bkPJ9opz18JD2ZG/30haYOSJYxe/Rl0M8C8=; b=Dmn23fikGBWSmTIbq46NiXBaBUFH8AOYpa//0Lvd0Pq6DVx4LIXDD83a09e6NtZ8qMPNR+qChUk8ONvYnHPtseNSjWb9pv01F7TlqU3OaR6qrAMQgDrQKTzo52p4buTRsOR4/Xr8Jb8xz8kALn9erQkReuXrP3dQGmzPOAc6tbU= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1754637681919468.20347578605947; Fri, 8 Aug 2025 00:21:21 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ukHMX-0002Yh-28; Fri, 08 Aug 2025 03:18:01 -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 1ukHLA-00073n-9P for qemu-devel@nongnu.org; Fri, 08 Aug 2025 03:16:41 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ukHL7-0007Ln-Sh for qemu-devel@nongnu.org; Fri, 08 Aug 2025 03:16:35 -0400 Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-207-GFUtMEwhM72SxQE2rcFo2Q-1; Fri, 08 Aug 2025 03:16:27 -0400 Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-2403e4c82ddso15600655ad.1 for ; Fri, 08 Aug 2025 00:16:27 -0700 (PDT) Received: from armenon-kvm.bengluru.csb ([49.36.101.237]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-241e899d347sm199659385ad.140.2025.08.08.00.16.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Aug 2025 00:16:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1754637393; 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=x1eMFN91bkPJ9opz18JD2ZG/30haYOSJYxe/Rl0M8C8=; b=OCgVKrlRVCusH1JMBbVFc4nsLqENSbaZnVrJIR0e44xxCriv3eod4yMjYgcEGEJdnNjWPK DPm1SpM5134Tz2ey2HrVs8+hAxp8Bbs+EsExjo6RO0n6GZLt0fpZkKnfTeaOLWRbHTgD05 qJiUfn2fO+KbdwqtAm9RtJPli6NEvek= X-MC-Unique: GFUtMEwhM72SxQE2rcFo2Q-1 X-Mimecast-MFC-AGG-ID: GFUtMEwhM72SxQE2rcFo2Q_1754637386 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754637386; x=1755242186; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=x1eMFN91bkPJ9opz18JD2ZG/30haYOSJYxe/Rl0M8C8=; b=A38lhIztwf1g9TUr438i5HPQkksMoekpBqqkm573qwMgbSAK2MBg14D/3tzaQ+jSlO yO6E3jbJhLZzMEWWNtoDAt26t17aS0h9xStDax5aKuh3A81Mj1xaPLLAwC18J/qglzpd B60pt5FN0LamrXngoSb0o2356FrR4LpSb5IDCsHMcf8DFhkJk7/YZ3PVys/75tA+rPyx oRBMt6cOCtyiJfOPDR6tM7IoNVKqdercXOpwmNxDKmpoZiQOaZPjziFCpct2rAK3uTfl zKqgIjEei7xqI+6ThQSZg99Ym1FNzMcKbbiXfgy4qJ0OLQo1rXTkizZJwDImptxouTyL jlCw== X-Gm-Message-State: AOJu0YwWgkWJqiXaiGpfmfAC/t4w28GibOtXsBoy/h+J/YOeRTpFcV/E GnQnDNGP4ROAgc3aGWGueAFR6IaNbOhYn9XtTvszb+93j5ykSI/V7d4E0ekN0CVZCnlePW8b7vh xcMehhz5F1xvxUFUSu+4mDSR0ogcuqwKtKitpbI0QMgaEQmyErVe/Nng7 X-Gm-Gg: ASbGncutvk+tg0lTQTMt4lovtz95RoaHgcsMzchlhNruzkha1yIuZakIf32LZ+YYLRw oFqtQ0uTKKncXyX4RUoDeEG6ZOKRMxYbcWHrBG0NVF2XNzGntsiZaROvrbsozN6jbf8rswk87cj Tp3TZLy0jC5ByoDk9NRQ4peJahw8N0bfJGN0XtQzssHncpdUu9sSYCYU+NI5XaJ5Ofz57SlPFT4 uhXV51UIfIRQf0tLHpnmQhpzWBwzgH1WLthUR/UchL+143BG22ivv1cohFGqYOi40HHl3lIZBc9 8DZ57qdLQp7h2iLgaNbPnCMpk3iGeECWDKrnWODSmy3el/YTRgGOMw== X-Received: by 2002:a17:902:f70c:b0:235:f143:9b16 with SMTP id d9443c01a7336-242c2240276mr27925065ad.41.1754637386475; Fri, 08 Aug 2025 00:16:26 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHNW3SnXvDaeDtDDX5OUsfGRkmd+Wq4Z8hJPWlseW4LPgO2lOAw0xi+TTGF2v5i8EgDKl0UIg== X-Received: by 2002:a17:902:f70c:b0:235:f143:9b16 with SMTP id d9443c01a7336-242c2240276mr27924565ad.41.1754637386097; Fri, 08 Aug 2025 00:16:26 -0700 (PDT) From: Arun Menon Date: Fri, 08 Aug 2025 12:43:38 +0530 Subject: [PATCH v10 12/27] migration: Update qemu_file_get_return_path() docs and remove dead checks MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250808-propagate_tpm_error-v10-12-3e81a1d419b2@redhat.com> References: <20250808-propagate_tpm_error-v10-0-3e81a1d419b2@redhat.com> In-Reply-To: <20250808-propagate_tpm_error-v10-0-3e81a1d419b2@redhat.com> To: qemu-devel@nongnu.org Cc: Peter Xu , Fabiano Rosas , =?utf-8?q?Alex_Benn=C3=A9e?= , Akihiko Odaki , Dmitry Osipenko , "Michael S. Tsirkin" , Marcel Apfelbaum , Cornelia Huck , Halil Pasic , Eric Farman , Thomas Huth , Christian Borntraeger , Matthew Rosato , Richard Henderson , David Hildenbrand , Ilya Leoshkevich , Nicholas Piggin , Harsh Prateek Bora , Paolo Bonzini , Fam Zheng , Alex Williamson , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Steve Sistare , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, Hailiang Zhang , Stefan Berger , Peter Maydell , qemu-arm@nongnu.org, Arun Menon , =?utf-8?q?Daniel_P=2E_Berrang=C3=A9?= X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=3858; i=armenon@redhat.com; h=from:subject:message-id; bh=2DVEmxxtErqxySrYa+Ux2h1Cq14PJ7w1dCm0qxcYpfU=; b=owGbwMvMwCWWVaVqcZPfqI/xtFoSQ8bUxVcrL07V5eRb8ezPvt/lWx9t6bFZ0P2NjVvKe/Gy2 MOlV2+86ChlYRDjYpAVU2Rp+Bog2xRQGBFp+/I6zBxWJpAhDFycAjCRBekM/2OE1kgc3jy3Mbx6 UkQjf+rtgt8qnxNndpfEfpn1rf1M7m2Gf2p1CrGZTSzLi1h9MjRq3K3z8+8JThGc4nSg+rrWvMN bOAA= X-Developer-Key: i=armenon@redhat.com; a=openpgp; fpr=80F5501D82507158593DE9D76A7A2538D90F328E 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=armenon@redhat.com; helo=us-smtp-delivery-124.mimecast.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, 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, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-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.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 @redhat.com) X-ZM-MESSAGEID: 1754637684250124100 The documentation of qemu_file_get_return_path() states that it can return NULL on failure. However, a review of the current implementation reveals that it is guaranteed that it will always succeed and will never return NULL. As a result, the NULL checks post calling the function become redundant. This commit updates the documentation for the function and removes all NULL checks throughout the migration code. Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Marc-Andr=C3=A9 Lureau Signed-off-by: Arun Menon --- migration/colo.c | 4 ---- migration/migration.c | 12 ++---------- migration/qemu-file.c | 1 - migration/savevm.c | 4 ---- 4 files changed, 2 insertions(+), 19 deletions(-) diff --git a/migration/colo.c b/migration/colo.c index a96e4dba15516b71d1b315c736c3b4879ff04e58..71842c798a1dbbea6a7ccf8cb64= e2c836c0f574c 100644 --- a/migration/colo.c +++ b/migration/colo.c @@ -850,10 +850,6 @@ static void *colo_process_incoming_thread(void *opaque) failover_init_state(); =20 mis->to_src_file =3D qemu_file_get_return_path(mis->from_src_file); - if (!mis->to_src_file) { - error_report("COLO incoming thread: Open QEMUFile to_src_file fail= ed"); - goto out; - } /* * Note: the communication between Primary side and Secondary side * should be sequential, we set the fd to unblocked in migration incom= ing diff --git a/migration/migration.c b/migration/migration.c index c6768d88f45c870c7fad9b9957300766ff69effc..35f769bc55c235134abb5554ed0= 1b94787d4bf78 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -2647,12 +2647,9 @@ out: return NULL; } =20 -static int open_return_path_on_source(MigrationState *ms) +static void open_return_path_on_source(MigrationState *ms) { ms->rp_state.from_dst_file =3D qemu_file_get_return_path(ms->to_dst_fi= le); - if (!ms->rp_state.from_dst_file) { - return -1; - } =20 trace_open_return_path_on_source(); =20 @@ -2661,8 +2658,6 @@ static int open_return_path_on_source(MigrationState = *ms) ms->rp_state.rp_thread_created =3D true; =20 trace_open_return_path_on_source_continue(); - - return 0; } =20 /* Return true if error detected, or false otherwise */ @@ -4011,10 +4006,7 @@ void migration_connect(MigrationState *s, Error *err= or_in) * QEMU uses the return path. */ if (migrate_postcopy_ram() || migrate_return_path()) { - if (open_return_path_on_source(s)) { - error_setg(&local_err, "Unable to open return-path for postcop= y"); - goto fail; - } + open_return_path_on_source(s); } =20 /* diff --git a/migration/qemu-file.c b/migration/qemu-file.c index b6ac190034f777dbde0da1598483a892089d7538..f9ccee9a1091ecbd37e6b7d2081= a4446442b544d 100644 --- a/migration/qemu-file.c +++ b/migration/qemu-file.c @@ -125,7 +125,6 @@ static QEMUFile *qemu_file_new_impl(QIOChannel *ioc, bo= ol is_writable) =20 /* * Result: QEMUFile* for a 'return path' for comms in the opposite directi= on - * NULL if not available */ QEMUFile *qemu_file_get_return_path(QEMUFile *f) { diff --git a/migration/savevm.c b/migration/savevm.c index ff2e4f75e070d0f452414f28435905928b1480a7..ce5be8f0b95c798d3740d0949d4= 68d7cbadf7020 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2590,10 +2590,6 @@ static int loadvm_process_command(QEMUFile *f, Error= **errp) return 0; } mis->to_src_file =3D qemu_file_get_return_path(f); - if (!mis->to_src_file) { - error_report("CMD_OPEN_RETURN_PATH failed"); - return -1; - } =20 /* * Switchover ack is enabled but no device uses it, so send an ACK= to --=20 2.50.1