External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-08-27 02:51:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

* src/xm_internal.c: patches from Masayuki Sunou to fix a problem

Browse Source 
when an HVM domain is started with a CD-Rom config, this should
  fix #328841
Daniel
This commit is contained in:
Daniel Veillard 2007-11-01 13:33:58 +00:00
parent 390cca8125
commit c33b54df47
2 changed files with 50 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Thu Nov 1 14:32:07 CET 2007 Daniel Veillard <veillard@redhat.com>
* src/xm_internal.c: patches from Masayuki Sunou to fix a problem
when an HVM domain is started with a CD-Rom config, this should
fix #328841
Wed Oct 31 10:36:00 CET 2007 Daniel Veillard <veillard@redhat.com> Wed Oct 31 10:36:00 CET 2007 Daniel Veillard <veillard@redhat.com>
* proxy/libvirt_proxy.c src/proxy_internal.[ch] src/xen_internal.c * proxy/libvirt_proxy.c src/proxy_internal.[ch] src/xen_internal.c

72
src/xm_internal.c
View File

@ -758,10 +758,15 @@ char *xenXMDomainFormatXML(virConnectPtr conn, virConfPtr conf) {
/* Extract source driver type */ /* Extract source driver type */
if (!(tmp = strchr(src, ':')) || !tmp[0]) if (!src[0]) {
goto skipdisk; strcpy(drvName, "phy");
strncpy(drvName, src, (tmp-src)); tmp = &src[0];
drvName[tmp-src] = '\0'; } else if (!(tmp = strchr(src, ':')) || !tmp[0]) {
goto skipdisk;
} else {
strncpy(drvName, src, (tmp-src));
drvName[tmp-src] = '\0';
}
/* And the source driver sub-type */ /* And the source driver sub-type */
if (!strncmp(drvName, "tap", 3)) { if (!strncmp(drvName, "tap", 3)) {
@ -771,7 +776,8 @@ char *xenXMDomainFormatXML(virConnectPtr conn, virConfPtr conf) {
memmove(src, src+(tmp1-src)+1, strlen(src)-(tmp1-src)); memmove(src, src+(tmp1-src)+1, strlen(src)-(tmp1-src));
} else { } else {
drvType[0] = '\0'; drvType[0] = '\0';
memmove(src, src+(tmp-src)+1, strlen(src)-(tmp-src)); if (src[0])
memmove(src, src+(tmp-src)+1, strlen(src)-(tmp-src));
} }
/* phy: type indicates a block device */ /* phy: type indicates a block device */
@ -798,7 +804,8 @@ char *xenXMDomainFormatXML(virConnectPtr conn, virConfPtr conf) {
virBufferVSprintf(buf, " <driver name='%s' type='%s'/>\n", drvName, drvType); virBufferVSprintf(buf, " <driver name='%s' type='%s'/>\n", drvName, drvType);
else else
virBufferVSprintf(buf, " <driver name='%s'/>\n", drvName); virBufferVSprintf(buf, " <driver name='%s'/>\n", drvName);
virBufferVSprintf(buf, " <source %s='%s'/>\n", block ? "dev" : "file", src); if (src[0])
virBufferVSprintf(buf, " <source %s='%s'/>\n", block ? "dev" : "file", src);
virBufferVSprintf(buf, " <target dev='%s'/>\n", dev); virBufferVSprintf(buf, " <target dev='%s'/>\n", dev);
if (!strcmp(head, "r") || if (!strcmp(head, "r") ||
!strcmp(head, "ro")) !strcmp(head, "ro"))
@ -1536,13 +1543,6 @@ static int xenXMParseXMLDisk(xmlNodePtr node, int hvm, int xendConfigVersion, ch
cur = cur->next; cur = cur->next;
} }
if (source == NULL) {
if (target != NULL)
xmlFree(target);
if (device != NULL)
xmlFree(device);
return (-1);
}
if (target == NULL) { if (target == NULL) {
if (source != NULL) if (source != NULL)
xmlFree(source); xmlFree(source);
@ -1573,6 +1573,14 @@ static int xenXMParseXMLDisk(xmlNodePtr node, int hvm, int xendConfigVersion, ch
} }
} }
if (source == NULL && !cdrom) {
if (target != NULL)
xmlFree(target);
if (device != NULL)
xmlFree(device);
return (-1);
}
if (drvName) { if (drvName) {
buflen += strlen((const char*)drvName) + 1; buflen += strlen((const char*)drvName) + 1;
if (!strcmp((const char*)drvName, "tap")) { if (!strcmp((const char*)drvName, "tap")) {
@ -1588,7 +1596,10 @@ static int xenXMParseXMLDisk(xmlNodePtr node, int hvm, int xendConfigVersion, ch
buflen += 4; buflen += 4;
} }
buflen += strlen((const char*)source) + 1; if(source)
buflen += strlen((const char*)source) + 1;
else
buflen += 1;
buflen += strlen((const char*)target) + 1; buflen += strlen((const char*)target) + 1;
if (hvm && xendConfigVersion == 1) /* ioemu: */ if (hvm && xendConfigVersion == 1) /* ioemu: */
buflen += 6; buflen += 6;
@ -1601,23 +1612,27 @@ static int xenXMParseXMLDisk(xmlNodePtr node, int hvm, int xendConfigVersion, ch
if (!(buf = malloc(buflen))) if (!(buf = malloc(buflen)))
goto cleanup; goto cleanup;
if (drvName) { if(source) {
strcpy(buf, (const char*)drvName); if (drvName) {
if (!strcmp((const char*)drvName, "tap")) { strcpy(buf, (const char*)drvName);
strcat(buf, ":"); if (!strcmp((const char*)drvName, "tap")) {
if (drvType) strcat(buf, ":");
strcat(buf, (const char*)drvType); if (drvType)
strcat(buf, (const char*)drvType);
else
strcat(buf, "aio");
}
} else {
if (typ == 0)
strcpy(buf, "file");
else else
strcat(buf, "aio"); strcpy(buf, "phy");
} }
strcat(buf, ":");
strcat(buf, (const char*)source);
} else { } else {
if (typ == 0) strcpy(buf, "");
strcpy(buf, "file");
else
strcpy(buf, "phy");
} }
strcat(buf, ":");
strcat(buf, (const char*)source);
strcat(buf, ","); strcat(buf, ",");
if (hvm && xendConfigVersion == 1) if (hvm && xendConfigVersion == 1)
strcat(buf, "ioemu:"); strcat(buf, "ioemu:");
@ -1637,7 +1652,8 @@ static int xenXMParseXMLDisk(xmlNodePtr node, int hvm, int xendConfigVersion, ch
xmlFree(drvName); xmlFree(drvName);
xmlFree(device); xmlFree(device);
xmlFree(target); xmlFree(target);
xmlFree(source); if(source)
xmlFree(source);
*disk = buf; *disk = buf;
return (ret); return (ret);