External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-06 18:05:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

* src/libvirt.c src/proxy_internal.c src/xs_internal.c: fix the

Browse Source 
patch for rhbz#214264 in the case of Domain 0 on Xen and push the
  defaulting to "linux" down to the xen specific parts.
Daniel
This commit is contained in:
Daniel Veillard 2006-11-08 13:53:29 +00:00
parent e444b199db
commit 515618b907
4 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Wed Nov 8 14:01:11 CET 2006 Daniel Veillard <veillard@redhat.com>
* src/libvirt.c src/proxy_internal.c src/xs_internal.c: fix the
patch for rhbz#214264 in the case of Domain 0 on Xen and push the
defaulting to "linux" down to the xen specific parts.
Tue Nov 7 16:17:23 EDT 2006 Daniel P. Berrange <berrange@redhat.com>
* python/generator.py: Pass in connection object when generating

3
src/libvirt.c
View File

@ -1256,9 +1256,6 @@ virDomainGetOSType(virDomainPtr domain)
}
}
if (str == NULL)
str = strdup("linux");
return (str);
}

4
src/proxy_internal.c
View File

@ -1018,6 +1018,10 @@ xenProxyDomainGetOSType(virDomainPtr domain)
xenProxyClose(domain->conn);
return(NULL);
}
if ((ans.len == sizeof(virProxyPacket)) && (ans.data.arg < 0)) {
return(NULL);
}
if (ans.len <= sizeof(virProxyPacket)) {
virProxyError(domain->conn, VIR_ERR_OPERATION_FAILED, __FUNCTION__);
return (NULL);

5
src/xs_internal.c
View File

@ -683,6 +683,8 @@ xenStoreDomainGetOSType(virDomainPtr domain) {
str = virDomainGetVMInfo(domain, vm, "image/ostype");
free(vm);
}
if (str == NULL)
str = strdup("linux");
return (str);
}
@ -763,6 +765,9 @@ xenStoreDomainGetOSTypeID(virConnectPtr conn, int id) {
str = xs_read(conn->xshandle, 0, &query[0], &len);
free(vm);
}
if (str == NULL)
str = strdup("linux");
return (str);
}