- Devel - libvirt List Archives

[libvirt] Refactor libvirt spec file
by Daniel P. Berrange 28 Sep '09

28 Sep '09

The following patch refactors the libvirt spec file conditional logic to make it a little easier to manage all the different Fedora/RHEL OS build variations, and also allow for easy creation of a client-only build The patch follows, but I'm including the full specfile below too, since its easier to understand than the diff # -*- rpm-spec -*- # A client only build will create a libvirt.so only containing # the generic RPC driver, and test driver and no libvirtd # Default to a full server + client build %define client_only 0 # Now turn off server build in certain cases # RHEL-5 builds are client-only for s390, ppc %if 0%{?rhel} == 5 %ifnarch i386 i586 i686 x86_64 ia64 %define client_only 1 %endif %endif # Disable all server side drivers if client only build requested %if %{client_only} %define server_drivers 0 %else %define server_drivers 1 %endif # Now set the defaults for all the important features, independant # of any particular OS # First the daemon itself %define with_libvirtd 0%{!?_without_libvirtd:%{server_drivers}} %define with_avahi 0%{!?_without_avahi:%{server_drivers}} # Then the hypervisor drivers %define with_xen 0%{!?_without_xen:%{server_drivers}} %define with_xen_proxy 0%{!?_without_xen_proxy:%{server_drivers}} %define with_qemu 0%{!?_without_qemu:%{server_drivers}} %define with_openvz 0%{!?_without_openvz:%{server_drivers}} %define with_lxc 0%{!?_without_lxc:%{server_drivers}} %define with_vbox 0%{!?_without_vbox:%{server_drivers}} %define with_uml 0%{!?_without_uml:%{server_drivers}} %define with_one 0%{!?_without_one:%{server_drivers}} %define with_phyp 0%{!?_without_phyp:%{server_drivers}} %define with_esx 0%{!?_without_esx:%{server_drivers}} # Then the secondary host drivers %define with_network 0%{!?_without_network:%{server_drivers}} %define with_storage_fs 0%{!?_without_storage_fs:%{server_drivers}} %define with_storage_lvm 0%{!?_without_storage_lvm:%{server_drivers}} %define with_storage_iscsi 0%{!?_without_storage_iscsi:%{server_drivers}} %define with_storage_disk 0%{!?_without_storage_disk:%{server_drivers}} %define with_storage_mpath 0%{!?_without_storage_mpath:%{server_drivers}} %define with_numactl 0%{!?_without_numactl:%{server_drivers}} %define with_selinux 0%{!?_without_selinux:%{server_drivers}} %define with_hal 0%{!?_without_hal:%{server_drivers}} # A few optional bits off by default, we enable later %define with_polkit 0%{!?_without_polkit:0} %define with_capng 0%{!?_without_capng:0} %define with_netcf 0%{!?_without_netcf:0} # Non-server/HV driver defaults which are always enabled %define with_python 0%{!?_without_python:1} %define with_sasl 0%{!?_without_sasl:1} # Finally set the OS / architecture specific special cases # Xen is available only on i386 x86_64 ia64 %ifnarch i386 i586 i686 x86_64 ia64 %define with_xen 0 %endif # RHEL doesn't ship OpenVZ, VBox, UML, OpenNebula, PowerHypervisor or ESX %if 0%{?rhel} %define with_openvz 0 %define with_vbox 0 %define with_uml 0 %define with_one 0 %define with_phyp 0 %define with_esx 0 %endif # RHEL-5 has restricted QEMU to x86_64 only and is too old for LXC %if 0%{?rhel} == 5 %ifnarch x86_64 %define with_qemu 0 %endif %define with_lxc 0 %endif # RHEL-6 has restricted QEMU to x86_64 only, stopped including Xen # on all archs. Other archs all have LXC available though %if 0%{?rhel} >= 6 %ifnarch x86_64 %define with_qemu 0 %endif %define with_xen 0 %endif # If Xen isn't turned on, we shouldn't build the xen proxy either %if ! %{with_xen} %define with_xen_proxy 0 %endif # Fedora doesn't have any QEMU on ppc64 - only ppc %if 0%{?fedora} %ifarch ppc64 %define with_qemu 0 %endif %endif # PolicyKit was introduced in Fedora 8 / RHEL-6 or newer, allowing # the setuid Xen proxy to be killed off %if 0%{?fedora} >= 8 || 0%{?rhel} >= 6 %define with_polkit 0%{!?_without_polkit:1} %define with_xen_proxy 0 %endif # libcapng is used to manage capabilities in Fedora 12 / RHEL-6 or newer %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 %define with_capng 0%{!?_without_capng:1} %endif # netcf is used to manage network interfaces in Fedora 12 / RHEL-6 or newer %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 %define with_netcf 0%{!?_without_netcf:%{server_drivers}} %endif # Force QEMU to run as non-root %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 %define qemu_user qemu %define qemu_group qemu %else %define qemu_user root %define qemu_group root %endif # The RHEL-5 Xen package has some feature backports. This # flag is set to enable use of those special bits on RHEL-5 %if 0%{?rhel} == 5 %define with_rhel5 1 %else %define with_rhel5 0 %endif Summary: Library providing a simple API virtualization Name: libvirt Version: 0.7.1 Release: 1%{?dist}%{?extra_release} License: LGPLv2+ Group: Development/Libraries Source: http://libvirt.org/sources/libvirt-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root URL: http://libvirt.org/ BuildRequires: python-devel # The client side, i.e. shared libs and virsh are in a subpackage Requires: libvirt-client = %{version}-%{release} # Used by many of the drivers, so turn it on whenever the # daemon is present %if %{with_libvirtd} Requires: bridge-utils %endif %if %{with_network} Requires: dnsmasq Requires: iptables %endif # needed for device enumeration %if %{with_hal} Requires: hal %endif %if %{with_polkit} %if 0%{?fedora} >= 12 || 0%{?rhel} >=6 Requires: polkit >= 0.93 %else Requires: PolicyKit >= 0.6 %endif %endif %if %{with_storage_fs} # For mount/umount in FS driver BuildRequires: util-linux # For showmount in FS driver (netfs discovery) BuildRequires: nfs-utils Requires: nfs-utils # For glusterfs %if 0%{?fedora} >= 11 Requires: glusterfs-client >= 2.0.1 %endif %endif %if %{with_qemu} # From QEMU RPMs Requires: /usr/bin/qemu-img # For image compression Requires: gzip Requires: bzip2 Requires: lzop Requires: xz %else %if %{with_xen} # From Xen RPMs Requires: /usr/sbin/qcow-create %endif %endif %if %{with_storage_lvm} # For LVM drivers Requires: lvm2 %endif %if %{with_storage_iscsi} # For ISCSI driver Requires: iscsi-initiator-utils %endif %if %{with_storage_disk} # For disk driver Requires: parted %endif %if %{with_storage_mpath} # For multipath support Requires: device-mapper %endif %if %{with_xen} BuildRequires: xen-devel %endif %if %{with_one} BuildRequires: xmlrpc-c-devel >= 1.14.0 %endif BuildRequires: libxml2-devel BuildRequires: xhtml1-dtds BuildRequires: readline-devel BuildRequires: ncurses-devel BuildRequires: gettext BuildRequires: gnutls-devel %if %{with_hal} BuildRequires: hal-devel %endif %if %{with_avahi} BuildRequires: avahi-devel %endif %if %{with_selinux} BuildRequires: libselinux-devel %endif %if %{with_network} BuildRequires: dnsmasq %endif BuildRequires: bridge-utils %if %{with_sasl} BuildRequires: cyrus-sasl-devel %endif %if %{with_polkit} %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 # Only need the binary, not -devel BuildRequires: polkit >= 0.93 %else BuildRequires: PolicyKit-devel >= 0.6 %endif %endif %if %{with_storage_fs} # For mount/umount in FS driver BuildRequires: util-linux %endif %if %{with_qemu} # From QEMU RPMs BuildRequires: /usr/bin/qemu-img %else %if %{with_xen} # From Xen RPMs BuildRequires: /usr/sbin/qcow-create %endif %endif %if %{with_storage_lvm} # For LVM drivers BuildRequires: lvm2 %endif %if %{with_storage_iscsi} # For ISCSI driver BuildRequires: iscsi-initiator-utils %endif %if %{with_storage_disk} # For disk driver BuildRequires: parted-devel %if 0%{?rhel} == 5 # Broken RHEL-5 parted RPM is missing a dep BuildRequires: e2fsprogs-devel %endif %endif %if %{with_storage_mpath} # For Multipath support %if 0%{?rhel} == 5 # Broken RHEL-5 packaging has header files in main RPM :-( BuildRequires: device-mapper %else BuildRequires: device-mapper-devel %endif %endif %if %{with_numactl} # For QEMU/LXC numa info BuildRequires: numactl-devel %endif %if %{with_capng} BuildRequires: libcap-ng-devel >= 0.5.0 %endif %if %{with_phyp} BuildRequires: libssh2-devel %endif %if %{with_netcf} BuildRequires: netcf-devel %endif # Fedora build root suckage BuildRequires: gawk %description Libvirt is a C toolkit to interact with the virtualization capabilities of recent versions of Linux (and other OSes). The main package includes the libvirtd server exporting the virtualization support. %package client Summary: Client side library and utilities of the libvirt library Group: Development/Libraries Requires: readline Requires: ncurses # 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 %description client Shared libraries and client binaries needed to access to the virtualization capabilities of recent versions of Linux (and other OSes). %package devel Summary: Libraries, includes, etc. to compile with the libvirt library Group: Development/Libraries Requires: libvirt = %{version}-%{release} Requires: pkgconfig %if %{with_xen} Requires: xen-devel %endif %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). %if %{with_python} %package python Summary: Python bindings for the libvirt library Group: Development/Libraries Requires: libvirt = %{version}-%{release} %description python 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 %build %if ! %{with_xen} %define _without_xen --without-xen %endif %if ! %{with_qemu} %define _without_qemu --without-qemu %endif %if ! %{with_openvz} %define _without_openvz --without-openvz %endif %if ! %{with_lxc} %define _without_lxc --without-lxc %endif %if ! %{with_vbox} %define _without_vbox --without-vbox %endif %if ! %{with_sasl} %define _without_sasl --without-sasl %endif %if ! %{with_avahi} %define _without_avahi --without-avahi %endif %if ! %{with_phyp} %define _without_phyp --without-phyp %endif %if ! %{with_esx} %define _without_esx --without-esx %endif %if ! %{with_polkit} %define _without_polkit --without-polkit %endif %if ! %{with_python} %define _without_python --without-python %endif %if ! %{with_libvirtd} %define _without_libvirtd --without-libvirtd %endif %if ! %{with_uml} %define _without_uml --without-uml %endif %if ! %{with_one} %define _without_one --without-one %endif %if %{with_rhel5} %define _with_rhel5_api --with-rhel5-api %endif %if ! %{with_network} %define _without_network --without-network %endif %if ! %{with_storage_fs} %define _without_storage_fs --without-storage-fs %endif %if ! %{with_storage_lvm} %define _without_storage_lvm --without-storage-lvm %endif %if ! %{with_storage_iscsi} %define _without_storage_iscsi --without-storage-iscsi %endif %if ! %{with_storage_disk} %define _without_storage_disk --without-storage-disk %endif %if ! %{with_storage_mpath} %define _without_storage_mpath --without-storage-mpath %endif %if ! %{with_numactl} %define _without_numactl --without-numactl %endif %if ! %{with_capng} %define _without_capng --without-capng %endif %if ! %{with_netcf} %define _without_netcf --without-netcf %endif %if ! %{with_selinux} %define _without_selinux --without-selinux %endif %if ! %{with_hal} %define _without_hal --without-hal %endif %configure %{?_without_xen} \ %{?_without_qemu} \ %{?_without_openvz} \ %{?_without_lxc} \ %{?_without_vbox} \ %{?_without_sasl} \ %{?_without_avahi} \ %{?_without_polkit} \ %{?_without_python} \ %{?_without_libvirtd} \ %{?_without_uml} \ %{?_without_one} \ %{?_without_phyp} \ %{?_without_esx} \ %{?_without_network} \ %{?_with_rhel5_api} \ %{?_without_storage_fs} \ %{?_without_storage_lvm} \ %{?_without_storage_iscsi} \ %{?_without_storage_disk} \ %{?_without_storage_mpath} \ %{?_without_numactl} \ %{?_without_capng} \ %{?_without_netcf} \ %{?_without_selinux} \ %{?_without_hal} \ --with-qemu-user=%{qemu_user} \ --with-qemu-group=%{qemu_group} \ --with-init-script=redhat \ --with-remote-pid-file=%{_localstatedir}/run/libvirtd.pid make %{?_smp_mflags} gzip -9 ChangeLog %install rm -fr %{buildroot} %makeinstall (cd docs/examples ; make clean ; rm -rf .deps Makefile Makefile.in) (cd docs/examples/python ; rm -rf .deps Makefile Makefile.in) (cd examples/hellolibvirt ; make clean ; rm -rf .deps .libs Makefile Makefile.in) (cd examples/domain-events/events-c ; make clean ;rm -rf .deps .libs Makefile Makefile.in) rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/python*/site-packages/*.a %if %{with_network} # 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. install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/libvirt/networks/ cp $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/default.xml \ $RPM_BUILD_ROOT%{_datadir}/libvirt/networks/default.xml 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 %else rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/default.xml rm -f $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml %endif %if ! %{with_qemu} rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/libvirtd_qemu.aug rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug %endif %find_lang %{name} %if ! %{with_python} rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-python-%{version} %endif %if %{client_only} rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-%{version} %endif %if ! %{with_qemu} rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu.conf %endif %if %{with_libvirtd} chmod 0644 $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/libvirtd %endif %clean rm -fr %{buildroot} %pre %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 # Normally 'setup' adds this in /etc/passwd, but this is # here for case of upgrades from earlier Fedora/RHEL. This # UID/GID pair is reserved for qemu:qemu getent group kvm >/dev/null || groupadd -g 36 -r kvm getent group qemu >/dev/null || groupadd -g 107 -r qemu getent passwd qemu >/dev/null || \ useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin \ -c "qemu user" qemu %endif %post %if %{with_libvirtd} %if %{with_network} # 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 /sbin/chkconfig --list libvirtd 1>/dev/null 2>&1 if [ $? != 0 -a ! -f %{_sysconfdir}/libvirt/qemu/networks/default.xml ] then UUID=`/usr/bin/uuidgen` sed -e "s,</name>,</name>\n <uuid>$UUID</uuid>," \ < %{_datadir}/libvirt/networks/default.xml \ > %{_sysconfdir}/libvirt/qemu/networks/default.xml ln -s ../default.xml %{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml fi %endif /sbin/chkconfig --add libvirtd if [ "$1" -ge "1" ]; then /sbin/service libvirtd condrestart > /dev/null 2>&1 fi %endif %preun %if %{with_libvirtd} if [ $1 = 0 ]; then /sbin/service libvirtd stop 1>/dev/null 2>&1 /sbin/chkconfig --del libvirtd fi %endif %post client -p /sbin/ldconfig %postun client -p /sbin/ldconfig %if %{with_libvirtd} %files %defattr(-, root, root) %doc AUTHORS ChangeLog.gz NEWS README COPYING.LIB TODO %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/ %if %{with_network} %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 %{_sysconfdir}/rc.d/init.d/libvirtd %config(noreplace) %{_sysconfdir}/sysconfig/libvirtd %config(noreplace) %{_sysconfdir}/libvirt/libvirtd.conf %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd %if %{with_qemu} %config(noreplace) %{_sysconfdir}/libvirt/qemu.conf %endif %dir %{_datadir}/libvirt/ %if %{with_network} %dir %{_datadir}/libvirt/networks/ %{_datadir}/libvirt/networks/default.xml %endif %dir %{_localstatedir}/run/libvirt/ %dir %{_localstatedir}/lib/libvirt/ %dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/images/ %dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/boot/ %dir %attr(0700, root, root) %{_localstatedir}/cache/libvirt/ %if %{with_qemu} %dir %attr(0700, root, root) %{_localstatedir}/run/libvirt/qemu/ %dir %attr(0700, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/ %dir %attr(0700, %{qemu_user}, %{qemu_group}) %{_localstatedir}/cache/libvirt/qemu/ %endif %if %{with_lxc} %dir %{_localstatedir}/run/libvirt/lxc/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/lxc/ %endif %if %{with_uml} %dir %{_localstatedir}/run/libvirt/uml/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/uml/ %endif %if %{with_network} %dir %{_localstatedir}/run/libvirt/network/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/network/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/iptables/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/iptables/filter/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/iptables/nat/ %endif %if %{with_qemu} %{_datadir}/augeas/lenses/libvirtd_qemu.aug %{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug %endif %{_datadir}/augeas/lenses/libvirtd.aug %{_datadir}/augeas/lenses/tests/test_libvirtd.aug %if %{with_polkit} %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 %{_datadir}/polkit-1/actions/org.libvirt.unix.policy %else %{_datadir}/PolicyKit/policy/org.libvirt.unix.policy %endif %endif %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/ %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 %if %{with_lxc} %attr(0755, root, root) %{_libexecdir}/libvirt_lxc %endif %attr(0755, root, root) %{_libexecdir}/libvirt_parthelper %attr(0755, root, root) %{_sbindir}/libvirtd %doc docs/*.xml %endif %files client -f %{name}.lang %defattr(-, root, root) %doc AUTHORS ChangeLog.gz NEWS README COPYING.LIB TODO %{_mandir}/man1/virsh.1* %{_mandir}/man1/virt-xml-validate.1* %{_bindir}/virsh %{_bindir}/virt-xml-validate %{_libdir}/lib*.so.* %dir %{_datadir}/libvirt/ %dir %{_datadir}/libvirt/schemas/ %{_datadir}/libvirt/schemas/domain.rng %{_datadir}/libvirt/schemas/network.rng %{_datadir}/libvirt/schemas/storagepool.rng %{_datadir}/libvirt/schemas/storagevol.rng %{_datadir}/libvirt/schemas/nodedev.rng %{_datadir}/libvirt/schemas/capability.rng %{_datadir}/libvirt/schemas/interface.rng %{_datadir}/libvirt/schemas/secret.rng %{_datadir}/libvirt/schemas/storageencryption.rng %if %{with_sasl} %config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf %endif %files devel %defattr(-, root, root) %{_libdir}/lib*.so %dir %{_includedir}/libvirt %{_includedir}/libvirt/*.h %{_libdir}/pkgconfig/libvirt.pc %dir %{_datadir}/gtk-doc/html/libvirt/ %doc %{_datadir}/gtk-doc/html/libvirt/*.devhelp %doc %{_datadir}/gtk-doc/html/libvirt/*.html %doc %{_datadir}/gtk-doc/html/libvirt/*.png %doc %{_datadir}/gtk-doc/html/libvirt/*.css %doc docs/*.html docs/html docs/*.gif %doc docs/examples %doc docs/libvirt-api.xml %doc examples %if %{with_python} %files python %defattr(-, root, root) %doc AUTHORS NEWS README COPYING.LIB %{_libdir}/python*/site-packages/libvirt.py* %{_libdir}/python*/site-packages/libvirtmod* %doc python/tests/*.py %doc python/TODO %doc python/libvirtclass.txt %doc docs/examples/python %endif

