~serge-hallyn/ubuntu/raring/libvirt/libvirt-hugepages

« back to all changes in this revision

Viewing changes to src/xen_internal.h

  • Committer: James Westby
  • Author(s): Jamie Strandboge
  • Date: 2009-12-02 14:22:21 UTC
  • mfrom: (1.2.3 upstream) (3.4.9 squeeze)
  • Revision ID: james.westby@canonical.com-20091202142221-ltkr0to6h52mla1y
Tags: 0.7.2-4ubuntu1
* Merge from debian testing. Remaining changes:
  - debian/control:
    + Don't build-depend on QEmu
    + Bump bridge-utils, dnsmasq-base, netcat-openbsd, and iptables
      to Depends of libvirt-bin
    + Recommends qemu-kvm (>= 0.11.0-0ubuntu6)
    + Add versioned Conflicts/Replaces to libvirt0 for libvirt0-dbg,
      since we used to ship them as such
    + We call libxen-dev libxen3-dev, so change all references
    + Build-Depends on libxml2-utils
    + Build-Depends on open-iscsi-utils instead of open-iscsi due to
      LP: #414986
  - debian/postinst:
    + rename the libvirt group to libvirtd
    + add each admin user to the libvirtd group
  - debian/libvirt-bin.postrm: rename the libvirt group to libvirtd
  - debian/rules: add DEB_MAKE_CHECK_TARGET := check
  - debian/patches/900[0-7]: updated/refreshed for new paths in 0.7.2
  - debian/patches/series: don't apply 0002-qemu-disable-network.diff.patch
  - AppArmor integration:
    + debian/control: Build-Depends on libapparmor-dev and Suggests
      apparmor (>= 2.3+1289-0ubuntu14)
    + debian/libvirt-bin.dirs: add /etc/apparmor.d/abstractions,
      /etc/apparmor.d/force-complain, /etc/apparmor.d/libvirt,
      /etc/cron.daily and /usr/share/apport/package-hooks
    + add debian/libvirt-bin.cron.daily (LP: #438165)
    + add debian/libvirt-bin.apport
    + debian/libvirt-bin.install: install apparmor profiles, abstractions
      and apport hook
    + debian/postinst: reload apparmor profiles
    + debian/libvirt-bin.postrm: remove apparmor symlinks on purge
    + debian/libvirt-bin.preinst: added to force complain on certain
      upgrades
    + debian/README.Debian: add AppArmor section based on the upstream
      documentation
    + debian/rules: use --with-apparmor and copy apparmor and apport hook to
      debian/tmp
  - Dropped the following patches now included upstream:
    + 0005-Close-logfile-fd-after-spawning-qemu.patch
    + 9090-reenable-nonfile-labels.patch
    + 9091-apparmor.patch
    + 9092-apparmor-autoreconf.patch
* AppArmor integration updates:
  - debian/apparmor/usr.sbin.libvirtd: allow libvirtd access to
    /usr/lib/libvirt/* (LP: #480478)
  - debian/apparmor/libvirt-qemu: allow guests access to
    /etc/pki/libvirt-vnc/** (LP: #484562)
  - debian/libvirt-bin.postinst: 0.7.2 moved /usr/bin/virt-aa-helper to
    /usr/lib/libvirt, so the profile changed from usr.bin.virt-aa-helper
    to usr.lib.libvirt.virt-aa-helper and needs to be migrated. If the user
    made no changes to the old profile, remove it, otherwise, update the
    paths, preserving the shipped usr.lib.libvirt.virt-aa-helper
  - update to 0.7.4 version of the sVirt AppArmor driver (can be dropped in
    0.7.4):
    + debian/patches/9008-apparmor-caps-mockup.patch
    + debian/patches/9009-apparmor-lp453335.patch
    + debian/patches/9010-apparmor-lp460271.patch
    + debian/patches/9011-apparmor-code-cleanups.patch
  - add virt-aa-helper-test and examples/apparmor that were omitted from the
    upstream tarball (can be dropped in 0.7.5):
    + debian/patches/9012-apparmor-add-virt-aa-helper-test.patch
    + debian/patches/9013-apparmor-examples.patch
    + debian/rules: add post-patches target to make virt-aa-helper-test
      executable
* debian/patches/0005-Fix-SELinux-linking-issues.patch: updated to work
  when both apparmor and selinux are available. This patch should be
  dropped in 0.7.4.
* debian/patches/9007-default-config-test-case.patch: updated to not fail
  if building in a deep directory
* debian/patches/9014-event-fuzz.patch: add a little fuzz to not be quite
  so precise with expected expiry time. Fixes FTBFS with HZ=100 kernels.
  Can be dropped in 0.7.5.
* debian/patches/9015-hal-startup-failure-is-nonfatal.patch: disable hal
  driver if hald is not running instead of dying. Can be dropped in
  0.7.4.
* debian/control: temporarily remove Build-Depends on libcap-ng-dev, which
  isn't available in Ubuntu main yet
* revert change to new source format 3.0 (quilt) since Launchpad can't
  handle it yet (see LP: #293106)

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
/*
2
 
 * xen_internal.h: internal API for direct access to Xen hypervisor level
3
 
 *
4
 
 * Copyright (C) 2005 Red Hat, Inc.
5
 
 *
6
 
 * See COPYING.LIB for the License of this software
7
 
 *
8
 
 * Daniel Veillard <veillard@redhat.com>
9
 
 */
10
 
 
11
 
#ifndef __VIR_XEN_INTERNAL_H__
12
 
#define __VIR_XEN_INTERNAL_H__
13
 
 
14
 
#include <libxml/uri.h>
15
 
 
16
 
#include "internal.h"
17
 
#include "capabilities.h"
18
 
#include "driver.h"
19
 
 
20
 
extern struct xenUnifiedDriver xenHypervisorDriver;
21
 
int    xenHypervisorInit                 (void);
22
 
 
23
 
virCapsPtr xenHypervisorMakeCapabilities (virConnectPtr conn);
24
 
 
25
 
/* The following calls are made directly by the Xen proxy: */
26
 
 
27
 
virDomainPtr
28
 
        xenHypervisorLookupDomainByID   (virConnectPtr conn,
29
 
                                         int id);
30
 
virDomainPtr
31
 
        xenHypervisorLookupDomainByUUID (virConnectPtr conn,
32
 
                                         const unsigned char *uuid);
33
 
char *
34
 
        xenHypervisorDomainGetOSType    (virDomainPtr dom);
35
 
 
36
 
virDrvOpenStatus
37
 
        xenHypervisorOpen               (virConnectPtr conn,
38
 
                                         virConnectAuthPtr auth,
39
 
                                         int flags);
40
 
int     xenHypervisorClose              (virConnectPtr conn);
41
 
int     xenHypervisorGetVersion         (virConnectPtr conn,
42
 
                                         unsigned long *hvVer);
43
 
virCapsPtr
44
 
        xenHypervisorMakeCapabilitiesInternal(virConnectPtr conn,
45
 
                                              const char *hostmachine,
46
 
                                              FILE *cpuinfo,
47
 
                                              FILE *capabilities);
48
 
char *
49
 
        xenHypervisorGetCapabilities    (virConnectPtr conn);
50
 
unsigned long
51
 
        xenHypervisorGetDomMaxMemory    (virConnectPtr conn,
52
 
                                         int id);
53
 
int     xenHypervisorNumOfDomains       (virConnectPtr conn);
54
 
int     xenHypervisorListDomains        (virConnectPtr conn,
55
 
                                         int *ids,
56
 
                                         int maxids);
57
 
int     xenHypervisorGetMaxVcpus        (virConnectPtr conn,
58
 
                                         const char *type);
59
 
int     xenHypervisorDestroyDomain      (virDomainPtr domain);
60
 
int     xenHypervisorResumeDomain       (virDomainPtr domain);
61
 
int     xenHypervisorPauseDomain        (virDomainPtr domain);
62
 
int     xenHypervisorGetDomainInfo        (virDomainPtr domain,
63
 
                                         virDomainInfoPtr info);
64
 
int     xenHypervisorGetDomInfo         (virConnectPtr conn,
65
 
                                         int id,
66
 
                                         virDomainInfoPtr info);
67
 
int     xenHypervisorSetMaxMemory       (virDomainPtr domain,
68
 
                                         unsigned long memory);
69
 
int     xenHypervisorCheckID            (virConnectPtr conn,
70
 
                                         int id);
71
 
int     xenHypervisorSetVcpus           (virDomainPtr domain,
72
 
                                         unsigned int nvcpus);
73
 
int     xenHypervisorPinVcpu            (virDomainPtr domain,
74
 
                                         unsigned int vcpu,
75
 
                                         unsigned char *cpumap,
76
 
                                         int maplen);
77
 
int     xenHypervisorGetVcpus           (virDomainPtr domain,
78
 
                                         virVcpuInfoPtr info,
79
 
                                         int maxinfo,
80
 
                                         unsigned char *cpumaps,
81
 
                                         int maplen);
82
 
int     xenHypervisorGetVcpuMax         (virDomainPtr domain);
83
 
 
84
 
char *  xenHypervisorGetSchedulerType   (virDomainPtr domain,
85
 
                                         int *nparams);
86
 
 
87
 
int     xenHypervisorGetSchedulerParameters(virDomainPtr domain,
88
 
                                         virSchedParameterPtr params,
89
 
                                         int *nparams);
90
 
 
91
 
int     xenHypervisorSetSchedulerParameters(virDomainPtr domain,
92
 
                                         virSchedParameterPtr params,
93
 
                                         int nparams);
94
 
 
95
 
int     xenHypervisorDomainBlockStats   (virDomainPtr domain,
96
 
                                         const char *path,
97
 
                                         struct _virDomainBlockStats *stats);
98
 
int     xenHypervisorDomainInterfaceStats (virDomainPtr domain,
99
 
                                         const char *path,
100
 
                                         struct _virDomainInterfaceStats *stats);
101
 
 
102
 
int     xenHypervisorNodeGetCellsFreeMemory(virConnectPtr conn,
103
 
                                          unsigned long long *freeMems,
104
 
                                          int startCell,
105
 
                                          int maxCells);
106
 
 
107
 
int     xenHavePrivilege(void);
108
 
 
109
 
#endif                          /* __VIR_XEN_INTERNAL_H__ */