|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [xen stable-4.21] libacpi: drop mk_dsdt's -d / --debug option
commit 52f07993948541b9583c36462be20d2a948d9639
Author: Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Thu Sep 10 12:35:39 2026 +0200
Commit: Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Thu Sep 10 12:35:39 2026 +0200
libacpi: drop mk_dsdt's -d / --debug option
Recent Clang complains about the "debug" static variable only ever being
written to. Drop it and the command line option controlling it.
Fixes: 19ab8356abe4 ("tools: remove support for running a guest with
qemu-traditional")
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
Acked-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
Acked-by: Roger Pau Monné <roger@xxxxxxxxxxxxxx>
master commit: f907784c320da65c912ea04ed9f83f29e59dbd87
master date: 2026-09-07 14:11:35 +0200
---
tools/libacpi/Makefile | 8 ++++----
tools/libacpi/mk_dsdt.c | 7 +------
2 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/tools/libacpi/Makefile b/tools/libacpi/Makefile
index 193ec78672..3b4c3d8c86 100644
--- a/tools/libacpi/Makefile
+++ b/tools/libacpi/Makefile
@@ -43,7 +43,7 @@ $(ACPI_BUILD_DIR)/dsdt_anycpu_qemu_xen.asl: dsdt.asl
dsdt_acpi_info.asl $(MK_DSD
# Remove last bracket
awk 'NR > 1 {print s} {s=$$0}' $< > $@.$(TMP_SUFFIX)
cat dsdt_acpi_info.asl >> $@.$(TMP_SUFFIX)
- $(MK_DSDT) --debug=$(debug) --dm-version qemu-xen >> $@.$(TMP_SUFFIX)
+ $(MK_DSDT) --dm-version qemu-xen >> $@.$(TMP_SUFFIX)
mv -f $@.$(TMP_SUFFIX) $@
# NB. awk invocation is a portable alternative to 'head -n -1'
@@ -51,17 +51,17 @@ $(ACPI_BUILD_DIR)/dsdt_%cpu.asl: dsdt.asl
dsdt_acpi_info.asl $(MK_DSDT)
# Remove last bracket
awk 'NR > 1 {print s} {s=$$0}' $< > $@.$(TMP_SUFFIX)
cat dsdt_acpi_info.asl >> $@.$(TMP_SUFFIX)
- $(MK_DSDT) --debug=$(debug) --maxcpu $* --dm-version qemu-xen >>
$@.$(TMP_SUFFIX)
+ $(MK_DSDT) --maxcpu $* --dm-version qemu-xen >> $@.$(TMP_SUFFIX)
mv -f $@.$(TMP_SUFFIX) $@
$(ACPI_BUILD_DIR)/dsdt_pvh.asl: dsdt_acpi_info.asl $(MK_DSDT)
printf "DefinitionBlock (\"DSDT.aml\", \"DSDT\", 5, \"Xen\", \"HVM\",
0)\n{" > $@
cat dsdt_acpi_info.asl >> $@
- $(MK_DSDT) --debug=$(debug) --maxcpu any --dm-version none >> $@
+ $(MK_DSDT) --maxcpu any --dm-version none >> $@
$(ACPI_BUILD_DIR)/dsdt_anycpu_arm.asl: $(MK_DSDT)
printf "DefinitionBlock (\"DSDT.aml\", \"DSDT\", 3, \"Xen\", \"ARM\",
1)\n{" > $@.$(TMP_SUFFIX)
- $(MK_DSDT) --debug=$(debug) >> $@.$(TMP_SUFFIX)
+ $(MK_DSDT) >> $@.$(TMP_SUFFIX)
mv -f $@.$(TMP_SUFFIX) $@
$(C_SRC): $(ACPI_BUILD_DIR)/%.c: $(ACPI_BUILD_DIR)/%.asl
diff --git a/tools/libacpi/mk_dsdt.c b/tools/libacpi/mk_dsdt.c
index f71de6c8c6..001c3875c3 100644
--- a/tools/libacpi/mk_dsdt.c
+++ b/tools/libacpi/mk_dsdt.c
@@ -15,7 +15,6 @@
#endif
static unsigned int indent_level;
-static bool debug = false;
typedef enum dm_version {
QEMU_NONE,
@@ -73,7 +72,6 @@ static struct option options[] = {
#ifdef CONFIG_X86
{ "dm-version", 1, 0, 'q' },
#endif
- { "debug", 1, 0, 'd' },
{ 0, 0, 0, 0 }
};
@@ -125,10 +123,7 @@ int main(int argc, char **argv)
}
break;
#endif
- case 'd':
- if (*optarg == 'y')
- debug = true;
- break;
+
default:
return -1;
}
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.21
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |