From patchwork Fri Mar 3 08:51:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Wang X-Patchwork-Id: 734979 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vZNGb6SFkz9s7v for ; Fri, 3 Mar 2017 19:52:06 +1100 (AEDT) Received: from localhost ([::1]:56779 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cjiwV-0002Cy-Ka for incoming@patchwork.ozlabs.org; Fri, 03 Mar 2017 03:52:03 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46234) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cjiw7-0002Cn-21 for qemu-devel@nongnu.org; Fri, 03 Mar 2017 03:51:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cjiw4-00027J-0e for qemu-devel@nongnu.org; Fri, 03 Mar 2017 03:51:39 -0500 Received: from mx1.redhat.com ([209.132.183.28]:45444) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cjiw3-00026y-QP for qemu-devel@nongnu.org; Fri, 03 Mar 2017 03:51:35 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B7D9B13AA1 for ; Fri, 3 Mar 2017 08:51:35 +0000 (UTC) Received: from jason-ThinkPad-T450s.redhat.com (vpn1-5-124.pek2.redhat.com [10.72.5.124]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v238pU51002672; Fri, 3 Mar 2017 03:51:32 -0500 From: Jason Wang To: mst@redhat.com, qemu-devel@nongnu.org Date: Fri, 3 Mar 2017 16:51:28 +0800 Message-Id: <1488531088-12483-1-git-send-email-jasowang@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Fri, 03 Mar 2017 08:51:35 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH] virtio: unbreak 1.0 device load with region cache 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: Paolo Bonzini , Jason Wang Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Current code depends on virtio_queue_update_rings() to setup address space cache. But this does not work for 1.0 device since we can't infer avail and used. Fixing this by calling virtio_init_region_cache() after subsections load which can guarantee avail and used are correct. Fixes: 97cd965c0701 ("virtio: use VRingMemoryRegionCaches for avail and used rings") Cc: Paolo Bonzini Signed-off-by: Jason Wang --- hw/virtio/virtio.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index 23483c7..faa45cb 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -2059,6 +2059,7 @@ int virtio_load(VirtIODevice *vdev, QEMUFile *f, int version_id) rcu_read_lock(); for (i = 0; i < num; i++) { + virtio_init_region_cache(vdev, i); if (vdev->vq[i].vring.desc) { uint16_t nheads; nheads = vring_avail_idx(&vdev->vq[i]) - vdev->vq[i].last_avail_idx;