From 29182e995ecc499d8a47a4d02e92329b768b4043 Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Tue, 19 Sep 2006 15:55:57 +0000 Subject: [PATCH] * src/xen_internal.c: applied patch from Jim Fehlig, about one of the content of the hypercall structures in 3.0.2 Daniel --- ChangeLog | 5 +++ docs/APIchunk0.html | 14 ++++++- docs/APIchunk1.html | 63 ++++++++++++++++++++++++----- docs/APIchunk2.html | 26 ++++++++++-- docs/APIchunk3.html | 28 ++++++++++--- docs/APIconstructors.html | 5 ++- docs/APIfiles.html | 24 ++++++++++- docs/APIfunctions.html | 9 ++++- docs/APIsymbols.html | 30 ++++++++++++-- docs/apibuild.py | 2 + docs/devhelp/libvirt-virterror.html | 10 ++++- docs/libvirt-api.xml | 20 +++++++-- docs/libvirt-refs.xml | 18 +++++++++ src/xen_internal.c | 2 +- 14 files changed, 219 insertions(+), 37 deletions(-) diff --git a/ChangeLog b/ChangeLog index bddcd4d1d1..f7b5f52ed6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Sep 19 16:59:53 CEST 2006 Daniel Veillard + + * src/xen_internal.c: applied patch from Jim Fehlig, about + one of the content of the hypercall structures in 3.0.2 + Thu Sep 14 10:33:23 EDT 2006 Daniel Berrange * src/xml.c: Append :disk for normal disk devices being created diff --git a/docs/APIchunk0.html b/docs/APIchunk0.html index ddb6228035..0c0d699e0b 100644 --- a/docs/APIchunk0.html +++ b/docs/APIchunk0.html @@ -58,6 +58,7 @@ virNodeGetInfo

Letter F:

For
virDomainGetUUIDString
Free
virDomainFree
+
Frees
virConfFree

Letter G:

Get
virConnectGetType
virConnectGetVersion
virDomainGetID
@@ -74,6 +75,7 @@

Letter K:

KBytes
_virDomainInfo

Letter L:

Launch
virDomainCreateLinux
Linux
virDomainCreateLinux
+
Lookup
virConfGetValue

Letter M:

Macro
LIBVIR_VERSION_NUMBER

Letter N:

NUMA
_virNodeInfo
Note
virDomainGetInfo
@@ -81,6 +83,7 @@ virDomainSetVcpus
virDomainShutdown

Letter O:

OUT
cpumap
+virConfWriteMem
virConnectGetVersion
virDomainGetVcpus
virGetVersion
@@ -94,6 +97,8 @@ virGetVersion

Letter R:

RFC4122
virDomainGetUUIDString
Read-Only
virConnectGetVersion
+
Reads
virConfReadFile
+virConfReadMem
Reboot
virDomainReboot
Reset
virConnResetLastError
virResetError
@@ -148,6 +153,8 @@
VIR_CPU_USABLE
VIR_CPU_USABLE
VIR_GET_CPUMAP
VIR_GET_CPUMAP

Letter W:

What
_virError
+
Writes
virConfWriteFile
+virConfWriteMem

Letter X:

XML
virDomainCreateLinux
virDomainDefineXML
virDomainGetXMLDesc
@@ -182,6 +189,7 @@
against
virGetVersion
alive
virDomainFree
all
VIR_CPU_MAPLEN
+virConfFree
virDomainDestroy
virDomainGetVcpus
allocated
cpumap
@@ -211,6 +219,7 @@ virDomainDestroy
virDomainPinVcpu
virSetErrorFunc
+
area
virConfWriteMem
argument
virConnectOpen
virConnectOpenReadOnly
array
VIR_COPY_CPUMAP
@@ -221,9 +230,12 @@ virDomainGetUUID
virDomainGetUUIDString
virDomainGetVcpus
+
associated
virConfFree
+virConfGetValue
assumed
virDomainGetVcpus
virGetVersion
available
_virError
+virConfWriteMem
virConnectOpenReadOnly
availble
virGetVersion
avoid
virInitialize
@@ -232,4 +244,4 @@ g-n o-s t-z -

