On 05/17/2016 10:34 AM, Chunyan Liu wrote:
> Signed-off-by: Chunyan Liu <cyliu@xxxxxxxx>
> ---
> tests/xlconfigdata/test-vif-typename.cfg | 25 ++++++++++++++++++
> tests/xlconfigdata/test-vif-typename.xml | 45 ++++++++++++++++++++++++++++++++
> tests/xlconfigtest.c | 1 +
> 3 files changed, 71 insertions(+)
> create mode 100644 tests/xlconfigdata/test-vif-typename.cfg
> create mode 100644 tests/xlconfigdata/test-vif-typename.xml
>
> diff --git a/tests/xlconfigdata/test-vif-typename.cfg b/tests/xlconfigdata/test-vif-typename.cfg
> new file mode 100644
> index 0000000..2e30777
> --- /dev/null
> +++ b/tests/xlconfigdata/test-vif-typename.cfg
> @@ -0,0 +1,25 @@
> +name = "XenGuest2"
> +uuid = "c7a5fdb2-cdaf-9455-926a-d65c16db1809"
> +maxmem = 579
> +memory = 394
> +vcpus = 1
> +pae = 1
> +acpi = 1
> +apic = 1
> +viridian = 0
> +rtc_timeoffset = 0
> +localtime = 0
> +on_poweroff = "destroy"
> +on_reboot = "restart"
> +on_crash = "restart"
> +device_model = "/usr/lib/xen/bin/qemu-dm"
Commit b90c4b5f5 changed test data files to use qemu-system-i386 as opposed
to qemu traditional, so probably this needs to be inline with that change.
> +sdl = 0
> +vnc = 1
> +vncunused = 1
> +vnclisten = "127.0.0.1"
> +vif = [ "mac=00:16:3e:66:92:9c,bridge=xenbr1,script=vif-bridge,type=vif" ]
> +parallel = "none"
> +serial = "none"
> +builder = "hvm"
> +boot = "d"
> +disk = [ "format=raw,vdev=hda,access=rw,backendtype=phy,target=/dev/HostVG/XenGuest2" ]
> diff --git a/tests/xlconfigdata/test-vif-typename.xml b/tests/xlconfigdata/test-vif-typename.xml
> new file mode 100644
> index 0000000..76e98e3
> --- /dev/null
> +++ b/tests/xlconfigdata/test-vif-typename.xml
> @@ -0,0 +1,45 @@
> +<domain type='xen'>
> + <name>XenGuest2</name>
> + <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid>
> + <memory unit='KiB'>592896</memory>
> + <currentMemory unit='KiB'>403456</currentMemory>
> + <vcpu placement='static'>1</vcpu>
> + <os>
> + <type arch='x86_64' machine='xenfv'>hvm</type>
> + <loader type='rom'>/usr/lib/xen/boot/hvmloader</loader>
> + <boot dev='cdrom'/>
> + </os>
> + <features>
> + <acpi/>
> + <apic/>
> + <pae/>
> + </features>
> + <clock offset='variable' adjustment='0' basis='utc'/>
> + <on_poweroff>destroy</on_poweroff>
> + <on_reboot>restart</on_reboot>
> + <on_crash>restart</on_crash>
> + <devices>
> + <emulator>/usr/lib/xen/bin/qemu-dm</emulator>
Same here.
> + <disk type='block' device='disk'>
> + <driver name='phy' type='raw'/>
> + <source dev='/dev/HostVG/XenGuest2'/>
> + <target dev='hda' bus='ide'/>
> + <address type='drive' controller='0' bus='0' target='0' unit='0'/>
> + </disk>
> + <controller type='ide' index='0'/>
> + <interface type='bridge'>
> + <mac address='00:16:3e:66:92:9c'/>
> + <source bridge='xenbr1'/>
> + <script path='vif-bridge'/>
> + <model type='netfront'/>
> + </interface>
> + <input type='mouse' bus='ps2'/>
> + <input type='keyboard' bus='ps2'/>
> + <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1'>
> + <listen type='address' address='127.0.0.1'/>
> + </graphics>
> + <video>
> + <model type='cirrus' vram='4096' heads='1' primary='yes'/>
And probably vram needs to be adjusted to 8192 - reflecting the change above mentioned.
> + </video>
> + </devices>
> +</domain>
> diff --git a/tests/xlconfigtest.c b/tests/xlconfigtest.c
> index ba1bed0..6819bad 100644
> --- a/tests/xlconfigtest.c
> +++ b/tests/xlconfigtest.c
> @@ -228,6 +228,7 @@ mymain(void)
> DO_TEST_FORMAT("fullvirt-direct-kernel-boot-extra");
> DO_TEST_FORMAT("fullvirt-direct-kernel-boot-bogus-extra");
> #endif
> + DO_TEST("vif-typename");
>
> virObjectUnref(caps);
> virObjectUnref(xmlopt);
>
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list