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 81F23CAC5B8 for ; Tue, 30 Sep 2025 04:29:47 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v3RqQ-0003N1-DV; Tue, 30 Sep 2025 00:20:06 -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 1v3RqA-0003Ah-O4 for qemu-arm@nongnu.org; Tue, 30 Sep 2025 00:19:51 -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 1v3Rq1-0002Kh-UN for qemu-arm@nongnu.org; Tue, 30 Sep 2025 00:19:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1759205974; 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=Zo7HjC4DzI8nhbXzaw36FTea5HwLLN7mMAHFtaaHE8E=; b=Gl+LilC9WEkUiI0jvejGV2sJ8QXm/v2fgpMigpFs9lZpPE/4oBzjU0rfiw+wU9vM2S8yDw NI2yLqb6TD6Lo8MGGdWOwWQFpSbgkoXLV1NPnInYR8o+XbL4H1xV/1Sbwo9AcdPWy+qQ6J +Zpw4o7mrcfYZmTJSWL0FPtHSQibCBY= Received: from mail-pg1-f199.google.com (mail-pg1-f199.google.com [209.85.215.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-27-p9pUEGDtM2y3ena4YIv9XA-1; Tue, 30 Sep 2025 00:19:25 -0400 X-MC-Unique: p9pUEGDtM2y3ena4YIv9XA-1 X-Mimecast-MFC-AGG-ID: p9pUEGDtM2y3ena4YIv9XA_1759205965 Received: by mail-pg1-f199.google.com with SMTP id 41be03b00d2f7-b5533921eb2so3779806a12.0 for ; Mon, 29 Sep 2025 21:19:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759205965; x=1759810765; 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=Zo7HjC4DzI8nhbXzaw36FTea5HwLLN7mMAHFtaaHE8E=; b=uGKoGgdZF3jADfg96DmM9UryfEp983L8WALk80DrPpoSpI+nGIG9+TKvhTeya5Lmsk fny40c16H2Ne9yfwsWJljqOCVUUOuE5+qd4swIvd/iUh2iyOAjoFUpcKQ1CzYaK8IYpq VzpppKYYGmg0mnQvj2pxlyYgTTcMXqX/WvVicy1VPcPlQAw6zfnJ5Ej7vRm5o2i8u8NE 3gI/w6oRJRks9bQbQppyNb/9MqKWBvwEBIjoxFJ5iBqfPmHUpUEMOnkm5PCjMBOxoNH4 ThqIzA2xc7Y2WDVbAfJdDUCkAHNvaKvWcZrhBLV7Bq+KS7Z0+54Zc+RVykd0n72/YmJq wWdA== X-Forwarded-Encrypted: i=1; AJvYcCVLLkgJJiVTAkrhANfyAqs9uyatXwEC394kS80E4SE58Puj4WoOxZseTvAdkqjZdkMS6+fNGE6xAA==@nongnu.org X-Gm-Message-State: AOJu0Yz++NDZVk8K5JMyMxQ1LcMazPeAVu3CqZ/qHEUwq8yuTtH2OYQc l/G6S8c90Hh5g+69+i1D/lTYeiQQHCHdPxTy/CUJA0sKL3OBZJbzQfUXiuQ72FodyY1jBa4rrFH vsYcgDo4uvdOg6vIffaRrD6lr4BI+KDrrN3X++oMVIzHpoKuLxoqc9g== X-Gm-Gg: ASbGncsfCrpistuRUnY5sE3bsqUdpIS5LKAnJXCo5wisR+/ZLHnVhwherZUBaVEr+1F STejNa1Rg0Qkmt9XwdPdLrHSTzhQGUEq4tWXNwJpRn2zEaV0dRCZTUazB0lzdqUDYV1I8h8+HOb qQhJjcqo21hlz+M49W/4axI1v+x9cJQEJqKmE7MV4geREozNf1ZOivWsPYZgkX6bPYlkDjg8CSP DKucI0JsZfVf/wuMpcjRyBAGd1Odh8Yk8SNNaWKFZCvm+ypy2MaJSnF3/New+YrBp17UIumkyRg sIeuz3HpDtwok22pbe/knBUR2eELjRK8mtnQJud+aOzi3p7Q3gICrfI/dA== X-Received: by 2002:a17:90b:384c:b0:338:3156:fc43 with SMTP id 98e67ed59e1d1-3383156fd42mr5997521a91.11.1759205964759; Mon, 29 Sep 2025 21:19:24 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFi06DprAdLkXnbg49QOzIrd7JUTOSHJD2t9OIQdo3nqW2lKQR9dsuYmhyYJfRkkE8IkZ6rrw== X-Received: by 2002:a17:90b:384c:b0:338:3156:fc43 with SMTP id 98e67ed59e1d1-3383156fd42mr5997494a91.11.1759205964344; Mon, 29 Sep 2025 21:19:24 -0700 (PDT) Received: from armenon-kvm.bengluru.csb ([49.36.108.92]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-b57c55a339dsm12534158a12.40.2025.09.29.21.19.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Sep 2025 21:19:24 -0700 (PDT) From: Arun Menon Date: Tue, 30 Sep 2025 09:48:14 +0530 Subject: [PATCH v15 05/26] migration: push Error **errp into loadvm_process_command() MIME-Version: 1.0 Message-Id: <20250930-propagate_tpm_error-v15-5-84afd3af1e47@redhat.com> References: <20250930-propagate_tpm_error-v15-0-84afd3af1e47@redhat.com> In-Reply-To: <20250930-propagate_tpm_error-v15-0-84afd3af1e47@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 X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=7258; i=armenon@redhat.com; h=from:subject:message-id; bh=z/LBX8lfqOcsEbX6iJOLzkowpVGEsY/fXD7M5WAQWGo=; b=owGbwMvMwCWWVaVqcZPfqI/xtFoSQ8btKIGJfv69Kz185v7XmPM+t3Cqdv5R94yAjAZF5u6DG 2+6hj7uKGVhEONikBVTZGn4GiDbFFAYEWn78jrMHFYmkCEMXJwCMBHRbkaGZ3vCspjZvP9vCWpb FlFnxvM0oUHB6NaHT7vtihaEZc+/wshweZWgk3Gtz0SW1+vO298/lbto6uE9IsxHVl/57fSH4X4 5CwA= X-Developer-Key: i=armenon@redhat.com; a=openpgp; fpr=80F5501D82507158593DE9D76A7A2538D90F328E X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: 1RQml2K7T21QhPaYECQPgj6t-rIXWM5xr2Si1CovxIo_1759205965 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit 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: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.513, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, T_SPF_TEMPERROR=0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-arm@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-arm-bounces+qemu-arm=archiver.kernel.org@nongnu.org Sender: qemu-arm-bounces+qemu-arm=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. The errors are temporarily reported using error_report_err(). This is removed in the subsequent patches in this series when we are actually able to propagate the error to the calling function. Reviewed-by: Marc-André Lureau Reviewed-by: Fabiano Rosas Tested-by: Fabiano Rosas Reviewed-by: Akihiko Odaki Signed-off-by: Arun Menon --- migration/savevm.c | 86 +++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 63 insertions(+), 23 deletions(-) diff --git a/migration/savevm.c b/migration/savevm.c index fffea57cd962800abb6d9abfcbeb908fcb2c9d95..d1ed2e1cde54913d7fcc4b6808d08cd5b3a17745 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2546,32 +2546,37 @@ 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); /* Check validity before continue processing of cmds */ - if (qemu_file_get_error(f)) { - return qemu_file_get_error(f); + ret = qemu_file_get_error(f); + if (ret) { + error_setg(errp, + "Failed to load VM process command: stream error: %d", + ret); + return ret; } 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; } @@ -2584,7 +2589,7 @@ static int loadvm_process_command(QEMUFile *f) } mis->to_src_file = qemu_file_get_return_path(f); if (!mis->to_src_file) { - error_report("CMD_OPEN_RETURN_PATH failed"); + error_setg(errp, "CMD_OPEN_RETURN_PATH failed"); return -1; } @@ -2594,11 +2599,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; } } @@ -2608,39 +2612,71 @@ 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: return loadvm_postcopy_handle_resume(mis); 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; @@ -3049,6 +3085,7 @@ int qemu_loadvm_state_main(QEMUFile *f, MigrationIncomingState *mis) { uint8_t section_type; int ret = 0; + Error *local_err = NULL; retry: while (true) { @@ -3076,7 +3113,10 @@ retry: } break; case QEMU_VM_COMMAND: - ret = loadvm_process_command(f); + ret = loadvm_process_command(f, &local_err); + if (ret < 0) { + error_report_err(local_err); + } trace_qemu_loadvm_state_section_command(ret); if ((ret < 0) || (ret == LOADVM_QUIT)) { goto out; -- 2.51.0