virConnectOpen
virConnectOpenReadOnly
+virDomainGetConnect
+virNetworkGetConnect
virDomainCreateLinux
virDomainDefineXML
virDomainLookupByID
diff --git a/docs/APIfiles.html b/docs/APIfiles.html
index 470d59d1ec..10d533b6c2 100644
--- a/docs/APIfiles.html
+++ b/docs/APIfiles.html
@@ -37,15 +37,16 @@
VIR_VCPU_OFFLINE
VIR_VCPU_RUNNING
_virDomainInfo
-_virDomainKernel
_virNodeInfo
_virSchedParameter
_virVcpuInfo
virConnect
virConnectClose
virConnectGetCapabilities
+virConnectGetHostname
virConnectGetMaxVcpus
virConnectGetType
+virConnectGetURI
virConnectGetVersion
virConnectListDefinedDomains
virConnectListDefinedNetworks
@@ -70,6 +71,7 @@
virDomainDetachDevice
virDomainFree
virDomainGetAutostart
+virDomainGetConnect
virDomainGetID
virDomainGetInfo
virDomainGetMaxMemory
@@ -84,8 +86,6 @@
virDomainGetXMLDesc
virDomainInfo
virDomainInfoPtr
-virDomainKernel
-virDomainKernelPtr
virDomainLookupByID
virDomainLookupByName
virDomainLookupByUUID
@@ -116,6 +116,7 @@
virNetworkFree
virNetworkGetAutostart
virNetworkGetBridgeName
+virNetworkGetConnect
virNetworkGetName
virNetworkGetUUID
virNetworkGetUUIDString
diff --git a/docs/APIfunctions.html b/docs/APIfunctions.html
index c7fa0f19b5..a11a2da473 100644
--- a/docs/APIfunctions.html
+++ b/docs/APIfunctions.html
@@ -28,8 +28,10 @@
virConnSetErrorFunc
virConnectClose
virConnectGetCapabilities
+virConnectGetHostname
virConnectGetMaxVcpus
virConnectGetType
+virConnectGetURI
virConnectGetVersion
virConnectListDefinedDomains
virConnectListDefinedNetworks
@@ -60,6 +62,7 @@
virDomainDetachDevice
virDomainFree
virDomainGetAutostart
+virDomainGetConnect
virDomainGetID
virDomainGetInfo
virDomainGetMaxMemory
@@ -96,6 +99,7 @@
virNetworkFree
virNetworkGetAutostart
virNetworkGetBridgeName
+virNetworkGetConnect
virNetworkGetName
virNetworkGetUUID
virNetworkGetUUIDString
diff --git a/docs/APIsymbols.html b/docs/APIsymbols.html
index dcbd811ec7..97c8ae9a01 100644
--- a/docs/APIsymbols.html
+++ b/docs/APIsymbols.html
@@ -96,7 +96,6 @@
VIR_VCPU_RUNNING
VIR_WAR_NO_NETWORK
_virDomainInfo
-_virDomainKernel
_virError
_virNodeInfo
_virSchedParameter
@@ -108,8 +107,10 @@
virConnect
virConnectClose
virConnectGetCapabilities
+virConnectGetHostname
virConnectGetMaxVcpus
virConnectGetType
+virConnectGetURI
virConnectGetVersion
virConnectListDefinedDomains
virConnectListDefinedNetworks
@@ -136,6 +137,7 @@
virDomainDetachDevice
virDomainFree
virDomainGetAutostart
+virDomainGetConnect
virDomainGetID
virDomainGetInfo
virDomainGetMaxMemory
@@ -150,8 +152,6 @@
virDomainGetXMLDesc
virDomainInfo
virDomainInfoPtr
-virDomainKernel
-virDomainKernelPtr
virDomainLookupByID
virDomainLookupByName
virDomainLookupByUUID
@@ -189,6 +189,7 @@
virNetworkFree
virNetworkGetAutostart
virNetworkGetBridgeName
+virNetworkGetConnect
virNetworkGetName
virNetworkGetUUID
virNetworkGetUUIDString
diff --git a/docs/devhelp/libvirt-libvirt.html b/docs/devhelp/libvirt-libvirt.html
index b3460c2e0d..3ea4bef7d4 100644
--- a/docs/devhelp/libvirt-libvirt.html
+++ b/docs/devhelp/libvirt-libvirt.html
@@ -49,28 +49,26 @@
#define VIR_UUID_STRING_BUFLEN;
#define VIR_GET_CPUMAP(cpumaps, maplen, vcpu);
#define VIR_UNUSE_CPU(cpumap, cpu);
-typedef struct _virNodeInfo virNodeInfo;
-typedef struct _virNetwork virNetwork;
-typedef enum virDeviceMode;
-typedef struct _virConnect virConnect;
-typedef struct _virVcpuInfo virVcpuInfo;
-typedef struct _virDomainInfo virDomainInfo;
-typedef enum virDomainCreateFlags;
-typedef virDomainKernel * virDomainKernelPtr;
-typedef enum virDomainState;
-typedef struct _virDomain virDomain;
-typedef enum virSchedParameterType;
-typedef enum virDomainRestart;
typedef virNodeInfo * virNodeInfoPtr;
typedef virNetwork * virNetworkPtr;
typedef virDomainInfo * virDomainInfoPtr;
typedef virConnect * virConnectPtr;
-typedef struct _virDomainKernel virDomainKernel;
typedef virVcpuInfo * virVcpuInfoPtr;
-typedef virSchedParameter * virSchedParameterPtr;
-typedef enum virVcpuState;
+typedef struct _virNodeInfo virNodeInfo;
+typedef struct _virNetwork virNetwork;
+typedef enum virDomainState;
+typedef enum virDeviceMode;
+typedef struct _virDomain virDomain;
typedef virDomain * virDomainPtr;
typedef struct _virSchedParameter virSchedParameter;
+typedef enum virSchedParameterType;
+typedef enum virDomainRestart;
+typedef struct _virConnect virConnect;
+typedef enum virDomainCreateFlags;
+typedef virSchedParameter * virSchedParameterPtr;
+typedef struct _virDomainInfo virDomainInfo;
+typedef enum virVcpuState;
+typedef struct _virVcpuInfo virVcpuInfo;
int virDomainGetInfo (virDomainPtr domain,
virDomainInfoPtr info);
int virNetworkFree (virNetworkPtr network);
const char * virNetworkGetName (virNetworkPtr network);
@@ -82,7 +80,7 @@ int virNetworkUndefine (virGetVersion (unsigned long * libVer,
const char * type,
unsigned long * typeVer);
int virConnectListDefinedDomains (virConnectPtr conn,
char ** const names,
int maxnames);
char * virConnectGetCapabilities (virConnectPtr conn);
-int virNetworkGetUUID (virNetworkPtr network,
unsigned char * uuid);
+virConnectPtr virNetworkGetConnect (virNetworkPtr net);
virDomainPtr virDomainLookupByName (virConnectPtr conn,
const char * name);
virNetworkPtr virNetworkLookupByUUID (virConnectPtr conn,
const unsigned char * uuid);
char * virNetworkGetBridgeName (virNetworkPtr network);
@@ -107,6 +105,7 @@ int virDomainSetMemory (virNetworkSetAutostart (virNetworkPtr network,
int autostart);
int virConnectNumOfDomains (virConnectPtr conn);
int virDomainGetUUIDString (virDomainPtr domain,
char * buf);
+virConnectPtr virDomainGetConnect (virDomainPtr dom);
unsigned long virDomainGetMaxMemory (virDomainPtr domain);
int virDomainAttachDevice (virDomainPtr domain,
char * xml);
int virDomainGetMaxVcpus (virDomainPtr domain);
@@ -123,6 +122,7 @@ int virConnectClose (virDomainReboot (virDomainPtr domain,
unsigned int flags);
int virInitialize (void);
int virDomainSetVcpus (virDomainPtr domain,
unsigned int nvcpus);
+virDomainPtr virDomainLookupByID (virConnectPtr conn,
int id);
int virNetworkGetUUIDString (virNetworkPtr network,
char * buf);
virNetworkPtr virNetworkLookupByName (virConnectPtr conn,
const char * name);
virNetworkPtr virNetworkCreateXML (virConnectPtr conn,
const char * xmlDesc);
@@ -136,11 +136,13 @@ int virConnectNumOfNetworks (virDomainDetachDevice (virDomainPtr domain,
char * xml);
int virDomainGetAutostart (virDomainPtr domain,
int * autostart);
int virDomainGetVcpus (virDomainPtr domain,
virVcpuInfoPtr info,
int maxinfo,
unsigned char * cpumaps,
int maplen);
+int virNetworkGetUUID (virNetworkPtr network,
unsigned char * uuid);
+char * virConnectGetHostname (virConnectPtr conn);
char * virDomainGetXMLDesc (virDomainPtr domain,
int flags);
int virDomainSetMaxMemory (virDomainPtr domain,
unsigned long memory);
int virConnectGetVersion (virConnectPtr conn,
unsigned long * hvVer);
int virConnectListNetworks (virConnectPtr conn,
char ** const names,
int maxnames);
-virDomainPtr virDomainLookupByID (virConnectPtr conn,
int id);
+char * virConnectGetURI (virConnectPtr conn);
int virDomainSave (virDomainPtr domain,
const char * to);
virConnectPtr virConnectOpenReadOnly (const char * name);
@@ -238,19 +240,6 @@ The content of this structure is not made public by the API.
virDomainInfo * virDomainInfoPtr;
a virDomainInfoPtr is a pointer to a virDomainInfo structure.
-struct _virDomainKernel {
- const char * kernel : filename pointing to the kernel image
- const char * ramdisk : an optional init ramdisk
- const char * root : an optional root block device
- const char * extra : optional kernel command line parameters
-} virDomainKernel;
-
-virDomainKernel * virDomainKernelPtr; -
a virDomainKernelPtr is a pointer to a virDomainKernel structure.
virDomain * virDomainPtr; @@ -355,6 +344,10 @@ The content of this structure is not made public by the API.+virConnectGetCapabilities ()
char * virConnectGetCapabilities (virConnectPtr conn)
Provides capabilities of the hypervisor / driver.
conn: pointer to the hypervisor connection Returns: NULL in case of error, or a pointer to an opaque virCapabilities structure (virCapabilitiesPtr). The client must free the returned string after use.
+virConnectGetHostname ()
char * virConnectGetHostname (virConnectPtr conn)
+This returns the system hostname on which the hypervisor is running (the result of the gethostname(2) system call). If we are connected to a remote system, then this returns the hostname of the remote system.
+
conn: pointer to a hypervisor connection Returns: the hostname which must be freed by the caller, or NULL if there was an error.
virConnectGetMaxVcpus ()
int virConnectGetMaxVcpus (virConnectPtr conn,
const char * type)
Provides the maximum number of virtual CPUs supported for a guest VM of a specific type. The 'type' parameter here corresponds to the 'type' attribute in the <domain> element of the XML.
@@ -363,6 +356,10 @@ The content of this structure is not made public by the API.+virConnectGetType ()
const char * virConnectGetType (virConnectPtr conn)
Get the name of the Hypervisor software used.
conn: pointer to the hypervisor connection Returns: NULL in case of error, a static zero terminated string otherwise. See also: http://www.redhat.com/archives/libvir-list/2007-February/msg00096.html
+virConnectGetURI ()
char * virConnectGetURI (virConnectPtr conn)
+This returns the URI (name) of the hypervisor connection. Normally this is the same as or similar to the string passed to the virConnectOpen/virConnectOpenReadOnly call, but the driver may make the URI canonical. If name == NULL was passed to virConnectOpen, then the driver will return a non-NULL URI which can be used to connect to the same hypervisor later.
+
conn: pointer to a hypervisor connection Returns: the URI string which must be freed by the caller, or NULL if there was an error.
virConnectGetVersion ()
int virConnectGetVersion (virConnectPtr conn,
unsigned long * hvVer)
Get the version level of the Hypervisor running. This may work only with hypervisor call, i.e. with priviledged access to the hypervisor, not with a Read-Only connection.
@@ -443,6 +440,10 @@ The content of this structure is not made public by the API.+virDomainGetAutostart ()
int virDomainGetAutostart (virDomainPtr domain,
int * autostart)
Provides a boolean value indicating whether the domain configured to be automatically started when the host machine boots.
domain: a domain object autostart: the value returned Returns: -1 in case of error, 0 in case of success
+virDomainGetConnect ()
virConnectPtr virDomainGetConnect (virDomainPtr dom)+
+
dom: pointer to a domain Returns: the connection pointer associated with a domain. The reference counter on the connection is not increased by this call. Returns the virConnectPtr or NULL in case of failure.
virDomainGetID ()
unsigned int virDomainGetID (virDomainPtr domain)
Get the hypervisor ID number for the domain
@@ -595,6 +596,10 @@ The content of this structure is not made public by the API.+virNetworkGetBridgeName ()
char * virNetworkGetBridgeName (virNetworkPtr network)
Provides a bridge interface name to which a domain may connect a network interface in order to join the network.
network: a network object Returns: a 0 terminated interface name, or NULL in case of error. the caller must free() the returned value.
+virNetworkGetConnect ()
virConnectPtr virNetworkGetConnect (virNetworkPtr net)+
+
net: pointer to a network Returns: the connection pointer associated with a network. The reference counter on the connection is not increased by this call. Returns the virConnectPtr or NULL in case of failure.
virNetworkGetName ()
const char * virNetworkGetName (virNetworkPtr network)
Get the public name for that network
diff --git a/docs/html/libvirt-libvirt.html b/docs/html/libvirt-libvirt.html index 299b7cf808..7d67c9281a 100644 --- a/docs/html/libvirt-libvirt.html +++ b/docs/html/libvirt-libvirt.html @@ -9,8 +9,6 @@ The content of this structure is not made public by the API.Enum virDomainCreateFlagsStructure virDomainInfo
struct _virDomainInfoTypedef virDomainInfo * virDomainInfoPtr -Structure virDomainKernel
struct _virDomainKernel -Typedef virDomainKernel * virDomainKernelPtrTypedef virDomain * virDomainPtrEnum virDomainRestartEnum virDomainState @@ -27,8 +25,10 @@ The content of this structure is not made public by the API.Enum virVcpuStateint virConnectClose (virConnectPtr conn)char * virConnectGetCapabilities (virConnectPtr conn)+char * virConnectGetHostname (virConnectPtr conn)int virConnectGetMaxVcpus (virConnectPtr conn,
const char * type)const char * virConnectGetType (virConnectPtr conn)+char * virConnectGetURI (virConnectPtr conn)int virConnectGetVersion (virConnectPtr conn,
unsigned long * hvVer)int virConnectListDefinedDomains (virConnectPtr conn,
char ** const names,
int maxnames)int virConnectListDefinedNetworks (virConnectPtr conn,@@ -49,6 +49,7 @@ The content of this structure is not made public by the API.
char ** const names,
int maxnames)int virDomainDetachDevice (virDomainPtr domain,
char * xml)int virDomainFree (virDomainPtr domain)int virDomainGetAutostart (virDomainPtr domain,+
int * autostart)virConnectPtr virDomainGetConnect (virDomainPtr dom)unsigned int virDomainGetID (virDomainPtr domain)int virDomainGetInfo (virDomainPtr domain,
virDomainInfoPtr info)unsigned long virDomainGetMaxMemory (virDomainPtr domain)@@ -87,6 +88,7 @@ The content of this structure is not made public by the API.int virNetworkFree (virNetworkPtr network)int virNetworkGetAutostart (virNetworkPtr network,
int * autostart)char * virNetworkGetBridgeName (virNetworkPtr network)+virConnectPtr virNetworkGetConnect (virNetworkPtr net)const char * virNetworkGetName (virNetworkPtr network)int virNetworkGetUUID (virNetworkPtr network,
unsigned char * uuid)int virNetworkGetUUIDString (virNetworkPtr network,@@ -132,13 +134,6 @@ The content of this structure is not made public by the API. unsigned long long cpuTime : the CPU time used in nanoseconds } a virDomainInfoPtr is a pointer to a virDomainInfo structure. -
char * buf)Structure virDomainKernel
Structure virDomainKernel- a virDomainKernelPtr is a pointer to a virDomainKernel structure. a virDomainPtr is pointer to a virDomain private structure, this is the type used to reference a Xen domain in the API.
struct _virDomainKernel { - const char * kernel : filename pointing to the kernel image - const char * ramdisk : an optional init ramdisk - const char * root : an optional root block device - const char * extra : optional kernel command line parameters -}Enum virDomainRestart
Enum virDomainRestart { @@ -198,11 +193,15 @@ The content of this structure is not made public by the API.This function closes the connection to the Hypervisor. This should not be called if further interaction with the Hypervisor are needed especially if there is running domain which need further monitoring by the application.
conn: pointer to the hypervisor connection Returns: 0 in case of success or -1 in case of error. Function: virConnectGetCapabilities
char * virConnectGetCapabilities (virConnectPtr conn)
Provides capabilities of the hypervisor / driver.
-
conn: pointer to the hypervisor connection Returns: NULL in case of error, or a pointer to an opaque virCapabilities structure (virCapabilitiesPtr). The client must free the returned string after use. Function: virConnectGetMaxVcpus
int virConnectGetMaxVcpus (virConnectPtr conn,
const char * type)
+
conn: pointer to the hypervisor connection Returns: NULL in case of error, or a pointer to an opaque virCapabilities structure (virCapabilitiesPtr). The client must free the returned string after use. Function: virConnectGetHostname
char * virConnectGetHostname (virConnectPtr conn)
+This returns the system hostname on which the hypervisor is running (the result of the gethostname(2) system call). If we are connected to a remote system, then this returns the hostname of the remote system.
+
conn: pointer to a hypervisor connection Returns: the hostname which must be freed by the caller, or NULL if there was an error. Function: virConnectGetMaxVcpus
int virConnectGetMaxVcpus (virConnectPtr conn,
const char * type)
Provides the maximum number of virtual CPUs supported for a guest VM of a specific type. The 'type' parameter here corresponds to the 'type' attribute in the <domain> element of the XML.
conn: pointer to the hypervisor connection type: value of the 'type' attribute in the <domain> element Returns: the maximum of virtual CPU or -1 in case of error. Function: virConnectGetType
const char * virConnectGetType (virConnectPtr conn)
Get the name of the Hypervisor software used.
-
conn: pointer to the hypervisor connection Returns: NULL in case of error, a static zero terminated string otherwise. See also: http://www.redhat.com/archives/libvir-list/2007-February/msg00096.html Function: virConnectGetVersion
int virConnectGetVersion (virConnectPtr conn,
unsigned long * hvVer)
+
conn: pointer to the hypervisor connection Returns: NULL in case of error, a static zero terminated string otherwise. See also: http://www.redhat.com/archives/libvir-list/2007-February/msg00096.html Function: virConnectGetURI
char * virConnectGetURI (virConnectPtr conn)
+This returns the URI (name) of the hypervisor connection. Normally this is the same as or similar to the string passed to the virConnectOpen/virConnectOpenReadOnly call, but the driver may make the URI canonical. If name == NULL was passed to virConnectOpen, then the driver will return a non-NULL URI which can be used to connect to the same hypervisor later.
+
conn: pointer to a hypervisor connection Returns: the URI string which must be freed by the caller, or NULL if there was an error. Function: virConnectGetVersion
int virConnectGetVersion (virConnectPtr conn,
unsigned long * hvVer)
Get the version level of the Hypervisor running. This may work only with hypervisor call, i.e. with priviledged access to the hypervisor, not with a Read-Only connection.
conn: pointer to the hypervisor connection hvVer: return value for the version of the running hypervisor (OUT) Returns: -1 in case of error, 0 otherwise. if the version can't be extracted by lack of capacities returns 0 and @hvVer is 0, otherwise @hvVer value is major * 1,000,000 + minor * 1,000 + release Function: virConnectListDefinedDomains
int virConnectListDefinedDomains (virConnectPtr conn,
char ** const names,
int maxnames)
list the defined domains, stores the pointers to the names in @names
@@ -242,7 +241,9 @@ The content of this structure is not made public by the API.Free the domain object. The running instance is kept alive. The data structure is freed and should not be used thereafter.
domain: a domain object Returns: 0 in case of success and -1 in case of failure. Function: virDomainGetAutostart
int virDomainGetAutostart (virDomainPtr domain,
int * autostart)
Provides a boolean value indicating whether the domain configured to be automatically started when the host machine boots.
-
domain: a domain object autostart: the value returned Returns: -1 in case of error, 0 in case of success Function: virDomainGetID
unsigned int virDomainGetID (virDomainPtr domain)
+
domain: a domain object autostart: the value returned Returns: -1 in case of error, 0 in case of success Function: virDomainGetConnect
virConnectPtr virDomainGetConnect (virDomainPtr dom)+
+
dom: pointer to a domain Returns: the connection pointer associated with a domain. The reference counter on the connection is not increased by this call. Returns the virConnectPtr or NULL in case of failure. Function: virDomainGetID
unsigned int virDomainGetID (virDomainPtr domain)
Get the hypervisor ID number for the domain
domain: a domain object Returns: the domain ID number or (unsigned int) -1 in case of error Function: virDomainGetInfo
int virDomainGetInfo (virDomainPtr domain,
virDomainInfoPtr info)
Extract information about a domain. Note that if the connection used to get the domain is limited only a partial set of the information can be extracted.
@@ -318,7 +319,9 @@ The content of this structure is not made public by the API.Provides a boolean value indicating whether the network configured to be automatically started when the host machine boots.
network: a network object autostart: the value returned Returns: -1 in case of error, 0 in case of success Function: virNetworkGetBridgeName
char * virNetworkGetBridgeName (virNetworkPtr network)
Provides a bridge interface name to which a domain may connect a network interface in order to join the network.
-
network: a network object Returns: a 0 terminated interface name, or NULL in case of error. the caller must free() the returned value. Function: virNetworkGetName
const char * virNetworkGetName (virNetworkPtr network)
+
network: a network object Returns: a 0 terminated interface name, or NULL in case of error. the caller must free() the returned value. Function: virNetworkGetConnect
virConnectPtr virNetworkGetConnect (virNetworkPtr net)+
+
net: pointer to a network Returns: the connection pointer associated with a network. The reference counter on the connection is not increased by this call. Returns the virConnectPtr or NULL in case of failure. Function: virNetworkGetName
const char * virNetworkGetName (virNetworkPtr network)
Get the public name for that network
network: a network object Returns: a pointer to the name or NULL, the string need not be deallocated its lifetime will be the same as the network object. Function: virNetworkGetUUID
int virNetworkGetUUID (virNetworkPtr network,
unsigned char * uuid)
Get the UUID for a network
diff --git a/docs/libvirt-api.xml b/docs/libvirt-api.xml index 1866510105..093b2430f3 100644 --- a/docs/libvirt-api.xml +++ b/docs/libvirt-api.xml @@ -41,30 +41,27 @@- - - - - - - - - - - - - - - + + + + + + + + + + + + + - @@ -79,7 +76,7 @@ - + @@ -104,6 +101,7 @@ + @@ -120,6 +118,7 @@ + @@ -133,11 +132,13 @@ + + - + @@ -375,15 +376,6 @@ - a virDomainInfoPtr is a pointer to a virDomainInfo structure. - -- - - - - a virDomainKernelPtr is a pointer to a virDomainKernel structure. -@@ -473,6 +465,11 @@ a virDomainPtr is pointer to a virDomain private structure, this is the type used to reference a Xen domain in the API. + + This returns the system hostname on which the hypervisor is running (the result of the gethostname(2) system call). If we are connected to a remote system, then this returns the hostname of the remote system. ++ + + Provides the maximum number of virtual CPUs supported for a guest VM of a specific type. The 'type' parameter here corresponds to the 'type' attribute in the <domain> element of the XML. @@ -484,6 +481,11 @@ + This returns the URI (name) of the hypervisor connection. Normally this is the same as or similar to the string passed to the virConnectOpen/virConnectOpenReadOnly call, but the driver may make the URI canonical. If name == NULL was passed to virConnectOpen, then the driver will return a non-NULL URI which can be used to connect to the same hypervisor later. ++ + + Get the version level of the Hypervisor running. This may work only with hypervisor call, i.e. with priviledged access to the hypervisor, not with a Read-Only connection. @@ -611,6 +613,11 @@ + + + + + Get the hypervisor ID number for the domain @@ -842,6 +849,11 @@ + + + + Get the public name for that network diff --git a/docs/libvirt-refs.xml b/docs/libvirt-refs.xml index f7f253ed92..b492f38aee 100644 --- a/docs/libvirt-refs.xml +++ b/docs/libvirt-refs.xml @@ -97,7 +97,6 @@ - @@ -109,8 +108,10 @@ + + @@ -137,6 +138,7 @@ + @@ -151,8 +153,6 @@ - - @@ -190,6 +190,7 @@ + @@ -315,7 +316,6 @@ - @@ -329,8 +329,10 @@ + + @@ -357,6 +359,7 @@ + @@ -371,8 +374,6 @@ - - @@ -410,6 +411,7 @@ + @@ -444,6 +446,8 @@ + + @@ -509,8 +513,10 @@ + + @@ -545,6 +551,7 @@ + @@ -587,6 +594,7 @@ + @@ -649,15 +657,16 @@ - + + @@ -682,6 +691,7 @@ + @@ -696,8 +706,6 @@ - - @@ -728,6 +736,7 @@ + @@ -1010,6 +1019,9 @@ + + + @@ -1074,6 +1086,10 @@ + + + + @@ -1113,6 +1129,8 @@ + + @@ -1141,6 +1159,7 @@ + + + @@ -1195,13 +1214,13 @@- - @@ -1329,6 +1348,7 @@ + @@ -1351,6 +1371,10 @@ ++ + + @@ -1423,9 +1447,6 @@ -- - @@ -1449,6 +1470,7 @@ + @@ -1479,14 +1501,18 @@ + + + + @@ -1502,6 +1528,8 @@ + + @@ -1515,10 +1543,14 @@ + ++ + @@ -1566,9 +1598,6 @@ - - - @@ -1588,8 +1617,12 @@ + ++ + @@ -1621,6 +1654,10 @@ + + + + @@ -1696,7 +1733,6 @@ - @@ -1734,6 +1770,7 @@+ @@ -1785,9 +1822,6 @@ -- - @@ -1829,6 +1863,8 @@ + + @@ -1889,6 +1925,9 @@ ++ + @@ -1944,6 +1983,9 @@ ++ + @@ -1970,15 +2012,16 @@ - - - + + + + @@ -1999,9 +2042,6 @@ -- - - @@ -2056,9 +2096,6 @@ - - @@ -2083,6 +2120,7 @@ + @@ -2140,9 +2178,6 @@ -- - @@ -2192,6 +2227,9 @@ ++ + @@ -2218,6 +2256,7 @@ + @@ -2297,6 +2336,8 @@ + + @@ -2309,6 +2350,7 @@ + @@ -2364,6 +2406,9 @@ + + + @@ -2377,6 +2422,7 @@ + @@ -2389,6 +2435,7 @@ + @@ -2435,7 +2482,6 @@ - @@ -2472,7 +2518,6 @@ - @@ -2486,6 +2531,9 @@ + + + @@ -2508,9 +2556,6 @@ -- - @@ -2576,9 +2621,6 @@ -- - @@ -2603,6 +2645,10 @@ + + + + @@ -2619,6 +2665,7 @@ + @@ -2674,9 +2721,11 @@ + + @@ -2704,15 +2753,14 @@ + + - - - @@ -2720,6 +2768,7 @@ + @@ -2740,6 +2789,7 @@ + @@ -2795,6 +2845,7 @@ + @@ -2887,6 +2938,7 @@ + @@ -2934,6 +2986,7 @@+ @@ -2975,6 +3028,8 @@ + + @@ -2983,6 +3038,8 @@ + + @@ -2997,6 +3054,9 @@ + + + @@ -3007,6 +3067,7 @@ + @@ -3085,6 +3146,7 @@ + @@ -3149,6 +3211,16 @@ + + + ++ + ++ + + @@ -3252,6 +3324,8 @@ + + @@ -3281,6 +3355,8 @@ + + @@ -3293,6 +3369,7 @@ + @@ -3316,9 +3393,11 @@ + + @@ -3354,8 +3433,8 @@ - - + +