[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 13/23] vhost: Remove unused vhost_dev_{load|save}_inflight
From: |
Michael Tokarev |
Subject: |
[PULL 13/23] vhost: Remove unused vhost_dev_{load|save}_inflight |
Date: |
Fri, 4 Oct 2024 19:03:21 +0300 |
From: "Dr. David Alan Gilbert" <dave@treblig.org>
vhost_dev_load_inflight and vhost_dev_save_inflight have been
unused since they were added in 2019 by:
5ad204bf2a ("vhost-user: Support transferring inflight buffer between qemu and
backend")
Remove them, and their helper vhost_dev_resize_inflight.
Signed-off-by: Dr. David Alan Gilbert <dave@treblig.org>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Michael Tokarev <mjt@tls.msk.ru>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
hw/virtio/vhost.c | 56 ---------------------------------------
include/hw/virtio/vhost.h | 2 --
2 files changed, 58 deletions(-)
diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c
index 7c5ef81b55..76f9b2aaad 100644
--- a/hw/virtio/vhost.c
+++ b/hw/virtio/vhost.c
@@ -1930,62 +1930,6 @@ void vhost_dev_free_inflight(struct vhost_inflight
*inflight)
}
}
-static int vhost_dev_resize_inflight(struct vhost_inflight *inflight,
- uint64_t new_size)
-{
- Error *err = NULL;
- int fd = -1;
- void *addr = qemu_memfd_alloc("vhost-inflight", new_size,
- F_SEAL_GROW | F_SEAL_SHRINK | F_SEAL_SEAL,
- &fd, &err);
-
- if (err) {
- error_report_err(err);
- return -ENOMEM;
- }
-
- vhost_dev_free_inflight(inflight);
- inflight->offset = 0;
- inflight->addr = addr;
- inflight->fd = fd;
- inflight->size = new_size;
-
- return 0;
-}
-
-void vhost_dev_save_inflight(struct vhost_inflight *inflight, QEMUFile *f)
-{
- if (inflight->addr) {
- qemu_put_be64(f, inflight->size);
- qemu_put_be16(f, inflight->queue_size);
- qemu_put_buffer(f, inflight->addr, inflight->size);
- } else {
- qemu_put_be64(f, 0);
- }
-}
-
-int vhost_dev_load_inflight(struct vhost_inflight *inflight, QEMUFile *f)
-{
- uint64_t size;
-
- size = qemu_get_be64(f);
- if (!size) {
- return 0;
- }
-
- if (inflight->size != size) {
- int ret = vhost_dev_resize_inflight(inflight, size);
- if (ret < 0) {
- return ret;
- }
- }
- inflight->queue_size = qemu_get_be16(f);
-
- qemu_get_buffer(f, inflight->addr, size);
-
- return 0;
-}
-
int vhost_dev_prepare_inflight(struct vhost_dev *hdev, VirtIODevice *vdev)
{
int r;
diff --git a/include/hw/virtio/vhost.h b/include/hw/virtio/vhost.h
index c75be46c06..461c168c37 100644
--- a/include/hw/virtio/vhost.h
+++ b/include/hw/virtio/vhost.h
@@ -338,8 +338,6 @@ void vhost_virtqueue_stop(struct vhost_dev *dev, struct
VirtIODevice *vdev,
void vhost_dev_reset_inflight(struct vhost_inflight *inflight);
void vhost_dev_free_inflight(struct vhost_inflight *inflight);
-void vhost_dev_save_inflight(struct vhost_inflight *inflight, QEMUFile *f);
-int vhost_dev_load_inflight(struct vhost_inflight *inflight, QEMUFile *f);
int vhost_dev_prepare_inflight(struct vhost_dev *hdev, VirtIODevice *vdev);
int vhost_dev_set_inflight(struct vhost_dev *dev,
struct vhost_inflight *inflight);
--
2.39.5
- [PULL 06/23] q35: Remove unused mch_mcfg_base, (continued)
- [PULL 06/23] q35: Remove unused mch_mcfg_base, Michael Tokarev, 2024/10/04
- [PULL 08/23] hw/net/net_rx_pkt: Remove deadcode, Michael Tokarev, 2024/10/04
- [PULL 03/23] vnc: fix crash when no console attached, Michael Tokarev, 2024/10/04
- [PULL 10/23] linux-user: Remove unused handle_vm86_fault, Michael Tokarev, 2024/10/04
- [PULL 04/23] MAINTAINERS: remove gensyscalls.sh from the linux-user section, Michael Tokarev, 2024/10/04
- [PULL 09/23] hw/char: Remove unused serial_set_frequency, Michael Tokarev, 2024/10/04
- [PULL 11/23] hw: Remove unused fw_cfg_init_io, Michael Tokarev, 2024/10/04
- [PULL 12/23] ui/cursor: remove cursor_get_mono_image, Michael Tokarev, 2024/10/04
- [PULL 13/23] vhost: Remove unused vhost_dev_{load|save}_inflight,
Michael Tokarev <=
- [PULL 14/23] remote: Remove unused remote_iohub_finalize, Michael Tokarev, 2024/10/04
- [PULL 15/23] replay: Remove unused replay_disable_events, Michael Tokarev, 2024/10/04
- [PULL 16/23] hw/pci: Remove unused pcie_chassis_find_slot, Michael Tokarev, 2024/10/04
- [PULL 17/23] hw/net/rocker: Remove unused rocker_fp_ports, Michael Tokarev, 2024/10/04
- [PULL 18/23] block-backend: Remove deadcode, Michael Tokarev, 2024/10/04
- [PULL 19/23] tests/tcg/plugins: Remove remainder of the cris target, Michael Tokarev, 2024/10/04
- [PULL 20/23] hw/mips: Build fw_cfg.c once, Michael Tokarev, 2024/10/04
- [PULL 21/23] tests/functional: Fix hash validation, Michael Tokarev, 2024/10/04
- [PULL 23/23] MAINTAINERS: Add myself as maintainer of e500 machines, Michael Tokarev, 2024/10/04
- [PULL 22/23] docs/devel: Mention post_load hook restrictions where we document the hook, Michael Tokarev, 2024/10/04