From bbd908025c530b57f57b5c5b739d53e28c1e59fc Mon Sep 17 00:00:00 2001
From: Stefan Weil
Date: Mon, 16 May 2016 15:23:33 +0200
Subject: scripts: Use $(..) instead of deprecated `..`

This fixes these warnings from shellcheck:

    ^-- SC2006: Use $(..) instead of deprecated `..`

Update also a comment using the same pattern.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 scripts/clean-includes | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'scripts/clean-includes')

diff --git a/scripts/clean-includes b/scripts/clean-includes
index 72b47f17f9..adffeddb71 100755
--- a/scripts/clean-includes
+++ b/scripts/clean-includes
@@ -39,7 +39,7 @@
 # However some caution is required regarding files that might be part
 # of the guest agent or standalone tests.
 
-# for i in `git ls-tree --name-only HEAD`  ; do test -f $i && \
+# for i in $(git ls-tree --name-only HEAD) ; do test -f $i && \
 #   grep -E '^# *include' $i | head -1 | grep 'osdep.h' ; test $? != 0 && \
 #   echo $i ; done
 
-- 
cgit v1.2.3-55-g7522


From df891b9197f595e8676885a10e1c1735a4c261ba Mon Sep 17 00:00:00 2001
From: Peter Maydell
Date: Tue, 24 May 2016 16:24:36 +0100
Subject: clean-includes: Add glib.h to list of unneeded includes

osdep.h pulls in glib.h via glib-compat.h, so add it to the list of
includes that we remove. (This then means we must avoid running
clean-includes on glib-compat.h or it will delete the glib.h include.)

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Eric Blake <eblake@redhat.com>
Tested-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
---
 scripts/clean-includes | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'scripts/clean-includes')

diff --git a/scripts/clean-includes b/scripts/clean-includes
index adffeddb71..37b73b5433 100755
--- a/scripts/clean-includes
+++ b/scripts/clean-includes
@@ -104,6 +104,7 @@ for f in "$@"; do
       ;;
     *include/qemu/osdep.h | \
     *include/qemu/compiler.h | \
+    *include/glib-compat.h | \
     *include/standard-headers/ )
       # Removing include lines from osdep.h itself would be counterproductive.
       echo "SKIPPING $f (special case header)"
@@ -143,7 +144,7 @@ for f in "$@"; do
            <setjmp.h> <stdarg.h> <stddef.h> <stdbool.h> <stdint.h> <sys/types.h>
            <stdlib.h> <stdio.h> <string.h> <strings.h> <inttypes.h>
            <limits.h> <unistd.h> <time.h> <ctype.h> <errno.h> <fcntl.h>
-           <sys/stat.h> <sys/time.h> <assert.h> <signal.h>
+           <sys/stat.h> <sys/time.h> <assert.h> <signal.h> <glib.h>
            "sysemu/os-posix.h, sysemu/os-win32.h "glib-compat.h"
            "qemu/typedefs.h"
             ))' "$f"
-- 
cgit v1.2.3-55-g7522