From mboxrd@z Thu Jan 1 00:00:00 1970 From: Eric Auger Subject: [PATCH 1/9] KVM: arm/arm64: vgic-its: fix return value for restore Date: Mon, 25 Sep 2017 15:34:30 +0200 Message-ID: <1506346478-1631-2-git-send-email-eric.auger@redhat.com> References: <1506346478-1631-1-git-send-email-eric.auger@redhat.com> Cc: wu.wubin@huawei.com To: eric.auger.pro@gmail.com, eric.auger@redhat.com, linux-kernel@vger.kernel.org, kvm@vger.kernel.org, marc.zyngier@arm.com, cdall@linaro.org, peter.maydell@linaro.org, andre.przywara@arm.com, wanghaibin.wang@huawei.com Return-path: In-Reply-To: <1506346478-1631-1-git-send-email-eric.auger@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-Id: kvm.vger.kernel.org From: wanghaibin This patch fix the migrate restore tables failure. The same scene, at the destination, the restore tables interface traversal guest memory, and check the dte/ite is valid or not. If all dtes/ites are invalid, we will do try next one, and the last it will take the 1 return value, but currently, it be treated as error. That's not correct. This patch try to fix this problem. Signed-off-by: wanghaibin --- need to CC stable v1 -> v2: - if (ret > 0) ret = 0 --- virt/kvm/arm/vgic/vgic-its.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/virt/kvm/arm/vgic/vgic-its.c b/virt/kvm/arm/vgic/vgic-its.c index f51c1e1..fbbc97b 100644 --- a/virt/kvm/arm/vgic/vgic-its.c +++ b/virt/kvm/arm/vgic/vgic-its.c @@ -2018,7 +2018,7 @@ static int vgic_its_restore_dte(struct vgic_its *its, u32 id, return PTR_ERR(dev); ret = vgic_its_restore_itt(its, dev); - if (ret) { + if (ret < 0) { vgic_its_free_device(its->dev->kvm, dev); return ret; } @@ -2141,7 +2141,7 @@ static int vgic_its_restore_device_tables(struct vgic_its *its) } if (ret > 0) - ret = -EINVAL; + ret = 0; return ret; } -- 2.5.5