main menu

related links

Graphics and design by Diana Fong

+

main menu

related links

Graphics and design by Diana Fong

diff --git a/docs/APIchunk1.html b/docs/APIchunk1.html index 223c183ce1..ce69ca22ec 100644 --- a/docs/APIchunk1.html +++ b/docs/APIchunk1.html @@ -5,7 +5,9 @@ g-n o-s t-z -

Letter b:

back
virConnSetErrorFunc
+

Letter b:

back
virConfWriteFile
+virConfWriteMem
+virConnSetErrorFunc
virDomainDestroy
virGetVersion
based
virDomainCreateLinux
@@ -33,17 +35,22 @@ virDomainSuspend
virDomainUndefine
virGetLastError
-
byte
virDomainPinVcpu
+
byte
virConfReadMem
+virConfWriteMem
+virDomainPinVcpu
bytes
VIR_CPU_MAPLEN
cpumap
cpumaps
maplen
+virConfWriteFile
+virConfWriteMem
virDomainGetUUID
virDomainGetUUIDString
virDomainGetVcpus
virDomainPinVcpu

Letter c:

calculate
VIR_NODEINFO_MAXCPUS
-
call
virConnectGetVersion
+
call
virConfWriteMem
+virConnectGetVersion
virDomainCreate
virDomainDestroy
virDomainSave
@@ -52,7 +59,8 @@
callback
virConnSetErrorFunc
virErrorFunc
virSetErrorFunc
-
called
virConnSetErrorFunc
+
called
virConfGetValue
+virConnSetErrorFunc
virConnectClose
virConnectOpen
virConnectOpenReadOnly
@@ -62,7 +70,8 @@ virDomainGetXMLDesc
calling
virDomainResume
calloc
virDomainGetVcpus
-
can
virConnectGetVersion
+
can
virConfReadMem
+virConnectGetVersion
virDomainGetInfo
virDomainPinVcpu
capacities
virConnectGetVersion
@@ -89,6 +98,15 @@
command
_virDomainKernel
compiled
virGetVersion
complete
VIR_CPU_MAPLEN
+
conf
virConfWriteFile
+virConfWriteMem
+
config
virConfWriteMem
+
configuration
virConfFree
+virConfGetValue
+virConfReadFile
+virConfReadMem
+virConfWriteFile
+virConfWriteMem
conjonction
VIR_COPY_CPUMAP
VIR_CPU_MAPLEN
VIR_CPU_USABLE
@@ -96,7 +114,8 @@ VIR_UNUSE_CPU
VIR_USE_CPU
consequent
_virError
-
content
virConnCopyLastError
+
content
virConfReadMem
+virConnCopyLastError
virCopyLastError
contents
virDomainSave
control
virConnectOpenReadOnly
@@ -124,7 +143,11 @@
cupmap
virDomainGetVcpus
currently
virConnectOpen
virConnectOpenReadOnly
-

Letter d:

data
virConnSetErrorFunc
+

Letter d:

data
virConfFree
+virConfGetValue
+virConfReadFile
+virConfReadMem
+virConnSetErrorFunc
virDomainDestroy
virDomainFree
virErrorFunc
@@ -155,9 +178,13 @@ virDomainCreate
down
virDomainDestroy
driver
virGetVersion
+
due
virConfWriteMem

Letter e:

each
virDomainPinVcpu
+
element
_virConfValue
encoded
virDomainGetXMLDesc
+
entry
virConfGetValue
especially
virConnectClose
+
even
virConfWriteMem
expected
_virNodeInfo
extra
_virError
virDomainReboot
@@ -166,6 +193,10 @@ virDomainGetInfo
extraction
virDomainGetXMLDesc

Letter f:

