| Message ID | 1361451293-5181-10-git-send-email-qemulist@gmail.com |
|---|---|
| State | New |
| Headers | show |
Il 21/02/2013 13:54, Liu Ping Fan ha scritto: > From: Liu Ping Fan <pingfank@linux.vnet.ibm.com> I'd rather remove the virtio-blk dataplane configure option instead. :) Paolo > Signed-off-by: Liu Ping Fan <pingfank@linux.vnet.ibm.com> > --- > configure | 12 ++++++++++++ > hw/dataplane/Makefile.objs | 4 +++- > 2 files changed, 15 insertions(+), 1 deletions(-) > > diff --git a/configure b/configure > index 837a84a..8d9c09b 100755 > --- a/configure > +++ b/configure > @@ -224,6 +224,7 @@ coroutine="" > seccomp="" > glusterfs="" > virtio_blk_data_plane="" > +virtio_net_data_plane="" > > # parse CC options first > for opt do > @@ -887,6 +888,10 @@ for opt do > ;; > --enable-virtio-blk-data-plane) virtio_blk_data_plane="yes" > ;; > + --disable-virtio-net-data-plane) virtio_net_data_plane="no" > + ;; > + --enable-virtio-net-data-plane) virtio_net_data_plane="yes" > + ;; > *) echo "ERROR: unknown option $opt"; show_help="yes" > ;; > esac > @@ -3305,6 +3310,7 @@ echo "seccomp support $seccomp" > echo "coroutine backend $coroutine_backend" > echo "GlusterFS support $glusterfs" > echo "virtio-blk-data-plane $virtio_blk_data_plane" > +echo "virtio-net-data-plane $virtio_net_data_plane" > > if test "$sdl_too_old" = "yes"; then > echo "-> Your SDL version is too old - please upgrade to have SDL support" > @@ -3653,9 +3659,15 @@ if test "$glusterfs" = "yes" ; then > fi > > if test "$virtio_blk_data_plane" = "yes" ; then > + echo "CONFIG_VIRTIO_DATA_PLANE=y" >> $config_host_mak > echo "CONFIG_VIRTIO_BLK_DATA_PLANE=y" >> $config_host_mak > fi > > +if test "$virtio_net_data_plane" = "yes" ; then > + echo "CONFIG_VIRTIO_DATA_PLANE=y" >> $config_host_mak > + echo "CONFIG_VIRTIO_NET_DATA_PLANE=y" >> $config_host_mak > +fi > + > # USB host support > case "$usb" in > linux) > diff --git a/hw/dataplane/Makefile.objs b/hw/dataplane/Makefile.objs > index 3e47d05..7fa73bd 100644 > --- a/hw/dataplane/Makefile.objs > +++ b/hw/dataplane/Makefile.objs > @@ -1 +1,3 @@ > -obj-$(CONFIG_VIRTIO_BLK_DATA_PLANE) += hostmem.o vring.o event-poll.o ioq.o virtio-blk.o > +obj-$(CONFIG_VIRTIO_DATA_PLANE) += hostmem.o vring.o event-poll.o > +obj-$(CONFIG_VIRTIO_BLK_DATA_PLANE) += virtio-blk.o ioq.o > +obj-$(CONFIG_VIRTIO_NET_DATA_PLANE) += virtio-net.o >
diff --git a/configure b/configure index 837a84a..8d9c09b 100755 --- a/configure +++ b/configure @@ -224,6 +224,7 @@ coroutine="" seccomp="" glusterfs="" virtio_blk_data_plane="" +virtio_net_data_plane="" # parse CC options first for opt do @@ -887,6 +888,10 @@ for opt do ;; --enable-virtio-blk-data-plane) virtio_blk_data_plane="yes" ;; + --disable-virtio-net-data-plane) virtio_net_data_plane="no" + ;; + --enable-virtio-net-data-plane) virtio_net_data_plane="yes" + ;; *) echo "ERROR: unknown option $opt"; show_help="yes" ;; esac @@ -3305,6 +3310,7 @@ echo "seccomp support $seccomp" echo "coroutine backend $coroutine_backend" echo "GlusterFS support $glusterfs" echo "virtio-blk-data-plane $virtio_blk_data_plane" +echo "virtio-net-data-plane $virtio_net_data_plane" if test "$sdl_too_old" = "yes"; then echo "-> Your SDL version is too old - please upgrade to have SDL support" @@ -3653,9 +3659,15 @@ if test "$glusterfs" = "yes" ; then fi if test "$virtio_blk_data_plane" = "yes" ; then + echo "CONFIG_VIRTIO_DATA_PLANE=y" >> $config_host_mak echo "CONFIG_VIRTIO_BLK_DATA_PLANE=y" >> $config_host_mak fi +if test "$virtio_net_data_plane" = "yes" ; then + echo "CONFIG_VIRTIO_DATA_PLANE=y" >> $config_host_mak + echo "CONFIG_VIRTIO_NET_DATA_PLANE=y" >> $config_host_mak +fi + # USB host support case "$usb" in linux) diff --git a/hw/dataplane/Makefile.objs b/hw/dataplane/Makefile.objs index 3e47d05..7fa73bd 100644 --- a/hw/dataplane/Makefile.objs +++ b/hw/dataplane/Makefile.objs @@ -1 +1,3 @@ -obj-$(CONFIG_VIRTIO_BLK_DATA_PLANE) += hostmem.o vring.o event-poll.o ioq.o virtio-blk.o +obj-$(CONFIG_VIRTIO_DATA_PLANE) += hostmem.o vring.o event-poll.o +obj-$(CONFIG_VIRTIO_BLK_DATA_PLANE) += virtio-blk.o ioq.o +obj-$(CONFIG_VIRTIO_NET_DATA_PLANE) += virtio-net.o