Commit 98bfaac7 authored by Peter Maydell's avatar Peter Maydell
Browse files

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



QAPI patches for 2017-09-01

# gpg: Signature made Mon 04 Sep 2017 12:30:31 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-09-01-v3: (47 commits)
  qapi: drop the sentinel in enum array
  qapi: Change data type of the FOO_lookup generated for enum FOO
  qapi: Convert indirect uses of FOO_lookup[...] to qapi_enum_lookup()
  qapi: Mechanically convert FOO_lookup[...] to FOO_str(...)
  qapi: Generate FOO_str() macro for QAPI enum FOO
  qapi: Avoid unnecessary use of enum lookup table's sentinel
  qapi: Use qapi_enum_parse() in input_type_enum()
  crypto: Use qapi_enum_parse() in qcrypto_block_luks_name_lookup()
  quorum: Use qapi_enum_parse() in quorum_open()
  block: Use qemu_enum_parse() in blkdebug_debug_breakpoint()
  hmp: Use qapi_enum_parse() in hmp_migrate_set_parameter()
  hmp: Use qapi_enum_parse() in hmp_migrate_set_capability()
  tpm: Clean up model registration & lookup
  tpm: Clean up driver registration & lookup
  qapi: Drop superfluous qapi_enum_parse() parameter max
  qapi: Update qapi-code-gen.txt examples to match current code
  qapi-schema: Improve section headings
  qapi-schema: Move queries from common.json to qapi-schema.json
  qapi-schema: Make block-core.json self-contained
  qapi-schema: Fold event.json back into qapi-schema.json
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 32f0f68b ebf677c8

MAINTAINERS

+16 −0
Original line number Diff line number Diff line
@@ -1231,6 +1231,7 @@ S: Supported 
F: blockdev.c

F: block/qapi.c

F: qapi/block*.json

F: qapi/transaction.json

T: git git://repo.or.cz/qemu/armbru.git block-next



Dirty Bitmaps
@@ -1253,6 +1254,7 @@ M: Marc-André Lureau <marcandre.lureau@redhat.com> 
S: Maintained

F: chardev/

F: include/chardev/

F: qapi/char.json



Character Devices (Braille)

M: Samuel Thibault <samuel.thibault@ens-lyon.org>
@@ -1319,12 +1321,14 @@ F: include/ui/spice-display.h 
F: ui/spice-*.c

F: audio/spiceaudio.c

F: hw/display/qxl*

F: qapi/ui.json



Graphics

M: Gerd Hoffmann <kraxel@redhat.com>

S: Odd Fixes

F: ui/

F: include/ui/

F: qapi/ui.json



Cocoa graphics

M: Peter Maydell <peter.maydell@linaro.org>
@@ -1338,6 +1342,7 @@ F: cpus.c 
F: util/main-loop.c

F: util/qemu-timer.c

F: vl.c

F: qapi/run-state.json



Human Monitor (HMP)

M: Dr. David Alan Gilbert <dgilbert@redhat.com>
@@ -1354,6 +1359,7 @@ S: Maintained 
F: net/

F: include/net/

T: git git://github.com/jasowang/qemu.git net

F: qapi/net.json



Netmap network backend

M: Luigi Rizzo <rizzo@iet.unipi.it>
@@ -1480,6 +1486,14 @@ F: scripts/tracetool/ 
F: docs/tracing.txt

T: git git://github.com/stefanha/qemu.git tracing



TPM

S: Orphan

F: tpm.c

