qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 6235b9: trivial: Restore blank line in qapi-s


From: GitHub
Subject: [Qemu-commits] [qemu/qemu] 6235b9: trivial: Restore blank line in qapi-schema
Date: Tue, 25 Oct 2016 10:30:04 -0700

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 6235b9cd859153a8eabd4efa309a0c541ebb3cc3
      
https://github.com/qemu/qemu/commit/6235b9cd859153a8eabd4efa309a0c541ebb3cc3
  Author: Eric Blake <address@hidden>
  Date:   2016-10-25 (Tue, 25 Oct 2016)

  Changed paths:
    M qapi-schema.json

  Log Message:
  -----------
  trivial: Restore blank line in qapi-schema

Commit de63ab6 accidentally undid part of commit a43edcf,
because the two patches were written in parallel, and the
blank line was not noticed as a casualty of merge conflicts.

Signed-off-by: Eric Blake <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Laurent Vivier <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>


  Commit: ebfd93b6803acef1a799ef6c755500087e37496e
      
https://github.com/qemu/qemu/commit/ebfd93b6803acef1a799ef6c755500087e37496e
  Author: Daniel P. Berrange <address@hidden>
  Date:   2016-10-25 (Tue, 25 Oct 2016)

  Changed paths:
    M Makefile.objs
    M qapi/qapi-visit-core.c
    A qapi/trace-events

  Log Message:
  -----------
  qapi: add trace events for visitor

Allow tracing of the operation of visitors

Signed-off-by: Daniel P. Berrange <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
[visit_type_uint8() & friends rearranged slightly for clarity]
Signed-off-by: Markus Armbruster <address@hidden>


  Commit: b3db211f3c80bb996a704d665fe275619f728bd4
      
https://github.com/qemu/qemu/commit/b3db211f3c80bb996a704d665fe275619f728bd4
  Author: Daniel P. Berrange <address@hidden>
  Date:   2016-10-25 (Tue, 25 Oct 2016)

  Changed paths:
    M block/qapi.c
    M blockdev.c
    R include/qapi/qmp-input-visitor.h
    R include/qapi/qmp-output-visitor.h
    A include/qapi/qobject-input-visitor.h
    A include/qapi/qobject-output-visitor.h
    M include/qapi/visitor.h
    M monitor.c
    M qapi/Makefile.objs
    M qapi/qapi-clone-visitor.c
    R qapi/qmp-input-visitor.c
    R qapi/qmp-output-visitor.c
    A qapi/qobject-input-visitor.c
    A qapi/qobject-output-visitor.c
    M qemu-img.c
    M qmp.c
    M qom/object_interfaces.c
    M qom/qom-qobject.c
    M scripts/qapi-commands.py
    M scripts/qapi-event.py
    M target-s390x/cpu_models.c
    M tests/.gitignore
    M tests/Makefile.include
    M tests/check-qnull.c
    M tests/test-qmp-commands.c
    R tests/test-qmp-input-strict.c
    R tests/test-qmp-input-visitor.c
    R tests/test-qmp-output-visitor.c
    A tests/test-qobject-input-strict.c
    A tests/test-qobject-input-visitor.c
    A tests/test-qobject-output-visitor.c
    M tests/test-string-input-visitor.c
    M tests/test-string-output-visitor.c
    M tests/test-visitor-serialization.c
    M util/qemu-sockets.c

  Log Message:
  -----------
  qapi: rename *qmp-*-visitor* to *qobject-*-visitor*

The QMP visitors have no direct dependency on QMP. It is
valid to use them anywhere that one has a QObject. Rename them
to better reflect their functionality as a generic QObject
to QAPI converter.

This is the first of three parts: rename the files.  The next two
parts will rename C identifiers.  The split is necessary to make git
rename detection work.

Reviewed-by: Kevin Wolf <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Daniel P. Berrange <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
[Split into file and identifier rename, two comments touched up]
Signed-off-by: Markus Armbruster <address@hidden>


  Commit: 09e68369a88d7de0f988972bf28eec1b80cc47f9
      
