All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
	Greg Kurz <groug@kaod.org>,
	Cornelia Huck <cornelia.huck@de.ibm.com>
Subject: [Qemu-devel] [PULL v2 33/34] virtio: drop virtio_queue_get_ring_{size, addr}()
Date: Fri, 11 Nov 2016 20:11:31 +0200	[thread overview]
Message-ID: <1478887767-31980-34-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1478887767-31980-1-git-send-email-mst@redhat.com>

From: Greg Kurz <groug@kaod.org>

These are not used anymore.

Signed-off-by: Greg Kurz <groug@kaod.org>
Reviewed-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 include/hw/virtio/virtio.h |  2 --
 hw/virtio/virtio.c         | 11 -----------
 2 files changed, 13 deletions(-)

diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h
index bdb3c4b..5951997 100644
--- a/include/hw/virtio/virtio.h
+++ b/include/hw/virtio/virtio.h
@@ -259,11 +259,9 @@ typedef struct VirtIORNGConf VirtIORNGConf;
 hwaddr virtio_queue_get_desc_addr(VirtIODevice *vdev, int n);
 hwaddr virtio_queue_get_avail_addr(VirtIODevice *vdev, int n);
 hwaddr virtio_queue_get_used_addr(VirtIODevice *vdev, int n);
-hwaddr virtio_queue_get_ring_addr(VirtIODevice *vdev, int n);
 hwaddr virtio_queue_get_desc_size(VirtIODevice *vdev, int n);
 hwaddr virtio_queue_get_avail_size(VirtIODevice *vdev, int n);
 hwaddr virtio_queue_get_used_size(VirtIODevice *vdev, int n);
-hwaddr virtio_queue_get_ring_size(VirtIODevice *vdev, int n);
 uint16_t virtio_queue_get_last_avail_idx(VirtIODevice *vdev, int n);
 void virtio_queue_set_last_avail_idx(VirtIODevice *vdev, int n, uint16_t idx);
 void virtio_queue_invalidate_signalled_used(VirtIODevice *vdev, int n);
diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
index 72ee06b..55a00cd 100644
--- a/hw/virtio/virtio.c
+++ b/hw/virtio/virtio.c
@@ -1935,11 +1935,6 @@ hwaddr virtio_queue_get_used_addr(VirtIODevice *vdev, int n)
     return vdev->vq[n].vring.used;
 }
 
-hwaddr virtio_queue_get_ring_addr(VirtIODevice *vdev, int n)
-{
-    return vdev->vq[n].vring.desc;
-}
-
 hwaddr virtio_queue_get_desc_size(VirtIODevice *vdev, int n)
 {
     return sizeof(VRingDesc) * vdev->vq[n].vring.num;
@@ -1957,12 +1952,6 @@ hwaddr virtio_queue_get_used_size(VirtIODevice *vdev, int n)
         sizeof(VRingUsedElem) * vdev->vq[n].vring.num;
 }
 
