* [PATCH v3 02/16] x86: Convert debug printfs to QEMU_DPRINTF
[not found] <1400367823-32610-1-git-send-email-marc.mari.barcelo@gmail.com>
@ 2014-05-17 23:03 ` Marc Marí
2014-05-19 15:35 ` [Qemu-devel] " Eric Blake
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Marc Marí @ 2014-05-17 23:03 UTC (permalink / raw)
To: qemu-devel
Cc: Peter Crosthwaite, Andreas Färber, Stefan Hajnoczi,
Marc Marí, open list:X86, open list:X86
Modify debug macros to have the same format through the codebase and use regular
ifs instead of ifdef.
Signed-off-by: Marc Marí <marc.mari.barcelo@gmail.com>
---
hw/i386/kvm/pci-assign.c | 11 ++++++-----
hw/i386/multiboot.c | 7 +++++--
target-i386/kvm.c | 9 +++++----
xen-hvm.c | 9 +++++----
xen-mapcache.c | 9 +++++----
5 files changed, 26 insertions(+), 19 deletions(-)
diff --git a/hw/i386/kvm/pci-assign.c b/hw/i386/kvm/pci-assign.c
index de33657..21330a9 100644
--- a/hw/i386/kvm/pci-assign.c
+++ b/hw/i386/kvm/pci-assign.c
@@ -51,14 +51,15 @@
//#define DEVICE_ASSIGNMENT_DEBUG
#ifdef DEVICE_ASSIGNMENT_DEBUG
-#define DEBUG(fmt, ...) \
- do { \
- fprintf(stderr, "%s: " fmt, __func__ , __VA_ARGS__); \
- } while (0)
+#define DEVICE_ASSIGNMENT_DEBUG_ENABLED 1
#else
-#define DEBUG(fmt, ...)
+#define DEVICE_ASSIGNMENT_DEBUG_ENABLED 0
#endif
+#define DEBUG(fmt, ...) \
+ QEMU_DPRINTF(DEVICE_ASSIGNMENT_DEBUG_ENABLED, \
+ "pci_assign", fmt, ## __VA_ARGS__)
+
typedef struct PCIRegion {
int type; /* Memory or port I/O */
int valid;
diff --git a/hw/i386/multiboot.c b/hw/i386/multiboot.c
index 985ca1e..cd04339 100644
--- a/hw/i386/multiboot.c
+++ b/hw/i386/multiboot.c
@@ -33,11 +33,14 @@
//#define DEBUG_MULTIBOOT
#ifdef DEBUG_MULTIBOOT
-#define mb_debug(a...) fprintf(stderr, ## a)
+#define DEBUG_MULTIBOOT_ENABLED 1
#else
-#define mb_debug(a...)
+#define DEBUG_MULTIBOOT_ENABLED 0
#endif
+#define mb_debug(...) \
+ QEMU_DPRINTF(DEBUG_MULTIBOOT_ENABLED, "i386 multiboot", __VA_ARGS__)
+
#define MULTIBOOT_STRUCT_ADDR 0x9000
#if MULTIBOOT_STRUCT_ADDR > 0xf0000
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index 0d894ef..53098ad 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -39,13 +39,14 @@
//#define DEBUG_KVM
#ifdef DEBUG_KVM
-#define DPRINTF(fmt, ...) \
- do { fprintf(stderr, fmt, ## __VA_ARGS__); } while (0)
+#define DEBUG_KVM_ENABLED 1
#else
-#define DPRINTF(fmt, ...) \
- do { } while (0)
+#define DEBUG_KVM_ENABLED 0
#endif
+#define DPRINTF(fmt, ...) \
+ QEMU_DPRINTF(DEBUG_KVM_ENABLED, "i386 kvm", fmt, ## __VA_ARGS__)
+
#define MSR_KVM_WALL_CLOCK 0x11
#define MSR_KVM_SYSTEM_TIME 0x12
diff --git a/xen-hvm.c b/xen-hvm.c
index a64486c..a0d0bf1 100644
--- a/xen-hvm.c
+++ b/xen-hvm.c
@@ -29,13 +29,14 @@
//#define DEBUG_XEN_HVM
#ifdef DEBUG_XEN_HVM
-#define DPRINTF(fmt, ...) \
- do { fprintf(stderr, "xen: " fmt, ## __VA_ARGS__); } while (0)
+#define DEBUG_XEN_HVM_ENABLED 1
#else
-#define DPRINTF(fmt, ...) \
- do { } while (0)
+#define DEBUG_XEN_HVM_ENABLED 0
#endif
+#define DPRINTF(fmt, ...) \
+ QEMU_DPRINTF(DEBUG_XEN_HVM_ENABLED, "xen", fmt, ## __VA_ARGS__)
+
static MemoryRegion ram_memory, ram_640k, ram_lo, ram_hi;
static MemoryRegion *framebuffer;
static bool xen_in_migration;
diff --git a/xen-mapcache.c b/xen-mapcache.c
index eda914a..c6a72c5 100644
--- a/xen-mapcache.c
+++ b/xen-mapcache.c
@@ -26,13 +26,14 @@
//#define MAPCACHE_DEBUG
#ifdef MAPCACHE_DEBUG
-# define DPRINTF(fmt, ...) do { \
- fprintf(stderr, "xen_mapcache: " fmt, ## __VA_ARGS__); \
-} while (0)
+#define MAPCACHE_DEBUG_ENABLED 1
#else
-# define DPRINTF(fmt, ...) do { } while (0)
+#define MAPCACHE_DEBUG_ENABLED 0
#endif
+#define DPRINTF(fmt, ...) \
+ QEMU_DPRINTF(MAPCACHE_DEBUG_ENABLED, "xen_mapcache", fmt, ## __VA_ARGS__)
+
#if defined(__i386__)
# define MCACHE_BUCKET_SHIFT 16
# define MCACHE_MAX_SIZE (1UL<<31) /* 2GB Cap */
--
1.7.10.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH v3 02/16] x86: Convert debug printfs to QEMU_DPRINTF
2014-05-17 23:03 ` [PATCH v3 02/16] x86: Convert debug printfs to QEMU_DPRINTF Marc Marí
@ 2014-05-19 15:35 ` Eric Blake
2014-05-19 15:45 ` Eric Blake
2014-05-19 15:48 ` Eric Blake
2 siblings, 0 replies; 4+ messages in thread
From: Eric Blake @ 2014-05-19 15:35 UTC (permalink / raw)
To: Marc Marí, qemu-devel
Cc: Stefan Hajnoczi, Peter Crosthwaite, X86, Andreas Färber, X86
[-- Attachment #1.1: Type: text/plain, Size: 1482 bytes --]
On 05/17/2014 05:03 PM, Marc Marí wrote:
> Modify debug macros to have the same format through the codebase and use regular
> ifs instead of ifdef.
>
> Signed-off-by: Marc Marí <marc.mari.barcelo@gmail.com>
> ---
> hw/i386/kvm/pci-assign.c | 11 ++++++-----
> hw/i386/multiboot.c | 7 +++++--
> target-i386/kvm.c | 9 +++++----
> xen-hvm.c | 9 +++++----
> xen-mapcache.c | 9 +++++----
> 5 files changed, 26 insertions(+), 19 deletions(-)
>
> #ifdef DEVICE_ASSIGNMENT_DEBUG
> -#define DEBUG(fmt, ...) \
> - do { \
> - fprintf(stderr, "%s: " fmt, __func__ , __VA_ARGS__); \
> - } while (0)
> +#define DEVICE_ASSIGNMENT_DEBUG_ENABLED 1
> #else
> -#define DEBUG(fmt, ...)
> +#define DEVICE_ASSIGNMENT_DEBUG_ENABLED 0
> #endif
>
> +#define DEBUG(fmt, ...) \
> + QEMU_DPRINTF(DEVICE_ASSIGNMENT_DEBUG_ENABLED, \
> + "pci_assign", fmt, ## __VA_ARGS__)
> +
Style - you are replacing aligned \ continuation with one-space \
continuation. I don't know if we have a distinct preference, but it's
probably better to leave the style unchanged if checkpatch.pl doesn't
complain about either way.
As that's minor,
Reviewed-by: Eric Blake <eblake@redhat.com>
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]
[-- Attachment #2: Type: text/plain, Size: 126 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH v3 02/16] x86: Convert debug printfs to QEMU_DPRINTF
2014-05-17 23:03 ` [PATCH v3 02/16] x86: Convert debug printfs to QEMU_DPRINTF Marc Marí
2014-05-19 15:35 ` [Qemu-devel] " Eric Blake
@ 2014-05-19 15:45 ` Eric Blake
2014-05-19 15:48 ` Eric Blake
2 siblings, 0 replies; 4+ messages in thread
From: Eric Blake @ 2014-05-19 15:45 UTC (permalink / raw)
To: Marc Marí, qemu-devel
Cc: Stefan Hajnoczi, Peter Crosthwaite, X86, Andreas Färber, X86
[-- Attachment #1.1: Type: text/plain, Size: 1921 bytes --]
[resend, because my first attempt got:
----- The following addresses had permanent fatal errors -----
<qemu-devel@nongnu.org>
(reason: 550 Invalid address in message header)
I think it was complaining about:
CC: open list:X86 <xen-devel@lists.xensource.com>
CC: open list:X86 <kvm@vger.kernel.org>
where the RFCs say you should enclose : inside "", as in:
CC: "open list:X86" <...>
to be fully compliant.]
On 05/17/2014 05:03 PM, Marc Marí wrote:
> Modify debug macros to have the same format through the codebase and use regular
> ifs instead of ifdef.
>
> Signed-off-by: Marc Marí <marc.mari.barcelo@gmail.com>
> ---
> hw/i386/kvm/pci-assign.c | 11 ++++++-----
> hw/i386/multiboot.c | 7 +++++--
> target-i386/kvm.c | 9 +++++----
> xen-hvm.c | 9 +++++----
> xen-mapcache.c | 9 +++++----
> 5 files changed, 26 insertions(+), 19 deletions(-)
>
> #ifdef DEVICE_ASSIGNMENT_DEBUG
> -#define DEBUG(fmt, ...) \
> - do { \
> - fprintf(stderr, "%s: " fmt, __func__ , __VA_ARGS__); \
> - } while (0)
> +#define DEVICE_ASSIGNMENT_DEBUG_ENABLED 1
> #else
> -#define DEBUG(fmt, ...)
> +#define DEVICE_ASSIGNMENT_DEBUG_ENABLED 0
> #endif
>
> +#define DEBUG(fmt, ...) \
> + QEMU_DPRINTF(DEVICE_ASSIGNMENT_DEBUG_ENABLED, \
> + "pci_assign", fmt, ## __VA_ARGS__)
> +
Style - you are replacing aligned \ continuation with one-space \
continuation. I don't know if we have a distinct preference, but it's
probably better to leave the style unchanged if checkpatch.pl doesn't
complain about either way.
As that's minor,
Reviewed-by: Eric Blake <eblake@redhat.com>
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]
[-- Attachment #2: Type: text/plain, Size: 126 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH v3 02/16] x86: Convert debug printfs to QEMU_DPRINTF
2014-05-17 23:03 ` [PATCH v3 02/16] x86: Convert debug printfs to QEMU_DPRINTF Marc Marí
2014-05-19 15:35 ` [Qemu-devel] " Eric Blake
2014-05-19 15:45 ` Eric Blake
@ 2014-05-19 15:48 ` Eric Blake
2 siblings, 0 replies; 4+ messages in thread
From: Eric Blake @ 2014-05-19 15:48 UTC (permalink / raw)
To: Marc Marí, qemu-devel@nongnu.org
Cc: Peter Crosthwaite, xen-devel, kvm, Stefan Hajnoczi,
Andreas Färber
[-- Attachment #1: Type: text/plain, Size: 1906 bytes --]
[resend, because I got:
----- The following addresses had permanent fatal errors -----
<qemu-devel@nongnu.org>
(reason: 550 Invalid address in message header)
I think it was complaining about:
CC: open list:X86 <xen-devel@lists.xensource.com>
CC: open list:X86 <kvm@vger.kernel.org>
where the RFCs say you should enclose : inside "", as in:
CC: "open list:X86" <...>
to be fully compliant.]
On 05/17/2014 05:03 PM, Marc Marí wrote:
> Modify debug macros to have the same format through the codebase and use regular
> ifs instead of ifdef.
>
> Signed-off-by: Marc Marí <marc.mari.barcelo@gmail.com>
> ---
> hw/i386/kvm/pci-assign.c | 11 ++++++-----
> hw/i386/multiboot.c | 7 +++++--
> target-i386/kvm.c | 9 +++++----
> xen-hvm.c | 9 +++++----
> xen-mapcache.c | 9 +++++----
> 5 files changed, 26 insertions(+), 19 deletions(-)
>
> #ifdef DEVICE_ASSIGNMENT_DEBUG
> -#define DEBUG(fmt, ...) \
> - do { \
> - fprintf(stderr, "%s: " fmt, __func__ , __VA_ARGS__); \
> - } while (0)
> +#define DEVICE_ASSIGNMENT_DEBUG_ENABLED 1
> #else
> -#define DEBUG(fmt, ...)
> +#define DEVICE_ASSIGNMENT_DEBUG_ENABLED 0
> #endif
>
> +#define DEBUG(fmt, ...) \
> + QEMU_DPRINTF(DEVICE_ASSIGNMENT_DEBUG_ENABLED, \
> + "pci_assign", fmt, ## __VA_ARGS__)
> +
Style - you are replacing aligned \ continuation with one-space \
continuation. I don't know if we have a distinct preference, but it's
probably better to leave the style unchanged if checkpatch.pl doesn't
complain about either way.
As that's minor,
Reviewed-by: Eric Blake <eblake@redhat.com>
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 604 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-05-19 15:48 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1400367823-32610-1-git-send-email-marc.mari.barcelo@gmail.com>
2014-05-17 23:03 ` [PATCH v3 02/16] x86: Convert debug printfs to QEMU_DPRINTF Marc Marí
2014-05-19 15:35 ` [Qemu-devel] " Eric Blake
2014-05-19 15:45 ` Eric Blake
2014-05-19 15:48 ` Eric Blake
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).