4 9

[libvirt] Uknown OS typehvm
by Fred Leeflang 28 Sep '09

28 Sep '09

Hello, I've had an older version of libvirtd/qemu running on Debian Lenny and had defined 4 virtual servers. I have the kvm and kvm_intel modules loaded (also compiled from source). I copied over my 4 config files from /etc/libvirt/qemu to /usr/local/etc/libvirt/qemu Now when I start up libvirtd -v: omega:~# libvirtd -v 20:17:38.877: warning : qemudStartup:566 : Unable to create cgroup for driver: No such device or address libvir: Domain Config error : unknown OS type hvm libvir: Domain Config error : unknown OS type hvm libvir: Domain Config error : unknown OS type hvm libvir: Domain Config error : unknown OS type hvm I'm trying to make sense out of the config files at this point but not very successful at it. I googled around a bit to see if others had this error message but most of the ones I found relate to not having the kernel modules loaded, which is visible in the 'virsh capabilities' output. Mine shows: fredl@omega:~$ which virsh /usr/local/bin/virsh fredl@omega:~$ virsh capabilities <capabilities> <host> <cpu> <arch>x86_64</arch> </cpu> <migration_features> <live/> <uri_transports> <uri_transport>tcp</uri_transport> </uri_transports> </migration_features> </host> </capabilities> This seems odd, this is from my /proc/cpuinfo: flags : fpu vme de pse tsc msr pae mce cx8 apic sep mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx rdtscp lm constant_tsc arch_perfmon pebs bts rep_good xtopology tsc_reliable nonstop_tsc aperfmperf pni dtes64 monitor ds_cpl vmx est tm2 ssse3 cx16 xtpr pdcm sse4_1 sse4_2 popcnt lahf_lm ida tpr_shadow vnmi flexpriority ept vpid So the processor is capable of it, however: fredl@omega:~$ virsh version Compiled against library: libvir 0.7.1 Using library: libvir 0.7.1 Using API: QEMU 0.7.1 *error: failed to get the hypervisor version error: Unknown failure * I'm guessing that's the problem and I realized that in the Debian package the qemu binary is named 'kvm' (may be a symlink) while mine's in -rwxr-xr-x 1 root staff 2286848 2009-09-26 19:31 /usr/local/bin/qemu-system-x86_64 So how does libvirtd try to find out the hypervisor version? how does it even know to use either Xen, qemu etc. ?

