- Devel - libvirt List Archives

[libvirt] [PATCH] remove dead code
by Nguyen Anh Quynh 17 Sep '08

17 Sep '08

Hi, This patch removes dead code in the qemu driver. Thanks, Quynh # diffstat fix8.patch qemu_driver.c | 2 --

2 2

[libvirt] [PATCH] Wrong comments
by Anton Protopopov 17 Sep '08

17 Sep '08

Hi! In comments to structure 'virDomainInfo' there was reference to smth of type 'virDomainFlags'. Actually, the type of this field must be 'virDomainState'. Patch includes another one such replacement. There is another place where 'virDomainFlags' mentioned: src/xend_internal.c. I think, that argument must be of type 'virConnectFlags', but it is marked as ATTRIBUTE_UNUSED, so I leave the comment as it is :) And why are you writing unsigned char state; instead of virDomainState state; ? Anton

2 2

[libvirt] [PATCH] spec file enhancements for minimal "client-only" build
by Ben Guthro 17 Sep '08

17 Sep '08

Attached is a patch to add some additional options to the spec file, allowing for more flexibility when building. With this patch, it allows you to build a "client-only" version of libvirt for machines that may have an interest in communicating over the remote driver, but do not have a hypervisor themselves. It enables command line overrides of control variables for the build eg: rpmbuild $(RPM_FLAGS) --nodeps \ --without xen \ --without xen_proxy \ --without qemu \ --without openvz \ --without lxc \ --without polkit \ --without libvirtd \ --without avahi \ --without sasl \ --without python \ --without devel \ -ta --clean libvirt*.tar.gz Signed-off-by: Ben Guthro <bguthro(a)virtualiron.com> diff --git a/libvirt.spec.in b/libvirt.spec.in index 18b2127..666fb83 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1,11 +1,16 @@ # -*- rpm-spec -*- -%define with_xen 1 -%define with_xen_proxy 1 -%define with_qemu 1 -%define with_openvz 1 -%define with_lxc 1 -%define with_polkit 0 +%define with_xen 0%{!?_without_xen:1} +%define with_xen_proxy 0%{!?_without_xen_proxy:1} +%define with_qemu 0%{!?_without_qemu:1} +%define with_openvz 0%{!?_without_openvz:1} +%define with_lxc 0%{!?_without_lxc:1} +%define with_sasl 0%{!?_without_sasl:1} +%define with_avahi 0%{!?_without_avahi:1} +%define with_polkit 0%{!?_without_polkit:0} +%define with_python 0%{!?_without_python:1} +%define with_libvirtd 0%{!?_without_libvirtd:1} +%define with_devel 0%{!?_without_devel:1} # Xen is available only on i386 x86_64 ia64 %ifnarch i386 i686 x86_64 ia64 @@ -23,7 +28,7 @@ %endif %if 0%{fedora} >= 8 -%define with_polkit 1 +%define with_polkit 0%{!?_without_polkit:1} %define with_xen_proxy 0 %endif @@ -46,10 +51,12 @@ Requires: iptables # So remote clients can access libvirt over SSH tunnel # (client invokes 'nc' against the UNIX socket on the server) Requires: nc +%if %{with_sasl} Requires: cyrus-sasl # Not technically required, but makes 'out-of-box' config # work correctly & doesn't have onerous dependencies Requires: cyrus-sasl-md5 +%endif %if %{with_polkit} Requires: PolicyKit >= 0.6 %endif @@ -82,14 +89,18 @@ BuildRequires: readline-devel BuildRequires: ncurses-devel BuildRequires: gettext BuildRequires: gnutls-devel +%if %{with_avahi} BuildRequires: avahi-devel +%endif BuildRequires: libselinux-devel BuildRequires: dnsmasq BuildRequires: bridge-utils %if %{with_qemu} BuildRequires: qemu %endif +%if %{with_sasl} BuildRequires: cyrus-sasl-devel +%endif %if %{with_polkit} BuildRequires: PolicyKit-devel >= 0.6 %endif @@ -119,6 +130,7 @@ BuildRequires: gawk Libvirt is a C toolkit to interact with the virtualization capabilities of recent versions of Linux (and other OSes). +%if %{with_devel} %package devel Summary: Libraries, includes, etc. to compile with the libvirt library Group: Development/Libraries @@ -132,7 +144,9 @@ Obsoletes: libvir-devel %description devel Includes and documentations for the C library providing an API to use the virtualization capabilities of recent versions of Linux (and other OSes). +%endif +%if %{with_python} %package python Summary: Python bindings for the libvirt library Group: Development/Libraries @@ -144,6 +158,7 @@ The libvirt-python package contains a module that permits applications written in the Python programming language to use the interface supplied by the libvirt library to use the virtualization capabilities of recent versions of Linux (and other OSes). +%endif %prep %setup -q @@ -190,6 +205,7 @@ install -d -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/lib/libvirt/images/ # Default dir for kernel+initrd images defnied in SELinux policy install -d -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/lib/libvirt/boot/ +%if %{with_qemu} # We don't want to install /etc/libvirt/qemu/networks in the main %files list # because if the admin wants to delete the default network completely, we don't # want to end up re-incarnating it on every RPM upgrade. @@ -200,14 +216,33 @@ rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/default.xml rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml # Strip auto-generated UUID - we need it generated per-install sed -i -e "/<uuid>/d" $RPM_BUILD_ROOT%{_datadir}/libvirt/networks/default.xml +%endif %find_lang %{name} +# If we are not building with certain options, we need to remove files +# so that we don't get Installed (but unpackaged) errors +%if ! %{with_devel} +rm -rf $RPM_BUILD_ROOT%{_datadir}/gtk-doc/html/libvirt +rm -rf $RPM_BUILD_ROOT%{_includedir}/libvirt +rm -rf $RPM_BUILD_ROOT%{_libdir}/lib*.so +rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig/libvirt.pc +%endif + +%if ! %{with_python} +rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-python-%{version} +%endif + +%if ! %{with_qemu} +rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu.conf +%endif + %clean rm -fr %{buildroot} %post /sbin/ldconfig +%if %{with_libvirtd} # We want to install the default network for initial RPM installs # or on the first upgrade from a non-network aware libvirt only. # We check this by looking to see if the daemon is already installed @@ -222,12 +257,15 @@ then fi /sbin/chkconfig --add libvirtd +%endif %preun +%if %{with_libvirtd} if [ $1 = 0 ]; then /sbin/service libvirtd stop 1>/dev/null 2>&1 /sbin/chkconfig --del libvirtd fi +%endif %postun /sbin/ldconfig @@ -240,40 +278,73 @@ fi %{_bindir}/virsh %{_libdir}/lib*.so.* %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/ + +%if %{with_qemu} %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/ %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/ %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/networks/autostart +%endif + +%if %{with_libvirtd} %{_sysconfdir}/rc.d/init.d/libvirtd %config(noreplace) %{_sysconfdir}/sysconfig/libvirtd %config(noreplace) %{_sysconfdir}/libvirt/libvirtd.conf +%endif + +%if %{with_qemu} %config(noreplace) %{_sysconfdir}/libvirt/qemu.conf +%endif + +%if %{with_sasl} %config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf +%endif + +%if %{with_qemu} %dir %{_datadir}/libvirt/ %dir %{_datadir}/libvirt/networks/ %{_datadir}/libvirt/networks/default.xml +%endif + %dir %{_localstatedir}/run/libvirt/ %dir %{_localstatedir}/lib/libvirt/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/images/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/boot/ -%{_datadir}/augeas/lenses/libvirtd.aug + +%if %{with_qemu} %{_datadir}/augeas/lenses/libvirtd_qemu.aug -%{_datadir}/augeas/lenses/tests/test_libvirtd.aug %{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug +%endif + +%if %{with_libvirtd} +%{_datadir}/augeas/lenses/libvirtd.aug +%{_datadir}/augeas/lenses/tests/test_libvirtd.aug +%endif + %if %{with_polkit} %{_datadir}/PolicyKit/policy/org.libvirt.unix.policy %endif + +%if %{with_qemu} %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/ +%endif + %if %{with_xen_proxy} %attr(4755, root, root) %{_libexecdir}/libvirt_proxy %endif -%attr(0755, root, root) %{_libexecdir}/libvirt_parthelper + %if %{with_lxc} %attr(0755, root, root) %{_libexecdir}/libvirt_lxc %endif + +%if %{with_libvirtd} +%attr(0755, root, root) %{_libexecdir}/libvirt_parthelper %attr(0755, root, root) %{_sbindir}/libvirtd +%endif + %doc docs/*.rng %doc docs/*.xml +%if %{with_devel} %files devel %defattr(-, root, root) @@ -289,7 +360,9 @@ fi %doc docs/*.html docs/html docs/*.gif %doc docs/examples %doc docs/libvirt-api.xml +%endif +%if %{with_python} %files python %defattr(-, root, root) @@ -300,6 +373,7 @@ fi %doc python/TODO %doc python/libvirtclass.txt %doc docs/examples/python +%endif %changelog * Mon Sep 8 2008 Daniel Veillard <veillard(a)redhat.com> - 0.4.5-1

3 10

[libvirt] [PATCH] kvm: maxVCPU runtime detection
by Guido Günther 17 Sep '08

17 Sep '08

Hi, with recent linux kernels we can detect the maximum number of virtual cpus at runtime via an ioctl. Possible patch attached. It does this on every call to qemudGetMaxVCPUs. Would you prefer something that does this only once in qemudStartup()? Cheers, -- Guido

7 24

[libvirt] Calling libvirt from C# (Mono/.Net)
by Richard W.M. Jones 17 Sep '08

17 Sep '08

As an experiment I managed to call libvirt from C# (using Mono, but similar code should work for .Net). This email should give interested people enough information to produce a proper set of bindings for libvirt. ---------------------------------------------------------------------- using System; using System.Runtime.InteropServices; [StructLayout (LayoutKind.Sequential)] class NodeInfo { [MarshalAs (UnmanagedType.ByValTStr, SizeConst=32)] public string model; public ulong memory; public uint cpus; public uint mhz; public uint nodes; public uint sockets; public uint cores; public uint threads; } class Connection { IntPtr _handle; [DllImport ("libvirt.so")] static extern IntPtr virConnectOpen ([In] string name); public Connection (string name) { _handle = virConnectOpen (name); } [DllImport ("libvirt.so")] static extern IntPtr virConnectClose (IntPtr h); ~Connection () { virConnectClose (_handle); } [DllImport ("libvirt.so")] static extern int virNodeGetInfo (IntPtr h, [Out] NodeInfo info); public NodeInfo nodeGetInfo () { NodeInfo info = new NodeInfo (); if (virNodeGetInfo (_handle, info) == -1) { // throw new LibvirtException ("virNodeGetInfo"); } return info; } } class Test { public static void Main () { Connection conn = new Connection ("test:///default"); NodeInfo info = conn.nodeGetInfo (); Console.WriteLine ("Results of virNodeGetInfo:"); Console.WriteLine ("model = {0}", info.model); Console.WriteLine ("memory = {0}", info.memory); Console.WriteLine ("cpus = {0}", info.cpus); Console.WriteLine ("mhz = {0}", info.mhz); Console.WriteLine ("nodes = {0}", info.nodes); Console.WriteLine ("sockets = {0}", info.sockets); Console.WriteLine ("cores = {0}", info.cores); Console.WriteLine ("threads = {0}", info.threads); } } ---------------------------------------------------------------------- Compile and run this code with: $ gmcs libvirt-test.c# $ LIBVIRT_DEBUG=1 mono ./libvirt-test.exe ---------------------------------------------------------------------- DEBUG: libvirt.c: virInitialize (register drivers) DEBUG: libvirt.c: virConnectOpen (name=test:///default) DEBUG: libvirt.c: do_open (name "test:///default" to URI components: scheme test opaque (null) authority (null) server (null) user (null) port 0 path /default ) DEBUG: libvirt.c: do_open (trying driver 0 (Test) ...) DEBUG: libvirt.c: do_open (driver 0 Test returned SUCCESS) DEBUG: libvirt.c: do_open (network driver 0 Test returned SUCCESS) DEBUG: libvirt.c: do_open (storage driver 0 Test returned SUCCESS) DEBUG: libvirt.c: virNodeGetInfo (conn=0xa8d560, info=0x7fff9530c070) Results of virNodeGetInfo: model = i686 memory = 3145728 cpus = 16 mhz = 1400 nodes = 2 sockets = 2 cores = 2 threads = 2 DEBUG: libvirt.c: virConnectClose (conn=0xa8d560) DEBUG: hash.c: virUnrefConnect (unref connection 0xa8d560 test:///default 1) DEBUG: hash.c: virReleaseConnect (release connection 0xa8d560 test:///default) ---------------------------------------------------------------------- Rich. -- Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones virt-top is 'top' for virtual machines. Tiny program with many powerful monitoring features, net stats, disk stats, logging, etc. http://et.redhat.com/~rjones/virt-top

1 0

[libvirt] network domain name patch
by JJ Reynolds 16 Sep '08

16 Sep '08

Hi all, This is a followup to the excellent patch which allows static IP address assignment. The problem with that patch is that you can only set the host name and cannot set a FQDN because dnsmasq will, as a security measure, not allow it unless --domain is specified. This patch adds support for adding <domain name="my.domain" /> to the network config file. With that stanza, one can then use FQDNs on the static host assignments, and this should be the domain reported for any clients that request it. If <domain name .. ./> is not specified in the config file, then there is no change in behaviour. As a special case, you can also set the domain name to "#", whereupon dnsmasq interprets that to use the domain of the host OS. Example default.xml: <network> <name>default</name> <uuid>0098abb7-ff94-4df9-aa78-e4c3fe636a3d</uuid> <bridge name="virbr0" /> <domain name="mynet.net" /> <forward/> <ip address="192.168.122.1" netmask="255.255.255.0"> <dhcp> <host name="vm1.mynet.net" mac="00:16:3e:24:a5:84" ip="192.168.122.101" /> <host name='vm2.mynet.net' mac="00:16:3e:1f:9a:95" ip="192.168.122.102" /> <range start="192.168.122.2" end="192.168.122.99" /> </dhcp> </ip> </network> Here is the patch: diff -r -U 3 libvirt-0.4.4/src/network_conf.c libvirt-0.4.4jjr/src/network_conf.c --- libvirt-0.4.4/src/network_conf.c 2008-08-20 09:20:01.000000000 -0400 +++ libvirt-0.4.4jjr/src/network_conf.c 2008-09-06 14:03:56.000000000 -0400 @@ -326,6 +326,9 @@ VIR_FREE(tmp); } + /* Parse network domain information */ + def->domain = virXPathString(conn, "string(./domain[1]/@name)", ctxt); + /* Parse bridge information */ def->bridge = virXPathString(conn, "string(./bridge[1]/@name)", ctxt); tmp = virXPathString(conn, "string(./bridge[1]/@stp)", ctxt); diff -r -U 3 libvirt-0.4.4/src/network_conf.h libvirt-0.4.4jjr/src/network_conf.h --- libvirt-0.4.4/src/network_conf.h 2008-08-20 09:20:01.000000000 -0400 +++ libvirt-0.4.4jjr/src/network_conf.h 2008-09-06 14:03:56.000000000 -0400 @@ -57,6 +57,7 @@ char *name; char *bridge; /* Name of bridge device */ + char *domain; unsigned long delay; /* Bridge forward delay (ms) */ int stp : 1; /* Spanning tree protocol */ diff -r -U 3 libvirt-0.4.4/src/qemu_driver.c libvirt-0.4.4jjr/src/qemu_driver.c --- libvirt-0.4.4/src/qemu_driver.c 2008-08-29 03:20:02.000000000 -0400 +++ libvirt-0.4.4jjr/src/qemu_driver.c 2008-09-06 14:15:28.000000000 -0400 @@ -1105,6 +1105,7 @@ 1 + /* --keep-in-foreground */ 1 + /* --strict-order */ 1 + /* --bind-interfaces */ + (network->def->domain?2:0) + /* --domain name */ 2 + /* --pid-file "" */ 2 + /* --conf-file "" */ /*2 + *//* --interface virbr0 */ @@ -1136,6 +1137,11 @@ APPEND_ARG(*argv, i++, "--strict-order"); APPEND_ARG(*argv, i++, "--bind-interfaces"); + if (network->def->domain) { + APPEND_ARG(*argv, i++, "--domain"); + APPEND_ARG(*argv, i++, network->def->domain); + } + APPEND_ARG(*argv, i++, "--pid-file"); APPEND_ARG(*argv, i++, ""); Thanks! -JJ Reynolds

3 11

[libvirt] LXC: making the private root filesystem more secure
by Daniel P. Berrange 12 Sep '08

12 Sep '08

When I wrote the private root filesystem stuff for LXC (which I just committed) I noted that we couldn't actually make this secure, because someone inside the chroot can just 'mknod' and access the host devices. What I completely forgot was that cgroups as of 2.6.26 has device ACLs If we place every container in a cgroup (which was planned anyway), then we can trivially prevent containers accessing host devices One time setup mount -t cgroups /dev/cgroups mkdir /dev/cgroups/libvirt mkdir /dev/cgroups/libvirt/lxc For each new container 'NAME' mkdir /dev/cgroups/libvirt/lxc/{NAME} echo "a" > /dev/cgroups/libvirt/lxc/{NAME}/devices.deny echo "c 1:3 rwm" > /dev/cgroups/libvirt/lxc/{NAME}/devices.allow echo "c 1:5 rwm" > /dev/cgroups/libvirt/lxc/{NAME}/devices.allow echo "c 1:7 rwm" > /dev/cgroups/libvirt/lxc/{NAME}/devices.allow echo "c 5:1 rwm" > /dev/cgroups/libvirt/lxc/{NAME}/devices.allow echo "c 1:8 rwm" > /dev/cgroups/libvirt/lxc/{NAME}/devices.allow echo "c 1:9 rwm" > /dev/cgroups/libvirt/lxc/{NAME}/devices.allow This denies all devices, and then allows null, zero, full, console, random and urandom. Allowing use of 'random' is debatable. The 'devpts' namespace stuff is also needed to provide private PTYs. The 'user' namespace stuff is needed to prevent an unprivileged user in the host OS from killing off processes with same UID inside the container. There looks to be active patchsets for both of these being discussed, so we're getting close to having a genuinely useful container based virt driver with LXC Daniel -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

5 11

[libvirt] virDomainGetInfo() returns 0 although the domain is not running anymore
by Johannes Formann 12 Sep '08

12 Sep '08

Hello, if I understand the API-documentation, virDomainGetInfo() should return -1 when the domain does not exists anymore, or some other problem happens. But with this code below ... if (virDomainGetInfo(domainPtr,domainInfo) == 0 ) { if (debugLevel > 15) {puts("virDomainGetInfo() returns 0");} if (domainInfo->state == VIR_DOMAIN_NOSTATE || domainInfo->state == VIR_DOMAIN_RUNNING || domainInfo->state == VIR_DOMAIN_BLOCKED || domainInfo->state == VIR_DOMAIN_PAUSED ) { return(false); } } ... I notized, virDomainGetInfo() always returns zero, even if libvirt prints an error. If I destroy a domain (xm destroy) I'll get this Message with each call of virDomainGetInfo(): "libvir: Xen Daemon error : GET operation failed:" But virDomainGetInfo() still returns zero, a bug, or did I missunderstood the API? regards Johannes

2 2

[libvirt] qemu or kvm?
by Jun Koi 12 Sep '08

12 Sep '08

Hi, Given a virDomainPtr variable, how can we know that it is a QEMU or KVM machine? Is there any API for that? Many thanks, Jun

2 3

[libvirt] [PATCH] Fix segfault if no qemu emulator passed
by Cole Robinson 12 Sep '08

12 Sep '08

