|
 |
7a3408 |
From 21f44cec9cc44e52990897a2f752c1ea9e4a2007 Mon Sep 17 00:00:00 2001
|
|
|
7a3408 |
Message-Id: <21f44cec9cc44e52990897a2f752c1ea9e4a2007@dist-git>
|
|
|
7a3408 |
From: Pavel Hrdina <phrdina@redhat.com>
|
|
|
7a3408 |
Date: Fri, 10 Jul 2015 12:39:30 +0200
|
|
|
7a3408 |
Subject: [PATCH] virDomainObjSignal: drop this function
|
|
|
7a3408 |
|
|
|
7a3408 |
There are multiple consumers for the domain condition and we should
|
|
|
7a3408 |
always wake them all.
|
|
|
7a3408 |
|
|
|
7a3408 |
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
|
|
|
7a3408 |
(cherry picked from commit 6b278f3ad6fa0c8b0366a0858546808e15a6676f)
|
|
|
7a3408 |
|
|
|
7a3408 |
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1147471
|
|
|
7a3408 |
|
|
|
7a3408 |
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
|
|
|
7a3408 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
7a3408 |
---
|
|
|
7a3408 |
src/conf/domain_conf.c | 7 -------
|
|
|
7a3408 |
src/conf/domain_conf.h | 1 -
|
|
|
7a3408 |
src/libvirt_private.syms | 1 -
|
|
|
7a3408 |
src/qemu/qemu_process.c | 4 ++--
|
|
|
7a3408 |
4 files changed, 2 insertions(+), 11 deletions(-)
|
|
|
7a3408 |
|
|
|
7a3408 |
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
|
|
|
7a3408 |
index 2f1f69d..d990180 100644
|
|
|
7a3408 |
--- a/src/conf/domain_conf.c
|
|
|
7a3408 |
+++ b/src/conf/domain_conf.c
|
|
|
7a3408 |
@@ -2662,13 +2662,6 @@ virDomainObjEndAPI(virDomainObjPtr *vm)
|
|
|
7a3408 |
|
|
|
7a3408 |
|
|
|
7a3408 |
void
|
|
|
7a3408 |
-virDomainObjSignal(virDomainObjPtr vm)
|
|
|
7a3408 |
-{
|
|
|
7a3408 |
- virCondSignal(&vm->cond);
|
|
|
7a3408 |
-}
|
|
|
7a3408 |
-
|
|
|
7a3408 |
-
|
|
|
7a3408 |
-void
|
|
|
7a3408 |
virDomainObjBroadcast(virDomainObjPtr vm)
|
|
|
7a3408 |
{
|
|
|
7a3408 |
virCondBroadcast(&vm->cond);
|
|
|
7a3408 |
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
|
|
|
7a3408 |
index 2bdbff1..0adaefc 100644
|
|
|
7a3408 |
--- a/src/conf/domain_conf.h
|
|
|
7a3408 |
+++ b/src/conf/domain_conf.h
|
|
|
7a3408 |
@@ -2443,7 +2443,6 @@ void virDomainObjEndAPI(virDomainObjPtr *vm);
|
|
|
7a3408 |
bool virDomainObjTaint(virDomainObjPtr obj,
|
|
|
7a3408 |
virDomainTaintFlags taint);
|
|
|
7a3408 |
|
|
|
7a3408 |
-void virDomainObjSignal(virDomainObjPtr vm);
|
|
|
7a3408 |
void virDomainObjBroadcast(virDomainObjPtr vm);
|
|
|
7a3408 |
int virDomainObjWait(virDomainObjPtr vm);
|
|
|
7a3408 |
int virDomainObjWaitUntil(virDomainObjPtr vm,
|
|
|
7a3408 |
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
|
|
|
7a3408 |
index 1566d11..720afdf 100644
|
|
|
7a3408 |
--- a/src/libvirt_private.syms
|
|
|
7a3408 |
+++ b/src/libvirt_private.syms
|
|
|
7a3408 |
@@ -412,7 +412,6 @@ virDomainObjParseNode;
|
|
|
7a3408 |
virDomainObjSetDefTransient;
|
|
|
7a3408 |
virDomainObjSetMetadata;
|
|
|
7a3408 |
virDomainObjSetState;
|
|
|
7a3408 |
-virDomainObjSignal;
|
|
|
7a3408 |
virDomainObjTaint;
|
|
|
7a3408 |
virDomainObjUpdateModificationImpact;
|
|
|
7a3408 |
virDomainObjWait;
|
|
|
7a3408 |
diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
|
|
|
7a3408 |
index 7abeaae..9f1ae5a 100644
|
|
|
7a3408 |
--- a/src/qemu/qemu_process.c
|
|
|
7a3408 |
+++ b/src/qemu/qemu_process.c
|
|
|
7a3408 |
@@ -1007,7 +1007,7 @@ qemuProcessHandleBlockJob(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
|
|
|
7a3408 |
/* We have a SYNC API waiting for this event, dispatch it back */
|
|
|
7a3408 |
diskPriv->blockJobType = type;
|
|
|
7a3408 |
diskPriv->blockJobStatus = status;
|
|
|
7a3408 |
- virDomainObjSignal(vm);
|
|
|
7a3408 |
+ virDomainObjBroadcast(vm);
|
|
|
7a3408 |
} else {
|
|
|
7a3408 |
/* there is no waiting SYNC API, dispatch the update to a thread */
|
|
|
7a3408 |
if (VIR_ALLOC(processEvent) < 0)
|
|
|
7a3408 |
@@ -1503,7 +1503,7 @@ qemuProcessHandleSpiceMigrated(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
|
|
|
7a3408 |
}
|
|
|
7a3408 |
|
|
|
7a3408 |
priv->job.spiceMigrated = true;
|
|
|
7a3408 |
- virDomainObjSignal(vm);
|
|
|
7a3408 |
+ virDomainObjBroadcast(vm);
|
|
|
7a3408 |
|
|
|
7a3408 |
cleanup:
|
|
|
7a3408 |
virObjectUnlock(vm);
|
|
|
7a3408 |
--
|
|
|
7a3408 |
2.4.5
|
|
|
7a3408 |
|