Re: [libvirt] [PATCH v2 01/25] src/xenxs:Refactor code parsing memory config
David Kiarie wrote:
From: Kiarie Kahurani <davidkiarie4(a)gmail.com>
Introduce function
xenParseXMMem(virConfPtr conf,......);
which parses memory config instead
Since you mentioned off-list that a V3 is in the works, I'll point out a
nit below you can address.
signed-off-by: David Kiarie<davidkiarie4(a)gmail.com>
---
src/xenxs/xen_xm.c | 28 ++++++++++++++++++----------
1 file changed, 18 insertions(+), 10 deletions(-)
diff --git a/src/xenxs/xen_xm.c b/src/xenxs/xen_xm.c
index f6492b5..5e26e5e 100644
--- a/src/xenxs/xen_xm.c
+++ b/src/xenxs/xen_xm.c
@@ -244,6 +244,23 @@ xenXMConfigGetUUID(virConfPtr conf, const char *name, unsigned char
*uuid)
return 0;
}
+
Since most functions in this file have 2 blank lines of whitespace
between them, this addition is fine.
+static
+int xenParseXMMem(virConfPtr conf, virDomainDefPtr def)
+{
+ if (xenXMConfigGetULongLong(conf, "memory", &def->mem.cur_balloon,
+ MIN_XEN_GUEST_SIZE * 2) < 0)
+ return -1;
+
+ if (xenXMConfigGetULongLong(conf, "maxmem", &def->mem.max_balloon,
+ def->mem.cur_balloon) < 0)
+ return -1;
+
+ def->mem.cur_balloon *= 1024;
+ def->mem.max_balloon *= 1024;
+
+ return 0;
+}
But you should do the same here.
Regards,
Jim
#define MAX_VFB 1024
/*
* Turn a config record into a lump of XML describing the
@@ -360,17 +377,8 @@ xenParseXM(virConfPtr conf, int xendConfigVersion,
}
}
- if (xenXMConfigGetULongLong(conf, "memory", &def->mem.cur_balloon,
- MIN_XEN_GUEST_SIZE * 2) < 0)
+ if (xenParseXMMem(conf, def) < 0)
goto cleanup;
-
- if (xenXMConfigGetULongLong(conf, "maxmem", &def->mem.max_balloon,
- def->mem.cur_balloon) < 0)
- goto cleanup;
-
- def->mem.cur_balloon *= 1024;
- def->mem.max_balloon *= 1024;
-
if (xenXMConfigGetULong(conf, "vcpus", &count, 1) < 0 ||
MAX_VIRT_CPUS < count)
goto cleanup;