[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 11/15] scripts/qom-fuse: ensure QOMFuse.read always returns bytes
From: |
John Snow |
Subject: |
[PATCH 11/15] scripts/qom-fuse: ensure QOMFuse.read always returns bytes |
Date: |
Wed, 21 Oct 2020 14:52:04 -0400 |
- Use FuseOSError to signal ENOENT instead of returning it
- Wrap qom-get in str(), as we don't always know its type
- The empty return should be b'', not ''.
Signed-off-by: John Snow <jsnow@redhat.com>
---
scripts/qmp/qom-fuse | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/scripts/qmp/qom-fuse b/scripts/qmp/qom-fuse
index b1030273ef..b120b93391 100755
--- a/scripts/qmp/qom-fuse
+++ b/scripts/qmp/qom-fuse
@@ -128,19 +128,19 @@ class QOMFuse(QOMCommand, Operations):
def read(self, path, size, offset, fh):
if not self.is_property(path):
- return -ENOENT
+ raise FuseOSError(ENOENT)
path, prop = path.rsplit('/', 1)
if path == '':
path = '/'
try:
- data = self.qmp.command('qom-get', path=path, property=prop)
+ data = str(self.qmp.command('qom-get', path=path, property=prop))
data += '\n' # make values shell friendly
except QMPResponseError as err:
raise FuseOSError(EPERM) from err
if offset > len(data):
- return ''
+ return b''
return bytes(data[offset:][:size], encoding='utf-8')
--
2.26.2
- [PATCH 00/15] python: absorb scripts/qmp/qom-* tooling, John Snow, 2020/10/21
- [PATCH 03/15] scripts/qmp: redirect qom-xxx scripts to python/qemu/qmp/, John Snow, 2020/10/21
- [PATCH 10/15] scripts/qom-fuse: use QOMCommand.qom_list(), John Snow, 2020/10/21
- [PATCH 13/15] scripts/qom-fuse: move to python/qemu/qmp/qom_fuse.py, John Snow, 2020/10/21
- [PATCH 08/15] scripts/qom-fuse: Add docstrings, John Snow, 2020/10/21
- [PATCH 07/15] scripts/qom-fuse: Apply pylint rules, John Snow, 2020/10/21
- [PATCH 12/15] scripts/qom-fuse: add static type hints, John Snow, 2020/10/21
- [PATCH 11/15] scripts/qom-fuse: ensure QOMFuse.read always returns bytes,
John Snow <=
- [PATCH 06/15] python: Add 'fh' to known-good variable names, John Snow, 2020/10/21
- [PATCH 01/15] python/qmp: Add qom script rewrites, John Snow, 2020/10/21
- [PATCH 02/15] python/qmp: add qom script entry points, John Snow, 2020/10/21
- [PATCH 04/15] scripts/qom-fuse: apply isort rules, John Snow, 2020/10/21
- [PATCH 09/15] scripts/qom-fuse: Convert to QOMCommand, John Snow, 2020/10/21
- [PATCH 15/15] python: add fuse command to 'qom' tools, John Snow, 2020/10/21
- [PATCH 14/15] scripts/qom-fuse: add redirection shim to python/qemu/qmp/qom-fuse.py, John Snow, 2020/10/21