[Qemu-devel] [PATCH 0/2] buildsys: Move vde cflags/libs to per object

[Qemu-devel] [PATCH 0/2] buildsys: Move vde cflags/libs to per object

[Fam Zheng]

Hi Jason,

this is the net/ part of the conversion of library cflags/libs from global
QEMU_CFLAGS and libs_softmmu to per object variables. Please review.

Fam Zheng (2):
  vl: Don't include vde header
  buildsys: Move vde libs to per object

 configure         | 3 +--
 net/Makefile.objs | 2 ++
 vl.c              | 4 ----
 3 files changed, 3 insertions(+), 6 deletions(-)

-- 
2.13.5

[Qemu-devel] [PATCH 1/2] vl: Don't include vde header

[Fam Zheng]

Nothing in vl.c uses anything from the vde package, do remove the
unnecessary include.

Signed-off-by: Fam Zheng <famz@redhat.com>
---
 vl.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/vl.c b/vl.c
index e75757f977..293cd91ec9 100644
--- a/vl.c
+++ b/vl.c
@@ -31,10 +31,6 @@
 #include "sysemu/seccomp.h"
 #endif
 
-#if defined(CONFIG_VDE)
-#include <libvdeplug.h>
-#endif
-
 #ifdef CONFIG_SDL
 #if defined(__APPLE__) || defined(main)
 #include <SDL.h>
-- 
2.13.5

[Qemu-devel] [PATCH 2/2] buildsys: Move vde libs to per object

[Fam Zheng]

Signed-off-by: Fam Zheng <famz@redhat.com>
---
 configure         | 3 +--
 net/Makefile.objs | 2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index fb7e34a901..bc09487668 100755
--- a/configure
+++ b/configure
@@ -2963,8 +2963,6 @@ int main(void)
 EOF
   if compile_prog "" "$vde_libs" ; then
     vde=yes
-    libs_softmmu="$vde_libs $libs_softmmu"
-    libs_tools="$vde_libs $libs_tools"
   else
     if test "$vde" = "yes" ; then
       feature_not_found "vde" "Install vde (Virtual Distributed Ethernet) devel"
@@ -5545,6 +5543,7 @@ if test "$slirp" = "yes" ; then
 fi
 if test "$vde" = "yes" ; then
   echo "CONFIG_VDE=y" >> $config_host_mak
+  echo "VDE_LIBS=$vde_libs" >> $config_host_mak
 fi
 if test "$netmap" = "yes" ; then
   echo "CONFIG_NETMAP=y" >> $config_host_mak
diff --git a/net/Makefile.objs b/net/Makefile.objs
index 67ba5e26fb..64adf32f40 100644
--- a/net/Makefile.objs
+++ b/net/Makefile.objs
@@ -21,3 +21,5 @@ tap-obj-$(CONFIG_SOLARIS) = tap-solaris.o
 tap-obj-y ?= tap-stub.o
 common-obj-$(CONFIG_POSIX) += tap.o $(tap-obj-y)
 common-obj-$(CONFIG_WIN32) += tap-win32.o
+
+vde.o-libs = $(VDE_LIBS)
-- 
2.13.5

Re: [Qemu-devel] [PATCH 0/2] buildsys: Move vde cflags/libs to per object

[Jason Wang]

On 2017年09月07日 16:35, Fam Zheng wrote:
> Hi Jason,
>
> this is the net/ part of the conversion of library cflags/libs from global
> QEMU_CFLAGS and libs_softmmu to per object variables. Please review.
>
> Fam Zheng (2):
>    vl: Don't include vde header
>    buildsys: Move vde libs to per object
>
>   configure         | 3 +--
>   net/Makefile.objs | 2 ++
>   vl.c              | 4 ----
>   3 files changed, 3 insertions(+), 6 deletions(-)
>

Reviewed-by: Jason Wang <jasowang@redhat.com>

Re: [Qemu-devel] [PATCH 0/2] buildsys: Move vde cflags/libs to per object

[Fam Zheng]

On Fri, 09/08 09:59, Jason Wang wrote:
> 
> 
> On 2017年09月07日 16:35, Fam Zheng wrote:
> > Hi Jason,
> > 
> > this is the net/ part of the conversion of library cflags/libs from global
> > QEMU_CFLAGS and libs_softmmu to per object variables. Please review.
> > 
> > Fam Zheng (2):
> >    vl: Don't include vde header
> >    buildsys: Move vde libs to per object
> > 
> >   configure         | 3 +--
> >   net/Makefile.objs | 2 ++
> >   vl.c              | 4 ----
> >   3 files changed, 3 insertions(+), 6 deletions(-)
> > 
> 
> Reviewed-by: Jason Wang <jasowang@redhat.com>
> 

Thanks, I will send a pull request later.

Fam