qemu-commits
[Top][All Lists]
Advanced

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

[Qemu-commits] [qemu/qemu] f6f55a: block: Clarify documentation of Block


From: GitHub
Subject: [Qemu-commits] [qemu/qemu] f6f55a: block: Clarify documentation of BlockInfo member i...
Date: Tue, 06 Jun 2017 08:59:53 -0700

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: f6f55affd1f1a1e297296922a6cc1a1b0d922c95
      
https://github.com/qemu/qemu/commit/f6f55affd1f1a1e297296922a6cc1a1b0d922c95
  Author: Markus Armbruster <address@hidden>
  Date:   2017-06-06 (Tue, 06 Jun 2017)

  Changed paths:
    M qapi/block-core.json

  Log Message:
  -----------
  block: Clarify documentation of BlockInfo member io-status

Say "SCSI except scsi-generic" instead of "scsi-disk", because
scsi-disk could mean either scsi-disk.c (which is correct) or device
model scsi-disk (which would be incorrect).

Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Acked-by: Paolo Bonzini <address@hidden>


  Commit: 8ee47a886fdae906e9b8734a7b0dc0a4c72d0aca
      
https://github.com/qemu/qemu/commit/8ee47a886fdae906e9b8734a7b0dc0a4c72d0aca
  Author: Markus Armbruster <address@hidden>
  Date:   2017-06-06 (Tue, 06 Jun 2017)

  Changed paths:
    M tests/virtio-scsi-test.c

  Log Message:
  -----------
  virtio-scsi-test: Use scsi-hd instead of legacy scsi-disk

Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Acked-by: Paolo Bonzini <address@hidden>


  Commit: a1af255f065ccf3f47a7bfe88f1dbc9eeca36935
      
https://github.com/qemu/qemu/commit/a1af255f065ccf3f47a7bfe88f1dbc9eeca36935
  Author: Michael Roth <address@hidden>
  Date:   2017-06-06 (Tue, 06 Jun 2017)

  Changed paths:
    M tests/check-qom-proplist.c

  Log Message:
  -----------
  tests: check-qom-proplist: add checks for cmdline-created objects

check-qom-proplist originally added tests for verifying that
object-creation helpers object_new_with_{props,propv} behaved in
similar fashion to the "traditional" method involving setting each
individual property separately after object creation rather than
via a single call.

Another similar "helper" for creating Objects exists in the form of
objects specified via -object command-line parameters. By that
rationale, we extend check-qom-proplist to include similar checks
for command-line-created objects by employing the same
qemu_opts_parse()-based parsing the vl.c employs.

This parser has a side-effect of parsing the object's options into
a QemuOpt structure and registering this in the global QemuOptsList
using the Object's ID. This can conflict with future Object instances
that attempt to use the same ID if we don't ensure this is cleaned
up as part of Object finalization, so we include a FIXME stub to test
for this case, which will then be resolved in a subsequent patch.

Suggested-by: Daniel Berrange <address@hidden>
Cc: "Dr. David Alan Gilbert" <address@hidden>
Cc: Markus Armbruster <address@hidden>
Cc: Eric Blake <address@hidden>
Cc: Daniel Berrange <address@hidden>
Cc: address@hidden
Signed-off-by: Michael Roth <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
[Comment formatting tidied up]
Signed-off-by: Markus Armbruster <address@hidden>


  Commit: c645d5acee0ae022534cb609184277ec2b4a8577
      
https://github.com/qemu/qemu/commit/c645d5acee0ae022534cb609184277ec2b4a8577
  Author: Michael Roth <address@hidden>
  Date:   2017-06-06 (Tue, 06 Jun 2017)

  Changed paths:
    M qom/object_interfaces.c
    M tests/check-qom-proplist.c

  Log Message:
  -----------
  monitor: fix object_del for command-line-created objects

Currently objects specified on the command-line are only partially
cleaned up when 'object_del' is issued in either HMP or QMP: the
object itself is fully finalized, but the QemuOpts are not removed.
This results in the following behavior:

  x86_64-softmmu/qemu-system-x86_64 -monitor stdio \
    -object memory-backend-ram,id=ram1,size=256M

  QEMU 2.7.91 monitor - type 'help' for more information
  (qemu) object_del ram1
  (qemu) object_del ram1
  object 'ram1' not found
  (qemu) object_add memory-backend-ram,id=ram1,size=256M
  Duplicate ID 'ram1' for object
  Try "help object_add" for more information

which can be an issue for use-cases like memory hotplug.

This happens on the HMP side because hmp_object_add() attempts to
create a temporary QemuOpts entry with ID 'ram1', which ends up
conflicting with the command-line-created entry, since it was never
cleaned up during the previous hmp_object_del() call.

We address this by adding a check in user_creatable_del(), which
is called by both qmp_object_del() and hmp_object_del() to handle
the actual object cleanup, to determine whether an option group entry
matching the object's ID is present and removing it if it is.

Note that qmp_object_add() never attempts to create a temporary
QemuOpts entry, so it does not encounter the duplicate ID error,
which is why this isn't generally visible in libvirt.

Cc: "Dr. David Alan Gilbert" <address@hidden>
Cc: Markus Armbruster <address@hidden>
Cc: Eric Blake <address@hidden>
Cc: Daniel Berrange <address@hidden>
Cc: address@hidden
Signed-off-by: Michael Roth <address@hidden>
Reviewed-by: Daniel P. Berrange <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>


  Commit: 572db7cd69bef46e94bd0bf6d7eacb1015ce714e
      
https://github.com/qemu/qemu/commit/572db7cd69bef46e94bd0bf6d7eacb1015ce714e
  Author: Peter Maydell <address@hidden>
  Date:   2017-06-06 (Tue, 06 Jun 2017)

  Changed paths:
    M qapi/block-core.json
    M qom/object_interfaces.c
    M tests/check-qom-proplist.c
    M tests/virtio-scsi-test.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/armbru/tags/pull-misc-2017-06-06' into 
staging

Miscellaneous patches for 2017-06-06

# gpg: Signature made Tue 06 Jun 2017 08:30:43 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-misc-2017-06-06:
  monitor: fix object_del for command-line-created objects
  tests: check-qom-proplist: add checks for cmdline-created objects
  virtio-scsi-test: Use scsi-hd instead of legacy scsi-disk
  block: Clarify documentation of BlockInfo member io-status

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


Compare: https://github.com/qemu/qemu/compare/e02bbe1956d8...572db7cd69be

reply via email to

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