diff options
| author |   Daniel Veillard <veillard@redhat.com> | 2006-07-03 13:45:55 +0000 |
|---|---|---|
| committer | Daniel Veillard <veillard@redhat.com> | 2006-07-03 13:45:55 +0000 |
| commit | c74976f13952117bb239a6b44f5a1cb26536accb (patch) | |
| tree | f9d8b4af7741a4c1e6257ec9c52ed2f5f92f2f25 /src | |
| parent | * proxy/libvirt_proxy.c src/proxy_internal.[ch] src/xend_internal.[ch]: (diff) | |
| download | libvirt-c74976f13952117bb239a6b44f5a1cb26536accb.tar.gz libvirt-c74976f13952117bb239a6b44f5a1cb26536accb.tar.bz2 libvirt-c74976f13952117bb239a6b44f5a1cb26536accb.zip | |
* libvirt.spec.in proxy/Makefile.am src/proxy_internal.c
src/xen_internal.c: fixing the proxy installation, integrate in
the spec file and fix a few bugs in the proxy, seems to behave
correctly now.
* docs/apibuild.py docs/*: fixing the doc and API generator
Daniel
Diffstat (limited to 'src')
| -rw-r--r-- | src/proxy_internal.c | 5 | ||||
| -rw-r--r-- | src/xen_internal.c | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/proxy_internal.c b/src/proxy_internal.c index b8716b4db..e588f1e72 100644 --- a/src/proxy_internal.c +++ b/src/proxy_internal.c @@ -468,7 +468,7 @@ retry: } /** - * xenProxyInit: + * xenProxyOpen: * @conn: pointer to the hypervisor connection * @name: URL for the target, NULL for local * @flags: combination of virDrvOpenFlag(s) @@ -714,6 +714,7 @@ xenProxyDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info) } memset(&req, 0, sizeof(req)); req.command = VIR_PROXY_DOMAIN_INFO; + req.data.arg = domain->handle; req.len = sizeof(req); ret = xenProxyCommand(domain->conn, &req, &ans); if (ret < 0) { @@ -765,7 +766,7 @@ xenProxyLookupByID(virConnectPtr conn, int id) xenProxyClose(conn); return(NULL); } - if (req.data.arg == -1) { + if (ans.data.arg == -1) { return(NULL); } memcpy(uuid, &ans.extra.str[0], 16); diff --git a/src/xen_internal.c b/src/xen_internal.c index 761bab6a6..8ec4f1b54 100644 --- a/src/xen_internal.c +++ b/src/xen_internal.c @@ -669,10 +669,6 @@ xenHypervisorGetDomInfo(virConnectPtr conn, int id, virDomainInfoPtr info) int xenHypervisorGetDomainInfo(virDomainPtr domain, virDomainInfoPtr info) { - dom0_op_t op; - dom0_getdomaininfo_t dominfo; - int ret; - if ((domain == NULL) || (domain->conn == NULL) || (domain->conn->handle < 0) || (info == NULL) || (domain->handle < 0)) |