From: Remi Collet <fedora(a)famillecollet.com&gt; --- src/config.m4 | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 src/config.m4 diff --git a/src/config.m4 b/src/config.m4 new file mode 100644 index 0000000..35bdd76 --- /dev/null +++ b/src/config.m4 @@ -0,0 +1,54 @@ +PHP_ARG_WITH(libvirt, for libvirt support, +[ --with-libvirt Include libvirt support]) + +if test "$PHP_LIBVIRT" != "no"; then + + AC_PATH_PROG(PKG_CONFIG, pkg-config, no) + + LIBVIRT_REQUIRED=1.2.8 + + if test -x "$PKG_CONFIG" && $PKG_CONFIG libvirt --exists ; then + AC_MSG_CHECKING(libvirt version) + if $PKG_CONFIG libvirt --atleast-version=$LIBVIRT_REQUIRED ; then + LIBVIRT_INCLUDE=`$PKG_CONFIG libvirt --cflags` + LIBVIRT_LIBRARY=`$PKG_CONFIG libvirt --libs` + LIBVIRT_VERSION=`$PKG_CONFIG libvirt --modversion` + AC_MSG_RESULT($LIBVIRT_VERSION) + else + AC_MSG_ERROR(version too old) + fi + PHP_EVAL_INCLINE($LIBVIRT_INCLUDE) + PHP_EVAL_LIBLINE($LIBVIRT_LIBRARY, LIBVIRT_SHARED_LIBADD) + + AC_MSG_CHECKING(libvirt-qemu version) + if $PKG_CONFIG libvirt-qemu --atleast-version=$LIBVIRT_REQUIRED ; then + QEMU_INCLUDE=`$PKG_CONFIG libvirt-qemu --cflags` + QEMU_LIBRARY=`$PKG_CONFIG libvirt-qemu --libs` + QEMU_VERSION=`$PKG_CONFIG libvirt-qemu --modversion` + AC_MSG_RESULT($QEMU_VERSION) + else + AC_MSG_ERROR(version too old) + fi + PHP_EVAL_INCLINE($QEMU_INCLUDE) + PHP_EVAL_LIBLINE($QEMU_LIBRARY, LIBVIRT_SHARED_LIBADD) + + AC_MSG_CHECKING(libxml version) + if $PKG_CONFIG libxml-2.0 --exists ; then + LIBXML_INCLUDE=`$PKG_CONFIG libxml-2.0 --cflags` + LIBXML_LIBRARY=`$PKG_CONFIG libxml-2.0 --libs` + LIBXML_VERSION=`$PKG_CONFIG libxml-2.0 --modversion` + AC_MSG_RESULT($LIBXML_VERSION) + else + AC_MSG_ERROR(version too old) + fi + PHP_EVAL_INCLINE($LIBXML_INCLUDE) + PHP_EVAL_LIBLINE($LIBXML_LIBRARY, LIBVIRT_SHARED_LIBADD) + + CFLAGS="$CFLAGS -DCOMPILE_DL_LIBVIRT=1" + + PHP_SUBST(LIBVIRT_SHARED_LIBADD) + PHP_NEW_EXTENSION(libvirt, libvirt-php.c sockets.c vncfunc.c, $ext_shared) + else + AC_MSG_ERROR(pkg-config not found) + fi +fi -- 2.5.5

