[PATCH 01/13] qemu-kvm: Reduce configure and Makefile.target diff to upstream

Jan Kiszka
2011-06-27T18:20:21Z

From: Jan Kiszka <jan.kiszka@siemens.com>

None of those bits are still required.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
Makefile.target | 2 --
configure | 8 +-------
2 files changed, 1 insertions(+), 9 deletions(-)

diff --git a/Makefile.target b/Makefile.target
index 4989345..43bab8f 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -40,8 +40,6 @@ ifndef CONFIG_HAIKU
LIBS+=-lm
endif

-CFLAGS += $(KVM_CFLAGS)
-
config-target.h: config-target.h-timestamp
config-target.h-timestamp: config-target.mak

diff --git a/configure b/configure
index 1d0641f..15db2a3 100755
--- a/configure
+++ b/configure
@@ -177,7 +177,6 @@ io_thread="yes"
mixemu="no"
kvm_cap_pit="yes"
kvm_cap_device_assignment="yes"
-kerneldir=""
aix="no"
blobs="yes"
pkgversion=" ($(kvm_version))"
@@ -3320,11 +3319,6 @@ case "$target_arch2" in
\( "$target_arch2" = "x86_64" -a "$cpu" = "i386" \) -o \
\( "$target_arch2" = "i386" -a "$cpu" = "x86_64" \) \) ; then
echo "CONFIG_KVM=y" >> $config_target_mak
- echo "CONFIG_THREAD=y" >> $config_host_mak
- echo "KVM_CFLAGS=$kvm_cflags" >> $config_target_mak
- if test "$kvm_para" = "yes"; then
- echo "CONFIG_KVM_PARA=y" >> $config_target_mak
- fi
if test $vhost_net = "yes" ; then
echo "CONFIG_VHOST_NET=y" >> $config_target_mak
fi
@@ -3566,7 +3560,7 @@ for f in $FILES ; do
done

# temporary config to build submodules
-for rom in seabios vgabios; do
+for rom in seabios vgabios ; do
config_mak=roms/$rom/config.mak
echo "# Automatically generated by configure - do not modify" > $config_mak
echo "SRC_PATH=$source_path/roms/$rom" >> $config_mak
--
1.7.1