* [Qemu-devel] [PATCH 0/2] acpi-build: trivial fixes
@ 2014-11-13 2:59 arei.gonglei
2014-11-13 2:59 ` [Qemu-devel] [PATCH 1/2] acpi-build: adjust indention 8 -> 4 spaces arei.gonglei
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: arei.gonglei @ 2014-11-13 2:59 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, pbonzini, Gonglei, peter.huangpeng, mst
From: Gonglei <arei.gonglei@huawei.com>
Those two fixes make sence and have no risk for
being applied in qemu-2.2 release version.
Thanks,
Gonglei (2):
acpi-build: adjust indention 8 -> 4 spaces
acpi-build: Make DPRINTF working for acpi-build
hw/i386/acpi-build.c | 22 ++++++++++++++--------
1 file changed, 14 insertions(+), 8 deletions(-)
--
1.7.12.4
^ permalink raw reply [flat|nested] 6+ messages in thread* [Qemu-devel] [PATCH 1/2] acpi-build: adjust indention 8 -> 4 spaces 2014-11-13 2:59 [Qemu-devel] [PATCH 0/2] acpi-build: trivial fixes arei.gonglei @ 2014-11-13 2:59 ` arei.gonglei 2014-11-13 2:59 ` [Qemu-devel] [PATCH 2/2] acpi-build: Make DPRINTF working for acpi-build arei.gonglei 2014-12-10 8:18 ` [Qemu-devel] [Qemu-trivial] [PATCH 0/2] acpi-build: trivial fixes Michael Tokarev 2 siblings, 0 replies; 6+ messages in thread From: arei.gonglei @ 2014-11-13 2:59 UTC (permalink / raw) To: qemu-devel; +Cc: qemu-trivial, pbonzini, Gonglei, peter.huangpeng, mst From: Gonglei <arei.gonglei@huawei.com> Signed-off-by: Gonglei <arei.gonglei@huawei.com> --- hw/i386/acpi-build.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index 4003b6b..4ab44bf 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -272,12 +272,12 @@ build_header(GArray *linker, GArray *table_data, static inline GArray *build_alloc_array(void) { - return g_array_new(false, true /* clear */, 1); + return g_array_new(false, true /* clear */, 1); } static inline void build_free_array(GArray *array) { - g_array_free(array, true); + g_array_free(array, true); } static inline void build_prepend_byte(GArray *array, uint8_t val) -- 1.7.12.4 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Qemu-devel] [PATCH 2/2] acpi-build: Make DPRINTF working for acpi-build 2014-11-13 2:59 [Qemu-devel] [PATCH 0/2] acpi-build: trivial fixes arei.gonglei 2014-11-13 2:59 ` [Qemu-devel] [PATCH 1/2] acpi-build: adjust indention 8 -> 4 spaces arei.gonglei @ 2014-11-13 2:59 ` arei.gonglei 2014-11-13 8:01 ` Markus Armbruster 2014-12-10 8:18 ` [Qemu-devel] [Qemu-trivial] [PATCH 0/2] acpi-build: trivial fixes Michael Tokarev 2 siblings, 1 reply; 6+ messages in thread From: arei.gonglei @ 2014-11-13 2:59 UTC (permalink / raw) To: qemu-devel; +Cc: qemu-trivial, pbonzini, Gonglei, peter.huangpeng, mst From: Gonglei <arei.gonglei@huawei.com> Signed-off-by: Gonglei <arei.gonglei@huawei.com> --- 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 4ab44bf..8cec9aa 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -67,6 +67,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; @@ -245,8 +253,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" @@ -1573,7 +1579,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 */, @@ -1751,17 +1757,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; } -- 1.7.12.4 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH 2/2] acpi-build: Make DPRINTF working for acpi-build 2014-11-13 2:59 ` [Qemu-devel] [PATCH 2/2] acpi-build: Make DPRINTF working for acpi-build arei.gonglei @ 2014-11-13 8:01 ` Markus Armbruster 2014-11-13 8:10 ` Gonglei 0 siblings, 1 reply; 6+ messages in thread From: Markus Armbruster @ 2014-11-13 8:01 UTC (permalink / raw) To: arei.gonglei; +Cc: qemu-trivial, pbonzini, mst, qemu-devel, peter.huangpeng <arei.gonglei@huawei.com> writes: > From: Gonglei <arei.gonglei@huawei.com> > > Signed-off-by: Gonglei <arei.gonglei@huawei.com> > --- > 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 4ab44bf..8cec9aa 100644 > --- a/hw/i386/acpi-build.c > +++ b/hw/i386/acpi-build.c > @@ -67,6 +67,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; > @@ -245,8 +253,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" Have you considered replacing ACPI_BUILD_DPRINTF() by tracepoints? [...] ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH 2/2] acpi-build: Make DPRINTF working for acpi-build 2014-11-13 8:01 ` Markus Armbruster @ 2014-11-13 8:10 ` Gonglei 0 siblings, 0 replies; 6+ messages in thread From: Gonglei @ 2014-11-13 8:10 UTC (permalink / raw) To: Markus Armbruster Cc: qemu-trivial@nongnu.org, pbonzini@redhat.com, mst@redhat.com, qemu-devel@nongnu.org, Huangpeng (Peter) On 2014/11/13 16:01, Markus Armbruster wrote: > <arei.gonglei@huawei.com> writes: > >> From: Gonglei <arei.gonglei@huawei.com> >> >> Signed-off-by: Gonglei <arei.gonglei@huawei.com> >> --- >> 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 4ab44bf..8cec9aa 100644 >> --- a/hw/i386/acpi-build.c >> +++ b/hw/i386/acpi-build.c >> @@ -67,6 +67,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; >> @@ -245,8 +253,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" > > Have you considered replacing ACPI_BUILD_DPRINTF() by tracepoints? > > [...] Not yet. I just think the change is simpler at this time ;) Maybe we can improve the file's log by tracing framework. Best regards, -Gonglei ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [Qemu-trivial] [PATCH 0/2] acpi-build: trivial fixes 2014-11-13 2:59 [Qemu-devel] [PATCH 0/2] acpi-build: trivial fixes arei.gonglei 2014-11-13 2:59 ` [Qemu-devel] [PATCH 1/2] acpi-build: adjust indention 8 -> 4 spaces arei.gonglei 2014-11-13 2:59 ` [Qemu-devel] [PATCH 2/2] acpi-build: Make DPRINTF working for acpi-build arei.gonglei @ 2014-12-10 8:18 ` Michael Tokarev 2 siblings, 0 replies; 6+ messages in thread From: Michael Tokarev @ 2014-12-10 8:18 UTC (permalink / raw) To: arei.gonglei, qemu-devel; +Cc: qemu-trivial, pbonzini, peter.huangpeng, mst 13.11.2014 05:59, arei.gonglei@huawei.com wrote: > Gonglei (2): > acpi-build: adjust indention 8 -> 4 spaces > acpi-build: Make DPRINTF working for acpi-build Applied both to -trivial, thank you! /mjt ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-12-10 8:18 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-11-13 2:59 [Qemu-devel] [PATCH 0/2] acpi-build: trivial fixes arei.gonglei 2014-11-13 2:59 ` [Qemu-devel] [PATCH 1/2] acpi-build: adjust indention 8 -> 4 spaces arei.gonglei 2014-11-13 2:59 ` [Qemu-devel] [PATCH 2/2] acpi-build: Make DPRINTF working for acpi-build arei.gonglei 2014-11-13 8:01 ` Markus Armbruster 2014-11-13 8:10 ` Gonglei 2014-12-10 8:18 ` [Qemu-devel] [Qemu-trivial] [PATCH 0/2] acpi-build: trivial fixes Michael Tokarev
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).