From: Remi Collet <fedora(a)famillecollet.com&gt; --- src/libvirt-php.c | 715 +++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 553 insertions(+), 162 deletions(-) diff --git a/src/libvirt-php.c b/src/libvirt-php.c index 1af6077..3f06edc 100644 --- a/src/libvirt-php.c +++ b/src/libvirt-php.c @@ -70,184 +70,563 @@ ZEND_DECLARE_MODULE_GLOBALS(libvirt) ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_connect, 0, 0, 0) ZEND_ARG_INFO(0, url) ZEND_ARG_INFO(0, readonly) +ZEND_ARG_INFO(0, credentials) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_void, 0, 0, 0) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_conn, 0, 0, 1) +ZEND_ARG_INFO(0, conn) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_conn_xpath, 0, 0, 1) +ZEND_ARG_INFO(0, conn) +ZEND_ARG_INFO(0, xpath) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_connect_get_emulator, 0, 0, 1) +ZEND_ARG_INFO(0, conn) +ZEND_ARG_INFO(0, arch) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_connect_get_soundhw_models, 0, 0, 1) +ZEND_ARG_INFO(0, conn) +ZEND_ARG_INFO(0, arch) +ZEND_ARG_INFO(0, flags) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_connect_get_all_domain_stats, 0, 0, 1) +ZEND_ARG_INFO(0, conn) +ZEND_ARG_INFO(0, stats) +ZEND_ARG_INFO(0, flags) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_stream_send, 0, 0, 2) +ZEND_ARG_INFO(0, conn) +ZEND_ARG_INFO(0, data) +ZEND_ARG_INFO(0, len) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_domain_new, 0, 0, 9) +ZEND_ARG_INFO(0, conn) +ZEND_ARG_INFO(0, name) +ZEND_ARG_INFO(0, arch) +ZEND_ARG_INFO(0, memMB) +ZEND_ARG_INFO(0, maxmemMB) +ZEND_ARG_INFO(0, vcpus) +ZEND_ARG_INFO(0, iso) +ZEND_ARG_INFO(0, disks) +ZEND_ARG_INFO(0, networks) +ZEND_ARG_INFO(0, flags) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_domain_change_vcpus, 0, 0, 2) +ZEND_ARG_INFO(0, conn) +ZEND_ARG_INFO(0, numCpus) +ZEND_ARG_INFO(0, flags) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_domain_change_memory, 0, 0, 3) +ZEND_ARG_INFO(0, conn) +ZEND_ARG_INFO(0, allocMem) +ZEND_ARG_INFO(0, allocMax) +ZEND_ARG_INFO(0, flags) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_domain_change_boot_devices, 0, 0, 3) +ZEND_ARG_INFO(0, conn) +ZEND_ARG_INFO(0, first) +ZEND_ARG_INFO(0, second) +ZEND_ARG_INFO(0, flags) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_domain_disk_add, 0, 0, 5) +ZEND_ARG_INFO(0, conn) +ZEND_ARG_INFO(0, img) +ZEND_ARG_INFO(0, dev) +ZEND_ARG_INFO(0, type) +ZEND_ARG_INFO(0, driver) +ZEND_ARG_INFO(0, flags) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_domain_disk_remove, 0, 0, 2) +ZEND_ARG_INFO(0, conn) +ZEND_ARG_INFO(0, dev) +ZEND_ARG_INFO(0, flags) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_domain_nic_add, 0, 0, 4) +ZEND_ARG_INFO(0, conn) +ZEND_ARG_INFO(0, mac) +ZEND_ARG_INFO(0, network) +ZEND_ARG_INFO(0, model) +ZEND_ARG_INFO(0, flags) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_domain_nic_remove, 0, 0, 2) +ZEND_ARG_INFO(0, conn) +ZEND_ARG_INFO(0, dev) +ZEND_ARG_INFO(0, flags) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_domain_lookup_by_id, 0, 0, 2) +ZEND_ARG_INFO(0, conn) +ZEND_ARG_INFO(0, id) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_conn_uuid, 0, 0, 2) +ZEND_ARG_INFO(0, conn) +ZEND_ARG_INFO(0, uuid) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_conn_xml, 0, 0, 2) +ZEND_ARG_INFO(0, conn) +ZEND_ARG_INFO(0, xml) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_domain_core_dump, 0, 0, 2) +ZEND_ARG_INFO(0, conn) +ZEND_ARG_INFO(0, to) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_conn_flags, 0, 0, 1) +ZEND_ARG_INFO(0, conn) +ZEND_ARG_INFO(0, flags) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_domain_memory_peek, 0, 0, 4) +ZEND_ARG_INFO(0, conn) +ZEND_ARG_INFO(0, start) +ZEND_ARG_INFO(0, size) +ZEND_ARG_INFO(0, flags) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_domain_set_memory, 0, 0, 2) +ZEND_ARG_INFO(0, conn) +ZEND_ARG_INFO(0, memory) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_domain_set_memory_flags, 0, 0, 2) +ZEND_ARG_INFO(0, conn) +ZEND_ARG_INFO(0, memory) +ZEND_ARG_INFO(0, flags) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_conn_path, 0, 0, 2) +ZEND_ARG_INFO(0, conn) +ZEND_ARG_INFO(0, path) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_domain_block_resize, 0, 0, 3) +ZEND_ARG_INFO(0, conn) +ZEND_ARG_INFO(0, path) +ZEND_ARG_INFO(0, size) +ZEND_ARG_INFO(0, flags) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_domain_block_job_abort, 0, 0, 2) +ZEND_ARG_INFO(0, conn) +ZEND_ARG_INFO(0, path) +ZEND_ARG_INFO(0, flags) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_domain_block_job_set_speed, 0, 0, 3) +ZEND_ARG_INFO(0, conn) +ZEND_ARG_INFO(0, path) +ZEND_ARG_INFO(0, bandwidth) +ZEND_ARG_INFO(0, flags) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_domain_migrate, 0, 0, 3) +ZEND_ARG_INFO(0, res) +ZEND_ARG_INFO(0, dest_conn) +ZEND_ARG_INFO(0, flags) +ZEND_ARG_INFO(0, dname) +ZEND_ARG_INFO(0, bandwidth) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_domain_migrate_to_uri, 0, 0, 3) +ZEND_ARG_INFO(0, res) +ZEND_ARG_INFO(0, dest_uri) +ZEND_ARG_INFO(0, flags) +ZEND_ARG_INFO(0, dname) +ZEND_ARG_INFO(0, bandwidth) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_domain_migrate_to_uri2, 0, 0, 1) +ZEND_ARG_INFO(0, res) +ZEND_ARG_INFO(0, dconn_uri) +ZEND_ARG_INFO(0, mig_uri) +ZEND_ARG_INFO(0, dxml) +ZEND_ARG_INFO(0, flags) +ZEND_ARG_INFO(0, dname) +ZEND_ARG_INFO(0, bandwidth) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_domain_xml_xpath, 0, 0, 2) +ZEND_ARG_INFO(0, res) +ZEND_ARG_INFO(0, xpath) +ZEND_ARG_INFO(0, flags) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_domain_get_block_info, 0, 0, 2) +ZEND_ARG_INFO(0, res) +ZEND_ARG_INFO(0, dev) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_domain_get_network_info, 0, 0, 2) +ZEND_ARG_INFO(0, res) +ZEND_ARG_INFO(0, mac) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_domain_set_autostart, 0, 0, 2) +ZEND_ARG_INFO(0, conn) +ZEND_ARG_INFO(0, flags) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_domain_get_metadata, 0, 0, 4) +ZEND_ARG_INFO(0, conn) +ZEND_ARG_INFO(0, type) +ZEND_ARG_INFO(0, uri) +ZEND_ARG_INFO(0, flags) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_domain_set_metadata, 0, 0, 6) +ZEND_ARG_INFO(0, conn) +ZEND_ARG_INFO(0, type) +ZEND_ARG_INFO(0, metadata) +ZEND_ARG_INFO(0, key) +ZEND_ARG_INFO(0, uri) +ZEND_ARG_INFO(0, flags) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_domain_get_screenshot, 0, 0, 2) +ZEND_ARG_INFO(0, conn) +ZEND_ARG_INFO(0, server) +ZEND_ARG_INFO(0, scancode) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_domain_get_screenshot_api, 0, 0, 1) +ZEND_ARG_INFO(0, conn) +ZEND_ARG_INFO(0, screenID) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_domain_get_screen_dimensions, 0, 0, 2) +ZEND_ARG_INFO(0, conn) +ZEND_ARG_INFO(0, server) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_domain_send_keys, 0, 0, 3) +ZEND_ARG_INFO(0, conn) +ZEND_ARG_INFO(0, server) +ZEND_ARG_INFO(0, scancode) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_domain_send_pointer_event, 0, 0, 5) +ZEND_ARG_INFO(0, conn) +ZEND_ARG_INFO(0, server) +ZEND_ARG_INFO(0, pos_x) +ZEND_ARG_INFO(0, pox_y) +ZEND_ARG_INFO(0, clicked) +ZEND_ARG_INFO(0, release) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_domain_update_device, 0, 0, 3) +ZEND_ARG_INFO(0, conn) +ZEND_ARG_INFO(0, xml) +ZEND_ARG_INFO(0, flags) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_conn_optflags, 0, 0, 1) +ZEND_ARG_INFO(0, conn) +ZEND_ARG_INFO(0, flags) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_domain_snapshot_lookup_by_name, 0, 0, 2) +ZEND_ARG_INFO(0, conn) +ZEND_ARG_INFO(0, name) +ZEND_ARG_INFO(0, flags) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_conn_name, 0, 0, 2) +ZEND_ARG_INFO(0, conn) +ZEND_ARG_INFO(0, name) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_storagevolume_lookup_by_path, 0, 0, 2) +ZEND_ARG_INFO(0, conn) +ZEND_ARG_INFO(0, path) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_storagevolume_get_xml_desc, 0, 0, 2) +ZEND_ARG_INFO(0, conn) +ZEND_ARG_INFO(0, xpath) +ZEND_ARG_INFO(0, flags) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_storagevolume_create_xml_from, 0, 0, 3) +ZEND_ARG_INFO(0, pool) +ZEND_ARG_INFO(0, xml) +ZEND_ARG_INFO(0, original_volume) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_storagevolume_download, 0, 0, 2) +ZEND_ARG_INFO(0, conn) +ZEND_ARG_INFO(0, stream) +ZEND_ARG_INFO(0, offset) +ZEND_ARG_INFO(0, length) +ZEND_ARG_INFO(0, flags) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_storagevolume_resize, 0, 0, 2) +ZEND_ARG_INFO(0, conn) +ZEND_ARG_INFO(0, capacity) +ZEND_ARG_INFO(0, flags) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_storagepool_define_xml, 0, 0, 2) +ZEND_ARG_INFO(0, conn) +ZEND_ARG_INFO(0, xml) +ZEND_ARG_INFO(0, flags) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_conn_optcpunr, 0, 0, 1) +ZEND_ARG_INFO(0, conn) +ZEND_ARG_INFO(0, cpunr) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_conn_opttime, 0, 0, 1) +ZEND_ARG_INFO(0, conn) +ZEND_ARG_INFO(0, time) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_conn_optcap, 0, 0, 1) +ZEND_ARG_INFO(0, conn) +ZEND_ARG_INFO(0, cap) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_opttype, 0, 0, 0) +ZEND_ARG_INFO(0, type) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_check_version, 0, 0, 3) +ZEND_ARG_INFO(0, major) +ZEND_ARG_INFO(0, minor) +ZEND_ARG_INFO(0, micro) +ZEND_ARG_INFO(0, type) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_name, 0, 0, 1) +ZEND_ARG_INFO(0, name) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_optpath, 0, 0, 0) +ZEND_ARG_INFO(0, path) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_image_create, 0, 0, 4) +ZEND_ARG_INFO(0, conn) +ZEND_ARG_INFO(0, name) +ZEND_ARG_INFO(0, size) +ZEND_ARG_INFO(0, format) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_conn_image, 0, 0, 2) +ZEND_ARG_INFO(0, conn) +ZEND_ARG_INFO(0, image) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_logfile_set, 0, 0, 1) +ZEND_ARG_INFO(0, filename) +ZEND_ARG_INFO(0, maxsize) +ZEND_END_ARG_INFO() + +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_domain_qemu_agent_command, 0, 0, 2) +ZEND_ARG_INFO(0, conn) +ZEND_ARG_INFO(0, cmd) +ZEND_ARG_INFO(0, timeout) +ZEND_ARG_INFO(0, flags) ZEND_END_ARG_INFO() static zend_function_entry libvirt_functions[] = { /* Common functions */ - PHP_FE(libvirt_get_last_error,NULL) + PHP_FE(libvirt_get_last_error, arginfo_libvirt_void) /* Connect functions */ - PHP_FE(libvirt_connect, arginfo_libvirt_connect) - PHP_FE(libvirt_connect_get_uri, NULL) - PHP_FE(libvirt_connect_get_hostname, NULL) - PHP_FE(libvirt_connect_get_capabilities, NULL) - PHP_FE(libvirt_connect_get_emulator, NULL) - PHP_FE(libvirt_connect_get_nic_models, NULL) - PHP_FE(libvirt_connect_get_soundhw_models, NULL) - PHP_FE(libvirt_connect_get_information, NULL) - PHP_FE(libvirt_connect_get_machine_types, NULL) - PHP_FE(libvirt_connect_get_hypervisor, NULL) - PHP_FE(libvirt_connect_get_sysinfo, NULL) - 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) + PHP_FE(libvirt_connect, arginfo_libvirt_connect) + PHP_FE(libvirt_connect_get_uri, arginfo_libvirt_conn) + PHP_FE(libvirt_connect_get_hostname, arginfo_libvirt_conn) + PHP_FE(libvirt_connect_get_capabilities, arginfo_libvirt_conn_xpath) + PHP_FE(libvirt_connect_get_emulator, arginfo_libvirt_connect_get_emulator) + PHP_FE(libvirt_connect_get_nic_models, arginfo_libvirt_connect_get_emulator) + PHP_FE(libvirt_connect_get_soundhw_models, arginfo_libvirt_connect_get_soundhw_models) + PHP_FE(libvirt_connect_get_information, arginfo_libvirt_conn) + PHP_FE(libvirt_connect_get_machine_types, arginfo_libvirt_conn) + PHP_FE(libvirt_connect_get_hypervisor, arginfo_libvirt_conn) + PHP_FE(libvirt_connect_get_sysinfo, arginfo_libvirt_conn) + PHP_FE(libvirt_connect_get_maxvcpus, arginfo_libvirt_conn) + PHP_FE(libvirt_connect_get_encrypted, arginfo_libvirt_conn) + PHP_FE(libvirt_connect_get_secure, arginfo_libvirt_conn) + PHP_FE(libvirt_connect_get_all_domain_stats, arginfo_libvirt_connect_get_all_domain_stats) /* Stream functions */ - PHP_FE(libvirt_stream_create, NULL) - PHP_FE(libvirt_stream_close, NULL) - PHP_FE(libvirt_stream_abort, NULL) - PHP_FE(libvirt_stream_finish, NULL) - PHP_FE(libvirt_stream_send, NULL) - PHP_FE(libvirt_stream_recv, NULL) + PHP_FE(libvirt_stream_create, arginfo_libvirt_conn) + PHP_FE(libvirt_stream_close, arginfo_libvirt_conn) + PHP_FE(libvirt_stream_abort, arginfo_libvirt_conn) + PHP_FE(libvirt_stream_finish, arginfo_libvirt_conn) + PHP_FE(libvirt_stream_send, arginfo_libvirt_stream_send) + PHP_FE(libvirt_stream_recv, arginfo_libvirt_stream_send) /* Domain functions */ - PHP_FE(libvirt_domain_new, NULL) - PHP_FE(libvirt_domain_new_get_vnc, NULL) - PHP_FE(libvirt_domain_get_counts, NULL) - PHP_FE(libvirt_domain_is_persistent, NULL) - PHP_FE(libvirt_domain_lookup_by_name, NULL) - PHP_FE(libvirt_domain_get_xml_desc, NULL) - PHP_FE(libvirt_domain_get_disk_devices, NULL) - PHP_FE(libvirt_domain_get_interface_devices, NULL) - PHP_FE(libvirt_domain_change_vcpus, NULL) - PHP_FE(libvirt_domain_change_memory, NULL) - PHP_FE(libvirt_domain_change_boot_devices, NULL) - PHP_FE(libvirt_domain_disk_add, NULL) - PHP_FE(libvirt_domain_disk_remove, NULL) - PHP_FE(libvirt_domain_nic_add, NULL) - PHP_FE(libvirt_domain_nic_remove, NULL) - PHP_FE(libvirt_domain_get_info, NULL) - PHP_FE(libvirt_domain_get_name, NULL) - PHP_FE(libvirt_domain_get_uuid, NULL) - PHP_FE(libvirt_domain_get_uuid_string, NULL) - PHP_FE(libvirt_domain_get_id, NULL) - PHP_FE(libvirt_domain_lookup_by_id, NULL) - PHP_FE(libvirt_domain_lookup_by_uuid, NULL) - PHP_FE(libvirt_domain_lookup_by_uuid_string, NULL) - PHP_FE(libvirt_domain_destroy, NULL) - PHP_FE(libvirt_domain_create, NULL) - PHP_FE(libvirt_domain_resume, NULL) - PHP_FE(libvirt_domain_core_dump, NULL) - PHP_FE(libvirt_domain_shutdown, NULL) - PHP_FE(libvirt_domain_suspend, NULL) - PHP_FE(libvirt_domain_managedsave, NULL) - PHP_FE(libvirt_domain_undefine, NULL) - PHP_FE(libvirt_domain_reboot, NULL) - PHP_FE(libvirt_domain_define_xml, NULL) - PHP_FE(libvirt_domain_create_xml, NULL) - PHP_FE(libvirt_domain_memory_peek,NULL) - PHP_FE(libvirt_domain_memory_stats,NULL) - PHP_FE(libvirt_domain_set_memory,NULL) - PHP_FE(libvirt_domain_set_max_memory,NULL) - PHP_FE(libvirt_domain_set_memory_flags,NULL) - PHP_FE(libvirt_domain_block_commit, NULL) - PHP_FE(libvirt_domain_block_stats,NULL) - PHP_FE(libvirt_domain_block_resize,NULL) - PHP_FE(libvirt_domain_block_job_abort,NULL) - PHP_FE(libvirt_domain_block_job_set_speed,NULL) - PHP_FE(libvirt_domain_block_job_info,NULL) - PHP_FE(libvirt_domain_interface_stats,NULL) - PHP_FE(libvirt_domain_get_connect, NULL) - PHP_FE(libvirt_domain_migrate, NULL) - PHP_FE(libvirt_domain_migrate_to_uri, NULL) - PHP_FE(libvirt_domain_migrate_to_uri2, NULL) - PHP_FE(libvirt_domain_get_job_info, NULL) - PHP_FE(libvirt_domain_xml_xpath, NULL) - PHP_FE(libvirt_domain_get_block_info, NULL) - PHP_FE(libvirt_domain_get_network_info, NULL) - PHP_FE(libvirt_domain_get_autostart, NULL) - PHP_FE(libvirt_domain_set_autostart, NULL) - PHP_FE(libvirt_domain_get_metadata, NULL) - PHP_FE(libvirt_domain_set_metadata, NULL) - PHP_FE(libvirt_domain_is_active, NULL) - PHP_FE(libvirt_domain_get_next_dev_ids, NULL) - PHP_FE(libvirt_domain_get_screenshot, NULL) - PHP_FE(libvirt_domain_get_screenshot_api, NULL) - PHP_FE(libvirt_domain_get_screen_dimensions, NULL) - PHP_FE(libvirt_domain_send_keys, NULL) - PHP_FE(libvirt_domain_send_pointer_event, NULL) - PHP_FE(libvirt_domain_update_device, NULL) + PHP_FE(libvirt_domain_new, arginfo_libvirt_domain_new) + PHP_FE(libvirt_domain_new_get_vnc, arginfo_libvirt_void) + PHP_FE(libvirt_domain_get_counts, arginfo_libvirt_conn) + PHP_FE(libvirt_domain_is_persistent, arginfo_libvirt_conn) + PHP_FE(libvirt_domain_lookup_by_name, arginfo_libvirt_conn_name) + PHP_FE(libvirt_domain_get_xml_desc, arginfo_libvirt_conn_xpath) + PHP_FE(libvirt_domain_get_disk_devices, arginfo_libvirt_conn) + PHP_FE(libvirt_domain_get_interface_devices, arginfo_libvirt_conn) + PHP_FE(libvirt_domain_change_vcpus, arginfo_libvirt_domain_change_vcpus) + PHP_FE(libvirt_domain_change_memory, arginfo_libvirt_domain_change_memory) + PHP_FE(libvirt_domain_change_boot_devices, arginfo_libvirt_domain_change_boot_devices) + PHP_FE(libvirt_domain_disk_add, arginfo_libvirt_domain_disk_add) + PHP_FE(libvirt_domain_disk_remove, arginfo_libvirt_domain_disk_remove) + PHP_FE(libvirt_domain_nic_add, arginfo_libvirt_domain_nic_add) + PHP_FE(libvirt_domain_nic_remove, arginfo_libvirt_domain_nic_remove) + PHP_FE(libvirt_domain_get_info, arginfo_libvirt_conn) + PHP_FE(libvirt_domain_get_name, arginfo_libvirt_conn) + PHP_FE(libvirt_domain_get_uuid, arginfo_libvirt_conn) + PHP_FE(libvirt_domain_get_uuid_string, arginfo_libvirt_conn) + PHP_FE(libvirt_domain_get_id, arginfo_libvirt_conn) + PHP_FE(libvirt_domain_lookup_by_id, arginfo_libvirt_domain_lookup_by_id) + PHP_FE(libvirt_domain_lookup_by_uuid, arginfo_libvirt_conn_uuid) + PHP_FE(libvirt_domain_lookup_by_uuid_string, arginfo_libvirt_conn_uuid) + PHP_FE(libvirt_domain_destroy, arginfo_libvirt_conn) + PHP_FE(libvirt_domain_create, arginfo_libvirt_conn_xml) + PHP_FE(libvirt_domain_resume, arginfo_libvirt_conn) + PHP_FE(libvirt_domain_core_dump, arginfo_libvirt_domain_core_dump) + PHP_FE(libvirt_domain_shutdown, arginfo_libvirt_conn) + PHP_FE(libvirt_domain_suspend, arginfo_libvirt_conn) + PHP_FE(libvirt_domain_managedsave, arginfo_libvirt_conn) + PHP_FE(libvirt_domain_undefine, arginfo_libvirt_conn) + PHP_FE(libvirt_domain_reboot, arginfo_libvirt_conn_flags) + PHP_FE(libvirt_domain_define_xml, arginfo_libvirt_conn_xml) + PHP_FE(libvirt_domain_create_xml, arginfo_libvirt_conn_xml) + PHP_FE(libvirt_domain_memory_peek, arginfo_libvirt_domain_memory_peek) + PHP_FE(libvirt_domain_memory_stats, arginfo_libvirt_conn_flags) + PHP_FE(libvirt_domain_set_memory, arginfo_libvirt_domain_set_memory) + PHP_FE(libvirt_domain_set_max_memory, arginfo_libvirt_domain_set_memory) + PHP_FE(libvirt_domain_set_memory_flags, arginfo_libvirt_domain_set_memory_flags) + PHP_FE(libvirt_domain_block_stats, arginfo_libvirt_conn_path) + PHP_FE(libvirt_domain_block_resize, arginfo_libvirt_domain_block_resize) + PHP_FE(libvirt_domain_block_job_abort, arginfo_libvirt_domain_block_job_abort) + PHP_FE(libvirt_domain_block_job_set_speed, arginfo_libvirt_domain_block_job_set_speed) + PHP_FE(libvirt_domain_interface_stats, arginfo_libvirt_conn_path) + PHP_FE(libvirt_domain_get_connect, arginfo_libvirt_conn) + PHP_FE(libvirt_domain_migrate, arginfo_libvirt_domain_migrate) + PHP_FE(libvirt_domain_migrate_to_uri, arginfo_libvirt_domain_migrate_to_uri) + PHP_FE(libvirt_domain_migrate_to_uri2, arginfo_libvirt_domain_migrate_to_uri2) + PHP_FE(libvirt_domain_get_job_info, arginfo_libvirt_conn) + PHP_FE(libvirt_domain_xml_xpath, arginfo_libvirt_domain_xml_xpath) + PHP_FE(libvirt_domain_get_block_info, arginfo_libvirt_domain_get_block_info) + PHP_FE(libvirt_domain_get_network_info, arginfo_libvirt_domain_get_network_info) + PHP_FE(libvirt_domain_get_autostart, arginfo_libvirt_conn) + PHP_FE(libvirt_domain_set_autostart, arginfo_libvirt_domain_set_autostart) + PHP_FE(libvirt_domain_get_metadata, arginfo_libvirt_domain_get_metadata) + PHP_FE(libvirt_domain_set_metadata, arginfo_libvirt_domain_set_metadata) + PHP_FE(libvirt_domain_is_active, arginfo_libvirt_conn) + PHP_FE(libvirt_domain_get_next_dev_ids, arginfo_libvirt_conn) + PHP_FE(libvirt_domain_get_screenshot, arginfo_libvirt_domain_get_screenshot) + PHP_FE(libvirt_domain_get_screenshot_api, arginfo_libvirt_domain_get_screenshot_api) + PHP_FE(libvirt_domain_get_screen_dimensions, arginfo_libvirt_domain_get_screen_dimensions) + PHP_FE(libvirt_domain_send_keys, arginfo_libvirt_domain_send_keys) + PHP_FE(libvirt_domain_send_pointer_event, arginfo_libvirt_domain_send_pointer_event) + PHP_FE(libvirt_domain_update_device, arginfo_libvirt_domain_update_device) /* Domain snapshot functions */ - PHP_FE(libvirt_domain_has_current_snapshot, NULL) - PHP_FE(libvirt_domain_snapshot_create, NULL) - PHP_FE(libvirt_domain_snapshot_get_xml, NULL) - PHP_FE(libvirt_domain_snapshot_revert, NULL) - PHP_FE(libvirt_domain_snapshot_delete, NULL) - PHP_FE(libvirt_domain_snapshot_lookup_by_name, NULL) + PHP_FE(libvirt_domain_has_current_snapshot, arginfo_libvirt_conn_optflags) + PHP_FE(libvirt_domain_snapshot_create, arginfo_libvirt_conn_optflags) + PHP_FE(libvirt_domain_snapshot_get_xml, arginfo_libvirt_conn_optflags) + PHP_FE(libvirt_domain_snapshot_revert, arginfo_libvirt_conn_optflags) + PHP_FE(libvirt_domain_snapshot_delete, arginfo_libvirt_conn_optflags) + PHP_FE(libvirt_domain_snapshot_lookup_by_name, arginfo_libvirt_domain_snapshot_lookup_by_name) /* Storagepool functions */ - PHP_FE(libvirt_storagepool_lookup_by_name,NULL) - PHP_FE(libvirt_storagepool_lookup_by_volume,NULL) - PHP_FE(libvirt_storagepool_get_info,NULL) - PHP_FE(libvirt_storagevolume_lookup_by_name,NULL) - PHP_FE(libvirt_storagevolume_lookup_by_path,NULL) - PHP_FE(libvirt_storagevolume_get_name,NULL) - PHP_FE(libvirt_storagevolume_get_path,NULL) - PHP_FE(libvirt_storagevolume_get_info,NULL) - PHP_FE(libvirt_storagevolume_get_xml_desc,NULL) - PHP_FE(libvirt_storagevolume_create_xml,NULL) - PHP_FE(libvirt_storagevolume_create_xml_from,NULL) - PHP_FE(libvirt_storagevolume_delete,NULL) - PHP_FE(libvirt_storagevolume_download,NULL) - PHP_FE(libvirt_storagevolume_upload,NULL) - PHP_FE(libvirt_storagevolume_resize,NULL) - PHP_FE(libvirt_storagepool_get_uuid_string, NULL) - PHP_FE(libvirt_storagepool_get_name, NULL) - PHP_FE(libvirt_storagepool_lookup_by_uuid_string, NULL) - PHP_FE(libvirt_storagepool_get_xml_desc, NULL) - PHP_FE(libvirt_storagepool_define_xml, NULL) - PHP_FE(libvirt_storagepool_undefine, NULL) - PHP_FE(libvirt_storagepool_create, NULL) - PHP_FE(libvirt_storagepool_destroy, NULL) - PHP_FE(libvirt_storagepool_is_active, NULL) - PHP_FE(libvirt_storagepool_get_volume_count, NULL) - PHP_FE(libvirt_storagepool_refresh, NULL) - PHP_FE(libvirt_storagepool_set_autostart, NULL) - PHP_FE(libvirt_storagepool_get_autostart, NULL) - PHP_FE(libvirt_storagepool_build, NULL) - PHP_FE(libvirt_storagepool_delete, NULL) + PHP_FE(libvirt_storagepool_lookup_by_name, arginfo_libvirt_conn_name) + PHP_FE(libvirt_storagepool_lookup_by_volume, arginfo_libvirt_conn) + PHP_FE(libvirt_storagepool_get_info, arginfo_libvirt_conn) + PHP_FE(libvirt_storagevolume_lookup_by_name, arginfo_libvirt_conn_name) + PHP_FE(libvirt_storagevolume_lookup_by_path, arginfo_libvirt_storagevolume_lookup_by_path) + PHP_FE(libvirt_storagevolume_get_name, arginfo_libvirt_conn) + PHP_FE(libvirt_storagevolume_get_path, arginfo_libvirt_conn) + PHP_FE(libvirt_storagevolume_get_info, arginfo_libvirt_conn) + PHP_FE(libvirt_storagevolume_get_xml_desc, arginfo_libvirt_storagevolume_get_xml_desc) + PHP_FE(libvirt_storagevolume_create_xml, arginfo_libvirt_conn_xml) + PHP_FE(libvirt_storagevolume_create_xml_from,arginfo_libvirt_storagevolume_create_xml_from) + PHP_FE(libvirt_storagevolume_delete, arginfo_libvirt_conn_optflags) + PHP_FE(libvirt_storagevolume_download, arginfo_libvirt_storagevolume_download) + PHP_FE(libvirt_storagevolume_upload, arginfo_libvirt_storagevolume_download) + PHP_FE(libvirt_storagevolume_resize, arginfo_libvirt_storagevolume_resize) + PHP_FE(libvirt_storagepool_get_uuid_string, arginfo_libvirt_conn) + PHP_FE(libvirt_storagepool_get_name, arginfo_libvirt_conn) + PHP_FE(libvirt_storagepool_lookup_by_uuid_string, arginfo_libvirt_conn_uuid) + PHP_FE(libvirt_storagepool_get_xml_desc, arginfo_libvirt_conn_xpath) + PHP_FE(libvirt_storagepool_define_xml, arginfo_libvirt_storagepool_define_xml) + PHP_FE(libvirt_storagepool_undefine, arginfo_libvirt_conn) + PHP_FE(libvirt_storagepool_create, arginfo_libvirt_conn) + PHP_FE(libvirt_storagepool_destroy, arginfo_libvirt_conn) + PHP_FE(libvirt_storagepool_is_active, arginfo_libvirt_conn) + PHP_FE(libvirt_storagepool_get_volume_count, arginfo_libvirt_conn) + PHP_FE(libvirt_storagepool_refresh, arginfo_libvirt_conn_optflags) + PHP_FE(libvirt_storagepool_set_autostart, arginfo_libvirt_conn_flags) + PHP_FE(libvirt_storagepool_get_autostart, arginfo_libvirt_conn) + PHP_FE(libvirt_storagepool_build, arginfo_libvirt_conn) + PHP_FE(libvirt_storagepool_delete, arginfo_libvirt_conn) /* Network functions */ - PHP_FE(libvirt_network_define_xml, NULL) - PHP_FE(libvirt_network_undefine, NULL) - PHP_FE(libvirt_network_get, NULL) - PHP_FE(libvirt_network_get_xml_desc, NULL) - PHP_FE(libvirt_network_get_bridge, NULL) - PHP_FE(libvirt_network_get_information, NULL) - PHP_FE(libvirt_network_get_active, NULL) - PHP_FE(libvirt_network_set_active, NULL) + PHP_FE(libvirt_network_define_xml, arginfo_libvirt_conn_xml) + PHP_FE(libvirt_network_undefine, arginfo_libvirt_conn) + PHP_FE(libvirt_network_get, arginfo_libvirt_conn_name) + PHP_FE(libvirt_network_get_xml_desc, arginfo_libvirt_conn_xpath) + PHP_FE(libvirt_network_get_bridge, arginfo_libvirt_conn) + PHP_FE(libvirt_network_get_information, arginfo_libvirt_conn) + PHP_FE(libvirt_network_get_active, arginfo_libvirt_conn) + PHP_FE(libvirt_network_set_active, arginfo_libvirt_conn_flags) /* Node functions */ - PHP_FE(libvirt_node_get_info, NULL) - PHP_FE(libvirt_node_get_cpu_stats, NULL) - PHP_FE(libvirt_node_get_cpu_stats_for_each_cpu, NULL) - PHP_FE(libvirt_node_get_mem_stats, NULL) + PHP_FE(libvirt_node_get_info, arginfo_libvirt_conn) + PHP_FE(libvirt_node_get_cpu_stats, arginfo_libvirt_conn_optcpunr) + PHP_FE(libvirt_node_get_cpu_stats_for_each_cpu, arginfo_libvirt_conn_opttime) + PHP_FE(libvirt_node_get_mem_stats, arginfo_libvirt_conn) /* Nodedev functions */ - PHP_FE(libvirt_nodedev_get, NULL) - PHP_FE(libvirt_nodedev_capabilities, NULL) - PHP_FE(libvirt_nodedev_get_xml_desc, NULL) - PHP_FE(libvirt_nodedev_get_information, NULL) + PHP_FE(libvirt_nodedev_get, arginfo_libvirt_conn) + PHP_FE(libvirt_nodedev_capabilities, arginfo_libvirt_conn) + PHP_FE(libvirt_nodedev_get_xml_desc, arginfo_libvirt_conn_xpath) + PHP_FE(libvirt_nodedev_get_information, arginfo_libvirt_conn) /* List functions */ - PHP_FE(libvirt_list_domains, NULL) - PHP_FE(libvirt_list_domain_snapshots, NULL) - PHP_FE(libvirt_list_domain_resources, NULL) - PHP_FE(libvirt_list_nodedevs, NULL) - PHP_FE(libvirt_list_networks,NULL) - PHP_FE(libvirt_list_storagepools,NULL) - PHP_FE(libvirt_list_active_storagepools,NULL) - PHP_FE(libvirt_list_inactive_storagepools,NULL) - PHP_FE(libvirt_storagepool_list_volumes,NULL) - PHP_FE(libvirt_list_active_domains, NULL) - PHP_FE(libvirt_list_active_domain_ids, NULL) - PHP_FE(libvirt_list_inactive_domains, NULL) + PHP_FE(libvirt_list_domains, arginfo_libvirt_conn) + PHP_FE(libvirt_list_domain_snapshots, arginfo_libvirt_conn_optflags) + PHP_FE(libvirt_list_domain_resources, arginfo_libvirt_conn) + PHP_FE(libvirt_list_nodedevs, arginfo_libvirt_conn_optcap) + PHP_FE(libvirt_list_networks, arginfo_libvirt_conn_optflags) + PHP_FE(libvirt_list_storagepools, arginfo_libvirt_conn) + PHP_FE(libvirt_list_active_storagepools, arginfo_libvirt_conn) + PHP_FE(libvirt_list_inactive_storagepools, arginfo_libvirt_conn) + PHP_FE(libvirt_storagepool_list_volumes, arginfo_libvirt_conn) + PHP_FE(libvirt_list_active_domains, arginfo_libvirt_conn) + PHP_FE(libvirt_list_active_domain_ids, arginfo_libvirt_conn) + PHP_FE(libvirt_list_inactive_domains, arginfo_libvirt_conn) /* Version information and common function */ - PHP_FE(libvirt_version, NULL) - PHP_FE(libvirt_check_version, NULL) - PHP_FE(libvirt_has_feature, NULL) - PHP_FE(libvirt_get_iso_images, NULL) - PHP_FE(libvirt_image_create, NULL) - PHP_FE(libvirt_image_remove, NULL) + PHP_FE(libvirt_version, arginfo_libvirt_opttype) + PHP_FE(libvirt_check_version, arginfo_libvirt_check_version) + PHP_FE(libvirt_has_feature, arginfo_libvirt_name) + PHP_FE(libvirt_get_iso_images, arginfo_libvirt_optpath) + PHP_FE(libvirt_image_create, arginfo_libvirt_image_create) + PHP_FE(libvirt_image_remove, arginfo_libvirt_conn_image) /* Debugging functions */ - PHP_FE(libvirt_logfile_set, NULL) - PHP_FE(libvirt_print_binding_resources, NULL) + PHP_FE(libvirt_logfile_set, arginfo_libvirt_logfile_set) + PHP_FE(libvirt_print_binding_resources, arginfo_libvirt_void) /* Agent functions */ - PHP_FE(libvirt_domain_qemu_agent_command, NULL) + PHP_FE(libvirt_domain_qemu_agent_command, arginfo_libvirt_domain_qemu_agent_command) +#ifdef PHP_FE_END + PHP_FE_END +#else {NULL, NULL, NULL} +#endif }; @@ -3692,6 +4071,7 @@ PHP_FUNCTION(libvirt_domain_lookup_by_uuid) * Since version: 0.5.2(-1) * Description: Function is used to send qemu-ga command * Arguments: @res [resource]: libvirt domain resource, e.g. from libvirt_domain_lookup_by_*() + * @cmd [string]: command * @timeout [int] timeout for waiting (-2 block, -1 default, 0 no wait, >0 wait specific time * @flags [int]: unknown * Returns: String on success and FALSE on error @@ -5199,6 +5579,7 @@ PHP_FUNCTION(libvirt_domain_change_vcpus) * Arguments: @res [resource]: libvirt domain resource * @allocMem [int]: number of MiBs to be set as immediate memory value * @allocMax [int]: number of MiBs to be set as the maximum allocation + * @flags [int]: flags * Returns: new domain resource */ PHP_FUNCTION(libvirt_domain_change_memory) @@ -5279,6 +5660,7 @@ PHP_FUNCTION(libvirt_domain_change_memory) * Arguments: @res [resource]: libvirt domain resource * @first [string]: first boot device to be set * @second [string]: second boot device to be set + * @flags [int]: flags * Returns: new domain resource */ PHP_FUNCTION(libvirt_domain_change_boot_devices) @@ -5784,6 +6166,7 @@ PHP_FUNCTION(libvirt_domain_resume) * Since version: 0.4.1(-2) * Description: Function is used to dump core of the domain identified by it's resource * Arguments: @res [resource]: libvirt domain resource, e.g. from libvirt_domain_lookup_by_*() + * @to [string]: to * Returns: TRUE for success, FALSE on error */ PHP_FUNCTION(libvirt_domain_core_dump) @@ -5890,6 +6273,7 @@ PHP_FUNCTION(libvirt_domain_undefine) * Since version: 0.4.1(-1) * Description: Function is used to reboot the domain identified by it's resource * Arguments: @res [resource]: libvirt domain resource, e.g. from libvirt_domain_lookup_by_*() + * @flags [int]: optional flags * Returns: TRUE for success, FALSE on error */ PHP_FUNCTION(libvirt_domain_reboot) @@ -5976,6 +6360,9 @@ PHP_FUNCTION(libvirt_domain_create_xml) * Since version: 0.4.1(-1) * Description: Function is used to get the domain's memory peek value * Arguments: @res [resource]: libvirt domain resource, e.g. from libvirt_domain_lookup_by_*() + * @start [int]: start + * @size [int]: size + * @flags [int]: optional flags * Returns: domain memory peek */ PHP_FUNCTION(libvirt_domain_memory_peek) @@ -5984,7 +6371,7 @@ PHP_FUNCTION(libvirt_domain_memory_peek) zval *zdomain; int retval; long flags=0; - long long start; + long start; long size; char *buff; @@ -6000,6 +6387,7 @@ PHP_FUNCTION(libvirt_domain_memory_peek) * Since version: 0.4.1(-1) * Description: Function is used to get the domain's memory stats * Arguments: @res [resource]: libvirt domain resource, e.g. from libvirt_domain_lookup_by_*() + * @flags [int]: optional flags * Returns: domain memory stats array (same fields as virDomainMemoryStats, please see libvirt documentation) */ PHP_FUNCTION(libvirt_domain_memory_stats) @@ -6419,6 +6807,7 @@ PHP_FUNCTION(libvirt_domain_get_block_info) * Description: Function is used to get the result of xPath expression that's run against the domain * Arguments: @res [resource]: libvirt domain resource, e.g. from libvirt_domain_lookup_by_*() * @xpath [string]: xPath expression to parse against the domain + * @flags [int]: optional flags * Returns: result of the expression in an array */ PHP_FUNCTION(libvirt_domain_xml_xpath) @@ -7173,6 +7562,7 @@ PHP_FUNCTION(libvirt_storagevolume_get_info) * Description: Function is used to get the storage volume XML description * Arguments: @res [resource]: libvirt storagevolume resource * @xpath [string]: optional xPath expression string to get just this entry, can be NULL + * @flags [int]: optional flags * Returns: storagevolume XML description or result of xPath expression */ PHP_FUNCTION(libvirt_storagevolume_get_xml_desc) @@ -8861,6 +9251,7 @@ PHP_FUNCTION(libvirt_network_get_information) * Since version: 0.4.1(-1) * Description: Function is used to set the activity state of the network * Arguments: @res [resource]: libvirt network resource + * @flags [int]: active * Returns: TRUE if success, FALSE on error */ PHP_FUNCTION(libvirt_network_set_active) -- 2.5.5

