From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
Ladi Prosek <lprosek@redhat.com>,
Stefan Hajnoczi <stefanha@redhat.com>
Subject: [Qemu-devel] [PULL 09/47] virtio: make virtqueue_alloc_element static
Date: Thu, 10 Nov 2016 18:12:53 +0200 [thread overview]
Message-ID: <1478794177-29377-10-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1478794177-29377-1-git-send-email-mst@redhat.com>
From: Ladi Prosek <lprosek@redhat.com>
The function does not fully initialize the returned VirtQueueElement and should
be used only internally from the virtio module.
Signed-off-by: Ladi Prosek <lprosek@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
include/hw/virtio/virtio.h | 1 -
hw/virtio/virtio.c | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/include/hw/virtio/virtio.h b/include/hw/virtio/virtio.h
index 6a2f57c..f12a1a8 100644
--- a/include/hw/virtio/virtio.h
+++ b/include/hw/virtio/virtio.h
@@ -154,7 +154,6 @@ VirtQueue *virtio_add_queue(VirtIODevice *vdev, int queue_size,
void virtio_del_queue(VirtIODevice *vdev, int n);
-void *virtqueue_alloc_element(size_t sz, unsigned out_num, unsigned in_num);
void virtqueue_push(VirtQueue *vq, const VirtQueueElement *elem,
unsigned int len);
void virtqueue_flush(VirtQueue *vq, unsigned int count);
diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
index 3a76dc6..1df5f4e 100644
--- a/hw/virtio/virtio.c
+++ b/hw/virtio/virtio.c
@@ -632,7 +632,7 @@ void virtqueue_map(VirtQueueElement *elem)
VIRTQUEUE_MAX_SIZE, 0);
}
-void *virtqueue_alloc_element(size_t sz, unsigned out_num, unsigned in_num)
+static void *virtqueue_alloc_element(size_t sz, unsigned out_num, unsigned in_num)
{
VirtQueueElement *elem;
size_t in_addr_ofs = QEMU_ALIGN_UP(sz, __alignof__(elem->in_addr[0]));
--
MST
next prev parent reply other threads:[~2016-11-10 16:13 UTC|newest]
Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-10 16:12 [Qemu-devel] [PULL 00/47] virtio, vhost, pc, pci: tests, documentation, fixes and cleanups Michael S. Tsirkin
2016-11-10 16:12 ` [Qemu-devel] [PULL 05/47] contrib: add libvhost-user Michael S. Tsirkin
2016-11-10 17:05 ` Daniel P. Berrange
2016-11-10 17:20 ` Michael S. Tsirkin
2016-11-10 16:12 ` [Qemu-devel] [PULL 01/47] tests/vhost-user-bridge: remove false comment Michael S. Tsirkin
2016-11-10 16:12 ` [Qemu-devel] [PULL 02/47] tests/vhost-user-bridge: remove unnecessary dispatcher_remove Michael S. Tsirkin
2016-11-10 16:12 ` [Qemu-devel] [PULL 03/47] tests/vhost-user-bridge: indicate peer disconnected Michael S. Tsirkin
2016-11-10 16:12 ` [Qemu-devel] [PULL 04/47] tests/vhost-user-bridge: do not accept more than one connection Michael S. Tsirkin
2016-11-10 16:12 ` [Qemu-devel] [PULL 06/47] tests/vhost-user-bridge: use contrib/libvhost-user Michael S. Tsirkin
2016-11-10 16:12 ` [Qemu-devel] [PULL 07/47] intel_iommu: fixing source id during IOTLB hash key calculation Michael S. Tsirkin
2016-11-10 16:12 ` [Qemu-devel] [PULL 08/47] virtio: rename virtqueue_discard to virtqueue_unpop Michael S. Tsirkin
2016-11-10 16:12 ` Michael S. Tsirkin [this message]
2016-11-10 16:12 ` [Qemu-devel] [PULL 10/47] pcie_aer: Convert pcie_aer_init to Error Michael S. Tsirkin
2016-11-10 16:12 ` [Qemu-devel] [PULL 11/47] virtio-crypto: tag as not hotpluggable and migration Michael S. Tsirkin
2016-11-10 16:13 ` [Qemu-devel] [PULL 12/47] intel_iommu: fix several incorrect endianess and bit fields Michael S. Tsirkin
2016-11-10 16:13 ` [Qemu-devel] [PULL 13/47] intel_iommu: fix incorrect assert Michael S. Tsirkin
2016-11-10 16:13 ` [Qemu-devel] [PULL 14/47] acpi: fix DMAR device scope for IOAPIC Michael S. Tsirkin
2016-11-10 16:13 ` [Qemu-devel] [PULL 15/47] virtio: allow per-device-class legacy features Michael S. Tsirkin
2016-11-10 16:13 ` [Qemu-devel] [PULL 16/47] virtio-net: mark VIRTIO_NET_F_GSO as legacy Michael S. Tsirkin
2016-11-10 16:13 ` [Qemu-devel] [PULL 17/47] vhost: Update 'ioeventfd_started' with host notifiers Michael S. Tsirkin
2016-11-10 16:13 ` [Qemu-devel] [PULL 18/47] vhost: Use vbus var instead of VIRTIO_BUS() macro Michael S. Tsirkin
2016-11-10 16:13 ` [Qemu-devel] [PULL 19/47] vhost: migration blocker only if shared log is used Michael S. Tsirkin
2016-11-10 16:13 ` [Qemu-devel] [PULL 20/47] qdev: hotplug: drop HotplugHandler.post_plug callback Michael S. Tsirkin
2016-11-10 16:13 ` [Qemu-devel] [PULL 21/47] nvdimm acpi: drop the lock of fit buffer Michael S. Tsirkin
2016-11-10 16:13 ` [Qemu-devel] [PULL 22/47] pc: memhp: move nvdimm hotplug out of memory hotplug Michael S. Tsirkin
2016-11-10 16:13 ` [Qemu-devel] [PULL 23/47] pc: memhp: stop handling nvdimm hotplug in pc_dimm_unplug Michael S. Tsirkin
2016-11-10 16:13 ` [Qemu-devel] [PULL 24/47] nvdimm acpi: clean up nvdimm_build_acpi Michael S. Tsirkin
2016-11-10 16:13 ` [Qemu-devel] [PULL 25/47] docs: improve the doc of Read FIT method Michael S. Tsirkin
2016-11-10 16:13 ` [Qemu-devel] [PULL 26/47] nvdimm acpi: rename nvdimm_plugged_device_list Michael S. Tsirkin
2016-11-10 16:13 ` [Qemu-devel] [PULL 27/47] nvdimm acpi: cleanup nvdimm_build_fit Michael S. Tsirkin
2016-11-10 16:13 ` [Qemu-devel] [PULL 28/47] nvdimm acpi: rename nvdimm_acpi_hotplug Michael S. Tsirkin
2016-11-10 16:13 ` [Qemu-devel] [PULL 29/47] nvdimm acpi: define DSM return codes Michael S. Tsirkin
2016-11-10 16:13 ` [Qemu-devel] [PULL 30/47] nvdimm acpi: fix two comments Michael S. Tsirkin
2016-11-10 16:13 ` [Qemu-devel] [PULL 31/47] nvdimm acpi: rename nvdimm_dsm_reserved_root Michael S. Tsirkin
2016-11-10 16:13 ` [Qemu-devel] [PULL 32/47] nvdimm acpi: use aml_name_decl to define named object Michael S. Tsirkin
2016-11-10 16:13 ` [Qemu-devel] [PULL 33/47] nvdimm acpi: introduce NVDIMM_DSM_MEMORY_SIZE Michael S. Tsirkin
2016-11-10 16:13 ` [Qemu-devel] [PULL 34/47] msix: Follow CODING_STYLE Michael S. Tsirkin
2016-11-10 16:14 ` [Qemu-devel] [PULL 35/47] hcd-xhci: check & correct param before using it Michael S. Tsirkin
2016-11-10 16:14 ` [Qemu-devel] [PULL 36/47] pci: Convert msix_init() to Error and fix callers to check it Michael S. Tsirkin
2016-11-11 6:55 ` Hannes Reinecke
2016-11-10 16:14 ` [Qemu-devel] [PULL 37/47] megasas: change behaviour of msix switch Michael S. Tsirkin
2016-11-11 6:56 ` Hannes Reinecke
2016-11-10 16:14 ` [Qemu-devel] [PULL 38/47] hcd-xhci: " Michael S. Tsirkin
2016-11-10 16:14 ` [Qemu-devel] [PULL 39/47] megasas: remove unnecessary megasas_use_msix() Michael S. Tsirkin
2016-11-11 6:57 ` Hannes Reinecke
2016-11-10 16:14 ` [Qemu-devel] [PULL 40/47] megasas: undo the overwrites of msi user configuration Michael S. Tsirkin
2016-11-11 6:57 ` Hannes Reinecke
2016-11-10 16:14 ` [Qemu-devel] [PULL 41/47] vmxnet3: fix reference leak issue Michael S. Tsirkin
2016-11-10 16:14 ` [Qemu-devel] [PULL 42/47] vmxnet3: remove unnecessary internal msix flag Michael S. Tsirkin
2016-11-10 16:14 ` [Qemu-devel] [PULL 43/47] msi_init: convert assert to return -errno Michael S. Tsirkin
2016-11-10 16:14 ` [Qemu-devel] [PULL 44/47] vhost: adapt vhost_verify_ring_mappings() to virtio 1 ring layout Michael S. Tsirkin
2016-11-10 16:14 ` [Qemu-devel] [PULL 45/47] vhost: drop legacy vring layout bits Michael S. Tsirkin
2016-11-10 16:14 ` [Qemu-devel] [PULL 46/47] virtio: drop virtio_queue_get_ring_{size, addr}() Michael S. Tsirkin
2016-11-10 16:14 ` [Qemu-devel] [PULL 47/47] docs: add PCIe devices placement guidelines Michael S. Tsirkin
2016-11-10 22:29 ` [Qemu-devel] [PULL 00/47] virtio, vhost, pc, pci: tests, documentation, fixes and cleanups Alex Williamson
2016-11-10 22:33 ` Michael S. Tsirkin
2016-11-10 22:48 ` Alex Williamson
2016-11-10 22:51 ` Michael S. Tsirkin
2016-11-11 2:46 ` Cao jin
2016-11-11 3:32 ` Michael S. Tsirkin
2016-11-11 3:51 ` Cao jin
2016-11-11 3:49 ` Michael S. Tsirkin
2016-11-10 23:09 ` Michael S. Tsirkin
2016-11-10 23:44 ` Alex Williamson
2016-11-11 0:03 ` John Fastabend
2016-11-11 21:48 ` [Qemu-devel] kvm_mem_ioeventfd_add: error adding ioeventfd: File exists (was Re: [PULL 00/47] virtio, vhost, pc, pci: tests, documentation, fixes and cleanups) Michael S. Tsirkin
2016-11-11 22:43 ` Alex Williamson
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=1478794177-29377-10-git-send-email-mst@redhat.com \
--to=mst@redhat.com \
--cc=lprosek@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).