- Devel - libvirt List Archives

[libvirt] [PATCH 0/4] Fix issues with snapshots named with strings containing '/'
by Peter Krempa 21 Jan '13

21 Jan '13

Multiple places in the code were affected by snapshots that would contain a slash in the name as the name is used to create path to the definition save file. Peter Krempa (4): qemu: Simplify condition with already extracted flag snapshot: conf: Avoid dereferencing NULL snapshot parent qemu: Don't return success if creation of snapshot save file fails qemu: Reject attempts to create snapshots with names containig '/' src/conf/snapshot_conf.c | 3 +++ src/qemu/qemu_driver.c | 22 +++++++++++++++++++--- 2 files changed, 22 insertions(+), 3 deletions(-) -- 1.8.1.1

3 17

[libvirt] [PATCH] safe{read, write}: Document usage with nonblocking FD
by Michal Privoznik 21 Jan '13

21 Jan '13

Currently, whenever somebody calls saferead() on nonblocking FD (safewrite() is totally interchangeable for purpose of this message) he might get wrong return value. For instance, in the first iteration some data is read. The number of bytes read is stored into local variable 'nread'. However, in next iterations we can get -1 from read() with errno == EAGAIN, in which case the -1 is returned despite fact some data has already been read. So the caller gets confused. Bare read() should be used for nonblocking FD. --- src/util/virutil.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/util/virutil.c b/src/util/virutil.c index b36e9d3..bc970a4 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -98,7 +98,9 @@ verify(sizeof(gid_t) <= sizeof(unsigned int) && #define VIR_FROM_THIS VIR_FROM_NONE -/* Like read(), but restarts after EINTR */ +/* Like read(), but restarts after EINTR. + * Doesn't play nicely with nonblocking FD and EAGAIN, + * in which case you want to use bare read() */ ssize_t saferead(int fd, void *buf, size_t count) { @@ -118,7 +120,9 @@ saferead(int fd, void *buf, size_t count) return nread; } -/* Like write(), but restarts after EINTR */ +/* Like write(), but restarts after EINTR. + * Doesn't play nicely with nonblocking FD and EAGAIN, + * in which case you want to use bare write() */ ssize_t safewrite(int fd, const void *buf, size_t count) { -- 1.8.0.2

2 2

[libvirt] [PATCH 0/2] Fix generation of API docs
by Jiri Denemark 21 Jan '13

21 Jan '13

The issue fixed by 2/2 was noticed by Claudio Bley, thanks for reporting that. Jiri Denemark (2): docs: event.c source file was renamed as virevent.c docs: Generate documentation for virTypedParams* APIs docs/Makefile.am | 4 +++- docs/apibuild.py | 18 +++++++++++------- 2 files changed, 14 insertions(+), 8 deletions(-) -- 1.8.1.1

2 4

[libvirt] [PATCHv2] spec: indent %if to make it easier to see conditions
by Eric Blake 21 Jan '13

21 Jan '13

Nested conditionals are hard to read if they are not indented. We can't add arbitrary whitespace to everything in spec files, but we CAN add spaces before %if and %define. Use this trick, plus a fancy sed script that rewrites a spec file into a C file, so we can use cppi to keep our spec file nice. For reference, sed script converts code like: |# RHEL-5 builds are client-only for s390, ppc |%if 0%{?rhel} == 5 | %ifnarch %{ix86} x86_64 ia64 | %define client_only 1 | %endif |%endif into the following for cppi: |// # RHEL-5 builds are client-only for s390, ppc |#if a // 0%{?rhel} == 5 |# if a // %{ix86} x86_64 ia64 |# define client_only 1 |# endif |#endif and errors from 'make syntax-check' look like: spec_indentation cppi: mingw-libvirt.spec.in: line 130: not properly indented maint.mk: incorrect preprocessor indentation * libvirt.spec.in: Add some indentation to make it easier to follow various conditionals. * mingw-libvirt-spec.in: Likewise. * cfg.mk (sc_spec_indentation): New syntax check to enforce it. --- v1: https://www.redhat.com/archives/libvir-list/2013-January/msg00571.html Changes since then: Rebase to latest, address review comment on spurious hunk, add mingw reformatting, and add syntax-check to enforce the style cfg.mk | 18 +- libvirt.spec.in | 854 +++++++++++++++++++++++++------------------------- mingw-libvirt.spec.in | 16 +- 3 files changed, 451 insertions(+), 437 deletions(-) diff --git a/cfg.mk b/cfg.mk index 96aab30..7c8ba2e 100644 --- a/cfg.mk +++ b/cfg.mk @@ -1,5 +1,5 @@ # Customize Makefile.maint. -*- makefile -*- -# Copyright (C) 2008-2012 Red Hat, Inc. +# Copyright (C) 2008-2013 Red Hat, Inc. # Copyright (C) 2003-2008 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify @@ -623,6 +623,22 @@ sc_preprocessor_indentation: echo '$(ME): skipping test $@: cppi not installed' 1>&2; \ fi +# Enforce similar spec file indentation style, by running cppi on a +# (comment-only) C file that mirrors the same layout as the spec file. +sc_spec_indentation: + @if cppi --version >/dev/null 2>&1; then \ + for f in $$($(VC_LIST_EXCEPT) | grep '\.spec\.in$$'); do \ + sed -e 's|#|// #|; s|%ifn*$arch$* |#if a // |' \ + -e 's/%$else\|endif\|define$/#\1/' \ + -e 's/^$ *$#/#\1/; s|^$[^#/]$|// \1|' $$f \ + | cppi -a -c 2>&1 | sed "s|standard input|$$f|"; \ + done | { if grep . >&2; then false; else :; fi; } \ + || { echo '$(ME): incorrect preprocessor indentation' 1>&2; \ + exit 1; }; \ + else \ + echo '$(ME): skipping test $@: cppi not installed' 1>&2; \ + fi + sc_copyright_format: @require='Copyright .*Red 'Hat', Inc\.' \ containing='Copyright .*Red 'Hat \ diff --git a/libvirt.spec.in b/libvirt.spec.in index 3486d29..52f86a1 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -22,16 +22,16 @@ # RHEL-5 builds are client-only for s390, ppc %if 0%{?rhel} == 5 -%ifnarch %{ix86} x86_64 ia64 -%define client_only 1 -%endif + %ifnarch %{ix86} 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 + %define server_drivers 0 %else -%define server_drivers 1 + %define server_drivers 1 %endif # Always build with dlopen'd modules @@ -54,15 +54,15 @@ %define with_qemu_tcg %{with_qemu} # Change if we ever provide qemu-kvm binaries on non-x86 hosts %if 0%{?fedora} >= 18 -%define qemu_kvm_arches %{ix86} x86_64 ppc64 s390x + %define qemu_kvm_arches %{ix86} x86_64 ppc64 s390x %else -%define qemu_kvm_arches %{ix86} x86_64 + %define qemu_kvm_arches %{ix86} x86_64 %endif %ifarch %{qemu_kvm_arches} -%define with_qemu_kvm %{with_qemu} + %define with_qemu_kvm %{with_qemu} %else -%define with_qemu_kvm 0 + %define with_qemu_kvm 0 %endif # Then the hypervisor drivers that run outside libvirtd, in libvirt.so @@ -84,14 +84,14 @@ %define with_storage_disk 0%{!?_without_storage_disk:%{server_drivers}} %define with_storage_mpath 0%{!?_without_storage_mpath:%{server_drivers}} %if 0%{?fedora} >= 16 -%define with_storage_rbd 0%{!?_without_storage_rbd:%{server_drivers}} + %define with_storage_rbd 0%{!?_without_storage_rbd:%{server_drivers}} %else -%define with_storage_rbd 0 + %define with_storage_rbd 0 %endif %if 0%{?fedora} >= 17 -%define with_storage_sheepdog 0%{!?_without_storage_sheepdog:%{server_drivers}} + %define with_storage_sheepdog 0%{!?_without_storage_sheepdog:%{server_drivers}} %else -%define with_storage_sheepdog 0 + %define with_storage_sheepdog 0 %endif %define with_numactl 0%{!?_without_numactl:%{server_drivers}} %define with_selinux 0%{!?_without_selinux:%{server_drivers}} @@ -126,215 +126,215 @@ # Xen is available only on i386 x86_64 ia64 %ifnarch %{ix86} x86_64 ia64 -%define with_xen 0 -%define with_libxl 0 + %define with_xen 0 + %define with_libxl 0 %endif # Numactl is not available on s390[x] and ARM %ifarch s390 s390x %{arm} -%define with_numactl 0 + %define with_numactl 0 %endif # RHEL doesn't ship OpenVZ, VBox, UML, PowerHypervisor, # VMWare, libxenserver (xenapi), libxenlight (Xen 4.1 and newer), # or HyperV. %if 0%{?rhel} -%define with_openvz 0 -%define with_vbox 0 -%define with_uml 0 -%define with_phyp 0 -%define with_vmware 0 -%define with_xenapi 0 -%define with_libxl 0 -%define with_hyperv 0 -%define with_parallels 0 + %define with_openvz 0 + %define with_vbox 0 + %define with_uml 0 + %define with_phyp 0 + %define with_vmware 0 + %define with_xenapi 0 + %define with_libxl 0 + %define with_hyperv 0 + %define with_parallels 0 %endif # Fedora 17 / RHEL-7 are first where we use systemd. Although earlier # Fedora has systemd, libvirt still used sysvinit there. %if 0%{?fedora} >= 17 || 0%{?rhel} >= 7 -%define with_systemd 1 + %define with_systemd 1 %endif # Fedora 18 / RHEL-7 are first where firewalld support is enabled %if 0%{?fedora} >= 17 || 0%{?rhel} >= 7 -%define with_firewalld 1 + %define with_firewalld 1 %endif # RHEL-5 has restricted QEMU to x86_64 only and is too old for LXC %if 0%{?rhel} == 5 -%define with_qemu_tcg 0 -%ifnarch x86_64 -%define with_qemu 0 -%define with_qemu_kvm 0 -%endif -%define with_lxc 0 + %define with_qemu_tcg 0 + %ifnarch x86_64 + %define with_qemu 0 + %define with_qemu_kvm 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 -%define with_qemu_tcg 0 -%ifnarch x86_64 -%define with_qemu 0 -%define with_qemu_kvm 0 -%endif -%define with_xen 0 + %define with_qemu_tcg 0 + %ifnarch x86_64 + %define with_qemu 0 + %define with_qemu_kvm 0 + %endif + %define with_xen 0 %endif # Fedora doesn't have any QEMU on ppc64 until FC16 - only ppc %if 0%{?fedora} && 0%{?fedora} < 16 -%ifarch ppc64 -%define with_qemu 0 -%endif + %ifarch ppc64 + %define with_qemu 0 + %endif %endif # Fedora doesn't have new enough Xen for libxl until F18 %if 0%{?fedora} && 0%{?fedora} < 18 -%define with_libxl 0 + %define with_libxl 0 %endif # PolicyKit was introduced in Fedora 8 / RHEL-6 or newer %if 0%{?fedora} >= 8 || 0%{?rhel} >= 6 -%define with_polkit 0%{!?_without_polkit:1} + %define with_polkit 0%{!?_without_polkit:1} %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} + %define with_capng 0%{!?_without_capng:1} %endif # fuse is used to provide virtualized /proc for LXC %if 0%{?fedora} >= 17 || 0%{?rhel} >= 7 -%define with_fuse 0%{!?_without_fuse:1} + %define with_fuse 0%{!?_without_fuse: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}} + %define with_netcf 0%{!?_without_netcf:%{server_drivers}} %endif # udev is used to manage host devices in Fedora 12 / RHEL-6 or newer %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 -%define with_udev 0%{!?_without_udev:%{server_drivers}} + %define with_udev 0%{!?_without_udev:%{server_drivers}} %else -%define with_hal 0%{!?_without_hal:%{server_drivers}} + %define with_hal 0%{!?_without_hal:%{server_drivers}} %endif # interface requires netcf %if ! 0%{?with_netcf} -%define with_interface 0 + %define with_interface 0 %endif # Enable yajl library for JSON mode with QEMU %if 0%{?fedora} >= 13 || 0%{?rhel} >= 6 -%define with_yajl 0%{!?_without_yajl:%{server_drivers}} + %define with_yajl 0%{!?_without_yajl:%{server_drivers}} %endif # Enable sanlock library for lock management with QEMU # Sanlock is available only on i686 x86_64 for RHEL %if 0%{?fedora} >= 16 -%define with_sanlock 0%{!?_without_sanlock:%{server_drivers}} + %define with_sanlock 0%{!?_without_sanlock:%{server_drivers}} %endif %if 0%{?rhel} >= 6 -%ifarch %{ix86} x86_64 -%define with_sanlock 0%{!?_without_sanlock:%{server_drivers}} -%endif + %ifarch %{ix86} x86_64 + %define with_sanlock 0%{!?_without_sanlock:%{server_drivers}} + %endif %endif # Enable libssh2 transport for new enough distros %if 0%{?fedora} >= 17 || 0%{?rhel} >= 6 -%define with_libssh2 0%{!?_without_libssh2:1} + %define with_libssh2 0%{!?_without_libssh2:1} %endif # Disable some drivers when building without libvirt daemon. # The logic is the same as in configure.ac %if ! %{with_libvirtd} -%define with_interface 0 -%define with_network 0 -%define with_qemu 0 -%define with_lxc 0 -%define with_uml 0 -%define with_hal 0 -%define with_udev 0 -%define with_storage_fs 0 -%define with_storage_lvm 0 -%define with_storage_iscsi 0 -%define with_storage_mpath 0 -%define with_storage_rbd 0 -%define with_storage_sheepdog 0 -%define with_storage_disk 0 + %define with_interface 0 + %define with_network 0 + %define with_qemu 0 + %define with_lxc 0 + %define with_uml 0 + %define with_hal 0 + %define with_udev 0 + %define with_storage_fs 0 + %define with_storage_lvm 0 + %define with_storage_iscsi 0 + %define with_storage_mpath 0 + %define with_storage_rbd 0 + %define with_storage_sheepdog 0 + %define with_storage_disk 0 %endif %if %{with_qemu} || %{with_lxc} || %{with_uml} -%define with_nwfilter 0%{!?_without_nwfilter:%{server_drivers}} + %define with_nwfilter 0%{!?_without_nwfilter:%{server_drivers}} # Enable libpcap library -%define with_libpcap 0%{!?_without_libpcap:%{server_drivers}} -%define with_macvtap 0%{!?_without_macvtap:%{server_drivers}} + %define with_libpcap 0%{!?_without_libpcap:%{server_drivers}} + %define with_macvtap 0%{!?_without_macvtap:%{server_drivers}} # numad is used to manage the CPU and memory placement dynamically, # it's not available on s390[x] and ARM. -%if 0%{?fedora} >= 17 || 0%{?rhel} >= 6 -%ifnarch s390 s390x %{arm} -%define with_numad 0%{!?_without_numad:%{server_drivers}} -%endif -%endif + %if 0%{?fedora} >= 17 || 0%{?rhel} >= 6 + %ifnarch s390 s390x %{arm} + %define with_numad 0%{!?_without_numad:%{server_drivers}} + %endif + %endif %endif %if %{with_macvtap} -%define with_libnl 1 + %define with_libnl 1 %endif %if 0%{?fedora} >= 11 || 0%{?rhel} >= 5 -%define with_audit 0%{!?_without_audit:1} + %define with_audit 0%{!?_without_audit:1} %endif %if 0%{?fedora} >= 13 || 0%{?rhel} >= 6 -%define with_dtrace 1 + %define with_dtrace 1 %endif # Pull in cgroups config system %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 -%if %{with_qemu} || %{with_lxc} -%define with_cgconfig 0%{!?_without_cgconfig:1} -%endif + %if %{with_qemu} || %{with_lxc} + %define with_cgconfig 0%{!?_without_cgconfig:1} + %endif %endif %if %{with_udev} || %{with_hal} -%define with_nodedev 1 + %define with_nodedev 1 %else -%define with_nodedev 0 + %define with_nodedev 0 %endif %if %{with_storage_fs} || %{with_storage_mpath} || %{with_storage_iscsi} || %{with_storage_lvm} || %{with_storage_disk} -%define with_storage 1 + %define with_storage 1 %else -%define with_storage 0 + %define with_storage 0 %endif # Force QEMU to run as non-root %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 -%define qemu_user qemu -%define qemu_group qemu + %define qemu_user qemu + %define qemu_group qemu %else -%define qemu_user root -%define qemu_group root + %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 + %define with_rhel5 1 %else -%define with_rhel5 0 + %define with_rhel5 0 %endif %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 -%define with_systemd_macros 1 + %define with_systemd_macros 1 %else -%define with_systemd_macros 0 + %define with_systemd_macros 0 %endif @@ -348,34 +348,34 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root URL: http://libvirt.org/ %if %(echo %{version} | grep -o \\. | wc -l) == 3 -%define mainturl stable_updates/ + %define mainturl stable_updates/ %endif Source: http://libvirt.org/sources/%{?mainturl}libvirt-%{version}.tar.gz %if %{with_libvirtd} Requires: libvirt-daemon = %{version}-%{release} -%if %{with_network} + %if %{with_network} Requires: libvirt-daemon-config-network = %{version}-%{release} -%endif -%if %{with_nwfilter} + %endif + %if %{with_nwfilter} Requires: libvirt-daemon-config-nwfilter = %{version}-%{release} -%endif -%if %{with_driver_modules} -%if %{with_libxl} + %endif + %if %{with_driver_modules} + %if %{with_libxl} Requires: libvirt-daemon-driver-libxl = %{version}-%{release} -%endif -%if %{with_lxc} + %endif + %if %{with_lxc} Requires: libvirt-daemon-driver-lxc = %{version}-%{release} -%endif -%if %{with_qemu} + %endif + %if %{with_qemu} Requires: libvirt-daemon-driver-qemu = %{version}-%{release} -%endif -%if %{with_uml} + %endif + %if %{with_uml} Requires: libvirt-daemon-driver-uml = %{version}-%{release} -%endif -%if %{with_xen} + %endif + %if %{with_xen} Requires: libvirt-daemon-driver-xen = %{version}-%{release} -%endif + %endif Requires: libvirt-daemon-driver-interface = %{version}-%{release} Requires: libvirt-daemon-driver-secret = %{version}-%{release} @@ -383,7 +383,7 @@ Requires: libvirt-daemon-driver-storage = %{version}-%{release} Requires: libvirt-daemon-driver-network = %{version}-%{release} Requires: libvirt-daemon-driver-nodedev = %{version}-%{release} Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release} -%endif + %endif %endif Requires: libvirt-client = %{version}-%{release} @@ -419,11 +419,11 @@ BuildRequires: augeas BuildRequires: hal-devel %endif %if %{with_udev} -%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 + %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 BuildRequires: systemd-devel >= 185 -%else + %else BuildRequires: libudev-devel >= 145 -%endif + %endif BuildRequires: libpciaccess-devel >= 0.10.9 %endif %if %{with_yajl} @@ -432,21 +432,21 @@ BuildRequires: yajl-devel %if %{with_sanlock} # make sure libvirt is built with new enough sanlock on # distros that have it; required for on_lockfailure -%if 0%{?fedora} >= 17 || 0%{?rhel} >= 6 + %if 0%{?fedora} >= 17 || 0%{?rhel} >= 6 BuildRequires: sanlock-devel >= 2.4 -%else + %else BuildRequires: sanlock-devel >= 1.8 -%endif + %endif %endif %if %{with_libpcap} BuildRequires: libpcap-devel %endif %if %{with_libnl} -%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 + %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 BuildRequires: libnl3-devel -%else + %else BuildRequires: libnl-devel -%endif + %endif %endif %if %{with_avahi} BuildRequires: avahi-devel @@ -468,12 +468,12 @@ BuildRequires: module-init-tools BuildRequires: cyrus-sasl-devel %endif %if %{with_polkit} -%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 + %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 # Only need the binary, not -devel BuildRequires: polkit >= 0.93 -%else + %else BuildRequires: PolicyKit-devel >= 0.6 -%endif + %endif %endif %if %{with_storage_fs} # For mount/umount in FS driver @@ -483,10 +483,10 @@ BuildRequires: util-linux # From QEMU RPMs BuildRequires: /usr/bin/qemu-img %else -%if %{with_xen} + %if %{with_xen} # From Xen RPMs BuildRequires: /usr/sbin/qcow-create -%endif + %endif %endif %if %{with_storage_lvm} # For LVM drivers @@ -499,22 +499,22 @@ BuildRequires: iscsi-initiator-utils %if %{with_storage_disk} # For disk driver BuildRequires: parted-devel -%if 0%{?rhel} == 5 + %if 0%{?rhel} == 5 # Broken RHEL-5 parted RPM is missing a dep BuildRequires: e2fsprogs-devel -%endif + %endif %endif %if %{with_storage_mpath} # For Multipath support -%if 0%{?rhel} == 5 + %if 0%{?rhel} == 5 # Broken RHEL-5 packaging has header files in main RPM :-( BuildRequires: device-mapper -%else + %else BuildRequires: device-mapper-devel -%endif -%if %{with_storage_rbd} + %endif + %if %{with_storage_rbd} BuildRequires: ceph-devel -%endif + %endif %endif %if %{with_numactl} # For QEMU/LXC numa info @@ -531,22 +531,22 @@ BuildRequires: libssh2-devel >= 1.3.0 %endif %if %{with_netcf} -%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 + %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 BuildRequires: netcf-devel >= 0.2.2 -%else -%if 0%{?fedora} >= 16 || 0%{?rhel} >= 6 + %else + %if 0%{?fedora} >= 16 || 0%{?rhel} >= 6 BuildRequires: netcf-devel >= 0.1.8 -%else + %else BuildRequires: netcf-devel >= 0.1.4 -%endif -%endif + %endif + %endif %endif %if %{with_esx} -%if 0%{?fedora} >= 9 || 0%{?rhel} >= 6 + %if 0%{?fedora} >= 9 || 0%{?rhel} >= 6 BuildRequires: libcurl-devel -%else + %else BuildRequires: curl-devel -%endif + %endif %endif %if %{with_hyperv} BuildRequires: libwsman-devel >= 2.2.3 @@ -611,57 +611,57 @@ Requires: %{name}-client = %{version}-%{release} Requires: module-init-tools # for /sbin/ip & /sbin/tc Requires: iproute -%if %{with_avahi} -%if 0%{?rhel} == 5 + %if %{with_avahi} + %if 0%{?rhel} == 5 Requires: avahi -%else + %else Requires: avahi-libs -%endif -%endif -%if %{with_network} + %endif + %endif + %if %{with_network} Requires: dnsmasq >= 2.41 Requires: radvd -%endif -%if %{with_network} || %{with_nwfilter} + %endif + %if %{with_network} || %{with_nwfilter} Requires: iptables Requires: iptables-ipv6 -%endif -%if %{with_nwfilter} + %endif + %if %{with_nwfilter} Requires: ebtables -%endif -%if %{with_netcf} && (0%{?fedora} >= 18 || 0%{?rhel} >= 7) + %endif + %if %{with_netcf} && (0%{?fedora} >= 18 || 0%{?rhel} >= 7) Requires: netcf-libs >= 0.2.2 -%endif + %endif # needed for device enumeration -%if %{with_hal} + %if %{with_hal} Requires: hal -%endif -%if %{with_udev} -%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 + %endif + %if %{with_udev} + %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 Requires: systemd >= 185 -%else + %else Requires: udev >= 145 -%endif -%endif -%if %{with_polkit} -%if 0%{?fedora} >= 12 || 0%{?rhel} >=6 + %endif + %endif + %if %{with_polkit} + %if 0%{?fedora} >= 12 || 0%{?rhel} >=6 Requires: polkit >= 0.93 -%else + %else Requires: PolicyKit >= 0.6 -%endif -%endif -%if %{with_storage_fs} + %endif + %endif + %if %{with_storage_fs} Requires: nfs-utils # For mkfs Requires: util-linux # For pool-build probing for existing pools BuildRequires: libblkid-devel >= 2.17 # For glusterfs -%if 0%{?fedora} >= 11 + %if 0%{?fedora} >= 11 Requires: glusterfs-client >= 2.0.1 -%endif -%endif -%if %{with_qemu} + %endif + %endif + %if %{with_qemu} # From QEMU RPMs Requires: /usr/bin/qemu-img # For image compression @@ -669,50 +669,50 @@ Requires: gzip Requires: bzip2 Requires: lzop Requires: xz -%else -%if %{with_xen} + %else + %if %{with_xen} # From Xen RPMs Requires: /usr/sbin/qcow-create -%endif -%endif -%if %{with_storage_lvm} + %endif + %endif + %if %{with_storage_lvm} # For LVM drivers Requires: lvm2 -%endif -%if %{with_storage_iscsi} + %endif + %if %{with_storage_iscsi} # For ISCSI driver Requires: iscsi-initiator-utils -%endif -%if %{with_storage_disk} + %endif + %if %{with_storage_disk} # For disk driver Requires: parted Requires: device-mapper -%endif -%if %{with_storage_mpath} + %endif + %if %{with_storage_mpath} # For multipath support Requires: device-mapper -%endif -%if %{with_storage_sheepdog} + %endif + %if %{with_storage_sheepdog} # For Sheepdog support Requires: sheepdog -%endif -%if %{with_cgconfig} + %endif + %if %{with_cgconfig} Requires: libcgroup -%endif -%ifarch %{ix86} x86_64 ia64 + %endif + %ifarch %{ix86} x86_64 ia64 # For virConnectGetSysinfo Requires: dmidecode -%endif + %endif # For service management -%if %{with_systemd} + %if %{with_systemd} Requires(post): systemd-units Requires(post): systemd-sysv Requires(preun): systemd-units Requires(postun): systemd-units -%endif -%if %{with_numad} + %endif + %if %{with_numad} Requires: numad -%endif + %endif # libvirtd depends on 'messagebus' service Requires: dbus @@ -721,7 +721,7 @@ Server side daemon required to manage the virtualization capabilities of recent versions of Linux. Requires a hypervisor specific sub-RPM for specific drivers. -%if %{with_network} + %if %{with_network} %package daemon-config-network Summary: Default configuration files for the libvirtd daemon Group: Development/Libraries @@ -730,9 +730,9 @@ Requires: libvirt-daemon = %{version}-%{release} %description daemon-config-network Default configuration files for setting up NAT based networking -%endif + %endif -%if %{with_nwfilter} + %if %{with_nwfilter} %package daemon-config-nwfilter Summary: Network filter configuration files for the libvirtd daemon Group: Development/Libraries @@ -741,10 +741,10 @@ Requires: libvirt-daemon = %{version}-%{release} %description daemon-config-nwfilter Network filter configuration files for cleaning guest traffic -%endif + %endif -%if %{with_driver_modules} -%if %{with_network} + %if %{with_driver_modules} + %if %{with_network} %package daemon-driver-network Summary: Network driver plugin for the libvirtd daemon Group: Development/Libraries @@ -754,10 +754,10 @@ Requires: libvirt-daemon = %{version}-%{release} The network driver plugin for the libvirtd daemon, providing an implementation of the virtual network APIs using the Linux bridge capabilities. -%endif + %endif -%if %{with_nwfilter} + %if %{with_nwfilter} %package daemon-driver-nwfilter Summary: Nwfilter driver plugin for the libvirtd daemon Group: Development/Libraries @@ -767,10 +767,10 @@ Requires: libvirt-daemon = %{version}-%{release} The nwfilter driver plugin for the libvirtd daemon, providing an implementation of the firewall APIs using the ebtables, iptables and ip6tables capabilities -%endif + %endif -%if %{with_nodedev} + %if %{with_nodedev} %package daemon-driver-nodedev Summary: Nodedev driver plugin for the libvirtd daemon Group: Development/Libraries @@ -780,10 +780,10 @@ Requires: libvirt-daemon = %{version}-%{release} The nodedev driver plugin for the libvirtd daemon, providing an implementation of the node device APIs using the udev capabilities. -%endif + %endif -%if %{with_interface} + %if %{with_interface} %package daemon-driver-interface Summary: Interface driver plugin for the libvirtd daemon Group: Development/Libraries @@ -793,7 +793,7 @@ Requires: libvirt-daemon = %{version}-%{release} The interface driver plugin for the libvirtd daemon, providing an implementation of the network interface APIs using the netcf library -%endif + %endif %package daemon-driver-secret @@ -806,7 +806,7 @@ The secret driver plugin for the libvirtd daemon, providing an implementation of the secret key APIs. -%if %{with_storage} + %if %{with_storage} %package daemon-driver-storage Summary: Storage driver plugin for the libvirtd daemon Group: Development/Libraries @@ -816,10 +816,10 @@ Requires: libvirt-daemon = %{version}-%{release} The storage driver plugin for the libvirtd daemon, providing an implementation of the storage APIs using LVM, iSCSI, parted and more. -%endif + %endif -%if %{with_qemu} + %if %{with_qemu} %package daemon-driver-qemu Summary: Qemu driver plugin for the libvirtd daemon Group: Development/Libraries @@ -831,10 +831,10 @@ Requires: libvirt-daemon-driver-network = %{version}-%{release} The qemu driver plugin for the libvirtd daemon, providing an implementation of the hypervisor driver APIs using QEMU -%endif + %endif -%if %{with_lxc} + %if %{with_lxc} %package daemon-driver-lxc Summary: LXC driver plugin for the libvirtd daemon Group: Development/Libraries @@ -846,10 +846,10 @@ Requires: libvirt-daemon-driver-network = %{version}-%{release} The LXC driver plugin for the libvirtd daemon, providing an implementation of the hypervisor driver APIs using the Linux kernel -%endif + %endif -%if %{with_uml} + %if %{with_uml} %package daemon-driver-uml Summary: Uml driver plugin for the libvirtd daemon Group: Development/Libraries @@ -859,10 +859,10 @@ Requires: libvirt-daemon = %{version}-%{release} The UML driver plugin for the libvirtd daemon, providing an implementation of the hypervisor driver APIs using User Mode Linux -%endif + %endif -%if %{with_xen} + %if %{with_xen} %package daemon-driver-xen Summary: Xen driver plugin for the libvirtd daemon Group: Development/Libraries @@ -872,10 +872,10 @@ Requires: libvirt-daemon = %{version}-%{release} The Xen driver plugin for the libvirtd daemon, providing an implementation of the hypervisor driver APIs using Xen -%endif + %endif -%if %{with_libxl} + %if %{with_libxl} %package daemon-driver-libxl Summary: Libxl driver plugin for the libvirtd daemon Group: Development/Libraries @@ -885,18 +885,18 @@ Requires: libvirt-daemon = %{version}-%{release} The Libxl driver plugin for the libvirtd daemon, providing an implementation of the hypervisor driver APIs using Libxl -%endif -%endif + %endif + %endif # %{with_driver_modules} -%if %{with_qemu_tcg} + %if %{with_qemu_tcg} %package daemon-qemu Summary: Server side daemon & driver required to run QEMU guests Group: Development/Libraries Requires: libvirt-daemon = %{version}-%{release} -%if %{with_driver_modules} + %if %{with_driver_modules} Requires: libvirt-daemon-driver-qemu = %{version}-%{release} Requires: libvirt-daemon-driver-interface = %{version}-%{release} Requires: libvirt-daemon-driver-network = %{version}-%{release} @@ -904,22 +904,22 @@ Requires: libvirt-daemon-driver-nodedev = %{version}-%{release} Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release} Requires: libvirt-daemon-driver-secret = %{version}-%{release} Requires: libvirt-daemon-driver-storage = %{version}-%{release} -%endif + %endif Requires: qemu %description daemon-qemu Server side daemon and driver required to manage the virtualization capabilities of the QEMU TCG emulators -%endif + %endif -%if %{with_qemu_kvm} + %if %{with_qemu_kvm} %package daemon-kvm Summary: Server side daemon & driver required to run KVM guests Group: Development/Libraries Requires: libvirt-daemon = %{version}-%{release} -%if %{with_driver_modules} + %if %{with_driver_modules} Requires: libvirt-daemon-driver-qemu = %{version}-%{release} Requires: libvirt-daemon-driver-interface = %{version}-%{release} Requires: libvirt-daemon-driver-network = %{version}-%{release} @@ -927,22 +927,22 @@ Requires: libvirt-daemon-driver-nodedev = %{version}-%{release} Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release} Requires: libvirt-daemon-driver-secret = %{version}-%{release} Requires: libvirt-daemon-driver-storage = %{version}-%{release} -%endif + %endif Requires: qemu-kvm %description daemon-kvm Server side daemon and driver required to manage the virtualization capabilities of the KVM hypervisor -%endif + %endif -%if %{with_lxc} + %if %{with_lxc} %package daemon-lxc Summary: Server side daemon & driver required to run LXC guests Group: Development/Libraries Requires: libvirt-daemon = %{version}-%{release} -%if %{with_driver_modules} + %if %{with_driver_modules} Requires: libvirt-daemon-driver-lxc = %{version}-%{release} Requires: libvirt-daemon-driver-interface = %{version}-%{release} Requires: libvirt-daemon-driver-network = %{version}-%{release} @@ -950,21 +950,21 @@ Requires: libvirt-daemon-driver-nodedev = %{version}-%{release} Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release} Requires: libvirt-daemon-driver-secret = %{version}-%{release} Requires: libvirt-daemon-driver-storage = %{version}-%{release} -%endif + %endif %description daemon-lxc Server side daemon and driver required to manage the virtualization capabilities of LXC -%endif + %endif -%if %{with_uml} + %if %{with_uml} %package daemon-uml Summary: Server side daemon & driver required to run UML guests Group: Development/Libraries Requires: libvirt-daemon = %{version}-%{release} -%if %{with_driver_modules} + %if %{with_driver_modules} Requires: libvirt-daemon-driver-uml = %{version}-%{release} Requires: libvirt-daemon-driver-interface = %{version}-%{release} Requires: libvirt-daemon-driver-network = %{version}-%{release} @@ -972,42 +972,42 @@ Requires: libvirt-daemon-driver-nodedev = %{version}-%{release} Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release} Requires: libvirt-daemon-driver-secret = %{version}-%{release} Requires: libvirt-daemon-driver-storage = %{version}-%{release} -%endif + %endif # There are no UML kernel RPMs in Fedora/RHEL to depend on. %description daemon-uml Server side daemon and driver required to manage the virtualization capabilities of UML -%endif + %endif -%if %{with_xen} || %{with_libxl} + %if %{with_xen} || %{with_libxl} %package daemon-xen Summary: Server side daemon & driver required to run XEN guests Group: Development/Libraries Requires: libvirt-daemon = %{version}-%{release} -%if %{with_driver_modules} -%if %{with_xen} + %if %{with_driver_modules} + %if %{with_xen} Requires: libvirt-daemon-driver-xen = %{version}-%{release} -%endif -%if %{with_libxl} + %endif + %if %{with_libxl} Requires: libvirt-daemon-driver-libxl = %{version}-%{release} -%endif + %endif Requires: libvirt-daemon-driver-interface = %{version}-%{release} Requires: libvirt-daemon-driver-network = %{version}-%{release} Requires: libvirt-daemon-driver-nodedev = %{version}-%{release} Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release} Requires: libvirt-daemon-driver-secret = %{version}-%{release} Requires: libvirt-daemon-driver-storage = %{version}-%{release} -%endif + %endif Requires: xen %description daemon-xen Server side daemon and driver required to manage the virtualization capabilities of XEN -%endif -%endif + %endif +%endif # %{with_libvirtd} %package client Summary: Client side library and utilities of the libvirt library @@ -1048,11 +1048,11 @@ Include header files & development libraries for the libvirt C library. %package lock-sanlock Summary: Sanlock lock manager plugin for QEMU driver Group: Development/Libraries -%if 0%{?fedora} >= 17 || 0%{?rhel} >= 6 + %if 0%{?fedora} >= 17 || 0%{?rhel} >= 6 Requires: sanlock >= 2.4 -%else + %else Requires: sanlock >= 1.8 -%endif + %endif #for virt-sanlock-cleanup require augeas Requires: augeas Requires: %{name}-daemon = %{version}-%{release} @@ -1081,179 +1081,179 @@ of recent versions of Linux (and other OSes). %build %if ! %{with_xen} -%define _without_xen --without-xen + %define _without_xen --without-xen %endif %if ! %{with_qemu} -%define _without_qemu --without-qemu + %define _without_qemu --without-qemu %endif %if ! %{with_openvz} -%define _without_openvz --without-openvz + %define _without_openvz --without-openvz %endif %if ! %{with_lxc} -%define _without_lxc --without-lxc + %define _without_lxc --without-lxc %endif %if ! %{with_vbox} -%define _without_vbox --without-vbox + %define _without_vbox --without-vbox %endif %if ! %{with_xenapi} -%define _without_xenapi --without-xenapi + %define _without_xenapi --without-xenapi %endif %if ! %{with_libxl} -%define _without_libxl --without-libxl + %define _without_libxl --without-libxl %endif %if ! %{with_sasl} -%define _without_sasl --without-sasl + %define _without_sasl --without-sasl %endif %if ! %{with_avahi} -%define _without_avahi --without-avahi + %define _without_avahi --without-avahi %endif %if ! %{with_phyp} -%define _without_phyp --without-phyp + %define _without_phyp --without-phyp %endif %if ! %{with_esx} -%define _without_esx --without-esx + %define _without_esx --without-esx %endif %if ! %{with_hyperv} -%define _without_hyperv --without-hyperv + %define _without_hyperv --without-hyperv %endif %if ! %{with_vmware} -%define _without_vmware --without-vmware + %define _without_vmware --without-vmware %endif %if ! %{with_parallels} -%define _without_parallels --without-parallels + %define _without_parallels --without-parallels %endif %if ! %{with_polkit} -%define _without_polkit --without-polkit + %define _without_polkit --without-polkit %endif %if ! %{with_python} -%define _without_python --without-python + %define _without_python --without-python %endif %if ! %{with_libvirtd} -%define _without_libvirtd --without-libvirtd + %define _without_libvirtd --without-libvirtd %endif %if ! %{with_uml} -%define _without_uml --without-uml + %define _without_uml --without-uml %endif %if %{with_rhel5} -%define _with_rhel5_api --with-rhel5-api + %define _with_rhel5_api --with-rhel5-api %endif %if ! %{with_interface} -%define _without_interface --without-interface + %define _without_interface --without-interface %endif %if ! %{with_network} -%define _without_network --without-network + %define _without_network --without-network %endif %if ! %{with_storage_fs} -%define _without_storage_fs --without-storage-fs + %define _without_storage_fs --without-storage-fs %endif %if ! %{with_storage_lvm} -%define _without_storage_lvm --without-storage-lvm + %define _without_storage_lvm --without-storage-lvm %endif %if ! %{with_storage_iscsi} -%define _without_storage_iscsi --without-storage-iscsi + %define _without_storage_iscsi --without-storage-iscsi %endif %if ! %{with_storage_disk} -%define _without_storage_disk --without-storage-disk + %define _without_storage_disk --without-storage-disk %endif %if ! %{with_storage_mpath} -%define _without_storage_mpath --without-storage-mpath + %define _without_storage_mpath --without-storage-mpath %endif %if ! %{with_storage_rbd} -%define _without_storage_rbd --without-storage-rbd + %define _without_storage_rbd --without-storage-rbd %endif %if ! %{with_storage_sheepdog} -%define _without_storage_sheepdog --without-storage-sheepdog + %define _without_storage_sheepdog --without-storage-sheepdog %endif %if ! %{with_numactl} -%define _without_numactl --without-numactl + %define _without_numactl --without-numactl %endif %if ! %{with_numad} -%define _without_numad --without-numad + %define _without_numad --without-numad %endif %if ! %{with_capng} -%define _without_capng --without-capng + %define _without_capng --without-capng %endif %if ! %{with_fuse} -%define _without_fuse --without-fuse + %define _without_fuse --without-fuse %endif %if ! %{with_netcf} -%define _without_netcf --without-netcf + %define _without_netcf --without-netcf %endif %if ! %{with_selinux} -%define _without_selinux --without-selinux + %define _without_selinux --without-selinux %endif %if ! %{with_hal} -%define _without_hal --without-hal + %define _without_hal --without-hal %endif %if ! %{with_udev} -%define _without_udev --without-udev + %define _without_udev --without-udev %endif %if ! %{with_yajl} -%define _without_yajl --without-yajl + %define _without_yajl --without-yajl %endif %if ! %{with_sanlock} -%define _without_sanlock --without-sanlock + %define _without_sanlock --without-sanlock %endif %if ! %{with_libpcap} -%define _without_libpcap --without-libpcap + %define _without_libpcap --without-libpcap %endif %if ! %{with_macvtap} -%define _without_macvtap --without-macvtap + %define _without_macvtap --without-macvtap %endif %if ! %{with_audit} -%define _without_audit --without-audit + %define _without_audit --without-audit %endif %if ! %{with_dtrace} -%define _without_dtrace --without-dtrace + %define _without_dtrace --without-dtrace %endif %if ! %{with_driver_modules} -%define _without_driver_modules --without-driver-modules + %define _without_driver_modules --without-driver-modules %endif %if %{with_firewalld} -%define _with_firewalld --with-firewalld + %define _with_firewalld --with-firewalld %endif %define when %(date +"%%F-%%T") @@ -1263,21 +1263,21 @@ of recent versions of Linux (and other OSes). %define with_packager_version --with-packager-version="%{release}" %if %{with_systemd} -%define init_scripts --with-init_script=systemd + %define init_scripts --with-init_script=systemd %else -%define init_scripts --with-init_script=redhat + %define init_scripts --with-init_script=redhat %endif %if 0%{?enable_autotools} -autoreconf -if + autoreconf -if %endif %if %{with_selinux} -%if 0%{?fedora} >= 17 || 0%{?rhel} >= 7 -%define with_selinux_mount --with-selinux-mount="/sys/fs/selinux" -%else -%define with_selinux_mount --with-selinux-mount="/selinux" -%endif + %if 0%{?fedora} >= 17 || 0%{?rhel} >= 7 + %define with_selinux_mount --with-selinux-mount="/sys/fs/selinux" + %else + %define with_selinux_mount --with-selinux-mount="/selinux" + %endif %endif %configure %{?_without_xen} \ @@ -1406,12 +1406,12 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-%{version} \ $RPM_BUILD_ROOT%{_datadir}/doc/libvirt-docs-%{version} %if %{with_dtrace} -%ifarch %{power64} s390x x86_64 ia64 alpha sparc64 + %ifarch %{power64} s390x x86_64 ia64 alpha sparc64 mv $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_probes.stp \ $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_probes-64.stp mv $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_qemu_probes.stp \ $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_qemu_probes-64.stp -%endif + %endif %endif %if 0%{?fedora} < 14 && 0%{?rhel} < 6 @@ -1436,7 +1436,7 @@ make check %if %{with_libvirtd} %pre daemon -%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 + %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 @@ -1445,11 +1445,11 @@ 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 + %endif %post daemon -%if %{with_network} + %if %{with_network} # All newly defined networks will have a mac address for the bridge # auto-generated, but networks already existing at the time of upgrade # will not. We need to go through all the network configs, look for @@ -1489,40 +1489,40 @@ do fi done done -%endif + %endif -%if %{with_systemd} -%if %{with_systemd_macros} -%systemd_post libvirtd.service -%else + %if %{with_systemd} + %if %{with_systemd_macros} + %systemd_post libvirtd.service + %else if [ $1 -eq 1 ] ; then # Initial installation /bin/systemctl enable virtlockd.socket >/dev/null 2>&1 || : /bin/systemctl enable libvirtd.service >/dev/null 2>&1 || : fi -%endif -%else -%if %{with_cgconfig} + %endif + %else + %if %{with_cgconfig} # Starting with Fedora 16/RHEL-7, systemd automounts all cgroups, # and cgconfig is no longer a necessary service. -%if (0%{?rhel} && 0%{?rhel} < 7) || (0%{?fedora} && 0%{?fedora} < 16) + %if (0%{?rhel} && 0%{?rhel} < 7) || (0%{?fedora} && 0%{?fedora} < 16) if [ "$1" -eq "1" ]; then /sbin/chkconfig cgconfig on fi -%endif -%endif + %endif + %endif /sbin/chkconfig --add libvirtd if [ "$1" -ge "1" ]; then /sbin/service libvirtd condrestart > /dev/null 2>&1 fi -%endif + %endif %preun daemon -%if %{with_systemd} -%if %{with_systemd_macros} -%systemd_preun libvirtd.service -%else + %if %{with_systemd} + %if %{with_systemd_macros} + %systemd_preun libvirtd.service + %else if [ $1 -eq 0 ] ; then # Package removal, not upgrade /bin/systemctl --no-reload disable virtlockd.socket > /dev/null 2>&1 || : @@ -1530,19 +1530,19 @@ if [ $1 -eq 0 ] ; then /bin/systemctl stop libvirtd.service > /dev/null 2>&1 || : /bin/systemctl stop virtlockd.service > /dev/null 2>&1 || : fi -%endif -%else + %endif + %else if [ $1 = 0 ]; then /sbin/service libvirtd stop 1>/dev/null 2>&1 /sbin/chkconfig --del libvirtd fi -%endif + %endif %postun daemon -%if %{with_systemd} -%if %{with_systemd_macros} -%systemd_postun_with_restart libvirtd.service -%else + %if %{with_systemd} + %if %{with_systemd_macros} + %systemd_postun_with_restart libvirtd.service + %else /bin/systemctl daemon-reload >/dev/null 2>&1 || : if [ $1 -ge 1 ] ; then # Package upgrade, not uninstall @@ -1552,10 +1552,10 @@ if [ $1 -ge 1 ] ; then fi /bin/systemctl try-restart libvirtd.service >/dev/null 2>&1 || : fi -%endif -%endif + %endif + %endif -%if %{with_network} + %if %{with_network} %post daemon-config-network if test $1 -eq 1 && test ! -f %{_sysconfdir}/libvirt/qemu/networks/default.xml ; then UUID=`/usr/bin/uuidgen` @@ -1564,11 +1564,9 @@ if test $1 -eq 1 && test ! -f %{_sysconfdir}/libvirt/qemu/networks/default.xml ; > %{_sysconfdir}/libvirt/qemu/networks/default.xml ln -s ../default.xml %{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml fi -%endif -%endif + %endif -%if %{with_libvirtd} -%if %{with_systemd} + %if %{with_systemd} %triggerun -- libvirt < 0.9.4 %{_bindir}/systemd-sysv-convert --save libvirtd >/dev/null 2>&1 ||: @@ -1578,15 +1576,15 @@ fi # Run these because the SysV package being removed won't do them /sbin/chkconfig --del libvirtd >/dev/null 2>&1 || : /bin/systemctl try-restart libvirtd.service >/dev/null 2>&1 || : -%endif -%endif + %endif +%endif # %{with_libvirtd} %preun client %if %{with_systemd} -%if %{with_systemd_macros} -%systemd_preun libvirt-guests.service -%endif + %if %{with_systemd_macros} + %systemd_preun libvirt-guests.service + %endif %else if [ $1 = 0 ]; then /sbin/chkconfig --del libvirt-guests @@ -1598,9 +1596,9 @@ fi /sbin/ldconfig %if %{with_systemd} -%if %{with_systemd_macros} -%systemd_post libvirt-guests.service -%endif + %if %{with_systemd_macros} + %systemd_post libvirt-guests.service + %endif %else /sbin/chkconfig --add libvirt-guests %endif @@ -1609,9 +1607,9 @@ fi /sbin/ldconfig %if %{with_systemd} -%if %{with_systemd_macros} -%systemd_postun_with_restart libvirt-guests.service -%endif + %if %{with_systemd_macros} + %systemd_postun_with_restart libvirt-guests.service + %endif %triggerun client -- libvirt < 0.9.4 %{_bindir}/systemd-sysv-convert --save libvirt-guests >/dev/null 2>&1 ||: @@ -1655,56 +1653,56 @@ fi %doc AUTHORS ChangeLog.gz NEWS README COPYING.LIB TODO %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/ -%if %{with_network} + %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 + %endif %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/nwfilter/ -%if %{with_systemd} + %if %{with_systemd} %{_unitdir}/libvirtd.service %{_unitdir}/virtlockd.service %{_unitdir}/virtlockd.socket -%else + %else %{_sysconfdir}/rc.d/init.d/libvirtd %{_sysconfdir}/rc.d/init.d/virtlockd -%endif + %endif %doc daemon/libvirtd.upstart %config(noreplace) %{_sysconfdir}/sysconfig/libvirtd %config(noreplace) %{_sysconfdir}/sysconfig/virtlockd %config(noreplace) %{_sysconfdir}/libvirt/libvirtd.conf -%if 0%{?fedora} >= 14 || 0%{?rhel} >= 6 + %if 0%{?fedora} >= 14 || 0%{?rhel} >= 6 %config(noreplace) %{_prefix}/lib/sysctl.d/libvirtd.conf -%endif + %endif %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/ %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/lxc/ %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/uml/ -%if %{with_libxl} + %if %{with_libxl} %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/libxl/ -%endif + %endif %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd -%if %{with_qemu} + %if %{with_qemu} %config(noreplace) %{_sysconfdir}/libvirt/qemu.conf %config(noreplace) %{_sysconfdir}/libvirt/qemu-lockd.conf %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.qemu -%endif -%if %{with_lxc} + %endif + %if %{with_lxc} %config(noreplace) %{_sysconfdir}/libvirt/lxc.conf %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.lxc -%endif -%if %{with_uml} + %endif + %if %{with_uml} %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.uml -%endif + %endif %dir %{_datadir}/libvirt/ -%if %{with_network} + %if %{with_network} %dir %{_datadir}/libvirt/networks/ %{_datadir}/libvirt/networks/default.xml -%endif + %endif %ghost %dir %{_localstatedir}/run/libvirt/ @@ -1713,67 +1711,67 @@ fi %dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/boot/ %dir %attr(0711, root, root) %{_localstatedir}/cache/libvirt/ -%if %{with_qemu} + %if %{with_qemu} %ghost %dir %attr(0700, root, root) %{_localstatedir}/run/libvirt/qemu/ %dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/ %dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/cache/libvirt/qemu/ -%endif -%if %{with_lxc} + %endif + %if %{with_lxc} %ghost %dir %{_localstatedir}/run/libvirt/lxc/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/lxc/ -%endif -%if %{with_uml} + %endif + %if %{with_uml} %ghost %dir %{_localstatedir}/run/libvirt/uml/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/uml/ -%endif -%if %{with_libxl} + %endif + %if %{with_libxl} %ghost %dir %{_localstatedir}/run/libvirt/libxl/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/libxl/ -%endif -%if %{with_xen} + %endif + %if %{with_xen} %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/xen/ -%endif -%if %{with_network} + %endif + %if %{with_network} %ghost %dir %{_localstatedir}/run/libvirt/network/ %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/network/ %dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/dnsmasq/ -%endif + %endif %dir %attr(0755, root, root) %{_libdir}/libvirt/lock-driver %attr(0755, root, root) %{_libdir}/libvirt/lock-driver/lockd.so -%if %{with_qemu} + %if %{with_qemu} %{_datadir}/augeas/lenses/libvirtd_qemu.aug %{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug -%endif + %endif -%if %{with_lxc} + %if %{with_lxc} %{_datadir}/augeas/lenses/libvirtd_lxc.aug %{_datadir}/augeas/lenses/tests/test_libvirtd_lxc.aug -%endif + %endif %{_datadir}/augeas/lenses/libvirtd.aug %{_datadir}/augeas/lenses/tests/test_libvirtd.aug %{_datadir}/augeas/lenses/libvirt_lockd.aug %{_datadir}/augeas/lenses/tests/test_libvirt_lockd.aug -%if %{with_polkit} -%if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 + %if %{with_polkit} + %if 0%{?fedora} >= 12 || 0%{?rhel} >= 6 %{_datadir}/polkit-1/actions/org.libvirt.unix.policy -%else + %else %{_datadir}/PolicyKit/policy/org.libvirt.unix.policy -%endif -%endif + %endif + %endif %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/ -%if %{with_lxc} + %if %{with_lxc} %attr(0755, root, root) %{_libexecdir}/libvirt_lxc -%endif + %endif -%if %{with_storage_disk} + %if %{with_storage_disk} %attr(0755, root, root) %{_libexecdir}/libvirt_parthelper -%endif + %endif %attr(0755, root, root) %{_libexecdir}/libvirt_iohelper %attr(0755, root, root) %{_sbindir}/libvirtd @@ -1781,115 +1779,115 @@ fi %{_mandir}/man8/libvirtd.8* -%if %{with_driver_modules} -%if %{with_network} + %if %{with_driver_modules} + %if %{with_network} %files daemon-config-network %defattr(-, root, root) -%endif + %endif -%if %{with_nwfilter} + %if %{with_nwfilter} %files daemon-config-nwfilter %defattr(-, root, root) %{_sysconfdir}/libvirt/nwfilter/*.xml -%endif + %endif -%if %{with_interface} + %if %{with_interface} %files daemon-driver-interface %defattr(-, root, root) %{_libdir}/%{name}/connection-driver/libvirt_driver_interface.so -%endif + %endif -%if %{with_network} + %if %{with_network} %files daemon-driver-network %defattr(-, root, root) %{_libdir}/%{name}/connection-driver/libvirt_driver_network.so -%endif + %endif -%if %{with_nodedev} + %if %{with_nodedev} %files daemon-driver-nodedev %defattr(-, root, root) %{_libdir}/%{name}/connection-driver/libvirt_driver_nodedev.so -%endif + %endif -%if %{with_nwfilter} + %if %{with_nwfilter} %files daemon-driver-nwfilter %defattr(-, root, root) %{_libdir}/%{name}/connection-driver/libvirt_driver_nwfilter.so -%endif + %endif %files daemon-driver-secret %defattr(-, root, root) %{_libdir}/%{name}/connection-driver/libvirt_driver_secret.so -%if %{with_storage} + %if %{with_storage} %files daemon-driver-storage %defattr(-, root, root) %{_libdir}/%{name}/connection-driver/libvirt_driver_storage.so -%endif + %endif -%if %{with_qemu} + %if %{with_qemu} %files daemon-driver-qemu %defattr(-, root, root) %{_libdir}/%{name}/connection-driver/libvirt_driver_qemu.so -%endif + %endif -%if %{with_lxc} + %if %{with_lxc} %files daemon-driver-lxc %defattr(-, root, root) %{_libdir}/%{name}/connection-driver/libvirt_driver_lxc.so -%endif + %endif -%if %{with_uml} + %if %{with_uml} %files daemon-driver-uml %defattr(-, root, root) %{_libdir}/%{name}/connection-driver/libvirt_driver_uml.so -%endif + %endif -%if %{with_xen} + %if %{with_xen} %files daemon-driver-xen %defattr(-, root, root) %{_libdir}/%{name}/connection-driver/libvirt_driver_xen.so -%endif + %endif -%if %{with_libxl} + %if %{with_libxl} %files daemon-driver-libxl %defattr(-, root, root) %{_libdir}/%{name}/connection-driver/libvirt_driver_libxl.so -%endif -%endif + %endif + %endif # %{with_driver_modules} -%if %{with_qemu_tcg} + %if %{with_qemu_tcg} %files daemon-qemu %defattr(-, root, root) -%endif + %endif -%if %{with_qemu_kvm} + %if %{with_qemu_kvm} %files daemon-kvm %defattr(-, root, root) -%endif + %endif -%if %{with_lxc} + %if %{with_lxc} %files daemon-lxc %defattr(-, root, root) -%endif + %endif -%if %{with_uml} + %if %{with_uml} %files daemon-uml %defattr(-, root, root) -%endif + %endif -%if %{with_xen} || %{with_libxl} + %if %{with_xen} || %{with_libxl} %files daemon-xen %defattr(-, root, root) -%endif -%endif + %endif +%endif # %{with_libvirtd} %if %{with_sanlock} %files lock-sanlock %defattr(-, root, root) -%if %{with_qemu} + %if %{with_qemu} %config(noreplace) %{_sysconfdir}/libvirt/qemu-sanlock.conf -%endif + %endif %attr(0755, root, root) %{_libdir}/libvirt/lock-driver/sanlock.so %{_datadir}/augeas/lenses/libvirt_sanlock.aug %{_datadir}/augeas/lenses/tests/test_libvirt_sanlock.aug diff --git a/mingw-libvirt.spec.in b/mingw-libvirt.spec.in index 6c4caa3..f467f7f 100644 --- a/mingw-libvirt.spec.in +++ b/mingw-libvirt.spec.in @@ -17,9 +17,9 @@ # RHEL ships ESX but not PowerHypervisor, HyperV, or libxenserver (xenapi) %if 0%{?rhel} -%define with_phyp 0 -%define with_xenapi 0 -%define with_hyperv 0 + %define with_phyp 0 + %define with_xenapi 0 + %define with_hyperv 0 %endif Name: mingw-libvirt @@ -111,23 +111,23 @@ MinGW Windows libvirt virtualization library, static version. %build %if ! %{with_phyp} -%define _without_phyp --without-phyp + %define _without_phyp --without-phyp %endif %if ! %{with_esx} -%define _without_esx --without-esx + %define _without_esx --without-esx %endif %if ! %{with_hyperv} -%define _without_hyperv --without-hyperv + %define _without_hyperv --without-hyperv %endif %if ! %{with_xenapi} -%define _without_xenapi --without-xenapi + %define _without_xenapi --without-xenapi %endif %if ! %{with_parallels} -%define _without_parallels --without-parallels + %define _without_parallels --without-parallels %endif %if 0%{?enable_autotools} -- 1.8.0.2

2 2

[libvirt] [PATCHv2 0/3] Colorize HTML documentation
by Claudio Bley 21 Jan '13

21 Jan '13

Hi. In version 2 of this series I'm trying to fix some of those issues Jiri had with the initial version. Changes: + do not define a default set of fonts, just use monospace + use font-size: smaller instead of 80% This lets the browser choose a more optimal font size it "thinks" is "smaller" than the normal font size, instead of scaling to some arbitrarily chosen 80% + use dl, dt, dd elements instead of the obsolete tt tag + use CSS instead of tables for layout Claudio Bley (3): docs: Assign classes to documentation elements docs: don't use <i> and <tt> HTML tags docs: Add some style and color to the HTML documentation docs/generic.css | 4 +- docs/libvirt.css | 68 ++++++++++++++- docs/newapi.xsl | 249 +++++++++++++++++++++++++++++------------------------- 3 files changed, 202 insertions(+), 119 deletions(-) -- 1.7.9.5

3 11

[libvirt] [Openstack][Openstack-dev]Where is libvirt library packages in Openstack Nova branch
by harryxiyou 21 Jan '13

21 Jan '13

Hi all, I read the source code of Openstack Nova branch source codes but i can not find the standard libvirt library packages, which i think Nova uses libvirt interfaces they are from standard libvirt library to attach Sheepdog(or others) volumes to QEMU. If i add a new block storage driver for standard libvirt, i have to update these libvirt library packages in Openstack Nova brahch. Cloud anyone give me some suggestions? Thanks in advance ;-) -- Thanks Harry Wei

