These functions should now give better crash information when something
unexpected happens.
Signed-off-by: John Snow
---
tests/qemu-iotests/iotests.py | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index
rom a tool.
Signed-off-by: John Snow
---
tests/qemu-iotests/257| 8 --
tests/qemu-iotests/iotests.py | 53 +++
2 files changed, 52 insertions(+), 9 deletions(-)
diff --git a/tests/qemu-iotests/257 b/tests/qemu-iotests/257
index fb5359c581e..e7e7a2317e3 1
┃
┃ and any of the individual glyphs used to draw the box may be┃
┃ replaced or specified as well. ┃
┗━━┛
Signed-off-by: John Snow
---
python/qemu/uti
ff-by: John Snow
---
tests/qemu-iotests/iotests.py | 34 ++
1 file changed, 34 insertions(+)
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index 6ba65eb1ffe..5617f991da7 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-io
By analogy with qemu_img_{measure, check, info}. Replace calls to
qemu_img_pipe('map', '--output=json', ...) with the new function.
Signed-off-by: John Snow
---
tests/qemu-iotests/041 | 5 ++---
tests/qemu-iotests/211 |
Remove two more usages of qemu_img_pipe().
Signed-off-by: John Snow
---
tests/qemu-iotests/tests/remove-bitmap-from-backing | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tests/qemu-iotests/tests/remove-bitmap-from-backing
b/tests/qemu-iotests/tests/remove-bitmap
re-raised instead.
In the event that the return code is zero but we can't parse valid JSON,
allow the JSON deserialization error to be raised.
Signed-off-by: John Snow
---
tests/qemu-iotests/iotests.py | 35 +++
1 file changed, 35 insertions(+)
diff --git a/
qemu_img() returning zero ought to be the rule, not the
exception. Remove all explicit checks against the condition in
preparation for making non-zero returns an Exception.
Signed-off-by: John Snow
Reviewed-by: Eric Blake
---
tests/qemu-iotests/163 | 9
Make this helper function a little stricter about what it allows by
default. If qemu_img returns some exit code that implies it didn't
actually perform the comparison, treat that as an exceptional
circumstance and force the caller to be aware of the peril.
Signed-off-by: John Snow
---
nd qemu_tool().
V2:
- Ensure *all* calls to qemu-img go through qemu_img()
- Raise VerboseProcessError on negative return code,
even when check=False
- Check logging status for logged variants and revert to
Exceptions when logging is off!
John Snow (18):
python/utils: add enbo
while
> >>>> reading it. What machine needs this? In QEMU I think we only have
> >>>> piix and ich9 emulated for pc and q35 machines but maybe ich6 is
> >>>> also used by some machine I don't know about. Otherwise it looks
> >>>&
On Tue, Feb 15, 2022 at 12:14 PM Hanna Reitz wrote:
>
> Ping
>
> (I can take it too, if you’d like, John, but you’re listed as the only
> maintainer for hw/ide, so... Just say the word, though!)
>
Sorry, I sent you a mail off-list at the time where I said you were
free to take it whenever you li
On Tue, Feb 15, 2022, 6:57 PM Philippe Mathieu-Daudé
wrote:
> On 16/2/22 00:53, John Snow wrote:
> > On Tue, Feb 15, 2022 at 5:55 PM Eric Blake wrote:
> >>
> >> On Tue, Feb 15, 2022 at 05:08:50PM -0500, John Snow wrote:
> >>>>>> pr
On Tue, Feb 15, 2022 at 6:09 PM Eric Blake wrote:
>
> On Tue, Feb 15, 2022 at 05:08:53PM -0500, John Snow wrote:
> > re-configure qemu_img() into a function that will by default raise a
> > VerboseProcessException (extended from CalledProcessException) on
> > non-zero
On Tue, Feb 15, 2022 at 6:05 PM Eric Blake wrote:
>
> On Tue, Feb 15, 2022 at 05:08:52PM -0500, John Snow wrote:
> > qemu_img() returning zero ought to be the rule, not the
> > exception. Remove all explicit checks against the condition in
> > preparation for making non-z
On Tue, Feb 15, 2022 at 5:58 PM Eric Blake wrote:
>
> On Tue, Feb 15, 2022 at 05:08:51PM -0500, John Snow wrote:
> > This adds an Exception that extends the garden variety
> > subprocess.CalledProcessError. When this exception is raised, it will
> > still be caught when
On Tue, Feb 15, 2022 at 5:55 PM Eric Blake wrote:
>
> On Tue, Feb 15, 2022 at 05:08:50PM -0500, John Snow wrote:
> > >>> print(enboxify(msg, width=72, name="commit message"))
> > ┏━ commit message ━┓
>
efault_decoder.decode(s)
+ File "/usr/lib64/python3.9/json/decoder.py", line 337, in decode
+obj, end = self.raw_decode(s, idx=_w(s, 0).end())
+ File "/usr/lib64/python3.9/json/decoder.py", line 355, in raw_decode
+raise JSONDecodeError("Expecting value", s, er
qemu_img() returning zero ought to be the rule, not the
exception. Remove all explicit checks against the condition in
preparation for making non-zero returns an Exception.
Signed-off-by: John Snow
---
tests/qemu-iotests/163 | 9 +++--
tests/qemu-iotests/216
ff-by: John Snow
---
tests/qemu-iotests/iotests.py | 34 ++
1 file changed, 34 insertions(+)
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index 6ba65eb1ffe..7df393df2c3 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-io
something more flexible (There appears to be only one)
can use check=False and manage the return themselves.
Signed-off-by: John Snow
---
tests/qemu-iotests/257| 8 --
tests/qemu-iotests/iotests.py | 53 +++
2 files changed, 53 insertions(+), 8 deletions
┃
┃ and any of the individual glyphs used to draw the box may be┃
┃ replaced or specified as well. ┃
┗━━┛
Signed-off-by: John Snow
---
python/qemu/uti
On Tue, Feb 15, 2022 at 1:01 PM Peter Maydell wrote:
>
> On Tue, 15 Feb 2022 at 17:46, John Snow wrote:
> > Just so I don't leave this thread hanging, I filed a GitLab issue and
> > I'm working on it, but this one isn't as quick to solve as the other.
> >
&
On Tue, Feb 8, 2022 at 9:40 AM Peter Maydell wrote:
>
> On Thu, 3 Feb 2022 at 23:22, John Snow wrote:
> >
> > On Thu, Feb 3, 2022 at 11:52 AM Peter Maydell
> > wrote:
> > >
> > > On Thu, 3 Feb 2022 at 16:38, John Snow wrote:
> > >
Squeak Squeak...
...Any objections to me staging this?
(This patchset removes the accommodations in iotests for allowing
either library to run and always forces the new one. Point of no
return for iotests.)
--js
On Wed, Feb 2, 2022 at 9:24 PM John Snow wrote:
>
> Ba
On Thu, Jan 27, 2022 at 3:11 PM Jon Maloy wrote:
>
>
> On 11/18/21 06:57, Philippe Mathieu-Daudé wrote:
> > Trivial fix for CVE-2021-3507.
> >
> > Philippe Mathieu-Daudé (2):
> >hw/block/fdc: Prevent end-of-track overrun (CVE-2021-3507)
> >tests/qtest/fdc-test: Add a regression test for CV
On Thu, Feb 3, 2022 at 4:19 AM Kevin Wolf wrote:
>
> Am 02.02.2022 um 20:08 hat John Snow geschrieben:
> > > I guess the relevant question in the context of this patch is whether
> > > sync.py will need a similar two-phase setup as legacy.py. Do you think
> > > yo
On Thu, Feb 3, 2022 at 4:38 AM Daniel P. Berrangé wrote:
>
> On Wed, Feb 02, 2022 at 02:08:59PM -0500, John Snow wrote:
> > On Tue, Feb 1, 2022 at 2:46 PM Kevin Wolf wrote:
> > >
> > > Am 01.02.2022 um 19:32 hat John Snow geschrieben:
> > > > On Tue
On Thu, Feb 3, 2022 at 11:52 AM Peter Maydell wrote:
>
> On Thu, 3 Feb 2022 at 16:38, John Snow wrote:
>
> > On Thu, Feb 3, 2022, 11:20 AM Peter Maydell
> > wrote:
> >> Summary of Failures:
> >>
> >> 1/1 qemu:block / qemu-iotests qcow2 ERR
On Thu, Feb 3, 2022, 11:20 AM Peter Maydell
wrote:
> On Thu, 3 Feb 2022 at 01:59, John Snow wrote:
> >
> > The following changes since commit
> 47cc1a3655135b89fa75c2824fbddd29df874612:
> >
> > Merge remote-tracking branch 'remotes/kwolf-gitlab/tags/for-upst
All that's left is to import type definitions from the new library
instead.
Signed-off-by: John Snow
Reviewed-by: Vladimir Sementsov-Ogievskiy
Reviewed-by: Beraldo Leal
---
tests/qemu-iotests/iotests.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/qemu-io
t to begin with.
Ultimately, I decided it's fine to just suppress the logger temporarily.)
Signed-off-by: John Snow
---
tests/qemu-iotests/tests/mirror-top-perms | 9 +++--
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/tests/qemu-iotests/tests/mirror-top-perms
b/tests/qemu-iote
For this commit, we only need to remove accommodations for the
synchronous QMP library.
Signed-off-by: John Snow
Reviewed-by: Vladimir Sementsov-Ogievskiy
Reviewed-by: Beraldo Leal
---
scripts/simplebench/bench_block_job.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a
Remove the QEMU_PYTHON_LEGACY_QMP environment variable, making the
switch permanent. Update Exceptions and import paths as necessary.
Signed-off-by: John Snow
Reviewed-by: Vladimir Sementsov-Ogievskiy
Reviewed-by: Beraldo Leal
---
python/qemu/machine/machine.py | 18 +++---
python
;ll avoid cluttering
up qemu-block list with those.
(Just be aware that I plan to finalize the switch soon!)
John Snow (4):
python/machine: permanently switch to AQMP
scripts/bench-block-job: switch to AQMP
iotests/mirror-top-perms: switch to AQMP
iotests: switch to AQMP
python/qemu/machi
vance, guaranteeing that
there will be a UNIX socket in the filesystem ready for the QEMU client
to connect to without a race condition.
(Yes, it's a bit ugly. Fixing it more nicely will have to wait until our
minimum Python version is 3.7+.)
Signed-off-by: John Snow
Reviewed-by: Kevin Wolf
related to the mypy upgrade are simply
beyond my control. It's on my list to take care of soon.)
Signed-off-by: John Snow
Reviewed-by: Kevin Wolf
Message-id: 20220201041134.1237016-4-js...@redhat.com
Signed-off-by: John Snow
---
python/Pipfile.lock
ilures you observed
on NetBSD. If it doesn't, let me know.
----
John Snow (4):
python/aqmp: Fix negotiation with pre-"oob" QEMU
python/machine: raise VMLaunchFailure exception from launch()
python: upgrade mypy to 0.780
ase, so catch on the broadest scope and
wrap-and-re-raise only in the more targeted scope.)
Signed-off-by: John Snow
Reviewed-by: Hanna Reitz
Reviewed-by: Kevin Wolf
Message-id: 20220201041134.1237016-3-js...@redhat.com
Signed-off-by: John Snow
---
python/qemu/machine/machin
QEMU versions prior to the "oob" capability *also* can't accept the
"enable" keyword argument at all. Fix the handshake process with older
QEMU versions.
Signed-off-by: John Snow
Reviewed-by: Hanna Reitz
Reviewed-by: Kevin Wolf
Message-id: 20220201041134.1237016-2-js
On Tue, Feb 1, 2022 at 2:46 PM Kevin Wolf wrote:
>
> Am 01.02.2022 um 19:32 hat John Snow geschrieben:
> > On Tue, Feb 1, 2022 at 8:21 AM Kevin Wolf wrote:
> > >
> > > Am 01.02.2022 um 05:11 hat John Snow geschrieben:
> > > > The synchronous QMP libra
On Tue, Feb 1, 2022 at 7:59 AM Kevin Wolf wrote:
>
> Am 01.02.2022 um 05:11 hat John Snow geschrieben:
> > QEMU versions prior to the "oob" capability *also* can't accept the
> > "enable" keyword argument at all. Fix the handshake process with older
>
On Tue, Feb 1, 2022 at 8:28 AM Kevin Wolf wrote:
>
> Am 01.02.2022 um 05:11 hat John Snow geschrieben:
> > GitLab: https://gitlab.com/jsnow/qemu/-/commits/python-aqmp-fixes
> > CI: https://gitlab.com/jsnow/qemu/-/pipelines/455146881
> >
> > Fixes and improvements a
On Tue, Feb 1, 2022 at 8:21 AM Kevin Wolf wrote:
>
> Am 01.02.2022 um 05:11 hat John Snow geschrieben:
> > The synchronous QMP library would bind to the server address during
> > __init__(). The new library delays this to the accept() call, because
> > binding occurs insi
ase, so catch on the broadest scope and
wrap-and-re-raise only in the more targeted scope.)
Signed-off-by: John Snow
Reviewed-by: Hanna Reitz
---
python/qemu/machine/machine.py| 45 ---
tests/qemu-iotests/tests/mirror-top-perms | 3 +-
2 files changed, 40 insertions(+),
QEMU versions prior to the "oob" capability *also* can't accept the
"enable" keyword argument at all. Fix the handshake process with older
QEMU versions.
Signed-off-by: John Snow
Reviewed-by: Hanna Reitz
---
python/qemu/aqmp/qmp_client.py | 4 ++--
1 file changed, 2 i
vance, guaranteeing that
there will be a UNIX socket in the filesystem ready for the QEMU client
to connect to without a race condition.
(Yes, it's a bit ugly. Fixing it more nicely will have to wait until our
minimum Python version is 3.7+.)
Signed-off-by: John Snow
---
python/qemu/aqmp/legacy
related to the mypy upgrade are simply
beyond my control. It's on my list to take care of soon.)
Signed-off-by: John Snow
---
python/Pipfile.lock | 66 ++---
python/setup.cfg| 2 +-
2 files changed, 40 insertions(+), 28 deletions(-)
diff --git a/p
each patch for details.
V4:
- Just commit message changes, and applying Hanna's RBs.
V3:
- Retitled series
- Dropped patch that was already merged
- Reworded some comments, docstrings, etc.
John Snow (4):
python/aqmp: Fix negotiation with pre-"oob" QEMU
python/machi
On Thu, Jan 27, 2022 at 10:50 AM Hanna Reitz wrote:
>
> On 24.01.22 19:06, John Snow wrote:
> > The synchronous QMP library would bind to the server address during
> > __init__(). The new library delays this to the accept() call, because
> > binding occurs inside of
On Thu, Jan 27, 2022 at 9:22 AM Hanna Reitz wrote:
>
> On 24.01.22 19:06, John Snow wrote:
> > This allows us to pack in some extra information about the failure,
> > which guarantees that if the caller did not *intentionally* cause a
> > failure (by capturing this Exce
On Mon, Jan 24, 2022 at 4:06 AM Hanna Reitz wrote:
>
> On 21.01.22 19:47, John Snow wrote:
> >
> > There's no regression test, but I will trust you (and Paolo) that this
> > solves the bug you were seeing. It makes sense.
>
> There is one in the BZ linked, but
each patch for details.
V3:
- Retitled series
- Dropped patch that was already merged
- Reworded some comments, docstrings, etc.
John Snow (4):
python/aqmp: Fix negotiation with pre-"oob" QEMU
python/machine: raise VMLaunchFailure exception from launch()
python: upgrade mypy to
vance, guaranteeing that
there will be a UNIX socket in the filesystem ready for the QEMU client
to connect to without a race condition.
(Yes, it's a bit ugly. Fixing it more nicely will have to wait until our
minimum Python version is 3.7+.)
Signed-off-by: John Snow
---
python/qemu/aqmp/legacy
will run as long as Python itself
doesn't crash. KeyboardInterrupt and several other "strong" events in
Python are a BaseException. These events should generally not be
suppressed, but occasionally we want to perform some cleanup in response
to one.)
Signed-off-by: John Snow
-
related to the mypy upgrade are simply
beyond my control. It's on my list to take care of soon.)
Signed-off-by: John Snow
---
python/Pipfile.lock | 66 ++---
python/setup.cfg| 2 +-
2 files changed, 40 insertions(+), 28 deletions(-)
diff --git a/p
QEMU versions prior to the "oob" capability *also* can't accept the
"enable" keyword argument at all. Fix the handshake process with older
QEMU versions.
Signed-off-by: John Snow
---
python/qemu/aqmp/qmp_client.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletion
cb, cb_opaque);
> iocb->s = s;
> iocb->bh = qemu_bh_new(ide_trim_bh_cb, iocb);
> --
> 2.34.1
>
Oh, this *wasn't* the same bug I thought it was.
There's no regression test, but I will trust you (and Paolo) that this
solves the bug you were seeing. It makes sense.
Reviewed-by: John Snow
Tested-by: John Snow
7;s simply drop the retry_isa test for now.
>
> Signed-off-by: Thomas Huth
I assume I had patches to make this make sense at some point, but
they're probably long lost to time by now. Please pardon my dust. 🙇
Reviewed-by: John Snow
> ---
> tests/qtest/ide-test.c | 13 +
On Mon, Jan 10, 2022 at 6:29 PM John Snow wrote:
>
> Based-on: <20220110232521.1922962-1-js...@redhat.com>
> (jsnow/python staging branch)
> GitLab: https://gitlab.com/jsnow/qemu/-/commits/python-qmp-legacy-switch
> CI: https://gitlab.com/jsnow/qemu/-/pipelines/4
On Thu, Jan 20, 2022 at 8:08 AM Beraldo Leal wrote:
>
> On Wed, Jan 19, 2022 at 02:39:13PM -0500, John Snow wrote:
> > The old legacy runner no longer seems to work with output logging, so we
> > can't see failure logs when a test case fails. The new runner doesn&
On Thu, Jan 20, 2022, 4:13 AM Daniel P. Berrangé
wrote:
> On Wed, Jan 19, 2022 at 02:39:16PM -0500, John Snow wrote:
> > The old QMP library would actually bind to the server address during
> > __init__(). The new library delays this to the accept() call, because
> > binding
On Tue, Jan 18, 2022 at 1:34 PM John Snow wrote:
>
> On Tue, Jan 18, 2022 at 7:13 AM Peter Maydell
> wrote:
> >
> > On Mon, 17 Jan 2022 at 20:35, John Snow wrote:
> > > I do expect this to print more information on failure than it
> > > currently is,
not related to the mypy upgrade are simply
beyond my control.)
Signed-off-by: John Snow
---
python/Pipfile.lock | 66 ++---
python/setup.cfg| 2 +-
2 files changed, 40 insertions(+), 28 deletions(-)
diff --git a/python/Pipfile.lock b/python/Pipfile.lock
ng of this year, but I haven't checked if all of
our supported build platforms have a properly modern Python available
yet.)
Signed-off-by: John Snow
---
python/qemu/aqmp/legacy.py | 3 +++
python/qemu/aqmp/protocol.py | 41 +---
2 files changed, 41 insertions(
event of a non-negative return code
more obvious when they go unhandled; the current behavior is to print a
warning message only in the event of signal-based terminations (for
negative return codes).
Signed-off-by: John Snow
---
python/qemu/machine/machine.py| 44
QEMUMachine.launch()
John Snow (5):
python/aqmp: Fix negotiation with pre-"oob" QEMU
python: use avocado's "new" runner
python/machine: raise VMLaunchFailure exception from launch()
python: upgrade mypy to 0.780
python/aqmp: add socket bind step to legacy
QEMU versions prior to the "oob" capability *also* can't accept the
"enable" keyword argument at all. Fix the handshake process with older
QEMU versions.
Signed-off-by: John Snow
---
python/qemu/aqmp/qmp_client.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletion
The old legacy runner no longer seems to work with output logging, so we
can't see failure logs when a test case fails. The new runner doesn't
(seem to) support Coverage.py yet, but seeing error output is a more
important feature.
Signed-off-by: John Snow
---
python/avocado.cfg | 2
On Tue, Jan 18, 2022 at 7:13 AM Peter Maydell wrote:
>
> On Mon, 17 Jan 2022 at 20:35, John Snow wrote:
> > I do expect this to print more information on failure than it
> > currently is, though (bug somewhere in machine.py, I think).
> > Can you please try applying
On Mon, Jan 17, 2022 at 3:49 PM Peter Maydell wrote:
>
> On Mon, 17 Jan 2022 at 20:35, John Snow wrote:
>
> > Can you please try applying this temporary patch and running `./check
> > -qcow2 040 041` until you see a breakage and show me the output from
> > that?
>
&
On Mon, Jan 17, 2022 at 5:05 AM Kevin Wolf wrote:
>
> Am 10.01.2022 um 16:55 hat Peter Maydell geschrieben:
> > Just saw this failure of iotests in a netbsd VM (the in-tree
> > tests/vm stuff). Pretty sure it's an intermittent as the
> > pulreq being tested has nothing io or block related.
> >
> >
On Fri, Jan 14, 2022 at 2:13 PM Eric Blake wrote:
>
> On Mon, Jan 10, 2022 at 06:29:02PM -0500, John Snow wrote:
> > Simply import the type defition from the new location.
>
> definition
>
ACK
> >
> > Signed-off-by: John Snow
> > Reviewed-by: Vladim
ch 22 is a touch hacky, and I think I will spend
some time today improving it, but I think it will be a follow-up, if
that's okay.)
Thanks,
--js
On Mon, Jan 10, 2022 at 6:33 PM John Snow wrote:
>
>
>
> On Mon, Jan 10, 2022 at 6:29 PM John Snow wrote:
>>
>> Based-on: <
On Wed, Jan 12, 2022 at 8:52 AM Beraldo Leal wrote:
>
> On Mon, Jan 10, 2022 at 06:28:53PM -0500, John Snow wrote:
> > We have a replacement for async QMP, but it doesn't have feature parity
> > yet. For now, then, port the old tool onto the new backend.
> >
On Thu, Dec 23, 2021 at 6:08 AM Vladimir Sementsov-Ogievskiy
wrote:
>
> Add and option to generate trace points. We should generate both trace
> points and trace-events files for further trace point code generation.
>
> Signed-off-by: Vladimir Sementsov-Ogievskiy
> Reviewed-by: Philippe Mathieu-D
On Tue, Jan 11, 2022 at 6:53 PM John Snow wrote:
>
> On Thu, Dec 23, 2021 at 6:08 AM Vladimir Sementsov-Ogievskiy
> wrote:
> >
> > Add possibility to generate trace points for each qmp command.
> >
> > We should generate both trace points and trace-events file,
On Thu, Dec 23, 2021 at 6:08 AM Vladimir Sementsov-Ogievskiy
wrote:
>
> Add possibility to generate trace points for each qmp command.
>
> We should generate both trace points and trace-events file, for further
> trace point code generation.
>
> Signed-off-by: Vladimir Sementsov-Ogievskiy
> ---
>
On Mon, Jan 10, 2022 at 11:06 AM Stefan Hajnoczi wrote:
>
> On Thu, Dec 23, 2021 at 12:07:53PM +0100, Vladimir Sementsov-Ogievskiy wrote:
> > diff --git a/block/trace-events b/block/trace-events
> > index 549090d453..5be3e3913b 100644
> > --- a/block/trace-events
> > +++ b/block/trace-events
> > @
> +qtest_add_func("hd-geo/override/scsi_2_controllers",
> + test_override_scsi_2_controllers);
> +}
> qtest_add_func("hd-geo/override/virtio_blk",
> test_override_virtio_blk);
> qtest_add_func("hd-geo/override/zero_chs", test_override_zero_chs);
> qtest_add_func("hd-geo/override/scsi_hot_unplug",
> --
> 2.27.0
>
Acked-by: John Snow
On Mon, Jan 10, 2022 at 6:29 PM John Snow wrote:
> Based-on: <20220110232521.1922962-1-js...@redhat.com>
> (jsnow/python staging branch)
>
Sorry, I goofed. This series accidentally re-includes these patches. You
can ignore the first four patches, or apply directly o
With the old library gone, there's nothing duplicated in the tree, so
the warning suppression can be removed.
Signed-off-by: John Snow
Reviewed-by: Vladimir Sementsov-Ogievskiy
Reviewed-by: Beraldo Leal
---
python/setup.cfg | 1 -
1 file changed, 1 deletion(-)
diff --git a/python/setup.
Copy the docstrings out of qemu.qmp, adjusting them as necessary to
more accurately reflect the current state of this class.
Signed-off-by: John Snow
Reviewed-by: Vladimir Sementsov-Ogievskiy
Reviewed-by: Beraldo Leal
---
python/qemu/aqmp/legacy.py | 110
After this patch, qemu.aqmp.legacy.QEMUMonitorProtocol no longer
inherits from qemu.qmp.QEMUMonitorProtocol. To do this, several
inherited methods need to be explicitly re-defined.
Signed-off-by: John Snow
Reviewed-by: Vladimir Sementsov-Ogievskiy
Reviewed-by: Beraldo Leal
---
python/qemu
Shift these definitions over from the qmp package to the async qmp
package.
Signed-off-by: John Snow
Reviewed-by: Vladimir Sementsov-Ogievskiy
Reviewed-by: Beraldo Leal
---
python/qemu/aqmp/aqmp_tui.py | 3 +--
python/qemu/aqmp/legacy.py | 30 ++
python/qemu/qmp
For this commit, we only need to remove accommodations for the
synchronous QMP library.
Signed-off-by: John Snow
Reviewed-by: Vladimir Sementsov-Ogievskiy
Reviewed-by: Beraldo Leal
---
scripts/simplebench/bench_block_job.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a
Thank you for your service!
Signed-off-by: John Snow
Reviewed-by: Vladimir Sementsov-Ogievskiy
Reviewed-by: Beraldo Leal
---
python/PACKAGE.rst | 4 +-
python/README.rst | 2 +-
python/qemu/qmp/README.rst | 9 -
python/qemu/qmp/__init__.py | 396
ade-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
---
python/PA
Signed-off-by: John Snow
Reviewed-by: Vladimir Sementsov-Ogievskiy
Reviewed-by: Beraldo Leal
---
python/qemu/qmp/qom.py| 5 +++--
python/qemu/qmp/qom_common.py | 3 ++-
python/qemu/qmp/qom_fuse.py | 11 ++-
3 files changed, 11 insertions(+), 8 deletions(-)
diff --git a
Signed-off-by: John Snow
Reviewed-by: Vladimir Sementsov-Ogievskiy
Reviewed-by: Beraldo Leal
---
python/README.rst | 2 +-
python/qemu/{qmp => aqmp}/qmp_shell.py | 0
python/setup.cfg | 2 +-
scripts/qmp/qmp-shell | 2 +-
4 fi
Signed-off-by: John Snow
Reviewed-by: Vladimir Sementsov-Ogievskiy
Reviewed-by: Beraldo Leal
---
Note: I still need to adjust the logging. The problem now is that the
logging messages include the PID of the test process, so they need to be
filtered out. I'll investigate that for a foll
In order to upload a QMP package to PyPI, I want to remove any scripts
that I am not 100% confident I want to support upstream, beyond our
castle walls.
Move most of our QMP utilities into the utils package so we can split
them out from the PyPI upload.
Signed-off-by: John Snow
Reviewed-by
Signed-off-by: John Snow
Reviewed-by: Daniel P. Berrangé
Reviewed-by: Vladimir Sementsov-Ogievskiy
Reviewed-by: Beraldo Leal
---
scripts/cpu-x86-uarch-abi.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/cpu-x86-uarch-abi.py b/scripts/cpu-x86-uarch-abi.py
This is the last vestige of the "aqmp" moniker surviving in the tree; remove it.
Signed-off-by: John Snow
---
python/qemu/qmp/{aqmp_tui.py => qmp_tui.py} | 12 ++--
python/setup.cfg| 6 +++---
2 files changed, 9 insertions(+), 9 deletions(-)
Remove the QEMU_PYTHON_LEGACY_QMP environment variable, making the
switch permanent. Update Exceptions and import paths as necessary.
Signed-off-by: John Snow
Reviewed-by: Vladimir Sementsov-Ogievskiy
Reviewed-by: Beraldo Leal
---
python/qemu/machine/machine.py | 18 +++---
python
Simply import the type defition from the new location.
Signed-off-by: John Snow
Reviewed-by: Vladimir Sementsov-Ogievskiy
Reviewed-by: Beraldo Leal
---
tests/qemu-iotests/iotests.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu
The next several commits copy some code from qemu.qmp to qemu.aqmp, then
delete qemu.qmp. In the interim, to prevent test failures, the duplicate
code detection needs to be silenced to prevent bisect problems with CI
testing.
Signed-off-by: John Snow
Reviewed-by: Vladimir Sementsov-Ogievskiy
Creating an instance of qemu.aqmp.ExecuteError is too involved here, so
just drop the specificity down to a generic QMPError.
Signed-off-by: John Snow
Reviewed-by: Vladimir Sementsov-Ogievskiy
Reviewed-by: Beraldo Leal
---
scripts/render_block_graph.py | 8 +++-
1 file changed, 3
It's a commonly needed definition, it can be re-exported by the root.
Signed-off-by: John Snow
Reviewed-by: Vladimir Sementsov-Ogievskiy
Reviewed-by: Beraldo Leal
---
python/qemu/aqmp/__init__.py | 10 +-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/python/qemu
Signed-off-by: John Snow
Reviewed-by: Daniel P. Berrangé
Reviewed-by: Vladimir Sementsov-Ogievskiy
---
scripts/cpu-x86-uarch-abi.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/scripts/cpu-x86-uarch-abi.py b/scripts/cpu-x86-uarch-abi.py
index 08acc52a81..8963d90f0b
701 - 800 of 5762 matches
Mail list logo
