- Devel - libvirt List Archives

[libvirt] [PATCH] build: fix compilation on mingw
by Eric Blake 28 Mar '11

28 Mar '11

* src/util/command.c (virCommandAbort) [WIN32]: Provide stub. Reported by Daniel P. Berrange's autobuilder. --- Pushing this under the build-breaker rule, as it was caught by Daniel's autobuilder. src/util/command.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/src/util/command.c b/src/util/command.c index 905256e..2e475a0 100644 --- a/src/util/command.c +++ b/src/util/command.c @@ -1291,6 +1291,7 @@ virCommandWait(virCommandPtr cmd, int *exitstatus) } +#ifndef WIN32 /* * Abort an async command if it is running, without issuing * any errors or affecting errno. Designed for error paths @@ -1349,6 +1350,15 @@ cleanup: cmd->reap = false; errno = saved_errno; } +#else /* WIN32 */ +void +virCommandAbort(virCommandPtr cmd ATTRIBUTE_UNUSED) +{ + /* Mingw lacks WNOHANG and kill(). But since we haven't ported + * virExecWithHook to mingw yet, there's no process to be killed, + * making this implementation trivially correct for now :) */ +} +#endif /* * Release all resources -- 1.7.4

1 0

[libvirt] access with VNC and graphic interface
by Kenneth Nagin 28 Mar '11

28 Mar '11

libvirt provides vnc to access the VMs under its control. However, I can not get applications with graphical interface to run when I use vnc to access a VM. The same applications will display properly if I ssh -X to the VM. Is there anyway to overcome this problem? Best Regards, Kenneth Nagin

3 2

[libvirt] [PATCH] Reserve first 3 PCI slots for hardcoded devices
by Philipp Hahn 28 Mar '11

28 Mar '11

If a domain is initially created without a <vidoe> device but with other devices (like <interface>), PCI device slots normally reserved for hardcoded devices (host bridge, IDE controller, video) get assigned to these. If than later on a <video> device is added without removing the already assigned <addresse>s, the re-definition fails in qemuAssignDevicePCISlots() with the error message "Primary video card must have PCI address 0:0:2.0" To simplify editing existing domains just reserve the first three slots for internal usage by setting qemuDomainPCIAddressSet.nextslot = 3. Signed-off-by: Philipp Hahn <hahn(a)univention.de> --- src/qemu/qemu_command.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index c63de09..c359fd0 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -733,6 +733,9 @@ qemuDomainAssignPCIAddresses(virDomainDefPtr def) if (!(addrs = qemuDomainPCIAddressSetCreate(def))) goto cleanup; + /* reserve first 3 slots for hardcoded devices */ + addrs->nextslot = 3; + if (qemuAssignDevicePCISlots(def, addrs) < 0) goto cleanup; } -- 1.7.1

2 1

[libvirt] [PATCH RFC] Remove the Open Nebula driver
by Daniel P. Berrange 28 Mar '11

28 Mar '11

