← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/conf/storage_conf.h

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2012-05-13 15:44:12 UTC
  • mfrom: (1.2.13)
  • Revision ID: package-import@ubuntu.com-20120513154412-fgmn5sxqdzgnzlx3
Tags: 0.9.12-0ubuntu1
* New upstream version:
  * Synchronize with debian packaging:
    - debian/control: Update build depends.
    - debian/libvirt-bin.postrm: Cleanup /var/log/libvirt
      on purge.
    - Bump standards verson (no changes).
    - debian/patches/Don-t-fail-if-we-can-t-setup-avahi.patch: Added
  * Dropped patches:
    - debian/patches/Debianize-libvirt-guests.patch
    - debian/patches/rewrite-lxc-controller-eof-handling-yet-again
    - debian/patches/ubuntu/libnl13.patch
    - debian/patches/ubuntu/fix-lxc-startup-error.patch
    - debian/patches/ubuntu/fix-bridge-fd.patch
    - debian/patches/ubuntu/skip-labelling-network-disks.patch
    - debian/patches/ubuntu/xen-xend-shutdown-detection.patch
    - debian/patches/ubuntu/xen-config-no-vfb-for-hvm.patch
    - debian/patches/debian/Disable-daemon-start-test.patch
    - debian/patches/debian/Disable-gnulib-s-test-nonplocking-pipe.sh.patch
    - debian/patches/ubuntu/9006-default-config-test-case.patch
    - debian/patches/fix-block-migration.patch
    - debian/patches/ubuntu/9022-qemu-unescape-HMP-commands-before-converting-them-to.patch
    - debian/patches/ubuntu/9023-qemu-change-rbd-auth_supported-separation-character-.patch
    - debian/patches/ubuntu/9024-qemu-allow-snapshotting-of-sheepdog-and-rbd-disks.patch
    - debian/patches/9025-qemu-change-rbd-auth_supported-separation-character-.patch
    - debian/patches/ubuntu/arm-gcc-workaround.patch
  * Rediffed:
    - debian/patches/Allow-libvirt-group-to-access-the-socket.patch
    - debian/patches/Disable-failing-virnetsockettest.patch
    - debian/patches/dnsmasq-as-priv-user
    - debian/patches/9002-better_default_uri_virsh.patch
  * debian/control: Add libnl-route-3-dev ass a build depends.
  * debian/patches/libnl3-build-fix.patch: Fix build with libnl3.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/conf/storage_conf.h
1
1
/*
2
2
 * storage_conf.h: config handling for storage driver
3
3
 *
4
 
 * Copyright (C) 2006-2008, 2010-2011 Red Hat, Inc.
 
4
 * Copyright (C) 2006-2008, 2010-2012 Red Hat, Inc.
5
5
 * Copyright (C) 2006-2008 Daniel P. Berrange
6
6
 *
7
7
 * This library is free software; you can redistribute it and/or
38
38
typedef struct _virStoragePerms virStoragePerms;
39
39
typedef virStoragePerms *virStoragePermsPtr;
40
40
struct _virStoragePerms {
41
 
    int mode;
42
 
    int uid;
43
 
    int gid;
 
41
    mode_t mode;
 
42
    uid_t uid;
 
43
    gid_t gid;
44
44
    char *label;
45
45
};
46
46
 
92
92
 
93
93
    unsigned int building;
94
94
 
95
 
    unsigned long long allocation;
96
 
    unsigned long long capacity;
 
95
    unsigned long long allocation; /* bytes */
 
96
    unsigned long long capacity; /* bytes */
97
97
 
98
98
    virStorageVolSource source;
99
99
    virStorageVolTarget target;
212
212
typedef struct _virStoragePoolSource virStoragePoolSource;
213
213
typedef virStoragePoolSource *virStoragePoolSourcePtr;
214
214
struct _virStoragePoolSource {
215
 
    /* An optional host */
216
 
    virStoragePoolSourceHost host;
 
215
    /* An optional (maybe multiple) host(s) */
 
216
    size_t nhost;
 
217
    virStoragePoolSourceHostPtr hosts;
217
218
 
218
219
    /* And either one or more devices ... */
219
220
    int ndevice;
262
263
    unsigned char uuid[VIR_UUID_BUFLEN];
263
264
    int type; /* virStoragePoolType */
264
265
 
265
 
    unsigned long long allocation;
266
 
    unsigned long long capacity;
267
 
    unsigned long long available;
 
266
    unsigned long long allocation; /* bytes */
 
267
    unsigned long long capacity; /* bytes */
 
268
    unsigned long long available; /* bytes */
268
269
 
269
270
    virStoragePoolSource source;
270
271
    virStoragePoolTarget target;