Re: [libvirt] [PATCH] add some more missing libvirt functions

10 июня 2015 г. 16:00 пользователь "Michal Privoznik" <mprivozn(a)redhat.com&gt; написал: +++++++++++++++++++++++++++++++++++++++++++++++++++++- CONST_CS | CONST_PERSISTENT); VIR_DOMAIN_BLOCK_JOB_ABORT_ASYNC, CONST_CS | CONST_PERSISTENT); VIR_DOMAIN_BLOCK_JOB_ABORT_PIVOT, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("VIR_DOMAIN_BLOCK_JOB_SPEED_BANDWIDTH_BYTES", VIR_DOMAIN_BLOCK_JOB_SPEED_BANDWIDTH_BYTES, CONST_CS | CONST_PERSISTENT); CONST_CS | CONST_PERSISTENT); less-common spelling that we're stuck with: */ DOMAIN_FLAG_TEST_LOCAL_VNC, CONST_CS | CONST_PERSISTENT); DOMAIN_FLAG_SOUND_AC97, CONST_CS | CONST_PERSISTENT); DOMAIN_DISK_FILE, CONST_CS | CONST_PERSISTENT); DOMAIN_DISK_BLOCK, CONST_CS | CONST_PERSISTENT); DOMAIN_DISK_BLOCK, CONST_CS | CONST_PERSISTENT); DOMAIN_DISK_ACCESS_ALL, CONST_CS | CONST_PERSISTENT); 1, CONST_CS | CONST_PERSISTENT); 2, CONST_CS | CONST_PERSISTENT); VIR_DOMAIN_STATS_STATE, CONST_CS | CONST_PERSISTENT); VIR_DOMAIN_STATS_CPU_TOTAL, CONST_CS | CONST_PERSISTENT); VIR_DOMAIN_STATS_BALLOON, CONST_CS | CONST_PERSISTENT); VIR_DOMAIN_STATS_VCPU, CONST_CS | CONST_PERSISTENT); VIR_DOMAIN_STATS_INTERFACE, CONST_CS | CONST_PERSISTENT); VIR_DOMAIN_STATS_BLOCK, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("VIR_CONNECT_GET_ALL_DOMAINS_STATS_ACTIVE", VIR_CONNECT_GET_ALL_DOMAINS_STATS_ACTIVE, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("VIR_CONNECT_GET_ALL_DOMAINS_STATS_INACTIVE", VIR_CONNECT_GET_ALL_DOMAINS_STATS_INACTIVE, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("VIR_CONNECT_GET_ALL_DOMAINS_STATS_OTHER", VIR_CONNECT_GET_ALL_DOMAINS_STATS_OTHER, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("VIR_CONNECT_GET_ALL_DOMAINS_STATS_PAUSED", VIR_CONNECT_GET_ALL_DOMAINS_STATS_PAUSED, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("VIR_CONNECT_GET_ALL_DOMAINS_STATS_PERSISTENT", VIR_CONNECT_GET_ALL_DOMAINS_STATS_PERSISTENT, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("VIR_CONNECT_GET_ALL_DOMAINS_STATS_RUNNING", VIR_CONNECT_GET_ALL_DOMAINS_STATS_RUNNING, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("VIR_CONNECT_GET_ALL_DOMAINS_STATS_SHUTOFF", VIR_CONNECT_GET_ALL_DOMAINS_STATS_SHUTOFF, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("VIR_CONNECT_GET_ALL_DOMAINS_STATS_TRANSIENT", VIR_CONNECT_GET_ALL_DOMAINS_STATS_TRANSIENT, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("VIR_CONNECT_GET_ALL_DOMAINS_STATS_BACKING", VIR_CONNECT_GET_ALL_DOMAINS_STATS_BACKING, CONST_CS | CONST_PERSISTENT); > > This line should be dropped too. > REGISTER_LONG_CONSTANT("VIR_CONNECT_GET_ALL_DOMAINS_STATS_ENFORCE_STATS", VIR_CONNECT_GET_ALL_DOMAINS_STATS_ENFORCE_STATS, CONST_CS | CONST_PERSISTENT); > > /* Connect flags */ > > REGISTER_LONG_CONSTANT("VIR_CONNECT_FLAG_SOUNDHW_GET_NAMES", CONNECT_FLAG_SOUNDHW_GET_NAMES, CONST_CS | CONST_PERSISTENT); > > > > @@ -2425,6 +2453,69 @@ PHP_FUNCTION(libvirt_connect_get_secure) > > RETURN_LONG( virConnectIsSecure(conn->conn) ); > > } > > > > +/* > > + Function name: libvirt_connect_get_all_domain_stats > > + Since version: 0.5.1(-1) > > + Description: Query statistics for all domains on a given connection VIR_DOMAIN_STATS_* VIR_CONNECT_GET_ALL_DOMAINS_STATS_* > > + Returns: assoc array with statistics or false on error > > +*/ > > +PHP_FUNCTION(libvirt_connect_get_all_domain_stats) > > +{ > > + php_libvirt_connection *conn = NULL; > > + zval *zconn; > > + int retval = -1; > > + long flags = 0; > > + long stats = 0; > > + char *name = NULL; > > const char *name; > > > + int i; > > + int j; > > + virTypedParameter params; > > + virDomainStatsRecordPtr *retstats = NULL; > > + GET_CONNECTION_FROM_ARGS("r|l|l",&zconn, &stats, &flags); > > + retval = virConnectGetAllDomainStats(conn->conn, stats, &retstats, flags); > > + array_init(return_value); > > + if (retval < 0) > > + RETURN_FALSE; > > + for (i=0; i < retval; i++) { > > + zval *arr2; > > + ALLOC_INIT_ZVAL(arr2); > > + array_init(arr2); > > + for (j = 0; j < retstats[i]->nparams; j++) { > > + params = retstats[i]->params[j]; > > + switch (params.type) { > > + case VIR_TYPED_PARAM_INT: > > + add_assoc_long(arr2, params.field, params.value.i); params.value.ui); params.value.l); params.value.ul); params.value.d); params.value.b); strlen(params.field)+1, params.value.s, strlen(params.value.s)+1); strlen(name)+1, &arr2, sizeof(arr2), NULL); > > + } > > + virDomainStatsRecordListFree(retstats); > > +} > > Otherwise looking good. Fixed all the nits, ACKed and pushed. > > Michal Thanks!