提交 a52b56b3 编写于 作者: C Conrad Meyer 提交者: Michal Privoznik

bhyvexml2argv: Add test for grub console support

上级 7c7c8b0b
/usr/sbin/bhyve -c 1 -m 214 -H -P -s 0:0,hostbridge \
-s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
-s 2:0,ahci-hd,/tmp/freebsd.img \
-s 1,lpc -l com1,/dev/nmdm0A bhyve
/usr/local/sbin/grub-bhyve --root hd0,msdos1 --device-map '<device.map>' \
--memory 214 bhyve
<domain type='bhyve'>
<name>bhyve</name>
<uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid>
<memory>219136</memory>
<vcpu>1</vcpu>
<bootloader>/usr/local/sbin/grub-bhyve</bootloader>
<os>
<type>hvm</type>
</os>
<devices>
<disk type='file'>
<driver name='file' type='raw'/>
<source file='/tmp/freebsd.img'/>
<target dev='hda' bus='sata'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
</disk>
<interface type='bridge'>
<model type='virtio'/>
<source bridge="virbr0"/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
</interface>
<serial type='nmdm'>
<source master='/dev/nmdm0A' slave='/dev/nmdm0B'/>
</serial>
</devices>
</domain>
/usr/sbin/bhyve -c 1 -m 214 -H -P -s 0:0,hostbridge \
-s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
-s 2:0,ahci-hd,/tmp/freebsd.img \
-s 1,lpc -l com1,/dev/nmdm0A bhyve
/usr/local/sbin/grub-bhyve --root hd0,msdos1 --device-map '<device.map>' \
--memory 214 --cons-dev /dev/nmdm0A bhyve
<domain type='bhyve'>
<name>bhyve</name>
<uuid>df3be7e7-a104-11e3-aeb0-50e5492bd3dc</uuid>
<memory>219136</memory>
<vcpu>1</vcpu>
<bootloader>/usr/local/sbin/grub-bhyve</bootloader>
<os>
<type>hvm</type>
</os>
<devices>
<disk type='file'>
<driver name='file' type='raw'/>
<source file='/tmp/freebsd.img'/>
<target dev='hda' bus='sata'/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
</disk>
<interface type='bridge'>
<model type='virtio'/>
<source bridge="virbr0"/>
<address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
</interface>
<serial type='nmdm'>
<source master='/dev/nmdm0A' slave='/dev/nmdm0B'/>
</serial>
</devices>
</domain>
...@@ -37,6 +37,7 @@ static int testCompareXMLToArgvFiles(const char *xml, ...@@ -37,6 +37,7 @@ static int testCompareXMLToArgvFiles(const char *xml,
goto out; goto out;
vm.def = vmdef; vm.def = vmdef;
conn->privateData = &driver;
if (!(cmd = virBhyveProcessBuildBhyveCmd(conn, vmdef, false))) if (!(cmd = virBhyveProcessBuildBhyveCmd(conn, vmdef, false)))
goto out; goto out;
...@@ -152,6 +153,7 @@ mymain(void) ...@@ -152,6 +153,7 @@ mymain(void)
ret = -1; \ ret = -1; \
} while (0) } while (0)
driver.grubcaps = BHYVE_GRUB_CAP_CONSDEV;
DO_TEST("base"); DO_TEST("base");
DO_TEST("acpiapic"); DO_TEST("acpiapic");
...@@ -164,6 +166,11 @@ mymain(void) ...@@ -164,6 +166,11 @@ mymain(void)
DO_TEST("bhyveload-explicitargs"); DO_TEST("bhyveload-explicitargs");
DO_TEST("custom-loader"); DO_TEST("custom-loader");
DO_TEST("disk-cdrom-grub"); DO_TEST("disk-cdrom-grub");
DO_TEST("serial-grub");
driver.grubcaps = 0;
DO_TEST("serial-grub-nocons");
virObjectUnref(driver.caps); virObjectUnref(driver.caps);
virObjectUnref(driver.xmlopt); virObjectUnref(driver.xmlopt);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册