[libvirt] [PATCHv4 16/18] conf: Add a 'id' to virDomainResctrlDef
Adding element 'id' to virDomainResctrlDef. This 'id' reflects
the attribute 'id' of of element 'cachetune in XML.
virResctrlAlloc.id is a copy of virDomanResctrlDef.id.
Signed-off-by: Wang Huaqiang <huaqiang.wang(a)intel.com>
---
src/conf/domain_conf.c | 20 ++++++++------------
src/conf/domain_conf.h | 1 +
2 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 4f4604f..6da9dd4 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -2979,6 +2979,7 @@ virDomainResctrlDefFree(virDomainResctrlDefPtr resctrl)
virObjectUnref(resctrl->alloc);
virBitmapFree(resctrl->vcpus);
VIR_FREE(resctrl->monitors);
+ VIR_FREE(resctrl->id);
VIR_FREE(resctrl);
}
@@ -19138,6 +19139,9 @@ virDomainResctrlAppend(virDomainDefPtr def,
goto cleanup;
}
+ if (VIR_STRDUP(resctrl->id, alloc_id) < 0)
+ goto cleanup;
+
if (virResctrlAllocSetID(resctrl->alloc, alloc_id) < 0)
goto cleanup;
@@ -27320,13 +27324,9 @@ virDomainCachetuneDefFormat(virBufferPtr buf,
virBufferAsprintf(buf, "<cachetune vcpus='%s'", vcpus);
- if (!(flags & VIR_DOMAIN_DEF_FORMAT_INACTIVE)) {
- const char *alloc_id = virResctrlAllocGetID(resctrl->alloc);
- if (!alloc_id)
- goto cleanup;
+ if (!(flags & VIR_DOMAIN_DEF_FORMAT_INACTIVE))
+ virBufferAsprintf(buf, " id='%s'", resctrl->id);
- virBufferAsprintf(buf, " id='%s'", alloc_id);
- }
virBufferAddLit(buf, ">\n");
virBufferAddBuffer(buf, &childrenBuf);
@@ -27383,13 +27383,9 @@ virDomainMemorytuneDefFormat(virBufferPtr buf,
virBufferAsprintf(buf, "<memorytune vcpus='%s'", vcpus);
- if (!(flags & VIR_DOMAIN_DEF_FORMAT_INACTIVE)) {
- const char *alloc_id = virResctrlAllocGetID(resctrl->alloc);
- if (!alloc_id)
- goto cleanup;
+ if (!(flags & VIR_DOMAIN_DEF_FORMAT_INACTIVE))
+ virBufferAsprintf(buf, " id='%s'", resctrl->id);
- virBufferAsprintf(buf, " id='%s'", alloc_id);
- }
virBufferAddLit(buf, ">\n");
virBufferAddBuffer(buf, &childrenBuf);
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 60f6464..e190aa2 100644
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -2248,6 +2248,7 @@ typedef struct _virDomainResctrlDef virDomainResctrlDef;
typedef virDomainResctrlDef *virDomainResctrlDefPtr;
struct _virDomainResctrlDef {
+ char *id;
virBitmapPtr vcpus;
virResctrlAllocPtr alloc;
--
2.7.4