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

* src/libvir.c src/xen_internal.c: fixed the new Xen hypervisor call 

Daniel
This commit is contained in:
Daniel Veillard 2005-12-08 10:12:18 +00:00
parent 7c82cb733f
commit 5a3d05007e
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Thu Dec 8 11:12:36 CET 2005 Daniel Veillard <veillard@redhat.com>
* src/libvir.c src/xen_internal.c: fixed the new Xen hypervisor call
Wed Dec 7 19:09:48 CET 2005 Daniel Veillard <veillard@redhat.com>
* configure.in src/Makefile.am src/libvir.c src/xen_internal.c

2
src/libvir.c
View File

@ -636,7 +636,7 @@ virDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info) {
dominfo.domain = domain->handle;
ret = xenHypervisorGetDomainInfo(domain->conn->handle, domain->handle,
&dominfo);
if (ret <= 0)
if (ret < 0)
return(-1);
switch (dominfo.flags & 0xFF) {
case DOMFLAGS_DYING:

9
src/xen_internal.c
View File

@ -84,6 +84,7 @@ int xenHypervisorClose(int handle) {
static int
xenHypervisorDoOp(int handle, dom0_op_t *op) {
int ret;
unsigned int cmd;
hypercall_t hc;
op->interface_version = DOM0_INTERFACE_VERSION;
@ -93,8 +94,8 @@ xenHypervisorDoOp(int handle, dom0_op_t *op) {
if (mlock(op, sizeof(dom0_op_t)) < 0)
return(-1);
ret = ioctl(handle, _IOC(_IOC_NONE, 'P', 0, sizeof(hypercall_t)),
(unsigned long) &hc);
cmd = _IOC(_IOC_NONE, 'P', 0, sizeof(hc));
ret = ioctl(handle, cmd, (unsigned long) &hc);
if (munlock(op, sizeof(dom0_op_t)) < 0)
ret = -1;
@ -132,13 +133,15 @@ xenHypervisorGetDomainInfo(int handle, int domain, dom0_getdomaininfo_t *info) {
op.u.getdomaininfolist.first_domain = (domid_t) domain;
op.u.getdomaininfolist.max_domains = 1;
op.u.getdomaininfolist.buffer = info;
op.u.getdomaininfolist.num_domains = 1;
info->domain = domain;
ret = xenHypervisorDoOp(handle, &op);
if (munlock(info, sizeof(dom0_getdomaininfo_t)) < 0)
ret = -1;
if (ret <= 0)
if (ret < 0)
return(-1);
return(0);
}