[Qemu-devel] [PATCH 15/15] add option to disable virtio drivers

[quintela]

From: Juan Quintela <address@hidden>


Signed-off-by: Juan Quintela <address@hidden>
---
 Makefile.hw     |    2 ++
 Makefile.target |    2 ++
 configure       |    9 +++++++++
 3 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/Makefile.hw b/Makefile.hw
index 6075fd3..3302555 100644
--- a/Makefile.hw
+++ b/Makefile.hw
@@ -16,7 +16,9 @@ CPPFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 
-D_LARGEFILE_SOURCE
 CPPFLAGS+=-I$(SRC_PATH)/fpu

 OBJS=
+ifdef CONFIG_VIRTIO
 OBJS+= virtio.o virtio-pci.o
+endif
 OBJS+= fw_cfg.o
 OBJS+= watchdog.o

diff --git a/Makefile.target b/Makefile.target
index 7240f81..1ba81df 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -498,7 +498,9 @@ OBJS=vl.o osdep.o monitor.o pci.o loader.o machine.o  
gdbstub.o gdbstub-xml.o

 # virtio has to be here due to weird dependency between PCI and virtio-net.
 # need to fix this properly
+ifdef CONFIG_VIRTIO
 OBJS+=virtio-blk.o virtio-balloon.o virtio-net.o virtio-console.o
+endif
 ifdef CONFIG_KVM
 OBJS+=kvm.o kvm-all.o
 endif
diff --git a/configure b/configure
index 5554934..8a6660d 100755
--- a/configure
+++ b/configure
@@ -195,6 +195,7 @@ usb="yes"
 smb="yes"
 scsi="yes"
 vmware="no"
+virtio="yes"
 kerneldir=""
 aix="no"
 blobs="yes"
@@ -454,6 +455,8 @@ for opt do
   ;;
   --disable-vmware) vmware="no"
   ;;
+  --disable-virtio) virtio="no"
+  ;;
   --disable-kvm) kvm="no"
   ;;
   --enable-profiler) profiler="yes"
@@ -649,6 +652,7 @@ echo "  --disable-usb            disable usb stack 
connectivity"
 echo "  --disable-smb            disable smb directories support"
 echo "  --disable-scsi           disable scsi support"
 echo "  --disable-vmware         disable vmware devices"
+echo "  --disable-virtio         disable virtio devices"
 echo "  --disable-kvm            disable KVM acceleration support"
 echo "  --disable-nptl           disable usermode NPTL support"
 echo "  --enable-system          enable all system emulation targets"
@@ -1476,6 +1480,7 @@ echo "usb support       $usb"
 echo "smb directories   $smb"
 echo "scsi support      $scsi"
 echo "vwmare devices    $vmware"
+echo "virtio devices    $virtio"

 if test $sdl_too_old = "yes"; then
 echo "-> Your SDL version is too old - please upgrade to have SDL support"
@@ -1809,6 +1814,10 @@ if test "$vmware" = "yes" ; then
   echo "#define CONFIG_VMWARE 1" >> $config_h
   echo "CONFIG_VMWARE=yes" >> $config_mak
 fi
+if test "$virtio" = "yes" ; then
+  echo "#define CONFIG_VIRTIO 1" >> $config_h
+  echo "CONFIG_VIRTIO=yes" >> $config_mak
+fi
 if test "$aio" = "yes" ; then
   echo "#define CONFIG_AIO 1" >> $config_h
   echo "CONFIG_AIO=yes" >> $config_mak
-- 
1.6.2.2