commit c8d614565aa5602711de2d4684f9e0e7693dd313
author SY Chiu <sy.chiu@linaro.org> Thu Sep 17 16:42:17 2015 +0800
committer Pascal Brand <pascal.brand@st.com> Wed Oct 07 15:05:26 2015 +0200
tree cbe986957bd98faadb5eddb9a8dcf74b95106be7
parent 7f43b92bd7eb5c595878edb26721b374f8248b5a

QEMU: open terminal only when soc_term is not launched

Signed-off-by: SY Chiu <sy.chiu@linaro.org>
Tested-by: SY Chiu <sy.chiu@linaro.org> (QEMU)
Reviewed-by: Joakim Bech <joakim.bech@linaro.org>
Reviewed-by: Pascal Brand <pascal.brand@linaro.org>

qemu.mk

diff --git a/qemu.mk b/qemu.mk
index 3e0284b..d278895 100644
--- a/qemu.mk
+++ b/qemu.mk
@@ -191,6 +191,11 @@
 	@echo xtest 2001
 endef
 
+define launch-terminal
+	@nc -z  127.0.0.1 $(1) || \
+	gnome-terminal -e "$(BASH) -c '$(SOC_TERM_PATH)/soc_term $(1); exec /bin/bash -i'" --title=$(2)
+endef
+
 .PHONY: run
 # This target enforces updating root fs etc
 run: all
@@ -199,8 +204,8 @@
 .PHONY: run-only
 run-only:
 	$(call run-help)
-	@gnome-terminal -e "$(BASH) -c '$(SOC_TERM_PATH)/soc_term 54320; exec /bin/bash -i'" --title="Normal world"
-	@gnome-terminal -e "$(BASH) -c '$(SOC_TERM_PATH)/soc_term 54321; exec /bin/bash -i'" --title="Secure world"
+	$(call launch-terminal,54320,"Normal World")
+	$(call launch-terminal,54321,"Secure World")
 	@sleep 1
 	$(QEMU_PATH)/arm-softmmu/qemu-system-arm \
 		-nographic \