Update and rebase to QEMU 4.1

[pve-qemu.git] / debian / patches / extra / 0001-monitor-qmp-resume-monitor-when-clearing-its-queue.patch

diff --git a/debian/patches/extra/0001-monitor-qmp-resume-monitor-when-clearing-its-queue.patch b/debian/patches/extra/0001-monitor-qmp-resume-monitor-when-clearing-its-queue.patch
index 968219dca9da3a3f2f97c0f2fdb628ae948f7b6b..d07c25166f9abd43bdd4add64ad16d50f7837ffe 100644 (file)
--- a/debian/patches/extra/0001-monitor-qmp-resume-monitor-when-clearing-its-queue.patch
+++ b/debian/patches/extra/0001-monitor-qmp-resume-monitor-when-clearing-its-queue.patch
@@ -1,11 +1,11 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Wolfgang Bumiller <w.bumiller@proxmox.com>
-Date: Wed, 2 Oct 2019 09:41:34 +0200
+Date: Wed, 2 Oct 2019 10:30:03 +0200
 Subject: [PATCH] monitor/qmp: resume monitor when clearing its queue
 
 When a monitor's queue is filled up in handle_qmp_command()
 it gets suspended. It's the dispatcher bh's job currently to
-resume the monitor, which it does after processing an even
+resume the monitor, which it does after processing an event
 from the queue. However, it is possible for a
 CHR_EVENT_CLOSED event to be processed before before the bh
 is scheduled, which will clear the queue without resuming
@@ -16,30 +16,21 @@ was filled up.
 
 Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
 ---
- monitor.c | 21 ++++++++++++++++-----
- 1 file changed, 16 insertions(+), 5 deletions(-)
+ monitor/qmp.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
 
-diff --git a/monitor.c b/monitor.c
-index 4807bbe811..daadbcdede 100644
---- a/monitor.c
-+++ b/monitor.c
-@@ -356,12 +356,28 @@ static void qmp_request_free(QMPRequest *req)
-     g_free(req);
- }
- 
-+static bool qmp_oob_enabled(Monitor *mon)
-+{
-+    return mon->qmp.capab[QMP_CAPABILITY_OOB];
-+}
-+
+diff --git a/monitor/qmp.c b/monitor/qmp.c
+index e1b196217d..fb3e66c62a 100644
+--- a/monitor/qmp.c
++++ b/monitor/qmp.c
+@@ -70,9 +70,19 @@ static void qmp_request_free(QMPRequest *req)
  /* Caller must hold mon->qmp.qmp_queue_lock */
- static void monitor_qmp_cleanup_req_queue_locked(Monitor *mon)
+ static void monitor_qmp_cleanup_req_queue_locked(MonitorQMP *mon)
  {
-+    bool need_resume =
-+        (!qmp_oob_enabled(mon) && mon->qmp.qmp_requests->length > 0)
-+        || mon->qmp.qmp_requests->length == QMP_REQ_QUEUE_LEN_MAX;
-     while (!g_queue_is_empty(mon->qmp.qmp_requests)) {
-         qmp_request_free(g_queue_pop_head(mon->qmp.qmp_requests));
++    bool need_resume = (!qmp_oob_enabled(mon) && mon->qmp_requests->length > 0)
++        || mon->qmp_requests->length == QMP_REQ_QUEUE_LEN_MAX;
+     while (!g_queue_is_empty(mon->qmp_requests)) {
+         qmp_request_free(g_queue_pop_head(mon->qmp_requests));
      }
 +    if (need_resume) {
 +        /*
@@ -47,20 +38,8 @@ index 4807bbe811..daadbcdede 100644
 +         * queue gets cleared from a CH_EVENT_CLOSED event before the dispatch
 +         * bh got scheduled.
 +         */
-+        monitor_resume(mon);
++        monitor_resume(&mon->common);
 +    }
  }
  
- static void monitor_qmp_cleanup_queues(Monitor *mon)
-@@ -1157,11 +1173,6 @@ static void monitor_init_qmp_commands(void)
-                          qmp_marshal_qmp_capabilities, QCO_ALLOW_PRECONFIG);
- }
- 
--static bool qmp_oob_enabled(Monitor *mon)
--{
--    return mon->qmp.capab[QMP_CAPABILITY_OOB];
--}
--
- static void monitor_qmp_caps_reset(Monitor *mon)
- {
-     memset(mon->qmp.capab_offered, 0, sizeof(mon->qmp.capab_offered));
+ static void monitor_qmp_cleanup_queues(MonitorQMP *mon)