2 6

[libvirt] [libvirt-java] [PATCH 0/2] fail on test errors and micro optimization
by Claudio Bley 21 Jan '13

21 Jan '13

Hi. This series is pretty self-explanatory, each patch can be applied individually. Tested with JNA 3.3.0, 3.4.0, 3.4.1, 3.4.2, 3.5.0 and 3.5.1. Claudio Bley (2): Make the build fail if any of the JUnit tests have errors or failures Avoid creating new Arrays and Lists on every struct instantiation build.xml | 3 ++- src/main/java/org/libvirt/jna/virConnectAuth.java | 12 +++++++++--- .../java/org/libvirt/jna/virConnectCredential.java | 12 +++++++++--- .../java/org/libvirt/jna/virDomainBlockInfo.java | 12 +++++++++--- .../java/org/libvirt/jna/virDomainBlockStats.java | 12 +++++++++--- src/main/java/org/libvirt/jna/virDomainInfo.java | 12 +++++++++--- .../org/libvirt/jna/virDomainInterfaceStats.java | 12 +++++++++--- .../java/org/libvirt/jna/virDomainJobInfo.java | 12 +++++++++--- .../java/org/libvirt/jna/virDomainMemoryStats.java | 10 ++++++++-- src/main/java/org/libvirt/jna/virError.java | 12 +++++++++--- src/main/java/org/libvirt/jna/virNodeInfo.java | 12 +++++++++--- .../java/org/libvirt/jna/virSchedParameter.java | 12 +++++++++--- .../java/org/libvirt/jna/virStoragePoolInfo.java | 12 +++++++++--- .../java/org/libvirt/jna/virStorageVolInfo.java | 12 +++++++++--- src/main/java/org/libvirt/jna/virVcpuInfo.java | 12 +++++++++--- 15 files changed, 127 insertions(+), 42 deletions(-) -- 1.7.9.5

3 6

[libvirt] [libvirt-java] [PATCH 00/12] event support
by Claudio Bley 21 Jan '13

21 Jan '13

Hi. This patch series is for early review. Please comment. It's not everything set in stone already. For one, names of methods are subject to change. Claudio Bley (12): Introduce event loop support Wrap virConnectIsAlive Wrap virConnectSetKeepAlive Prepare to define proper domain event callback support. Rename method domainEventDeregisterAny to domainEventDeregister Add an internal domainEventRegister forwarding method Add constants for enum virDomainEventID Connect: overload domainEventRegister method for IOError events Connect: overload domainEventRegister method for Reboot events Connect: overload domainEventRegister method for Lifecycle events Connect: overload domainEventRegister for PMWakeup events Connect: overload domainEventRegister method for PMSuspend events src/main/java/org/libvirt/Connect.java | 367 +++++++++++++++++++++-- src/main/java/org/libvirt/Domain.java | 85 ++++++ src/main/java/org/libvirt/jna/Libvirt.java | 53 +++- src/test/java/org/libvirt/TestJavaBindings.java | 1 + 4 files changed, 482 insertions(+), 24 deletions(-) -- 1.7.9.5

1 13

[libvirt] [PATCH v2 00/13] More refactoring of QEMU driver objects & locking
by Daniel P. Berrange 21 Jan '13

21 Jan '13

An update of https://www.redhat.com/archives/libvir-list/2013-January/msg01108.html This series does more general refactoring to help in the goal of killing the big QEMU driver lock. There are 3 key changes in this series - Isolating all QEMU configuration parameters in one struct. - Making virDomainObjList self-locking - Add dedicated locking to PCI/USB device lists There are all the really hard bits of the QEMU locking. As can be seen from the last patch there is still more work to be done before the QEMU driver lock can be said to be truely dead, but this is less critical. In v2: - Rebase, since previous series no longer applied to GIT

1 13

[libvirt] [PATCH 1/1] ppc64 cpu features
by Li Zhang 21 Jan '13

21 Jan '13