fail
virDomainSetVcpus
+
failed
virConfGetValue
+virConfReadFile
+virConfReadMem
+
fails
virConfWriteMem
failure
virDomainCreateLinux
virDomainDestroy
virDomainFree
@@ -187,7 +218,13 @@ virDomainSuspend
virGetVersion
virNodeGetInfo
-
file
virDomainSave
+
file
virConfFree
+virConfGetValue
+virConfReadFile
+virConfReadMem
+virConfWriteFile
+virConfWriteMem
+virDomainSave
filename
_virDomainKernel
filled
virDomainGetVcpus
find
virDomainLookupByID
@@ -197,6 +234,7 @@ virDomainReboot
for
_virDomainInfo
_virNodeInfo
+virConfWriteMem
virConnGetLastError
virConnectGetVersion
virDomainDefineXML
@@ -223,10 +261,13 @@ virConnectListDomains
virConnectNumOfDomains
virCopyLastError
-
free
virConnCopyLastError
+
free
virConfReadFile
+virConfReadMem
+virConnCopyLastError
virCopyLastError
virDomainGetXMLDesc
-
freed
virDomainDestroy
+
freed
virConfGetValue
+virDomainDestroy
virDomainFree
virDomainGetOSType
frequency
_virNodeInfo
@@ -261,4 +302,4 @@ g-n o-s t-z -

main menu

related links

Graphics and design by Diana Fong

+

main menu

related links

Graphics and design by Diana Fong

diff --git a/docs/APIchunk2.html b/docs/APIchunk2.html index 2cd8b3c0d3..c3ad83d585 100644 --- a/docs/APIchunk2.html +++ b/docs/APIchunk2.html @@ -22,7 +22,11 @@
guest
virDomainCreateLinux
virDomainReboot
virDomainShutdown
-

Letter h:

handler
virConnSetErrorFunc
+

Letter h:

handle
virConfFree
+virConfGetValue
+virConfReadFile
+virConfReadMem
+
handler
virConnSetErrorFunc
virSetErrorFunc
handling
virConnSetErrorFunc
virSetErrorFunc
@@ -37,6 +41,7 @@
ignore
virDomainReboot
virDomainShutdown
image
_virDomainKernel
+
indicates
virConfWriteMem
indicating
_virNodeInfo
info
virDomainGetVcpus
information
_virError
@@ -53,7 +58,9 @@ virDomainDestroy
virDomainFree
virDomainGetXMLDesc
+
insufficient
virConfWriteMem
int
virDomainGetID
+
integer
_virConfValue
interaction
virConnectClose
into
VIR_COPY_CPUMAP
its
virDomainGetName
@@ -79,6 +86,8 @@ virDomainGetXMLDesc
launch
virDomainCreate
least
virDomainPinVcpu
+
lenght
virConfReadMem
+virConfWriteMem
length
VIR_CPU_MAPLEN
maplen
level
virConnectGetVersion
@@ -102,12 +111,18 @@
limited
virDomainGetInfo
virDomainSetVcpus
line
_virDomainKernel
-
list
virConnectListDefinedDomains
+
list
_virConfValue
+virConnectListDefinedDomains
virConnectListDomains
listed
virDomainSave
little-endian
virDomainPinVcpu
+
loaded
virConfReadMem
+
long
_virConfValue
looked
virGetVersion
-
lookup
virDomainLookupByName
+
lookup
virConfGetValue
+virConfReadFile
+virConfReadMem
+virDomainLookupByName
virDomainLookupByUUID
virDomainLookupByUUIDString
lowest
virDomainPinVcpu
@@ -149,6 +164,8 @@
mem
_virNodeInfo
memory
_virDomainInfo
_virNodeInfo
+virConfReadMem
+virConfWriteMem
virDomainGetMaxMemory
virDomainGetVcpus
virDomainSave
@@ -194,6 +211,7 @@ virDomainLookupByUUID
virDomainLookupByUUIDString
virDomainSetVcpus
+
next
_virConfValue
node
_virNodeInfo
virNodeGetInfo
non
VIR_CPU_USABLE
@@ -221,4 +239,4 @@ g-n o-s t-z -