Le 14/04/2016 18:30, Michal Privoznik a écrit : I confirm this patch is correct and needed. GET_DOMAIN_FROM_ARGS("rlll",&zdomain,&start,&size,&flags); zend_parse_parameters expect a (long *) for "l" option Casting a (long long *) to a (long *) is terrible, mash the stack, can raise segfault, and very bad thing on big endian retval=virDomainMemoryPeek(domain->domain,start,size,buff,flags); Casting a (long) to a (long long) is perfectly OK. So current version is broken - zend_ulong64 start; + zend_long start; And if you want to manage the negative value, just add a test if (start<0) RETURN_FALSE; Remi.

From: Remi Collet <fedora(a)famillecollet.com&gt; --- src/libvirt-php.c | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/src/libvirt-php.c b/src/libvirt-php.c index 2bc0708..3603392 100644 --- a/src/libvirt-php.c +++ b/src/libvirt-php.c @@ -55,6 +55,12 @@ const char *features[] = { NULL }; const char *features_binaries[] = { NULL }; #endif +#if PHP_MAJOR_VERSION >= 7 +typedef size_t strsize_t; +#else +typedef int strsize_t; +typedef long zend_long; +#endif /* ZEND thread safe per request globals definition */ int le_libvirt_connection; int le_libvirt_domain; @@ -2102,8 +2108,8 @@ PHP_FUNCTION(libvirt_connect) virConnectAuth libvirt_virConnectAuth= { libvirt_virConnectCredType, sizeof(libvirt_virConnectCredType)/sizeof(int), libvirt_virConnectAuthCallback, NULL}; char *url=NULL; - int url_len=0; - int readonly=1; + strsize_t url_len=0; + zend_bool readonly=1; HashTable *arr_hash; HashPosition pointer; @@ -4321,7 +4327,7 @@ PHP_FUNCTION(libvirt_stream_recv) char *recv_buf; php_libvirt_stream *stream=NULL; int retval = -1; - long length = 0; + zend_long length = 0; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rz|l", &zstream, &zbuf, &length) == FAILURE) { RETURN_LONG(retval); @@ -4368,7 +4374,7 @@ PHP_FUNCTION(libvirt_stream_send) zval *zstream, *zbuf; php_libvirt_stream *stream=NULL; int retval = -1; - long length = 0; + zend_long length = 0; char *cstr; //int cstrlen; @@ -7770,7 +7776,7 @@ PHP_FUNCTION(libvirt_storagevolume_create_xml_from) virStorageVolPtr volume=NULL; char *xml; - int xml_len; + strsize_t xml_len; if (zend_parse_parameters (ZEND_NUM_ARGS() TSRMLS_CC, "rsr", &zpool, &xml, &xml_len, &zvolume) == FAILURE) { @@ -7870,9 +7876,9 @@ PHP_FUNCTION(libvirt_storagevolume_download) php_libvirt_stream *stream=NULL; zval *zvolume; zval *zstream; - long flags = 0; - long offset = 0; - long length = 0; + zend_long flags = 0; + zend_long offset = 0; + zend_long length = 0; int retval = -1; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rr|l|l|l", &zvolume, &zstream, &offset, &length, &flags) == FAILURE) { @@ -7911,9 +7917,9 @@ PHP_FUNCTION(libvirt_storagevolume_upload) php_libvirt_stream *stream=NULL; zval *zvolume; zval *zstream; - long flags = 0; - long offset = 0; - long length = 0; + zend_long flags = 0; + zend_long offset = 0; + zend_long length = 0; int retval = -1; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rr|l|l|l", &zvolume, &zstream, &offset, &length, &flags) == FAILURE) { @@ -9490,7 +9496,7 @@ PHP_FUNCTION(libvirt_version) { unsigned long libVer; unsigned long typeVer; - int type_len; + strsize_t type_len; char *type=NULL; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &type,&type_len) == FAILURE) { set_error("Invalid arguments" TSRMLS_CC); @@ -9537,7 +9543,7 @@ PHP_FUNCTION(libvirt_version) PHP_FUNCTION(libvirt_check_version) { unsigned long libVer; - unsigned long major = 0, minor = 0, micro = 0, type = VIR_VERSION_BINDING; + zend_long major = 0, minor = 0, micro = 0, type = VIR_VERSION_BINDING; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "lll|l", &major, &minor, &micro, &type) == FAILURE) { set_error("Invalid arguments" TSRMLS_CC); @@ -9582,7 +9588,7 @@ PHP_FUNCTION(libvirt_check_version) PHP_FUNCTION(libvirt_has_feature) { char *name = NULL; - int name_len = 0; + strsize_t name_len = 0; const char *binary = NULL; int ret = 0; @@ -9610,7 +9616,7 @@ PHP_FUNCTION(libvirt_has_feature) PHP_FUNCTION(libvirt_get_iso_images) { char *path = NULL; - int path_len = 0; + strsize_t path_len = 0; #ifndef EXTWIN struct dirent *entry; DIR *d = NULL; @@ -9697,8 +9703,8 @@ PHP_FUNCTION(libvirt_print_binding_resources) PHP_FUNCTION(libvirt_logfile_set) { char *filename = NULL; - long maxsize = DEFAULT_LOG_MAXSIZE; - int filename_len = 0; + zend_long maxsize = DEFAULT_LOG_MAXSIZE; + strsize_t filename_len = 0; int err; if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &filename, &filename_len, &maxsize) == FAILURE) { -- 2.5.5

