Commit 81781be3 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2018-12-13-v2' into staging 



QAPI patches for 2018-12-13

# gpg: Signature made Fri 14 Dec 2018 05:53:51 GMT
# gpg:                using RSA key 3870B400EB918653
# 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-2018-12-13-v2: (32 commits)
  qapi: add conditions to REPLICATION type/commands on the schema
  qapi: add more conditions to SPICE
  qapi: add condition to variants documentation
  qapi: add 'If:' condition to struct members documentation
  qapi: add 'If:' condition to enum values documentation
  qapi: Add #if conditions to generated code members
  qapi: add 'if' to alternate members
  qapi: add 'if' to union members
  qapi: Add 'if' to implicit struct members
  qapi: add a dictionary form for TYPE
  qapi-events: add 'if' condition to implicit event enum
  qapi: add 'if' to enum members
  qapi: add a dictionary form with 'name' key for enum members
  qapi: improve reporting of unknown or missing keys
  qapi: factor out checking for keys
  tests: print enum type members more like object type members
  qapi: change enum visitor and gen_enum* to take QAPISchemaMember
  qapi: Do not define enumeration value explicitly
  qapi: break long lines at 'data' member
  qapi: rename QAPISchemaEnumType.values to .members
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents d058a37a 335d10cd

docs/devel/qapi-code-gen.txt

+20 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ how the schemas, scripts, and resulting code are used. 
== QMP/Guest agent schema ==



A QAPI schema file is designed to be loosely based on JSON

(http://www.ietf.org/rfc/rfc7159.txt) with changes for quoting style

(http://www.ietf.org/rfc/rfc8259.txt) with changes for quoting style

and the use of comments; a QAPI schema file is then parsed by a python

code generation program.  A valid QAPI schema consists of a series of

top-level expressions, with no commas between them.  Where
@@ -752,6 +752,25 @@ gets its generated code guarded like this: 
 #endif /* defined(HAVE_BAR) */

 #endif /* defined(CONFIG_FOO) */



Where a member can be defined with a single string value for its type,

it is also possible to supply a dictionary instead with both 'type'

and 'if' keys.



Example: a conditional 'bar' member



{ 'struct': 'IfStruct', 'data':

  { 'foo': 'int',

    'bar': { 'type': 'int', 'if': 'defined(IFCOND)'} } }



An enum value can be replaced by a dictionary with a 'name' and a 'if'

key.



Example: a conditional 'bar' enum member.



{ 'enum': 'IfEnum', 'data':

  [ 'foo',

    { 'name' : 'bar', 'if': 'defined(IFCOND)' } ] }



Please note that you are responsible to ensure that the C code will

compile with an arbitrary combination of conditions, since the

generators are unable to check it at this point.

docs/interop/qmp-spec.txt

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ following format: 
Where DATA-STRUCTURE-NAME is any valid JSON data structure, as defined

by the JSON standard:



http://www.ietf.org/rfc/rfc7159.txt

http://www.ietf.org/rfc/rfc8259.txt



The server expects its input to be encoded in UTF-8, and sends its

output encoded in ASCII.

include/qapi/string-input-visitor.h

+2 −2
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ typedef struct StringInputVisitor StringInputVisitor; 


/*

 * The string input visitor does not implement support for visiting

 * QAPI structs, alternates, null, or arbitrary QTypes.  It also

 * requires a non-null list argument to visit_start_list().

 * QAPI structs, alternates, null, or arbitrary QTypes. Only flat lists

 * of integers (except type "size") are supported.

 */

Visitor *string_input_visitor_new(const char *str);

include/qemu/cutils.h

+5 −3
Original line number Diff line number Diff line
@@ -146,14 +146,16 @@ int qemu_strtoi64(const char *nptr, const char **endptr, int base, 
                  int64_t *result);

int qemu_strtou64(const char *nptr, const char **endptr, int base,

                  uint64_t *result);

int qemu_strtod(const char *nptr, const char **endptr, double *result);

int qemu_strtod_finite(const char *nptr, const char **endptr, double *result);



int parse_uint(const char *s, unsigned long long *value, char **endptr,

               int base);

int parse_uint_full(const char *s, unsigned long long *value, int base);



int qemu_strtosz(const char *nptr, char **end, uint64_t *result);

int qemu_strtosz_MiB(const char *nptr, char **end, uint64_t *result);

int qemu_strtosz_metric(const char *nptr, char **end, uint64_t *result);

int qemu_strtosz(const char *nptr, const char **end, uint64_t *result);

int qemu_strtosz_MiB(const char *nptr, const char **end, uint64_t *result);

int qemu_strtosz_metric(const char *nptr, const char **end, uint64_t *result);



/* used to print char* safely */

#define STR_OR_NULL(str) ((str) ? (str) : "null")

migration/colo.c

+4 −12
Original line number Diff line number Diff line
@@ -24,7 +24,9 @@ 
#include "trace.h"

#include "qemu/error-report.h"

#include "migration/failover.h"

#ifdef CONFIG_REPLICATION

#include "replication.h"

#endif

#include "net/colo-compare.h"

#include "net/colo.h"

#include "block/block.h"
@@ -201,11 +203,11 @@ void colo_do_failover(MigrationState *s) 
    }

}



#ifdef CONFIG_REPLICATION

void qmp_xen_set_replication(bool enable, bool primary,

                             bool has_failover, bool failover,

                             Error **errp)

{

#ifdef CONFIG_REPLICATION

    ReplicationMode mode = primary ?

                           REPLICATION_MODE_PRIMARY :

                           REPLICATION_MODE_SECONDARY;
@@ -224,14 +226,10 @@ void qmp_xen_set_replication(bool enable, bool primary, 
        }

        replication_stop_all(failover, failover ? NULL : errp);

    }

#else

    abort();

#endif

}



ReplicationStatus *qmp_query_xen_replication_status(Error **errp)

{

#ifdef CONFIG_REPLICATION

    Error *err = NULL;

    ReplicationStatus *s = g_new0(ReplicationStatus, 1);
@@ -246,19 +244,13 @@ ReplicationStatus *qmp_query_xen_replication_status(Error **errp) 


    error_free(err);

    return s;

#else

    abort();

#endif

}



void qmp_xen_colo_do_checkpoint(Error **errp)

{

#ifdef CONFIG_REPLICATION

    replication_do_checkpoint_all(errp);

#else

    abort();

#endif

}

#endif



COLOStatus *qmp_query_colo_status(Error **errp)

{