[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [qemu/qemu] eada6d: qmp: fix aio_poll() assertion failure
From: |
Peter Maydell |
Subject: |
[Qemu-commits] [qemu/qemu] eada6d: qmp: fix aio_poll() assertion failure on Windows |
Date: |
Tue, 03 Nov 2020 08:53:14 -0800 |
Branch: refs/heads/master
Home: https://github.com/qemu/qemu
Commit: eada6d9220b77ffee13a86ca8a7aba8fc4451e71
https://github.com/qemu/qemu/commit/eada6d9220b77ffee13a86ca8a7aba8fc4451e71
Author: Volker Rümelin <vr_qemu@t-online.de>
Date: 2020-11-03 (Tue, 03 Nov 2020)
Changed paths:
M util/aio-win32.c
Log Message:
-----------
qmp: fix aio_poll() assertion failure on Windows
Commit 9ce44e2ce2 "qmp: Move dispatcher to a coroutine" modified
aio_poll() in util/aio-posix.c to avoid an assertion failure. This
change is missing in util/aio-win32.c.
Apply the changes to util/aio-posix.c to util/aio-win32.c too.
This fixes an assertion failure on Windows whenever QEMU exits.
$ ./qemu-system-x86_64.exe -machine pc,accel=tcg -display gtk
**
ERROR:../qemu/util/aio-win32.c:337:aio_poll: assertion failed:
(in_aio_context_home_thread(ctx))
Bail out! ERROR:../qemu/util/aio-win32.c:337:aio_poll: assertion
failed: (in_aio_context_home_thread(ctx))
Fixes: 9ce44e2ce2 ("qmp: Move dispatcher to a coroutine")
Signed-off-by: Volker Rümelin <vr_qemu@t-online.de>
Message-Id: <20201021064033.8600-1-vr_qemu@t-online.de>
Tested-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Commit: 6aec830e77a3f80952b41e421dc23c0041c1e399
https://github.com/qemu/qemu/commit/6aec830e77a3f80952b41e421dc23c0041c1e399
Author: Tuguoyi <tu.guoyi@h3c.com>
Date: 2020-11-03 (Tue, 03 Nov 2020)
Changed paths:
M qemu-img.c
Log Message:
-----------
qemu-img convert: Free @sn_opts in all error cases
@sn_opts is initialized at the beginning, so it should be deleted
after jumping to the lable 'fail_getopt'
Signed-off-by: Guoyi Tu <tu.guoyi@h3c.com>
Message-Id: <6ff1c5d372944494be3932274f75485d@h3c.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Commit: 503c2b31b675c9fba2ff9711a79e55585304895a
https://github.com/qemu/qemu/commit/503c2b31b675c9fba2ff9711a79e55585304895a
Author: Kevin Wolf <kwolf@redhat.com>
Date: 2020-11-03 (Tue, 03 Nov 2020)
Changed paths:
M tests/qemu-iotests/iotests.py
Log Message:
-----------
iotests.py: Fix type check errors in wait_migration()
Commit 1847a4a8c20 clarified that event_wait() can return None (though
only with timeout=0) and commit f12a282ff47 annotated it as returning
Optional[QMPMessage].
Type checks in wait_migration() fail because of the unexpected optional
return type:
iotests.py:750: error: Value of type variable "Msg" of "log" cannot be
"Optional[Dict[str, Any]]"
iotests.py:751: error: Value of type "Optional[Dict[str, Any]]" is not indexable
iotests.py:754: error: Value of type "Optional[Dict[str, Any]]" is not indexable
Fortunately, the non-zero default timeout is used in the event_wait()
call, so we can make mypy happy by just asserting this.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20201027163806.290960-2-kwolf@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Commit: eeb7314c46545a2426c39e2c00f03a0ab5f4f4f1
https://github.com/qemu/qemu/commit/eeb7314c46545a2426c39e2c00f03a0ab5f4f4f1
Author: Kevin Wolf <kwolf@redhat.com>
Date: 2020-11-03 (Tue, 03 Nov 2020)
Changed paths:
M tests/qemu-iotests/pylintrc
Log Message:
-----------
iotests: Disable unsubscriptable-object in pylint
When run with Python 3.9, pylint incorrectly warns about things like
Optional[foo] because it doesn't recognise Optional as unsubscriptable.
This is a known pylint bug:
https://github.com/PyCQA/pylint/issues/3882
Just disable this check to get rid of the warnings.
Disabling this shouldn't make us miss any real bug because mypy also
has a similar check ("... is not indexable").
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20201027163806.290960-3-kwolf@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Commit: 757ae0ec5cc6849b88280e2aaca70fe5eb022a0d
https://github.com/qemu/qemu/commit/757ae0ec5cc6849b88280e2aaca70fe5eb022a0d
Author: Kevin Wolf <kwolf@redhat.com>
Date: 2020-11-03 (Tue, 03 Nov 2020)
Changed paths:
M tests/qemu-iotests/iotests.py
Log Message:
-----------
iotests: Use Python 3 style super()
pylint complains about the use of super with the current class and
instance as arguments in VM.__init__():
iotests.py:546:8: R1725: Consider using Python 3 style super() without
arguments (super-with-arguments)
No reason not to follow the advice and make it happy, so let's do this.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20201027163806.290960-4-kwolf@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Commit: c9eb2f3e386840844bcc91e66d0a3475bc650780
https://github.com/qemu/qemu/commit/c9eb2f3e386840844bcc91e66d0a3475bc650780
Author: AlexChen <alex.chen@huawei.com>
Date: 2020-11-03 (Tue, 03 Nov 2020)
Changed paths:
M block/vvfat.c
Log Message:
-----------
block/vvfat: Fix bad printf format specifiers
We should use printf format specifier "%u" instead of "%d" for
argument of type "unsigned int".
In addition, fix two error format problems found by checkpatch.pl:
ERROR: space required after that ',' (ctx:VxV)
+ fprintf(stderr,"%s attributes=0x%02x begin=%u size=%d\n",
^
ERROR: line over 90 characters
+ fprintf(stderr, "%d, %s (%u, %d)\n", i, commit->path ? commit->path :
"(null)", commit->param.rename.cluster, commit->action);
Reported-by: Euler Robot <euler.robot@huawei.com>
Signed-off-by: Alex Chen <alex.chen@huawei.com>
Message-Id: <5FA12620.6030705@huawei.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Commit: 8507c9d5c9a62de2a0e281b640f995e26eac46af
https://github.com/qemu/qemu/commit/8507c9d5c9a62de2a0e281b640f995e26eac46af
Author: Peter Maydell <peter.maydell@linaro.org>
Date: 2020-11-03 (Tue, 03 Nov 2020)
Changed paths:
M block/vvfat.c
M qemu-img.c
M tests/qemu-iotests/iotests.py
M tests/qemu-iotests/pylintrc
M util/aio-win32.c
Log Message:
-----------
Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging
Block layer patches:
- iotests: Fix pylint/mypy warnings with Python 3.9
- qmp: fix aio_poll() assertion failure on Windows
- Some minor fixes
# gpg: Signature made Tue 03 Nov 2020 15:25:01 GMT
# gpg: using RSA key DC3DEB159A9AF95D3D7456FE7F09B272C88F2FD6
# gpg: issuer "kwolf@redhat.com"
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>" [full]
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74 56FE 7F09 B272 C88F 2FD6
* remotes/kevin/tags/for-upstream:
block/vvfat: Fix bad printf format specifiers
iotests: Use Python 3 style super()
iotests: Disable unsubscriptable-object in pylint
iotests.py: Fix type check errors in wait_migration()
qemu-img convert: Free @sn_opts in all error cases
qmp: fix aio_poll() assertion failure on Windows
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Compare: https://github.com/qemu/qemu/compare/ad262888993f...8507c9d5c9a6
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-commits] [qemu/qemu] eada6d: qmp: fix aio_poll() assertion failure on Windows,
Peter Maydell <=