[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 04/20] acpi-build: Make DPRINTF working for acpi-bu
From: |
Michael Tokarev |
Subject: |
[Qemu-trivial] [PULL 04/20] acpi-build: Make DPRINTF working for acpi-build |
Date: |
Thu, 11 Dec 2014 21:15:52 +0300 |
From: Gonglei <address@hidden>
Signed-off-by: Gonglei <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
hw/i386/acpi-build.c | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 76dfaea..a4d0c0c 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -68,6 +68,14 @@
#define ACPI_BUILD_TABLE_SIZE 0x20000
+/* #define DEBUG_ACPI_BUILD */
+#ifdef DEBUG_ACPI_BUILD
+#define ACPI_BUILD_DPRINTF(fmt, ...) \
+ do {printf("ACPI_BUILD: " fmt, ## __VA_ARGS__); } while (0)
+#else
+#define ACPI_BUILD_DPRINTF(fmt, ...)
+#endif
+
typedef struct AcpiCpuInfo {
DECLARE_BITMAP(found_cpus, ACPI_CPU_HOTPLUG_ID_LIMIT);
} AcpiCpuInfo;
@@ -246,8 +254,6 @@ static void acpi_get_pci_info(PcPciInfo *info)
#define ACPI_BUILD_APPNAME6 "BOCHS "
#define ACPI_BUILD_APPNAME4 "BXPC"
-#define ACPI_BUILD_DPRINTF(level, fmt, ...) do {} while (0)
-
#define ACPI_BUILD_TABLE_FILE "etc/acpi/tables"
#define ACPI_BUILD_RSDP_FILE "etc/acpi/rsdp"
#define ACPI_BUILD_TPMLOG_FILE "etc/tpm/log"
@@ -1569,7 +1575,7 @@ void acpi_build(PcGuestInfo *guest_info, AcpiBuildTables
*tables)
table_offsets = g_array_new(false, true /* clear */,
sizeof(uint32_t));
- ACPI_BUILD_DPRINTF(3, "init ACPI tables\n");
+ ACPI_BUILD_DPRINTF("init ACPI tables\n");
bios_linker_loader_alloc(tables->linker, ACPI_BUILD_TABLE_FILE,
64 /* Ensure FACS is aligned */,
@@ -1750,17 +1756,17 @@ void acpi_setup(PcGuestInfo *guest_info)
AcpiBuildState *build_state;
if (!guest_info->fw_cfg) {
- ACPI_BUILD_DPRINTF(3, "No fw cfg. Bailing out.\n");
+ ACPI_BUILD_DPRINTF("No fw cfg. Bailing out.\n");
return;
}
if (!guest_info->has_acpi_build) {
- ACPI_BUILD_DPRINTF(3, "ACPI build disabled. Bailing out.\n");
+ ACPI_BUILD_DPRINTF("ACPI build disabled. Bailing out.\n");
return;
}
if (!acpi_enabled) {
- ACPI_BUILD_DPRINTF(3, "ACPI disabled. Bailing out.\n");
+ ACPI_BUILD_DPRINTF("ACPI disabled. Bailing out.\n");
return;
}
--
2.1.3
- [Qemu-trivial] [PULL 00/20] Trivial patches for 2014-12-11, Michael Tokarev, 2014/12/11
- [Qemu-trivial] [PULL 05/20] virtio-bus: avoid breaking build when open DEBUG switch, Michael Tokarev, 2014/12/11
- [Qemu-trivial] [PULL 04/20] acpi-build: Make DPRINTF working for acpi-build,
Michael Tokarev <=
- [Qemu-trivial] [PULL 03/20] acpi-build: adjust indention 8 -> 4 spaces, Michael Tokarev, 2014/12/11
- [Qemu-trivial] [PULL 02/20] target-s390x: fix possible out of bounds read, Michael Tokarev, 2014/12/11
- [Qemu-trivial] [PULL 06/20] usb: delete redundant brackets in usb_host_handle_control(), Michael Tokarev, 2014/12/11
- [Qemu-trivial] [PULL 15/20] qapi-schema: fix typo about change-vnc-password, Michael Tokarev, 2014/12/11
- [Qemu-trivial] [PULL 07/20] Drop superfluous conditionals around qemu_opts_del(), Michael Tokarev, 2014/12/11
- [Qemu-trivial] [PULL 14/20] fw_cfg: remove superfluous blank line, Michael Tokarev, 2014/12/11
- [Qemu-trivial] [PULL 01/20] qmp: fix typo in input-send-event examples, Michael Tokarev, 2014/12/11
- [Qemu-trivial] [PULL 19/20] hpet: increase spelling precision, Michael Tokarev, 2014/12/11
- [Qemu-trivial] [PULL 13/20] get_maintainer.pl: Remove the --git-chief-penguins option, Michael Tokarev, 2014/12/11
- [Qemu-trivial] [PULL 11/20] util: Use g_new() & friends where that makes obvious sense, Michael Tokarev, 2014/12/11