conf: desktop graphics remove unused option

Previously, the 'desktop' graphics configuration contained the
'fullscreen' option which was never used, removed the unused option.

Signed-off-by: Kirill Shchetiniuk <kshcheti@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst
index e47204ec1c040f9532502d08ea39fb8081a5952b..1acf203d18fa1f5da1adb802ff6ebb64c5bc5b3e 100644 (file)
--- 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 201a4ded8bc8f2687875a413c9bad26da63b6a6f..be70ec3b9638cf9c9123d0cf7560f279a92e1343 100644 (file)
--- 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 c909cfba3f12fec6f384b16e115455126ad2c6b7..5e02c15ed5b9b5fbd0fa233484518fd6644cad8b 100644 (file)
--- 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 5597d5a66baf036c096daba312a1de16b18d068d..81afa10083da1e8d533253ef37d32bd973768ae5 100644 (file)
--- 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">