-hwaddr virtio_queue_get_ring_size(VirtIODevice *vdev, int n)
-{
-    return vdev->vq[n].vring.used - vdev->vq[n].vring.desc +
-	    virtio_queue_get_used_size(vdev, n);
-}
-
 uint16_t virtio_queue_get_last_avail_idx(VirtIODevice *vdev, int n)
 {
     return vdev->vq[n].last_avail_idx;
-- 
MST

  parent reply	other threads:[~2016-11-11 18:11 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-11-11 18:09 [Qemu-devel] [PULL v2 00/34] virtio, vhost, pc, pci: tests, documentation, fixes and cleanups Michael S. Tsirkin
2016-11-11 18:10 ` [Qemu-devel] [PULL v2 01/34] tests/vhost-user-bridge: remove false comment Michael S. Tsirkin
2016-11-11 18:10 ` [Qemu-devel] [PULL v2 02/34] tests/vhost-user-bridge: remove unnecessary dispatcher_remove Michael S. Tsirkin
2016-11-11 18:10 ` [Qemu-devel] [PULL v2 03/34] tests/vhost-user-bridge: indicate peer disconnected Michael S. Tsirkin
2016-11-11 18:10 ` [Qemu-devel] [PULL v2 04/34] tests/vhost-user-bridge: do not accept more than one connection Michael S. Tsirkin
2016-11-11 18:10 ` [Qemu-devel] [PULL v2 05/34] contrib: add libvhost-user Michael S. Tsirkin
2016-11-11 18:10 ` [Qemu-devel] [PULL v2 06/34] tests/vhost-user-bridge: use contrib/libvhost-user Michael S. Tsirkin
2016-11-11 18:10 ` [Qemu-devel] [PULL v2 07/34] intel_iommu: fixing source id during IOTLB hash key calculation Michael S. Tsirkin
2016-11-11 18:10 ` [Qemu-devel] [PULL v2 08/34] virtio: rename virtqueue_discard to virtqueue_unpop Michael S. Tsirkin
2016-11-11 18:10 ` [Qemu-devel] [PULL v2 09/34] virtio: make virtqueue_alloc_element static Michael S. Tsirkin
2016-11-11 18:10 ` [Qemu-devel] [PULL v2 10/34] virtio-crypto: tag as not hotpluggable and migration Michael S. Tsirkin
2016-11-11 18:10 ` [Qemu-devel] [PULL v2 11/34] intel_iommu: fix several incorrect endianess and bit fields Michael S. Tsirkin
2016-11-11 18:10 ` [Qemu-devel] [PULL v2 12/34] intel_iommu: fix incorrect assert Michael S. Tsirkin
2016-11-11 18:10 ` [Qemu-devel] [PULL v2 13/34] acpi: fix DMAR device scope for IOAPIC Michael S. Tsirkin
2016-11-11 18:10 ` [Qemu-devel] [PULL v2 14/34] virtio: allow per-device-class legacy features Michael S. Tsirkin
2016-11-11 18:10 ` [Qemu-devel] [PULL v2 15/34] virtio-net: mark VIRTIO_NET_F_GSO as legacy Michael S. Tsirkin
2016-11-11 18:10 ` [Qemu-devel] [PULL v2 16/34] vhost: migration blocker only if shared log is used Michael S. Tsirkin
2016-11-11 18:10 ` [Qemu-devel] [PULL v2 17/34] qdev: hotplug: drop HotplugHandler.post_plug callback Michael S. Tsirkin
2016-11-11 18:10 ` [Qemu-devel] [PULL v2 18/34] nvdimm acpi: drop the lock of fit buffer Michael S. Tsirkin
2016-11-11 18:10 ` [Qemu-devel] [PULL v2 19/34] pc: memhp: move nvdimm hotplug out of memory hotplug Michael S. Tsirkin
2016-11-11 18:11 ` [Qemu-devel] [PULL v2 20/34] pc: memhp: stop handling nvdimm hotplug in pc_dimm_unplug Michael S. Tsirkin
2016-11-11 18:11 ` [Qemu-devel] [PULL v2 21/34] nvdimm acpi: clean up nvdimm_build_acpi Michael S. Tsirkin
2016-11-11 18:11 ` [Qemu-devel] [PULL v2 22/34] docs: improve the doc of Read FIT method Michael S. Tsirkin
2016-11-11 18:11 ` [Qemu-devel] [PULL v2 23/34] nvdimm acpi: rename nvdimm_plugged_device_list Michael S. Tsirkin
2016-11-11 18:11 ` [Qemu-devel] [PULL v2 24/34] nvdimm acpi: cleanup nvdimm_build_fit Michael S. Tsirkin
2016-11-11 18:11 ` [Qemu-devel] [PULL v2 25/34] nvdimm acpi: rename nvdimm_acpi_hotplug Michael S. Tsirkin
2016-11-11 18:11 ` [Qemu-devel] [PULL v2 26/34] nvdimm acpi: define DSM return codes Michael S. Tsirkin
2016-11-11 18:11 ` [Qemu-devel] [PULL v2 27/34] nvdimm acpi: fix two comments Michael S. Tsirkin
2016-11-11 18:11 ` [Qemu-devel] [PULL v2 28/34] nvdimm acpi: rename nvdimm_dsm_reserved_root Michael S. Tsirkin
2016-11-11 18:11 ` [Qemu-devel] [PULL v2 29/34] nvdimm acpi: use aml_name_decl to define named object Michael S. Tsirkin
2016-11-11 18:11 ` [Qemu-devel] [PULL v2 30/34] nvdimm acpi: introduce NVDIMM_DSM_MEMORY_SIZE Michael S. Tsirkin
2016-11-11 18:11 ` [Qemu-devel] [PULL v2 31/34] vhost: adapt vhost_verify_ring_mappings() to virtio 1 ring layout Michael S. Tsirkin
2016-11-11 18:11 ` [Qemu-devel] [PULL v2 32/34] vhost: drop legacy vring layout bits Michael S. Tsirkin
2016-11-11 18:11 ` Michael S. Tsirkin [this message]
2016-11-11 18:11 ` [Qemu-devel] [PULL v2 34/34] docs: add PCIe devices placement guidelines Michael S. Tsirkin
2016-11-14 15:52 ` [Qemu-devel] [PULL v2 00/34] virtio, vhost, pc, pci: tests, documentation, fixes and cleanups Stefan Hajnoczi
2016-11-14 23:19   ` Michael S. Tsirkin
2016-11-15 10:56     ` Stefan Hajnoczi
2016-11-17 14:16 ` no-reply
2016-11-17 16:44   ` Michael S. Tsirkin
2016-11-17 17:04     ` Fam Zheng

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1478887767-31980-34-git-send-email-mst@redhat.com \
    --to=mst@redhat.com \
    --cc=cornelia.huck@de.ibm.com \
    --cc=groug@kaod.org \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.