6bbd8f8c21
virt-manager-1.3.0.tar.bz2 * Git hosting moved to http://github.com/virt-manager/virt-manager * Switch translation infrastructure from transifex to fedora.zanata.org * Add dogtail UI tests and infrastructure * Improved support for s390x kvm (Kevin Zhao) * virt-install and virt-manager now remove created disk images if VM install startup fails * Replace urlgrabber usage with requests and urllib2 * virt-install: add –network virtualport support for openvswitch (Daniel P. Berrange) * virt-install: support multiple –security labels * virt-install: support –features kvm_hidden=on|off (Pavel Hrdina) * virt-install: add –features pmu=on|off * virt-install: add –features pvspinlock=on|off (Abhijeet Kasurde) * virt-install: add –events on_lockfailure=on|off (Abhijeet Kasurde) * virt-install: add –network link_state=up|down * virt-install: add –vcpu placement=static|auto - Dropped virt-manager-1.2.1.tar.bz2 34db1af7-fix-adding-iscsi-pools.patch 360fe110-add-s390x-arch-support.patch 4970615f-fix-qemu-vs-lxc-detection.patch 590f5a52-urlfetcher-Clear-cached-ftp-connection-on-cleanupLoc.patch 5e68b0fc-dont-try-to-set-vmport-on-non-x86.patch 601a82cb-fix-console_type-if-xen.patch 76bad650-fix-virt-xml-define-and-update.patch 77423e7a-connection-catch-more-errors-in-filter_nodedevs.patch 8dbe96fc-add-s390x-arch-support.patch a9b303fb-fix-copy-host-cpu-definition.patch aebebbf8-report-an-error-for-pxe-install-without-network.patch cde2f0ef-Suppress-gi-warnings-about-lack-of-require_version.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=283
44 lines
1.9 KiB
Diff
44 lines
1.9 KiB
Diff
Use the correct qemu emulator based on the architecture.
|
|
We want to get away from using the old qemu-dm emulator
|
|
for Xen HVM guests so default to qemu-system-i386.
|
|
Index: virt-manager-1.3.0/virtinst/guest.py
|
|
===================================================================
|
|
--- virt-manager-1.3.0.orig/virtinst/guest.py
|
|
+++ virt-manager-1.3.0/virtinst/guest.py
|
|
@@ -849,14 +849,29 @@ class Guest(XMLBuilder):
|
|
self.emulator = None
|
|
return
|
|
|
|
- if self.emulator:
|
|
+ if self.conn.is_qemu():
|
|
+ if self.os.arch == "s390x":
|
|
+ preferred_emulator = "/usr/bin/qemu-system-s390x"
|
|
+ elif self.os.arch == "ppc64" or self.os.arch == "ppc64le":
|
|
+ preferred_emulator = "/usr/bin/qemu-system-ppc64"
|
|
+ else:
|
|
+ preferred_emulator = "/usr/bin/qemu-system-x86_64"
|
|
+ elif self.conn.is_lxc():
|
|
+ preferred_emulator = "/usr/lib/libvirt/libvirt_lxc"
|
|
+ if not os.path.exists(preferred_emulator):
|
|
+ preferred_emulator = "/usr/lib64/libvirt/libvirt_lxc"
|
|
+ else:
|
|
+ preferred_emulator = "/usr/lib/xen/bin/qemu-system-i386"
|
|
+ if self.emulator and self.emulator == preferred_emulator:
|
|
return
|
|
|
|
- if self.os.is_hvm() and self.type == "xen":
|
|
- if self.conn.caps.host.cpu.arch == "x86_64":
|
|
- self.emulator = "/usr/lib64/xen/bin/qemu-dm"
|
|
- else:
|
|
- self.emulator = "/usr/lib/xen/bin/qemu-dm"
|
|
+ if os.path.exists(preferred_emulator):
|
|
+ self.emulator = preferred_emulator
|
|
+ elif self.os.is_hvm() and self.type == "xen":
|
|
+ # We don't want to use the old qemu-dm for xen
|
|
+ self.emulator = "/usr/lib/xen/bin/qemu-system-i386"
|
|
+ elif not self.emulator:
|
|
+ self.emulator = "/usr/bin/qemu-kvm"
|
|
|
|
def _set_cpu_defaults(self):
|
|
self.cpu.set_topology_defaults(self.vcpus)
|