mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-22 17:34:18 +03:00
tests: move xmconfig tests to WITH_LIBXL
In preparation of removing the legacy Xen driver, move the xmconfig tests from WITH_XEN to WITH_LIBXL. Even though the legacy driver will be removed, we'll want to maintain the ability to convert xm config to XML. Requires fixing up the tests to account for different behavior of Xen vs libxl post parse functions. For consistency with other Xen config tests, change the <os> arch to x86_64. There is some test file fallout due to differences in handling of default values between xend and libxl. Signed-off-by: Jim Fehlig <jfehlig@suse.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
parent
212da33f81
commit
8ee83ea875
@ -273,12 +273,12 @@ ssh_SOURCES = ssh.c
|
|||||||
ssh_LDADD = $(COVERAGE_LDFLAGS)
|
ssh_LDADD = $(COVERAGE_LDFLAGS)
|
||||||
|
|
||||||
if WITH_XEN
|
if WITH_XEN
|
||||||
test_programs += xmconfigtest xencapstest
|
test_programs += xencapstest
|
||||||
endif WITH_XEN
|
endif WITH_XEN
|
||||||
|
|
||||||
if WITH_LIBXL
|
if WITH_LIBXL
|
||||||
test_programs += xlconfigtest xml2sexprtest sexpr2xmltest \
|
test_programs += xlconfigtest xml2sexprtest sexpr2xmltest \
|
||||||
libxlxml2domconfigtest
|
xmconfigtest libxlxml2domconfigtest
|
||||||
test_libraries += virmocklibxl.la
|
test_libraries += virmocklibxl.la
|
||||||
endif WITH_LIBXL
|
endif WITH_LIBXL
|
||||||
|
|
||||||
@ -502,18 +502,12 @@ if WITH_XEN
|
|||||||
xen_LDADDS = ../src/libvirt_driver_xen_impl.la
|
xen_LDADDS = ../src/libvirt_driver_xen_impl.la
|
||||||
xen_LDADDS += $(LDADDS)
|
xen_LDADDS += $(LDADDS)
|
||||||
|
|
||||||
xmconfigtest_SOURCES = \
|
|
||||||
xmconfigtest.c testutilsxen.c testutilsxen.h \
|
|
||||||
testutils.c testutils.h
|
|
||||||
xmconfigtest_LDADD = $(xen_LDADDS)
|
|
||||||
|
|
||||||
xencapstest_SOURCES = \
|
xencapstest_SOURCES = \
|
||||||
xencapstest.c testutils.h testutils.c
|
xencapstest.c testutils.h testutils.c
|
||||||
xencapstest_LDADD = $(xen_LDADDS)
|
xencapstest_LDADD = $(xen_LDADDS)
|
||||||
|
|
||||||
else ! WITH_XEN
|
else ! WITH_XEN
|
||||||
EXTRA_DIST += xmconfigtest.c xencapstest.c \
|
EXTRA_DIST += xencapstest.c testutilsxen.c testutilsxen.h
|
||||||
testutilsxen.c testutilsxen.h
|
|
||||||
endif ! WITH_XEN
|
endif ! WITH_XEN
|
||||||
|
|
||||||
if WITH_LIBXL
|
if WITH_LIBXL
|
||||||
@ -538,6 +532,11 @@ sexpr2xmltest_SOURCES = \
|
|||||||
testutils.c testutils.h
|
testutils.c testutils.h
|
||||||
sexpr2xmltest_LDADD = $(libxl_LDADDS)
|
sexpr2xmltest_LDADD = $(libxl_LDADDS)
|
||||||
|
|
||||||
|
xmconfigtest_SOURCES = \
|
||||||
|
xmconfigtest.c testutilsxen.c testutilsxen.h \
|
||||||
|
testutils.c testutils.h
|
||||||
|
xmconfigtest_LDADD = $(libxl_LDADDS)
|
||||||
|
|
||||||
libxlxml2domconfigtest_SOURCES = \
|
libxlxml2domconfigtest_SOURCES = \
|
||||||
libxlxml2domconfigtest.c testutilsxen.c testutilsxen.h \
|
libxlxml2domconfigtest.c testutilsxen.c testutilsxen.h \
|
||||||
testutils.c testutils.h
|
testutils.c testutils.h
|
||||||
@ -550,7 +549,7 @@ virmocklibxl_la_LIBADD = $(MOCKLIBS_LIBS)
|
|||||||
|
|
||||||
else ! WITH_LIBXL
|
else ! WITH_LIBXL
|
||||||
EXTRA_DIST += xlconfigtest.c xml2sexprtest.c sexpr2xmltest.c \
|
EXTRA_DIST += xlconfigtest.c xml2sexprtest.c sexpr2xmltest.c \
|
||||||
libxlxml2domconfigtest.c
|
xmconfigtest.c libxlxml2domconfigtest.c
|
||||||
endif ! WITH_LIBXL
|
endif ! WITH_LIBXL
|
||||||
|
|
||||||
QEMUMONITORTESTUTILS_SOURCES = \
|
QEMUMONITORTESTUTILS_SOURCES = \
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
<vcpu placement='static'>2</vcpu>
|
<vcpu placement='static'>2</vcpu>
|
||||||
<bootloader>/usr/bin/pygrub</bootloader>
|
<bootloader>/usr/bin/pygrub</bootloader>
|
||||||
<os>
|
<os>
|
||||||
<type arch='i686' machine='xenpv'>linux</type>
|
<type arch='x86_64' machine='xenpv'>linux</type>
|
||||||
</os>
|
</os>
|
||||||
<clock offset='utc' adjustment='reset'/>
|
<clock offset='utc' adjustment='reset'/>
|
||||||
<on_poweroff>destroy</on_poweroff>
|
<on_poweroff>destroy</on_poweroff>
|
||||||
@ -28,6 +28,5 @@
|
|||||||
</console>
|
</console>
|
||||||
<input type='mouse' bus='xen'/>
|
<input type='mouse' bus='xen'/>
|
||||||
<input type='keyboard' bus='xen'/>
|
<input type='keyboard' bus='xen'/>
|
||||||
<memballoon model='xen'/>
|
|
||||||
</devices>
|
</devices>
|
||||||
</domain>
|
</domain>
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
<vcpu placement='static'>2</vcpu>
|
<vcpu placement='static'>2</vcpu>
|
||||||
<bootloader>/usr/bin/pygrub</bootloader>
|
<bootloader>/usr/bin/pygrub</bootloader>
|
||||||
<os>
|
<os>
|
||||||
<type arch='i686' machine='xenpv'>linux</type>
|
<type arch='x86_64' machine='xenpv'>linux</type>
|
||||||
</os>
|
</os>
|
||||||
<clock offset='utc' adjustment='reset'/>
|
<clock offset='utc' adjustment='reset'/>
|
||||||
<on_poweroff>destroy</on_poweroff>
|
<on_poweroff>destroy</on_poweroff>
|
||||||
@ -28,6 +28,5 @@
|
|||||||
</console>
|
</console>
|
||||||
<input type='mouse' bus='xen'/>
|
<input type='mouse' bus='xen'/>
|
||||||
<input type='keyboard' bus='xen'/>
|
<input type='keyboard' bus='xen'/>
|
||||||
<memballoon model='xen'/>
|
|
||||||
</devices>
|
</devices>
|
||||||
</domain>
|
</domain>
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
<currentMemory unit='KiB'>403456</currentMemory>
|
<currentMemory unit='KiB'>403456</currentMemory>
|
||||||
<vcpu placement='static'>1</vcpu>
|
<vcpu placement='static'>1</vcpu>
|
||||||
<os>
|
<os>
|
||||||
<type arch='i686' machine='xenfv'>hvm</type>
|
<type arch='x86_64' machine='xenfv'>hvm</type>
|
||||||
<loader type='rom'>/usr/lib/xen/boot/hvmloader&test</loader>
|
<loader type='rom'>/usr/lib/xen/boot/hvmloader&test</loader>
|
||||||
<boot dev='cdrom'/>
|
<boot dev='cdrom'/>
|
||||||
</os>
|
</os>
|
||||||
@ -21,19 +21,19 @@
|
|||||||
<devices>
|
<devices>
|
||||||
<emulator>/usr/lib/xen/bin/qemu-dm&test</emulator>
|
<emulator>/usr/lib/xen/bin/qemu-dm&test</emulator>
|
||||||
<disk type='block' device='disk'>
|
<disk type='block' device='disk'>
|
||||||
<driver name='phy'/>
|
<driver name='phy' type='raw'/>
|
||||||
<source dev='/dev/HostVG/XenGuest2'/>
|
<source dev='/dev/HostVG/XenGuest2'/>
|
||||||
<target dev='hda' bus='ide'/>
|
<target dev='hda' bus='ide'/>
|
||||||
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
|
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
|
||||||
</disk>
|
</disk>
|
||||||
<disk type='block' device='disk'>
|
<disk type='block' device='disk'>
|
||||||
<driver name='phy'/>
|
<driver name='phy' type='raw'/>
|
||||||
<source dev='/dev/HostVG/XenGuest'"'/>
|
<source dev='/dev/HostVG/XenGuest'"'/>
|
||||||
<target dev='hdb' bus='ide'/>
|
<target dev='hdb' bus='ide'/>
|
||||||
<address type='drive' controller='0' bus='0' target='0' unit='1'/>
|
<address type='drive' controller='0' bus='0' target='0' unit='1'/>
|
||||||
</disk>
|
</disk>
|
||||||
<disk type='file' device='cdrom'>
|
<disk type='file' device='cdrom'>
|
||||||
<driver name='file'/>
|
<driver name='file' type='raw'/>
|
||||||
<source file='/root/boot.iso&test'/>
|
<source file='/root/boot.iso&test'/>
|
||||||
<target dev='hdc' bus='ide'/>
|
<target dev='hdc' bus='ide'/>
|
||||||
<readonly/>
|
<readonly/>
|
||||||
@ -54,8 +54,7 @@
|
|||||||
<sound model='sb16'/>
|
<sound model='sb16'/>
|
||||||
<sound model='es1370'/>
|
<sound model='es1370'/>
|
||||||
<video>
|
<video>
|
||||||
<model type='cirrus' vram='16384' heads='1' primary='yes'/>
|
<model type='cirrus' vram='8192' heads='1' primary='yes'/>
|
||||||
</video>
|
</video>
|
||||||
<memballoon model='xen'/>
|
|
||||||
</devices>
|
</devices>
|
||||||
</domain>
|
</domain>
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
<currentMemory unit='KiB'>403456</currentMemory>
|
<currentMemory unit='KiB'>403456</currentMemory>
|
||||||
<vcpu placement='static'>1</vcpu>
|
<vcpu placement='static'>1</vcpu>
|
||||||
<os>
|
<os>
|
||||||
<type arch='i686' machine='xenfv'>hvm</type>
|
<type arch='x86_64' machine='xenfv'>hvm</type>
|
||||||
<loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
|
<loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
|
||||||
<boot dev='cdrom'/>
|
<boot dev='cdrom'/>
|
||||||
</os>
|
</os>
|
||||||
@ -23,13 +23,13 @@
|
|||||||
<devices>
|
<devices>
|
||||||
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
|
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
|
||||||
<disk type='block' device='disk'>
|
<disk type='block' device='disk'>
|
||||||
<driver name='phy'/>
|
<driver name='phy' type='raw'/>
|
||||||
<source dev='/dev/HostVG/XenGuest2'/>
|
<source dev='/dev/HostVG/XenGuest2'/>
|
||||||
<target dev='hda' bus='ide'/>
|
<target dev='hda' bus='ide'/>
|
||||||
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
|
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
|
||||||
</disk>
|
</disk>
|
||||||
<disk type='file' device='cdrom'>
|
<disk type='file' device='cdrom'>
|
||||||
<driver name='file'/>
|
<driver name='file' type='raw'/>
|
||||||
<source file='/root/boot.iso'/>
|
<source file='/root/boot.iso'/>
|
||||||
<target dev='hdc' bus='ide'/>
|
<target dev='hdc' bus='ide'/>
|
||||||
<readonly/>
|
<readonly/>
|
||||||
@ -48,8 +48,7 @@
|
|||||||
<listen type='address' address='127.0.0.1'/>
|
<listen type='address' address='127.0.0.1'/>
|
||||||
</graphics>
|
</graphics>
|
||||||
<video>
|
<video>
|
||||||
<model type='cirrus' vram='16384' heads='1' primary='yes'/>
|
<model type='cirrus' vram='8192' heads='1' primary='yes'/>
|
||||||
</video>
|
</video>
|
||||||
<memballoon model='xen'/>
|
|
||||||
</devices>
|
</devices>
|
||||||
</domain>
|
</domain>
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
<currentMemory unit='KiB'>403456</currentMemory>
|
<currentMemory unit='KiB'>403456</currentMemory>
|
||||||
<vcpu placement='static'>1</vcpu>
|
<vcpu placement='static'>1</vcpu>
|
||||||
<os>
|
<os>
|
||||||
<type arch='i686' machine='xenfv'>hvm</type>
|
<type arch='x86_64' machine='xenfv'>hvm</type>
|
||||||
<loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
|
<loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
|
||||||
<boot dev='cdrom'/>
|
<boot dev='cdrom'/>
|
||||||
</os>
|
</os>
|
||||||
@ -23,13 +23,13 @@
|
|||||||
<devices>
|
<devices>
|
||||||
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
|
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
|
||||||
<disk type='block' device='disk'>
|
<disk type='block' device='disk'>
|
||||||
<driver name='phy'/>
|
<driver name='phy' type='raw'/>
|
||||||
<source dev='/dev/HostVG/XenGuest2'/>
|
<source dev='/dev/HostVG/XenGuest2'/>
|
||||||
<target dev='hda' bus='ide'/>
|
<target dev='hda' bus='ide'/>
|
||||||
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
|
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
|
||||||
</disk>
|
</disk>
|
||||||
<disk type='file' device='cdrom'>
|
<disk type='file' device='cdrom'>
|
||||||
<driver name='file'/>
|
<driver name='file' type='raw'/>
|
||||||
<source file='/root/boot.iso'/>
|
<source file='/root/boot.iso'/>
|
||||||
<target dev='hdc' bus='ide'/>
|
<target dev='hdc' bus='ide'/>
|
||||||
<readonly/>
|
<readonly/>
|
||||||
@ -48,8 +48,7 @@
|
|||||||
<listen type='address' address='127.0.0.1'/>
|
<listen type='address' address='127.0.0.1'/>
|
||||||
</graphics>
|
</graphics>
|
||||||
<video>
|
<video>
|
||||||
<model type='cirrus' vram='16384' heads='1' primary='yes'/>
|
<model type='cirrus' vram='8192' heads='1' primary='yes'/>
|
||||||
</video>
|
</video>
|
||||||
<memballoon model='xen'/>
|
|
||||||
</devices>
|
</devices>
|
||||||
</domain>
|
</domain>
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
<currentMemory unit='KiB'>403456</currentMemory>
|
<currentMemory unit='KiB'>403456</currentMemory>
|
||||||
<vcpu placement='static'>1</vcpu>
|
<vcpu placement='static'>1</vcpu>
|
||||||
<os>
|
<os>
|
||||||
<type arch='i686' machine='xenfv'>hvm</type>
|
<type arch='x86_64' machine='xenfv'>hvm</type>
|
||||||
<loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
|
<loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
|
||||||
<boot dev='cdrom'/>
|
<boot dev='cdrom'/>
|
||||||
</os>
|
</os>
|
||||||
@ -23,13 +23,13 @@
|
|||||||
<devices>
|
<devices>
|
||||||
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
|
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
|
||||||
<disk type='block' device='disk'>
|
<disk type='block' device='disk'>
|
||||||
<driver name='phy'/>
|
<driver name='phy' type='raw'/>
|
||||||
<source dev='/dev/HostVG/XenGuest2'/>
|
<source dev='/dev/HostVG/XenGuest2'/>
|
||||||
<target dev='hda' bus='ide'/>
|
<target dev='hda' bus='ide'/>
|
||||||
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
|
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
|
||||||
</disk>
|
</disk>
|
||||||
<disk type='file' device='cdrom'>
|
<disk type='file' device='cdrom'>
|
||||||
<driver name='file'/>
|
<driver name='file' type='raw'/>
|
||||||
<source file='/root/boot.iso'/>
|
<source file='/root/boot.iso'/>
|
||||||
<target dev='hdc' bus='ide'/>
|
<target dev='hdc' bus='ide'/>
|
||||||
<readonly/>
|
<readonly/>
|
||||||
@ -48,8 +48,7 @@
|
|||||||
<listen type='address' address='127.0.0.1'/>
|
<listen type='address' address='127.0.0.1'/>
|
||||||
</graphics>
|
</graphics>
|
||||||
<video>
|
<video>
|
||||||
<model type='cirrus' vram='16384' heads='1' primary='yes'/>
|
<model type='cirrus' vram='8192' heads='1' primary='yes'/>
|
||||||
</video>
|
</video>
|
||||||
<memballoon model='xen'/>
|
|
||||||
</devices>
|
</devices>
|
||||||
</domain>
|
</domain>
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
<currentMemory unit='KiB'>403456</currentMemory>
|
<currentMemory unit='KiB'>403456</currentMemory>
|
||||||
<vcpu placement='static'>1</vcpu>
|
<vcpu placement='static'>1</vcpu>
|
||||||
<os>
|
<os>
|
||||||
<type arch='i686' machine='xenfv'>hvm</type>
|
<type arch='x86_64' machine='xenfv'>hvm</type>
|
||||||
<loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
|
<loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
|
||||||
<boot dev='cdrom'/>
|
<boot dev='cdrom'/>
|
||||||
</os>
|
</os>
|
||||||
@ -21,13 +21,13 @@
|
|||||||
<devices>
|
<devices>
|
||||||
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
|
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
|
||||||
<disk type='block' device='disk'>
|
<disk type='block' device='disk'>
|
||||||
<driver name='phy'/>
|
<driver name='phy' type='raw'/>
|
||||||
<source dev='/dev/HostVG/XenGuest2'/>
|
<source dev='/dev/HostVG/XenGuest2'/>
|
||||||
<target dev='hda' bus='ide'/>
|
<target dev='hda' bus='ide'/>
|
||||||
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
|
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
|
||||||
</disk>
|
</disk>
|
||||||
<disk type='file' device='cdrom'>
|
<disk type='file' device='cdrom'>
|
||||||
<driver name='file'/>
|
<driver name='file' type='raw'/>
|
||||||
<source file='/root/boot.iso'/>
|
<source file='/root/boot.iso'/>
|
||||||
<target dev='hdc' bus='ide'/>
|
<target dev='hdc' bus='ide'/>
|
||||||
<readonly/>
|
<readonly/>
|
||||||
@ -46,8 +46,7 @@
|
|||||||
<listen type='address' address='127.0.0.1'/>
|
<listen type='address' address='127.0.0.1'/>
|
||||||
</graphics>
|
</graphics>
|
||||||
<video>
|
<video>
|
||||||
<model type='cirrus' vram='16384' heads='1' primary='yes'/>
|
<model type='cirrus' vram='8192' heads='1' primary='yes'/>
|
||||||
</video>
|
</video>
|
||||||
<memballoon model='xen'/>
|
|
||||||
</devices>
|
</devices>
|
||||||
</domain>
|
</domain>
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
<currentMemory unit='KiB'>403456</currentMemory>
|
<currentMemory unit='KiB'>403456</currentMemory>
|
||||||
<vcpu placement='static'>1</vcpu>
|
<vcpu placement='static'>1</vcpu>
|
||||||
<os>
|
<os>
|
||||||
<type arch='i686' machine='xenfv'>hvm</type>
|
<type arch='x86_64' machine='xenfv'>hvm</type>
|
||||||
<loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
|
<loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
|
||||||
<boot dev='cdrom'/>
|
<boot dev='cdrom'/>
|
||||||
</os>
|
</os>
|
||||||
@ -21,13 +21,13 @@
|
|||||||
<devices>
|
<devices>
|
||||||
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
|
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
|
||||||
<disk type='block' device='disk'>
|
<disk type='block' device='disk'>
|
||||||
<driver name='phy'/>
|
<driver name='phy' type='raw'/>
|
||||||
<source dev='/dev/HostVG/XenGuest2'/>
|
<source dev='/dev/HostVG/XenGuest2'/>
|
||||||
<target dev='hda' bus='ide'/>
|
<target dev='hda' bus='ide'/>
|
||||||
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
|
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
|
||||||
</disk>
|
</disk>
|
||||||
<disk type='file' device='cdrom'>
|
<disk type='file' device='cdrom'>
|
||||||
<driver name='file'/>
|
<driver name='file' type='raw'/>
|
||||||
<source file='/root/boot.iso'/>
|
<source file='/root/boot.iso'/>
|
||||||
<target dev='hdc' bus='ide'/>
|
<target dev='hdc' bus='ide'/>
|
||||||
<readonly/>
|
<readonly/>
|
||||||
@ -46,8 +46,7 @@
|
|||||||
<listen type='address' address='127.0.0.1'/>
|
<listen type='address' address='127.0.0.1'/>
|
||||||
</graphics>
|
</graphics>
|
||||||
<video>
|
<video>
|
||||||
<model type='cirrus' vram='16384' heads='1' primary='yes'/>
|
<model type='cirrus' vram='8192' heads='1' primary='yes'/>
|
||||||
</video>
|
</video>
|
||||||
<memballoon model='xen'/>
|
|
||||||
</devices>
|
</devices>
|
||||||
</domain>
|
</domain>
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
<currentMemory unit='KiB'>403456</currentMemory>
|
<currentMemory unit='KiB'>403456</currentMemory>
|
||||||
<vcpu placement='static'>1</vcpu>
|
<vcpu placement='static'>1</vcpu>
|
||||||
<os>
|
<os>
|
||||||
<type arch='i686' machine='xenfv'>hvm</type>
|
<type arch='x86_64' machine='xenfv'>hvm</type>
|
||||||
<loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
|
<loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
|
||||||
<boot dev='cdrom'/>
|
<boot dev='cdrom'/>
|
||||||
</os>
|
</os>
|
||||||
@ -21,13 +21,13 @@
|
|||||||
<devices>
|
<devices>
|
||||||
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
|
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
|
||||||
<disk type='block' device='disk'>
|
<disk type='block' device='disk'>
|
||||||
<driver name='phy'/>
|
<driver name='phy' type='raw'/>
|
||||||
<source dev='/dev/HostVG/XenGuest2'/>
|
<source dev='/dev/HostVG/XenGuest2'/>
|
||||||
<target dev='hda' bus='ide'/>
|
<target dev='hda' bus='ide'/>
|
||||||
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
|
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
|
||||||
</disk>
|
</disk>
|
||||||
<disk type='file' device='cdrom'>
|
<disk type='file' device='cdrom'>
|
||||||
<driver name='file'/>
|
<driver name='file' type='raw'/>
|
||||||
<source file='/root/boot.iso'/>
|
<source file='/root/boot.iso'/>
|
||||||
<target dev='hdc' bus='ide'/>
|
<target dev='hdc' bus='ide'/>
|
||||||
<readonly/>
|
<readonly/>
|
||||||
@ -46,8 +46,7 @@
|
|||||||
<listen type='address' address='127.0.0.1'/>
|
<listen type='address' address='127.0.0.1'/>
|
||||||
</graphics>
|
</graphics>
|
||||||
<video>
|
<video>
|
||||||
<model type='cirrus' vram='16384' heads='1' primary='yes'/>
|
<model type='cirrus' vram='8192' heads='1' primary='yes'/>
|
||||||
</video>
|
</video>
|
||||||
<memballoon model='xen'/>
|
|
||||||
</devices>
|
</devices>
|
||||||
</domain>
|
</domain>
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
<currentMemory unit='KiB'>403456</currentMemory>
|
<currentMemory unit='KiB'>403456</currentMemory>
|
||||||
<vcpu placement='static'>1</vcpu>
|
<vcpu placement='static'>1</vcpu>
|
||||||
<os>
|
<os>
|
||||||
<type arch='i686' machine='xenfv'>hvm</type>
|
<type arch='x86_64' machine='xenfv'>hvm</type>
|
||||||
<loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
|
<loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
|
||||||
<boot dev='cdrom'/>
|
<boot dev='cdrom'/>
|
||||||
</os>
|
</os>
|
||||||
@ -22,13 +22,13 @@
|
|||||||
<devices>
|
<devices>
|
||||||
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
|
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
|
||||||
<disk type='block' device='disk'>
|
<disk type='block' device='disk'>
|
||||||
<driver name='phy'/>
|
<driver name='phy' type='raw'/>
|
||||||
<source dev='/dev/HostVG/XenGuest2'/>
|
<source dev='/dev/HostVG/XenGuest2'/>
|
||||||
<target dev='hda' bus='ide'/>
|
<target dev='hda' bus='ide'/>
|
||||||
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
|
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
|
||||||
</disk>
|
</disk>
|
||||||
<disk type='file' device='cdrom'>
|
<disk type='file' device='cdrom'>
|
||||||
<driver name='file'/>
|
<driver name='file' type='raw'/>
|
||||||
<source file='/root/boot.iso'/>
|
<source file='/root/boot.iso'/>
|
||||||
<target dev='hdc' bus='ide'/>
|
<target dev='hdc' bus='ide'/>
|
||||||
<readonly/>
|
<readonly/>
|
||||||
@ -47,8 +47,7 @@
|
|||||||
<listen type='address' address='127.0.0.1'/>
|
<listen type='address' address='127.0.0.1'/>
|
||||||
</graphics>
|
</graphics>
|
||||||
<video>
|
<video>
|
||||||
<model type='cirrus' vram='16384' heads='1' primary='yes'/>
|
<model type='cirrus' vram='8192' heads='1' primary='yes'/>
|
||||||
</video>
|
</video>
|
||||||
<memballoon model='xen'/>
|
|
||||||
</devices>
|
</devices>
|
||||||
</domain>
|
</domain>
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
<currentMemory unit='KiB'>403456</currentMemory>
|
<currentMemory unit='KiB'>403456</currentMemory>
|
||||||
<vcpu placement='static'>1</vcpu>
|
<vcpu placement='static'>1</vcpu>
|
||||||
<os>
|
<os>
|
||||||
<type arch='i686' machine='xenfv'>hvm</type>
|
<type arch='x86_64' machine='xenfv'>hvm</type>
|
||||||
<loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
|
<loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
|
||||||
<boot dev='cdrom'/>
|
<boot dev='cdrom'/>
|
||||||
</os>
|
</os>
|
||||||
@ -21,13 +21,13 @@
|
|||||||
<devices>
|
<devices>
|
||||||
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
|
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
|
||||||
<disk type='block' device='disk'>
|
<disk type='block' device='disk'>
|
||||||
<driver name='phy'/>
|
<driver name='phy' type='raw'/>
|
||||||
<source dev='/dev/HostVG/XenGuest2'/>
|
<source dev='/dev/HostVG/XenGuest2'/>
|
||||||
<target dev='hda' bus='ide'/>
|
<target dev='hda' bus='ide'/>
|
||||||
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
|
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
|
||||||
</disk>
|
</disk>
|
||||||
<disk type='file' device='cdrom'>
|
<disk type='file' device='cdrom'>
|
||||||
<driver name='file'/>
|
<driver name='file' type='raw'/>
|
||||||
<source file='/root/boot.iso'/>
|
<source file='/root/boot.iso'/>
|
||||||
<target dev='hdc' bus='ide'/>
|
<target dev='hdc' bus='ide'/>
|
||||||
<readonly/>
|
<readonly/>
|
||||||
@ -51,8 +51,7 @@
|
|||||||
<listen type='address' address='127.0.0.1'/>
|
<listen type='address' address='127.0.0.1'/>
|
||||||
</graphics>
|
</graphics>
|
||||||
<video>
|
<video>
|
||||||
<model type='cirrus' vram='16384' heads='1' primary='yes'/>
|
<model type='cirrus' vram='8192' heads='1' primary='yes'/>
|
||||||
</video>
|
</video>
|
||||||
<memballoon model='xen'/>
|
|
||||||
</devices>
|
</devices>
|
||||||
</domain>
|
</domain>
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
<currentMemory unit='KiB'>403456</currentMemory>
|
<currentMemory unit='KiB'>403456</currentMemory>
|
||||||
<vcpu placement='static'>1</vcpu>
|
<vcpu placement='static'>1</vcpu>
|
||||||
<os>
|
<os>
|
||||||
<type arch='i686' machine='xenfv'>hvm</type>
|
<type arch='x86_64' machine='xenfv'>hvm</type>
|
||||||
<loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
|
<loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
|
||||||
<boot dev='cdrom'/>
|
<boot dev='cdrom'/>
|
||||||
</os>
|
</os>
|
||||||
@ -21,13 +21,13 @@
|
|||||||
<devices>
|
<devices>
|
||||||
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
|
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
|
||||||
<disk type='block' device='disk'>
|
<disk type='block' device='disk'>
|
||||||
<driver name='phy'/>
|
<driver name='phy' type='raw'/>
|
||||||
<source dev='/dev/HostVG/XenGuest2'/>
|
<source dev='/dev/HostVG/XenGuest2'/>
|
||||||
<target dev='hda' bus='ide'/>
|
<target dev='hda' bus='ide'/>
|
||||||
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
|
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
|
||||||
</disk>
|
</disk>
|
||||||
<disk type='file' device='cdrom'>
|
<disk type='file' device='cdrom'>
|
||||||
<driver name='file'/>
|
<driver name='file' type='raw'/>
|
||||||
<source file='/root/boot.iso'/>
|
<source file='/root/boot.iso'/>
|
||||||
<target dev='hdc' bus='ide'/>
|
<target dev='hdc' bus='ide'/>
|
||||||
<readonly/>
|
<readonly/>
|
||||||
@ -54,8 +54,7 @@
|
|||||||
<listen type='address' address='127.0.0.1'/>
|
<listen type='address' address='127.0.0.1'/>
|
||||||
</graphics>
|
</graphics>
|
||||||
<video>
|
<video>
|
||||||
<model type='cirrus' vram='16384' heads='1' primary='yes'/>
|
<model type='cirrus' vram='8192' heads='1' primary='yes'/>
|
||||||
</video>
|
</video>
|
||||||
<memballoon model='xen'/>
|
|
||||||
</devices>
|
</devices>
|
||||||
</domain>
|
</domain>
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
<currentMemory unit='KiB'>403456</currentMemory>
|
<currentMemory unit='KiB'>403456</currentMemory>
|
||||||
<vcpu placement='static'>1</vcpu>
|
<vcpu placement='static'>1</vcpu>
|
||||||
<os>
|
<os>
|
||||||
<type arch='i686' machine='xenfv'>hvm</type>
|
<type arch='x86_64' machine='xenfv'>hvm</type>
|
||||||
<loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
|
<loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
|
||||||
<boot dev='cdrom'/>
|
<boot dev='cdrom'/>
|
||||||
</os>
|
</os>
|
||||||
@ -21,13 +21,13 @@
|
|||||||
<devices>
|
<devices>
|
||||||
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
|
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
|
||||||
<disk type='block' device='disk'>
|
<disk type='block' device='disk'>
|
||||||
<driver name='phy'/>
|
<driver name='phy' type='raw'/>
|
||||||
<source dev='/dev/HostVG/XenGuest2'/>
|
<source dev='/dev/HostVG/XenGuest2'/>
|
||||||
<target dev='hda' bus='ide'/>
|
<target dev='hda' bus='ide'/>
|
||||||
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
|
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
|
||||||
</disk>
|
</disk>
|
||||||
<disk type='file' device='cdrom'>
|
<disk type='file' device='cdrom'>
|
||||||
<driver name='file'/>
|
<driver name='file' type='raw'/>
|
||||||
<source file='/root/boot.iso'/>
|
<source file='/root/boot.iso'/>
|
||||||
<target dev='hdc' bus='ide'/>
|
<target dev='hdc' bus='ide'/>
|
||||||
<readonly/>
|
<readonly/>
|
||||||
@ -52,8 +52,7 @@
|
|||||||
<listen type='address' address='127.0.0.1'/>
|
<listen type='address' address='127.0.0.1'/>
|
||||||
</graphics>
|
</graphics>
|
||||||
<video>
|
<video>
|
||||||
<model type='cirrus' vram='16384' heads='1' primary='yes'/>
|
<model type='cirrus' vram='8192' heads='1' primary='yes'/>
|
||||||
</video>
|
</video>
|
||||||
<memballoon model='xen'/>
|
|
||||||
</devices>
|
</devices>
|
||||||
</domain>
|
</domain>
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
<currentMemory unit='KiB'>403456</currentMemory>
|
<currentMemory unit='KiB'>403456</currentMemory>
|
||||||
<vcpu placement='static'>1</vcpu>
|
<vcpu placement='static'>1</vcpu>
|
||||||
<os>
|
<os>
|
||||||
<type arch='i686' machine='xenfv'>hvm</type>
|
<type arch='x86_64' machine='xenfv'>hvm</type>
|
||||||
<loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
|
<loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
|
||||||
<boot dev='cdrom'/>
|
<boot dev='cdrom'/>
|
||||||
</os>
|
</os>
|
||||||
@ -21,13 +21,13 @@
|
|||||||
<devices>
|
<devices>
|
||||||
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
|
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
|
||||||
<disk type='block' device='disk'>
|
<disk type='block' device='disk'>
|
||||||
<driver name='phy'/>
|
<driver name='phy' type='raw'/>
|
||||||
<source dev='/dev/HostVG/XenGuest2'/>
|
<source dev='/dev/HostVG/XenGuest2'/>
|
||||||
<target dev='hda' bus='ide'/>
|
<target dev='hda' bus='ide'/>
|
||||||
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
|
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
|
||||||
</disk>
|
</disk>
|
||||||
<disk type='file' device='cdrom'>
|
<disk type='file' device='cdrom'>
|
||||||
<driver name='file'/>
|
<driver name='file' type='raw'/>
|
||||||
<source file='/root/boot.iso'/>
|
<source file='/root/boot.iso'/>
|
||||||
<target dev='hdc' bus='ide'/>
|
<target dev='hdc' bus='ide'/>
|
||||||
<readonly/>
|
<readonly/>
|
||||||
@ -54,8 +54,7 @@
|
|||||||
<listen type='address' address='127.0.0.1'/>
|
<listen type='address' address='127.0.0.1'/>
|
||||||
</graphics>
|
</graphics>
|
||||||
<video>
|
<video>
|
||||||
<model type='cirrus' vram='16384' heads='1' primary='yes'/>
|
<model type='cirrus' vram='8192' heads='1' primary='yes'/>
|
||||||
</video>
|
</video>
|
||||||
<memballoon model='xen'/>
|
|
||||||
</devices>
|
</devices>
|
||||||
</domain>
|
</domain>
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
<currentMemory unit='KiB'>403456</currentMemory>
|
<currentMemory unit='KiB'>403456</currentMemory>
|
||||||
<vcpu placement='static'>1</vcpu>
|
<vcpu placement='static'>1</vcpu>
|
||||||
<os>
|
<os>
|
||||||
<type arch='i686' machine='xenfv'>hvm</type>
|
<type arch='x86_64' machine='xenfv'>hvm</type>
|
||||||
<loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
|
<loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
|
||||||
<boot dev='cdrom'/>
|
<boot dev='cdrom'/>
|
||||||
</os>
|
</os>
|
||||||
@ -21,13 +21,13 @@
|
|||||||
<devices>
|
<devices>
|
||||||
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
|
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
|
||||||
<disk type='block' device='disk'>
|
<disk type='block' device='disk'>
|
||||||
<driver name='phy'/>
|
<driver name='phy' type='raw'/>
|
||||||
<source dev='/dev/HostVG/XenGuest2'/>
|
<source dev='/dev/HostVG/XenGuest2'/>
|
||||||
<target dev='hda' bus='ide'/>
|
<target dev='hda' bus='ide'/>
|
||||||
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
|
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
|
||||||
</disk>
|
</disk>
|
||||||
<disk type='file' device='cdrom'>
|
<disk type='file' device='cdrom'>
|
||||||
<driver name='file'/>
|
<driver name='file' type='raw'/>
|
||||||
<source file='/root/boot.iso'/>
|
<source file='/root/boot.iso'/>
|
||||||
<target dev='hdc' bus='ide'/>
|
<target dev='hdc' bus='ide'/>
|
||||||
<readonly/>
|
<readonly/>
|
||||||
@ -52,8 +52,7 @@
|
|||||||
<listen type='address' address='127.0.0.1'/>
|
<listen type='address' address='127.0.0.1'/>
|
||||||
</graphics>
|
</graphics>
|
||||||
<video>
|
<video>
|
||||||
<model type='cirrus' vram='16384' heads='1' primary='yes'/>
|
<model type='cirrus' vram='8192' heads='1' primary='yes'/>
|
||||||
</video>
|
</video>
|
||||||
<memballoon model='xen'/>
|
|
||||||
</devices>
|
</devices>
|
||||||
</domain>
|
</domain>
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
<currentMemory unit='KiB'>403456</currentMemory>
|
<currentMemory unit='KiB'>403456</currentMemory>
|
||||||
<vcpu placement='static'>1</vcpu>
|
<vcpu placement='static'>1</vcpu>
|
||||||
<os>
|
<os>
|
||||||
<type arch='i686' machine='xenfv'>hvm</type>
|
<type arch='x86_64' machine='xenfv'>hvm</type>
|
||||||
<loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
|
<loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
|
||||||
<boot dev='cdrom'/>
|
<boot dev='cdrom'/>
|
||||||
</os>
|
</os>
|
||||||
@ -21,13 +21,13 @@
|
|||||||
<devices>
|
<devices>
|
||||||
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
|
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
|
||||||
<disk type='block' device='disk'>
|
<disk type='block' device='disk'>
|
||||||
<driver name='phy'/>
|
<driver name='phy' type='raw'/>
|
||||||
<source dev='/dev/HostVG/XenGuest2'/>
|
<source dev='/dev/HostVG/XenGuest2'/>
|
||||||
<target dev='hda' bus='ide'/>
|
<target dev='hda' bus='ide'/>
|
||||||
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
|
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
|
||||||
</disk>
|
</disk>
|
||||||
<disk type='file' device='cdrom'>
|
<disk type='file' device='cdrom'>
|
||||||
<driver name='file'/>
|
<driver name='file' type='raw'/>
|
||||||
<source file='/root/boot.iso'/>
|
<source file='/root/boot.iso'/>
|
||||||
<target dev='hdc' bus='ide'/>
|
<target dev='hdc' bus='ide'/>
|
||||||
<readonly/>
|
<readonly/>
|
||||||
@ -52,8 +52,7 @@
|
|||||||
<listen type='address' address='127.0.0.1'/>
|
<listen type='address' address='127.0.0.1'/>
|
||||||
</graphics>
|
</graphics>
|
||||||
<video>
|
<video>
|
||||||
<model type='cirrus' vram='16384' heads='1' primary='yes'/>
|
<model type='cirrus' vram='8192' heads='1' primary='yes'/>
|
||||||
</video>
|
</video>
|
||||||
<memballoon model='xen'/>
|
|
||||||
</devices>
|
</devices>
|
||||||
</domain>
|
</domain>
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
<currentMemory unit='KiB'>403456</currentMemory>
|
<currentMemory unit='KiB'>403456</currentMemory>
|
||||||
<vcpu placement='static'>1</vcpu>
|
<vcpu placement='static'>1</vcpu>
|
||||||
<os>
|
<os>
|
||||||
<type arch='i686' machine='xenfv'>hvm</type>
|
<type arch='x86_64' machine='xenfv'>hvm</type>
|
||||||
<loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
|
<loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
|
||||||
<boot dev='cdrom'/>
|
<boot dev='cdrom'/>
|
||||||
</os>
|
</os>
|
||||||
@ -21,13 +21,13 @@
|
|||||||
<devices>
|
<devices>
|
||||||
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
|
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
|
||||||
<disk type='block' device='disk'>
|
<disk type='block' device='disk'>
|
||||||
<driver name='phy'/>
|
<driver name='phy' type='raw'/>
|
||||||
<source dev='/dev/HostVG/XenGuest2'/>
|
<source dev='/dev/HostVG/XenGuest2'/>
|
||||||
<target dev='hda' bus='ide'/>
|
<target dev='hda' bus='ide'/>
|
||||||
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
|
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
|
||||||
</disk>
|
</disk>
|
||||||
<disk type='file' device='cdrom'>
|
<disk type='file' device='cdrom'>
|
||||||
<driver name='file'/>
|
<driver name='file' type='raw'/>
|
||||||
<source file='/root/boot.iso'/>
|
<source file='/root/boot.iso'/>
|
||||||
<target dev='hdc' bus='ide'/>
|
<target dev='hdc' bus='ide'/>
|
||||||
<readonly/>
|
<readonly/>
|
||||||
@ -56,8 +56,7 @@
|
|||||||
<listen type='address' address='127.0.0.1'/>
|
<listen type='address' address='127.0.0.1'/>
|
||||||
</graphics>
|
</graphics>
|
||||||
<video>
|
<video>
|
||||||
<model type='cirrus' vram='16384' heads='1' primary='yes'/>
|
<model type='cirrus' vram='8192' heads='1' primary='yes'/>
|
||||||
</video>
|
</video>
|
||||||
<memballoon model='xen'/>
|
|
||||||
</devices>
|
</devices>
|
||||||
</domain>
|
</domain>
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
<currentMemory unit='KiB'>403456</currentMemory>
|
<currentMemory unit='KiB'>403456</currentMemory>
|
||||||
<vcpu placement='static'>1</vcpu>
|
<vcpu placement='static'>1</vcpu>
|
||||||
<os>
|
<os>
|
||||||
<type arch='i686' machine='xenfv'>hvm</type>
|
<type arch='x86_64' machine='xenfv'>hvm</type>
|
||||||
<loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
|
<loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
|
||||||
<boot dev='cdrom'/>
|
<boot dev='cdrom'/>
|
||||||
</os>
|
</os>
|
||||||
@ -21,13 +21,13 @@
|
|||||||
<devices>
|
<devices>
|
||||||
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
|
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
|
||||||
<disk type='block' device='disk'>
|
<disk type='block' device='disk'>
|
||||||
<driver name='phy'/>
|
<driver name='phy' type='raw'/>
|
||||||
<source dev='/dev/HostVG/XenGuest2'/>
|
<source dev='/dev/HostVG/XenGuest2'/>
|
||||||
<target dev='hda' bus='ide'/>
|
<target dev='hda' bus='ide'/>
|
||||||
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
|
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
|
||||||
</disk>
|
</disk>
|
||||||
<disk type='file' device='cdrom'>
|
<disk type='file' device='cdrom'>
|
||||||
<driver name='file'/>
|
<driver name='file' type='raw'/>
|
||||||
<source file='/root/boot.iso'/>
|
<source file='/root/boot.iso'/>
|
||||||
<target dev='hdc' bus='ide'/>
|
<target dev='hdc' bus='ide'/>
|
||||||
<readonly/>
|
<readonly/>
|
||||||
@ -56,8 +56,7 @@
|
|||||||
<listen type='address' address='127.0.0.1'/>
|
<listen type='address' address='127.0.0.1'/>
|
||||||
</graphics>
|
</graphics>
|
||||||
<video>
|
<video>
|
||||||
<model type='cirrus' vram='16384' heads='1' primary='yes'/>
|
<model type='cirrus' vram='8192' heads='1' primary='yes'/>
|
||||||
</video>
|
</video>
|
||||||
<memballoon model='xen'/>
|
|
||||||
</devices>
|
</devices>
|
||||||
</domain>
|
</domain>
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
<currentMemory unit='KiB'>403456</currentMemory>
|
<currentMemory unit='KiB'>403456</currentMemory>
|
||||||
<vcpu placement='static'>1</vcpu>
|
<vcpu placement='static'>1</vcpu>
|
||||||
<os>
|
<os>
|
||||||
<type arch='i686' machine='xenfv'>hvm</type>
|
<type arch='x86_64' machine='xenfv'>hvm</type>
|
||||||
<loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
|
<loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
|
||||||
<boot dev='cdrom'/>
|
<boot dev='cdrom'/>
|
||||||
</os>
|
</os>
|
||||||
@ -21,13 +21,13 @@
|
|||||||
<devices>
|
<devices>
|
||||||
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
|
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
|
||||||
<disk type='block' device='disk'>
|
<disk type='block' device='disk'>
|
||||||
<driver name='phy'/>
|
<driver name='phy' type='raw'/>
|
||||||
<source dev='/dev/HostVG/XenGuest2'/>
|
<source dev='/dev/HostVG/XenGuest2'/>
|
||||||
<target dev='hda' bus='ide'/>
|
<target dev='hda' bus='ide'/>
|
||||||
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
|
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
|
||||||
</disk>
|
</disk>
|
||||||
<disk type='file' device='cdrom'>
|
<disk type='file' device='cdrom'>
|
||||||
<driver name='file'/>
|
<driver name='file' type='raw'/>
|
||||||
<source file='/root/boot.iso'/>
|
<source file='/root/boot.iso'/>
|
||||||
<target dev='hdc' bus='ide'/>
|
<target dev='hdc' bus='ide'/>
|
||||||
<readonly/>
|
<readonly/>
|
||||||
@ -56,8 +56,7 @@
|
|||||||
<listen type='address' address='127.0.0.1'/>
|
<listen type='address' address='127.0.0.1'/>
|
||||||
</graphics>
|
</graphics>
|
||||||
<video>
|
<video>
|
||||||
<model type='cirrus' vram='16384' heads='1' primary='yes'/>
|
<model type='cirrus' vram='8192' heads='1' primary='yes'/>
|
||||||
</video>
|
</video>
|
||||||
<memballoon model='xen'/>
|
|
||||||
</devices>
|
</devices>
|
||||||
</domain>
|
</domain>
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
<currentMemory unit='KiB'>403456</currentMemory>
|
<currentMemory unit='KiB'>403456</currentMemory>
|
||||||
<vcpu placement='static'>1</vcpu>
|
<vcpu placement='static'>1</vcpu>
|
||||||
<os>
|
<os>
|
||||||
<type arch='i686' machine='xenfv'>hvm</type>
|
<type arch='x86_64' machine='xenfv'>hvm</type>
|
||||||
<loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
|
<loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
|
||||||
<boot dev='cdrom'/>
|
<boot dev='cdrom'/>
|
||||||
</os>
|
</os>
|
||||||
@ -21,13 +21,13 @@
|
|||||||
<devices>
|
<devices>
|
||||||
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
|
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
|
||||||
<disk type='block' device='disk'>
|
<disk type='block' device='disk'>
|
||||||
<driver name='phy'/>
|
<driver name='phy' type='raw'/>
|
||||||
<source dev='/dev/HostVG/XenGuest2'/>
|
<source dev='/dev/HostVG/XenGuest2'/>
|
||||||
<target dev='hda' bus='ide'/>
|
<target dev='hda' bus='ide'/>
|
||||||
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
|
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
|
||||||
</disk>
|
</disk>
|
||||||
<disk type='file' device='cdrom'>
|
<disk type='file' device='cdrom'>
|
||||||
<driver name='file'/>
|
<driver name='file' type='raw'/>
|
||||||
<source file='/root/boot.iso'/>
|
<source file='/root/boot.iso'/>
|
||||||
<target dev='hdc' bus='ide'/>
|
<target dev='hdc' bus='ide'/>
|
||||||
<readonly/>
|
<readonly/>
|
||||||
@ -54,8 +54,7 @@
|
|||||||
<listen type='address' address='127.0.0.1'/>
|
<listen type='address' address='127.0.0.1'/>
|
||||||
</graphics>
|
</graphics>
|
||||||
<video>
|
<video>
|
||||||
<model type='cirrus' vram='16384' heads='1' primary='yes'/>
|
<model type='cirrus' vram='8192' heads='1' primary='yes'/>
|
||||||
</video>
|
</video>
|
||||||
<memballoon model='xen'/>
|
|
||||||
</devices>
|
</devices>
|
||||||
</domain>
|
</domain>
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
<currentMemory unit='KiB'>403456</currentMemory>
|
<currentMemory unit='KiB'>403456</currentMemory>
|
||||||
<vcpu placement='static'>1</vcpu>
|
<vcpu placement='static'>1</vcpu>
|
||||||
<os>
|
<os>
|
||||||
<type arch='i686' machine='xenfv'>hvm</type>
|
<type arch='x86_64' machine='xenfv'>hvm</type>
|
||||||
<loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
|
<loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
|
||||||
<boot dev='cdrom'/>
|
<boot dev='cdrom'/>
|
||||||
</os>
|
</os>
|
||||||
@ -21,13 +21,13 @@
|
|||||||
<devices>
|
<devices>
|
||||||
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
|
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
|
||||||
<disk type='block' device='disk'>
|
<disk type='block' device='disk'>
|
||||||
<driver name='phy'/>
|
<driver name='phy' type='raw'/>
|
||||||
<source dev='/dev/HostVG/XenGuest2'/>
|
<source dev='/dev/HostVG/XenGuest2'/>
|
||||||
<target dev='hda' bus='ide'/>
|
<target dev='hda' bus='ide'/>
|
||||||
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
|
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
|
||||||
</disk>
|
</disk>
|
||||||
<disk type='file' device='cdrom'>
|
<disk type='file' device='cdrom'>
|
||||||
<driver name='file'/>
|
<driver name='file' type='raw'/>
|
||||||
<source file='/root/boot.iso'/>
|
<source file='/root/boot.iso'/>
|
||||||
<target dev='hdc' bus='ide'/>
|
<target dev='hdc' bus='ide'/>
|
||||||
<readonly/>
|
<readonly/>
|
||||||
@ -48,8 +48,7 @@
|
|||||||
<sound model='sb16'/>
|
<sound model='sb16'/>
|
||||||
<sound model='es1370'/>
|
<sound model='es1370'/>
|
||||||
<video>
|
<video>
|
||||||
<model type='cirrus' vram='16384' heads='1' primary='yes'/>
|
<model type='cirrus' vram='8192' heads='1' primary='yes'/>
|
||||||
</video>
|
</video>
|
||||||
<memballoon model='xen'/>
|
|
||||||
</devices>
|
</devices>
|
||||||
</domain>
|
</domain>
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
<currentMemory unit='KiB'>403456</currentMemory>
|
<currentMemory unit='KiB'>403456</currentMemory>
|
||||||
<vcpu placement='static'>1</vcpu>
|
<vcpu placement='static'>1</vcpu>
|
||||||
<os>
|
<os>
|
||||||
<type arch='i686' machine='xenfv'>hvm</type>
|
<type arch='x86_64' machine='xenfv'>hvm</type>
|
||||||
<loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
|
<loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
|
||||||
<boot dev='cdrom'/>
|
<boot dev='cdrom'/>
|
||||||
</os>
|
</os>
|
||||||
@ -21,13 +21,13 @@
|
|||||||
<devices>
|
<devices>
|
||||||
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
|
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
|
||||||
<disk type='block' device='disk'>
|
<disk type='block' device='disk'>
|
||||||
<driver name='phy'/>
|
<driver name='phy' type='raw'/>
|
||||||
<source dev='/dev/HostVG/XenGuest2'/>
|
<source dev='/dev/HostVG/XenGuest2'/>
|
||||||
<target dev='hda' bus='ide'/>
|
<target dev='hda' bus='ide'/>
|
||||||
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
|
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
|
||||||
</disk>
|
</disk>
|
||||||
<disk type='file' device='cdrom'>
|
<disk type='file' device='cdrom'>
|
||||||
<driver name='file'/>
|
<driver name='file' type='raw'/>
|
||||||
<source file='/root/boot.iso'/>
|
<source file='/root/boot.iso'/>
|
||||||
<target dev='hdc' bus='ide'/>
|
<target dev='hdc' bus='ide'/>
|
||||||
<readonly/>
|
<readonly/>
|
||||||
@ -47,8 +47,7 @@
|
|||||||
<listen type='address' address='127.0.0.1'/>
|
<listen type='address' address='127.0.0.1'/>
|
||||||
</graphics>
|
</graphics>
|
||||||
<video>
|
<video>
|
||||||
<model type='cirrus' vram='16384' heads='1' primary='yes'/>
|
<model type='cirrus' vram='8192' heads='1' primary='yes'/>
|
||||||
</video>
|
</video>
|
||||||
<memballoon model='xen'/>
|
|
||||||
</devices>
|
</devices>
|
||||||
</domain>
|
</domain>
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
<currentMemory unit='KiB'>403456</currentMemory>
|
<currentMemory unit='KiB'>403456</currentMemory>
|
||||||
<vcpu placement='static'>1</vcpu>
|
<vcpu placement='static'>1</vcpu>
|
||||||
<os>
|
<os>
|
||||||
<type arch='i686' machine='xenfv'>hvm</type>
|
<type arch='x86_64' machine='xenfv'>hvm</type>
|
||||||
<loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
|
<loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
|
||||||
<boot dev='cdrom'/>
|
<boot dev='cdrom'/>
|
||||||
</os>
|
</os>
|
||||||
@ -21,13 +21,13 @@
|
|||||||
<devices>
|
<devices>
|
||||||
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
|
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
|
||||||
<disk type='block' device='disk'>
|
<disk type='block' device='disk'>
|
||||||
<driver name='phy'/>
|
<driver name='phy' type='raw'/>
|
||||||
<source dev='/dev/HostVG/XenGuest2'/>
|
<source dev='/dev/HostVG/XenGuest2'/>
|
||||||
<target dev='hda' bus='ide'/>
|
<target dev='hda' bus='ide'/>
|
||||||
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
|
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
|
||||||
</disk>
|
</disk>
|
||||||
<disk type='file' device='cdrom'>
|
<disk type='file' device='cdrom'>
|
||||||
<driver name='file'/>
|
<driver name='file' type='raw'/>
|
||||||
<source file='/root/boot.iso'/>
|
<source file='/root/boot.iso'/>
|
||||||
<target dev='hdc' bus='ide'/>
|
<target dev='hdc' bus='ide'/>
|
||||||
<readonly/>
|
<readonly/>
|
||||||
@ -47,8 +47,7 @@
|
|||||||
<listen type='address' address='127.0.0.1'/>
|
<listen type='address' address='127.0.0.1'/>
|
||||||
</graphics>
|
</graphics>
|
||||||
<video>
|
<video>
|
||||||
<model type='cirrus' vram='16384' heads='1' primary='yes'/>
|
<model type='cirrus' vram='8192' heads='1' primary='yes'/>
|
||||||
</video>
|
</video>
|
||||||
<memballoon model='xen'/>
|
|
||||||
</devices>
|
</devices>
|
||||||
</domain>
|
</domain>
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
<currentMemory unit='KiB'>403456</currentMemory>
|
<currentMemory unit='KiB'>403456</currentMemory>
|
||||||
<vcpu placement='static'>1</vcpu>
|
<vcpu placement='static'>1</vcpu>
|
||||||
<os>
|
<os>
|
||||||
<type arch='i686' machine='xenfv'>hvm</type>
|
<type arch='x86_64' machine='xenfv'>hvm</type>
|
||||||
<loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
|
<loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
|
||||||
<boot dev='cdrom'/>
|
<boot dev='cdrom'/>
|
||||||
</os>
|
</os>
|
||||||
@ -21,13 +21,13 @@
|
|||||||
<devices>
|
<devices>
|
||||||
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
|
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
|
||||||
<disk type='block' device='disk'>
|
<disk type='block' device='disk'>
|
||||||
<driver name='phy'/>
|
<driver name='phy' type='raw'/>
|
||||||
<source dev='/dev/HostVG/XenGuest2'/>
|
<source dev='/dev/HostVG/XenGuest2'/>
|
||||||
<target dev='hda' bus='ide'/>
|
<target dev='hda' bus='ide'/>
|
||||||
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
|
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
|
||||||
</disk>
|
</disk>
|
||||||
<disk type='file' device='cdrom'>
|
<disk type='file' device='cdrom'>
|
||||||
<driver name='file'/>
|
<driver name='file' type='raw'/>
|
||||||
<source file='/root/boot.iso'/>
|
<source file='/root/boot.iso'/>
|
||||||
<target dev='hdc' bus='ide'/>
|
<target dev='hdc' bus='ide'/>
|
||||||
<readonly/>
|
<readonly/>
|
||||||
@ -46,8 +46,7 @@
|
|||||||
<listen type='address' address='127.0.0.1'/>
|
<listen type='address' address='127.0.0.1'/>
|
||||||
</graphics>
|
</graphics>
|
||||||
<video>
|
<video>
|
||||||
<model type='cirrus' vram='16384' heads='1' primary='yes'/>
|
<model type='cirrus' vram='8192' heads='1' primary='yes'/>
|
||||||
</video>
|
</video>
|
||||||
<memballoon model='xen'/>
|
|
||||||
</devices>
|
</devices>
|
||||||
</domain>
|
</domain>
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
<currentMemory unit='KiB'>358400</currentMemory>
|
<currentMemory unit='KiB'>358400</currentMemory>
|
||||||
<vcpu placement='static'>1</vcpu>
|
<vcpu placement='static'>1</vcpu>
|
||||||
<os>
|
<os>
|
||||||
<type arch='i686' machine='xenfv'>hvm</type>
|
<type arch='x86_64' machine='xenfv'>hvm</type>
|
||||||
<loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
|
<loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
|
||||||
<boot dev='hd'/>
|
<boot dev='hd'/>
|
||||||
</os>
|
</os>
|
||||||
@ -21,13 +21,13 @@
|
|||||||
<devices>
|
<devices>
|
||||||
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
|
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
|
||||||
<disk type='block' device='disk'>
|
<disk type='block' device='disk'>
|
||||||
<driver name='phy'/>
|
<driver name='phy' type='raw'/>
|
||||||
<source dev='/dev/sda8'/>
|
<source dev='/dev/sda8'/>
|
||||||
<target dev='hda' bus='ide'/>
|
<target dev='hda' bus='ide'/>
|
||||||
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
|
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
|
||||||
</disk>
|
</disk>
|
||||||
<disk type='block' device='cdrom'>
|
<disk type='block' device='cdrom'>
|
||||||
<driver name='phy'/>
|
<driver name='phy' type='raw'/>
|
||||||
<target dev='hdc' bus='ide'/>
|
<target dev='hdc' bus='ide'/>
|
||||||
<readonly/>
|
<readonly/>
|
||||||
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
|
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
|
||||||
@ -51,8 +51,7 @@
|
|||||||
<listen type='address'/>
|
<listen type='address'/>
|
||||||
</graphics>
|
</graphics>
|
||||||
<video>
|
<video>
|
||||||
<model type='cirrus' vram='16384' heads='1' primary='yes'/>
|
<model type='cirrus' vram='8192' heads='1' primary='yes'/>
|
||||||
</video>
|
</video>
|
||||||
<memballoon model='xen'/>
|
|
||||||
</devices>
|
</devices>
|
||||||
</domain>
|
</domain>
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
<vcpu placement='static' current='2'>4</vcpu>
|
<vcpu placement='static' current='2'>4</vcpu>
|
||||||
<bootloader>/usr/bin/pygrub</bootloader>
|
<bootloader>/usr/bin/pygrub</bootloader>
|
||||||
<os>
|
<os>
|
||||||
<type arch='i686' machine='xenpv'>linux</type>
|
<type arch='x86_64' machine='xenpv'>linux</type>
|
||||||
</os>
|
</os>
|
||||||
<clock offset='utc' adjustment='reset'/>
|
<clock offset='utc' adjustment='reset'/>
|
||||||
<on_poweroff>destroy</on_poweroff>
|
<on_poweroff>destroy</on_poweroff>
|
||||||
@ -14,7 +14,7 @@
|
|||||||
<on_crash>restart</on_crash>
|
<on_crash>restart</on_crash>
|
||||||
<devices>
|
<devices>
|
||||||
<disk type='block' device='disk'>
|
<disk type='block' device='disk'>
|
||||||
<driver name='phy'/>
|
<driver name='phy' type='raw'/>
|
||||||
<source dev='/dev/HostVG/XenGuest1'/>
|
<source dev='/dev/HostVG/XenGuest1'/>
|
||||||
<target dev='xvda' bus='xen'/>
|
<target dev='xvda' bus='xen'/>
|
||||||
</disk>
|
</disk>
|
||||||
@ -28,6 +28,5 @@
|
|||||||
</console>
|
</console>
|
||||||
<input type='mouse' bus='xen'/>
|
<input type='mouse' bus='xen'/>
|
||||||
<input type='keyboard' bus='xen'/>
|
<input type='keyboard' bus='xen'/>
|
||||||
<memballoon model='xen'/>
|
|
||||||
</devices>
|
</devices>
|
||||||
</domain>
|
</domain>
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
<vcpu placement='static'>1</vcpu>
|
<vcpu placement='static'>1</vcpu>
|
||||||
<bootloader>/usr/bin/pygrub</bootloader>
|
<bootloader>/usr/bin/pygrub</bootloader>
|
||||||
<os>
|
<os>
|
||||||
<type arch='i686' machine='xenpv'>linux</type>
|
<type arch='x86_64' machine='xenpv'>linux</type>
|
||||||
</os>
|
</os>
|
||||||
<clock offset='utc' adjustment='reset'/>
|
<clock offset='utc' adjustment='reset'/>
|
||||||
<on_poweroff>destroy</on_poweroff>
|
<on_poweroff>destroy</on_poweroff>
|
||||||
@ -14,7 +14,7 @@
|
|||||||
<on_crash>restart</on_crash>
|
<on_crash>restart</on_crash>
|
||||||
<devices>
|
<devices>
|
||||||
<disk type='block' device='disk'>
|
<disk type='block' device='disk'>
|
||||||
<driver name='phy'/>
|
<driver name='phy' type='raw'/>
|
||||||
<source dev='/dev/HostVG/XenGuest1'/>
|
<source dev='/dev/HostVG/XenGuest1'/>
|
||||||
<target dev='xvda' bus='xen'/>
|
<target dev='xvda' bus='xen'/>
|
||||||
</disk>
|
</disk>
|
||||||
@ -35,6 +35,5 @@
|
|||||||
<video>
|
<video>
|
||||||
<model type='xen' vram='4096' heads='1' primary='yes'/>
|
<model type='xen' vram='4096' heads='1' primary='yes'/>
|
||||||
</video>
|
</video>
|
||||||
<memballoon model='xen'/>
|
|
||||||
</devices>
|
</devices>
|
||||||
</domain>
|
</domain>
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
<vcpu placement='static'>1</vcpu>
|
<vcpu placement='static'>1</vcpu>
|
||||||
<bootloader>/usr/bin/pygrub</bootloader>
|
<bootloader>/usr/bin/pygrub</bootloader>
|
||||||
<os>
|
<os>
|
||||||
<type arch='i686' machine='xenpv'>linux</type>
|
<type arch='x86_64' machine='xenpv'>linux</type>
|
||||||
</os>
|
</os>
|
||||||
<clock offset='utc' adjustment='reset'/>
|
<clock offset='utc' adjustment='reset'/>
|
||||||
<on_poweroff>destroy</on_poweroff>
|
<on_poweroff>destroy</on_poweroff>
|
||||||
@ -14,7 +14,7 @@
|
|||||||
<on_crash>restart</on_crash>
|
<on_crash>restart</on_crash>
|
||||||
<devices>
|
<devices>
|
||||||
<disk type='block' device='disk'>
|
<disk type='block' device='disk'>
|
||||||
<driver name='phy'/>
|
<driver name='phy' type='raw'/>
|
||||||
<source dev='/dev/HostVG/XenGuest1'/>
|
<source dev='/dev/HostVG/XenGuest1'/>
|
||||||
<target dev='xvda' bus='xen'/>
|
<target dev='xvda' bus='xen'/>
|
||||||
</disk>
|
</disk>
|
||||||
@ -36,6 +36,5 @@
|
|||||||
<video>
|
<video>
|
||||||
<model type='xen' vram='4096' heads='1' primary='yes'/>
|
<model type='xen' vram='4096' heads='1' primary='yes'/>
|
||||||
</video>
|
</video>
|
||||||
<memballoon model='xen'/>
|
|
||||||
</devices>
|
</devices>
|
||||||
</domain>
|
</domain>
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
<vcpu placement='static'>1</vcpu>
|
<vcpu placement='static'>1</vcpu>
|
||||||
<bootloader>/usr/bin/pygrub</bootloader>
|
<bootloader>/usr/bin/pygrub</bootloader>
|
||||||
<os>
|
<os>
|
||||||
<type arch='i686' machine='xenpv'>linux</type>
|
<type arch='x86_64' machine='xenpv'>linux</type>
|
||||||
</os>
|
</os>
|
||||||
<clock offset='utc' adjustment='reset'/>
|
<clock offset='utc' adjustment='reset'/>
|
||||||
<on_poweroff>destroy</on_poweroff>
|
<on_poweroff>destroy</on_poweroff>
|
||||||
@ -14,7 +14,7 @@
|
|||||||
<on_crash>restart</on_crash>
|
<on_crash>restart</on_crash>
|
||||||
<devices>
|
<devices>
|
||||||
<disk type='block' device='disk'>
|
<disk type='block' device='disk'>
|
||||||
<driver name='phy'/>
|
<driver name='phy' type='raw'/>
|
||||||
<source dev='/dev/HostVG/XenGuest1'/>
|
<source dev='/dev/HostVG/XenGuest1'/>
|
||||||
<target dev='xvda' bus='xen'/>
|
<target dev='xvda' bus='xen'/>
|
||||||
</disk>
|
</disk>
|
||||||
@ -34,6 +34,5 @@
|
|||||||
<video>
|
<video>
|
||||||
<model type='xen' vram='4096' heads='1' primary='yes'/>
|
<model type='xen' vram='4096' heads='1' primary='yes'/>
|
||||||
</video>
|
</video>
|
||||||
<memballoon model='xen'/>
|
|
||||||
</devices>
|
</devices>
|
||||||
</domain>
|
</domain>
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
<vcpu placement='static'>1</vcpu>
|
<vcpu placement='static'>1</vcpu>
|
||||||
<bootloader>/usr/bin/pygrub</bootloader>
|
<bootloader>/usr/bin/pygrub</bootloader>
|
||||||
<os>
|
<os>
|
||||||
<type arch='i686' machine='xenpv'>linux</type>
|
<type arch='x86_64' machine='xenpv'>linux</type>
|
||||||
</os>
|
</os>
|
||||||
<clock offset='utc' adjustment='reset'/>
|
<clock offset='utc' adjustment='reset'/>
|
||||||
<on_poweroff>destroy</on_poweroff>
|
<on_poweroff>destroy</on_poweroff>
|
||||||
@ -14,7 +14,7 @@
|
|||||||
<on_crash>restart</on_crash>
|
<on_crash>restart</on_crash>
|
||||||
<devices>
|
<devices>
|
||||||
<disk type='block' device='disk'>
|
<disk type='block' device='disk'>
|
||||||
<driver name='phy'/>
|
<driver name='phy' type='raw'/>
|
||||||
<source dev='/dev/HostVG/XenGuest1'/>
|
<source dev='/dev/HostVG/XenGuest1'/>
|
||||||
<target dev='xvda' bus='xen'/>
|
<target dev='xvda' bus='xen'/>
|
||||||
</disk>
|
</disk>
|
||||||
@ -34,6 +34,5 @@
|
|||||||
<video>
|
<video>
|
||||||
<model type='xen' vram='4096' heads='1' primary='yes'/>
|
<model type='xen' vram='4096' heads='1' primary='yes'/>
|
||||||
</video>
|
</video>
|
||||||
<memballoon model='xen'/>
|
|
||||||
</devices>
|
</devices>
|
||||||
</domain>
|
</domain>
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
<vcpu placement='static' current='2'>4</vcpu>
|
<vcpu placement='static' current='2'>4</vcpu>
|
||||||
<bootloader>/usr/bin/pygrub</bootloader>
|
<bootloader>/usr/bin/pygrub</bootloader>
|
||||||
<os>
|
<os>
|
||||||
<type arch='i686' machine='xenpv'>linux</type>
|
<type arch='x86_64' machine='xenpv'>linux</type>
|
||||||
</os>
|
</os>
|
||||||
<clock offset='utc' adjustment='reset'/>
|
<clock offset='utc' adjustment='reset'/>
|
||||||
<on_poweroff>destroy</on_poweroff>
|
<on_poweroff>destroy</on_poweroff>
|
||||||
@ -14,7 +14,7 @@
|
|||||||
<on_crash>restart</on_crash>
|
<on_crash>restart</on_crash>
|
||||||
<devices>
|
<devices>
|
||||||
<disk type='block' device='disk'>
|
<disk type='block' device='disk'>
|
||||||
<driver name='phy'/>
|
<driver name='phy' type='raw'/>
|
||||||
<source dev='/dev/HostVG/XenGuest1'/>
|
<source dev='/dev/HostVG/XenGuest1'/>
|
||||||
<target dev='xvda' bus='xen'/>
|
<target dev='xvda' bus='xen'/>
|
||||||
</disk>
|
</disk>
|
||||||
@ -28,6 +28,5 @@
|
|||||||
</console>
|
</console>
|
||||||
<input type='mouse' bus='xen'/>
|
<input type='mouse' bus='xen'/>
|
||||||
<input type='keyboard' bus='xen'/>
|
<input type='keyboard' bus='xen'/>
|
||||||
<memballoon model='xen'/>
|
|
||||||
</devices>
|
</devices>
|
||||||
</domain>
|
</domain>
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
<currentMemory unit='KiB'>358400</currentMemory>
|
<currentMemory unit='KiB'>358400</currentMemory>
|
||||||
<vcpu placement='static'>1</vcpu>
|
<vcpu placement='static'>1</vcpu>
|
||||||
<os>
|
<os>
|
||||||
<type arch='i686' machine='xenfv'>hvm</type>
|
<type arch='x86_64' machine='xenfv'>hvm</type>
|
||||||
<loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
|
<loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
|
||||||
<boot dev='hd'/>
|
<boot dev='hd'/>
|
||||||
</os>
|
</os>
|
||||||
@ -21,13 +21,13 @@
|
|||||||
<devices>
|
<devices>
|
||||||
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
|
<emulator>/usr/lib/xen/bin/qemu-dm</emulator>
|
||||||
<disk type='block' device='disk'>
|
<disk type='block' device='disk'>
|
||||||
<driver name='phy'/>
|
<driver name='phy' type='raw'/>
|
||||||
<source dev='/dev/sda8'/>
|
<source dev='/dev/sda8'/>
|
||||||
<target dev='hda' bus='ide'/>
|
<target dev='hda' bus='ide'/>
|
||||||
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
|
<address type='drive' controller='0' bus='0' target='0' unit='0'/>
|
||||||
</disk>
|
</disk>
|
||||||
<disk type='block' device='cdrom'>
|
<disk type='block' device='cdrom'>
|
||||||
<driver name='phy'/>
|
<driver name='phy' type='raw'/>
|
||||||
<target dev='hdc' bus='ide'/>
|
<target dev='hdc' bus='ide'/>
|
||||||
<readonly/>
|
<readonly/>
|
||||||
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
|
<address type='drive' controller='0' bus='1' target='0' unit='0'/>
|
||||||
@ -51,18 +51,19 @@
|
|||||||
<listen type='address'/>
|
<listen type='address'/>
|
||||||
</graphics>
|
</graphics>
|
||||||
<video>
|
<video>
|
||||||
<model type='cirrus' vram='16384' heads='1' primary='yes'/>
|
<model type='cirrus' vram='8192' heads='1' primary='yes'/>
|
||||||
</video>
|
</video>
|
||||||
<hostdev mode='subsystem' type='pci' managed='no'>
|
<hostdev mode='subsystem' type='pci' managed='no'>
|
||||||
|
<driver name='xen'/>
|
||||||
<source>
|
<source>
|
||||||
<address domain='0x0001' bus='0x0c' slot='0x1b' function='0x2'/>
|
<address domain='0x0001' bus='0x0c' slot='0x1b' function='0x2'/>
|
||||||
</source>
|
</source>
|
||||||
</hostdev>
|
</hostdev>
|
||||||
<hostdev mode='subsystem' type='pci' managed='no'>
|
<hostdev mode='subsystem' type='pci' managed='no'>
|
||||||
|
<driver name='xen'/>
|
||||||
<source>
|
<source>
|
||||||
<address domain='0x0000' bus='0x01' slot='0x13' function='0x0'/>
|
<address domain='0x0000' bus='0x01' slot='0x13' function='0x0'/>
|
||||||
</source>
|
</source>
|
||||||
</hostdev>
|
</hostdev>
|
||||||
<memballoon model='xen'/>
|
|
||||||
</devices>
|
</devices>
|
||||||
</domain>
|
</domain>
|
||||||
|
@ -29,13 +29,12 @@
|
|||||||
|
|
||||||
#include "internal.h"
|
#include "internal.h"
|
||||||
#include "datatypes.h"
|
#include "datatypes.h"
|
||||||
#include "xen/xen_driver.h"
|
|
||||||
#include "xen/xm_internal.h"
|
|
||||||
#include "xenconfig/xen_xm.h"
|
#include "xenconfig/xen_xm.h"
|
||||||
#include "testutils.h"
|
#include "testutils.h"
|
||||||
#include "testutilsxen.h"
|
#include "testutilsxen.h"
|
||||||
#include "viralloc.h"
|
#include "viralloc.h"
|
||||||
#include "virstring.h"
|
#include "virstring.h"
|
||||||
|
#include "libxl/libxl_conf.h"
|
||||||
|
|
||||||
#define VIR_FROM_THIS VIR_FROM_NONE
|
#define VIR_FROM_THIS VIR_FROM_NONE
|
||||||
|
|
||||||
@ -50,7 +49,6 @@ testCompareParseXML(const char *xmcfg, const char *xml)
|
|||||||
int ret = -1;
|
int ret = -1;
|
||||||
virConnectPtr conn = NULL;
|
virConnectPtr conn = NULL;
|
||||||
int wrote = 4096;
|
int wrote = 4096;
|
||||||
struct _xenUnifiedPrivate priv;
|
|
||||||
virDomainDefPtr def = NULL;
|
virDomainDefPtr def = NULL;
|
||||||
|
|
||||||
if (VIR_ALLOC_N(gotxmcfgData, wrote) < 0)
|
if (VIR_ALLOC_N(gotxmcfgData, wrote) < 0)
|
||||||
@ -59,10 +57,6 @@ testCompareParseXML(const char *xmcfg, const char *xml)
|
|||||||
conn = virGetConnect();
|
conn = virGetConnect();
|
||||||
if (!conn) goto fail;
|
if (!conn) goto fail;
|
||||||
|
|
||||||
/* Many puppies died to bring you this code. */
|
|
||||||
priv.caps = caps;
|
|
||||||
conn->privateData = &priv;
|
|
||||||
|
|
||||||
if (!(def = virDomainDefParseFile(xml, caps, xmlopt, NULL,
|
if (!(def = virDomainDefParseFile(xml, caps, xmlopt, NULL,
|
||||||
VIR_DOMAIN_DEF_PARSE_INACTIVE)))
|
VIR_DOMAIN_DEF_PARSE_INACTIVE)))
|
||||||
goto fail;
|
goto fail;
|
||||||
@ -101,20 +95,11 @@ testCompareFormatXML(const char *xmcfg, const char *xml)
|
|||||||
char *gotxml = NULL;
|
char *gotxml = NULL;
|
||||||
virConfPtr conf = NULL;
|
virConfPtr conf = NULL;
|
||||||
int ret = -1;
|
int ret = -1;
|
||||||
virConnectPtr conn;
|
|
||||||
struct _xenUnifiedPrivate priv;
|
|
||||||
virDomainDefPtr def = NULL;
|
virDomainDefPtr def = NULL;
|
||||||
|
|
||||||
conn = virGetConnect();
|
|
||||||
if (!conn) goto fail;
|
|
||||||
|
|
||||||
if (virTestLoadFile(xmcfg, &xmcfgData) < 0)
|
if (virTestLoadFile(xmcfg, &xmcfgData) < 0)
|
||||||
goto fail;
|
goto fail;
|
||||||
|
|
||||||
/* Many puppies died to bring you this code. */
|
|
||||||
priv.caps = caps;
|
|
||||||
conn->privateData = &priv;
|
|
||||||
|
|
||||||
if (!(conf = virConfReadString(xmcfgData, 0)))
|
if (!(conf = virConfReadString(xmcfgData, 0)))
|
||||||
goto fail;
|
goto fail;
|
||||||
|
|
||||||
@ -135,7 +120,6 @@ testCompareFormatXML(const char *xmcfg, const char *xml)
|
|||||||
VIR_FREE(xmcfgData);
|
VIR_FREE(xmcfgData);
|
||||||
VIR_FREE(gotxml);
|
VIR_FREE(gotxml);
|
||||||
virDomainDefFree(def);
|
virDomainDefFree(def);
|
||||||
virObjectUnref(conn);
|
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
@ -180,10 +164,10 @@ mymain(void)
|
|||||||
{
|
{
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
|
||||||
if (!(caps = testXenCapsInit()))
|
if (!(caps = testXLInitCaps()))
|
||||||
return EXIT_FAILURE;
|
return EXIT_FAILURE;
|
||||||
|
|
||||||
if (!(xmlopt = xenDomainXMLConfInit()))
|
if (!(xmlopt = libxlCreateXMLConf()))
|
||||||
return EXIT_FAILURE;
|
return EXIT_FAILURE;
|
||||||
|
|
||||||
#define DO_TEST_PARSE(name) \
|
#define DO_TEST_PARSE(name) \
|
||||||
|
Loading…
Reference in New Issue
Block a user