[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 3/8] scripts/qmp/qom-fuse: Unbreak import of QEMUMonitorProtocol
From: |
Markus Armbruster |
Subject: |
[PULL 3/8] scripts/qmp/qom-fuse: Unbreak import of QEMUMonitorProtocol |
Date: |
Thu, 3 Sep 2020 10:23:39 +0200 |
Commit c7b942d7f8 "scripts/qmp: Fix shebang and imports" messed with
it for reasons I don't quite understand. I do understand how it fails
now: it neglects to import sys. Fix that.
It now fails because it expects an old version of module fuse. That's
next.
Fixes: c7b942d7f84ef54f266921bf7668d43f1f2c7c79
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20200723142738.1868568-2-armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
---
scripts/qmp/qom-fuse | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/qmp/qom-fuse b/scripts/qmp/qom-fuse
index 5fa6b3bf64..b7dabe8d65 100755
--- a/scripts/qmp/qom-fuse
+++ b/scripts/qmp/qom-fuse
@@ -13,7 +13,7 @@
import fuse, stat
from fuse import Fuse
-import os, posix
+import os, posix, sys
from errno import *
sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'python'))
@@ -134,7 +134,7 @@ class QOMFS(Fuse):
yield fuse.Direntry(str(item['name']))
if __name__ == '__main__':
- import sys, os
+ import os
fs = QOMFS(QEMUMonitorProtocol(os.environ['QMP_SOCKET']))
fs.main(sys.argv)
--
2.26.2
- [PULL 0/8] QAPI patches patches for 2020-09-03, Markus Armbruster, 2020/09/03
- [PULL 1/8] qapi: enable use of g_autoptr with QAPI types, Markus Armbruster, 2020/09/03
- [PULL 4/8] scripts/qmp/qom-fuse: Port to current Python module fuse, Markus Armbruster, 2020/09/03
- [PULL 5/8] scripts/qmp/qom-fuse: Fix getattr(), read() for files in /, Markus Armbruster, 2020/09/03
- [PULL 7/8] qapi: Document event VSERPORT_CHANGE is rate-limited, Markus Armbruster, 2020/09/03
- [PULL 8/8] docs/qdev-device-use: Don't suggest -drive and -net can do USB, Markus Armbruster, 2020/09/03
- [PULL 2/8] qapi/block-core.json: Remove stale description of 'blockdev-add', Markus Armbruster, 2020/09/03
- [PULL 6/8] docs/interop/qmp-spec: Point to the QEMU QMP reference manual, Markus Armbruster, 2020/09/03
- [PULL 3/8] scripts/qmp/qom-fuse: Unbreak import of QEMUMonitorProtocol,
Markus Armbruster <=
- Re: [PULL 0/8] QAPI patches patches for 2020-09-03, Peter Maydell, 2020/09/05