[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v6 16/21] vhost-net-vdpa: add stubs for when no virtio-net device
From: |
Eugenio Pérez |
Subject: |
[PATCH v6 16/21] vhost-net-vdpa: add stubs for when no virtio-net device is present |
Date: |
Wed, 20 Jul 2022 08:59:41 +0200 |
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>
---
net/vhost-vdpa-stub.c | 21 +++++++++++++++++++++
net/meson.build | 3 ++-
2 files changed, 23 insertions(+), 1 deletion(-)
create mode 100644 net/vhost-vdpa-stub.c
diff --git a/net/vhost-vdpa-stub.c b/net/vhost-vdpa-stub.c
new file mode 100644
index 0000000000..1732ed2443
--- /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;
+}
diff --git a/net/meson.build b/net/meson.build
index 754e2d1d40..d1be76daf3 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(
--
2.31.1
- [PATCH v6 06/21] vhost: Move vhost_svq_kick call to vhost_svq_add, (continued)
- [PATCH v6 06/21] vhost: Move vhost_svq_kick call to vhost_svq_add, Eugenio Pérez, 2022/07/20
- [PATCH v6 08/21] vhost: Decouple vhost_svq_add from VirtQueueElement, Eugenio Pérez, 2022/07/20
- [PATCH v6 03/21] virtio-net: Expose ctrl virtqueue logic, Eugenio Pérez, 2022/07/20
- [PATCH v6 09/21] vhost: Add SVQDescState, Eugenio Pérez, 2022/07/20
- [PATCH v6 10/21] vhost: Track number of descs in SVQDescState, Eugenio Pérez, 2022/07/20
- [PATCH v6 12/21] vhost: Expose vhost_svq_add, Eugenio Pérez, 2022/07/20
- [PATCH v6 15/21] vdpa: Export vhost_vdpa_dma_map and unmap calls, Eugenio Pérez, 2022/07/20
- [PATCH v6 13/21] vhost: add vhost_svq_poll, Eugenio Pérez, 2022/07/20
- [PATCH v6 11/21] vhost: add vhost_svq_push_elem, Eugenio Pérez, 2022/07/20
- [PATCH v6 14/21] vhost: Add svq avail_handler callback, Eugenio Pérez, 2022/07/20
- [PATCH v6 16/21] vhost-net-vdpa: add stubs for when no virtio-net device is present,
Eugenio Pérez <=
- [PATCH v6 18/21] vdpa: Buffer CVQ support on shadow virtqueue, Eugenio Pérez, 2022/07/20
- [PATCH v6 17/21] vdpa: manual forward CVQ buffers, Eugenio Pérez, 2022/07/20
- [PATCH v6 19/21] vdpa: Extract get features part from vhost_vdpa_get_max_queue_pairs, Eugenio Pérez, 2022/07/20
- [PATCH v6 20/21] vdpa: Add device migration blocker, Eugenio Pérez, 2022/07/20
- [PATCH v6 21/21] vdpa: Add x-svq to NetdevVhostVDPAOptions, Eugenio Pérez, 2022/07/20