2 1

[libvirt] Re: OpenVZ : The restriction of domain name should be addressed
by Yuji NISHIDA 28 Sep '09

28 Sep '09

Hi Daniel, I didn't realize that I even did not follow the manner of XML. I have worked with this problem and got a small patch to handle "ID" in OpenVZ functionality. I found it is working well with the XML script included "ID" in domain tag. I am concerned that I had to edit the common file domain_conf.c. I still believe I should keep it away from this problem for compatibility with the others. How do you think can I avoid this? diff --git a/src/domain_conf.c b/src/domain_conf.c index 5ae0775..f74961f 100644 --- a/src/domain_conf.c +++ b/src/domain_conf.c @@ -2492,7 +2492,7 @@ static virDomainDefPtr virDomainDefParseXML (virConnectPtr conn, return NULL; } - if (!(flags & VIR_DOMAIN_XML_INACTIVE)) + // if (!(flags & VIR_DOMAIN_XML_INACTIVE)) if((virXPathLong(conn, "string(./@id)", ctxt, &id)) < 0) id = -1; def->id = (int)id; diff --git a/src/openvz_conf.c b/src/openvz_conf.c index be94b9e..d23f173 100644 --- a/src/openvz_conf.c +++ b/src/openvz_conf.c @@ -425,17 +425,18 @@ int openvzLoadDomains(struct openvz_driver *driver) { char uuidstr[VIR_UUID_STRING_BUFLEN]; virDomainObjPtr dom = NULL; char temp[50]; + char name[64]; if (openvzAssignUUIDs() < 0) return -1; - if ((fp = popen(VZLIST " -a -ovpsid,status -H 2>/dev/null", "r")) == NULL) { + if ((fp = popen(VZLIST " -a -ovpsid,name,status -H 2>/dev/null", "r")) == NULL) { openvzError(NULL, VIR_ERR_INTERNAL_ERROR, "%s", _("popen failed")); return -1; } while(!feof(fp)) { - if (fscanf(fp, "%d %s¥n", &veid, status) != 2) { + if (fscanf(fp, "%d %s¥n", &veid, name, status) != 3) { if (feof(fp)) break; @@ -465,7 +466,7 @@ int openvzLoadDomains(struct openvz_driver *driver) { dom->pid = veid; dom->def->id = dom->state == VIR_DOMAIN_SHUTOFF ? -1 : veid; - if (virAsprintf(&dom->def->name, "%i", veid) < 0) + if (virAsprintf(&dom->def->name, "%s", name) < 0) goto no_memory; openvzGetVPSUUID(veid, uuidstr, sizeof(uuidstr)); diff --git a/src/openvz_driver.c b/src/openvz_driver.c index a8c24ba..c0c1e0f 100644 --- a/src/openvz_driver.c +++ b/src/openvz_driver.c @@ -101,6 +101,7 @@ static int openvzDomainDefineCmd(virConnectPtr conn, virDomainDefPtr vmdef) { int narg; + char str_id[10]; for (narg = 0; narg < maxarg; narg++) args[narg] = NULL; @@ -130,6 +131,11 @@ static int openvzDomainDefineCmd(virConnectPtr conn, ADD_ARG_LIT(VZCTL); ADD_ARG_LIT("--quiet"); ADD_ARG_LIT("create"); + + sprintf( str_id, "%d", vmdef->id ); + ADD_ARG_LIT(str_id); + + ADD_ARG_LIT("--name"); ADD_ARG_LIT(vmdef->name); if (vmdef->nfss == 1 && @@ -1229,7 +1235,11 @@ static int openvzListDefinedDomains (virConnectPtr conn, char vpsname[32]; char buf[32]; char *endptr; - const char *cmd[] = {VZLIST, "-ovpsid", "-H", "-S", NULL}; + const char *cmd[] = {VZLIST, "-oname", "-H", "-S", NULL}; + int cnt = 0; + char name_buf[32]; + + /* the -S options lists only stopped domains */ ret = virExec(conn, cmd, NULL, NULL, @@ -1241,14 +1251,14 @@ static int openvzListDefinedDomains (virConnectPtr conn, } while(got < nnames){ - ret = openvz_readline(outfd, buf, 32); + ret = openvz_readline(outfd, buf, 64); if(!ret) break; - if (virStrToLong_i(buf, &endptr, 10, &veid) < 0) { - openvzError(conn, VIR_ERR_INTERNAL_ERROR, - _("Could not parse VPS ID %s"), buf); - continue; + cnt = 0; + while( buf[cnt] != ' ' ){ + name_buf[cnt] = buf[cnt]; + cnt++; } - snprintf(vpsname, sizeof(vpsname), "%d", veid); + snprintf(vpsname, sizeof(vpsname), "%d", name_buf); if (!(names[got] = strdup(vpsname))) goto no_memory; got ++; -- 1.5.2.2 ----- Yuji Nishida nishidy(a)nict.go.jp

4 6

[libvirt] debug output?
by Fred Leeflang 28 Sep '09

28 Sep '09

I compiled libvirtd --enable-debug=yes so I can see what's going on, because I'm getting an error libvir: QEMU error : internal error unable to start guest: qemu: could not open disk image. How do I see any debugging output from libvirtd?

