6c478a495d
- kvm-blkdebug-Add-delay-ns-option.patch [RHEL-121686] - kvm-block-Add-blk_co_start-end_request-and-BDRV_REQ_NO_Q.patch [RHEL-121686] - kvm-block-Add-flags-parameter-to-blk_-_pdiscard.patch [RHEL-121686] - kvm-ide-Minimal-fix-for-deadlock-between-TRIM-and-drain.patch [RHEL-121686] - kvm-ide-Clean-up-ide_trim_co_entry-to-be-idiomatic-corou.patch [RHEL-121686] - kvm-ide-test-Factor-out-wait_dma_completion.patch [RHEL-121686] - kvm-ide-test-Test-reset-during-TRIM.patch [RHEL-121686] - kvm-block-graph-lock-fix-missed-wakeup-in-bdrv_graph_co_.patch [RHEL-186384] - kvm-block-curl-fix-curl-internal-handles-handling.patch [RHEL-186384] - kvm-block-curl.c-Use-explicit-long-constants-in-curl_eas.patch [RHEL-186384] - kvm-block-curl.c-Fix-CURLOPT_VERBOSE-parameter-type.patch [RHEL-186384] - kvm-block-curl-fix-concurrent-completion-handling.patch [RHEL-186384] - kvm-block-curl-free-s-password-in-cleanup-paths.patch [RHEL-186384] - kvm-nvme-Kick-and-check-completions-in-BDS-context.patch [RHEL-186384] - kvm-nvme-Note-in-which-AioContext-some-functions-run.patch [RHEL-186384] - kvm-block-remove-detached-header-option-from-opts-after-.patch [RHEL-186384] - kvm-block-fix-luks-amend-when-run-in-coroutine.patch [RHEL-186384] - kvm-qed-Don-t-try-to-flush-during-incoming-migration.patch [RHEL-186384] - kvm-block-vmdk-fix-OOB-read-in-vmdk_read_extent.patch [RHEL-186384] - kvm-block-throttle-groups-fix-deadlock-with-iolimits-and.patch [RHEL-186384] - kvm-throttle-group-Fix-race-condition-in-throttle_group_.patch [RHEL-186384] - kvm-qemu-img-Fix-amend-option-parse-error-handling.patch [RHEL-186384] - kvm-qemu-img-rebase-don-t-exceed-IO_BUF_SIZE-in-one-oper.patch [RHEL-186384] - kvm-python-backport-drop-Python3.6-workarounds.patch [RHEL-186384] - kvm-python-backport-Remove-deprecated-get_event_loop-cal.patch [RHEL-186384] - kvm-python-backport-avoid-creating-additional-event-loop.patch [RHEL-186384] - kvm-iotests-147-ensure-temporary-sockets-are-closed-befo.patch [RHEL-186384] - kvm-iotests-151-ensure-subprocesses-are-cleaned-up.patch [RHEL-186384] - kvm-tests-qemu-iotest-fix-iotest-024-with-qed-images.patch [RHEL-186384] - kvm-tests-qemu-iotests-Fix-check-for-existing-file-in-_r.patch [RHEL-186384] - kvm-async-access-bottom-half-flags-with-qatomic_read.patch [RHEL-186384] - kvm-block-linux-aio-bound-ioq_submit-recursion-depth.patch [RHEL-186384] - kvm-block-io-fallback-to-bounce-buffer-if-BLKZEROOUT-is-.patch [RHEL-186384] - kvm-file-posix-populate-pwrite_zeroes_alignment.patch [RHEL-186384] - kvm-block-use-pwrite_zeroes_alignment-when-writing-first.patch [RHEL-186384] - kvm-iotests-add-Linux-loop-device-image-creation-test.patch [RHEL-186384] - kvm-virtio-Fix-crash-when-sriov-pf-is-set-for-non-PCI-Ex.patch [RHEL-186384] - kvm-virtio-scsi-pass-the-same-cdb_size-to-virtio_scsi_po.patch [RHEL-186384] - kvm-hw-scsi-avoid-deadlock-upon-TMF-request-cancelling-w.patch [RHEL-186384] - kvm-virtio-blk-fix-zone-report-buffer-out-of-memory-CVE-.patch [RHEL-186384] - kvm-ide-Fix-potential-assertion-failure-on-VM-stop-for-P.patch [RHEL-186384] - kvm-block-Create-DEFAULT_BLOCK_CONF-macro.patch [RHEL-186384] - kvm-block-Add-more-defaults-to-DEFAULT_BLOCK_CONF.patch [RHEL-186384] - kvm-block-mirror-check-range-when-setting-zero-bitmap-fo.patch [RHEL-186384] - kvm-iotests-test-active-mirror-with-unaligned-small-writ.patch [RHEL-186384] - kvm-block-mirror-fix-assertion-failure-upon-duplicate-co.patch [RHEL-186384] - kvm-commit-Drain-nodes-across-all-of-bdrv_commit.patch [RHEL-186384] - kvm-qemu-io-Add-aio_discard-command.patch [RHEL-186384] - kvm-qcow2-Fix-corruption-on-discard-during-write-with-CO.patch [RHEL-186384] - kvm-iotests-046-Test-that-discard-write_zeroes-wait-for-.patch [RHEL-186384] - kvm-qcow2-Fix-data-loss-on-zero-write-with-detect-zeroes.patch [RHEL-186384] - kvm-block-Fix-crash-after-setting-latency-historygram-wi.patch [RHEL-186384] - Resolves: RHEL-121686 (qemu-kvm hung during drain after double pause) - Resolves: RHEL-186384 (virt-storage: Backport stable branch fixes)
105 lines
4.2 KiB
Diff
105 lines
4.2 KiB
Diff
From d8bdd0cbf122d1f01acaec8c9846b9cdbf925d3c Mon Sep 17 00:00:00 2001
|
|
From: John Snow <jsnow@redhat.com>
|
|
Date: Tue, 13 Aug 2024 09:35:30 -0400
|
|
Subject: [PATCH 25/52] python: backport 'Remove deprecated get_event_loop
|
|
calls'
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
RH-Author: Kevin Wolf <kwolf@redhat.com>
|
|
RH-MergeRequest: 504: virt-storage: Backport stable branch fixes
|
|
RH-Jira: RHEL-186384
|
|
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
RH-Commit: [18/45] 7f8d672738b92fa5935342eded7559bc16bef7ab (kmwolf/centos-qemu-kvm)
|
|
|
|
This method was deprecated in 3.12 because it ordinarily should not be
|
|
used from coroutines; if there is not a currently running event loop,
|
|
this automatically creates a new event loop - which is usually not what
|
|
you want from code that would ever run in the bottom half.
|
|
|
|
In our case, we do want this behavior in two places:
|
|
|
|
(1) The synchronous shim, for convenience: this allows fully sync
|
|
programs to use QEMUMonitorProtocol() without needing to set up an event
|
|
loop beforehand. This is intentional to fully box in the async
|
|
complexities into the legacy sync shim.
|
|
|
|
(2) The qmp_tui shell; instead of relying on asyncio.run to create and
|
|
run an asyncio program, we need to be able to pass the current asyncio
|
|
loop to urwid setup functions. For convenience, again, we create one if
|
|
one is not present to simplify the creation of the TUI appliance.
|
|
|
|
The remaining user of get_event_loop() was in fact one of the erroneous
|
|
users that should not have been using this function: if there's no
|
|
running event loop inside of a coroutine, you're in big trouble :)
|
|
|
|
Signed-off-by: John Snow <jsnow@redhat.com>
|
|
cherry picked from commit python-qemu-qmp@aa1ff9907603a3033296027e1bd021133df86ef1
|
|
Signed-off-by: John Snow <jsnow@redhat.com>
|
|
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
(cherry picked from commit 5d99044d09db0fa8c2b3294e301927118f9effc9)
|
|
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
---
|
|
python/qemu/qmp/legacy.py | 9 ++++++++-
|
|
python/qemu/qmp/qmp_tui.py | 7 ++++++-
|
|
python/tests/protocol.py | 2 +-
|
|
3 files changed, 15 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/python/qemu/qmp/legacy.py b/python/qemu/qmp/legacy.py
|
|
index 22a2b5616e..ea9b8032c3 100644
|
|
--- a/python/qemu/qmp/legacy.py
|
|
+++ b/python/qemu/qmp/legacy.py
|
|
@@ -86,7 +86,14 @@ def __init__(self,
|
|
"server argument should be False when passing a socket")
|
|
|
|
self._qmp = QMPClient(nickname)
|
|
- self._aloop = asyncio.get_event_loop()
|
|
+
|
|
+ try:
|
|
+ self._aloop = asyncio.get_running_loop()
|
|
+ except RuntimeError:
|
|
+ # No running loop; since this is a sync shim likely to be
|
|
+ # used in fully sync programs, create one if neccessary.
|
|
+ self._aloop = asyncio.get_event_loop_policy().get_event_loop()
|
|
+
|
|
self._address = address
|
|
self._timeout: Optional[float] = None
|
|
|
|
diff --git a/python/qemu/qmp/qmp_tui.py b/python/qemu/qmp/qmp_tui.py
|
|
index 562be008d5..651f611316 100644
|
|
--- a/python/qemu/qmp/qmp_tui.py
|
|
+++ b/python/qemu/qmp/qmp_tui.py
|
|
@@ -377,7 +377,12 @@ def run(self, debug: bool = False) -> None:
|
|
screen = urwid.raw_display.Screen()
|
|
screen.set_terminal_properties(256)
|
|
|
|
- self.aloop = asyncio.get_event_loop()
|
|
+ try:
|
|
+ self.aloop = asyncio.get_running_loop()
|
|
+ except RuntimeError:
|
|
+ # No running asyncio event loop. Create one if necessary.
|
|
+ self.aloop = asyncio.get_event_loop_policy().get_event_loop()
|
|
+
|
|
self.aloop.set_debug(debug)
|
|
|
|
# Gracefully handle SIGTERM and SIGINT signals
|
|
diff --git a/python/tests/protocol.py b/python/tests/protocol.py
|
|
index c254c77b17..e565802516 100644
|
|
--- a/python/tests/protocol.py
|
|
+++ b/python/tests/protocol.py
|
|
@@ -227,7 +227,7 @@ def async_test(async_test_method):
|
|
Decorator; adds SetUp and TearDown to async tests.
|
|
"""
|
|
async def _wrapper(self, *args, **kwargs):
|
|
- loop = asyncio.get_event_loop()
|
|
+ loop = asyncio.get_running_loop()
|
|
loop.set_debug(True)
|
|
|
|
await self._asyncSetUp()
|
|
--
|
|
2.52.0
|
|
|