The Open Nebula driver has been unmaintained since it was first introduced. The only commits have been for tree-wide cleanups. It also has a major design flaw, in that it only knows about guests that it has created itself, which makes it of very limited use. Discussions wrt evolution of the VMWare ESX driver, concluded that it should limit itself to single-node ESX operation and not try to manage the multi-node architecture of VirtualCenter. Open Nebula is a cluster like Virtual Center, not a single node system, so reasoning applies. The DeltaCloud project includes an Open Nebula driver and is a much better fit architecturally, since it is explicitly targetting the distributed multihost cluster scenario. Thus this patch deletes the libvirt Open Nebula driver with the recommendation that people use DeltaCloud for managing it instead. * configure.ac: Remove probe for xmlrpc & --with-one arg * daemon/Makefile.am, daemon/libvirtd.c, src/Makefile.am: Remove ONE driver build * src/opennebula/one_client.c, src/opennebula/one_client.h, src/opennebula/one_conf.c, src/opennebula/one_conf.h, src/opennebula/one_driver.c, src/opennebula/one_driver.c: Delete files * autobuild.sh, libvirt.spec.in, mingw32-libvirt.spec.in: Remove build rules for Open Nebula * docs/drivers.html.in, docs/sitemap.html.in: Remove reference to OpenNebula * docs/drvone.html.in: Delete file --- autobuild.sh | 1 - configure.ac | 41 -- daemon/Makefile.am | 4 - daemon/libvirtd.c | 7 - docs/drivers.html.in | 1 - docs/drvone.html.in | 108 ------ docs/sitemap.html.in | 4 - libvirt.spec.in | 12 +- mingw32-libvirt.spec.in | 1 - src/Makefile.am | 29 -- src/README | 5 +- src/opennebula/one_client.c | 207 ----------- src/opennebula/one_client.h | 62 ---- src/opennebula/one_conf.c | 285 --------------- src/opennebula/one_conf.h | 54 --- src/opennebula/one_driver.c | 850 ------------------------------------------- src/opennebula/one_driver.h | 30 -- 17 files changed, 3 insertions(+), 1698 deletions(-) delete mode 100644 docs/drvone.html.in delete mode 100644 src/opennebula/one_client.c delete mode 100644 src/opennebula/one_client.h delete mode 100644 src/opennebula/one_conf.c delete mode 100644 src/opennebula/one_conf.h delete mode 100644 src/opennebula/one_driver.c delete mode 100644 src/opennebula/one_driver.h diff --git a/autobuild.sh b/autobuild.sh index 54fb273..491f1b8 100755 --- a/autobuild.sh +++ b/autobuild.sh @@ -81,7 +81,6 @@ if [ -x /usr/bin/i686-pc-mingw32-gcc ]; then --without-uml \ --without-vbox \ --without-openvz \ - --without-one \ --without-phyp \ --without-netcf \ --without-audit \ diff --git a/configure.ac b/configure.ac index 12bf0f6..dd15962 100644 --- a/configure.ac +++ b/configure.ac @@ -271,8 +271,6 @@ AC_ARG_WITH([vbox], [with_vbox=yes]) AC_ARG_WITH([lxc], AC_HELP_STRING([--with-lxc], [add Linux Container support @<:@default=check@:>@]),[],[with_lxc=check]) -AC_ARG_WITH([one], - AC_HELP_STRING([--with-one], [add ONE support @<:@default=check@:>@]),[],[with_one=check]) AC_ARG_WITH([esx], AC_HELP_STRING([--with-esx], [add ESX support @<:@default=check@:>@]),[],[with_esx=check]) AC_ARG_WITH([test], @@ -440,11 +438,6 @@ if test "$with_qemu" = "yes" ; then fi AM_CONDITIONAL([WITH_QEMU], [test "$with_qemu" = "yes"]) -if test "$with_one" = "yes" ; then - AC_DEFINE_UNQUOTED([WITH_ONE],1,[whether ONE driver is enabled]) -fi -AM_CONDITIONAL([WITH_ONE],[test "$with_one" = "yes"]) - if test "$with_test" = "yes" ; then AC_DEFINE_UNQUOTED([WITH_TEST], 1, [whether Test driver is enabled]) fi @@ -725,34 +718,6 @@ fi dnl Need to test if pkg-config exists PKG_PROG_PKG_CONFIG -dnl OpenNebula driver Compilation setting -dnl - -if test "$with_libvirtd" = "no" ; then - with_one=no -fi -XMLRPC_CFLAGS= -XMLRPC_LIBS= -if test "x$with_one" = "xyes" || test "x$with_one" = "xcheck"; then - PKG_CHECK_MODULES(XMLRPC, xmlrpc_client >= $XMLRPC_REQUIRED, - [with_one=yes], [ - if test "x$with_one" = "xcheck" ; then - with_one=no - else - AC_MSG_ERROR( - [You must install XMLRPC-C >= $XMLRPC_REQUIRED to compile libvirt ONE driver]) - fi - ]) - if test "x$with_one" = "xyes" ; then - AC_DEFINE_UNQUOTED([HAVE_XMLRPC], 1, - [whether One is used to broadcast server presence]) - fi -fi -AM_CONDITIONAL([HAVE_XMLRPC], [test "x$with_one" = "xyes"]) -AM_CONDITIONAL([WITH_ONE], [test "x$with_one" = "xyes"]) -AC_SUBST([XMLRPC_CFLAGS]) -AC_SUBST([XMLRPC_LIBS]) - dnl ========================================================================== dnl find libxml2 library, borrowed from xmlsec @@ -2415,7 +2380,6 @@ AC_MSG_NOTICE([ XenAPI: $with_xenapi]) AC_MSG_NOTICE([xenlight: $with_libxl]) AC_MSG_NOTICE([ LXC: $with_lxc]) AC_MSG_NOTICE([ PHYP: $with_phyp]) -AC_MSG_NOTICE([ ONE: $with_one]) AC_MSG_NOTICE([ ESX: $with_esx]) AC_MSG_NOTICE([ Test: $with_test]) AC_MSG_NOTICE([ Remote: $with_remote]) @@ -2542,11 +2506,6 @@ AC_MSG_NOTICE([ netcf: $NETCF_CFLAGS $NETCF_LIBS]) else AC_MSG_NOTICE([ netcf: no]) fi -if test "$with_one" = "yes" ; then -AC_MSG_NOTICE([ xmlrpc: $XMLRPC_CFLAGS $XMLRPC_LIBS]) -else -AC_MSG_NOTICE([ xmlrpc: no]) -fi if test "$with_qemu" = "yes" && test "$LIBPCAP_FOUND" != "no"; then AC_MSG_NOTICE([ pcap: $LIBPCAP_CFLAGS $LIBPCAP_LIBS]) else diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 9e3a557..0fde04c 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -114,10 +114,6 @@ if WITH_UML libvirtd_LDADD += ../src/libvirt_driver_uml.la endif -if WITH_ONE - libvirtd_LDADD += ../src/libvirt_driver_one.la -endif - if WITH_STORAGE_DIR libvirtd_LDADD += ../src/libvirt_driver_storage.la endif diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 7818316..024f56f 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -87,9 +87,6 @@ # ifdef WITH_UML # include "uml/uml_driver.h" # endif -# ifdef WITH_ONE -# include "opennebula/one_driver.h" -# endif # ifdef WITH_NETWORK # include "network/bridge_driver.h" # endif @@ -925,7 +922,6 @@ static struct qemud_server *qemudInitialize(void) { virDriverLoadModule("qemu"); virDriverLoadModule("lxc"); virDriverLoadModule("uml"); - virDriverLoadModule("one"); virDriverLoadModule("nwfilter"); #else # ifdef WITH_NETWORK @@ -958,9 +954,6 @@ static struct qemud_server *qemudInitialize(void) { # ifdef WITH_UML umlRegister(); # endif -# ifdef WITH_ONE - oneRegister(); -# endif #endif return server; diff --git a/docs/drivers.html.in b/docs/drivers.html.in index ecad03a..0428870 100644 --- a/docs/drivers.html.in +++ b/docs/drivers.html.in @@ -20,7 +20,6 @@ <ul> <li><strong><a href="drvlxc.html">LXC</a></strong> - Linux Containers</li> - <li><strong><a href="drvone.html">OpenNebula</a></strong></li> <li><strong><a href="drvopenvz.html">OpenVZ</a></strong></li> <li><strong><a href="drvqemu.html">QEMU</a></strong></li> <li><strong><a href="drvtest.html">Test</a></strong> - Used for testing</li> diff --git a/docs/drvone.html.in b/docs/drvone.html.in deleted file mode 100644 index 036c0c7..0000000 --- a/docs/drvone.html.in +++ /dev/null @@ -1,108 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> -<html> -<head> -<meta http-equiv="CONTENT-TYPE" content="text/html; charset=utf-8"> -<title></title> -<meta name="GENERATOR" content="OpenOffice.org 3.0 (Linux)"> -<meta name="CREATED" content="0;0"> -<meta name="CHANGED" content="20090701;13170700"> -</head> -<body lang="en-US" dir="LTR"> -<h1>OpenNebula Virtual Infrastructure Manager driver</h1> -<p><a name="toc"></a><a href="http://opennebula.org/">OpenNebula</a> -is a Virtual Infrastructure Manager that controls Virtual Machines (VM) in a pool of distributed resources -by orchestrating network, storage and virtualization technologies. The OpenNebula driver lets you manage your private or hybrid (<a href="http://aws.amazon.com/ec2/">Amazon EC2</a> or <a href="http://www.elastichosts.com/">Elastic Hosts</a> based) cloud using a standard libvirt interface, including the API as well as the related -tools and VM description files.</p> -<h2> -<a name="prereq"></a>Deployment pre-requisites</h2> -<ul> -<li> -<p style="margin-bottom: 0in">A working OpenNebula installation, - version 1.2 or higher. - </p> - </li> -</ul> -<h2> -<a name="uris"></a>Connections to OpenNebula driver</h2> -<p>The Uri of the driver protocol is "one". Some example -connection Uris for the driver are: -</p> -<pre> -one:/// (local access) -one+unix:/// (local access) -one://example.com/ (remote access) -one+tcp://example.com/ (remote access, SASl/Kerberos) -one+ssh://user@example.com/ (remote access, SSH tunnelled) -</pre> -<h2> -<a name="xmlconfig"></a>Example domain XML config</h2> -<p>There are some limitations on the XML attributes that may be -specified when interfacing OpenNebula. The following xml example -details the attributes and options supported by the OpenNebula -driver:</p> - -<h3>Paravirtualized guest direct kernel boot -</h3> -<pre> -<domain type='one'> - <name>vm01</name> - <memory>32768</memory> - <vcpu>1</vcpu> - - <os> - <type>linux</type> - <kernel>/boot/vmlinuz-2.6.24-17-xen</kernel> - <initrd>/boot/initrd.img-2.6.24-17-xen</initrd> - <cmdline></cmdline> - <root>sda1</root> - </os> - - <devices> - <disk type='file' device='disk'> - <source file='/images/sgehosts/01/disk.img'/> - <target dev='sda1'/> - </disk> - - <disk type='file' device='disk'> - <source file='/images/sgehosts/01/swap.img'/> - <target dev='sda2'/> - </disk> - - <disk type='file' device='cdrom'> - <source file='/images/iso/cdrom.iso'/> - <target dev='hdc'/> - <readonly/> - </disk> - - -  - <interface type='bridge'> - <source bridge='eth0'/> - <mac address='00:16:3e:5d:c7:9e'/> - </interface> - -  - <interface type='network'> - <source network='onenetwork'/> - </interface> - </devices> -</domain> -</pre> -<p> -<b>Note:</b> The "<interface type='network'>" will -attach the interface to a previously configured network (named -<tt>onenetwork</tt>) within the <a href="http://opennebula.org/">OpenNebula</a> system, typically with the -<tt>onevnet</tt> CLI command.</p> - -<p><b>Note</b>: OpenNebula supports the simultaneous use of different hypervisors, so you can specify any os type (linux or hvm) supported by your cluster. -</p> - -<h2>Links</h2> -<ul> -<li><a href="http://www.opennebula.org/doku.php?id=documentation">OpenNebula Documentation</a> -</li> -<li><a href="http://www.opennebula.org/doku.php?id=documentation:rel1.2:ug">OpenNebula User Guide</a> -</li> -</ul> -</body> -</html> diff --git a/docs/sitemap.html.in b/docs/sitemap.html.in index ac0af71..5650fee 100644 --- a/docs/sitemap.html.in +++ b/docs/sitemap.html.in @@ -191,10 +191,6 @@ <span>Driver for VirtualBox</span> </li> <li> - <a href="drvone.html">OpenNebula</a> - <span>Driver for OpenNebula</span> - </li> - <li> <a href="drvesx.html">VMware ESX</a> <span>Driver for VMware ESX</span> </li> diff --git a/libvirt.spec.in b/libvirt.spec.in index 4a62c80..2a84c26 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -46,8 +46,6 @@ %define with_uml 0%{!?_without_uml:%{server_drivers}} %define with_xenapi 0%{!?_without_xenapi:%{server_drivers}} %define with_libxl 0%{!?_without_libxl:%{server_drivers}} -# XXX this shouldn't be here, but it mistakenly links into libvirtd -%define with_one 0%{!?_without_one:%{server_drivers}} # Then the hypervisor drivers that talk a native remote protocol %define with_phyp 0%{!?_without_phyp:1} @@ -96,13 +94,12 @@ %define with_numactl 0 %endif -# RHEL doesn't ship OpenVZ, VBox, UML, OpenNebula, PowerHypervisor, +# RHEL doesn't ship OpenVZ, VBox, UML, PowerHypervisor, # VMWare, libxenserver (xenapi), or libxenlight (Xen 4.1 and newer) %if 0%{?rhel} %define with_openvz 0 %define with_vbox 0 %define with_uml 0 -%define with_one 0 %define with_phyp 0 %define with_vmware 0 %define with_xenapi 0 @@ -306,9 +303,6 @@ Requires: libcgroup %if %{with_xen} BuildRequires: xen-devel %endif -%if %{with_one} -BuildRequires: xmlrpc-c-devel >= 1.14.0 -%endif BuildRequires: libxml2-devel BuildRequires: xhtml1-dtds BuildRequires: readline-devel @@ -540,10 +534,6 @@ of recent versions of Linux (and other OSes). %define _without_uml --without-uml %endif -%if ! %{with_one} -%define _without_one --without-one -%endif - %if %{with_rhel5} %define _with_rhel5_api --with-rhel5-api %endif diff --git a/mingw32-libvirt.spec.in b/mingw32-libvirt.spec.in index 0841dc0..27c75c1 100644 --- a/mingw32-libvirt.spec.in +++ b/mingw32-libvirt.spec.in @@ -54,7 +54,6 @@ MinGW Windows libvirt virtualization library. --without-uml \ --without-vbox \ --without-openvz \ - --without-one \ --without-phyp \ --without-netcf \ --without-audit \ diff --git a/src/Makefile.am b/src/Makefile.am index c3729a6..cacfc49 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -306,14 +306,6 @@ UML_DRIVER_SOURCES = \ uml/uml_conf.c uml/uml_conf.h \ uml/uml_driver.c uml/uml_driver.h -ONE_DRIVER_SOURCES = \ - ./opennebula/one_conf.c \ - ./opennebula/one_conf.h \ - ./opennebula/one_driver.c \ - ./opennebula/one_driver.h \ - ./opennebula/one_client.c \ - ./opennebula/one_client.h - ESX_DRIVER_SOURCES = \ esx/esx_private.h \ esx/esx_driver.c esx/esx_driver.h \ @@ -794,26 +786,6 @@ endif libvirt_driver_uml_la_SOURCES = $(UML_DRIVER_SOURCES) endif -if WITH_ONE -if WITH_DRIVER_MODULES -mod_LTLIBRARIES += libvirt_driver_one.la -else -noinst_LTLIBRARIES += libvirt_driver_one.la -# Stateful, so linked to daemon instead -#libvirt_la_BUILT_LIBADD += libvirt_driver_one.la -endif -libvirt_driver_one_la_CFLAGS = $(XMLRPC_CFLAGS) \ - -I@top_srcdir@/src/conf $(AM_CFLAGS) -libvirt_driver_one_la_LDFLAGS = $(AM_LDFLAGS) -libvirt_driver_one_la_LIBADD = $(XMLRPC_LIBS) -#libvirt_driver_one_la_CFLAGS = "-DWITH_ONE" -if WITH_DRIVER_MODULES -libvirt_driver_one_la_LIBADD += ../gnulib/lib/libgnu.la -libvirt_driver_one_la_LDFLAGS += -module -avoid-version -endif -libvirt_driver_one_la_SOURCES = $(ONE_DRIVER_SOURCES) -endif - BUILT_SOURCES += $(ESX_DRIVER_GENERATED) @@ -1023,7 +995,6 @@ EXTRA_DIST += \ $(QEMU_DRIVER_SOURCES) \ $(LXC_DRIVER_SOURCES) \ $(UML_DRIVER_SOURCES) \ - $(ONE_DRIVER_SOURCES) \ $(OPENVZ_DRIVER_SOURCES) \ $(PHYP_DRIVER_SOURCES) \ $(VBOX_DRIVER_SOURCES) \ diff --git a/src/README b/src/README index ad171a5..f95a8b7 100644 --- a/src/README +++ b/src/README @@ -27,7 +27,6 @@ Then there are the hypervisor implementations: * esx/ - VMware ESX and GSX support using vSphere API over SOAP * lxc/ - Linux Native Containers - * opennebula/ - Open Nebula using XMLRPC * openvz/ - OpenVZ containers using cli tools * phyp/ - IBM Power Hypervisor using CLI tools over SSH * qemu/ - QEMU / KVM using qemu CLI/monitor @@ -42,8 +41,8 @@ Then there are the hypervisor implementations: Finally some secondary drivers that are shared for several HVs. Currently these are used by LXC, OpenVZ, QEMU, UML and Xen drivers. -The ESX, OpenNebula, Power Hypervisor, Remote, Test & VirtualBox -drivers all implement the secondary drivers directly +The ESX, Power Hypervisor, Remote, Test & VirtualBox drivers all +implement the secondary drivers directly * cpu/ - CPU feature management * interface/ - Host network interface management diff --git a/src/opennebula/one_client.c b/src/opennebula/one_client.c deleted file mode 100644 index da806fc..0000000 --- a/src/opennebula/one_client.c +++ /dev/null @@ -1,207 +0,0 @@ -/* Copyright 2002-2009, Distributed Systems Architecture Group, Universidad - * Complutense de Madrid (dsa-research.org) - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include <config.h> - -#include <stdlib.h> -#include <stdio.h> -#include <string.h> -#include <fcntl.h> -#include <unistd.h> -#include "one_client.h" -#include "datatypes.h" -#include "util.h" -#include "memory.h" - -oneClient one_client; - -void c_oneStart() -{ - xmlrpc_env_init(&one_client.env); - xmlrpc_client_init2(&one_client.env, XMLRPC_CLIENT_NO_FLAGS, - "OpenNebula API Client", "1.2", NULL, 0); - - one_client.error = 0; - one_client.url = "http://localhost:2633/RPC2"; - one_client.session = "one-session"; -}; - - -int c_oneReturnCode(xmlrpc_value *resultP); - -int c_oneReturnCode(xmlrpc_value *resultP) -{ - int return_code; - char *return_string; - - xmlrpc_decompose_value(&one_client.env, resultP, "(bs)", - &return_code, &return_string); - - if( return_code ) - { - xmlrpc_DECREF(resultP); - VIR_FREE(return_string); - return 0; - } - else - { - VIR_FREE(one_client.error); - - one_client.error=return_string; - return -1; - } -} - -int c_oneDeploy(int vmid, int hid) -{ - xmlrpc_value *resultP; - - resultP = xmlrpc_client_call(&one_client.env, one_client.url, - "one.vmdeploy", "(sii)", one_client.session, (xmlrpc_int32)vmid, - (xmlrpc_int32)hid); - - return c_oneReturnCode(resultP); -} - -int c_oneMigrate(int vmid, int hid, int flag) -{ - xmlrpc_value *resultP; - - resultP = xmlrpc_client_call(&one_client.env, one_client.url, - "one.vmmigrate", "(siib)", one_client.session, (xmlrpc_int32)vmid, - (xmlrpc_int32)hid, - (xmlrpc_bool)flag); - - return c_oneReturnCode(resultP); -} - -int c_oneAllocateTemplate(char* vm_template) -{ - xmlrpc_value *resultP; - xmlrpc_value *valueP; - int return_code; - char *return_string; - int vmid; - - - resultP = xmlrpc_client_call(&one_client.env, one_client.url, - "one.vmallocate", "(ss)", one_client.session, vm_template); - - xmlrpc_array_read_item(&one_client.env, resultP, 0, &valueP); - xmlrpc_read_bool(&one_client.env, valueP, &return_code); - - if( return_code ) - { - xmlrpc_DECREF(valueP); - xmlrpc_array_read_item(&one_client.env, resultP, 1, &valueP); - xmlrpc_read_int(&one_client.env, valueP, &vmid); - - xmlrpc_DECREF(valueP); - xmlrpc_DECREF(resultP); - - return vmid; - } - else - { - xmlrpc_DECREF(valueP); - xmlrpc_array_read_item(&one_client.env, resultP, 1, &valueP); - xmlrpc_read_string(&one_client.env, valueP, - (const char **)&return_string); - - xmlrpc_DECREF(valueP); - xmlrpc_DECREF(resultP); - - VIR_FREE(one_client.error); - - one_client.error=return_string; - return -1; - } -} - -int c_oneAction(int vmid, char* action) -{ - xmlrpc_value *resultP; - - resultP = xmlrpc_client_call(&one_client.env, one_client.url, - "one.vmaction", "(ssi)", one_client.session, action, - (xmlrpc_int32)vmid); - - return c_oneReturnCode(resultP); -} - -int c_oneShutdown(int vmid) -{ - return c_oneAction(vmid, (char *)"shutdown"); -} - -int c_oneSuspend(int vmid) -{ - return c_oneAction(vmid, (char *)"suspend"); -} - -int c_oneStop(int vmid) -{ - return c_oneAction(vmid, (char *)"stop"); -} - -int c_oneResume(int vmid) -{ - return c_oneAction(vmid, (char *)"resume"); -} - -int c_oneCancel(int vmid) -{ - return c_oneAction(vmid, (char *)"cancel"); -} - -int c_oneFinalize(int vmid) -{ - return c_oneAction(vmid, (char *)"finalize"); -} - -int c_oneVmInfo(int vmid, char* ret_info, int length) -{ - xmlrpc_value *resultP; - int return_code; - char *return_string; - int retval = -1; - - resultP = xmlrpc_client_call(&one_client.env, one_client.url, - "one.vmget_info", "(si)", one_client.session, vmid); - - xmlrpc_decompose_value(&one_client.env, resultP, "(bs)", - &return_code, &return_string); - - if( return_code ) - { - if (virStrncpy(ret_info, return_string, length-1, length) != NULL) - /* Only set the return value to 0 if we succeeded */ - retval = 0; - } - - xmlrpc_DECREF(resultP); - VIR_FREE(return_string); - - return retval; -} - -void c_oneFree() -{ - xmlrpc_env_clean(&one_client.env); - xmlrpc_client_cleanup(); -} diff --git a/src/opennebula/one_client.h b/src/opennebula/one_client.h deleted file mode 100644 index e94956d..0000000 --- a/src/opennebula/one_client.h +++ /dev/null @@ -1,62 +0,0 @@ -/* Copyright 2002-2009, Distributed Systems Architecture Group, Universidad - * Complutense de Madrid (dsa-research.org) - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#ifndef ONE_CLIENT_H_ -# define ONE_CLIENT_H_ - -# include <xmlrpc-c/base.h> -# include <xmlrpc-c/client.h> - -struct _oneClient { - xmlrpc_env env; - const char *url; - const char *session; - char *error; -}; - -typedef struct _oneClient oneClient; -typedef oneClient *oneClientPtr; - -void c_oneStart(void); - -int c_oneDeploy(int vmid, int hid); - -int c_oneMigrate(int vmid, int hid, int flag); - -int c_oneAllocateTemplate(char* vm_template); - -int c_oneAction(int vmid,char* action); - -int c_oneShutdown(int vmid); - -int c_oneSuspend(int vmid); - -int c_oneStop(int vmid); - -int c_oneResume(int vmid); - -int c_oneCancel(int vmid); - -int c_oneFinalize(int vmid); - -int c_oneVmInfo(int vmid, char* ret_info,int leng); - -void c_oneFree(void); - - -#endif /* ONE_CLIENT_H_ */ diff --git a/src/opennebula/one_conf.c b/src/opennebula/one_conf.c deleted file mode 100644 index 9f0ed26..0000000 --- a/src/opennebula/one_conf.c +++ /dev/null @@ -1,285 +0,0 @@ -/*----------------------------------------------------------------------------------*/ -/* - * Copyright (C) 2010 Red Hat, Inc. - * Copyright 2002-2009, Distributed Systems Architecture Group, Universidad - * Complutense de Madrid (dsa-research.org) - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ -/*-----------------------------------------------------------------------------------*/ - -#include <config.h> -#include <sys/utsname.h> - -#include "virterror_internal.h" -#include "one_conf.h" -#include "buf.h" -#include "memory.h" -#include "util.h" - -#define VIR_FROM_THIS VIR_FROM_ONE -/* --------------------------------------------------------------------------------- */ - -/** - * oneCapsInit initialize the driver capabilities - * @return a pointer to the driver capabilities NULL in case of error - */ - -virCapsPtr oneCapsInit(void) -{ - struct utsname utsname; - virCapsPtr caps; - virCapsGuestPtr guest; - - uname(&utsname); - - if ((caps = virCapabilitiesNew(utsname.machine,0,0)) == NULL) - { - goto no_memory; - } - - virCapabilitiesSetMacPrefix(caps,(unsigned char[]){ 0x52, 0x54, 0x00 }); - - if ((guest = virCapabilitiesAddGuest(caps, - "hvm", - "i686", - 32, - NULL, - NULL, - 0, - NULL)) == NULL) - { - goto no_memory; - } - - if (virCapabilitiesAddGuestDomain(guest, - "one", - NULL, - NULL, - 0, - NULL) == NULL) - { - goto no_memory; - } - - - if ((guest = virCapabilitiesAddGuest(caps, - "hvm", - "x86_64", - 64, - NULL, - NULL, - 0, - NULL)) == NULL) - { - goto no_memory; - } - - if (virCapabilitiesAddGuestDomain(guest, - "one", - NULL, - NULL, - 0, - NULL) == NULL) - { - goto no_memory; - } - if ((guest = virCapabilitiesAddGuest(caps, - "xen", - "i686", - 32, - NULL, - NULL, - 0, - NULL)) == NULL) - { - goto no_memory; - } - if (virCapabilitiesAddGuestDomain(guest, - "one", - NULL, - NULL, - 0, - NULL) == NULL) - { - goto no_memory; - } - - return caps; - -no_memory: - - virCapabilitiesFree(caps); - return NULL; -} - -/* --------------------------------------------------------------------------------- */ -/* --------------------------------------------------------------------------------- */ -/* --------------------------------------------------------------------------------- */ - - -/** - * oneSubmitVM generates an OpenNebula description file and submits the new VM - * @param driver the OpenNebula driver - * @param vm the virtual machine pointer - * @return the OpenNebula ID for the new VM or -1 in case of error - */ - -int oneSubmitVM(one_driver_t* driver ATTRIBUTE_UNUSED, - virDomainObjPtr vm) -{ - char* templ; - int oneid; - - if ((templ = xmlOneTemplate(vm->def)) == NULL) - return -1; - - if ((oneid = c_oneAllocateTemplate(templ)) < 0) { - oneError(VIR_ERR_OPERATION_FAILED, "%s", - _("Error submitting virtual machine to OpenNebula")); - VIR_FREE(templ); - return -1; - } - - VIR_FREE(templ); - return oneid; -} -/* --------------------------------------------------------------------------------- */ -/* --------------------------------------------------------------------------------- */ -/* --------------------------------------------------------------------------------- */ - -/** - * xmlOneTemplate Generate an OpenNebula template to deploy a VM from libvirt - * internal Domain definition. - * @param def Internal libvirt Domain definition - * @return OpenNebula VM template. - */ - -char* xmlOneTemplate(virDomainDefPtr def) -{ - int i; - virBuffer buf= VIR_BUFFER_INITIALIZER; - virBufferVSprintf(&buf,"#OpenNebula Template automatically generated " - "by libvirt\nNAME = %s\nCPU = %d\nMEMORY = %ld\n", - def->name, - def->maxvcpus, - VIR_DIV_UP(def->mem.max_balloon, 1024)); - - /*Optional Booting OpenNebula Information:*/ - if (def->os.kernel) { - virBufferVSprintf(&buf,"OS=[ kernel = \"%s\"",def->os.kernel); - if (def->os.initrd) - virBufferVSprintf(&buf,",\n initrd = \"%s\"",def->os.initrd); - if (def->os.cmdline) - virBufferVSprintf(&buf,",\n kernel_cmd = \"%s\"",def->os.cmdline); - if (def->os.root) - virBufferVSprintf(&buf,",\n root = \"%s\"",def->os.root); - - virBufferAddLit(&buf," ]\n"); - } - /* set Disks & NICS */ - for (i=0 ; i < def->ndisks ; i++) { - /* missing source is only allowed at cdrom and floppy */ - if (def->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_DISK) { - virBufferVSprintf(&buf, "DISK=[ type = disk,\n" - "\tsource = \"%s\",\n", - def->disks[i]->src); - } - else if (def->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_CDROM) { - virBufferAddLit(&buf, "DISK=[ type = cdrom,\n"); - if (def->disks[i]->src) virBufferVSprintf(&buf, "\tsource = \"%s\",\n",def->disks[i]->src); - } - else if (def->disks[i]->device == VIR_DOMAIN_DISK_DEVICE_FLOPPY) { - virBufferAddLit(&buf, "DISK=[ type = floppy,\n"); - if (def->disks[i]->src) virBufferVSprintf(&buf, "\tsource = \"%s\",\n",def->disks[i]->src); - } - - virBufferVSprintf(&buf, "\ttarget = \"%s\",\n" - "\treadonly =", - def->disks[i]->dst); - - if (def->disks[i]->readonly) - virBufferAddLit(&buf,"\"yes\"]\n"); - else - virBufferAddLit(&buf,"\"no\"]\n"); - } - - for (i=0 ; i< def->nnets ; i++) - { - if (!def->nets[i]) { - continue; - } - - switch(def->nets[i]->type) - { - case VIR_DOMAIN_NET_TYPE_BRIDGE: - virBufferVSprintf(&buf,"NIC=[ bridge =\"%s\",\n",def->nets[i]->data.bridge.brname); - - if (def->nets[i]->ifname) - virBufferVSprintf(&buf," target =\"%s\",\n",def->nets[i]->ifname); - - virBufferVSprintf(&buf," mac =\"%02x:%02x:%02x:%02x:%02x:%02x\" ]\n", - def->nets[i]->mac[0],def->nets[i]->mac[1], - def->nets[i]->mac[2],def->nets[i]->mac[3], - def->nets[i]->mac[4],def->nets[i]->mac[5]); - break; - - case VIR_DOMAIN_NET_TYPE_NETWORK: - virBufferVSprintf(&buf,"NIC=[ network=\"%s\"",def->nets[i]->data.network.name); - if (def->nets[i]->ifname) - virBufferVSprintf(&buf,",\n target =\"%s\"",def->nets[i]->ifname); - virBufferAddLit(&buf," ]\n"); - break; - - default: break; - } - } - - for(i=0;i<def->ngraphics;i++) { - if (def->graphics[i] == NULL) - continue; - - if (def->graphics[i]->type == VIR_DOMAIN_GRAPHICS_TYPE_VNC) { - virBufferAddLit(&buf,"GRAPHICS = [\n type = \"vnc\""); - - if (def->graphics[i]->data.vnc.listenAddr != NULL) - virBufferVSprintf(&buf,",\n listen = \"%s\"", - def->graphics[i]->data.vnc.listenAddr); - - if (def->graphics[i]->data.vnc.autoport == 0) - virBufferVSprintf(&buf,",\n port = \"%d\"", - def->graphics[i]->data.vnc.port); - - if (def->graphics[i]->data.vnc.auth.passwd != NULL) - virBufferVSprintf(&buf,",\n passwd = \"%s\"", - def->graphics[i]->data.vnc.auth.passwd); - - virBufferAddLit(&buf," ]\n"); - - } - else /* graphics.type==VIR_DOMAIN_GRAPHICS_TYPE_SDL */ - virBufferAddLit(&buf,"GRAPHICS = [\n type = \"sdl\" ]\n"); - - } - if (virBufferError(&buf)) - goto no_memory; - - return virBufferContentAndReset(&buf); - -no_memory: - virReportOOMError(); - virBufferFreeAndReset(&buf); - return NULL; -}; diff --git a/src/opennebula/one_conf.h b/src/opennebula/one_conf.h deleted file mode 100644 index c53090c..0000000 --- a/src/opennebula/one_conf.h +++ /dev/null @@ -1,54 +0,0 @@ -/*----------------------------------------------------------------------------------*/ -/* - * Copyright (C) 2010 Red Hat, Inc. - * Copyright 2002-2009, Distributed Systems Architecture Group, Universidad - * Complutense de Madrid (dsa-research.org) - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ -/*-----------------------------------------------------------------------------------*/ - -#ifndef ONE_CONF_H -# define ONE_CONF_H - -# include <config.h> - -# include "internal.h" -# include "domain_conf.h" -# include "capabilities.h" -# include "threads.h" -# include "one_client.h" - -struct one_driver{ - virMutex lock; - - virCapsPtr caps; - virDomainObjList domains; - int nextid; -}; - -typedef struct one_driver one_driver_t; - -virCapsPtr oneCapsInit(void); - -int oneSubmitVM(one_driver_t* driver, virDomainObjPtr vm); - -char* xmlOneTemplate(virDomainDefPtr def); - -# define oneError(code, ...) \ - virReportErrorHelper(NULL, VIR_FROM_ONE, code, __FILE__, \ - __FUNCTION__, __LINE__, __VA_ARGS__) - -#endif /* ONE_CONF_H */ diff --git a/src/opennebula/one_driver.c b/src/opennebula/one_driver.c deleted file mode 100644 index 3146589..0000000 --- a/src/opennebula/one_driver.c +++ /dev/null @@ -1,850 +0,0 @@ -/*---------------------------------------------------------------------------*/ -/* - * Copyright (C) 2010-2011 Red Hat, Inc. - * Copyright 2002-2009, Distributed Systems Architecture Group, Universidad - * Complutense de Madrid (dsa-research.org) - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ -/*---------------------------------------------------------------------------*/ - -#include <config.h> - -#include <fcntl.h> -#include <sched.h> -#include <sys/utsname.h> -#include <string.h> -#include <sys/types.h> -#include <sys/socket.h> -#include <sys/un.h> -#include <sys/poll.h> -#include <unistd.h> -#include <wait.h> -#include <sys/time.h> - -#include "virterror_internal.h" -#include "logging.h" -#include "datatypes.h" -#include "one_conf.h" -#include "one_driver.h" -#include "memory.h" -#include "util.h" -#include "bridge.h" - -#define VIR_FROM_THIS VIR_FROM_ONE - -static int oneStartup(int privileged); -static int oneShutdown(void); -static int oneActive(void); - -static void oneDriverLock(one_driver_t* driver) -{ - virMutexLock(&driver->lock); -} - -static void oneDriverUnlock(one_driver_t* driver) -{ - virMutexUnlock(&driver->lock); -} - -static one_driver_t *one_driver =NULL; - - -static virDrvOpenStatus oneOpen(virConnectPtr conn, - virConnectAuthPtr auth ATTRIBUTE_UNUSED, - int flags ATTRIBUTE_UNUSED) -{ - /* Verify uri was specified */ - if (conn->uri == NULL) { - conn->uri = xmlParseURI("one:///"); - if (!conn->uri) { - virReportOOMError(); - return VIR_DRV_OPEN_ERROR; - } - } else if (conn->uri->scheme == NULL || - STRNEQ(conn->uri->scheme, "one")) { - goto declineConnection; - } - conn->privateData = one_driver; - - return VIR_DRV_OPEN_SUCCESS; - -declineConnection: - return VIR_DRV_OPEN_DECLINED; -} - -static int oneClose(virConnectPtr conn) -{ - conn->privateData = NULL; - return 0; -} - - -static int oneIsEncrypted(virConnectPtr conn ATTRIBUTE_UNUSED) -{ - /* Not encrypted because it uses HTTP, not HTTPs */ - return 0; -} - - -static int oneIsSecure(virConnectPtr conn ATTRIBUTE_UNUSED) -{ - /* Not secure because it uses HTTP, not HTTPs */ - return 0; -} - -static int oneIsUpdated(virDomainPtr conn ATTRIBUTE_UNUSED) -{ - return 0; -} - -static virDomainPtr oneDomainLookupByID(virConnectPtr conn, - int id) -{ - one_driver_t *driver = conn->privateData; - virDomainPtr dom = NULL; - virDomainObjPtr vm = NULL; - - oneDriverLock(driver); - vm = virDomainFindByID(&driver->domains, id); - oneDriverUnlock(driver); - - if (!vm) { - oneError(VIR_ERR_NO_DOMAIN, NULL); - goto return_point; - } - - dom = virGetDomain(conn, vm->def->name, vm->def->uuid); - if (dom) { - dom->id = vm->def->id; - } - -return_point: - if(vm) { - virDomainObjUnlock(vm); - } - - return dom; -} - -static virDomainPtr oneDomainLookupByUUID(virConnectPtr conn, - const unsigned char *uuid) -{ - one_driver_t *driver = conn->privateData; - virDomainPtr dom = NULL; - virDomainObjPtr vm = NULL; - - oneDriverLock(driver); - vm = virDomainFindByUUID(&driver->domains, uuid); - oneDriverUnlock(driver); - if (!vm) { - oneError(VIR_ERR_NO_DOMAIN, NULL); - goto return_point; - } - - dom = virGetDomain(conn, vm->def->name, vm->def->uuid); - if (dom) { - dom->id = vm->def->id; - } - -return_point: - if(vm) { - virDomainObjUnlock(vm); - } - - return dom; -} - -static virDomainPtr oneDomainLookupByName(virConnectPtr conn, - const char *name) -{ - one_driver_t *driver = conn->privateData; - virDomainObjPtr vm = NULL; - virDomainPtr dom=NULL; - - oneDriverLock(driver); - vm = virDomainFindByName(&driver->domains, name); - oneDriverUnlock(driver); - - if (!vm) { - oneError(VIR_ERR_NO_DOMAIN, NULL); - goto return_point; - } - - dom = virGetDomain(conn, vm->def->name, vm->def->uuid); - if (dom) { - dom->id = vm->def->id; - } -return_point: - if(vm) { - virDomainObjUnlock(vm); - } - - return dom; -} - -static int oneListDomains(virConnectPtr conn, int *ids, int nids) -{ - one_driver_t *driver = conn->privateData; - int n; - - oneDriverLock(driver); - n = virDomainObjListGetActiveIDs(&driver->domains, ids, nids); - oneDriverUnlock(driver); - - return n; -} - -static int oneNumDomains(virConnectPtr conn) -{ - one_driver_t *driver = conn->privateData; - int n; - - oneDriverLock(driver); - n = virDomainObjListNumOfDomains(&driver->domains, 1); - oneDriverUnlock(driver); - - return n; -} - -static int oneListDefinedDomains(virConnectPtr conn, - char **const names, int nnames) { - one_driver_t *driver = conn->privateData; - int n; - - oneDriverLock(driver); - n = virDomainObjListGetInactiveNames(&driver->domains, names, nnames); - oneDriverUnlock(driver); - - return n; -} - -static int oneNumDefinedDomains(virConnectPtr conn) -{ - one_driver_t *driver = conn->privateData; - int n; - - oneDriverLock(driver); - n = virDomainObjListNumOfDomains(&driver->domains, 0); - oneDriverUnlock(driver); - - return n; -} - -static virDomainPtr oneDomainDefine(virConnectPtr conn, const char *xml) -{ - one_driver_t *driver = conn->privateData; - virDomainDefPtr def; - virDomainObjPtr vm; - virDomainPtr dom=NULL; - - oneDriverLock(driver); - if (!(def = virDomainDefParseString(driver->caps, xml, - VIR_DOMAIN_XML_INACTIVE))) - goto return_point; - - if (!(vm = virDomainAssignDef(driver->caps, - &driver->domains, def, false))) { - virDomainDefFree(def); - goto return_point; - } - - vm->def->id = -1; - vm->persistent = 1; - dom = virGetDomain(conn, vm->def->name, vm->def->uuid); - if (dom) { - dom->id = vm->def->id; - } - virDomainObjUnlock(vm); - -return_point: - oneDriverUnlock(driver); - return dom; -} - - -static int oneDomainUndefine(virDomainPtr dom) -{ - one_driver_t *driver = dom->conn->privateData; - virDomainObjPtr vm = NULL; - int ret=-1; - - oneDriverLock(driver); - vm =virDomainFindByUUID(&driver->domains, dom->uuid); - if (!vm) { - oneError(VIR_ERR_NO_DOMAIN, "%s", - _("no domain with matching uuid")); - goto return_point; - } - - if (!vm->persistent) { - oneError(VIR_ERR_OPERATION_INVALID, "%s", - _("cannot undefine transient domain")); - goto return_point; - } - virDomainRemoveInactive(&driver->domains, vm); - ret=0; - -return_point: - if (vm) - virDomainObjUnlock(vm); - oneDriverUnlock(driver); - return ret; -} - -static int oneDomainGetInfo(virDomainPtr dom, - virDomainInfoPtr info) -{ - one_driver_t *driver = dom->conn->privateData; - struct timeval tv; - virDomainObjPtr vm; - oneDriverLock(driver); - vm= virDomainFindByUUID(&driver->domains, dom->uuid); - oneDriverUnlock(driver); - - if (!vm) { - oneError(VIR_ERR_NO_DOMAIN, "%s", - _("no domain with matching uuid")); - return -1; - } - - if(gettimeofday(&tv,NULL)<0) { - oneError(VIR_ERR_INTERNAL_ERROR, "%s", - _("getting time of day")); - virDomainObjUnlock(vm); - return -1; - } - - if (!virDomainObjIsActive(vm)) { - info->cpuTime = 0; - } else { - char vm_info[257]; - c_oneVmInfo(vm->pid,vm_info,256); - /* State: */ - char* cptr = strstr(vm_info,"STATE"); - cptr = index(cptr, ':'); - cptr++; - int one_state=atoi(cptr); - - switch(one_state) { - case 3: /** running */ - if (vm->state!=VIR_DOMAIN_SHUTDOWN) - vm->state=VIR_DOMAIN_RUNNING; - break; - case 5: /** pause */ - vm->state=VIR_DOMAIN_PAUSED; - break; - case 6: /** done */ - vm->state=VIR_DOMAIN_SHUTOFF; - vm->def->id=-1; - break; - case 7: /** error */ - vm->state=VIR_DOMAIN_CRASHED; - break; - default: - break; - }; - /* Memory: */ - cptr=strstr(vm_info,"MEMORY"); - cptr=index(cptr,':'); - cptr++; - vm->def->mem.cur_balloon = atoi(cptr); - - /* run time: */ - cptr=strstr(vm_info,"START TIME"); - cptr=index(cptr,':'); - cptr++; - long starttime = atol(cptr); - info->cpuTime = (tv.tv_sec - starttime) *1000ll *1000ll *1000ll; - - } - - info->state = vm->state; - info->maxMem = vm->def->mem.max_balloon; - info->memory = vm->def->mem.cur_balloon; - info->nrVirtCpu = vm->def->vcpus; - - virDomainObjUnlock(vm); - return 0; -} - -static char *oneGetOSType(virDomainPtr dom) -{ - one_driver_t *driver = dom->conn->privateData; - virDomainObjPtr vm = NULL; - char *ret = NULL; - - oneDriverLock(driver); - vm =virDomainFindByUUID(&driver->domains, dom->uuid); - oneDriverUnlock(driver); - if (!vm) { - oneError(VIR_ERR_NO_DOMAIN, "%s", - _("no domain with matching uuid")); - goto cleanup; - } - - ret = strdup(vm->def->os.type); - if (!ret) - virReportOOMError(); - -cleanup: - if (vm) - virDomainObjUnlock(vm); - return ret; -} - -static int oneDomainStartWithFlags(virDomainPtr dom, unsigned int flags) -{ - virConnectPtr conn = dom->conn; - one_driver_t *driver = conn->privateData; - virDomainObjPtr vm; - int ret = -1; - int oneid; - - virCheckFlags(0, -1); - - oneDriverLock(driver); - vm = virDomainFindByName(&driver->domains, dom->name); - - if (!vm) { - oneError(VIR_ERR_NO_DOMAIN, - _("no domain named %s"), dom->name); - goto return_point; - } - if((oneid = oneSubmitVM(driver, vm)) < 0) { - goto return_point; - } - vm->pid=oneid; - vm->def->id=driver->nextid++; - vm->state=VIR_DOMAIN_BLOCKED; - ret=0; - -return_point: - if(vm) - virDomainObjUnlock(vm); - oneDriverUnlock(driver); - - return ret; -} - -static int oneDomainStart(virDomainPtr dom) -{ - return oneDomainStartWithFlags(dom, 0); -} - -static virDomainPtr -oneDomainCreateAndStart(virConnectPtr conn, - const char *xml, - unsigned int flags) { - one_driver_t *driver = conn->privateData; - virDomainObjPtr vm = NULL; - virDomainDefPtr def; - virDomainPtr dom = NULL; - int oneid; - - virCheckFlags(0, NULL); - - oneDriverLock(driver); - if (!(def = virDomainDefParseString(driver->caps, xml, - VIR_DOMAIN_XML_INACTIVE))) - goto return_point; - - vm = virDomainFindByName(&driver->domains, def->name); - if (vm) { - oneError(VIR_ERR_OPERATION_FAILED, - _("Already an OpenNebula VM active with the name: '%s' id: %d "), - def->name,def->id); - goto return_point; - } - - if (!(vm = virDomainAssignDef(driver->caps, - &driver->domains, def, false))) { - virDomainDefFree(def); - goto return_point; - } - if ((oneid = oneSubmitVM(driver, vm)) < 0) { - virDomainRemoveInactive(&driver->domains, vm); - vm=NULL; - goto return_point; - } - - vm->def->id=driver->nextid++; - vm->persistent=0; - vm->pid=oneid; - vm->state=VIR_DOMAIN_BLOCKED; - - dom = virGetDomain(conn, vm->def->name, vm->def->uuid); - if (dom) { - dom->id = vm->def->id; - } - -return_point: - if(vm) - virDomainObjUnlock(vm); - oneDriverUnlock(driver); - - return dom; -} - -static int oneDomainShutdown(virDomainPtr dom) -{ - one_driver_t *driver = dom->conn->privateData; - virDomainObjPtr vm; - int ret=-1; - - oneDriverLock(driver); - if (!(vm=virDomainFindByID(&driver->domains, dom->id))) { - oneError(VIR_ERR_NO_DOMAIN, - _("no domain with id %d"), dom->id); - goto return_point; - } - - if (c_oneShutdown(vm->pid)) { - oneError(VIR_ERR_OPERATION_INVALID, "%s", - _("Wrong state to perform action")); - goto return_point; - } - vm->state=VIR_DOMAIN_SHUTDOWN; - ret= 0; - - if (!vm->persistent) { - virDomainRemoveInactive(&driver->domains, vm); - vm = NULL; - } - -return_point: - if(vm) - virDomainObjUnlock(vm); - oneDriverUnlock(driver); - - return ret; -} - -static int oneDomainDestroy(virDomainPtr dom) -{ - one_driver_t *driver = dom->conn->privateData; - virDomainObjPtr vm; - int ret=-1; - - oneDriverLock(driver); - vm= virDomainFindByID(&driver->domains, dom->id); - if (!vm) { - oneError(VIR_ERR_NO_DOMAIN, - _("no domain with id %d"), dom->id); - goto return_point; - } - if(c_oneCancel(vm->pid)) { - /* VM not running, delete the instance at ONE DB */ - if(c_oneFinalize(vm->pid)){ - oneError(VIR_ERR_OPERATION_INVALID, "%s", - _("Wrong state to perform action")); - goto return_point; - } - } - if(!vm->persistent) { - virDomainRemoveInactive(&driver->domains,vm); - vm=NULL; - } - ret=0; - -return_point: - if(vm) - virDomainObjUnlock(vm); - - oneDriverUnlock(driver); - - return ret; -} - -static int oneDomainSuspend(virDomainPtr dom) -{ - one_driver_t* driver = dom->conn->privateData; - virDomainObjPtr vm; - int ret=-1; - - oneDriverLock(driver); - if ((vm=virDomainFindByID(&driver->domains,dom->id))){ - - if (vm->state == VIR_DOMAIN_RUNNING) { - if( !(c_oneSuspend(vm->pid)) ) { - vm->state=VIR_DOMAIN_PAUSED; - ret=0; - goto return_point; - } - oneError(VIR_ERR_OPERATION_INVALID, "%s", - _("Wrong state to perform action")); - goto return_point; - } - oneError(VIR_ERR_OPERATION_INVALID, "%s", - _("domain is not running")); - } else { - oneError(VIR_ERR_NO_DOMAIN, - _("no domain with matching id %d"), dom->id); - } - -return_point: - if(vm) - virDomainObjUnlock(vm); - oneDriverUnlock(driver); - - return ret; -}; - -static int oneDomainResume(virDomainPtr dom) -{ - one_driver_t* driver = dom->conn->privateData; - virDomainObjPtr vm; - int ret=-1; - - oneDriverLock(driver); - if ((vm=virDomainFindByID(&driver->domains,dom->id))) { - if (vm->state == VIR_DOMAIN_PAUSED) { - if( !(c_oneResume(vm->pid)) ) { - vm->state=VIR_DOMAIN_RUNNING; - ret=0; - goto return_point; - } - oneError(VIR_ERR_OPERATION_INVALID, "%s", - _("Wrong state to perform action")); - goto return_point; - } - oneError(VIR_ERR_OPERATION_INVALID, "%s", - _("domain is not paused")); - } else { - oneError(VIR_ERR_NO_DOMAIN, - _("no domain with matching id %d"), dom->id); - } - -return_point: - if(vm) - virDomainObjUnlock(vm); - oneDriverUnlock(driver); - - return ret; -}; - -static int oneStartup(int privileged ATTRIBUTE_UNUSED){ - - if (VIR_ALLOC(one_driver) < 0) { - return -1; - } - - if(virMutexInit(&one_driver->lock)<0){ - VIR_FREE(one_driver); - return -1; - } - - c_oneStart(); - oneDriverLock(one_driver); - - if (virDomainObjListInit(&one_driver->domains) < 0) { - goto error; - } - - one_driver->nextid=1; - if ((one_driver->caps = oneCapsInit()) == NULL) { - virReportOOMError(); - goto error; - } - oneDriverUnlock(one_driver); - - return 0; - -error: - oneDriverUnlock(one_driver); - oneShutdown(); - return -1; -} - -static int oneShutdown(void){ - if (one_driver == NULL) - return(-1); - - oneDriverLock(one_driver); - virDomainObjListDeinit(&one_driver->domains); - - virCapabilitiesFree(one_driver->caps); - oneDriverUnlock(one_driver); - virMutexDestroy(&one_driver->lock); - VIR_FREE(one_driver); - one_driver = NULL; - c_oneFree(); - return 0; -} - -static int oneActive(void){ - int active = 0; - - if (one_driver == NULL) - return(0); - - oneDriverLock(one_driver); - active = virDomainObjListNumOfDomains(&one_driver->domains, 1); - oneDriverUnlock(one_driver); - - return active; - -} - -static int oneVersion(virConnectPtr conn ATTRIBUTE_UNUSED, unsigned long *hvVer) -{ - *hvVer = 1; - return 0; -} - - -static int oneGetAutostart(virDomainPtr domain ATTRIBUTE_UNUSED, int *autostart) -{ - autostart=0; - return 0; -} - -static char* oneGetCapabilities(virConnectPtr conn){ - one_driver_t* privconn = conn->privateData; - char *xml; - oneDriverLock(privconn); - if ((xml = virCapabilitiesFormatXML(privconn->caps)) == NULL) - virReportOOMError(); - oneDriverUnlock(privconn); - return xml; -} -/* Function Tables */ -static virDriver oneDriver = { - VIR_DRV_ONE, /* the number virDrvNo */ - "one", /* the name of the driver */ - oneOpen, /* open */ - oneClose, /* close */ - NULL, /* supports_feature */ - NULL, /* type */ - oneVersion, /* version */ - NULL, /* libvirtVersion (impl. in libvirt.c) */ - NULL, /* getHostname */ - NULL, /* getSysinfo */ - NULL, /* getMaxVcpus */ - NULL, /* nodeGetInfo */ - oneGetCapabilities, /* getCapabilities */ - oneListDomains, /* listDomains */ - oneNumDomains, /* numOfDomains */ - oneDomainCreateAndStart, /* domainCreateXML */ - oneDomainLookupByID, /* domainLookupByID */ - oneDomainLookupByUUID, /* domainLookupByUUID */ - oneDomainLookupByName, /* domainLookupByName */ - oneDomainSuspend, /* domainSuspend */ - oneDomainResume, /* domainResume */ - oneDomainShutdown, /* domainShutdown */ - NULL, /* domainReboot */ - oneDomainDestroy, /* domainDestroy */ - oneGetOSType, /* domainGetOSType */ - NULL, /* domainGetMaxMemory */ - NULL, /* domainSetMaxMemory */ - NULL, /* domainSetMemory */ - NULL, /* domainSetMemoryFlags */ - NULL, /* domainSetMemoryParameters */ - NULL, /* domainGetMemoryParameters */ - NULL, /* domainSetBlkioParameters */ - NULL, /* domainGetBlkioParameters */ - oneDomainGetInfo, /* domainGetInfo */ - NULL, /* domainSave */ - NULL, /* domainRestore */ - NULL, /* domainCoreDump */ - NULL, /* domainSetVcpus */ - NULL, /* domainSetVcpusFlags */ - NULL, /* domainGetVcpusFlags */ - NULL, /* domainPinVcpu */ - NULL, /* domainGetVcpus */ - NULL, /* domainGetMaxVcpus */ - NULL, /* domainGetSecurityLabel */ - NULL, /* nodeGetSecurityModel */ - NULL, /* domainDumpXML */ - NULL, /* domainXMLFromNative */ - NULL, /* domainXMLToNative */ - oneListDefinedDomains, /* listDefinedDomains */ - oneNumDefinedDomains, /* numOfDefinedDomains */ - oneDomainStart, /* domainCreate */ - oneDomainStartWithFlags, /* domainCreateWithFlags */ - oneDomainDefine, /* domainDefineXML */ - oneDomainUndefine, /* domainUndefine */ - NULL, /* domainAttachDevice */ - NULL, /* domainAttachDeviceFlags */ - NULL, /* domainDetachDevice */ - NULL, /* domainDetachDeviceFlags */ - NULL, /* domainUpdateDeviceFlags */ - oneGetAutostart, /* domainGetAutostart */ - NULL, /* domainSetAutostart */ - NULL, /* domainGetSchedulerType */ - NULL, /* domainGetSchedulerParameters */ - NULL, /* domainSetSchedulerParameters */ - NULL, /* domainMigratePrepare */ - NULL, /* domainMigratePerform */ - NULL, /* domainMigrateFinish */ - NULL, /* domainBlockStats */ - NULL, /* domainInterfaceStats */ - NULL, /* domainMemoryStats */ - NULL, /* domainBlockPeek */ - NULL, /* domainMemoryPeek */ - NULL, /* domainGetBlockInfo */ - NULL, /* nodeGetCellsFreeMemory */ - NULL, /* getFreeMemory */ - NULL, /* domainEventRegister */ - NULL, /* domainEventDeregister */ - NULL, /* domainMigratePrepare2 */ - NULL, /* domainMigrateFinish2 */ - NULL, /* nodeDeviceDettach; */ - NULL, /* nodeDeviceReAttach; */ - NULL, /* nodeDeviceReset; */ - NULL, /* domainMigratePrepareTunnel */ - oneIsEncrypted, /* isEncrypted */ - oneIsSecure, /* isSecure */ - NULL, /* domainIsActive */ - NULL, /* domainIsPersistent */ - oneIsUpdated, /* domainIsUpdated */ - NULL, /* cpuCompare */ - NULL, /* cpuBaseline */ - NULL, /* domainGetJobInfo */ - NULL, /* domainAbortJob */ - NULL, /* domainMigrateSetMaxDowntime */ - NULL, /* domainMigrateSetMaxSpeed */ - NULL, /* domainEventRegisterAny */ - NULL, /* domainEventDeregisterAny */ - NULL, /* domainManagedSave */ - NULL, /* domainHasManagedSaveImage */ - NULL, /* domainManagedSaveRemove */ - NULL, /* domainSnapshotCreateXML */ - NULL, /* domainSnapshotDumpXML */ - NULL, /* domainSnapshotNum */ - NULL, /* domainSnapshotListNames */ - NULL, /* domainSnapshotLookupByName */ - NULL, /* domainHasCurrentSnapshot */ - NULL, /* domainSnapshotCurrent */ - NULL, /* domainRevertToSnapshot */ - NULL, /* domainSnapshotDelete */ - NULL, /* qemuDomainMonitorCommand */ - NULL, /* domainOpenConsole */ -}; - -static virStateDriver oneStateDriver = { - .name = "OpenNebula", - .initialize = oneStartup, - .cleanup = oneShutdown, - .active = oneActive, -}; - - -int oneRegister(void) -{ - virRegisterDriver(&oneDriver); - virRegisterStateDriver(&oneStateDriver); - return 0; -} diff --git a/src/opennebula/one_driver.h b/src/opennebula/one_driver.h deleted file mode 100644 index 6cc1f46..0000000 --- a/src/opennebula/one_driver.h +++ /dev/null @@ -1,30 +0,0 @@ -/*---------------------------------------------------------------------------*/ -/* Copyright 2002-2009, Distributed Systems Architecture Group, Universidad - * Complutense de Madrid (dsa-research.org) - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ -/*---------------------------------------------------------------------------*/ - - -#ifndef ONE_DRIVER_H -# define ONE_DRIVER_H - -# include <config.h> -# include "one_client.h" - -int oneRegister(void); - -#endif /* ONE_DRIVER_H */ -- 1.7.4

5 8

[libvirt] [libvirt-php PATCH v2 0/4] new API for storage
by Lyre 28 Mar '11

28 Mar '11

Hi all: Those patches fixed some minor mistakes, and added 3 functions for storage. Lyre (4): Comment: fix typo Storagepool: make flag for pool refresh optional Volume: add "clone" support Storage: add lookup functions src/libvirt-php.c | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++++- src/libvirt-php.h | 3 + 2 files changed, 111 insertions(+), 2 deletions(-) -- 1.7.3.4

2 5

[libvirt] [libvirt-php] Add volume clone support
by Lyre 28 Mar '11

28 Mar '11

New API: libvirt_storagevolume_create_xml_from () --- src/libvirt-php.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++- src/libvirt-php.h | 1 + 2 files changed, 58 insertions(+), 2 deletions(-) diff --git a/src/libvirt-php.c b/src/libvirt-php.c index 890b447..3179271 100644 --- a/src/libvirt-php.c +++ b/src/libvirt-php.c @@ -109,6 +109,7 @@ static function_entry libvirt_functions[] = { 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_storagepool_get_uuid_string, NULL) PHP_FE(libvirt_storagepool_get_name, NULL) PHP_FE(libvirt_storagepool_lookup_by_uuid_string, NULL) @@ -1904,7 +1905,16 @@ PHP_FUNCTION(libvirt_domain_memory_stats) int retval; long flags=0; int i; - struct _virDomainMemoryStat stats[VIR_DOMAIN_MEMORY_STAT_NR]; + + struct _virDomainMemoryStat stats[VIR_DOMAIN_MEMORY_STAT_NR] = + { + {VIR_DOMAIN_MEMORY_STAT_SWAP_IN, 0}, + {VIR_DOMAIN_MEMORY_STAT_SWAP_OUT, 0}, + {VIR_DOMAIN_MEMORY_STAT_MAJOR_FAULT, 0}, + {VIR_DOMAIN_MEMORY_STAT_MINOR_FAULT, 0}, + {VIR_DOMAIN_MEMORY_STAT_UNUSED, 0}, + {VIR_DOMAIN_MEMORY_STAT_AVAILABLE, 0}, + }; GET_DOMAIN_FROM_ARGS("r|l",&zdomain,&flags); @@ -2804,6 +2814,51 @@ PHP_FUNCTION(libvirt_storagevolume_create_xml) } /* + Function name: libvirt_storagevolume_create_xml_from + Since version: 0.4.1(-2) + Description: Function is used to clone the new storage volume into pool from the orignial volume + Arguments: @pool [resource]: libvirt storagepool resource + @xml [string]: XML string to create the storage volume in the storage pool + @original_volume [resource]: libvirt storagevolume resource + Returns: libvirt storagevolume resource +*/ +PHP_FUNCTION(libvirt_storagevolume_create_xml_from) +{ + php_libvirt_volume *res_volume=NULL; + php_libvirt_storagepool *pool=NULL; + zval *zpool; + + php_libvirt_volume *pl_volume=NULL; + zval *zvolume; + + virStorageVolPtr volume=NULL; + char *xml; + int xml_len; + + if (zend_parse_parameters (ZEND_NUM_ARGS() TSRMLS_CC, "rsr", &zpool, &xml, &xml_len, &zvolume) == FAILURE) + { + RETURN_FALSE; + } + + ZEND_FETCH_RESOURCE (pool, php_libvirt_storagepool*, &zpool, -1, PHP_LIBVIRT_STORAGEPOOL_RES_NAME, le_libvirt_storagepool); + if ((pool==NULL)||(pool->pool==NULL))RETURN_FALSE; + ZEND_FETCH_RESOURCE (pl_volume, php_libvirt_volume*, &zvolume, -1, PHP_LIBVIRT_VOLUME_RES_NAME, le_libvirt_volume); + if ((pl_volume==NULL)||(pl_volume->volume==NULL))RETURN_FALSE; + + volume=virStorageVolCreateXMLFrom(pool->pool,xml, pl_volume->volume, 0); + if (volume==NULL) + { + set_error ("Cannot create new volume" TSRMLS_CC); + RETURN_FALSE; + } + + res_volume= emalloc(sizeof(php_libvirt_volume)); + res_volume->volume = volume; + + ZEND_REGISTER_RESOURCE(return_value, res_volume, le_libvirt_volume); +} + +/* Function name: libvirt_storagepool_get_uuid_string Since version: 0.4.1(-1) Description: Function is used to get storage pool by UUID string @@ -3058,7 +3113,7 @@ PHP_FUNCTION(libvirt_storagepool_refresh) zval *zpool; unsigned long flags = 0; - GET_STORAGEPOOL_FROM_ARGS ("rl", &zpool, &flags); + GET_STORAGEPOOL_FROM_ARGS ("r|l", &zpool, &flags); if (virStoragePoolRefresh (pool->pool, flags) < 0) { diff --git a/src/libvirt-php.h b/src/libvirt-php.h index 816175d..b49355f 100644 --- a/src/libvirt-php.h +++ b/src/libvirt-php.h @@ -173,6 +173,7 @@ PHP_FUNCTION(libvirt_storagevolume_get_path); PHP_FUNCTION(libvirt_storagevolume_get_info); PHP_FUNCTION(libvirt_storagevolume_get_xml_desc); PHP_FUNCTION(libvirt_storagevolume_create_xml); +PHP_FUNCTION(libvirt_storagevolume_create_xml_from); PHP_FUNCTION(libvirt_storagepool_get_uuid_string); PHP_FUNCTION(libvirt_storagepool_get_name); PHP_FUNCTION(libvirt_storagepool_lookup_by_uuid_string); -- 1.7.3.4 m

2 3

[libvirt] [libvirt-php] Add lookup function for pool & volume
by Lyre 28 Mar '11

28 Mar '11

--- src/libvirt-php.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++++ src/libvirt-php.h | 2 + 2 files changed, 68 insertions(+), 0 deletions(-) diff --git a/src/libvirt-php.c b/src/libvirt-php.c index 3179271..5737163 100644 --- a/src/libvirt-php.c +++ b/src/libvirt-php.c @@ -102,8 +102,10 @@ static function_entry libvirt_functions[] = { PHP_FE(libvirt_domain_snapshot_lookup_by_name, NULL) /* 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) @@ -2600,6 +2602,37 @@ PHP_FUNCTION(libvirt_storagepool_lookup_by_name) ZEND_REGISTER_RESOURCE(return_value, res_pool, le_libvirt_storagepool); } +/* Storagepool functions */ + +/* + Function name: libvirt_storagepool_lookup_by_volume + Since version: 0.4.1(-1) + Description: Function is used to lookup for storage pool by a volume + Arguments: @res [volume]: volume resource of storage pool + Returns: libvirt storagepool resource +*/ +PHP_FUNCTION(libvirt_storagepool_lookup_by_volume) +{ + php_libvirt_volume *volume; + zval *zvolume; + virStoragePoolPtr pool=NULL; + php_libvirt_storagepool *res_pool; + + GET_VOLUME_FROM_ARGS ("r", &zvolume); + + pool = virStoragePoolLookupByVolume (volume->volume); + if (pool == NULL) + { + set_error ("Cannot find storage pool" TSRMLS_CC); + RETURN_FALSE; + } + + res_pool = emalloc(sizeof(php_libvirt_storagepool)); + res_pool->pool = pool; + + ZEND_REGISTER_RESOURCE(return_value, res_pool, le_libvirt_storagepool); +} + /* Function name: libvirt_storagepool_list_volumes Since version: 0.4.1(-1) @@ -2693,6 +2726,39 @@ PHP_FUNCTION(libvirt_storagevolume_lookup_by_name) } /* + Function name: libvirt_storagevolume_lookup_by_path + Since version: 0.4.1(-2) + Description: Function is used to lookup for storage volume by it's path + Arguments: @res [resource]: libvirt connection resource + @path [string]: path of the storage volume to look for + Returns: libvirt storagevolume resource +*/ +PHP_FUNCTION(libvirt_storagevolume_lookup_by_path) +{ + php_libvirt_connection *conn=NULL; + php_libvirt_volume *res_volume; + zval *zconn; + int name_len; + char *name=NULL; + virStorageVolPtr volume=NULL; + + GET_CONNECTION_FROM_ARGS("rs",&zconn,&name,&name_len); + if ( (name == NULL) || (name_len<1)) RETURN_FALSE; + + volume=virStorageVolLookupByPath (conn->conn,name); + if (volume==NULL) + { + set_error ("Cannot find volume"); + RETURN_FALSE; + } + + res_volume = emalloc(sizeof(php_libvirt_volume)); + res_volume->volume = volume; + + ZEND_REGISTER_RESOURCE(return_value, res_volume, le_libvirt_volume); +} + +/* Function name: libvirt_storagevolume_get_name Since version: 0.4.1(-2) Description: Function is used to get the storage volume name diff --git a/src/libvirt-php.h b/src/libvirt-php.h index b49355f..4646c64 100644 --- a/src/libvirt-php.h +++ b/src/libvirt-php.h @@ -165,9 +165,11 @@ PHP_FUNCTION(libvirt_domain_snapshot_revert); PHP_FUNCTION(libvirt_domain_snapshot_delete); /* Storagepool functions */ PHP_FUNCTION(libvirt_storagepool_lookup_by_name); +PHP_FUNCTION(libvirt_storagepool_lookup_by_volume); PHP_FUNCTION(libvirt_storagepool_list_volumes); PHP_FUNCTION(libvirt_storagepool_get_info); PHP_FUNCTION(libvirt_storagevolume_lookup_by_name); +PHP_FUNCTION(libvirt_storagevolume_lookup_by_path); PHP_FUNCTION(libvirt_storagevolume_get_name); PHP_FUNCTION(libvirt_storagevolume_get_path); PHP_FUNCTION(libvirt_storagevolume_get_info); -- 1.7.3.4 o

