On 12/19/2011 05:42 PM, Eric Blake wrote:
From: Hu Tao <hutao@cn.fujitsu.com>
--- daemon/remote.c | 64 ++++++++++++++++++++++++++++++++++++++++++ src/remote/remote_driver.c | 50 ++++++++++++++++++++++++++++++++ src/remote/remote_protocol.x | 24 +++++++++++++++- src/remote_protocol-structs | 22 ++++++++++++++ 4 files changed, 159 insertions(+), 1 deletions(-)
Squash in this, at least. diff --git i/daemon/remote.c w/daemon/remote.c index 20193b1..bf7f02c 100644 --- i/daemon/remote.c +++ w/daemon/remote.c @@ -1652,7 +1652,7 @@ remoteDispatchDomainGetNumaParameters(virNetServerPtr server ATTRIBUTE_UNUSED, flags = args->flags; - if (nparams > REMOTE_DOMAIN_MEMORY_PARAMETERS_MAX) { + if (nparams > REMOTE_DOMAIN_NUMA_PARAMETERS_MAX) { virNetError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large")); goto cleanup; } diff --git i/src/remote/remote_protocol.x w/src/remote/remote_protocol.x index 4843317..18dba8c 100644 --- i/src/remote/remote_protocol.x +++ w/src/remote/remote_protocol.x @@ -552,7 +552,7 @@ struct remote_domain_block_resize_args { struct remote_domain_set_numa_parameters_args { remote_nonnull_domain dom; - remote_typed_param params<REMOTE_DOMAIN_MEMORY_PARAMETERS_MAX>; + remote_typed_param params<REMOTE_DOMAIN_NUMA_PARAMETERS_MAX>; unsigned int flags; }; @@ -563,7 +563,7 @@ struct remote_domain_get_numa_parameters_args { }; struct remote_domain_get_numa_parameters_ret { - remote_typed_param params<REMOTE_DOMAIN_MEMORY_PARAMETERS_MAX>; + remote_typed_param params<REMOTE_DOMAIN_NUMA_PARAMETERS_MAX>; int nparams; }; -- Eric Blake eblake@redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org