From patchwork Tue Oct 27 08:48:08 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 536487 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 5A63014136A for ; Tue, 27 Oct 2015 19:50:40 +1100 (AEDT) Received: from localhost ([::1]:58190 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zqzxm-0000Sx-1L for incoming@patchwork.ozlabs.org; Tue, 27 Oct 2015 04:50:38 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35423) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZqzvQ-0004Iw-05 for qemu-devel@nongnu.org; Tue, 27 Oct 2015 04:48:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZqzvP-0003cH-7O for qemu-devel@nongnu.org; Tue, 27 Oct 2015 04:48:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52897) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZqzvP-0003c7-2j for qemu-devel@nongnu.org; Tue, 27 Oct 2015 04:48:11 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (Postfix) with ESMTPS id BD67FC0B5904 for ; Tue, 27 Oct 2015 08:48:10 +0000 (UTC) Received: from redhat.com (ovpn-116-58.ams2.redhat.com [10.36.116.58]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id t9R8m9FY018916; Tue, 27 Oct 2015 04:48:09 -0400 Date: Tue, 27 Oct 2015 10:48:08 +0200 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Message-ID: <1445935663-31971-7-git-send-email-mst@redhat.com> References: <1445935663-31971-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1445935663-31971-1-git-send-email-mst@redhat.com> X-Mutt-Fcc: =sent X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Igor Mammedov Subject: [Qemu-devel] [PATCH 6/6] virtio: drop virtqueue_map_sg X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Deprecated in favor of virtqueue_map. Signed-off-by: Michael S. Tsirkin Reviewed-by: Igor Mammedov --- include/hw/virtio/virtio.h | 2 -- hw/virtio/virtio.c | 7 ------- 2 files changed, 9 deletions(-) diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h index 9d9abb4..205fadf 100644 --- a/include/hw/virtio/virtio.h +++ b/include/hw/virtio/virtio.h @@ -151,8 +151,6 @@ void virtqueue_discard(VirtQueue *vq, const VirtQueueElement *elem, void virtqueue_fill(VirtQueue *vq, const VirtQueueElement *elem, unsigned int len, unsigned int idx); -void virtqueue_map_sg(struct iovec *sg, hwaddr *addr, - size_t num_sg, int is_write); void virtqueue_map(VirtQueueElement *elem); int virtqueue_pop(VirtQueue *vq, VirtQueueElement *elem); int virtqueue_avail_bytes(VirtQueue *vq, unsigned int in_bytes, diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index 84e2320..be32145 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -491,13 +491,6 @@ static void virtqueue_map_iovec(struct iovec *sg, hwaddr *addr, } } -/* Deprecated: don't use in new code */ -void virtqueue_map_sg(struct iovec *sg, hwaddr *addr, - size_t num_sg, int is_write) -{ - virtqueue_map_iovec(sg, addr, &num_sg, num_sg, is_write); -} - void virtqueue_map(VirtQueueElement *elem) { virtqueue_map_iovec(elem->in_sg, elem->in_addr, &elem->in_num,