|
 |
5cef56 |
From de03c66f06549081fef4d5600eb9a2136664a0fa Mon Sep 17 00:00:00 2001
|
|
|
5cef56 |
From: Xu Wang <gesaint@linux.vnet.ibm.com>
|
|
|
5cef56 |
Date: Mon, 19 Aug 2013 17:11:10 +0800
|
|
|
5cef56 |
Subject: [PATCH 05/48] Add dumpCore tag support to memory
|
|
|
5cef56 |
|
|
|
5cef56 |
dumpCore tag in the <memory> is not supported by libvirt-cim and
|
|
|
5cef56 |
it will be dropped during updating any element in the xml definition
|
|
|
5cef56 |
of a domain. This patch keep the tag all the time.
|
|
|
5cef56 |
|
|
|
5cef56 |
Signed-off-by: Xu Wang <gesaint@linux.vnet.ibm.com>
|
|
|
5cef56 |
Signed-off-by: John Ferlan <jferlan@redhat.com>
|
|
|
5cef56 |
---
|
|
|
5cef56 |
libxkutil/device_parsing.c | 28 +++++++++++++++++++++++++++-
|
|
|
5cef56 |
libxkutil/device_parsing.h | 3 +++
|
|
|
5cef56 |
libxkutil/xmlgen.c | 9 +++++++++
|
|
|
5cef56 |
3 files changed, 39 insertions(+), 1 deletion(-)
|
|
|
5cef56 |
|
|
|
5cef56 |
diff --git a/libxkutil/device_parsing.c b/libxkutil/device_parsing.c
|
|
|
5cef56 |
index ffdf682..542e4e9 100644
|
|
|
5cef56 |
--- a/libxkutil/device_parsing.c
|
|
|
5cef56 |
+++ b/libxkutil/device_parsing.c
|
|
|
5cef56 |
@@ -606,8 +606,17 @@ static int parse_mem_device(xmlNode *node, struct virt_device **vdevs)
|
|
|
5cef56 |
|
|
|
5cef56 |
if (XSTREQ(node->name, "currentMemory"))
|
|
|
5cef56 |
sscanf(content, "%" PRIu64, &mdev->size);
|
|
|
5cef56 |
- else if (XSTREQ(node->name, "memory"))
|
|
|
5cef56 |
+ else if (XSTREQ(node->name, "memory")) {
|
|
|
5cef56 |
sscanf(content, "%" PRIu64, &mdev->maxsize);
|
|
|
5cef56 |
+ content = get_attr_value(node, "dumpCore");
|
|
|
5cef56 |
+ if (content && XSTREQ(content, "on")) {
|
|
|
5cef56 |
+ mdev->dumpCore = MEM_DUMP_CORE_ON;
|
|
|
5cef56 |
+ } else if (content && XSTREQ(content, "off")) {
|
|
|
5cef56 |
+ mdev->dumpCore = MEM_DUMP_CORE_OFF;
|
|
|
5cef56 |
+ } else {
|
|
|
5cef56 |
+ mdev->dumpCore = MEM_DUMP_CORE_NOT_SET;
|
|
|
5cef56 |
+ }
|
|
|
5cef56 |
+ }
|
|
|
5cef56 |
|
|
|
5cef56 |
free(content);
|
|
|
5cef56 |
|
|
|
5cef56 |
@@ -969,6 +978,7 @@ static int _get_mem_device(const char *xml, struct virt_device **list)
|
|
|
5cef56 |
struct virt_device *mdevs = NULL;
|
|
|
5cef56 |
struct virt_device *mdev = NULL;
|
|
|
5cef56 |
int ret;
|
|
|
5cef56 |
+ bool mem_dump_core_set = false;
|
|
|
5cef56 |
|
|
|
5cef56 |
ret = parse_devices(xml, &mdevs, CIM_RES_TYPE_MEM);
|
|
|
5cef56 |
if (ret <= 0)
|
|
|
5cef56 |
@@ -988,10 +998,26 @@ static int _get_mem_device(const char *xml, struct virt_device **list)
|
|
|
5cef56 |
mdevs[1].dev.mem.size);
|
|
|
5cef56 |
mdev->dev.mem.maxsize = MAX(mdevs[0].dev.mem.maxsize,
|
|
|
5cef56 |
mdevs[1].dev.mem.maxsize);
|
|
|
5cef56 |
+ /* libvirt dumpCore tag always belong to memory xml node, but
|
|
|
5cef56 |
+ * here we may have two mdev for memory node and currentMemory
|
|
|
5cef56 |
+ * node. So pick up one value.
|
|
|
5cef56 |
+ */
|
|
|
5cef56 |
+ if (mdevs[0].dev.mem.dumpCore != MEM_DUMP_CORE_NOT_SET) {
|
|
|
5cef56 |
+ mdev->dev.mem.dumpCore = mdevs[0].dev.mem.dumpCore;
|
|
|
5cef56 |
+ mem_dump_core_set = true;
|
|
|
5cef56 |
+ } else if (mdevs[1].dev.mem.dumpCore !=
|
|
|
5cef56 |
+ MEM_DUMP_CORE_NOT_SET) {
|
|
|
5cef56 |
+ if (mem_dump_core_set) {
|
|
|
5cef56 |
+ CU_DEBUG("WARN: libvirt set memory core dump in"
|
|
|
5cef56 |
+ "two nodes!");
|
|
|
5cef56 |
+ }
|
|
|
5cef56 |
+ mdev->dev.mem.dumpCore = mdevs[1].dev.mem.dumpCore;
|
|
|
5cef56 |
+ }
|
|
|
5cef56 |
} else {
|
|
|
5cef56 |
mdev->dev.mem.size = MAX(mdevs[0].dev.mem.size,
|
|
|
5cef56 |
mdevs[0].dev.mem.maxsize);
|
|
|
5cef56 |
mdev->dev.mem.maxsize = mdev->dev.mem.size;
|
|
|
5cef56 |
+ mdev->dev.mem.dumpCore = mdevs[0].dev.mem.dumpCore;
|
|
|
5cef56 |
}
|
|
|
5cef56 |
|
|
|
5cef56 |
mdev->type = CIM_RES_TYPE_MEM;
|
|
|
5cef56 |
diff --git a/libxkutil/device_parsing.h b/libxkutil/device_parsing.h
|
|
|
5cef56 |
index 2b6d3d1..979b792 100644
|
|
|
5cef56 |
--- a/libxkutil/device_parsing.h
|
|
|
5cef56 |
+++ b/libxkutil/device_parsing.h
|
|
|
5cef56 |
@@ -75,6 +75,9 @@ struct net_device {
|
|
|
5cef56 |
struct mem_device {
|
|
|
5cef56 |
uint64_t size;
|
|
|
5cef56 |
uint64_t maxsize;
|
|
|
5cef56 |
+ enum { MEM_DUMP_CORE_NOT_SET,
|
|
|
5cef56 |
+ MEM_DUMP_CORE_ON,
|
|
|
5cef56 |
+ MEM_DUMP_CORE_OFF } dumpCore;
|
|
|
5cef56 |
};
|
|
|
5cef56 |
|
|
|
5cef56 |
struct vcpu_device {
|
|
|
5cef56 |
diff --git a/libxkutil/xmlgen.c b/libxkutil/xmlgen.c
|
|
|
5cef56 |
index 4287d42..30e9a5e 100644
|
|
|
5cef56 |
--- a/libxkutil/xmlgen.c
|
|
|
5cef56 |
+++ b/libxkutil/xmlgen.c
|
|
|
5cef56 |
@@ -498,6 +498,15 @@ static const char *mem_xml(xmlNodePtr root, struct domain *dominfo)
|
|
|
5cef56 |
BAD_CAST string);
|
|
|
5cef56 |
|
|
|
5cef56 |
free(string);
|
|
|
5cef56 |
+
|
|
|
5cef56 |
+ if (tmp == NULL)
|
|
|
5cef56 |
+ return XML_ERROR;
|
|
|
5cef56 |
+ if (mem->dumpCore == MEM_DUMP_CORE_ON) {
|
|
|
5cef56 |
+ xmlNewProp(tmp, BAD_CAST "dumpCore", BAD_CAST "on");
|
|
|
5cef56 |
+ } else if (mem->dumpCore == MEM_DUMP_CORE_OFF) {
|
|
|
5cef56 |
+ xmlNewProp(tmp, BAD_CAST "dumpCore", BAD_CAST "off");
|
|
|
5cef56 |
+ }
|
|
|
5cef56 |
+
|
|
|
5cef56 |
out:
|
|
|
5cef56 |
if (tmp == NULL)
|
|
|
5cef56 |
return XML_ERROR;
|
|
|
5cef56 |
--
|
|
|
5cef56 |
1.8.5.3
|
|
|
5cef56 |
|