qemu-commits
[Top][All Lists]
Advanced

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

[Qemu-commits] [qemu/qemu] 58f88d: qmp: Add qom_path field to query-cpus


From: GitHub
Subject: [Qemu-commits] [qemu/qemu] 58f88d: qmp: Add qom_path field to query-cpus command
Date: Mon, 18 May 2015 05:00:08 -0700

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 58f88d4b7e9e5578b8dd2c5acfe555b85b35af88
      
https://github.com/qemu/qemu/commit/58f88d4b7e9e5578b8dd2c5acfe555b85b35af88
  Author: Eduardo Habkost <address@hidden>
  Date:   2015-05-14 (Thu, 14 May 2015)

  Changed paths:
    M cpus.c
    M qapi-schema.json
    M qmp-commands.hx

  Log Message:
  -----------
  qmp: Add qom_path field to query-cpus command

This will allow clients to query additional information directly using
qom-get on the CPU objects.

Reviewed-by: David Gibson <address@hidden>
Reviewed-by: Andreas Färber <address@hidden>
Signed-off-by: Eduardo Habkost <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>


  Commit: 777abdfe7bb47e582c8eb87dd6cecdf3fd9f86fc
      
https://github.com/qemu/qemu/commit/777abdfe7bb47e582c8eb87dd6cecdf3fd9f86fc
  Author: Michael S. Tsirkin <address@hidden>
  Date:   2015-05-14 (Thu, 14 May 2015)

  Changed paths:
    M docs/qmp/qmp-events.txt

  Log Message:
  -----------
  doc: fix qmp event type

Event name for hot unplug errors was wrong.
Make doc match code.

Cc: Zhu Guihua <address@hidden>
Reported-by: Eric Blake <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>


  Commit: 47299262de424af0cb69965d082e5e70b2314183
      
https://github.com/qemu/qemu/commit/47299262de424af0cb69965d082e5e70b2314183
  Author: Markus Armbruster <address@hidden>
  Date:   2015-05-14 (Thu, 14 May 2015)

  Changed paths:
    M scripts/qapi.py

  Log Message:
  -----------
  qapi: Fix C identifiers generated for names containing '.'

c_fun() maps '.' to '_', c_var() doesn't.  Nothing prevents '.' in
QAPI names that get passed to c_var().

Which QAPI names get passed to c_fun(), to c_var(), or to both is not
obvious.  Names of command parameters and struct type members get
passed to c_var().

c_var() strips a leading '*', but this cannot happen.  c_fun()
doesn't.

Fix c_var() to work exactly like c_fun().

Perhaps they should be replaced by a single mapping function.

Signed-off-by: Markus Armbruster <address@hidden>
[add 'import string']
Signed-off-by: Eric Blake <address@hidden>
Reviewed-by: Alberto Garcia <address@hidden>


  Commit: 18df515ebbefa9f13474b128b8050d5fa346ea1e
      
https://github.com/qemu/qemu/commit/18df515ebbefa9f13474b128b8050d5fa346ea1e
  Author: Eric Blake <address@hidden>
  Date:   2015-05-14 (Thu, 14 May 2015)

  Changed paths:
    M scripts/qapi-commands.py
    M scripts/qapi-event.py
    M scripts/qapi-types.py
    M scripts/qapi-visit.py
    M scripts/qapi.py

  Log Message:
  -----------
  qapi: Rename identical c_fun()/c_var() into c_name()

Now that the two functions are identical, we only need one of them,
and we might as well give it a more descriptive name.  Basically,
the function serves as the translation from a QAPI name into a
(portion of a) C identifier, without regards to whether it is a
variable or function name.

Signed-off-by: Eric Blake <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>


  Commit: fa6068a1e8ef3c878ac9ee2399bb01eeaf61c366
      
https://github.com/qemu/qemu/commit/fa6068a1e8ef3c878ac9ee2399bb01eeaf61c366
  Author: Markus Armbruster <address@hidden>
  Date:   2015-05-14 (Thu, 14 May 2015)

  Changed paths:
    M scripts/qapi.py

  Log Message:
  -----------
  qapi: Rename _generate_enum_string() to camel_to_upper()