On 13.04.2016 18:13, Neal Gompa wrote: So @data is now a single pointer ... .. but _PP says it's a double pointer. The !PHP7 code needs to be updated too. Michal

On 13.04.2016 18:13, Neal Gompa wrote: This will still not fly. But I've rewritten the patch, so it builds. Michal

From: Remi Collet <fedora(a)famillecollet.com&gt; --- src/libvirt-php.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/libvirt-php.c b/src/libvirt-php.c index 6525ba5..ef732a3 100644 --- a/src/libvirt-php.c +++ b/src/libvirt-php.c @@ -3071,7 +3071,11 @@ PHP_FUNCTION(libvirt_connect_get_all_domain_stats) } } name = virDomainGetName(retstats[i]->dom); +#if PHP_MAJOR_VERSION >= 7 + zend_hash_update(Z_ARRVAL_P(return_value), zend_string_init(name, strlen(name), 0), arr2); +#else zend_hash_update(Z_ARRVAL_P(return_value), name, strlen(name)+1, &arr2, sizeof(arr2), NULL); +#endif } virDomainStatsRecordListFree(retstats); -- 2.5.5

From: Remi Collet <fedora(a)famillecollet.com&gt; --- src/libvirt-php.c | 98 +++++++++++++++++++++++++++++++++++++++++++++---------- src/libvirt-php.h | 4 +++ 2 files changed, 85 insertions(+), 17 deletions(-) diff --git a/src/libvirt-php.c b/src/libvirt-php.c index 771f3b4..653d251 100644 --- a/src/libvirt-php.c +++ b/src/libvirt-php.c @@ -2039,7 +2039,7 @@ else \ #define LONGLONG_INDEX(out,key,in) \ if (LIBVIRT_G(longlong_to_string_ini)) { \ snprintf(tmpnumber,63,"%llu",in); \ - add_index_string(out,key,tmpnumber,1); \ + add_index_string(out,key,tmpnumber VIRT_COPY_OPT); \ } \ else \ { \ @@ -2225,11 +2225,12 @@ PHP_FUNCTION(libvirt_connect) DPRINTF("%s: Connection to %s established, returning %p\n", PHPFUNC, url, conn->conn); #if PHP_MAJOR_VERSION >= 7 - ZVAL_RES(return_value, zend_register_resource(conn, le_libvirt_connection)); + conn->resource_id = zend_register_resource(conn, le_libvirt_connection); + ZVAL_RES(return_value, conn->resource_id); #else ZEND_REGISTER_RESOURCE(return_value, conn, le_libvirt_connection); + conn->resource_id = Z_LVAL_P(return_value); #endif - conn->resource_id=Z_LVAL_P(return_value); } /* @@ -4438,14 +4439,15 @@ PHP_FUNCTION(libvirt_stream_recv) if (retval < 0) { efree(recv_buf); zval_dtor(zbuf); - Z_TYPE_P(zbuf) = IS_NULL; + ZVAL_NULL(zbuf); } else { recv_buf[retval] = '\0'; - /* Rebuild buffer zval */ - zval_dtor(zbuf); - Z_STRVAL_P(zbuf) = recv_buf; - Z_STRLEN_P(zbuf) = retval; - Z_TYPE_P(zbuf) = IS_STRING; +#if PHP_MAJOR_VERSION >= 7 + ZVAL_STRINGL(zbuf, recv_buf, retval); + efree(recv_buf); +#else + ZVAL_STRINGL(zbuf, recv_buf, retval, 0) +#endif } if (retval == -1) { @@ -4806,9 +4808,7 @@ PHP_FUNCTION(libvirt_domain_get_screenshot) } /* This is necessary to make the output binary safe */ - Z_STRLEN_P(return_value) = fsize; - Z_STRVAL_P(return_value) = buf; - Z_TYPE_P(return_value) = IS_STRING; + ZVAL_STRINGL(return_value, buf, fsize VIRT_COPY_OPT); efree(buf); free(tmp); @@ -5161,7 +5161,6 @@ PHP_FUNCTION(libvirt_connect_get_emulator) char *arch = NULL; int arch_len; char *tmp; - char *emulator; GET_CONNECTION_FROM_ARGS("r|s",&zconn,&arch,&arch_len); @@ -5358,10 +5357,15 @@ void parse_array(zval *arr, tVMDisk *disk, tVMNetwork *network) { HashTable *arr_hash; // int array_count; +#if PHP_MAJOR_VERSION >= 7 + zval *data; + zend_string *key; +#else zval **data; // removed **zvalue - HashPosition pointer; char *key; unsigned int key_len; +#endif + HashPosition pointer; unsigned long index; arr_hash = Z_ARRVAL_P(arr); @@ -5372,6 +5376,43 @@ void parse_array(zval *arr, tVMDisk *disk, tVMNetwork *network) if (network != NULL) memset(network, 0, sizeof(tVMNetwork)); +#if PHP_MAJOR_VERSION >= 7 + for (zend_hash_internal_pointer_reset_ex(arr_hash, &pointer); + (data = zend_hash_get_current_data_ex(arr_hash, &pointer)) != NULL; + zend_hash_move_forward_ex(arr_hash, &pointer)) { + if ((Z_TYPE_P(data) == IS_STRING) || (Z_TYPE_P(data) == IS_LONG)) { + if (zend_hash_get_current_key_ex(arr_hash, &key, &index, &pointer) == HASH_KEY_IS_STRING) { + if (disk != NULL) { + if ((Z_TYPE_P(data) == IS_STRING) && strcmp(ZSTR_VAL(key), "path") == 0) + disk->path = strdup( Z_STRVAL_P(data) ); + else if ((Z_TYPE_P(data) == IS_STRING) && strcmp(ZSTR_VAL(key), "driver") == 0) + disk->driver = strdup( Z_STRVAL_P(data) ); + else if ((Z_TYPE_P(data) == IS_STRING) && strcmp(ZSTR_VAL(key), "bus") == 0) + disk->bus = strdup( Z_STRVAL_P(data) ); + else if ((Z_TYPE_P(data) == IS_STRING) && strcmp(ZSTR_VAL(key), "dev") == 0) + disk->dev = strdup( Z_STRVAL_P(data) ); + else if (strcmp(ZSTR_VAL(key), "size") == 0) { + if (Z_TYPE_P(data) == IS_LONG) + disk->size = Z_LVAL_P(data); + else + disk->size = size_def_to_mbytes(Z_STRVAL_P(data)); + } + else if ((Z_TYPE_P(data) == IS_LONG) && strcmp(ZSTR_VAL(key), "dev") == 0) + disk->flags = Z_LVAL_P(data); + } else { + if (network != NULL) { + if ((Z_TYPE_P(data) == IS_STRING) && strcmp(ZSTR_VAL(key), "mac") == 0) + network->mac = strdup( Z_STRVAL_P(data) ); + else if ((Z_TYPE_P(data) == IS_STRING) && strcmp(ZSTR_VAL(key), "network") == 0) + network->network = strdup( Z_STRVAL_P(data) ); + else if ((Z_TYPE_P(data) == IS_STRING) && strcmp(ZSTR_VAL(key), "model") == 0) + network->model = strdup( Z_STRVAL_P(data) ); + } + } + } + } + } +#else for (zend_hash_internal_pointer_reset_ex(arr_hash, &pointer); zend_hash_get_current_data_ex(arr_hash, (void**) &data, &pointer) == SUCCESS; zend_hash_move_forward_ex(arr_hash, &pointer)) { @@ -5410,6 +5451,7 @@ void parse_array(zval *arr, tVMDisk *disk, tVMNetwork *network) } } } +#endif } /* @@ -5451,7 +5493,11 @@ PHP_FUNCTION(libvirt_domain_new) long maxmemMB = -1; HashTable *arr_hash; int numDisks, numNets, i; +#if PHP_MAJOR_VERSION >= 7 + zval *data; +#else zval **data; // removed **zvalue +#endif HashPosition pointer; char vncl[2048] = { 0 }; char tmpname[1024] = { 0 }; @@ -5482,12 +5528,19 @@ PHP_FUNCTION(libvirt_domain_new) memset(vmDisks, 0, numDisks * sizeof(tVMDisk)); i = 0; for(zend_hash_internal_pointer_reset_ex(arr_hash, &pointer); +#if PHP_MAJOR_VERSION >= 7 + (data = zend_hash_get_current_data_ex(arr_hash, &pointer)) != NULL; + zend_hash_move_forward_ex(arr_hash, &pointer)) { + if (Z_TYPE_P(data) == IS_ARRAY) { + tVMDisk disk; + parse_array(data, &disk, NULL); +#else zend_hash_get_current_data_ex(arr_hash, (void**) &data, &pointer) == SUCCESS; zend_hash_move_forward_ex(arr_hash, &pointer)) { if (Z_TYPE_PP(data) == IS_ARRAY) { tVMDisk disk; parse_array(*data, &disk, NULL); - +#endif if (disk.path != NULL) { //DPRINTF("Disk => path = '%s', driver = '%s', bus = '%s', dev = '%s', size = %ld MB, flags = %d\n", // disk.path, disk.driver, disk.bus, disk.dev, disk.size, disk.flags); @@ -5504,12 +5557,19 @@ PHP_FUNCTION(libvirt_domain_new) memset(vmNetworks, 0, numNets * sizeof(tVMNetwork)); i = 0; for(zend_hash_internal_pointer_reset_ex(arr_hash, &pointer); +#if PHP_MAJOR_VERSION >= 7 + (data = zend_hash_get_current_data_ex(arr_hash, &pointer)) != NULL; + zend_hash_move_forward_ex(arr_hash, &pointer)) { + if (Z_TYPE_P(data) == IS_ARRAY) { + tVMNetwork network; + parse_array(data, NULL, &network); +#else zend_hash_get_current_data_ex(arr_hash, (void**) &data, &pointer) == SUCCESS; zend_hash_move_forward_ex(arr_hash, &pointer)) { if (Z_TYPE_PP(data) == IS_ARRAY) { tVMNetwork network; parse_array(*data, NULL, &network); - +#endif if (network.mac != NULL) { //DPRINTF("Network => mac = '%s', network = '%s', model = '%s'\n", network.mac, network.network, network.model); vmNetworks[i++] = network; @@ -7101,7 +7161,11 @@ PHP_FUNCTION(libvirt_domain_get_connect) conn= domain->conn; if (conn->conn == NULL) RETURN_FALSE; +#if PHP_MAJOR_VERSION >= 7 + ZVAL_RES(return_value, conn->resource_id); +#else RETURN_RESOURCE(conn->resource_id); +#endif } /* @@ -8952,7 +9016,7 @@ PHP_FUNCTION(libvirt_list_networks) for (i=0;i<count;i++) { - add_next_index_string(return_value, names[i], 1); + add_next_index_string(return_value, names[i] VIRT_COPY_OPT); free(names[i]); } diff --git a/src/libvirt-php.h b/src/libvirt-php.h index bf33a57..9217b91 100644 --- a/src/libvirt-php.h +++ b/src/libvirt-php.h @@ -258,7 +258,11 @@ typedef struct tBMPFile { /* Libvirt-php types */ typedef struct _php_libvirt_connection { virConnectPtr conn; +#if PHP_MAJOR_VERSION >= 7 + zend_resource *resource_id; +#else long resource_id; +#endif } php_libvirt_connection; typedef struct _php_libvirt_stream { -- 2.5.5

