bhyve: parse: Set video device model when parsing bhyve commandline

Add the proper video device type when parsing bhyve's commandline into a
XML.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Roman Bogorodskiy <bogorodskiy@gmail.com>

diff --git a/src/bhyve/bhyve_parse_command.c b/src/bhyve/bhyve_parse_command.c
index 969e782b273ca026a40d83cfa202dd37c025ec64..4f1d384da1f0990026d22a865996f41a58dfb76a 100644 (file)
--- a/src/bhyve/bhyve_parse_command.c
+++ b/src/bhyve/bhyve_parse_command.c
@@ -573,6 +573,8 @@ bhyveParsePCIFbuf(virDomainDefPtr def,
     if (!(video = virDomainVideoDefNew(xmlopt)))
         goto cleanup;
 
+    video->type = VIR_DOMAIN_VIDEO_TYPE_GOP;
+
     if (!(graphics = virDomainGraphicsDefNew(xmlopt)))
         goto cleanup;
 

diff --git a/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-listen.xml b/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-listen.xml
index 4ab17aef813dc51467661a00d43a20ffb709fa96..616f8e180e056bb4aab3188df339c525e06daa6a 100644 (file)
--- a/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-listen.xml
+++ b/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-listen.xml
@@ -16,7 +16,7 @@
       <listen type='address' address='1.2.3.4'/>
     </graphics>
     <video>
-      <model type='default' heads='1'/>
+      <model type='gop' heads='1'/>
     </video>
   </devices>
 </domain>

diff --git a/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-password.xml b/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-password.xml
index 456a1ee9e315c18000da522750124d414d03f221..be15a20d91977a7b8c985b66b04bdc9ac4a54374 100644 (file)
--- a/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-password.xml
+++ b/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-password.xml
@@ -16,7 +16,7 @@
       <listen type='address' address='127.0.0.1'/>
     </graphics>
     <video>
-      <model type='default' heads='1'/>
+      <model type='gop' heads='1'/>
     </video>
   </devices>
 </domain>

diff --git a/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-resolution.xml b/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-resolution.xml
index f8fa0ed1ce227a197652e2d8ca906181305f22a3..662961ba0d954c0cacd3feffcf6be62a3a532208 100644 (file)
--- a/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-resolution.xml
+++ b/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-resolution.xml
@@ -16,7 +16,7 @@
       <listen type='address' address='127.0.0.1'/>
     </graphics>
     <video>
-      <model type='default' heads='1'>
+      <model type='gop' heads='1'>
         <resolution x='1920' y='1080'/>
       </model>
     </video>

diff --git a/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-vga-io.xml b/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-vga-io.xml
index 1e2f3d6938456f6cc541f1deccf645225813788b..4ead57217a6c331f8ebc7aa0d434c64844d6170e 100644 (file)
--- a/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-vga-io.xml
+++ b/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-vga-io.xml
@@ -16,7 +16,7 @@
       <listen type='address' address='127.0.0.1'/>
     </graphics>
     <video>
-      <model type='default' heads='1'/>
+      <model type='gop' heads='1'/>
     </video>
   </devices>
 </domain>

diff --git a/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-vga-off.xml b/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-vga-off.xml
index 3c9c76e5aa978b06fab4a125fbd6f7d5473259a4..0623938b653840e5bab696e7d2995548a81e64e7 100644 (file)
--- a/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-vga-off.xml
+++ b/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-vga-off.xml
@@ -17,7 +17,7 @@
     </graphics>
     <video>
       <driver vgaconf='off'/>
-      <model type='default' heads='1'/>
+      <model type='gop' heads='1'/>
     </video>
   </devices>
 </domain>

diff --git a/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-vga-on.xml b/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-vga-on.xml
index b83772c47abe4c9794330f777c466dbfd1a686f4..01aa559cb4547cdd9dfb93bebe97dea303624e62 100644 (file)
--- a/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-vga-on.xml
+++ b/tests/bhyveargv2xmldata/bhyveargv2xml-vnc-vga-on.xml
@@ -17,7 +17,7 @@
     </graphics>
     <video>
       <driver vgaconf='on'/>
-      <model type='default' heads='1'/>
+      <model type='gop' heads='1'/>
     </video>
   </devices>
 </domain>

diff --git a/tests/bhyveargv2xmldata/bhyveargv2xml-vnc.xml b/tests/bhyveargv2xmldata/bhyveargv2xml-vnc.xml
index 1e2f3d6938456f6cc541f1deccf645225813788b..4ead57217a6c331f8ebc7aa0d434c64844d6170e 100644 (file)
--- a/tests/bhyveargv2xmldata/bhyveargv2xml-vnc.xml
+++ b/tests/bhyveargv2xmldata/bhyveargv2xml-vnc.xml
@@ -16,7 +16,7 @@
       <listen type='address' address='127.0.0.1'/>
     </graphics>
     <video>
-      <model type='default' heads='1'/>
+      <model type='gop' heads='1'/>
     </video>
   </devices>
 </domain>