[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 01/40] scripts: Remove check-qerror.sh
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 01/40] scripts: Remove check-qerror.sh |
Date: |
Mon, 22 Oct 2018 14:33:34 +0200 |
From: Alberto Garcia <address@hidden>
qerror.h contains leftovers from the now-defunct QError API.
There's only a handful of string macros left, and no one is supposed
to add anything else. The check-qerror.sh script was used to make sure
that all definitions on the qerror.c and qerror.h files were sorted
alphabetically. The former was removed three years ago, and the latter
is now in a different location, so the script doesn't even work (as
a matter of fact the alphabetical order was broken last time someone
added a macro -also in 2015- and no one seemed to notice).
There's no point in fixing this script so let's just remove it.
The rogue macro is also moved to its correct location.
Signed-off-by: Alberto Garcia <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
---
include/qapi/qmp/qerror.h | 6 +++---
scripts/check-qerror.sh | 22 ----------------------
2 files changed, 3 insertions(+), 25 deletions(-)
delete mode 100755 scripts/check-qerror.sh
diff --git a/include/qapi/qmp/qerror.h b/include/qapi/qmp/qerror.h
index 145571f618..7c76e24aa7 100644
--- a/include/qapi/qmp/qerror.h
+++ b/include/qapi/qmp/qerror.h
@@ -79,6 +79,9 @@
#define QERR_QGA_COMMAND_FAILED \
"Guest agent command failed, error was '%s'"
+#define QERR_REPLAY_NOT_SUPPORTED \
+ "Record/replay feature is not supported for '%s'"
+
#define QERR_SET_PASSWD_FAILED \
"Could not set password"
@@ -88,7 +91,4 @@
#define QERR_UNSUPPORTED \
"this feature or command is not currently supported"
-#define QERR_REPLAY_NOT_SUPPORTED \
- "Record/replay feature is not supported for '%s'"
-
#endif /* QERROR_H */
diff --git a/scripts/check-qerror.sh b/scripts/check-qerror.sh
deleted file mode 100755
index af7fbd5249..0000000000
--- a/scripts/check-qerror.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-# This script verifies that qerror definitions and table entries are
-# alphabetically ordered.
-
-check_order() {
- errmsg=$1
- shift
-
- # sort -C verifies order but does not print a message. sort -c does print a
- # message. These options are both in POSIX.
- if ! "$@" | sort -C; then
- echo "$errmsg"
- "$@" | sort -c
- exit 1
- fi
- return 0
-}
-
-check_order 'Definitions in qerror.h must be in alphabetical order:' \
- grep '^#define QERR_' qerror.h
-check_order 'Entries in qerror.c:qerror_table must be in alphabetical order:' \
- sed -n '/^static.*qerror_table\[\]/,/^};/s/QERR_/&/gp' qerror.c
--
2.17.2
- [Qemu-devel] [PULL 00/40] Error reporting patches for 2018-10-22, Markus Armbruster, 2018/10/22
- [Qemu-devel] [PULL 04/40] Use error_fatal to simplify obvious fatal errors (again), Markus Armbruster, 2018/10/22
- [Qemu-devel] [PULL 01/40] scripts: Remove check-qerror.sh,
Markus Armbruster <=
- [Qemu-devel] [PULL 03/40] error: Fix use of error_prepend() with &error_fatal, &error_abort, Markus Armbruster, 2018/10/22
- [Qemu-devel] [PULL 05/40] block: Use warn_report() & friends to report warnings, Markus Armbruster, 2018/10/22
- [Qemu-devel] [PULL 12/40] ioapic: Fix error handling in realize(), Markus Armbruster, 2018/10/22
- [Qemu-devel] [PULL 27/40] ui/keymaps: Fix handling of erroneous include files, Markus Armbruster, 2018/10/22
- [Qemu-devel] [PULL 10/40] 9pfs: Fix CLI parsing crash on error, Markus Armbruster, 2018/10/22
- [Qemu-devel] [PULL 25/40] vl: Clean up error reporting in parse_fw_cfg(), Markus Armbruster, 2018/10/22
- [Qemu-devel] [PULL 24/40] vl: Clean up error reporting in mon_init_func(), Markus Armbruster, 2018/10/22
- [Qemu-devel] [PULL 22/40] vl: Clean up error reporting in chardev_init_func(), Markus Armbruster, 2018/10/22
- [Qemu-devel] [PULL 35/40] blockdev: Convert drive_new() to Error, Markus Armbruster, 2018/10/22
- [Qemu-devel] [PULL 39/40] vpc: Fail open on bad header checksum, Markus Armbruster, 2018/10/22