|
 |
79b470 |
From c049804bc3b296a183ce0bd819d5f9b1d1a45ea7 Mon Sep 17 00:00:00 2001
|
|
|
79b470 |
Message-Id: <c049804bc3b296a183ce0bd819d5f9b1d1a45ea7@dist-git>
|
|
|
79b470 |
From: Michal Privoznik <mprivozn@redhat.com>
|
|
|
79b470 |
Date: Wed, 7 Oct 2020 18:45:34 +0200
|
|
|
79b470 |
Subject: [PATCH] numa_conf: Drop CPU from name of two functions
|
|
|
79b470 |
MIME-Version: 1.0
|
|
|
79b470 |
Content-Type: text/plain; charset=UTF-8
|
|
|
79b470 |
Content-Transfer-Encoding: 8bit
|
|
|
79b470 |
|
|
|
79b470 |
There are two functions virDomainNumaDefCPUFormatXML() and
|
|
|
79b470 |
virDomainNumaDefCPUParseXML() which format and parse domain's
|
|
|
79b470 |
<numa/>. There is nothing CPU specific about them. Drop the
|
|
|
79b470 |
infix.
|
|
|
79b470 |
|
|
|
79b470 |
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
|
|
79b470 |
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
|
|
|
79b470 |
(cherry picked from commit 68c5b0183cb157c4672a6af3a14375df4434cee5)
|
|
|
79b470 |
|
|
|
79b470 |
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1749518
|
|
|
79b470 |
|
|
|
79b470 |
Conflicts:
|
|
|
79b470 |
- src/conf/domain_conf.c: Context.
|
|
|
79b470 |
|
|
|
79b470 |
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
|
|
|
79b470 |
Message-Id: <a06547d5b53c7a8fa2a2801a9cbd7a47834ebaa3.1602087923.git.mprivozn@redhat.com>
|
|
|
79b470 |
Reviewed-by: Ján Tomko <jtomko@redhat.com>
|
|
|
79b470 |
---
|
|
|
79b470 |
src/conf/cpu_conf.c | 2 +-
|
|
|
79b470 |
src/conf/domain_conf.c | 2 +-
|
|
|
79b470 |
src/conf/numa_conf.c | 8 ++++----
|
|
|
79b470 |
src/conf/numa_conf.h | 4 ++--
|
|
|
79b470 |
4 files changed, 8 insertions(+), 8 deletions(-)
|
|
|
79b470 |
|
|
|
79b470 |
diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c
|
|
|
79b470 |
index 1a2948ce11..dfd0c1f798 100644
|
|
|
79b470 |
--- a/src/conf/cpu_conf.c
|
|
|
79b470 |
+++ b/src/conf/cpu_conf.c
|
|
|
79b470 |
@@ -746,7 +746,7 @@ virCPUDefFormatBufFull(virBufferPtr buf,
|
|
|
79b470 |
if (virCPUDefFormatBuf(&childrenBuf, def) < 0)
|
|
|
79b470 |
goto cleanup;
|
|
|
79b470 |
|
|
|
79b470 |
- if (virDomainNumaDefCPUFormatXML(&childrenBuf, numa) < 0)
|
|
|
79b470 |
+ if (virDomainNumaDefFormatXML(&childrenBuf, numa) < 0)
|
|
|
79b470 |
goto cleanup;
|
|
|
79b470 |
|
|
|
79b470 |
/* Put it all together */
|
|
|
79b470 |
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
|
|
|
79b470 |
index 484f3b4352..3229d5ec95 100644
|
|
|
79b470 |
--- a/src/conf/domain_conf.c
|
|
|
79b470 |
+++ b/src/conf/domain_conf.c
|
|
|
79b470 |
@@ -20487,7 +20487,7 @@ virDomainDefParseXML(xmlDocPtr xml,
|
|
|
79b470 |
if (virCPUDefParseXML(ctxt, "./cpu[1]", VIR_CPU_TYPE_GUEST, &def->cpu) < 0)
|
|
|
79b470 |
goto error;
|
|
|
79b470 |
|
|
|
79b470 |
- if (virDomainNumaDefCPUParseXML(def->numa, ctxt) < 0)
|
|
|
79b470 |
+ if (virDomainNumaDefParseXML(def->numa, ctxt) < 0)
|
|
|
79b470 |
goto error;
|
|
|
79b470 |
|
|
|
79b470 |
if (virDomainNumaGetCPUCountTotal(def->numa) > virDomainDefGetVcpusMax(def)) {
|
|
|
79b470 |
diff --git a/src/conf/numa_conf.c b/src/conf/numa_conf.c
|
|
|
79b470 |
index 6f1257fd8e..38fcf9d9aa 100644
|
|
|
79b470 |
--- a/src/conf/numa_conf.c
|
|
|
79b470 |
+++ b/src/conf/numa_conf.c
|
|
|
79b470 |
@@ -842,8 +842,8 @@ virDomainNumaDefNodeDistanceParseXML(virDomainNumaPtr def,
|
|
|
79b470 |
}
|
|
|
79b470 |
|
|
|
79b470 |
int
|
|
|
79b470 |
-virDomainNumaDefCPUParseXML(virDomainNumaPtr def,
|
|
|
79b470 |
- xmlXPathContextPtr ctxt)
|
|
|
79b470 |
+virDomainNumaDefParseXML(virDomainNumaPtr def,
|
|
|
79b470 |
+ xmlXPathContextPtr ctxt)
|
|
|
79b470 |
{
|
|
|
79b470 |
xmlNodePtr *nodes = NULL;
|
|
|
79b470 |
xmlNodePtr oldNode = ctxt->node;
|
|
|
79b470 |
@@ -971,8 +971,8 @@ virDomainNumaDefCPUParseXML(virDomainNumaPtr def,
|
|
|
79b470 |
|
|
|
79b470 |
|
|
|
79b470 |
int
|
|
|
79b470 |
-virDomainNumaDefCPUFormatXML(virBufferPtr buf,
|
|
|
79b470 |
- virDomainNumaPtr def)
|
|
|
79b470 |
+virDomainNumaDefFormatXML(virBufferPtr buf,
|
|
|
79b470 |
+ virDomainNumaPtr def)
|
|
|
79b470 |
{
|
|
|
79b470 |
virDomainMemoryAccess memAccess;
|
|
|
79b470 |
virTristateBool discard;
|
|
|
79b470 |
diff --git a/src/conf/numa_conf.h b/src/conf/numa_conf.h
|
|
|
79b470 |
index b1b8e3274d..ce865cbfbb 100644
|
|
|
79b470 |
--- a/src/conf/numa_conf.h
|
|
|
79b470 |
+++ b/src/conf/numa_conf.h
|
|
|
79b470 |
@@ -182,7 +182,7 @@ bool virDomainNumatuneNodesetIsAvailable(virDomainNumaPtr numatune,
|
|
|
79b470 |
bool virDomainNumatuneNodeSpecified(virDomainNumaPtr numatune,
|
|
|
79b470 |
int cellid);
|
|
|
79b470 |
|
|
|
79b470 |
-int virDomainNumaDefCPUParseXML(virDomainNumaPtr def, xmlXPathContextPtr ctxt);
|
|
|
79b470 |
-int virDomainNumaDefCPUFormatXML(virBufferPtr buf, virDomainNumaPtr def);
|
|
|
79b470 |
+int virDomainNumaDefParseXML(virDomainNumaPtr def, xmlXPathContextPtr ctxt);
|
|
|
79b470 |
+int virDomainNumaDefFormatXML(virBufferPtr buf, virDomainNumaPtr def);
|
|
|
79b470 |
|
|
|
79b470 |
unsigned int virDomainNumaGetCPUCountTotal(virDomainNumaPtr numa);
|
|
|
79b470 |
--
|
|
|
79b470 |
2.29.2
|
|
|
79b470 |
|