Signed-off-by: Markus Armbruster <address@hidden>
Signed-off-by: Eric Blake <address@hidden>


  Commit: 7c81c61f9c2274f66ba947eafd9618d60da838a6
      
https://github.com/qemu/qemu/commit/7c81c61f9c2274f66ba947eafd9618d60da838a6
  Author: Markus Armbruster <address@hidden>
  Date:   2015-05-14 (Thu, 14 May 2015)

  Changed paths:
    M scripts/qapi-event.py
    M scripts/qapi-types.py
    M scripts/qapi-visit.py
    M scripts/qapi.py

  Log Message:
  -----------
  qapi: Rename generate_enum_full_value() to c_enum_const()

Signed-off-by: Markus Armbruster <address@hidden>
Signed-off-by: Eric Blake <address@hidden>


  Commit: 02e20c7e593363c564aae96e3c5bdc58630ce584
      
https://github.com/qemu/qemu/commit/02e20c7e593363c564aae96e3c5bdc58630ce584
  Author: Markus Armbruster <address@hidden>
  Date:   2015-05-14 (Thu, 14 May 2015)

  Changed paths:
    M scripts/qapi.py

  Log Message:
  -----------
  qapi: Simplify c_enum_const()

Signed-off-by: Markus Armbruster <address@hidden>
Signed-off-by: Eric Blake <address@hidden>


  Commit: b42e91484df9772bb0c26aa0f05390a92d564d6f
      
https://github.com/qemu/qemu/commit/b42e91484df9772bb0c26aa0f05390a92d564d6f
  Author: Markus Armbruster <address@hidden>
  Date:   2015-05-14 (Thu, 14 May 2015)

  Changed paths:
    M scripts/qapi-types.py
    M scripts/qapi.py

  Log Message:
  -----------
  qapi: Use c_enum_const() in generate_alternate_qtypes()

Missed in commit b0b5819.

Signed-off-by: Markus Armbruster <address@hidden>
Signed-off-by: Eric Blake <address@hidden>


  Commit: 849bc5382e42b3b9590c6a50ba30c2fd2450308c
      
https://github.com/qemu/qemu/commit/849bc5382e42b3b9590c6a50ba30c2fd2450308c
  Author: Markus Armbruster <address@hidden>
  Date:   2015-05-14 (Thu, 14 May 2015)

  Changed paths:
    M scripts/qapi.py

  Log Message:
  -----------
  qapi: Move camel_to_upper(), c_enum_const() to closely related code

Signed-off-by: Markus Armbruster <address@hidden>
Signed-off-by: Eric Blake <address@hidden>


  Commit: d557344628e32771f07e5b6a2a818ee3d8e7a65f
      
https://github.com/qemu/qemu/commit/d557344628e32771f07e5b6a2a818ee3d8e7a65f
  Author: Eric Blake <address@hidden>
  Date:   2015-05-14 (Thu, 14 May 2015)

  Changed paths:
    M scripts/qapi.py

  Log Message:
  -----------
  qapi: Tidy c_type() logic

c_type() is designed to be called on both string names and on
array designations, so 'name' is a bit misleading because it
operates on more than strings.  Also, no caller ever passes
an empty string.  Finally, + notation is a bit nicer to read
than '%s' % value for string concatenation.

Signed-off-by: Eric Blake <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>


  Commit: c6405b54b7b09a876f2f2fba2aa6f8ac87189cb9
      
https://github.com/qemu/qemu/commit/c6405b54b7b09a876f2f2fba2aa6f8ac87189cb9
  Author: Eric Blake <address@hidden>
  Date:   2015-05-14 (Thu, 14 May 2015)

  Changed paths:
    M scripts/qapi.py

  Log Message:
  -----------
  qapi: Make c_type() consistently convert qapi names

Continuing the string of cleanups for supporting downstream names
containing '.', this patch focuses on ensuring c_type() can
handle a downstream name.  This patch alone does not fix the
places where generator output should be calling this function
but was open-coding things instead, but it gets us a step closer.

In particular, the changes to c_list_type() and type_name() mean
that type_name(FOO) now handles the case when FOO contains '.',
'-', or is a ticklish identifier other than a builtin (builtins
are exempted because ['int'] must remain mapped to 'intList' and
not 'q_intList').  Meanwhile, ['unix'] now maps to 'q_unixList'
rather than 'unixList', to match the fact that 'unix' is ticklish;
however, our naming conventions state that complex types should
start with a capital, so no type name following conventions will
ever have the 'q_' prepended.

