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 C6961CA0EF8 for ; Thu, 21 Aug 2025 08:53:29 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1up0yh-0000m2-R0; Thu, 21 Aug 2025 04:49: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 1up0xf-0006JR-TG for qemu-devel@nongnu.org; Thu, 21 Aug 2025 04:47:59 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1up0xb-0001Z7-M8 for qemu-devel@nongnu.org; Thu, 21 Aug 2025 04:47:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1755766067; 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=8FO14PH4lLpI5ovEyIqsx9TNW7UAeWhvxdRm5KT2O9k=; b=IsuvN5xWrQUzCSZvL/wRNf9wIIbX4iXbdAB0E7lgg2hltMVyfRGXpPcucXxOUaLShIpasw z6RXfxjH9CLC29uXe+HxC+VEMKSyhGvZHHHvZCRP98xRSlb2bnTwyPkUxpi/a01ENXI5ZZ JUMcm3fuWI0Y+bBwz5iHAqw+gQDSlK8= 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-54-HvQiKr50P8asxTEoG35iUQ-1; Thu, 21 Aug 2025 04:47:45 -0400 X-MC-Unique: HvQiKr50P8asxTEoG35iUQ-1 X-Mimecast-MFC-AGG-ID: HvQiKr50P8asxTEoG35iUQ_1755766065 Received: by mail-pl1-f197.google.com with SMTP id d9443c01a7336-24457f59889so8414455ad.0 for ; Thu, 21 Aug 2025 01:47:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755766065; x=1756370865; 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=8FO14PH4lLpI5ovEyIqsx9TNW7UAeWhvxdRm5KT2O9k=; b=bZQVa4x/IJHeOEkattfcMa4Xj7gz9hhVJ2WEdIxkJ2TD7quUeKQRDhVZdxC5sRFOwu eeW6dHgb+8fGzr+SlNuFC4+WcyRhHhzlBnbR1pTy/ZdEqQD7eNNJNSFskKZKHAMtNxdU dANSk4uFdpZ933UTo/J53UmWJAr3DFcn88wXpGaWjh7ZjBdvKYN6oTmpLGfCd16Pg22O xbEkGWK4QVllxt8dK7KUID1XthEvK0CaFzYZbnlxkFuinA4DP6UJcGvz08G6PL3QXLj1 X5LPXp4iLGpouwb5YgUAmYhannyrcNvDxUAcWV4hPZZToNpQbk3Da8qy/UhVjUNy0qXZ C9Qw== X-Gm-Message-State: AOJu0YwTb5vXu2iRUEGBUSo5logtC7rnUECCYS1U1BHLb6UYAs6FWvtQ qCd0uhP4F29rKu0M1eBWI1wno6gvlYA6Q1kccLqouE2ywcU4nWSbFv4/mNaT2uYBzNNxEbkDFdy f308eMk/DSV2nWJ4ZG3tT6zF28h1Zyv9942AhohOdB30UjGrSdUrTInJO X-Gm-Gg: ASbGncvadAF8SUJn3fncw502IuxL9W2q0xSEJ7uM7+MVDh9g+3qAhoR/+cFUgoJjw4X a8TXf1Wj82e1WyhIfnm8tRHSPQn4AAg3LnC0v5jGgEzYU8TPblHxQSXYLoLqT1cEOoinj0nQNfg yScBigU3M7qudAvGyxwmb/j60m8GCQyh4IOp+0pOpyRyT0Mnr8N3x7yMs+Elw137z3B+IVuQLw8 ztWKY0EqmEPDQ+t1zBPpoFWosmLvxfq5IkD0wofl8q0uNE43rtk1weLu2jDplvLnvzv1D6jUVeO WaTr2+6w/d/biZs/CIc6ZuiISDQHY9g5AdYwwI7a+R3yv5Y43+aq X-Received: by 2002:a17:903:440f:b0:244:5ef0:d258 with SMTP id d9443c01a7336-245ff874e99mr22749915ad.48.1755766064705; Thu, 21 Aug 2025 01:47:44 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEWcGaG7mkLl01PAlHDjQwKo8yhM5cKQHqs5L2UKo3pHfPKllF4MLcn53VgMP72zfhiVQznUw== X-Received: by 2002:a17:903:440f:b0:244:5ef0:d258 with SMTP id d9443c01a7336-245ff874e99mr22749625ad.48.1755766064291; Thu, 21 Aug 2025 01:47:44 -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.47.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Aug 2025 01:47:43 -0700 (PDT) From: Arun Menon Date: Thu, 21 Aug 2025 14:14:12 +0530 Subject: [PATCH v12 18/27] migration: push Error **errp into loadvm_postcopy_ram_handle_discard() MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Message-Id: <20250821-propagate_tpm_error-v12-18-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 X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=4329; i=armenon@redhat.com; h=from:subject:message-id; bh=9iknsY3BCg26MtH4QZ0BkNi4PlMcFCHBWM7DD/Lc7j0=; b=owGbwMvMwCWWVaVqcZPfqI/xtFoSQ8ayOyldi8XMH+s+SFIwmRZX5clVMvfpJEHtnqWv+H0yd DY4Z8t2lLIwiHExyIopsjR8DZBtCiiMiLR9eR1mDisTyBAGLk4BmMhZc0aGT8J+6g3xl9etyPA3 d13QMluaMTJl63NeJ0NXE49WKyVjRob5mcy7biz29yz4FbfpUsfj+etj1U+olJ3uOPxX+mbPL01 mAA== X-Developer-Key: i=armenon@redhat.com; a=openpgp; fpr=80F5501D82507158593DE9D76A7A2538D90F328E Received-SPF: pass client-ip=170.10.133.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_postcopy_ram_handle_discard() must report an error in errp, in case of failure. Reviewed-by: Fabiano Rosas Reviewed-by: Marc-André Lureau Signed-off-by: Arun Menon --- migration/savevm.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/migration/savevm.c b/migration/savevm.c index 348ea9d7e57927c57131e8e747b446c232a9cdf3..c38646d5c3d75c64712561984f6b1df92ad55feb 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2004,7 +2004,7 @@ static int loadvm_postcopy_handle_advise(MigrationIncomingState *mis, * There can be 0..many of these messages, each encoding multiple pages. */ static int loadvm_postcopy_ram_handle_discard(MigrationIncomingState *mis, - uint16_t len) + uint16_t len, Error **errp) { int tmp; char ramid[256]; @@ -2017,6 +2017,7 @@ static int loadvm_postcopy_ram_handle_discard(MigrationIncomingState *mis, /* 1st discard */ tmp = postcopy_ram_prepare_discard(mis); if (tmp) { + error_setg(errp, "Failed to prepare for RAM discard: %d", tmp); return tmp; } break; @@ -2026,8 +2027,9 @@ static int loadvm_postcopy_ram_handle_discard(MigrationIncomingState *mis, break; default: - error_report("CMD_POSTCOPY_RAM_DISCARD in wrong postcopy state (%d)", - ps); + error_setg(errp, + "CMD_POSTCOPY_RAM_DISCARD in wrong postcopy state (%d)", + ps); return -1; } /* We're expecting a @@ -2036,29 +2038,30 @@ static int loadvm_postcopy_ram_handle_discard(MigrationIncomingState *mis, * then at least 1 16 byte chunk */ if (len < (1 + 1 + 1 + 1 + 2 * 8)) { - error_report("CMD_POSTCOPY_RAM_DISCARD invalid length (%d)", len); + error_setg(errp, "CMD_POSTCOPY_RAM_DISCARD invalid length (%d)", len); return -1; } tmp = qemu_get_byte(mis->from_src_file); if (tmp != postcopy_ram_discard_version) { - error_report("CMD_POSTCOPY_RAM_DISCARD invalid version (%d)", tmp); + error_setg(errp, "CMD_POSTCOPY_RAM_DISCARD invalid version (%d)", tmp); return -1; } if (!qemu_get_counted_string(mis->from_src_file, ramid)) { - error_report("CMD_POSTCOPY_RAM_DISCARD Failed to read RAMBlock ID"); + error_setg(errp, + "CMD_POSTCOPY_RAM_DISCARD Failed to read RAMBlock ID"); return -1; } tmp = qemu_get_byte(mis->from_src_file); if (tmp != 0) { - error_report("CMD_POSTCOPY_RAM_DISCARD missing nil (%d)", tmp); + error_setg(errp, "CMD_POSTCOPY_RAM_DISCARD missing nil (%d)", tmp); return -1; } len -= 3 + strlen(ramid); if (len % 16) { - error_report("CMD_POSTCOPY_RAM_DISCARD invalid length (%d)", len); + error_setg(errp, "CMD_POSTCOPY_RAM_DISCARD invalid length (%d)", len); return -1; } trace_loadvm_postcopy_ram_handle_discard_header(ramid, len); @@ -2070,6 +2073,7 @@ static int loadvm_postcopy_ram_handle_discard(MigrationIncomingState *mis, len -= 16; int ret = ram_discard_range(ramid, start_addr, block_length); if (ret) { + error_setg(errp, "Failed to discard RAM range %s: %d", ramid, ret); return ret; } } @@ -2629,11 +2633,7 @@ static int loadvm_process_command(QEMUFile *f, Error **errp) return loadvm_postcopy_handle_run(mis, errp); case MIG_CMD_POSTCOPY_RAM_DISCARD: - ret = loadvm_postcopy_ram_handle_discard(mis, len); - if (ret < 0) { - error_setg(errp, "Failed to load device state command: %d", ret); - } - return ret; + return loadvm_postcopy_ram_handle_discard(mis, len, errp); case MIG_CMD_POSTCOPY_RESUME: loadvm_postcopy_handle_resume(mis); -- 2.50.1