@@ -95,7 +95,7 @@ class QOMFuse(QOMCommand, Operations):
def is_object(self, path):
"""Is the given QOM path an object?"""
try:
- self.qmp.command('qom-list', path=path)
+ self.qom_list(path)
return True
except QMPResponseError:
return False
@@ -106,8 +106,8 @@ class QOMFuse(QOMCommand, Operations):
if path == '':
path = '/'
try:
- for item in self.qmp.command('qom-list', path=path):
- if item['name'] == prop:
+ for item in self.qom_list(path):
+ if item.name == prop:
return True
return False
except QMPResponseError:
@@ -119,11 +119,9 @@ class QOMFuse(QOMCommand, Operations):
if path == '':
path = '/'
try:
- for item in self.qmp.command('qom-list', path=path):
- if item['name'] == prop:
- if item['type'].startswith('link<'):
- return True
- return False
+ for item in self.qom_list(path):
+ if item.name == prop and item.link:
+ return True
return False
except QMPResponseError:
return False
@@ -201,8 +199,8 @@ class QOMFuse(QOMCommand, Operations):
def readdir(self, path, fh):
yield '.'
yield '..'
- for item in self.qmp.command('qom-list', path=path):
- yield str(item['name'])
+ for item in self.qom_list(path):
+ yield item.name
if __name__ == '__main__':
the qom_list method provides a type-safe object that's easier to type check, so switch to using it. Signed-off-by: John Snow <jsnow@redhat.com> --- scripts/qmp/qom-fuse | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-)