mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
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: 19ab8356ab ("tools: remove support for running a guest with qemu-traditional")
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Roger Pau Monné <roger@xenproject.org>
This commit is contained in:
1 parent
44a6486a4f
commit
f907784c32
2 files changed
+5
-10
No files matched your search
@@ -43,7 +43,7 @@ $(ACPI_BUILD_DIR)/dsdt_anycpu_qemu_xen.asl: dsdt.asl dsdt_acpi_info.asl $(MK_DSD
|
|||||||
# Remove last bracket
|
# Remove last bracket
|
||||||
awk 'NR > 1 {print s} {s=$$0}' $< > $@.$(TMP_SUFFIX)
|
awk 'NR > 1 {print s} {s=$$0}' $< > $@.$(TMP_SUFFIX)
|
||||||
cat dsdt_acpi_info.asl >> $@.$(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) $@
|
mv -f $@.$(TMP_SUFFIX) $@
|
||||||
|
|
||||||
# NB. awk invocation is a portable alternative to 'head -n -1'
|
# 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
|
# Remove last bracket
|
||||||
awk 'NR > 1 {print s} {s=$$0}' $< > $@.$(TMP_SUFFIX)
|
awk 'NR > 1 {print s} {s=$$0}' $< > $@.$(TMP_SUFFIX)
|
||||||
cat dsdt_acpi_info.asl >> $@.$(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) $@
|
mv -f $@.$(TMP_SUFFIX) $@
|
||||||
|
|
||||||
$(ACPI_BUILD_DIR)/dsdt_pvh.asl: dsdt_acpi_info.asl $(MK_DSDT)
|
$(ACPI_BUILD_DIR)/dsdt_pvh.asl: dsdt_acpi_info.asl $(MK_DSDT)
|
||||||
printf "DefinitionBlock (\"DSDT.aml\", \"DSDT\", 5, \"Xen\", \"HVM\", 0)\n{" > $@
|
printf "DefinitionBlock (\"DSDT.aml\", \"DSDT\", 5, \"Xen\", \"HVM\", 0)\n{" > $@
|
||||||
cat dsdt_acpi_info.asl >> $@
|
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)
|
$(ACPI_BUILD_DIR)/dsdt_anycpu_arm.asl: $(MK_DSDT)
|
||||||
printf "DefinitionBlock (\"DSDT.aml\", \"DSDT\", 3, \"Xen\", \"ARM\", 1)\n{" > $@.$(TMP_SUFFIX)
|
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) $@
|
mv -f $@.$(TMP_SUFFIX) $@
|
||||||
|
|
||||||
$(C_SRC): $(ACPI_BUILD_DIR)/%.c: $(ACPI_BUILD_DIR)/%.asl
|
$(C_SRC): $(ACPI_BUILD_DIR)/%.c: $(ACPI_BUILD_DIR)/%.asl
|
||||||
|
|||||||
@@ -15,7 +15,6 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
static unsigned int indent_level;
|
static unsigned int indent_level;
|
||||||
static bool debug = false;
|
|
||||||
|
|
||||||
typedef enum dm_version {
|
typedef enum dm_version {
|
||||||
QEMU_NONE,
|
QEMU_NONE,
|
||||||
@@ -73,7 +72,6 @@ static struct option options[] = {
|
|||||||
#ifdef CONFIG_X86
|
#ifdef CONFIG_X86
|
||||||
{ "dm-version", 1, 0, 'q' },
|
{ "dm-version", 1, 0, 'q' },
|
||||||
#endif
|
#endif
|
||||||
{ "debug", 1, 0, 'd' },
|
|
||||||
{ 0, 0, 0, 0 }
|
{ 0, 0, 0, 0 }
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -125,10 +123,7 @@ int main(int argc, char **argv)
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
case 'd':
|
|
||||||
if (*optarg == 'y')
|
|
||||||
debug = true;
|
|
||||||
break;
|
|
||||||
default:
|
default:
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|||||||