There is unfortunately a pretty prevalent segfault in the latest libvirt. If a qemu domain is defined without an emulator specified, libvirtd crashes. This is doubly unfortunate since current virtinst generates an emulator-less config for all qemu and kvm guests (I'm about to fix this upstream though). Attached patch fixes this. Thanks, Cole diff --git a/src/qemu_conf.c b/src/qemu_conf.c index d742c32..23ef050 100644 --- a/src/qemu_conf.c +++ b/src/qemu_conf.c @@ -790,7 +790,7 @@ int qemudBuildCommandLine(virConnectPtr conn, if (!emulator) return -1; - ADD_ARG_LIT(vm->def->emulator); + ADD_ARG_LIT(emulator); ADD_ARG_LIT("-S"); ADD_ARG_LIT("-M"); ADD_ARG_LIT(vm->def->os.machine);

6 16

[libvirt] Sharing file between host and guest
by Yushu Yao 12 Sep '08

12 Sep '08

Hi All, Question not very related to libvirt but I think most of the real VM experts are in this list. What is the best and fastest way to share files between guest and host? Something like the share folders-hgfs in vmware might work, but is there a way that works on all hypervisors? Network based file sharing (NFS/Samba) are limited by the speed of the virtual network interfaces. Maybe one can do it through USB? Thanks a lot! -yushu

2 1

[libvirt] [PATCH] make consistent assumptions about libvirtd dependence
by David Lively 12 Sep '08

12 Sep '08

Hi - Currently src/Makefile.am says that only the QEMU, LXC, and storage drivers are dependent on libvirtd. But the driver registration code in virInitialize wasn't registering the remote or openVz driver when WITH_LIBVIRTD was not defined. The attached patch makes the virInitialize code consistent with the assumptions stated in src/Makefile.am. But note I'm assuming the assumptions in src/Makefile.am are correct. I'm not sure what's really dependent on libvirtd, so Someone Who Knows Better should verify this. Thanks, Dave commit 24d5708877fce90c4e85e3b2ede07b74f4a98224 Author: David Lively <dlively(a)virtualiron.com> Date: Thu Sep 11 11:56:20 2008 -0400 Make driver registration assume the same libvirtd dependences expressed in src/Makefile.am (i.e., that only the QEMU, LXC, and storage drivers depend on libvirtd). diff --git a/src/libvirt.c b/src/libvirt.c index 54ed8cf..3d66f5a 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -286,20 +286,20 @@ virInitialize(void) #ifdef WITH_XEN if (xenUnifiedRegister () == -1) return -1; #endif -#ifdef WITH_LIBVIRTD -#ifdef WITH_QEMU - if (qemudRegister() == -1) return -1; +#ifdef WITH_REMOTE + if (remoteRegister () == -1) return -1; #endif #ifdef WITH_OPENVZ if (openvzRegister() == -1) return -1; #endif +#ifdef WITH_LIBVIRTD +#ifdef WITH_QEMU + if (qemudRegister() == -1) return -1; +#endif #ifdef WITH_LXC if (lxcRegister() == -1) return -1; #endif if (storageRegister() == -1) return -1; -#ifdef WITH_REMOTE - if (remoteRegister () == -1) return -1; -#endif #endif return(0);

2 1

[libvirt] PATCH: Latest MinGW patches
by Daniel P. Berrange 12 Sep '08

12 Sep '08

I've got a MinGW build environment setup on Fedora 10 now, so just checked out what the latest state of libvirt CVS is. With the attached patch, I can run configure with: ./configure \ --build=i686-pc-linux-gnu \ --host=i686-pc-mingw32 \ --prefix=/usr/i686-pc-mingw32/sys-root/mingw \ --without-libvirtd \ --without-xen \ --without-qemu \ --without-sasl \ --without-lxc \ --without-openvz \ --without-python So, basically only the 'test' and 'remote' drivers are turned on. And do a build which produces a libvirt-0.dll and a virsh.exe which is I can run under Wine successfully. The changes: - The src/Makefile.am was conditionally turning off individual storage driver backends, based on the WITH_LIBVIRTD conditional. THis gave confusing diagnositics, since the configure summary said they were turned on. So, now configure itself turns off the storage drivers if libvirtd is disabled. - The storage_backend.c file is used by storage_Conf.c, so we need to compile this even if all storage backends are disabled. So we tweak src/Makefile.am to achieve this, and add a few more bits of conditional logic inside storage_backend.c to cope with the base directory pool driver not being available. - Mingw is missing regex.h and sys/wait.h, which are used in the generic storage_backend.c file. We check for those in configure and conditionalize their inclusion. Furthermore we disable the virStorageBackendRunProgRegex and virStorageBackendRunProgNul functions on Windows, since they're not required and not compilable without regex.h / sys/wait.h - Mingw is mising getuid() and getgid() which are used in the storage_conf XML parser. We check for and optionally disable them and initialize uid/gid to 0 if missing. - The virExec() stub routine for Mingw didn't have its signature updated when i did the recent virExe changes. THis fixes that. configure.in | 18 +++++++++++++--- qemud/remote_protocol.c | 1 qemud/remote_protocol.h | 1 qemud/remote_protocol.x | 1 src/Makefile.am | 6 ++--- src/storage_backend.c | 53 +++++++++++++++++++++++++++++++++++++++++++----- src/storage_conf.c | 22 +++++++++++++++++-- src/util.c | 17 +++------------ 8 files changed, 92 insertions(+), 27 deletions(-) Daniel diff -r 74dd97c354cc configure.in --- a/configure.in Tue Sep 02 10:49:53 2008 -0400 +++ b/configure.in Wed Sep 03 08:24:04 2008 -0400 @@ -65,10 +65,10 @@ AC_SYS_LARGEFILE dnl Availability of various common functions (non-fatal if missing). -AC_CHECK_FUNCS([cfmakeraw regexec uname sched_getaffinity]) +AC_CHECK_FUNCS([cfmakeraw regexec uname sched_getaffinity getuid getgid]) dnl Availability of various common headers (non-fatal if missing). -AC_CHECK_HEADERS([pwd.h paths.h sys/syslimits.h sys/utsname.h sys/wait.h winsock2.h sched.h termios.h]) +AC_CHECK_HEADERS([pwd.h paths.h regex.h sys/syslimits.h sys/utsname.h sys/wait.h winsock2.h sched.h termios.h]) dnl Where are the XDR functions? dnl If portablexdr is installed, prefer that. @@ -648,6 +648,18 @@ [ --with-storage-iscsi with iSCSI backend for the storage driver (on)],[],[with_storage_iscsi=check]) AC_ARG_WITH([storage-disk], [ --with-storage-disk with GPartd Disk backend for the storage driver (on)],[],[with_storage_disk=check]) + +with_storage_dir=yes +if test "$with_libvirtd" = "no"; then + with_storage_dir=no + with_storage_fs=no + with_storage_lvm=no + with_storage_iscsi=no + with_storage_disk=no +fi + +AM_CONDITIONAL([WITH_STORAGE_DIR], [test "$with_storage_dir" = "yes"]) + if test "$with_storage_fs" = "yes" -o "$with_storage_fs" = "check"; then AC_PATH_PROG([MOUNT], [mount], [], [$PATH:/sbin:/usr/sbin]) @@ -1053,7 +1065,7 @@ AC_MSG_NOTICE([]) AC_MSG_NOTICE([Storage Drivers]) AC_MSG_NOTICE([]) -AC_MSG_NOTICE([ Dir: yes]) +AC_MSG_NOTICE([ Dir: $with_storage_dir]) AC_MSG_NOTICE([ FS: $with_storage_fs]) AC_MSG_NOTICE([ NetFS: $with_storage_fs]) AC_MSG_NOTICE([ LVM: $with_storage_lvm]) diff -r 74dd97c354cc qemud/remote_protocol.c --- a/qemud/remote_protocol.c Tue Sep 02 10:49:53 2008 -0400 +++ b/qemud/remote_protocol.c Wed Sep 03 08:24:04 2008 -0400 @@ -6,6 +6,7 @@ #include "remote_protocol.h" #include <config.h> #include "internal.h" +#include "socketcompat.h" bool_t xdr_remote_nonnull_string (XDR *xdrs, remote_nonnull_string *objp) diff -r 74dd97c354cc qemud/remote_protocol.h --- a/qemud/remote_protocol.h Tue Sep 02 10:49:53 2008 -0400 +++ b/qemud/remote_protocol.h Wed Sep 03 08:24:04 2008 -0400 @@ -15,6 +15,7 @@ #include <config.h> #include "internal.h" +#include "socketcompat.h" #define REMOTE_MESSAGE_MAX 262144 #define REMOTE_STRING_MAX 65536 diff -r 74dd97c354cc qemud/remote_protocol.x --- a/qemud/remote_protocol.x Tue Sep 02 10:49:53 2008 -0400 +++ b/qemud/remote_protocol.x Wed Sep 03 08:24:04 2008 -0400 @@ -38,6 +38,7 @@ %#include <config.h> %#include "internal.h" +%#include "socketcompat.h" /*----- Data types. -----*/ diff -r 74dd97c354cc src/Makefile.am --- a/src/Makefile.am Tue Sep 02 10:49:53 2008 -0400 +++ b/src/Makefile.am Wed Sep 03 08:24:04 2008 -0400 @@ -58,7 +58,8 @@ # Storage driver generic impl APIs STORAGE_CONF_SOURCES = \ - storage_conf.h storage_conf.c + storage_conf.h storage_conf.c \ + storage_backend.h storage_backend.c # The remote RPC driver, covering domains, storage, networks, etc @@ -109,8 +110,7 @@ # And finally storage backend specific impls STORAGE_DRIVER_SOURCES = \ - storage_driver.h storage_driver.c \ - storage_backend.h storage_backend.c + storage_driver.h storage_driver.c STORAGE_DRIVER_FS_SOURCES = \ storage_backend_fs.h storage_backend_fs.c diff -r 74dd97c354cc src/storage_backend.c --- a/src/storage_backend.c Tue Sep 02 10:49:53 2008 -0400 +++ b/src/storage_backend.c Wed Sep 03 08:24:04 2008 -0400 @@ -24,9 +24,13 @@ #include <config.h> #include <string.h> +#if HAVE_REGEX_H #include <regex.h> +#endif #include <sys/types.h> +#if HAVE_SYS_WAIT_H #include <sys/wait.h> +#endif #include <unistd.h> #include <fcntl.h> #include <stdint.h> @@ -38,6 +42,10 @@ #endif #include "internal.h" +#include "util.h" +#include "memory.h" + +#include "storage_backend.h" #if WITH_STORAGE_LVM #include "storage_backend_logical.h" @@ -48,15 +56,14 @@ #if WITH_STORAGE_DISK #include "storage_backend_disk.h" #endif - -#include "util.h" -#include "memory.h" - -#include "storage_backend.h" +#if WITH_STORAGE_DIR #include "storage_backend_fs.h" +#endif static virStorageBackendPtr backends[] = { +#if WITH_STORAGE_DIR &virStorageBackendDirectory, +#endif #if WITH_STORAGE_FS &virStorageBackendFileSystem, &virStorageBackendNetFileSystem, @@ -209,8 +216,12 @@ return -2; if (S_ISREG(sb.st_mode)) { +#ifndef __MINGW32__ vol->allocation = (unsigned long long)sb.st_blocks * (unsigned long long)sb.st_blksize; +#else + vol->allocation = sb.st_size; +#endif /* Regular files may be sparse, so logical size (capacity) is not same * as actual allocation above */ @@ -337,6 +348,8 @@ return devpath; } + +#ifndef __MINGW32__ /* * Run an external program. * @@ -620,3 +633,33 @@ return 0; } + +#else + +int +virStorageBackendRunProgRegex(virConnectPtr conn, + virStoragePoolObjPtr pool ATTRIBUTE_UNUSED, + const char *const*prog ATTRIBUTE_UNUSED, + int nregex ATTRIBUTE_UNUSED, + const char **regex ATTRIBUTE_UNUSED, + int *nvars ATTRIBUTE_UNUSED, + virStorageBackendListVolRegexFunc func ATTRIBUTE_UNUSED, + void *data ATTRIBUTE_UNUSED, + int *outexit ATTRIBUTE_UNUSED) +{ + virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, "%s no implemented on Win32", __FUNCTION__); + return -1; +} + +int +virStorageBackendRunProgNul(virConnectPtr conn, + virStoragePoolObjPtr pool ATTRIBUTE_UNUSED, + const char **prog ATTRIBUTE_UNUSED, + size_t n_columns ATTRIBUTE_UNUSED, + virStorageBackendListVolNulFunc func ATTRIBUTE_UNUSED, + void *data ATTRIBUTE_UNUSED) +{ + virStorageReportError(conn, VIR_ERR_INTERNAL_ERROR, "%s no implemented on Win32", __FUNCTION__); + return -1; +} +#endif diff -r 74dd97c354cc src/storage_conf.c --- a/src/storage_conf.c Tue Sep 02 10:49:53 2008 -0400 +++ b/src/storage_conf.c Wed Sep 03 08:24:04 2008 -0400 @@ -188,7 +188,11 @@ } if (virXPathNode(conn, "/pool/permissions/owner", ctxt) == NULL) { +#if HAVE_GETUID perms->uid = getuid(); +#else + perms->uid = 0; +#endif } else { if (virXPathLong(conn, "number(/pool/permissions/owner)", ctxt, &v) < 0) { virStorageReportError(conn, VIR_ERR_XML_ERROR, @@ -199,7 +203,11 @@ } if (virXPathNode(conn, "/pool/permissions/group", ctxt) == NULL) { - perms->uid = getgid(); +#if HAVE_GETGID + perms->gid = getgid(); +#else + perms->gid = 0; +#endif } else { if (virXPathLong(conn, "number(/pool/permissions/group)", ctxt, &v) < 0) { virStorageReportError(conn, VIR_ERR_XML_ERROR, @@ -407,7 +415,7 @@ if (!xml) { if (conn && conn->err.code == VIR_ERR_NONE) virStorageReportError(conn, VIR_ERR_XML_ERROR, - _("failed to parse xml document")); + "%s",_("failed to parse xml document")); goto cleanup; } @@ -569,7 +577,11 @@ } if (virXPathNode(conn, "/volume/permissions/owner", ctxt) == NULL) { +#if HAVE_GETUID perms->uid = getuid(); +#else + perms->uid = 0; +#endif } else { if (virXPathLong(conn, "number(/volume/permissions/owner)", ctxt, &v) < 0) { virStorageReportError(conn, VIR_ERR_XML_ERROR, @@ -579,7 +591,11 @@ perms->uid = (int)v; } if (virXPathNode(conn, "/volume/permissions/group", ctxt) == NULL) { +#if HAVE_GETGID perms->gid = getgid(); +#else + perms->gid = 0; +#endif } else { if (virXPathLong(conn, "number(/volume/permissions/group)", ctxt, &v) < 0) { virStorageReportError(conn, VIR_ERR_XML_ERROR, @@ -778,7 +794,7 @@ if (!xml) { if (conn && conn->err.code == VIR_ERR_NONE) virStorageReportError(conn, VIR_ERR_XML_ERROR, - _("failed to parse xml document")); + "%s", _("failed to parse xml document")); goto cleanup; } diff -r 74dd97c354cc src/util.c --- a/src/util.c Tue Sep 02 10:49:53 2008 -0400 +++ b/src/util.c Wed Sep 03 08:24:04 2008 -0400 @@ -440,22 +440,13 @@ int virExec(virConnectPtr conn, const char *const*argv ATTRIBUTE_UNUSED, + const char *const*envp ATTRIBUTE_UNUSED, + const fd_set *keepfd ATTRIBUTE_UNUSED, int *retpid ATTRIBUTE_UNUSED, int infd ATTRIBUTE_UNUSED, int *outfd ATTRIBUTE_UNUSED, - int *errfd ATTRIBUTE_UNUSED) -{ - ReportError (conn, VIR_ERR_INTERNAL_ERROR, __FUNCTION__); - return -1; -} - -int -virExecNonBlock(virConnectPtr conn, - const char *const*argv ATTRIBUTE_UNUSED, - int *retpid ATTRIBUTE_UNUSED, - int infd ATTRIBUTE_UNUSED, - int *outfd ATTRIBUTE_UNUSED, - int *errfd ATTRIBUTE_UNUSED) + int *errfd ATTRIBUTE_UNUSED, + int flags ATTRIBUTE_UNUSED) { ReportError (conn, VIR_ERR_INTERNAL_ERROR, __FUNCTION__); return -1; -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

5 19

[libvirt] [RFC][PATCH] virt-manager calls migration API
by S.Sakamoto 11 Sep '08

11 Sep '08

Hi, I just make the proto patch that calls migration API from virt-manager. Form unity point of view, This proto patch adds Migrate in as same layer as operations for the Domain. Fisrt, this patch adds "Migrate" to the right-click menu when selected a domain. Run Run Pause Pause Shutdown Shutdown --------- ---> -------- Open(O) Migrate -------- Open(O) When "Migrate" selected, it goes on new window open which shows available(have been connecting) hosts. Of course, I have been knowing that there is Drag&Drop way. By the way, (1)It is necessary to migrate a domain that users modify an environmental setting. (ex. for XenD xend-config, ...) And (2)I think it that is necessary to improve usability that there is "precheking" beofre migrating. (ex. same cpu family/processor number?, enough free memory?, ...) Do you already have a idea that virt-manager servies above (1)(2) ? Finally, I understand that migrated domain's state switches Running and Shutoff alternately, because current virt-maneger manages domains by UUID. Is there a plan that this problem is solved? virtManager/domain.py | 27 ++++++ virtManager/engine.py | 82 ++++++++++++++++++++ virtManager/hostlist.py | 172 ++++++++++++++++++++++++++++++++++++++++++ virtManager/manager.py | 27 ++!!!! vmm-hostlist.glade | 195 ++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 488 insertions(+), 15 modifications(!) Thanks, Shigeki Sakamoto.

2 2

[libvirt] ANNOUNCE: New release virtinst 0.400.0
by Cole Robinson 10 Sep '08

10 Sep '08

I'm happy to announce a new virtinst release, version 0.400.0. It can be downloaded at: http://virt-manager.org/download.html The direct link is: http://virt-manager.org/download/sources/virtinst/virtinst-0.400.0.tar.gz New in this release: - New tool 'virt-convert': Allows converting between different types of virt configuration files. Currently only supports vmx -> virt-image. - New tool 'virt-pack': Converts virt-image xml format to vmx and packs in a tar.gz. (Note this will likely be merged with virt-convert in the future). - virt-install: Support for remote VM installation. Can use install media and disk images on remote host if shared via libvirt. Allows provisioning storage on remote pools. - virt-install new options: new --wait option, allows putting a hard time limit on installs. new --sound option, to create VM with soundcard emulation. new --disk option, allows specifying media as a path, storage volume, or a pool to provision storage on, device type, and several other options. Deprecates --file, --size, --nonsparse. new --prompt option. Input prompting is no longer the default, this option turns it back on. - virt-install: allow setting cpu pinning information for qemu/kvm VMs. - virt-install: numa support via --cpuset=auto option. - virt-image: --replace option to overwrite existing VM image file. - virt-image: support multiple network interfaces in virt-image format. - use virtio disk/net drivers if chosen os entry supports it (Fedora 9/10, Ubuntu Hardy). - Numerous bug fixes and minor improvements. Thanks to everyone who has contributed to this release whether by testing, bug reporting, submitting patches, and otherwise sending feedback! Thanks, Cole

1 0

[libvirt] ANNOUNCE: New release virt-manager 0.6.0
by Cole Robinson 10 Sep '08

10 Sep '08

I'm happy to announce a new virt-manager release, version 0.6.0. The release can be downloaded from: http://virt-manager.org/download.html The direct download link is: http://virt-manager.org/download/sources/virt-manager/virt-manager-0.6.0.ta… This release includes: - Remote storage management and provisioning: View, add, remove, and provision libvirt managed storage. Attach managed storage to a remote VM. - Remote VM installation support: Install from managed media (cdrom) or PXE. Simple install time storage provisioning. - VM details and console windows merged: each VM is now represented by a single tabbed window. - Use Avahi to list libvirtd instances on network. - Hypervisor Autoconnect: Option to connect to hypervisor at virt-manager start up. - Option to add sound device emulation when creating new guests. - Virtio and USB options when adding a disk device. - Allow viewing and removing VM sound, serial, parallel, and console devices. - Specifying a specific keymap when adding display device. - Allow app to keep running with only a VM window open. - Allow limiting amount of stored stats history. - Numerous bug fixes and minor improvements. Thanks to everyone who has contributed to this release through testing, bug reporting, submitting patches, and otherwise sending in feedback! Thanks, Cole

1 0

[libvirt] [PATCH] fix a error message and coding-style cleanup
by Nguyen Anh Quynh 10 Sep '08

10 Sep '08

Hi, This patch fixes a "copy&paste" error message in MemoryPeek() function of qemu driver. And while I am at it, this patch does some clean-up on coding style. Without this, my vim goes crazy while browsing the source. Please enforce the coding style (more or less similar to GNU style?) when merging. Thanks, Quynh # diffstat fix5.patch qemu_driver.c | 261 ++++++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 175 insertions(+), 86 deletions(-)

4 6

[libvirt] [PATCH] Use gcc style for structure fields declaration
by Nguyen Anh Quynh 10 Sep '08

10 Sep '08

Hi, This patch uses gcc style to declare fields in virDriver structures. This also makes it easier to spot bugs. $ diffstat fix3.patch lxc_driver.c | 118 ++++++++++++++++++++++++++-------------------------- openvz_driver.c | 118 ++++++++++++++++++++++++++-------------------------- qemu_driver.c | 126 ++++++++++++++++++++++++++++---------------------------- test.c | 118 ++++++++++++++++++++++++++-------------------------- 4 files changed, 240 insertions(+), 240 deletions(-) Thanks, Quynh

4 5

[libvirt] [PATCH] Add more xen vnc tests, patch failures
by Cole Robinson 09 Sep '08

09 Sep '08

Investigating an old bug made me trip over a few problems with vnc parameter handling in the xen driver. The attached patch adds test cases for these bugs and fixes the failures, particularly fixing incomplete handling of a fixed vnc port for xend managed domains. Thanks, Cole

2 2

[libvirt] <soapbox>Thoughts on Open Source Hypervisor management
by Nathan Charles 09 Sep '08

09 Sep '08

Over the the last few years I've setup and experimented with a large number of vm technologies. Everything from x86 based stuff like VMware, kvm, qemu, xen, to more exotic things like hercules, and z/VM. So far the solution I've found to be the most baked is VMware ESX with Virtual Center. It's pretty sweet to set up a DRS cluster and have VM's load balance across available hardware. However, It's super expensive and is in bed with windows way to much. i.e. Virtual Center and the Virtual Infrastructure Client only run on windows don't have LDAP auth and only use MSQL. I've also been working implementing a provisioning solution for our developers. We do automated installation of hundreds of machines of which many are underutilized. Many are newer machines with some pretty beefy specs (8 cores and at least 8 gigs of ram). I've done a lot of thinking in a vacuum about what would be ideal. There's a lot out there I don't know so I hope you give me some grace as I talk. So I want to be able to pull these machines into a cluster of hypervisors; a VM fabric aggregated via software. Or thought of in another way a p2p vm cluster. In some ways I think oVirt is the closest and in someways I think simply extending libvirt would be better and sometimes I think it should be a new project. So I thought I'd post this and see what people think. Since I'm still unsure as to where the proper place to abstract this is, I'll use the working package name of genet for the rest of the discussion. >From my perspective the reason I can't use most of the open source virtualization solutions for more than local vm's is one of management. They're great for one machine but as soon as you get to more than one machine there is a lot of human administrative overhead. oVirt seems like it could be really good, but in an existing environment it requires a lot of substantial changes and requires significant modification to work with an existing provisioning infrastructure. So as I imagined a silver bullet I used biology as a metaphor and used started thinking with the idea of "every piece contains the image of the whole." So the here's the 10,000 ft overview of an idea. 1. cluster administration is done from the command line 2. cluster administration can be performed from any node. 3. a new node can join a cluster on a local subnet with one command. 4. local storage resources are presented to the cluster so there is no need to have predefined NAS/SAN/iSCSI 5. cluster will load balance vm instances from node to node. 6. a node shouldn't need more than one nic but adding additional nic's provides failover and load balancing. I'm kind of ignoring storage at this point, but I think it's the biggest pieces of the puzzle as long as migration needs network/san storage. The ideal scenario would be something really simple like if I have SAN connectivity use that else I use some sort of cluster file system which adds in local storage and doesn't require reformating, but that might be wistful thinking. Use cases 1. looking for clusters on the same subnet via avahi # [yum|apt-get] install genet # genet list clusters forsythia hazelnut sumac # rhizome info sumac Password: sumac info: 8 nodes 64 Cores 128 G Ram 1.5 T storage 50% Cluster CPU utilized 75% Memory utilized 80% Storage utilized 2. a machine joins an existing cluster # genet join sumac Password: localhost has successfully joined sumac # Help output #genet -h usage: genet [options] command genet is a simple command line interface for creating and maintaining a cluster of hypervisors. Commands: create cluster [cluster name] create vm [vm name] (probably integrates with virt-install) evacuate [hostname] - migrate all vm instances off of [hostname] (defaults to localhost) list clusters [hostname] - list clusters on local subnet or via hostname on another network/subnet list vm [cluster] - list all vm instances in a cluster defaults to cluster local node is in. console [vmname] - virt-viewer to vmname So this all begs the the statement, "show me the code" and I think that perfectly valid. I may write some code, but I don't want to duplicate effort and I want to find out what other people are thinking. I welcome your thoughts. </soapbox> Regards, -- Nathan Charles

2 1

[libvirt] Question about migration on KVM/Qemu
by Atsushi SAKAI 08 Sep '08

08 Sep '08

Hi, I have a question about migration on KVM/Qemu. >From src/qemu_driver.c, domainMigrateXxxxx is not defined. But from news on 0.3.2, KVM migration is supported. http://libvirt.org/news.html Where is the code which performs migration on KVM/Qemu. Thanks Atsushi SAKAI

3 6

Re: [libvirt] Does libvirt support Xen on Solaris?
by atif bajwa 08 Sep '08

08 Sep '08

Thanks, But does libvirt supports xVM Virtualbox and xVM Server? I think Sun has published some web services API for these platforms. Regards, Atif On Wed, Sep 3, 2008 at 3:52 PM, Mark Johnson <johnson.nh(a)gmail.com> wrote: > On Wed, Sep 3, 2008 at 8:30 AM, atif bajwa <atifbajwa(a)gmail.com> wrote: > > Hi! > > > > Does libvirt supports Xen on Solaris? > > Yes. > > > > If so what is version of libvirt and Solaris? > > I believe we currently have 0.4.0 integrated in current > Nevada/OpenSolaris builds. > > > > MRJ > > > Regards, > > Atif > > > > -- > > Libvir-list mailing list > > Libvir-list(a)redhat.com > > https://www.redhat.com/mailman/listinfo/libvir-list > > > > >

2 1

[libvirt] [PATCH] Implement vol delete for disk pools
by Cole Robinson 08 Sep '08

08 Sep '08

The patch below implements virStorageVolDelete for volumes on a disk pool. The only interesting thing here is that parted wants a partition number to delete, so we need to peel off the end of the volume's target path which will be of the form '/dev/sda1' or similar (I assume. If not, it's still better than having nothing implemented). Thanks, Cole

