On 4/21/20 5:42 AM, Philippe Mathieu-Daudé wrote:
> QEMU Python scripts have been moved in commit 8f8fd9edba4 ("Introduce
> Python module structure"). Use the same sys.path modification used
> in the referenced commit to be able to use these scripts again.
>
> Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org>
> ---
> scripts/qmp/qmp | 4 +++-
> scripts/qmp/qom-fuse | 4 +++-
> scripts/qmp/qom-get | 4 +++-
> scripts/qmp/qom-list | 4 +++-
> scripts/qmp/qom-set | 4 +++-
> scripts/qmp/qom-tree | 4 +++-
> 6 files changed, 18 insertions(+), 6 deletions(-)
>
> diff --git a/scripts/qmp/qmp b/scripts/qmp/qmp
> index 0625fc2aba..8e52e4a54d 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.qmp import QEMUMonitorProtocol
>
Try to avoid using sys.path hacks; they don't work in pylint or mypy and
it provides an active barrier to CQA work here.
(They also tend to be quite fragile.)
We can discuss the right way to do this; one of those ways is to create
an installable package that we can install locally in a virtual environment.
Another way is perhaps to set PYTHONPATH in the calling environment so
that standard "import" directives will work.
Both ultimately involve changing the environment of the user to
accommodate the script.
> def print_response(rsp, prefix=[]):
> if type(rsp) == list:
> diff --git a/scripts/qmp/qom-fuse b/scripts/qmp/qom-fuse
> index 6bada2c33d..5fa6b3bf64 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.qmp import QEMUMonitorProtocol
>
> fuse.fuse_python_api = (0, 2)
>
> diff --git a/scripts/qmp/qom-get b/scripts/qmp/qom-get
> index 72ccd79330..59090069dc 100755
> --- a/scripts/qmp/qom-get
> +++ b/scripts/qmp/qom-get
> @@ -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.qmp 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 5b8f9fd855..c5d0c8127d 100755
> --- a/scripts/qmp/qom-list
> +++ b/scripts/qmp/qom-list
> @@ -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.qmp import QEMUMonitorProtocol
>
> cmd, args = sys.argv[0], sys.argv[1:]
> socket_path = None
> diff --git a/scripts/qmp/qom-set b/scripts/qmp/qom-set
> index b475e397fc..e9d7e0b054 100755
> --- a/scripts/qmp/qom-set
> +++ b/scripts/qmp/qom-set
> @@ -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.qmp 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 86233fa211..d96b17256e 100755
> --- a/scripts/qmp/qom-tree
> +++ b/scripts/qmp/qom-tree
> @@ -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.qmp import QEMUMonitorProtocol
>
> cmd, args = sys.argv[0], sys.argv[1:]
> socket_path = None
>
