提交 41b28943 编写于 作者: P Peter Krempa

tests: qemuxml2xml: Simplify adding to the status XML expect string generator

Unindent the static XML block and move around the autoindent calls so
that further additions don't have to add more of them.

Also rename the string holding the static XML section.
上级 cb1e4ca2
...@@ -81,23 +81,23 @@ static const char testStatusXMLPrefixHeader[] = ...@@ -81,23 +81,23 @@ static const char testStatusXMLPrefixHeader[] =
" <taint flag='high-privileges'/>\n" " <taint flag='high-privileges'/>\n"
" <monitor path='/var/lib/libvirt/qemu/test.monitor' json='1' type='unix'/>\n"; " <monitor path='/var/lib/libvirt/qemu/test.monitor' json='1' type='unix'/>\n";
static const char testStatusXMLPrefixFooter[] = static const char testStatusXMLPrefixBodyStatic[] =
" <qemuCaps>\n" "<qemuCaps>\n"
" <flag name='vnet-hdr'/>\n" " <flag name='vnet-hdr'/>\n"
" <flag name='qxl.vgamem_mb'/>\n" " <flag name='qxl.vgamem_mb'/>\n"
" <flag name='qxl-vga.vgamem_mb'/>\n" " <flag name='qxl-vga.vgamem_mb'/>\n"
" <flag name='pc-dimm'/>\n" " <flag name='pc-dimm'/>\n"
" </qemuCaps>\n" "</qemuCaps>\n"
" <devices>\n" "<devices>\n"
" <device alias='balloon0'/>\n" " <device alias='balloon0'/>\n"
" <device alias='video0'/>\n" " <device alias='video0'/>\n"
" <device alias='serial0'/>\n" " <device alias='serial0'/>\n"
" <device alias='net0'/>\n" " <device alias='net0'/>\n"
" <device alias='usb'/>\n" " <device alias='usb'/>\n"
" </devices>\n" "</devices>\n"
" <numad nodeset='0-2' cpuset='1,3'/>\n" "<numad nodeset='0-2' cpuset='1,3'/>\n"
" <libDir path='/tmp'/>\n" "<libDir path='/tmp'/>\n"
" <channelTargetDir path='/tmp/channel'/>\n"; "<channelTargetDir path='/tmp/channel'/>\n";
static const char testStatusXMLSuffix[] = static const char testStatusXMLSuffix[] =
"</domstatus>\n"; "</domstatus>\n";
...@@ -134,8 +134,9 @@ testGetStatusXMLPrefix(const struct testInfo *data) ...@@ -134,8 +134,9 @@ testGetStatusXMLPrefix(const struct testInfo *data)
testGetStatuXMLPrefixVcpus(&buf, data); testGetStatuXMLPrefixVcpus(&buf, data);
virBufferAddStr(&buf, testStatusXMLPrefixBodyStatic);
virBufferAdjustIndent(&buf, -2); virBufferAdjustIndent(&buf, -2);
virBufferAdd(&buf, testStatusXMLPrefixFooter, -1);
return virBufferContentAndReset(&buf); return virBufferContentAndReset(&buf);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册