[libvirt PATCH 02/16] domain_conf: graphics: use a function to format audio element
Removes code duplication.
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
src/conf/domain_conf.c | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 850fe7e90b..a0e68d6046 100644
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -26375,6 +26375,16 @@ virDomainGraphicsDefFormatGL(virBuffer *buf,
virBufferAddLit(buf, "/>\n");
}
+static void
+virDomainGraphicsDefFormatAudio(virBuffer *buf,
+ unsigned int audioId)
+{
+ if (audioId <= 0)
+ return;
+
+ virBufferAsprintf(buf, "<audio id='%d'/>\n", audioId);
+}
+
static int
virDomainGraphicsDefFormat(virBuffer *buf,
virDomainGraphicsDef *def,
@@ -26592,9 +26602,7 @@ virDomainGraphicsDefFormat(virBuffer *buf,
virDomainGraphicsDefFormatGL(buf, def->data.dbus.gl,
def->data.dbus.rendernode);
- if (def->data.dbus.audioId > 0)
- virBufferAsprintf(buf, "<audio id='%d'/>\n",
- def->data.dbus.audioId);
+ virDomainGraphicsDefFormatAudio(buf, def->data.dbus.audioId);
break;
case VIR_DOMAIN_GRAPHICS_TYPE_LAST:
@@ -26695,9 +26703,7 @@ virDomainGraphicsDefFormat(virBuffer *buf,
children = true;
}
- if (def->data.vnc.audioId > 0)
- virBufferAsprintf(buf, "<audio id='%d'/>\n",
- def->data.vnc.audioId);
+ virDomainGraphicsDefFormatAudio(buf, def->data.vnc.audioId);
}
if (children) {
--
2.48.1