External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-05 04:25:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename internal DumpXML functions to GetXMLDesc

Browse Source 
This matches the public API and helps to get rid of some special
case code in the remote generator.

Rename driver API functions and XDR protocol structs.

No functional change included outside of the remote generator.
This commit is contained in:
Matthias Bolte 2011-05-06 21:53:10 +02:00
parent fcf967f2ad
commit 9817604afc
31 changed files with 141 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
daemon/remote_generator.pl
View File

@ -645,8 +645,6 @@ elsif ($opt_b) {
$prefix = "Connect" $prefix = "Connect"
} elsif ($calls{$_}->{ProcName} eq "SupportsFeature") { } elsif ($calls{$_}->{ProcName} eq "SupportsFeature") {
$prefix = "Drv" $prefix = "Drv"
} elsif ($calls{$_}->{ProcName} =~ m/^(\S+)DumpXML$/) {
$proc_name = "${1}GetXMLDesc"
} elsif ($calls{$_}->{ProcName} eq "CPUBaseline") { } elsif ($calls{$_}->{ProcName} eq "CPUBaseline") {
$proc_name = "ConnectBaselineCPU" $proc_name = "ConnectBaselineCPU"
} elsif ($calls{$_}->{ProcName} eq "CPUCompare") { } elsif ($calls{$_}->{ProcName} eq "CPUCompare") {
@ -892,8 +890,8 @@ elsif ($opt_k) {
# fix bad decisions in the xdr protocol # fix bad decisions in the xdr protocol
if ($arg_name eq "flags" and if ($arg_name eq "flags" and
$call->{ProcName} ne "DomainCoreDump" and $call->{ProcName} ne "DomainCoreDump" and
$call->{ProcName} ne "DomainDumpXML" and $call->{ProcName} ne "DomainGetXMLDesc" and
$call->{ProcName} ne "NetworkDumpXML") { $call->{ProcName} ne "NetworkGetXMLDesc") {
$type_name = "unsigned int"; $type_name = "unsigned int";
} elsif ($arg_name eq "nvcpus" and } elsif ($arg_name eq "nvcpus" and
$call->{ProcName} eq "DomainSetVcpus") { $call->{ProcName} eq "DomainSetVcpus") {

16
src/driver.h
View File

@ -176,7 +176,7 @@ typedef int
const char *to, const char *to,
int flags); int flags);
typedef char * typedef char *
(*virDrvDomainDumpXML) (virDomainPtr dom, (*virDrvDomainGetXMLDesc) (virDomainPtr dom,
int flags); int flags);
typedef char * typedef char *
(*virDrvConnectDomainXMLFromNative) (virConnectPtr conn, (*virDrvConnectDomainXMLFromNative) (virConnectPtr conn,
@ -474,7 +474,7 @@ typedef virDomainSnapshotPtr
unsigned int flags); unsigned int flags);
typedef char * typedef char *
(*virDrvDomainSnapshotDumpXML)(virDomainSnapshotPtr snapshot, (*virDrvDomainSnapshotGetXMLDesc)(virDomainSnapshotPtr snapshot,
unsigned int flags); unsigned int flags);
typedef int typedef int
@ -577,7 +577,7 @@ struct _virDriver {
virDrvDomainGetMaxVcpus domainGetMaxVcpus; virDrvDomainGetMaxVcpus domainGetMaxVcpus;
virDrvDomainGetSecurityLabel domainGetSecurityLabel; virDrvDomainGetSecurityLabel domainGetSecurityLabel;
virDrvNodeGetSecurityModel nodeGetSecurityModel; virDrvNodeGetSecurityModel nodeGetSecurityModel;
virDrvDomainDumpXML domainDumpXML; virDrvDomainGetXMLDesc domainGetXMLDesc;
virDrvConnectDomainXMLFromNative domainXMLFromNative; virDrvConnectDomainXMLFromNative domainXMLFromNative;
virDrvConnectDomainXMLToNative domainXMLToNative; virDrvConnectDomainXMLToNative domainXMLToNative;
virDrvListDefinedDomains listDefinedDomains; virDrvListDefinedDomains listDefinedDomains;
@ -632,7 +632,7 @@ struct _virDriver {
virDrvDomainHasManagedSaveImage domainHasManagedSaveImage; virDrvDomainHasManagedSaveImage domainHasManagedSaveImage;
virDrvDomainManagedSaveRemove domainManagedSaveRemove; virDrvDomainManagedSaveRemove domainManagedSaveRemove;
virDrvDomainSnapshotCreateXML domainSnapshotCreateXML; virDrvDomainSnapshotCreateXML domainSnapshotCreateXML;
virDrvDomainSnapshotDumpXML domainSnapshotDumpXML; virDrvDomainSnapshotGetXMLDesc domainSnapshotGetXMLDesc;
virDrvDomainSnapshotNum domainSnapshotNum; virDrvDomainSnapshotNum domainSnapshotNum;
virDrvDomainSnapshotListNames domainSnapshotListNames; virDrvDomainSnapshotListNames domainSnapshotListNames;
virDrvDomainSnapshotLookupByName domainSnapshotLookupByName; virDrvDomainSnapshotLookupByName domainSnapshotLookupByName;
@ -676,7 +676,7 @@ typedef int
typedef int typedef int
(*virDrvNetworkDestroy) (virNetworkPtr network); (*virDrvNetworkDestroy) (virNetworkPtr network);
typedef char * typedef char *
(*virDrvNetworkDumpXML) (virNetworkPtr network, (*virDrvNetworkGetXMLDesc) (virNetworkPtr network,
int flags); int flags);
typedef char * typedef char *
(*virDrvNetworkGetBridgeName) (virNetworkPtr network); (*virDrvNetworkGetBridgeName) (virNetworkPtr network);
@ -722,7 +722,7 @@ struct _virNetworkDriver {
virDrvNetworkUndefine networkUndefine; virDrvNetworkUndefine networkUndefine;
virDrvNetworkCreate networkCreate; virDrvNetworkCreate networkCreate;
virDrvNetworkDestroy networkDestroy; virDrvNetworkDestroy networkDestroy;
virDrvNetworkDumpXML networkDumpXML; virDrvNetworkGetXMLDesc networkGetXMLDesc;
virDrvNetworkGetBridgeName networkGetBridgeName; virDrvNetworkGetBridgeName networkGetBridgeName;
virDrvNetworkGetAutostart networkGetAutostart; virDrvNetworkGetAutostart networkGetAutostart;
virDrvNetworkSetAutostart networkSetAutostart; virDrvNetworkSetAutostart networkSetAutostart;
@ -1021,7 +1021,7 @@ typedef int (*virDevMonListDevices)(virConnectPtr conn,
typedef virNodeDevicePtr (*virDevMonDeviceLookupByName)(virConnectPtr conn, typedef virNodeDevicePtr (*virDevMonDeviceLookupByName)(virConnectPtr conn,
const char *name); const char *name);
typedef char * (*virDevMonDeviceDumpXML)(virNodeDevicePtr dev, typedef char * (*virDevMonDeviceGetXMLDesc)(virNodeDevicePtr dev,
unsigned int flags); unsigned int flags);
typedef char * (*virDevMonDeviceGetParent)(virNodeDevicePtr dev); typedef char * (*virDevMonDeviceGetParent)(virNodeDevicePtr dev);
@ -1051,7 +1051,7 @@ struct _virDeviceMonitor {
virDevMonNumOfDevices numOfDevices; virDevMonNumOfDevices numOfDevices;
virDevMonListDevices listDevices; virDevMonListDevices listDevices;
virDevMonDeviceLookupByName deviceLookupByName; virDevMonDeviceLookupByName deviceLookupByName;
virDevMonDeviceDumpXML deviceDumpXML; virDevMonDeviceGetXMLDesc deviceGetXMLDesc;
virDevMonDeviceGetParent deviceGetParent; virDevMonDeviceGetParent deviceGetParent;
virDevMonDeviceNumOfCaps deviceNumOfCaps; virDevMonDeviceNumOfCaps deviceNumOfCaps;
virDevMonDeviceListCaps deviceListCaps; virDevMonDeviceListCaps deviceListCaps;

2
src/esx/esx_device_monitor.c
View File

@ -72,7 +72,7 @@ static virDeviceMonitor esxDeviceMonitor = {
NULL, /* numOfDevices */ NULL, /* numOfDevices */
NULL, /* listDevices */ NULL, /* listDevices */
NULL, /* deviceLookupByName */ NULL, /* deviceLookupByName */
NULL, /* deviceDumpXML */ NULL, /* deviceGetXMLDesc */
NULL, /* deviceGetParent */ NULL, /* deviceGetParent */
NULL, /* deviceNumOfCaps */ NULL, /* deviceNumOfCaps */
NULL, /* deviceListCaps */ NULL, /* deviceListCaps */

8
src/esx/esx_driver.c
View File

@ -2610,7 +2610,7 @@ esxDomainGetMaxVcpus(virDomainPtr domain)
static char * static char *
esxDomainDumpXML(virDomainPtr domain, int flags) esxDomainGetXMLDesc(virDomainPtr domain, int flags)
{ {
esxPrivate *priv = domain->conn->privateData; esxPrivate *priv = domain->conn->privateData;
esxVI_String *propertyNameList = NULL; esxVI_String *propertyNameList = NULL;
@ -4137,7 +4137,7 @@ esxDomainSnapshotCreateXML(virDomainPtr domain, const char *xmlDesc,
static char * static char *
esxDomainSnapshotDumpXML(virDomainSnapshotPtr snapshot, esxDomainSnapshotGetXMLDesc(virDomainSnapshotPtr snapshot,
unsigned int flags) unsigned int flags)
{ {
esxPrivate *priv = snapshot->domain->conn->privateData; esxPrivate *priv = snapshot->domain->conn->privateData;
@ -4634,7 +4634,7 @@ static virDriver esxDriver = {
esxDomainGetMaxVcpus, /* domainGetMaxVcpus */ esxDomainGetMaxVcpus, /* domainGetMaxVcpus */
NULL, /* domainGetSecurityLabel */ NULL, /* domainGetSecurityLabel */
NULL, /* nodeGetSecurityModel */ NULL, /* nodeGetSecurityModel */
esxDomainDumpXML, /* domainDumpXML */ esxDomainGetXMLDesc, /* domainGetXMLDesc */
esxDomainXMLFromNative, /* domainXMLFromNative */ esxDomainXMLFromNative, /* domainXMLFromNative */
esxDomainXMLToNative, /* domainXMLToNative */ esxDomainXMLToNative, /* domainXMLToNative */
esxListDefinedDomains, /* listDefinedDomains */ esxListDefinedDomains, /* listDefinedDomains */
@ -4689,7 +4689,7 @@ static virDriver esxDriver = {
NULL, /* domainHasManagedSaveImage */ NULL, /* domainHasManagedSaveImage */
NULL, /* domainManagedSaveRemove */ NULL, /* domainManagedSaveRemove */
esxDomainSnapshotCreateXML, /* domainSnapshotCreateXML */ esxDomainSnapshotCreateXML, /* domainSnapshotCreateXML */
esxDomainSnapshotDumpXML, /* domainSnapshotDumpXML */ esxDomainSnapshotGetXMLDesc, /* domainSnapshotGetXMLDesc */
esxDomainSnapshotNum, /* domainSnapshotNum */ esxDomainSnapshotNum, /* domainSnapshotNum */
esxDomainSnapshotListNames, /* domainSnapshotListNames */ esxDomainSnapshotListNames, /* domainSnapshotListNames */
esxDomainSnapshotLookupByName, /* domainSnapshotLookupByName */ esxDomainSnapshotLookupByName, /* domainSnapshotLookupByName */

2
src/esx/esx_network_driver.c
View File

@ -80,7 +80,7 @@ static virNetworkDriver esxNetworkDriver = {
NULL, /* networkUndefine */ NULL, /* networkUndefine */
NULL, /* networkCreate */ NULL, /* networkCreate */
NULL, /* networkDestroy */ NULL, /* networkDestroy */
NULL, /* networkDumpXML */ NULL, /* networkGetXMLDesc */
NULL, /* networkGetBridgeName */ NULL, /* networkGetBridgeName */
NULL, /* networkGetAutostart */ NULL, /* networkGetAutostart */
NULL, /* networkSetAutostart */ NULL, /* networkSetAutostart */

4
src/esx/esx_storage_driver.c
View File

@ -1523,7 +1523,7 @@ esxStorageVolumeGetInfo(virStorageVolPtr volume, virStorageVolInfoPtr info)
static char * static char *
esxStorageVolumeDumpXML(virStorageVolPtr volume, unsigned int flags) esxStorageVolumeGetXMLDesc(virStorageVolPtr volume, unsigned int flags)
{ {
esxPrivate *priv = volume->conn->storagePrivateData; esxPrivate *priv = volume->conn->storagePrivateData;
virStoragePoolDef pool; virStoragePoolDef pool;
@ -1676,7 +1676,7 @@ static virStorageDriver esxStorageDriver = {
esxStorageVolumeDelete, /* volDelete */ esxStorageVolumeDelete, /* volDelete */
esxStorageVolumeWipe, /* volWipe */ esxStorageVolumeWipe, /* volWipe */
esxStorageVolumeGetInfo, /* volGetInfo */ esxStorageVolumeGetInfo, /* volGetInfo */
esxStorageVolumeDumpXML, /* volGetXMLDesc */ esxStorageVolumeGetXMLDesc, /* volGetXMLDesc */
esxStorageVolumeGetPath, /* volGetPath */ esxStorageVolumeGetPath, /* volGetPath */
esxStoragePoolIsActive, /* poolIsActive */ esxStoragePoolIsActive, /* poolIsActive */
esxStoragePoolIsPersistent, /* poolIsPersistent */ esxStoragePoolIsPersistent, /* poolIsPersistent */

20
src/libvirt.c
View File

@ -3207,9 +3207,9 @@ virDomainGetXMLDesc(virDomainPtr domain, int flags)
flags &= VIR_DOMAIN_XML_FLAGS_MASK; flags &= VIR_DOMAIN_XML_FLAGS_MASK;
if (conn->driver->domainDumpXML) { if (conn->driver->domainGetXMLDesc) {
char *ret; char *ret;
ret = conn->driver->domainDumpXML (domain, flags); ret = conn->driver->domainGetXMLDesc(domain, flags);
if (!ret) if (!ret)
goto error; goto error;
return ret; return ret;
@ -3431,12 +3431,12 @@ virDomainMigrateVersion2 (virDomainPtr domain,
* different. We fetch the domain XML of the source domain * different. We fetch the domain XML of the source domain
* and pass it to Prepare2. * and pass it to Prepare2.
*/ */
if (!domain->conn->driver->domainDumpXML) { if (!domain->conn->driver->domainGetXMLDesc) {
virLibConnError(VIR_ERR_INTERNAL_ERROR, __FUNCTION__); virLibConnError(VIR_ERR_INTERNAL_ERROR, __FUNCTION__);
virDispatchError(domain->conn); virDispatchError(domain->conn);
return NULL; return NULL;
} }
dom_xml = domain->conn->driver->domainDumpXML (domain, dom_xml = domain->conn->driver->domainGetXMLDesc(domain,
VIR_DOMAIN_XML_SECURE | VIR_DOMAIN_XML_SECURE |
VIR_DOMAIN_XML_UPDATE_CPU); VIR_DOMAIN_XML_UPDATE_CPU);
if (!dom_xml) if (!dom_xml)
@ -6760,9 +6760,9 @@ virNetworkGetXMLDesc(virNetworkPtr network, int flags)
conn = network->conn; conn = network->conn;
if (conn->networkDriver && conn->networkDriver->networkDumpXML) { if (conn->networkDriver && conn->networkDriver->networkGetXMLDesc) {
char *ret; char *ret;
ret = conn->networkDriver->networkDumpXML (network, flags); ret = conn->networkDriver->networkGetXMLDesc(network, flags);
if (!ret) if (!ret)
goto error; goto error;
return ret; return ret;
@ -9677,9 +9677,9 @@ char *virNodeDeviceGetXMLDesc(virNodeDevicePtr dev, unsigned int flags)
return NULL; return NULL;
} }
if (dev->conn->deviceMonitor && dev->conn->deviceMonitor->deviceDumpXML) { if (dev->conn->deviceMonitor && dev->conn->deviceMonitor->deviceGetXMLDesc) {
char *ret; char *ret;
ret = dev->conn->deviceMonitor->deviceDumpXML (dev, flags); ret = dev->conn->deviceMonitor->deviceGetXMLDesc(dev, flags);
if (!ret) if (!ret)
goto error; goto error;
return ret; return ret;
@ -13098,9 +13098,9 @@ virDomainSnapshotGetXMLDesc(virDomainSnapshotPtr snapshot,
goto error; goto error;
} }
if (conn->driver->domainSnapshotDumpXML) { if (conn->driver->domainSnapshotGetXMLDesc) {
char *ret; char *ret;
ret = conn->driver->domainSnapshotDumpXML(snapshot, flags); ret = conn->driver->domainSnapshotGetXMLDesc(snapshot, flags);
if (!ret) if (!ret)
goto error; goto error;
return ret; return ret;

6
src/libxl/libxl_driver.c
View File

@ -1916,7 +1916,7 @@ cleanup:
} }
static char * static char *
libxlDomainDumpXML(virDomainPtr dom, int flags) libxlDomainGetXMLDesc(virDomainPtr dom, int flags)
{ {
libxlDriverPrivatePtr driver = dom->conn->privateData; libxlDriverPrivatePtr driver = dom->conn->privateData;
virDomainObjPtr vm; virDomainObjPtr vm;
@ -2725,7 +2725,7 @@ static virDriver libxlDriver = {
NULL, /* domainGetMaxVcpus */ NULL, /* domainGetMaxVcpus */
NULL, /* domainGetSecurityLabel */ NULL, /* domainGetSecurityLabel */
NULL, /* nodeGetSecurityModel */ NULL, /* nodeGetSecurityModel */
libxlDomainDumpXML, /* domainDumpXML */ libxlDomainGetXMLDesc, /* domainGetXMLDesc */
libxlDomainXMLFromNative, /* domainXmlFromNative */ libxlDomainXMLFromNative, /* domainXmlFromNative */
libxlDomainXMLToNative, /* domainXmlToNative */ libxlDomainXMLToNative, /* domainXmlToNative */
libxlListDefinedDomains, /* listDefinedDomains */ libxlListDefinedDomains, /* listDefinedDomains */
@ -2780,7 +2780,7 @@ static virDriver libxlDriver = {
NULL, /* domainHasManagedSaveImage */ NULL, /* domainHasManagedSaveImage */
NULL, /* domainManagedSaveRemove */ NULL, /* domainManagedSaveRemove */
NULL, /* domainSnapshotCreateXML */ NULL, /* domainSnapshotCreateXML */
NULL, /* domainSnapshotDumpXML */ NULL, /* domainSnapshotGetXMLDesc */
NULL, /* domainSnapshotNum */ NULL, /* domainSnapshotNum */
NULL, /* domainSnapshotListNames */ NULL, /* domainSnapshotListNames */
NULL, /* domainSnapshotLookupByName */ NULL, /* domainSnapshotLookupByName */

6
src/lxc/lxc_driver.c
View File

@ -918,7 +918,7 @@ cleanup:
return ret; return ret;
} }
static char *lxcDomainDumpXML(virDomainPtr dom, static char *lxcDomainGetXMLDesc(virDomainPtr dom,
int flags) int flags)
{ {
lxc_driver_t *driver = dom->conn->privateData; lxc_driver_t *driver = dom->conn->privateData;
@ -2750,7 +2750,7 @@ static virDriver lxcDriver = {
NULL, /* domainGetMaxVcpus */ NULL, /* domainGetMaxVcpus */
NULL, /* domainGetSecurityLabel */ NULL, /* domainGetSecurityLabel */
NULL, /* nodeGetSecurityModel */ NULL, /* nodeGetSecurityModel */
lxcDomainDumpXML, /* domainDumpXML */ lxcDomainGetXMLDesc, /* domainGetXMLDesc */
NULL, /* domainXMLFromNative */ NULL, /* domainXMLFromNative */
NULL, /* domainXMLToNative */ NULL, /* domainXMLToNative */
lxcListDefinedDomains, /* listDefinedDomains */ lxcListDefinedDomains, /* listDefinedDomains */
@ -2805,7 +2805,7 @@ static virDriver lxcDriver = {
NULL, /* domainHasManagedSaveImage */ NULL, /* domainHasManagedSaveImage */
NULL, /* domainManagedSaveRemove */ NULL, /* domainManagedSaveRemove */
NULL, /* domainSnapshotCreateXML */ NULL, /* domainSnapshotCreateXML */
NULL, /* domainSnapshotDumpXML */ NULL, /* domainSnapshotGetXMLDesc */
NULL, /* domainSnapshotNum */ NULL, /* domainSnapshotNum */
NULL, /* domainSnapshotListNames */ NULL, /* domainSnapshotListNames */
NULL, /* domainSnapshotLookupByName */ NULL, /* domainSnapshotLookupByName */

4
src/network/bridge_driver.c
View File

@ -2356,7 +2356,7 @@ cleanup:
return ret; return ret;
} }
static char *networkDumpXML(virNetworkPtr net, int flags ATTRIBUTE_UNUSED) { static char *networkGetXMLDesc(virNetworkPtr net, int flags ATTRIBUTE_UNUSED) {
struct network_driver *driver = net->conn->networkPrivateData; struct network_driver *driver = net->conn->networkPrivateData;
virNetworkObjPtr network; virNetworkObjPtr network;
char *ret = NULL; char *ret = NULL;
@ -2517,7 +2517,7 @@ static virNetworkDriver networkDriver = {
networkUndefine, /* networkUndefine */ networkUndefine, /* networkUndefine */
networkStart, /* networkCreate */ networkStart, /* networkCreate */
networkDestroy, /* networkDestroy */ networkDestroy, /* networkDestroy */
networkDumpXML, /* networkDumpXML */ networkGetXMLDesc, /* networkGetXMLDesc */
networkGetBridgeName, /* networkGetBridgeName */ networkGetBridgeName, /* networkGetBridgeName */
networkGetAutostart, /* networkGetAutostart */ networkGetAutostart, /* networkGetAutostart */
networkSetAutostart, /* networkSetAutostart */ networkSetAutostart, /* networkSetAutostart */

4
src/node_device/node_device_driver.c
View File

@ -251,7 +251,7 @@ out:
} }
static char *nodeDeviceDumpXML(virNodeDevicePtr dev, static char *nodeDeviceGetXMLDesc(virNodeDevicePtr dev,
unsigned int flags ATTRIBUTE_UNUSED) unsigned int flags ATTRIBUTE_UNUSED)
{ {
virDeviceMonitorStatePtr driver = dev->conn->devMonPrivateData; virDeviceMonitorStatePtr driver = dev->conn->devMonPrivateData;
@ -657,7 +657,7 @@ void registerCommonNodeFuncs(virDeviceMonitorPtr driver)
driver->numOfDevices = nodeNumOfDevices; driver->numOfDevices = nodeNumOfDevices;
driver->listDevices = nodeListDevices; driver->listDevices = nodeListDevices;
driver->deviceLookupByName = nodeDeviceLookupByName; driver->deviceLookupByName = nodeDeviceLookupByName;
driver->deviceDumpXML = nodeDeviceDumpXML; driver->deviceGetXMLDesc = nodeDeviceGetXMLDesc;
driver->deviceGetParent = nodeDeviceGetParent; driver->deviceGetParent = nodeDeviceGetParent;
driver->deviceNumOfCaps = nodeDeviceNumOfCaps; driver->deviceNumOfCaps = nodeDeviceNumOfCaps;
driver->deviceListCaps = nodeDeviceListCaps; driver->deviceListCaps = nodeDeviceListCaps;

4
src/nwfilter/nwfilter_driver.c
View File

@ -406,7 +406,7 @@ cleanup:
static char * static char *
nwfilterDumpXML(virNWFilterPtr obj, nwfilterGetXMLDesc(virNWFilterPtr obj,
unsigned int flags) { unsigned int flags) {
virNWFilterDriverStatePtr driver = obj->conn->nwfilterPrivateData; virNWFilterDriverStatePtr driver = obj->conn->nwfilterPrivateData;
virNWFilterObjPtr nwfilter; virNWFilterObjPtr nwfilter;
@ -457,7 +457,7 @@ static virNWFilterDriver nwfilterDriver = {
.nwfilterLookupByUUID = nwfilterLookupByUUID, .nwfilterLookupByUUID = nwfilterLookupByUUID,
.defineXML = nwfilterDefine, .defineXML = nwfilterDefine,
.undefine = nwfilterUndefine, .undefine = nwfilterUndefine,
.getXMLDesc = nwfilterDumpXML, .getXMLDesc = nwfilterGetXMLDesc,
}; };

6
src/openvz/openvz_driver.c
View File

@ -425,7 +425,7 @@ static int openvzDomainIsUpdated(virDomainPtr dom ATTRIBUTE_UNUSED)
return 0; return 0;
} }
static char *openvzDomainDumpXML(virDomainPtr dom, int flags) { static char *openvzDomainGetXMLDesc(virDomainPtr dom, int flags) {
struct openvz_driver *driver = dom->conn->privateData; struct openvz_driver *driver = dom->conn->privateData;
virDomainObjPtr vm; virDomainObjPtr vm;
char *ret = NULL; char *ret = NULL;
@ -1602,7 +1602,7 @@ static virDriver openvzDriver = {
openvzDomainGetMaxVcpus, /* domainGetMaxVcpus */ openvzDomainGetMaxVcpus, /* domainGetMaxVcpus */
NULL, /* domainGetSecurityLabel */ NULL, /* domainGetSecurityLabel */
NULL, /* nodeGetSecurityModel */ NULL, /* nodeGetSecurityModel */
openvzDomainDumpXML, /* domainDumpXML */ openvzDomainGetXMLDesc, /* domainGetXMLDesc */
NULL, /* domainXmlFromNative */ NULL, /* domainXmlFromNative */
NULL, /* domainXmlToNative */ NULL, /* domainXmlToNative */
openvzListDefinedDomains, /* listDefinedDomains */ openvzListDefinedDomains, /* listDefinedDomains */
@ -1657,7 +1657,7 @@ static virDriver openvzDriver = {
NULL, /* domainHasManagedSaveImage */ NULL, /* domainHasManagedSaveImage */
NULL, /* domainManagedSaveRemove */ NULL, /* domainManagedSaveRemove */
NULL, /* domainSnapshotCreateXML */ NULL, /* domainSnapshotCreateXML */
NULL, /* domainSnapshotDumpXML */ NULL, /* domainSnapshotGetXMLDesc */
NULL, /* domainSnapshotNum */ NULL, /* domainSnapshotNum */
NULL, /* domainSnapshotListNames */ NULL, /* domainSnapshotListNames */
NULL, /* domainSnapshotLookupByName */ NULL, /* domainSnapshotLookupByName */

6
src/phyp/phyp_driver.c
View File

@ -3302,7 +3302,7 @@ cleanup:
} }
static char * static char *
phypDomainDumpXML(virDomainPtr dom, int flags) phypDomainGetXMLDesc(virDomainPtr dom, int flags)
{ {
ConnectionData *connection_data = dom->conn->networkPrivateData; ConnectionData *connection_data = dom->conn->networkPrivateData;
phyp_driverPtr phyp_driver = dom->conn->privateData; phyp_driverPtr phyp_driver = dom->conn->privateData;
@ -3763,7 +3763,7 @@ static virDriver phypDriver = {
phypGetLparCPUMAX, /* domainGetMaxVcpus */ phypGetLparCPUMAX, /* domainGetMaxVcpus */
NULL, /* domainGetSecurityLabel */ NULL, /* domainGetSecurityLabel */
NULL, /* nodeGetSecurityModel */ NULL, /* nodeGetSecurityModel */
phypDomainDumpXML, /* domainDumpXML */ phypDomainGetXMLDesc, /* domainGetXMLDesc */
NULL, /* domainXMLFromNative */ NULL, /* domainXMLFromNative */
NULL, /* domainXMLToNative */ NULL, /* domainXMLToNative */
phypListDefinedDomains, /* listDefinedDomains */ phypListDefinedDomains, /* listDefinedDomains */
@ -3818,7 +3818,7 @@ static virDriver phypDriver = {
NULL, /* domainHasManagedSaveImage */ NULL, /* domainHasManagedSaveImage */
NULL, /* domainManagedSaveRemove */ NULL, /* domainManagedSaveRemove */
NULL, /* domainSnapshotCreateXML */ NULL, /* domainSnapshotCreateXML */
NULL, /* domainSnapshotDumpXML */ NULL, /* domainSnapshotGetXMLDesc */
NULL, /* domainSnapshotNum */ NULL, /* domainSnapshotNum */
NULL, /* domainSnapshotListNames */ NULL, /* domainSnapshotListNames */
NULL, /* domainSnapshotLookupByName */ NULL, /* domainSnapshotLookupByName */

2
src/qemu/qemu_command.c
View File

@ -241,7 +241,7 @@ qemuNetworkIfaceConnect(virDomainDefPtr def,
virReportOOMError(); virReportOOMError();
goto cleanup; goto cleanup;
} }
/* avoid exposing vnet%d in dumpxml or error outputs */ /* avoid exposing vnet%d in getXMLDesc or error outputs */
template_ifname = 1; template_ifname = 1;
} }

8
src/qemu/qemu_driver.c
View File

@ -3331,7 +3331,7 @@ cleanup:
} }
static char *qemudDomainDumpXML(virDomainPtr dom, static char *qemuDomainGetXMLDesc(virDomainPtr dom,
int flags) { int flags) {
struct qemud_driver *driver = dom->conn->privateData; struct qemud_driver *driver = dom->conn->privateData;
virDomainObjPtr vm; virDomainObjPtr vm;
@ -6624,7 +6624,7 @@ cleanup:
return snapshot; return snapshot;
} }
static char *qemuDomainSnapshotDumpXML(virDomainSnapshotPtr snapshot, static char *qemuDomainSnapshotGetXMLDesc(virDomainSnapshotPtr snapshot,
unsigned int flags) unsigned int flags)
{ {
struct qemud_driver *driver = snapshot->domain->conn->privateData; struct qemud_driver *driver = snapshot->domain->conn->privateData;
@ -7171,7 +7171,7 @@ static virDriver qemuDriver = {
qemudDomainGetMaxVcpus, /* domainGetMaxVcpus */ qemudDomainGetMaxVcpus, /* domainGetMaxVcpus */
qemudDomainGetSecurityLabel, /* domainGetSecurityLabel */ qemudDomainGetSecurityLabel, /* domainGetSecurityLabel */
qemudNodeGetSecurityModel, /* nodeGetSecurityModel */ qemudNodeGetSecurityModel, /* nodeGetSecurityModel */
qemudDomainDumpXML, /* domainDumpXML */ qemuDomainGetXMLDesc, /* domainGetXMLDesc */
qemuDomainXMLFromNative, /* domainXmlFromNative */ qemuDomainXMLFromNative, /* domainXmlFromNative */
qemuDomainXMLToNative, /* domainXMLToNative */ qemuDomainXMLToNative, /* domainXMLToNative */
qemudListDefinedDomains, /* listDefinedDomains */ qemudListDefinedDomains, /* listDefinedDomains */
@ -7226,7 +7226,7 @@ static virDriver qemuDriver = {
qemuDomainHasManagedSaveImage, /* domainHasManagedSaveImage */ qemuDomainHasManagedSaveImage, /* domainHasManagedSaveImage */
qemuDomainManagedSaveRemove, /* domainManagedSaveRemove */ qemuDomainManagedSaveRemove, /* domainManagedSaveRemove */
qemuDomainSnapshotCreateXML, /* domainSnapshotCreateXML */ qemuDomainSnapshotCreateXML, /* domainSnapshotCreateXML */
qemuDomainSnapshotDumpXML, /* domainSnapshotDumpXML */ qemuDomainSnapshotGetXMLDesc, /* domainSnapshotGetXMLDesc */
qemuDomainSnapshotNum, /* domainSnapshotNum */ qemuDomainSnapshotNum, /* domainSnapshotNum */
qemuDomainSnapshotListNames, /* domainSnapshotListNames */ qemuDomainSnapshotListNames, /* domainSnapshotListNames */
qemuDomainSnapshotLookupByName, /* domainSnapshotLookupByName */ qemuDomainSnapshotLookupByName, /* domainSnapshotLookupByName */

12
src/remote/remote_driver.c
View File

@ -6428,7 +6428,7 @@ static virDriver remote_driver = {
remoteDomainGetMaxVcpus, /* domainGetMaxVcpus */ remoteDomainGetMaxVcpus, /* domainGetMaxVcpus */
remoteDomainGetSecurityLabel, /* domainGetSecurityLabel */ remoteDomainGetSecurityLabel, /* domainGetSecurityLabel */
remoteNodeGetSecurityModel, /* nodeGetSecurityModel */ remoteNodeGetSecurityModel, /* nodeGetSecurityModel */
remoteDomainDumpXML, /* domainDumpXML */ remoteDomainGetXMLDesc, /* domainGetXMLDesc */
remoteDomainXMLFromNative, /* domainXMLFromNative */ remoteDomainXMLFromNative, /* domainXMLFromNative */
remoteDomainXMLToNative, /* domainXMLToNative */ remoteDomainXMLToNative, /* domainXMLToNative */
remoteListDefinedDomains, /* listDefinedDomains */ remoteListDefinedDomains, /* listDefinedDomains */
@ -6483,7 +6483,7 @@ static virDriver remote_driver = {
remoteDomainHasManagedSaveImage, /* domainHasManagedSaveImage */ remoteDomainHasManagedSaveImage, /* domainHasManagedSaveImage */
remoteDomainManagedSaveRemove, /* domainManagedSaveRemove */ remoteDomainManagedSaveRemove, /* domainManagedSaveRemove */
remoteDomainSnapshotCreateXML, /* domainSnapshotCreateXML */ remoteDomainSnapshotCreateXML, /* domainSnapshotCreateXML */
remoteDomainSnapshotDumpXML, /* domainSnapshotDumpXML */ remoteDomainSnapshotGetXMLDesc, /* domainSnapshotGetXMLDesc */
remoteDomainSnapshotNum, /* domainSnapshotNum */ remoteDomainSnapshotNum, /* domainSnapshotNum */
remoteDomainSnapshotListNames, /* domainSnapshotListNames */ remoteDomainSnapshotListNames, /* domainSnapshotListNames */
remoteDomainSnapshotLookupByName, /* domainSnapshotLookupByName */ remoteDomainSnapshotLookupByName, /* domainSnapshotLookupByName */
@ -6511,7 +6511,7 @@ static virNetworkDriver network_driver = {
.networkUndefine = remoteNetworkUndefine, .networkUndefine = remoteNetworkUndefine,
.networkCreate = remoteNetworkCreate, .networkCreate = remoteNetworkCreate,
.networkDestroy = remoteNetworkDestroy, .networkDestroy = remoteNetworkDestroy,
.networkDumpXML = remoteNetworkDumpXML, .networkGetXMLDesc = remoteNetworkGetXMLDesc,
.networkGetBridgeName = remoteNetworkGetBridgeName, .networkGetBridgeName = remoteNetworkGetBridgeName,
.networkGetAutostart = remoteNetworkGetAutostart, .networkGetAutostart = remoteNetworkGetAutostart,
.networkSetAutostart = remoteNetworkSetAutostart, .networkSetAutostart = remoteNetworkSetAutostart,
@ -6558,7 +6558,7 @@ static virStorageDriver storage_driver = {
.poolDelete = remoteStoragePoolDelete, .poolDelete = remoteStoragePoolDelete,
.poolRefresh = remoteStoragePoolRefresh, .poolRefresh = remoteStoragePoolRefresh,
.poolGetInfo = remoteStoragePoolGetInfo, .poolGetInfo = remoteStoragePoolGetInfo,
.poolGetXMLDesc = remoteStoragePoolDumpXML, .poolGetXMLDesc = remoteStoragePoolGetXMLDesc,
.poolGetAutostart = remoteStoragePoolGetAutostart, .poolGetAutostart = remoteStoragePoolGetAutostart,
.poolSetAutostart = remoteStoragePoolSetAutostart, .poolSetAutostart = remoteStoragePoolSetAutostart,
.poolNumOfVolumes = remoteStoragePoolNumOfVolumes, .poolNumOfVolumes = remoteStoragePoolNumOfVolumes,
@ -6574,7 +6574,7 @@ static virStorageDriver storage_driver = {
.volDelete = remoteStorageVolDelete, .volDelete = remoteStorageVolDelete,
.volWipe = remoteStorageVolWipe, .volWipe = remoteStorageVolWipe,
.volGetInfo = remoteStorageVolGetInfo, .volGetInfo = remoteStorageVolGetInfo,
.volGetXMLDesc = remoteStorageVolDumpXML, .volGetXMLDesc = remoteStorageVolGetXMLDesc,
.volGetPath = remoteStorageVolGetPath, .volGetPath = remoteStorageVolGetPath,
.poolIsActive = remoteStoragePoolIsActive, .poolIsActive = remoteStoragePoolIsActive,
.poolIsPersistent = remoteStoragePoolIsPersistent, .poolIsPersistent = remoteStoragePoolIsPersistent,
@ -6602,7 +6602,7 @@ static virDeviceMonitor dev_monitor = {
.numOfDevices = remoteNodeNumOfDevices, .numOfDevices = remoteNodeNumOfDevices,
.listDevices = remoteNodeListDevices, .listDevices = remoteNodeListDevices,
.deviceLookupByName = remoteNodeDeviceLookupByName, .deviceLookupByName = remoteNodeDeviceLookupByName,
.deviceDumpXML = remoteNodeDeviceDumpXML, .deviceGetXMLDesc = remoteNodeDeviceGetXMLDesc,
.deviceGetParent = remoteNodeDeviceGetParent, .deviceGetParent = remoteNodeDeviceGetParent,
.deviceNumOfCaps = remoteNodeDeviceNumOfCaps, .deviceNumOfCaps = remoteNodeDeviceNumOfCaps,
.deviceListCaps = remoteNodeDeviceListCaps, .deviceListCaps = remoteNodeDeviceListCaps,

36
src/remote/remote_protocol.x
View File

@ -714,12 +714,12 @@ struct remote_domain_core_dump_args {
int flags; int flags;
}; };
struct remote_domain_dump_xml_args { struct remote_domain_get_xml_desc_args {
remote_nonnull_domain dom; remote_nonnull_domain dom;
int flags; int flags;
}; };
struct remote_domain_dump_xml_ret { struct remote_domain_get_xml_desc_ret {
remote_nonnull_string xml; remote_nonnull_string xml;
}; };
@ -992,12 +992,12 @@ struct remote_network_destroy_args {
remote_nonnull_network net; remote_nonnull_network net;
}; };
struct remote_network_dump_xml_args { struct remote_network_get_xml_desc_args {
remote_nonnull_network net; remote_nonnull_network net;
int flags; int flags;
}; };
struct remote_network_dump_xml_ret { struct remote_network_get_xml_desc_ret {
remote_nonnull_string xml; remote_nonnull_string xml;
}; };
@ -1294,12 +1294,12 @@ struct remote_storage_pool_refresh_args {
unsigned flags; unsigned flags;
}; };
struct remote_storage_pool_dump_xml_args { struct remote_storage_pool_get_xml_desc_args {
remote_nonnull_storage_pool pool; remote_nonnull_storage_pool pool;
unsigned flags; unsigned flags;
}; };
struct remote_storage_pool_dump_xml_ret { struct remote_storage_pool_get_xml_desc_ret {
remote_nonnull_string xml; remote_nonnull_string xml;
}; };
@ -1404,12 +1404,12 @@ struct remote_storage_vol_wipe_args {
unsigned flags; unsigned flags;
}; };
struct remote_storage_vol_dump_xml_args { struct remote_storage_vol_get_xml_desc_args {
remote_nonnull_storage_vol vol; remote_nonnull_storage_vol vol;
unsigned flags; unsigned flags;
}; };
struct remote_storage_vol_dump_xml_ret { struct remote_storage_vol_get_xml_desc_ret {
remote_nonnull_string xml; remote_nonnull_string xml;
}; };
@ -1460,12 +1460,12 @@ struct remote_node_device_lookup_by_name_ret {
remote_nonnull_node_device dev; remote_nonnull_node_device dev;
}; };
struct remote_node_device_dump_xml_args { struct remote_node_device_get_xml_desc_args {
remote_nonnull_string name; remote_nonnull_string name;
unsigned flags; unsigned flags;
}; };
struct remote_node_device_dump_xml_ret { struct remote_node_device_get_xml_desc_ret {
remote_nonnull_string xml; remote_nonnull_string xml;
}; };
@ -1859,12 +1859,12 @@ struct remote_domain_snapshot_create_xml_ret {
remote_nonnull_domain_snapshot snap; remote_nonnull_domain_snapshot snap;
}; };
struct remote_domain_snapshot_dump_xml_args { struct remote_domain_snapshot_get_xml_desc_args {
remote_nonnull_domain_snapshot snap; remote_nonnull_domain_snapshot snap;
int flags; int flags;
}; };
struct remote_domain_snapshot_dump_xml_ret { struct remote_domain_snapshot_get_xml_desc_ret {
remote_nonnull_string xml; remote_nonnull_string xml;
}; };
@ -1967,7 +1967,7 @@ enum remote_procedure {
REMOTE_PROC_DOMAIN_DEFINE_XML = 11, REMOTE_PROC_DOMAIN_DEFINE_XML = 11,
REMOTE_PROC_DOMAIN_DESTROY = 12, REMOTE_PROC_DOMAIN_DESTROY = 12,
REMOTE_PROC_DOMAIN_DETACH_DEVICE = 13, REMOTE_PROC_DOMAIN_DETACH_DEVICE = 13,
REMOTE_PROC_DOMAIN_DUMP_XML = 14, REMOTE_PROC_DOMAIN_GET_XML_DESC = 14,
REMOTE_PROC_DOMAIN_GET_AUTOSTART = 15, REMOTE_PROC_DOMAIN_GET_AUTOSTART = 15,
REMOTE_PROC_DOMAIN_GET_INFO = 16, REMOTE_PROC_DOMAIN_GET_INFO = 16,
REMOTE_PROC_DOMAIN_GET_MAX_MEMORY = 17, REMOTE_PROC_DOMAIN_GET_MAX_MEMORY = 17,
@ -1999,7 +1999,7 @@ enum remote_procedure {
REMOTE_PROC_NETWORK_DEFINE_XML = 41, REMOTE_PROC_NETWORK_DEFINE_XML = 41,
REMOTE_PROC_NETWORK_DESTROY = 42, REMOTE_PROC_NETWORK_DESTROY = 42,
REMOTE_PROC_NETWORK_DUMP_XML = 43, REMOTE_PROC_NETWORK_GET_XML_DESC = 43,
REMOTE_PROC_NETWORK_GET_AUTOSTART = 44, REMOTE_PROC_NETWORK_GET_AUTOSTART = 44,
REMOTE_PROC_NETWORK_GET_BRIDGE_NAME = 45, REMOTE_PROC_NETWORK_GET_BRIDGE_NAME = 45,
REMOTE_PROC_NETWORK_LOOKUP_BY_NAME = 46, REMOTE_PROC_NETWORK_LOOKUP_BY_NAME = 46,
@ -2048,7 +2048,7 @@ enum remote_procedure {
REMOTE_PROC_STORAGE_POOL_LOOKUP_BY_UUID = 85, REMOTE_PROC_STORAGE_POOL_LOOKUP_BY_UUID = 85,
REMOTE_PROC_STORAGE_POOL_LOOKUP_BY_VOLUME = 86, REMOTE_PROC_STORAGE_POOL_LOOKUP_BY_VOLUME = 86,
REMOTE_PROC_STORAGE_POOL_GET_INFO = 87, REMOTE_PROC_STORAGE_POOL_GET_INFO = 87,
REMOTE_PROC_STORAGE_POOL_DUMP_XML = 88, REMOTE_PROC_STORAGE_POOL_GET_XML_DESC = 88,
REMOTE_PROC_STORAGE_POOL_GET_AUTOSTART = 89, REMOTE_PROC_STORAGE_POOL_GET_AUTOSTART = 89,
REMOTE_PROC_STORAGE_POOL_SET_AUTOSTART = 90, REMOTE_PROC_STORAGE_POOL_SET_AUTOSTART = 90,
@ -2060,7 +2060,7 @@ enum remote_procedure {
REMOTE_PROC_STORAGE_VOL_LOOKUP_BY_KEY = 96, REMOTE_PROC_STORAGE_VOL_LOOKUP_BY_KEY = 96,
REMOTE_PROC_STORAGE_VOL_LOOKUP_BY_PATH = 97, REMOTE_PROC_STORAGE_VOL_LOOKUP_BY_PATH = 97,
REMOTE_PROC_STORAGE_VOL_GET_INFO = 98, REMOTE_PROC_STORAGE_VOL_GET_INFO = 98,
REMOTE_PROC_STORAGE_VOL_DUMP_XML = 99, REMOTE_PROC_STORAGE_VOL_GET_XML_DESC = 99,
REMOTE_PROC_STORAGE_VOL_GET_PATH = 100, REMOTE_PROC_STORAGE_VOL_GET_PATH = 100,
REMOTE_PROC_NODE_GET_CELLS_FREE_MEMORY = 101, REMOTE_PROC_NODE_GET_CELLS_FREE_MEMORY = 101,
@ -2077,7 +2077,7 @@ enum remote_procedure {
REMOTE_PROC_NODE_NUM_OF_DEVICES = 111, REMOTE_PROC_NODE_NUM_OF_DEVICES = 111,
REMOTE_PROC_NODE_LIST_DEVICES = 112, REMOTE_PROC_NODE_LIST_DEVICES = 112,
REMOTE_PROC_NODE_DEVICE_LOOKUP_BY_NAME = 113, REMOTE_PROC_NODE_DEVICE_LOOKUP_BY_NAME = 113,
REMOTE_PROC_NODE_DEVICE_DUMP_XML = 114, REMOTE_PROC_NODE_DEVICE_GET_XML_DESC = 114,
REMOTE_PROC_NODE_DEVICE_GET_PARENT = 115, REMOTE_PROC_NODE_DEVICE_GET_PARENT = 115,
REMOTE_PROC_NODE_DEVICE_NUM_OF_CAPS = 116, REMOTE_PROC_NODE_DEVICE_NUM_OF_CAPS = 116,
REMOTE_PROC_NODE_DEVICE_LIST_CAPS = 117, REMOTE_PROC_NODE_DEVICE_LIST_CAPS = 117,
@ -2156,7 +2156,7 @@ enum remote_procedure {
REMOTE_PROC_DOMAIN_HAS_MANAGED_SAVE_IMAGE = 183, REMOTE_PROC_DOMAIN_HAS_MANAGED_SAVE_IMAGE = 183,
REMOTE_PROC_DOMAIN_MANAGED_SAVE_REMOVE = 184, REMOTE_PROC_DOMAIN_MANAGED_SAVE_REMOVE = 184,
REMOTE_PROC_DOMAIN_SNAPSHOT_CREATE_XML = 185, REMOTE_PROC_DOMAIN_SNAPSHOT_CREATE_XML = 185,
REMOTE_PROC_DOMAIN_SNAPSHOT_DUMP_XML = 186, REMOTE_PROC_DOMAIN_SNAPSHOT_GET_XML_DESC = 186,
REMOTE_PROC_DOMAIN_SNAPSHOT_NUM = 187, REMOTE_PROC_DOMAIN_SNAPSHOT_NUM = 187,
REMOTE_PROC_DOMAIN_SNAPSHOT_LIST_NAMES = 188, REMOTE_PROC_DOMAIN_SNAPSHOT_LIST_NAMES = 188,
REMOTE_PROC_DOMAIN_SNAPSHOT_LOOKUP_BY_NAME = 189, REMOTE_PROC_DOMAIN_SNAPSHOT_LOOKUP_BY_NAME = 189,

24
src/remote_protocol-structs
View File

@ -403,11 +403,11 @@ struct remote_domain_core_dump_args {
remote_nonnull_string to; remote_nonnull_string to;
int flags; int flags;
}; };
struct remote_domain_dump_xml_args { struct remote_domain_get_xml_desc_args {
remote_nonnull_domain dom; remote_nonnull_domain dom;
int flags; int flags;
}; };
struct remote_domain_dump_xml_ret { struct remote_domain_get_xml_desc_ret {
remote_nonnull_string xml; remote_nonnull_string xml;
}; };
struct remote_domain_migrate_prepare_args { struct remote_domain_migrate_prepare_args {
@ -663,11 +663,11 @@ struct remote_network_create_args {
struct remote_network_destroy_args { struct remote_network_destroy_args {
remote_nonnull_network net; remote_nonnull_network net;
}; };
struct remote_network_dump_xml_args { struct remote_network_get_xml_desc_args {
remote_nonnull_network net; remote_nonnull_network net;
int flags; int flags;
}; };
struct remote_network_dump_xml_ret { struct remote_network_get_xml_desc_ret {
remote_nonnull_string xml; remote_nonnull_string xml;
}; };
struct remote_network_get_bridge_name_args { struct remote_network_get_bridge_name_args {
@ -916,11 +916,11 @@ struct remote_storage_pool_refresh_args {
remote_nonnull_storage_pool pool; remote_nonnull_storage_pool pool;
u_int flags; u_int flags;
}; };
struct remote_storage_pool_dump_xml_args { struct remote_storage_pool_get_xml_desc_args {
remote_nonnull_storage_pool pool; remote_nonnull_storage_pool pool;
u_int flags; u_int flags;
}; };
struct remote_storage_pool_dump_xml_ret { struct remote_storage_pool_get_xml_desc_ret {
remote_nonnull_string xml; remote_nonnull_string xml;
}; };
struct remote_storage_pool_get_info_args { struct remote_storage_pool_get_info_args {
@ -1002,11 +1002,11 @@ struct remote_storage_vol_wipe_args {
remote_nonnull_storage_vol vol; remote_nonnull_storage_vol vol;
u_int flags; u_int flags;
}; };
struct remote_storage_vol_dump_xml_args { struct remote_storage_vol_get_xml_desc_args {
remote_nonnull_storage_vol vol; remote_nonnull_storage_vol vol;
u_int flags; u_int flags;
}; };
struct remote_storage_vol_dump_xml_ret { struct remote_storage_vol_get_xml_desc_ret {
remote_nonnull_string xml; remote_nonnull_string xml;
}; };
struct remote_storage_vol_get_info_args { struct remote_storage_vol_get_info_args {
@ -1047,11 +1047,11 @@ struct remote_node_device_lookup_by_name_args {
struct remote_node_device_lookup_by_name_ret { struct remote_node_device_lookup_by_name_ret {
remote_nonnull_node_device dev; remote_nonnull_node_device dev;
}; };
struct remote_node_device_dump_xml_args { struct remote_node_device_get_xml_desc_args {
remote_nonnull_string name; remote_nonnull_string name;
u_int flags; u_int flags;
}; };
struct remote_node_device_dump_xml_ret { struct remote_node_device_get_xml_desc_ret {
remote_nonnull_string xml; remote_nonnull_string xml;
}; };
struct remote_node_device_get_parent_args { struct remote_node_device_get_parent_args {
@ -1359,11 +1359,11 @@ struct remote_domain_snapshot_create_xml_args {
struct remote_domain_snapshot_create_xml_ret { struct remote_domain_snapshot_create_xml_ret {
remote_nonnull_domain_snapshot snap; remote_nonnull_domain_snapshot snap;
}; };
struct remote_domain_snapshot_dump_xml_args { struct remote_domain_snapshot_get_xml_desc_args {
remote_nonnull_domain_snapshot snap; remote_nonnull_domain_snapshot snap;
int flags; int flags;
}; };
struct remote_domain_snapshot_dump_xml_ret { struct remote_domain_snapshot_get_xml_desc_ret {
remote_nonnull_string xml; remote_nonnull_string xml;
}; };
struct remote_domain_snapshot_num_args { struct remote_domain_snapshot_num_args {

4
src/storage/storage_driver.c
View File

@ -939,7 +939,7 @@ cleanup:
} }
static char * static char *
storagePoolDumpXML(virStoragePoolPtr obj, storagePoolGetXMLDesc(virStoragePoolPtr obj,
unsigned int flags ATTRIBUTE_UNUSED) { unsigned int flags ATTRIBUTE_UNUSED) {
virStorageDriverStatePtr driver = obj->conn->storagePrivateData; virStorageDriverStatePtr driver = obj->conn->storagePrivateData;
virStoragePoolObjPtr pool; virStoragePoolObjPtr pool;
@ -2122,7 +2122,7 @@ static virStorageDriver storageDriver = {
.poolDelete = storagePoolDelete, .poolDelete = storagePoolDelete,
.poolRefresh = storagePoolRefresh, .poolRefresh = storagePoolRefresh,
.poolGetInfo = storagePoolGetInfo, .poolGetInfo = storagePoolGetInfo,
.poolGetXMLDesc = storagePoolDumpXML, .poolGetXMLDesc = storagePoolGetXMLDesc,
.poolGetAutostart = storagePoolGetAutostart, .poolGetAutostart = storagePoolGetAutostart,
.poolSetAutostart = storagePoolSetAutostart, .poolSetAutostart = storagePoolSetAutostart,
.poolNumOfVolumes = storagePoolNumVolumes, .poolNumOfVolumes = storagePoolNumVolumes,

18
src/test/test_driver.c
View File

@ -2336,7 +2336,7 @@ cleanup:
return ret; return ret;
} }
static char *testDomainDumpXML(virDomainPtr domain, int flags) static char *testDomainGetXMLDesc(virDomainPtr domain, int flags)
{ {
testConnPtr privconn = domain->conn->privateData; testConnPtr privconn = domain->conn->privateData;
virDomainDefPtr def; virDomainDefPtr def;
@ -3137,7 +3137,7 @@ cleanup:
return ret; return ret;
} }
static char *testNetworkDumpXML(virNetworkPtr network, int flags ATTRIBUTE_UNUSED) { static char *testNetworkGetXMLDesc(virNetworkPtr network, int flags ATTRIBUTE_UNUSED) {
testConnPtr privconn = network->conn->privateData; testConnPtr privconn = network->conn->privateData;
virNetworkObjPtr privnet; virNetworkObjPtr privnet;
char *ret = NULL; char *ret = NULL;
@ -4162,7 +4162,7 @@ cleanup:
} }
static char * static char *
testStoragePoolDumpXML(virStoragePoolPtr pool, testStoragePoolGetXMLDesc(virStoragePoolPtr pool,
unsigned int flags ATTRIBUTE_UNUSED) { unsigned int flags ATTRIBUTE_UNUSED) {
testConnPtr privconn = pool->conn->privateData; testConnPtr privconn = pool->conn->privateData;
virStoragePoolObjPtr privpool; virStoragePoolObjPtr privpool;
@ -4914,7 +4914,7 @@ cleanup:
} }
static char * static char *
testNodeDeviceDumpXML(virNodeDevicePtr dev, testNodeDeviceGetXMLDesc(virNodeDevicePtr dev,
unsigned int flags ATTRIBUTE_UNUSED) unsigned int flags ATTRIBUTE_UNUSED)
{ {
testConnPtr driver = dev->conn->privateData; testConnPtr driver = dev->conn->privateData;
@ -5382,7 +5382,7 @@ static virDriver testDriver = {
testDomainGetMaxVcpus, /* domainGetMaxVcpus */ testDomainGetMaxVcpus, /* domainGetMaxVcpus */
NULL, /* domainGetSecurityLabel */ NULL, /* domainGetSecurityLabel */
NULL, /* nodeGetSecurityModel */ NULL, /* nodeGetSecurityModel */
testDomainDumpXML, /* domainDumpXML */ testDomainGetXMLDesc, /* domainGetXMLDesc */
NULL, /* domainXMLFromNative */ NULL, /* domainXMLFromNative */
NULL, /* domainXMLToNative */ NULL, /* domainXMLToNative */
testListDefinedDomains, /* listDefinedDomains */ testListDefinedDomains, /* listDefinedDomains */
@ -5437,7 +5437,7 @@ static virDriver testDriver = {
NULL, /* domainHasManagedSaveImage */ NULL, /* domainHasManagedSaveImage */
NULL, /* domainManagedSaveRemove */ NULL, /* domainManagedSaveRemove */
NULL, /* domainSnapshotCreateXML */ NULL, /* domainSnapshotCreateXML */
NULL, /* domainSnapshotDumpXML */ NULL, /* domainSnapshotGetXMLDesc */
NULL, /* domainSnapshotNum */ NULL, /* domainSnapshotNum */
NULL, /* domainSnapshotListNames */ NULL, /* domainSnapshotListNames */
NULL, /* domainSnapshotLookupByName */ NULL, /* domainSnapshotLookupByName */
@ -5465,7 +5465,7 @@ static virNetworkDriver testNetworkDriver = {
testNetworkUndefine, /* networkUndefine */ testNetworkUndefine, /* networkUndefine */
testNetworkStart, /* networkCreate */ testNetworkStart, /* networkCreate */
testNetworkDestroy, /* networkDestroy */ testNetworkDestroy, /* networkDestroy */
testNetworkDumpXML, /* networkDumpXML */ testNetworkGetXMLDesc, /* networkGetXMLDesc */
testNetworkGetBridgeName, /* networkGetBridgeName */ testNetworkGetBridgeName, /* networkGetBridgeName */
testNetworkGetAutostart, /* networkGetAutostart */ testNetworkGetAutostart, /* networkGetAutostart */
testNetworkSetAutostart, /* networkSetAutostart */ testNetworkSetAutostart, /* networkSetAutostart */
@ -5514,7 +5514,7 @@ static virStorageDriver testStorageDriver = {
.poolDelete = testStoragePoolDelete, .poolDelete = testStoragePoolDelete,
.poolRefresh = testStoragePoolRefresh, .poolRefresh = testStoragePoolRefresh,
.poolGetInfo = testStoragePoolGetInfo, .poolGetInfo = testStoragePoolGetInfo,
.poolGetXMLDesc = testStoragePoolDumpXML, .poolGetXMLDesc = testStoragePoolGetXMLDesc,
.poolGetAutostart = testStoragePoolGetAutostart, .poolGetAutostart = testStoragePoolGetAutostart,
.poolSetAutostart = testStoragePoolSetAutostart, .poolSetAutostart = testStoragePoolSetAutostart,
.poolNumOfVolumes = testStoragePoolNumVolumes, .poolNumOfVolumes = testStoragePoolNumVolumes,
@ -5541,7 +5541,7 @@ static virDeviceMonitor testDevMonitor = {
.numOfDevices = testNodeNumOfDevices, .numOfDevices = testNodeNumOfDevices,
.listDevices = testNodeListDevices, .listDevices = testNodeListDevices,
.deviceLookupByName = testNodeDeviceLookupByName, .deviceLookupByName = testNodeDeviceLookupByName,
.deviceDumpXML = testNodeDeviceDumpXML, .deviceGetXMLDesc = testNodeDeviceGetXMLDesc,
.deviceGetParent = testNodeDeviceGetParent, .deviceGetParent = testNodeDeviceGetParent,
.deviceNumOfCaps = testNodeDeviceNumOfCaps, .deviceNumOfCaps = testNodeDeviceNumOfCaps,
.deviceListCaps = testNodeDeviceListCaps, .deviceListCaps = testNodeDeviceListCaps,

2
src/uml/uml_conf.c
View File

@ -132,7 +132,7 @@ umlConnectTapDevice(virConnectPtr conn,
VIR_FREE(net->ifname); VIR_FREE(net->ifname);
if (!(net->ifname = strdup("vnet%d"))) if (!(net->ifname = strdup("vnet%d")))
goto no_memory; goto no_memory;
/* avoid exposing vnet%d in dumpxml or error outputs */ /* avoid exposing vnet%d in getXMLDesc or error outputs */
template_ifname = 1; template_ifname = 1;
} }

6
src/uml/uml_driver.c
View File

@ -1522,7 +1522,7 @@ cleanup:
} }
static char *umlDomainDumpXML(virDomainPtr dom, static char *umlDomainGetXMLDesc(virDomainPtr dom,
int flags ATTRIBUTE_UNUSED) { int flags ATTRIBUTE_UNUSED) {
struct uml_driver *driver = dom->conn->privateData; struct uml_driver *driver = dom->conn->privateData;
virDomainObjPtr vm; virDomainObjPtr vm;
@ -2188,7 +2188,7 @@ static virDriver umlDriver = {
NULL, /* domainGetMaxVcpus */ NULL, /* domainGetMaxVcpus */
NULL, /* domainGetSecurityLabel */ NULL, /* domainGetSecurityLabel */
NULL, /* nodeGetSecurityModel */ NULL, /* nodeGetSecurityModel */
umlDomainDumpXML, /* domainDumpXML */ umlDomainGetXMLDesc, /* domainGetXMLDesc */
NULL, /* domainXMLFromNative */ NULL, /* domainXMLFromNative */
NULL, /* domainXMLToNative */ NULL, /* domainXMLToNative */
umlListDefinedDomains, /* listDefinedDomains */ umlListDefinedDomains, /* listDefinedDomains */
@ -2243,7 +2243,7 @@ static virDriver umlDriver = {
NULL, /* domainHasManagedSaveImage */ NULL, /* domainHasManagedSaveImage */
NULL, /* domainManagedSaveRemove */ NULL, /* domainManagedSaveRemove */
NULL, /* domainSnapshotCreateXML */ NULL, /* domainSnapshotCreateXML */
NULL, /* domainSnapshotDumpXML */ NULL, /* domainSnapshotGetXMLDesc */
NULL, /* domainSnapshotNum */ NULL, /* domainSnapshotNum */
NULL, /* domainSnapshotListNames */ NULL, /* domainSnapshotListNames */
NULL, /* domainSnapshotLookupByName */ NULL, /* domainSnapshotLookupByName */

12
src/vbox/vbox_tmpl.c
View File

@ -2066,7 +2066,7 @@ vboxDomainGetMaxVcpus(virDomainPtr dom)
VIR_DOMAIN_VCPU_MAXIMUM)); VIR_DOMAIN_VCPU_MAXIMUM));
} }
static char *vboxDomainDumpXML(virDomainPtr dom, int flags) { static char *vboxDomainGetXMLDesc(virDomainPtr dom, int flags) {
VBOX_OBJECT_CHECK(dom->conn, char *, NULL); VBOX_OBJECT_CHECK(dom->conn, char *, NULL);
virDomainDefPtr def = NULL; virDomainDefPtr def = NULL;
IMachine *machine = NULL; IMachine *machine = NULL;
@ -5638,7 +5638,7 @@ cleanup:
} }
static char * static char *
vboxDomainSnapshotDumpXML(virDomainSnapshotPtr snapshot, vboxDomainSnapshotGetXMLDesc(virDomainSnapshotPtr snapshot,
unsigned int flags) unsigned int flags)
{ {
virDomainPtr dom = snapshot->domain; virDomainPtr dom = snapshot->domain;
@ -7510,7 +7510,7 @@ static int vboxNetworkDestroy(virNetworkPtr network) {
return vboxNetworkUndefineDestroy(network, false); return vboxNetworkUndefineDestroy(network, false);
} }
static char *vboxNetworkDumpXML(virNetworkPtr network, int flags ATTRIBUTE_UNUSED) { static char *vboxNetworkGetXMLDesc(virNetworkPtr network, int flags ATTRIBUTE_UNUSED) {
VBOX_OBJECT_HOST_CHECK(network->conn, char *, NULL); VBOX_OBJECT_HOST_CHECK(network->conn, char *, NULL);
virNetworkDefPtr def = NULL; virNetworkDefPtr def = NULL;
virNetworkIpDefPtr ipdef = NULL; virNetworkIpDefPtr ipdef = NULL;
@ -8577,7 +8577,7 @@ virDriver NAME(Driver) = {
vboxDomainGetMaxVcpus, /* domainGetMaxVcpus */ vboxDomainGetMaxVcpus, /* domainGetMaxVcpus */
NULL, /* domainGetSecurityLabel */ NULL, /* domainGetSecurityLabel */
NULL, /* nodeGetSecurityModel */ NULL, /* nodeGetSecurityModel */
vboxDomainDumpXML, /* domainDumpXML */ vboxDomainGetXMLDesc, /* domainGetXMLDesc */
NULL, /* domainXMLFromNative */ NULL, /* domainXMLFromNative */
NULL, /* domainXMLToNative */ NULL, /* domainXMLToNative */
vboxListDefinedDomains, /* listDefinedDomains */ vboxListDefinedDomains, /* listDefinedDomains */
@ -8642,7 +8642,7 @@ virDriver NAME(Driver) = {
NULL, /* domainHasManagedSaveImage */ NULL, /* domainHasManagedSaveImage */
NULL, /* domainManagedSaveRemove */ NULL, /* domainManagedSaveRemove */
vboxDomainSnapshotCreateXML, /* domainSnapshotCreateXML */ vboxDomainSnapshotCreateXML, /* domainSnapshotCreateXML */
vboxDomainSnapshotDumpXML, /* domainSnapshotDumpXML */ vboxDomainSnapshotGetXMLDesc, /* domainSnapshotGetXMLDesc */
vboxDomainSnapshotNum, /* domainSnapshotNum */ vboxDomainSnapshotNum, /* domainSnapshotNum */
vboxDomainSnapshotListNames, /* domainSnapshotListNames */ vboxDomainSnapshotListNames, /* domainSnapshotListNames */
vboxDomainSnapshotLookupByName, /* domainSnapshotLookupByName */ vboxDomainSnapshotLookupByName, /* domainSnapshotLookupByName */
@ -8670,7 +8670,7 @@ virNetworkDriver NAME(NetworkDriver) = {
.networkUndefine = vboxNetworkUndefine, .networkUndefine = vboxNetworkUndefine,
.networkCreate = vboxNetworkCreate, .networkCreate = vboxNetworkCreate,
.networkDestroy = vboxNetworkDestroy, .networkDestroy = vboxNetworkDestroy,
.networkDumpXML = vboxNetworkDumpXML, .networkGetXMLDesc = vboxNetworkGetXMLDesc,
.networkGetBridgeName = NULL, .networkGetBridgeName = NULL,
.networkGetAutostart = NULL, .networkGetAutostart = NULL,
.networkSetAutostart = NULL .networkSetAutostart = NULL

6
src/vmware/vmware_driver.c
View File

@ -789,7 +789,7 @@ vmwareDomainIsPersistent(virDomainPtr dom)
static char * static char *
vmwareDomainDumpXML(virDomainPtr dom, int flags) vmwareDomainGetXMLDesc(virDomainPtr dom, int flags)
{ {
struct vmware_driver *driver = dom->conn->privateData; struct vmware_driver *driver = dom->conn->privateData;
virDomainObjPtr vm; virDomainObjPtr vm;
@ -942,7 +942,7 @@ static virDriver vmwareDriver = {
NULL, /* domainGetMaxVcpus */ NULL, /* domainGetMaxVcpus */
NULL, /* domainGetSecurityLabel */ NULL, /* domainGetSecurityLabel */
NULL, /* nodeGetSecurityModel */ NULL, /* nodeGetSecurityModel */
vmwareDomainDumpXML, /* domainDumpXML */ vmwareDomainGetXMLDesc, /* domainGetXMLDesc */
NULL, /* domainXmlFromNative */ NULL, /* domainXmlFromNative */
NULL, /* domainXmlToNative */ NULL, /* domainXmlToNative */
vmwareListDefinedDomains, /* listDefinedDomains */ vmwareListDefinedDomains, /* listDefinedDomains */
@ -997,7 +997,7 @@ static virDriver vmwareDriver = {
NULL, /* domainHasManagedSaveImage */ NULL, /* domainHasManagedSaveImage */
NULL, /* domainManagedSaveRemove */ NULL, /* domainManagedSaveRemove */
NULL, /* domainSnapshotCreateXML */ NULL, /* domainSnapshotCreateXML */
NULL, /* domainSnapshotDumpXML */ NULL, /* domainSnapshotGetXMLDesc */
NULL, /* domainSnapshotNum */ NULL, /* domainSnapshotNum */
NULL, /* domainSnapshotListNames */ NULL, /* domainSnapshotListNames */
NULL, /* domainSnapshotLookupByName */ NULL, /* domainSnapshotLookupByName */

12
src/xen/xen_driver.c
View File

@ -1192,20 +1192,20 @@ xenUnifiedDomainGetMaxVcpus (virDomainPtr dom)
} }
static char * static char *
xenUnifiedDomainDumpXML (virDomainPtr dom, int flags) xenUnifiedDomainGetXMLDesc(virDomainPtr dom, int flags)
{ {
GET_PRIVATE(dom->conn); GET_PRIVATE(dom->conn);
if (dom->id == -1 && priv->xendConfigVersion < 3 ) { if (dom->id == -1 && priv->xendConfigVersion < 3 ) {
if (priv->opened[XEN_UNIFIED_XM_OFFSET]) if (priv->opened[XEN_UNIFIED_XM_OFFSET])
return xenXMDomainDumpXML(dom, flags); return xenXMDomainGetXMLDesc(dom, flags);
} else { } else {
if (priv->opened[XEN_UNIFIED_XEND_OFFSET]) { if (priv->opened[XEN_UNIFIED_XEND_OFFSET]) {
char *cpus, *res; char *cpus, *res;
xenUnifiedLock(priv); xenUnifiedLock(priv);
cpus = xenDomainUsedCpus(dom); cpus = xenDomainUsedCpus(dom);
xenUnifiedUnlock(priv); xenUnifiedUnlock(priv);
res = xenDaemonDomainDumpXML(dom, flags, cpus); res = xenDaemonDomainGetXMLDesc(dom, flags, cpus);
VIR_FREE(cpus); VIR_FREE(cpus);
return(res); return(res);
} }
@ -1374,7 +1374,7 @@ xenUnifiedDomainMigrateFinish (virConnectPtr dconn,
} }
if (flags & VIR_MIGRATE_PERSIST_DEST) { if (flags & VIR_MIGRATE_PERSIST_DEST) {
domain_xml = xenDaemonDomainDumpXML (dom, 0, NULL); domain_xml = xenDaemonDomainGetXMLDesc(dom, 0, NULL);
if (! domain_xml) { if (! domain_xml) {
xenUnifiedError(VIR_ERR_MIGRATE_PERSIST_FAILED, xenUnifiedError(VIR_ERR_MIGRATE_PERSIST_FAILED,
"%s", _("failed to get XML representation of migrated domain")); "%s", _("failed to get XML representation of migrated domain"));
@ -2143,7 +2143,7 @@ static virDriver xenUnifiedDriver = {
xenUnifiedDomainGetMaxVcpus, /* domainGetMaxVcpus */ xenUnifiedDomainGetMaxVcpus, /* domainGetMaxVcpus */
NULL, /* domainGetSecurityLabel */ NULL, /* domainGetSecurityLabel */
NULL, /* nodeGetSecurityModel */ NULL, /* nodeGetSecurityModel */
xenUnifiedDomainDumpXML, /* domainDumpXML */ xenUnifiedDomainGetXMLDesc, /* domainGetXMLDesc */
xenUnifiedDomainXMLFromNative, /* domainXMLFromNative */ xenUnifiedDomainXMLFromNative, /* domainXMLFromNative */
xenUnifiedDomainXMLToNative, /* domainXMLToNative */ xenUnifiedDomainXMLToNative, /* domainXMLToNative */
xenUnifiedListDefinedDomains, /* listDefinedDomains */ xenUnifiedListDefinedDomains, /* listDefinedDomains */
@ -2198,7 +2198,7 @@ static virDriver xenUnifiedDriver = {
NULL, /* domainHasManagedSaveImage */ NULL, /* domainHasManagedSaveImage */
NULL, /* domainManagedSaveRemove */ NULL, /* domainManagedSaveRemove */
NULL, /* domainSnapshotCreateXML */ NULL, /* domainSnapshotCreateXML */
NULL, /* domainSnapshotDumpXML */ NULL, /* domainSnapshotGetXMLDesc */
NULL, /* domainSnapshotNum */ NULL, /* domainSnapshotNum */
NULL, /* domainSnapshotListNames */ NULL, /* domainSnapshotListNames */
NULL, /* domainSnapshotLookupByName */ NULL, /* domainSnapshotLookupByName */

4
src/xen/xend_internal.c
View File

@ -1813,7 +1813,7 @@ cleanup:
/** /**
* xenDaemonDomainDumpXML: * xenDaemonDomainGetXMLDesc:
* @domain: a domain object * @domain: a domain object
* @flags: potential dump flags * @flags: potential dump flags
* @cpus: list of cpu the domain is pinned to. * @cpus: list of cpu the domain is pinned to.
@ -1824,7 +1824,7 @@ cleanup:
* the caller must free() the returned value. * the caller must free() the returned value.
*/ */
char * char *
xenDaemonDomainDumpXML(virDomainPtr domain, int flags, const char *cpus) xenDaemonDomainGetXMLDesc(virDomainPtr domain, int flags, const char *cpus)
{ {
xenUnifiedPrivatePtr priv; xenUnifiedPrivatePtr priv;
virDomainDefPtr def; virDomainDefPtr def;

2
src/xen/xend_internal.h
View File

@ -110,7 +110,7 @@ int xenDaemonDomainRestore(virConnectPtr conn, const char *filename);
int xenDaemonDomainSetMemory(virDomainPtr domain, unsigned long memory); int xenDaemonDomainSetMemory(virDomainPtr domain, unsigned long memory);
int xenDaemonDomainSetMaxMemory(virDomainPtr domain, unsigned long memory); int xenDaemonDomainSetMaxMemory(virDomainPtr domain, unsigned long memory);
int xenDaemonDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info); int xenDaemonDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info);
char *xenDaemonDomainDumpXML(virDomainPtr domain, int flags, const char *cpus); char *xenDaemonDomainGetXMLDesc(virDomainPtr domain, int flags, const char *cpus);
unsigned long xenDaemonDomainGetMaxMemory(virDomainPtr domain); unsigned long xenDaemonDomainGetMaxMemory(virDomainPtr domain);
char **xenDaemonListDomainsOld(virConnectPtr xend); char **xenDaemonListDomainsOld(virConnectPtr xend);

2
src/xen/xm_internal.c
View File

@ -513,7 +513,7 @@ error:
* Turn a config record into a lump of XML describing the * Turn a config record into a lump of XML describing the
* domain, suitable for later feeding for virDomainCreateXML * domain, suitable for later feeding for virDomainCreateXML
*/ */
char *xenXMDomainDumpXML(virDomainPtr domain, int flags) { char *xenXMDomainGetXMLDesc(virDomainPtr domain, int flags) {
xenUnifiedPrivatePtr priv; xenUnifiedPrivatePtr priv;
const char *filename; const char *filename;
xenXMConfCachePtr entry; xenXMConfCachePtr entry;

2
src/xen/xm_internal.h
View File

@ -40,7 +40,7 @@ virDrvOpenStatus xenXMOpen(virConnectPtr conn, virConnectAuthPtr auth, int flags
int xenXMClose(virConnectPtr conn); int xenXMClose(virConnectPtr conn);
const char *xenXMGetType(virConnectPtr conn); const char *xenXMGetType(virConnectPtr conn);
int xenXMDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info); int xenXMDomainGetInfo(virDomainPtr domain, virDomainInfoPtr info);
char *xenXMDomainDumpXML(virDomainPtr domain, int flags); char *xenXMDomainGetXMLDesc(virDomainPtr domain, int flags);
int xenXMDomainSetMemory(virDomainPtr domain, unsigned long memory); int xenXMDomainSetMemory(virDomainPtr domain, unsigned long memory);
int xenXMDomainSetMaxMemory(virDomainPtr domain, unsigned long memory); int xenXMDomainSetMaxMemory(virDomainPtr domain, unsigned long memory);
unsigned long xenXMDomainGetMaxMemory(virDomainPtr domain); unsigned long xenXMDomainGetMaxMemory(virDomainPtr domain);

8
src/xenapi/xenapi_driver.c
View File

@ -1224,13 +1224,13 @@ xenapiDomainGetMaxVcpus (virDomainPtr dom)
} }
/* /*
* xenapiDomainDumpXML * xenapiDomainGetXMLDesc
* *
* *
* Returns XML string of the domain configuration on success or -1 in case of error * Returns XML string of the domain configuration on success or -1 in case of error
*/ */
static char * static char *
xenapiDomainDumpXML (virDomainPtr dom, int flags ATTRIBUTE_UNUSED) xenapiDomainGetXMLDesc(virDomainPtr dom, int flags ATTRIBUTE_UNUSED)
{ {
xen_vm vm=NULL; xen_vm vm=NULL;
xen_vm_set *vms; xen_vm_set *vms;
@ -1824,7 +1824,7 @@ static virDriver xenapiDriver = {
xenapiDomainGetMaxVcpus, /* domainGetMaxVcpus */ xenapiDomainGetMaxVcpus, /* domainGetMaxVcpus */
NULL, /* domainGetSecurityLabel */ NULL, /* domainGetSecurityLabel */
NULL, /* nodeGetSecurityModel */ NULL, /* nodeGetSecurityModel */
xenapiDomainDumpXML, /* domainDumpXML */ xenapiDomainGetXMLDesc, /* domainGetXMLDesc */
NULL, /* domainXmlFromNative */ NULL, /* domainXmlFromNative */
NULL, /* domainXmlToNative */ NULL, /* domainXmlToNative */
xenapiListDefinedDomains, /* listDefinedDomains */ xenapiListDefinedDomains, /* listDefinedDomains */
@ -1879,7 +1879,7 @@ static virDriver xenapiDriver = {
NULL, /* domainHasManagedSaveImage */ NULL, /* domainHasManagedSaveImage */
NULL, /* domainManagedSaveRemove */ NULL, /* domainManagedSaveRemove */
NULL, /* domainSnapshotCreateXML */ NULL, /* domainSnapshotCreateXML */
NULL, /* domainSnapshotDumpXML */ NULL, /* domainSnapshotGetXMLDesc */
NULL, /* domainSnapshotNum */ NULL, /* domainSnapshotNum */
NULL, /* domainSnapshotListNames */ NULL, /* domainSnapshotListNames */
NULL, /* domainSnapshotLookupByName */ NULL, /* domainSnapshotLookupByName */