Likewise, changes to c_type() mean that c_type(FOO) properly
handles an enum or complex type FOO with '.' or '-' in the
name, or is a ticklish identifier (again, a ticklish identifier
as a type name violates conventions).

Signed-off-by: Eric Blake <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>


  Commit: fce384b8e5193e02421f6b2c2880f3684abcbdc0
      
https://github.com/qemu/qemu/commit/fce384b8e5193e02421f6b2c2880f3684abcbdc0
  Author: Eric Blake <address@hidden>
  Date:   2015-05-14 (Thu, 14 May 2015)

  Changed paths:
    M scripts/qapi-types.py
    M scripts/qapi-visit.py
    M tests/qapi-schema/qapi-schema-test.json
    M tests/qapi-schema/qapi-schema-test.out

  Log Message:
  -----------
  qapi: Support downstream enums

Enhance the testsuite to cover a downstream enum type and enum
string.  Update the generator to mangle the enum name in the
appropriate places.

Signed-off-by: Eric Blake <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>


  Commit: 83a02706bb1fd31c93eab755de543dfe228682d4
      
https://github.com/qemu/qemu/commit/83a02706bb1fd31c93eab755de543dfe228682d4
  Author: Eric Blake <address@hidden>
  Date:   2015-05-14 (Thu, 14 May 2015)

  Changed paths:
    M scripts/qapi-types.py
    M scripts/qapi-visit.py
    M tests/qapi-schema/qapi-schema-test.json
    M tests/qapi-schema/qapi-schema-test.out

  Log Message:
  -----------
  qapi: Support downstream structs

Enhance the testsuite to cover downstream structs, including struct
members and base structs.  Update the generator to mangle the
struct names in the appropriate places.

Signed-off-by: Eric Blake <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>


  Commit: bb33729043ceda56b4068db13bdc17786ebd0ed0
      
https://github.com/qemu/qemu/commit/bb33729043ceda56b4068db13bdc17786ebd0ed0
  Author: Eric Blake <address@hidden>
  Date:   2015-05-14 (Thu, 14 May 2015)

  Changed paths:
    M scripts/qapi-types.py
    M scripts/qapi-visit.py
    M tests/qapi-schema/qapi-schema-test.json
    M tests/qapi-schema/qapi-schema-test.out

  Log Message:
  -----------
  qapi: Support downstream simple unions

Enhance the testsuite to cover downstream simple unions, including
when a union branch is a downstream name.  Update the generator to
mangle the union names in the appropriate places.

Signed-off-by: Eric Blake <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>


  Commit: 857af5f06c3fb097d1bb6bc8a23b9992aac99e75
      
https://github.com/qemu/qemu/commit/857af5f06c3fb097d1bb6bc8a23b9992aac99e75
  Author: Eric Blake <address@hidden>
  Date:   2015-05-14 (Thu, 14 May 2015)

  Changed paths:
    M scripts/qapi-types.py
    M scripts/qapi-visit.py
    M tests/qapi-schema/qapi-schema-test.json
    M tests/qapi-schema/qapi-schema-test.out

  Log Message:
  -----------
  qapi: Support downstream flat unions

Enhance the testsuite to cover downstream flat unions, including
the base type, discriminator name and type, and branch name and
type.  Update the generator to mangle the union names in the
appropriate places.

Signed-off-by: Eric Blake <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>


  Commit: d1f07c86c05706facf950b0b0dba370f71fd5ef6
      
https://github.com/qemu/qemu/commit/d1f07c86c05706facf950b0b0dba370f71fd5ef6
  Author: Eric Blake <address@hidden>
  Date:   2015-05-14 (Thu, 14 May 2015)

  Changed paths:
    M scripts/qapi-types.py
    M scripts/qapi-visit.py
    M tests/qapi-schema/qapi-schema-test.json
    M tests/qapi-schema/qapi-schema-test.out

  Log Message:
  -----------
  qapi: Support downstream alternates

Enhance the testsuite to cover downstream alternates, including
whether the branch name or type is downstream.  Update the
generator to mangle alternate names in the appropriate places.

