qemu/python-aqmp-use-absolute-import-statement.patch
Jiabo Feng 11aadaf893 QEMU update to version 6.2.0-101:
- python/aqmp: use absolute import statement
- sysemu: Cleanup qemu_run_machine_init_done_notifiers()
- vhost-backend: avoid overflow on memslots_limit
- hw/i386/vmmouse: Require 'i8042' property to be set
- hw/scsi/megasas: Fails command if SGL buffer overflows
- target/i386/kvm: Replace use of __u32 type
- hw/avr: Realize AVRCPU qdev object using qdev_realize()
- qemu-keymap: Add license in generated files
- configure: Symlink binaries using .exe suffix with MinGW
- ui: remove break after g_assert_not_reached()
- io/channel-websock: Replace strlen(const_str) by sizeof(const_str) - 1
- target/ppc: Add HASHKEYR and HASHPKEYR SPRs
- tests: Fix error strings
- Hexagon (target/hexagon) remove unused encodings
- target/i386: introduce insn_get_addr
- target/i386: REPZ and REPNZ are mutually exclusive
- target/i386: correctly mask SSE4a bit indices in register operands
- bios-tables-test: Make oem-fields tests be consistent
- tests/vm: update NetBSD to 9.3
- monitor/hmp-cmds: Avoid displaying bogus size in 'info pci' When BAR aren't mapped, we get:
- virtio-mem: don't warn about THP sizes on a kernel without THP Support
- Subject: [PATCH] kvm: Use 'unsigned long' for request argument in functions  wrapping ioctl()

Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com>
(cherry picked from commit 2430c96ac522f910c11eb98c2d9f74c2c3336a00)
2024-10-21 11:02:49 +08:00

42 lines
1.5 KiB
Diff

From 81ab64fe4c328b3981290afe4860f9bcd8f8750c Mon Sep 17 00:00:00 2001
From: Luo Yifan <luoyifan_yewu@cmss.chinamobile.com>
Date: Thu, 26 Sep 2024 16:07:19 +0800
Subject: [PATCH] python/aqmp: use absolute import statement
cherry picked from commit f75b20e4f16663af4c65657821c5727b1d1c2493
pylint's dependency astroid appears to have bugs in 2.9.1 and 2.9.2 (Dec
31 and Jan 3) that appear to erroneously expect the qemu namespace to
have an __init__.py file. astroid 2.9.3 (Jan 9) avoids that problem, but
appears to not understand a relative import within a namespace package.
Update the relative import - it was worth changing anyway, because these
packages will eventually be packaged and distributed separately.
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Beraldo Leal <bleal@redhat.com>
Message-id: 20220110191349.1841027-2-jsnow@redhat.com
Signed-off-by: John Snow <jsnow@redhat.com>
Signed-off-by: Luo Yifan <luoyifan_yewu@cmss.chinamobile.com>
---
python/qemu/aqmp/aqmp_tui.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/python/qemu/aqmp/aqmp_tui.py b/python/qemu/aqmp/aqmp_tui.py
index a2929f771c..f1e926dd75 100644
--- a/python/qemu/aqmp/aqmp_tui.py
+++ b/python/qemu/aqmp/aqmp_tui.py
@@ -35,7 +35,8 @@
import urwid
import urwid_readline
-from ..qmp import QEMUMonitorProtocol, QMPBadPortError
+from qemu.qmp import QEMUMonitorProtocol, QMPBadPortError
+
from .error import ProtocolError
from .message import DeserializationError, Message, UnexpectedTypeError
from .protocol import ConnectError, Runstate
--
2.41.0.windows.1