From nobody Wed Feb 11 01:09:24 2026 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=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1683247920; cv=none; d=zohomail.com; s=zohoarc; b=Txffn+sUmpKhAAIw6v/WGJLDO6tULtkkVt0v0mPeA2TR5oyRSQZjFy4xexVhDh7lzlTPNeNikMJGSaQ3s5V4NwuXEdEOikc3lbQ0FkfaNp27SaQtqK41vMSB+qs6jhx4IHHRyv1fP5oBpOTCzGide/0vvv4oxGhSEoEPfG/y84o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1683247920; 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=s9CNUZXatzlFdaclSBdpejKOWg2kyZoK+ax00G7wKek=; b=WlcmyraBZWAAmpfBiCLNdHQF4sln+JIaSbvVf6Ug0q0oFDmiPTID+uNi3ICZzsLi0EyIBekBnKQ7s/e4vgd3jaYiZcZIHo0inPwOgU7uHtTLltOhAVTl7jfJMyPtMIcp5zxjlz5Y/ciVsfcQsqcHR+b4Jgt5O3Ev+dqoDoQP8gA= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1683247920347536.3961945929544; Thu, 4 May 2023 17:52:00 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pujcl-0004Cm-MQ; Thu, 04 May 2023 20:48:39 -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 1pujcj-00049c-0j for qemu-devel@nongnu.org; Thu, 04 May 2023 20:48:37 -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 1pujch-0001Fg-Lw for qemu-devel@nongnu.org; Thu, 04 May 2023 20:48:36 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-283-vH3h913wMTqnYZtjwWfvBQ-1; Thu, 04 May 2023 20:48:31 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9BC6B85A588; Fri, 5 May 2023 00:48:30 +0000 (UTC) Received: from secure.mitica (unknown [10.39.193.236]) by smtp.corp.redhat.com (Postfix) with ESMTP id DCAB1404B24D; Fri, 5 May 2023 00:48:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1683247714; 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=s9CNUZXatzlFdaclSBdpejKOWg2kyZoK+ax00G7wKek=; b=VP1LqEQzYCX+YqTQcT/W9eMCJnX9OcJEAtWN0TVB26+s8nG+y2cNuqsLcVgYWFWA2excgV 2Fc7dye2yWjUQP8tulUYPZ8sDaIy2OKUd001Sx6yndfXwaOCH52YUSnN4tIgvG3nQPCU1S zW0bHrrLHgLCUuMg1A0dpAocZ5nYOwk= X-MC-Unique: vH3h913wMTqnYZtjwWfvBQ-1 From: Juan Quintela To: qemu-devel@nongnu.org Cc: Eric Blake , Vladimir Sementsov-Ogievskiy , Stefan Hajnoczi , John Snow , Juan Quintela , qemu-block@nongnu.org, Leonardo Bras , Fam Zheng , Peter Xu , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= Subject: [PULL 07/16] migration/rdma: simplify ram_control_load_hook() Date: Fri, 5 May 2023 02:48:03 +0200 Message-Id: <20230505004812.31583-8-quintela@redhat.com> In-Reply-To: <20230505004812.31583-1-quintela@redhat.com> References: <20230505004812.31583-1-quintela@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 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=quintela@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.161, 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_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1683247921342100003 Signed-off-by: Juan Quintela Reviewed-by: Daniel P. Berrang=C3=A9 Message-Id: <20230504114443.23891-3-quintela@redhat.com> --- migration/qemu-file.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/migration/qemu-file.c b/migration/qemu-file.c index ee04240a21..b7afc8d498 100644 --- a/migration/qemu-file.c +++ b/migration/qemu-file.c @@ -340,10 +340,8 @@ void ram_control_after_iterate(QEMUFile *f, uint64_t f= lags) =20 void ram_control_load_hook(QEMUFile *f, uint64_t flags, void *data) { - int ret =3D -EINVAL; - if (f->hooks && f->hooks->hook_ram_load) { - ret =3D f->hooks->hook_ram_load(f, flags, data); + int ret =3D f->hooks->hook_ram_load(f, flags, data); if (ret < 0) { qemu_file_set_error(f, ret); } @@ -353,7 +351,7 @@ void ram_control_load_hook(QEMUFile *f, uint64_t flags,= void *data) * that expects there to be a hook on the destination. */ if (flags =3D=3D RAM_CONTROL_HOOK) { - qemu_file_set_error(f, ret); + qemu_file_set_error(f, -EINVAL); } } } --=20 2.40.0