← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/libvirt/jaunty-updates

« back to all changes in this revision

Viewing changes to src/lxc_container.h

  • Committer: Bazaar Package Importer
  • Author(s): Soren Hansen
  • Date: 2009-01-08 23:01:16 UTC
  • mfrom: (1.1.8 upstream) (3.1.7 sid)
  • Revision ID: james.westby@ubuntu.com-20090108230116-niu4xzgypapywhmx
Tags: 0.5.1-4ubuntu1
* Merge with Debian experimental.
  - debian/control:
    + Don't build-depend on QEmu.
    + Add "XS-Debian-" prefix to Debian's Vcs headers.
    + Bump bridge-utils, dnsmasq-base, netcat-openbsd, and iptables
      to Depends of libvirt-bin.
    + s/interract/interact/g
    + Add versioned Conflicts/Replaces to libvirt0 for libvirt0-dbg,
      since we used to ship them as such.
  - Rename libvirt group to libvirtd.
  - 0005-delayed_iff_up_bridge.patch: Don't try to bring up the bridge
    before at least one interface has been added to it.
  - dont_clobber_existing_bridges.patch: Assign the name of the virtual
    bridge dynamically to avoid interfering with existing bridges.
  - better_default_uri_virsh.patch: Default to qemu:///system if the
    user has write access to the libvirt socket, otherwise
    qemu:///session.
  - We call libxen-dev libxen3-dev, so change all references.
* Included (but did not enable) opennebula patch (since it's not in
  the archive yet).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/lxc_container.h
30
30
    LXC_CONTAINER_FEATURE_NET = (1 << 0),
31
31
};
32
32
 
 
33
#define LXC_DEV_MAJ_MEMORY  1
 
34
#define LXC_DEV_MIN_NULL    3
 
35
#define LXC_DEV_MIN_ZERO    5
 
36
#define LXC_DEV_MIN_FULL    7
 
37
#define LXC_DEV_MIN_RANDOM  8
 
38
#define LXC_DEV_MIN_URANDOM 9
 
39
 
 
40
#define LXC_DEV_MAJ_TTY     5
 
41
#define LXC_DEV_MIN_CONSOLE 1
 
42
 
 
43
#define LXC_DEV_MAJ_PTY     136
 
44
 
33
45
int lxcContainerSendContinue(int control);
34
46
 
35
47
int lxcContainerStart(virDomainDefPtr def,