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 4560DC87FCC for ; Thu, 31 Jul 2025 14:22:53 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uhU7T-0002Qk-H7; Thu, 31 Jul 2025 10:18:56 -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 1uhTFq-0008St-Lp for qemu-devel@nongnu.org; Thu, 31 Jul 2025 09:23:35 -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 1uhTFl-0008Gn-Nf for qemu-devel@nongnu.org; Thu, 31 Jul 2025 09:23:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1753968204; 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=pONtifaguG13Cs8t7DIqrtCwScrqhUzIQHS4WT1h7kg=; b=SaWNuSNfXnNMXHOYATqoX5L6Lbzl3wQNnaowhhRxHkqiLrCE2U3gHHAjb000cCXsIa+vja /aF1g39ce77iU2V3ETO75BD2Qibt7MDMec5RyMn+6LQ5SWLqNO5+p6r5x3MRr9R+xxZW6v hpERv8NYidX4o1PRwy4igPjthn+szSs= Received: from mail-pj1-f72.google.com (mail-pj1-f72.google.com [209.85.216.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-85-FlxQRzwYOGqy8qrQMC5_ZQ-1; Thu, 31 Jul 2025 09:23:23 -0400 X-MC-Unique: FlxQRzwYOGqy8qrQMC5_ZQ-1 X-Mimecast-MFC-AGG-ID: FlxQRzwYOGqy8qrQMC5_ZQ_1753968202 Received: by mail-pj1-f72.google.com with SMTP id 98e67ed59e1d1-31f2dd30823so1566259a91.0 for ; Thu, 31 Jul 2025 06:23:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753968202; x=1754573002; 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=pONtifaguG13Cs8t7DIqrtCwScrqhUzIQHS4WT1h7kg=; b=qdzELSz1C8Z9j5poeY5k7GDQocPeZc1t9+7x0zmn3IFdR5lVTcgEg0C+PWHTgyq+ka TWNT3oe5qxPI306sbVk6xiNfN7WK224OoXews31TQ4I+5eJh4I89alVSjcz8C80SktLV hbHW/zc9cSo5+mMyIaWsU7YAHR0/gajBa6L4hpeLVAN+oaTge1QRkxsJ+Qm4C8qWSS2I A74hWYfmJCOgwbbAF7wyUIuhGIXcGZW58bC3APtgiKcP7RssCznSsCL3ux8XpyuL8ZEO EkxYyKdb9gKZvyPW+jwczUTaCpWmUy77e5lnzLWA2Af+1So3VYKfiXwJcfdDPVr+uhqD +RmQ== X-Gm-Message-State: AOJu0Yw8wwhHMfaOLgC3NaSHuYgGdFZIlAwUj/zmniHes5SKTzOVoPS0 R4feQc6gcwO6jp4Sc8zcNUcw2XXF8KI18RZQq8UJpFcHjna4nwUdctGgOe8bIWvuc6ClqoTE0/5 YR0pCDQd0JsZeWKLrBlCt/siJBH+4rTSlF1T21mcKv+AOMnF6Xjc2CMKXz3SVX4hUFoWZ5Xshbz l5orupJlY3XOu/rLuradK4DgLi+ME5abmOKi2ES9BQhg== X-Gm-Gg: ASbGncvnEn48bCjPhPva6d5njvzDPa23e38XR6mC6wyMBG2hN7FP0Fe/V/y38+BubsU QYr8G5psRViD5zNP5jOFGwJX6y4BLiAgQZuh1rYZEmD+Ci0EZ8dgwNm0BDeO0rk5eIi/ugdANoC 0PESKeC+7xryQzbAxd6mEMrsTsVD9JAsmuPDInCtR+/GuJopWrm8wcjOTXyaqzenGGiaGxz2jFp ZBxya+zi3R/YQhd/TQomwOC/xJa7t9DxnOjmcGwvbYAFObGQYYoDWwB7R6hhiQ1n83q40jLyWZ2 AZQebFqEr9YMM33WwJ1LFqXkmUHGJ+nPHSTHxAMstXGAPL2c4D0S X-Received: by 2002:a17:90b:3f85:b0:313:176b:3d4b with SMTP id 98e67ed59e1d1-31f5de41b53mr7910596a91.22.1753968201843; Thu, 31 Jul 2025 06:23:21 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHYlAZU+FeK9C5a9MgO4n2JW+DkMnm6nP5EXJrVoKQxEivaSPLO7U4Go+biEYCwg5JgsgGRGw== X-Received: by 2002:a17:90b:3f85:b0:313:176b:3d4b with SMTP id 98e67ed59e1d1-31f5de41b53mr7910500a91.22.1753968201062; Thu, 31 Jul 2025 06:23:21 -0700 (PDT) Received: from armenon-kvm.bengluru.csb ([49.36.99.139]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3209a84d115sm2007034a91.36.2025.07.31.06.23.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 31 Jul 2025 06:23:20 -0700 (PDT) From: Arun Menon Date: Thu, 31 Jul 2025 18:50:49 +0530 Subject: [PATCH v8 09/27] migration: push Error **errp into loadvm_process_command() MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Message-Id: <20250731-propagate_tpm_error-v8-9-28fd82fdfdb2@redhat.com> References: <20250731-propagate_tpm_error-v8-0-28fd82fdfdb2@redhat.com> In-Reply-To: <20250731-propagate_tpm_error-v8-0-28fd82fdfdb2@redhat.com> To: qemu-devel@nongnu.org Cc: "Michael S. Tsirkin" , Marcel Apfelbaum , Cornelia Huck , Halil Pasic , Eric Farman , Richard Henderson , David Hildenbrand , Ilya Leoshkevich , Thomas Huth , Christian Borntraeger , Paolo Bonzini , Fam Zheng , Nicholas Piggin , Daniel Henrique Barboza , Harsh Prateek Bora , Alex Williamson , =?utf-8?q?C=C3=A9dric_Le_Goater?= , Peter Xu , Fabiano Rosas , Hailiang Zhang , Steve Sistare , qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, Stefan Berger , =?utf-8?q?Marc-Andr=C3=A9_Lureau?= , =?utf-8?q?Alex_Benn=C3=A9e?= , Akihiko Odaki , Dmitry Osipenko , Matthew Rosato , Arun Menon X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=6004; i=armenon@redhat.com; h=from:subject:message-id; bh=749RqNuXFloBJ+w70Re6iXAcs2gd63UT3Sg410UpJRA=; b=owGbwMvMwCWWVaVqcZPfqI/xtFoSQ0Z37lPVR4eyW2YmibokLLWIFfm89Y2rc4/m3ynczA3H2 vJSe793lLIwiHExyIopsjR8DZBtCiiMiLR9eR1mDisTyBAGLk4BmIj7fYZ/VpeynneavIoLdY1X TFoULXzlWLnm11PhzPo8D/6W/DnRw/A/pyTdx9uYT+xu0K7oQHcxIatFrgsXXDV4pvuri8fSvII FAA== 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. It is ensured that loadvm_process_command() must report an error in errp, in case of failure. Reviewed-by: Marc-André Lureau Signed-off-by: Arun Menon --- migration/savevm.c | 72 +++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 52 insertions(+), 20 deletions(-) diff --git a/migration/savevm.c b/migration/savevm.c index dfdb39952b0de12f7a4d6a0850c052a50e719925..280ee92133975913f1d374231b431235a7301b7d 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2544,12 +2544,13 @@ static int loadvm_postcopy_handle_switchover_start(void) * LOADVM_QUIT All good, but exit the loop * <0 Error */ -static int loadvm_process_command(QEMUFile *f) +static int loadvm_process_command(QEMUFile *f, Error **errp) { MigrationIncomingState *mis = migration_incoming_get_current(); uint16_t cmd; uint16_t len; uint32_t tmp32; + int ret; cmd = qemu_get_be16(f); len = qemu_get_be16(f); @@ -2560,16 +2561,16 @@ static int loadvm_process_command(QEMUFile *f) } if (cmd >= MIG_CMD_MAX || cmd == MIG_CMD_INVALID) { - error_report("MIG_CMD 0x%x unknown (len 0x%x)", cmd, len); + error_setg(errp, "MIG_CMD 0x%x unknown (len 0x%x)", cmd, len); return -EINVAL; } trace_loadvm_process_command(mig_cmd_args[cmd].name, len); if (mig_cmd_args[cmd].len != -1 && mig_cmd_args[cmd].len != len) { - error_report("%s received with bad length - expecting %zu, got %d", - mig_cmd_args[cmd].name, - (size_t)mig_cmd_args[cmd].len, len); + error_setg(errp, "%s received with bad length - expecting %zu, got %d", + mig_cmd_args[cmd].name, + (size_t)mig_cmd_args[cmd].len, len); return -ERANGE; } @@ -2588,11 +2589,10 @@ static int loadvm_process_command(QEMUFile *f) * been created. */ if (migrate_switchover_ack() && !mis->switchover_ack_pending_num) { - int ret = migrate_send_rp_switchover_ack(mis); + ret = migrate_send_rp_switchover_ack(mis); if (ret) { - error_report( - "Could not send switchover ack RP MSG, err %d (%s)", ret, - strerror(-ret)); + error_setg_errno(errp, -ret, + "Could not send switchover ack RP MSG"); return ret; } } @@ -2602,40 +2602,72 @@ static int loadvm_process_command(QEMUFile *f) tmp32 = qemu_get_be32(f); trace_loadvm_process_command_ping(tmp32); if (!mis->to_src_file) { - error_report("CMD_PING (0x%x) received with no return path", - tmp32); + error_setg(errp, "CMD_PING (0x%x) received with no return path", + tmp32); return -1; } migrate_send_rp_pong(mis, tmp32); break; case MIG_CMD_PACKAGED: - return loadvm_handle_cmd_packaged(mis); + ret = loadvm_handle_cmd_packaged(mis); + if (ret < 0) { + error_setg(errp, "Failed to load device state command: %d", ret); + } + return ret; case MIG_CMD_POSTCOPY_ADVISE: - return loadvm_postcopy_handle_advise(mis, len); + ret = loadvm_postcopy_handle_advise(mis, len); + if (ret < 0) { + error_setg(errp, "Failed to load device state command: %d", ret); + } + return ret; case MIG_CMD_POSTCOPY_LISTEN: - return loadvm_postcopy_handle_listen(mis); + ret = loadvm_postcopy_handle_listen(mis); + if (ret < 0) { + error_setg(errp, "Failed to load device state command: %d", ret); + } + return ret; case MIG_CMD_POSTCOPY_RUN: - return loadvm_postcopy_handle_run(mis); + ret = loadvm_postcopy_handle_run(mis); + if (ret < 0) { + error_setg(errp, "Failed to load device state command: %d", ret); + } + return ret; case MIG_CMD_POSTCOPY_RAM_DISCARD: - return loadvm_postcopy_ram_handle_discard(mis, len); + ret = loadvm_postcopy_ram_handle_discard(mis, len); + if (ret < 0) { + error_setg(errp, "Failed to load device state command: %d", ret); + } + return ret; case MIG_CMD_POSTCOPY_RESUME: loadvm_postcopy_handle_resume(mis); return 0; case MIG_CMD_RECV_BITMAP: - return loadvm_handle_recv_bitmap(mis, len); + ret = loadvm_handle_recv_bitmap(mis, len); + if (ret < 0) { + error_setg(errp, "Failed to load device state command: %d", ret); + } + return ret; case MIG_CMD_ENABLE_COLO: - return loadvm_process_enable_colo(mis); + ret = loadvm_process_enable_colo(mis); + if (ret < 0) { + error_setg(errp, "Failed to load device state command: %d", ret); + } + return ret; case MIG_CMD_SWITCHOVER_START: - return loadvm_postcopy_handle_switchover_start(); + ret = loadvm_postcopy_handle_switchover_start(); + if (ret < 0) { + error_setg(errp, "Failed to load device state command: %d", ret); + } + return ret; } return 0; @@ -3077,7 +3109,7 @@ retry: } break; case QEMU_VM_COMMAND: - ret = loadvm_process_command(f); + ret = loadvm_process_command(f, NULL); trace_qemu_loadvm_state_section_command(ret); if ((ret < 0) || (ret == LOADVM_QUIT)) { goto out; -- 2.50.0