diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-01-27 15:20:08 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-01-27 15:20:08 +0000 |
| commit | 29ba0cdc1fd1300f910d150c03a0f74236083bf7 (patch) | |
| tree | 514cdeab7694a5ccabe9cf313c02403b0ea69ec0 /qmp.c | |
| parent | 8a26d88507b51b7cc5dc40732e51ccc135fec0f6 (diff) | |
| parent | 7a8c153f0e59cccdc0425cdebe43765008def01a (diff) | |
| download | focaccia-qemu-29ba0cdc1fd1300f910d150c03a0f74236083bf7.tar.gz focaccia-qemu-29ba0cdc1fd1300f910d150c03a0f74236083bf7.zip | |
Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2017-01-27' into staging
QAPI/QMP patches for 2017-01-27 # gpg: Signature made Fri 27 Jan 2017 07:24:02 GMT # 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-01-27: qmp: Fix argument name in error message of device-list-properties qapi: Remove unwanted commas after #optional keyword build-sys: Minor qapi doc generation target cleanups Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'qmp.c')
| -rw-r--r-- | qmp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qmp.c b/qmp.c index 0028f0b30e..886059ef94 100644 --- a/qmp.c +++ b/qmp.c @@ -531,12 +531,12 @@ DevicePropertyInfoList *qmp_device_list_properties(const char *typename, klass = object_class_dynamic_cast(klass, TYPE_DEVICE); if (klass == NULL) { - error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "name", TYPE_DEVICE); + error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "typename", TYPE_DEVICE); return NULL; } if (object_class_is_abstract(klass)) { - error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "name", + error_setg(errp, QERR_INVALID_PARAMETER_VALUE, "typename", "non-abstract device type"); return NULL; } |