qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: kraxel@redhat.com, lcapitulino@redhat.com
Subject: [Qemu-devel] [PATCH v2 3/9] hmp: Compile hmp_info_spice() only with CONFIG_SPICE
Date: Thu, 29 Jan 2015 10:27:32 +0100	[thread overview]
Message-ID: <1422523658-3503-4-git-send-email-armbru@redhat.com> (raw)
In-Reply-To: <1422523658-3503-1-git-send-email-armbru@redhat.com>

It's dead code when CONFIG_SPICE is off.  If it wasn't, it would crash
dereferencing the null pointer returned by the qmp_query_spice()
dummy in qmp.c.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
---
 hmp.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/hmp.c b/hmp.c
index 481be80..a42c5c0 100644
--- a/hmp.c
+++ b/hmp.c
@@ -535,6 +535,7 @@ out:
     qapi_free_VncInfo(info);
 }
 
+#ifdef CONFIG_SPICE
 void hmp_info_spice(Monitor *mon, const QDict *qdict)
 {
     SpiceChannelList *chan;
@@ -581,6 +582,7 @@ void hmp_info_spice(Monitor *mon, const QDict *qdict)
 out:
     qapi_free_SpiceInfo(info);
 }
+#endif
 
 void hmp_info_balloon(Monitor *mon, const QDict *qdict)
 {
-- 
1.9.3

  parent reply	other threads:[~2015-01-29  9:28 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-29  9:27 [Qemu-devel] [PATCH v2 0/9] qmp hmp balloon: Cleanups around error reporting Markus Armbruster
2015-01-29  9:27 ` [Qemu-devel] [PATCH v2 1/9] qmp hmp: Factor out common "using spice" test Markus Armbruster
2015-01-29  9:27 ` [Qemu-devel] [PATCH v2 2/9] qmp hmp: Improve error messages when SPICE is not in use Markus Armbruster
2015-01-29  9:27 ` Markus Armbruster [this message]
2015-01-29  9:27 ` [Qemu-devel] [PATCH v2 4/9] qmp: Clean up qmp_query_spice() #ifndef !CONFIG_SPICE dummy Markus Armbruster
2015-01-29  9:27 ` [Qemu-devel] [PATCH v2 5/9] qmp: Simplify recognition of capability negotiation command Markus Armbruster
2015-01-29  9:27 ` [Qemu-devel] [PATCH v2 6/9] qmp: Eliminate silly QERR_COMMAND_NOT_FOUND macro Markus Armbruster
2015-01-29  9:27 ` [Qemu-devel] [PATCH v2 7/9] balloon: Inline qemu_balloon(), qemu_balloon_status() Markus Armbruster
2015-01-29  9:27 ` [Qemu-devel] [PATCH v2 8/9] balloon: Factor out common "is balloon active" test Markus Armbruster
2015-01-29  9:27 ` [Qemu-devel] [PATCH v2 9/9] balloon: Eliminate silly QERR_ macros Markus Armbruster
2015-01-29 13:53   ` Eric Blake

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=1422523658-3503-4-git-send-email-armbru@redhat.com \
    --to=armbru@redhat.com \
    --cc=kraxel@redhat.com \
    --cc=lcapitulino@redhat.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).