[Qemu-commits] [qemu/qemu] 1bf4d3: monitor: Fix find_device_state() for IDs containin...

[Richard Henderson]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 1bf4d3294bd48b702530b131e3344860495425fd
      
https://github.com/qemu/qemu/commit/1bf4d3294bd48b702530b131e3344860495425fd
  Author: Markus Armbruster <armbru@redhat.com>
  Date:   2021-11-10 (Wed, 10 Nov 2021)

  Changed paths:
    M include/qom/object.h
    M qom/object.c
    M softmmu/qdev-monitor.c

  Log Message:
  -----------
  monitor: Fix find_device_state() for IDs containing slashes

Recent commit 6952026120 "monitor: Tidy up find_device_state()"
assumed the function's argument is "the device's ID or QOM path" (as
documented for device_del).  It's actually either an absolute QOM
path, or a QOM path relative to /machine/peripheral/.  Such a relative
path is a device ID when it doesn't contain a slash.  When it does,
the function now always fails.  Broke iotest 200, which uses relative
path "vda/virtio-backend".

It fails because object_resolve_path_component() resolves just one
component, not a relative path.

The obvious function to resolve relative paths is
object_resolve_path().  It picks a parent automatically.  Too much
magic, we want to specify the parent.  Create new
object_resolve_path_at() for that, and use it in find_device_state().

Reported-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20211019085711.86377-1-armbru@redhat.com>
Tested-by: Christian Borntraeger <borntraeger@de.ibm.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>


  Commit: d73b6ae2c0893420c4b5d9f15b5e1407ca0d2173
      
https://github.com/qemu/qemu/commit/d73b6ae2c0893420c4b5d9f15b5e1407ca0d2173
  Author: Richard Henderson <richard.henderson@linaro.org>
  Date:   2021-11-10 (Wed, 10 Nov 2021)

  Changed paths:
    M include/qom/object.h
    M qom/object.c
    M softmmu/qdev-monitor.c

  Log Message:
  -----------
  Merge tag 'pull-monitor-2021-11-10' of git://repo.or.cz/qemu/armbru into 
staging

Monitor patches patches for 2021-11-10

# gpg: Signature made Wed 10 Nov 2021 06:15:38 AM CET
# 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]

* tag 'pull-monitor-2021-11-10' of git://repo.or.cz/qemu/armbru:
  monitor: Fix find_device_state() for IDs containing slashes

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>


Compare: https://github.com/qemu/qemu/compare/856f9fa9a2c5...d73b6ae2c089