From patchwork Thu Nov 22 14:06:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Xu X-Patchwork-Id: 1001826 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4311kl4bgJz9s8J for ; Fri, 23 Nov 2018 01:18:23 +1100 (AEDT) Received: from localhost ([::1]:46946 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gPpoD-00059t-8N for incoming@patchwork.ozlabs.org; Thu, 22 Nov 2018 09:18:21 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36944) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gPph2-00079r-9q for qemu-devel@nongnu.org; Thu, 22 Nov 2018 09:10:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gPph0-0000fO-6S for qemu-devel@nongnu.org; Thu, 22 Nov 2018 09:10:56 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43384) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gPpgz-0000bM-WC for qemu-devel@nongnu.org; Thu, 22 Nov 2018 09:10:54 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 27A09A4297; Thu, 22 Nov 2018 14:10:53 +0000 (UTC) Received: from dell-per430-12.lab.eng.pek2.redhat.com (dell-per430-12.lab.eng.pek2.redhat.com [10.73.196.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id D2669863DA; Thu, 22 Nov 2018 14:10:49 +0000 (UTC) From: wexu@redhat.com To: jasowang@redhat.com, qemu-devel@nongnu.org Date: Thu, 22 Nov 2018 09:06:17 -0500 Message-Id: <1542895581-10721-13-git-send-email-wexu@redhat.com> In-Reply-To: <1542895581-10721-1-git-send-email-wexu@redhat.com> References: <1542895581-10721-1-git-send-email-wexu@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Thu, 22 Nov 2018 14:10:53 +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 v1 12/16] virtio: add userspace migration of packed ring 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: maxime.coquelin@redhat.com, jfreimann@redhat.com, wexu@redhat.com, tiwei.bie@intel.com, mst@redhat.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Wei Xu Signed-off-by: Wei Xu --- hw/virtio/virtio.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index 240c4e3..64d5c04 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -2558,6 +2558,12 @@ int virtio_save(VirtIODevice *vdev, QEMUFile *f) */ qemu_put_be64(f, vdev->vq[i].vring.desc); qemu_put_be16s(f, &vdev->vq[i].last_avail_idx); + qemu_put_8s(f, (const uint8_t *)&vdev->vq[i].avail_wrap_counter); + qemu_put_8s(f, (const uint8_t *)&vdev->vq[i].event_wrap_counter); + qemu_put_8s(f, (const uint8_t *)&vdev->vq[i].used_wrap_counter); + qemu_put_be16s(f, &vdev->vq[i].used_idx); + qemu_put_be16s(f, &vdev->vq[i].shadow_avail_idx); + qemu_put_be32s(f, &vdev->vq[i].inuse); if (k->save_queue) { k->save_queue(qbus->parent, i, f); } @@ -2705,6 +2711,14 @@ int virtio_load(VirtIODevice *vdev, QEMUFile *f, int version_id) } vdev->vq[i].vring.desc = qemu_get_be64(f); qemu_get_be16s(f, &vdev->vq[i].last_avail_idx); + + qemu_get_8s(f, (uint8_t *)&vdev->vq[i].avail_wrap_counter); + qemu_get_8s(f, (uint8_t *)&vdev->vq[i].event_wrap_counter); + qemu_get_8s(f, (uint8_t *)&vdev->vq[i].used_wrap_counter); + qemu_get_be16s(f, &vdev->vq[i].used_idx); + qemu_get_be16s(f, &vdev->vq[i].shadow_avail_idx); + qemu_get_be32s(f, &vdev->vq[i].inuse); + vdev->vq[i].signalled_used_valid = false; vdev->vq[i].notification = true; @@ -2786,6 +2800,10 @@ int virtio_load(VirtIODevice *vdev, QEMUFile *f, int version_id) virtio_queue_update_rings(vdev, i); } + if (virtio_vdev_has_feature(vdev, VIRTIO_F_RING_PACKED)) { + continue; + } + nheads = vring_avail_idx(&vdev->vq[i]) - vdev->vq[i].last_avail_idx; /* Check it isn't doing strange things with descriptor numbers. */ if (nheads > vdev->vq[i].vring.num) {