[libvirt] [PATCH v3 10/11] conf: cleanup: drop virDomainObjWait

Nikolay Shirokovskiy nshirokovskiy at virtuozzo.com
Thu Nov 9 13:18:56 UTC 2017


---
 src/conf/domain_conf.c   | 19 -------------------
 src/conf/domain_conf.h   |  1 -
 src/libvirt_private.syms |  1 -
 3 files changed, 21 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 7dfd7b5..dad0520 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -3192,25 +3192,6 @@ virDomainObjBroadcast(virDomainObjPtr vm)
 }
 
 
-int
-virDomainObjWait(virDomainObjPtr vm)
-{
-    if (virCondWait(&vm->cond, &vm->parent.lock) < 0) {
-        virReportSystemError(errno, "%s",
-                             _("failed to wait for domain condition"));
-        return -1;
-    }
-
-    if (!virDomainObjIsActive(vm)) {
-        virReportError(VIR_ERR_OPERATION_FAILED, "%s",
-                       _("domain is not running"));
-        return -1;
-    }
-
-    return 0;
-}
-
-
 /**
  * Waits for domain condition to be triggered for a specific period of time.
  *
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index e3f060b..e6140ab 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -2685,7 +2685,6 @@ bool virDomainObjTaint(virDomainObjPtr obj,
                        virDomainTaintFlags taint);
 
 void virDomainObjBroadcast(virDomainObjPtr vm);
-int virDomainObjWait(virDomainObjPtr vm);
 int virDomainObjWaitUntil(virDomainObjPtr vm,
                           unsigned long long whenms);
 
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 6164446..e7320dc 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -470,7 +470,6 @@ virDomainObjSetMetadata;
 virDomainObjSetState;
 virDomainObjTaint;
 virDomainObjUpdateModificationImpact;
-virDomainObjWait;
 virDomainObjWaitUntil;
 virDomainOSTypeFromString;
 virDomainOSTypeToString;
-- 
1.8.3.1




More information about the libvir-list mailing list