Commit 29ba0cdc authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 8a26d885 7a8c153f

Makefile

+3 −3
Original line number Diff line number Diff line
@@ -542,8 +542,8 @@ ui/console-gl.o: $(SRC_PATH)/ui/console-gl.c \ 
	ui/shader/texture-blit-vert.h ui/shader/texture-blit-frag.h



# documentation

MAKEINFO=makeinfo -D 'VERSION $(VERSION)'

MAKEINFOFLAGS=--no-split --number-sections

MAKEINFO=makeinfo

MAKEINFOFLAGS=--no-split --number-sections -D 'VERSION $(VERSION)'

TEXIFLAG=$(if $(V),,--quiet) --command='@set VERSION $(VERSION)'



%.html: %.texi
@@ -573,7 +573,7 @@ qemu-img-cmds.texi: $(SRC_PATH)/qemu-img-cmds.hx $(SRC_PATH)/scripts/hxtool 
	$(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -t < $< > $@,"GEN","$@")



qemu-qapi.texi: $(qapi-modules) $(qapi-py)

	$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi2texi.py $< > $@,"GEN" "$@")

	$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi2texi.py $< > $@,"GEN","$@")



qemu-ga-qapi.texi: $(SRC_PATH)/qga/qapi-schema.json $(qapi-py)

	$(call quiet-command,$(PYTHON) $(SRC_PATH)/scripts/qapi2texi.py $< > $@,"GEN","$@")

qapi-schema.json

+2 −2
Original line number Diff line number Diff line
@@ -1506,7 +1506,7 @@ 
#

# The network connection information for server

#

# @auth: #optional, authentication method

# @auth: #optional authentication method

#

# Since: 2.1

##
@@ -1694,7 +1694,7 @@ 
#

# Information about a SPICE server

#

# @auth: #optional, authentication method

# @auth: #optional authentication method

#

# Since: 2.1

##

qapi/block-core.json

+5 −5
Original line number Diff line number Diff line
@@ -3126,10 +3126,10 @@ 
#

# @filename:        filename of the new image to be loaded

#

# @format:          #optional, format to open the new image with (defaults to

# @format:          #optional format to open the new image with (defaults to

#                   the probed format)

#

# @read-only-mode:  #optional, change the read-only mode of the device; defaults

# @read-only-mode:  #optional change the read-only mode of the device; defaults

#                   to 'retain'

#

# Since: 2.5
@@ -3208,10 +3208,10 @@ 
#       corruption being detected. It should not be parsed by machine as it is

#       not guaranteed to be stable

#

# @offset: #optional, if the corruption resulted from an image access, this is

# @offset: #optional if the corruption resulted from an image access, this is

#          the host's access offset into the image

#

# @size: #optional, if the corruption resulted from an image access, this is

# @size: #optional if the corruption resulted from an image access, this is

#        the access size

#

# @fatal: if set, the image is marked corrupt and therefore unusable after this
@@ -3302,7 +3302,7 @@ 
#

# @speed: rate limit, bytes per second

#

# @error: #optional, error message. Only present on failure. This field

# @error: #optional error message. Only present on failure. This field

#         contains a human-readable error message. There are no semantics

#         other than that streaming has failed and clients should not try to

#         interpret the error string

qapi/event.json

+3 −3
Original line number Diff line number Diff line
@@ -186,7 +186,7 @@ 
# At this point, it's safe to reuse the specified device ID. Device removal can

# be initiated by the guest or by HMP/QMP commands.

#

# @device: #optional, device name

# @device: #optional device name

#

# @path: device path

#
@@ -209,7 +209,7 @@ 
# Emitted once until the 'query-rx-filter' command is executed, the first event

# will always be emitted

#

# @name: #optional, net client name

# @name: #optional net client name

#

# @path: device path

#
@@ -531,7 +531,7 @@ 
#

# @type: quorum operation type (Since 2.6)

#

# @error: #optional, error message. Only present on failure. This field

# @error: #optional error message. Only present on failure. This field

#         contains a human-readable error message. There are no semantics other

#         than that the block layer reported an error and clients should not

#         try to interpret the error string.

qmp.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

    }