|
 |
6d3351 |
From 4e32b3e8ab394aaf1f94b1166d7c5e38cec8ede4 Mon Sep 17 00:00:00 2001
|
|
|
6d3351 |
Message-Id: <4e32b3e8ab394aaf1f94b1166d7c5e38cec8ede4@dist-git>
|
|
|
6d3351 |
From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
|
|
|
6d3351 |
Date: Fri, 9 Jun 2017 12:48:53 +0200
|
|
|
6d3351 |
Subject: [PATCH] Use a separate buffer for <controller><driver>
|
|
|
6d3351 |
MIME-Version: 1.0
|
|
|
6d3351 |
Content-Type: text/plain; charset=UTF-8
|
|
|
6d3351 |
Content-Transfer-Encoding: 8bit
|
|
|
6d3351 |
|
|
|
6d3351 |
Make adding new attributes easier.
|
|
|
6d3351 |
|
|
|
6d3351 |
(cherry picked from commit 5e5fc766257b05979c37593434d28cc9eb7e0cf0)
|
|
|
6d3351 |
Signed-off-by: Ján Tomko <jtomko@redhat.com>
|
|
|
6d3351 |
|
|
|
6d3351 |
https://bugzilla.redhat.com/show_bug.cgi?id=1283251
|
|
|
6d3351 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
6d3351 |
---
|
|
|
6d3351 |
src/conf/domain_conf.c | 39 ++++++++++++++++++++-------------------
|
|
|
6d3351 |
1 file changed, 20 insertions(+), 19 deletions(-)
|
|
|
6d3351 |
|
|
|
6d3351 |
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
|
|
|
6d3351 |
index d5c5a7030b..242a79a7e7 100644
|
|
|
6d3351 |
--- a/src/conf/domain_conf.c
|
|
|
6d3351 |
+++ b/src/conf/domain_conf.c
|
|
|
6d3351 |
@@ -21332,6 +21332,7 @@ virDomainControllerDefFormat(virBufferPtr buf,
|
|
|
6d3351 |
const char *model = NULL;
|
|
|
6d3351 |
const char *modelName = NULL;
|
|
|
6d3351 |
bool pcihole64 = false, pciModel = false, pciTarget = false;
|
|
|
6d3351 |
+ virBuffer driverBuf = VIR_BUFFER_INITIALIZER;
|
|
|
6d3351 |
|
|
|
6d3351 |
if (!type) {
|
|
|
6d3351 |
virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
|
6d3351 |
@@ -21436,26 +21437,26 @@ virDomainControllerDefFormat(virBufferPtr buf,
|
|
|
6d3351 |
}
|
|
|
6d3351 |
}
|
|
|
6d3351 |
|
|
|
6d3351 |
- if (def->queues || def->cmd_per_lun ||
|
|
|
6d3351 |
- def->max_sectors || def->ioeventfd || def->iothread) {
|
|
|
6d3351 |
+ if (def->queues)
|
|
|
6d3351 |
+ virBufferAsprintf(&driverBuf, " queues='%u'", def->queues);
|
|
|
6d3351 |
+
|
|
|
6d3351 |
+ if (def->cmd_per_lun)
|
|
|
6d3351 |
+ virBufferAsprintf(&driverBuf, " cmd_per_lun='%u'", def->cmd_per_lun);
|
|
|
6d3351 |
+
|
|
|
6d3351 |
+ if (def->max_sectors)
|
|
|
6d3351 |
+ virBufferAsprintf(&driverBuf, " max_sectors='%u'", def->max_sectors);
|
|
|
6d3351 |
+
|
|
|
6d3351 |
+ if (def->ioeventfd) {
|
|
|
6d3351 |
+ virBufferAsprintf(&driverBuf, " ioeventfd='%s'",
|
|
|
6d3351 |
+ virTristateSwitchTypeToString(def->ioeventfd));
|
|
|
6d3351 |
+ }
|
|
|
6d3351 |
+
|
|
|
6d3351 |
+ if (def->iothread)
|
|
|
6d3351 |
+ virBufferAsprintf(&driverBuf, " iothread='%u'", def->iothread);
|
|
|
6d3351 |
+
|
|
|
6d3351 |
+ if (virBufferUse(&driverBuf)) {
|
|
|
6d3351 |
virBufferAddLit(buf, "
|
|
|
6d3351 |
- if (def->queues)
|
|
|
6d3351 |
- virBufferAsprintf(buf, " queues='%u'", def->queues);
|
|
|
6d3351 |
-
|
|
|
6d3351 |
- if (def->cmd_per_lun)
|
|
|
6d3351 |
- virBufferAsprintf(buf, " cmd_per_lun='%u'", def->cmd_per_lun);
|
|
|
6d3351 |
-
|
|
|
6d3351 |
- if (def->max_sectors)
|
|
|
6d3351 |
- virBufferAsprintf(buf, " max_sectors='%u'", def->max_sectors);
|
|
|
6d3351 |
-
|
|
|
6d3351 |
- if (def->ioeventfd) {
|
|
|
6d3351 |
- virBufferAsprintf(buf, " ioeventfd='%s'",
|
|
|
6d3351 |
- virTristateSwitchTypeToString(def->ioeventfd));
|
|
|
6d3351 |
- }
|
|
|
6d3351 |
-
|
|
|
6d3351 |
- if (def->iothread)
|
|
|
6d3351 |
- virBufferAsprintf(buf, " iothread='%u'", def->iothread);
|
|
|
6d3351 |
-
|
|
|
6d3351 |
+ virBufferAddBuffer(buf, &driverBuf);
|
|
|
6d3351 |
virBufferAddLit(buf, "/>\n");
|
|
|
6d3351 |
}
|
|
|
6d3351 |
|
|
|
6d3351 |
--
|
|
|
6d3351 |
2.13.1
|
|
|
6d3351 |
|