From nobody Sun Feb 8 20:12:47 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1612462432; cv=none; d=zohomail.com; s=zohoarc; b=XEgMBvJaOBNztdd9iE5RrVH3HyZe1YoMya/2TyPfsEnrbxNd+0B7aNhnBf6l5n/Mjz7JJS+oteZNEI/6DDA2Z040cqFe8dTICMROo24JliVrO7hBsNJ8c+O4tsaUj6LG8tArGpbVtYyMHWgcXqDgIC0+Q45HiNWBAsVzHV3dPAA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612462432; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=5I0JoPIFAE4pIArB3WQSq5OJU/80mSf2HtxpzVX0jJY=; b=dloqsoVB9+lpXJ/7RAkjL/NIcgZufqAMTwXcZZ2nSofQ0ggmhJEYsi8GW+zR108p9xXOv60VMpRyrYV0w5FhoWAlwUhN6L2nd2MHNeTmNAoVuR/RIytz6tV2ICK9BKjti9BLswtWChqWyByFqOgfBtU2B5YrZElqhZbEn5Zk4uE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1612462432665823.2811708963393; Thu, 4 Feb 2021 10:13:52 -0800 (PST) Received: from localhost ([::1]:38994 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l7j8Z-0006HH-Hb for importer@patchew.org; Thu, 04 Feb 2021 13:13:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50238) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l7iIF-0007oT-Rp for qemu-devel@nongnu.org; Thu, 04 Feb 2021 12:19:47 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:24437) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l7iIE-0005Wo-4n for qemu-devel@nongnu.org; Thu, 04 Feb 2021 12:19:47 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-6-FrI1HanwPMWS5HF5FdeeXg-1; Thu, 04 Feb 2021 12:19:43 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 68CE8835E23; Thu, 4 Feb 2021 17:19:42 +0000 (UTC) Received: from localhost.localdomain.com (ovpn-112-221.ams2.redhat.com [10.36.112.221]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4430260DA1; Thu, 4 Feb 2021 17:19:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612459185; 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=5I0JoPIFAE4pIArB3WQSq5OJU/80mSf2HtxpzVX0jJY=; b=KH2lURiMgaIxVK609J+1opInKYXtmgh03Je8z/4kCDN3k0RzQ1WoEUUR6Jexig0Nnb0b2g 2j7lLMP89q+ZFIu3tlOZso5ewsEfxuOfS5hzF0xChjx2BxZv4tMRmrotQ44nHIKAgvalnv TXyy2Y9KejJom1PzXZN65jJU2YwsbOo= X-MC-Unique: FrI1HanwPMWS5HF5FdeeXg-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 15/33] migration: make loadvm_postcopy_handle_resume() void Date: Thu, 4 Feb 2021 17:18:49 +0000 Message-Id: <20210204171907.901471-16-berrange@redhat.com> In-Reply-To: <20210204171907.901471-1-berrange@redhat.com> References: <20210204171907.901471-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=berrange@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.351, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Juan Quintela , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , "Dr. David Alan Gilbert" , Hailiang Zhang Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) This is an incremental step in converting vmstate loading code to report via Error objects instead of printing directly to the console/monitor. Signed-off-by: Daniel P. Berrang=C3=A9 --- migration/savevm.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/migration/savevm.c b/migration/savevm.c index 2216c61c6f..041175162a 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -2067,12 +2067,12 @@ static void migrate_send_rp_req_pages_pending(Migra= tionIncomingState *mis) } } =20 -static int loadvm_postcopy_handle_resume(MigrationIncomingState *mis) +static void loadvm_postcopy_handle_resume(MigrationIncomingState *mis) { if (mis->state !=3D MIGRATION_STATUS_POSTCOPY_RECOVER) { error_report("%s: illegal resume received", __func__); /* Don't fail the load, only for this. */ - return 0; + return; } =20 /* @@ -2113,8 +2113,6 @@ static int loadvm_postcopy_handle_resume(MigrationInc= omingState *mis) * migrate_send_rp_message_req_pages() is not thread safe, yet. */ qemu_sem_post(&mis->postcopy_pause_sem_fault); - - return 0; } =20 /** @@ -2302,12 +2300,8 @@ static int loadvm_process_command(QEMUFile *f, Error= **errp) return loadvm_postcopy_ram_handle_discard(mis, len, errp); =20 case MIG_CMD_POSTCOPY_RESUME: - ret =3D loadvm_postcopy_handle_resume(mis); - if (ret < 0) { - error_setg(errp, "Failed to load device state command: %d", re= t); - return -1; - } - return ret; + loadvm_postcopy_handle_resume(mis); + return 0; =20 case MIG_CMD_RECV_BITMAP: ret =3D loadvm_handle_recv_bitmap(mis, len); --=20 2.29.2