FreeBSD Bugzilla – Attachment 199057 Details for
Bug 232968
emulators/qemu: hw/rdma/vmw/pvrdma_cmd.c depends on linux/types.h?
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Proposed fix
qemu_pvrdma_cmd_build_fix.diff (text/plain), 4.12 KB, created by
Roman Bogorodskiy
on 2018-11-07 17:39:08 UTC
(
hide
)
Description:
Proposed fix
Filename:
MIME Type:
Creator:
Roman Bogorodskiy
Created:
2018-11-07 17:39:08 UTC
Size:
4.12 KB
patch
obsolete
>Index: Makefile >=================================================================== >--- Makefile (revision 484310) >+++ Makefile (working copy) >@@ -3,7 +3,7 @@ > > PORTNAME= qemu > PORTVERSION= 2.12.0 >-PORTREVISION= 1 >+PORTREVISION= 2 > CATEGORIES= emulators > MASTER_SITES= http://wiki.qemu.org/download/ > DIST_SUBDIR= qemu/${PORTVERSION} >Index: files/patch-rdma-pvrdma-split >=================================================================== >--- files/patch-rdma-pvrdma-split (nonexistent) >+++ files/patch-rdma-pvrdma-split (working copy) >@@ -0,0 +1,123 @@ >+diff --git configure configure >+index 457684a7e6..3da60d8436 100755 >+--- configure >++++ configure >+@@ -353,6 +353,7 @@ hax="no" >+ hvf="no" >+ whpx="no" >+ rdma="" >++pvrdma="" >+ gprof="no" >+ debug_tcg="no" >+ debug="no" >+@@ -1308,6 +1309,10 @@ for opt do >+ ;; >+ --disable-rdma) rdma="no" >+ ;; >++ --enable-pvrdma) pvrdma="yes" >++ ;; >++ --disable-pvrdma) pvrdma="no" >++ ;; >+ --with-gtkabi=*) gtkabi="$optarg" >+ ;; >+ --disable-vte) vte="no" >+@@ -1593,7 +1598,8 @@ disabled with --disable-FEATURE, default is enabled if available: >+ hax HAX acceleration support >+ hvf Hypervisor.framework acceleration support >+ whpx Windows Hypervisor Platform acceleration support >+- rdma Enable RDMA-based migration and PVRDMA support >++ rdma Enable RDMA-based migration >++ pvrdma Enable PVRDMA support >+ vde support for vde network >+ netmap support for netmap network >+ linux-aio Linux AIO support >+@@ -2971,6 +2977,48 @@ EOF >+ fi >+ fi >+ >++########################################## >++# PVRDMA detection >++ >++cat > $TMPC <<EOF && >++#include <sys/mman.h> >++ >++int >++main(void) >++{ >++ char buf = 0; >++ void *addr = &buf; >++ addr = mremap(addr, 0, 1, MREMAP_MAYMOVE | MREMAP_FIXED); >++ >++ return 0; >++} >++EOF >++ >++if test "$rdma" = "yes" ; then >++ case "$pvrdma" in >++ "") >++ if compile_prog "" ""; then >++ pvrdma="yes" >++ else >++ pvrdma="no" >++ fi >++ ;; >++ "yes") >++ if ! compile_prog "" ""; then >++ error_exit "PVRDMA is not supported since mremap is not implemented" >++ fi >++ pvrdma="yes" >++ ;; >++ "no") >++ pvrdma="no" >++ ;; >++ esac >++else >++ if test "$pvrdma" = "yes" ; then >++ error_exit "PVRDMA requires rdma suppport" >++ fi >++ pvrdma="no" >++fi >+ >+ ########################################## >+ # VNC SASL detection >+@@ -5820,6 +5868,7 @@ if test "$tcg" = "yes" ; then >+ fi >+ echo "malloc trim support $malloc_trim" >+ echo "RDMA support $rdma" >++echo "PVRDMA support $pvrdma" >+ echo "fdt support $fdt" >+ echo "membarrier $membarrier" >+ echo "preadv support $preadv" >+@@ -6568,6 +6617,10 @@ if test "$rdma" = "yes" ; then >+ echo "RDMA_LIBS=$rdma_libs" >> $config_host_mak >+ fi >+ >++if test "$pvrdma" = "yes" ; then >++ echo "CONFIG_PVRDMA=y" >> $config_host_mak >++fi >++ >+ if test "$have_rtnetlink" = "yes" ; then >+ echo "CONFIG_RTNETLINK=y" >> $config_host_mak >+ fi >+diff --git hw/rdma/Makefile.objs hw/rdma/Makefile.objs >+index 3504c39d21..bd36cbf51c 100644 >+--- hw/rdma/Makefile.objs >++++ hw/rdma/Makefile.objs >+@@ -1,4 +1,4 @@ >+-ifeq ($(CONFIG_RDMA),y) >++ifeq ($(CONFIG_PVRDMA),y) >+ obj-$(CONFIG_PCI) += rdma_utils.o rdma_backend.o rdma_rm.o >+ obj-$(CONFIG_PCI) += vmw/pvrdma_dev_ring.o vmw/pvrdma_cmd.o \ >+ vmw/pvrdma_qp_ops.o vmw/pvrdma_main.o >+diff --git hw/rdma/vmw/pvrdma_cmd.c hw/rdma/vmw/pvrdma_cmd.c >+index 99019d8741..bd14b4bc47 100644 >+--- hw/rdma/vmw/pvrdma_cmd.c >++++ hw/rdma/vmw/pvrdma_cmd.c >+@@ -16,7 +16,6 @@ >+ #include "qemu/osdep.h" >+ #include "qemu/error-report.h" >+ #include "cpu.h" >+-#include <linux/types.h> >+ #include "hw/hw.h" >+ #include "hw/pci/pci.h" >+ #include "hw/pci/pci_ids.h" > >Property changes on: files/patch-rdma-pvrdma-split >___________________________________________________________________ >Added: fbsd:nokeywords >## -0,0 +1 ## >+yes >\ No newline at end of property >Added: svn:eol-style >## -0,0 +1 ## >+native >\ No newline at end of property >Added: svn:mime-type >## -0,0 +1 ## >+text/plain >\ No newline at end of property
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 232968
: 199057