Signed-off-by: Eric Blake <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>


  Commit: e3c4c3d796c1147d32f66fa1413d5d7c49d5aa37
      
https://github.com/qemu/qemu/commit/e3c4c3d796c1147d32f66fa1413d5d7c49d5aa37
  Author: Eric Blake <address@hidden>
  Date:   2015-05-14 (Thu, 14 May 2015)

  Changed paths:
    M scripts/qapi-commands.py
    M tests/qapi-schema/qapi-schema-test.json
    M tests/qapi-schema/qapi-schema-test.out
    M tests/test-qmp-commands.c

  Log Message:
  -----------
  qapi: Support downstream events and commands

Enhance the testsuite to cover downstream events and commands.
Events worked without more tweaks, but commands needed a few final
updates in the generator to mangle names in the appropriate places.
In making those tweaks, it was easier to drop type_visitor() and
inline its actions instead.

Signed-off-by: Eric Blake <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>


  Commit: df3e21a0e0edd30ea2e7c9b09b05feaaa297c718
      
https://github.com/qemu/qemu/commit/df3e21a0e0edd30ea2e7c9b09b05feaaa297c718
  Author: Markus Armbruster <address@hidden>
  Date:   2015-05-14 (Thu, 14 May 2015)

  Changed paths:
    M tests/Makefile

  Log Message:
  -----------
  tests: Add missing dependencies on $(qapi-py)

Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>


  Commit: c70cef5bd48c7be603f75a7b5346db032a31b470
      
https://github.com/qemu/qemu/commit/c70cef5bd48c7be603f75a7b5346db032a31b470
  Author: Markus Armbruster <address@hidden>
  Date:   2015-05-14 (Thu, 14 May 2015)

  Changed paths:
    M Makefile
    M scripts/qapi-event.py

  Log Message:
  -----------
  qapi: qapi-event.py option -b does nothing, drop it

Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>


  Commit: 72aaa73a4acef06bfaed750064c40a597f0cf745
      
https://github.com/qemu/qemu/commit/72aaa73a4acef06bfaed750064c40a597f0cf745
  Author: Markus Armbruster <address@hidden>
  Date:   2015-05-14 (Thu, 14 May 2015)

  Changed paths:
    M scripts/qapi-commands.py

  Log Message:
  -----------
  qapi: qapi-commands.py option --type is unused, drop it

Anything but --type sync (which is the default) suppresses output
entirely, which makes no sense.

Dates back to the initial commit c17d990.  Commit message says
"Currently only generators for synchronous qapi/qmp functions are
supported", so maybe output other than "synchronous qapi/qmp" was
planned at the time, to be selected with --type.

Should other kinds of output ever materialize, we can put the option
back.

Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>


  Commit: 2114f5a98d0d80774306279e1694de074ca86aa0
      
https://github.com/qemu/qemu/commit/2114f5a98d0d80774306279e1694de074ca86aa0
  Author: Markus Armbruster <address@hidden>
  Date:   2015-05-14 (Thu, 14 May 2015)

  Changed paths:
    M scripts/qapi-commands.py
    M scripts/qapi-event.py
    M scripts/qapi-types.py
    M scripts/qapi-visit.py
    M scripts/qapi.py

  Log Message:
  -----------
  qapi: Factor parse_command_line() out of the generators

Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>


  Commit: b45409683e829770000a4560ed21e704f87df74c
      
https://github.com/qemu/qemu/commit/b45409683e829770000a4560ed21e704f87df74c
  Author: Markus Armbruster <address@hidden>
  Date:   2015-05-14 (Thu, 14 May 2015)

  Changed paths:
    M scripts/qapi.py

  Log Message:
  -----------
  qapi: Fix generators to report command line errors decently

Report to stderr, prefix with the program name.  Also reject
extra arguments.

Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>


  Commit: 16d80f61814745bd3f5bb9f47ae3b00edf9e1e45
      
https://github.com/qemu/qemu/commit/16d80f61814745bd3f5bb9f47ae3b00edf9e1e45
  Author: Markus Armbruster <address@hidden>
  Date:   2015-05-14 (Thu, 14 May 2015)

  Changed paths:
    M Makefile
    M docs/qapi-code-gen.txt
    M scripts/qapi.py
    M tests/Makefile

  Log Message:
  -----------
  qapi: Turn generators' mandatory option -i into an argument

