Re: [libvirt] [PATCH 11/12] Move virDomain related APIs out of libvirt.c

Introduce a src/libvirt-domain.c file to hold all the methods related to the virDomain type. --- docs/apibuild.py | 2 + po/POTFILES.in | 1 + src/Makefile.am | 2 + src/libvirt-domain.c | 11112 ++++++++++++++++++++++++++++++++++++++++++ src/libvirt.c | 12388 +++-------------------------------------------- src/libvirt_internal.h | 6 + 6 files changed, 11774 insertions(+), 11737 deletions(-) create mode 100644 src/libvirt-domain.c

diff --git a/docs/apibuild.py b/docs/apibuild.py index 1eb6fcf..a96260f 100755 --- a/docs/apibuild.py +++ b/docs/apibuild.py @@ -24,6 +24,7 @@ included_files = { "libvirt.h": "header with general libvirt API definitions", "virterror.h": "header with error specific API definitions", "libvirt.c": "Main interfaces for the libvirt library", + "libvirt-domain.c": "Domain interfaces for the libvirt library", "libvirt-domain-snapshot.c": "Domain snapshot interfaces for the libvirt library", "libvirt-interface.c": "Interface interfaces for the libvirt library", "libvirt-network.c": "Network interfaces for the libvirt library", @@ -73,6 +74,7 @@ ignored_functions = { "virDomainMigratePrepareTunnel3": "private function for tunnelled migration", "DllMain": "specific function for Win32", "virTypedParamsValidate": "internal function in virtypedparam.c", + "virTypedParameterValidateSet": "internal function in virtypedparam.c",

+++ b/src/libvirt.c @@ -52,7 +52,6 @@ #include "viruuid.h" #include "viralloc.h" #include "configmake.h" -#include "intprops.h" #include "virconf.h" #if WITH_GNUTLS # if WITH_GNUTLS_GCRYPT @@ -1500,6 +1499,48 @@ virConnectSupportsFeature(virConnectPtr conn, int feature) } +/* Helper function called to validate incoming client array on any + * interface that sets typed parameters in the hypervisor. */ +int +virTypedParameterValidateSet(virConnectPtr conn, + virTypedParameterPtr params, + int nparams)

@@ -1755,41 +1796,34 @@ virConnectGetMaxVcpus(virConnectPtr conn, /** - * virConnectListDomains: + * virNodeGetInfo: * @conn: pointer to the hypervisor connection - * @ids: array to collect the list of IDs of active domains - * @maxids: size of @ids - * - * Collect the list of active domains, and store their IDs in array @ids + * @info: pointer to a virNodeInfo structure allocated by the user * - * For inactive domains, see virConnectListDefinedDomains(). For more - * control over the results, see virConnectListAllDomains(). + * Extract hardware information about the node. * - * Returns the number of domains found or -1 in case of error. Note that - * this command is inherently racy; a domain can be started between a - * call to virConnectNumOfDomains() and this call; you are only guaranteed - * that all currently active domains were listed if the return is less - * than @maxids. + * Returns 0 in case of success and -1 in case of failure. */ int -virConnectListDomains(virConnectPtr conn, int *ids, int maxids) +virNodeGetInfo(virConnectPtr conn, virNodeInfoPtr info)

+++ b/src/libvirt_internal.h @@ -285,4 +285,10 @@ int virDomainMigrateConfirm3Params(virDomainPtr domain, int cookieinlen, unsigned int flags, int cancelled); + +int +virTypedParameterValidateSet(virConnectPtr conn, + virTypedParameterPtr params, + int nparams); + #endif