From nobody Wed Nov 5 18:27:48 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 153601396777954.25577939451318; Mon, 3 Sep 2018 15:32:47 -0700 (PDT) Received: from localhost ([::1]:47191 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fwxOo-0000PE-NS for importer@patchew.org; Mon, 03 Sep 2018 18:32:46 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34314) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fwxKO-0004PW-Ii for qemu-devel@nongnu.org; Mon, 03 Sep 2018 18:28:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fwxKN-0003Ha-Nn for qemu-devel@nongnu.org; Mon, 03 Sep 2018 18:28:12 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:60608 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fwxKN-0003Gm-IN for qemu-devel@nongnu.org; Mon, 03 Sep 2018 18:28:11 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 36D0B4020687; Mon, 3 Sep 2018 22:28:11 +0000 (UTC) Received: from secure.mitica (ovpn-116-187.ams2.redhat.com [10.36.116.187]) by smtp.corp.redhat.com (Postfix) with ESMTP id E6F4FA9E89; Mon, 3 Sep 2018 22:28:09 +0000 (UTC) From: Juan Quintela To: qemu-devel@nongnu.org Date: Tue, 4 Sep 2018 00:27:57 +0200 Message-Id: <20180903222758.13267-5-quintela@redhat.com> In-Reply-To: <20180903222758.13267-1-quintela@redhat.com> References: <20180903222758.13267-1-quintela@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Mon, 03 Sep 2018 22:28:11 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Mon, 03 Sep 2018 22:28:11 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'quintela@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PULL 4/5] migration: handle the error condition properly X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, Xiao Guangrong , dgilbert@redhat.com, peterx@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RDMRC_1 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Xiao Guangrong ram_find_and_save_block() can return negative if any error hanppens, however, it is completely ignored in current code Signed-off-by: Xiao Guangrong Reviewed-by: Juan Quintela Message-Id: <20180903092644.25812-5-xiaoguangrong@tencent.com> Signed-off-by: Juan Quintela --- migration/ram.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/migration/ram.c b/migration/ram.c index 5a54836c28..2add09174d 100644 --- a/migration/ram.c +++ b/migration/ram.c @@ -2372,7 +2372,8 @@ static int ram_save_host_page(RAMState *rs, PageSearc= hStatus *pss, * * Called within an RCU critical section. * - * Returns the number of pages written where zero means no dirty pages + * Returns the number of pages written where zero means no dirty pages, + * or negative on error * * @rs: current RAM state * @last_stage: if we are at the completion stage @@ -3196,6 +3197,12 @@ static int ram_save_iterate(QEMUFile *f, void *opaqu= e) done =3D 1; break; } + + if (pages < 0) { + qemu_file_set_error(f, pages); + break; + } + rs->target_page_count +=3D pages; =20 /* we want to check in the 1st loop, just in case it was the 1st t= ime @@ -3238,7 +3245,7 @@ out: /** * ram_save_complete: function called to send the remaining amount of ram * - * Returns zero to indicate success + * Returns zero to indicate success or negative on error * * Called with iothread lock * @@ -3249,6 +3256,7 @@ static int ram_save_complete(QEMUFile *f, void *opaqu= e) { RAMState **temp =3D opaque; RAMState *rs =3D *temp; + int ret =3D 0; =20 rcu_read_lock(); =20 @@ -3269,6 +3277,10 @@ static int ram_save_complete(QEMUFile *f, void *opaq= ue) if (pages =3D=3D 0) { break; } + if (pages < 0) { + ret =3D pages; + break; + } } =20 flush_compressed_data(rs); @@ -3280,7 +3292,7 @@ static int ram_save_complete(QEMUFile *f, void *opaqu= e) qemu_put_be64(f, RAM_SAVE_FLAG_EOS); qemu_fflush(f); =20 - return 0; + return ret; } =20 static void ram_save_pending(QEMUFile *f, void *opaque, uint64_t max_size, --=20 2.17.1