virDomainGraphicsDefFormat function was way too long so split it into separate functions for each graphics type. Signed-off-by: Pavel Hrdina <phrdina@xxxxxxxxxx> --- src/conf/domain_conf.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index e1589527f2..4314ef4dc4 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -26455,6 +26455,21 @@ virDomainGraphicsDefFormatVNC(virBuffer *attrBuf, return 0; } +static void +virDomainGraphicsDefFormatSDL(virBuffer *attrBuf, + virBuffer *childBuf, + virDomainGraphicsDef *def) +{ + virBufferEscapeString(attrBuf, " display='%s'", def->data.sdl.display); + + virBufferEscapeString(attrBuf, " xauth='%s'", def->data.sdl.xauth); + + if (def->data.sdl.fullscreen) + virBufferAddLit(attrBuf, " fullscreen='yes'"); + + virDomainGraphicsDefFormatGL(childBuf, def->data.sdl.gl, NULL); +} + static int virDomainGraphicsDefFormat(virBuffer *buf, virDomainGraphicsDef *def, @@ -26481,15 +26496,7 @@ virDomainGraphicsDefFormat(virBuffer *buf, break; case VIR_DOMAIN_GRAPHICS_TYPE_SDL: - virBufferEscapeString(&attrBuf, " display='%s'", - def->data.sdl.display); - - virBufferEscapeString(&attrBuf, " xauth='%s'", - def->data.sdl.xauth); - if (def->data.sdl.fullscreen) - virBufferAddLit(&attrBuf, " fullscreen='yes'"); - - virDomainGraphicsDefFormatGL(&childBuf, def->data.sdl.gl, NULL); + virDomainGraphicsDefFormatSDL(&attrBuf, &childBuf, def); break; case VIR_DOMAIN_GRAPHICS_TYPE_RDP: -- 2.48.1