main menu

related links

Graphics and design by Diana Fong

+

main menu

related links

Graphics and design by Diana Fong

diff --git a/docs/APIchunk3.html b/docs/APIchunk3.html index ac1dbbe934..5d82d37a30 100644 --- a/docs/APIchunk3.html +++ b/docs/APIchunk3.html @@ -54,16 +54,22 @@ virCopyLastError
virDomainDefineXML
virGetVersion
-
output
virDomainSave
-

Letter p:

parameter
virConnCopyLastError
+
output
virConfWriteMem
+virDomainSave
+

Letter p:

parameter
virConfWriteMem
+virConnCopyLastError
virCopyLastError
parameters
_virDomainKernel
+
parse
virConfReadFile
+virConfReadMem
part
_virError
partial
virDomainGetInfo
pass
virConnSetErrorFunc
virConnectOpen
virConnectOpenReadOnly
-
path
virDomainRestore
+
path
virConfReadFile
+virConfWriteFile
+virDomainRestore
virDomainSave
per
_virNodeInfo
physical
VIR_CPU_MAPLEN
@@ -104,6 +110,7 @@
ramdisk
_virDomainKernel
raw
virDomainLookupByUUID
reactivate
virDomainSuspend
+
read
virConfReadFile
real
_virVcpuInfo
cpumap
virDomainGetVcpus
@@ -121,6 +128,7 @@
request
virDomainReboot
virDomainShutdown
required
VIR_CPU_MAPLEN
+virConfWriteMem
requires
virDomainCreateLinux
virDomainDestroy
virDomainPinVcpu
@@ -182,6 +190,8 @@ virDomainGetInfo
virDomainGetXMLDesc
virDomainPinVcpu
+
settings
virConfReadFile
+virConfReadMem
should
virConnectClose
virConnectOpen
virConnectOpenReadOnly
@@ -193,6 +203,7 @@
similar
virDomainCreateLinux
single
VIR_CPU_MAPLEN
size
_virNodeInfo
+virConfWriteMem
virConnectListDefinedDomains
virConnectListDomains
virDomainGetMaxMemory
@@ -202,6 +213,7 @@ virDomainSetMemory
socket
_virNodeInfo
software
virConnectGetType
+
space
virConfWriteMem
specified
VIR_COPY_CPUMAP
VIR_GET_CPUMAP
start
virDomainDefineXML
@@ -218,14 +230,17 @@
stopped
virDomainReboot
virDomainShutdown
store
VIR_CPU_MAPLEN
+virConfWriteMem
virConnectListDefinedDomains
virConnectListDomains
virConnectOpen
virDomainGetVcpus
stored
virDomainPinVcpu
stores
virConnectListDefinedDomains
-
string
_virError
+
string
_virConfValue
+_virError
_virNodeInfo
+virConfReadMem
virConnectGetType
virDomainGetName
virDomainGetOSType
@@ -237,7 +252,8 @@ virNodeGetInfo
structures
virDomainGetVcpus
succeed
virDomainCreate
-
success
virConnectClose
+
success
virConfFree
+virConnectClose
virDomainCreate
virDomainDestroy
virDomainFree
@@ -273,4 +289,4 @@ g-n o-s t-z -

main menu

related links

Graphics and design by Diana Fong

+

main menu

related links

Graphics and design by Diana Fong

diff --git a/docs/APIconstructors.html b/docs/APIconstructors.html index 3349078b76..f2f2246d7e 100644 --- a/docs/APIconstructors.html +++ b/docs/APIconstructors.html @@ -2,6 +2,9 @@ List of constructors for libvirt

List of constructors for libvirt

Type unsigned int:

virDomainGetID

Type unsigned long:

virDomainGetMaxMemory
+

Type virConfPtr:

virConfReadFile
+virConfReadMem
+

