From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id ED2BFCA0EEB for ; Thu, 21 Aug 2025 08:49:52 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1up0yA-0007p1-DW; Thu, 21 Aug 2025 04:48:26 -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 1up0ww-0004MP-7W for qemu-devel@nongnu.org; Thu, 21 Aug 2025 04:47:10 -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 1up0wo-0001KC-Ly for qemu-devel@nongnu.org; Thu, 21 Aug 2025 04:47:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1755766018; 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=zpqnEptwezU1dB9sFAUu0JGNQXbWEN6mcNeNsGNkqH0=; b=gT6pGM2jCWaEiTzIe2Wl6tbwprI9n5aMgnhgHO65MT01WsQ5GvAXeO5/C7W91Lj+Z1EdRZ nFEMlDdlRNd1zRGcRjKYxwrV97HZ4MPIMk9nhfkAmbvgXzDxSp1W7IRylwQP8hkOgVNxYu u4GDF2afZluPDA0zL9MKdV+FGEurGIk= Received: from mail-pl1-f197.google.com (mail-pl1-f197.google.com [209.85.214.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-275-RrJkEYQuOu6k9WcS_9qq1A-1; Thu, 21 Aug 2025 04:46:56 -0400 X-MC-Unique: RrJkEYQuOu6k9WcS_9qq1A-1 X-Mimecast-MFC-AGG-ID: RrJkEYQuOu6k9WcS_9qq1A_1755766016 Received: by mail-pl1-f197.google.com with SMTP id d9443c01a7336-2445806eab4so9706245ad.1 for ; Thu, 21 Aug 2025 01:46:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755766016; x=1756370816; 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=zpqnEptwezU1dB9sFAUu0JGNQXbWEN6mcNeNsGNkqH0=; b=S4DJBuGzfIpmDxr56GaMEOhswSPFbhrBiwsAEElzFQQKB3jKwFhhKTkbyvjlRfY0Hp M+JNjfwuWloSxEjo9+Lq94w5mPgboJgovnrk7HJLELr5twBx8PGtKrZzuCiTlX9DC7/2 t6R6r5oT0QR+r865miOhWCZHt5Jof694cEGLPW/c0g1V5BbMSe7r49/0vLvPA8ZHMKq/ jgAjr29UNI5Rwamkz8WI/qyBavdcbIaFdtkJU8N3OTqPXNOGzQKwrnWNtEpRYDghh1Ni B8RJCRgB9HBf7VQK2XYPyFBNLP+8O8bbwyGbb2wdh9r1RWLP6aGfJixMx85SaKuZgMCT 5sig== X-Gm-Message-State: AOJu0Yzs3HOVziwHjlzRTtjFqqi8iBbDvUO+ebYUokn2doZ/ItEcM7Qy veWDf+v05Vdq1/t+f2CNxmay4jIlYok38vVuZe/w4jCcjYw52nI586UFM3t4RD+fdvdh+WwnVnQ Z4CRZ9+LQNiHKuscYL7ZhyKft3j95+QdBJVfOgOgz9HZ5BEXl6BEcwESq X-Gm-Gg: ASbGncvJ4DhdIRevS0e+7h+lv4rrRv4pOi7mxF7I8nXH8t80aP6ZDy7EkmsJNIkJILr AMtQY5OvjqItvW6dO7i92myPfIb7UeezAS7zp9sWJ9l96PQE5f2RYmgnEbPYz4tqGGKMASJfUcs z7URbUzDVvb/UPIRjPLJTAAfZhFdrOr2aJxgCDCdbLWl5cHAGhcbI2hf7dextZQ98A9V4hnOpGZ /nNboyCAUBJb6Jahje23hx93hp+yZKqPuDT5gt6lpnAzjpbop5OnCkK//mCkXrmQDXNjwhcGu/M L7U9iHqDXIwFsuxq75/LWLRhejYaok7TYLuA/B+o0Sh0Kqjlc18z X-Received: by 2002:a17:903:4b07:b0:240:1bba:fc7d with SMTP id d9443c01a7336-245fedcc268mr21255075ad.33.1755766015323; Thu, 21 Aug 2025 01:46:55 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGKLbSCd0SyJ3NhUYkW3PJAKfF3wYS6AAK7+AeX13WRmQ2ymnBFjaNYjShfRv7WuX/JHFlmoQ== X-Received: by 2002:a17:903:4b07:b0:240:1bba:fc7d with SMTP id d9443c01a7336-245fedcc268mr21254785ad.33.1755766014846; Thu, 21 Aug 2025 01:46:54 -0700 (PDT) Received: from armenon-kvm.bengluru.csb ([49.47.192.65]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-245ed33e05dsm48789985ad.3.2025.08.21.01.46.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Aug 2025 01:46:54 -0700 (PDT) From: Arun Menon Date: Thu, 21 Aug 2025 14:14:07 +0530 Subject: [PATCH v12 13/27] migration: make loadvm_postcopy_handle_resume() void MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Message-Id: <20250821-propagate_tpm_error-v12-13-72b803e707dc@redhat.com> References: <20250821-propagate_tpm_error-v12-0-72b803e707dc@redhat.com> In-Reply-To: <20250821-propagate_tpm_error-v12-0-72b803e707dc@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=2052; i=armenon@redhat.com; h=from:subject:message-id; bh=N5pt1gunHOlKLf2QzPY2g/q1GokUjbzWIX3PAZeY0eI=; b=owGbwMvMwCWWVaVqcZPfqI/xtFoSQ8ayOymcjfPYby+PMA4ydgtb2ax+ZIVGhcXGA6ZsrhpnE xy/hut2lLIwiHExyIopsjR8DZBtCiiMiLR9eR1mDisTyBAGLk4BmMjGqQx/xZ1Y1x9jmmrvsX/x XvtZJssfc97X91SakGFfuvLgKrm3Rxn+B01nu7ZMuFNl35PjaffU04xTf4RrWcSen/DJKFyPtSW OBQA= X-Developer-Key: i=armenon@redhat.com; a=openpgp; fpr=80F5501D82507158593DE9D76A7A2538D90F328E 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=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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org This is an incremental step in converting vmstate loading code to report error via Error objects instead of directly printing it to console/monitor. Use warn_report() instead of error_report(); it ensures that a resume command received while the migration is not in postcopy recover state is not fatal. It only informs that the command received is unusual, and therefore we should not set errp with the error string. Reviewed-by: Daniel P. Berrangé Reviewed-by: Fabiano Rosas Signed-off-by: Arun Menon --- migration/savevm.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/migration/savevm.c b/migration/savevm.c index 2446711e862233801d5689a775517adabec593d9..f13fecb5cc4778974c883fbbc007b0cd18d90e64 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2334,12 +2334,12 @@ static void migrate_send_rp_req_pages_pending(MigrationIncomingState *mis) } } -static int loadvm_postcopy_handle_resume(MigrationIncomingState *mis) +static void loadvm_postcopy_handle_resume(MigrationIncomingState *mis) { if (mis->state != MIGRATION_STATUS_POSTCOPY_RECOVER) { - error_report("%s: illegal resume received", __func__); + warn_report("%s: illegal resume received", __func__); /* Don't fail the load, only for this. */ - return 0; + return; } /* @@ -2391,8 +2391,6 @@ static int loadvm_postcopy_handle_resume(MigrationIncomingState *mis) /* Kick the fast ram load thread too */ qemu_sem_post(&mis->postcopy_pause_sem_fast_load); } - - return 0; } /** @@ -2647,7 +2645,8 @@ static int loadvm_process_command(QEMUFile *f, Error **errp) return ret; case MIG_CMD_POSTCOPY_RESUME: - return loadvm_postcopy_handle_resume(mis); + loadvm_postcopy_handle_resume(mis); + return 0; case MIG_CMD_RECV_BITMAP: ret = loadvm_handle_recv_bitmap(mis, len); -- 2.50.1