From nobody Sun Sep 28 16:33:55 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=1756570208; cv=none; d=zohomail.com; s=zohoarc; b=m2Z9B5RMENxHG3Jptc1QlU8HdHlmsDYvJpU19Lp8wsopkfznRERbPQ+0/QABI7ZOtgWtaM+kj9wfavKxMH+KITXUuRrwMz8ZTh8G3GMUAzieeHgcX5gv10li/U0F5uHj/GZH/cU083rW42/HLwJEgeVmuLEgSko5JM5SdIMMAQA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1756570208; 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=gj+j75kbzZRr8WyC+CT6yCwQ+uVU6b0xjRbHU07xHqI=; b=ilNvvleI0Zk97c+ITHHNkAoNlvaZmq9ZKxZ9L9LV7EX1rrELDrZZv/2huvJk/TvKF8Fom1iKOeafgqkMvfVrExjOYSy3K00QfzjrtsM9D+0ROLvcG+DA5TeH9c0pvy/5Xw7ct7vP7yEbfVsYmDT4hJyYY0sYemLhjb9Y6noUA0g= 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 1756570208583864.8132221788147; Sat, 30 Aug 2025 09:10:08 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1usNfA-0005vu-Ss; Sat, 30 Aug 2025 11:38:44 -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 1us5N2-0006JD-VN for qemu-devel@nongnu.org; Fri, 29 Aug 2025 16:06:48 -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 1us5N1-0005Ab-9g for qemu-devel@nongnu.org; Fri, 29 Aug 2025 16:06:48 -0400 Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-655-FRhV609rMVirrF9GbOw7UA-1; Fri, 29 Aug 2025 16:06:40 -0400 Received: by mail-pl1-f198.google.com with SMTP id d9443c01a7336-2445803f0cfso32575285ad.1 for ; Fri, 29 Aug 2025 13:06:40 -0700 (PDT) Received: from armenon-kvm.bengluru.csb ([49.47.195.108]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-327d8f66f16sm3570543a91.0.2025.08.29.13.06.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Aug 2025 13:06:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1756498006; 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=gj+j75kbzZRr8WyC+CT6yCwQ+uVU6b0xjRbHU07xHqI=; b=Esl9wEhtarYM6tXyJBRZtu2X+lrRTJ2cnW3iUeG+AMPR42pgm0IDI1wJ4+qMZn6WLIvZ3x XApWuwxsb7cnIusjRlofjCfFh4WY2M0ZKaMZcLYDVWvd0H7BxhRwX9nUm6dfKZByDIaNl7 9qYFOJDngSFFNMkhs5OhhdHM9dbi/LM= X-MC-Unique: FRhV609rMVirrF9GbOw7UA-1 X-Mimecast-MFC-AGG-ID: FRhV609rMVirrF9GbOw7UA_1756497999 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1756497999; x=1757102799; 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=gj+j75kbzZRr8WyC+CT6yCwQ+uVU6b0xjRbHU07xHqI=; b=ImRVxA74zhveBsQu+zBzwTh+fDl3dLvBUn7mk02oyCj7duj7hr9cELQKWvRAn1G9t7 W/wsEnhoT2GCzMNVBSDmv0hyrvv1vqUY5bspV5FydvBnuAdDY/eDPNAEEytIzGMRdDNQ uhepkZV84D9epEEnnUYczLGXyFOz6YoRFuk0RvqiQcYqYPyoBIp1kwB39YEHJcKGkw0q XNEqU3Mqn5tP1xs7U+gr0+d82KhiMIUx2aV/P5TFQPcav5cyJLEwrJBdM0sema5Om72A Hr7/KzsXH7cP2fKX97J03yFwKTmGxn4GME4wdGinN49BPZJLkw5jVvP+8jK73Q16Af6k t1Fw== X-Gm-Message-State: AOJu0YxLX2m6E20LAwUIy4EaHhhMPX56yHkloQ+iLUGhbZwaL35ww5wc OWJvj/U+mG6ucqIxi5xLUR/EWZQ3FsUOm3D6W1l9df7Vn7SbWvoq/4Or3AEu0IU9PgKeoiKwj44 4IFAuGTZX7M+fSG+7hHYhLzWvmpX6RZtlwYc5QbL7LGYjnvJJyyhXQtJT X-Gm-Gg: ASbGncsskrsRPAseLGqN3T3JX1vwbbGqC7C6oc1rZ/x53ChSHSjVAbYbxRLZZ1tCxqs IWUA6VHXcr8Vtp9MttunUDyH/a6mK20Dt0ek4gNoV9U5IfjU5cYcRtvec6V/ULPdIXFDTJWey7R nv42SRYhhI9qwuftMNF1JhQROHGVw9+lIfgKC8mjUhveH+Oj4DKUYZPKYFZrWBvwvIZCoh7c1ti Qyz577Qxbeui7rlNTIuuCOniuMG64zHXKxFd/Xt+5DCxrY/eOyH0KOz3vh6H9N0yugHEmRGlNks EeODkTamujIp32UBAEl0VnQhUPzyDLZt6SCwOEc5bmXX16Q9QGwRsw== X-Received: by 2002:a17:903:3d0c:b0:248:f55d:447a with SMTP id d9443c01a7336-248f55d44bfmr95115455ad.3.1756497999119; Fri, 29 Aug 2025 13:06:39 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFh2ZU31P8nEog5eR2YeSUb8M/iP6niwjTYkDYZ34N0QwuJtfh5AbNkf3nThrtGd+RIbPvDmg== X-Received: by 2002:a17:903:3d0c:b0:248:f55d:447a with SMTP id d9443c01a7336-248f55d44bfmr95114845ad.3.1756497998606; Fri, 29 Aug 2025 13:06:38 -0700 (PDT) From: Arun Menon Date: Sat, 30 Aug 2025 01:31:58 +0530 Subject: [PATCH v13 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: quoted-printable Message-Id: <20250830-propagate_tpm_error-v13-18-a4e777b7eb2c@redhat.com> References: <20250830-propagate_tpm_error-v13-0-a4e777b7eb2c@redhat.com> In-Reply-To: <20250830-propagate_tpm_error-v13-0-a4e777b7eb2c@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=r7TvIL4ZIDOkRB8HrM5BHB1nfGTyTk+rEFu7cLDvTA4=; b=owGbwMvMwCWWVaVqcZPfqI/xtFoSQ8Ymdl+9pRd7Gu5xCzmzPdI7v0bo7/rmp5K5R158/cmU5 ZHF+PZxRykLgxgXg6yYIkvD1wDZpoDCiEjbl9dh5rAygQxh4OIUgIns6mL4zSpqyTJjX8CqLtG4 HuW1dY1FVsJLtrryt0efDFi99fbNBQz/Y/pmt2qKpnG8WMTCZahTc7QzW+32jDv1GrfkpuZfFvn BCQA= 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: 1756570210452116600 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=C3=A9 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 3ab20bd3de980ecfd79ab29697e3e1527ab3e73c..01cc186b9e0324053e804c4fede= bee02d8df4052 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2004,7 +2004,7 @@ static int loadvm_postcopy_handle_advise(MigrationInc= omingState *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(Migrati= onIncomingState *mis, /* 1st discard */ tmp =3D 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(Migrati= onIncomingState *mis, break; =20 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(Migra= tionIncomingState *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)", l= en); return -1; } =20 tmp =3D qemu_get_byte(mis->from_src_file); if (tmp !=3D 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; } =20 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 =3D qemu_get_byte(mis->from_src_file); if (tmp !=3D 0) { - error_report("CMD_POSTCOPY_RAM_DISCARD missing nil (%d)", tmp); + error_setg(errp, "CMD_POSTCOPY_RAM_DISCARD missing nil (%d)", tmp); return -1; } =20 len -=3D 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)", l= en); return -1; } trace_loadvm_postcopy_ram_handle_discard_header(ramid, len); @@ -2070,6 +2073,7 @@ static int loadvm_postcopy_ram_handle_discard(Migrati= onIncomingState *mis, len -=3D 16; int ret =3D 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); =20 case MIG_CMD_POSTCOPY_RAM_DISCARD: - ret =3D loadvm_postcopy_ram_handle_discard(mis, len); - if (ret < 0) { - error_setg(errp, "Failed to load device state command: %d", re= t); - } - return ret; + return loadvm_postcopy_ram_handle_discard(mis, len, errp); =20 case MIG_CMD_POSTCOPY_RESUME: loadvm_postcopy_handle_resume(mis); --=20 2.51.0