Type virConfValuePtr:

virConfGetValue

Type virConnectPtr:

virConnectOpen
virConnectOpenReadOnly

Type virDomainPtr:

virDomainCreateLinux
@@ -12,4 +15,4 @@ virDomainLookupByUUIDString

Type virErrorPtr:

virConnGetLastError
virGetLastError
-

main menu

related links

Graphics and design by Diana Fong

+

main menu

related links

Graphics and design by Diana Fong

diff --git a/docs/APIfiles.html b/docs/APIfiles.html index 5b6c892f72..aa0875b01e 100644 --- a/docs/APIfiles.html +++ b/docs/APIfiles.html @@ -89,6 +89,7 @@ virVcpuInfoPtr
virVcpuState

Module virterror:

VIR_ERR_CALL_FAILED
+VIR_ERR_CONF_SYNTAX
VIR_ERR_DOM_EXIST
VIR_ERR_DRIVER_FULL
VIR_ERR_ERROR
@@ -112,15 +113,20 @@ VIR_ERR_NO_XEN
VIR_ERR_NO_XENSTORE
VIR_ERR_OK
+VIR_ERR_OPEN_FAILED
VIR_ERR_OPERATION_DENIED
VIR_ERR_OPERATION_FAILED
VIR_ERR_OS_TYPE
+VIR_ERR_PARSE_FAILED
VIR_ERR_POST_FAILED
+VIR_ERR_READ_FAILED
VIR_ERR_SEXPR_SERIAL
VIR_ERR_UNKNOWN_HOST
VIR_ERR_WARNING
+VIR_ERR_WRITE_FAILED
VIR_ERR_XEN_CALL
VIR_ERR_XML_ERROR
+VIR_FROM_CONF
VIR_FROM_DOM
VIR_FROM_NONE
VIR_FROM_PROXY
@@ -147,4 +153,20 @@ virResetError
virResetLastError
virSetErrorFunc
-

main menu

related links

Graphics and design by Diana Fong

+

Module conf:

VIR_CONF_LIST
+VIR_CONF_LONG
+VIR_CONF_NONE
+VIR_CONF_STRING
+_virConfValue
+virConf
+virConfFree
+virConfGetValue
+virConfPtr
+virConfReadFile
+virConfReadMem
+virConfType
+virConfValue
+virConfValuePtr
+virConfWriteFile
+virConfWriteMem
+

main menu

related links

Graphics and design by Diana Fong

diff --git a/docs/APIfunctions.html b/docs/APIfunctions.html index 45d6addc1e..f9d2f8097a 100644 --- a/docs/APIfunctions.html +++ b/docs/APIfunctions.html @@ -2,7 +2,8 @@ List of function manipulating types in libvirt

List of function manipulating types in libvirt

Type const char **:

virConnectListDefinedDomains

Type const unsigned char *:

virDomainLookupByUUID
-

Type int *:

virConnectListDomains
+

Type int *:

virConfWriteMem
+virConnectListDomains

Type unsigned char *:

virDomainGetUUID
virDomainGetVcpus
virDomainPinVcpu
@@ -14,6 +15,10 @@ virDomainSetMemory

Type unsigned long *:

virConnectGetVersion
virGetVersion
+

Type virConfPtr:

virConfFree
+virConfGetValue
+virConfWriteFile
+virConfWriteMem

Type virConnectPtr:

virConnCopyLastError
virConnGetLastError
virConnResetLastError
@@ -67,4 +72,4 @@

Type void *:

virConnSetErrorFunc
virErrorFunc
virSetErrorFunc
-

main menu

related links

Graphics and design by Diana Fong

+

main menu

related links

Graphics and design by Diana Fong

diff --git a/docs/APIsymbols.html b/docs/APIsymbols.html index 5f32e8e512..9e45b3ef24 100644 --- a/docs/APIsymbols.html +++ b/docs/APIsymbols.html @@ -1,7 +1,11 @@ Alphabetic List of Symbols in libvirt +

