On 5/14/20 7:53 AM, John Snow wrote: > There's more wrong with these scripts; They are in various stages of > disrepair. That's beyond the scope of this current patchset. > > This just mechanically corrects the imports and the shebangs, as part of > ensuring that the python/qemu/lib refactoring didn't break anything > needlessly. > > Signed-off-by: John Snow <js...@redhat.com>
Whoops, I address this in a patch series I'm working on, too. I'll keep my patch in there for now until this one makes it in, or vice-versa. https://www.mail-archive.com/qemu-block@nongnu.org/msg66801.html Reviewed-by: Philippe Mathieu-Daudé <phi...@redhat.com> > --- > scripts/qmp/qmp | 4 +++- > scripts/qmp/qom-fuse | 4 +++- > scripts/qmp/qom-get | 6 ++++-- > scripts/qmp/qom-list | 4 +++- > scripts/qmp/qom-set | 6 ++++-- > scripts/qmp/qom-tree | 6 ++++-- > 6 files changed, 21 insertions(+), 9 deletions(-) > > diff --git a/scripts/qmp/qmp b/scripts/qmp/qmp > index 0625fc2aba..5981f7c414 100755 > --- a/scripts/qmp/qmp > +++ b/scripts/qmp/qmp > @@ -11,7 +11,9 @@ > # See the COPYING file in the top-level directory. > > import sys, os > -from qmp import QEMUMonitorProtocol > + > +sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', > 'python')) > +from qemu.lib import QEMUMonitorProtocol > > def print_response(rsp, prefix=[]): > if type(rsp) == list: > diff --git a/scripts/qmp/qom-fuse b/scripts/qmp/qom-fuse > index 6bada2c33d..6006f1d562 100755 > --- a/scripts/qmp/qom-fuse > +++ b/scripts/qmp/qom-fuse > @@ -15,7 +15,9 @@ import fuse, stat > from fuse import Fuse > import os, posix > from errno import * > -from qmp import QEMUMonitorProtocol > + > +sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', > 'python')) > +from qemu.lib import QEMUMonitorProtocol > > fuse.fuse_python_api = (0, 2) > > diff --git a/scripts/qmp/qom-get b/scripts/qmp/qom-get > index 007b4cd442..1d04d1b119 100755 > --- a/scripts/qmp/qom-get > +++ b/scripts/qmp/qom-get > @@ -1,4 +1,4 @@ > -#!/usr/bin/python > +#!/usr/bin/env python3 > ## > # QEMU Object Model test tools > # > @@ -13,7 +13,9 @@ > > import sys > import os > -from qmp import QEMUMonitorProtocol > + > +sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', > 'python')) > +from qemu.lib import QEMUMonitorProtocol > > cmd, args = sys.argv[0], sys.argv[1:] > socket_path = None > diff --git a/scripts/qmp/qom-list b/scripts/qmp/qom-list > index 03bda3446b..94e3bc21ba 100755 > --- a/scripts/qmp/qom-list > +++ b/scripts/qmp/qom-list > @@ -1,4 +1,4 @@ > -#!/usr/bin/python > +#!/usr/bin/env python3 > ## > # QEMU Object Model test tools > # > @@ -13,6 +13,8 @@ > > import sys > import os > + > +sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', > 'python')) > from qmp import QEMUMonitorProtocol > > cmd, args = sys.argv[0], sys.argv[1:] > diff --git a/scripts/qmp/qom-set b/scripts/qmp/qom-set > index c37fe78b00..a78080a4fc 100755 > --- a/scripts/qmp/qom-set > +++ b/scripts/qmp/qom-set > @@ -1,4 +1,4 @@ > -#!/usr/bin/python > +#!/usr/bin/env python3 > ## > # QEMU Object Model test tools > # > @@ -13,7 +13,9 @@ > > import sys > import os > -from qmp import QEMUMonitorProtocol > + > +sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', > 'python')) > +from qemu.lib import QEMUMonitorProtocol > > cmd, args = sys.argv[0], sys.argv[1:] > socket_path = None > diff --git a/scripts/qmp/qom-tree b/scripts/qmp/qom-tree > index 1c8acf61e7..4866c15581 100755 > --- a/scripts/qmp/qom-tree > +++ b/scripts/qmp/qom-tree > @@ -1,4 +1,4 @@ > -#!/usr/bin/python > +#!/usr/bin/env python3 > ## > # QEMU Object Model test tools > # > @@ -15,7 +15,9 @@ > > import sys > import os > -from qmp import QEMUMonitorProtocol > + > +sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', > 'python')) > +from qemu.lib import QEMUMonitorProtocol > > cmd, args = sys.argv[0], sys.argv[1:] > socket_path = None >