Attachment 210670 Details for Bug 241774 – Patch to fix q35 issue

[patch] Patch to fix q35 issue

q35-netmap.diff (text/plain), 1.64 KB, created by Vincenzo Maffione on 2020-01-12 22:30:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vincenzo Maffione

Created: 2020-01-12 22:30:53 UTC

Size: 1.64 KB

patch

obsolete

>diff --git a/sys/dev/netmap/if_ptnet.c b/sys/dev/netmap/if_ptnet.c
>index ccf008d4451..a16e52f3b3b 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 3748f81cbb5..690d45def35 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
>diff --git a/sys/net/netmap_virt.h b/sys/net/netmap_virt.h
>index 07e551aff00..12c2565a734 100644
>--- a/sys/net/netmap_virt.h
>+++ b/sys/net/netmap_virt.h
>@@ -44,8 +44,8 @@
> /* PCI identifiers and PCI BARs for ptnetmap-memdev and ptnet. */
> #define PTNETMAP_MEMDEV_NAME            "ptnetmap-memdev"
> #define PTNETMAP_PCI_VENDOR_ID          0x1b36  /* QEMU virtual devices */
>-#define PTNETMAP_PCI_DEVICE_ID          0x000c  /* memory device */
>-#define PTNETMAP_PCI_NETIF_ID           0x000d  /* ptnet network interface */
>+#define PTNETMAP_PCI_DEVICE_ID          0xcccc  /* memory device */
>+#define PTNETMAP_PCI_NETIF_ID           0xcccd  /* ptnet network interface */
> #define PTNETMAP_IO_PCI_BAR             0
> #define PTNETMAP_MEM_PCI_BAR            1
> #define PTNETMAP_MSIX_PCI_BAR           2

Actions: View | Diff

Attachments on bug 241774: 208964 | 208965 | 208966 | 210670 | 210673 | 210674 | 210675 | 210719