2 1

[libvirt] libvirt.py
by Fred Leeflang 27 Sep '09

27 Sep '09

Hello, Just getting started on this and checked out the source from git. Ran autogen.sh, configure, make, make install and it doesn't seem to automatically install libvirt.py. The generated Makefile in python/ has these lines commented out: #GENERATED = libvirt-export.c \ # libvirt.c \ # libvirt.h \ # libvirt.py Am I perhaps missing some python_includes? From what I can tell, WITH_PYTHON_TRUE only gets set to # if some includes are not there. I'm trying to build this on Debian Lenny with Python 2.5.2

2 1

[libvirt] [PATCH] Remove hand-crafted UUID parsers
by Daniel P. Berrange 25 Sep '09

25 Sep '09

* src/libvirt.c: Remove hand-crafted UUID parsers in favour of calling virParseUUID --- src/libvirt.c | 56 +++++--------------------------------------------------- 1 files changed, 5 insertions(+), 51 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 9fb0617..74d62a4 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -1839,26 +1839,11 @@ virDomainLookupByUUIDString(virConnectPtr conn, const char *uuidstr) virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); goto error; } - /* XXX: sexpr_uuid() also supports 'xxxx-xxxx-xxxx-xxxx' format. - * We needn't it here. Right? - */ - ret = sscanf(uuidstr, - "%02x%02x%02x%02x-" - "%02x%02x-" - "%02x%02x-" - "%02x%02x-" - "%02x%02x%02x%02x%02x%02x", - raw + 0, raw + 1, raw + 2, raw + 3, - raw + 4, raw + 5, raw + 6, raw + 7, - raw + 8, raw + 9, raw + 10, raw + 11, - raw + 12, raw + 13, raw + 14, raw + 15); - - if (ret!=VIR_UUID_BUFLEN) { + + if (virUUIDParse(uuidstr, uuid) < 0) { virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); goto error; } - for (i = 0; i < VIR_UUID_BUFLEN; i++) - uuid[i] = raw[i] & 0xFF; return virDomainLookupByUUID(conn, &uuid[0]); @@ -5038,26 +5023,10 @@ virNetworkLookupByUUIDString(virConnectPtr conn, const char *uuidstr) goto error; } - /* XXX: sexpr_uuid() also supports 'xxxx-xxxx-xxxx-xxxx' format. - * We needn't it here. Right? - */ - ret = sscanf(uuidstr, - "%02x%02x%02x%02x-" - "%02x%02x-" - "%02x%02x-" - "%02x%02x-" - "%02x%02x%02x%02x%02x%02x", - raw + 0, raw + 1, raw + 2, raw + 3, - raw + 4, raw + 5, raw + 6, raw + 7, - raw + 8, raw + 9, raw + 10, raw + 11, - raw + 12, raw + 13, raw + 14, raw + 15); - - if (ret!=VIR_UUID_BUFLEN) { + if (virUUIDParse(uuidstr, uuid) < 0) { virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); goto error; } - for (i = 0; i < VIR_UUID_BUFLEN; i++) - uuid[i] = raw[i] & 0xFF; return virNetworkLookupByUUID(conn, &uuid[0]); @@ -8887,26 +8856,11 @@ virSecretLookupByUUIDString(virConnectPtr conn, const char *uuidstr) virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); goto error; } - /* XXX: sexpr_uuid() also supports 'xxxx-xxxx-xxxx-xxxx' format. - * We needn't it here. Right? - */ - ret = sscanf(uuidstr, - "%02x%02x%02x%02x-" - "%02x%02x-" - "%02x%02x-" - "%02x%02x-" - "%02x%02x%02x%02x%02x%02x", - raw + 0, raw + 1, raw + 2, raw + 3, - raw + 4, raw + 5, raw + 6, raw + 7, - raw + 8, raw + 9, raw + 10, raw + 11, - raw + 12, raw + 13, raw + 14, raw + 15); - - if (ret!=VIR_UUID_BUFLEN) { + + if (virUUIDParse(uuidstr, uuid) < 0) { virLibConnError(conn, VIR_ERR_INVALID_ARG, __FUNCTION__); goto error; } - for (i = 0; i < VIR_UUID_BUFLEN; i++) - uuid[i] = raw[i] & 0xFF; return virSecretLookupByUUID(conn, &uuid[0]); -- 1.6.2.5

3 3

[libvirt] Virsh migrate --live fails
by Subba Rao, Sandeep M (STSD) 25 Sep '09

25 Sep '09

Hi, I'm trying to live move a domU using virsh migrate command: [root@RHEL53Xen1 ~]# xm list Name ID Mem(MiB) VCPUs State Time(s) Copy_RHELVM3 1 511 1 -b---- 898.3 Domain-0 0 1507 4 r----- 133702.5 [root@RHEL53Xen1 ~]# virsh migrate --live Copy_RHELVM3 xen+ssh://15.154.102.20 error: server closed connection [root@RHEL53Xen1 ~]# However the same works using xm migrate --live. The source and the destination are RHEL 5.3 Xen hosts. Libvirt: [root@RHEL53Xen1 ~]# rpm -qa | grep libvirt libvirt-0.3.3-14.el5 libvirt-devel-0.3.3-14.el5 libvirt-cim-0.5.1-4.el5 libvirt-python-0.3.3-14.el5 Xen: [root@RHEL53Xen1 ~]# rpm -qa | grep xen xen-3.0.3-80.el5 xen-libs-3.0.3-80.el5 xen-devel-3.0.3-80.el5 kernel-xen-2.6.18-128.el5 I was earlier getting the error - "can't connect: Name or service not known". So, installed libvirt-0.6.4 as mentioned in the following link: https://bugzilla.redhat.com/show_bug.cgi?id=348861 After installing libvirt-0.6.4, I'm getting "server closed connection" error. Any help is much appreciated. Thanks, Sandeep

2 2

[libvirt] node device devicekit backend
by Dave Allan 25 Sep '09

25 Sep '09

I've been looking at implementing a libudev backed node device, and I noticed that the devicekit node device backend doesn't build. Since I believe DeviceKit is deprecated for this sort of use, and AFAIK the DeviceKit support was never functionally equivalent to the HAL support, I'm wondering if we can just drop DeviceKit support. It also drags in glib, which is a separate problem. Opinions? Dave

2 1

[libvirt] Miscellaneous fixes to build with -Werror
by Charles Duffy 25 Sep '09

25 Sep '09

HACKING suggests compiling with --enable-compile-warnings=error before submitting any patches; however, current master fails for me on this account (CentOS 5.3; gcc 4.1.2). Please see attached. I suspect most of these should be uncontroversial -- but wonder if perhaps virStrcpy uses would be better converted to virStrcpyStatic rather than adding virStrcpy to the symbol list as done here, and am curious about whether the need for explicit initialization to silence a warning regarding qemudSetLogging's log_level indicates a bug in the macro later used to assign that value.

4 6

[libvirt] Some problem with the save function
by Daniel Berteaud 25 Sep '09

25 Sep '09

Hi everyone. This is my first post to this list, so excuse me if it's not the right place to poste info like this. I've found some problems in qemu_driver.c in the latest versions of libvirt: - the first problem was also present in 0.7.0. If we run qemu guests unprivileged, we cannot use the save function (virsh save guestname /path/to/file). The reason seems to be that libvirt first create the destination file to write the header and the XML definition. The file is owned by root with 600 permission. Then, we ask qemu to append the dump of the memory (via the migrate exec: call) to this file. This part doesn't work because the qemu user cannot write to this file. So we endup with a file which only contains the header and the XML, and the guest is stoped :/ - the second problem is present since libvirt 0.7.1. Now that the saved file can be compressed, it seems we cannot save in a raw format any more. This is due to this part in the code (qemu_driver.c): if (STREQ (prog, "raw")) prog = "cat"; internalret = virAsprintf(&command, "migrate \"exec:" "%s -c >> '%s' 2>/dev/null\"", prog, safe_path); which result in "migrate \"exec cat -c >> safe_path 2>/dev/null\"" But cat doesn't support the -c argument, so once again, the save fails, as we end up with a save file which only contains the header and the XML definition. Unfortunately, my C knowledge is near 0, so I cannot correct this myself. - the third problem, is that restore doesn't work any more. I haven't dig it yet, but when I try to restore a guest using a saved file (uncompressed produced under libvirt 0.7.0), I've this error: virsh restore /tmp/guest.state error: Failed to restore domain from /tmp/guest.state error: internal error unable to start guest: Nothing interesting in /var/log/libvirt/qemu/guest.log: LC_ALL=C PATH=/sbin:/usr/sbin:/bin:/usr/bin HOME=/root USER=root LOGNAME=root /usr/bin/qemu-kvm -S -M pc -m 2048 -smp 4 -name guest -uuid 37b5937b-eacf-fda6-f4d0-33537d61b414 -monitor unix:/var/lib/libvirt/qemu/guest.monitor,server,nowait -localtime -no-reboot -boot c -drive file=/dev/data/guest,if=ide,index=0,boot=on -drive file=/var/lib/libvirt/iso/boot.iso,if=ide,media=cdrom,index=2 -net nic,macaddr=52:54:00:48:c4:ca,vlan=0,name=nic.0 -net tap,fd=25,vlan=0,name=tap.0 -serial pty -parallel none -usb -usbdevice tablet -vnc 127.0.0.1:0 -k fr -vga cirrus -incoming exec:cat The qemu process eats 100% of CPU during a few seconds, then stops (if I strace it during this time, I see a lot of error like bad file descriptor). Anyone have save/restore functions working with 0.7.1 ? Cheers, Daniel -- Daniel Berteaud FIREWALL-SERVICES SARL. Société de Services en Logiciels Libres Technopôle Montesquieu 33650 MARTILLAC Tel : 05 56 64 15 32 Fax : 05 56 64 15 32 Mail: daniel(a)firewall-services.com Web : http://www.firewall-services.com

5 14

[libvirt] qemu_driver migrateuri handling broken?
by Gregor Schaffrath 24 Sep '09

24 Sep '09

Hi all. Short summary on DV's request ;) I ran into a problem migrating kvm machines with libvirt-0.6.5: 1) At first, using the same syntax for the migrateuri as with xen (just the IP) did not work... looking into the source code (! ;) ), I found a different syntax for qemu. 2) using tcp://<ip>:<port> just produced an 'unknown failure' on the receiving side: root@loadgen137:~> virsh -c qemu:///system migrate --live kvm-testnode-vnode3 qemu+tcp://10.192.11.136/system?no_verify=1 tcp://10.192.11.136:12345 error: Unknown failure (Note: it was working like a charm when I eliminated the migrateuri altogether, but this was not an option in all my work environments, since one of them doesn't feature DNS, breaking migration on the hostname alone (and keeping /etc/hosts in sync on n machines is something I'd like to avoid, if possible ;) )) 3) removing the case distinction and the handling of the migrateuri in the qemudDomainMigratePrepare2 function in qemu_driver.c entirely (if-statement, and full else-part) solved both my issues. --- The issue seems to be current with 0.7.1 as well (at least I did receive the same error message - I did not investigate further) --- My 2ct: ;) I think that a wrapper like libvirt should consequently abstract lower level details (such as 'qemu', or 'xen') as much as possible (that's what libvirt is for, I guess :) ). Since the removal of the URI handling solves both the issue _and_ eliminates a case distinction between xen and qemu (painlessly, as far as I can see), I'd suggest perhaps considering the removal. :) As to the sending side specification of transfer ports: I think there should always be a possiblity to leave port selection up to libvirt, as the sending side does not necessarily an oversight over the free ports on the receiving side. (I feel that the reason for the different syntax including mandatory :port part was motivated by the wish to allow users to specify ports on the sending side) Cheers, Gregor Schaffrath.