Mandatory option is silly, and the error handling is missing: the
programs crash when -i isn't supplied.  Make it an argument, and check
it properly.

Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>


  Commit: 12f8e1b9ff57e99dafbb13f89cd5a99ad5c28527
      
https://github.com/qemu/qemu/commit/12f8e1b9ff57e99dafbb13f89cd5a99ad5c28527
  Author: Markus Armbruster <address@hidden>
  Date:   2015-05-14 (Thu, 14 May 2015)

  Changed paths:
    M scripts/qapi-commands.py
    M scripts/qapi-event.py
    M scripts/qapi-types.py
    M scripts/qapi-visit.py
    M scripts/qapi.py

  Log Message:
  -----------
  qapi: Factor open_output(), close_output() out of generators

Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>


  Commit: 09896d3f48078a93e3d2dbd8ef86436b85ebda7c
      
https://github.com/qemu/qemu/commit/09896d3f48078a93e3d2dbd8ef86436b85ebda7c
  Author: Markus Armbruster <address@hidden>
  Date:   2015-05-14 (Thu, 14 May 2015)

  Changed paths:
    M scripts/qapi.py

  Log Message:
  -----------
  qapi: Drop pointless flush() before close()

Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>


  Commit: 4180978c9205c50acd2d6c385def9b3e81911696
      
https://github.com/qemu/qemu/commit/4180978c9205c50acd2d6c385def9b3e81911696
  Author: Markus Armbruster <address@hidden>
  Date:   2015-05-14 (Thu, 14 May 2015)

  Changed paths:
    M scripts/qapi-commands.py

  Log Message:
  -----------
  qapi: Inline gen_command_decl_prologue(), gen_command_def_prologue()

Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>


  Commit: 385057cbec9b4a0eb6150330c572e875ed714965
      
https://github.com/qemu/qemu/commit/385057cbec9b4a0eb6150330c572e875ed714965
  Author: Peter Maydell <address@hidden>
  Date:   2015-05-15 (Fri, 15 May 2015)

  Changed paths:
    M Makefile
    M cpus.c
    M docs/qapi-code-gen.txt
    M docs/qmp/qmp-events.txt
    M qapi-schema.json
    M qmp-commands.hx
    M scripts/qapi-commands.py
    M scripts/qapi-event.py
    M scripts/qapi-types.py
    M scripts/qapi-visit.py
    M scripts/qapi.py
    M tests/Makefile
    M tests/qapi-schema/qapi-schema-test.json
    M tests/qapi-schema/qapi-schema-test.out
    M tests/test-qmp-commands.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2015-05-15' into 
staging

qapi: Fix qapi mangling of downstream names, and more

# gpg: Signature made Fri May 15 17:41:31 2015 BST using RSA key ID EB918653
# gpg: Good signature from "Markus Armbruster <address@hidden>"
# gpg:                 aka "Markus Armbruster <address@hidden>"

* remotes/armbru/tags/pull-qapi-2015-05-15: (26 commits)
  qapi: Inline gen_command_decl_prologue(), gen_command_def_prologue()
  qapi: Drop pointless flush() before close()
  qapi: Factor open_output(), close_output() out of generators
  qapi: Turn generators' mandatory option -i into an argument
  qapi: Fix generators to report command line errors decently
  qapi: Factor parse_command_line() out of the generators
  qapi: qapi-commands.py option --type is unused, drop it
  qapi: qapi-event.py option -b does nothing, drop it
  tests: Add missing dependencies on $(qapi-py)
  qapi: Support downstream events and commands
  qapi: Support downstream alternates
  qapi: Support downstream flat unions
  qapi: Support downstream simple unions
  qapi: Support downstream structs
  qapi: Support downstream enums
  qapi: Make c_type() consistently convert qapi names
  qapi: Tidy c_type() logic
  qapi: Move camel_to_upper(), c_enum_const() to closely related code
  qapi: Use c_enum_const() in generate_alternate_qtypes()
  qapi: Simplify c_enum_const()
  ...

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


Compare: https://github.com/qemu/qemu/compare/99e7627a70d1...385057cbec9b

reply via email to

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