[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL V2 16/25] vhost-net-vdpa: add stubs for when no virtio-net device
From: |
Jason Wang |
Subject: |
[PULL V2 16/25] vhost-net-vdpa: add stubs for when no virtio-net device is present |
Date: |
Wed, 20 Jul 2022 17:03:04 +0800 |
From: Eugenio Pérez <eperezma@redhat.com>
net/vhost-vdpa.c will need functions that are declared in
vhost-shadow-virtqueue.c, that needs functions of virtio-net.c.
Copy the vhost-vdpa-stub.c code so
only the constructor net_init_vhost_vdpa needs to be defined.
Signed-off-by: Eugenio Pérez <eperezma@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
net/meson.build | 3 ++-
net/vhost-vdpa-stub.c | 21 +++++++++++++++++++++
2 files changed, 23 insertions(+), 1 deletion(-)
create mode 100644 net/vhost-vdpa-stub.c
diff --git a/net/meson.build b/net/meson.build
index 754e2d1..d1be76d 100644
--- a/net/meson.build
+++ b/net/meson.build
@@ -41,7 +41,8 @@ endif
softmmu_ss.add(when: 'CONFIG_POSIX', if_true: files(tap_posix))
softmmu_ss.add(when: 'CONFIG_WIN32', if_true: files('tap-win32.c'))
if have_vhost_net_vdpa
- softmmu_ss.add(files('vhost-vdpa.c'))
+ softmmu_ss.add(when: 'CONFIG_VIRTIO_NET', if_true: files('vhost-vdpa.c'),
if_false: files('vhost-vdpa-stub.c'))
+ softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('vhost-vdpa-stub.c'))
endif
vmnet_files = files(
diff --git a/net/vhost-vdpa-stub.c b/net/vhost-vdpa-stub.c
new file mode 100644
index 0000000..1732ed2
--- /dev/null
+++ b/net/vhost-vdpa-stub.c
@@ -0,0 +1,21 @@
+/*
+ * vhost-vdpa-stub.c
+ *
+ * Copyright (c) 2022 Red Hat, Inc.
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ *
+ */
+
+#include "qemu/osdep.h"
+#include "clients.h"
+#include "net/vhost-vdpa.h"
+#include "qapi/error.h"
+
+int net_init_vhost_vdpa(const Netdev *netdev, const char *name,
+ NetClientState *peer, Error **errp)
+{
+ error_setg(errp, "vhost-vdpa requires frontend driver virtio-net-*");
+ return -1;
+}
--
2.7.4
- [PULL V2 10/25] vhost: Track number of descs in SVQDescState, (continued)
- [PULL V2 10/25] vhost: Track number of descs in SVQDescState, Jason Wang, 2022/07/20
- [PULL V2 11/25] vhost: add vhost_svq_push_elem, Jason Wang, 2022/07/20
- [PULL V2 05/25] vhost: Reorder vhost_svq_kick, Jason Wang, 2022/07/20
- [PULL V2 17/25] vdpa: manual forward CVQ buffers, Jason Wang, 2022/07/20
- [PULL V2 15/25] vdpa: Export vhost_vdpa_dma_map and unmap calls, Jason Wang, 2022/07/20
- [PULL V2 19/25] vdpa: Extract get features part from vhost_vdpa_get_max_queue_pairs, Jason Wang, 2022/07/20
- [PULL V2 22/25] softmmu/runstate.c: add RunStateTransition support form COLO to PRELAUNCH, Jason Wang, 2022/07/20
- [PULL V2 12/25] vhost: Expose vhost_svq_add, Jason Wang, 2022/07/20
- [PULL V2 14/25] vhost: Add svq avail_handler callback, Jason Wang, 2022/07/20
- [PULL V2 13/25] vhost: add vhost_svq_poll, Jason Wang, 2022/07/20
- [PULL V2 16/25] vhost-net-vdpa: add stubs for when no virtio-net device is present,
Jason Wang <=
- [PULL V2 18/25] vdpa: Buffer CVQ support on shadow virtqueue, Jason Wang, 2022/07/20
- [PULL V2 20/25] vdpa: Add device migration blocker, Jason Wang, 2022/07/20
- [PULL V2 21/25] vdpa: Add x-svq to NetdevVhostVDPAOptions, Jason Wang, 2022/07/20
- [PULL V2 23/25] net/colo: Fix a "double free" crash to clear the conn_list, Jason Wang, 2022/07/20
- [PULL V2 24/25] net/colo.c: No need to track conn_list for filter-rewriter, Jason Wang, 2022/07/20
- [PULL V2 25/25] net/colo.c: fix segmentation fault when packet is not parsed correctly, Jason Wang, 2022/07/20
- Re: [PULL V2 00/25] Net patches, Peter Maydell, 2022/07/20