https://github.com/qemu/qemu/commit/09e68369a88d7de0f988972bf28eec1b80cc47f9
  Author: Daniel P. Berrange <address@hidden>
  Date:   2016-10-25 (Tue, 25 Oct 2016)

  Changed paths:
    M docs/qapi-code-gen.txt
    M include/qapi/qobject-input-visitor.h
    M qapi/qobject-input-visitor.c
    M qmp.c
    M qom/qom-qobject.c
    M scripts/qapi-commands.py
    M target-s390x/cpu_models.c
    M tests/check-qnull.c
    M tests/test-qmp-commands.c
    M tests/test-qobject-input-strict.c
    M tests/test-qobject-input-visitor.c
    M tests/test-visitor-serialization.c

  Log Message:
  -----------
  qapi: rename QmpInputVisitor to QObjectInputVisitor

The QmpInputVisitor has no direct dependency on QMP. It is
valid to use it anywhere that one has a QObject. Rename it
to better reflect its functionality as a generic QObject
to QAPI converter.

The previous commit renamed the files, this one renames C identifiers.

Reviewed-by: Kevin Wolf <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Daniel P. Berrange <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
[Straightforwardly rebased, split into file and identifier rename]
Signed-off-by: Markus Armbruster <address@hidden>


  Commit: 7d5e199ade76c53ec316ab6779800581bb47c50a
      
https://github.com/qemu/qemu/commit/7d5e199ade76c53ec316ab6779800581bb47c50a
  Author: Daniel P. Berrange <address@hidden>
  Date:   2016-10-25 (Tue, 25 Oct 2016)

  Changed paths:
    M block/qapi.c
    M blockdev.c
    M docs/qapi-code-gen.txt
    M include/qapi/qobject-output-visitor.h
    M qapi/qobject-output-visitor.c
    M qemu-img.c
    M qom/qom-qobject.c
    M scripts/qapi-commands.py
    M scripts/qapi-event.py
    M tests/check-qnull.c
    M tests/test-qobject-output-visitor.c
    M tests/test-visitor-serialization.c

  Log Message:
  -----------
  qapi: rename QmpOutputVisitor to QObjectOutputVisitor

The QmpOutputVisitor has no direct dependency on QMP. It is
valid to use it anywhere that one wants a QObject. Rename it
to better reflect its functionality as a generic QAPI
to QObject converter.

The commit before previous renamed the files, this one renames C
identifiers.

Reviewed-by: Kevin Wolf <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Daniel P. Berrange <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
[Split into file rename and identifier rename]
Signed-off-by: Markus Armbruster <address@hidden>


  Commit: b1d2e5f1b0612178cdc2752fb0f60407dd87960e
      
https://github.com/qemu/qemu/commit/b1d2e5f1b0612178cdc2752fb0f60407dd87960e
  Author: Daniel P. Berrange <address@hidden>
  Date:   2016-10-25 (Tue, 25 Oct 2016)

  Changed paths:
    M tests/test-qobject-input-visitor.c

  Log Message:
  -----------
  qapi: don't pass two copies of TestInputVisitorData to tests

The input_visitor_test_add() method was accepting an instance
of 'TestInputVisitorData' and passing it as the 'user_data'
parameter to test functions. The main 'TestInputVisitorData'
instance that was actually used, was meanwhile being allocated
automatically by the test framework fixture setup.

The 'user_data' parameter is going to be needed for tests
added in later patches, so getting rid of the current mistaken
usage now allows this.

Signed-off-by: Daniel P. Berrange <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>


  Commit: 603476c25c4d588a557ec2139352028f3157cba4
      
https://github.com/qemu/qemu/commit/603476c25c4d588a557ec2139352028f3157cba4
  Author: Daniel P. Berrange <address@hidden>
  Date:   2016-10-25 (Tue, 25 Oct 2016)

  Changed paths:
    M include/qapi/qmp/qdict.h
    M qobject/qdict.c
    M tests/check-qdict.c

  Log Message:
  -----------
  qdict: implement a qdict_crumple method for un-flattening a dict

The qdict_flatten() method will take a dict whose elements are
further nested dicts/lists and flatten them by concatenating
keys.

The qdict_crumple() method aims to do the reverse, taking a flat
qdict, and turning it into a set of nested dicts/lists. It will
apply nesting based on the key name, with a '.' indicating a
new level in the hierarchy. If the keys in the nested structure
are all numeric, it will create a list, otherwise it will create
a dict.

