From patchwork Tue May 25 08:37:02 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshiaki Tamura X-Patchwork-Id: 102129 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o4P8ihCp031365 for ; Tue, 25 May 2010 08:44:43 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754759Ab0EYIok (ORCPT ); Tue, 25 May 2010 04:44:40 -0400 Received: from sh.osrg.net ([192.16.179.4]:54753 "EHLO sh.osrg.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750956Ab0EYIoj (ORCPT ); Tue, 25 May 2010 04:44:39 -0400 Received: from fs.osrg.net (postfix@fs.osrg.net [10.0.0.12]) by sh.osrg.net (8.14.3/8.14.3/OSRG-NET) with ESMTP id o4P8eJrv010292; Tue, 25 May 2010 17:40:19 +0900 Received: from localhost (hype-wd0.osrg.net [10.72.1.16]) by fs.osrg.net (Postfix) with ESMTP id 025503E030C; Tue, 25 May 2010 17:40:18 +0900 (JST) From: Yoshiaki Tamura To: kvm@vger.kernel.org, qemu-devel@nongnu.org Cc: avi@redhat.com, aliguori@us.ibm.com, mtosatti@redhat.com, ohmura.kei@lab.ntt.co.jp, Yoshiaki Tamura Subject: [RFC PATCH 21/23] virtio-blk: Modify save/load handler to handle inuse varialble. Date: Tue, 25 May 2010 17:37:02 +0900 Message-Id: <1274776624-16435-23-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> X-Mailer: git-send-email 1.7.0.31.g1df487 In-Reply-To: <1274776624-16435-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> References: <1274776624-16435-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> X-Dispatcher: imput version 20070423(IM149) Lines: 44 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 25 May 2010 08:44:43 +0000 (UTC) X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-3.0 (sh.osrg.net [192.16.179.4]); Tue, 25 May 2010 17:40:20 +0900 (JST) X-Virus-Scanned: clamav-milter 0.96 at sh X-Virus-Status: Clean Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org diff --git a/hw/virtio.c b/hw/virtio.c index 7c020a3..502929c 100644 --- a/hw/virtio.c +++ b/hw/virtio.c @@ -70,7 +70,7 @@ struct VirtQueue VRing vring; target_phys_addr_t pa; uint16_t last_avail_idx; - int inuse; + uint16_t inuse; uint16_t vector; void (*handle_output)(VirtIODevice *vdev, VirtQueue *vq); }; @@ -641,6 +641,7 @@ void virtio_save(VirtIODevice *vdev, QEMUFile *f) qemu_put_be32(f, vdev->vq[i].vring.num); qemu_put_be64(f, vdev->vq[i].pa); qemu_put_be16s(f, &vdev->vq[i].last_avail_idx); + qemu_put_be16s(f, &vdev->vq[i].inuse); if (vdev->binding->save_queue) vdev->binding->save_queue(vdev->binding_opaque, i, f); } @@ -678,6 +679,11 @@ int virtio_load(VirtIODevice *vdev, QEMUFile *f) vdev->vq[i].vring.num = qemu_get_be32(f); vdev->vq[i].pa = qemu_get_be64(f); qemu_get_be16s(f, &vdev->vq[i].last_avail_idx); + qemu_get_be16s(f, &vdev->vq[i].inuse); + + /* revert last_avail_idx if there are outstanding emulation. */ + vdev->vq[i].last_avail_idx -= vdev->vq[i].inuse; + vdev->vq[i].inuse = 0; if (vdev->vq[i].pa) { virtqueue_init(&vdev->vq[i]);