From: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> This patch adds a CPU feature "powernv" identifying IBM Power processor that supports native hypervisor e.g. KVM. This can be used by virtualization management software to determine the CPU capabilities. PVR doesn't indicate whether it a host or a guest CPU. So, we use /proc/cpuinfo to get the platform information (PowerNV) and use that to set the "powernv" flag. Signed-off-by: Dipankar Sarma <dipankar(a)in.ibm.com> Signed-off-by: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> --- src/cpu/cpu_map.xml | 9 ++ src/cpu/cpu_powerpc.c | 349 ++++++++++++++++++++++++++++++++++++++---------- src/cpu/cpu_ppc_data.h | 4 + src/util/sysinfo.c | 2 +- 4 files changed, 294 insertions(+), 70 deletions(-) diff --git a/src/cpu/cpu_map.xml b/src/cpu/cpu_map.xml index eb69a34..6b1f9b9 100644 --- a/src/cpu/cpu_map.xml +++ b/src/cpu/cpu_map.xml @@ -587,14 +587,23 @@ <arch name='ppc64'>  <vendor name='IBM' string='PowerPC'/> + <feature name='powernv'>  + <systemid platform='0x00000001'/> + </feature>  <model name='POWER7'> + <feature name='powernv'/> + <systemid pvr='0x003f0200'/> <vendor name='IBM'/> </model> <model name='POWER7_v2.1'> + <feature name='powernv'/> + <systemid pvr='0x003f0201'/> <vendor name='IBM'/> </model> <model name='POWER7_v2.3'> + <feature name='powernv'/> + <systemid pvr='0x003f0203'/> <vendor name='IBM'/> </model> </arch> diff --git a/src/cpu/cpu_powerpc.c b/src/cpu/cpu_powerpc.c index ac10789..2135944 100644 --- a/src/cpu/cpu_powerpc.c +++ b/src/cpu/cpu_powerpc.c @@ -33,6 +33,7 @@ #include "cpu_map.h" #include "buf.h" +#include "sysinfo.h" #define VIR_FROM_THIS VIR_FROM_CPU @@ -44,16 +45,9 @@ struct cpuPowerPC { uint32_t pvr; }; -static const struct cpuPowerPC cpu_defs[] = { - {"POWER7", "IBM", 0x003f0200}, - {"POWER7_v2.1", "IBM", 0x003f0201}, - {"POWER7_v2.3", "IBM", 0x003f0203}, - {NULL, NULL, 0xffffffff} -}; - - struct ppc_vendor { char *name; + uint32_t pvr; struct ppc_vendor *next; }; @@ -64,64 +58,191 @@ struct ppc_model { struct ppc_model *next; }; +struct ppc_feature { + char *name; + union cpuData *data; + struct ppc_feature *next; +}; + struct ppc_map { struct ppc_vendor *vendors; + struct ppc_feature *features; struct ppc_model *models; }; +static void +ppcDataSubtract(union cpuData *data1, + const union cpuData *data2) +{ + data1->ppc.platform &= ~data2->ppc.platform; +} + +static bool +ppcDataIsSubset(const union cpuData *data, + const union cpuData *subset) +{ + if (subset->ppc.platform && + (data->ppc.platform & subset->ppc.platform) == subset->ppc.platform) + return true; + + return false; +} + +static void +PowerPCDataFree(union cpuData *data) +{ + if (data == NULL) + return; + VIR_FREE(data); +} + + +static union cpuData * +ppcDataCopy(const union cpuData *data) +{ + union cpuData *copy = NULL; + + if (VIR_ALLOC(copy) < 0) { + PowerPCDataFree(copy); + return NULL; + } + copy->ppc = data->ppc; + return copy; +} + + +/* also removes all detected features from data */ static int -ConvertModelVendorFromPVR(char ***model, - char ***vendor, - uint32_t pvr) +ppcDataToCPUFeatures(virCPUDefPtr cpu, + int policy, + union cpuData *data, + const struct ppc_map *map) { - int i; + const struct ppc_feature *feature = map->features; - for (i = 0; cpu_defs[i].name; i++) { - if (cpu_defs[i].pvr == pvr) { - **model = strdup(cpu_defs[i].name); - **vendor = strdup(cpu_defs[i].vendor); - return 0; + while (feature != NULL) { + if (ppcDataIsSubset(data, feature->data)) { + ppcDataSubtract(data, feature->data); + if (virCPUDefAddFeature(cpu, feature->name, policy) < 0) + return -1; } + feature = feature->next; } - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("Missing the definition of this model")); - return -1; + return 0; } -static int -ConvertPVRFromModel(const char *model, - uint32_t *pvr) +static struct ppc_feature * +ppcFeatureNew(void) { - int i; + struct ppc_feature *feature; - for (i = 0; cpu_defs[i].name; i++) { - if (STREQ(cpu_defs[i].name, model)) { - *pvr = cpu_defs[i].pvr; - return 0; - } + if (VIR_ALLOC(feature) < 0) + return NULL; + + if (VIR_ALLOC(feature->data) < 0) { + VIR_FREE(feature); + return NULL; + } + + return feature; +} + + +static void +ppcFeatureFree(struct ppc_feature *feature) +{ + if (feature == NULL) + return; + + VIR_FREE(feature->name); + PowerPCDataFree(feature->data); + VIR_FREE(feature); +} + + +static struct ppc_feature * +ppcFeatureFind(const struct ppc_map *map, + const char *name) +{ + struct ppc_feature *feature; + + feature = map->features; + while (feature != NULL) { + if (STREQ(feature->name, name)) + return feature; + + feature = feature->next; } - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("Missing the definition of this model")); - return -1; + return NULL; } static int -cpuMatch(const union cpuData *data, - char **cpu_model, - char **cpu_vendor, - const struct ppc_model *model) +ppcFeatureLoad(xmlXPathContextPtr ctxt, + struct ppc_map *map) { + xmlNodePtr *nodes = NULL; + xmlNodePtr ctxt_node = ctxt->node; + struct ppc_feature *feature; int ret = 0; + unsigned long platform = 0; + unsigned long pvr = 0; + int ret_platform; + int ret_pvr; + int n; + + if (!(feature = ppcFeatureNew())) + goto no_memory; + + feature->name = virXPathString("string(@name)", ctxt); + if (feature->name == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("Missing CPU feature name")); + goto ignore; + } + + if (ppcFeatureFind(map, feature->name)) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("CPU feature %s already defined"), feature->name); + goto ignore; + } + + n = virXPathNodeSet("./systemid", ctxt, &nodes); + if (n < 0) + goto ignore; + + ctxt->node = nodes[0]; + ret_platform = virXPathULongHex("string(@platform)", ctxt, &platform); + ret_pvr = virXPathULongHex("string(@pvr)", ctxt, &pvr); + if (ret_platform < 0 && ret_pvr < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Invalid systemid in %s feature"), feature->name); + goto ignore; + } + feature->data->ppc.platform = platform; + feature->data->ppc.pvr = pvr; - ret = ConvertModelVendorFromPVR(&cpu_model, &cpu_vendor, data->ppc.pvr); + if (map->features == NULL) + map->features = feature; + else { + feature->next = map->features; + map->features = feature; + } - if (STREQ(model->name, *cpu_model) && - STREQ(model->vendor->name, *cpu_vendor)) - ret = 1; +out: + ctxt->node = ctxt_node; + VIR_FREE(nodes); return ret; + +no_memory: + virReportOOMError(); + ret = -1; + +ignore: + ppcFeatureFree(feature); + goto out; } @@ -171,6 +292,66 @@ ppcModelFind(const struct ppc_map *map, return NULL; } +/* also removes bits corresponding to vendor string from data */ +static const struct ppc_vendor * +ppcDataToVendor(union cpuData *data, + const struct ppc_map *map) +{ + const struct ppc_vendor *vendor = map->vendors; + + while (vendor) { + if (data->ppc.pvr == vendor->pvr) + return vendor; + vendor = vendor->next; + } + + return NULL; +} + + +static virCPUDefPtr +ppcDataToCPU(const union cpuData *data, + const struct ppc_model *model, + const struct ppc_map *map) +{ + virCPUDefPtr cpu; + union cpuData *copy = NULL; + union cpuData *modelData = NULL; + const struct ppc_vendor *vendor; + + if (VIR_ALLOC(cpu) < 0 || + !(cpu->model = strdup(model->name)) || + !(copy = ppcDataCopy(data)) || + !(modelData = ppcDataCopy(model->data))) + goto no_memory; + + if ((vendor = ppcDataToVendor(copy, map)) && + !(cpu->vendor = strdup(vendor->name))) + goto no_memory; + + ppcDataSubtract(copy, modelData); + ppcDataSubtract(modelData, data); + + /* because feature policy is ignored for host CPU */ + cpu->type = VIR_CPU_TYPE_GUEST; + + if (ppcDataToCPUFeatures(cpu, VIR_CPU_FEATURE_REQUIRE, copy, map) || + ppcDataToCPUFeatures(cpu, VIR_CPU_FEATURE_DISABLE, modelData, map)) + goto error; + +cleanup: + PowerPCDataFree(modelData); + PowerPCDataFree(copy); + return cpu; + +no_memory: + virReportOOMError(); +error: + virCPUDefFree(cpu); + cpu = NULL; + goto cleanup; +} + static struct ppc_vendor * ppcVendorFind(const struct ppc_map *map, const char *name) @@ -256,6 +437,9 @@ ppcModelLoad(xmlXPathContextPtr ctxt, xmlNodePtr *nodes = NULL; struct ppc_model *model; char *vendor = NULL; + unsigned long pvr = 0, platform = 0; + int ret_platform, ret_pvr; + int n; int ret = -1; if (!(model = ppcModelNew())) @@ -268,10 +452,20 @@ ppcModelLoad(xmlXPathContextPtr ctxt, goto ignore; } - ret = ConvertPVRFromModel(model->name, &model->data->ppc.pvr); - if (ret < 0) - goto ignore; + n = virXPathNodeSet("./systemid", ctxt, &nodes); + if (n < 0) + goto ignore; + ctxt->node = nodes[0]; + ret_platform = virXPathULongHex("string(@platform)", ctxt, &platform); + ret_pvr = virXPathULongHex("string(@pvr)", ctxt, &pvr); + if (ret_platform < 0 && ret_pvr < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Invalid systemid in %s model"), model->name); + goto ignore; + } + model->data->ppc.platform = platform; + model->data->ppc.pvr = pvr; if (virXPathBoolean("boolean(./vendor)", ctxt)) { vendor = virXPathString("string(./vendor/@name)", ctxt); @@ -324,6 +518,8 @@ ppcMapLoadCallback(enum cpuMapElement element, return ppcVendorLoad(ctxt, map); case CPU_MAP_ELEMENT_MODEL: return ppcModelLoad(ctxt, map); + case CPU_MAP_ELEMENT_FEATURE: + return ppcFeatureLoad(ctxt, map); default: break; } @@ -385,6 +581,7 @@ ppcModelCopy(const struct ppc_model *model) } copy->data->ppc.pvr = model->data->ppc.pvr; + copy->data->ppc.platform = model->data->ppc.platform; copy->vendor = model->vendor; return copy; @@ -437,8 +634,6 @@ PowerPCDecode(virCPUDefPtr cpu, const struct ppc_model *candidate; virCPUDefPtr cpuCandidate; virCPUDefPtr cpuModel = NULL; - char *cpu_vendor = NULL; - char *cpu_model = NULL; unsigned int i; if (data == NULL || (map = ppcLoadMap()) == NULL) @@ -475,13 +670,30 @@ PowerPCDecode(virCPUDefPtr cpu, goto next; } - if (VIR_ALLOC(cpuCandidate) < 0) { - virReportOOMError(); + if (!(cpuCandidate = ppcDataToCPU(data, candidate, map))) goto out; + + if (candidate->vendor && cpuCandidate->vendor && + STRNEQ(candidate->vendor->name, cpuCandidate->vendor)) { + VIR_DEBUG("CPU vendor %s of model %s differs from %s; ignoring", + candidate->vendor->name, candidate->name, + cpuCandidate->vendor); + virCPUDefFree(cpuCandidate); + goto next; } - cpuCandidate->model = strdup(candidate->name); - cpuCandidate->vendor = strdup(candidate->vendor->name); + if (cpu->type == VIR_CPU_TYPE_HOST) { + cpuCandidate->type = VIR_CPU_TYPE_HOST; + for (i = 0; i < cpuCandidate->nfeatures; i++) { + switch (cpuCandidate->features[i].policy) { + case VIR_CPU_FEATURE_DISABLE: + virCPUDefFree(cpuCandidate); + goto next; + default: + cpuCandidate->features[i].policy = -1; + } + } + } if (preferred && STREQ(cpuCandidate->model, preferred)) { virCPUDefFree(cpuModel); @@ -489,19 +701,12 @@ PowerPCDecode(virCPUDefPtr cpu, break; } - ret = cpuMatch(data, &cpu_model, &cpu_vendor, candidate); - if (ret < 0) { - VIR_FREE(cpuCandidate); - goto out; - } else if (ret == 1) { - cpuCandidate->model = cpu_model; - cpuCandidate->vendor = cpu_vendor; + if (cpuModel == NULL + || cpuModel->nfeatures > cpuCandidate->nfeatures) { virCPUDefFree(cpuModel); cpuModel = cpuCandidate; - break; - } - - virCPUDefFree(cpuCandidate); + }else + virCPUDefFree(cpuCandidate); next: candidate = candidate->next; @@ -515,6 +720,8 @@ PowerPCDecode(virCPUDefPtr cpu, cpu->model = cpuModel->model; cpu->vendor = cpuModel->vendor; + cpu->nfeatures = cpuModel->nfeatures; + cpu->features = cpuModel->features; VIR_FREE(cpuModel); ret = 0; @@ -537,19 +744,11 @@ static uint32_t ppc_mfpvr(void) } #endif -static void -PowerPCDataFree(union cpuData *data) -{ - if (data == NULL) - return; - - VIR_FREE(data); -} - static union cpuData * PowerPCNodeData(void) { union cpuData *data; + virSysinfoDefPtr hostinfo; if (VIR_ALLOC(data) < 0) { virReportOOMError(); @@ -561,6 +760,18 @@ PowerPCNodeData(void) data->ppc.pvr = ppc_mfpvr(); #endif + hostinfo = virSysinfoRead(); + if (hostinfo == NULL) { + VIR_FREE(data); + return NULL; + } + + data->ppc.platform &= ~VIR_CPU_PPC64_POWERNV; + + if (STREQ(hostinfo->system_family, "PowerNV")) + data->ppc.platform |= VIR_CPU_PPC64_POWERNV; + virSysinfoDefFree(hostinfo); + return data; } diff --git a/src/cpu/cpu_ppc_data.h b/src/cpu/cpu_ppc_data.h index 685332a..0e691ce 100644 --- a/src/cpu/cpu_ppc_data.h +++ b/src/cpu/cpu_ppc_data.h @@ -28,6 +28,10 @@ struct cpuPPCData { uint32_t pvr; + uint32_t platform; /* Bitflag indicating platform features */ }; +#define VIR_CPU_PPC64_NONE 0x0 +#define VIR_CPU_PPC64_POWERNV 0x1 + #endif /* __VIR_CPU_PPC_DATA_H__ */ diff --git a/src/util/sysinfo.c b/src/util/sysinfo.c index 6a5db80..5f98986 100644 --- a/src/util/sysinfo.c +++ b/src/util/sysinfo.c @@ -234,7 +234,7 @@ virSysinfoRead(void) { if (VIR_ALLOC(ret) < 0) goto no_memory; - if (virFileReadAll(CPUINFO, 2048, &outbuf) < 0) { + if (virFileReadAll(CPUINFO, 8192, &outbuf) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to open %s"), CPUINFO); return NULL; -- 1.7.10.1

1 1

[libvirt] Network stops with CentOS 6.3 guest on Ubuntu 12.10
by Andy Howell 20 Jan '13

20 Jan '13

Hello, I'm trying to get CentOS 6.3 running under Ubuntu 12.10. When the interface comes up, I can ping another machine for 9 packets. After that it stops working. Bouncing the guest network interface gets it going again for another 10 packets. Monitoring the vnet0 interface on the host, I see ARP requests from the host to the guest are not getting replies. I cleared out iptables to eliminate that. No luck. I have Fedora 17 and Windows 7 running on the machine with no problems. Any ideas? Thanks, Andy

1 0

[libvirt] Fwd: [Openstack] [Openstack-dev][Sheepdog]Add a new driver for OpenstackCinder like Sheepdog volumes
by harryxiyou 19 Jan '13

19 Jan '13

---------- Forwarded message ---------- From: harryxiyou <harryxiyou(a)gmail.com> Date: Sat, Jan 19, 2013 at 11:49 AM Subject: Re: [Openstack] [Openstack-dev][Sheepdog]Add a new driver for OpenstackCinder like Sheepdog volumes To: 张家龙 <zhangjl(a)awcloud.com> Cc: Kazutaka Morita <morita.kazutaka(a)gmail.com>, openstack-dev(a)lists.launchpad.org, Liu Yuan <namei.unix(a)gmail.com>, sheepdog <sheepdog(a)lists.wpkg.org>, openstack <openstack(a)lists.launchpad.net>, Kang Hua <kanghua151(a)gmail.com> On Sat, Jan 19, 2013 at 10:57 AM, 张家龙 <zhangjl(a)awcloud.com> wrote: > Maybe，you need to modify the nova/virt/libvirt.xml.template.In our tesing of > nova and sheepdog, Hi Zhang jia long, What are the functions of libvirt.xml.template? Currently, we just wanna to add a new block driver(a new one as the same as sheepdog driver) to Openstack Cinder ;-) The performances will be enhenced later. > [...] > Hi Morita and other developers, > > If i add a QEMU/Libvirt driver(the same as Sheepdog volumes driver in > Openstack Cinder branch) to let Openstack Cinder support a new block-level > storage system, I should change following stuffs, right? > > 1, Add a driver file to the dir in Openstack Cinder branch(the same as > sheepdog.py), > https://github.com/openstack/cinder/blob/master/cinder/volume/drivers > 2, Change the file in Openstack Nova branch(Let libvirt attach HLFS volumes > to QEMU, the same as sheepdog)， > > https://github.com/openstack/nova/blob/master/nova/virt/libvirt/driver.py > > Do I should change/add any other files for Openstack? Cloud anyone give me > some suggestions? Thanks in advance ;-) > Hi Openstack developers, libvirt developers and Sheepdog developers, I also have following questions, please give me some suggestions. Thanks in advance ;-) 1, The libvirt codes in Nova branch are just interfaces which call the standard Libvirt library, right? (Or the libvirt codes in Nova branch are the standard Libvirt library.) 2, If i add a new block storage driver for Openstack by QEMU/Libvirt way, should i also modify standard libvirt library and QEMU source codes to let them support this new driver so that i can use this new driver to let libvirt attach the new driver volumes to QEMU in Openstack? 3, Certainly, i should also do following stuffs. a, Add a driver file to the dir in Openstack Cinder branch(the same as sheepdog.py), https://github.com/openstack/cinder/blob/master/cinder/volume/drivers b, Change the file in Openstack Nova branch(Let libvirt attach the new driver volumes to QEMU, the same as sheepdog)， https://github.com/openstack/nova/blob/master/nova/virt/libvirt/driver.py 4, Should i have to do any other stuffs? -- Thanks Harry Wei -- Thanks Harry Wei

1 0

[libvirt] [PATCH] Fix race condition when destroying guests
by Daniel P. Berrange 19 Jan '13