3 8

[libvirt] Release of libvirt-0.4.5
by Daniel Veillard 08 Sep '08

08 Sep '08

It was really time for a new release, the ChangeLog is huge ... Main features are the improvement of OpenVZ and LXC, the uniform XML handling (and hence format) though all drivers, improvements in devices handling for QEmu/KVM and storage pool source discovery. Available as usual at ftp://libvirt.org/libvirt/ Full log of change is huge: * New features: - NETNS support for Linux containers (Dan Smith) - unified XML domain and network parsing for all drivers (Daniel Berrange) - OpenVZ features improvements (Evgeniy Sokolov) - OpenVZ and Linux containers support now default - USB device passthrough for QEmu/KVM (Guido Günther) - storage pool source discovery (David Lively) * Portability: - fixes for MinGW (Atsushi SAKAI and Daniel Berrange) - detection of xen lib improvement (David Lively) - storage backend portability for SLES (David Lively) - fix make distclean and distcheck (Jim Meyering) - fix build failures on RHEL4 - lot of MinGW portability fixes (Atsushi SAKAI and Daniel Berrange) - HTML generation fix - -lpthread explicit linking when needed (Jim Meyering) * Documentation: - various typo fixes (Anton Protopopov, Toth István, Atsushi SAKAI, Nguyen Anh Quynh) - Java bindings docs - remove Xen centric comments (Guido Günther) - various typo in comments (Chris Lalancette) - docs and API comments fixes (Charles Duffy) - how to contribute to open source link (Richard Jones) - memory unit fixups (matthew chan) * Bug fixes: - memory leaks and testing for OOM (Daniel Berrange) - do_open driver bug(Evgeniy Sokolov) - don't use polkit auth when running as non-root (Daniel Berrange) - boot of CDRom devices in QEmu/KVM (Daniel Berrange) - fix OpenVZ probe function (Evgeniy Sokolov) - ID related lookup fixes in OpenVZ (Evgeniy Sokolov) - pool cration for netfs (Cole Robinson) - check for migrate support with QEmu (Guido Günther) - check against double create with QEmu (Guido Günther) - broken open failure detection in QEmu (Guido Günther) - UUID string conversions in QEmu (Guido Günther) - various small cleanup and bug fixes (Daniel Berrange) - ID related fixes in the test driver (Daniel Berrange) - better error reporting on XML parsing (Daniel Berrange) - empty CD-ROM source device section (Chris Lalancette) - avoid crashes for interface without a name in QEmu (Guido Günther) - provide the real vncport (Charles Duffy) - fix forward delay (Daniel Berrange) - new VM state is initialized to be SHUTOFF (Daniel Berrange) - virsh attach-disk bug fixes (Chris Lalancette) - veth clash of device names (Dan Smith) - connection lookup fixes on storage creation (Cole Robinson) - parted call fix (Cole Robinson) - use "server" option when using serial/telnet with QEmu (Mark McLoughlin) - duplicate virInitialize calls (Nguyen Anh Quynh) - many fixes to virExec and related functions (Daniel Berrange) - size of disk without partitions (Cole Robinson) - creating and cleaning up logical volumes with target path (Cole Robinson) - fix reporting of virConnectOpen problems (Daniel Berrange) - veth cleanup at shutdown (Dan Smith) - lookup of Xen VMs after define (Cole Robinson) - fix emulator reported capabilities (Cole Robinson) - avoid segfault on KVM CD eject (Cole Robinson) - fix disk ordering and avoid duplicate in QEmu XML parsing (Cole Robinson) - update domain XML after device hotplug (Cole Robinson) - use poweroff instead of halt when shutting down a Xen domain (John Levon) - don't dump core of Xen domain live by default (John Levon) - vgcreate command line size bug (Jim Fehlig) - signed/unsigned issue in probing file (Cole Robinson) - Fix Xen domains without PVFB console (Daniel Berrange) - OpenVZ config read bug fix (Evgeniy Sokolov). * Improvements: - improved failure diagnostic for TAP (Jim Meyering) - better exec and error diagnostic for OpenVZ commands (Evgeniy Sokolov) - OpenVZ auto start and stop of domains (Evgeniy Sokolov) - OpenVZ domain cpu time consumption (Evgeniy Sokolov) - virsh shutdown improvements and test (Jim Meyering) - better report of XML well formedness errors (Richard Jones) - new XML elements (Daniel Berrange) - virsh "edit" command (Richard Jones) - save UUID of OpenVZ domains (Evgeniy Sokolov) - improve xen blocks statistics (Chris Lalancette) - gnulib updates (Jim Meyering) - allow to add disk as USB devices (Guido Günther) - LXC container process should survive libvirtd restarts (Daniel Berrange) - allow to define static host domain configs - number of CPU used by OpenVZ domains (Evgeniy Sokolov) - private root fs for LXC (Daniel Berrange) - storage source information in storage pools (David Lively) - virsh reports attach and detach success (Cole Robinson) - detect failure in QEmu eject command (Cole Robinson) - add support for eect on floppy and SCSI cdroms for QEmu (Cole Robinson) - LXC hypervisor version extraction (Dan Smith) - Augeas config file support (Daniel Berrange) - support for a domain name in network config (JJ Reynolds). * Cleanups: - Python verbosity cleanup (Ryan Scott) - space and tabs cleanups (Atsushi SAKAI) - OpenVZ and LXC drivers cleanup and unification of XML handling (Daniel Berrange) - updates to Relax-NG XML schemas (John Levon and Daniel Berrange) - more printf format checkings (Jim Meyering) - VIR_FREE related cleanups (Jim Meyering) - integer string parsing cleanup (Evgeniy Sokolov) - initial OpenVZ xml refactoring (Evgeniy Sokolov) - better error message on domain redefine (Charles Duffy) - check XML files against the RNG Schemas (Daniel Berrange) - const-correctness in virsh (Richard Jones and Jim Meyering) - const-correctness and cleanups in LXC and OpenVZ drivers (Daniel Berrange) - virFileLinkPointsTo rewrite (Jim Meyering) - cleanup of the conditional compilation of C files (Daniel Berrange) - shell quoting fixes (Jim Meyering) - parallel build support (James Morris and Jim Meyering) - new convenenience virFileReadLimFD function (Jim Meyering). A lot of people contributed to this release with patches, reports or documentations, thanks everybody ! Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] libvirt vs XenAPI
by atif bajwa 08 Sep '08

08 Sep '08

Hi! I am looking to integrate the Xen Management. Please guide me advantages of using libvirt over XenAPI and please list xen-based-hypervisor distributions(versions) that will be supported with libvirt. And what is future of libvirt as XenSource is more focused on XenAPI. Regards, Atif

7 22

[libvirt] PATCH: Fix NULL checks in openvz driver
by Daniel P. Berrange 08 Sep '08

08 Sep '08

