Re: [libvirt] [PATCH 07/13] conf: Split memory related post parse stuff into separate function

[Michal Privoznik]

On 21.09.2015 19:21, Peter Krempa wrote:
> The post parse func is growing rather large. Since later patches will
> introduce more logic in the memory post parse code, split it into a
> separate handler.
> ---
>  src/conf/domain_conf.c | 32 +---
>  1 file changed, 21 insertions(+), 11 deletions(-)

ACK

Michal

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

[libvirt] [PATCH 07/13] conf: Split memory related post parse stuff into separate function

[Peter Krempa]

The post parse func is growing rather large. Since later patches will
introduce more logic in the memory post parse code, split it into a
separate handler.
---
 src/conf/domain_conf.c | 32 +---
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 63dcecd..ca60e60 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -3726,18 +3726,8 @@ virDomainDefRemoveDuplicateMetadata(virDomainDefPtr def)


 static int
-virDomainDefPostParseInternal(virDomainDefPtr def,
-  virCapsPtr caps ATTRIBUTE_UNUSED)
+virDomainDefPostParseMemory(virDomainDefPtr def)
 {
-size_t i;
-
-/* verify init path for container based domains */
-if (def->os.type == VIR_DOMAIN_OSTYPE_EXE && !def->os.init) {
-virReportError(VIR_ERR_XML_ERROR, "%s",
-   _("init binary must be specified"));
-return -1;
-}
-
 if (virDomainDefGetMemoryInitial(def) == 0) {
 virReportError(VIR_ERR_XML_ERROR, "%s",
_("Memory size must be specified via  or in the 
"
@@ -3765,6 +3755,26 @@ virDomainDefPostParseInternal(virDomainDefPtr def,
 return -1;
 }

+return 0;
+}
+
+
+static int
+virDomainDefPostParseInternal(virDomainDefPtr def,
+  virCapsPtr caps ATTRIBUTE_UNUSED)
+{
+size_t i;
+
+/* verify init path for container based domains */
+if (def->os.type == VIR_DOMAIN_OSTYPE_EXE && !def->os.init) {
+virReportError(VIR_ERR_XML_ERROR, "%s",
+   _("init binary must be specified"));
+return -1;
+}
+
+if (virDomainDefPostParseMemory(def) < 0)
+return -1;
+
 /*
  * Some really crazy backcompat stuff for consoles
  *
-- 
2.4.5

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list