On 13.04.2016 18:13, Neal Gompa wrote: This is not how we handle version numbers. Anything that's not released yet is a development version. NACK to this one. Michal

From: Remi Collet <fedora(a)famillecollet.com&gt; --- src/libvirt-php.c | 75 ++++++++++++++++++++++++++++++++----------------------- 1 file changed, 44 insertions(+), 31 deletions(-) diff --git a/src/libvirt-php.c b/src/libvirt-php.c index fe84f16..e497c10 100644 --- a/src/libvirt-php.c +++ b/src/libvirt-php.c @@ -59,6 +59,9 @@ const char *features_binaries[] = { NULL }; typedef size_t strsize_t; #define VIRT_COPY_OPT +#define VIRT_RETVAL_STRING(str) RETVAL_STRING(str) +#define VIRT_ZVAL_STRINGL(zv,str,len) ZVAL_STRINGL(zv,str,len) + #define VIRT_FETCH_RESOURCE(_state, _type, _zval, _name, _le) \ if ((_state = (_type)zend_fetch_resource(Z_RES_P(*_zval), _name, _le)) == NULL) { \ RETURN_FALSE; \ @@ -70,6 +73,8 @@ typedef long zend_long; typedef unsigned long zend_ulong; #define VIRT_COPY_OPT ,1 +#define VIRT_RETVAL_STRING(str) RETVAL_STRING(str, 1) +#define VIRT_ZVAL_STRINGL(zv,str,len) ZVAL_STRINGL(zv,str,len,1) #define VIRT_FETCH_RESOURCE(_state, _type, _zval, _name, _le) \ ZEND_FETCH_RESOURCE(_state, _type, _zval, -1, _name, _le); @@ -2093,7 +2098,7 @@ static int libvirt_virConnectCredType[] = { PHP_FUNCTION(libvirt_get_last_error) { if (LIBVIRT_G (last_error) == NULL) RETURN_NULL(); - RETURN_STRING(LIBVIRT_G (last_error) VIRT_COPY_OPT); + VIRT_RETVAL_STRING(LIBVIRT_G(last_error)); } /* @@ -2110,7 +2115,11 @@ PHP_FUNCTION(libvirt_connect) php_libvirt_connection *conn; php_libvirt_cred_value *creds=NULL; zval* zcreds=NULL; +#if PHP_MAJOR_VERSION >= 7 zval *data; +#else + zval **data; +#endif int i; int j; int credscount=0; @@ -2784,7 +2793,7 @@ PHP_FUNCTION(libvirt_connect_get_uri) DPRINTF("%s: virConnectGetURI returned %s\n", PHPFUNC, uri); if (uri == NULL) RETURN_FALSE; - RETVAL_STRING(uri VIRT_COPY_OPT); + VIRT_RETVAL_STRING(uri); free(uri); } @@ -2807,7 +2816,7 @@ PHP_FUNCTION(libvirt_connect_get_hostname) DPRINTF("%s: virConnectGetHostname returned %s\n", PHPFUNC, hostname); if (hostname==NULL) RETURN_FALSE; - RETVAL_STRING(hostname VIRT_COPY_OPT); + VIRT_RETVAL_STRING(hostname); free(hostname); } @@ -3124,7 +3133,7 @@ PHP_FUNCTION(libvirt_connect_get_sysinfo) sysinfo=virConnectGetSysinfo(conn->conn, 0); if (sysinfo==NULL) RETURN_FALSE; - RETVAL_STRING(sysinfo VIRT_COPY_OPT); + VIRT_RETVAL_STRING(sysinfo); free(sysinfo); } @@ -3408,7 +3417,11 @@ long get_next_free_numeric_value(virDomainPtr domain, char *xpath) HashTable *arr_hash; HashPosition pointer; // int array_count; +#if PHP_MAJOR_VERSION >= 7 zval *data; +#else + zval **data; +#endif unsigned long index; long max_slot = -1; @@ -4096,7 +4109,7 @@ PHP_FUNCTION(libvirt_domain_get_metadata) } } else { - RETVAL_STRING(ret VIRT_COPY_OPT); + VIRT_RETVAL_STRING(ret); free(ret); } } @@ -4249,7 +4262,7 @@ PHP_FUNCTION(libvirt_domain_qemu_agent_command) ret = virDomainQemuAgentCommand(domain->domain, cmd, timeout, flags); if (ret == NULL) RETURN_FALSE; - RETURN_STRING(ret VIRT_COPY_OPT); + VIRT_RETVAL_STRING(ret); } /* @@ -4446,7 +4459,7 @@ PHP_FUNCTION(libvirt_stream_recv) ZVAL_STRINGL(zbuf, recv_buf, retval); efree(recv_buf); #else - ZVAL_STRINGL(zbuf, recv_buf, retval, 0) + ZVAL_STRINGL(zbuf, recv_buf, retval, 0); #endif } @@ -4550,7 +4563,7 @@ PHP_FUNCTION(libvirt_domain_get_name) DPRINTF("%s: virDomainGetName(%p) returned %s\n", PHPFUNC, domain->domain, name); if (name==NULL) RETURN_FALSE; - RETURN_STRING(name VIRT_COPY_OPT); //we can use the copy mechanism as we need not to free name (we even can not!) + VIRT_RETVAL_STRING(name); //we can use the copy mechanism as we need not to free name (we even can not!) } /* @@ -4808,7 +4821,7 @@ PHP_FUNCTION(libvirt_domain_get_screenshot) } /* This is necessary to make the output binary safe */ - ZVAL_STRINGL(return_value, buf, fsize VIRT_COPY_OPT); + VIRT_ZVAL_STRINGL(return_value, buf, fsize); efree(buf); free(tmp); @@ -5137,9 +5150,9 @@ PHP_FUNCTION(libvirt_connect_get_capabilities) tmp = get_string_from_xpath(caps, xpath, NULL, &retval); if ((tmp == NULL) || (retval < 0)) { - RETVAL_STRING(caps VIRT_COPY_OPT); + VIRT_RETVAL_STRING(caps); } else { - RETVAL_STRING(tmp VIRT_COPY_OPT); + VIRT_RETVAL_STRING(tmp); } free(caps); @@ -5173,7 +5186,7 @@ PHP_FUNCTION(libvirt_connect_get_emulator) RETURN_FALSE; } - RETVAL_STRING(tmp VIRT_COPY_OPT); + VIRT_RETVAL_STRING(tmp); free(tmp); } @@ -5671,9 +5684,9 @@ PHP_FUNCTION(libvirt_domain_new) PHP_FUNCTION(libvirt_domain_new_get_vnc) { if (LIBVIRT_G(vnc_location)) - RETURN_STRING(LIBVIRT_G(vnc_location) VIRT_COPY_OPT); - - RETURN_NULL(); + VIRT_RETVAL_STRING(LIBVIRT_G(vnc_location)); + else + RETVAL_NULL(); } /* @@ -5709,9 +5722,9 @@ PHP_FUNCTION(libvirt_domain_get_xml_desc) tmp = get_string_from_xpath(xml, xpath, NULL, &retval); if ((tmp == NULL) || (retval < 0)) { - RETVAL_STRING(xml VIRT_COPY_OPT); + VIRT_RETVAL_STRING(xml); } else { - RETVAL_STRING(tmp VIRT_COPY_OPT); + VIRT_RETVAL_STRING(tmp); } free(tmp); @@ -7467,7 +7480,7 @@ PHP_FUNCTION(libvirt_domain_snapshot_get_xml) xml = virDomainSnapshotGetXMLDesc(snapshot->snapshot, flags); if (xml==NULL) RETURN_FALSE; - RETVAL_STRING(xml VIRT_COPY_OPT); + VIRT_RETVAL_STRING(xml); free(xml); } @@ -7798,7 +7811,7 @@ PHP_FUNCTION(libvirt_storagevolume_get_name) DPRINTF("%s: virStorageVolGetName(%p) returned %s\n", PHPFUNC, volume->volume, retval); if (retval == NULL) RETURN_FALSE; - RETURN_STRING(retval VIRT_COPY_OPT); + VIRT_RETVAL_STRING(retval); } /* @@ -7820,7 +7833,7 @@ PHP_FUNCTION(libvirt_storagevolume_get_path) DPRINTF("%s: virStorageVolGetPath(%p) returned %s\n", PHPFUNC, volume->volume, retval); if (retval == NULL) RETURN_FALSE; - RETURN_STRING(retval VIRT_COPY_OPT); + VIRT_RETVAL_STRING(retval); } /* @@ -7884,9 +7897,9 @@ PHP_FUNCTION(libvirt_storagevolume_get_xml_desc) tmp = get_string_from_xpath(xml, xpath, NULL, &retval); if ((tmp == NULL) || (retval < 0)) { - RETVAL_STRING(xml VIRT_COPY_OPT); + VIRT_RETVAL_STRING(xml); } else { - RETVAL_STRING(tmp VIRT_COPY_OPT); + VIRT_RETVAL_STRING(tmp); } free(xml); @@ -8170,7 +8183,7 @@ PHP_FUNCTION(libvirt_storagepool_get_name) if (name == NULL) RETURN_FALSE; - RETURN_STRING(name VIRT_COPY_OPT); + VIRT_RETVAL_STRING(name); } /* @@ -8247,9 +8260,9 @@ PHP_FUNCTION(libvirt_storagepool_get_xml_desc) tmp = get_string_from_xpath(xml, xpath, NULL, &retval); if ((tmp == NULL) || (retval < 0)) { - RETVAL_STRING(xml VIRT_COPY_OPT); + VIRT_RETVAL_STRING(xml); } else { - RETVAL_STRING(tmp VIRT_COPY_OPT); + VIRT_RETVAL_STRING(tmp); } free(xml); @@ -8997,7 +9010,7 @@ PHP_FUNCTION(libvirt_list_networks) for (i=0;i<count;i++) { - add_next_index_string(return_value, names[i]); + add_next_index_string(return_value, names[i] VIRT_COPY_OPT); free(names[i]); } @@ -9175,9 +9188,9 @@ PHP_FUNCTION(libvirt_nodedev_get_xml_desc) tmp = get_string_from_xpath(xml, xpath, NULL, &retval); if ((tmp == NULL) || (retval < 0)) { - RETVAL_STRING(xml VIRT_COPY_OPT); + VIRT_RETVAL_STRING(xml); } else { - RETVAL_STRING(tmp VIRT_COPY_OPT); + VIRT_RETVAL_STRING(tmp); } free(xml); @@ -9458,7 +9471,7 @@ PHP_FUNCTION(libvirt_network_get_bridge) RETURN_FALSE; } - RETURN_STRING(name VIRT_COPY_OPT); + VIRT_RETVAL_STRING(name); } /* @@ -9658,9 +9671,9 @@ PHP_FUNCTION(libvirt_network_get_xml_desc) tmp = get_string_from_xpath(xml, xpath, NULL, &retval); if ((tmp == NULL) || (retval < 0)) { - RETVAL_STRING(xml VIRT_COPY_OPT); + VIRT_RETVAL_STRING(xml); } else { - RETVAL_STRING(tmp VIRT_COPY_OPT); + VIRT_RETVAL_STRING(tmp); } free(xml); -- 2.5.5

