From nobody Tue Dec 16 03:44:24 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=1754419045; cv=none; d=zohomail.com; s=zohoarc; b=ALz4Jl1mQCeWQ2busdIHRD4Z1Y6gvRXOxuJbQ7D7+c9FLoE2Eh1jif6mVx/pDAPKgNCBoBgy/jgoe7egMdTtBV0O9L0yo1NwJc7viPXBWuPAFGhLYgd1FizMpYpobKz+3WalxjUaZ0EZ8kwEDQiFZilJYRH1Cv1SaQEBN4LGPUk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1754419045; 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=/D+LRx8DgN32RC9NWwi8CDlFXsyOxe/yuFJHVT2GAeQ=; b=AbuRwoYAe6TyrPApqAS4y09anMKTtTOYrx+GiUdRf9SaGiw6/SviUUlG+QLtu9HJaFEthJ4Vob6fy4p63dcbiWkkXNEwLcVgzmlYWgD3/peIroppZBP8/V6wpgUrrotQmcdMGLoskSw5tcv4lLyqqW5JXyTR+tKe26f7A2zmDrg= 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 1754419045063518.7918995172182; Tue, 5 Aug 2025 11:37:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ujMWV-0008H8-Qr; Tue, 05 Aug 2025 14:36:31 -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 1ujMVO-0002SN-R4 for qemu-devel@nongnu.org; Tue, 05 Aug 2025 14:35:22 -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 1ujMQp-0004YM-Kf for qemu-devel@nongnu.org; Tue, 05 Aug 2025 14:30:42 -0400 Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-570-egoT8SNFNcGgBWLe9-kNEw-1; Tue, 05 Aug 2025 14:30:38 -0400 Received: by mail-pl1-f200.google.com with SMTP id d9443c01a7336-2405fdb7c15so83992215ad.0 for ; Tue, 05 Aug 2025 11:30:37 -0700 (PDT) Received: from armenon-kvm.bengluru.csb ([49.36.99.3]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-241d1f0e585sm139200115ad.40.2025.08.05.11.30.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Aug 2025 11:30:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1754418639; 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=/D+LRx8DgN32RC9NWwi8CDlFXsyOxe/yuFJHVT2GAeQ=; b=fXlqzZLTk2q4HbLeQDUhm9PyCF8HdsSocmSlCo8rY3LL45yFhBw6wqNRXIkp8SuiIMxLmx vRPCf8Xc6vHRhPjT/CQ/IXMkgZtqav+d6nMvCBQzThpsXr7+pxhx7VvrM0uM7cT0D5+4jP 57ONPrzZSaT9sk7ntknTjcvFsd3GAfY= X-MC-Unique: egoT8SNFNcGgBWLe9-kNEw-1 X-Mimecast-MFC-AGG-ID: egoT8SNFNcGgBWLe9-kNEw_1754418637 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754418637; x=1755023437; 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=/D+LRx8DgN32RC9NWwi8CDlFXsyOxe/yuFJHVT2GAeQ=; b=a4zSpDh1hd9IyydPGztAVti/h/9kqq+Ney231l7vuL8Q9bmwmixbj3aOp92mwnoBaz gu/kzSYF2BobBwVKb6Q36hR/KAYcc75g+HclZ0EDF2XRYuhW9XBDFu+s9Eq4u68C4H8p +ZdNFRyEu+9O6KTCHnW5P8MOOqeosw3j4ElhPlJeK0nHYF7q6Lm2Kh3ST7FT5/SH5OpI o1t2W2+5rQzVf0nsCrmPXG2NZw+GWYf6ODVDATXln3gI+UBbxFHScQoKR9tLOlb/XOUf JNXTuATpvSkgxcV2l+P3aAgq95Bq7SD3Yx++zzxkkZuq6MJvfmLkuxJIkeRmu4JNtzWt hRag== X-Gm-Message-State: AOJu0YwAySD2rWm329bsA35dsdzKHr+mbWPFVbUYXHISd5qYjlNm0Lql HqfnAaWQfbQsIr0cHmvX7erkRt5cnT7VVr19Jii/aY0r1J42ntTXynkWIkr6TJPFeZ3OcMoAp0F hiDcnLt1eJ+9O6kRgtI2/seqIV/JxTxvBoXb/iav+tXpHNv48qZsGpIPU X-Gm-Gg: ASbGncsvgDfwjxiQaDRgN5OARNYdn/Kl0BnGg/9FNAukyXozNfmCn1gEh28riyYkhzz uwE1PvcDOolIqzA844Fikyt1L158ecRIdf/l7ba49Jm8LqmhjRfv7uRAT+wVD00hI0gZrIb4Tcp PsRsrjIQ1gfDL3mBjXG179xWTBaiU0IEhYopMNnO+M/vWLecRraQ0i5ljOMvRokEJX48dJ7d6kj bCMEfigJfAnWQ8G6Z/NENr/flYMX3yjRsZ47p6gp8UhBvN5X5aXwBj2rhAIa1kEMaNqK4Wq6YJh l3tTI8zbelj06hs+FR7XXUOdE3xAVbXfWDzSruqRHvCJh4bWFg== X-Received: by 2002:a17:903:ad0:b0:240:8ec:fe2 with SMTP id d9443c01a7336-2429f2f5609mr1324175ad.4.1754418636626; Tue, 05 Aug 2025 11:30:36 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGlf/R3oR3aVhuy0kmkBQvWkFIRiBl7En0K67zgezGfHJOPekhnauwULPasv0DY1y48n9SZqQ== X-Received: by 2002:a17:903:ad0:b0:240:8ec:fe2 with SMTP id d9443c01a7336-2429f2f5609mr1323685ad.4.1754418636257; Tue, 05 Aug 2025 11:30:36 -0700 (PDT) From: Arun Menon Date: Tue, 05 Aug 2025 23:55:25 +0530 Subject: [PATCH v9 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: <20250805-propagate_tpm_error-v9-18-123450810db7@redhat.com> References: <20250805-propagate_tpm_error-v9-0-123450810db7@redhat.com> In-Reply-To: <20250805-propagate_tpm_error-v9-0-123450810db7@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 , Arun Menon X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=4220; i=armenon@redhat.com; h=from:subject:message-id; bh=9DYN67BBT1IJrMGRtQvdCpvnr09HwM/uq78YW1KOy+0=; b=owGbwMvMwCWWVaVqcZPfqI/xtFoSQ8YkX5mdr/5s8MzOeBPwIsJiwR/VM+KClbWtKXGVH5dcX hE2919LRykLgxgXg6yYIkvD1wDZpoDCiEjbl9dh5rAygQxh4OIUgIlwSDMyTF9msrvmVq78wWXR 6o2+Vcl/7K6tUnZbV5PQ9c/VpHR5MyPD4eQf87bOFZz99/OMM149jTd+W/ezRz/XZf2uJco1a9l zZgA= 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.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_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_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: 1754419045956124100 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. 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 eb90873a750ded354b3db31cba40b44d1be79864..3abe4193e02aae9c813ff07fb38= 8a7ee470c8a6a 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.50.1