← Back to branch summary

~serge-hallyn/ubuntu/oneiric/libvirt/fix-shutdown

« back to all changes in this revision

Viewing changes to src/conf/network_conf.h

  • Committer: Bazaar Package Importer
  • Author(s): Serge Hallyn
  • Date: 2010-11-02 16:26:51 UTC
  • mfrom: (1.2.7 upstream)
  • Revision ID: james.westby@ubuntu.com-20101102162651-aq8tnbz58mdf01bf
Tags: 0.8.5-0ubuntu1
* New upstream release.
* Removed a slew of patches which have been
  applied upstream since 0.8.3.
  - 9012-apparmor-extra-tests.patch
  - 9013-apparmor-chardev.patch
  - 9015-Add-ubd-to-the-list-of-disk-prefixes.patch
  - 9016-Close-fd-s-of-persistent-tap-devices.patch
  - 9017-Make-sure-all-command-line-arguments-get-passed-to-U.patch
  - 9018-Make-umlConnectTapDevice-ask-brAddTap-for-a-persiste.patch
  - 9019-uml-fix-logic-bug-in-checking-reply-length.patch
  - 9021-Allow-chardev-of-type-file-for-UML-domains.patch
  - 9022-Rename-qemudShrinkDisks-to-virDomainDiskRemove-and-m.patch
  - 9023-Support-virDomainAttachDevice-and-virDomainDetachDev.patch
  - 9024-Explicitly-pass-uml_dir-argument-to-user-mode-linux.patch
  - 9025-Add-nwfilter-support-to-UML-driver.patch
  - 9026-Rebuild-network-filter-for-UML-guests-on-updates.patch
  - 9027-Make-newfilter-xml-transformations-endian-safe.patch
  - 9028-lp628055.patch
* Updated 9002-better_default_uri_virsh.patch to use vshStrdup,
  as now required in that file.  (use of strdup now causes compilation
  to fail)
* Removed 9008-run-as-root-by-default.patch, which has not been
  applied for awhile now, with no ill effects.
* Simple refresh of:
  - 0001-remove-RHism.diff.patch
  - 0003-allow-libvirt-group-to-access-the-socket.patch
  - 0004-fix-Debian-specific-path-to-hvm-loader.patch
  - 0006-patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
  - 9000-delayed_iff_up_bridge.patch
  - 9001-dont_clobber_existing_bridges.patch
  - 9003-better-default-arch.patch
  - 9004-libvirtd-group-name.patch
  - 9005-increase-unix-socket-timeout.patch
  - 9006-default-config-test-case.patch
  - 9009-autodetect-nc-params.patch
  - 9010-dont-disable-ipv6.patch
  - 9011-move-ebtables-script.patch
  - 9014-skip-nodeinfotest.patch
  - 9020-lp545795.patch
* Create a patch to include stdint.h so lxc_container.h, which
  #includes linux/fs.h, doesn't trip up on undefined uint64_t.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/conf/network_conf.h
30
30
 
31
31
# include "internal.h"
32
32
# include "threads.h"
 
33
# include "network.h"
33
34
 
34
35
/* 2 possible types of forwarding */
35
36
enum virNetworkForwardType {
43
44
typedef struct _virNetworkDHCPRangeDef virNetworkDHCPRangeDef;
44
45
typedef virNetworkDHCPRangeDef *virNetworkDHCPRangeDefPtr;
45
46
struct _virNetworkDHCPRangeDef {
46
 
    char *start;
47
 
    char *end;
48
 
    int size;
 
47
    virSocketAddr start;
 
48
    virSocketAddr end;
49
49
};
50
50
 
51
51
typedef struct _virNetworkDHCPHostDef virNetworkDHCPHostDef;
53
53
struct _virNetworkDHCPHostDef {
54
54
    char *mac;
55
55
    char *name;
56
 
    char *ip;
 
56
    virSocketAddr ip;
57
57
};
58
58
 
59
59
typedef struct _virNetworkDef virNetworkDef;
70
70
    int forwardType;    /* One of virNetworkForwardType constants */
71
71
    char *forwardDev;   /* Destination device for forwarding */
72
72
 
73
 
    char *ipAddress;    /* Bridge IP address */
74
 
    char *netmask;
75
 
    char *network;
 
73
    virSocketAddr ipAddress;    /* Bridge IP address */
 
74
    virSocketAddr netmask;
76
75
 
77
76
    unsigned int nranges;        /* Zero or more dhcp ranges */
78
77
    virNetworkDHCPRangeDefPtr ranges;
82
81
 
83
82
    char *tftproot;
84
83
    char *bootfile;
85
 
    char *bootserver;
 
84
    virSocketAddr bootserver;
86
85
};
87
86
 
88
87
typedef struct _virNetworkObj virNetworkObj;