From: Remi Collet <fedora(a)famillecollet.com&gt; --- src/tests/test-connect.phpt | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 src/tests/test-connect.phpt diff --git a/src/tests/test-connect.phpt b/src/tests/test-connect.phpt new file mode 100644 index 0000000..2aab021 --- /dev/null +++ b/src/tests/test-connect.phpt @@ -0,0 +1,15 @@ +--TEST-- +libvirt_version +--SKIPIF-- +<?php require_once('skipif.inc'); ?> +--FILE-- +<?php + $conn = libvirt_connect('test:///default'); + var_dump($conn); + unset($conn); +?> +Done +--EXPECTF-- +resource(%d) of type (Libvirt connection) +Done + -- 2.5.5

From: Remi Collet <fedora(a)famillecollet.com&gt; - %p doesn't work with PHP snprintf - store max_connections_ini as long instead of string - store mem as pointer instead of integer - convert test-conn-limit to phpt --- src/libvirt-php.c | 33 ++++++++++++--------------------- src/libvirt-php.h | 4 ++-- 2 files changed, 14 insertions(+), 23 deletions(-) diff --git a/src/libvirt-php.c b/src/libvirt-php.c index 09be51b..ef8bb13 100644 --- a/src/libvirt-php.c +++ b/src/libvirt-php.c @@ -682,7 +682,7 @@ PHP_INI_BEGIN() STD_PHP_INI_ENTRY("libvirt.longlong_to_string", "1", PHP_INI_ALL, OnUpdateBool, longlong_to_string_ini, zend_libvirt_globals, libvirt_globals) STD_PHP_INI_ENTRY("libvirt.iso_path", "/var/lib/libvirt/images/iso", PHP_INI_ALL, OnUpdateString, iso_path_ini, zend_libvirt_globals, libvirt_globals) STD_PHP_INI_ENTRY("libvirt.image_path", "/var/lib/libvirt/images", PHP_INI_ALL, OnUpdateString, image_path_ini, zend_libvirt_globals, libvirt_globals) -STD_PHP_INI_ENTRY("libvirt.max_connections", "5", PHP_INI_ALL, OnUpdateString, max_connections_ini, zend_libvirt_globals, libvirt_globals) +STD_PHP_INI_ENTRY("libvirt.max_connections", "5", PHP_INI_ALL, OnUpdateLong, max_connections_ini, zend_libvirt_globals, libvirt_globals) PHP_INI_END() void change_debug(int val TSRMLS_DC) @@ -697,7 +697,7 @@ static void php_libvirt_init_globals(zend_libvirt_globals *libvirt_globals TSRML libvirt_globals->longlong_to_string_ini = 1; libvirt_globals->iso_path_ini = "/var/lib/libvirt/images/iso"; libvirt_globals->image_path_ini = "/var/lib/libvirt/images"; - libvirt_globals->max_connections_ini = "5"; + libvirt_globals->max_connections_ini = 5; libvirt_globals->binding_resources_count = 0; libvirt_globals->binding_resources = NULL; #ifdef DEBUG_SUPPORT @@ -877,18 +877,13 @@ void free_tokens(tTokenizer t) * @inc [int/bool]: Increment the counter (1 = add memory location) or decrement the counter (0 = remove memory location) from entries. * Returns: 0 on success, -errno otherwise */ -int resource_change_counter(int type, virConnectPtr conn, void *memp, int inc TSRMLS_DC) +int resource_change_counter(int type, virConnectPtr conn, void *mem, int inc TSRMLS_DC) { int i; int pos = -1; int binding_resources_count; - char tmp[64] = { 0 }; - arch_uint mem = 0; resource_info *binding_resources = NULL; - snprintf(tmp, sizeof(tmp), "%p", memp); - sscanf(tmp, "%"UINTx, &mem); - binding_resources_count = LIBVIRT_G(binding_resources_count); binding_resources = LIBVIRT_G(binding_resources); @@ -1011,7 +1006,8 @@ PHP_MINFO_FUNCTION(libvirt) php_info_print_table_row(2, "Libvirt version", version); } - php_info_print_table_row(2, "Max. connections", LIBVIRT_G(max_connections_ini)); + snprintf(path, sizeof(path), "%lu", (unsigned long)LIBVIRT_G(max_connections_ini)); + php_info_print_table_row(2, "Max. connections", path); if (!access(LIBVIRT_G(iso_path_ini), F_OK) == 0) snprintf(path, sizeof(path), "%s - path is invalid. To set the valid path modify the libvirt.iso_path in your php.ini configuration!", @@ -1254,16 +1250,11 @@ void free_resources_on_connection(virConnectPtr conn TSRMLS_DC) * @memp [pointer]: pointer to the memory * Returns: 1 if resource is allocated, 0 otherwise */ -int check_resource_allocation(virConnectPtr conn, int type, void *memp TSRMLS_DC) +int check_resource_allocation(virConnectPtr conn, int type, void *mem TSRMLS_DC) { int binding_resources_count = 0; resource_info *binding_resources = NULL; int i, allocated = 0; - char tmp[64] = { 0 }; - arch_uint mem = 0; - - snprintf(tmp, sizeof(tmp), "%p", memp); - sscanf(tmp, "%"UINTx, &mem); binding_resources_count = LIBVIRT_G(binding_resources_count); binding_resources = LIBVIRT_G(binding_resources); @@ -2151,8 +2142,8 @@ PHP_FUNCTION(libvirt_connect) RETURN_FALSE; } - if ((count_resources(INT_RESOURCE_CONNECTION TSRMLS_CC) + 1) > atoi(LIBVIRT_G(max_connections_ini))) { - DPRINTF("%s: maximum number of connections allowed exceeded (max %s)\n",PHPFUNC, LIBVIRT_G(max_connections_ini)); + if ((count_resources(INT_RESOURCE_CONNECTION TSRMLS_CC) + 1) > LIBVIRT_G(max_connections_ini)) { + DPRINTF("%s: maximum number of connections allowed exceeded (max %lu)\n",PHPFUNC, (unsigned long)LIBVIRT_G(max_connections_ini)); set_error("Maximum number of connections allowed exceeded" TSRMLS_CC); RETURN_FALSE; } @@ -9873,11 +9864,11 @@ PHP_FUNCTION(libvirt_print_binding_resources) for (i = 0; i < binding_resources_count; i++) { if (binding_resources[i].overwrite == 0) { if (binding_resources[i].conn != NULL) - snprintf(tmp, sizeof(tmp), "Libvirt %s resource at 0x%"UINTx" (connection %p)", translate_counter_type(binding_resources[i].type), - binding_resources[i].mem, binding_resources[i].conn); + snprintf(tmp, sizeof(tmp), "Libvirt %s resource at 0x%lx (connection %lx)", translate_counter_type(binding_resources[i].type), + (long)binding_resources[i].mem, (long)binding_resources[i].conn); else - snprintf(tmp, sizeof(tmp), "Libvirt %s resource at 0x%"UINTx, translate_counter_type(binding_resources[i].type), - binding_resources[i].mem); + snprintf(tmp, sizeof(tmp), "Libvirt %s resource at 0x%lx", translate_counter_type(binding_resources[i].type), + (long)binding_resources[i].mem); add_next_index_string(return_value, tmp VIRT_COPY_OPT); } } diff --git a/src/libvirt-php.h b/src/libvirt-php.h index 1562b32..105be20 100644 --- a/src/libvirt-php.h +++ b/src/libvirt-php.h @@ -166,7 +166,7 @@ typedef struct tTokenizer { typedef struct _resource_info { int type; virConnectPtr conn; - arch_uint mem; + void *mem; int overwrite; } resource_info; @@ -176,7 +176,7 @@ ZEND_BEGIN_MODULE_GLOBALS(libvirt) zend_bool longlong_to_string_ini; char *iso_path_ini; char *image_path_ini; - char *max_connections_ini; + zend_long max_connections_ini; #ifdef DEBUG_SUPPORT int debug; #endif -- 2.5.5

