File de9cd87f-return-recommended-machine-for-XEN.patch of Package virt-manager

Overview Repositories Revisions Requests Users Attributes Meta

File de9cd87f-return-recommended-machine-for-XEN.patch of Package virt-manager (Revision 276dd676b384e395b595819941941ecf)

Currently displaying revision 276dd676b384e395b595819941941ecf , Show latest

Subject: virtinst.capabilities: return recommended machine for XEN
From: Pavel Hrdina phrdina@redhat.com Thu Jun 16 12:00:51 2016 +0200
Date: Thu Jun 16 12:16:49 2016 +0200:
Git: de9cd87fda742dfd5e9a14cf4b68c60e574d3e3d

This is required in order to ask for correct domcapabilities.  If you don't
specify any machine libvirt will return domcapabilities for default machine
which is xenpv.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>

Index: virt-manager-1.3.2/tests/cli-test-xml/compare/virt-install-xen-hvm.xml
===================================================================
--- virt-manager-1.3.2.orig/tests/cli-test-xml/compare/virt-install-xen-hvm.xml
+++ virt-manager-1.3.2/tests/cli-test-xml/compare/virt-install-xen-hvm.xml
@@ -5,7 +5,7 @@
   <currentMemory>65536</currentMemory>
   <vcpu>1</vcpu>
   <os>
-    <type arch="x86_64">hvm</type>
+    <type arch="x86_64" machine="xenfv">hvm</type>
     <loader>/usr/lib/xen/boot/hvmloader</loader>
     <boot dev="cdrom"/>
     <boot dev="hd"/>
Index: virt-manager-1.3.2/tests/cli-test-xml/compare/virt-install-xen-pv.xml
===================================================================
--- virt-manager-1.3.2.orig/tests/cli-test-xml/compare/virt-install-xen-pv.xml
+++ virt-manager-1.3.2/tests/cli-test-xml/compare/virt-install-xen-pv.xml
@@ -5,7 +5,7 @@
   <currentMemory>65536</currentMemory>
   <vcpu>1</vcpu>
   <os>
-    <type arch="x86_64">linux</type>
+    <type arch="x86_64" machine="xenpv">linux</type>
     <kernel>/tmp/virtinst-vmlinuz.</kernel>
     <initrd>/tmp/virtinst-initrd.img.</initrd>
     <cmdline>method=tests/cli-test-xml/faketree</cmdline>
Index: virt-manager-1.3.2/virtinst/capabilities.py
===================================================================
--- virt-manager-1.3.2.orig/virtinst/capabilities.py
+++ virt-manager-1.3.2/virtinst/capabilities.py
@@ -350,9 +350,14 @@ class _CapsInfo(object):
 
         # For any other HV just let libvirt get us the default, these
         # are the only ones we've tested.
-        if not self.conn.is_test() and not self.conn.is_qemu():
+        if (not self.conn.is_test() and
+            not self.conn.is_qemu() and
+            not self.conn.is_xen()):
             return None
 
+        if self.conn.is_xen() and len(self.machines):
+            return self.machines[0]
+
         if (self.arch in ["ppc64", "ppc64le"] and
             "pseries" in self.machines):
             return "pseries"

Places

File de9cd87f-return-recommended-machine-for-XEN.patch of Package virt-manager (Revision 276dd676b384e395b595819941941ecf)

Places