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

2015-06-11 Thread Vasiliy Tolstov 
10 июня 2015 г. 16:00 пользователь Michal Privoznik mpriv...@redhat.com
написал:

 On 10.06.2015 10:18, Vasiliy Tolstov wrote:
  * libvirt_connect_get_all_domain_stats
  * libvirt_domain_block_resize
  * libvirt_domain_block_job_abort
  * libvirt_domain_block_job_set_speed
 
  Signed-off-by: Vasiliy Tolstov v.tols...@selfip.ru
  ---
   src/libvirt-php.c | 177
+-
   src/libvirt-php.h |   4 ++
   2 files changed, 180 insertions(+), 1 deletion(-)

 From the e-mail header:

 Content-Type: text/plain; charset=yes

 I've not know there's such charset as yes :)


 
  diff --git a/src/libvirt-php.c b/src/libvirt-php.c
  index e9b9657..f9096ef 100644
  --- a/src/libvirt-php.c
  +++ b/src/libvirt-php.c
  @@ -91,6 +91,7 @@ static zend_function_entry libvirt_functions[] = {
PHP_FE(libvirt_connect_get_maxvcpus, NULL)
PHP_FE(libvirt_connect_get_encrypted, NULL)
PHP_FE(libvirt_connect_get_secure, NULL)
  + PHP_FE(libvirt_connect_get_all_domain_stats, NULL)
/* Stream functions */
PHP_FE(libvirt_stream_create, NULL)
PHP_FE(libvirt_stream_close, NULL)
  @@ -136,6 +137,10 @@ static zend_function_entry libvirt_functions[] = {
PHP_FE(libvirt_domain_memory_peek,NULL)
PHP_FE(libvirt_domain_memory_stats,NULL)
PHP_FE(libvirt_domain_block_stats,NULL)
  + PHP_FE(libvirt_domain_block_resize,NULL)
  + //  PHP_FE(libvirt_domain_block_copy,NULL)

 Just drop this line.

  + PHP_FE(libvirt_domain_block_job_abort,NULL)
  + PHP_FE(libvirt_domain_block_job_set_speed,NULL)
PHP_FE(libvirt_domain_interface_stats,NULL)
PHP_FE(libvirt_domain_get_connect, NULL)
PHP_FE(libvirt_domain_migrate, NULL)
  @@ -1332,6 +1337,11 @@ PHP_MINIT_FUNCTION(libvirt)
/* Job was aborted but it's not cleanup up yet */
REGISTER_LONG_CONSTANT(VIR_DOMAIN_JOB_CANCELLED,  5,
CONST_CS | CONST_PERSISTENT);
 
  + REGISTER_LONG_CONSTANT(VIR_DOMAIN_BLOCK_JOB_ABORT_ASYNC,
VIR_DOMAIN_BLOCK_JOB_ABORT_ASYNC, CONST_CS | CONST_PERSISTENT);
  + REGISTER_LONG_CONSTANT(VIR_DOMAIN_BLOCK_JOB_ABORT_PIVOT,
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);
  +
/* Migration constants */
REGISTER_LONG_CONSTANT(VIR_MIGRATE_LIVE,1,
CONST_CS | CONST_PERSISTENT);
/* direct source - dest host control channel Note the
less-common spelling that we're stuck with: */
  @@ -1374,7 +1384,7 @@ PHP_MINIT_FUNCTION(libvirt)
REGISTER_LONG_CONSTANT(VIR_DOMAIN_FLAG_TEST_LOCAL_VNC,
DOMAIN_FLAG_TEST_LOCAL_VNC, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(VIR_DOMAIN_FLAG_SOUND_AC97,
DOMAIN_FLAG_SOUND_AC97, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(VIR_DOMAIN_DISK_FILE,
DOMAIN_DISK_FILE, CONST_CS | CONST_PERSISTENT);
  - REGISTER_LONG_CONSTANT(VIR_DOMAIN_DISK_BLOCK,
 DOMAIN_DISK_BLOCK, CONST_CS | CONST_PERSISTENT);
  + REGISTER_LONG_CONSTANT(VIR_DOMAIN_DISK_BLOCK,
 DOMAIN_DISK_BLOCK, CONST_CS | CONST_PERSISTENT);

 This looks like spurious change.

REGISTER_LONG_CONSTANT(VIR_DOMAIN_DISK_ACCESS_ALL,
DOMAIN_DISK_ACCESS_ALL, CONST_CS | CONST_PERSISTENT);
 
/* Domain metadata constants */
  @@ -1385,6 +1395,24 @@ PHP_MINIT_FUNCTION(libvirt)
REGISTER_LONG_CONSTANT(VIR_DOMAIN_AFFECT_LIVE,
1, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(VIR_DOMAIN_AFFECT_CONFIG,
2, CONST_CS | CONST_PERSISTENT);
 
  + REGISTER_LONG_CONSTANT(VIR_DOMAIN_STATS_STATE,
VIR_DOMAIN_STATS_STATE, CONST_CS | CONST_PERSISTENT);
  + REGISTER_LONG_CONSTANT(VIR_DOMAIN_STATS_CPU_TOTAL,
VIR_DOMAIN_STATS_CPU_TOTAL, CONST_CS | CONST_PERSISTENT);
  + REGISTER_LONG_CONSTANT(VIR_DOMAIN_STATS_BALLOON,
VIR_DOMAIN_STATS_BALLOON, CONST_CS | CONST_PERSISTENT);
  + REGISTER_LONG_CONSTANT(VIR_DOMAIN_STATS_VCPU,
 VIR_DOMAIN_STATS_VCPU, CONST_CS | CONST_PERSISTENT);
  + REGISTER_LONG_CONSTANT(VIR_DOMAIN_STATS_INTERFACE,
VIR_DOMAIN_STATS_INTERFACE, CONST_CS | CONST_PERSISTENT);
  + REGISTER_LONG_CONSTANT(VIR_DOMAIN_STATS_BLOCK,
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,

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

2015-06-10 Thread Michal Privoznik 
On 10.06.2015 10:18, Vasiliy Tolstov wrote:
 * libvirt_connect_get_all_domain_stats
 * libvirt_domain_block_resize
 * libvirt_domain_block_job_abort
 * libvirt_domain_block_job_set_speed
 
 Signed-off-by: Vasiliy Tolstov v.tols...@selfip.ru
 ---
  src/libvirt-php.c | 177 
 +-
  src/libvirt-php.h |   4 ++
  2 files changed, 180 insertions(+), 1 deletion(-)

From the e-mail header:

Content-Type: text/plain; charset=yes

I've not know there's such charset as yes :)


 
 diff --git a/src/libvirt-php.c b/src/libvirt-php.c
 index e9b9657..f9096ef 100644
 --- a/src/libvirt-php.c
 +++ b/src/libvirt-php.c
 @@ -91,6 +91,7 @@ static zend_function_entry libvirt_functions[] = {
   PHP_FE(libvirt_connect_get_maxvcpus, NULL)
   PHP_FE(libvirt_connect_get_encrypted, NULL)
   PHP_FE(libvirt_connect_get_secure, NULL)
 + PHP_FE(libvirt_connect_get_all_domain_stats, NULL)
   /* Stream functions */
   PHP_FE(libvirt_stream_create, NULL)
   PHP_FE(libvirt_stream_close, NULL)
 @@ -136,6 +137,10 @@ static zend_function_entry libvirt_functions[] = {
   PHP_FE(libvirt_domain_memory_peek,NULL)
   PHP_FE(libvirt_domain_memory_stats,NULL)
   PHP_FE(libvirt_domain_block_stats,NULL)
 + PHP_FE(libvirt_domain_block_resize,NULL)
 + //  PHP_FE(libvirt_domain_block_copy,NULL)

Just drop this line.

 + PHP_FE(libvirt_domain_block_job_abort,NULL)
 + PHP_FE(libvirt_domain_block_job_set_speed,NULL)
   PHP_FE(libvirt_domain_interface_stats,NULL)
   PHP_FE(libvirt_domain_get_connect, NULL)
   PHP_FE(libvirt_domain_migrate, NULL)
 @@ -1332,6 +1337,11 @@ PHP_MINIT_FUNCTION(libvirt)
   /* Job was aborted but it's not cleanup up yet */
   REGISTER_LONG_CONSTANT(VIR_DOMAIN_JOB_CANCELLED,  5, CONST_CS | 
 CONST_PERSISTENT);
  
 + REGISTER_LONG_CONSTANT(VIR_DOMAIN_BLOCK_JOB_ABORT_ASYNC,  
 VIR_DOMAIN_BLOCK_JOB_ABORT_ASYNC, CONST_CS | CONST_PERSISTENT);
 + REGISTER_LONG_CONSTANT(VIR_DOMAIN_BLOCK_JOB_ABORT_PIVOT,  
 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);
 +
   /* Migration constants */
   REGISTER_LONG_CONSTANT(VIR_MIGRATE_LIVE,1, CONST_CS | 
 CONST_PERSISTENT);
   /* direct source - dest host control channel Note the less-common 
 spelling that we're stuck with: */
 @@ -1374,7 +1384,7 @@ PHP_MINIT_FUNCTION(libvirt)
   REGISTER_LONG_CONSTANT(VIR_DOMAIN_FLAG_TEST_LOCAL_VNC,
 DOMAIN_FLAG_TEST_LOCAL_VNC, CONST_CS | CONST_PERSISTENT);
   REGISTER_LONG_CONSTANT(VIR_DOMAIN_FLAG_SOUND_AC97,
 DOMAIN_FLAG_SOUND_AC97, CONST_CS | CONST_PERSISTENT);
   REGISTER_LONG_CONSTANT(VIR_DOMAIN_DISK_FILE,  
 DOMAIN_DISK_FILE, CONST_CS | CONST_PERSISTENT);
 - REGISTER_LONG_CONSTANT(VIR_DOMAIN_DISK_BLOCK, 
 DOMAIN_DISK_BLOCK, CONST_CS | CONST_PERSISTENT);
 + REGISTER_LONG_CONSTANT(VIR_DOMAIN_DISK_BLOCK, 
 DOMAIN_DISK_BLOCK, CONST_CS | CONST_PERSISTENT);

This looks like spurious change.

   REGISTER_LONG_CONSTANT(VIR_DOMAIN_DISK_ACCESS_ALL,
 DOMAIN_DISK_ACCESS_ALL, CONST_CS | CONST_PERSISTENT);
  
   /* Domain metadata constants */
 @@ -1385,6 +1395,24 @@ PHP_MINIT_FUNCTION(libvirt)
   REGISTER_LONG_CONSTANT(VIR_DOMAIN_AFFECT_LIVE,1, 
 CONST_CS | CONST_PERSISTENT);
   REGISTER_LONG_CONSTANT(VIR_DOMAIN_AFFECT_CONFIG,  2, 
 CONST_CS | CONST_PERSISTENT);
  
 + REGISTER_LONG_CONSTANT(VIR_DOMAIN_STATS_STATE,
 VIR_DOMAIN_STATS_STATE, CONST_CS | CONST_PERSISTENT);
 + REGISTER_LONG_CONSTANT(VIR_DOMAIN_STATS_CPU_TOTAL,
 VIR_DOMAIN_STATS_CPU_TOTAL, CONST_CS | CONST_PERSISTENT);
 + REGISTER_LONG_CONSTANT(VIR_DOMAIN_STATS_BALLOON,  
 VIR_DOMAIN_STATS_BALLOON, CONST_CS | CONST_PERSISTENT);
 + REGISTER_LONG_CONSTANT(VIR_DOMAIN_STATS_VCPU, 
 VIR_DOMAIN_STATS_VCPU, CONST_CS | CONST_PERSISTENT);
 + REGISTER_LONG_CONSTANT(VIR_DOMAIN_STATS_INTERFACE,
 VIR_DOMAIN_STATS_INTERFACE, CONST_CS | CONST_PERSISTENT);
 + REGISTER_LONG_CONSTANT(VIR_DOMAIN_STATS_BLOCK,
 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);
 +

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

2015-06-10 Thread Vasiliy Tolstov 
* libvirt_connect_get_all_domain_stats
* libvirt_domain_block_resize
* libvirt_domain_block_job_abort
* libvirt_domain_block_job_set_speed

Signed-off-by: Vasiliy Tolstov v.tols...@selfip.ru
---
 src/libvirt-php.c | 177 +-
 src/libvirt-php.h |   4 ++
 2 files changed, 180 insertions(+), 1 deletion(-)

diff --git a/src/libvirt-php.c b/src/libvirt-php.c
index e9b9657..f9096ef 100644
--- a/src/libvirt-php.c
+++ b/src/libvirt-php.c
@@ -91,6 +91,7 @@ static zend_function_entry libvirt_functions[] = {
PHP_FE(libvirt_connect_get_maxvcpus, NULL)
PHP_FE(libvirt_connect_get_encrypted, NULL)
PHP_FE(libvirt_connect_get_secure, NULL)
+   PHP_FE(libvirt_connect_get_all_domain_stats, NULL)
/* Stream functions */
PHP_FE(libvirt_stream_create, NULL)
PHP_FE(libvirt_stream_close, NULL)
@@ -136,6 +137,10 @@ static zend_function_entry libvirt_functions[] = {
PHP_FE(libvirt_domain_memory_peek,NULL)
PHP_FE(libvirt_domain_memory_stats,NULL)
PHP_FE(libvirt_domain_block_stats,NULL)
+   PHP_FE(libvirt_domain_block_resize,NULL)
+   //  PHP_FE(libvirt_domain_block_copy,NULL)
+   PHP_FE(libvirt_domain_block_job_abort,NULL)
+   PHP_FE(libvirt_domain_block_job_set_speed,NULL)
PHP_FE(libvirt_domain_interface_stats,NULL)
PHP_FE(libvirt_domain_get_connect, NULL)
PHP_FE(libvirt_domain_migrate, NULL)
@@ -1332,6 +1337,11 @@ PHP_MINIT_FUNCTION(libvirt)
/* Job was aborted but it's not cleanup up yet */
REGISTER_LONG_CONSTANT(VIR_DOMAIN_JOB_CANCELLED,  5, CONST_CS | 
CONST_PERSISTENT);
 
+   REGISTER_LONG_CONSTANT(VIR_DOMAIN_BLOCK_JOB_ABORT_ASYNC,  
VIR_DOMAIN_BLOCK_JOB_ABORT_ASYNC, CONST_CS | CONST_PERSISTENT);
+   REGISTER_LONG_CONSTANT(VIR_DOMAIN_BLOCK_JOB_ABORT_PIVOT,  
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);
+
/* Migration constants */
REGISTER_LONG_CONSTANT(VIR_MIGRATE_LIVE,1, CONST_CS | 
CONST_PERSISTENT);
/* direct source - dest host control channel Note the less-common 
spelling that we're stuck with: */
@@ -1374,7 +1384,7 @@ PHP_MINIT_FUNCTION(libvirt)
REGISTER_LONG_CONSTANT(VIR_DOMAIN_FLAG_TEST_LOCAL_VNC,
DOMAIN_FLAG_TEST_LOCAL_VNC, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(VIR_DOMAIN_FLAG_SOUND_AC97,
DOMAIN_FLAG_SOUND_AC97, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(VIR_DOMAIN_DISK_FILE,  
DOMAIN_DISK_FILE, CONST_CS | CONST_PERSISTENT);
-   REGISTER_LONG_CONSTANT(VIR_DOMAIN_DISK_BLOCK, 
DOMAIN_DISK_BLOCK, CONST_CS | CONST_PERSISTENT);
+   REGISTER_LONG_CONSTANT(VIR_DOMAIN_DISK_BLOCK, 
DOMAIN_DISK_BLOCK, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(VIR_DOMAIN_DISK_ACCESS_ALL,
DOMAIN_DISK_ACCESS_ALL, CONST_CS | CONST_PERSISTENT);
 
/* Domain metadata constants */
@@ -1385,6 +1395,24 @@ PHP_MINIT_FUNCTION(libvirt)
REGISTER_LONG_CONSTANT(VIR_DOMAIN_AFFECT_LIVE,1, 
CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT(VIR_DOMAIN_AFFECT_CONFIG,  2, 
CONST_CS | CONST_PERSISTENT);
 
+   REGISTER_LONG_CONSTANT(VIR_DOMAIN_STATS_STATE,
VIR_DOMAIN_STATS_STATE, CONST_CS | CONST_PERSISTENT);
+   REGISTER_LONG_CONSTANT(VIR_DOMAIN_STATS_CPU_TOTAL,
VIR_DOMAIN_STATS_CPU_TOTAL, CONST_CS | CONST_PERSISTENT);
+   REGISTER_LONG_CONSTANT(VIR_DOMAIN_STATS_BALLOON,  
VIR_DOMAIN_STATS_BALLOON, CONST_CS | CONST_PERSISTENT);
+   REGISTER_LONG_CONSTANT(VIR_DOMAIN_STATS_VCPU, 
VIR_DOMAIN_STATS_VCPU, CONST_CS | CONST_PERSISTENT);
+   REGISTER_LONG_CONSTANT(VIR_DOMAIN_STATS_INTERFACE,
VIR_DOMAIN_STATS_INTERFACE, CONST_CS | CONST_PERSISTENT);
+   REGISTER_LONG_CONSTANT(VIR_DOMAIN_STATS_BLOCK,
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);
+