shaba/virt-manager
1
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2024-12-22 13:34:07 +03:00
Code Issues Projects Releases Wiki Activity

domain: os: treat xenpvh as xen PV

Browse Source 
Notably, don't try to add a tablet device, this apparently
doesn't work.

https://github.com/virt-manager/virt-manager/issues/448

Signed-off-by: Cole Robinson <crobinso@redhat.com>
This commit is contained in:
Cole Robinson 2024-09-06 15:27:23 -04:00
parent 65d568ebf9
commit 83daac0489
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tests/data/capabilities/xen-rhel5.4.xml
View File

@ -31,8 +31,18 @@
<wordsize>64</wordsize> <wordsize>64</wordsize>
<emulator>/usr/lib64/xen/bin/qemu-dm</emulator> <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
<machine>xenpv</machine> <machine>xenpv</machine>
<domain type='xen'> <domain type='xen'/>
</domain> </arch>
</guest>
<!-- fake addition for testing xenpvh -->
<guest>
<os_type>xenpvh</os_type>
<arch name='x86_64'>
<wordsize>64</wordsize>
<emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
<machine>xenpvh</machine>
<domain type='xen'/>
</arch> </arch>
</guest> </guest>

1
tests/test_cli.py
View File

@ -1271,6 +1271,7 @@ c.add_compare("--init /usr/bin/httpd", "manual-init")
c = vinst.add_category("xen", "--noautoconsole --connect " + utils.URIs.xen) c = vinst.add_category("xen", "--noautoconsole --connect " + utils.URIs.xen)
c.add_valid("--disk %(EXISTIMG1)s --location %(TREEDIR)s --paravirt --graphics none") # Xen PV install headless c.add_valid("--disk %(EXISTIMG1)s --location %(TREEDIR)s --paravirt --graphics none") # Xen PV install headless
c.add_compare("--disk %(EXISTIMG1)s --import", "xen-default") # Xen default c.add_compare("--disk %(EXISTIMG1)s --import", "xen-default") # Xen default
c.add_compare("--disk %(EXISTIMG1)s --machine xenpvh --boot os_type=xenpvh --import", "xenpvh") # Xen default
c.add_compare("--disk %(EXISTIMG1)s --location %(TREEDIR)s --paravirt --controller xenbus,maxGrantFrames=64 --input default", "xen-pv", precompare_check="5.3.0") # Xen PV c.add_compare("--disk %(EXISTIMG1)s --location %(TREEDIR)s --paravirt --controller xenbus,maxGrantFrames=64 --input default", "xen-pv", precompare_check="5.3.0") # Xen PV
c.add_compare("--osinfo generic --disk /pool-iscsi/diskvol1 --cdrom %(EXISTIMG1)s --livecd --hvm", "xen-hvm") # Xen HVM c.add_compare("--osinfo generic --disk /pool-iscsi/diskvol1 --cdrom %(EXISTIMG1)s --livecd --hvm", "xen-hvm") # Xen HVM
c.add_compare("--osinfo generic --disk /pool-iscsi/diskvol1 --cdrom %(EXISTIMG1)s --install no_install=yes --hvm", "xen-hvm") # Ensure --livecd and --install no_install are essentially identical c.add_compare("--osinfo generic --disk /pool-iscsi/diskvol1 --cdrom %(EXISTIMG1)s --install no_install=yes --hvm", "xen-hvm") # Ensure --livecd and --install no_install are essentially identical

2
virtinst/domain/os.py
View File

@ -45,7 +45,7 @@ class DomainOs(XMLBuilder):
def is_hvm(self): def is_hvm(self):
return self.os_type == "hvm" return self.os_type == "hvm"
def is_xenpv(self): def is_xenpv(self):
return self.os_type in ["xen", "linux"] return self.os_type in ["xen", "linux", "xenpvh"]
def is_container(self): def is_container(self):
return self.os_type == "exe" return self.os_type == "exe"