If the keys are a mixture of numeric and non-numeric, or the
numeric keys are not in strictly ascending order, an error will
be reported.

As an example, a flat dict containing

 {
   'foo.0.bar': 'one',
   'foo.0.wizz': '1',
   'foo.1.bar': 'two',
   'foo.1.wizz': '2'
 }

will get turned into a dict with one element 'foo' whose
value is a list. The list elements will each in turn be
dicts.

 {
   'foo': [
     { 'bar': 'one', 'wizz': '1' },
     { 'bar': 'two', 'wizz': '2' }
   ],
 }

If the key is intended to contain a literal '.', then it must
be escaped as '..'. ie a flat dict

  {
     'foo..bar': 'wizz',
     'bar.foo..bar': 'eek',
     'bar.hello': 'world'
  }

Will end up as

  {
     'foo.bar': 'wizz',
     'bar': {
  'foo.bar': 'eek',
  'hello': 'world'
     }
  }

The intent of this function is that it allows a set of QemuOpts
to be turned into a nested data structure that mirrors the nesting
used when the same object is defined over QMP.

Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Signed-off-by: Daniel P. Berrange <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
[Parameter recursive dropped along with its tests; whitespace style
touched up]
Signed-off-by: Markus Armbruster <address@hidden>


  Commit: ede0cbeb7892bdf4a19128853a3a3c61a17fb068
      
https://github.com/qemu/qemu/commit/ede0cbeb7892bdf4a19128853a3a3c61a17fb068
  Author: Peter Maydell <address@hidden>
  Date:   2016-10-25 (Tue, 25 Oct 2016)

  Changed paths:
    M Makefile.objs
    M block/qapi.c
    M blockdev.c
    M docs/qapi-code-gen.txt
    R include/qapi/qmp-input-visitor.h
    R include/qapi/qmp-output-visitor.h
    M include/qapi/qmp/qdict.h
    A include/qapi/qobject-input-visitor.h
    A include/qapi/qobject-output-visitor.h
    M include/qapi/visitor.h
    M monitor.c
    M qapi-schema.json
    M qapi/Makefile.objs
    M qapi/qapi-clone-visitor.c
    M qapi/qapi-visit-core.c
    R qapi/qmp-input-visitor.c
    R qapi/qmp-output-visitor.c
    A qapi/qobject-input-visitor.c
    A qapi/qobject-output-visitor.c
    A qapi/trace-events
    M qemu-img.c
    M qmp.c
    M qobject/qdict.c
    M qom/object_interfaces.c
    M qom/qom-qobject.c
    M scripts/qapi-commands.py
    M scripts/qapi-event.py
    M target-s390x/cpu_models.c
    M tests/.gitignore
    M tests/Makefile.include
    M tests/check-qdict.c
    M tests/check-qnull.c
    M tests/test-qmp-commands.c
    R tests/test-qmp-input-strict.c
    R tests/test-qmp-input-visitor.c
    R tests/test-qmp-output-visitor.c
    A tests/test-qobject-input-strict.c
    A tests/test-qobject-input-visitor.c
    A tests/test-qobject-output-visitor.c
    M tests/test-string-input-visitor.c
    M tests/test-string-output-visitor.c
    M tests/test-visitor-serialization.c
    M util/qemu-sockets.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2016-10-25' into 
staging

QAPI patches for 2016-10-25

# gpg: Signature made Tue 25 Oct 2016 16:56:27 BST
# gpg:                using RSA key 0x3870B400EB918653
# gpg: Good signature from "Markus Armbruster <address@hidden>"
# gpg:                 aka "Markus Armbruster <address@hidden>"
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* remotes/armbru/tags/pull-qapi-2016-10-25:
  qdict: implement a qdict_crumple method for un-flattening a dict
  qapi: don't pass two copies of TestInputVisitorData to tests
  qapi: rename QmpOutputVisitor to QObjectOutputVisitor
  qapi: rename QmpInputVisitor to QObjectInputVisitor
  qapi: rename *qmp-*-visitor* to *qobject-*-visitor*
  qapi: add trace events for visitor
  trivial: Restore blank line in qapi-schema

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/4429532b48a2...ede0cbeb7892

reply via email to

[Prev in Thread] Current Thread [Next in Thread]