aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2017-07-13 16:15:52 +0100
committerPeter Maydell <peter.maydell@linaro.org>2017-07-13 16:15:52 +0100
commitaa5a704756fe933d0c87c02657e4406866d36c1d (patch)
treeba9e59449c4e0b11b5832bcf3c48ba69fa669b9b /scripts
parent76fba746ea73c752f0168e511566f74fe4d2d32c (diff)
parenta7a305aee1e9a74a3f4b263aa98babed795b1f0a (diff)
downloadqemu-aa5a704756fe933d0c87c02657e4406866d36c1d.zip
qemu-aa5a704756fe933d0c87c02657e4406866d36c1d.tar.gz
qemu-aa5a704756fe933d0c87c02657e4406866d36c1d.tar.bz2
Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-fetch' into staging
trivial patches for 2017-07-12 # gpg: Signature made Wed 12 Jul 2017 14:58:43 BST # gpg: using RSA key 0x701B4F6B1A693E59 # gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>" # gpg: aka "Michael Tokarev <mjt@corpit.ru>" # gpg: aka "Michael Tokarev <mjt@debian.org>" # Primary key fingerprint: 6EE1 95D1 886E 8FFB 810D 4324 457C E0A0 8044 65C5 # Subkey fingerprint: 7B73 BAD6 8BE7 A2C2 8931 4B22 701B 4F6B 1A69 3E59 * remotes/mjt/tags/trivial-patches-fetch: include/hw/ptimer.h: Add documentation comments hxtool: remove dead -q option qga-win32: Fix memory leak of device information set hw/core: fix missing return value in load_image_targphys_as() elf-loader: warn about invalid endianness configure: Handle having no c++ compiler in FORTIFY_SOURCE check hw/pci: define msi_nonbroken in pci-stub hw/misc: add missing includes configure: Fix build with pkg-config and --static --enable-sdl util/qemu-sockets: Drop unused helper socket_address_to_string() target/xtensa: gdbstub: drop dead return statement Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/hxtool46
1 files changed, 1 insertions, 45 deletions
diff --git a/scripts/hxtool b/scripts/hxtool
index 5468cd7..1e2c97c 100644
--- a/scripts/hxtool
+++ b/scripts/hxtool
@@ -7,7 +7,7 @@ hxtoh()
case $str in
HXCOMM*)
;;
- STEXI*|ETEXI*|SQMP*|EQMP*) flag=$(($flag^1))
+ STEXI*|ETEXI*) flag=$(($flag^1))
;;
*)
test $flag -eq 1 && printf "%s\n" "$str"
@@ -45,12 +45,6 @@ hxtotexi()
fi
flag=0
;;
- SQMP*|EQMP*)
- if test $flag -eq 1 ; then
- printf "line %d: syntax error: expected ETEXI, found '%s'\n" "$line" "$str" >&2
- exit 1
- fi
- ;;
DEFHEADING*)
print_texi_heading "$(expr "$str" : "DEFHEADING(\(.*\))")"
;;
@@ -65,47 +59,9 @@ hxtotexi()
done
}
-hxtoqmp()
-{
- IFS=
- flag=0
- line=1
- while read -r str; do
- case "$str" in
- HXCOMM*)
- ;;
- SQMP*)
- if test $flag -eq 1 ; then
- printf "line %d: syntax error: expected EQMP, found '%s'\n" "$line" "$str" >&2
- exit 1
- fi
- flag=1
- ;;
- EQMP*)
- if test $flag -ne 1 ; then
- printf "line %d: syntax error: expected SQMP, found '%s'\n" "$line" "$str" >&2
- exit 1
- fi
- flag=0
- ;;
- STEXI*|ETEXI*)
- if test $flag -eq 1 ; then
- printf "line %d: syntax error: expected EQMP, found '%s'\n" "$line" "$str" >&2
- exit 1
- fi
- ;;
- *)
- test $flag -eq 1 && printf '%s\n' "$str"
- ;;
- esac
- line=$((line+1))
- done
-}
-
case "$1" in
"-h") hxtoh ;;
"-t") hxtotexi ;;
-"-q") hxtoqmp ;;
*) exit 1 ;;
esac