On Wed, Mar 23, 2022 at 2:20 PM Hanna Reitz <hre...@redhat.com> wrote: > > On 21.03.22 22:08, John Snow wrote: > > Now that we are fully switched over to the new QMP library, move it back > > over the old namespace. This is being done primarily so that we may > > upload this package simply as "qemu.qmp" without introducing confusion > > over whether or not "aqmp" is a new protocol or not. > > > > The trade-off is increased confusion inside the QEMU developer > > tree. Sorry! > > > > Note: the 'private' member "_aqmp" in legacy.py also changes to "_qmp"; > > not out of necessity, but just to remove any traces of the "aqmp" > > name. > > > > Signed-off-by: John Snow <js...@redhat.com> > > Reviewed-by: Beraldo Leal <bl...@redhat.com> > > --- > > I guess this is the one for which I’m CC-ed?
Probably. > > [...] > > > diff --git a/scripts/render_block_graph.py b/scripts/render_block_graph.py > > index b33fb70d5e..8f731a5cfe 100755 > > --- a/scripts/render_block_graph.py > > +++ b/scripts/render_block_graph.py > > @@ -25,8 +25,8 @@ > > from graphviz import Digraph > > > > sys.path.append(os.path.join(os.path.dirname(__file__), '..', 'python')) > > -from qemu.aqmp import QMPError > > -from qemu.aqmp.legacy import QEMUMonitorProtocol > > +from qemu.qmp import QMPError > > +from qemu.qmp.legacy import QEMUMonitorProtocol > > > > > > def perm(arr): > > diff --git a/scripts/simplebench/bench_block_job.py > > b/scripts/simplebench/bench_block_job.py > > index af9d1646a4..56191db44b 100755 > > --- a/scripts/simplebench/bench_block_job.py > > +++ b/scripts/simplebench/bench_block_job.py > > @@ -27,7 +27,7 @@ > > > > sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', > > 'python')) > > from qemu.machine import QEMUMachine > > -from qemu.aqmp import ConnectError > > +from qemu.qmp import ConnectError > > > > > > def bench_block_job(cmd, cmd_args, qemu_args): > > diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py > > index 8760e2c310..9563749709 100644 > > --- a/tests/qemu-iotests/iotests.py > > +++ b/tests/qemu-iotests/iotests.py > > @@ -38,7 +38,7 @@ > > from contextlib import contextmanager > > > > from qemu.machine import qtest > > -from qemu.aqmp.legacy import QMPMessage, QEMUMonitorProtocol > > +from qemu.qmp.legacy import QMPMessage, QEMUMonitorProtocol > > (Rebasing will change the order of imports; you fixed the (alphabetic) > ordering in 2882ccf86a9, now you’re going to have to restore the > original ordering here :)) I'll probably just fix stuff like this on merge when I go to send my PR for this. Too fiddly otherwise. > > > # Use this logger for logging messages directly from the iotests module > > logger = logging.getLogger('qemu.iotests') > > diff --git a/tests/qemu-iotests/tests/mirror-top-perms > > b/tests/qemu-iotests/tests/mirror-top-perms > > index 223f3c1620..d538579961 100755 > > --- a/tests/qemu-iotests/tests/mirror-top-perms > > +++ b/tests/qemu-iotests/tests/mirror-top-perms > > @@ -99,7 +99,7 @@ class TestMirrorTopPerms(iotests.QMPTestCase): > > self.vm_b.add_device('virtio-blk,drive=drive0,share-rw=on') > > try: > > # Silence AQMP logging errors temporarily. > > Probably should just be “QMP” now, too. Anyway: Yep, oops. I didn't refresh this series as much as I should have. It was good the last time I checked it, I swear! ... three months ago. > > Acked-by: Hanna Reitz <hre...@redhat.com> Thanks. > > > - with change_log_level('qemu.aqmp'): > > + with change_log_level('qemu.qmp'): > > self.vm_b.launch() > > print('ERROR: VM B launched successfully, ' > > 'this should not have happened') >