Am 24.09.2012 12:57, schrieb Laurent Desnogues:
On Sat, Sep 22, 2012 at 11:37 PM, Stefan Weil<s...@weilnetz.de> wrote:
Am 14.09.2012 19:02, schrieb Stefan Weil:
The old code aborted configure when no emulation target was selected.
Even after removing the 'exit 1', it tried to read from STDIN
when QEMU was configured with
configure' '--disable-user' '--disable-system'
This is fixed here.
Signed-off-by: Stefan Weil<s...@weilnetz.de>
---
This patch can be applied after 66d5499b3 was reverted.
It also works on top of 66d5499b3. In this case only Makefile
needs modifications, and the configure part of the patch must be removed.
Regards
Stefan Weil
Makefile | 5 +++++
configure | 4 ----
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index 9523e05..d38ac0f 100644
--- a/Makefile
+++ b/Makefile
@@ -52,8 +52,13 @@ SUBDIR_MAKEFLAGS=$(if $(V),,--no-print-directory)
BUILD_DIR=$(BUILD_DIR)
SUBDIR_DEVICES_MAK=$(patsubst %, %/config-devices.mak, $(TARGET_DIRS))
SUBDIR_DEVICES_MAK_DEP=$(patsubst %, %/config-devices.mak.d,
$(TARGET_DIRS))
+ifeq ($(SUBDIR_DEVICES_MAK),)
+config-all-devices.mak:
+ $(call quiet-command,echo '# no devices'> $@," GEN $@")
+else
config-all-devices.mak: $(SUBDIR_DEVICES_MAK)
$(call quiet-command,cat $(SUBDIR_DEVICES_MAK) | grep =y | sort
-u> $@," GEN $@")
+endif
-include $(SUBDIR_DEVICES_MAK_DEP)
diff --git a/configure b/configure
index fc27bd9..a9305f3 100755
--- a/configure
+++ b/configure
@@ -1331,10 +1331,6 @@ if test -z "$target_list" ; then
else
target_list=`echo "$target_list" | sed -e 's/,/ /g'`
fi
-if test -z "$target_list" ; then
- echo "No targets enabled"
- exit 1
-fi
# see if system emulation was really requested
case " $target_list " in
*"-softmmu "*) softmmu=yes
Ping? 66d5499b3 was reverted, so my patch can be applied if nobody objects.
Works fine here.
I think Daniel's original proposal to use some keyword for target-list
is more convenient than having to use both --disable-user and
--disable-system, but that's no big deal :-)
Laurent
Thanks for testing. Support for --target-list= (empty target list
instead of --disable-user --disable-system) also requires the same
modifications and can be implemented by an additional patch.
Stefan