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 B7191CA0EEB for ; Thu, 21 Aug 2025 08:51:22 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1up0yG-00085Q-1o; Thu, 21 Aug 2025 04:48:32 -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 1up0x6-0004gZ-LV for qemu-devel@nongnu.org; Thu, 21 Aug 2025 04:47:23 -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 1up0wz-0001NB-Pu for qemu-devel@nongnu.org; Thu, 21 Aug 2025 04:47:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1755766027; 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=nlMHYTzuC0OJNbmajsR6kql8v59Nbj5zk+o2AatFeoc=; b=An4eTq2I+SI8x9qm1LLfIOQh1s5ey3LYNVadJ5LotdeDjV2heMVfyCDPYrVwd0DkEqOQCF uRiW/KTf2Ip0BzWNo+erTM166KzyqzKJe4bF/eQlIKh8BqbbNgG/wnaldCkLwKjAVA2rCm JgXRL+HjM/RLkft1Rit/Kwt1zbOLO5A= 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-90-s3nh1zcxMnmIkgUQGOlFSg-1; Thu, 21 Aug 2025 04:47:05 -0400 X-MC-Unique: s3nh1zcxMnmIkgUQGOlFSg-1 X-Mimecast-MFC-AGG-ID: s3nh1zcxMnmIkgUQGOlFSg_1755766024 Received: by mail-pl1-f198.google.com with SMTP id d9443c01a7336-24458121274so9631145ad.2 for ; Thu, 21 Aug 2025 01:47:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755766024; x=1756370824; 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=nlMHYTzuC0OJNbmajsR6kql8v59Nbj5zk+o2AatFeoc=; b=HNwb6ZSxn+I1inJFOlhxAqCT4nTqG5wLjaocpZMjhihjuISb+HNS0U7Wkb41X79yXn hutw1a1SSwKxZOFcmSdNiDrHvB64WlMBN35UYhQqZWBnZOu00fSmPc7QbXa8GCDRX/lN +uXvWi6HlVlXCBPI69gzQ5Ub39Hx0V3WEdxYcb/UYAc+cT0rZo5U5wi5iaQCA+Nvx/7J LmhqSmADaSSjGQ1xvDNZBaxz1Yd1oEIyOjLlKYVxytC0PmvNk/IB2/PujAHtRZgQRh8/ EcLBQUsga/fe7KuqHOXcaojYVDIGagJSJMWtDNHyvqBykAP0NsPdYoxkVw16593yf6ps VPkg== X-Gm-Message-State: AOJu0YxbI3IHA7L1VaxJGsUC1Y2QrLDJruUoqxBTlgQDswkE58OBVQi9 ofSxjHGt8ughX6Yv+vuPRqGI9RLn80+MmaHMRsm8BzCSEfD/CBPIw1B74b1MIg4aHXPXuUQ9iOR ry69laONM+r7Z02R2LI6t4wZuRZrfIJoovDtW/3NMf9PUq1SB8tvJAzkE X-Gm-Gg: ASbGncslHImk/dXfGMsYDOy8aVv7Td3uoIWzqe7cRBYp4ytIFI7MR3GMsr2UQZf33dh HQLOkyL5vSUtPZIUE5gFjGRmPVKYGHiddDOI0/tYxiAaHp8VNU3qQjhpKsxXvtbh4iQkx3PDL2Q aDpcSVfmsilRjrlNvzJKdhYJdr/ev5i9BBK8UMMi6KgF/KEnMSK4nmNfaIDwNkxkDiWhWMwKZXR UCOjBKTryxiZFayHWIlVglw3uuAWgnARt9K5CyZ2sT0zm6aUp7fPyvTNCv2f/BIytQVVHdEY460 doRWlmwgIfBlqltk7RDMfoDVuxUUAklVd/AdVa/mn97o8E1lOk0C X-Received: by 2002:a17:902:c942:b0:234:ba37:87ae with SMTP id d9443c01a7336-245febefa70mr23076785ad.4.1755766024413; Thu, 21 Aug 2025 01:47:04 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGzUglKEWC2d7VXmkQ+cuWP6XoL5D9VThNiuRuRV62zSz5khkWbAMy17K7BLi+RGwEoVzddUQ== X-Received: by 2002:a17:902:c942:b0:234:ba37:87ae with SMTP id d9443c01a7336-245febefa70mr23076465ad.4.1755766024008; Thu, 21 Aug 2025 01:47:04 -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.46.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Aug 2025 01:47:03 -0700 (PDT) From: Arun Menon Date: Thu, 21 Aug 2025 14:14:08 +0530 Subject: [PATCH v12 14/27] migration: push Error **errp into ram_postcopy_incoming_init() MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Message-Id: <20250821-propagate_tpm_error-v12-14-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=4806; i=armenon@redhat.com; h=from:subject:message-id; bh=EabNSGRQLm6cwS6/ht6Yf7DNHZhUD2jPEfZ+gH5fQEk=; b=owGbwMvMwCWWVaVqcZPfqI/xtFoSQ8ayOylbqy+8/JUicMno1ydpAX7fFNWqsN/qci91mBdmc 26uMLzXUcrCIMbFICumyNLwNUC2KaAwItL25XWYOaxMIEMYuDgFYCIXRBn+JxYs0LFe+bCOe1ns jizHxgfuZ9a0f6vcHrcyVZRBa4dDMyPDnyRtgVjfWWpbn82P5F7y5t87pcLF32TY+cVmblvGqSr IDAA= 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_PASS=-0.001, T_SPF_HELO_TEMPERROR=0.01 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+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 ram_postcopy_incoming_init() 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/postcopy-ram.c | 9 ++++++--- migration/postcopy-ram.h | 2 +- migration/ram.c | 4 ++-- migration/ram.h | 2 +- migration/savevm.c | 2 +- 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/migration/postcopy-ram.c b/migration/postcopy-ram.c index 45af9a361e8eacaad0fb217a5da2c5004416c1da..05617e5fbcad62226a54fe17d9f7d9a316baf1e4 100644 --- a/migration/postcopy-ram.c +++ b/migration/postcopy-ram.c @@ -681,6 +681,7 @@ out: */ static int init_range(RAMBlock *rb, void *opaque) { + Error **errp = opaque; const char *block_name = qemu_ram_get_idstr(rb); void *host_addr = qemu_ram_get_host_addr(rb); ram_addr_t offset = qemu_ram_get_offset(rb); @@ -701,6 +702,8 @@ static int init_range(RAMBlock *rb, void *opaque) * (Precopy will just overwrite this data, so doesn't need the discard) */ if (ram_discard_range(block_name, 0, length)) { + error_setg(errp, "failed to discard RAM block %s len=%zu", + block_name, length); return -1; } @@ -749,9 +752,9 @@ static int cleanup_range(RAMBlock *rb, void *opaque) * postcopy later; must be called prior to any precopy. * called from arch_init's similarly named ram_postcopy_incoming_init */ -int postcopy_ram_incoming_init(MigrationIncomingState *mis) +int postcopy_ram_incoming_init(MigrationIncomingState *mis, Error **errp) { - if (foreach_not_ignored_block(init_range, NULL)) { + if (foreach_not_ignored_block(init_range, errp)) { return -1; } @@ -1703,7 +1706,7 @@ bool postcopy_ram_supported_by_host(MigrationIncomingState *mis, Error **errp) return false; } -int postcopy_ram_incoming_init(MigrationIncomingState *mis) +int postcopy_ram_incoming_init(MigrationIncomingState *mis, Error **errp) { error_report("postcopy_ram_incoming_init: No OS support"); return -1; diff --git a/migration/postcopy-ram.h b/migration/postcopy-ram.h index 3852141d7e37ab18bada4b46c137fef0969d0070..ca19433b246893fa5105bcebffb442c58a9a4f48 100644 --- a/migration/postcopy-ram.h +++ b/migration/postcopy-ram.h @@ -30,7 +30,7 @@ int postcopy_ram_incoming_setup(MigrationIncomingState *mis); * postcopy later; must be called prior to any precopy. * called from ram.c's similarly named ram_postcopy_incoming_init */ -int postcopy_ram_incoming_init(MigrationIncomingState *mis); +int postcopy_ram_incoming_init(MigrationIncomingState *mis, Error **errp); /* * At the end of a migration where postcopy_ram_incoming_init was called. diff --git a/migration/ram.c b/migration/ram.c index 7208bc114fb5c366740db380ee6956a91b3871a0..6a0dcc04f436524a37672c41c38f201f06773374 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -3716,9 +3716,9 @@ static int ram_load_cleanup(void *opaque) * postcopy-ram. postcopy-ram's similarly names * postcopy_ram_incoming_init does the work. */ -int ram_postcopy_incoming_init(MigrationIncomingState *mis) +int ram_postcopy_incoming_init(MigrationIncomingState *mis, Error **errp) { - return postcopy_ram_incoming_init(mis); + return postcopy_ram_incoming_init(mis, errp); } /** diff --git a/migration/ram.h b/migration/ram.h index 921c39a2c5c45bc2344be80854c46e4c10c09aeb..275709a99187f9429ccb4111e05281ec268ba0db 100644 --- a/migration/ram.h +++ b/migration/ram.h @@ -86,7 +86,7 @@ void ram_postcopy_migrated_memory_release(MigrationState *ms); void ram_postcopy_send_discard_bitmap(MigrationState *ms); /* For incoming postcopy discard */ int ram_discard_range(const char *block_name, uint64_t start, size_t length); -int ram_postcopy_incoming_init(MigrationIncomingState *mis); +int ram_postcopy_incoming_init(MigrationIncomingState *mis, Error **errp); int ram_load_postcopy(QEMUFile *f, int channel); void ram_handle_zero(void *host, uint64_t size); diff --git a/migration/savevm.c b/migration/savevm.c index f13fecb5cc4778974c883fbbc007b0cd18d90e64..e65b9b57a7458d29956604da034f4c80b3bec3d3 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -1989,7 +1989,7 @@ static int loadvm_postcopy_handle_advise(MigrationIncomingState *mis, return -1; } - if (ram_postcopy_incoming_init(mis)) { + if (ram_postcopy_incoming_init(mis, NULL) < 0) { return -1; } -- 2.50.1