[PATCH 4/4] conf: desktop graphics remove unused option

From: Kirill Shchetiniuk <kshcheti(a)redhat.com&gt; Previously, the 'desktop' graphics configuration contained the 'fullscreen' option which was never used, removed the unused option. Signed-off-by: Kirill Shchetiniuk <kshcheti(a)redhat.com&gt; --- docs/formatdomain.rst | 5 ++--- src/conf/domain_conf.c | 17 ++--------------- src/conf/domain_conf.h | 1 - src/conf/schemas/domaincommon.rng | 5 ----- 4 files changed, 4 insertions(+), 24 deletions(-) diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst index 8753ee9c23..9940b2e38f 100644 --- a/docs/formatdomain.rst +++ b/docs/formatdomain.rst @@ -6697,7 +6697,7 @@ interaction with the admin. <listen type='address' address='1.2.3.4'/> </graphics> <graphics type='rdp' autoport='yes' multiUser='yes'/> - <graphics type='desktop' fullscreen='yes'/> + <graphics type='desktop'/> <graphics type='spice'> <listen type='network' network='rednet'/> </graphics> @@ -6878,8 +6878,7 @@ interaction with the admin. ``desktop`` This value is reserved for VirtualBox domains for the moment. It displays a window on the host desktop, similarly to "sdl", but using the VirtualBox - viewer. Just like "sdl", it accepts the optional attributes ``display`` - and ``fullscreen``. + viewer. Just like "sdl", it accepts the optional attribute ``display``. ``egl-headless`` :since:`Since 4.6.0` This display type provides support for an OpenGL accelerated display diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 201a4ded8b..be70ec3b96 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -11961,20 +11961,11 @@ virDomainGraphicsDefParseXMLRDP(virDomainGraphicsDef *def, } -static int +static void virDomainGraphicsDefParseXMLDesktop(virDomainGraphicsDef *def, xmlNodePtr node) { - virTristateBool fullscreen; - - if (virXMLPropTristateBool(node, "fullscreen", VIR_XML_PROP_NONE, - &fullscreen) < 0) - return -1; - - virTristateBoolToBool(fullscreen, &def->data.desktop.fullscreen); def->data.desktop.display = virXMLPropString(node, "display"); - - return 0; } @@ -12260,8 +12251,7 @@ virDomainGraphicsDefParseXML(virDomainXMLOption *xmlopt, goto error; break; case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP: - if (virDomainGraphicsDefParseXMLDesktop(def, node) < 0) - goto error; + virDomainGraphicsDefParseXMLDesktop(def, node); break; case VIR_DOMAIN_GRAPHICS_TYPE_SPICE: if (virDomainGraphicsDefParseXMLSpice(def, node, ctxt, flags) < 0) @@ -26998,9 +26988,6 @@ virDomainGraphicsDefFormatDesktop(virBuffer *attrBuf, virDomainGraphicsDef *def) { virBufferEscapeString(attrBuf, " display='%s'", def->data.desktop.display); - - if (def->data.desktop.fullscreen) - virBufferAddLit(attrBuf, " fullscreen='yes'"); } static int diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index c909cfba3f..5e02c15ed5 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2049,7 +2049,6 @@ struct _virDomainGraphicsDef { } rdp; struct { char *display; - bool fullscreen; } desktop; struct { int port; diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng index 5597d5a66b..81afa10083 100644 --- a/src/conf/schemas/domaincommon.rng +++ b/src/conf/schemas/domaincommon.rng @@ -4573,11 +4573,6 @@ <text/> </attribute> </optional> - <optional> - <attribute name="fullscreen"> - <ref name="virYesNo"/> - </attribute> - </optional> </group> <group> <attribute name="type"> -- 2.49.0