
On 06/15/2016 09:56 AM, Peter Krempa wrote:
--- src/bhyve/bhyve_driver.c | 2 +- src/conf/domain_audit.c | 2 +- src/conf/domain_conf.c | 22 +++++++++++----------- src/conf/domain_conf.h | 2 +- src/libvirt_private.syms | 2 +- src/libxl/libxl_driver.c | 6 +++--- src/lxc/lxc_driver.c | 10 +++++----- src/lxc/lxc_fuse.c | 6 +++--- src/openvz/openvz_driver.c | 2 +- src/qemu/qemu_domain.c | 6 +++--- src/qemu/qemu_driver.c | 16 ++++++++-------- src/qemu/qemu_hotplug.c | 4 ++-- src/qemu/qemu_process.c | 4 ++-- src/test/test_driver.c | 6 +++--- src/uml/uml_driver.c | 6 +++--- src/vmware/vmware_driver.c | 2 +- src/vmx/vmx.c | 10 +++++----- src/vz/vz_driver.c | 4 ++-- src/vz/vz_sdk.c | 6 +++--- src/xen/xm_internal.c | 8 ++++---- src/xenapi/xenapi_utils.c | 4 ++-- src/xenconfig/xen_common.c | 2 +- src/xenconfig/xen_sxpr.c | 6 +++--- 23 files changed, 69 insertions(+), 69 deletions(-)
[...] ACK - however, since you're changing it, why not use "const virDomainDef *", too John
/** - * virDomainDefGetMemoryActual: + * virDomainDefGetMemoryTotal: * @def: domain definition * * Returns the current maximum memory size usable by the domain described by * @def. This size includes possible additional memory devices. */ unsigned long long -virDomainDefGetMemoryActual(virDomainDefPtr def) +virDomainDefGetMemoryTotal(virDomainDefPtr def)
const virDomainDef *def
{ return def->mem.total_memory; } @@ -14545,7 +14545,7 @@ int
[...]
diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 96ac510..5765bb2 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -2270,7 +2270,7 @@ virDomainVcpuInfoPtr virDomainDefGetVcpu(virDomainDefPtr def, unsigned int vcpu)
unsigned long long virDomainDefGetMemoryInitial(const virDomainDef *def); void virDomainDefSetMemoryTotal(virDomainDefPtr def, unsigned long long size); -unsigned long long virDomainDefGetMemoryActual(virDomainDefPtr def); +unsigned long long virDomainDefGetMemoryTotal(virDomainDefPtr def);
const virDomainDef *def
bool virDomainDefHasMemoryHotplug(const virDomainDef *def);
[...]