From: Michael Roth <mdroth@linux.vnet.ibm.com>
To: qemu-devel@nongnu.org
Cc: aliguori@linux.vnet.ibm.com, agl@linux.vnet.ibm.com,
mdroth@linux.vnet.ibm.com
Subject: [Qemu-devel] [PATCH 2/9] qapi: input visiter, don't always allocate memory for structs
Date: Fri, 29 Apr 2011 10:21:55 -0500 [thread overview]
Message-ID: <1304090522-5861-3-git-send-email-mdroth@linux.vnet.ibm.com> (raw)
In-Reply-To: <1304090522-5861-1-git-send-email-mdroth@linux.vnet.ibm.com>
Sometimes we have anonymous nested structs rather than references. In
these cases we call visit_start_struct() primarilly to push the nested
qobject onto the stack, and specify a NULL obj value to avoid doing any
memory allocation. So add a simple check for this NULL value.
Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---
qapi/qmp-input-visiter.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/qapi/qmp-input-visiter.c b/qapi/qmp-input-visiter.c
index 53379fd..4bae85e 100644
--- a/qapi/qmp-input-visiter.c
+++ b/qapi/qmp-input-visiter.c
@@ -75,7 +75,9 @@ static void qmp_input_start_struct(Visiter *v, void **obj, const char *kind, con
qmp_input_push(qiv, qobj);
- *obj = qemu_mallocz(QAPI_OBJECT_SIZE);
+ if (obj) {
+ *obj = qemu_mallocz(QAPI_OBJECT_SIZE);
+ }
}
static void qmp_input_end_struct(Visiter *v, Error **errp)
--
1.7.0.4
next prev parent reply other threads:[~2011-04-29 15:23 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-29 15:21 [Qemu-devel] [PULL] QAPI code generator fix-ups Michael Roth
2011-04-29 15:21 ` [Qemu-devel] [PATCH 1/9] qapi: Fix type generator for structured type members Michael Roth
2011-04-29 15:21 ` Michael Roth [this message]
2011-04-29 15:21 ` [Qemu-devel] [PATCH 3/9] qapi: Fix visiter generator for nested structs/qobjects Michael Roth
2011-04-29 15:21 ` [Qemu-devel] [PATCH 4/9] qapi: some basename/guardname py utility functions Michael Roth
2011-04-29 15:21 ` [Qemu-devel] [PATCH 5/9] qapi: add --prefix option to type generator Michael Roth
2011-04-29 15:21 ` [Qemu-devel] [PATCH 6/9] qapi: add --prefix option for visiter generator Michael Roth
2011-04-29 15:22 ` [Qemu-devel] [PATCH 7/9] qapi: test schema for test-visiter unit tests Michael Roth
2011-04-29 15:22 ` [Qemu-devel] [PATCH 8/9] qapi: Makefile, build test-visiter with generated test code Michael Roth
2011-04-29 15:22 ` [Qemu-devel] [PATCH 9/9] qapi: test-visiter, pull in gen code, tests for nested structures Michael Roth
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=1304090522-5861-3-git-send-email-mdroth@linux.vnet.ibm.com \
--to=mdroth@linux.vnet.ibm.com \
--cc=agl@linux.vnet.ibm.com \
--cc=aliguori@linux.vnet.ibm.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).