qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: "John Snow" <jsnow@redhat.com>,
	peter.maydell@linaro.org,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PULL 5/8] scripts/qmp/qom-fuse: Fix getattr(), read() for files in /
Date: Thu,  3 Sep 2020 10:23:41 +0200	[thread overview]
Message-ID: <20200903082344.1877175-6-armbru@redhat.com> (raw)
In-Reply-To: <20200903082344.1877175-1-armbru@redhat.com>

path, prop = "type".rsplit('/', 1) sets path to "", which doesn't
work.  Correct to "/".

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20200723142738.1868568-4-armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
---
 scripts/qmp/qom-fuse | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/scripts/qmp/qom-fuse b/scripts/qmp/qom-fuse
index 405e6ebd67..7c7cff8edf 100755
--- a/scripts/qmp/qom-fuse
+++ b/scripts/qmp/qom-fuse
@@ -45,8 +45,10 @@ class QOMFS(Operations):
             return False
 
     def is_property(self, path):
+        path, prop = path.rsplit('/', 1)
+        if path == '':
+            path = '/'
         try:
-            path, prop = path.rsplit('/', 1)
             for item in self.qmp.command('qom-list', path=path):
                 if item['name'] == prop:
                     return True
@@ -55,8 +57,10 @@ class QOMFS(Operations):
             return False
 
     def is_link(self, path):
+        path, prop = path.rsplit('/', 1)
+        if path == '':
+            path = '/'
         try:
-            path, prop = path.rsplit('/', 1)
             for item in self.qmp.command('qom-list', path=path):
                 if item['name'] == prop:
                     if item['type'].startswith('link<'):
@@ -71,6 +75,8 @@ class QOMFS(Operations):
             return -ENOENT
 
         path, prop = path.rsplit('/', 1)
+        if path == '':
+            path = '/'
         try:
             data = self.qmp.command('qom-get', path=path, property=prop)
             data += '\n' # make values shell friendly
-- 
2.26.2



  parent reply	other threads:[~2020-09-03  8:26 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-03  8:23 [PULL 0/8] QAPI patches patches for 2020-09-03 Markus Armbruster
2020-09-03  8:23 ` [PULL 1/8] qapi: enable use of g_autoptr with QAPI types Markus Armbruster
2020-09-03  8:23 ` [PULL 2/8] qapi/block-core.json: Remove stale description of 'blockdev-add' Markus Armbruster
2020-09-03  8:23 ` [PULL 3/8] scripts/qmp/qom-fuse: Unbreak import of QEMUMonitorProtocol Markus Armbruster
2020-09-03  8:23 ` [PULL 4/8] scripts/qmp/qom-fuse: Port to current Python module fuse Markus Armbruster
2020-09-03  8:23 ` Markus Armbruster [this message]
2020-09-03  8:23 ` [PULL 6/8] docs/interop/qmp-spec: Point to the QEMU QMP reference manual Markus Armbruster
2020-09-03  8:23 ` [PULL 7/8] qapi: Document event VSERPORT_CHANGE is rate-limited Markus Armbruster
2020-09-03  8:23 ` [PULL 8/8] docs/qdev-device-use: Don't suggest -drive and -net can do USB Markus Armbruster
2020-09-05 14:27 ` [PULL 0/8] QAPI patches patches for 2020-09-03 Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200903082344.1877175-6-armbru@redhat.com \
    --to=armbru@redhat.com \
    --cc=jsnow@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=philmd@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).