2 1

[libvirt] [PATCH] Don't allow two or more disks to be mapped to the same image file
by Hu Tao 28 Mar '11

28 Mar '11

If two or more disks are mapped to the same image file, operating on these disks at the same time may corrupt data stored in the image file. --- src/conf/domain_conf.c | 22 ++++++++++++++++++++++ src/conf/domain_conf.h | 2 ++ src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 6 ++++++ 4 files changed, 31 insertions(+), 0 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 1b02c25..93a081d 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -5455,6 +5455,14 @@ static virDomainDefPtr virDomainDefParseXML(virCapsPtr caps, if (!disk) goto error; + if (virDomainDiskConflict(disk, def)) { + virDomainReportError(VIR_ERR_INTERNAL_ERROR, "%s %s %s", + _("source"), + disk->src, + _("is already mapped to another device, " + "skip this device.")); + continue; + } def->disks[def->ndisks++] = disk; } VIR_FREE(nodes); @@ -9088,3 +9096,17 @@ cleanup: return ret; } + +bool virDomainDiskConflict(virDomainDiskDefPtr disk, virDomainDefPtr def) +{ + int i; + + if (!disk->src) + return false; + + for (i = 0; i < def->ndisks; i++) { + if (STREQ(disk->src, def->disks[i]->src)) + return true; + } + return false; +} diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 9f595d6..78b2f95 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1350,6 +1350,8 @@ int virDomainDiskDefForeachPath(virDomainDiskDefPtr disk, bool ignoreOpenFailure, virDomainDiskDefPathIterator iter, void *opaque); +bool virDomainDiskConflict(virDomainDiskDefPtr disk, + virDomainDefPtr def); typedef const char* (*virLifecycleToStringFunc)(int type); typedef int (*virLifecycleFromStringFunc)(const char *type); diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index b4b6c63..17e2ec4 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -237,6 +237,7 @@ virDomainDeviceTypeToString; virDomainDiskBusTypeToString; virDomainDiskCacheTypeFromString; virDomainDiskCacheTypeToString; +virDomainDiskConflict; virDomainDiskDefAssignAddress; virDomainDiskDefForeachPath; virDomainDiskDefFree; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 6f296c9..6de08d3 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -4058,6 +4058,12 @@ static int qemudDomainAttachDevice(virDomainPtr dom, break; case VIR_DOMAIN_DISK_DEVICE_DISK: + if (virDomainDiskConflict(dev->data.disk, vm->def)) { + qemuReportError(VIR_ERR_INTERNAL_ERROR, "%s %s %s", + _("source"), dev->data.disk->src, + _("is already mapped to another device.")); + break; + } if (dev->data.disk->bus == VIR_DOMAIN_DISK_BUS_USB) { ret = qemuDomainAttachUsbMassstorageDevice(driver, vm, dev->data.disk, qemuCaps); -- 1.7.3.1

6 12

[libvirt] [PATCH] remote: Don't leak gnutls session on negotiation error
by Matthias Bolte 26 Mar '11

26 Mar '11

--- Found while trying to reproduce another reported memory leak in doRemoteOpen. This leaked 10kb per failing call to negotiate_gnutls_on_connection. src/remote/remote_driver.c | 28 +++++++++++++++++++--------- 1 files changed, 19 insertions(+), 9 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index b05bbcb..0915548 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -1331,8 +1331,9 @@ negotiate_gnutls_on_connection (virConnectPtr conn, GNUTLS_CRT_OPENPGP, 0 }; + bool success = false; int err; - gnutls_session_t session; + gnutls_session_t session = NULL; /* Initialize TLS session */ @@ -1341,7 +1342,7 @@ negotiate_gnutls_on_connection (virConnectPtr conn, remoteError(VIR_ERR_GNUTLS_ERROR, _("unable to initialize TLS client: %s"), gnutls_strerror (err)); - return NULL; + goto cleanup; } /* Use default priorities */ @@ -1350,7 +1351,7 @@ negotiate_gnutls_on_connection (virConnectPtr conn, remoteError(VIR_ERR_GNUTLS_ERROR, _("unable to set TLS algorithm priority: %s"), gnutls_strerror (err)); - return NULL; + goto cleanup; } err = gnutls_certificate_type_set_priority (session, @@ -1359,7 +1360,7 @@ negotiate_gnutls_on_connection (virConnectPtr conn, remoteError(VIR_ERR_GNUTLS_ERROR, _("unable to set certificate priority: %s"), gnutls_strerror (err)); - return NULL; + goto cleanup; } /* put the x509 credentials to the current session @@ -1369,7 +1370,7 @@ negotiate_gnutls_on_connection (virConnectPtr conn, remoteError(VIR_ERR_GNUTLS_ERROR, _("unable to set session credentials: %s"), gnutls_strerror (err)); - return NULL; + goto cleanup; } gnutls_transport_set_ptr (session, @@ -1391,13 +1392,14 @@ negotiate_gnutls_on_connection (virConnectPtr conn, remoteError(VIR_ERR_GNUTLS_ERROR, _("unable to complete TLS handshake: %s"), gnutls_strerror (err)); - return NULL; + goto cleanup; } /* Verify certificate. */ if (verify_certificate (conn, priv, session) == -1) { VIR_DEBUG0("failed to verify peer's certificate"); - if (!no_verify) return NULL; + if (!no_verify) + goto cleanup; } /* At this point, the server is verifying _our_ certificate, IP address, @@ -1413,13 +1415,13 @@ negotiate_gnutls_on_connection (virConnectPtr conn, remoteError(VIR_ERR_GNUTLS_ERROR, _("unable to complete TLS initialization: %s"), gnutls_strerror (len)); - return NULL; + goto cleanup; } if (len != 1 || buf[0] != '\1') { remoteError(VIR_ERR_RPC, "%s", _("server verification (of our certificate or IP " "address) failed")); - return NULL; + goto cleanup; } #if 0 @@ -1427,6 +1429,14 @@ negotiate_gnutls_on_connection (virConnectPtr conn, print_info (session); #endif + success = true; + +cleanup: + if (!success) { + gnutls_deinit(session); + session = NULL; + } + return session; } -- 1.7.0.4

2 2

[libvirt] [RFC: PATCHv4 00/15] outgoing migration via fd: rather than exec:
by Eric Blake 26 Mar '11

26 Mar '11

v3 has not had complete reviews yet, located at: https://www.redhat.com/archives/libvir-list/2011-March/msg00132.html I'm posting v4 rebased on the latest tree, to get more feedback and possibly ACKs for the earlier half of the series. Differences in v4 (still incomplete): rearrange some of the earlier patches, incorporate Paolo's feedback Currently well-tested through patch 11. Remaining patches (12-15) are compiling but not yet tested, but should form the basis for doing compressed migration. Also available via: git fetch git://repo.or.cz/libvirt/ericb.git fd-migration Still to go - I really hate that doCoreDump can't use fd-migration until I make it compute qemuCaps; really, we should be computing caps once at vm startup, and remembering it elsewhere doCoreDump only works to regular files and fails on root-squash NFS, it should be possible to fix that I really need to write virCommandKill, which silently kills an async child process (if one is running) without overwriting any error messages Needs more testing - especially on root-squash NFS Eric Blake (15): qemu: use lighter-weight fd:n on incoming tunneled migration qemu: consolidate duplicated monitor migration code qemu: improve efficiency of dd during snapshots qemu: support migration to fd util: use SCM_RIGHTS in virFileOperation when needed qemu: allow simple domain save to use fd: protocol qemu: simplify domain save fd handling storage: simplify fd handling util: rename virFileOperation to virFileOpenAs util: adjust indentation in previous patch qemu, storage: improve type safety qemu: use common API for reading difficult files qemu: consolidate migration to file code qemu: skip granting access during fd migration qemu: support fd: migration with compression src/libvirt_private.syms | 2 +- src/qemu/qemu_driver.c | 626 ++++++++++++++++------------------------- src/qemu/qemu_migration.c | 45 +-- src/qemu/qemu_monitor.c | 124 ++++++++- src/qemu/qemu_monitor.h | 4 + src/qemu/qemu_monitor_json.c | 125 +-------- src/qemu/qemu_monitor_json.h | 23 +-- src/qemu/qemu_monitor_text.c | 123 +-------- src/qemu/qemu_monitor_text.h | 23 +-- src/storage/storage_backend.c | 80 +++--- src/util/util.c | 161 ++++++++---- src/util/util.h | 15 +- 12 files changed, 544 insertions(+), 807 deletions(-) -- 1.7.4

6 55