[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH v3 22/28] conf: pass parseFlags down to virDomainDefAddConsoleCompat



From: Pino Toscano <ptoscano redhat com>

Signed-off-by: Pino Toscano <ptoscano redhat com>
Reviewed-by: Andrea Bolognani <abologna redhat com>
---
 src/conf/domain_conf.c | 10 ++++++----
 src/conf/domain_conf.h |  3 ++-
 src/vz/vz_sdk.c        |  2 +-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index b31917dad..792d9bef4 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -3987,7 +3987,8 @@ virDomainDefPostParseMemory(virDomainDefPtr def,
 
 
 static int
-virDomainDefAddConsoleCompat(virDomainDefPtr def)
+virDomainDefAddConsoleCompat(virDomainDefPtr def,
+                             unsigned int parseFlags ATTRIBUTE_UNUSED)
 {
     size_t i;
 
@@ -4948,7 +4949,7 @@ virDomainDefPostParseCommon(virDomainDefPtr def,
     if (virDomainDefPostParseTimer(def) < 0)
         return -1;
 
-    if (virDomainDefAddImplicitDevices(def) < 0)
+    if (virDomainDefAddImplicitDevices(def, data->parseFlags) < 0)
         return -1;
 
     if (def->nvideos != 0) {
@@ -22017,9 +22018,10 @@ virDomainDefAddImplicitVideo(virDomainDefPtr def)
 }
 
 int
-virDomainDefAddImplicitDevices(virDomainDefPtr def)
+virDomainDefAddImplicitDevices(virDomainDefPtr def,
+                               unsigned int parseFlags)
 {
-    if (virDomainDefAddConsoleCompat(def) < 0)
+    if (virDomainDefAddConsoleCompat(def, parseFlags) < 0)
         return -1;
 
     if (virDomainDefAddImplicitControllers(def) < 0)
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 48b07226e..6e23cdd7d 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -2945,7 +2945,8 @@ bool virDomainDefCheckABIStabilityFlags(virDomainDefPtr src,
                                         virDomainXMLOptionPtr xmlopt,
                                         unsigned int flags);
 
-int virDomainDefAddImplicitDevices(virDomainDefPtr def);
+int virDomainDefAddImplicitDevices(virDomainDefPtr def,
+                                   unsigned int parseFlags);
 
 virDomainIOThreadIDDefPtr virDomainIOThreadIDFind(const virDomainDef *def,
                                                   unsigned int iothread_id);
diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c
index eea5f6fc6..35522f46c 100644
--- a/src/vz/vz_sdk.c
+++ b/src/vz/vz_sdk.c
@@ -1932,7 +1932,7 @@ prlsdkLoadDomain(vzDriverPtr driver,
     if (prlsdkGetDomainState(dom, sdkdom, &domainState) < 0)
         goto error;
 
-    if (!IS_CT(def) && virDomainDefAddImplicitDevices(def) < 0)
+    if (!IS_CT(def) && virDomainDefAddImplicitDevices(def, 0) < 0)
         goto error;
 
     if (def->ngraphics > 0) {
-- 
2.14.3


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]