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 C7C37CAC5B9 for ; Tue, 30 Sep 2025 04:28:49 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v3RrI-0004qw-VO; Tue, 30 Sep 2025 00:21: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 1v3Rqw-0004T8-J8 for qemu-arm@nongnu.org; Tue, 30 Sep 2025 00:20:39 -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 1v3Rqi-0002hG-R7 for qemu-arm@nongnu.org; Tue, 30 Sep 2025 00:20:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1759206014; 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=psSpiDH4kV8Bgi2nzWMvb0l33iY5a0fe+4eRM75ZEmA=; b=CII7inbCLlqldHgYF5iPTtKPn/kAECVBuBS7UKfQrl3/KvW9JTkln+yXKSFevebvQwzdW+ A7FsoNycUScE+qMxdLng8+CxtgbuvavkJ91KqJkYTSeFG2KXQ3oe7hv8peZkSztIZoaJtP 2GoJ7JByCBrXMt3Pp3OcxNcxR7ro+EY= 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-92-BMIYuCiJOG2E5RsP40hnZw-1; Tue, 30 Sep 2025 00:20:12 -0400 X-MC-Unique: BMIYuCiJOG2E5RsP40hnZw-1 X-Mimecast-MFC-AGG-ID: BMIYuCiJOG2E5RsP40hnZw_1759206011 Received: by mail-pl1-f198.google.com with SMTP id d9443c01a7336-2697410e7f9so118541405ad.2 for ; Mon, 29 Sep 2025 21:20:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759206011; x=1759810811; 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=psSpiDH4kV8Bgi2nzWMvb0l33iY5a0fe+4eRM75ZEmA=; b=HIR074UmqGIrfm3DOC4A5Y27XN8D5flp5eossbyhCR38Qo3l56MbGhxRQbQfRz1z1e G4REk3Ex4lrb7ge9bFTNaJH17qbGjKuN78DRZ7hn7/gNOinoq0LvZFIDp9hifB0iBv9o LiaU0pRbztOG5at6ST0yrE5quf29kO6zd7a/XG8g7gZ97Jzrf3DnlZYQ+LkETp44Xx+3 nNi2bNw2w2O9FlFT0Qzwf9vg9c9rDu4BTMLeWgB13nA7Btk0YAUkQmeIR49aVlV6AZUk psgQTlvVbefPiPTg8ngDurkqSIMEm7O/AI1JMS9HPM0L/iFJw2nklA1UWDcQe5TWXhX4 b3Pg== X-Forwarded-Encrypted: i=1; AJvYcCXbH2ZbSdzWVF4YKYUOCQU+MTsN5djAl8CX+qrEF6L7s0E41rFcY2csw6UFCUqypvG/QeQLIr/upA==@nongnu.org X-Gm-Message-State: AOJu0Ywk2Raz+G/umAqbNPfyd1FcAfTlpfHVGCvgrdYON8GNVCcn6fx6 D/57xquF9Qe+I0UYwUYomJfBVGgNH/Eo0ATSCVuUeA9Vdf/1qizuzAao5U+e1FMq9I/JHrpSJ/e K3JSarM71FOPsFOgBP4RjDvHvvA6K1mGo6toS7ZpOfUIyoMECtTDtMg== X-Gm-Gg: ASbGncuAKnJqZvKWiwnJK+5kmRVqQSS0G4EUq3Qst4pKdMoI8DzlRmSB4r7m1cIjY9o DZj6OlSz2kKGyrYPhDfIsDTgOAzevB9r+r+X5qcwbSYCNaedtwZCZM0qtEWS4KavYDEmjNzKpYT E0Ryhr+e+x+pEzCcwPeTmpa87CDpzqY4jbgQDd/EcgZ5kNEE83aJtqzZaYIkAuflkuHXYXC0mpD rw/r/kG7AvDO8n/dyjXY/4DM9NH84KJk4SpwuNRyVUzf+XkuwjOA35bZSwLPUbys9W/tuZ8Yd2f VQ1WlTkfCeijt/mwwvIItT49BMV+s23gnEIxOyqudjrsG1kRxFsNiFKRwQ== X-Received: by 2002:a17:903:22c5:b0:24f:dbe7:73a2 with SMTP id d9443c01a7336-27ed4a3d5e5mr218686715ad.31.1759206011307; Mon, 29 Sep 2025 21:20:11 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEuALdhjz7oHDH3HHWoJGXIYjTO1TVJkPSW71ODNeEaT0jLk2J2flj6ZQTOCktdXhCNxon3JA== X-Received: by 2002:a17:903:22c5:b0:24f:dbe7:73a2 with SMTP id d9443c01a7336-27ed4a3d5e5mr218686395ad.31.1759206010958; Mon, 29 Sep 2025 21:20:10 -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.20.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Sep 2025 21:20:10 -0700 (PDT) From: Arun Menon Date: Tue, 30 Sep 2025 09:48:19 +0530 Subject: [PATCH v15 10/26] migration: push Error **errp into qemu_loadvm_section_start_full() MIME-Version: 1.0 Message-Id: <20250930-propagate_tpm_error-v15-10-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=4901; i=armenon@redhat.com; h=from:subject:message-id; bh=XCbvGGwXhkjJZmvdOEAYFgx2kzoPSMf9LtiyEklMnvA=; b=owGbwMvMwCWWVaVqcZPfqI/xtFoSQ8btKMHNzqtVdxuGHOXzX/gwrbVaqffD31/NHX9WRDy70 BwRYhvVUcrCIMbFICumyNLwNUC2KaAwItL25XWYOaxMIEMYuDgFYCIK7xgZdtjMNw/Qu3+xp0j3 V0HRhIlLnt6d6KP5nMPv8fSt12rmbGH4XyT7W8dP+39cWfmPE9y/bhmvqwzYHTn7j9dB5olhE9b /YQQA X-Developer-Key: i=armenon@redhat.com; a=openpgp; fpr=80F5501D82507158593DE9D76A7A2538D90F328E X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: ebbqH-QAGIGd4a9pVVbwY7ODOF25kdcXfiGp_rz3XJ4_1759206011 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit 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: -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_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-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 qemu_loadvm_section_start_full() must report an error in errp, in case of failure. 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 | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/migration/savevm.c b/migration/savevm.c index f1338f5cf6d983c73ce8388c7f899b45fd3980aa..83d8fb8f4144fd54fa7970eadc81444d38437659 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2722,21 +2722,21 @@ static bool check_section_footer(QEMUFile *f, SaveStateEntry *se) } static int -qemu_loadvm_section_start_full(QEMUFile *f, uint8_t type) +qemu_loadvm_section_start_full(QEMUFile *f, uint8_t type, Error **errp) { + ERRP_GUARD(); bool trace_downtime = (type == QEMU_VM_SECTION_FULL); uint32_t instance_id, version_id, section_id; int64_t start_ts, end_ts; SaveStateEntry *se; char idstr[256]; int ret; - Error *local_err = NULL; /* Read section start */ section_id = qemu_get_be32(f); if (!qemu_get_counted_string(f, idstr)) { - error_report("Unable to read ID string for section %u", - section_id); + error_setg(errp, "Unable to read ID string for section %u", + section_id); return -EINVAL; } instance_id = qemu_get_be32(f); @@ -2744,8 +2744,7 @@ qemu_loadvm_section_start_full(QEMUFile *f, uint8_t type) ret = qemu_file_get_error(f); if (ret) { - error_report("%s: Failed to read instance/version ID: %d", - __func__, ret); + error_setg(errp, "Failed to read instance/version ID: %d", ret); return ret; } @@ -2754,17 +2753,17 @@ qemu_loadvm_section_start_full(QEMUFile *f, uint8_t type) /* Find savevm section */ se = find_se(idstr, instance_id); if (se == NULL) { - error_report("Unknown savevm section or instance '%s' %"PRIu32". " - "Make sure that your current VM setup matches your " - "saved VM setup, including any hotplugged devices", - idstr, instance_id); + error_setg(errp, "Unknown section or instance '%s' %"PRIu32". " + "Make sure that your current VM setup matches your " + "saved VM setup, including any hotplugged devices", + idstr, instance_id); return -EINVAL; } /* Validate version */ if (version_id > se->version_id) { - error_report("savevm: unsupported version %d for '%s' v%d", - version_id, idstr, se->version_id); + error_setg(errp, "unsupported version %d for '%s' v%d", + version_id, idstr, se->version_id); return -EINVAL; } se->load_version_id = version_id; @@ -2772,7 +2771,7 @@ qemu_loadvm_section_start_full(QEMUFile *f, uint8_t type) /* Validate if it is a device's state */ if (xen_enabled() && se->is_ram) { - error_report("loadvm: %s RAM loading not allowed on Xen", idstr); + error_setg(errp, "loadvm: %s RAM loading not allowed on Xen", idstr); return -EINVAL; } @@ -2780,11 +2779,11 @@ qemu_loadvm_section_start_full(QEMUFile *f, uint8_t type) start_ts = qemu_clock_get_us(QEMU_CLOCK_REALTIME); } - ret = vmstate_load(f, se, &local_err); + ret = vmstate_load(f, se, errp); if (ret < 0) { - error_report("error while loading state for instance 0x%"PRIx32" of" - " device '%s'", instance_id, idstr); - error_report_err(local_err); + error_prepend(errp, + "error while loading state for instance 0x%"PRIx32" of" + " device '%s': ", instance_id, idstr); return ret; } @@ -2795,6 +2794,8 @@ qemu_loadvm_section_start_full(QEMUFile *f, uint8_t type) } if (!check_section_footer(f, se)) { + error_setg(errp, "Section footer error, section_id: %d", + section_id); return -EINVAL; } @@ -3100,7 +3101,7 @@ retry: switch (section_type) { case QEMU_VM_SECTION_START: case QEMU_VM_SECTION_FULL: - ret = qemu_loadvm_section_start_full(f, section_type); + ret = qemu_loadvm_section_start_full(f, section_type, errp); if (ret < 0) { goto out; } -- 2.51.0