F: hw/tpm/*

F: include/hw/acpi/tpm.h

F: include/sysemu/tpm*

F: qapi/tpm.json



Checkpatch

S: Odd Fixes

F: scripts/checkpatch.pl
@@ -1493,6 +1507,7 @@ F: migration/ 
F: scripts/vmstate-static-checker.py

F: tests/vmstate-static-checker-data/

F: docs/migration.txt

F: qapi/migration.json



Seccomp

M: Eduardo Otubo <otubo@redhat.com>
@@ -1535,6 +1550,7 @@ M: Paolo Bonzini <pbonzini@redhat.com> 
S: Maintained

F: include/qemu/sockets.h

F: util/qemu-sockets.c

F: qapi/sockets.json



Throttling infrastructure

M: Alberto Garcia <berto@igalia.com>

Makefile

+12 −3
Original line number Diff line number Diff line
@@ -410,9 +410,18 @@ $(SRC_PATH)/qga/qapi-schema.json $(SRC_PATH)/scripts/qapi-commands.py $(qapi-py) 


qapi-modules = $(SRC_PATH)/qapi-schema.json $(SRC_PATH)/qapi/common.json \

               $(SRC_PATH)/qapi/block.json $(SRC_PATH)/qapi/block-core.json \

               $(SRC_PATH)/qapi/event.json $(SRC_PATH)/qapi/introspect.json \

               $(SRC_PATH)/qapi/crypto.json $(SRC_PATH)/qapi/rocker.json \

               $(SRC_PATH)/qapi/trace.json

               $(SRC_PATH)/qapi/char.json \

               $(SRC_PATH)/qapi/crypto.json \

               $(SRC_PATH)/qapi/introspect.json \

               $(SRC_PATH)/qapi/migration.json \

               $(SRC_PATH)/qapi/net.json \

               $(SRC_PATH)/qapi/rocker.json \

               $(SRC_PATH)/qapi/run-state.json \

               $(SRC_PATH)/qapi/sockets.json \

               $(SRC_PATH)/qapi/tpm.json \

               $(SRC_PATH)/qapi/trace.json \

               $(SRC_PATH)/qapi/transaction.json \

               $(SRC_PATH)/qapi/ui.json



qapi-types.c qapi-types.h :\

$(qapi-modules) $(SRC_PATH)/scripts/qapi-types.py $(qapi-py)

backends/hostmem.c

+2 −2
Original line number Diff line number Diff line
@@ -304,7 +304,7 @@ host_memory_backend_memory_complete(UserCreatable *uc, Error **errp) 
            return;

        } else if (maxnode == 0 && backend->policy != MPOL_DEFAULT) {

            error_setg(errp, "host-nodes must be set for policy %s",

                       HostMemPolicy_lookup[backend->policy]);

                       HostMemPolicy_str(backend->policy));

            return;

        }
@@ -395,7 +395,7 @@ host_memory_backend_class_init(ObjectClass *oc, void *data) 
        host_memory_backend_set_host_nodes,

        NULL, NULL, &error_abort);

    object_class_property_add_enum(oc, "policy", "HostMemPolicy",

        HostMemPolicy_lookup,

        &HostMemPolicy_lookup,

        host_memory_backend_get_policy,

        host_memory_backend_set_policy, &error_abort);

    object_class_property_add_str(oc, "id", get_id, set_id, &error_abort);

block.c

+1 −3
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ 
#include "qapi-event.h"

#include "qemu/cutils.h"

#include "qemu/id.h"

#include "qapi/util.h"



#ifdef CONFIG_BSD

#include <sys/ioctl.h>
@@ -1333,9 +1332,8 @@ static int bdrv_open_common(BlockDriverState *bs, BlockBackend *file, 
    detect_zeroes = qemu_opt_get(opts, "detect-zeroes");

    if (detect_zeroes) {

        BlockdevDetectZeroesOptions value =

            qapi_enum_parse(BlockdevDetectZeroesOptions_lookup,

            qapi_enum_parse(&BlockdevDetectZeroesOptions_lookup,

                            detect_zeroes,

                            BLOCKDEV_DETECT_ZEROES_OPTIONS__MAX,

                            BLOCKDEV_DETECT_ZEROES_OPTIONS_OFF,

                            &local_err);

        if (local_err) {

block/backup.c

+1 −1
Original line number Diff line number Diff line
@@ -596,7 +596,7 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs, 
        error_setg(errp,

                   "a sync_bitmap was provided to backup_run, "

                   "but received an incompatible sync_mode (%s)",

                   MirrorSyncMode_lookup[sync_mode]);

                   MirrorSyncMode_str(sync_mode));

        return NULL;

    }