[Qemu-commits] [qemu/qemu] 6ac3f1: qapi/machine.json: Fix missing newline in doc comment

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 6ac3f1e79974091aa292a0ab8637d5be8e5e4b1e
      
https://github.com/qemu/qemu/commit/6ac3f1e79974091aa292a0ab8637d5be8e5e4b1e
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2020-08-03 (Mon, 03 Aug 2020)

  Changed paths:
    M qapi/machine.json

  Log Message:
  -----------
  qapi/machine.json: Fix missing newline in doc comment

In commit 176d2cda0dee9f4 we added the @die-id field
to the CpuInstanceProperties struct, but in the process
accidentally removed the newline between the doc-comment
lines for @core-id and @thread-id.

Put the newline back in; this fixes a misformatting in the
generated HTML QMP reference manual.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20200729191019.19168-1-peter.maydell@linaro.org>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: fbeed197611bda439968e68a42d8efadb2e60f81
      
https://github.com/qemu/qemu/commit/fbeed197611bda439968e68a42d8efadb2e60f81
  Author: Markus Armbruster <armbru@redhat.com>
  Date:   2020-08-03 (Mon, 03 Aug 2020)

  Changed paths:
    M qapi/block-core.json
    M qapi/ui.json

  Log Message:
  -----------
  qapi: Delete unwanted indentation of top-level expressions

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20200730091656.2633334-1-armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
[One more line de-indented]


  Commit: f7160f32186b4ae1e1327e3bd05060fffec8f9ae
      
https://github.com/qemu/qemu/commit/f7160f32186b4ae1e1327e3bd05060fffec8f9ae
  Author: Andrea Bolognani <abologna@redhat.com>
  Date:   2020-08-03 (Mon, 03 Aug 2020)

  Changed paths:
    M docs/interop/firmware.json
    M docs/interop/vhost-user.json
    M qapi/authz.json
    M qapi/block-core.json
    M qapi/block.json
    M qapi/char.json
    M qapi/common.json
    M qapi/control.json
    M qapi/crypto.json
    M qapi/dump.json
    M qapi/error.json
    M qapi/introspect.json
    M qapi/job.json
    M qapi/machine-target.json
    M qapi/machine.json
    M qapi/migration.json
    M qapi/misc-target.json
    M qapi/misc.json
    M qapi/net.json
    M qapi/qapi-schema.json
    M qapi/qdev.json
    M qapi/qom.json
    M qapi/rdma.json
    M qapi/rocker.json
    M qapi/run-state.json
    M qapi/sockets.json
    M qapi/tpm.json
    M qapi/transaction.json
    M qapi/ui.json
    M qga/qapi-schema.json
    M storage-daemon/qapi/qapi-schema.json
    M tests/qapi-schema/doc-good.json
    M tests/qapi-schema/include/sub-module.json
    M tests/qapi-schema/qapi-schema-test.json
    M tests/qapi-schema/sub-sub-module.json

  Log Message:
  -----------
  schemas: Add vim modeline

The various schemas included in QEMU use a JSON-based format which
is, however, strictly speaking not valid JSON.

As a consequence, when vim tries to apply syntax highlight rules
for JSON (as guessed from the file name), the result is an unreadable
mess which mostly consist of red markers pointing out supposed errors
in, well, pretty much everything.

Using Python syntax highlighting produces much better results, and
in fact these files already start with specially-formatted comments
that instruct Emacs to process them as if they were Python files.

This commit adds the equivalent special comments for vim.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Message-Id: <20200729185024.121766-1-abologna@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>


  Commit: 6c5dfc9ccb643a0d50fdec9f10806b14960571d1
      
https://github.com/qemu/qemu/commit/6c5dfc9ccb643a0d50fdec9f10806b14960571d1
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2020-08-03 (Mon, 03 Aug 2020)

  Changed paths:
    M docs/interop/firmware.json
    M docs/interop/vhost-user.json
    M qapi/authz.json
    M qapi/block-core.json
    M qapi/block.json
    M qapi/char.json
    M qapi/common.json
    M qapi/control.json
    M qapi/crypto.json
    M qapi/dump.json
    M qapi/error.json
    M qapi/introspect.json
    M qapi/job.json
    M qapi/machine-target.json
    M qapi/machine.json
    M qapi/migration.json
    M qapi/misc-target.json
    M qapi/misc.json
    M qapi/net.json
    M qapi/qapi-schema.json
    M qapi/qdev.json
    M qapi/qom.json
    M qapi/rdma.json
    M qapi/rocker.json
    M qapi/run-state.json
    M qapi/sockets.json
    M qapi/tpm.json
    M qapi/transaction.json
    M qapi/ui.json
    M qga/qapi-schema.json
    M storage-daemon/qapi/qapi-schema.json
    M tests/qapi-schema/doc-good.json
    M tests/qapi-schema/include/sub-module.json
    M tests/qapi-schema/qapi-schema-test.json
    M tests/qapi-schema/sub-sub-module.json

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2020-08-03' into 
staging

QAPI patches patches for 2020-08-03

# gpg: Signature made Mon 03 Aug 2020 10:08:30 BST
# gpg:                using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653
# gpg:                issuer "armbru@redhat.com"
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [full]
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>" [full]
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* remotes/armbru/tags/pull-qapi-2020-08-03:
  schemas: Add vim modeline
  qapi: Delete unwanted indentation of top-level expressions
  qapi/machine.json: Fix missing newline in doc comment

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/92a95ab44655...6c5dfc9ccb64