Commit 84e3d072 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2017-06-09-v2' into staging 



QAPI patches for 2017-06-09

# gpg: Signature made Tue 20 Jun 2017 13:31:39 BST
# gpg:                using RSA key 0x3870B400EB918653
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>"
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* remotes/armbru/tags/pull-qapi-2017-06-09-v2: (41 commits)
  tests/qdict: check more get_try_int() cases
  console: use get_uint() for "head" property
  i386/cpu: use get_uint() for "min-level"/"min-xlevel" properties
  numa: use get_uint() for "size" property
  pnv-core: use get_uint() for "core-pir" property
  pvpanic: use get_uint() for "ioport" property
  auxbus: use get_uint() for "addr" property
  arm: use get_uint() for "mp-affinity" property
  xen: use get_uint() for "max-ram-below-4g" property
  pc: use get_uint() for "hpet-intcap" property
  pc: use get_uint() for "apic-id" property
  pc: use get_uint() for "iobase" property
  acpi: use get_uint() for "pci-hole*" properties
  acpi: use get_uint() for various acpi properties
  acpi: use get_uint() for "acpi-pcihp-io*" properties
  platform-bus: use get_uint() for "addr" property
  bcm2835_fb: use {get, set}_uint() for "vcram-size" and "vcram-base"
  aspeed: use {set, get}_uint() for "ram-size" property
  pcihp: use get_uint() for "bsel" property
  pc-dimm: make "size" property uint64
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents db7a99cd 269c20b2

MAINTAINERS

+1 −2
Original line number Diff line number Diff line
@@ -1411,8 +1411,7 @@ F: include/qapi/qmp/ 
X: include/qapi/qmp/dispatch.h

F: scripts/coccinelle/qobject.cocci

F: tests/check-qdict.c

F: tests/check-qfloat.c

F: tests/check-qint.c

F: tests/check-qnum.c

F: tests/check-qjson.c

F: tests/check-qlist.c

F: tests/check-qstring.c

backends/cryptodev.c

+1 −1
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ cryptodev_backend_can_be_deleted(UserCreatable *uc, Error **errp) 


static void cryptodev_backend_instance_init(Object *obj)

{

    object_property_add(obj, "queues", "int",

    object_property_add(obj, "queues", "uint32",

                          cryptodev_backend_get_queues,

                          cryptodev_backend_set_queues,

                          NULL, NULL, NULL);

block/blkdebug.c

+0 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 
#include "qemu/module.h"

#include "qapi/qmp/qbool.h"

#include "qapi/qmp/qdict.h"

#include "qapi/qmp/qint.h"

#include "qapi/qmp/qstring.h"

#include "sysemu/qtest.h"

block/nbd.c

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 
#include "qapi/qobject-output-visitor.h"

#include "qapi/qmp/qdict.h"

#include "qapi/qmp/qjson.h"

#include "qapi/qmp/qint.h"

#include "qapi/qmp/qstring.h"

#include "qemu/cutils.h"

block/nfs.c

+0 −1
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ 
#include "qemu/cutils.h"

#include "sysemu/sysemu.h"

#include "qapi/qmp/qdict.h"

#include "qapi/qmp/qint.h"

#include "qapi/qmp/qstring.h"

#include "qapi-visit.h"

#include "qapi/qobject-input-visitor.h"