qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Andreas Färber" <afaerber@suse.de>
To: qemu-devel@nongnu.org
Cc: "Blue Swirl" <blauwirbel@gmail.com>,
	"Edgar E. Iglesias" <edgar.iglesias@gmail.com>,
	"Peter A. G. Crosthwaite" <peter.crothwaite@petalogix.com>,
	"Andreas Färber" <afaerber@suse.de>,
	"Paolo Bonzini" <pbonzini@redhat.com>
Subject: [Qemu-devel] [PATCH 2/3] qemu-log: Allow usage in libhw
Date: Sat,  9 Jun 2012 03:54:30 +0200	[thread overview]
Message-ID: <1339206871-4706-3-git-send-email-afaerber@suse.de> (raw)
In-Reply-To: <1339206871-4706-1-git-send-email-afaerber@suse.de>

Add #ifdef to avoid complaint about use of poisoned "env".

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
 qemu-log.h |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/qemu-log.h b/qemu-log.h
index fccfb110..a9b3ca4 100644
--- a/qemu-log.h
+++ b/qemu-log.h
@@ -50,6 +50,7 @@ extern int loglevel;
 
 /* Special cases: */
 
+#ifdef NEED_CPU_H
 /* cpu_dump_state() logging functions: */
 #define log_cpu_state(env, f) cpu_dump_state((env), logfile, fprintf, (f));
 #define log_cpu_state_mask(b, env, f) do {           \
@@ -64,6 +65,7 @@ extern int loglevel;
 
 /* page_dump() output to the log file: */
 #define log_page_dump() page_dump(logfile)
+#endif
 
 
 
-- 
1.7.7

  parent reply	other threads:[~2012-06-09  1:54 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-06-09  1:54 [Qemu-devel] [PATCH 0/3] xilinx: Speed up the build Andreas Färber
2012-06-09  1:54 ` [Qemu-devel] [PATCH 1/3] hw/xilinx_*: Share Xilinx devices between ppc and microblaze Andreas Färber
2012-06-09  2:15   ` Peter Crosthwaite
2012-06-09  2:31     ` Andreas Färber
2012-06-09  2:36       ` Peter Crosthwaite
2012-06-09  1:54 ` Andreas Färber [this message]
2012-06-09  1:54 ` [Qemu-devel] [PATCH 3/3] xilinx_axi*: Share devices between microblaze and microblazeel Andreas Färber
2012-06-09  2:16   ` Peter Crosthwaite
2012-06-09  2:06 ` [Qemu-devel] [PATCH 0/3] xilinx: Speed up the build Peter Crosthwaite
2012-06-09 15:20 ` Edgar E. Iglesias
2012-06-09 15:31   ` Andreas Färber
2012-06-09 21:23     ` Edgar E. Iglesias
2012-06-15 11:13 ` Edgar E. Iglesias
2012-06-15 14:52   ` Andreas Färber
2012-06-16  4:15     ` Peter Crosthwaite

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1339206871-4706-3-git-send-email-afaerber@suse.de \
    --to=afaerber@suse.de \
    --cc=blauwirbel@gmail.com \
    --cc=edgar.iglesias@gmail.com \
    --cc=pbonzini@redhat.com \
    --cc=peter.crothwaite@petalogix.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).