diff options
| author | Vincenzo Maffione <vmaffione@FreeBSD.org> | 2020-01-13 21:47:23 +0000 |
|---|---|---|
| committer | Vincenzo Maffione <vmaffione@FreeBSD.org> | 2020-01-13 21:47:23 +0000 |
| commit | 2ec213aba4bfecb47d7439a6d4b46b88a382eaff (patch) | |
| tree | 3b71250ddf51f8565ce68f2f06674f32364103ec /sys/dev/netmap | |
| parent | f55f37d9c5b8e02e1568cdecf8e1bbb58a6d19ec (diff) | |
| download | src-2ec213aba4bfecb47d7439a6d4b46b88a382eaff.tar.gz src-2ec213aba4bfecb47d7439a6d4b46b88a382eaff.zip | |
netmap: disable passthrough with no hypervisor support
The netmap passthrough subsystem requires proper support in the
hypervisor. In particular, two PCI device ids (from the Red Hat
PCI vendor id 0x1b36) need to be assigned to the two netmap
virtual devices. We then disable these devices until the ids have
not been assigned, in order to avoid conflicts with other
virtual devices emulated by upstream QEMU.
PR: 241774
MFC after: 3 days
Notes
Notes:
svn path=/head/; revision=356704
Diffstat (limited to 'sys/dev/netmap')
| -rw-r--r-- | sys/dev/netmap/if_ptnet.c | 3 | ||||
| -rw-r--r-- | sys/dev/netmap/netmap_kern.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/sys/dev/netmap/if_ptnet.c b/sys/dev/netmap/if_ptnet.c index ccf008d4451b..38149ac2650c 100644 --- a/sys/dev/netmap/if_ptnet.c +++ b/sys/dev/netmap/if_ptnet.c @@ -87,6 +87,8 @@ #include <dev/netmap/netmap_mem2.h> #include <dev/virtio/network/virtio_net.h> +#ifdef WITH_PTNETMAP + #ifndef INET #error "INET not defined, cannot support offloadings" #endif @@ -1993,3 +1995,4 @@ ptnet_poll(if_t ifp, enum poll_cmd cmd, int budget) return count; } #endif /* DEVICE_POLLING */ +#endif /* WITH_PTNETMAP */ diff --git a/sys/dev/netmap/netmap_kern.h b/sys/dev/netmap/netmap_kern.h index 3748f81cbb5f..690d45def356 100644 --- a/sys/dev/netmap/netmap_kern.h +++ b/sys/dev/netmap/netmap_kern.h @@ -76,7 +76,6 @@ #define WITH_PIPES #define WITH_MONITOR #define WITH_GENERIC -#define WITH_PTNETMAP /* ptnetmap guest support */ #define WITH_EXTMEM #define WITH_NMNULL #endif |