19 Jan '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> When running virDomainDestroy, we need to make sure that no other background thread cleans up the domain while we're doing our work. This can happen if we release the domain object while in the middle of work, because the monitor might detect EOF in this window. For this reason we have a 'beingDestroyed' flag to stop the monitor from doing its normal cleanup. Unfortunately this flag was only being used to protect qemuDomainBeginJob, and not qemuProcessKill This left open a race condition where either libvirtd could crash, or alternatively report bogus error messages about the domain already having been destroyed to the caller Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/qemu/qemu_driver.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index c28c223..2a6f381 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -2121,24 +2121,29 @@ qemuDomainDestroyFlags(virDomainPtr dom, qemuDomainSetFakeReboot(driver, vm, false); + + /* We need to prevent monitor EOF callback from doing our work (and sending + * misleading events) while the vm is unlocked inside BeginJob/ProcessKill API + */ + priv->beingDestroyed = true; + /* Although qemuProcessStop does this already, there may * be an outstanding job active. We want to make sure we * can kill the process even if a job is active. Killing * it now means the job will be released */ if (flags & VIR_DOMAIN_DESTROY_GRACEFUL) { - if (qemuProcessKill(driver, vm, 0) < 0) + if (qemuProcessKill(driver, vm, 0) < 0) { + priv->beingDestroyed = false; goto cleanup; + } } else { - if (qemuProcessKill(driver, vm, VIR_QEMU_PROCESS_KILL_FORCE) < 0) + if (qemuProcessKill(driver, vm, VIR_QEMU_PROCESS_KILL_FORCE) < 0) { + priv->beingDestroyed = false; goto cleanup; + } } - /* We need to prevent monitor EOF callback from doing our work (and sending - * misleading events) while the vm is unlocked inside BeginJob API - */ - priv->beingDestroyed = true; - if (qemuDomainObjBeginJobWithDriver(driver, vm, QEMU_JOB_DESTROY) < 0) goto cleanup; -- 1.8.0.2

5 6

[libvirt] RFC: libxl race fixes
by Jim Fehlig 18 Jan '13

18 Jan '13

I've been investigating some races in the libxl driver and would like to get comments on some potential solutions. The first race is in the fd/timeout event handling code, which maps libxl's osevent interface to libvirt's event loop interface. This mapping opens the possibility for libvirt's event loop to invoke event callbacks after libxl has already deregistered the event, potentially accessing an event object that has already been freed. One solution to this race I've found successful is reference counting the objects associated with the events. When libxl registers an event, an object encapsulating the event is created and it's reference count is set to 1. When the event is injected into libvirt's event loop, another reference is taken on the object. When libxl deregisters the event, it's reference count is decremented. Once the event is removed from libvirt's event loop, the final reference is decremented and the object is disposed. This approach ensures the object is not disposed until it is removed from libvirt's event loop *and* libxl had explicitly deregistered the event. The notion of an event being 'disabled' found in libvirt's event loop impl also had to be added to the libxl event object, to ensure the driver doesn't call into libxl for a previously deregistered event. The second race is between destroying a vm (i.e., calling privateDataFreeFunc, which frees the libxl ctx) and deregistration/cleanup of all events that have been registered by libxl. One solution for this race is to convert libxlDomainObjPrivate to a virObject and increment its reference for each fd and timeout registration. Only when all fds and timeouts are deregistered and destroyed will the libxlDomainObjPrivate be destroyed. One downside to this approach is that an API to "cleanup" the libxl ctx is needed. Without such an API, some fds are not deregistered until calling libxl_ctx_free. But since the fd events have references on the libxlDomainObjPrivate, libxl_ctx_free is never called. (BTW I have a patch adding libxl_ctx_quiesce() to libxl, which upstream xen folks seem receptive to, including backporting to Xen 4.2 branch, but I don't think this is ideal.) An alternate solution that can be used to address both of these races is to maintain a list of the fd/timeout registrations in the libxlDomainObjPrivate object, and take a more brute force approach to managing the registrations Other solutions that I might be overlooking are certainly appreciated :). Regards, Jim

2 3

[libvirt] [PATCH] qemu: Support ram bar size for qxl devices
by Alon Levy 18 Jan '13

18 Jan '13

Adds a qxl-ram attribute globaly to the video.model element, that changes the resulting qemu command line only if video.type == "qxl". That attribute gets a default value of 64*1024 only if model.type is "qxl". In effect not changing any xml or argv for non qxl devices. For qxl devices a new property is set: -global qxl-vga.ram_size=<ram>*1024 or -global qxl.ram_size=<ram>*1024 For the main and secondary qxl devices respectively. The default for the qxl ram bar is the same as the default for the qxl vram bar, 64*1024. --- I've added a qxl-ram attribute. There is no precedent for adding am attribute prefixed like this, so I'm open for any other suggestion on how to do it. docs/schemas/domaincommon.rng | 9 +++- src/conf/domain_conf.c | 19 ++++++- src/conf/domain_conf.h | 1 + src/qemu/qemu_command.c | 58 ++++++++++++++++++---- .../qemuxml2argv-graphics-spice-compression.args | 2 +- .../qemuxml2argv-graphics-spice-compression.xml | 4 +- .../qemuxml2argv-graphics-spice-qxl-vga.args | 2 +- .../qemuxml2argv-graphics-spice-qxl-vga.xml | 4 +- .../qemuxml2argv-graphics-spice.args | 2 +- .../qemuxml2argv-graphics-spice.xml | 4 +- .../qemuxml2argv-video-device-pciaddr-default.args | 6 +-- 11 files changed, 86 insertions(+), 25 deletions(-) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 67ae864..50fc834 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -2251,7 +2251,9 @@ </define>  <define name="video"> <element name="video"> @@ -2268,6 +2270,11 @@ </choice> </attribute> <optional> + <attribute name="qxl-ram"> + <ref name="unsignedInt"/> + </attribute> + </optional> + <optional> <attribute name="vram"> <ref name="unsignedInt"/> </attribute> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 13c14e9..a16f1b5 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -7391,6 +7391,7 @@ virDomainVideoDefParseXML(const xmlNodePtr node, char *type = NULL; char *heads = NULL; char *vram = NULL; + char *qxl_ram = NULL; char *primary = NULL; if (VIR_ALLOC(def) < 0) { @@ -7401,9 +7402,10 @@ virDomainVideoDefParseXML(const xmlNodePtr node, cur = node->children; while (cur != NULL) { if (cur->type == XML_ELEMENT_NODE) { - if (!type && !vram && !heads && + if (!type && !vram && !qxl_ram && !heads && xmlStrEqual(cur->name, BAD_CAST "model")) { type = virXMLPropString(cur, "type"); + qxl_ram = virXMLPropString(cur, "qxl-ram"); vram = virXMLPropString(cur, "vram"); heads = virXMLPropString(cur, "heads"); @@ -7431,6 +7433,18 @@ virDomainVideoDefParseXML(const xmlNodePtr node, } } + if (qxl_ram) { + if (virStrToLong_ui(qxl_ram, NULL, 10, &def->qxl_ram) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("cannot parse video qxl-ram '%s'"), qxl_ram); + goto error; + } + } else { + if (def->type == VIR_DOMAIN_VIDEO_TYPE_QXL) { + def->qxl_ram = virDomainVideoDefaultRAM(dom, def->type); + } + } + if (vram) { if (virStrToLong_ui(vram, NULL, 10, &def->vram) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, @@ -7455,6 +7469,7 @@ virDomainVideoDefParseXML(const xmlNodePtr node, goto error; VIR_FREE(type); + VIR_FREE(qxl_ram); VIR_FREE(vram); VIR_FREE(heads); @@ -13383,6 +13398,8 @@ virDomainVideoDefFormat(virBufferPtr buf, virBufferAddLit(buf, " <video>\n"); virBufferAsprintf(buf, " <model type='%s'", model); + if (def->qxl_ram && def->type == VIR_DOMAIN_VIDEO_TYPE_QXL) + virBufferAsprintf(buf, " qxl-ram='%u'", def->qxl_ram); if (def->vram) virBufferAsprintf(buf, " vram='%u'", def->vram); if (def->heads) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index ce36003..9333d26 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1157,6 +1157,7 @@ struct _virDomainVideoAccelDef { struct _virDomainVideoDef { int type; + unsigned int qxl_ram; unsigned int vram; unsigned int heads; bool primary; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 981c692..05f656a 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3563,6 +3563,15 @@ qemuBuildDeviceVideoStr(virDomainVideoDefPtr video, UINT_MAX / 1024); goto error; } + if (video->qxl_ram > (UINT_MAX / 1024)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("value for 'qxl-ram' must be less than '%u'"), + UINT_MAX / 1024); + goto error; + } + + /* QEMU accepts bytes for ram_size. */ + virBufferAsprintf(&buf, ",ram_size=%u", video->qxl_ram * 1024); /* QEMU accepts bytes for vram_size. */ virBufferAsprintf(&buf, ",vram_size=%u", video->vram * 1024); @@ -6569,23 +6578,48 @@ qemuBuildCommandLine(virConnectPtr conn, virCommandAddArgList(cmd, "-vga", vgastr, NULL); if (def->videos[0]->type == VIR_DOMAIN_VIDEO_TYPE_QXL) { - if (def->videos[0]->vram && + if ((def->videos[0]->vram || def->videos[0]->qxl_ram) && qemuCapsGet(caps, QEMU_CAPS_DEVICE)) { - if (def->videos[0]->vram > (UINT_MAX / 1024)) { + int qxl_ram = def->videos[0]->qxl_ram; + int vram = def->videos[0]->vram; + if (vram > (UINT_MAX / 1024)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("value for 'vram' must be less than '%u'"), + _("value for 'vram' must be less than '%u'"), + UINT_MAX / 1024); + goto error; + } + if (qxl_ram > (UINT_MAX / 1024)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("value for 'qxl-ram' must be less than '%u'"), UINT_MAX / 1024); goto error; } - virCommandAddArg(cmd, "-global"); - - if (qemuCapsGet(caps, QEMU_CAPS_DEVICE_QXL_VGA)) - virCommandAddArgFormat(cmd, "qxl-vga.vram_size=%u", - def->videos[0]->vram * 1024); - else - virCommandAddArgFormat(cmd, "qxl.vram_size=%u", - def->videos[0]->vram * 1024); + if (qemuCapsGet(caps, QEMU_CAPS_DEVICE_QXL_VGA)) { + if (qxl_ram) { + virCommandAddArg(cmd, "-global"); + virCommandAddArgFormat(cmd, + "qxl-vga.ram_size=%u", + qxl_ram * 1024); + } + if (vram) { + virCommandAddArg(cmd, "-global"); + virCommandAddArgFormat(cmd, + "qxl-vga.vram_size=%u", + vram * 1024); + } + } else { + if (qxl_ram) { + virCommandAddArg(cmd, "-global"); + virCommandAddArgFormat(cmd, "qxl.ram_size=%u", + qxl_ram * 1024); + } + if (vram) { + virCommandAddArg(cmd, "-global"); + virCommandAddArgFormat(cmd, "qxl.vram_size=%u", + vram * 1024); + } + } } } } @@ -9247,6 +9281,8 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr caps, else vid->type = video; vid->vram = virDomainVideoDefaultRAM(def, vid->type); + vid->qxl_ram = vid->type == VIR_DOMAIN_VIDEO_TYPE_QXL ? + virDomainVideoDefaultRAM(def, vid->type) : 0; vid->heads = 1; if (VIR_REALLOC_N(def->videos, def->nvideos+1) < 0) { diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.args index 5c5912b..2f537df 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.args @@ -5,5 +5,5 @@ unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ x509-dir=/etc/pki/libvirt-spice,\ image-compression=auto_glz,jpeg-wan-compression=auto,zlib-glz-wan-compression=auto,\ playback-compression=on,streaming-video=filter -vga \ -qxl -global qxl.vram_size=18874368 -device qxl,id=video1,vram_size=33554432,bus=pci.0,addr=0x4 \ +qxl -global qxl.ram_size=67108864 -global qxl.vram_size=18874368 -device qxl,id=video1,ram_size=67108864,vram_size=33554432,bus=pci.0,addr=0x4 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.xml index 52eb5b9..32e4cc8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.xml @@ -31,10 +31,10 @@ <streaming mode='filter'/> </graphics> <video> - <model type='qxl' vram='18432' heads='1'/> + <model type='qxl' qxl-ram='65536' vram='18432' heads='1'/> </video> <video> - <model type='qxl' vram='32768' heads='1'/> + <model type='qxl' qxl-ram='65536' vram='32768' heads='1'/> </video> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args index 3954c03..007dd3f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args @@ -3,5 +3,5 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=spice \ unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ /dev/HostVG/QEMUGuest1 -spice port=5903,tls-port=5904,addr=127.0.0.1,\ x509-dir=/etc/pki/libvirt-spice,tls-channel=main,plaintext-channel=inputs -vga \ -qxl -global qxl-vga.vram_size=33554432 -device qxl,id=video1,vram_size=67108864,bus=pci.0,addr=0x4 \ +qxl -global qxl-vga.ram_size=67108864 -global qxl-vga.vram_size=33554432 -device qxl,id=video1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x4 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.xml index 49cb8cc..ab40c7b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.xml @@ -28,10 +28,10 @@ <channel name='inputs' mode='insecure'/> </graphics> <video> - <model type='qxl' vram='32768' heads='1'/> + <model type='qxl' qxl-ram='65536' vram='32768' heads='1'/> </video> <video> - <model type='qxl' vram='65536' heads='1'/> + <model type='qxl' qxl-ram='65536' vram='65536' heads='1'/> </video> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args index 854e723..030e1f2 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args @@ -5,5 +5,5 @@ unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ x509-dir=/etc/pki/libvirt-spice,tls-channel=default,tls-channel=main,plaintext-channel=inputs,\ image-compression=auto_glz,jpeg-wan-compression=auto,zlib-glz-wan-compression=auto,\ playback-compression=on,streaming-video=filter,disable-copy-paste -vga \ -qxl -global qxl.vram_size=18874368 -device qxl,id=video1,vram_size=33554432,bus=pci.0,addr=0x4 \ +qxl -global qxl.ram_size=67108864 -global qxl.vram_size=18874368 -device qxl,id=video1,ram_size=67108864,vram_size=33554432,bus=pci.0,addr=0x4 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml index d4939a4..b540915 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml @@ -34,10 +34,10 @@ <clipboard copypaste='no'/> </graphics> <video> - <model type='qxl' vram='18432' heads='1'/> + <model type='qxl' qxl-ram='65536' vram='18432' heads='1'/> </video> <video> - <model type='qxl' vram='32768' heads='1'/> + <model type='qxl' qxl-ram='65536' vram='32768' heads='1'/> </video> <memballoon model='virtio'/> </devices> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-device-pciaddr-default.args b/tests/qemuxml2argvdata/qemuxml2argv-video-device-pciaddr-default.args index 9ce852f..4abd7c2 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-video-device-pciaddr-default.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-video-device-pciaddr-default.args @@ -3,7 +3,7 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=none \ -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c \ -usb \ -hda /var/lib/libvirt/images/QEMUGuest1 -vnc 127.0.0.1:-5900 \ --device qxl-vga,id=video0,vram_size=67108864,bus=pci.0,addr=0x3 \ --device qxl,id=video1,vram_size=67108864,bus=pci.0,addr=0x4 \ --device qxl,id=video2,vram_size=67108864,bus=pci.0,addr=0x5 \ +-device qxl-vga,id=video0,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x3 \ +-device qxl,id=video1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x4 \ +-device qxl,id=video2,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x5 \ -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 -- 1.8.0.1

6 10

[libvirt] [PATCH] Log flags passed to qemuMigrationPrepare{Tunnel, Direct} APIs
by Michal Privoznik 18 Jan '13

18 Jan '13

We are already logging other arguments passed, however, @flags were missing there. --- Pushed as these chunks were ACKed and are not really part of my NBD patchset: https://www.redhat.com/archives/libvir-list/2013-January/msg01306.html src/qemu/qemu_migration.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 465dbc1..d03e361 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -1787,9 +1787,10 @@ qemuMigrationPrepareTunnel(virQEMUDriverPtr driver, int ret; VIR_DEBUG("driver=%p, dconn=%p, cookiein=%s, cookieinlen=%d, " - "cookieout=%p, cookieoutlen=%p, st=%p, dname=%s, dom_xml=%s", + "cookieout=%p, cookieoutlen=%p, st=%p, dname=%s, dom_xml=%s " + "flags=%lx", driver, dconn, NULLSTR(cookiein), cookieinlen, - cookieout, cookieoutlen, st, NULLSTR(dname), dom_xml); + cookieout, cookieoutlen, st, NULLSTR(dname), dom_xml, flags); /* QEMU will be started with -incoming stdio (which qemu_command might * convert to exec:cat or fd:n) @@ -1823,10 +1824,10 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, VIR_DEBUG("driver=%p, dconn=%p, cookiein=%s, cookieinlen=%d, " "cookieout=%p, cookieoutlen=%p, uri_in=%s, uri_out=%p, " - "dname=%s, dom_xml=%s", + "dname=%s, dom_xml=%s flags=%lx", driver, dconn, NULLSTR(cookiein), cookieinlen, cookieout, cookieoutlen, NULLSTR(uri_in), uri_out, - NULLSTR(dname), dom_xml); + NULLSTR(dname), dom_xml, flags); /* The URI passed in may be NULL or a string "tcp://somehostname:port". * -- 1.8.0.2

1 0

[libvirt] [PATCH] build: Fix RPM build errors related to libvirt-lxc API
by Viktor Mihajlovski 18 Jan '13

18 Jan '13

Added missing entries to makefile and spec. Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- docs/Makefile.am | 2 +- libvirt.spec.in | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index b1fa77a..c95497f 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -120,7 +120,7 @@ EXTRA_DIST= \ hacking1.xsl hacking2.xsl wrapstring.xsl \ $(dot_html) $(dot_html_in) $(gif) $(apihtml) $(apipng) \ $(devhelphtml) $(devhelppng) $(devhelpcss) $(devhelpxsl) \ - $(xml) $(qemu_xml) $(fig) $(png) $(css) \ + $(xml) $(qemu_xml) $(lxc_xml) $(fig) $(png) $(css) \ $(patches) $(dot_php_in) $(dot_php_code_in) $(dot_php)\ $(internals_html_in) $(internals_html) \ sitemap.html.in \ diff --git a/libvirt.spec.in b/libvirt.spec.in index dca5053..3486d29 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1983,6 +1983,7 @@ fi %doc AUTHORS NEWS README COPYING.LIB %{_libdir}/python*/site-packages/libvirt.py* %{_libdir}/python*/site-packages/libvirt_qemu.py* +%{_libdir}/python*/site-packages/libvirt_lxc.py* %{_libdir}/python*/site-packages/libvirtmod* %doc python/tests/*.py %doc python/TODO -- 1.7.9.5

2 1

[libvirt] Coverity update
by John Ferlan 18 Jan '13

18 Jan '13

Taking Eric's suggestion from: https://www.redhat.com/archives/libvir-list/2013-January/msg01050.html There's two changes that have yet to be reviewed: https://www.redhat.com/archives/libvir-list/2013-January/msg00537.html https://www.redhat.com/archives/libvir-list/2013-January/msg00541.html After this recent set of 10 patches there are about 20 patches remaining. With the 2 above and the 10 from yesterday, the coverity defect list stands at 236 (down from 297). Of those, about 50 are related to a sdt.h macro issue, 50 are false positives requiring a comment change, and another 95 can be fixed/resolved by a very simple (but yet unnecessary) change to src/esx/esx_vi.c and src/esx/esx_vi_types.c. Each module as a __TEMPLATE__FREE() macro which does the following: item=*ptrptr; \ \ _body \ \ VIR_FREE(*ptrptr); \ Coverity has a hard time with the VIR_FREE(*ptrptr) here and in other modules, thus it decides we must be leaking. No amount of tagging completely removes all the warnings (I tried adding them everywhere and only reduced the count, not eliminated). There is a solution, but I really don't like it. If the VIR_FREE(*ptrptr) is changed to: VIR_FREE(item); \ *ptrptr = NULL; \ Coverity is happy. I asked about this on a Coverity community message board, but no one has an answer. I even generated a small program which replicated the issue. In a way I think it could be a Coverity bug, but I'm not sure I want to make that claim yet. John

1 0

[libvirt] [PATCH] qemu: Double mutex unlock in qemuDomainModifyDeviceFlags
by Viktor Mihajlovski 18 Jan '13

18 Jan '13

The driver mutex was unlocked in qemuDomainModifyDeviceFlags before entering qemuDomainObjBeginJobWithDriver where it will be unlocked once more leaving it in an undefined state. The result was that two threads were simultaneously looking up the domain hash table during multiple parallel device attach/detach operations. Luckily this triggered a virHashIterationError. Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- src/qemu/qemu_driver.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 8c39864..c28c223 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6443,7 +6443,6 @@ qemuDomainModifyDeviceFlags(virDomainPtr dom, const char *xml, qemuDriverLock(driver); vm = virDomainFindByUUID(&driver->domains, dom->uuid); - qemuDriverUnlock(driver); if (!vm) { char uuidstr[VIR_UUID_STRING_BUFLEN]; virUUIDFormat(dom->uuid, uuidstr); -- 1.7.9.5

3 4

Re: [libvirt] Redefinition of struct in6_addr in <netinet/in.h> and <linux/in6.h>
by Carlos O'Donell 18 Jan '13

18 Jan '13

On Thu, Jan 17, 2013 at 11:20 PM, Mike Frysinger <vapier(a)gentoo.org> wrote: > On Wednesday 16 January 2013 22:15:38 David Miller wrote: >> From: Carlos O'Donell <carlos(a)systemhalted.org> >> Date: Wed, 16 Jan 2013 21:15:03 -0500 >> >> > +/* If a glibc-based userspace has already included in.h, then we will >> > not + * define in6_addr (nor the defines), sockaddr_in6, or ipv6_mreq. >> > The + * ABI used by the kernel and by glibc match exactly. Neither the >> > kernel + * nor glibc should break this ABI without coordination. >> > + */ >> > +#ifndef _NETINET_IN_H >> > + >> >> I think we should shoot for a non-glibc-centric solution. >> >> I can't imagine that other libc's won't have the same exact problem >> with their netinet/in.h conflicting with the kernel's, redefining >> structures like in6_addr, that we'd want to provide a protection >> scheme for here as well. > > yes, the kernel's use of __GLIBC__ in exported headers has already caused > problems in the past. fortunately, it's been reduced down to just one case > now (stat.h). let's not balloon it back up. > -mike I also see coda.h has grown a __GLIBC__ usage. In the next revision of the patch I created a single libc-compat.h header which encompasses the logic for any libc that wants to coordinate with the kernel headers. It's simple enough to move all of the __GLIBC__ uses into libc-compat.h, then you control userspace libc coordination from one file. Cheers, Carlos.

3 5

[libvirt] [PATCH 00/12] Introduce public APIs for dealing with virTypedParameters
by Jiri Denemark 18 Jan '13

18 Jan '13

Working with virTypedParameters in clients written in C is ugly and requires all clients to duplicate the same code. This set of APIs makes this code for manipulating with virTypedParameters integral part of libvirt so that all clients may benefit from it. Jiri Denemark (12): Add virTypedParams* APIs virsh: Use virTypedParams* APIs in blkdeviotune virsh: Use virTypedParams* APIs in blkiotune virsh: Use virTypedParams* APIs in domiftune virsh: Use virTypedParams* APIs in schedinfo virsh: Use virTypedParams* APIs in domblkstat virsh: Use virTypedParams* APIs in memtune virsh: Use virTypedParams* APIs in numatune virsh: Use virTypedParams* APIs in node-memory-tune virsh: Use virTypedParams* APIs in cpu-stats Introduce virTypedParamsClear public API python: Avoid freeing uninitialized new_params pointer daemon/remote.c | 34 +- include/libvirt/libvirt.h.in | 95 ++++++ python/generator.py | 20 ++ python/libvirt-override.c | 73 ++-- src/libvirt_private.syms | 1 - src/libvirt_public.syms | 18 + src/remote/remote_driver.c | 4 +- src/rpc/gendispatch.pl | 3 +- src/util/virtypedparam.c | 782 ++++++++++++++++++++++++++++++++++++++++++- src/util/virtypedparam.h | 2 - tools/virsh-domain-monitor.c | 5 +- tools/virsh-domain.c | 542 +++++++++++------------------- tools/virsh-host.c | 78 ++--- tools/virsh.c | 20 -- 14 files changed, 1171 insertions(+), 506 deletions(-) -- 1.8.1.1

3 17

[libvirt] [PATCH] storage: Fix lvcreate parameter for backingStore.
by Atsushi Kumagai 18 Jan '13

18 Jan '13

When virStorageBackendLogicalCreateVol() creates a snapshot for a logical volume with backingStore element, it fails with the message below: 2013-01-17 03:10:18.869+0000: 1967: error : virCommandWait:2345 : internal error Child process (/sbin/lvcreate --name lvm-snapshot -L 51200K -s=/dev/lvm-pool/lvm-volume) unexpected exit status 3: /sbin/lvcreate: invalid option -- '=' Error during parsing of command line. This is because virCommandAddArgPair() uses '=' to connect the two parameters, it's unsuitable for -s option of the lvcreate. Signed-off-by: Atsushi Kumagai <kumagai-atsushi(a)mxc.nes.nec.co.jp> --- src/storage/storage_backend_logical.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index 91db3fd..bb709df 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -736,7 +736,7 @@ virStorageBackendLogicalCreateVol(virConnectPtr conn, } virCommandAddArgFormat(cmd, "%lluK", VIR_DIV_UP(vol->capacity, 1024)); if (vol->backingStore.path) - virCommandAddArgPair(cmd, "-s", vol->backingStore.path); + virCommandAddArgList(cmd, "-s", vol->backingStore.path, NULL); else virCommandAddArg(cmd, pool->def->source.name); -- 1.7.1

2 1

Re: [libvirt] Redefinition of struct in6_addr in <netinet/in.h> and <linux/in6.h>
by David Miller 18 Jan '13

18 Jan '13

From: Mike Frysinger <vapier(a)gentoo.org> Date: Thu, 17 Jan 2013 23:14:31 -0500 > the kernel already exports many types with a __kernel_ prefix. i changed the > kernel headers in Gentoo for a few releases (2.6.28 - 2.6.34) to do the same > thing to pretty much all the networking headers. a few packages broke, but > the number was low, and trivial to fix (a sed would do it most of the time). > > it's also trivial for userland packages to detect that they need to do this > sort of thing in a local header by using linux/version.h and a set of defines > to redirect the new structure name back to the old one. > > would be a lot cleaner to just break it and be done. We are not at liberty to break something that has legitimately compiled successfully for two decades. Your __kernel_ prefix idea breaks compilation just as equally. One thing you certainly don't have to be is happy about this header file situation, but you cannot use that dissatisfaction as justification to make the situation worse by breaking the build for people outside of the world you directly control.

1 0

Re: [libvirt] Redefinition of struct in6_addr in <netinet/in.h> and <linux/in6.h>
by David Miller 18 Jan '13

18 Jan '13

From: Mike Frysinger <vapier(a)gentoo.org> Date: Wed, 16 Jan 2013 12:04:56 -0500 > certainly true, but the current expectation is that you don't mix your ABIs. > if you're programming with the C library API, then use the C library headers. > if you're banging directly on the kernel, then use the kernel headers. not > saying it's a perfect solution, but it works for the vast majority of use > cases. This isn't how real life works. GLIBC itself brings in some of the kernel headers, as do various library headers for libraries other than glibc. So you can get these conflicting headers included indirectly, and it is of no fault of any of the various parties involved. We have to make them work when included at the same time somehow, and this is totally unavoidable.

3 5

[libvirt] [PATCH] build: fix build on BSD
by Eric Blake 18 Jan '13

18 Jan '13

A build on FreeBSD failed with: util/virportallocator.c:108: error: storage size of 'addr' isn't known util/virportallocator.c:123: error: 'INADDR_ANY' undeclared (first use in this function) It turns out that while POSIX allows sockaddr_in to leak in through other headers (the way Linux does it), conforming applications are required to get it through netinet/in.h. * src/util/virportallocator.c: Include header for struct sockaddr_in. --- Pushing under the build-breaker rule. src/util/virportallocator.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/util/virportallocator.c b/src/util/virportallocator.c index 35f2157..590bb57 100644 --- a/src/util/virportallocator.c +++ b/src/util/virportallocator.c @@ -23,6 +23,7 @@ #include <sys/socket.h> #include <arpa/inet.h> +#include <netinet/in.h> #include "viralloc.h" #include "virbitmap.h" -- 1.8.0.2

1 0

[libvirt] [PATCH v2.1 RESEND 00/11] Rework storage migration
by Michal Privoznik 18 Jan '13

18 Jan '13

This patch set re-implements migration with storage for enough new qemu. Currently, you can migrate a domain to a host without need for shared storage. This is done by setting 'blk' or 'inc' attribute (representing VIR_MIGRATE_NON_SHARED_DISK and VIR_MIGRATE_NON_SHARED_INC flags respectively) of 'migrate' monitor command. However, the qemu implementation is buggy and applications are advised to switch to new impementation which, moreover, offers some nice features, like migrating only explicitly specified disks. The new functionality is controlled via 'nbd-server-*' and 'drive-mirror' commands. The flow is meant to look like this: 1) User invokes libvirt's migrate functionality. 2) libvirt checks that no block jobs are active on the source. 3) libvirt starts the destination QEMU and sets up the NBD server using the nbd-server-start and nbd-server-add commands. 4) libvirt starts drive-mirror with a destination pointing to the remote NBD server, for example nbd:host:port:exportname=diskname (where diskname is the -drive id specified on the destination). 5) once all mirroring jobs reach steady state, libvirt invokes the migrate command. 6) once migration completed, libvirt invokes the nbd-server-stop command on the destination QEMU. If we just skip the 2nd step and there is an active block-job, qemu will fail in step 4. No big deal. Since we try to NOT break migration and keep things compatible, this feature is enabled iff both sides support it. Since there's obvious need for some data transfer between src and dst, I've put it into qemuCookieMigration: 1) src -> dest: (QEMU_MIGRATION_PHASE_BEGIN3 -> QEMU_MIGRATION_PHASE_PREPARE) <nbd> <disk size='17179869184'/> </nbd> Hey destination, I know how to use this cool new feature. Moreover, these are the disks I'll send you. Each one of them is X bytes big. It's one of the prerequisite - the file (disk->src) on dst exists and has at least the same size as on dst. 2) dst -> src: (QEMU_MIGRATION_PHASE_PREPARE -> QEMU_MIGRATION_PHASE_PERFORM3) <nbd port='X'/> Okay, I (destination) support this feature as well. I've created all files as you (src) told me to and you can start rolling data. I am listening on port X. 3) src -> dst: (QEMU_MIGRATION_PHASE_PERFORM3 -> QEMU_MIGRATION_PHASE_FINISH3) <nbd port='-1'/> Migration completed, destination, you may shut the NBD server down. If either src or dst doesn't support NBD, it is not used and whole process fall backs to old implementation. diff to v1: -Eric's and Daniel's suggestions worked in. To point out the bigger ones: don't do NBD style when TUNNELLED requested, added 'b:writable' to 'nbd-server-add' -drop '/qemu-migration/nbd/disk/@src' attribute from migration cookie. As pointed out by Jirka, disk->src can be changed during migration (e.g. by migration hook or by passed xml). So I've tried (as suggested on the list) passing disk alias. However, since qemu hasn't been started on destination yet, the aliases hasn't been generated yet. So we have to rely on ordering completely. diff to v2: -rebase to reflect changes made by offline migration patch -send initial nbd cookie only if needed diff to previous v2.1: -rebase to current HEAD The patches 1,3 and 5 has been ACKed already. Maybe, I'll need to drop 7/11 patch completely, once Dan's patches [1] are in. 1: https://www.redhat.com/archives/libvir-list/2013-January/msg00742.html Michal Privoznik (11): qemu: Introduce NBD_SERVER capability Introduce NBD migration cookie qemu: Introduce nbd-server-start command qemu: Introduce nbd-server-add command qemu: Introduce nbd-server-stop command qemu_migration: Introduce qemuMigrationStartNBDServer qemu_migration: Move port allocation to a separate func qemu_migration: Implement qemuMigrationStartNBDServer() qemu_migration: Implement qemuMigrationDriveMirror qemu_migration: Check size prerequisites qemu_migration: Stop NBD server at Finish phase src/qemu/qemu_capabilities.c | 4 +- src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_migration.c | 624 ++++++++++++++++++++++++++++++++++++++++--- src/qemu/qemu_monitor.c | 63 +++++ src/qemu/qemu_monitor.h | 7 + src/qemu/qemu_monitor_json.c | 95 +++++++ src/qemu/qemu_monitor_json.h | 7 + 7 files changed, 768 insertions(+), 33 deletions(-) -- 1.8.0.2

2 23

[libvirt] [RFC] Data in the <topology> element in the capabilities XML
by Peter Krempa 18 Jan '13

18 Jan '13

Hi everybody, a while ago there was a discussion about changing the data that is returned in the <topology> sub-element: <capabilities> <host> <cpu> <arch>x86_64</arch> <model>SandyBridge</model> <vendor>Intel</vendor> <topology sockets='1' cores='2' threads='2'/> The data provided here is as of today taken from the nodeinfo detection code and thus is really wrong when the fallback mechanisms are used. To get a useful count, the user has to multiply the data by the number of NUMA nodes in the host. With the fallback detection code used for nodeinfo the NUMA node count used to get the CPU count should be 1 instead of the actual number. As Jiri proposed, I think we should change this output to separate detection code that will not take into account NUMA nodes for this output and will rather provide data as the "lspci" command does. This change will make the data provided by the element standalone and also usable in guest XMLs to mirror host's topology. The meaning of the attributes of that element isn't really documented anywhere, so as an additional precaution we should document that. ( http://libvirt.org/formatcaps.html ) For some additional background, please refer to the original discussion here: https://www.redhat.com/archives/libvir-list/2012-March/msg01123.html Thanks in advance for your comments and suggestions. Peter

3 16

[libvirt] [PATCH v2] Avoid integer wrap on remotePortMax in QEMU driver
by Daniel P. Berrange 17 Jan '13

17 Jan '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The QEMU driver default max port is 65535, but it then increments this by 1 to 65536. This maps to 0 in an unsigned short :-( This was apparently done so that for() loops could use "< max" instead of "<= max". Remove this insanity and just make the loop do the right thing. --- src/qemu/qemu_conf.c | 4 ---- src/util/virportallocator.c | 6 +++--- tests/virportallocatortest.c | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 680e8fb..b21392e 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -233,10 +233,6 @@ int qemuLoadDriverConfig(virQEMUDriverPtr driver, filename, QEMU_REMOTE_PORT_MAX); goto cleanup; } - /* increasing the value by 1 makes all the loops going through - the bitmap (i = remotePortMin; i < remotePortMax; i++), work as - expected. */ - driver->remotePortMax++; if (driver->remotePortMin > driver->remotePortMax) { virReportError(VIR_ERR_INTERNAL_ERROR, diff --git a/src/util/virportallocator.c b/src/util/virportallocator.c index 033aee4..d80347a 100644 --- a/src/util/virportallocator.c +++ b/src/util/virportallocator.c @@ -84,7 +84,7 @@ virPortAllocatorPtr virPortAllocatorNew(unsigned short start, pa->start = start; pa->end = end; - if (!(pa->bitmap = virBitmapNew(end-start))) { + if (!(pa->bitmap = virBitmapNew((end-start)+1))) { virReportOOMError(); virObjectUnref(pa); return NULL; @@ -103,7 +103,7 @@ int virPortAllocatorAcquire(virPortAllocatorPtr pa, *port = 0; virObjectLock(pa); - for (i = pa->start ; i < pa->end && !*port; i++) { + for (i = pa->start ; i <= pa->end && !*port; i++) { int reuse = 1; struct sockaddr_in addr; bool used = false; @@ -168,7 +168,7 @@ int virPortAllocatorRelease(virPortAllocatorPtr pa, virObjectLock(pa); if (port < pa->start || - port >= pa->end) { + port > pa->end) { virReportInvalidArg(port, "port %d must be in range (%d, %d)", port, pa->start, pa->end); goto cleanup; diff --git a/tests/virportallocatortest.c b/tests/virportallocatortest.c index 93577d7..3f6edcc 100644 --- a/tests/virportallocatortest.c +++ b/tests/virportallocatortest.c @@ -59,7 +59,7 @@ int bind(int sockfd ATTRIBUTE_UNUSED, static int testAllocAll(const void *args ATTRIBUTE_UNUSED) { - virPortAllocatorPtr alloc = virPortAllocatorNew(5900, 5910); + virPortAllocatorPtr alloc = virPortAllocatorNew(5900, 5909); int ret = -1; unsigned short p1, p2, p3, p4, p5, p6, p7; -- 1.8.0.2

3 2

[libvirt] [PATCH] Avoid integer wrap on remotePortMax in QEMU driver
by Daniel P. Berrange 17 Jan '13

17 Jan '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The QEMU driver default max port is 65535, but it then increments this by 1 to 65536. This maps to 0 in an unsigned short :-( This was apparently done so that for() loops could use "< max" instead of "<= max". Remove this insanity and just make the loop do the right thing. --- src/qemu/qemu_conf.c | 4 ---- src/util/virportallocator.c | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 680e8fb..b21392e 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -233,10 +233,6 @@ int qemuLoadDriverConfig(virQEMUDriverPtr driver, filename, QEMU_REMOTE_PORT_MAX); goto cleanup; } - /* increasing the value by 1 makes all the loops going through - the bitmap (i = remotePortMin; i < remotePortMax; i++), work as - expected. */ - driver->remotePortMax++; if (driver->remotePortMin > driver->remotePortMax) { virReportError(VIR_ERR_INTERNAL_ERROR, diff --git a/src/util/virportallocator.c b/src/util/virportallocator.c index 033aee4..5d07dd0 100644 --- a/src/util/virportallocator.c +++ b/src/util/virportallocator.c @@ -84,7 +84,7 @@ virPortAllocatorPtr virPortAllocatorNew(unsigned short start, pa->start = start; pa->end = end; - if (!(pa->bitmap = virBitmapNew(end-start))) { + if (!(pa->bitmap = virBitmapNew((end-start)+1))) { virReportOOMError(); virObjectUnref(pa); return NULL; @@ -103,7 +103,7 @@ int virPortAllocatorAcquire(virPortAllocatorPtr pa, *port = 0; virObjectLock(pa); - for (i = pa->start ; i < pa->end && !*port; i++) { + for (i = pa->start ; i <= pa->end && !*port; i++) { int reuse = 1; struct sockaddr_in addr; bool used = false; -- 1.8.0.2

3 2

[libvirt] [PATCH 0/5] Resolve REVERSE_INULL errors found by Coverity
by John Ferlan 17 Jan '13

17 Jan '13

This patch will resolve a set of "REVERSE_INULL (CWE-476):" errors found by Coverity. John Ferlan (5): network: Resolve some issues around vlan copying xen: Remove extraneous checks in xenStoreGetDomainInfo() interface: Need to check ifacedef->mac not just ifacedef after strdup() xen: Need to check validity of domain->conn before deref privateData openvz: Need to check 'vm' first before dereferencing 'def' src/interface/interface_backend_udev.c | 2 +- src/network/bridge_driver.c | 16 +++++++++++++--- src/openvz/openvz_driver.c | 2 +- src/xen/xen_hypervisor.c | 3 ++- src/xen/xs_internal.c | 2 +- 5 files changed, 18 insertions(+), 7 deletions(-) -- 1.7.11.7

5 15

[libvirt] [PATCH] network: use bandwidth from portgroup when appropriate
by Laine Stump 17 Jan '13

17 Jan '13

The bandwidth plug and unplug functions were assuming that an interface's bandwidth setting was always specified directly in the domain's <interface> definition, but that's not necessarily true - it could have been obtained from a <portgroup> definition in the network definition. This patch fixes those functions to use virDomainNetGetActualBandwidth(), which gets the bandwidth pointer from iface->data.network.actual if it exists, otherwise returns iface->bandwidth. --- src/network/bridge_driver.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index c3cb63d..6f3c839 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -4518,7 +4518,7 @@ networkCheckBandwidth(virNetworkObjPtr net, { int ret = -1; virNetDevBandwidthPtr netBand = net->def->bandwidth; - virNetDevBandwidthPtr ifaceBand = iface->bandwidth; + virNetDevBandwidthPtr ifaceBand = virDomainNetGetActualBandwidth(iface); unsigned long long tmp_floor_sum = net->floor_sum; unsigned long long tmp_new_rate = 0; char ifmac[VIR_MAC_STRING_BUFLEN]; @@ -4597,6 +4597,7 @@ networkPlugBandwidth(virNetworkObjPtr net, unsigned long long new_rate = 0; ssize_t class_id = 0; char ifmac[VIR_MAC_STRING_BUFLEN]; + virNetDevBandwidthPtr ifaceBand = virDomainNetGetActualBandwidth(iface); if ((plug_ret = networkCheckBandwidth(net, iface, &new_rate)) < 0) { /* helper reported error */ @@ -4625,11 +4626,8 @@ networkPlugBandwidth(virNetworkObjPtr net, goto cleanup; } - plug_ret = virNetDevBandwidthPlug(net->def->bridge, - net->def->bandwidth, - &iface->mac, - iface->bandwidth, - class_id); + plug_ret = virNetDevBandwidthPlug(net->def->bridge, net->def->bandwidth, + &iface->mac, ifaceBand, class_id); if (plug_ret < 0) { ignore_value(virNetDevBandwidthUnplug(net->def->bridge, class_id)); goto cleanup; @@ -4638,11 +4636,11 @@ networkPlugBandwidth(virNetworkObjPtr net, /* QoS was set, generate new class ID */ iface->data.network.actual->class_id = class_id; /* update sum of 'floor'-s of attached NICs */ - net->floor_sum += iface->bandwidth->in->floor; + net->floor_sum += ifaceBand->in->floor; /* update status file */ if (virNetworkSaveStatus(NETWORK_STATE_DIR, net) < 0) { ignore_value(virBitmapClearBit(net->class_id, class_id)); - net->floor_sum -= iface->bandwidth->in->floor; + net->floor_sum -= ifaceBand->in->floor; iface->data.network.actual->class_id = 0; ignore_value(virNetDevBandwidthUnplug(net->def->bridge, class_id)); goto cleanup; @@ -4666,6 +4664,7 @@ networkUnplugBandwidth(virNetworkObjPtr net, { int ret = 0; unsigned long long new_rate; + virNetDevBandwidthPtr ifaceBand = virDomainNetGetActualBandwidth(iface); if (iface->data.network.actual && iface->data.network.actual->class_id) { @@ -4680,13 +4679,13 @@ networkUnplugBandwidth(virNetworkObjPtr net, if (ret < 0) goto cleanup; /* update sum of 'floor'-s of attached NICs */ - net->floor_sum -= iface->bandwidth->in->floor; + net->floor_sum -= ifaceBand->in->floor; /* return class ID */ ignore_value(virBitmapClearBit(net->class_id, iface->data.network.actual->class_id)); /* update status file */ if (virNetworkSaveStatus(NETWORK_STATE_DIR, net) < 0) { - net->floor_sum += iface->bandwidth->in->floor; + net->floor_sum += ifaceBand->in->floor; ignore_value(virBitmapSetBit(net->class_id, iface->data.network.actual->class_id)); goto cleanup; -- 1.7.11.7

2 2

[libvirt] [PATCH] conf: don't fail to parse <boot> element when parsing a single device
by Laine Stump 17 Jan '13

17 Jan '13

This resolves: https://bugzilla.redhat.com/show_bug.cgi?id=895294 The symptom was that attempts to modify a network device using virDomainUpdateDeviceFlags() would fail if the original device had a <boot> element (e.g. "<boot order='1'/>"), even if the updated device had the same <boot> element. Instead, the following error would be logged: cannot modify network device boot index setting It's true that it's not possible to change boot order (internally known as bootIndex) of a live device; qemuDomainChangeNet checks for that, but the problem was that the information it was checking was incorrect. Explanation: When a complete domain is parsed, a global (to the domain) "bootMap" is passed down to the parse for each device; the bootMap is used to make sure that devices don't have conflicting settings for their boot orders. When a single device is parsed by itself (as in the case of virDomainUpdateDeviceFlags), there is no global bootMap that would be appropriate to send, so NULL is sent instead. However, although the lowest level function that parses just the boot order *does* simply skip the sanity check in that case, the next higher level "virDomainDeviceInfoParseXML" function refuses to call down to the lower "virDomainDeviceBootParseXML" if bootMap is NULL. So, the boot order is never set in the "new" device object, and when it is compared to the original (which does have a boot order), they don't match. The fix is to patch virDomainDeviceInfoParseXML to not care about bootMap, and just always call virDomainDeviceInfoBootParseXML whenever there is a <boot> element. When we are only parsing a single device, we don't care whether or not any specified boot order is consistent with the rest of the domain; we will always do this check later (in the current case, we do it by verifying that the net bootIndex exactly matches the old bootIndex). --- src/conf/domain_conf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 06b9c25..e4babaf 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -1,7 +1,7 @@ /* * domain_conf.c: domain XML processing * - * Copyright (C) 2006-2012 Red Hat, Inc. + * Copyright (C) 2006-2013 Red Hat, Inc. * Copyright (C) 2006-2008 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -2624,7 +2624,7 @@ virDomainDeviceInfoParseXML(xmlNodePtr node, } else if (master == NULL && xmlStrEqual(cur->name, BAD_CAST "master")) { master = cur; - } else if (boot == NULL && bootMap && + } else if (boot == NULL && (flags & VIR_DOMAIN_XML_INTERNAL_ALLOW_BOOT) && xmlStrEqual(cur->name, BAD_CAST "boot")) { boot = cur; -- 1.7.11.7

2 2

[libvirt] [PATCH] lock_daemon: Simplify error handling
by Peter Krempa 17 Jan '13

17 Jan '13

No need to check the run_dir variable twice for NULL. --- src/locking/lock_daemon.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c index f0eba48..97e5d74 100644 --- a/src/locking/lock_daemon.c +++ b/src/locking/lock_daemon.c @@ -1311,19 +1311,16 @@ int main(int argc, char **argv) { /* Ensure the rundir exists (on tmpfs on some systems) */ if (privileged) { - run_dir = strdup(LOCALSTATEDIR "/run/libvirt"); + if (!(run_dir = strdup(LOCALSTATEDIR "/run/libvirt"))) { + virReportOOMError(); + goto cleanup; + } } else { - run_dir = virGetUserRuntimeDirectory(); - - if (!run_dir) { + if (!(run_dir = virGetUserRuntimeDirectory())) { VIR_ERROR(_("Can't determine user directory")); goto cleanup; } } - if (!run_dir) { - virReportOOMError(); - goto cleanup; - } if (privileged) old_umask = umask(022); -- 1.8.1.1

2 2

[libvirt] [PATCH 0/2 v2] Colorize HTML documentation
by Claudio Bley 17 Jan '13

17 Jan '13

The only difference to v1 is that I fixed the CSS pseudo elements adding some vital whitespaces. (I tried to be extra smart and removed some whitespace without further testing, just to discover that it did not work anymore *after* sending the patcheset). Claudio Bley (2): docs: Assign classes to documentation elements docs: Add some style and color to the HTML documentation docs/generic.css | 4 ++ docs/libvirt.css | 56 +++++++++++++++- docs/newapi.xsl | 187 +++++++++++++++++++++++++++++++----------------------- 3 files changed, 166 insertions(+), 81 deletions(-) -- 1.7.9.5

2 6

[libvirt] [PATCH 00/12] virsh: Partially convert to c99 struct initialization
by Michal Privoznik 17 Jan '13

17 Jan '13

For now, we have to suffice with vshCmdOptDef. Others coming soon. Changes are pretty mechanical, so if you find a mistake there, blame my vim macro :) Michal Privoznik (12): virsh.c: Switch to C99 initialization of vshCmdOptDef virsh-domain.c: Switch to C99 initialization of vshCmdOptDef virsh-domain-monitor.c: Switch to C99 initialization of vshCmdOptDef virsh-host.c: Switch to C99 initialization of vshCmdOptDef virsh-interface.c: Switch to C99 initialization of vshCmdOptDef virsh-network.c: Switch to C99 initialization of vshCmdOptDef virsh-nodedev.c: Switch to C99 initialization of vshCmdOptDef virsh-nwfilter.c: Switch to C99 initialization of vshCmdOptDef virsh-pool.c: Switch to C99 initialization of vshCmdOptDef virsh-secret.c: Switch to C99 initialization of vshCmdOptDef virsh-snapshot.c: Switch to C99 initialization of vshCmdOptDef virsh-volume.c: Switch to C99 initialization of vshCmdOptDef tools/virsh-domain-monitor.c | 279 +++-- tools/virsh-domain.c | 2299 +++++++++++++++++++++++++++++++++--------- tools/virsh-host.c | 102 +- tools/virsh-interface.c | 138 ++- tools/virsh-network.c | 193 +++- tools/virsh-nodedev.c | 64 +- tools/virsh-nwfilter.c | 34 +- tools/virsh-pool.c | 286 ++++-- tools/virsh-secret.c | 72 +- tools/virsh-snapshot.c | 452 +++++++-- tools/virsh-volume.c | 368 +++++-- tools/virsh.c | 62 +- 12 files changed, 3406 insertions(+), 943 deletions(-) -- 1.8.0.2

3 28

[libvirt] [PATCH] libvirt.c: fix typo in comment
by Claudio Bley 17 Jan '13

17 Jan '13

Signed-off-by: Claudio Bley <cbley(a)av-test.de> --- Pushing under the trivial rule. src/libvirt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libvirt.c b/src/libvirt.c index 7db677f..d5d561c 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -17181,7 +17181,7 @@ error: * encrypted, or running over a channel which is not exposed * to eavesdropping (eg a UNIX domain socket, or pipe) * - * Returns 1 if secure, 0 if secure, -1 on error + * Returns 1 if secure, 0 if not secure, -1 on error */ int virConnectIsSecure(virConnectPtr conn) { -- 1.7.9.5

1 0

[libvirt] [PATCH] Move comment after enum members
by Claudio Bley 17 Jan '13

17 Jan '13

The api builder always associates comments to the last member it read, not to the current member even if there was a comment for the previous member and a comma was already seen. This has the effect that the comment for the previous member gets overwritten and the current member has no comment at all. Signed-off-by: Claudio Bley <cbley(a)av-test.de> --- include/libvirt/libvirt.h.in | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 09c89c5..9110fcf 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -127,12 +127,12 @@ typedef enum { power management */ #ifdef VIR_ENUM_SENTINELS - /* - * NB: this enum value will increase over time as new events are - * added to the libvirt API. It reflects the last state supported - * by this version of the libvirt API. - */ VIR_DOMAIN_LAST + /* + * NB: this enum value will increase over time as new events are + * added to the libvirt API. It reflects the last state supported + * by this version of the libvirt API. + */ #endif } virDomainState; @@ -2742,12 +2742,12 @@ typedef enum { VIR_STORAGE_VOL_WIPE_ALG_RANDOM = 8, /* 1-pass random */ #ifdef VIR_ENUM_SENTINELS + VIR_STORAGE_VOL_WIPE_ALG_LAST /* * NB: this enum value will increase over time as new algorithms are * added to the libvirt API. It reflects the last algorithm supported * by this version of the libvirt API. */ - VIR_STORAGE_VOL_WIPE_ALG_LAST #endif } virStorageVolWipeAlgorithm; @@ -2974,12 +2974,12 @@ typedef enum { VIR_KEYCODE_SET_RFB = 9, #ifdef VIR_ENUM_SENTINELS + VIR_KEYCODE_SET_LAST /* * NB: this enum value will increase over time as new events are * added to the libvirt API. It reflects the last keycode set supported * by this version of the libvirt API. */ - VIR_KEYCODE_SET_LAST #endif } virKeycodeSet; @@ -3533,12 +3533,12 @@ typedef enum { VIR_SECRET_USAGE_TYPE_CEPH = 2, #ifdef VIR_ENUM_SENTINELS + VIR_SECRET_USAGE_TYPE_LAST /* * NB: this enum value will increase over time as new events are * added to the libvirt API. It reflects the last secret owner ID * supported by this version of the libvirt API. */ - VIR_SECRET_USAGE_TYPE_LAST #endif } virSecretUsageType; @@ -4443,12 +4443,12 @@ typedef enum { VIR_DOMAIN_EVENT_ID_PMSUSPEND_DISK = 14, /* virConnectDomainEventPMSuspendDiskCallback */ #ifdef VIR_ENUM_SENTINELS + VIR_DOMAIN_EVENT_ID_LAST /* * NB: this enum value will increase over time as new events are * added to the libvirt API. It reflects the last event ID supported * by this version of the libvirt API. */ - VIR_DOMAIN_EVENT_ID_LAST #endif } virDomainEventID; -- 1.7.9.5

2 6

[libvirt] iptables --physdev-out warnings
by Reinier Schoof 17 Jan '13

17 Jan '13

Hi, we've experienced some issues with starting lots of KVM based VM's with libvirt. Since I couldn't find any clues on the libvirt mailing list, I'm posting the way I fixed the issues. When starting a VM, /var/log/messages was spammed with the following message: xt_physdev: using --physdev-out in the OUTPUT, FORWARD and POSTROUTING chains for non-bridged traffic is not supported anymore. With each extra VM I start, the messages get amplified exponentially. This results in longer starting times every new VM, relative the the previously started VM. When I ran a test with starting 100 equal VM's, the first VM started in about 2 seconds, the 100th VM took 48 seconds to start. I'm running a vanilla 3.7.1 kernel, but I have the same issue on VM hosts with kernel 3.2.28 or 3.2.0, running libvirt 0.9.12 and 0.9.8 respectively. Looking into the warning, it seemed that iptables need an extra argument, --physdev-is-bridged, in commands like: iptables -A libvirt-out -m physdev --physdev-is-bridged --physdev-out vnet99 -g FP-vnet99 I patched the libvirt source (version 1.0.0) to test whether this works or not: --- src/nwfilter/nwfilter_ebiptables_driver.c.orig 2013-01-16 10:51:43.000000000 +0100 +++ src/nwfilter/nwfilter_ebiptables_driver.c 2013-01-16 10:52:07.000000000 +0100 @@ -166,7 +166,7 @@ snprintf(buf, sizeof(buf), "%c%c-%s", prefix[0], prefix[1], ifname) #define PHYSDEV_IN "--physdev-in" -#define PHYSDEV_OUT "--physdev-out" +#define PHYSDEV_OUT "--physdev-is-bridged --physdev-out" static const char *m_state_out_str = "-m state --state NEW,ESTABLISHED"; static const char *m_state_in_str = "-m state --state ESTABLISHED"; The warnings in /var/log/messages are gone and running the test again proved the 100th VM started in 3.8 seconds. It suprises me I'm the first to mention this problem on the libvirt mailing list and I wondering if I'm doing something wrong. Until then, this fix helps me a lot! Reinier Schoof -- TransIP BV | https://www.transip.nl/

3 2

[libvirt] [test-API][PATCH] Add storage cases of pool list, pool lookup and volume lookup
by Wayne Sun 17 Jan '13

17 Jan '13

Add 3 simple storage realted API cases * pool_list_active is only for testing with flags: libvirt.VIR_CONNECT_LIST_STORAGE_POOLS_ACTIVE * pool_lookup is for testing lookup pool object by name, UUID, UUIDString and volume object * vol_lookup is for testing lookup volume object by name, key and path * add cases into storage_dir.conf Signed-off-by: Wayne Sun <gsun(a)redhat.com> --- cases/storage_dir.conf | 14 +++++++ repos/storage/pool_list_active.py | 50 +++++++++++++++++++++++++ repos/storage/pool_lookup.py | 74 +++++++++++++++++++++++++++++++++++++ repos/storage/vol_lookup.py | 62 +++++++++++++++++++++++++++++++ 4 files changed, 200 insertions(+), 0 deletions(-) create mode 100644 repos/storage/pool_list_active.py create mode 100644 repos/storage/pool_lookup.py create mode 100644 repos/storage/vol_lookup.py diff --git a/cases/storage_dir.conf b/cases/storage_dir.conf index 38b349d..2bdb7d6 100644 --- a/cases/storage_dir.conf +++ b/cases/storage_dir.conf @@ -2,14 +2,22 @@ storage:define_dir_pool poolname $defaultpoolname +storage:pool_lookup + poolname + $defaultpoolname + storage:build_dir_pool poolname $defaultpoolname +storage:pool_list_active + storage:activate_pool poolname $defaultpoolname +storage:pool_list_active + storage:create_dir_volume poolname $defaultpoolname @@ -20,6 +28,12 @@ storage:create_dir_volume capacity $defaultvolumesize +storage:vol_lookup + poolname + $defaultpoolname + volname + $defaultvolumename + storage:vol_clone poolname $defaultpoolname diff --git a/repos/storage/pool_list_active.py b/repos/storage/pool_list_active.py new file mode 100644 index 0000000..3e390c8 --- /dev/null +++ b/repos/storage/pool_list_active.py @@ -0,0 +1,50 @@ +#!/usr/bin/env python +# list active storage pool testing with flag: +# libvirt.VIR_CONNECT_LIST_STORAGE_POOLS_ACTIVE + +import libvirt +from libvirt import libvirtError + +from src import sharedmod + +required_params = () +optional_params = { + } + +def pool_list_active(params): + """list active storage pool testing""" + + global logger + logger = params['logger'] + namelist = [] + + conn = sharedmod.libvirtobj['conn'] + try: + pool_num = conn.numOfStoragePools() + logger.info("number of active storage pools is %s" % pool_num) + + flag = libvirt.VIR_CONNECT_LIST_STORAGE_POOLS_ACTIVE + poolobj_list = conn.listAllStoragePools(flag) + if not len(poolobj_list) == pool_num: + logger.error("active pool object number mismatched") + return 1 + + for i in poolobj_list: + pool_name = i.name() + namelist.append(pool_name) + + logger.info("active pool name list is %s" % namelist) + + active_namelist = conn.listStoragePools() + if namelist == active_namelist: + logger.info("active pool name list matched") + else: + logger.error("active pool name list mismatched") + return 1 + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + logger.info("list active storage pool succeed") + return 0 diff --git a/repos/storage/pool_lookup.py b/repos/storage/pool_lookup.py new file mode 100644 index 0000000..89d7252 --- /dev/null +++ b/repos/storage/pool_lookup.py @@ -0,0 +1,74 @@ +#!/usr/bin/env python +# storage pool lookup testing + +import libvirt +from libvirt import libvirtError + +from src import sharedmod + +required_params = ('poolname',) +optional_params = { + 'volname': None + } + +def pool_lookup(params): + """storage pool lookup testing""" + + global logger + logger = params['logger'] + poolname = params['poolname'] + volname = params.get('volname') + retval = 0 + + logger.info("the poolname is %s" % poolname) + if volname: + logger.info("the given volume name is %s" % volname) + + conn = sharedmod.libvirtobj['conn'] + try: + logger.info("lookup the pool object by name: %s" % poolname) + poolobj = conn.storagePoolLookupByName(poolname) + if poolobj.name() == poolname: + logger.info("pool object lookup by name succeed") + else: + logger.error("pool object lookup by name failed") + retval += 1 + + uuid = poolobj.UUID() + logger.info("lookup the pool object by UUID: %s" % uuid) + poolobj_uuid = conn.storagePoolLookupByUUID(uuid) + if poolobj_uuid.name() == poolname: + logger.info("pool object lookup by UUID succeed") + else: + logger.error("pool object lookup by UUID failed") + retval += 1 + + uuidstr = poolobj.UUIDString() + logger.info("lookup the pool object by UUID string: %s" % uuidstr) + poolobj_uuidstr = conn.storagePoolLookupByUUIDString(uuidstr) + if poolobj_uuidstr.name() == poolname: + logger.info("pool object lookup by UUID string succeed") + else: + logger.error("pool object lookup by UUID string failed") + retval += 1 + + if volname: + logger.info("lookup volume object by volume name: %s" % volname) + volobj = poolobj.storageVolLookupByName(volname) + logger.info("lookup the pool object by volume object") + poolobj_vol = volobj.storagePoolLookupByVolume() + + if poolobj_vol.name() == poolname: + logger.info("pool object lookup by UUID string succeed") + else: + logger.error("pool object lookup by UUID string failed") + retval += 1 + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + if retval: + return 1 + + return 0 diff --git a/repos/storage/vol_lookup.py b/repos/storage/vol_lookup.py new file mode 100644 index 0000000..30238e1 --- /dev/null +++ b/repos/storage/vol_lookup.py @@ -0,0 +1,62 @@ +#!/usr/bin/env python +# storage pool volume lookup testing + +import libvirt +from libvirt import libvirtError + +from src import sharedmod + +required_params = ('poolname', 'volname',) +optional_params = { + } + +def vol_lookup(params): + """storage pool volume lookup testing""" + + global logger + logger = params['logger'] + poolname = params['poolname'] + volname = params['volname'] + retval = 0 + + logger.info("the poolname is %s" % poolname) + logger.info("the given volume name is %s" % volname) + + conn = sharedmod.libvirtobj['conn'] + try: + poolobj = conn.storagePoolLookupByName(poolname) + + logger.info("lookup the volume object by name: %s" % volname) + volobj = poolobj.storageVolLookupByName(volname) + if volobj.name() == volname: + logger.info("volume object lookup by name succeed") + else: + logger.error("volume object lookup by name failed") + retval += 1 + + volkey = volobj.key() + logger.info("lookup the volume object by key: %s" % volkey) + volobj_key = conn.storageVolLookupByKey(volkey) + if volobj_key.name() == volname: + logger.info("volume object lookup by key succeed") + else: + logger.error("volume object lookup by key failed") + retval += 1 + + volpath = volobj.path() + logger.info("lookup the volume object by path: %s" % volpath) + volobj_path = conn.storageVolLookupByPath(volpath) + if volobj_path.name() == volname: + logger.info("volume object lookup by path succeed") + else: + logger.error("volume object lookup by path failed") + retval += 1 + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + if retval: + return 1 + + return 0 -- 1.7.1

1 0

[libvirt] [PATCH v2 0/5]use VIR_ENUM_DECL for domain NIC model and add usb-net
by Guannan Ren 17 Jan '13

17 Jan '13

v1 to v2 *removed i8* NIC models support for QEMU/KVM *updated docs This patchset uses VIR_ENUM_DECL and VIR_ENUM_IMPL macros for NIC models and changes the related codes to use them. All of NIC models supported by various hypervisors comprise the enum, so the problem is that we need to do further checking in hypervisor-specific implementation. Fortunately, VMX and Vbox did this checking very well already. In 4/5, a similar job is performed for QEMU/KVM. And, adds usb-net support. The vendorId and productID of is 0525:a4a2. The corresponding item in usb-ids is as follows: 0525 Netchip Technology, Inc. a4a2 Linux-USB Ethernet/RNDIS Gadget In my opinion, using usb-net directly is good enough, so I keep it. Any idea is welcome. Libvirt XML sample: <devices> <interface type='user'> <mac address='52:54:00:32:6a:91'/> <model type='usb-net'/> <alias name='net1'/> <address type='usb' bus='0' port='1'/> </interface> </devices> qemu commandline: qemu ${other_vm_args} -netdev user,id=hostnet1 \ -device usb-net,netdev=hostnet1,id=net1,\ mac=52:54:00:32:6a:91,bus=usb.0,port=1 Guannan Ren(2) [PATCH v2 1/5] conf: fix mismatch on two domain VIR_ENUM_IMPL macro [PATCH v2 2/5] add domain NIC model enum macro [PATCH v2 3/5] net: use virDomainNICModelType{From|To}String functions [PATCH v2 4/5] qemu: add NIC model checking for qemu hypervisor [PATCH v2 5/5] qemu: add usb-net support docs/formatdomain.html.in | 29 +++++++++++------------------ src/conf/domain_conf.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------- src/conf/domain_conf.h | 32 +++++++++++++++++++++++++++++++- src/libvirt_private.syms | 2 ++ src/libxl/libxl_conf.c | 5 +++-- src/parallels/parallels_driver.c | 2 +- src/qemu/qemu_command.c | 41 +++++++++++++++++++++++++++-------------- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_hotplug.c | 10 ++++++---- src/qemu/qemu_process.c | 14 +++++++------- src/vbox/vbox_tmpl.c | 57 +++++++++++++++++++++++++++------------------------------ src/vmx/vmx.c | 31 ++++++++++++++++--------------- src/xenxs/xen_sxpr.c | 23 ++++++++++++----------- src/xenxs/xen_xm.c | 21 +++++++++++---------- 14 files changed, 215 insertions(+), 142 deletions(-)

1 5

[libvirt] Entering freeze for 1.0.2 in a week
by Daniel Veillard 17 Jan '13

17 Jan '13

Just for people to remember, the plan is to enter the freeze for 1.0.2 in a week, on the 24. So if you need to push APIs or large changes, please do so before that deadline :-) Then the release should show up at the end of the month, thanks ! Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH 0/5] use VIR_ENUM_DECL for domain NIC model and add usb-net
by Guannan Ren 17 Jan '13

17 Jan '13

This patchset uses VIR_ENUM_DECL and VIR_ENUM_IMPL macros for NIC models and changes the related codes to use them. All of NIC models supported by various hypervisors comprise the enum, so the problem is that we need to do further checking in hypervisor-specific implementation. Fortunately, VMX and Vbox did this checking very well already. In 4/5, a similar job is performed for QEMU/KVM. And, adds usb-net support. The vendorId and productID of is 0525:a4a2. The corresponding item in usb-ids is as follows: 0525 Netchip Technology, Inc. a4a2 Linux-USB Ethernet/RNDIS Gadget In my opinion, using usb-net directly is good enough, so I keep it. Any idea is welcome. Libvirt XML sample: <devices> <interface type='user'> <mac address='52:54:00:32:6a:91'/> <model type='usb-net'/> <alias name='net1'/> <address type='usb' bus='0' port='1'/> </interface> </devices> qemu commandline: qemu ${other_vm_args} -netdev user,id=hostnet1 \ -device usb-net,netdev=hostnet1,id=net1,\ mac=52:54:00:32:6a:91,bus=usb.0,port=1 Guannan Ren(5) [PATCH 1/5] conf: fix mismatch on two domain VIR_ENUM_IMPL macro [PATCH 2/5] conf: add domain NIC model enum macro [PATCH 3/5] net: use virDomainNICModelType{From|To}String functions [PATCH 4/5] qemu: add NIC model checking for qemu hypervisor [PATCH 5/5] qemu: add usb-net support docs/formatdomain.html.in | 8 +++++++- src/conf/domain_conf.c | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------- src/conf/domain_conf.h | 45 ++++++++++++++++++++++++++++++++++++++++++++- src/libvirt_private.syms | 2 ++ src/libxl/libxl_conf.c | 5 +++-- src/parallels/parallels_driver.c | 2 +- src/qemu/qemu_command.c | 41 +++++++++++++++++++++++++++-------------- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_hotplug.c | 10 ++++++---- src/qemu/qemu_process.c | 14 +++++++------- src/vbox/vbox_tmpl.c | 57 +++++++++++++++++++++++++++------------------------------ src/vmx/vmx.c | 31 ++++++++++++++++--------------- src/xenxs/xen_sxpr.c | 23 ++++++++++++----------- src/xenxs/xen_xm.c | 21 +++++++++++---------- 14 files changed, 237 insertions(+), 125 deletions(-)

3 12

Re: [libvirt] Redefinition of struct in6_addr in <netinet/in.h> and <linux/in6.h>
by David Miller 17 Jan '13

17 Jan '13

From: Mike Frysinger <vapier(a)gentoo.org> Date: Wed, 16 Jan 2013 12:28:39 -0500 > if you're not calling the kernel directly, why are you including the kernel > headers ? what is the problem people are actually trying to address here (and > no, "i want to include both headers" is not the answer) ? When GLIBC doesn't provide it's own definition of some networking macros or interfaces that the kernel provides, people include the kernel header. This has been done for decades, wake up.

3 3

Re: [libvirt] Redefinition of struct in6_addr in <netinet/in.h> and <linux/in6.h>
by Cong Wang 17 Jan '13

17 Jan '13

On Wed, 2013-01-16 at 14:22 -0500, Mike Frysinger wrote: > > but this is still too vague. what headers/definitions do people want to see > simultaneously included ? changes would be needed on both sides (kernel & C > library). > Hi, Mike, Please take a look at my first email in this thread. The user application includes <linux/if_bridge.h> and <netinet/in.h>. <linux/if_bridge.h> uses struct_in6 but doesn't include <linux/in6.h> (this is my bad, sorry), an obvious fix is just including <linux/in6.h>. But this immediately breaks applications which include <linux/if_bridge.h> and <netinet/in.h>, just as what Thomas reported. And if_bridge.h is kernel-specific, there is no corresponding glibc one, so you can't blame applications which include both of them. Thanks.

1 0

[libvirt] [PATCH 0/5] libxl: Trivial fixes and style improvements
by Jim Fehlig 17 Jan '13

17 Jan '13

This patchset contains some trivial bug fixes and style improvements for the libxl driver that were noticed while investigating races between the driver and libxl. Jim Fehlig (5): libxl: Use consistent style for function definitions libxl: Use consistent parameter naming scheme libxl: Don't free domain death event libxl: Check for libxl_ctx_alloc failure libxl: Fix cleanup on domain start error src/libxl/libxl_driver.c | 106 ++++++++++++++++++++++++++--------------------- 1 file changed, 58 insertions(+), 48 deletions(-) -- 1.8.0.1

2 13

[libvirt] iptables --physdev-out warnings
by Reinier Schoof 17 Jan '13

17 Jan '13

Hi, we've experienced some issues with starting lots of KVM based VM's with libvirt. Since I couldn't find any clues on the libvirt mailing list, I'm posting the way I fixed the issues. When starting a VM, /var/log/messages was spammed with the following message: xt_physdev: using --physdev-out in the OUTPUT, FORWARD and POSTROUTING chains for non-bridged traffic is not supported anymore. With each extra VM I start, the messages get amplified exponentially. This results in longer starting times every new VM, relative the the previously started VM. When I ran a test with starting 100 equal VM's, the first VM started in about 2 seconds, the 100th VM took 48 seconds to start. I'm running a vanilla 3.7.1 kernel, but I have the same issue on VM hosts with kernel 3.2.28 or 3.2.0, running libvirt 0.9.12 and 0.9.8 respectively. Looking into the warning, it seemed that iptables need an extra argument, --physdev-is-bridged, in commands like: iptables -A libvirt-out -m physdev --physdev-is-bridged --physdev-out vnet99 -g FP-vnet99 I patched the libvirt source (version 1.0.0) to test whether this works or not: --- src/nwfilter/nwfilter_ebiptables_driver.c.orig 2013-01-16 10:51:43.000000000 +0100 +++ src/nwfilter/nwfilter_ebiptables_driver.c 2013-01-16 10:52:07.000000000 +0100 @@ -166,7 +166,7 @@ snprintf(buf, sizeof(buf), "%c%c-%s", prefix[0], prefix[1], ifname) #define PHYSDEV_IN "--physdev-in" -#define PHYSDEV_OUT "--physdev-out" +#define PHYSDEV_OUT "--physdev-is-bridged --physdev-out" static const char *m_state_out_str = "-m state --state NEW,ESTABLISHED"; static const char *m_state_in_str = "-m state --state ESTABLISHED"; The warnings in /var/log/messages are gone and running the test again proved the 100th VM started in 3.8 seconds. It suprises me I'm the first to mention this problem on the libvirt mailing list and I wondering if I'm doing something wrong. Until then, this fix helps me a lot! Reinier Schoof -- TransIP BV | https://www.transip.nl/

2 1

[libvirt] [PATCH] Fix typo in variable name
by Guido Günther 16 Jan '13

16 Jan '13

Hi, I pushed that under the build breaker rule: that broke the build like: CC libvirt_conf_la-domain_conf.lo conf/domain_conf.c: In function 'virDomainVcpuPinAdd': conf/domain_conf.c:11920:29: error: 'vpcupin' undeclared (first use in this function) conf/domain_conf.c:11920:29: note: each undeclared identifier is reported only once for each function it appears in make[3]: *** [libvirt_conf_la-domain_conf.lo] Error 1 --- src/conf/domain_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 88865b5..13c14e9 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -11917,7 +11917,7 @@ int virDomainVcpuPinAdd(virDomainVcpuPinDefPtr **vcpupin_list, no_memory: virReportOOMError(); - virDomainVcpuPinDefFree(vpcupin); + virDomainVcpuPinDefFree(vcpupin); return -1; } -- 1.7.10.4

1 0

Re: [libvirt] Redefinition of struct in6_addr in <netinet/in.h> and <linux/in6.h>
by David Miller 16 Jan '13

16 Jan '13

From: Mike Frysinger <vapier(a)gentoo.org> Date: Wed, 16 Jan 2013 14:22:16 -0500 > On Wednesday 16 January 2013 13:59:59 David Miller wrote: >> This has been done for decades, wake up. > > and it's been broken for just as long. no need to be a dick. By being ignorant and having such a simplistic view of the situation, you're the one who's actually the dick.

1 0

[libvirt] [PATCH 0/2] add qemu machine type q35 support
by liguang 16 Jan '13

16 Jan '13

qemu-1.3 added machine type q35, changelog said: Added Intel Q35 chipset as a new machine type, '--machine q35'. Adds PCIe support. Requires an updated SeaBIOS (bios.bin), and '-acpitable file=/seabios-path/q35-acpi-dsdt.aml' to run. so add q35 support for libvirt. src/conf/device_conf.c | 8 +++++++- src/conf/device_conf.h | 1 + src/conf/domain_conf.c | 1 + src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 11 +++++++++++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 8 +++- 7 files changed, 29 insertions(+), 2 deletions(-)

7 12

[libvirt] [PATCH] safe{read,write}: Don't lie on nonblocking FD
by Michal Privoznik 16 Jan '13

16 Jan '13

Currently, whenever somebody calls saferead() on nonblocking FD (safewrite() is totally interchangeable for purpose of this message) he might get wrong return value. For instance, in the first iteration some data is read. The number of bytes read is stored into local variable 'nread'. However, in next iterations we can get -1 from read() with errno == EAGAIN, in which case the -1 is returned despite fact some data has already been read. So the caller gets confused. Moreover, the comment just above the functions says, they act like regular read() with nicer handling of EINTR. Well, they don't now. --- src/util/virutil.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/util/virutil.c b/src/util/virutil.c index b36e9d3..cd19971 100644 --- a/src/util/virutil.c +++ b/src/util/virutil.c @@ -105,6 +105,8 @@ saferead(int fd, void *buf, size_t count) size_t nread = 0; while (count > 0) { ssize_t r = read(fd, buf, count); + if (r < 0 && nread && errno == EAGAIN) + return nread; if (r < 0 && errno == EINTR) continue; if (r < 0) @@ -125,7 +127,8 @@ safewrite(int fd, const void *buf, size_t count) size_t nwritten = 0; while (count > 0) { ssize_t r = write(fd, buf, count); - + if (r < 0 && nwritten && errno == EAGAIN) + return nwritten; if (r < 0 && errno == EINTR) continue; if (r < 0) -- 1.8.0.2

2 4

[libvirt] [PATCH] conf: fix class_id bitmap leak in virNetworkObj
by Ján Tomko 16 Jan '13

16 Jan '13

Commit '07d1b6b' added class_id bitmap to virNetworkObj but never freed it. --- src/conf/network_conf.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 48639a9..9c35ea8 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -235,6 +235,7 @@ void virNetworkObjFree(virNetworkObjPtr net) virNetworkDefFree(net->def); virNetworkDefFree(net->newDef); + virBitmapFree(net->class_id); virMutexDestroy(&net->lock); -- 1.7.8.6

3 5

Re: [libvirt] Redefinition of struct in6_addr in <netinet/in.h> and <linux/in6.h>
by Ben Hutchings 16 Jan '13

16 Jan '13

On Wed, 2013-01-16 at 12:04 -0500, Mike Frysinger wrote: > On Wednesday 16 January 2013 10:47:12 Ben Hutchings wrote: > > On Wed, 2013-01-16 at 23:21 +0900, YOSHIFUJI Hideaki wrote: > > > Cong Wang wrote: > > > > (Cc'ing some glibc developers...) > > > > > > > > Hello, > > > > > > > > In glibc source file inet/netinet/in.h and kernel source file > > > > include/uapi/linux/in6.h, both define struct in6_addr, and both are > > > > visible to user applications. Thomas reported a conflict below. > > > > > > > > So, how can we handle this? /me is wondering why we didn't see this > > > > before. > > > > [...] > > > > > This is not a new issue. In addition to this, > > > netinet/in.h also conflits with linux/in.h. > > > > > > We might have > > > > > > #if !defined(__GLIBC__) || !defined(_NETINET_IN_H) > > > > > > #endif > > > > > > around those conflicting definitions in uapi/linux/in{,6}.h. > > > > This only solves half the problem, as <netinet/in.h> might be included > > after <linux/in.h>. Also, not all Linux userland uses glibc. > > certainly true, but the current expectation is that you don't mix your ABIs. Whose expectation? Which ABIs are being mixed? > if you're programming with the C library API, then use the C library headers. > if you're banging directly on the kernel, then use the kernel headers. not > saying it's a perfect solution, but it works for the vast majority of use > cases. In practice most C programs for Linux will use a mixture of thinly wrapped system calls and higher-level APIs from the C library, and never really call the kernel directly (as that requires inline assembler). Userland programmers will work around this historical mess by tweaking the #include order or splitting source files. But they shouldn't have to. Ben. -- Ben Hutchings, Staff Engineer, Solarflare Not speaking for my employer; that's the marketing department's job. They asked us to note that Solarflare product names are trademarked.

1 0

[libvirt] [PATCH] qemu: fix QEMU_CAPS_NO_ACPI detection
by Ján Tomko 16 Jan '13

16 Jan '13

In commit c4bbaaf8, caps->arch was checked uninitialized, rendering the whole check useless. This patch moves the conditional setting of QEMU_CAPS_NO_ACPI to qemuCapsInitQMP, and removes the no longer needed exception for S390. It also clears the flag for all non-x86 archs instead of just S390 in qemuCapsInitHelp. --- src/qemu/qemu_capabilities.c | 29 ++++++++--------------------- 1 files changed, 8 insertions(+), 21 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 167cdb2..e0d0c2a 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2175,13 +2175,11 @@ qemuCapsInitHelp(qemuCapsPtr caps, uid_t runUid, gid_t runGid) if (caps->arch == VIR_ARCH_X86_64 || caps->arch == VIR_ARCH_I686) { qemuCapsSet(caps, QEMU_CAPS_PCI_MULTIBUS); - } - - /* S390 and probably other archs do not support no-acpi - - maybe the qemu option parsing should be re-thought. */ - if (caps->arch == VIR_ARCH_S390 || - caps->arch == VIR_ARCH_S390X) + } else { + /* -no-acpi is not supported on other archs + * even if qemu reports it in -help */ qemuCapsClear(caps, QEMU_CAPS_NO_ACPI); + } /* qemuCapsExtractDeviceStr will only set additional caps if qemu * understands the 0.13.0+ notion of "-device driver,". */ @@ -2260,13 +2258,6 @@ qemuCapsInitQMPBasic(qemuCapsPtr caps) qemuCapsSet(caps, QEMU_CAPS_DRIVE_CACHE_DIRECTSYNC); qemuCapsSet(caps, QEMU_CAPS_NO_SHUTDOWN); qemuCapsSet(caps, QEMU_CAPS_DRIVE_CACHE_UNSAFE); - - /* ACPI is only supported on x86, PPC or - * other platforms don't support it*/ - if (caps->arch == VIR_ARCH_I686 || - caps->arch == VIR_ARCH_X86_64) - qemuCapsSet(caps, QEMU_CAPS_NO_ACPI); - qemuCapsSet(caps, QEMU_CAPS_FSDEV_READONLY); qemuCapsSet(caps, QEMU_CAPS_VIRTIO_BLK_SG_IO); qemuCapsSet(caps, QEMU_CAPS_DRIVE_COPY_ON_READ); @@ -2402,16 +2393,12 @@ qemuCapsInitQMP(qemuCapsPtr caps, } VIR_FREE(archstr); - /* Currently only x86_64 and i686 support PCI-multibus. */ + /* Currently only x86_64 and i686 support PCI-multibus and -no-acpi. */ if (caps->arch == VIR_ARCH_X86_64 || - caps->arch == VIR_ARCH_I686) + caps->arch == VIR_ARCH_I686) { qemuCapsSet(caps, QEMU_CAPS_PCI_MULTIBUS); - - /* S390 and probably other archs do not support no-acpi - - maybe the qemu option parsing should be re-thought. */ - if (caps->arch == VIR_ARCH_S390 || - caps->arch == VIR_ARCH_S390X) - qemuCapsClear(caps, QEMU_CAPS_NO_ACPI); + qemuCapsSet(caps, QEMU_CAPS_NO_ACPI); + } if (qemuCapsProbeQMPCommands(caps, mon) < 0) goto cleanup; -- 1.7.8.6

4 11

[libvirt] [PATCH 00/14] Resolve some RESOURCE_LEAK errors found by Coverity
by John Ferlan 16 Jan '13

16 Jan '13

This patch addresses some "Error: RESOURCE_LEAK (CWE-404)" errors found by Coverity. There are 100+ remaining; however, many seem to be false positives which will be addressed in a separate patch. The esx_driver.c and hyperv_driver.c changes could be tagged as false positives; however, the changes made will avoid the Coverity error since the freeing of the resource marked isn't based soley on the result. The phyp_driver.c changes in openSSHSession() and its callers were the most involved since the code with now use connection_data->sock in order to track the socket so as to allow it to be closed once done with it. Of interest in this change is that phypExec() used connection_data->sock even though it had never been initialized. John Ferlan (14): phyp: Resolve some file descriptor leaks esx: Address resource leak found by Coverity storage: Resolve resource leak using 'vol' buffer util: Resolve resource leak for 'res' in virSetInherit error path. locking: Resolve resource leak with 'dir' on non error path rpc: Avoid resource leak of 'socks' if any object append fails uml: Avoid resource leak of event in umlInofityEvent test: Resource resource leak with 'tmp_vols' storage: Resource resource leak using 'tmp_vols' interface: Resolve resource leak wth 'tmp_iface_objs' xen: Resource resource leak with 'cpuset' parallels: Resolve some resource leaks storage: Need to also VIR_FREE(reg) hyperv: Address resource leak found by Coverityo src/esx/esx_driver.c | 8 ++++---- src/hyperv/hyperv_driver.c | 10 +++++----- src/interface/interface_backend_netcf.c | 1 + src/locking/lock_driver_sanlock.c | 1 + src/parallels/parallels_driver.c | 30 +++++++++++++++++++----------- src/phyp/phyp_driver.c | 19 ++++++++++++++----- src/rpc/virnetserverservice.c | 6 +++--- src/storage/storage_backend_logical.c | 1 + src/storage/storage_backend_rbd.c | 13 ++++++++++--- src/storage/storage_driver.c | 1 + src/test/test_driver.c | 1 + src/uml/uml_driver.c | 6 ++++-- src/util/virlockspace.c | 1 + src/xen/xend_internal.c | 12 ++++++------ 14 files changed, 71 insertions(+), 39 deletions(-) -- 1.7.11.7

6 47

[libvirt] [PATCH] Add RESUME event listener to qemu monitor.
by Andres Lagar-Cavilla 16 Jan '13

16 Jan '13

Perform all the appropriate plumbing. When qemu/KVM VMs are paused manually through a monitor not-owned by libvirt, libvirt will think of them as "paused" event after they are resumed and effectively running. With this patch the discrepancy goes away. This is meant to address bug 892791. Signed-off-by: Andres Lagar-Cavilla <andres(a)lagarcavilla.org> --- src/qemu/qemu_monitor.c | 10 ++++++++ src/qemu/qemu_monitor.h | 3 +++ src/qemu/qemu_monitor_json.c | 7 ++++++ src/qemu/qemu_process.c | 56 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 76 insertions(+) diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 99642b6..cb5a3e2 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -1022,6 +1022,16 @@ int qemuMonitorEmitStop(qemuMonitorPtr mon) } +int qemuMonitorEmitResume(qemuMonitorPtr mon) +{ + int ret = -1; + VIR_DEBUG("mon=%p", mon); + + QEMU_MONITOR_CALLBACK(mon, ret, domainResume, mon->vm); + return ret; +} + + int qemuMonitorEmitRTCChange(qemuMonitorPtr mon, long long offset) { int ret = -1; diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index d7faa90..00ce813 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -97,6 +97,8 @@ struct _qemuMonitorCallbacks { virDomainObjPtr vm); int (*domainStop)(qemuMonitorPtr mon, virDomainObjPtr vm); + int (*domainResume)(qemuMonitorPtr mon, + virDomainObjPtr vm); int (*domainRTCChange)(qemuMonitorPtr mon, virDomainObjPtr vm, long long offset); @@ -187,6 +189,7 @@ int qemuMonitorEmitShutdown(qemuMonitorPtr mon); int qemuMonitorEmitReset(qemuMonitorPtr mon); int qemuMonitorEmitPowerdown(qemuMonitorPtr mon); int qemuMonitorEmitStop(qemuMonitorPtr mon); +int qemuMonitorEmitResume(qemuMonitorPtr mon); int qemuMonitorEmitRTCChange(qemuMonitorPtr mon, long long offset); int qemuMonitorEmitWatchdog(qemuMonitorPtr mon, int action); int qemuMonitorEmitIOError(qemuMonitorPtr mon, diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 2d2d254..de5f115 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -55,6 +55,7 @@ static void qemuMonitorJSONHandleShutdown(qemuMonitorPtr mon, virJSONValuePtr da static void qemuMonitorJSONHandleReset(qemuMonitorPtr mon, virJSONValuePtr data); static void qemuMonitorJSONHandlePowerdown(qemuMonitorPtr mon, virJSONValuePtr data); static void qemuMonitorJSONHandleStop(qemuMonitorPtr mon, virJSONValuePtr data); +static void qemuMonitorJSONHandleResume(qemuMonitorPtr mon, virJSONValuePtr data); static void qemuMonitorJSONHandleRTCChange(qemuMonitorPtr mon, virJSONValuePtr data); static void qemuMonitorJSONHandleWatchdog(qemuMonitorPtr mon, virJSONValuePtr data); static void qemuMonitorJSONHandleIOError(qemuMonitorPtr mon, virJSONValuePtr data); @@ -87,6 +88,7 @@ static qemuEventHandler eventHandlers[] = { { "DEVICE_TRAY_MOVED", qemuMonitorJSONHandleTrayChange, }, { "POWERDOWN", qemuMonitorJSONHandlePowerdown, }, { "RESET", qemuMonitorJSONHandleReset, }, + { "RESUME", qemuMonitorJSONHandleResume, }, { "RTC_CHANGE", qemuMonitorJSONHandleRTCChange, }, { "SHUTDOWN", qemuMonitorJSONHandleShutdown, }, { "SPICE_CONNECTED", qemuMonitorJSONHandleSPICEConnect, }, @@ -589,6 +591,11 @@ static void qemuMonitorJSONHandleStop(qemuMonitorPtr mon, virJSONValuePtr data A qemuMonitorEmitStop(mon); } +static void qemuMonitorJSONHandleResume(qemuMonitorPtr mon, virJSONValuePtr data ATTRIBUTE_UNUSED) +{ + qemuMonitorEmitResume(mon); +} + static void qemuMonitorJSONHandleRTCChange(qemuMonitorPtr mon, virJSONValuePtr data) { long long offset = 0; diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index f5fc1b3..938c17e 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -736,6 +736,61 @@ unlock: static int +qemuProcessHandleResume(qemuMonitorPtr mon ATTRIBUTE_UNUSED, + virDomainObjPtr vm) +{ + virQEMUDriverPtr driver = qemu_driver; + virDomainEventPtr event = NULL; + + virDomainObjLock(vm); + if (virDomainObjGetState(vm, NULL) == VIR_DOMAIN_PAUSED) { + qemuDomainObjPrivatePtr priv = vm->privateData; + + if (priv->gotShutdown) { + VIR_DEBUG("Ignoring RESUME event after SHUTDOWN"); + goto unlock; + } + + VIR_DEBUG("Transitioned guest %s out of paused into resumed state", + vm->def->name); + + virDomainObjSetState(vm, VIR_DOMAIN_RUNNING, + VIR_DOMAIN_RUNNING_UNPAUSED); + event = virDomainEventNewFromObj(vm, + VIR_DOMAIN_EVENT_RESUMED, + VIR_DOMAIN_EVENT_RESUMED_UNPAUSED); + + VIR_DEBUG("Using lock state '%s' on resume event", NULLSTR(priv->lockState)); + if (virDomainLockProcessResume(driver->lockManager, driver->uri, + vm, priv->lockState) < 0) { + /* Don't free priv->lockState on error, because we need + * to make sure we have state still present if the user + * tries to resume again + */ + goto unlock; + } + VIR_FREE(priv->lockState); + + if (virDomainSaveStatus(driver->caps, driver->stateDir, vm) < 0) { + VIR_WARN("Unable to save status on vm %s after state change", + vm->def->name); + } + } + +unlock: + virDomainObjUnlock(vm); + + if (event) { + qemuDriverLock(driver); + qemuDomainEventQueue(driver, event); + qemuDriverUnlock(driver); + } + + return 0; +} + + +static int qemuProcessHandleRTCChange(qemuMonitorPtr mon ATTRIBUTE_UNUSED, virDomainObjPtr vm, long long offset) @@ -1250,6 +1305,7 @@ static qemuMonitorCallbacks monitorCallbacks = { .diskSecretLookup = qemuProcessFindVolumeQcowPassphrase, .domainShutdown = qemuProcessHandleShutdown, .domainStop = qemuProcessHandleStop, + .domainResume = qemuProcessHandleResume, .domainReset = qemuProcessHandleReset, .domainRTCChange = qemuProcessHandleRTCChange, .domainWatchdog = qemuProcessHandleWatchdog, -- 1.7.9.5

6 9

[libvirt] [PATCH 00/13] More refactoring of QEMU driver objects & locking
by Daniel P. Berrange 16 Jan '13

16 Jan '13

This series does more general refactoring to help in the goal of killing the big QEMU driver lock. There are 3 key changes in this series - Isolating all QEMU configuration parameters in one struct. - Making virDomainObjList self-locking - Add dedicated locking to PCI/USB device lists There are all the really hard bits of the QEMU locking. As can be seen from the last patch there is still more work to be done before the QEMU driver lock can be said to be truely dead, but this is less critical.

1 14

[libvirt] Libvirt daemon not getting started
by Varun Bhatnagar 16 Jan '13

16 Jan '13

Hi, Earlier I was having libvirt-0.7.5 but now I have installed 0.9.8 version of libvirt now. I am trying to start libvirt daemon using the command below but daemon it is not getting started and the PID file is not getting created. Tried /usr/loval/sbin/libvirtd -d option too. In that case I am not getting any error but PID file is not getting created in this case too. /usr/local/sbin/libvirtd 2013-01-16 16:43:53.399+0000: 4070: info : libvirt version: 0.9.8 2013-01-16 16:43:53.399+0000: 4070: error : virCommandWait:2192 : internal error Child process (/usr/sbin/iptables --table mangle --delete POSTROUTING --out-interface virbr0 --protocol udp --destination-port 68 --jump CHECKSUM --checksum-fill) status unexpected: exit status 2 2013-01-16 16:43:53.406+0000: 4070: error : virCommandWait:2192 : internal error Child process (/usr/sbin/iptables --table mangle --insert POSTROUTING --out-interface virbr0 --protocol udp --destination-port 68 --jump CHECKSUM --checksum-fill) status unexpected: exit status 2 2013-01-16 16:43:53.406+0000: 4070: warning : networkAddGeneralIptablesRules:1259 : Could not add rule to fixup DHCP response checksums on network 'default'. 2013-01-16 16:43:53.406+0000: 4070: warning : networkAddGeneralIptablesRules:1260 : May need to update iptables package & kernel to support CHECKSUM rule. 2013-01-16 16:43:54.704+0000: 4070: error : umlStartup:471 : cannot initialize inotify 2013-01-16 16:43:54.704+0000: 4070: error : virStateInitialize:854 : Initialization of UML state driver failed 2013-01-16 16:43:54.704+0000: 4070: error : daemonRunStateInit:1157 : Driver state initialization failed and I am also trying to connect to VMPlayer with the following URL but it is giving the following error message: virsh # connect vmplayer:///session error: Failed to connect to the hypervisor error: Failed to connect socket to '/usr/local/var/run/libvirt/libvirt-sock': No such file or directory Is this because of the daemon, as it is not getting started or because of some other reason? Can anybody suggest any solution for this. I am stuck from past few days and not able to find solution. Any help will be appreciated. Thanks in advance. Regards, Varun =====-----=====-----===== Notice: The information contained in this e-mail message and/or attachments to it may contain confidential or privileged information. If you are not the intended recipient, any dissemination, use, review, distribution, printing or copying of the information contained in this e-mail message and/or attachments to it are strictly prohibited. If you have received this communication in error, please notify us by reply e-mail or telephone and immediately and permanently delete the message and any attachments. Thank you

1 0

[libvirt] [PATCH 0/7] Share the VNC port allocation tracking code
by Daniel P. Berrange 16 Jan '13

16 Jan '13

Both QEMU and libxl have the same code for tracking auto-allocated VNC ports. Move this code out into src/util/virportallocator.[c,h]. While doing this turn it into a virObjectLockable so that it becomes a ref-counted object with self-contained locking. This means it no longer needs to be protected by the QEMU/libxl global driver locks. As part of this series the virObject APIs are enhanced to allow arbitrarily deep inheritance (instead of fixed 1 level), and a new virObjectLockable base class is introduced which extends virObject to provide a mutex. This is a very common need so many existing classes are updated to use it.

2 19

[libvirt] [PATCH v2 0/4] Resolved CHECKED_RETURN errors found by Coverity
by John Ferlan 16 Jan '13

16 Jan '13

Rather then further muddy the waters of the previous patch series, this is a fresh patch series. I added one patch to this since the code was in the same general area as the virBufferTrim patch. Differences in v2 rpc: Updated the commit message to include why only putting out a VIR_WARN. The code did not change. The original patch: https://www.redhat.com/archives/libvir-list/2013-January/msg00103.html tools: Rework the patch to check the virBufferTrim() status return. Added virBufferError() status check after virBufferAddLit() to match the similar check after virBufferAddChar(). The original patch: https://www.redhat.com/archives/libvir-list/2013-January/msg00118.html xen: Resend of the v2 patch to keep in the same series: https://www.redhat.com/archives/libvir-list/2013-January/msg00473.html which was the replacement for: https://www.redhat.com/archives/libvir-list/2013-January/msg00114.html util: (new) The coverity error was NEGATIVE_RETURNS. The complaint being the potential to call memset() with a negative indent value. Since virBufferGetIndent() will check and fail on buf->error, I removed that check from virBufferAdd() and used the -1 return as the way to exit. John Ferlan (4): rpc: Check and message setsockopt() tools: Check return status on virBufferTrim() xen: Ignore return status for TCP_NODELAY util: Check for negative indent in virBufferAdd src/rpc/virnetsocket.c | 4 +++- src/util/virbuffer.c | 5 ++--- src/xen/xend_internal.c | 7 +++---- tools/virsh.c | 11 ++++++++--- 4 files changed, 16 insertions(+), 11 deletions(-) -- 1.7.11.7

2 8

[libvirt] [PATCH 0/6] add qemu usb-scsi controller support
by Guannan Ren 16 Jan '13

16 Jan '13

This patchset tries to add usb-scsi model for SCSI controller. http://lists.gnu.org/archive/html/qemu-devel/2012-06/msg03382.html "usb-uas is a pure UAS (usb attached scsi) emulation. The emulation works like any other scsi hba emulation (eps, lsi, virtio, megasas, ...). It provides just the HBA where you can attach scsi devices as you like using '-device'. A single scsi target with up to 256 luns is supported. For now only usb 2.0 transport is supported." libvirt XML snip <devices> <controller type='usb' index='2' model='ehci'> </controller> <controller type='scsi' index='0' model='usb-scsi'> <address type='usb' bus='2' port='1'/> </controller> </devices> qemu commandline: qemu ${other_vm_args} \ -device usb-ehci,id=usb2,bus=pci.0,addr=0x8 \ -device usb-uas,id=scsi0,bus=usb2.0,port=1 When a scsi disk is attached to usb-scsi controller, the target id must 0(usb-scsi only provide one scsi target). The unit value must in range of 0~255 for its lun number. As for the guest, the kernel with CONFIG_USB_UAS=y is necessary to have it show up scsi disk attached to UAS. Fedora has the kernel driver disabled by default though. (thanks to Gerd Hoffmann's suggestion) I grabbed linux-3.7.1 version from kernel website. It works after compiling. Guannan Ren(6) [PATCH 1/6] conf: declare usb spec and port number enum for usb [PATCH 2/6] conf: store usb spec and nports info when parsing usb [PATCH 3/6] qemu: add usb-uas caps flag [PATCH 4/6] qemu: add usb scsi controller support [PATCH 5/6] qemu: add usb-scsi controller checking when building [PATCH 6/6] test: add qemuxml2argv disk-scsi-uas testcase docs/formatdomain.html.in | 25 +++++- docs/schemas/domaincommon.rng | 1 + src/conf/domain_conf.c | 213 ++++++++++++++++++++++++++++++++++++++------ src/conf/domain_conf.h | 25 +++++- src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 41 +++++++-- src/vmx/vmx.c | 3 +- tests/qemuhelptest.c | 6 +- tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-uas.args | 10 +++ tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-uas.xml | 34 +++++++ tests/qemuxml2argvtest.c | 3 + 12 files changed, 326 insertions(+), 38 deletions(-)

3 10

[libvirt] libvirt boolean type
by Claudio Bley 16 Jan '13

16 Jan '13

Hi. The following patch's intend is to get a discussion started first. Rationale: Many functions in libvirt return "1 for <TRUE>, 0 for <FALSE> and -1 on <ERROR>". When calling a function you need to read the documentation, skipping to the "Returns:" text in order to determine what return values to expect from the function and how to interpret them. This is cumbersome and takes an extra step which could be avoided. Advantages: + enum is binary compatible with int, so no ABI changes + without reading the documentation, you see what return values to expect at a glance + code generators in higher level languages could use it to generate proper wrappings to "boolean" automatically + compilers can probably warn when returning a value not part of the enum Claudio Bley (1): Implement a virBool type include/libvirt/libvirt.h.in | 25 +++++++++++++++++++++---- python/generator.py | 16 ++++++++++++++++ src/libvirt.c | 8 ++++---- 3 files changed, 41 insertions(+), 8 deletions(-) -- 1.7.9.5

3 5

[libvirt] [PATCH 0/4] Resolve some UNUSED_VALUE errors found by Coverity
by John Ferlan 15 Jan '13

15 Jan '13

This patch resolves "UNUSED_VALUE (CWE-563)" errors found by Coverity. John Ferlan (4): locking: Remove unnecessary setting of lockspace util: Remove the unused setting of 'res' for virHashLookup return virsh: Remove unused setting of 'br_node' and 'if_node' parallels: Remove unused JSON fetch of "OS" src/locking/lock_daemon_dispatch.c | 4 ++-- src/parallels/parallels_driver.c | 3 --- src/util/virlockspace.c | 6 ++---- tools/virsh-interface.c | 6 +++--- 4 files changed, 7 insertions(+), 12 deletions(-) -- 1.7.11.7

2 6

[libvirt] [PATCH] qemu: Don't update count of vCPUs if hot-unplug has failed
by Peter Krempa 15 Jan '13

15 Jan '13

After live change of cpu counts, the number of processor threads is verified. This patch makes use of this approach to check if qemu ignored the request for cpu hot-unplug and report an appropriate message. --- src/qemu/qemu_driver.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 39175f4..c4be130 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3697,6 +3697,15 @@ static int qemuDomainHotplugVcpus(virQEMUDriverPtr driver, goto cleanup; } + /* check if hotplug has failed */ + if (vcpus < oldvcpus && ncpupids == oldvcpus) { + virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", + _("qemu didn't unplug the vCPUs properly")); + vcpus = oldvcpus; + ret = -1; + goto cleanup; + } + if (ncpupids != vcpus) { virReportError(VIR_ERR_INTERNAL_ERROR, _("got wrong number of vCPU pids from QEMU monitor. " -- 1.8.1

2 2

[libvirt] [PATCH 00/10] Resolve CHECKED_RETURN errors found by Coverity
by John Ferlan 15 Jan '13

15 Jan '13

Bug: https://bugzilla.redhat.com/show_bug.cgi?id=880388 This set of patches resolves the "CHECKED_RETURN (CWE-252)" errors found by Coverity. John Ferlan (10): interface: Check and handle error for virAsprintf() calls. parallels: Check and handle error for virAsprintf() calls. Ignore the return inparallelsMakePoolName() since subsequent check validates name was allocated. rpc: Check status when attempting to set SO_REUSEADDR flag on outgoing connection. On failure, VIR_WARN(), but continue to connect. vmware: Ignore the return status check for vmwareUpdateVMStatus in convenience routine vmwareDomainObjListUpdateDomain xen: Check return status for setting TCP_NODELAY option and generate a VIR_DEBUG message on failure. Allow connection to continue. virlockspacetest: Check return on mkdir for LOCKSPACE_DIR vmx2xmltest: Check and handle error for virAsprintf() calls. xml2vmxtest: Check and handle error for virAsprintf() calls. virsh: Ignore error returns for virBufferTrim(). phyp: Check and handle select() errors from waitsocket(). src/interface/interface_backend_udev.c | 5 ++-- src/parallels/parallels_storage.c | 5 ++-- src/phyp/phyp_driver.c | 42 ++++++++++++++++++++++++++-------- src/rpc/virnetsocket.c | 4 +++- src/vmware/vmware_driver.c | 2 +- src/xen/xend_internal.c | 6 +++-- tests/virlockspacetest.c | 3 ++- tests/vmx2xmltest.c | 7 ++++-- tests/xml2vmxtest.c | 5 ++-- tools/virsh.c | 4 ++-- 10 files changed, 56 insertions(+), 27 deletions(-) -- 1.7.11.7

4 32

[libvirt] [PATCH] libvirt: lxc: don't mkdir when selinux is disabled
by Gao feng 15 Jan '13

15 Jan '13

libvirt lxc will fail to start when selinux is disabled. error: Failed to start domain noroot error: internal error guest failed to start: PATH=/bin:/sbin TERM=linux container=lxc-libvirt container_uuid=b9873916-3516-c199-8112-1592ff694a9e LIBVIRT_LXC_UUID=b9873916-3516-c199-8112-1592ff694a9e LIBVIRT_LXC_NAME=noroot /bin/sh 2013-01-09 11:04:05.384+0000: 1: info : libvirt version: 1.0.1 2013-01-09 11:04:05.384+0000: 1: error : lxcContainerMountBasicFS:546 : Failed to mkdir /sys/fs/selinux: No such file or directory 2013-01-09 11:04:05.384+0000: 7536: info : libvirt version: 1.0.1 2013-01-09 11:04:05.384+0000: 7536: error : virLXCControllerRun:1466 : error receiving signal from container: Input/output error 2013-01-09 11:04:05.404+0000: 7536: error : virCommandWait:2287 : internal error Child process (ip link del veth1) unexpected exit status 1: Cannot find device "veth1" fix this problem by checking if selinuxfs is mounted in host before we try to create dir /sys/fs/selinux. Signed-off-by: Gao feng <gaofeng(a)cn.fujitsu.com> --- src/lxc/lxc_container.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 9f22923..d7f4960 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -540,13 +540,6 @@ static int lxcContainerMountBasicFS(bool pivotRoot, VIR_DEBUG("Processing %s -> %s", mnts[i].src, mnts[i].dst); - if (virFileMakePath(mnts[i].dst) < 0) { - virReportSystemError(errno, - _("Failed to mkdir %s"), - mnts[i].src); - goto cleanup; - } - srcpath = mnts[i].src; /* Skip if mount doesn't exist in source */ @@ -554,6 +547,13 @@ static int lxcContainerMountBasicFS(bool pivotRoot, (access(srcpath, R_OK) < 0)) continue; + if (virFileMakePath(mnts[i].dst) < 0) { + virReportSystemError(errno, + _("Failed to mkdir %s"), + mnts[i].src); + goto cleanup; + } + VIR_DEBUG("Mount %s on %s type=%s flags=%x, opts=%s", srcpath, mnts[i].dst, mnts[i].type, mnts[i].mflags, mnts[i].opts); if (mount(srcpath, mnts[i].dst, mnts[i].type, mnts[i].mflags, mnts[i].opts) < 0) { -- 1.7.11.7

3 3

[libvirt] [PATCH v2] Add 'lxc-enter-namespace' command to virsh
by Daniel P. Berrange 15 Jan '13

15 Jan '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Add a 'lxc-enter-namespace' command which accepts a domain name and then a command + args to run, attached to the container eg virsh -c lxc:/// lxc-enter-namespace demo -- /bin/ps -auxf Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- tools/Makefile.am | 1 + tools/virsh-domain.c | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++++ tools/virsh.pod | 8 +++++ 3 files changed, 103 insertions(+) diff --git a/tools/Makefile.am b/tools/Makefile.am index 878a114..8a0429c 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -133,6 +133,7 @@ virsh_LDADD = \ $(STATIC_BINARIES) \ $(WARN_CFLAGS) \ ../src/libvirt.la \ + ../src/libvirt-lxc.la \ ../src/libvirt-qemu.la \ ../gnulib/lib/libgnu.la \ $(LIBXML_LIBS) \ diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index e91939c..1fee681 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -43,11 +43,13 @@ #include "conf/domain_conf.h" #include "console.h" #include "viralloc.h" +#include "vircommand.h" #include "virutil.h" #include "virfile.h" #include "virjson.h" #include "virkeycode.h" #include "virmacaddr.h" +#include "virprocess.h" #include "virstring.h" #include "virsh-domain-monitor.h" #include "virerror.h" @@ -6771,6 +6773,97 @@ cleanup: } /* + * "lxc-enter-namespace" namespace + */ +static const vshCmdInfo info_lxc_enter_namespace[] = { + {"help", N_("LXC Guest Enter Namespace")}, + {"desc", N_("Run an arbitrary lxc guest enter namespace; use at your own risk")}, + {NULL, NULL} +}; + +static const vshCmdOptDef opts_lxc_enter_namespace[] = { + {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, + {NULL, 0, 0, NULL} +}; + +static bool +cmdLxcEnterNamespace(vshControl *ctl, const vshCmd *cmd) +{ + virDomainPtr dom = NULL; + bool ret = false; + const vshCmdOpt *opt = NULL; + char **cmdargv = NULL; + size_t ncmdargv = 0; + pid_t pid; + int nfdlist; + int *fdlist; + size_t i; + + dom = vshCommandOptDomain(ctl, cmd, NULL); + if (dom == NULL) + goto cleanup; + + while ((opt = vshCommandOptArgv(cmd, opt))) { + if (VIR_EXPAND_N(cmdargv, ncmdargv, 1) < 0) { + vshError(ctl, _("%s: %d: failed to allocate argv"), + __FILE__, __LINE__); + } + cmdargv[ncmdargv-1] = opt->data; + } + if (VIR_EXPAND_N(cmdargv, ncmdargv, 1) < 0) { + vshError(ctl, _("%s: %d: failed to allocate argv"), + __FILE__, __LINE__); + } + cmdargv[ncmdargv - 1] = NULL; + + if ((nfdlist = virDomainLxcOpenNamespace(dom, &fdlist, 0)) < 0) + goto cleanup; + + /* Fork once because we don't want to affect + * virsh's namespace itself + */ + if (virFork(&pid) < 0) + goto cleanup; + if (pid == 0) { + if (virDomainLxcEnterNamespace(dom, + nfdlist, + fdlist, + NULL, + NULL, + 0) < 0) + _exit(255); + + /* Fork a second time because entering the + * pid namespace only takes effect after fork + */ + if (virFork(&pid) < 0) + _exit(255); + if (pid == 0) { + execv(cmdargv[0], cmdargv); + _exit(255); + } else { + if (virProcessWait(pid, NULL) < 0) + _exit(255); + } + _exit(0); + } else { + for (i = 0 ; i < nfdlist ; i++) + VIR_FORCE_CLOSE(fdlist[i]); + VIR_FREE(fdlist); + if (virProcessWait(pid, NULL) < 0) + goto cleanup; + } + + ret = true; + +cleanup: + if (dom) + virDomainFree(dom); + VIR_FREE(cmdargv); + return ret; +} + +/* * "dumpxml" command */ static const vshCmdInfo info_dumpxml[] = { @@ -8760,6 +8853,7 @@ const vshCmdDef domManagementCmds[] = { {"inject-nmi", cmdInjectNMI, opts_inject_nmi, info_inject_nmi, 0}, {"send-key", cmdSendKey, opts_send_key, info_send_key, 0}, {"send-process-signal", cmdSendProcessSignal, opts_send_process_signal, info_send_process_signal, 0}, + {"lxc-enter-namespace", cmdLxcEnterNamespace, opts_lxc_enter_namespace, info_lxc_enter_namespace, 0}, {"managedsave", cmdManagedSave, opts_managedsave, info_managedsave, 0}, {"managedsave-remove", cmdManagedSaveRemove, opts_managedsaveremove, info_managedsaveremove, 0}, diff --git a/tools/virsh.pod b/tools/virsh.pod index c9ebc8f..e2a2aec 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -3056,6 +3056,14 @@ When I<--aysnc> is given, the command waits for timeout whether success or failed. And when I<--block> is given, the command waits forever with blocking timeout. +=item B<lxc-enter-namespace> I<domain> -- /path/to/binary [arg1, [arg2, ...]] + +Enter the namespace of I<domain> and execute the command C</path/to/binary> +passing the requested args. The binary path is relative to the container +root filesystem, not the host root filesystem. The binary will inherit the +environment variables / console visible to virsh. This command only works +when connected to the LXC hypervisor driver. + =back =head1 ENVIRONMENT -- 1.7.11.7

2 1

[libvirt] [PATCH] build: add new file, for lxc_protocol checking
by Eric Blake 15 Jan '13

15 Jan '13

Commit 509eb51 added lxc_protocol.x; but without the initial checkin of src/lxc_protocol-structs, 'make check' would fail for anyone with pdwtags installed: make[3]: *** No rule to make target `lxc_protocol-structs', needed by `check-protocol'. Stop. * src/lxc_protocol-structs: New file. --- Pushing under the build-breaker rule. src/lxc_protocol-structs | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 src/lxc_protocol-structs diff --git a/src/lxc_protocol-structs b/src/lxc_protocol-structs new file mode 100644 index 0000000..eb54172 --- /dev/null +++ b/src/lxc_protocol-structs @@ -0,0 +1,13 @@ +/* -*- c -*- */ +struct remote_nonnull_domain { + remote_nonnull_string name; + remote_uuid uuid; + int id; +}; +struct lxc_domain_open_namespace_args { + remote_nonnull_domain dom; + u_int flags; +}; +enum lxc_procedure { + LXC_PROC_DOMAIN_OPEN_NAMESPACE = 1, +}; -- 1.8.0.2

2 1

[libvirt] [PATCH 0/8] *Persistent vHBA support in storage pool
by Osier Yang 15 Jan '13

15 Jan '13

This is the 3rd part to implement NPIV migration support [1]. Part 1: https://www.redhat.com/archives/libvir-list/2013-January/msg00859.html Part 2: (Already ACKed by Michal) https://www.redhat.com/archives/libvir-list/2013-January/msg00859.html The patches are based on Part 2. The new XMLs might be too long, might be deserved to have them as sub-elements of <adapter>. But I'd like to see the feedback first. Osier Yang (8): New XML attributes for storage pool source adapter storage: Make the adapter name be consistent with node device driver storage: Move virStorageBackendSCSIGetHostNumber into iscsi backend phyp: Prohibit fc_host adapter for phyp driver util: Add helper to get the scsi host name by iterating over sysfs util: Fix bug of managing vport storage: Add startPool and stopPool for scsi backend storage: Guess the parent if it's not specified for vHBA docs/formatstorage.html.in | 15 ++- docs/schemas/storagepool.rng | 33 +++++- src/conf/storage_conf.c | 123 ++++++++++++++++-- src/conf/storage_conf.h | 23 +++- src/libvirt_private.syms | 4 + src/phyp/phyp_driver.c | 15 ++- src/storage/storage_backend_iscsi.c | 39 ++++++- src/storage/storage_backend_scsi.c | 190 +++++++++++++++++++-------- src/storage/storage_backend_scsi.h | 3 - src/util/virutil.c | 196 +++++++++++++++++++++++++++- src/util/virutil.h | 7 + tests/storagepoolxml2xmlin/pool-scsi.xml | 2 +- tests/storagepoolxml2xmlin/pool-scsi1.xml | 15 ++ tests/storagepoolxml2xmlout/pool-scsi.xml | 2 +- tests/storagepoolxml2xmlout/pool-scsi1.xml | 18 +++ tests/storagepoolxml2xmltest.c | 1 + 16 files changed, 602 insertions(+), 84 deletions(-) create mode 100644 tests/storagepoolxml2xmlin/pool-scsi1.xml create mode 100644 tests/storagepoolxml2xmlout/pool-scsi1.xml [1] https://www.redhat.com/archives/libvir-list/2012-November/msg00826.html Regards, Osier

1 8

[libvirt] [PATCH 0/2] Add total number of physical cores to the capabilities output
by Peter Krempa 15 Jan '13

15 Jan '13

https://bugzilla.redhat.com/show_bug.cgi?id=888503 The values added by this patch help avoid management applications the dodgy approach of multiplying values in the nodeinfo structure to gather data needed for their management decisions. Peter Krempa (2): nodeinfo: Gather total number of physical cores and fix tests capabilities: Add total number of cores and threads to the XML docs/formatcaps.html.in | 2 +- docs/schemas/capability.rng | 8 +++++++ src/conf/cpu_conf.c | 4 ++++ src/conf/cpu_conf.h | 2 ++ src/libvirt_private.syms | 1 + src/nodeinfo.c | 37 ++++++++++++++++++++++------- src/nodeinfo.h | 2 ++ src/qemu/qemu_capabilities.c | 3 ++- tests/nodeinfodata/linux-x86-test1.expected | 2 +- tests/nodeinfodata/linux-x86-test2.expected | 2 +- tests/nodeinfodata/linux-x86-test3.expected | 2 +- tests/nodeinfodata/linux-x86-test4.expected | 2 +- tests/nodeinfodata/linux-x86-test5.expected | 2 +- tests/nodeinfodata/linux-x86-test6.expected | 2 +- tests/nodeinfodata/linux-x86-test7.expected | 2 +- tests/nodeinfodata/linux-x86-test8.expected | 2 +- tests/nodeinfotest.c | 11 +++++---- tests/testutilsqemu.c | 2 ++ 18 files changed, 66 insertions(+), 22 deletions(-) -- 1.8.1

2 3

[libvirt] Libvirt node is not getting booted through network
by Varun Bhatnagar 15 Jan '13

15 Jan '13

Hi, I am trying to boot my node through network with the following configuration: But I am getting an error message saying: Even my network setting is not getting reflected in the Virtualbox. Can anyone suggest me what is wrong with this configuration. I think to boot a node from network we need to define a boot server but where shall I add that, I am confused.... Any help will be appreciated. Thanks in advance. Regards, Varun =====-----=====-----===== Notice: The information contained in this e-mail message and/or attachments to it may contain confidential or privileged information. If you are not the intended recipient, any dissemination, use, review, distribution, printing or copying of the information contained in this e-mail message and/or attachments to it are strictly prohibited. If you have received this communication in error, please notify us by reply e-mail or telephone and immediately and permanently delete the message and any attachments. Thank you

1 0

[libvirt] [PATCH] .gitignore: Sort alphabetically
by Michal Privoznik 15 Jan '13

15 Jan '13

--- Pushed under trivial rule .gitignore | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f71c30c..be83e28 100644 --- a/.gitignore +++ b/.gitignore @@ -63,8 +63,8 @@ /docs/devhelp/libvirt.devhelp /docs/hvsupport.html.in /docs/libvirt-api.xml -/docs/libvirt-qemu-*.xml /docs/libvirt-lxc-*.xml +/docs/libvirt-qemu-*.xml /docs/libvirt-refs.xml /docs/search.php /docs/todo.html.in @@ -161,8 +161,8 @@ /tests/reconnect /tests/secaatest /tests/seclabeltest -/tests/securityselinuxtest /tests/securityselinuxlabeltest +/tests/securityselinuxtest /tests/sexpr2xmltest /tests/shunloadtest /tests/sockettest -- 1.8.0.2

1 0

[libvirt] [PATCH 0/4 v3] New API virNodeDeviceLookupSCSIHostByWWN
by Osier Yang 15 Jan '13

15 Jan '13

For easy reviewing, this is splitted from [1]. v2 - v3: * Validate the specified wwnn,wwpn pair before applying it to the new API in virsh-nodedev.c v1 - v2: * Per Daniel's suggestion, change the API name from virNodeDeviceLookupByWWN into virNodeDeviceLookupSCSIHostByWWN. Osier Yang (4): Introduce API virNodeDeviceLookupSCSIHostByWWN remote: Wire up the remote protocol nodedev: Implement virNodeDeviceLookupSCSIHostByWWN virsh: Use virNodeDeviceLookupSCSIHostByWWN include/libvirt/libvirt.h.in | 5 ++ src/driver.h | 6 ++ src/libvirt.c | 46 ++++++++++++++++ src/libvirt_public.syms | 1 + src/node_device/node_device_driver.c | 13 +++-- src/node_device/node_device_driver.h | 4 ++ src/node_device/node_device_hal.c | 1 + src/node_device/node_device_udev.c | 1 + src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 13 ++++- src/remote_protocol-structs | 9 +++ src/rpc/gendispatch.pl | 5 ++- tools/virsh-nodedev.c | 97 ++++++++++++++++++++++++++-------- tools/virsh.pod | 15 +++-- 14 files changed, 181 insertions(+), 36 deletions(-) [1] https://www.redhat.com/archives/libvir-list/2013-January/msg00328.html Regards, Osier

1 5

[libvirt] [PATCH 0/4] Resolve UNINIT errors found by Coverity
by John Ferlan 15 Jan '13

15 Jan '13

This set of patches resolves "Error: UNINIT (CWE-457)" errors found by Coverity John Ferlan (4): parallels: Resolve issues with uninitialized 'ret' value openvz: Need to initialize 'ret' for kb_per_pages error path lxc: Initialize dst due to potential cleanup usage before setting interface: Need to initialize 'add_to_list' src/interface/interface_backend_udev.c | 2 +- src/lxc/lxc_driver.c | 2 +- src/openvz/openvz_conf.c | 2 +- src/parallels/parallels_storage.c | 19 ++++++++++++++----- 4 files changed, 17 insertions(+), 8 deletions(-) -- 1.7.11.7

4 13

[libvirt] [PATCH 0/9 v2] Miscs of nodedev
by Osier Yang 15 Jan '13

15 Jan '13

This is the second part of [1]. Some of them are preparations for persistent vHBA support in storage pool, some are fixes, some are improvements. v1 - v2: * One more patch: 9/9 Osier Yang (9): nodedev: Remove the unused enum nodedev: Introduce two new flags for listAll API util: Add one helper virReadFCHost to read the value of fc_host entry nodedev: Use access instead of stat nodedev: Refactor the helpers nodedev: Dump max vports and vports in use for HBA's XML nodedev: Fix the improper logic when enumerating SRIOV VF nodedev: Abstract nodeDeviceVportCreateDelete as util function cleanup libvirt_private.syms docs/formatnode.html.in | 10 +- docs/schemas/nodedev.rng | 6 + include/libvirt/libvirt.h.in | 20 +- src/conf/node_device_conf.c | 41 +- src/conf/node_device_conf.h | 16 +- src/libvirt.c | 2 + src/libvirt_private.syms | 1160 +++++++++++++++-------------- src/node_device/node_device_driver.c | 110 +--- src/node_device/node_device_driver.h | 19 +- src/node_device/node_device_hal.c | 15 +- src/node_device/node_device_linux_sysfs.c | 245 ++---- src/node_device/node_device_udev.c | 14 +- src/util/virpci.c | 36 +- src/util/virutil.c | 224 ++++++ src/util/virutil.h | 19 + tools/virsh-nodedev.c | 6 + tools/virsh.pod | 7 +- 17 files changed, 1034 insertions(+), 916 deletions(-) Regards, Osier

3 28

Re: [libvirt] [RFC qom-cpu v2 1/2] target-i386: Convert CPU definitions into X86CPU subclasses
by Eduardo Habkost 15 Jan '13

15 Jan '13

On Tue, Jan 15, 2013 at 09:41:04AM +0100, Igor Mammedov wrote: > On Mon, 10 Dec 2012 23:59:31 +0100 > Andreas Färber <afaerber(a)suse.de> wrote: > > > TODO: sort classes for -cpu ?, generalize X86CPUListState, more testing > > > > Signed-off-by: Andreas Färber <afaerber(a)suse.de> > > Cc: Eduardo Habkost <ehabkost(a)redhat.com> > > Cc: Igor Mammedov <imammedo(a)redhat.com> [...] > The patch is just renaming of the current builtin_x86_defs > into a bunch of functions and polluting X86CPUClass > with fields from the former x86_def_t. > object_new() still creates a dummy cpu instance whose defaults > are still manually copied from X86CPUClass instead of x86_def_t. > That's a good thing, isn't it? It means the patch is easier to review. :-) No patch alone will do everything we want, because we want to do a lot. We need to do it one step at a time. (BTW, why are you looking at this RFC instead of the more recent one, that I have sent on Jan 4? [that's very similar to this one]) > What's the point in having dummy sub-classes? > How it can help in your CPU re-factoring? It will help us to unify the CPU creation/realization code that's duplicated over all the architectures. It will give libvirt an easy mechanism to list the available CPU models that won't require parsing help output (using "qom-list-types" QMP command). > > > On the other hand converting features to static properties first and > then converting X86CPU to sub-classes, yields already initialized to > defaults sub-class completely removing notion of x86_def_t and > not polluting X86CPUClass with redundant fields. I wouldn't disagree with this approach in principle, but I believe our main problem today is lack of reviewer bandwidth. I learned the hard way that trying to clean up everything before implementing something will make sure the code takes forever to be reviewed. > For example see following patches on > https://github.com/imammedo/qemu/commits/x86-cpu-classes.Jan142013 > > e9fd18f qdev: extend DEFINE_GENERIC_PROP() to support default values > c65eca9 qdev: make qdev_prop_find_bit return non const so prop default value could be modified > 0311952 allow to expolit default value static props for model, family, stepping & vendor props > 8b3080e target-i386: add helpers to change default values of static properties before object is created > ed506d3 target-i386: prepare for subclasses to have its own instance of static properties definitions > a48e252 target-i386: declare subclass for qemu64 cpu model > 9c556c2 target-i386: move cpu_x86_init() & cpu_x86_register() into it and switch to subclasses. PS: implemended only for qemu64 > f5dbfe6 CPU_CLASS_NAME(qemu64) hack > 00e15b8 target-i386: properties list are per subclass: do not set them in superclass to avoid defaults set by subclass be over-written > > -- > Regards, > Igor -- Eduardo

1 0

[libvirt] [PATCH 0/9] Add ability to connect to LXC namespaces
by Daniel P. Berrange 15 Jan '13

15 Jan '13

This series introduces an LXC specific library libvirt-lxc.so which adds ability for a process to connect to the namespaces used by an LXC container from outside. It uses FD passing magic to allow the caller to connect, even if it is not root.

3 23

[libvirt] [test-API][PATCH] Add logical volume download and upload cases
by Wayne Sun 15 Jan '13

15 Jan '13

This is for logical volume download and upload testing. * using download and upload API under class virStream. they are functions act as same with download/upload APIs under class virStorageVol, just different entrance. * using logical volume specified xml to create volume. no need to provide volume format. * check method is the same with dir vol download/upload cases. Signed-off-by: Wayne Sun <gsun(a)redhat.com> --- cases/storage_logical_vol_upload_download.conf | 179 ++++++++++++++++++++++++ repos/storage/logical_vol_download.py | 125 +++++++++++++++++ repos/storage/logical_vol_upload.py | 152 ++++++++++++++++++++ 3 files changed, 456 insertions(+), 0 deletions(-) create mode 100644 cases/storage_logical_vol_upload_download.conf create mode 100644 repos/storage/logical_vol_download.py create mode 100644 repos/storage/logical_vol_upload.py diff --git a/cases/storage_logical_vol_upload_download.conf b/cases/storage_logical_vol_upload_download.conf new file mode 100644 index 0000000..51b640e --- /dev/null +++ b/cases/storage_logical_vol_upload_download.conf @@ -0,0 +1,179 @@ +storage:define_logical_pool + poolname + $defaultpoolname + sourcename + $defaultpoolname + sourcepath + $defaultpartition + +storage:build_logical_pool + poolname + $defaultpoolname + +storage:activate_pool + poolname + $defaultpoolname + +storage:logical_vol_download + poolname + $defaultpoolname + volname + $defaultvolumename + capacity + 50 + offset + 0 + length + 0 +clean + +storage:delete_logical_volume + poolname + $defaultpoolname + volname + $defaultvolumename + +storage:logical_vol_download + poolname + $defaultpoolname + volname + $defaultvolumename + capacity + 50 + offset + 0 + length + 1048576 +clean + +storage:delete_logical_volume + poolname + $defaultpoolname + volname + $defaultvolumename + +storage:logical_vol_download + poolname + $defaultpoolname + volname + $defaultvolumename + capacity + 50 + offset + 1048576 + length + 0 +clean + +storage:delete_logical_volume + poolname + $defaultpoolname + volname + $defaultvolumename + +storage:logical_vol_download + poolname + $defaultpoolname + volname + $defaultvolumename + capacity + 50 + offset + 1048576 + length + 1048576 +clean + +storage:delete_logical_volume + poolname + $defaultpoolname + volname + $defaultvolumename + +storage:logical_vol_upload + poolname + $defaultpoolname + volname + $defaultvolumename + capacity + 50 + offset + 0 + length + 0 +clean + +storage:delete_logical_volume + poolname + $defaultpoolname + volname + $defaultvolumename + +storage:logical_vol_upload + poolname + $defaultpoolname + volname + $defaultvolumename + capacity + 50 + offset + 0 + length + 1048576 +clean + +storage:delete_logical_volume + poolname + $defaultpoolname + volname + $defaultvolumename + +storage:logical_vol_upload + poolname + $defaultpoolname + volname + $defaultvolumename + capacity + 50 + offset + 1048576 + length + 0 +clean + +storage:delete_logical_volume + poolname + $defaultpoolname + volname + $defaultvolumename + +storage:logical_vol_upload + poolname + $defaultpoolname + volname + $defaultvolumename + capacity + 50 + offset + 1048576 + length + 1048576 +clean + +storage:delete_logical_volume + poolname + $defaultpoolname + volname + $defaultvolumename + +storage:destroy_pool + poolname + $defaultpoolname + +storage:delete_logical_pool + poolname + $defaultpoolname + +storage:undefine_pool + poolname + $defaultpoolname diff --git a/repos/storage/logical_vol_download.py b/repos/storage/logical_vol_download.py new file mode 100644 index 0000000..9797f36 --- /dev/null +++ b/repos/storage/logical_vol_download.py @@ -0,0 +1,125 @@ +#!/usr/bin/env python +# logical storage volume download testing + +import os +import string +from xml.dom import minidom + +import libvirt +from libvirt import libvirtError + +from src import sharedmod +from utils import utils + +required_params = ('poolname', 'volname', 'capacity', 'offset', 'length',) +optional_params = {'xml' : 'xmls/logical_volume.xml', + } + +def get_pool_path(poolobj): + """ get pool xml description + """ + poolxml = poolobj.XMLDesc(0) + + logger.debug("the xml description of pool is %s" % poolxml) + + doc = minidom.parseString(poolxml) + path_element = doc.getElementsByTagName('path')[0] + textnode = path_element.childNodes[0] + path_value = textnode.data + + return path_value + +def write_file(path, capacity): + """write test data to file + """ + logger.info("write %sM data into file %s" % (capacity, path)) + f = open(path, 'w') + datastr = ''.join(string.lowercase + string.uppercase + + string.digits + '.' + '\n') + repeat = capacity / 64 + data = ''.join(repeat * datastr) + f.write(data) + f.close() + +def handler(stream, data, file_): + return file_.write(data) + +def logical_vol_download(params): + """test volume download and check""" + global logger + logger = params['logger'] + poolname = params['poolname'] + volname = params['volname'] + offset = int(params['offset']) + length = int(params['length']) + capacity = int(params['capacity']) + xmlstr = params['xml'] + + logger.info("the poolname is %s, volname is %s" % + (poolname, volname)) + logger.info("download offset is: %s" % offset) + logger.info("the data length to download is: %s" % length) + + conn = sharedmod.libvirtobj['conn'] + try: + poolobj = conn.storagePoolLookupByName(poolname) + path_value = get_pool_path(poolobj) + volume_path = path_value + "/" + volname + logger.debug("volume target path: %s" % volume_path) + + xmlstr = xmlstr.replace('TARGETPATH', volume_path) + logger.debug("volume xml:\n%s" % xmlstr) + + logger.info("create %s logical storage volume" % volname) + vol = poolobj.createXML(xmlstr, 0) + logger.debug("current created storage volume: %s" % + poolobj.listVolumes()) + + write_file(volume_path, capacity) + origdigest = utils.digest(volume_path, offset, length) + logger.debug("the md5 hex digest of data read from %s is: %s" % + (volume_path, origdigest)) + + st = conn.newStream(0) + + test_path = path_value + "/" + "vol_test" + + f = open(test_path, 'w') + logger.info("start download") + st.download(vol, offset, length, 0) + logger.info("downloaded all data") + st.recvAll(handler, f) + logger.info("finished stream") + st.finish() + f.close() + + newdigest = utils.digest(test_path, 0, 0) + logger.debug("the md5 hex digest of data read from %s is: %s" % + (test_path, newdigest)) + + if origdigest == newdigest: + logger.info("file digests match, download succeed") + else: + logger.error("file digests not match, download failed") + return 1 + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + return 0 + +def logical_vol_download_clean(params): + """clean testing environment""" + poolname = params['poolname'] + volname = params['volname'] + + conn = sharedmod.libvirtobj['conn'] + poolobj = conn.storagePoolLookupByName(poolname) + path_value = get_pool_path(poolobj) + test_path = path_value + "/" + "vol_test" + + if os.path.exists(test_path): + os.unlink(test_path) + + return 0 diff --git a/repos/storage/logical_vol_upload.py b/repos/storage/logical_vol_upload.py new file mode 100644 index 0000000..fc03ee6 --- /dev/null +++ b/repos/storage/logical_vol_upload.py @@ -0,0 +1,152 @@ +#!/usr/bin/env python +# logical storage volume upload testing, offset and length can +# only be chosen in 0 and 1048576. + +import os +import string +from xml.dom import minidom + +import libvirt +from libvirt import libvirtError + +from src import sharedmod +from utils import utils + +required_params = ('poolname', 'volname', 'capacity', 'offset', 'length',) +optional_params = {'xml' : 'xmls/logical_volume.xml', + } + +def get_pool_path(poolobj): + """ get pool xml description + """ + poolxml = poolobj.XMLDesc(0) + + logger.debug("the xml description of pool is %s" % poolxml) + + doc = minidom.parseString(poolxml) + path_element = doc.getElementsByTagName('path')[0] + textnode = path_element.childNodes[0] + path_value = textnode.data + + return path_value + +def write_file(path): + """write 1M test data to file + """ + logger.info("write 1M data into file %s" % path) + f = open(path, 'w') + datastr = ''.join(string.lowercase + string.uppercase + + string.digits + '.' + '\n') + data = ''.join(16384 * datastr) + f.write(data) + f.close() + +def handler(stream, data, file_): + return file_.read(data) + +def logical_vol_upload(params): + """test volume download and check""" + global logger + logger = params['logger'] + poolname = params['poolname'] + volname = params['volname'] + offset = int(params['offset']) + length = int(params['length']) + capacity = int(params['capacity']) + xmlstr = params['xml'] + + logger.info("the poolname is %s, volname is %s" % + (poolname, volname)) + logger.info("download offset is: %s" % offset) + logger.info("the data length to download is: %s" % length) + + conn = sharedmod.libvirtobj['conn'] + try: + poolobj = conn.storagePoolLookupByName(poolname) + path_value = get_pool_path(poolobj) + volume_path = path_value + "/" + volname + logger.debug("volume target path: %s" % volume_path) + + xmlstr = xmlstr.replace('TARGETPATH', volume_path) + logger.debug("volume xml:\n%s" % xmlstr) + + logger.info("create %s logical storage volume" % volname) + vol = poolobj.createXML(xmlstr, 0) + logger.debug("current created storage volume: %s" % + poolobj.listVolumes()) + + test_path = path_value + "/" + "vol_test" + write_file(test_path) + olddigest = utils.digest(test_path, 0, 0) + logger.debug("the old file digest is: %s" % olddigest) + + if offset: + origdigestpre = utils.digest(volume_path, 0, offset) + else: + origdigestpre = '' + logger.debug("the original pre region digest is: %s" % origdigestpre) + + origdigestpost = utils.digest(volume_path, offset + 1024 * 1024, 0) + logger.debug("the original post region digest is: %s" % origdigestpost) + + st = conn.newStream(0) + + f = open(test_path, 'r') + logger.info("start upload") + st.upload(vol, offset, length, 0) + logger.info("sent all data") + st.sendAll(handler, f) + logger.info("finished stream") + st.finish() + f.close() + + newdigest = utils.digest(volume_path, offset, 1024 * 1024) + logger.debug("the new file digest is: %s" % olddigest) + + if offset: + newdigestpre = utils.digest(volume_path, 0, offset) + else: + newdigestpre = '' + logger.debug("the new pre region digest is: %s" % origdigestpre) + + newdigestpost = utils.digest(volume_path, offset + 1024 * 1024, 0) + logger.debug("the new post region digest is: %s" % origdigestpost) + + if newdigestpre == origdigestpre: + logger.info("file pre region digests match") + else: + logger.error("file pre region digests not match") + return 1 + + if olddigest == newdigest: + logger.info("file digests match") + else: + logger.error("file digests not match") + return 1 + + if newdigestpost == origdigestpost: + logger.info("file post region digests match") + else: + logger.error("file post region digests not match") + return 1 + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + return 0 + +def logical_vol_upload_clean(params): + """clean testing environment""" + poolname = params['poolname'] + volname = params['volname'] + + conn = sharedmod.libvirtobj['conn'] + poolobj = conn.storagePoolLookupByName(poolname) + path_value = get_pool_path(poolobj) + test_path = path_value + "/" + "vol_test" + + if os.path.exists(test_path): + os.unlink(test_path) + + return 0 -- 1.7.1

2 1

[libvirt] [test-API][PATCH] Add volume resize case with delta flag
by Wayne Sun 15 Jan '13

15 Jan '13

Only storage backend for RBD (RADOS Block Device), FS and directory have the resizeVol function, so only testing dir volume here. Flags 'allocate' and 'shrik' are with bug: https://bugzilla.redhat.com/show_bug.cgi?id=804516 they are not supported yet, so leave the case for later. * using volume resize API with flag VIR_STORAGE_VOL_RESIZE_DELTA * using volume info API to get volume info and check * add dir volume resize conf Signed-off-by: Wayne Sun <gsun(a)redhat.com> --- cases/storage_dir_vol_resize_delta.conf | 47 +++++++++++++++++++ repos/storage/vol_resize_delta.py | 75 +++++++++++++++++++++++++++++++ 2 files changed, 122 insertions(+), 0 deletions(-) create mode 100644 cases/storage_dir_vol_resize_delta.conf create mode 100644 repos/storage/vol_resize_delta.py diff --git a/cases/storage_dir_vol_resize_delta.conf b/cases/storage_dir_vol_resize_delta.conf new file mode 100644 index 0000000..58e15bf --- /dev/null +++ b/cases/storage_dir_vol_resize_delta.conf @@ -0,0 +1,47 @@ +storage:create_dir_pool + poolname + $defaultpoolname + +storage:create_dir_volume + poolname + $defaultpoolname + volname + $defaultvolumename + volformat + $defaultvolumetype + capacity + $defaultvolumesize + +storage:vol_resize_delta + poolname + $defaultpoolname + volname + $defaultvolumename + capacity + 1M + +storage:vol_resize_delta + poolname + $defaultpoolname + volname + $defaultvolumename + capacity + 2G + +storage:vol_resize_delta + poolname + $defaultpoolname + volname + $defaultvolumename + capacity + 4096K + +storage:delete_dir_volume + poolname + $defaultpoolname + volname + $defaultvolumename + +storage:destroy_pool + poolname + $defaultpoolname diff --git a/repos/storage/vol_resize_delta.py b/repos/storage/vol_resize_delta.py new file mode 100644 index 0000000..a87941e --- /dev/null +++ b/repos/storage/vol_resize_delta.py @@ -0,0 +1,75 @@ +#!/usr/bin/env python +# volume resize testing with delta flags, libvirt storage +# driver only support dir now + +import libvirt +from libvirt import libvirtError + +from src import sharedmod +from utils import utils + +required_params = ('poolname', 'volname', 'capacity',) +optional_params = {} + +def vol_resize_delta(params): + """test volume resize with delta flags""" + + global logger + logger = params['logger'] + poolname = params['poolname'] + volname = params['volname'] + capacity = params['capacity'] + + logger.info("the poolname is %s, volname is %s" % + (poolname, volname)) + + logger.info("the capacity given is %s" % capacity) + out = utils.get_capacity_suffix_size(capacity) + capacity_val = out['capacity_byte'] + logger.debug("the capacity to byte is %s" % capacity_val) + + conn = sharedmod.libvirtobj['conn'] + try: + poolobj = conn.storagePoolLookupByName(poolname) + vol = poolobj.storageVolLookupByName(volname) + + logger.info("get volume info before resize") + out = vol.info() + pre_capacity = out[1] + pre_allocation = out[2] + logger.info("volume capacity is %s bytes, allocation is %s bytes" % + (pre_capacity, pre_allocation)) + + flag = libvirt.VIR_STORAGE_VOL_RESIZE_DELTA + logger.info("resize %s with capacity %s in pool %s using flag: %s" + % (volname, capacity, poolname, flag)) + + vol.resize(capacity_val, flag) + + logger.info("get volume info after resize") + out = vol.info() + post_capacity = out[1] + post_allocation = out[2] + logger.info("volume capacity is %s bytes, allocation is %s bytes" % + (post_capacity, post_allocation)) + + logger.info("check resize effect") + if post_capacity - pre_capacity == capacity_val: + logger.info("increased size is expected") + else: + logger.error("increase size not equal to set, resize failed") + return 1 + + if pre_allocation == post_allocation: + logger.info("allocation is expected") + else: + logger.error("allocation changed, resize failed") + return 1 + + logger.info("resize succeed") + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + return 0 -- 1.7.1

2 1

[libvirt] [test-API][PATCH] Add find storage pool sources cases
by Wayne Sun 15 Jan '13

15 Jan '13

Add cases for testing findStoragePoolSources API * add 3 cases for storage type 'netfs', 'iscsi' and 'logical' * add 2 xmls for 'netfs' and 'iscsi' find 'logical' storage pool sources did not require xml start with source tag and xml could be empty * add test conf for find storage pool sources Signed-off-by: Wayne Sun <gsun(a)redhat.com> --- cases/find_storage_pool_sources.conf | 31 +++++++++++ repos/storage/find_iscsi_pool_sources.py | 72 ++++++++++++++++++++++++ repos/storage/find_logical_pool_sources.py | 82 ++++++++++++++++++++++++++++ repos/storage/find_netfs_pool_sources.py | 71 ++++++++++++++++++++++++ repos/storage/xmls/iscsi_pool_source.xml | 3 + repos/storage/xmls/netfs_pool_source.xml | 4 ++ 6 files changed, 263 insertions(+), 0 deletions(-) create mode 100644 cases/find_storage_pool_sources.conf create mode 100644 repos/storage/find_iscsi_pool_sources.py create mode 100644 repos/storage/find_logical_pool_sources.py create mode 100644 repos/storage/find_netfs_pool_sources.py create mode 100644 repos/storage/xmls/iscsi_pool_source.xml create mode 100644 repos/storage/xmls/netfs_pool_source.xml diff --git a/cases/find_storage_pool_sources.conf b/cases/find_storage_pool_sources.conf new file mode 100644 index 0000000..d2e86db --- /dev/null +++ b/cases/find_storage_pool_sources.conf @@ -0,0 +1,31 @@ +storage:find_iscsi_pool_sources + sourcehost + $iscsi_server + +storage:find_netfs_pool_sources + sourcehost + $nfs_server + +storage:define_logical_pool + poolname + $defaultpoolname + sourcename + $defaultpoolname + sourcepath + $defaultpartition + +storage:build_logical_pool + poolname + $defaultpoolname + +storage:find_logical_pool_sources + sourcepath + $defaultpartition + +storage:delete_logical_pool + poolname + $defaultpoolname + +storage:undefine_pool + poolname + $defaultpoolname diff --git a/repos/storage/find_iscsi_pool_sources.py b/repos/storage/find_iscsi_pool_sources.py new file mode 100644 index 0000000..4b758d2 --- /dev/null +++ b/repos/storage/find_iscsi_pool_sources.py @@ -0,0 +1,72 @@ +#!/usr/bin/env python +# Test finding storage pool source of 'iscsi' type + +from xml.dom import minidom + +import libvirt +from libvirt import libvirtError + +from src import sharedmod +from utils import utils + +required_params = ('sourcehost',) +optional_params = {'xml' : 'xmls/iscsi_pool_source.xml', + } + +def check_pool_sources(host, xmlstr): + """check the iscsi sources with command: + iscsiadm --mode discovery --type sendtargets --portal + """ + source_val = [] + + doc = minidom.parseString(xmlstr) + for diskTag in doc.getElementsByTagName("source"): + device_element = diskTag.getElementsByTagName("device")[0] + attr = device_element.getAttributeNode('path') + path_val = attr.nodeValue + + source_val.append(path_val) + + logger.debug("pool source info list is: %s" % source_val) + + cmd = "iscsiadm --mode discovery --type sendtargets --portal %s:3260,1 |\ + awk -F' ' '{print $2}'" % host + ret, path_list = utils.exec_cmd(cmd, shell=True) + + logger.debug("iscsiadm command output list is: %s" % path_list) + + if source_val == path_list: + logger.info("source list matched with iscsiadm command output") + return 0 + else: + logger.error("source list did not match with iscsiadm command output") + return 1 + +def find_iscsi_pool_sources(params): + """Find iscsi type storage pool sources from xml""" + global logger + logger = params['logger'] + sourcehost = params['sourcehost'] + xmlstr = params['xml'] + + conn = sharedmod.libvirtobj['conn'] + try: + + logger.debug("storage source spec xml:\n%s" % xmlstr) + + logger.info("find pool sources of iscsi type") + source_xml = conn.findStoragePoolSources('iscsi', xmlstr, 0) + logger.info("pool sources xml description is:\n %s" % source_xml) + + ret = check_pool_sources(sourcehost, source_xml) + if ret: + logger.error("pool sources check failed") + return 1 + else: + logger.info("pool sources check succeed") + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + return 0 diff --git a/repos/storage/find_logical_pool_sources.py b/repos/storage/find_logical_pool_sources.py new file mode 100644 index 0000000..255d879 --- /dev/null +++ b/repos/storage/find_logical_pool_sources.py @@ -0,0 +1,82 @@ +#!/usr/bin/env python +# Test finding storage pool source of 'logical' type + +from xml.dom import minidom + +import libvirt +from libvirt import libvirtError + +from src import sharedmod +from utils import utils + +required_params = ('sourcepath',) +optional_params = {'xml' : 'xmls/logical_pool.xml', + } + +def check_pool_sources(xmlstr): + """check the logical sources with command: + pvs --noheadings -o pv_name,vg_name + """ + source_val = {} + source_cmp = {} + + doc = minidom.parseString(xmlstr) + for diskTag in doc.getElementsByTagName("source"): + device_element = diskTag.getElementsByTagName("device")[0] + attr = device_element.getAttributeNode('path') + path_val = attr.nodeValue + + name_element = diskTag.getElementsByTagName("name")[0] + textnode = name_element.childNodes[0] + name_val = textnode.data + + source_val.update({path_val: name_val, }) + + logger.debug("pool source info dict is: %s" % source_val) + + cmd = "pvs --noheadings -o pv_name,vg_name | awk -F' ' '{print $1}'" + ret, path_list = utils.exec_cmd(cmd, shell=True) + + cmd = "pvs --noheadings -o pv_name,vg_name | awk -F' ' '{print $2}'" + ret, name_list = utils.exec_cmd(cmd, shell=True) + + for i in range(len(path_list)): + source_cmp.update({path_list[i]: name_list[i]}) + + logger.debug("pvs command output dict is: %s" % source_cmp) + + if source_val == source_cmp: + logger.info("source dict match with pvs command output") + return 0 + else: + logger.error("source dict did not match with pvs command output") + return 1 + +def find_logical_pool_sources(params): + """Find logical type storage pool sources from xml""" + global logger + logger = params['logger'] + sourcepath = params['sourcepath'] + xmlstr = params['xml'] + + conn = sharedmod.libvirtobj['conn'] + try: + + logger.debug("storage source spec xml:\n%s" % xmlstr) + + logger.info("find pool sources of logical type") + source_xml = conn.findStoragePoolSources('logical', xmlstr, 0) + logger.info("pool sources xml description is:\n %s" % source_xml) + + ret = check_pool_sources(source_xml) + if ret: + logger.error("pool sources check failed") + return 1 + else: + logger.info("pool sources check succeed") + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + return 0 diff --git a/repos/storage/find_netfs_pool_sources.py b/repos/storage/find_netfs_pool_sources.py new file mode 100644 index 0000000..bc71233 --- /dev/null +++ b/repos/storage/find_netfs_pool_sources.py @@ -0,0 +1,71 @@ +#!/usr/bin/env python +# Test finding storage pool source of 'netfs' type + +from xml.dom import minidom + +import libvirt +from libvirt import libvirtError + +from src import sharedmod +from utils import utils + +required_params = ('sourcehost',) +optional_params = {'xml' : 'xmls/netfs_pool_source.xml', + } + +def check_pool_sources(host, xmlstr): + """check the netfs sources with command: + showmount --no-headers -e HOSTNAME + """ + source_val = [] + + doc = minidom.parseString(xmlstr) + for diskTag in doc.getElementsByTagName("source"): + device_element = diskTag.getElementsByTagName("dir")[0] + attr = device_element.getAttributeNode('path') + path_val = attr.nodeValue + + source_val.append(path_val) + + logger.debug("pool source info list is: %s" % source_val) + + cmd = "showmount --no-headers -e %s | awk -F' ' '{print $1}'" % host + ret, path_list = utils.exec_cmd(cmd, shell=True) + + logger.debug("showmount command output list is: %s" % path_list) + + if source_val == path_list: + logger.info("source list matched with showmount command output") + return 0 + else: + logger.error("source list did not match with showmount command output") + return 1 + +def find_netfs_pool_sources(params): + """Find netfs type storage pool sources from xml""" + global logger + logger = params['logger'] + sourcehost = params['sourcehost'] + xmlstr = params['xml'] + + conn = sharedmod.libvirtobj['conn'] + try: + + logger.debug("storage source spec xml:\n%s" % xmlstr) + + logger.info("find pool sources of netfs type") + source_xml = conn.findStoragePoolSources('netfs', xmlstr, 0) + logger.info("pool sources xml description is:\n %s" % source_xml) + + ret = check_pool_sources(sourcehost, source_xml) + if ret: + logger.error("pool sources check failed") + return 1 + else: + logger.info("pool sources check succeed") + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + return 0 diff --git a/repos/storage/xmls/iscsi_pool_source.xml b/repos/storage/xmls/iscsi_pool_source.xml new file mode 100644 index 0000000..93216c5 --- /dev/null +++ b/repos/storage/xmls/iscsi_pool_source.xml @@ -0,0 +1,3 @@ +<source> + <host name="SOURCEHOST"/> +</source> diff --git a/repos/storage/xmls/netfs_pool_source.xml b/repos/storage/xmls/netfs_pool_source.xml new file mode 100644 index 0000000..6a2aeea --- /dev/null +++ b/repos/storage/xmls/netfs_pool_source.xml @@ -0,0 +1,4 @@ +<source> + <host name="SOURCEHOST"/> + <format type="nfs"/> +</source> -- 1.7.1

2 1

[libvirt] [test-API][PATCH] Add the volume clone case
by Wayne Sun 15 Jan '13

15 Jan '13

This is for volume clone testing by using createXMLFrom API * add the vol_clone case under storage it is general for all pool types * add cases into confs: cases/storage_dir.conf cases/storage_logical.conf cases/storage_netfs.conf * add variable 'defaultvolclonename' in global.cfg Signed-off-by: Wayne Sun <gsun(a)redhat.com> --- cases/storage_dir.conf | 14 +++++++ cases/storage_logical.conf | 14 +++++++ cases/storage_netfs.conf | 14 +++++++ global.cfg | 2 + repos/storage/vol_clone.py | 81 ++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 125 insertions(+), 0 deletions(-) create mode 100644 repos/storage/vol_clone.py diff --git a/cases/storage_dir.conf b/cases/storage_dir.conf index dcac700..38b349d 100644 --- a/cases/storage_dir.conf +++ b/cases/storage_dir.conf @@ -20,6 +20,20 @@ storage:create_dir_volume capacity $defaultvolumesize +storage:vol_clone + poolname + $defaultpoolname + volname + $defaultvolumename + clonevolname + $defaultvolclonename + +storage:delete_dir_volume + poolname + $defaultpoolname + volname + $defaultvolclonename + storage:delete_dir_volume poolname $defaultpoolname diff --git a/cases/storage_logical.conf b/cases/storage_logical.conf index 3334abd..d374dfa 100644 --- a/cases/storage_logical.conf +++ b/cases/storage_logical.conf @@ -22,6 +22,20 @@ storage:create_logical_volume capacity $defaultvolumesize +storage:vol_clone + poolname + $defaultpoolname + volname + $defaultvolumename + clonevolname + $defaultvolclonename + +storage:delete_logical_volume + poolname + $defaultpoolname + volname + $defaultvolclonename + storage:delete_logical_volume poolname $defaultpoolname diff --git a/cases/storage_netfs.conf b/cases/storage_netfs.conf index e764813..f486ff4 100644 --- a/cases/storage_netfs.conf +++ b/cases/storage_netfs.conf @@ -24,6 +24,20 @@ storage:create_netfs_volume capacity $defaultvolumesize +storage:vol_clone + poolname + $defaultpoolname + volname + $defaultvolumename + clonevolname + $defaultvolclonename + +storage:delete_netfs_volume + poolname + $defaultpoolname + volname + $defaultvolclonename + storage:delete_netfs_volume poolname $defaultpoolname diff --git a/global.cfg b/global.cfg index 9e28614..182acbd 100644 --- a/global.cfg +++ b/global.cfg @@ -156,6 +156,8 @@ defaultpoolname = test_api_pool defaultpoolpath = /var/lib/libvirt/images/dir_pool # default volume name for creating new volume defaultvolumename = test_api_volume +# default clone volume name for clone a volume +defaultvolclonename = test_clone_volume # default volume type for creating a new volume defaultvolumetype = raw # default volume capacity for creating a new volume diff --git a/repos/storage/vol_clone.py b/repos/storage/vol_clone.py new file mode 100644 index 0000000..abf5644 --- /dev/null +++ b/repos/storage/vol_clone.py @@ -0,0 +1,81 @@ +#!/usr/bin/env python +# volume clone testing + +import os +from xml.dom import minidom + +import libvirt +from libvirt import libvirtError + +from src import sharedmod + +required_params = ('poolname', 'volname', 'clonevolname',) +optional_params = {} + +def prepare_clone_xml(xmlstr, volname): + """prepare clone xmldesc by replace name element + with clone souce volume xml + """ + doc = minidom.parseString(xmlstr) + oldname = doc.getElementsByTagName("name")[0] + + newname = doc.createElement('name') + newnameval = doc.createTextNode(volname) + newname.appendChild(newnameval) + + volume = doc.getElementsByTagName('volume')[0] + + volume.replaceChild(newname, oldname) + newxmlstr = doc.toxml() + + return newxmlstr + +def vol_clone(params): + """volume clone testing""" + + global logger + logger = params['logger'] + poolname = params['poolname'] + volname = params['volname'] + clonevolname = params['clonevolname'] + + logger.info("the poolname is %s, volname is %s" % (poolname, volname)) + logger.info("the clone volume name is %s" % clonevolname) + + conn = sharedmod.libvirtobj['conn'] + try: + poolobj = conn.storagePoolLookupByName(poolname) + old_vol = poolobj.storageVolLookupByName(volname) + + xmlstr = old_vol.XMLDesc(0) + newxmlstr = prepare_clone_xml(xmlstr, clonevolname) + logger.debug("volume xml:\n%s" % newxmlstr) + + logger.info("clone volume %s from source volume %s" % + (clonevolname, volname)) + + old_volnum = poolobj.numOfVolumes() + + new_vol = poolobj.createXMLFrom(newxmlstr, old_vol, 0) + poolobj.refresh(0) + + new_volnum = poolobj.numOfVolumes() + + logger.debug("new cloned volume path is: %s" % new_vol.path()) + if os.access(new_vol.path(), os.R_OK): + logger.info("cloned volume path exist") + else: + logger.error("cloned volume path not exist") + return 1 + + if new_volnum > old_volnum: + logger.info("clone succeed") + else: + logger.error("clone failed") + return 1 + + except libvirtError, e: + logger.error("libvirt call failed: " + str(e)) + return 1 + + return 0 -- 1.7.1

2 1

[libvirt] [PATCH] docs: remove extra "
by Eric Blake 15 Jan '13

15 Jan '13

* tools/virsh.pod: Fix typo. --- Pushing under the trivial rule. tools/virsh.pod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index 3687a4d..c9ebc8f 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -2095,7 +2095,7 @@ destroy and re-start the network. I<command> is one of "add-first", "add-last", "add" (a synonym for add-last), "delete", or "modify". -I<section> is one of ""bridge", "domain", "ip", "ip-dhcp-host", +I<section> is one of "bridge", "domain", "ip", "ip-dhcp-host", "ip-dhcp-range", "forward", "forward-interface", "forward-pf", "portgroup", "dns-host", "dns-txt", or "dns-srv", each section being named by a concatenation of the xml element hierarchy leading to the -- 1.8.0.2

1 0

[libvirt] [PATCH v2] Build breaker securityselinuxhelper.c
by John Ferlan 14 Jan '13

14 Jan '13

v2: syntax-check - need space on # include Commit 907a39e7 missed adding the WITH_ATTR around #include <attr/xattr.h> resulting in a build failure: CC libsecurityselinuxhelper_la-securityselinuxhelper.lo securityselinuxhelper.c:27:24: fatal error: attr/xattr.h: No such file or directory compilation terminated. make[2]: *** [libsecurityselinuxhelper_la-securityselinuxhelper.lo] Error 1 make[2]: Leaving directory `/home/jferlan/libvirt.work/tests' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/home/jferlan/libvirt.work' make: *** [all] Error 2 --- tests/securityselinuxhelper.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/securityselinuxhelper.c b/tests/securityselinuxhelper.c index daad7dd..a9656a8 100644 --- a/tests/securityselinuxhelper.c +++ b/tests/securityselinuxhelper.c @@ -24,7 +24,9 @@ #include <string.h> #include <unistd.h> #include <errno.h> -#include <attr/xattr.h> +#if WITH_ATTR +# include <attr/xattr.h> +#endif /* -- 1.7.11.7

3 2

[libvirt] [PATCH] Don't try to include xattr.h if not available
by Guido Günther 14 Jan '13

14 Jan '13

--- tests/securityselinuxhelper.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/securityselinuxhelper.c b/tests/securityselinuxhelper.c index abe4d7c..bd5ea87 100644 --- a/tests/securityselinuxhelper.c +++ b/tests/securityselinuxhelper.c @@ -24,7 +24,9 @@ #include <string.h> #include <unistd.h> #include <errno.h> -#include <attr/xattr.h> +#ifdef WITH_ATTR +# include <attr/xattr.h> +#endif /* -- 1.7.10.4

1 0

[libvirt] [ANNOUNCE] libvirt-glib 0.1.5 release
by Daniel P. Berrange 14 Jan '13

14 Jan '13

I am pleased to announce that a new release of the libvirt-glib package, version 0.1.5, is now available from ftp://libvirt.org/libvirt/glib/ The packages are GPG signed with Key fingerprint: DAF3 A6FD B26B 6291 2D0E 8E3F BE86 EBB4 1510 4FDF (4096R) New in this release: - Add support for bridge interface types in guest XML - Add API to open a read-only connection - Add support for smartcard devices in guest XML - Remove storage volume from pool list after deleting it libvirt-glib comprises three distinct libraries: - libvirt-glib - Integrate with the GLib event loop and error handling - libvirt-gconfig - Representation of libvirt XML documents as GObjects - libvirt-gobject - Mapping of libvirt APIs into the GObject type system NB: While libvirt aims to be API/ABI stable forever, with libvirt-glib we are not yet guaranteeing that libvirt-glib libraries are API/ABI permanently stable. As of the 0.0.8 release, we have tentatively frozen the API/ABI with the intent of being longterm stable hereafter, but there is still a small chance we might find flaws requiring an API/ABI change. The likelihood of this is low, however, and we will strive to avoid it. Follow up comments about libvirt-glib should be directed to the regular libvir-list(a)redhat.com development list. Thanks to all the people involved in contributing to this release. Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

1 0

[libvirt] [PATCH] Build breaker securityselinuxhelper.c
by John Ferlan 14 Jan '13

14 Jan '13

Commit 907a39e7 missed adding the WITH_ATTR around #include <attr/xattr.h> resulting in a build failure: CC libsecurityselinuxhelper_la-securityselinuxhelper.lo securityselinuxhelper.c:27:24: fatal error: attr/xattr.h: No such file or directory compilation terminated. make[2]: *** [libsecurityselinuxhelper_la-securityselinuxhelper.lo] Error 1 make[2]: Leaving directory `/home/jferlan/libvirt.work/tests' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/home/jferlan/libvirt.work' make: *** [all] Error 2 --- tests/securityselinuxhelper.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/securityselinuxhelper.c b/tests/securityselinuxhelper.c index daad7dd..206d936 100644 --- a/tests/securityselinuxhelper.c +++ b/tests/securityselinuxhelper.c @@ -24,7 +24,9 @@ #include <string.h> #include <unistd.h> #include <errno.h> +#if WITH_ATTR #include <attr/xattr.h> +#endif /* -- 1.7.11.7

1 0

[libvirt] [PATCH] build: work around broken kernel header
by Eric Blake 14 Jan '13

14 Jan '13

I got this scary warning during ./configure on rawhide: checking linux/if_bridge.h usability... no checking linux/if_bridge.h presence... yes configure: WARNING: linux/if_bridge.h: present but cannot be compiled configure: WARNING: linux/if_bridge.h: check for missing prerequisite headers? configure: WARNING: linux/if_bridge.h: see the Autoconf documentation configure: WARNING: linux/if_bridge.h: section "Present But Cannot Be Compiled" configure: WARNING: linux/if_bridge.h: proceeding with the compiler's result configure: WARNING: ## ------------------------------------- ## configure: WARNING: ## Report this to libvir-list(a)redhat.com ## configure: WARNING: ## ------------------------------------- ## checking for linux/if_bridge.h... no * configure.ac (AC_CHECK_HEADERS): Provide struct in6_addr, since linux/if_bridge.h uses it without declaring it. --- Pushing under the build-breaker rule. I also plan on opening a BZ against the kernel headers. configure.ac | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index 753916c..31e7f80 100644 --- a/configure.ac +++ b/configure.ac @@ -978,7 +978,9 @@ dnl if test "$with_linux" = "yes"; then if test "$with_qemu" = "yes" || test "$with_lxc" = "yes" ; then AC_CHECK_HEADERS([linux/param.h linux/sockios.h linux/if_bridge.h linux/if_tun.h],, - AC_MSG_ERROR([You must install kernel-headers in order to compile libvirt with QEMU or LXC support])) + [AC_MSG_ERROR([You must install kernel-headers in order to compile libvirt with QEMU or LXC support])], + [[#include <netinet/ip6.h> + ]]) fi fi -- 1.7.1

1 2

[libvirt] [PATCH] maint: typo fix
by Eric Blake 14 Jan '13

14 Jan '13

I noticed this typo while configuring on a freshly-installed machine. * m4/virt-udev.m4: Correct pciaccess name. --- Pushing under the trivial rule. m4/virt-udev.m4 | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/m4/virt-udev.m4 b/m4/virt-udev.m4 index bf4623d..55673bf 100644 --- a/m4/virt-udev.m4 +++ b/m4/virt-udev.m4 @@ -22,7 +22,7 @@ AC_DEFUN([LIBVIRT_CHECK_UDEV],[ LIBVIRT_CHECK_PKG([UDEV], [libudev], [145]) if test "$with_udev" = "yes" && test "$with_pciaccess" != "yes" ; then - AC_MSG_ERROR([You must install the pciaccesss module to build with udev]) + AC_MSG_ERROR([You must install the pciaccess module to build with udev]) fi ]) -- 1.7.1

1 0

[libvirt] [PATCH 00/28] Convert more of configure.ac to use helper macros
by Daniel P. Berrange 14 Jan '13

14 Jan '13

This is a follow-on series from https://www.redhat.com/archives/libvir-list/2013-January/msg00647.html It converts all the remaining easy library/package checks to use the new helper macros. What's let are some tricky cases where we first check via pkg-config and then fallback to a manual check, or cases where we use a custom pkg-config like program

2 61

[libvirt] [PATCH] docs: generate links from plain text documentation
by Claudio Bley 14 Jan '13

14 Jan '13

There are two forms used throughout libvirt code comments, which are both supported by this patch. * plain links like e.g. http://www.libvirt.org/ * links enclosed in <> characters, e.g. <http://www.libvirt.org/> Signed-off-by: Claudio Bley <cbley(a)av-test.de> --- docs/newapi.xsl | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/docs/newapi.xsl b/docs/newapi.xsl index 24831ee..6d20358 100644 --- a/docs/newapi.xsl +++ b/docs/newapi.xsl @@ -62,6 +62,19 @@ <a href="libvirt-{$ref/@file}.html#{$ref/@name}"><xsl:value-of select="$stem"/></a> <xsl:value-of select="substring-after($token, $stem)"/> </xsl:when> + <xsl:when test="starts-with($token, 'http://')"> + <a href="{$token}"> + <xsl:value-of select="$token"/> + </a> + </xsl:when> + <xsl:when test="starts-with($token, '<http://') and contains($token, '>')"> + <xsl:variable name="link" + select="substring(substring-before($token, '>'), 2)"/> + <a href="{$link}"> + <xsl:value-of select="$link"/> + </a> + <xsl:value-of select="substring-after($token, '>')"/> + </xsl:when> <xsl:otherwise> <xsl:value-of select="$token"/> </xsl:otherwise> @@ -547,7 +560,11 @@ <h2 style="font-weight:bold;color:red;text-align:center">This module is deprecated</h2> </xsl:if> <xsl:if test="description"> - <p><xsl:value-of select="description"/></p> + <p> + <xsl:call-template name="dumptext"> + <xsl:with-param name="text" select="description"/> + </xsl:call-template> + </p> </xsl:if> </xsl:template> -- 1.7.9.5

1 0

[libvirt] [test-API][PATCH] Update activate pool case
by Wayne Sun 14 Jan '13

14 Jan '13

* delete the unused function * fix column length and some other nits Signed-off-by: Wayne Sun <gsun(a)redhat.com> --- repos/storage/activate_pool.py | 45 +++++++++++++++++---------------------- 1 files changed, 20 insertions(+), 25 deletions(-) diff --git a/repos/storage/activate_pool.py b/repos/storage/activate_pool.py index 064f356..d3adef8 100644 --- a/repos/storage/activate_pool.py +++ b/repos/storage/activate_pool.py @@ -1,8 +1,5 @@ #!/usr/bin/env python -import os -import re -import sys import time import libvirt @@ -13,42 +10,40 @@ from src import sharedmod required_params = ('poolname',) optional_params = {} -def display_pool_info(stg, logger): - """Display current storage pool information""" - logger.debug("current defined storage pool: %s" % \ - stg.defstorage_pool_list()) - logger.debug("current active storage pool: %s" % stg.storage_pool_list()) - def activate_pool(params): - """Undefine a storage pool that's been defined and inactive""" + """activate a storage pool that's been defined + and inactive + """ logger = params['logger'] poolname = params['poolname'] conn = sharedmod.libvirtobj['conn'] - pool_names = conn.listDefinedStoragePools() - pool_names += conn.listStoragePools() + try: + pool_names = conn.listDefinedStoragePools() + pool_names += conn.listStoragePools() - if poolname in pool_names: - poolobj = conn.storagePoolLookupByName(poolname) - else: - logger.error("%s not found\n" % poolname); - return 1 + if poolname in pool_names: + poolobj = conn.storagePoolLookupByName(poolname) + else: + logger.error("%s not found\n" % poolname); + return 1 - if poolobj.isActive(): - logger.error("%s is active already" % poolname) - return 1 + if poolobj.isActive(): + logger.error("%s is active already" % poolname) + return 1 - try: poolobj.create(0) time.sleep(5) if poolobj.isActive(): - logger.info("activating %s storage pool is SUCCESSFUL!!!" % poolname) + logger.info("activating %s storage pool is SUCCESSFUL!!!" % + poolname) else: - logger.info("activating %s storage pool is UNSUCCESSFUL!!!" % poolname) + logger.info("activating %s storage pool is UNSUCCESSFUL!!!" % + poolname) return 1 + except libvirtError, e: - logger.error("API error message: %s, error code is %s" \ - % (e.message, e.get_error_code())) + logger.error("libvirt call failed: " + str(e)) return 1 return 0 -- 1.7.1

2 1

[libvirt] [PATCH] qemu: Fix grouping of capabilities strings
by Peter Krempa 14 Jan '13

14 Jan '13

Commit f8d478b6dfc46a0ad2459844b96937599dec06e1 broke the grouping by five items. --- Pushed under the trivial rule. --- src/qemu/qemu_capabilities.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 25e8951..b166dd6 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -200,7 +200,8 @@ VIR_ENUM_IMPL(qemuCaps, QEMU_CAPS_LAST, "vmware-svga", "device-video-primary", "s390-sclp", - "usb-serial", + + "usb-serial", /* 125 */ "usb-net", ); -- 1.8.1

3 2

[libvirt] [PATCH 0/2] Improvements for apibuild.py
by Claudio Bley 14 Jan '13

14 Jan '13

Hi. Patch #1 just simplifies the code a bit. This requires python 2.2.3. Is that OK? Patch #2 fixes an issue with parsing top level comments. Looking at the libvirt HTML output, you can see that the license text at the top of the file ends prematurely. This happens because the "<http:" is regarded by apibuild.py as an info key, the part afterwards as its value. The patch restricts the characters allowed for the key. Alternatively, it would also be possible using only specific words. Claudio Bley (2): docs: simplify code docs: restrict the set of characters for info keys docs/apibuild.py | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) -- 1.7.9.5

3 9

[libvirt] [libvirt-glib] gconfig: Entertain bridge interface devices
by Zeeshan Ali (Khattak) 12 Jan '13

12 Jan '13

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> Currently we ignore bridge interface devices from domain XML. This patch fixes that. Pushed under trivial rule. --- libvirt-gconfig/libvirt-gconfig-domain-interface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface.c b/libvirt-gconfig/libvirt-gconfig-domain-interface.c index 2f7be5c..48fc6fd 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-interface.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface.c @@ -147,7 +147,7 @@ gvir_config_domain_interface_new_from_tree(GVirConfigXmlDoc *doc, } else if (g_str_equal(type, "user")) { gtype = GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_USER; } else if (g_str_equal(type, "bridge")) { - goto unimplemented; + gtype = GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_BRIDGE; } else if (g_str_equal(type, "direct")) { goto unimplemented; } else if (g_str_equal(type, "server")) { -- 1.8.0.2

1 0

[libvirt] [PATCH 0/2] Support PCI passthrough in libxl driver
by Chunyan Liu 11 Jan '13

11 Jan '13

This patch series is to add PCI passthrough support to libxenlight driver so that it can create VM with managed/non-managed host pci device defined. Chunyan Liu (2): libxl: add APIs to prepare/release host pci device libxl: support pci passthrough po/POTFILES.in | 1 + src/Makefile.am | 1 + src/libxl/libxl_conf.c | 44 ++++ src/libxl/libxl_conf.h | 5 +- src/libxl/libxl_driver.c | 16 ++ src/libxl/libxl_hostdev.c | 600 +++++++++++++++++++++++++++++++++++++++++++++ src/libxl/libxl_hostdev.h | 44 ++++ 7 files changed, 710 insertions(+), 1 deletions(-) create mode 100644 src/libxl/libxl_hostdev.c create mode 100644 src/libxl/libxl_hostdev.h -- 1.7.3.4

2 3

[libvirt] [PATCH] build: avoid m4_expand for RHEL 5
by Eric Blake 11 Jan '13

11 Jan '13

Problem introduced in commit cd699ed. * m4/virt-lib.m4 (LIBVIRT_CHECK_LIB, LIBVIRT_CHECK_PKG): Set up direct expansions, since autoconf 2.59 lacked m4_expand. --- Pushing under the build-breaker rule, once I finish testing. m4/virt-lib.m4 | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/m4/virt-lib.m4 b/m4/virt-lib.m4 index 771c376..778cd40 100644 --- a/m4/virt-lib.m4 +++ b/m4/virt-lib.m4 @@ -84,16 +84,16 @@ AC_DEFUN([LIBVIRT_CHECK_LIB],[ if test "x$with_var" != "xcheck"; then fail=1 fi - m4_expand(with_var[=no]) + with_var=no ]) if test "$fail" = "0" && test "x$with_var" != "xno" ; then AC_CHECK_HEADER([header_name], [ - m4_expand(with_var[=yes]) + with_var=yes ],[ if test "x$with_var" != "xcheck"; then fail=1 fi - m4_expand(with_var[=no]) + with_var=no ]) fi fi @@ -218,20 +218,20 @@ AC_DEFUN([LIBVIRT_CHECK_LIB_ALT],[ if test "x$with_var" != "xcheck"; then fail=1 fi - m4_expand(with_var[=no]) + with_var=no ]) ]) if test "$fail" = "0" && test "x$with_var" != "xno" ; then AC_CHECK_HEADER([header_name], [ - m4_expand(with_var[=yes]) + with_var=yes ],[ AC_CHECK_HEADER([header_name_alt], [ - m4_expand(with_var[=yes]) + with_var=yes ],[ if test "x$with_var" != "xcheck"; then fail=1 fi - m4_expand(with_var[=no]) + with_var=no ]) ]) fi @@ -326,12 +326,12 @@ AC_DEFUN([LIBVIRT_CHECK_PKG],[ fail=0 if test "x$with_var" != "xno" ; then PKG_CHECK_MODULES(check_name, pc_name[ >= ]pc_version, [ - m4_expand(with_var[=yes]) + with_var=yes ],[ if test "x$with_var" != "xcheck"; then fail=1 fi - m4_expand(with_var[=no]) + with_var=no ]) fi -- 1.8.0.2

1 0

[libvirt] [PATCH 0/9 v2] Refactor the configure.ac to reduce duplication
by Daniel P. Berrange 11 Jan '13

11 Jan '13

This is an update to https://www.redhat.com/archives/libvir-list/2012-September/msg01443.html Aside from the rebase, the main changes are all in the first patch, where I believe I addresses all Erics feedback with one exception. The exception was about the suggestion to support action-if-found, action-if-not-found, instead of the 2nd variant of macro. This is not actually possible, since the 2nd variant is not equivalent to a pair of calls to the 1st variant. To avoid flooding the list I've reduced this to just the first 9 patches. If these are approved there are another 30 patches to follow doing more conversions :-)

2 23

[libvirt] [PATCH] docs: add some more hacking tips
by Eric Blake 11 Jan '13

11 Jan '13

Based on a suggestion by John Ferlan: https://www.redhat.com/archives/libvir-list/2013-January/msg00158.html * docs/hacking.html.in: Add some commit message instructions. Mention the ./run script. * HACKING: Regenerate. --- I don't know how to make docs/hacking2.xsl delay the line wrapping until after the '(3) ' prefix due to the <li> is inserted; as a result, there is a line longer than 80 columns. Suggestions on improving the template are welcome. HACKING | 26 ++++++++++++++++++++++---- docs/hacking.html.in | 19 ++++++++++++++++++- 2 files changed, 40 insertions(+), 5 deletions(-) diff --git a/HACKING b/HACKING index 0ee988a..1b4dea3 100644 --- a/HACKING +++ b/HACKING @@ -58,7 +58,19 @@ though). -(3) Split large changes into a series of smaller patches, self-contained if +(3) In your commit message, make the summary line reasonably short (60 characters +is typical), followed by a blank line, followed by any longer description of +why your patch makes sense. If the patch fixes a regression, and you know what +commit introduced the problem, mentioning that is useful. If the patch +resolves a bugzilla report, mentioning the URL of the bug number is useful; +but also summarize the issue rather than making all readers follow the link. +You can use 'git shortlog -30' to get an idea of typical summary lines. +Libvirt does not currently attach any meaning to Signed-off-by: lines, so it +is up to you if you want to include or omit them in the commit message. + + + +(4) Split large changes into a series of smaller patches, self-contained if possible, with an explanation of each patch and an explanation of how the sequence of patches fits together. Moreover, please keep in mind that it's required to be able to compile cleanly (*including* "make check" and "make @@ -69,10 +81,10 @@ things). -(4) Make sure your patches apply against libvirt GIT. Developers only follow GIT +(5) Make sure your patches apply against libvirt GIT. Developers only follow GIT and don't care much about released versions. -(5) Run the automated tests on your code before submitting any changes. In +(6) Run the automated tests on your code before submitting any changes. In particular, configure with compile warnings set to -Werror. This is done automatically for a git checkout; from a tarball, use: @@ -97,7 +109,13 @@ Also, individual tests can be run from inside the "tests/" directory, like: ./qemuxml2xmltest -(6) Update tests and/or documentation, particularly if you are adding a new +There is also a "./run" script at the top level, to make it easier to run +uninstalled programs, as well as to wrap invocations of various tests under +gdb or valgrind. + + + +(7) Update tests and/or documentation, particularly if you are adding a new feature or changing the output of a program. diff --git a/docs/hacking.html.in b/docs/hacking.html.in index 40acdbb..17136f0 100644 --- a/docs/hacking.html.in +++ b/docs/hacking.html.in @@ -59,6 +59,21 @@ version if needed though).</p> </li> + <li><p>In your commit message, make the summary line reasonably + short (60 characters is typical), followed by a blank line, + followed by any longer description of why your patch makes + sense. If the patch fixes a regression, and you know what + commit introduced the problem, mentioning that is useful. + If the patch resolves a bugzilla report, mentioning the URL + of the bug number is useful; but also summarize the issue + rather than making all readers follow the link. You can use + 'git shortlog -30' to get an idea of typical summary lines. + Libvirt does not currently attach any meaning to + Signed-off-by: lines, so it is up to you if you want to + include or omit them in the commit message. + </p> + </li> + <li><p>Split large changes into a series of smaller patches, self-contained if possible, with an explanation of each patch and an explanation of how the sequence of patches fits @@ -110,7 +125,9 @@ <pre> ./qemuxml2xmltest </pre> - + <p>There is also a <code>./run</code> script at the top level, + to make it easier to run uninstalled programs, as well as to + wrap invocations of various tests under gdb or valgrind.</p> </li> <li>Update tests and/or documentation, particularly if you are adding a new feature or changing the output of a program.</li> -- 1.8.0.2

3 6

[libvirt] [PATCH] build: fix incomplete WITH_SASL conversion
by Eric Blake 11 Jan '13

11 Jan '13

Commit 321a7d53 missed a spot. * src/rpc/virnetsocket.c (virNetSocketPreExecRestart): Use right conditional. --- Pushing under the build-breaker rule. src/rpc/virnetsocket.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 549aabe..00c6121 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -1,7 +1,7 @@ /* * virnetsocket.c: generic network socket handling * - * Copyright (C) 2006-2012 Red Hat, Inc. + * Copyright (C) 2006-2013 Red Hat, Inc. * Copyright (C) 2006 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -943,7 +943,7 @@ virJSONValuePtr virNetSocketPreExecRestart(virNetSocketPtr sock) virMutexLock(&sock->lock); -#if HAVE_SASL +#if WITH_SASL if (sock->saslSession) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("Unable to save socket state when SASL session is active")); -- 1.8.0.2

1 0

[libvirt] [libvirt-glib] gobject: API to open read-only connection to libvirt
by Zeeshan Ali (Khattak) 11 Jan '13

11 Jan '13

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> --- libvirt-gobject/libvirt-gobject-connection.c | 99 +++++++++++++++++++++++++--- libvirt-gobject/libvirt-gobject-connection.h | 10 +++ libvirt-gobject/libvirt-gobject.sym | 7 ++ 3 files changed, 107 insertions(+), 9 deletions(-) diff --git a/libvirt-gobject/libvirt-gobject-connection.c b/libvirt-gobject/libvirt-gobject-connection.c index 3157a66..558ed2a 100644 --- a/libvirt-gobject/libvirt-gobject-connection.c +++ b/libvirt-gobject/libvirt-gobject-connection.c @@ -407,14 +407,10 @@ static int domain_event_cb(virConnectPtr conn G_GNUC_UNUSED, return 0; } -/** - * gvir_connection_open: - * @conn: a #GVirConnection - * @cancellable: (allow-none)(transfer none): cancellation object - */ -gboolean gvir_connection_open(GVirConnection *conn, - GCancellable *cancellable, - GError **err) +static gboolean _gvir_connection_open(GVirConnection *conn, + gboolean read_only, + GCancellable *cancellable, + GError **err) { GVirConnectionPrivate *priv; @@ -438,7 +434,11 @@ gboolean gvir_connection_open(GVirConnection *conn, return FALSE; } - if (!(priv->conn = virConnectOpen(priv->uri))) { + if (read_only) + priv->conn = virConnectOpenReadOnly(priv->uri); + else + priv->conn = virConnectOpen(priv->uri); + if (!priv->conn) { gvir_set_error(err, GVIR_CONNECTION_ERROR, 0, "Unable to open %s", @@ -472,6 +472,24 @@ gboolean gvir_connection_open(GVirConnection *conn, return TRUE; } +/** + * gvir_connection_open: + * @conn: a #GVirConnection + * @cancellable: (allow-none)(transfer none): cancellation object + */ +gboolean gvir_connection_open(GVirConnection *conn, + GCancellable *cancellable, + GError **err) +{ + return _gvir_connection_open(conn, FALSE, cancellable, err); +} + +gboolean gvir_connection_open_read_only(GVirConnection *conn, + GCancellable *cancellable, + GError **err) +{ + return _gvir_connection_open(conn, TRUE, cancellable, err); +} static void gvir_connection_open_helper(GSimpleAsyncResult *res, @@ -537,6 +555,69 @@ gboolean gvir_connection_open_finish(GVirConnection *conn, return TRUE; } +static void +gvir_connection_open_read_only_helper(GSimpleAsyncResult *res, + GObject *object, + GCancellable *cancellable) +{ + GVirConnection *conn = GVIR_CONNECTION(object); + GError *err = NULL; + + if (!gvir_connection_open_read_only(conn, cancellable, &err)) { + g_simple_async_result_set_from_error(res, err); + g_error_free(err); + } +} + + +/** + * gvir_connection_open_read_only_async: + * @conn: a #GVirConnection + * @cancellable: (allow-none)(transfer none): cancellation object + * @callback: (scope async): completion callback + * @user_data: (closure): opaque data for callback + */ +void gvir_connection_open_read_only_async(GVirConnection *conn, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + GSimpleAsyncResult *res; + + g_return_if_fail(GVIR_IS_CONNECTION(conn)); + g_return_if_fail((cancellable == NULL) || G_IS_CANCELLABLE(cancellable)); + + res = g_simple_async_result_new(G_OBJECT(conn), + callback, + user_data, + gvir_connection_open_read_only_async); + g_simple_async_result_run_in_thread(res, + gvir_connection_open_read_only_helper, + G_PRIORITY_DEFAULT, + cancellable); + g_object_unref(res); +} + + +/** + * gvir_connection_open_read_only_finish: + * @conn: a #GVirConnection + * @result: (transfer none): async method result + */ +gboolean gvir_connection_open_read_only_finish(GVirConnection *conn, + GAsyncResult *result, + GError **err) +{ + g_return_val_if_fail(GVIR_IS_CONNECTION(conn), FALSE); + g_return_val_if_fail(g_simple_async_result_is_valid(result, G_OBJECT(conn), + gvir_connection_open_read_only_async), + FALSE); + + if (g_simple_async_result_propagate_error(G_SIMPLE_ASYNC_RESULT(result), err)) + return FALSE; + + return TRUE; +} gboolean gvir_connection_is_open(GVirConnection *conn) { diff --git a/libvirt-gobject/libvirt-gobject-connection.h b/libvirt-gobject/libvirt-gobject-connection.h index f91ca05..d2b0a9f 100644 --- a/libvirt-gobject/libvirt-gobject-connection.h +++ b/libvirt-gobject/libvirt-gobject-connection.h @@ -88,6 +88,9 @@ GVirConnection *gvir_connection_new(const char *uri); gboolean gvir_connection_open(GVirConnection *conn, GCancellable *cancellable, GError **err); +gboolean gvir_connection_open_read_only(GVirConnection *conn, + GCancellable *cancellable, + GError **err); void gvir_connection_open_async(GVirConnection *conn, GCancellable *cancellable, GAsyncReadyCallback callback, @@ -95,6 +98,13 @@ void gvir_connection_open_async(GVirConnection *conn, gboolean gvir_connection_open_finish(GVirConnection *conn, GAsyncResult *result, GError **err); +void gvir_connection_open_read_only_async(GVirConnection *conn, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); +gboolean gvir_connection_open_read_only_finish(GVirConnection *conn, + GAsyncResult *result, + GError **err); gboolean gvir_connection_is_open(GVirConnection *conn); void gvir_connection_close(GVirConnection *conn); diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index 8743b88..b02b365 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -224,4 +224,11 @@ LIBVIRT_GOBJECT_0.1.4 { gvir_storage_pool_undefine_finish; } LIBVIRT_GOBJECT_0.1.3; +LIBVIRT_GOBJECT_0.1.5 { + global: + gvir_connection_open_read_only; + gvir_connection_open_read_only_async; + gvir_connection_open_read_only_finish; +} LIBVIRT_GOBJECT_0.1.4; + # .... define new API here using predicted next version number .... -- 1.8.0.2

2 4

[libvirt] [libvirt-java] git commit: Fix memory leaks for libvirt functions returning newly allocated memory. (3220de)
by Wido den Hollander 11 Jan '13

11 Jan '13

Hi, I just wanted to build the latest libvirt-java master on my Ubuntu 12.04 laptop and it failed due to this commit. The commit message says: "Use JNA's Native.free() method to free memory. This requires JNA version 3.3.0 or later." Ubuntu 12.04 comes with JNA 3.2.7-4, so the build fails. Is there a way to still build and run on Ubuntu 12.04? This is a 5-year LTS release from Ubuntu so we'll be seeing this around until 2017. I'm working on the patches I sent last week and got some good feedback. We (the Apache CloudStack project) rely heavily on libvirt-java for virtual machine management when using the KVM Hypervisor, so I'd like to keep the bindings working on Ubuntu 12.04 :) Thanks, Wido

1 0