Jim pointed out some places where the openvz driver could deference some NULs, so this patch fixes them Daniel Index: src/openvz_driver.c =================================================================== RCS file: /data/cvs/libvirt/src/openvz_driver.c,v retrieving revision 1.46 diff -u -p -r1.46 openvz_driver.c --- src/openvz_driver.c 5 Sep 2008 15:00:14 -0000 1.46 +++ src/openvz_driver.c 5 Sep 2008 15:11:34 -0000 @@ -276,7 +276,7 @@ static char *openvzDomainDumpXML(virDoma static int openvzDomainShutdown(virDomainPtr dom) { struct openvz_driver *driver = (struct openvz_driver *)dom->conn->privateData; virDomainObjPtr vm = virDomainFindByUUID(driver->domains, dom->uuid); - const char *prog[] = {VZCTL, "--quiet", "stop", vm->def->name, NULL}; + const char *prog[] = {VZCTL, "--quiet", "stop", NULL /* name */, NULL}; if (!vm) { openvzError(dom->conn, VIR_ERR_INVALID_DOMAIN, @@ -290,6 +290,7 @@ static int openvzDomainShutdown(virDomai return -1; } + prog[3] = vm->def->name; if (virRun(dom->conn, prog, NULL) < 0) return -1; @@ -303,7 +304,7 @@ static int openvzDomainReboot(virDomainP unsigned int flags ATTRIBUTE_UNUSED) { struct openvz_driver *driver = (struct openvz_driver *)dom->conn->privateData; virDomainObjPtr vm = virDomainFindByUUID(driver->domains, dom->uuid); - const char *prog[] = {VZCTL, "--quiet", "restart", vm->def->name, NULL}; + const char *prog[] = {VZCTL, "--quiet", "restart", NULL /* name */, NULL}; if (!vm) { openvzError(dom->conn, VIR_ERR_INVALID_DOMAIN, @@ -317,6 +318,7 @@ static int openvzDomainReboot(virDomainP return -1; } + prog[3] = vm->def->name; if (virRun(dom->conn, prog, NULL) < 0) return -1; @@ -581,7 +583,7 @@ openvzDomainCreate(virDomainPtr dom) { struct openvz_driver *driver = (struct openvz_driver *)dom->conn->privateData; virDomainObjPtr vm = virDomainFindByName(driver->domains, dom->name); - const char *prog[] = {VZCTL, "--quiet", "start", vm->def->name, NULL }; + const char *prog[] = {VZCTL, "--quiet", "start", NULL /* name */, NULL }; if (!vm) { openvzError(dom->conn, VIR_ERR_INVALID_DOMAIN, @@ -595,6 +597,7 @@ openvzDomainCreate(virDomainPtr dom) return -1; } + prog[3] = vm->def->name; if (virRun(dom->conn, prog, NULL) < 0) { openvzError(dom->conn, VIR_ERR_INTERNAL_ERROR, _("Could not exec %s"), VZCTL); @@ -614,7 +617,7 @@ openvzDomainUndefine(virDomainPtr dom) virConnectPtr conn= dom->conn; struct openvz_driver *driver = (struct openvz_driver *) conn->privateData; virDomainObjPtr vm = virDomainFindByUUID(driver->domains, dom->uuid); - const char *prog[] = { VZCTL, "--quiet", "destroy", vm->def->name, NULL }; + const char *prog[] = { VZCTL, "--quiet", "destroy", NULL /* name */, NULL }; if (!vm) { openvzError(conn, VIR_ERR_INVALID_DOMAIN, _("no domain with matching uuid")); @@ -626,6 +629,7 @@ openvzDomainUndefine(virDomainPtr dom) return -1; } + prog[3] = vm->def->name; if (virRun(conn, prog, NULL) < 0) { openvzError(conn, VIR_ERR_INTERNAL_ERROR, _("Could not exec %s"), VZCTL); @@ -643,7 +647,7 @@ openvzDomainSetAutostart(virDomainPtr do virConnectPtr conn= dom->conn; struct openvz_driver *driver = (struct openvz_driver *) conn->privateData; virDomainObjPtr vm = virDomainFindByUUID(driver->domains, dom->uuid); - const char *prog[] = { VZCTL, "--quiet", "set", vm->def->name, + const char *prog[] = { VZCTL, "--quiet", "set", NULL /* name */, "--onboot", autostart ? "yes" : "no", "--save", NULL }; @@ -652,6 +656,7 @@ openvzDomainSetAutostart(virDomainPtr do return -1; } + prog[3] = vm->def->name; if (virRun(conn, prog, NULL) < 0) { openvzError(conn, VIR_ERR_INTERNAL_ERROR, _("Could not exec %s"), VZCTL); return -1; @@ -704,16 +709,9 @@ static int openvzDomainSetVcpus(virDomai struct openvz_driver *driver = (struct openvz_driver *) conn->privateData; virDomainObjPtr vm = virDomainFindByUUID(driver->domains, dom->uuid); char str_vcpus[32]; - const char *prog[] = { VZCTL, "--quiet", "set", vm->def->name, + const char *prog[] = { VZCTL, "--quiet", "set", NULL /* name */, "--cpus", str_vcpus, "--save", NULL }; - snprintf(str_vcpus, 31, "%d", nvcpus); - str_vcpus[31] = '\0'; - if (nvcpus <= 0) { - openvzError(conn, VIR_ERR_INTERNAL_ERROR, - _("VCPUs should be >= 1")); - return -1; - } if (!vm) { openvzError(conn, VIR_ERR_INVALID_DOMAIN, @@ -721,6 +719,16 @@ static int openvzDomainSetVcpus(virDomai return -1; } + if (nvcpus <= 0) { + openvzError(conn, VIR_ERR_INTERNAL_ERROR, + _("VCPUs should be >= 1")); + return -1; + } + + snprintf(str_vcpus, 31, "%d", nvcpus); + str_vcpus[31] = '\0'; + + prog[3] = vm->def->name; if (virRun(conn, prog, NULL) < 0) { openvzError(conn, VIR_ERR_INTERNAL_ERROR, _("Could not exec %s"), VZCTL); -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

4 6

[libvirt] domain type "kvm" error
by Rakotomandimby Mihamina 08 Sep '08

08 Sep '08

Hi all, I use "ubuntu hardy" but I dont think the problem is specific to the distribution I use. I installed KVM and libvirt as described here: https://help.ubuntu.com/community/KVM Following that method, created a domain, which dumps like this: <domain type='qemu' id='1'> <name>xp1</name> ... </domain> Launching the guest is OK, but it is as slow as if I directly launched $ qemu [options] I tried to launch: $ kvm [options] and it is much faster My conclusion is that method on the Ubuntu documentation launches a qemu without the use of kvm. I modified that XML dump, changing "qemu" with "kvm": <domain type='kvm' id='1'> <name>xp1</name> ... </domain> I undefined the domain "xp1" and re-defined it with that new XML file. When I start the new defined domain: virsh # start xp1 libvir: QEMU error : QEMU quit during console startup qemu: unknowm parameter 'boot' in \ 'file=/home/mihamina/xpjohnny.iso,if=ide,media=cdrom,boot=on' error: Failed to start domain xp1 It's a Windows XP domain. My conclusion is: - When domain type is "qemu", qemu is called a certain way, without syntax error - When domain type is "kvm", qemu/kvm is not called the same way and among that, there are syntax errors. How to confirm my conclusion? What to check if it's the case? I already filed a bug https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/252916 but they seem not to have idea of the problem. -- Huile Essentielle de Camphre http://www.huile-camphre.fr Infogerance http://www.infogerance.us (Serveurs, Postes de travail, Développement logiciel)

3 7

[libvirt] [PATCH]Fix minor issues in logical storage backend
by Jim Fehlig 08 Sep '08

08 Sep '08

Hi All! I came across some problems trying to create a new LVM-based storage pool using this config <pool type="logical"> <name>test_vg</name> <source> <device path="/dev/sdb1"/> </source> <target> <path>/dev/test_vg</path> </target> </pool> Volume group did not previously exist so I did virsh pool-define <above.xml> virsh pool-build test_vg pool-build failed since the backend logical storage driver does not have VIR_STORAGE_BACKEND_POOL_SOURCE_DEVICE set in flags. Without this flag set, the device element is never parsed in virStoragePoolDefParseDoc() (storage_conf.c), causing pvcreate to fail since no physical volume is specified. After this problem was memory corruption cause by miscalculating the size of vgcreate command line :-). This patch fixes both issues. Regards, Jim

3 4

[libvirt] PATCH: Switch openvz driver to domain APIs
by Daniel P. Berrange 05 Sep '08

05 Sep '08

This patch is the minimum effort port of the OpenVZ driver over to the new generic domain XML routines. It basically removes all the existing config format stuff from openvz_conf, defines a set of openvz capabilities and implements the DumpXML method too. This is enough to get all the core libvirt functions working. The biggest flaw I see currently is that the openvz driver doesn't load the existing device config for networks or filesystems of existing VMs, so you can't see that info in the XML dump Daniel diff -r e270be59a80f src/openvz_conf.c --- a/src/openvz_conf.c Wed Aug 27 17:03:25 2008 +0100 +++ b/src/openvz_conf.c Wed Aug 27 17:26:08 2008 +0100 @@ -40,39 +40,29 @@ #include <limits.h> #include <errno.h> #include <string.h> - -#include <libxml/parser.h> -#include <libxml/tree.h> -#include <libxml/xpath.h> -#include <libxml/uri.h> - -#include "internal.h" - -#include "openvz_driver.h" +#include <sys/utsname.h> + #include "openvz_conf.h" #include "uuid.h" #include "buf.h" #include "memory.h" #include "util.h" -#include "xml.h" -#include "domain_conf.h" static char *openvzLocateConfDir(void); -static struct openvz_vm_def *openvzParseXML(virConnectPtr conn, xmlDocPtr xml); static int openvzGetVPSUUID(int vpsid, char *uuidstr); -static int openvzSetUUID(int vpsid); static int openvzLocateConfFile(int vpsid, char *conffile, int maxlen); +static int openvzAssignUUIDs(void); void openvzError (virConnectPtr conn, virErrorNumber code, const char *fmt, ...) { va_list args; - char errorMessage[OPENVZ_MAX_ERROR_LEN]; + char errorMessage[1024]; const char *errmsg; if (fmt) { va_start(args, fmt); - vsnprintf(errorMessage, OPENVZ_MAX_ERROR_LEN-1, fmt, args); + vsnprintf(errorMessage, sizeof(errorMessage)-1, fmt, args); va_end(args); } else { errorMessage[0] = '\0'; @@ -84,46 +74,6 @@ openvzError (virConnectPtr conn, virErro errmsg, errorMessage); } -struct openvz_vm -*openvzFindVMByID(const struct openvz_driver *driver, int id) { - struct openvz_vm *vm = driver->vms; - - while (vm) { - if (vm->vpsid == id) - return vm; - vm = vm->next; - } - - return NULL; -} - -struct openvz_vm -*openvzFindVMByUUID(const struct openvz_driver *driver, - const unsigned char *uuid) { - struct openvz_vm *vm = driver->vms; - - while (vm) { - if (!memcmp(vm->vmdef->uuid, uuid, VIR_UUID_BUFLEN)) - return vm; - vm = vm->next; - } - - return NULL; -} - -struct openvz_vm -*openvzFindVMByName(const struct openvz_driver *driver, - const char *name) { - struct openvz_vm *vm = driver->vms; - - while (vm) { - if (STREQ(vm->vmdef->name, name)) - return vm; - vm = vm->next; - } - - return NULL; -} int strtoI(const char *str) @@ -135,6 +85,43 @@ strtoI(const char *str) return val; } + +virCapsPtr openvzCapsInit(void) +{ + struct utsname utsname; + virCapsPtr caps; + virCapsGuestPtr guest; + + uname(&utsname); + + if ((caps = virCapabilitiesNew(utsname.machine, + 0, 0)) == NULL) + goto no_memory; + + if ((guest = virCapabilitiesAddGuest(caps, + "exe", + utsname.machine, + sizeof(int) == 4 ? 32 : 8, + NULL, + NULL, + 0, + NULL)) == NULL) + goto no_memory; + + if (virCapabilitiesAddGuestDomain(guest, + "openvz", + NULL, + NULL, + 0, + NULL) == NULL) + goto no_memory; + return caps; + +no_memory: + virCapabilitiesFree(caps); + return NULL; +} + /* function checks MAC address is empty return 0 - empty @@ -164,438 +151,105 @@ char *openvzMacToString(const unsigned c return strdup(str); } -void -openvzRemoveInactiveVM(struct openvz_driver *driver, struct openvz_vm *vm) -{ - driver->num_inactive--; - openvzFreeVM(driver, vm, 1); -} - -/* Free all memory associated with a openvz_vm_def structure */ -void -openvzFreeVMDef(struct openvz_vm_def *def) -{ - if (def) { - virDomainNetDefFree(def->net); - } -} - -/* Free all memory associated with a openvz_vm structure - * @checkCallee == 0 then openvzFreeDriver() is callee else some other function - */ -void -openvzFreeVM(struct openvz_driver *driver, struct openvz_vm *vm, - int checkCallee) -{ - struct openvz_vm *vms; - - if (!vm && !driver) - return; - vms = driver->vms; - if (checkCallee) { - if (vms == vm) - driver->vms = vm->next; - else { - while (vms) { - struct openvz_vm *prev = vms; - - vms = vms->next; - if (vms == vm) { - prev->next = vms->next; - break; - } - } - } - } - if (vms) { - openvzFreeVMDef(vm->vmdef); - VIR_FREE(vm); - } -} - /* Free all memory associated with a openvz_driver structure */ void openvzFreeDriver(struct openvz_driver *driver) { - struct openvz_vm *next; - + virDomainObjPtr dom; + if (!driver) return; - if (driver->vms) - for(next = driver->vms->next; driver->vms; driver->vms = next) - openvzFreeVM(driver, driver->vms, 0); - VIR_FREE(driver); -} - -struct openvz_vm * -openvzAssignVMDef(virConnectPtr conn, - struct openvz_driver *driver, struct openvz_vm_def *def) -{ - struct openvz_vm *vm = NULL; - - if (!driver || !def) - return NULL; - - if ((vm = openvzFindVMByName(driver, def->name))) { - if (!openvzIsActiveVM(vm)) { - openvzFreeVMDef(vm->vmdef); - vm->vmdef = def; - } - else - { - openvzLog(OPENVZ_ERR, - _("Error already an active OPENVZ VM having id '%s'"), - def->name); - openvzFreeVMDef(def); - return NULL; /* can't redefine an active domain */ - } - - return vm; - } - - if (VIR_ALLOC(vm) < 0) { - openvzFreeVMDef(def); - openvzError(conn, VIR_ERR_NO_MEMORY, _("vm")); - return NULL; - } - - vm->vpsid = -1; /* -1 needed for to represent inactiveness of domain before 'start' */ - vm->status = VIR_DOMAIN_SHUTOFF; - vm->vmdef = def; - vm->next = driver->vms; - - driver->vms = vm; - driver->num_inactive++; - - return vm; -} - -struct openvz_vm_def -*openvzParseVMDef(virConnectPtr conn, - const char *xmlStr, const char *displayName) -{ - xmlDocPtr xml; - struct openvz_vm_def *def = NULL; - - xml = xmlReadDoc(BAD_CAST xmlStr, displayName ? displayName : "domain.xml", NULL, - XML_PARSE_NOENT | XML_PARSE_NONET | XML_PARSE_NOERROR | XML_PARSE_NOWARNING); - if (!xml) { - openvzError(conn, VIR_ERR_XML_ERROR, NULL); - return NULL; - } - - def = openvzParseXML(conn, xml); - xmlFreeDoc(xml); - - return def; -} - -/* Parse filesystem section -Sample: -<filesystem type="template"> - <source name="fedora-core-5-i386"/> - <quota type="size" max="10000"/> - <quota type="inodes" max="100"/> -</filesystem> -*/ -static int openvzParseDomainFS(virConnectPtr conn, - struct openvz_fs_def *fs, - xmlXPathContextPtr ctxt) -{ - xmlNodePtr cur, obj; - char *type = NULL; - int n; - xmlNodePtr *nodes = NULL; - - - if ((n = virXPathNodeSet(conn, "/domain/devices/filesystem", - ctxt, &nodes)) < 0) { - openvzError(conn, VIR_ERR_INTERNAL_ERROR, - _("missing filesystem tag")); - goto error; - } - - if (n > 1) { - openvzError(conn, VIR_ERR_INTERNAL_ERROR, - _("There should be only one filesystem tag")); - goto error; - } - - obj = nodes[0]; - - /*check template type*/ - type = virXMLPropString(obj, "type"); - if (type == NULL) { - openvzError(conn, VIR_ERR_INTERNAL_ERROR, - _("missing type attribute")); - goto error; - } - - if (STRNEQ(type, "template")) { - openvzError(conn, VIR_ERR_INTERNAL_ERROR, - _("Unknown type attribute %s"), type); - goto error; - } - VIR_FREE(type); - - cur = obj->children; - while(cur != NULL) - { - if (cur->type == XML_ELEMENT_NODE) { - if (xmlStrEqual(cur->name, BAD_CAST "source")) { - char * name = virXMLPropString(cur, "name"); - - if (name != NULL) { - strncpy(fs->tmpl, name,sizeof(fs->tmpl)); - fs->tmpl[sizeof(fs->tmpl) - 1] = '\0'; - } - VIR_FREE(name); - } else if (xmlStrEqual(cur->name, BAD_CAST "quota")) { - char * qtype = virXMLPropString(cur, "type"); - char * max = virXMLPropString(cur, "max"); - - if (qtype != NULL && STREQ(qtype, "size") && max != NULL) - fs->disksize = strtoI(max); - else if (qtype != NULL && STREQ(qtype, "inodes") && max != NULL) - fs->diskinodes = strtoI(max); - VIR_FREE(qtype); - VIR_FREE(max); - } - } - cur = cur->next; - } - VIR_FREE(nodes); - - return 0; - - error: - VIR_FREE(nodes); - VIR_FREE(type); - - return -1; -} - - -/* - * Parses a libvirt XML definition of a guest, and populates the - * the openvz_vm struct with matching data about the guests config - */ -static struct openvz_vm_def -*openvzParseXML(virConnectPtr conn, - xmlDocPtr xml) { - xmlNodePtr root = NULL; - char *prop = NULL; - xmlXPathContextPtr ctxt = NULL; - xmlXPathObjectPtr obj = NULL; - struct openvz_vm_def *def = NULL; - xmlNodePtr *nodes = NULL; - int i, n; - - if (VIR_ALLOC(def) < 0) { - openvzError(conn, VIR_ERR_NO_MEMORY, _("xmlXPathContext")); - return NULL; - } - - /* Prepare parser / xpath context */ - root = xmlDocGetRootElement(xml); - if ((root == NULL) || (!xmlStrEqual(root->name, BAD_CAST "domain"))) { - openvzError(conn, VIR_ERR_INTERNAL_ERROR, _("incorrect root element")); - goto bail_out; - } - - ctxt = xmlXPathNewContext(xml); - if (ctxt == NULL) { - openvzError(conn, VIR_ERR_NO_MEMORY, _("xmlXPathContext")); - goto bail_out; - } - ctxt->node = root; - - /* Find out what type of OPENVZ virtualization to use */ - if (!(prop = virXMLPropString(root, "type"))) { - openvzError(conn, VIR_ERR_INTERNAL_ERROR, _("missing domain type attribute")); - goto bail_out; - } - - if (STRNEQ(prop, "openvz")){ - openvzError(conn, VIR_ERR_INTERNAL_ERROR, _("invalid domain type attribute")); - goto bail_out; - } - VIR_FREE(prop); - - /* Extract domain name */ - obj = xmlXPathEval(BAD_CAST "string(/domain/name[1])", ctxt); - if ((obj == NULL) || (obj->type != XPATH_STRING) || - (obj->stringval == NULL) || (obj->stringval[0] == 0)) { - openvzError(conn, VIR_ERR_INTERNAL_ERROR, _("invalid domain name")); - goto bail_out; - } - - /* rejecting VPS ID <= OPENVZ_RSRV_VM_LIMIT for they are reserved */ - if (strtoI((const char *) obj->stringval) <= OPENVZ_RSRV_VM_LIMIT) { - openvzError(conn, VIR_ERR_INTERNAL_ERROR, - _("VPS ID Error (must be an integer greater than 100")); - goto bail_out; - } - strncpy(def->name, (const char *) obj->stringval, OPENVZ_NAME_MAX); - xmlXPathFreeObject(obj); - obj = NULL; - - /* Extract domain uuid */ - prop = virXPathString(conn, "string(./uuid[1])", ctxt); - if (!prop) { - int err; - if ((err = virUUIDGenerate(def->uuid))) { - openvzError(conn, VIR_ERR_INTERNAL_ERROR, - _("Failed to generate UUID: %s"), - strerror(err)); - goto bail_out; - } - } else { - if (virUUIDParse(prop, def->uuid) < 0) { - openvzError(conn, VIR_ERR_INTERNAL_ERROR, - _("malformed uuid element")); - goto bail_out; - } - VIR_FREE(prop); - } - - /* extract virtual CPUs */ - if (virXPathULong(conn, "string(./vcpu[1])", ctxt, &def->vcpus) < 0) - def->vcpus = 0; //use default CPUs count - - /* Extract filesystem info */ - if (openvzParseDomainFS(conn, &(def->fs), ctxt)) { - openvzError(conn, VIR_ERR_INTERNAL_ERROR, - _("malformed filesystem tag")); - goto bail_out; - } - - /* analysis of the network devices */ - if ((n = virXPathNodeSet(conn, "/domain/devices/interface", - ctxt, &nodes)) < 0) { - openvzError(conn, VIR_ERR_INTERNAL_ERROR, - "%s", _("cannot extract network devices")); - goto bail_out; - } - - for (i = n - 1 ; i >= 0 ; i--) { - virDomainNetDefPtr net = virDomainNetDefParseXML(conn, - nodes[i]); - if (!net) - goto bail_out; - - net->next = def->net; - def->net = net; - } - VIR_FREE(nodes); - - xmlXPathFreeContext(ctxt); - return def; - - bail_out: - VIR_FREE(prop); - xmlXPathFreeObject(obj); - xmlXPathFreeContext(ctxt); - openvzFreeVMDef(def); - - return NULL; -} - -struct openvz_vm * -openvzGetVPSInfo(virConnectPtr conn) { + + dom = driver->domains; + while (dom) { + virDomainObjPtr tmp = dom->next; + virDomainObjFree(dom); + dom = tmp; + } + + virCapabilitiesFree(driver->caps); +} + + + +int openvzLoadDomains(struct openvz_driver *driver) { FILE *fp; int veid, ret; char status[16]; char uuidstr[VIR_UUID_STRING_BUFLEN]; - struct openvz_vm *vm; - struct openvz_vm **pnext; - struct openvz_driver *driver; - struct openvz_vm_def *vmdef; - char temp[124]; - - vm = NULL; - driver = conn->privateData; - driver->num_active = 0; - driver->num_inactive = 0; - - if((fp = popen(VZLIST " -a -ovpsid,status -H 2>/dev/null", "r")) == NULL) { - openvzError(conn, VIR_ERR_INTERNAL_ERROR, _("popen failed")); - return NULL; - } - pnext = &vm; + virDomainObjPtr dom = NULL, prev = NULL; + + if (openvzAssignUUIDs() < 0) + return -1; + + if ((fp = popen(VZLIST " -a -ovpsid,status -H 2>/dev/null", "r")) == NULL) { + openvzError(NULL, VIR_ERR_INTERNAL_ERROR, _("popen failed")); + return -1; + } + while(!feof(fp)) { - if (VIR_ALLOC(*pnext) < 0) { - openvzError(conn, VIR_ERR_INTERNAL_ERROR, _("calloc failed")); - goto error; - } - - if(!vm) - vm = *pnext; - if (fscanf(fp, "%d %s\n", &veid, status) != 2) { if (feof(fp)) break; - - openvzError(conn, VIR_ERR_INTERNAL_ERROR, - _("Failed to parse vzlist output")); - goto error; - } - if(STRNEQ(status, "stopped")) { - (*pnext)->status = VIR_DOMAIN_RUNNING; - driver->num_active ++; - (*pnext)->vpsid = veid; - } - else { - (*pnext)->status = VIR_DOMAIN_SHUTOFF; - driver->num_inactive ++; - /* - * inactive domains don't have their ID set in libvirt, - * thought this doesn't make sense for OpenVZ - */ - (*pnext)->vpsid = -1; - } - - if (VIR_ALLOC(vmdef) < 0) { - openvzError(conn, VIR_ERR_INTERNAL_ERROR, _("calloc failed")); - goto error; - } - - snprintf(vmdef->name, OPENVZ_NAME_MAX, "%i", veid); + + openvzError(NULL, VIR_ERR_INTERNAL_ERROR, + _("Failed to parse vzlist output")); + goto cleanup; + } + + if (VIR_ALLOC(dom) < 0 || + VIR_ALLOC(dom->def) < 0) + goto no_memory; + + if (STRNEQ(status, "stopped")) + dom->state = VIR_DOMAIN_RUNNING; + else + dom->state = VIR_DOMAIN_SHUTOFF; + + dom->pid = veid; + dom->def->id = dom->state == VIR_DOMAIN_SHUTOFF ? -1 : veid; + + if (asprintf(&dom->def->name, "%i", veid) < 0) { + dom->def->name = NULL; + goto no_memory; + } + openvzGetVPSUUID(veid, uuidstr); - ret = virUUIDParse(uuidstr, vmdef->uuid); - - if(ret == -1) { - openvzError(conn, VIR_ERR_INTERNAL_ERROR, - _("UUID in config file malformed")); - VIR_FREE(vmdef); - goto error; - } - - /*get VCPU*/ - ret = openvzReadConfigParam(veid, "CPUS", temp, sizeof(temp)); - if (ret < 0) { - openvzError(conn, VIR_ERR_INTERNAL_ERROR, - _("Cound not read config for container %d"), veid); - goto error; - } else if (ret > 0) { - vmdef->vcpus = strtoI(temp); - } - - - (*pnext)->vmdef = vmdef; - pnext = &(*pnext)->next; - } - return vm; -error: - while (vm != NULL) { - struct openvz_vm *next; - - next = vm->next; - VIR_FREE(vm->vmdef); - VIR_FREE(vm); - vm = next; - } - return NULL; + ret = virUUIDParse(uuidstr, dom->def->uuid); + + if (ret == -1) { + openvzError(NULL, VIR_ERR_INTERNAL_ERROR, + _("UUID in config file malformed")); + goto cleanup; + } + + dom->def->vcpus = 1; + if (!(dom->def->os.type = strdup("exe"))) + goto no_memory; + if (!(dom->def->os.init = strdup("/sbin/init"))) + goto no_memory; + + /* XXX load rest of VM config data .... */ + + if (prev) { + prev->next = dom; + } else { + driver->domains = dom; + } + prev = dom; + } + + fclose(fp); + + return 0; + + no_memory: + openvzError(NULL, VIR_ERR_NO_MEMORY, NULL); + + cleanup: + fclose(fp); + virDomainObjFree(dom); + return -1; } /* @@ -797,7 +451,7 @@ openvzSetUUID(int vpsid){ * */ -int openvzAssignUUIDs(void) +static int openvzAssignUUIDs(void) { DIR *dp; struct dirent *dent; diff -r e270be59a80f src/openvz_conf.h --- a/src/openvz_conf.h Wed Aug 27 17:03:25 2008 +0100 +++ b/src/openvz_conf.h Wed Aug 27 17:03:45 2008 +0100 @@ -28,94 +28,35 @@ #ifndef OPENVZ_CONF_H #define OPENVZ_CONF_H -#include "openvz_driver.h" +#include "internal.h" #include "domain_conf.h" enum { OPENVZ_WARN, OPENVZ_ERR }; -#define OPENVZ_NAME_MAX 8 -#define OPENVZ_TMPL_MAX 256 -#define OPENVZ_UNAME_MAX 32 -#define OPENVZ_IP_MAX 16 -#define OPENVZ_HOSTNAME_MAX 256 -#define OPENVZ_PROFILE_MAX 256 -#define OPENVZ_MAX_ERROR_LEN 1024 -#define OPENVZ_MAX_XML_LEN 4096 -#define OPENVZ_MAX_QUOTA 8 -#define OPENVZ_MAX_XPathEval_LEN 256 -#define OPENVZ_RSRV_VM_LIMIT 100 +#define openvzLog(level, msg...) { if(level == OPENVZ_WARN) \ + fprintf(stderr, "\nWARNING: ");\ + else \ + fprintf(stderr, "\nERROR: ");\ + fprintf(stderr, "\n\t");\ + fprintf(stderr, msg);\ + fprintf(stderr, "\n"); } -enum openvz_quota{ - VM_LEVEL = 0, - USER_LEVEL = 1, +/* OpenVZ commands - Replace with wrapper scripts later? */ +#define VZLIST "vzlist" +#define VZCTL "vzctl" + +struct openvz_driver { + virCapsPtr caps; + virDomainObjPtr domains; }; - -/* TODO Add more properties here */ -struct vps_props { - int kmemsize; /* currently held */ - int kmemsize_m; /* max held */ - int kmemsize_b; /* barrier */ - int kmemsize_l; /* limit */ - int kmemsize_f; /* fail count */ - -}; - -struct openvz_fs_def { - char tmpl[OPENVZ_TMPL_MAX]; - long int disksize, diskinodes; -}; - -struct openvz_vm_def { - char name[OPENVZ_NAME_MAX]; - unsigned char uuid[VIR_UUID_BUFLEN]; - char profile[OPENVZ_PROFILE_MAX]; - unsigned long vcpus; - struct openvz_fs_def fs; - virDomainNetDefPtr net; -}; - -struct ovz_quota { - enum openvz_quota type; - unsigned int size; - char uname[OPENVZ_UNAME_MAX]; - struct ovz_quota *next; -}; - -struct openvz_vm { - int vpsid; - int status; - struct openvz_vm_def *vmdef; - struct openvz_vm *next; -}; - -static inline int -openvzIsActiveVM(struct openvz_vm *vm) -{ - return vm->vpsid != -1; -} void openvzError (virConnectPtr conn, virErrorNumber code, const char *fmt, ...) ATTRIBUTE_FORMAT(printf, 3, 4); int openvz_readline(int fd, char *ptr, int maxlen); int openvzReadConfigParam(int vpsid ,const char * param, char *value, int maxlen); -struct openvz_vm *openvzFindVMByID(const struct openvz_driver *driver, int id); -struct openvz_vm *openvzFindVMByUUID(const struct openvz_driver *driver, - const unsigned char *uuid); - -struct openvz_vm *openvzFindVMByName(const struct openvz_driver *driver, const char *name); -struct openvz_vm_def *openvzParseVMDef(virConnectPtr conn, const char *xmlStr, - const char *displayName); - -struct openvz_vm *openvzAssignVMDef(virConnectPtr conn, struct openvz_driver *driver, - struct openvz_vm_def *def); - -struct openvz_vm *openvzGetVPSInfo(virConnectPtr conn); -void openvzGenerateUUID(unsigned char *uuid); -int openvzAssignUUIDs(void); -void openvzRemoveInactiveVM(struct openvz_driver *driver, struct openvz_vm *vm); +virCapsPtr openvzCapsInit(void); +int openvzLoadDomains(struct openvz_driver *driver); void openvzFreeDriver(struct openvz_driver *driver); -void openvzFreeVM(struct openvz_driver *driver, struct openvz_vm *vm, int checkCallee); -void openvzFreeVMDef(struct openvz_vm_def *def); int strtoI(const char *str); int openvzCheckEmptyMac(const unsigned char *mac); char *openvzMacToString(const unsigned char *mac); diff -r e270be59a80f src/openvz_driver.c --- a/src/openvz_driver.c Wed Aug 27 17:03:25 2008 +0100 +++ b/src/openvz_driver.c Wed Aug 27 17:29:40 2008 +0100 @@ -60,33 +60,6 @@ #define CMDBUF_LEN 1488 #define CMDOP_LEN 288 -static virDomainPtr openvzDomainLookupByID(virConnectPtr conn, int id); -static char *openvzGetOSType(virDomainPtr dom); -static int openvzGetNodeInfo(virConnectPtr conn, virNodeInfoPtr nodeinfo); -static virDomainPtr openvzDomainLookupByUUID(virConnectPtr conn, const unsigned char *uuid); -static virDomainPtr openvzDomainLookupByName(virConnectPtr conn, const char *name); -static int openvzDomainGetInfo(virDomainPtr dom, virDomainInfoPtr info); -static int openvzDomainShutdown(virDomainPtr dom); -static int openvzDomainReboot(virDomainPtr dom, unsigned int flags); -static int openvzDomainCreate(virDomainPtr dom); -static virDrvOpenStatus openvzOpen(virConnectPtr conn, - xmlURIPtr uri, - virConnectAuthPtr auth ATTRIBUTE_UNUSED, - int flags ATTRIBUTE_UNUSED); -static int openvzClose(virConnectPtr conn); -static const char *openvzGetType(virConnectPtr conn ATTRIBUTE_UNUSED); -static int openvzListDomains(virConnectPtr conn, int *ids, int nids); -static int openvzNumDomains(virConnectPtr conn); -static int openvzListDefinedDomains(virConnectPtr conn, char **const names, int nnames); -static int openvzNumDefinedDomains(virConnectPtr conn); - -static virDomainPtr openvzDomainDefineXML(virConnectPtr conn, const char *xml); -static virDomainPtr openvzDomainCreateLinux(virConnectPtr conn, const char *xml, - unsigned int flags ATTRIBUTE_UNUSED); - -static int openvzDomainUndefine(virDomainPtr dom); -static void cmdExecFree(const char *cmdExec[]); - static int openvzGetProcessInfo(unsigned long long *cpuTime, int vpsid); static int openvzGetMaxVCPUs(virConnectPtr conn, const char *type); static int openvzDomainGetMaxVcpus(virDomainPtr dom); @@ -110,7 +83,7 @@ static int openvzDomainDefineCmd(virConn static int openvzDomainDefineCmd(virConnectPtr conn, const char *args[], int maxarg, - struct openvz_vm_def *vmdef) + virDomainDefPtr vmdef) { int narg; @@ -143,15 +116,29 @@ static int openvzDomainDefineCmd(virConn ADD_ARG_LIT("--quiet"); ADD_ARG_LIT("create"); ADD_ARG_LIT(vmdef->name); - - if ((vmdef->fs.tmpl && *(vmdef->fs.tmpl))) { + + if (vmdef->fss) { + if (vmdef->fss->type != VIR_DOMAIN_FS_TYPE_TEMPLATE) { + openvzError(conn, VIR_ERR_INTERNAL_ERROR, + "%s", _("only filesystem templates are supported")); + return -1; + } + + if (vmdef->fss->next) { + openvzError(conn, VIR_ERR_INTERNAL_ERROR, + "%s", _("only one filesystem supported")); + return -1; + } + ADD_ARG_LIT("--ostemplate"); - ADD_ARG_LIT(vmdef->fs.tmpl); - } + ADD_ARG_LIT(vmdef->fss->src); + } +#if 0 if ((vmdef->profile && *(vmdef->profile))) { ADD_ARG_LIT("--config"); ADD_ARG_LIT(vmdef->profile); } +#endif ADD_ARG(NULL); return 0; @@ -165,39 +152,43 @@ static int openvzDomainDefineCmd(virConn static virDomainPtr openvzDomainLookupByID(virConnectPtr conn, - int id) { + int id) { struct openvz_driver *driver = (struct openvz_driver *)conn->privateData; - struct openvz_vm *vm; + virDomainObjPtr vm; virDomainPtr dom; - vm = openvzFindVMByID(driver, id); + vm = virDomainFindByID(driver->domains, id); if (!vm) { openvzError(conn, VIR_ERR_NO_DOMAIN, NULL); return NULL; } - dom = virGetDomain(conn, vm->vmdef->name, vm->vmdef->uuid); - if (!dom) { - openvzError(conn, VIR_ERR_NO_MEMORY, _("virDomainPtr")); - return NULL; - } - - dom->id = vm->vpsid; + dom = virGetDomain(conn, vm->def->name, vm->def->uuid); + if (!dom) + return NULL; + + dom->id = vm->def->id; return dom; } -static char *openvzGetOSType(virDomainPtr dom ATTRIBUTE_UNUSED) -{ - /* OpenVZ runs on Linux and runs only Linux */ - return strdup("linux"); +static char *openvzGetOSType(virDomainPtr dom) +{ + struct openvz_driver *driver = (struct openvz_driver *)dom->conn->privateData; + virDomainObjPtr vm = virDomainFindByUUID(driver->domains, dom->uuid); + char *ret = strdup(vm->def->os.type); + + if (!ret) + openvzError(dom->conn, VIR_ERR_NO_MEMORY, NULL); + + return ret; } static virDomainPtr openvzDomainLookupByUUID(virConnectPtr conn, - const unsigned char *uuid) { + const unsigned char *uuid) { struct openvz_driver *driver = (struct openvz_driver *)conn->privateData; - struct openvz_vm *vm = openvzFindVMByUUID(driver, uuid); + virDomainObjPtr vm = virDomainFindByUUID(driver->domains, uuid); virDomainPtr dom; if (!vm) { @@ -205,20 +196,18 @@ static virDomainPtr openvzDomainLookupBy return NULL; } - dom = virGetDomain(conn, vm->vmdef->name, vm->vmdef->uuid); - if (!dom) { - openvzError(conn, VIR_ERR_NO_MEMORY, _("virDomainPtr")); - return NULL; - } - - dom->id = vm->vpsid; + dom = virGetDomain(conn, vm->def->name, vm->def->uuid); + if (!dom) + return NULL; + + dom->id = vm->def->id; return dom; } static virDomainPtr openvzDomainLookupByName(virConnectPtr conn, const char *name) { struct openvz_driver *driver = (struct openvz_driver *)conn->privateData; - struct openvz_vm *vm = openvzFindVMByName(driver, name); + virDomainObjPtr vm = virDomainFindByName(driver->domains, name); virDomainPtr dom; if (!vm) { @@ -226,74 +215,83 @@ static virDomainPtr openvzDomainLookupBy return NULL; } - dom = virGetDomain(conn, vm->vmdef->name, vm->vmdef->uuid); - if (!dom) { - openvzError(conn, VIR_ERR_NO_MEMORY, _("virDomainPtr")); - return NULL; - } - - dom->id = vm->vpsid; + dom = virGetDomain(conn, vm->def->name, vm->def->uuid); + if (!dom) + return NULL; + + dom->id = vm->def->id; return dom; } static int openvzDomainGetInfo(virDomainPtr dom, - virDomainInfoPtr info) { + virDomainInfoPtr info) { struct openvz_driver *driver = (struct openvz_driver *)dom->conn->privateData; - struct openvz_vm *vm = openvzFindVMByUUID(driver, dom->uuid); + virDomainObjPtr vm = virDomainFindByUUID(driver->domains, dom->uuid); if (!vm) { openvzError(dom->conn, VIR_ERR_INVALID_DOMAIN, - _("no domain with matching uuid")); - return -1; - } - - info->state = vm->status; - - if (!openvzIsActiveVM(vm)) { + _("no domain with matching uuid")); + return -1; + } + + info->state = vm->state; + + if (!virDomainIsActive(vm)) { info->cpuTime = 0; } else { if (openvzGetProcessInfo(&(info->cpuTime), dom->id) < 0) { openvzError(dom->conn, VIR_ERR_OPERATION_FAILED, - _("cannot read cputime for domain %d"), dom->id); + _("cannot read cputime for domain %d"), dom->id); return -1; } } /* TODO These need to be calculated differently for OpenVZ */ //info->cpuTime = - //info->maxMem = vm->def->maxmem; - //info->memory = vm->def->memory; - info->nrVirtCpu = vm->vmdef->vcpus; - return 0; -} + info->maxMem = vm->def->maxmem; + info->memory = vm->def->memory; + info->nrVirtCpu = vm->def->vcpus; + return 0; +} + + +static char *openvzDomainDumpXML(virDomainPtr dom, int flags) { + struct openvz_driver *driver = (struct openvz_driver *)dom->conn->privateData; + virDomainObjPtr vm = virDomainFindByUUID(driver->domains, dom->uuid); + + if (!vm) { + openvzError(dom->conn, VIR_ERR_INVALID_DOMAIN, + _("no domain with matching uuid")); + return NULL; + } + + return virDomainDefFormat(dom->conn, vm->def, flags); +} + + static int openvzDomainShutdown(virDomainPtr dom) { struct openvz_driver *driver = (struct openvz_driver *)dom->conn->privateData; - struct openvz_vm *vm = openvzFindVMByUUID(driver, dom->uuid); - const char *prog[] = {VZCTL, "--quiet", "stop", vm->vmdef->name, NULL}; + virDomainObjPtr vm = virDomainFindByUUID(driver->domains, dom->uuid); + const char *prog[] = {VZCTL, "--quiet", "stop", vm->def->name, NULL}; if (!vm) { openvzError(dom->conn, VIR_ERR_INVALID_DOMAIN, - _("no domain with matching id")); - return -1; - } - - if (vm->status != VIR_DOMAIN_RUNNING) { - openvzError(dom->conn, VIR_ERR_OPERATION_DENIED, - _("domain is not in running state")); - return -1; - } - - if (virRun(dom->conn, prog, NULL) < 0) { + _("no domain with matching uuid")); + return -1; + } + + if (vm->state != VIR_DOMAIN_RUNNING) { openvzError(dom->conn, VIR_ERR_INTERNAL_ERROR, - _("Could not exec %s"), VZCTL); - return -1; - } - - vm->vpsid = -1; - vm->status = VIR_DOMAIN_SHUTOFF; - ovz_driver.num_inactive ++; - ovz_driver.num_active --; + _("domain is not in running state")); + return -1; + } + + if (virRun(dom->conn, prog, NULL) < 0) + return -1; + + vm->def->id = -1; + vm->state = VIR_DOMAIN_SHUTOFF; return 0; } @@ -301,26 +299,23 @@ static int openvzDomainReboot(virDomainP static int openvzDomainReboot(virDomainPtr dom, unsigned int flags ATTRIBUTE_UNUSED) { struct openvz_driver *driver = (struct openvz_driver *)dom->conn->privateData; - struct openvz_vm *vm = openvzFindVMByUUID(driver, dom->uuid); - const char *prog[] = {VZCTL, "--quiet", "restart", vm->vmdef->name, NULL}; + virDomainObjPtr vm = virDomainFindByUUID(driver->domains, dom->uuid); + const char *prog[] = {VZCTL, "--quiet", "restart", vm->def->name, NULL}; if (!vm) { openvzError(dom->conn, VIR_ERR_INVALID_DOMAIN, - _("no domain with matching id")); - return -1; - } - - if (vm->status != VIR_DOMAIN_RUNNING) { - openvzError(dom->conn, VIR_ERR_OPERATION_DENIED, - _("domain is not in running state")); - return -1; - } - - if (virRun(dom->conn, prog, NULL) < 0) { + _("no domain with matching uuid")); + return -1; + } + + if (vm->state != VIR_DOMAIN_RUNNING) { openvzError(dom->conn, VIR_ERR_INTERNAL_ERROR, - _("Could not exec %s"), VZCTL); - return -1; - } + _("domain is not in running state")); + return -1; + } + + if (virRun(dom->conn, prog, NULL) < 0) + return -1; return 0; } @@ -421,24 +416,31 @@ openvzDomainDefineXML(virConnectPtr conn openvzDomainDefineXML(virConnectPtr conn, const char *xml) { struct openvz_driver *driver = (struct openvz_driver *) conn->privateData; - struct openvz_vm_def *vmdef = NULL; - struct openvz_vm *vm = NULL; + virDomainDefPtr vmdef = NULL; + virDomainObjPtr vm = NULL; virDomainPtr dom = NULL; const char *prog[OPENVZ_MAX_ARG]; prog[0] = NULL; - if ((vmdef = openvzParseVMDef(conn, xml, NULL)) == NULL) - return NULL; - - vm = openvzFindVMByName(driver, vmdef->name); + if ((vmdef = virDomainDefParseString(conn, driver->caps, xml)) == NULL) + return NULL; + + if (vmdef->os.init == NULL && + !(vmdef->os.init = strdup("/sbin/init"))) { + virDomainDefFree(vmdef); + return NULL; + } + + vm = virDomainFindByName(driver->domains, vmdef->name); if (vm) { + virDomainDefFree(vmdef); openvzLog(OPENVZ_ERR, _("Already an OPENVZ VM active with the id '%s'"), vmdef->name); return NULL; } - if (!(vm = openvzAssignVMDef(conn, driver, vmdef))) { - openvzFreeVMDef(vmdef); - openvzLog(OPENVZ_ERR, "%s", _("Error creating OPENVZ VM")); + if (!(vm = virDomainAssignDef(conn, &driver->domains, vmdef))) { + virDomainDefFree(vmdef); + return NULL; } if (openvzDomainDefineCmd(conn, prog, OPENVZ_MAX_ARG, vmdef) < 0) { @@ -461,11 +463,11 @@ openvzDomainDefineXML(virConnectPtr conn goto exit; } - dom = virGetDomain(conn, vm->vmdef->name, vm->vmdef->uuid); + dom = virGetDomain(conn, vm->def->name, vm->def->uuid); if (dom) - dom->id = vm->vpsid; - - if (openvzDomainSetNetwork(conn, vmdef->name, vmdef->net) < 0) { + dom->id = -1; + + if (openvzDomainSetNetwork(conn, vmdef->name, vmdef->nets) < 0) { openvzError(conn, VIR_ERR_INTERNAL_ERROR, _("Could not configure network")); goto exit; @@ -488,27 +490,33 @@ openvzDomainCreateLinux(virConnectPtr co openvzDomainCreateLinux(virConnectPtr conn, const char *xml, unsigned int flags ATTRIBUTE_UNUSED) { - struct openvz_vm_def *vmdef = NULL; - struct openvz_vm *vm = NULL; + virDomainDefPtr vmdef = NULL; + virDomainObjPtr vm = NULL; virDomainPtr dom = NULL; struct openvz_driver *driver = (struct openvz_driver *) conn->privateData; const char *progstart[] = {VZCTL, "--quiet", "start", NULL, NULL}; const char *progcreate[OPENVZ_MAX_ARG]; progcreate[0] = NULL; - if (!(vmdef = openvzParseVMDef(conn, xml, NULL))) - return NULL; - - vm = openvzFindVMByName(driver, vmdef->name); + if ((vmdef = virDomainDefParseString(conn, driver->caps, xml)) == NULL) + return NULL; + + if (vmdef->os.init == NULL && + !(vmdef->os.init = strdup("/sbin/init"))) { + virDomainDefFree(vmdef); + return NULL; + } + + vm = virDomainFindByName(driver->domains, vmdef->name); if (vm) { - openvzFreeVMDef(vmdef); + virDomainDefFree(vmdef); openvzLog(OPENVZ_ERR, _("Already an OPENVZ VM defined with the id '%d'"), strtoI(vmdef->name)); return NULL; } - if (!(vm = openvzAssignVMDef(conn, driver, vmdef))) { - openvzLog(OPENVZ_ERR, "%s", _("Error creating OPENVZ VM")); + if (!(vm = virDomainAssignDef(conn, &driver->domains, vmdef))) { + virDomainDefFree(vmdef); return NULL; } @@ -530,7 +538,7 @@ openvzDomainCreateLinux(virConnectPtr co goto exit; } - if (openvzDomainSetNetwork(conn, vmdef->name, vmdef->net) < 0) { + if (openvzDomainSetNetwork(conn, vmdef->name, vmdef->nets) < 0) { openvzError(conn, VIR_ERR_INTERNAL_ERROR, _("Could not configure network")); goto exit; @@ -544,20 +552,19 @@ openvzDomainCreateLinux(virConnectPtr co goto exit; } - vm->vpsid = strtoI(vmdef->name); - vm->status = VIR_DOMAIN_RUNNING; - ovz_driver.num_inactive--; - ovz_driver.num_active++; - - dom = virGetDomain(conn, vm->vmdef->name, vm->vmdef->uuid); + vm->pid = strtoI(vmdef->name); + vm->def->id = vm->pid; + vm->state = VIR_DOMAIN_RUNNING; + + dom = virGetDomain(conn, vm->def->name, vm->def->uuid); if (dom) - dom->id = vm->vpsid; + dom->id = vm->def->id; if (vmdef->vcpus > 0) { if (openvzDomainSetVcpus(dom, vmdef->vcpus) < 0) { openvzError(conn, VIR_ERR_INTERNAL_ERROR, - _("Could not set number of virtual cpu")); - goto exit; + _("Could not set number of virtual cpu")); + goto exit; } } @@ -570,8 +577,8 @@ openvzDomainCreate(virDomainPtr dom) openvzDomainCreate(virDomainPtr dom) { struct openvz_driver *driver = (struct openvz_driver *)dom->conn->privateData; - struct openvz_vm *vm = openvzFindVMByName(driver, dom->name); - const char *prog[] = {VZCTL, "--quiet", "start", vm->vmdef->name, NULL }; + virDomainObjPtr vm = virDomainFindByName(driver->domains, dom->name); + const char *prog[] = {VZCTL, "--quiet", "start", vm->def->name, NULL }; if (!vm) { openvzError(dom->conn, VIR_ERR_INVALID_DOMAIN, @@ -579,7 +586,7 @@ openvzDomainCreate(virDomainPtr dom) return -1; } - if (vm->status != VIR_DOMAIN_SHUTOFF) { + if (vm->state != VIR_DOMAIN_SHUTOFF) { openvzError(dom->conn, VIR_ERR_OPERATION_DENIED, _("domain is not in shutoff state")); return -1; @@ -591,10 +598,9 @@ openvzDomainCreate(virDomainPtr dom) return -1; } - vm->vpsid = strtoI(vm->vmdef->name); - vm->status = VIR_DOMAIN_RUNNING; - ovz_driver.num_inactive --; - ovz_driver.num_active ++; + vm->pid = strtoI(vm->def->name); + vm->def->id = vm->pid; + vm->state = VIR_DOMAIN_RUNNING; return 0; } @@ -604,15 +610,15 @@ openvzDomainUndefine(virDomainPtr dom) { virConnectPtr conn= dom->conn; struct openvz_driver *driver = (struct openvz_driver *) conn->privateData; - struct openvz_vm *vm = openvzFindVMByUUID(driver, dom->uuid); - const char *prog[] = { VZCTL, "--quiet", "destroy", vm->vmdef->name, NULL }; + virDomainObjPtr vm = virDomainFindByUUID(driver->domains, dom->uuid); + const char *prog[] = { VZCTL, "--quiet", "destroy", vm->def->name, NULL }; if (!vm) { openvzError(conn, VIR_ERR_INVALID_DOMAIN, _("no domain with matching uuid")); return -1; } - if (openvzIsActiveVM(vm)) { + if (virDomainIsActive(vm)) { openvzError(conn, VIR_ERR_INTERNAL_ERROR, _("cannot delete active domain")); return -1; } @@ -623,7 +629,8 @@ openvzDomainUndefine(virDomainPtr dom) return -1; } - openvzRemoveInactiveVM(driver, vm); + virDomainRemoveInactive(&driver->domains, vm); + return 0; } @@ -632,8 +639,8 @@ openvzDomainSetAutostart(virDomainPtr do { virConnectPtr conn= dom->conn; struct openvz_driver *driver = (struct openvz_driver *) conn->privateData; - struct openvz_vm *vm = openvzFindVMByUUID(driver, dom->uuid); - const char *prog[] = { VZCTL, "--quiet", "set", vm->vmdef->name, + virDomainObjPtr vm = virDomainFindByUUID(driver->domains, dom->uuid); + const char *prog[] = { VZCTL, "--quiet", "set", vm->def->name, "--onboot", autostart ? "yes" : "no", "--save", NULL }; @@ -655,7 +662,7 @@ openvzDomainGetAutostart(virDomainPtr do { virConnectPtr conn= dom->conn; struct openvz_driver *driver = (struct openvz_driver *) conn->privateData; - struct openvz_vm *vm = openvzFindVMByUUID(driver, dom->uuid); + virDomainObjPtr vm = virDomainFindByUUID(driver->domains, dom->uuid); char value[1024]; if (!vm) { @@ -663,7 +670,7 @@ openvzDomainGetAutostart(virDomainPtr do return -1; } - if (openvzReadConfigParam(strtoI(vm->vmdef->name), "ONBOOT", value, sizeof(value)) < 0) { + if (openvzReadConfigParam(strtoI(vm->def->name), "ONBOOT", value, sizeof(value)) < 0) { openvzError(conn, VIR_ERR_INTERNAL_ERROR, _("Could not read container config")); return -1; } @@ -692,32 +699,32 @@ static int openvzDomainSetVcpus(virDomai static int openvzDomainSetVcpus(virDomainPtr dom, unsigned int nvcpus) { virConnectPtr conn= dom->conn; struct openvz_driver *driver = (struct openvz_driver *) conn->privateData; - struct openvz_vm *vm = openvzFindVMByUUID(driver, dom->uuid); + virDomainObjPtr vm = virDomainFindByUUID(driver->domains, dom->uuid); char str_vcpus[32]; - const char *prog[] = { VZCTL, "--quiet", "set", vm->vmdef->name, + const char *prog[] = { VZCTL, "--quiet", "set", vm->def->name, "--cpus", str_vcpus, "--save", NULL }; snprintf(str_vcpus, 31, "%d", nvcpus); str_vcpus[31] = '\0'; if (nvcpus <= 0) { openvzError(conn, VIR_ERR_INTERNAL_ERROR, - _("VCPUs should be >= 1")); + _("VCPUs should be >= 1")); return -1; } if (!vm) { openvzError(conn, VIR_ERR_INVALID_DOMAIN, - _("no domain with matching uuid")); + _("no domain with matching uuid")); return -1; } if (virRun(conn, prog, NULL) < 0) { openvzError(conn, VIR_ERR_INTERNAL_ERROR, - _("Could not exec %s"), VZCTL); - return -1; - } - - vm->vmdef->vcpus = nvcpus; + _("Could not exec %s"), VZCTL); + return -1; + } + + vm->def->vcpus = nvcpus; return 0; } @@ -735,51 +742,48 @@ static virDrvOpenStatus openvzOpen(virCo virConnectAuthPtr auth ATTRIBUTE_UNUSED, int flags ATTRIBUTE_UNUSED) { - struct openvz_vm *vms; - + struct openvz_driver *driver; /*Just check if the user is root. Nothing really to open for OpenVZ */ - if (getuid()) { // OpenVZ tools can only be used by r00t - return VIR_DRV_OPEN_DECLINED; - } else { - if (uri == NULL || uri->scheme == NULL || uri->path == NULL) - return VIR_DRV_OPEN_DECLINED; - if (STRNEQ (uri->scheme, "openvz")) - return VIR_DRV_OPEN_DECLINED; - if (STRNEQ (uri->path, "/system")) - return VIR_DRV_OPEN_DECLINED; - } + if (getuid()) { // OpenVZ tools can only be used by r00t + return VIR_DRV_OPEN_DECLINED; + } else { + if (uri == NULL || uri->scheme == NULL || uri->path == NULL) + return VIR_DRV_OPEN_DECLINED; + if (STRNEQ (uri->scheme, "openvz")) + return VIR_DRV_OPEN_DECLINED; + if (STRNEQ (uri->path, "/system")) + return VIR_DRV_OPEN_DECLINED; + } /* See if we are running an OpenVZ enabled kernel */ - if(access("/proc/vz/veinfo", F_OK) == -1 || - access("/proc/user_beancounters", F_OK) == -1) { - return VIR_DRV_OPEN_DECLINED; - } - - conn->privateData = &ovz_driver; - - openvzAssignUUIDs(); - - vms = openvzGetVPSInfo(conn); - ovz_driver.vms = vms; - - return VIR_DRV_OPEN_SUCCESS; + if(access("/proc/vz/veinfo", F_OK) == -1 || + access("/proc/user_beancounters", F_OK) == -1) { + return VIR_DRV_OPEN_DECLINED; + } + + if (VIR_ALLOC(driver) < 0) { + openvzError(conn, VIR_ERR_NO_MEMORY, NULL); + return VIR_DRV_OPEN_ERROR; + } + + if (!(driver->caps = openvzCapsInit())) + goto cleanup; + + if (openvzLoadDomains(driver) < 0) + goto cleanup; + + conn->privateData = driver; + + return VIR_DRV_OPEN_SUCCESS; + +cleanup: + openvzFreeDriver(driver); + return VIR_DRV_OPEN_ERROR; }; static int openvzClose(virConnectPtr conn) { - struct openvz_driver *driver = (struct openvz_driver *)conn->privateData; - struct openvz_vm *vm = driver->vms; - - while(vm) { - openvzFreeVMDef(vm->vmdef); - vm = vm->next; - } - vm = driver->vms; - while (vm) { - struct openvz_vm *prev = vm; - vm = vm->next; - free(prev); - } - + + openvzFreeDriver(driver); conn->privateData = NULL; return 0; @@ -792,6 +796,12 @@ static int openvzGetNodeInfo(virConnectP static int openvzGetNodeInfo(virConnectPtr conn, virNodeInfoPtr nodeinfo) { return virNodeInfoPopulate(conn, nodeinfo); +} + +static char *openvzGetCapabilities(virConnectPtr conn) { + struct openvz_driver *driver = (struct openvz_driver *)conn->privateData; + + return virCapabilitiesFormatXML(driver->caps); } static int openvzListDomains(virConnectPtr conn, int *ids, int nids) { @@ -829,14 +839,22 @@ static int openvzListDomains(virConnectP } static int openvzNumDomains(virConnectPtr conn ATTRIBUTE_UNUSED) { - return ovz_driver.num_active; + struct openvz_driver *driver = conn->privateData; + int nactive = 0; + virDomainObjPtr vm = driver->domains; + while (vm) { + if (virDomainIsActive(vm)) + nactive++; + vm = vm->next; + } + return nactive; } static int openvzListDefinedDomains(virConnectPtr conn, - char **const names, int nnames) { + char **const names, int nnames) { int got = 0; int veid, pid, outfd = -1, errfd = -1, ret; - char vpsname[OPENVZ_NAME_MAX]; + char vpsname[32]; char buf[32]; char *endptr; const char *cmd[] = {VZLIST, "-ovpsid", "-H", "-S", NULL}; @@ -858,7 +876,7 @@ static int openvzListDefinedDomains(virC _("Could not parse VPS ID %s"), buf); continue; } - sprintf(vpsname, "%d", veid); + snprintf(vpsname, sizeof(vpsname), "%d", veid); names[got] = strdup(vpsname); got ++; } @@ -911,8 +929,16 @@ Version: 2.2 return 0; } -static int openvzNumDefinedDomains(virConnectPtr conn ATTRIBUTE_UNUSED) { - return ovz_driver.num_inactive; +static int openvzNumDefinedDomains(virConnectPtr conn) { + struct openvz_driver *driver = (struct openvz_driver *) conn->privateData; + int ninactive = 0; + virDomainObjPtr vm = driver->domains; + while (vm) { + if (!virDomainIsActive(vm)) + ninactive++; + vm = vm->next; + } + return ninactive; } static virDriver openvzDriver = { @@ -929,7 +955,7 @@ static virDriver openvzDriver = { NULL, /* uri */ openvzGetMaxVCPUs, /* getMaxVcpus */ openvzGetNodeInfo, /* nodeGetInfo */ - NULL, /* getCapabilities */ + openvzGetCapabilities, /* getCapabilities */ openvzListDomains, /* listDomains */ openvzNumDomains, /* numOfDomains */ openvzDomainCreateLinux, /* domainCreateLinux */ @@ -953,7 +979,7 @@ static virDriver openvzDriver = { NULL, /* domainPinVcpu */ NULL, /* domainGetVcpus */ openvzDomainGetMaxVcpus, /* domainGetMaxVcpus */ - NULL, /* domainDumpXML */ + openvzDomainDumpXML, /* domainDumpXML */ openvzListDefinedDomains, /* listDomains */ openvzNumDefinedDomains, /* numOfDomains */ openvzDomainCreate, /* domainCreate */ diff -r e270be59a80f src/openvz_driver.h --- a/src/openvz_driver.h Wed Aug 27 17:03:25 2008 +0100 +++ b/src/openvz_driver.h Wed Aug 27 17:03:45 2008 +0100 @@ -31,24 +31,6 @@ #include "internal.h" -/* OpenVZ commands - Replace with wrapper scripts later? */ -#define VZLIST "vzlist" -#define VZCTL "vzctl" - -struct openvz_driver { - struct openvz_vm *vms; - int num_active; - int num_inactive; -}; - int openvzRegister(void); -#define openvzLog(level, msg...) { if(level == OPENVZ_WARN) \ - fprintf(stderr, "\nWARNING: ");\ - else \ - fprintf(stderr, "\nERROR: ");\ - fprintf(stderr, "\n\t");\ - fprintf(stderr, msg);\ - fprintf(stderr, "\n"); } - #endif -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

4 10

[libvirt] PATCH: Only pass in emulator if user requested it
by Daniel P. Berrange 05 Sep '08

05 Sep '08

Previouly with Xen we would only specify an emulator path to XenD if there was one provided in the XML. With the new domain XML routines we will always lookup the default emulator path internally using our capabilities data. So XenD sees an explicit emulator path even if the user didn't request one. This works fine, except for paravirt guests where you only want to have the text console active, and not the graphical framebuffer. In this scenario, XenD starts QEMU-DM to handle the text console, but it crashes because PVFB isn't configured. This patch switches us back to the old behaviour where we only pass an emulator to XenD if the user actually specified one - XenD is intelligent enough to auto-configure a QEMU instance for paravirt framebuffers as needed. The logic looking up the default emulator did live in the generic XML parsing routines. This patch removes it from the XML parsing stage, and pushes it down into the individual drivers at time of use (if they so desire). src/domain_conf.c | 47 +++++++++++++++---------- src/domain_conf.h | 5 ++ src/lxc_driver.c | 10 ++++- src/qemu_conf.c | 6 +++ src/qemu_driver.c | 15 +++++-- src/xm_internal.c | 20 ---------- tests/xmconfigdata/test-paravirt-net-e1000.xml | 1 tests/xmconfigdata/test-paravirt-new-pvfb.xml | 1 tests/xmconfigdata/test-paravirt-old-pvfb.xml | 1 tests/xml2sexprdata/xml2sexpr-fv-kernel.xml | 1 tests/xml2sexprdata/xml2sexpr-pv-vfb-new.sexpr | 2 - 11 files changed, 62 insertions(+), 47 deletions(-) Daniel diff -r d1308575c2d3 src/domain_conf.c --- a/src/domain_conf.c Mon Sep 01 14:48:19 2008 +0100 +++ b/src/domain_conf.c Mon Sep 01 15:00:46 2008 +0100 @@ -1917,24 +1917,6 @@ static virDomainDefPtr virDomainDefParse } def->emulator = virXPathString(conn, "string(./devices/emulator[1])", ctxt); - if (!def->emulator) { - const char *type = virDomainVirtTypeToString(def->virtType); - if (!type) { - virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, - "%s", _("unknown virt type")); - goto error; - } - const char *emulator = virCapabilitiesDefaultGuestEmulator(caps, - def->os.type, - def->os.arch, - type); - - if (emulator && - !(def->emulator = strdup(emulator))) { - virDomainReportError(conn, VIR_ERR_NO_MEMORY, NULL); - goto error; - } - } /* analysis of the disk devices */ if ((n = virXPathNodeSet(conn, "./devices/disk", ctxt, &nodes)) < 0) { @@ -3404,4 +3386,33 @@ char *virDomainConfigFile(virConnectPtr } +const char *virDomainDefDefaultEmulator(virConnectPtr conn, + virDomainDefPtr def, + virCapsPtr caps) { + const char *type; + const char *emulator; + + type = virDomainVirtTypeToString(def->virtType); + if (!type) { + virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, + "%s", _("unknown virt type")); + return NULL; + } + + emulator = virCapabilitiesDefaultGuestEmulator(caps, + def->os.type, + def->os.arch, + type); + + if (!emulator) { + virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, + _("no emulator for domain %s os type %s on architecture %s"), + type, def->os.type, def->os.arch); + return NULL; + } + + return emulator; +} + + #endif /* ! PROXY */ diff -r d1308575c2d3 src/domain_conf.h --- a/src/domain_conf.h Mon Sep 01 14:48:19 2008 +0100 +++ b/src/domain_conf.h Mon Sep 01 15:00:57 2008 +0100 @@ -556,6 +556,11 @@ virDomainNetDefPtr virDomainNetDefParseX virDomainNetDefPtr virDomainNetDefParseXML(virConnectPtr conn, xmlNodePtr node); +const char *virDomainDefDefaultEmulator(virConnectPtr conn, + virDomainDefPtr def, + virCapsPtr caps); + + VIR_ENUM_DECL(virDomainVirt) VIR_ENUM_DECL(virDomainBoot) VIR_ENUM_DECL(virDomainFeature) diff -r d1308575c2d3 src/lxc_driver.c --- a/src/lxc_driver.c Mon Sep 01 14:48:19 2008 +0100 +++ b/src/lxc_driver.c Mon Sep 01 15:12:34 2008 +0100 @@ -623,6 +623,8 @@ static int lxcControllerStart(virConnect int status; fd_set keepfd; char appPtyStr[30]; + const char *emulator; + lxc_driver_t *driver = conn->privateData; FD_ZERO(&keepfd); @@ -650,7 +652,13 @@ static int lxcControllerStart(virConnect snprintf(appPtyStr, sizeof(appPtyStr), "%d", appPty); - ADD_ARG_LIT(vm->def->emulator); + emulator = vm->def->emulator; + if (!emulator) + emulator = virDomainDefDefaultEmulator(conn, vm->def, driver->caps); + if (!emulator) + return -1; + + ADD_ARG_LIT(emulator); ADD_ARG_LIT("--name"); ADD_ARG_LIT(vm->def->name); ADD_ARG_LIT("--console"); diff -r d1308575c2d3 src/qemu_conf.c --- a/src/qemu_conf.c Mon Sep 01 14:48:19 2008 +0100 +++ b/src/qemu_conf.c Mon Sep 01 15:10:36 2008 +0100 @@ -712,6 +712,7 @@ int qemudBuildCommandLine(virConnectPtr int disableKQEMU = 0; int qargc = 0, qarga = 0; const char **qargv = NULL; + const char *emulator; uname(&ut); @@ -767,6 +768,11 @@ int qemudBuildCommandLine(virConnectPtr snprintf(memory, sizeof(memory), "%lu", vm->def->memory/1024); snprintf(vcpus, sizeof(vcpus), "%lu", vm->def->vcpus); + emulator = vm->def->emulator; + if (!emulator) + emulator = virDomainDefDefaultEmulator(conn, vm->def, driver->caps); + if (!emulator) + return -1; ADD_ARG_LIT(vm->def->emulator); ADD_ARG_LIT("-S"); diff -r d1308575c2d3 src/qemu_driver.c --- a/src/qemu_driver.c Mon Sep 01 14:48:19 2008 +0100 +++ b/src/qemu_driver.c Mon Sep 01 15:10:47 2008 +0100 @@ -849,6 +849,7 @@ static int qemudStartVMDaemon(virConnect int ntapfds = 0; unsigned int qemuCmdFlags; fd_set keepfd; + const char *emulator; FD_ZERO(&keepfd); @@ -908,24 +909,30 @@ static int qemudStartVMDaemon(virConnect return -1; } + emulator = vm->def->emulator; + if (!emulator) + emulator = virDomainDefDefaultEmulator(conn, vm->def, driver->caps); + if (!emulator) + return -1; + /* Make sure the binary we are about to try exec'ing exists. * Technically we could catch the exec() failure, but that's * in a sub-process so its hard to feed back a useful error */ - if (stat(vm->def->emulator, &sb) < 0) { + if (stat(emulator, &sb) < 0) { qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, _("Cannot find QEMU binary %s: %s"), - vm->def->emulator, + emulator, strerror(errno)); return -1; } - if (qemudExtractVersionInfo(vm->def->emulator, + if (qemudExtractVersionInfo(emulator, NULL, &qemuCmdFlags) < 0) { qemudReportError(conn, NULL, NULL, VIR_ERR_INTERNAL_ERROR, _("Cannot determine QEMU argv syntax %s"), - vm->def->emulator); + emulator); return -1; } diff -r d1308575c2d3 src/xm_internal.c --- a/src/xm_internal.c Mon Sep 01 14:48:19 2008 +0100 +++ b/src/xm_internal.c Mon Sep 01 15:08:37 2008 +0100 @@ -785,26 +785,6 @@ xenXMDomainConfigParse(virConnectPtr con if (xenXMConfigCopyStringOpt(conn, conf, "device_model", &def->emulator) < 0) goto cleanup; - if (def->emulator == NULL) { - const char *type = virDomainVirtTypeToString(def->virtType); - if (!type) { - xenXMError(conn, VIR_ERR_INTERNAL_ERROR, - "%s", _("unknown virt type")); - goto cleanup; - } - const char *emulator = virCapabilitiesDefaultGuestEmulator(priv->caps, - def->os.type, - def->os.arch, - type); - if (!emulator) { - xenXMError(conn, VIR_ERR_INTERNAL_ERROR, - "%s", _("unsupported guest type")); - goto cleanup; - } - if (!(def->emulator = strdup(emulator))) - goto no_memory; - } - list = virConfGetValue(conf, "disk"); if (list && list->type == VIR_CONF_LIST) { list = list->list; diff -r d1308575c2d3 tests/xmconfigdata/test-paravirt-net-e1000.xml --- a/tests/xmconfigdata/test-paravirt-net-e1000.xml Mon Sep 01 14:48:19 2008 +0100 +++ b/tests/xmconfigdata/test-paravirt-net-e1000.xml Mon Sep 01 15:21:27 2008 +0100 @@ -13,7 +13,6 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/lib/xen/bin/qemu-dm</emulator> <disk type='block' device='disk'> <driver name='phy'/> <source dev='/dev/HostVG/XenGuest1'/> diff -r d1308575c2d3 tests/xmconfigdata/test-paravirt-new-pvfb.xml --- a/tests/xmconfigdata/test-paravirt-new-pvfb.xml Mon Sep 01 14:48:19 2008 +0100 +++ b/tests/xmconfigdata/test-paravirt-new-pvfb.xml Mon Sep 01 15:20:59 2008 +0100 @@ -13,7 +13,6 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/lib/xen/bin/qemu-dm</emulator> <disk type='block' device='disk'> <driver name='phy'/> <source dev='/dev/HostVG/XenGuest1'/> diff -r d1308575c2d3 tests/xmconfigdata/test-paravirt-old-pvfb.xml --- a/tests/xmconfigdata/test-paravirt-old-pvfb.xml Mon Sep 01 14:48:19 2008 +0100 +++ b/tests/xmconfigdata/test-paravirt-old-pvfb.xml Mon Sep 01 15:21:15 2008 +0100 @@ -13,7 +13,6 @@ <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> - <emulator>/usr/lib/xen/bin/qemu-dm</emulator> <disk type='block' device='disk'> <driver name='phy'/> <source dev='/dev/HostVG/XenGuest1'/> diff -r d1308575c2d3 tests/xml2sexprdata/xml2sexpr-fv-kernel.xml --- a/tests/xml2sexprdata/xml2sexpr-fv-kernel.xml Mon Sep 01 14:48:19 2008 +0100 +++ b/tests/xml2sexprdata/xml2sexpr-fv-kernel.xml Mon Sep 01 15:19:55 2008 +0100 @@ -14,6 +14,7 @@ <on_reboot>destroy</on_reboot> <on_crash>destroy</on_crash> <devices> + <emulator>/usr/lib/xen/bin/qemu-dm</emulator> <disk type='file' device='disk'> <source file='/root/some.img'/> <target dev='xvda'/> diff -r d1308575c2d3 tests/xml2sexprdata/xml2sexpr-pv-vfb-new.sexpr --- a/tests/xml2sexprdata/xml2sexpr-pv-vfb-new.sexpr Mon Sep 01 14:48:19 2008 +0100 +++ b/tests/xml2sexprdata/xml2sexpr-pv-vfb-new.sexpr Mon Sep 01 15:20:16 2008 +0100 @@ -1,1 +1,1 @@ -(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5… ')(device_model '/usr/lib/xen/bin/qemu-dm')))(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w')))(device (vkbd))(device (vfb (type vnc)(vncunused 0)(vncdisplay 6)(vnclisten '127.0.0.1')(vncpasswd '123456')(keymap 'ja')))) \ No newline at end of file +(vm (name 'pvtest')(memory 420)(maxmem 420)(vcpus 2)(uuid '596a5d21-71f4-8fb2-e068-e2386a5c413e')(on_poweroff 'destroy')(on_reboot 'destroy')(on_crash 'destroy')(image (linux (kernel '/var/lib/xen/vmlinuz.2Dn2YT')(ramdisk '/var/lib/xen/initrd.img.0u-Vhq')(args ' method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5… ')))(device (vbd (dev 'xvda')(uname 'file:/root/some.img')(mode 'w')))(device (vkbd))(device (vfb (type vnc)(vncunused 0)(vncdisplay 6)(vnclisten '127.0.0.1')(vncpasswd '123456')(keymap 'ja')))) \ No newline at end of file -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

3 3

[libvirt] remote_protocol.{c,h} ?
by Jun Koi 05 Sep '08

05 Sep '08

Hi, Is it really true that qemud/remote_protocol.{c,h} are created by rpcgen? If so, why dont we have them created at compile time? I still see them in the source code. I modified remote_protocol.x a bit, and when recompiling, remote_protocol.{c,h} are not reflected at all. So it is expected that developers must recompile with rpcgen themself?? Thanks, Jun

2 6

[libvirt] [PATCH] Fix vnc port determining for xend
by Cole Robinson 04 Sep '08

04 Sep '08

Current libvirt checks xenstore for a xen guests fixed vnc port on xend > 3.0.3. At least on f8 though, hvm guests don't store the vnc port in xenstore, it is stored in the sexpr. Patch fixes the logic to look in the sexpr if the xenstore lookup appears to fail. This fixes setting static vnc ports for f8 xen hvm guests. Thanks, Cole diff --git a/src/xend_internal.c b/src/xend_internal.c index 2a687c3..0b62dd0 100644 --- a/src/xend_internal.c +++ b/src/xend_internal.c @@ -2121,6 +2121,10 @@ xenDaemonParseSxprGraphicsNew(virConnectPtr conn, goto no_memory; } else { int port = xenStoreDomainGetVNCPort(conn, def->id); + if (port == -1) { + // Didn't find port entry in xenstore + port = sexpr_int(node, "device/vfb/vncdisplay"); + } const char *listenAddr = sexpr_node(node, "device/vfb/vnclisten"); const char *vncPasswd = sexpr_node(node, "device/vfb/vncpasswd");; const char *keymap = sexpr_node(node, "device/vfb/keymap");

3 5

[libvirt] [PATCH] Fix capacity reporting for qcow2 images
by Cole Robinson 04 Sep '08

04 Sep '08

Libvirt was reporting some ridiculously large 'capacity' values for some qcow2 images I was creating with relatively small sizes (200 MB). Seems there was a signedness problem when parsing the file header. The attached fix shows the expected values and doesn't look like it will hurt elsewhere. Thanks, Cole

2 1

[libvirt] PATCH: Add a augeas lens for libvirtd.conf
by Daniel P. Berrange 04 Sep '08

04 Sep '08

Augeas is a awesome config file manipulation tool. libvirtd has a config file. libvirtd meet augeas; augeas meet libvirt. Now instead of telling people 'edit /etc/libvirt/libvirtd.conf and change listen_tls to 1, and auth_tls to sasl' we can say run # augtool <<EOF set /files/etc/libvirt/libvirtd.conf/listen_tls 1 set /files/etc/libvirt/libvirtd.conf/auth_tls sasl save EOF THis patch is intended to be committed to libvirt, so the config file rules are distributed alongside libvirt. I'm CC'ing augeas-devel for feedback on the lens itself. libvirt.spec.in | 2 qemud/Makefile.am | 8 qemud/libvirtd.aug | 64 ++++++ qemud/test_libvirtd.aug | 484 ++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 558 insertions(+) Daniel Index: qemud/Makefile.am =================================================================== RCS file: /data/cvs/libvirt/qemud/Makefile.am,v retrieving revision 1.51 diff -u -p -r1.51 Makefile.am --- qemud/Makefile.am 20 Aug 2008 20:48:35 -0000 1.51 +++ qemud/Makefile.am 26 Aug 2008 20:03:48 -0000 @@ -24,6 +24,8 @@ EXTRA_DIST = \ libvirtd.policy \ libvirtd.sasl \ libvirtd.sysconf \ + libvirtd.aug \ + test_libvirtd.aug \ $(AVAHI_SOURCES) \ $(DAEMON_SOURCES) @@ -56,6 +58,12 @@ sbin_PROGRAMS = libvirtd confdir = $(sysconfdir)/libvirt/ conf_DATA = libvirtd.conf +augeasdir = $(datadir)/augeas/lenses +augeas_DATA = libvirtd.aug + +augeastestsdir = $(datadir)/augeas/lenses/tests +augeastests_DATA = test_libvirtd.aug + libvirtd_SOURCES = $(DAEMON_SOURCES) #-D_XOPEN_SOURCE=600 -D_XOPEN_SOURCE_EXTENDED=1 -D_POSIX_C_SOURCE=199506L Index: qemud/libvirtd.aug =================================================================== RCS file: qemud/libvirtd.aug diff -N qemud/libvirtd.aug --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ qemud/libvirtd.aug 26 Aug 2008 20:03:48 -0000 @@ -0,0 +1,64 @@ +(* /etc/libvirt/libvirtd.conf *) + +module Libvirtd = + autoload xfm + + let eol = del /[ \t]*\n/ "\n" + let value_sep = del /[ \t]*=[ \t]*/ " = " + let prespace = del /[ \t]*/ "" + + let array_sep = del /,[ \t\n]*/ ", " + let array_start = del /\[[ \t\n]*/ "[ " + let array_end = del /\]/ " ]" + + let str_val = del /\"/ "\"" . store /[^\"]*/ . del /\"/ "\"" + let bool_val = store /0|1/ + let str_array_element = [ str_val ] . del /[ \t\n]*/ "" + let str_array_val = array_start . ( str_array_element . ( array_sep . str_array_element ) * ) ? . array_end + + let str_entry (kw:string) = [ prespace . key kw . value_sep . str_val . eol ] + let bool_entry (kw:string) = [ prespace . key kw . value_sep . bool_val . eol ] + let str_array_entry (kw:string) = [ prespace . key kw . value_sep . str_array_val . eol ] + + let network_entry = bool_entry "listen_tls" + | bool_entry "listen_tcp" + | str_entry "tls_port" + | str_entry "tcp_port" + | str_entry "listen_addr" + | bool_entry "mdns_adv" + | str_entry "mdns_name" + + let sock_acl_entry = str_entry "unix_sock_group" + | str_entry "unix_sock_ro_perms" + | str_entry "unix_sock_rw_perms" + + let authentication_entry = str_entry "auth_unix_ro" + | str_entry "auth_unix_rw" + | str_entry "auth_tcp" + | str_entry "auth_tls" + + let certificate_entry = str_entry "key_file" + | str_entry "cert_file" + | str_entry "ca_file" + | str_entry "crl_file" + + let authorization_entry = bool_entry "tls_no_verify_certificate" + | str_array_entry "tls_allowed_dn_list" + | str_array_entry "sasl_allowed_username_list" + + let entry = network_entry + | sock_acl_entry + | authentication_entry + | certificate_entry + | authorization_entry + + let comment = [ label "comment" . del /#[ \t]*/ "# " . store /([^ \t\n][^\n]*)?/ . del /\n/ "\n" ] + let empty = [ label "empty" . del /[ \t]*\n/ "" ] + + let lns = ( entry | comment | empty ) + + + let filter = incl "/etc/libvirt/libvirtd.conf" + . Util.stdexcl + + let xfm = transform lns filter + Index: qemud/test_libvirtd.aug =================================================================== RCS file: qemud/test_libvirtd.aug diff -N qemud/test_libvirtd.aug --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ qemud/test_libvirtd.aug 26 Aug 2008 20:03:48 -0000 @@ -0,0 +1,484 @@ +module Test_libvirtd = + let conf1 = "# Master libvirt daemon configuration file +# +# For further information consult http://libvirt.org/format.html + + +################################################################# +# +# Network connectivity controls +# + +# Flag listening for secure TLS connections on the public TCP/IP port. +# NB, must pass the --listen flag to the libvirtd process for this to +# have any effect. +# +# It is necessary to setup a CA and issue server certificates before +# using this capability. +# +# This is enabled by default, uncomment this to disable it +listen_tls = 0 +" + + let conf = "# Master libvirt daemon configuration file +# +# For further information consult http://libvirt.org/format.html + + +################################################################# +# +# Network connectivity controls +# + +# Flag listening for secure TLS connections on the public TCP/IP port. +# NB, must pass the --listen flag to the libvirtd process for this to +# have any effect. +# +# It is necessary to setup a CA and issue server certificates before +# using this capability. +# +# This is enabled by default, uncomment this to disable it +listen_tls = 0 + +# Listen for unencrypted TCP connections on the public TCP/IP port. +# NB, must pass the --listen flag to the libvirtd process for this to +# have any effect. +# +# Using the TCP socket requires SASL authentication by default. Only +# SASL mechanisms which support data encryption are allowed. This is +# DIGEST_MD5 and GSSAPI (Kerberos5) +# +# This is disabled by default, uncomment this to enable it. +listen_tcp = 1 + + + +# Override the port for accepting secure TLS connections +# This can be a port number, or service name +# +tls_port = \"16514\" + +# Override the port for accepting insecure TCP connections +# This can be a port number, or service name +# +tcp_port = \"16509\" + + +# Override the default configuration which binds to all network +# interfaces. This can be a numeric IPv4/6 address, or hostname +# +listen_addr = \"192.168.0.1\" + + +# Flag toggling mDNS advertizement of the libvirt service. +# +# Alternatively can disable for all services on a host by +# stopping the Avahi daemon +# +# This is enabled by default, uncomment this to disable it +mdns_adv = 0 + +# Override the default mDNS advertizement name. This must be +# unique on the immediate broadcast network. +# +# The default is \"Virtualization Host HOSTNAME\", where HOSTNAME +# is subsituted for the short hostname of the machine (without domain) +# +mdns_name = \"Virtualization Host Joe Demo\" + + +################################################################# +# +# UNIX socket access controls +# + +# Set the UNIX domain socket group ownership. This can be used to +# allow a 'trusted' set of users access to management capabilities +# without becoming root. +# +# This is restricted to 'root' by default. +unix_sock_group = \"libvirt\" + +# Set the UNIX socket permissions for the R/O socket. This is used +# for monitoring VM status only +# +# Default allows any user. If setting group ownership may want to +# restrict this to: +unix_sock_ro_perms = \"0777\" + +# Set the UNIX socket permissions for the R/W socket. This is used +# for full management of VMs +# +# Default allows only root. If PolicyKit is enabled on the socket, +# the default will change to allow everyone (eg, 0777) +# +# If not using PolicyKit and setting group ownership for access +# control then you may want to relax this to: +unix_sock_rw_perms = \"0770\" + + + +################################################################# +# +# Authentication. +# +# - none: do not perform auth checks. If you can connect to the +# socket you are allowed. This is suitable if there are +# restrictions on connecting to the socket (eg, UNIX +# socket permissions), or if there is a lower layer in +# the network providing auth (eg, TLS/x509 certificates) +# +# - sasl: use SASL infrastructure. The actual auth scheme is then +# controlled from /etc/sasl2/libvirt.conf. For the TCP +# socket only GSSAPI & DIGEST-MD5 mechanisms will be used. +# For non-TCP or TLS sockets, any scheme is allowed. +# +# - polkit: use PolicyKit to authenticate. This is only suitable +# for use on the UNIX sockets. The default policy will +# require a user to supply their own password to gain +# full read/write access (aka sudo like), while anyone +# is allowed read/only access. +# +# Set an authentication scheme for UNIX read-only sockets +# By default socket permissions allow anyone to connect +# +# To restrict monitoring of domains you may wish to enable +# an authentication mechanism here +auth_unix_ro = \"none\" + +# Set an authentication scheme for UNIX read-write sockets +# By default socket permissions only allow root. If PolicyKit +# support was compiled into libvirt, the default will be to +# use 'polkit' auth. +# +# If the unix_sock_rw_perms are changed you may wish to enable +# an authentication mechanism here +auth_unix_rw = \"none\" + +# Change the authentication scheme for TCP sockets. +# +# If you don't enable SASL, then all TCP traffic is cleartext. +# Don't do this outside of a dev/test scenario. For real world +# use, always enable SASL and use the GSSAPI or DIGEST-MD5 +# mechanism in /etc/sasl2/libvirt.conf +auth_tcp = \"sasl\" + +# Change the authentication scheme for TLS sockets. +# +# TLS sockets already have encryption provided by the TLS +# layer, and limited authentication is done by certificates +# +# It is possible to make use of any SASL authentication +# mechanism as well, by using 'sasl' for this option +auth_tls = \"none\" + + + +################################################################# +# +# TLS x509 certificate configuration +# + + +# Override the default server key file path +# +key_file = \"/etc/pki/libvirt/private/serverkey.pem\" + +# Override the default server certificate file path +# +cert_file = \"/etc/pki/libvirt/servercert.pem\" + +# Override the default CA certificate path +# +ca_file = \"/etc/pki/CA/cacert.pem\" + +# Specify a certificate revocation list. +# +# Defaults to not using a CRL, uncomment to enable it +crl_file = \"/etc/pki/CA/crl.pem\" + + + +################################################################# +# +# Authorization controls +# + + +# Flag to disable verification of client certificates +# +# Client certificate verification is the primary authentication mechanism. +# Any client which does not present a certificate signed by the CA +# will be rejected. +# +# Default is to always verify. Uncommenting this will disable +# verification - make sure an IP whitelist is set +tls_no_verify_certificate = 1 + + +# A whitelist of allowed x509 Distinguished Names +# This list may contain wildcards such as +# +# \"C=GB,ST=London,L=London,O=Red Hat,CN=*\" +# +# See the POSIX fnmatch function for the format of the wildcards. +# +# NB If this is an empty list, no client can connect, so comment out +# entirely rather than using empty list to disable these checks +# +# By default, no DN's are checked + tls_allowed_dn_list = [\"DN1\", \"DN2\"] + + +# A whitelist of allowed SASL usernames. The format for usernames +# depends on the SASL authentication mechanism. Kerberos usernames +# look like username@REALM +# +# This list may contain wildcards such as +# +# \"*(a)EXAMPLE.COM\" +# +# See the POSIX fnmatch function for the format of the wildcards. +# +# NB If this is an empty list, no client can connect, so comment out +# entirely rather than using empty list to disable these checks +# +# By default, no Username's are checked +sasl_allowed_username_list = [ + \"joe(a)EXAMPLE.COM\", + \"fred(a)EXAMPLE.COM\" +] +" + + test Libvirtd.lns get conf = + { "comment" = "Master libvirt daemon configuration file" } + { "comment" = "" } + { "comment" = "For further information consult http://libvirt.org/format.html" } + { "empty" } + { "empty" } + { "comment" = "################################################################" } + { "comment" = "" } + { "comment" = "Network connectivity controls" } + { "comment" = "" } + { "empty" } + { "comment" = "Flag listening for secure TLS connections on the public TCP/IP port." } + { "comment" = "NB, must pass the --listen flag to the libvirtd process for this to" } + { "comment" = "have any effect." } + { "comment" = "" } + { "comment" = "It is necessary to setup a CA and issue server certificates before" } + { "comment" = "using this capability." } + { "comment" = "" } + { "comment" = "This is enabled by default, uncomment this to disable it" } + { "listen_tls" = "0" } + { "empty" } + { "comment" = "Listen for unencrypted TCP connections on the public TCP/IP port." } + { "comment" = "NB, must pass the --listen flag to the libvirtd process for this to" } + { "comment" = "have any effect." } + { "comment" = "" } + { "comment" = "Using the TCP socket requires SASL authentication by default. Only" } + { "comment" = "SASL mechanisms which support data encryption are allowed. This is" } + { "comment" = "DIGEST_MD5 and GSSAPI (Kerberos5)" } + { "comment" = "" } + { "comment" = "This is disabled by default, uncomment this to enable it." } + { "listen_tcp" = "1" } + { "empty" } + { "empty" } + { "empty" } + { "comment" = "Override the port for accepting secure TLS connections" } + { "comment" = "This can be a port number, or service name" } + { "comment" = "" } + { "tls_port" = "16514" } + { "empty" } + { "comment" = "Override the port for accepting insecure TCP connections" } + { "comment" = "This can be a port number, or service name" } + { "comment" = "" } + { "tcp_port" = "16509" } + { "empty" } + { "empty" } + { "comment" = "Override the default configuration which binds to all network" } + { "comment" = "interfaces. This can be a numeric IPv4/6 address, or hostname" } + { "comment" = "" } + { "listen_addr" = "192.168.0.1" } + { "empty" } + { "empty" } + { "comment" = "Flag toggling mDNS advertizement of the libvirt service." } + { "comment" = "" } + { "comment" = "Alternatively can disable for all services on a host by" } + { "comment" = "stopping the Avahi daemon" } + { "comment" = "" } + { "comment" = "This is enabled by default, uncomment this to disable it" } + { "mdns_adv" = "0" } + { "empty" } + { "comment" = "Override the default mDNS advertizement name. This must be" } + { "comment" = "unique on the immediate broadcast network." } + { "comment" = "" } + { "comment" = "The default is \"Virtualization Host HOSTNAME\", where HOSTNAME" } + { "comment" = "is subsituted for the short hostname of the machine (without domain)" } + { "comment" = "" } + { "mdns_name" = "Virtualization Host Joe Demo" } + { "empty" } + { "empty" } + { "comment" = "################################################################" } + { "comment" = "" } + { "comment" = "UNIX socket access controls" } + { "comment" = "" } + { "empty" } + { "comment" = "Set the UNIX domain socket group ownership. This can be used to" } + { "comment" = "allow a 'trusted' set of users access to management capabilities" } + { "comment" = "without becoming root." } + { "comment" = "" } + { "comment" = "This is restricted to 'root' by default." } + { "unix_sock_group" = "libvirt" } + { "empty" } + { "comment" = "Set the UNIX socket permissions for the R/O socket. This is used" } + { "comment" = "for monitoring VM status only" } + { "comment" = "" } + { "comment" = "Default allows any user. If setting group ownership may want to" } + { "comment" = "restrict this to:" } + { "unix_sock_ro_perms" = "0777" } + { "empty" } + { "comment" = "Set the UNIX socket permissions for the R/W socket. This is used" } + { "comment" = "for full management of VMs" } + { "comment" = "" } + { "comment" = "Default allows only root. If PolicyKit is enabled on the socket," } + { "comment" = "the default will change to allow everyone (eg, 0777)" } + { "comment" = "" } + { "comment" = "If not using PolicyKit and setting group ownership for access" } + { "comment" = "control then you may want to relax this to:" } + { "unix_sock_rw_perms" = "0770" } + { "empty" } + { "empty" } + { "empty" } + { "comment" = "################################################################" } + { "comment" = "" } + { "comment" = "Authentication." } + { "comment" = "" } + { "comment" = "- none: do not perform auth checks. If you can connect to the" } + { "comment" = "socket you are allowed. This is suitable if there are" } + { "comment" = "restrictions on connecting to the socket (eg, UNIX" } + { "comment" = "socket permissions), or if there is a lower layer in" } + { "comment" = "the network providing auth (eg, TLS/x509 certificates)" } + { "comment" = "" } + { "comment" = "- sasl: use SASL infrastructure. The actual auth scheme is then" } + { "comment" = "controlled from /etc/sasl2/libvirt.conf. For the TCP" } + { "comment" = "socket only GSSAPI & DIGEST-MD5 mechanisms will be used." } + { "comment" = "For non-TCP or TLS sockets, any scheme is allowed." } + { "comment" = "" } + { "comment" = "- polkit: use PolicyKit to authenticate. This is only suitable" } + { "comment" = "for use on the UNIX sockets. The default policy will" } + { "comment" = "require a user to supply their own password to gain" } + { "comment" = "full read/write access (aka sudo like), while anyone" } + { "comment" = "is allowed read/only access." } + { "comment" = "" } + { "comment" = "Set an authentication scheme for UNIX read-only sockets" } + { "comment" = "By default socket permissions allow anyone to connect" } + { "comment" = "" } + { "comment" = "To restrict monitoring of domains you may wish to enable" } + { "comment" = "an authentication mechanism here" } + { "auth_unix_ro" = "none" } + { "empty" } + { "comment" = "Set an authentication scheme for UNIX read-write sockets" } + { "comment" = "By default socket permissions only allow root. If PolicyKit" } + { "comment" = "support was compiled into libvirt, the default will be to" } + { "comment" = "use 'polkit' auth." } + { "comment" = "" } + { "comment" = "If the unix_sock_rw_perms are changed you may wish to enable" } + { "comment" = "an authentication mechanism here" } + { "auth_unix_rw" = "none" } + { "empty" } + { "comment" = "Change the authentication scheme for TCP sockets." } + { "comment" = "" } + { "comment" = "If you don't enable SASL, then all TCP traffic is cleartext." } + { "comment" = "Don't do this outside of a dev/test scenario. For real world" } + { "comment" = "use, always enable SASL and use the GSSAPI or DIGEST-MD5" } + { "comment" = "mechanism in /etc/sasl2/libvirt.conf" } + { "auth_tcp" = "sasl" } + { "empty" } + { "comment" = "Change the authentication scheme for TLS sockets." } + { "comment" = "" } + { "comment" = "TLS sockets already have encryption provided by the TLS" } + { "comment" = "layer, and limited authentication is done by certificates" } + { "comment" = "" } + { "comment" = "It is possible to make use of any SASL authentication" } + { "comment" = "mechanism as well, by using 'sasl' for this option" } + { "auth_tls" = "none" } + { "empty" } + { "empty" } + { "empty" } + { "comment" = "################################################################" } + { "comment" = "" } + { "comment" = "TLS x509 certificate configuration" } + { "comment" = "" } + { "empty" } + { "empty" } + { "comment" = "Override the default server key file path" } + { "comment" = "" } + { "key_file" = "/etc/pki/libvirt/private/serverkey.pem" } + { "empty" } + { "comment" = "Override the default server certificate file path" } + { "comment" = "" } + { "cert_file" = "/etc/pki/libvirt/servercert.pem" } + { "empty" } + { "comment" = "Override the default CA certificate path" } + { "comment" = "" } + { "ca_file" = "/etc/pki/CA/cacert.pem" } + { "empty" } + { "comment" = "Specify a certificate revocation list." } + { "comment" = "" } + { "comment" = "Defaults to not using a CRL, uncomment to enable it" } + { "crl_file" = "/etc/pki/CA/crl.pem" } + { "empty" } + { "empty" } + { "empty" } + { "comment" = "################################################################" } + { "comment" = "" } + { "comment" = "Authorization controls" } + { "comment" = "" } + { "empty" } + { "empty" } + { "comment" = "Flag to disable verification of client certificates" } + { "comment" = "" } + { "comment" = "Client certificate verification is the primary authentication mechanism." } + { "comment" = "Any client which does not present a certificate signed by the CA" } + { "comment" = "will be rejected." } + { "comment" = "" } + { "comment" = "Default is to always verify. Uncommenting this will disable" } + { "comment" = "verification - make sure an IP whitelist is set" } + { "tls_no_verify_certificate" = "1" } + { "empty" } + { "empty" } + { "comment" = "A whitelist of allowed x509 Distinguished Names" } + { "comment" = "This list may contain wildcards such as" } + { "comment" = "" } + { "comment" = "\"C=GB,ST=London,L=London,O=Red Hat,CN=*\"" } + { "comment" = "" } + { "comment" = "See the POSIX fnmatch function for the format of the wildcards." } + { "comment" = "" } + { "comment" = "NB If this is an empty list, no client can connect, so comment out" } + { "comment" = "entirely rather than using empty list to disable these checks" } + { "comment" = "" } + { "comment" = "By default, no DN's are checked" } + { "tls_allowed_dn_list" + { = "DN1"} + { = "DN2"} + } + { "empty" } + { "empty" } + { "comment" = "A whitelist of allowed SASL usernames. The format for usernames" } + { "comment" = "depends on the SASL authentication mechanism. Kerberos usernames" } + { "comment" = "look like username@REALM" } + { "comment" = "" } + { "comment" = "This list may contain wildcards such as" } + { "comment" = "" } + { "comment" = "\"*(a)EXAMPLE.COM\"" } + { "comment" = "" } + { "comment" = "See the POSIX fnmatch function for the format of the wildcards." } + { "comment" = "" } + { "comment" = "NB If this is an empty list, no client can connect, so comment out" } + { "comment" = "entirely rather than using empty list to disable these checks" } + { "comment" = "" } + { "comment" = "By default, no Username's are checked" } + { "sasl_allowed_username_list" + { = "joe(a)EXAMPLE.COM" } + { = "fred(a)EXAMPLE.COM" } + } Index: libvirt.spec.in =================================================================== RCS file: /data/cvs/libvirt/libvirt.spec.in,v retrieving revision 1.91 diff -u -p -r1.91 libvirt.spec.in --- libvirt.spec.in 21 Aug 2008 09:28:54 -0000 1.91 +++ libvirt.spec.in 26 Aug 2008 20:04:24 -0000 @@ -252,6 +252,8 @@ fi %dir %{_localstatedir}/lib/libvirt/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/images/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/boot/ +%{_datadir}/augeas/lenses/libvirtd.aug +%{_datadir}/augeas/lenses/tests/test_libvirtd.aug %if %{with_polkit} %{_datadir}/PolicyKit/policy/org.libvirt.unix.policy %endif -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|

5 15

[libvirt] Bug reported... with respect to console problems
by Stefan de Konink 04 Sep '08

04 Sep '08

A few days ago I reported a bug with respect to console problems after the <bootloader /> bug was 'solved'. Now the status of it did not change, nor did anyone comment. Any updates? Stefan

5 10

[libvirt] [PATCH] virsh dump should not be live
by John Levon 04 Sep '08

04 Sep '08

Live dumps are much less likely to produce usable cores. They also trigger a Xen bug that crashes xend. Signed-off-by: John Levon <john.levon(a)sun.com> Index: src/xend_internal.c =================================================================== RCS file: /data/cvs/libvirt/src/xend_internal.c,v retrieving revision 1.211 diff -u -r1.211 xend_internal.c --- src/xend_internal.c 28 Aug 2008 11:59:07 -0000 1.211 +++ src/xend_internal.c 28 Aug 2008 14:10:45 -0000 @@ -3037,7 +3037,7 @@ if (domain->id < 0) return(-1); return xend_op(domain->conn, domain->name, "op", "dump", "file", filename, - "live", "1", "crash", "0", NULL); + "live", "0", "crash", "0", NULL); } /**

4 4

[libvirt] [PATCH] use poweroff not halt for virsh shutdown
by John Levon 04 Sep '08

04 Sep '08

"halt" means just that, and we want to "poweroff". Linux doesn't care, but Solaris differentiates between the two. Signed-off-by: John Levon <john.levon(a)sun.com> Index: src/xend_internal.c =================================================================== RCS file: /data/cvs/libvirt/src/xend_internal.c,v retrieving revision 1.211 diff -u -r1.211 xend_internal.c --- src/xend_internal.c 28 Aug 2008 11:59:07 -0000 1.211 +++ src/xend_internal.c 28 Aug 2008 14:04:21 -0000 @@ -2884,7 +2884,7 @@ } if (domain->id < 0) return(-1); - return xend_op(domain->conn, domain->name, "op", "shutdown", "reason", "halt", NULL); + return xend_op(domain->conn, domain->name, "op", "shutdown", "reason", "poweroff", NULL); } /** Index: src/xs_internal.c =================================================================== RCS file: /data/cvs/libvirt/src/xs_internal.c,v retrieving revision 1.68 diff -u -r1.68 xs_internal.c --- src/xs_internal.c 20 Aug 2008 20:48:36 -0000 1.68 +++ src/xs_internal.c 28 Aug 2008 14:04:22 -0000 @@ -654,7 +654,7 @@ * this is very hackish, the domU kernel probes for a special * node in the xenstore and launch the shutdown command if found. */ - return(virDomainDoStoreWrite(domain, "control/shutdown", "halt")); + return(virDomainDoStoreWrite(domain, "control/shutdown", "poweroff")); } /**

3 2

[libvirt] [PATCH] Fix signedness bug in src/qemu_driver.c
by James Morris 04 Sep '08

04 Sep '08

Fix a signedness bug in src/qemu_driver.c, qemuCmdFlags needs to be unsigned int. Signed-off-by: James Morris <jmorris(a)namei.org> --- src/qemu_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu_driver.c b/src/qemu_driver.c index 59faf94..72c2d81 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -2987,7 +2987,7 @@ static int qemudDomainChangeEjectableMedia(virDomainPtr dom, virDomainDiskDefPtr origdisk, newdisk; char *cmd, *reply, *safe_path; char *devname = NULL; - int qemuCmdFlags; + unsigned int qemuCmdFlags; if (!vm) { qemudReportError(dom->conn, dom, NULL, VIR_ERR_INVALID_DOMAIN, -- 1.6.0.1

2 1

[libvirt] Java bindings
by Alejandro Berna Juan 04 Sep '08

04 Sep '08

Hi all, I'm Alejandro Berna from i2CAT (a non-profit foundation in Barcelona, Spain, www.i2cat.net) I'm collaborating in a Europena project called Federica ( www.fp7-*federica*.eu ). One of the branch of this project is to permit virtualization of different hosts in the Federica test-bed. We are doing some studies about the different management interfaces of Xen. Our objective is to create a software remote client for Xen tool (in java if it's possible) that can do (general functionalities): - Create virtual machines assigning virtual interfaces. - Permit choose the OS assigned to this virtual machine - Install new applications to be tested in the virtual machines - Configure a vm to become a router and permit to configure this router as it was a physical router. All these actions have to be performed remotelly. I have not found too much information about libvrt but I think that can be usefull for our achieves. If you agree that with libvrt we can perform these actions, maybe I can build the java bindings for libvrt inside the Federica work. I'm waiting for your opinions, thank you, -- Alejandro Berna Juan alejandro.berna(a)i2cat.net

4 10

[libvirt] [PATCH] xen: fix domain lookup after define
by Cole Robinson 04 Sep '08

04 Sep '08

Defining a xen domain will succeed, but report error because we weren't properly passing the domain's name to the post-define lookup. Attached patch fixes this, and also adds a debug statement to show the sexpr we create from the passed xml. Thanks, Cole diff --git a/src/xend_internal.c b/src/xend_internal.c index 2a687c3..124ee8b 100644 --- a/src/xend_internal.c +++ b/src/xend_internal.c @@ -4270,7 +4270,6 @@ xenDaemonDomainMigratePerform (virDomainPtr domain, virDomainPtr xenDaemonDomainDefineXML(virConnectPtr conn, const char *xmlDesc) { int ret; char *sexpr; - char *name = NULL; virDomainPtr dom; xenUnifiedPrivatePtr priv; virDomainDefPtr def; @@ -4292,15 +4291,17 @@ virDomainPtr xenDaemonDomainDefineXML(virConnectPtr conn, const char *xmlDesc) { goto error; } + DEBUG("Defining w/ sexpr: \n%s", sexpr); + ret = xend_op(conn, "", "op", "new", "config", sexpr, NULL); VIR_FREE(sexpr); if (ret != 0) { virXendError(conn, VIR_ERR_XEN_CALL, - _("Failed to create inactive domain %s\n"), name); + _("Failed to create inactive domain %s\n"), def->name); goto error; } - dom = virDomainLookupByName(conn, name); + dom = virDomainLookupByName(conn, def->name); if (dom == NULL) { goto error; }

3 2

[libvirt] [PATCH] [LXC] Add version implementation
by Dan Smith 03 Sep '08

03 Sep '08

This patch adds an implementation of the version function to the LXC driver. The providers use the hypervisor version in a field of one of the instances, so we need to have something meaningful here. AFAICT, the only real option we have (considering the limitations of the libvirt version information) is to use the kernel version. diff -r be3be31c94a2 -r 0cabead40d65 src/lxc_driver.c --- a/src/lxc_driver.c Fri Aug 29 07:11:15 2008 +0000 +++ b/src/lxc_driver.c Fri Aug 29 09:10:41 2008 -0700 @@ -1110,6 +1110,29 @@ return 0; } +static int lxcVersion(virConnectPtr conn, unsigned long *version) +{ + struct utsname ver; + int maj; + int min; + int rev; + + if (uname(&ver) != 0) { + lxcError(conn, NULL, VIR_ERR_INTERNAL_ERROR, + _("uname(): %m")); + return -1; + } + + if (sscanf(ver.release, "%i.%i.%i", &maj, &min, &rev) != 3) { + lxcError(conn, NULL, VIR_ERR_INTERNAL_ERROR, + _("Unknown release: %s"), ver.release); + return -1; + } + + *version = (maj * 1000 * 1000) + (min * 1000) + rev; + + return 0; +} /* Function Tables */ static virDriver lxcDriver = { @@ -1121,7 +1144,7 @@ lxcClose, /* close */ NULL, /* supports_feature */ NULL, /* type */ - NULL, /* version */ + lxcVersion, /* version */ NULL, /* getHostname */ NULL, /* getURI */ NULL, /* getMaxVcpus */

2 1

[libvirt] [PATCH] Fix ejecting cdroms with latest qemu syntax
by Cole Robinson 03 Sep '08

03 Sep '08

Originally, ejecting a cdrom from a qemu guest entailed passing 'eject cdrom' to the monitor. But since qemu added the -drive option, more than one cdrom can be specified, so just using 'cdrom' isn't explicit enough. The attached patch updates media change/eject to use the current qemu syntax. The new generated commands look something like "eject ide0-cd1", with the name derived from device target and bus type. While I was in there I added support for inserting/ ejecting media from scsi cdroms and floppy devices. This is built around my previous two patches: - Fix cd eject segfault - Attempt to detect cdrom change failures Thanks, Cole

4 11

[libvirt] [PATCH] virConnectListAllDomains (version 3, still no Xen)
by Richard W.M. Jones 03 Sep '08

03 Sep '08

This is a third version of the virConnectListAllDomains patch. The API is now slightly different from previous proposals. We only allow filtering on All/Active/Inactive, and not by a long list of fine-grained states. The reason is twofold: (1) a simpler implementation and (2) doubtful that anyone would actually use the fine-grained filtering feature. The new API is shown below. I have tested this out with mlvirsh and virt-top and of course in the remote case there is a substantial saving in terms of round-trip times, although it's hard to precisely measure what the difference is when I've got only a couple of guests running. There is still no Xen-specific implementation, but note that in the remote case you get some of the benefit anyway. Rich. ---------------------------------------------------------------------- /** * virConnectListAllDomains: * @conn: pointer to the hypervisor connection * @domains: pointer to returned array of domain pointers (must not be NULL) * @infos: pointer to returned array of virDomainInfo structures (may be NULL) * @stateflags: state of domains of interest * @flags: other flags (always 0) * * This call returns the list of all domains, active or inactive, * and their virDomainInfo structures. * * This call is usually more efficient than using the old method * of calling virConnectListDomains and virConnectListDefinedDomains * and then loading each domain and its info. This call is supported * for all hypervisor types. (If the backend driver doesn't support it * directly, then the call is emulated for you). * * @stateflags allows only the domains of interest to be * returned. Callers must pass one of: * VIR_DOMAIN_LIST_ACTIVE to return running domains, * VIR_DOMAIN_LIST_INACTIVE to return defined but not running domains, * VIR_DOMAIN_LIST_ALL to return all domains, * 0 to return no domains. * * @flags may be used in the future. Always pass 0 for this parameter. * * If there is no error then @domains will be updated to point to an * array of virDomainPtr. * * If there is no error and @infos is not NULL, then @infos will be * updated to point to an array of virDomainInfo structures, with * the same length as the array of domains. * * Returns the number of domains in the @domains array, or -1 in * case of error. * * If there was no error then the caller must free each domain * with virDomainFree, free the array of @domains pointers, * and if necessary free the array of @infos structures. */ int virConnectListAllDomains(virConnectPtr conn, virDomainPtr **domains, virDomainInfo **infos, unsigned long stateflags, unsigned long flags); ---------------------------------------------------------------------- -- Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones Read my OCaml programming blog: http://camltastic.blogspot.com/ Fedora now supports 64 OCaml packages (the OPEN alternative to F#) http://cocan.org/getting_started_with_ocaml_on_red_hat_and_fedora

1 0

[libvirt] [PATCH] Attempt to detect cdrom change failures
by Cole Robinson 03 Sep '08

03 Sep '08

If a 'change' or 'eject' qemu monitor command fails, an error message is printed to the monitor of the form "device {not found, is locked, is not removable"}. This is really the only indication we have that the command errored out, so scrape the monitor reply for "\ndevice " and fail if it is found. Thanks, Cole commit 8caba367b62b4fb961722cd641d8172bb441b84e Author: Cole Robinson <crobinso(a)dhcp-100-19-219.bos.redhat.com> Date: Fri Aug 22 16:35:24 2008 -0400 Scrape cdrom attach/eject monitor output to try and determine failure. diff --git a/src/qemu_driver.c b/src/qemu_driver.c index 9a26375..05e7402 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -2994,6 +2994,19 @@ static int qemudDomainChangeCDROM(virDomainPtr dom, VIR_FREE(newsrc); return -1; } + + /* If the command failed qemu prints: + * device not found, device is locked ... + * No message is printed on success it seems */ + DEBUG ("cdrom change reply: %s", reply); + if (strstr(reply, "\ndevice ")) { + qemudReportError (dom->conn, dom, NULL, VIR_ERR_OPERATION_FAILED, + "%s", _("changing cdrom media failed)); + VIR_FREE(reply); + VIR_FREE(cmd); + return -1; + } + VIR_FREE(reply); VIR_FREE(cmd);

2 3

[libvirt] [PATCH] Update domain xml after usb hotplug
by Cole Robinson 03 Sep '08

03 Sep '08

The recently added usb hostdev and mass storage device hotplug code doesn't append the devices to the running guests xml if the hotplug succeeds. The attached patch fixes this. Thanks, Cole commit 8df17db8b36a2c1e8efa430a0493f66825b6b80e Author: Cole (Work Acct) <crobinso(a)localhost.localdomain> Date: Thu Aug 21 23:08:04 2008 -0400 Add hotplugged usb devices to running domain xml. diff --git a/src/domain_conf.c b/src/domain_conf.c index 3c61039..dc5eb0c 100644 --- a/src/domain_conf.c +++ b/src/domain_conf.c @@ -481,8 +481,8 @@ void virDomainRemoveInactive(virDomainObjPtr *doms, } #ifndef PROXY -static int virDomainDiskCompare(virDomainDiskDefPtr a, - virDomainDiskDefPtr b) { +int virDomainDiskCompare(virDomainDiskDefPtr a, + virDomainDiskDefPtr b) { if (a->bus == b->bus) return virDiskNameToIndex(a->dst) - virDiskNameToIndex(b->dst); else diff --git a/src/domain_conf.h b/src/domain_conf.h index b98f7f3..cfa2a90 100644 --- a/src/domain_conf.h +++ b/src/domain_conf.h @@ -526,6 +526,8 @@ char *virDomainCpuSetFormat(virConnectPtr conn, char *cpuset, int maxcpu); +int virDomainDiskCompare(virDomainDiskDefPtr a, + virDomainDiskDefPtr b); int virDomainSaveConfig(virConnectPtr conn, const char *configDir, diff --git a/src/qemu_driver.c b/src/qemu_driver.c index 769f34f..9a26375 100644 --- a/src/qemu_driver.c +++ b/src/qemu_driver.c @@ -62,6 +62,7 @@ #include "capabilities.h" #include "memory.h" #include "uuid.h" +#include "domain_conf.h" /* For storing short-lived temporary files. */ #define TEMPDIR LOCAL_STATE_DIR "/cache/libvirt" @@ -3044,6 +3045,7 @@ static int qemudDomainAttachUsbMassstorageDevice(virDomainPtr dom, virDomainDevi virDomainObjPtr vm = virDomainFindByUUID(driver->domains, dom->uuid); int ret; char *cmd, *reply; + virDomainDiskDefPtr *dest, *prev, ptr; if (!vm) { qemudReportError(dom->conn, dom, NULL, VIR_ERR_INVALID_DOMAIN, @@ -3051,6 +3053,28 @@ static int qemudDomainAttachUsbMassstorageDevice(virDomainPtr dom, virDomainDevi return -1; } + /* Find spot in domain definition where we will put the disk */ + ptr = vm->def->disks; + prev = &(vm->def->disks); + while (ptr) { + if (STREQ(dev->data.disk->dst, ptr->dst)) { + qemudReportError(dom->conn, dom, NULL, VIR_ERR_INTERNAL_ERROR, + _("duplicate disk target '%s'"), + dev->data.disk->dst); + return -1; + } + if (virDomainDiskCompare(dev->data.disk, ptr) < 0) { + dest = &(ptr); + break; + } + prev = &(ptr->next); + ptr = ptr->next; + } + + if (!ptr) { + dest = prev; + } + ret = asprintf(&cmd, "usb_add disk:%s", dev->data.disk->src); if (ret == -1) { qemudReportError(dom->conn, NULL, NULL, VIR_ERR_NO_MEMORY, NULL); @@ -3059,7 +3083,7 @@ static int qemudDomainAttachUsbMassstorageDevice(virDomainPtr dom, virDomainDevi if (qemudMonitorCommand(driver, vm, cmd, &reply) < 0) { qemudReportError(dom->conn, dom, NULL, VIR_ERR_OPERATION_FAILED, - "%s", _("cannot attach usb device")); + "%s", _("cannot attach usb disk")); VIR_FREE(cmd); return -1; } @@ -3070,11 +3094,16 @@ static int qemudDomainAttachUsbMassstorageDevice(virDomainPtr dom, virDomainDevi if (strstr(reply, "Could not add ")) { qemudReportError (dom->conn, dom, NULL, VIR_ERR_OPERATION_FAILED, "%s", - _("adding usb device failed")); + _("adding usb disk failed")); VIR_FREE(reply); VIR_FREE(cmd); return -1; } + + /* Actually update the xml */ + dev->data.disk->next = *dest; + *prev = dev->data.disk; + VIR_FREE(reply); VIR_FREE(cmd); return 0; @@ -3125,6 +3154,11 @@ static int qemudDomainAttachHostDevice(virDomainPtr dom, virDomainDeviceDefPtr d VIR_FREE(cmd); return -1; } + + /* Update xml */ + dev->data.hostdev->next = vm->def->hostdevs; + vm->def->hostdevs = dev->data.hostdev; + VIR_FREE(reply); VIR_FREE(cmd); return 0; @@ -3167,7 +3201,7 @@ static int qemudDomainAttachDevice(virDomainPtr dom, ret = qemudDomainAttachHostDevice(dom, dev); } else { qemudReportError(dom->conn, dom, NULL, VIR_ERR_NO_SUPPORT, - "%s", _("this devicetype cannot be attached")); + "%s", _("this device type cannot be attached")); ret = -1; }

3 3

[libvirt] [PATCH] Fix disk device ordering
by Cole Robinson 03 Sep '08

03 Sep '08

When parsing the domain xml, disks are supposed to be rearranged in an alphabetic order based on bus type and target. The reordering code had a flaw though, in that it would always put the first disk it encountered at the head of the list, and had no way of putting new entries in front of it. The attached patch reworks the code to compare the new disk against the current disk entry (rather than the next entry like the existing code). Seems to pass all my tests. Thanks, Cole commit ce3abbb62327672f756848efec7c95275fa797d6 Author: Cole (Work Acct) <crobinso(a)localhost.localdomain> Date: Thu Aug 21 23:04:11 2008 -0400 Fix disk ordering when parsing domain xml. diff --git a/src/domain_conf.c b/src/domain_conf.c index ed6cc8b..3c61039 100644 --- a/src/domain_conf.c +++ b/src/domain_conf.c @@ -1949,25 +1949,27 @@ static virDomainDefPtr virDomainDefParseXML(virConnectPtr conn, goto error; /* Maintain list in sorted order according to target device name */ - if (def->disks == NULL) { - disk->next = def->disks; - def->disks = disk; - } else { - virDomainDiskDefPtr ptr = def->disks; - while (ptr) { - if (ptr->next && STREQ(disk->dst, ptr->next->dst)) { - virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, - _("duplicate disk target '%s'"), - disk->dst); - goto error; - } - if (!ptr->next || virDomainDiskCompare(disk, ptr->next) < 0) { - disk->next = ptr->next; - ptr->next = disk; - break; - } - ptr = ptr->next; + virDomainDiskDefPtr ptr = def->disks; + virDomainDiskDefPtr *prev = &(def->disks); + while (ptr) { + if (STREQ(disk->dst, ptr->dst)) { + virDomainReportError(conn, VIR_ERR_INTERNAL_ERROR, + _("duplicate disk target '%s'"), + disk->dst); + goto error; + } + if (virDomainDiskCompare(disk, ptr) < 0) { + disk->next = ptr; + *prev = disk; + break; } + prev = &(ptr->next); + ptr = ptr->next; + } + + if (!ptr) { + disk->next = ptr; + *prev = disk; } } VIR_FREE(nodes);

3 3

[libvirt] Does libvirt supports Xen on Solaris?
by atif bajwa 03 Sep '08

03 Sep '08

Hi! Does libvirt supports Xen on Solaris? If so what is version of libvirt and Solaris? Regards, Atif

2 1

[libvirt] [PATCH] Add success output to virsh attach/detach commands
by Cole Robinson 03 Sep '08

03 Sep '08

The virsh attach-* and detach-* commands don't say anything if the operation succeeds, which doesn't seem very polite. The attached adds some simple feedback. Thanks, Cole commit eda28c5de3d367d001ca89ffc969fcc3c0185abb Author: Cole Robinson <crobinso(a)dhcp-100-19-219.bos.redhat.com> Date: Thu Aug 21 17:59:13 2008 -0400 Report success message for virsh attach-* and detach-* diff --git a/src/virsh.c b/src/virsh.c index 67d9658..c22cdc4 100644 --- a/src/virsh.c +++ b/src/virsh.c @@ -4490,6 +4490,8 @@ cmdAttachDevice(vshControl *ctl, const vshCmd *cmd) vshError(ctl, FALSE, _("Failed to attach device from %s"), from); virDomainFree(dom); return FALSE; + } else { + vshPrint(ctl, _("Device attached successfully\n")); } virDomainFree(dom); @@ -4547,6 +4549,8 @@ cmdDetachDevice(vshControl *ctl, const vshCmd *cmd) vshError(ctl, FALSE, _("Failed to detach device from %s"), from); virDomainFree(dom); return FALSE; + } else { + vshPrint(ctl, _("Device detached successfully\n")); } virDomainFree(dom); @@ -4655,8 +4659,11 @@ cmdAttachInterface(vshControl *ctl, const vshCmd *cmd) if (!buf) goto cleanup; strcat(buf, " </interface>\n"); - if (virDomainAttachDevice(dom, buf)) + if (virDomainAttachDevice(dom, buf)) { goto cleanup; + } else { + vshPrint(ctl, _("Interface attached successfully\n")); + } ret = TRUE; @@ -4772,8 +4779,10 @@ cmdDetachInterface(vshControl *ctl, const vshCmd *cmd) ret = virDomainDetachDevice(dom, (char *)xmlBufferContent(xml_buf)); if (ret != 0) ret = FALSE; - else + else { + vshPrint(ctl, _("Interface detached successfully\n")); ret = TRUE; + } cleanup: if (dom) @@ -4939,6 +4948,8 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) if (virDomainAttachDevice(dom, buf)) goto cleanup; + else + vshPrint(ctl, _("Disk attached successfully\n")); ret = TRUE; @@ -5046,8 +5057,10 @@ cmdDetachDisk(vshControl *ctl, const vshCmd *cmd) ret = virDomainDetachDevice(dom, (char *)xmlBufferContent(xml_buf)); if (ret != 0) ret = FALSE; - else + else { + vshPrint(ctl, _("Disk detached successfully\n")); ret = TRUE; + } cleanup: xmlXPathFreeObject(obj);

4 4

[libvirt] [PATCH] introducing <source> <name> (for logical storage pools)
by David Lively 03 Sep '08

03 Sep '08

Hi Folks - This small patch is a proposed prerequisite for the storage pool discovery patch I submitted last week. Daniel B proposed having storage pool discovery return a bunch of XML storage <source> elements, rather than full <pool> elements (which contain "target-dependent" details like the local pool name and device or mount path -- things which don't need to be decided unless/until the pool is defined). I like his suggestion a lot, and I think it addresses the final API-definition problem keeping storage pool discovery out of libvirt. But ... it doesn't quite work for logical storage pools because those are created from the <pool> <name> element (which is the same as the volume group name). This patch introduces a new <source> element <name>, which is distinct from the pool name. <name> is used only by the logical storage backend, and represents the volume group name. For convenience and back-compatibility, <source> <name> defaults to the pool name if not specified when the pool is defined, and <pool> <name> defaults to the source name if not specified. There is no requirement that pool and source name be the same, though. While admittedly it seems a little weird, it does allow more flexibility (pool name not tied to vol group name), and allows <source> to fully specify a logical pool source, as it does for the other pool types[*]. Defaulting the source name from the pool name means all existing pool XML definitions continue to work. Defaulting the pool name from the source name is simply a matter of convenience (but perhaps a step too far?) If this is accepted, logical pool discovery can then return a bunch of sources like: <source><name>VolGroup00</name></source> <source><name>VolGroup01</name></source> Please note I'll be on vacation next week (Aug 11-15), so I may not be responding until the following week. Thanks, Dave [*] Well ... almost. Note that directory pools have a similar issue -- the "source" of the pool is given by the <target> <path> -- there's no <source>. I suppose implementing directory pool discovery (for the sake of completeness) means addressing this as well, maybe via some similar mechanism ...

5 16

[libvirt] libvir: Xen error
by mantra UNIX 02 Sep '08

02 Sep '08

Hello everyone, I get the following error when i try to redtart a domain; # virsh list libvir: Xen error : Domain not found: xenUnifiedDomainLookupByID I am using RHEL5.2 on i386, I have searched for the error on web and on RedHat but could not find any. -- Regards, mantra - Instrument of Thought

3 6