ia64/xen-unstable

changeset 4772:e2c5e62c7c0d

bitkeeper revision 1.1389.5.16 (427a2d48fB11IAeFlv0AL07RxME0vg)

build privcmd even in unpriv domains; minor libxc fix

Signed-off-by: Steven Hand <steven@xensource.com>
author smh22@tempest.cl.cam.ac.uk
date Thu May 05 14:27:20 2005 +0000 (2005-05-05)
parents 86c325c8937a
children 25570fbe05c7
files BitKeeper/etc/ignore linux-2.6.11-xen-sparse/drivers/xen/Makefile tools/libxc/xc_domain.c
line diff
     1.1 --- a/BitKeeper/etc/ignore	Thu May 05 13:28:41 2005 +0000
     1.2 +++ b/BitKeeper/etc/ignore	Thu May 05 14:27:20 2005 +0000
     1.3 @@ -140,3 +140,8 @@ xen/tools/figlet/figlet
     1.4  xen/xen
     1.5  xen/xen-syms
     1.6  xen/xen.*
     1.7 +CRASH.txt
     1.8 +linux-2.4.29-xen-sparse/arch/xen/kernel/foo.ps
     1.9 +skiing-defaults2
    1.10 +tools/libxc/xc_linux_restore.c.SMH
    1.11 +tools/libxc/xc_linux_save.c.SMH
     2.1 --- a/linux-2.6.11-xen-sparse/drivers/xen/Makefile	Thu May 05 13:28:41 2005 +0000
     2.2 +++ b/linux-2.6.11-xen-sparse/drivers/xen/Makefile	Thu May 05 14:27:20 2005 +0000
     2.3 @@ -3,8 +3,8 @@
     2.4  obj-y	+= console/
     2.5  obj-y	+= evtchn/
     2.6  obj-y	+= balloon/
     2.7 +obj-y	+= privcmd/
     2.8  
     2.9 -obj-$(CONFIG_XEN_PRIVILEGED_GUEST)	+= privcmd/
    2.10  obj-$(CONFIG_XEN_BLKDEV_BACKEND)	+= blkback/
    2.11  obj-$(CONFIG_XEN_NETDEV_BACKEND)	+= netback/
    2.12  obj-$(CONFIG_XEN_BLKDEV_FRONTEND)	+= blkfront/
     3.1 --- a/tools/libxc/xc_domain.c	Thu May 05 13:28:41 2005 +0000
     3.2 +++ b/tools/libxc/xc_domain.c	Thu May 05 14:27:20 2005 +0000
     3.3 @@ -103,6 +103,7 @@ int xc_domain_getinfo(int xc_handle,
     3.4      unsigned int nr_doms;
     3.5      u32 next_domid = first_domid;
     3.6      dom0_op_t op;
     3.7 +    int rc = 0; 
     3.8  
     3.9      for ( nr_doms = 0; nr_doms < max_doms; nr_doms++ )
    3.10      {
    3.11 @@ -110,7 +111,7 @@ int xc_domain_getinfo(int xc_handle,
    3.12          op.u.getdomaininfo.domain = (domid_t)next_domid;
    3.13          op.u.getdomaininfo.exec_domain = 0; // FIX ME?!?
    3.14          op.u.getdomaininfo.ctxt = NULL; /* no exec context info, thanks. */
    3.15 -        if ( do_dom0_op(xc_handle, &op) < 0 )
    3.16 +        if ( (rc = do_dom0_op(xc_handle, &op)) < 0 )
    3.17              break;
    3.18          info->domid   = (u16)op.u.getdomaininfo.domain;
    3.19  
    3.20 @@ -137,6 +138,8 @@ int xc_domain_getinfo(int xc_handle,
    3.21          info++;
    3.22      }
    3.23  
    3.24 +    if(!nr_doms) return rc; 
    3.25 +
    3.26      return nr_doms;
    3.27  }
    3.28