mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-07-12 12:55:46 +00:00
* 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. Daniel
This commit is contained in:
parent
e444b199db
commit
515618b907
@ -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>
|
Tue Nov 7 16:17:23 EDT 2006 Daniel P. Berrange <berrange@redhat.com>
|
||||||
|
|
||||||
* python/generator.py: Pass in connection object when generating
|
* python/generator.py: Pass in connection object when generating
|
||||||
|
@ -1256,9 +1256,6 @@ virDomainGetOSType(virDomainPtr domain)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (str == NULL)
|
|
||||||
str = strdup("linux");
|
|
||||||
|
|
||||||
return (str);
|
return (str);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1018,6 +1018,10 @@ xenProxyDomainGetOSType(virDomainPtr domain)
|
|||||||
xenProxyClose(domain->conn);
|
xenProxyClose(domain->conn);
|
||||||
return(NULL);
|
return(NULL);
|
||||||
}
|
}
|
||||||
|
if ((ans.len == sizeof(virProxyPacket)) && (ans.data.arg < 0)) {
|
||||||
|
return(NULL);
|
||||||
|
}
|
||||||
|
|
||||||
if (ans.len <= sizeof(virProxyPacket)) {
|
if (ans.len <= sizeof(virProxyPacket)) {
|
||||||
virProxyError(domain->conn, VIR_ERR_OPERATION_FAILED, __FUNCTION__);
|
virProxyError(domain->conn, VIR_ERR_OPERATION_FAILED, __FUNCTION__);
|
||||||
return (NULL);
|
return (NULL);
|
||||||
|
@ -683,6 +683,8 @@ xenStoreDomainGetOSType(virDomainPtr domain) {
|
|||||||
str = virDomainGetVMInfo(domain, vm, "image/ostype");
|
str = virDomainGetVMInfo(domain, vm, "image/ostype");
|
||||||
free(vm);
|
free(vm);
|
||||||
}
|
}
|
||||||
|
if (str == NULL)
|
||||||
|
str = strdup("linux");
|
||||||
|
|
||||||
return (str);
|
return (str);
|
||||||
}
|
}
|
||||||
@ -763,6 +765,9 @@ xenStoreDomainGetOSTypeID(virConnectPtr conn, int id) {
|
|||||||
str = xs_read(conn->xshandle, 0, &query[0], &len);
|
str = xs_read(conn->xshandle, 0, &query[0], &len);
|
||||||
free(vm);
|
free(vm);
|
||||||
}
|
}
|
||||||
|
if (str == NULL)
|
||||||
|
str = strdup("linux");
|
||||||
|
|
||||||
|
|
||||||
return (str);
|
return (str);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user