openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

xml: omit domain name from comment if it contains double hyphen 

We put a comment containing "virsh edit <domain_name>" at the start of
the XML. W3C recommendation forbids the use of "--" in comments [1] and
libvirt can't parse it either. This patch omits the domain name if it
contains a double hyphen.

[1] http://www.w3.org/TR/REC-xml/#sec-comments
This commit is contained in:
Ján Tomko 2012-10-23 14:16:44 +02:00 committed by Michal Privoznik
parent b326765c80
commit 9b704ab823
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/util/xml.c
View File

@ -807,12 +807,16 @@ or other application using the libvirt API.\n\
if (safewrite(fd, cmd, len) != len)
return -1;
if (safewrite(fd, " ", 1) != 1)
return -1;
/* Omit the domain name if it contains a double hyphen
* because they aren't allowed in XML comments */
if (!strstr(name, "--")) {
if (safewrite(fd, " ", 1) != 1)
return -1;
len = strlen(name);
if (safewrite(fd, name, len) != len)
return -1;
len = strlen(name);
if (safewrite(fd, name, len) != len)
return -1;
}
len = strlen(epilogue);
if (safewrite(fd, epilogue, len) != len)