From: Remi Collet <fedora(a)famillecollet.com&gt; --- src/tests/test-conn-limit.phpt | 2 +- src/tests/test-connect-get-emulator.phpt | 15 +++++++++++++++ src/tests/test-connect.phpt | 2 +- 3 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 src/tests/test-connect-get-emulator.phpt diff --git a/src/tests/test-conn-limit.phpt b/src/tests/test-conn-limit.phpt index 23f8e98..8fa0fc4 100644 --- a/src/tests/test-conn-limit.phpt +++ b/src/tests/test-conn-limit.phpt @@ -1,5 +1,5 @@ --TEST-- -libvirt_version +INI: libvirt.max_connections --SKIPIF-- <?php require_once('skipif.inc'); ?> --INI-- diff --git a/src/tests/test-connect-get-emulator.phpt b/src/tests/test-connect-get-emulator.phpt new file mode 100644 index 0000000..7d8e8ce --- /dev/null +++ b/src/tests/test-connect-get-emulator.phpt @@ -0,0 +1,15 @@ +--TEST-- +libvirt_connect_get_emulator +--SKIPIF-- +<?php require_once('skipif.inc'); ?> +--FILE-- +<?php + $conn = libvirt_connect('test:///default'); + var_dump(libvirt_connect_get_emulator($conn)); + unset($conn); +?> +Done +--EXPECTF-- +string(%d) "%s" +Done + diff --git a/src/tests/test-connect.phpt b/src/tests/test-connect.phpt index 2aab021..f0cfce9 100644 --- a/src/tests/test-connect.phpt +++ b/src/tests/test-connect.phpt @@ -1,5 +1,5 @@ --TEST-- -libvirt_version +libvirt_connect --SKIPIF-- <?php require_once('skipif.inc'); ?> --FILE-- -- 2.5.5