main menu

related links

Graphics and design by Diana Fong

diff --git a/docs/apibuild.py b/docs/apibuild.py index 96752eb9de..4feb42e641 100755 --- a/docs/apibuild.py +++ b/docs/apibuild.py @@ -39,6 +39,8 @@ ignored_files = { "xmlrpc.c": "internal code", "test.h": "test driver", "test.c": "test driver", + "conf.h": "internal code", + "conf.c": "internal code", } ignored_words = { diff --git a/docs/devhelp/libvirt-virterror.html b/docs/devhelp/libvirt-virterror.html index 08719e49bd..78a96d8cf2 100644 --- a/docs/devhelp/libvirt-virterror.html +++ b/docs/devhelp/libvirt-virterror.html @@ -87,7 +87,8 @@ void virConnResetLastError (VIR_FROM_XML = 5 /* Error in the XML code */ VIR_FROM_DOM = 6 /* Error when operating on a domain */ VIR_FROM_RPC = 7 /* Error in the XML-RPC code */ - VIR_FROM_PROXY = 8 /* Error in the proxy code */ + VIR_FROM_PROXY = 8 /* Error in the proxy code */ + VIR_FROM_CONF = 9 /* Error in the configuration file handling */ };

@@ -130,7 +131,12 @@ void virConnResetLastError (VIR_ERR_CALL_FAILED = 26 /* not supported by the drivers */ VIR_ERR_XML_ERROR = 27 /* an XML description is not well formed or broken */ VIR_ERR_DOM_EXIST = 28 /* the domain already exist */ - VIR_ERR_OPERATION_DENIED = 29 /* operation forbidden on read-only connections */ + VIR_ERR_OPERATION_DENIED = 29 /* operation forbidden on read-only connections */ + VIR_ERR_OPEN_FAILED = 30 /* failed to open a conf file */ + VIR_ERR_READ_FAILED = 31 /* failed to read a conf file */ + VIR_ERR_PARSE_FAILED = 32 /* failed to parse a conf file */ + VIR_ERR_CONF_SYNTAX = 33 /* failed to parse the syntax of a conf file */ + VIR_ERR_WRITE_FAILED = 34 /* failed to write a conf file */ };

diff --git a/docs/libvirt-api.xml b/docs/libvirt-api.xml index 4674ebb8cb..bd9721547d 100644 --- a/docs/libvirt-api.xml +++ b/docs/libvirt-api.xml @@ -109,11 +109,13 @@ - + + + @@ -125,17 +127,21 @@ - + + + + + @@ -218,6 +224,7 @@ + @@ -241,18 +248,23 @@ - + + + + + + - + diff --git a/docs/libvirt-refs.xml b/docs/libvirt-refs.xml index 7711380c4a..b5559c5d2d 100644 --- a/docs/libvirt-refs.xml +++ b/docs/libvirt-refs.xml @@ -22,6 +22,7 @@ + @@ -45,15 +46,20 @@ + + + + + @@ -174,6 +180,7 @@ + @@ -197,15 +204,20 @@ + + + + + @@ -522,6 +534,7 @@ + @@ -545,15 +558,20 @@ + + + + + diff --git a/src/xen_internal.c b/src/xen_internal.c index 005bba9ed4..7f0898c1ef 100644 --- a/src/xen_internal.c +++ b/src/xen_internal.c @@ -90,7 +90,7 @@ struct xen_v0_getdomaininfo { uint32_t flags; /* falgs, see before */ uint64_t tot_pages; /* total number of pages used */ uint64_t max_pages; /* maximum number of pages allowed */ - uint64_t shared_info_frame; /* MFN of shared_info struct */ + unsigned long shared_info_frame; /* MFN of shared_info struct */ uint64_t cpu_time; /* CPU time used */ uint32_t nr_online_vcpus; /* Number of VCPUs currently online. */ uint32_t max_vcpu_id; /* Maximum VCPUID in use by this domain. */ -- GitLab