qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Marc-André Lureau" <marcandre.lureau@redhat.com>
To: qemu-devel@nongnu.org
Cc: armbru@redhat.com,
	"Marc-André Lureau" <marcandre.lureau@redhat.com>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	"Richard Henderson" <rth@twiddle.net>,
	"Eduardo Habkost" <ehabkost@redhat.com>
Subject: [Qemu-devel] [PATCH 01/14] qdict: add qdict_put_null() helper
Date: Thu, 24 Aug 2017 12:33:37 +0200	[thread overview]
Message-ID: <20170824103350.16400-2-marcandre.lureau@redhat.com> (raw)
In-Reply-To: <20170824103350.16400-1-marcandre.lureau@redhat.com>

A step towards completeness.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 include/qapi/qmp/qdict.h | 4 +++-
 target/i386/cpu.c        | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/include/qapi/qmp/qdict.h b/include/qapi/qmp/qdict.h
index 363e431106..6588c7f0c8 100644
--- a/include/qapi/qmp/qdict.h
+++ b/include/qapi/qmp/qdict.h
@@ -53,13 +53,15 @@ void qdict_destroy_obj(QObject *obj);
 #define qdict_put(qdict, key, obj) \
         qdict_put_obj(qdict, key, QOBJECT(obj))
 
-/* Helpers for int, bool, and string */
+/* Helpers for int, bool, null, and string */
 #define qdict_put_int(qdict, key, value) \
         qdict_put(qdict, key, qnum_from_int(value))
 #define qdict_put_bool(qdict, key, value) \
         qdict_put(qdict, key, qbool_from_bool(value))
 #define qdict_put_str(qdict, key, value) \
         qdict_put(qdict, key, qstring_from_str(value))
+#define qdict_put_null(qdict, key) \
+        qdict_put(qdict, key, qnull())
 
 /* High level helpers */
 double qdict_get_double(const QDict *qdict, const char *key);
diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index ddc45abd70..bec2009a9c 100644
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -2454,7 +2454,7 @@ static QDict *x86_cpu_static_props(void)
 
     d = qdict_new();
     for (i = 0; props[i]; i++) {
-        qdict_put(d, props[i], qnull());
+        qdict_put_null(d, props[i]);
     }
 
     for (w = 0; w < FEATURE_WORDS; w++) {
@@ -2464,7 +2464,7 @@ static QDict *x86_cpu_static_props(void)
             if (!fi->feat_names[bit]) {
                 continue;
             }
-            qdict_put(d, fi->feat_names[bit], qnull());
+            qdict_put_null(d, fi->feat_names[bit]);
         }
     }
 
-- 
2.14.1.146.gd35faa819

  reply	other threads:[~2017-08-24 10:34 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-08-24 10:33 [Qemu-devel] [PATCH 00/14] Generate a literal qobject for introspection Marc-André Lureau
2017-08-24 10:33 ` Marc-André Lureau [this message]
2017-08-25  5:52   ` [Qemu-devel] [PATCH 01/14] qdict: add qdict_put_null() helper Markus Armbruster
2017-08-25 12:53   ` Eduardo Habkost
2017-08-24 10:33 ` [Qemu-devel] [PATCH 02/14] qlit: move qlit from check-qjson to qobject/ Marc-André Lureau
2017-08-25  5:55   ` Markus Armbruster
2017-09-01  0:06   ` Eduardo Habkost
2017-09-01  9:05     ` Markus Armbruster
2017-09-01 13:23       ` Eduardo Habkost
2017-08-24 10:33 ` [Qemu-devel] [PATCH 03/14] qlit: use QLit prefix consistently Marc-André Lureau
2017-08-25  6:04   ` Markus Armbruster
2017-08-24 10:33 ` [Qemu-devel] [PATCH 04/14] qlit: remove needless type cast Marc-André Lureau
2017-08-25  6:20   ` Markus Armbruster
2017-08-25 10:17     ` Marc-André Lureau
2017-08-28 11:17       ` Markus Armbruster
2017-08-24 10:33 ` [Qemu-devel] [PATCH 05/14] qlit: rename compare_litqobj_to_qobj Marc-André Lureau
2017-08-25  6:35   ` Markus Armbruster
2017-08-25  6:44     ` Markus Armbruster
2017-08-24 10:33 ` [Qemu-devel] [PATCH 06/14] qlit: make qlit_equal_qobject return a bool Marc-André Lureau
2017-08-25  6:55   ` Markus Armbruster
2017-08-24 10:33 ` [Qemu-devel] [PATCH 07/14] qlit: make qlit_equal_qobject() take const arguments Marc-André Lureau
2017-08-25  6:56   ` Markus Armbruster
2017-08-24 10:33 ` [Qemu-devel] [PATCH 08/14] qlit: add QLIT_QNULL and QLIT_BOOL Marc-André Lureau
2017-08-25  6:57   ` Markus Armbruster
2017-08-24 10:33 ` [Qemu-devel] [PATCH 09/14] qlit: replace assert(qnum_get_try_int) Marc-André Lureau
2017-08-25  7:02   ` Markus Armbruster
2017-08-24 10:33 ` [Qemu-devel] [PATCH 10/14] tests: add qlit tests Marc-André Lureau
2017-08-24 10:33 ` [Qemu-devel] [PATCH 11/14] qlit: improve QLit dict vs qdict comparison Marc-André Lureau
2017-08-24 10:33 ` [Qemu-devel] [PATCH 12/14] qlit: improve QLit list vs qlist comparison Marc-André Lureau
2017-08-24 10:38   ` Marc-André Lureau
2017-08-24 10:33 ` [Qemu-devel] [PATCH 13/14] qlit: add qobject_form_qlit() Marc-André Lureau
2017-08-24 10:33 ` [Qemu-devel] [PATCH 14/14] qapi: generate a literal qobject for introspection Marc-André Lureau

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=20170824103350.16400-2-marcandre.lureau@redhat.com \
    --to=marcandre.lureau@redhat.com \
    --cc=armbru@redhat.com \
    --cc=ehabkost@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=rth@twiddle.net \
    /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).