[PATCH] scripts/qmp-shell-wrap: Fix import path

John Snow posted 1 patch 3 years, 11 months ago
Test checkpatch passed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20220225170828.3418305-1-jsnow@redhat.com
Maintainers: Markus Armbruster <armbru@redhat.com>
scripts/qmp/qmp-shell-wrap | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[PATCH] scripts/qmp-shell-wrap: Fix import path
Posted by John Snow 3 years, 11 months ago
Mea culpa. Dan's patch wound up with the wrong import path because I
re-ordered my most recent pull request and missed that this needed a fix
on rebase.

Fixes: 43912529
Reported-by: Kashyap Chamarthy <kchamart@redhat.com>
Signed-off-by: John Snow <jsnow@redhat.com>
---
 scripts/qmp/qmp-shell-wrap | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/qmp/qmp-shell-wrap b/scripts/qmp/qmp-shell-wrap
index 9e94da114f..66846e36d1 100755
--- a/scripts/qmp/qmp-shell-wrap
+++ b/scripts/qmp/qmp-shell-wrap
@@ -4,7 +4,7 @@ import os
 import sys
 
 sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'python'))
-from qemu.qmp import qmp_shell
+from qemu.aqmp import qmp_shell
 
 
 if __name__ == '__main__':
-- 
2.34.1


Re: [PATCH] scripts/qmp-shell-wrap: Fix import path
Posted by Kashyap Chamarthy 3 years, 11 months ago
On Fri, Feb 25, 2022 at 12:08:28PM -0500, John Snow wrote:
> Mea culpa. Dan's patch wound up with the wrong import path because I
> re-ordered my most recent pull request and missed that this needed a fix
> on rebase.
> 
> Fixes: 43912529
> Reported-by: Kashyap Chamarthy <kchamart@redhat.com>
> Signed-off-by: John Snow <jsnow@redhat.com>
> ---
>  scripts/qmp/qmp-shell-wrap | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/scripts/qmp/qmp-shell-wrap b/scripts/qmp/qmp-shell-wrap
> index 9e94da114f..66846e36d1 100755
> --- a/scripts/qmp/qmp-shell-wrap
> +++ b/scripts/qmp/qmp-shell-wrap
> @@ -4,7 +4,7 @@ import os
>  import sys
>  
>  sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'python'))
> -from qemu.qmp import qmp_shell
> +from qemu.aqmp import qmp_shell
>  
>  
>  if __name__ == '__main__':

Works for me; thank you.

Tested-by: Kashyap Chamarthy <kchamart@redhat.com>  

> -- 
> 2.34.1
> 

-- 
/kashyap