3 5

[libvirt] [PATCH] Fix a typo in virDiskHasValidPciAddr()
by Jiri Denemark 24 Sep '09

24 Sep '09

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/conf/domain_conf.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 09368d9..d494e54 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -125,7 +125,7 @@ struct _virDomainDiskDef { static inline int virDiskHasValidPciAddr(virDomainDiskDefPtr def) { - return def->pci_addr.domain || def->pci_addr.domain || def->pci_addr.slot; + return def->pci_addr.domain || def->pci_addr.bus || def->pci_addr.slot; } -- 1.6.5.rc1

3 2

[libvirt] "Unable to read QEMU help output: Interrupted system call" doing virDomainRestore() on current master
by Charles Duffy 24 Sep '09

24 Sep '09

Howdy. I've had this issue since yesterday, but avoided reporting it until determining today that it occurs on an unmodified upstream tree as well as my own local branch: $ virsh restore ramsave error: Failed to restore domain from ramsave error: Unable to read QEMU help output: Interrupted system call This happens immediately (no delay) and only on restore; "virsh start" behaves as usual. When running libvirtd under gdb, the failure mode is different: $ virsh restore ramsave error: Failed to restore domain from ramsave error: internal error Timed out while reading monitor startup output When running libvirtd under strace, this shows the binary being run (["/usr/bin/qemu-kvm", "-help"]) failing with a SIGPIPE while attempting to write to stdout. strace also shows a SIGSEGV being delivered to a libvirtd thread (a few clone()s removed from the parent) after that thread attempts to close all its open file descriptors above 0-2, but without being able to run gdb I'm at a bit of a loss as to what that thread is doing. Any suggestions?

2 1

[libvirt] [PATCH 0/5] Python fixes
by Cole Robinson 23 Sep '09

23 Sep '09

The following series fixes some functional (and cosmetic) issues with the python bindings. Thanks, Cole Cole Robinson (5): python: Don't generate conflicting conn.createXML functions. python: Add a newline between virConnect and virNode for readability. python: Don't generate bindings for vir*Ref python: Use a pure python implementation of 'vir*GetConnect' python: Fix generated virInterface method names python/generator.py | 40 +++++++++++++++++++++++++++++++++++++--- python/virConnect.py | 1 + 2 files changed, 38 insertions(+), 3 deletions(-)

2 8

[libvirt] building libvirtd fails on libxml-2
by Dan Bar Dov 23 Sep '09

23 Sep '09

I'm running on Centos5.3 Building using: ./autogen.sh --prefix=/usr configure fails with checking libxml2 xml2-config >= 2.6.0 ... configure: error: Could not find libxml2 anywhere (see config.log for details). but rpm -qa | grep libxml2 libxml2-python-2.6.26-2.1.2.7 libxml2-2.6.26-2.1.2.7 libxml2-2.6.26-2.1.2.7 So what's the problem, or better yet, how to fix it? Thanks, Dan

3 4

[libvirt] RFC: Rename / move / delete files in GIT
by Daniel P. Berrange 23 Sep '09

23 Sep '09

With the 0.7.1 relesae out of the way I'd like to suggest that we take this time to move around some files in GIT to correct some long standing wierd/bad naming decisions :-) The qemud/ directory is better named 'daemon', and some of the things in there should really have been in the src/ directory. So... * qemud/ -> daemon/ * qemud/qemud.{h,c} daemon/main.{h,c} * qemud/default-network.xml -> src/network/default.xml * qemud/libvirtd_qemu.aug src/qemu/qemu.aug * qemud/test_libvirtd_qemu.aug src/qemu/test_qemu.aug * qemud/remote_protocol.x -> src/remote/remote_protocol.x In the src/ directory we should move the rest of the drivers into their own sub-directories. Basically want one sub directory for each of the 'mod_LTLIBRARIES' declared in the src/Makefile.am. This will ensure we keep separate build dependancies, not accidentally including files that we shouldn't. * src/qemu_*.{c,h} -> src/qemu/ * src/xen_unified.{c,h} -> src/xen/xen_driver.{c,h} * src/xend_*, src/xm_* src/xen_* -> src/xen/ * src/test.{c,h} -> src/test/test_driver.{c,h} * src/storage*.{c,h} -> src/storage/ * src/security*.{c,h} -> src/security/ * src/remote_internal.{c,h} -> src/remote/remote_driver.{c,h} * src/interface_driver.c -> src/interface/netcf_driver.c * src/network_driver.c -> src/network/network_driver.c * src/lxc_* -> src/lxc/ * src/openvz_* -> src/openvz/ * src/node_device* -> src/nodedev/ That would just leave all the shared source files in src/. We could leave them there, or create a src/util/ directory for that stuff. Move virsh into the tools directory * src/virsh.c -> tools/virsh.c * docs/virsh.pod -> tools/virsh.pod * virsh.1: delete from GIT Sanitise naming in python/ directory, to make it clear which are the manually overriden methods. * python/libvir.c -> python/override-api.c * python/libvir.py -> python/override-api.py * python/libvirt-python-api.xml python/override-api.xml * python/libvirt_wrap.h -> python/types.h * python/virConnect.py -> python/override-virConnect.py Cleanup the docs/ directory * docs/*.html.in -> docs/website/ * docs/*.html: delete from GIT * docs/devhelp: delete from GIT * docs/html: delete from GIT * docs/libvirt-{api,refs}.xml: delete from GIT * docs/examples/ -> examples/ * docs/test*xml -> examples/xml/test/ * docs/storage -> examples/xml/storage/ Remove include/libvirt/libvirt.h from GIT For there places where I list 'delete from GIT', we would ensure that when you run 'make dist' the files are still included in the tar.gz NB, we would also update the cron job that deploys the website on libvirt.org soo that it runs 'make' in the docs/website directory to generate the .html files. Regards, 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 :|

4 8

[libvirt] [PATCH] Allow control over QEMU audio backend
by Daniel P. Berrange 23 Sep '09

23 Sep '09

When using VNC for graphics + keyboard + mouse, we shouldn't then use the host OS for audio. Audio should go back over VNC. When using SDL for graphics, we should use the host OS for audio since that's where the display is. We need to allow certain QEMU env variables to be passed through to guest too to allow choice of QEMU audio backend. * qemud/libvirtd.sysconf: Mention QEMU/SDL audio env vars * src/qemu_conf.c: Passthrough QEMU/SDL audio env for SDL display, disable host audio for VNC display --- daemon/libvirtd.sysconf | 8 ++++++++ src/qemu/qemu_conf.c | 14 ++++++++++++++ 2 files changed, 22 insertions(+), 0 deletions(-) diff --git a/daemon/libvirtd.sysconf b/daemon/libvirtd.sysconf index fe4596a..28080a0 100644 --- a/daemon/libvirtd.sysconf +++ b/daemon/libvirtd.sysconf @@ -7,3 +7,11 @@ # Override Kerberos service keytab for SASL/GSSAPI #KRB5_KTNAME=/etc/libvirt/krb5.tab + +# Override the QEMU/SDL default audio driver probing when +# starting virtual machines using SDL graphics +# +# NB these have no effect for VMs using VNC +#QEMU_AUDIO_DRV=sdl +# +#SDL_AUDIODRIVER=pulse diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 273aeca..74ca52b 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -2109,6 +2109,13 @@ int qemudBuildCommandLine(virConnectPtr conn, ADD_ARG_LIT("-k"); ADD_ARG_LIT(def->graphics[0]->data.vnc.keymap); } + + /* QEMU implements a VNC extension for providing audio, so we + * set the audio backend to none, to prevent it opening the + * host OS audio devices since that causes security issues + * and is non-sensical when using VNC. + */ + ADD_ENV_LIT("QEMU_AUDIO_DRV=none"); } else if ((def->ngraphics == 1) && def->graphics[0]->type == VIR_DOMAIN_GRAPHICS_TYPE_SDL) { char *xauth = NULL; @@ -2131,6 +2138,13 @@ int qemudBuildCommandLine(virConnectPtr conn, ADD_ENV(display); if (def->graphics[0]->data.sdl.fullscreen) ADD_ARG_LIT("-full-screen"); + + /* If using SDL for video, then we should just let it + * use QEMU's host audio drivers, possibly SDL too + * User can set these two before starting libvirtd + */ + ADD_ENV_COPY("QEMU_AUDIO_DRV"); + ADD_ENV_COPY("SDL_AUDIODRIVER"); } if (def->nvideos) { -- 1.6.2.5

2 2

[libvirt] ESX: Check if a datastore is accessible before accessing its URL property
by Matthias Bolte 23 Sep '09

23 Sep '09

An inaccessible datastore has no valid URL property. * src/esx/esx_vi.c: esxVI_LookupDatastoreByName(): check if datastore is accessible before accessing its URL property * src/esx/esx_vmx.c: update to changed datastore properties PS: This patch has to be applied after the 12er patch series. Matthias

3 2

[libvirt] ESX [01/12]: Add esxNodeGetFreeMemory()
by Matthias Bolte 23 Sep '09

23 Sep '09

* src/esx/esx_driver.c: add esxNodeGetFreeMemory(), cache IP address * src/esx/esx_vi.[ch]: refactor resource pool query into esxVI_GetResourcePool() * src/esx/esx_vi_types.[ch]: bind VI type ResourcePoolResourceUsage

3 2

[libvirt] [PATCH] Fix up "make check"
by Chris Lalancette 23 Sep '09

23 Sep '09

While running make check, I noticed that it was actually using the virsh binary from my system, in /usr/bin/virsh, and not the one that was just compiled. This doesn't seem to be the intent, so I changed all of the test scripts to point to the one built in-tree, not the system one. Signed-off-by: Chris Lalancette <clalance(a)redhat.com> --- tests/cpuset | 6 +++--- tests/define-dev-segfault | 4 ++-- tests/libvirtd-pool | 4 ++-- tests/read-bufsiz | 6 +++--- tests/read-non-seekable | 6 +++--- tests/start | 4 ++-- tests/test_conf.sh | 2 +- tests/undefine | 8 ++++---- tests/vcpupin | 6 +++--- tests/virsh-all | 6 +++--- tests/virsh-synopsis | 6 +++--- 11 files changed, 29 insertions(+), 29 deletions(-) diff --git a/tests/cpuset b/tests/cpuset index eeb0ee2..a3abe14 100755 --- a/tests/cpuset +++ b/tests/cpuset @@ -18,7 +18,7 @@ if test "$VERBOSE" = yes; then set -x - virsh --version + $abs_top_builddir/tools/virsh --version fi . $srcdir/test-lib.sh @@ -26,7 +26,7 @@ fi fail=0 # generate input -virsh --connect test:///default dumpxml 1 > xml || fail=1 +$abs_top_builddir/tools/virsh --connect test:///default dumpxml 1 > xml || fail=1 # require the presence of the string we'll transform grep '<vcpu>' xml > /dev/null || fail=1 @@ -34,7 +34,7 @@ grep '<vcpu>' xml > /dev/null || fail=1 sed "s/vcpu>/vcpu cpuset='aaa'>/" xml > xml-invalid || fail=1 # Require failure and a diagnostic. -virsh --connect test:///default define xml-invalid > out 2>&1 && fail=1 +$abs_top_builddir/tools/virsh --connect test:///default define xml-invalid > out 2>&1 && fail=1 cat <<\EOF > exp || fail=1 error: Failed to define domain from xml-invalid error: failed Xen syscall topology cpuset syntax error diff --git a/tests/define-dev-segfault b/tests/define-dev-segfault index 4ae286f..cce1c07 100755 --- a/tests/define-dev-segfault +++ b/tests/define-dev-segfault @@ -4,7 +4,7 @@ if test "$VERBOSE" = yes; then set -x - virsh --version + $abs_top_builddir/tools/virsh --version fi test -z "$srcdir" && srcdir=$(pwd) @@ -62,7 +62,7 @@ cat <<\EOF > D.xml || fail=1 EOF url=test:///default -virsh --connect "$url" 'define D.xml; dumpxml D' > out 2>&1 || fail=1 +$abs_top_builddir/tools/virsh --connect "$url" 'define D.xml; dumpxml D' > out 2>&1 || fail=1 cat > exp <<EOF || fail=1 Domain D defined from D.xml diff --git a/tests/libvirtd-pool b/tests/libvirtd-pool index 59da5a6..96da111 100755 --- a/tests/libvirtd-pool +++ b/tests/libvirtd-pool @@ -3,7 +3,7 @@ if test "$VERBOSE" = yes; then set -x - virsh --version + $abs_top_builddir/tools/virsh --version fi test -z "$srcdir" && srcdir=$(pwd) @@ -14,7 +14,7 @@ fail=0 pwd=$(pwd) || fail=1 -virsh --connect test:///default \ +$abs_top_builddir/tools/virsh --connect test:///default \ pool-define-as --print-xml \ P dir src-host /src/path /src/dev S /target-path \ 1>out 2>&1 diff --git a/tests/read-bufsiz b/tests/read-bufsiz index 7d53735..9652817 100755 --- a/tests/read-bufsiz +++ b/tests/read-bufsiz @@ -18,7 +18,7 @@ if test "$VERBOSE" = yes; then set -x - virsh --version + $abs_top_builddir/tools/virsh --version fi test -z "$srcdir" && srcdir=`pwd` @@ -29,7 +29,7 @@ test -z "$abs_top_srcdir" && abs_top_srcdir=`pwd`/.. fail=0 # Output a valid definition, to be used as input. -virsh -c test:///default dumpxml 1 > xml || fail=1 +$abs_top_builddir/tools/virsh -c test:///default dumpxml 1 > xml || fail=1 for i in before after; do # The largest BUFSIZ I've seen is 128K. This is slightly larger. @@ -38,7 +38,7 @@ for i in before after; do # Append or prepend enough spaces to push the size over the limit: ( test $i = before && cat sp xml || cat xml sp ) > $in || fail=1 - virsh --connect test:///default define $in > out || fail=1 + $abs_top_builddir/tools/virsh --connect test:///default define $in > out || fail=1 printf "Domain test defined from $in\n\n" > exp || fail=1 compare exp out || fail=1 done diff --git a/tests/read-non-seekable b/tests/read-non-seekable index 8a7bdcd..648def6 100755 --- a/tests/read-non-seekable +++ b/tests/read-non-seekable @@ -18,7 +18,7 @@ if test "$VERBOSE" = yes; then set -x - virsh --version + $abs_top_builddir/tools/virsh --version fi . $srcdir/test-lib.sh @@ -40,11 +40,11 @@ cat <<\EOF > dom </domain> EOF -virsh -c test:///default define dom > /dev/null || fail=1 +$abs_top_builddir/tools/virsh -c test:///default define dom > /dev/null || fail=1 mkfifo_or_skip_ fifo cat dom > fifo & -virsh -c test:///default define fifo > /dev/null || fail=1 +$abs_top_builddir/tools/virsh -c test:///default define fifo > /dev/null || fail=1 (exit $fail); exit $fail diff --git a/tests/start b/tests/start index f457d59..6f7815a 100755 --- a/tests/start +++ b/tests/start @@ -18,7 +18,7 @@ if test "$VERBOSE" = yes; then set -x - virsh --version + $abs_top_builddir/tools/virsh --version fi test -z "$srcdir" && srcdir=$(pwd) @@ -30,7 +30,7 @@ fail=0 test_url=test:///default # expect this to fail -virsh -c $test_url start test > out 2> err && fail=1 +$abs_top_builddir/tools/virsh -c $test_url start test > out 2> err && fail=1 # stdout gets a newline echo > exp || fail=1 diff --git a/tests/test_conf.sh b/tests/test_conf.sh index 62c2324..2754765 100755 --- a/tests/test_conf.sh +++ b/tests/test_conf.sh @@ -2,7 +2,7 @@ if test "$VERBOSE" = yes; then set -x - virsh --version + $abs_top_builddir/tools/virsh --version fi . $srcdir/test-lib.sh diff --git a/tests/undefine b/tests/undefine index fafdae7..048a98b 100755 --- a/tests/undefine +++ b/tests/undefine @@ -18,7 +18,7 @@ if test "$VERBOSE" = yes; then set -x - virsh --version + $abs_top_builddir/tools/virsh --version fi . $srcdir/test-lib.sh @@ -26,7 +26,7 @@ fi fail=0 # Attempt to undefine a running domain, by domain name. -virsh -q -c test:///default undefine test > out 2>&1 +$abs_top_builddir/tools/virsh -q -c test:///default undefine test > out 2>&1 test $? = 1 || fail=1 cat <<\EOF > exp || fail=1 error: Failed to undefine domain test @@ -35,7 +35,7 @@ EOF compare exp out || fail=1 # A different diagnostic when specifying a domain ID -virsh -q -c test:///default undefine 1 > out 2>&1 +$abs_top_builddir/tools/virsh -q -c test:///default undefine 1 > out 2>&1 test $? = 1 || fail=1 cat <<\EOF > exp || fail=1 error: a running domain like 1 cannot be undefined; @@ -44,7 +44,7 @@ EOF compare exp out || fail=1 # Succeed, now: first shut down, then undefine, both via name. -virsh -q -c test:///default 'shutdown test; undefine test' > out 2>&1 +$abs_top_builddir/tools/virsh -q -c test:///default 'shutdown test; undefine test' > out 2>&1 test $? = 0 || fail=1 cat <<\EOF > exp || fail=1 Domain test is being shutdown diff --git a/tests/vcpupin b/tests/vcpupin index 79b02dc..c243d80 100755 --- a/tests/vcpupin +++ b/tests/vcpupin @@ -18,7 +18,7 @@ if test "$VERBOSE" = yes; then set -x - virsh --version + $abs_top_builddir/tools/virsh --version fi . $srcdir/test-lib.sh @@ -26,7 +26,7 @@ fi fail=0 # Invalid syntax. -virsh --connect test:///default vcpupin test a 0,1 > out 2>&1 +$abs_top_builddir/tools/virsh --connect test:///default vcpupin test a 0,1 > out 2>&1 test $? = 1 || fail=1 cat <<\EOF > exp || fail=1 error: vcpupin: Invalid or missing vCPU number. @@ -35,7 +35,7 @@ EOF compare exp out || fail=1 # An out-of-range vCPU number deserves a diagnostic, too. -virsh --connect test:///default vcpupin test 100 0,1 > out 2>&1 +$abs_top_builddir/tools/virsh --connect test:///default vcpupin test 100 0,1 > out 2>&1 test $? = 1 || fail=1 cat <<\EOF > exp || fail=1 error: vcpupin: Invalid vCPU number. diff --git a/tests/virsh-all b/tests/virsh-all index 03ea466..6accf44 100755 --- a/tests/virsh-all +++ b/tests/virsh-all @@ -18,7 +18,7 @@ if test "$VERBOSE" = yes; then set -x - virsh --version + $abs_top_builddir/tools/virsh --version fi test -z "$srcdir" && srcdir=$(pwd) @@ -29,14 +29,14 @@ fail=0 test_url=test:///default -virsh -c $test_url help > cmds || framework_failure +$abs_top_builddir/tools/virsh -c $test_url help > cmds || framework_failure cmds=$(sed -n 's/^ $[^ ][^ ]*$ .*/\1/p' cmds) || framework_failure test -n "$cmds" || framework_failure for i in $cmds; do echo testing $i... 1>&2 # For now, just run the command and ignore output and exit status. - virsh -c $test_url $i < /dev/null > /dev/null 2>&1 + $abs_top_builddir/tools/virsh -c $test_url $i < /dev/null > /dev/null 2>&1 done (exit $fail); exit $fail diff --git a/tests/virsh-synopsis b/tests/virsh-synopsis index 24038dd..e700993 100755 --- a/tests/virsh-synopsis +++ b/tests/virsh-synopsis @@ -18,7 +18,7 @@ if test "$VERBOSE" = yes; then set -x - virsh --version + $abs_top_builddir/tools/virsh --version fi test -z "$srcdir" && srcdir=$(pwd) @@ -28,12 +28,12 @@ fail=0 test_url=test:///default -virsh -c $test_url help > cmds || framework_failure +$abs_top_builddir/tools/virsh -c $test_url help > cmds || framework_failure cmds=$(sed -n 's/^ $[^ ][^ ]*$ .*/\1/p' cmds) || framework_failure test -n "$cmds" || framework_failure for i in $cmds; do - virsh -c $test_url help $i > help || fail=1 + $abs_top_builddir/tools/virsh -c $test_url help $i > help || fail=1 grep -A1 '^ SYNOPSIS$' help > synopsis \ || { echo 1>&2 missing or invalid help SYNOPSIS for $i; fail=1; } sed -n 2p synopsis > s2 || framework_failure -- 1.6.0.6

2 2

[libvirt] virsh capabilities, kvm with apic and toggle
by Garry Dolley 23 Sep '09

23 Sep '09

When I run 'virsh capabilities' on a libvirt 0.6.4 system with qemu 0.10 and kvm-84, one of the results I get is: <guest> <os_type>hvm</os_type> <arch name='x86_64'> <wordsize>64</wordsize> <emulator>/usr/bin/qemu-system-x86_64</emulator> <machine>pc</machine> <machine>isapc</machine> <domain type='qemu'> </domain> <domain type='kvm'> <emulator>/usr/bin/kvm</emulator> </domain> </arch> <features> <acpi default='on' toggle='yes'/> <apic default='on' toggle='no'/> </features> </guest> I'm wondering why the "apic" feature can't be toggled. Passing -no-kvm-irqchip to kvm would turn off "PIC/IOAPIC/LAPIC" -- Garry Dolley ARP Networks, Inc. | http://www.arpnetworks.com | (818) 206-0181 Data center, VPS, and IP Transit solutions Member Los Angeles County REACT, Unit 336 | WQGK336 Blog http://scie.nti.st

2 1

[libvirt] [RFC,PATCH] network: add 'netboot' option to dhcp config
by Jeremy Kerr 23 Sep '09

23 Sep '09

Currently, libvirtd will start a dnsmasq process for the virtual network, but (aside from killing the dnsmasq process and replacing it), there's no way to define tftp boot options. This change introduces a 'netboot' tag to the dhcp configuration: <network> <name>default</name> <bridge name="virbr%d" /> <forward/> <ip address="192.168.122.1" netmask="255.255.255.0"> <dhcp> <range start="192.168.122.2" end="192.168.122.254" /> <netboot root="/srv/tftp" file="pxeboot.img"/> </dhcp> </ip> </network> When root= and file= attributes are present, these are passed to the arguments to dnsmasq: dnsmasq [...] --enable-tftp --tftp-root /srv/tftp --dhcp-boot pxeboot.img At present, only local tftp servers are supported (ie, dnsmasq runs as the tftp server), but we could improve this in future by adding a server= attribute. Signed-off-by: Jeremy Kerr <jk(a)ozlabs.org> --- docs/formatnetwork.html.in | 6 ++++++ docs/schemas/network.rng | 6 ++++++ src/network_conf.c | 28 ++++++++++++++++++++++++++++ src/network_conf.h | 9 +++++++++ src/network_driver.c | 10 ++++++++++ 5 files changed, 59 insertions(+) diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in index fd68430..3186498 100644 --- a/docs/formatnetwork.html.in +++ b/docs/formatnetwork.html.in @@ -138,6 +138,12 @@ name to be given that host by the DHCP server (via the <code>name</code> attribute). <span class="since">Since 0.4.5</span> </dd> + <dt><code>netboot</code></dt> + <dd>The optional <code>netboot</code> element specified network boot + options to be provided by the DHCP server. Two attributes are + required: <code>root</code> (the root path of the TFTP server), and + <code>file</code> (the file to be used for the boot image). + </dd> </dl> <h2><a name="examples">Example configuration</a></h2> diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng index a4281a5..571e916 100644 --- a/docs/schemas/network.rng +++ b/docs/schemas/network.rng @@ -76,6 +76,12 @@ <attribute name="ip"><text/></attribute> </element> </zeroOrMore> + <optional> + <element name="netboot"> + <attribute name="root"><text/></attribute> + <attribute name="file"><text/></attribute> + </element> + </optional> </element> </element> </optional> diff --git a/src/network_conf.c b/src/network_conf.c index 3764bb4..87bb5e4 100644 --- a/src/network_conf.c +++ b/src/network_conf.c @@ -115,6 +115,9 @@ void virNetworkDefFree(virNetworkDefPtr def) } VIR_FREE(def->hosts); + VIR_FREE(def->tftproot); + VIR_FREE(def->bootfile); + VIR_FREE(def); } @@ -299,6 +302,24 @@ virNetworkDHCPRangeDefParseXML(virConnectPtr conn, def->hosts[def->nhosts].name = (char *)name; def->hosts[def->nhosts].ip = (char *)ip; def->nhosts++; + + } else if (cur->type == XML_ELEMENT_NODE && + xmlStrEqual(cur->name, BAD_CAST "netboot")) { + xmlChar *root, *file; + + if (!(root = xmlGetProp(cur, BAD_CAST "root"))) { + cur = cur->next; + continue; + } + + if (!(file = xmlGetProp(cur, BAD_CAST "file"))) { + cur = cur->next; + xmlFree(root); + continue; + } + + def->tftproot = (char *)root; + def->bootfile = (char *)file; } cur = cur->next; @@ -621,6 +642,13 @@ char *virNetworkDefFormat(virConnectPtr conn, virBufferVSprintf(&buf, "ip='%s' ", def->hosts[i].ip); virBufferAddLit(&buf, "/>\n"); } + if (virNetworkDefProvidesNetboot(def)) { + virBufferAddLit(&buf, " <netboot"); + virBufferEscapeString(&buf, " root='%s'", def->tftproot); + virBufferEscapeString(&buf, " file='%s'", def->bootfile); + virBufferAddLit(&buf, " />\n"); + } + virBufferAddLit(&buf, " </dhcp>\n"); } diff --git a/src/network_conf.h b/src/network_conf.h index 4076f9a..f6f7c1e 100644 --- a/src/network_conf.h +++ b/src/network_conf.h @@ -78,8 +78,17 @@ struct _virNetworkDef { unsigned int nhosts; /* Zero or more dhcp hosts */ virNetworkDHCPHostDefPtr hosts; + + char *tftproot; + char *bootfile; }; +static inline int +virNetworkDefProvidesNetboot(const virNetworkDefPtr def) +{ + return def->tftproot && def->bootfile; +} + typedef struct _virNetworkObj virNetworkObj; typedef virNetworkObj *virNetworkObjPtr; struct _virNetworkObj { diff --git a/src/network_driver.c b/src/network_driver.c index 49855bf..cf462f2 100644 --- a/src/network_driver.c +++ b/src/network_driver.c @@ -400,6 +400,8 @@ networkBuildDnsmasqArgv(virConnectPtr conn, (2 * network->def->nranges) + /* --dhcp-range 10.0.0.2,10.0.0.254 */ /* --dhcp-host 01:23:45:67:89:0a,hostname,10.0.0.3 */ (2 * network->def->nhosts) + + /* --enable-tftp --tftp-root /srv/tftp --dhcp-boot pxeboot.img */ + (virNetworkDefProvidesNetboot(network->def) ? 5 : 0) + 1; /* NULL */ if (VIR_ALLOC_N(*argv, len) < 0) @@ -478,6 +480,14 @@ networkBuildDnsmasqArgv(virConnectPtr conn, APPEND_ARG(*argv, i++, buf); } + if (virNetworkDefProvidesNetboot(network->def)) { + APPEND_ARG(*argv, i++, "--enable-tftp"); + APPEND_ARG(*argv, i++, "--tftp-root"); + APPEND_ARG(*argv, i++, network->def->tftproot); + APPEND_ARG(*argv, i++, "--dhcp-boot"); + APPEND_ARG(*argv, i++, network->def->bootfile); + } + #undef APPEND_ARG return 0;

8 17

[libvirt] [PATCH] virStrncpy
by Chris Lalancette 22 Sep '09

22 Sep '09

Next revision of the virStrncpy patch. This one has the feedback from Mattias Bolte incorporated in, and passes all of the "make check" tests. I've also done basic testing on the hypervisors I have access to, (xen and kvm) and it seems to work there. That doesn't guarantee that it is bug-free, but most of the problems have been ironed out.

3 6

[libvirt] [RFC] Support for CPUID masking v2
by Jiri Denemark 22 Sep '09

22 Sep '09

Hi, This is an attempt to provide similar flexibility to CPU ID masking without being x86-specific and unfriendly to users. As suggested by Dan, we need a way to specify both CPU flags and topology to achieve this goal. Firstly, CPU topology and all (actually all that libvirt knows about) CPU features have to be advertised in host capabilities: <host> <cpu> ... <features> <feature>NAME</feature> </features> <topology> <sockets>NUMBER_OF_SOCKETS</sockets> <cores>CORES_PER_SOCKET</cores> <threads>THREADS_PER_CORE</threads> </topology> </cpu> ... </host> I'm not 100% sure we should represent CPU features as <feature>NAME</feature> especially because some features are currently advertised as <NAME/>. However, extending XML schema every time a new feature is introduced doesn't look like a good idea at all. The problem is we can't get rid of <NAME/>-style features, which would result in redundancy: <features> <vmx/> <feature>vmx</feature> </features> But I think it's better than changing the schema to add new features. Secondly, drivers which support detailed CPU specification have to advertise it in guest capabilities. In case <features> are meant to be hypervisor features, than it could look like: <guest> ... <features> <cpu/> </features> </guest> But if they are meant to be CPU features, we need to come up with something else: <guest> ... <cpu_selection/> </guest> I'm not sure how to deal with named CPUs suggested by Dan. Either we need to come up with global set of named CPUs and document what they mean or let drivers specify their own named CPUs and advertise them through guest capabilities: <guest> ... <cpu model="NAME"> <feature>NAME</feature> ... </cpu> </guest> The former approach would make matching named CPUs with those defined by a hypervisor (such as qemu) quite hard. The latter could bring the need for hardcoding features provided by specific CPU models or, in case we decide not to provide a list of features for each CPU model, it can complicate transferring a domain from one hypervisor to another. And finally, CPU may be configured in domain XML configuration: <domain> ... <cpu model="NAME"> <topology> <sockets>NUMBER_OF_SOCKETS</sockets> <cores>CORES_PER_SOCKET</cores> <threads>THREADS_PER_CORE</threads> </topology> <feature name="NAME" mode="set|check" value="on|off"/> </cpu> </domain> Mode 'check' checks physical CPU for the feature and refuses the domain to start if it doesn't match. VCPU feature is set to the same value. Mode 'set' just sets the VCPU feature. Final note: <topology> could also be called <cpu_topology> to avoid confusion with NUMA <topology>, which is used in host capabilities. However, I prefer <cpu><topology>...</topology></cpu> over <cpu><cpu_topology>...</cpu_topology></cpu>. Thanks for your comments. Jirka

5 10

[libvirt] Fix Xen virConnectPtr leak
by Matthias Bolte 22 Sep '09

22 Sep '09

The commit cb51aa48a777ddae6997faa9f28350cb62655ffd "Fix up connection reference counting." changed the driver closing and virConnectPtr unref-logic in virConnectClose(). Before this commit virConnectClose() closed all drivers of the given virConnectPtr and virUnrefConnect()'ed it afterwards. After this commit the driver-closing is done in virUnrefConnect() if and only if the ref-count of the virConnectPtr dropped to zero. This change in execution order leads to a virConnectPtr leak, at least for connections to Xen. The relevant call sequences: virConnectOpen() -> xenUnifiedOpen() ... ... xenInotifyOpen() -> virConnectRef(conn) ... xenStoreOpen() -> xenStoreAddWatch() -> conn->refs++ virConnectClose() -> xenUnifiedClose() ... ... xenInotifyClose() -> virUnrefConnect(conn) ... xenStoreClose() -> xenStoreRemoveWatch() -> virUnrefConnect(conn) Before the commit this additional virConnectRef/virUnrefConnect calls where no problem, because virConnectClose() closed the drivers explicitly and the additional refs added by the Xen subdrivers were removed properly. After the commit this additional refs result in a virConnectPtr leak (including a leak of the hypercall file handle; that's how I noticed this problem), because now the drivers are only close if and only if the ref-count drops to zero, but this cannot happen anymore, because the additional refs from the Xen subdrivers would only be removed if the drivers get closed, but that doesn't happen because the ref-count cannot drop to zero. The fix for this problem is simple: remove the virConnectRef/virUnrefConnect calls from the Xen subdrivers (see attached patch). Maybe someone could explain why the Xen Inotify and Xen Store driver do this extra ref-counting, but none of the other Xen subdrivers. It seems unnecessary to me and can be removed without problems. Matthias

3 3