From 3f8d46e42bb9bf77cde93f00d1ca3c81d78f2a8b Mon Sep 17 00:00:00 2001
From: Juan Quintela <quintela@redhat.com>
Date: Tue, 21 Jul 2009 22:27:07 +0200
Subject: [PATCH 03/16] disable isapc

Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-Id: <990391e93a5cbff18e7a16fc3b62d7f201ebbab0.1248207931.git.quintela@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Bugzilla: 512837
Message-Id: <990391e93a5cbff18e7a16fc3b62d7f201ebbab0.1248095797.git.quintela@redhat.com>
Acked-by: "Daniel P. Berrange" <berrange@redhat.com>
Acked-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Luiz Capitulino <lcapitulino@redhat.com> (conditional on feature unwanted)
---
 qemu/configure             |    8 ++++++++
 qemu/target-i386/machine.c |    2 ++
 2 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/qemu/configure b/qemu/configure
index afb4efc..56ebe01 100755
--- a/qemu/configure
+++ b/qemu/configure
@@ -176,6 +176,7 @@ mixemu="no"
 bluez="yes"
 smb="yes"
 scsi="yes"
+isapc="yes"
 kvm="yes"
 kvm_cap_pit="no"
 kvm_cap_device_assignment="no"
@@ -409,6 +410,8 @@ for opt do
   ;;
   --disable-scsi) scsi="no"
   ;;
+  --disable-isapc) isapc="no"
+  ;;
   --disable-kvm) kvm="no"
   ;;
   --enable-profiler) profiler="yes"
@@ -563,6 +566,7 @@ echo "  --disable-curses         disable curses output"
 echo "  --disable-bluez          disable bluez stack connectivity"
 echo "  --disable-smb            disable smb user directories"
 echo "  --disable-scsi           disable scsi devices"
+echo "  --disable-isapc          disable isapc machine"
 echo "  --disable-kvm            disable KVM acceleration support"
 echo "  --disable-nptl           disable usermode NPTL support"
 echo "  --enable-system          enable all system emulation targets"
@@ -1294,6 +1298,7 @@ echo "QXL               $qxl"
 echo "Spice             $spice"
 echo "SMB directores    $smb"
 echo "SCSI devices      $scsi"
+echo "ISAPC support     $isapc"
 
 if test $sdl_too_old = "yes"; then
 echo "-> Your SDL version is too old - please upgrade to have SDL support"
@@ -1587,6 +1592,9 @@ if test "$scsi" = "yes" ; then
   echo "CONFIG_SCSI=yes" >> $config_mak
   echo "#define CONFIG_SCSI 1" >> $config_h
 fi
+if test "$isapc" = "yes" ; then
+  echo "#define CONFIG_ISAPC 1" >> $config_h
+fi
 if test "$aio" = "yes" ; then
   echo "#define CONFIG_AIO 1" >> $config_h
   echo "CONFIG_AIO=yes" >> $config_mak
diff --git a/qemu/target-i386/machine.c b/qemu/target-i386/machine.c
index 71c0751..4e90c5a 100644
--- a/qemu/target-i386/machine.c
+++ b/qemu/target-i386/machine.c
@@ -9,7 +9,9 @@
 void register_machines(void)
 {
     qemu_register_machine(&pc_machine);
+#ifdef CONFIG_ISAPC
     qemu_register_machine(&isapc_machine);
+#endif
 }
 
 static void cpu_put_seg(QEMUFile *f, SegmentCache *dt)
-- 
1.6.3.rc4.29.g8146