← Back to branch summary

~ubuntu-branches/ubuntu/karmic/libvirt/karmic-proposed

« back to all changes in this revision

Viewing changes to src/openvz_conf.h

  • Committer: Bazaar Package Importer
  • Author(s): Soren Hansen
  • Date: 2009-02-11 01:01:42 UTC
  • mfrom: (1.1.9 upstream)
  • Revision ID: james.westby@ubuntu.com-20090211010142-8zrm7z1u6ryfhkiq
Tags: 0.6.0-1ubuntu1
* Merge with Debian experimental. Remaining changes:
  - 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
    main yet).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/openvz_conf.h
30
30
 
31
31
#include "internal.h"
32
32
#include "domain_conf.h"
 
33
#include "threads.h"
33
34
 
34
35
enum { OPENVZ_WARN, OPENVZ_ERR };
35
36
 
36
 
#define openvzLog(level, msg...) { if(level == OPENVZ_WARN) \
37
 
                                        fprintf(stderr, "\nWARNING: ");\
38
 
                                else \
39
 
                                        fprintf(stderr, "\nERROR: ");\
40
 
                                fprintf(stderr, "\n\t");\
41
 
                                fprintf(stderr, msg);\
42
 
                                fprintf(stderr, "\n"); }
43
 
 
44
37
#define openvzError(conn, code, fmt...)                                      \
45
38
        virReportErrorHelper(conn, VIR_FROM_OPENVZ, code, __FILE__,        \
46
39
                               __FUNCTION__, __LINE__, fmt)
53
46
#define VZCTL_BRIDGE_MIN_VERSION ((3 * 1000 * 1000) + (0 * 1000) + 22 + 1)
54
47
 
55
48
struct openvz_driver {
 
49
    virMutex lock;
 
50
 
56
51
    virCapsPtr caps;
57
52
    virDomainObjList domains;
58
53
    int version;