From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37966) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zrjga-0006sI-AM for qemu-devel@nongnu.org; Thu, 29 Oct 2015 05:39:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZrjgW-0000ef-Ad for qemu-devel@nongnu.org; Thu, 29 Oct 2015 05:39:56 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43158) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZrjgW-0000eZ-56 for qemu-devel@nongnu.org; Thu, 29 Oct 2015 05:39:52 -0400 Date: Thu, 29 Oct 2015 11:39:49 +0200 From: "Michael S. Tsirkin" Message-ID: <1446111531-5755-12-git-send-email-mst@redhat.com> References: <1446111531-5755-1-git-send-email-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1446111531-5755-1-git-send-email-mst@redhat.com> Subject: [Qemu-devel] [PULL 11/16] virtio: drop virtqueue_map_sg List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell , Igor Mammedov 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 4621570..939f802 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, -- MST