From: Remi Collet <fedora(a)famillecollet.com&gt; --- src/tests/test-install.phpt | 136 +++++++++++++++++++++++++++++++++++++++++ src/tests/test-libvirt-php.img | 0 2 files changed, 136 insertions(+) create mode 100644 src/tests/test-install.phpt create mode 100644 src/tests/test-libvirt-php.img diff --git a/src/tests/test-install.phpt b/src/tests/test-install.phpt new file mode 100644 index 0000000..eac0875 --- /dev/null +++ b/src/tests/test-install.phpt @@ -0,0 +1,136 @@ +--TEST-- +libvirt_domain_new +--SKIPIF-- +<?php require_once('skipif.inc'); ?> +--FILE-- +<?php + $logfile = __DIR__ . '/test-install.log'; + @unlink($logfile); + libvirt_logfile_set($logfile, 10); + + $name = 'test'; + $image = __DIR__.'/test-libvirt-php.img'; + $disk_image = '/tmp/test-libvirt-php.img'; + $local_test = true; + $show_vnc_location = false; + $memory = 64; + + echo "# libvirt_connect\n"; + $conn = libvirt_connect('test:///default', false); /* Enable read-write connection */ + var_dump($conn); + + //cleaning + if ($res = libvirt_domain_lookup_by_name($conn, "test")) { + libvirt_domain_destroy($res); + libvirt_domain_undefine($res); + } + + $disks = array( + array( 'path' => $disk_image, 'driver' => 'raw', 'bus' => 'ide', 'dev' => 'hda', 'size' => '1M', + 'flags' => VIR_DOMAIN_DISK_FILE | VIR_DOMAIN_DISK_ACCESS_ALL ) + ); + + $networks = array( + array( 'mac' => '00:11:22:33:44:55', 'network' => 'default', 'model' => 'e1000') + ); + + $networks = array(); + + $flags = VIR_DOMAIN_FLAG_FEATURE_ACPI | VIR_DOMAIN_FLAG_FEATURE_APIC | VIR_DOMAIN_FLAG_FEATURE_PAE; + + if ($local_test) + $flags |= VIR_DOMAIN_FLAG_TEST_LOCAL_VNC; + + echo "# libvirt_domain_new\n"; + $res = libvirt_domain_new($conn, $name, false, $memory, $memory, 1, $image, $disks, $networks, $flags); + var_dump($res); + if ($res == false) + echo 'Installation test failed with error: '.libvirt_get_last_error().'. More info saved into '.$logfile; + + echo "# libvirt_domain_get_name\n"; + var_dump(libvirt_domain_get_name($res)); + + echo "# libvirt_domain_get_id\n"; + var_dump(libvirt_domain_get_id($res)); + + echo "# libvirt_domain_get_uuid\n"; + var_dump(bin2hex(libvirt_domain_get_uuid($res))); + + echo "# libvirt_domain_get_uuid_string\n"; + var_dump(libvirt_domain_get_uuid_string($res)); + + echo "# libvirt_domain_get_info\n"; + var_dump(libvirt_domain_get_info($res)); + + $ok = is_resource($res); + + echo "# libvirt_domain_new_get_vnc\n"; + $vncloc = libvirt_domain_new_get_vnc(); + var_dump($vncloc); + + echo "libvirt_domain_destroy\n"; + var_dump($ret = libvirt_domain_destroy($res)); + if (!$ret) + echo 'Domain destroy failed with error: '.libvirt_get_last_error().'. More info saved into '.$logfile; + + unset($res); + + echo "# libvirt_domain_lookup_by_name\n"; + $res = libvirt_domain_lookup_by_name($conn, $name); + var_dump($res); + if (is_resource($res)) { + echo "# libvirt_domain_undefine\n"; + var_dump(libvirt_domain_undefine($res)); + } + unset($res); + + echo "# libvirt_domain_lookup_by_name\n"; + $res = libvirt_domain_lookup_by_name($conn, $name); + var_dump($res); + + unset($res); + unset($conn); + + @unlink($disk_image); + @unlink($logfile); +?> +Done +--EXPECTF-- +# libvirt_connect +resource(%d) of type (Libvirt connection) +# libvirt_domain_new +resource(%d) of type (Libvirt domain) +# libvirt_domain_get_name +string(12) "test-install" +# libvirt_domain_get_id +int(%d) +# libvirt_domain_get_uuid +string(%d) "%s" +# libvirt_domain_get_uuid_string +string(%d) "%s" +# libvirt_domain_get_info +array(5) { + ["maxMem"]=> + int(65536) + ["memory"]=> + int(65536) + ["state"]=> + int(1) + ["nrVirtCpu"]=> + int(1) + ["cpuUsed"]=> + float(%s) +} +# libvirt_domain_new_get_vnc +string(%d) "%s" +libvirt_domain_destroy +bool(true) +# libvirt_domain_lookup_by_name +resource(%d) of type (Libvirt domain) +# libvirt_domain_undefine +bool(true) +# libvirt_domain_lookup_by_name + +%s Domain not found %s +bool(false) +Done diff --git a/src/tests/test-libvirt-php.img b/src/tests/test-libvirt-php.img new file mode 100644 index 0000000..e69de29 -- 2.5.5

From: Remi Collet <fedora(a)famillecollet.com&gt; --- src/tests/test-domain-create-and-get-xpath.phpt | 56 +++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 src/tests/test-domain-create-and-get-xpath.phpt diff --git a/src/tests/test-domain-create-and-get-xpath.phpt b/src/tests/test-domain-create-and-get-xpath.phpt new file mode 100644 index 0000000..84e8895 --- /dev/null +++ b/src/tests/test-domain-create-and-get-xpath.phpt @@ -0,0 +1,56 @@ +--TEST-- +libvirt_domain_xml_xpath +--SKIPIF-- +<?php require_once('skipif.inc'); ?> +--FILE-- +<?php + echo "# libvirt_connect\n"; + var_dump($conn = libvirt_connect('test:///default', false)); + if (!is_resource($conn)) + die('Connection to default hypervisor failed'); + + $xml = file_get_contents(__DIR__.'/example-no-disk-and-media.xml'); + + echo "# libvirt_domain_create_xml\n"; + var_dump($res = libvirt_domain_create_xml($conn, $xml)); + if (!is_resource($res)) + die('Domain definition failed with error: '.libvirt_get_last_error()); + + $info = libvirt_domain_xml_xpath($res, '/domain/name'); + if (!$info) + die('Cannot get domain XML and/or xPath expression'); + var_dump($info); + + if (!array_key_exists('num', $info)) + die('Num element is missing in the output array'); + + for ($i = 0; $i < $info['num']; $i++) + if (!array_key_exists($i, $info)) + die("Element $i doesn\'t exist in the output array"); + + echo "# libvirt_domain_destroy\n"; + var_dump($ret = libvirt_domain_destroy($res)); + if (!$ret) { + die('Domain destroy failed with error: '.libvirt_get_last_error()); + } + unset($res); + unset($conn); +?> +Done +--EXPECTF-- +# libvirt_connect +resource(%d) of type (Libvirt connection) +# libvirt_domain_create_xml +resource(%d) of type (Libvirt domain) +array(3) { + [0]=> + string(28) "test-guest-no-disk-and-media" + ["num"]=> + int(1) + ["xpath"]=> + string(12) "/domain/name" +} +# libvirt_domain_destroy +bool(true) +Done + -- 2.5.5

From: Chuck Roydhouse <cer(a)datto.com&gt; --- src/libvirt-php.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/libvirt-php.c b/src/libvirt-php.c index 4fa24d6..36be055 100644 --- a/src/libvirt-php.c +++ b/src/libvirt-php.c @@ -213,6 +213,13 @@ ZEND_ARG_INFO(0, memory) ZEND_ARG_INFO(0, flags) ZEND_END_ARG_INFO() +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_domain_block_commit, 0, 0, 3) +ZEND_ARG_INFO(0, res) +ZEND_ARG_INFO(0, disk) +ZEND_ARG_INFO(0, base) +ZEND_ARG_INFO(0, top) +ZEND_END_ARG_INFO() + ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_conn_path, 0, 0, 2) ZEND_ARG_INFO(0, conn) ZEND_ARG_INFO(0, path) @@ -238,6 +245,12 @@ ZEND_ARG_INFO(0, bandwidth) ZEND_ARG_INFO(0, flags) ZEND_END_ARG_INFO() +ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_domain_block_job_info, 0, 0, 2) +ZEND_ARG_INFO(0, dom) +ZEND_ARG_INFO(0, disk) +ZEND_ARG_INFO(0, flags) +ZEND_END_ARG_INFO() + ZEND_BEGIN_ARG_INFO_EX(arginfo_libvirt_domain_migrate, 0, 0, 3) ZEND_ARG_INFO(0, res) ZEND_ARG_INFO(0, dest_conn) @@ -515,10 +528,12 @@ static zend_function_entry libvirt_functions[] = { PHP_FE(libvirt_domain_set_memory, arginfo_libvirt_domain_set_memory) PHP_FE(libvirt_domain_set_max_memory, arginfo_libvirt_domain_set_memory) PHP_FE(libvirt_domain_set_memory_flags, arginfo_libvirt_domain_set_memory_flags) + PHP_FE(libvirt_domain_block_commit, arginfo_libvirt_domain_block_commit) PHP_FE(libvirt_domain_block_stats, arginfo_libvirt_conn_path) PHP_FE(libvirt_domain_block_resize, arginfo_libvirt_domain_block_resize) PHP_FE(libvirt_domain_block_job_abort, arginfo_libvirt_domain_block_job_abort) PHP_FE(libvirt_domain_block_job_set_speed, arginfo_libvirt_domain_block_job_set_speed) + PHP_FE(libvirt_domain_block_job_info, arginfo_libvirt_domain_block_job_info) PHP_FE(libvirt_domain_interface_stats, arginfo_libvirt_conn_path) PHP_FE(libvirt_domain_get_connect, arginfo_libvirt_conn) PHP_FE(libvirt_domain_migrate, arginfo_libvirt_domain_migrate) -- 2.5.5

--- INSTALL.PHPEXT | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 INSTALL.PHPEXT diff --git a/INSTALL.PHPEXT b/INSTALL.PHPEXT new file mode 100644 index 0000000..41c2ef6 --- /dev/null +++ b/INSTALL.PHPEXT @@ -0,0 +1,14 @@ +Installing using the PHP extension build system +*********************************************** + +libvirt-php supports being built using `phpize`, +a tool that's part of the PHP SDK for building PHP +extensions. + +To build this way, change into the src subdirectory +and run `phpize`. Then run `./configure && make && make install` +to build and install it. Refer to INSTALL for more information +on how to use ./configure. + +The PHP extension build system also has its own tests, +which can be run by doing `make test`. -- 2.5.5

On 13.04.2016 18:13, Neal Gompa wrote: I will push this one only after some testing of the patches I've just pushed. It has been a big change so I rather give our users chance to test it before calling it release. Michal