tags 685749 +patch
thanks
Ubuntu 12.10 picked up the debian package, and thus had the same
problem. Attached is the patch to libvirt that removes the absolute
paths, allowing the toolstack to search its own paths for the necessary
binaries.
-George
Don't use absolute paths for xen helper binaries
The problem with using absolute paths is that they have to be kept
in sync with where the xen packager places the binaries. Since the
toolstacks already know where the binaries are, just say the name
of the binary and let the toolstack sort it out.
Also, update the xml templates so that the checks pass.
Signed-off-by: George Dunlap <george.dun...@eu.citrix.com>
Index: libvirt/src/xen/xen_hypervisor.c
===================================================================
--- libvirt.orig/src/xen/xen_hypervisor.c 2012-09-27 14:59:08.377979000 +0100
+++ libvirt/src/xen/xen_hypervisor.c 2012-09-27 15:53:08.783031646 +0100
@@ -2356,10 +2356,10 @@
guest_archs[i].model,
guest_archs[i].bits,
(STREQ(hostmachine, "x86_64") ?
- "/usr/lib64/xen/bin/qemu-dm" :
- "/usr/lib/xen/bin/qemu-dm"),
+ "qemu-dm" :
+ "qemu-dm"),
(guest_archs[i].hvm ?
- "/usr/lib/xen-default/boot/hvmloader" :
+ "hvmloader" :
NULL),
1,
machines)) == NULL) {
Index: libvirt/tests/xencapsdata/xen-x86_64-hvm.xml
===================================================================
--- libvirt.orig/tests/xencapsdata/xen-x86_64-hvm.xml 2012-09-27 14:59:08.377979000 +0100
+++ libvirt/tests/xencapsdata/xen-x86_64-hvm.xml 2012-09-27 15:57:51.327031878 +0100
@@ -20,7 +20,7 @@
<os_type>xen</os_type>
<arch name='x86_64'>
<wordsize>64</wordsize>
- <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
+ <emulator>qemu-dm</emulator>
<machine>xenpv</machine>
<domain type='xen'>
</domain>
@@ -31,8 +31,8 @@
<os_type>hvm</os_type>
<arch name='i686'>
<wordsize>32</wordsize>
- <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
- <loader>/usr/lib/xen-default/boot/hvmloader</loader>
+ <emulator>qemu-dm</emulator>
+ <loader>hvmloader</loader>
<machine>xenfv</machine>
<domain type='xen'>
</domain>
@@ -49,8 +49,8 @@
<os_type>hvm</os_type>
<arch name='x86_64'>
<wordsize>64</wordsize>
- <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
- <loader>/usr/lib/xen-default/boot/hvmloader</loader>
+ <emulator>qemu-dm</emulator>
+ <loader>hvmloader</loader>
<machine>xenfv</machine>
<domain type='xen'>
</domain>
Index: libvirt/tests/xencapsdata/xen-ia64-be-hvm.xml
===================================================================
--- libvirt.orig/tests/xencapsdata/xen-ia64-be-hvm.xml 2012-09-27 14:59:08.377979000 +0100
+++ libvirt/tests/xencapsdata/xen-ia64-be-hvm.xml 2012-09-27 15:58:29.079030806 +0100
@@ -17,7 +17,7 @@
<os_type>xen</os_type>
<arch name='ia64'>
<wordsize>64</wordsize>
- <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+ <emulator>qemu-dm</emulator>
<machine>xenpv</machine>
<domain type='xen'>
</domain>
@@ -31,8 +31,8 @@
<os_type>hvm</os_type>
<arch name='ia64'>
<wordsize>64</wordsize>
- <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
- <loader>/usr/lib/xen-default/boot/hvmloader</loader>
+ <emulator>qemu-dm</emulator>
+ <loader>hvmloader</loader>
<machine>xenfv</machine>
<domain type='xen'>
</domain>
Index: libvirt/tests/xencapsdata/xen-ia64-be.xml
===================================================================
--- libvirt.orig/tests/xencapsdata/xen-ia64-be.xml 2012-09-27 14:59:08.377979000 +0100
+++ libvirt/tests/xencapsdata/xen-ia64-be.xml 2012-09-27 15:58:52.355030843 +0100
@@ -17,7 +17,7 @@
<os_type>xen</os_type>
<arch name='ia64'>
<wordsize>64</wordsize>
- <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+ <emulator>qemu-dm</emulator>
<machine>xenpv</machine>
<domain type='xen'>
</domain>
Index: libvirt/tests/xencapsdata/xen-ia64.xml
===================================================================
--- libvirt.orig/tests/xencapsdata/xen-ia64.xml 2012-09-27 14:59:08.377979000 +0100
+++ libvirt/tests/xencapsdata/xen-ia64.xml 2012-09-27 15:59:00.899032049 +0100
@@ -17,7 +17,7 @@
<os_type>xen</os_type>
<arch name='ia64'>
<wordsize>64</wordsize>
- <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+ <emulator>qemu-dm</emulator>
<machine>xenpv</machine>
<domain type='xen'>
</domain>
Index: libvirt/tests/xencapsdata/xen-ppc64.xml
===================================================================
--- libvirt.orig/tests/xencapsdata/xen-ppc64.xml 2012-09-27 14:59:08.377979000 +0100
+++ libvirt/tests/xencapsdata/xen-ppc64.xml 2012-09-27 15:59:09.935031933 +0100
@@ -17,7 +17,7 @@
<os_type>xen</os_type>
<arch name='ppc64'>
<wordsize>64</wordsize>
- <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+ <emulator>qemu-dm</emulator>
<machine>xenpv</machine>
<domain type='xen'>
</domain>
Index: libvirt/tests/xencapsdata/xen-x86_64.xml
===================================================================
--- libvirt.orig/tests/xencapsdata/xen-x86_64.xml 2012-09-27 14:59:08.377979000 +0100
+++ libvirt/tests/xencapsdata/xen-x86_64.xml 2012-09-27 15:59:19.167031816 +0100
@@ -20,7 +20,7 @@
<os_type>xen</os_type>
<arch name='x86_64'>
<wordsize>64</wordsize>
- <emulator>/usr/lib64/xen/bin/qemu-dm</emulator>
+ <emulator>qemu-dm</emulator>
<machine>xenpv</machine>
<domain type='xen'>
</domain>
Index: libvirt/tests/xencapsdata/xen-i686-pae.xml
===================================================================
--- libvirt.orig/tests/xencapsdata/xen-i686-pae.xml 2012-09-27 14:59:08.377979000 +0100
+++ libvirt/tests/xencapsdata/xen-i686-pae.xml 2012-09-27 15:59:27.659032312 +0100
@@ -20,7 +20,7 @@
<os_type>xen</os_type>
<arch name='i686'>
<wordsize>32</wordsize>
- <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+ <emulator>qemu-dm</emulator>
<machine>xenpv</machine>
<domain type='xen'>
</domain>
Index: libvirt/tests/xencapsdata/xen-i686-pae-hvm.xml
===================================================================
--- libvirt.orig/tests/xencapsdata/xen-i686-pae-hvm.xml 2012-09-27 14:59:08.377979000 +0100
+++ libvirt/tests/xencapsdata/xen-i686-pae-hvm.xml 2012-09-27 16:00:31.087033097 +0100
@@ -20,7 +20,7 @@
<os_type>xen</os_type>
<arch name='i686'>
<wordsize>32</wordsize>
- <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+ <emulator>qemu-dm</emulator>
<machine>xenpv</machine>
<domain type='xen'>
</domain>
@@ -34,8 +34,8 @@
<os_type>hvm</os_type>
<arch name='i686'>
<wordsize>32</wordsize>
- <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
- <loader>/usr/lib/xen-default/boot/hvmloader</loader>
+ <emulator>qemu-dm</emulator>
+ <loader>hvmloader</loader>
<machine>xenfv</machine>
<domain type='xen'>
</domain>
Index: libvirt/tests/xencapsdata/xen-ia64-hvm.xml
===================================================================
--- libvirt.orig/tests/xencapsdata/xen-ia64-hvm.xml 2012-09-27 14:59:08.377979000 +0100
+++ libvirt/tests/xencapsdata/xen-ia64-hvm.xml 2012-09-27 17:00:41.987033046 +0100
@@ -17,7 +17,7 @@
<os_type>xen</os_type>
<arch name='ia64'>
<wordsize>64</wordsize>
- <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+ <emulator>qemu-dm</emulator>
<machine>xenpv</machine>
<domain type='xen'>
</domain>
@@ -28,8 +28,8 @@
<os_type>hvm</os_type>
<arch name='ia64'>
<wordsize>64</wordsize>
- <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
- <loader>/usr/lib/xen-default/boot/hvmloader</loader>
+ <emulator>qemu-dm</emulator>
+ <loader>hvmloader</loader>
<machine>xenfv</machine>
<domain type='xen'>
</domain>
Index: libvirt/tests/xencapsdata/xen-i686.xml
===================================================================
--- libvirt.orig/tests/xencapsdata/xen-i686.xml 2012-09-27 14:59:08.377979000 +0100
+++ libvirt/tests/xencapsdata/xen-i686.xml 2012-09-27 16:00:57.243032258 +0100
@@ -17,7 +17,7 @@
<os_type>xen</os_type>
<arch name='i686'>
<wordsize>32</wordsize>
- <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
+ <emulator>qemu-dm</emulator>
<machine>xenpv</machine>
<domain type='xen'>
</domain>
Index: libvirt/docs/schemas/capability.rng
===================================================================
--- libvirt.orig/docs/schemas/capability.rng 2012-09-27 16:37:15.035033524 +0100
+++ libvirt/docs/schemas/capability.rng 2012-09-27 16:38:13.583031060 +0100
@@ -239,13 +239,13 @@
<define name='emulator'>
<element name='emulator'>
- <ref name='absFilePath'/>
+ <ref name='filePath'/>
</element>
</define>
<define name='loader'>
<element name='loader'>
- <ref name='absFilePath'/>
+ <ref name='filePath'/>
</element>
</define>
