- Devel - libvirt List Archives

[libvirt] [test-API][PATCH] Fix a typo xml_file_path
by hongming 06 Nov '12

06 Nov '12

Change the undefined variable "xml_file_path" to "file_path" --- src/testcasexml.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/testcasexml.py b/src/testcasexml.py index 8485d3d..4cbdc03 100644 --- a/src/testcasexml.py +++ b/src/testcasexml.py @@ -31,7 +31,7 @@ def xml_file_to_str(proxy_obj, mod_case, case_params): text = fh.read() fh.close() else: - raise exception.FileDoesNotExist("xml file %s doesn't exist" % xml_file_path) + raise exception.FileDoesNotExist("xml file %s doesn't exist" % file_path) # replace the params that in testcase.conf first for (key, value) in case_params.items(): -- 1.7.7.6

2 1

[libvirt] [PATCH v6 1/6] add a configure option --with-fuse to prepare introduction of fuse support for libvirt lxc
by Gao feng 06 Nov '12

06 Nov '12

add a configure option --with-fuse to prepare introduction of fuse support for libvirt lxc. With help from Daniel Signed-off-by: Gao feng <gaofeng(a)cn.fujitsu.com> --- configure.ac | 36 ++++++++++++++++++++++++++++++++++++ libvirt.spec.in | 9 +++++++++ 2 files changed, 45 insertions(+), 0 deletions(-) diff --git a/configure.ac b/configure.ac index 8810efd..0cac7fd 100644 --- a/configure.ac +++ b/configure.ac @@ -115,6 +115,7 @@ LIBSSH2_REQUIRED="1.0" LIBSSH2_TRANSPORT_REQUIRED="1.3" LIBBLKID_REQUIRED="2.17" DBUS_REQUIRED="1.0.0" +FUSE_REQUIRED="2.8.6" dnl Checks for C compiler. AC_PROG_CC @@ -1857,6 +1858,36 @@ AC_SUBST([CAPNG_CFLAGS]) AC_SUBST([CAPNG_LIBS]) +dnl libfuse +AC_ARG_WITH([fuse], + AC_HELP_STRING([--with-fuse], [use libfuse to proivde fuse filesystem support for libvirt lxc]), + [], + [with_fuse=check]) +dnl +dnl This check looks for 'fuse' +dnl +FUSE_CFLAGS= +FUSE_LIBS= +if test "x$with_fuse" != "xno"; then + PKG_CHECK_MODULES([FUSE], [fuse >= $FUSE_REQUIRED], + [with_fuse=yes], [ + if test "x$with_fuse" = "xcheck" ; then + with_fuse=no + else + AC_MSG_ERROR( + [You must install fuse Library to compile libvirt]) + fi + ]) + if test "x$with_fuse" = "xyes" ; then + FUSE_LIBS="-lfuse" + FUSE_CFLAGS="-D_FILE_OFFSET_BITS=64" + AC_DEFINE_UNQUOTED([HAVE_FUSE], 1, [whether fuse is available for libvirt lxc]) + fi +fi +AM_CONDITIONAL([HAVE_FUSE], [test "x$with_fuse" = "xyes"]) +AC_SUBST([FUSE_CFLAGS]) +AC_SUBST([FUSE_LIBS]) + dnl virsh libraries AC_CHECK_HEADERS([readline/readline.h]) @@ -3161,6 +3192,11 @@ AC_MSG_NOTICE([ capng: $CAPNG_CFLAGS $CAPNG_LIBS]) else AC_MSG_NOTICE([ capng: no]) fi +if test "$with_fuse" = "yes" ; then +AC_MSG_NOTICE([ fuse: $FUSE_CFLAGS $FUSE_LIBS]) +else +AC_MSG_NOTICE([ fuse: no]) +fi if test "$with_xen" = "yes" ; then AC_MSG_NOTICE([ xen: $XEN_CFLAGS $XEN_LIBS]) else diff --git a/libvirt.spec.in b/libvirt.spec.in index 511949e..8fe0d77 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -93,6 +93,7 @@ # A few optional bits off by default, we enable later %define with_polkit 0%{!?_without_polkit:0} %define with_capng 0%{!?_without_capng:0} +%define with_fuse 0%{!?_without_fuse:0} %define with_netcf 0%{!?_without_netcf:0} %define with_udev 0%{!?_without_udev:0} %define with_hal 0%{!?_without_hal:0} @@ -503,6 +504,9 @@ BuildRequires: numactl-devel %if %{with_capng} BuildRequires: libcap-ng-devel >= 0.5.0 %endif +%if %{with_fuse} +BuildRequires: fuse-devel >= 2.8.6 +%endif %if %{with_phyp} || %{with_libssh2_transport} %if %{with_libssh2_transport} BuildRequires: libssh2-devel >= 1.3.0 @@ -1186,6 +1190,10 @@ of recent versions of Linux (and other OSes). %define _without_capng --without-capng %endif +%if ! %{with_fuse} +%define _without_fuse --without-fuse +%endif + %if ! %{with_netcf} %define _without_netcf --without-netcf %endif @@ -1289,6 +1297,7 @@ autoreconf -if %{?_without_numactl} \ %{?_without_numad} \ %{?_without_capng} \ + %{?_without_fuse} \ %{?_without_netcf} \ %{?_without_selinux} \ %{?_with_selinux_mount} \ -- 1.7.7.6

3 10

[libvirt] Patch replaces scriptlets with new systemd macros
by Václav Pavlín 06 Nov '12

06 Nov '12

Hi, I created patch for spec file to follow changes in guidelines with respect to new systemd macros (see https://fedoraproject.org/wiki/Packaging:ScriptletSnippets#Systemd)

4 12

[libvirt] [PATCH] iohelper: Don't report errors on special FDs
by Michal Privoznik 05 Nov '12

05 Nov '12

Some FDs may not implement fdatasync() functionality, e.g. pipes or stdout. In that case EINVAL or EROFS is returned. We don't want to fail then nor report any error. Reported-by: Christophe Fergeau <cfergeau(a)redhat.com> --- I know that those two 'if-s' can be joined together but it just looks weird to me. src/util/iohelper.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/util/iohelper.c b/src/util/iohelper.c index 860e14a..b8c91aa 100644 --- a/src/util/iohelper.c +++ b/src/util/iohelper.c @@ -181,8 +181,11 @@ runIO(const char *path, int fd, int oflags, unsigned long long length) /* Ensure all data is written */ if (fdatasync(fdout) < 0) { - virReportSystemError(errno, _("unable to fsync %s"), fdoutname); - goto cleanup; + if (errno != EINVAL && errno != EROFS) { + /* fdatasync() may fail on some special FDs like stdout or pipes */ + virReportSystemError(errno, _("unable to fsync %s"), fdoutname); + goto cleanup; + } } ret = 0; -- 1.7.8.6

2 2

[libvirt] [PATCH v2] gitignore: ignore more files
by liguang 05 Nov '12

05 Nov '12

ignore cscope.in.out, cscope.po.out Signed-off-by: liguang <lig.fnst(a)cn.fujitsu.com> --- .gitignore | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 79a055b..12fbe0e 100644 --- a/.gitignore +++ b/.gitignore @@ -188,7 +188,9 @@ Makefile.in TAGS coverage cscope.files +cscope.in.out cscope.out +cscope.po.out results.log stamp-h stamp-h.in -- 1.7.1

2 1

[libvirt] [PATCH] iohelper: Don't try to fdatasync(stdout)
by Christophe Fergeau 05 Nov '12

05 Nov '12

After upgrading to libvirt 1.0.0, I've started getting warnings from libvirt: (gnome-boxes:5965): Libvirt.GObject-CRITICAL **: cannot finish stream: internal error libvirt_iohelper: unable to fsync stdout: Invalid argument On further investigation, in iohelper.c:runIO(), fdatasync can get called on STDOUT_FILENO, which indeed returns EINVAL when this happens. After making sure that fdout is not STDOUT_FILENO, this warning goes away. --- src/util/iohelper.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/util/iohelper.c b/src/util/iohelper.c index 860e14a..f8a8ee3 100644 --- a/src/util/iohelper.c +++ b/src/util/iohelper.c @@ -180,9 +180,11 @@ runIO(const char *path, int fd, int oflags, unsigned long long length) } /* Ensure all data is written */ - if (fdatasync(fdout) < 0) { - virReportSystemError(errno, _("unable to fsync %s"), fdoutname); - goto cleanup; + if (fdout != STDOUT_FILENO) { + if (fdatasync(fdout) < 0) { + virReportSystemError(errno, _("unable to fsync %s"), fdoutname); + goto cleanup; + } } ret = 0; -- 1.7.12.1

2 1

[libvirt] jna problem
by Matthieu Simonin 05 Nov '12

05 Nov '12

Hello, Since this morning i got this exception throwed by the libvirt-java : java.lang.UnsatisfiedLinkError: com.sun.jna.Native.pointerSize()I at com.sun.jna.Native.pointerSize(Native Method) What could be the problem ? Is it related to an update of my distribution ? Bye, Matt

2 1

[libvirt] [PATCHv4 00/51] another round of snapshot patches
by Eric Blake 05 Nov '12

05 Nov '12

I think I've addressed most findings from round 3 - by implementing the ability to redefine a snapshot, it becomes possible to restore snapshot hierarchy when recreating a transient domain by the same name. New goodies in this round: several bug fixes, add virsh snapshot-edit, drop undefine --snapshots-full (you can only remove snapshot metadata on undefine). I tested as I went, but this went through so many rebases that there may be some nasties that snuck in; but I wanted to get this posted now. I also know that I'm missing at least one major feature requested in the v3 review: namely, transient domains _should_ auto-remove snapshot metadata files when they halt, but right now aren't doing that. v3 was at: https://www.redhat.com/archives/libvir-list/2011-August/msg01132.html Also available here: git fetch git://repo.or.cz/libvirt/ericb.git snapshot or browse online at: http://repo.or.cz/w/libvirt/ericb.git/shortlog/refs/heads/snapshot I'm also trying to group things by several bugzilla related to various patches (looks like I still need to create a few): Eric Blake (51): https://bugzilla.redhat.com/show_bug.cgi?id=674537 snapshot: fix corner case on OOM during creation https://bugzilla.redhat.com/show_bug.cgi?id=733762 snapshot: better events when starting paused snapshot: fine-tune ability to start paused snapshot: expose --running and --paused in virsh snapshot: fine-tune qemu saved images starting paused snapshot: improve reverting to qemu paused snapshots snapshot: properly revert qemu to offline snapshots snapshot: fine-tune qemu snapshot revert states no bug filed yet... should be one about no stale metadata snapshot: allow deletion of just snapshot metadata snapshot: add snapshot-list --parent to virsh https://bugzilla.redhat.com/show_bug.cgi?id=733529 snapshot: speed up snapshot location snapshot: avoid crash when deleting qemu snapshots snapshot: track current domain across deletion of children snapshot: simplify acting on just children no bug filed yet... should be one about no stale metadata snapshot: let qemu discard only snapshot metadata snapshot: identify which snapshots have metadata snapshot: reflect new dumpxml and list options in virsh snapshot: identify qemu snapshot roots snapshot: allow recreation of metadata snapshot: refactor virsh snapshot creation snapshot: improve virsh snapshot-create, add snapshot-edit snapshot: add qemu snapshot creation without metadata no bug filed yet... should be one about snapshot migration snapshot: add qemu snapshot redefine support snapshot: prevent stranding snapshot data on domain destruction snapshot: teach virsh about new undefine flags snapshot: refactor some qemu code snapshot: cache qemu-img location snapshot: support new undefine flags in qemu snapshot: prevent migration from stranding snapshot data https://bugzilla.redhat.com/show_bug.cgi?id=638510 snapshot: refactor domain xml output snapshot: allow full domain xml in snapshot snapshot: correctly escape generated xml snapshot: update rng to support full domain in xml snapshot: store qemu domain details in xml snapshot: additions to domain xml for disks snapshot: reject transient disks where code is not ready snapshot: introduce new deletion flag snapshot: expose new delete flag in virsh snapshot: allow halting after snapshot snapshot: expose halt-after-creation in virsh snapshot: wire up new qemu monitor command snapshot: support extra state in snapshots snapshot: add <disks> to snapshot xml snapshot: also support disks by path snapshot: add virsh domblklist command snapshot: add flag for requesting disk snapshot snapshot: wire up disk-only flag to snapshot-create snapshot: reject unimplemented disk snapshot features snapshot: make it possible to audit external snapshot snapshot: wire up live qemu disk snapshots snapshot: use SELinux and lock manager with external snapshots docs/formatdomain.html.in | 40 +- docs/formatsnapshot.html.in | 269 ++- docs/schemas/Makefile.am | 1 + docs/schemas/domain.rng | 2555 +------------------- docs/schemas/{domain.rng => domaincommon.rng} | 32 +- docs/schemas/domainsnapshot.rng | 84 +- examples/domain-events/events-c/event-test.c | 37 +- include/libvirt/libvirt.h.in | 66 +- src/conf/domain_audit.c | 12 +- src/conf/domain_audit.h | 4 +- src/conf/domain_conf.c | 902 ++++++-- src/conf/domain_conf.h | 76 +- src/esx/esx_driver.c | 38 +- src/libvirt.c | 256 ++- src/libvirt_private.syms | 8 + src/libxl/libxl_conf.c | 5 + src/libxl/libxl_driver.c | 11 +- src/qemu/qemu_command.c | 5 + src/qemu/qemu_conf.h | 1 + src/qemu/qemu_driver.c | 1532 +++++++++--- src/qemu/qemu_hotplug.c | 18 +- src/qemu/qemu_migration.c | 48 +- src/qemu/qemu_migration.h | 2 - src/qemu/qemu_monitor.c | 24 + src/qemu/qemu_monitor.h | 4 + src/qemu/qemu_monitor_json.c | 33 + src/qemu/qemu_monitor_json.h | 4 + src/qemu/qemu_monitor_text.c | 40 + src/qemu/qemu_monitor_text.h | 4 + src/qemu/qemu_process.c | 11 +- src/uml/uml_driver.c | 56 +- src/vbox/vbox_tmpl.c | 43 +- src/xen/xend_internal.c | 12 +- src/xenxs/xen_sxpr.c | 5 + src/xenxs/xen_xm.c | 5 + tests/domainsnapshotxml2xmlin/disk_snapshot.xml | 16 + tests/domainsnapshotxml2xmlout/disk_snapshot.xml | 77 + tests/domainsnapshotxml2xmlout/full_domain.xml | 35 + .../qemuxml2argv-disk-snapshot.args | 7 + .../qemuxml2argv-disk-snapshot.xml | 39 + .../qemuxml2argv-disk-transient.xml | 27 + tests/qemuxml2argvtest.c | 2 + tests/virsh-optparse | 20 + tools/virsh.c | 772 +++++- tools/virsh.pod | 214 ++- 45 files changed, 3978 insertions(+), 3474 deletions(-) copy docs/schemas/{domain.rng => domaincommon.rng} (98%) create mode 100644 tests/domainsnapshotxml2xmlin/disk_snapshot.xml create mode 100644 tests/domainsnapshotxml2xmlout/disk_snapshot.xml create mode 100644 tests/domainsnapshotxml2xmlout/full_domain.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-snapshot.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-snapshot.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-disk-transient.xml -- 1.7.4.4

4 72

[libvirt] [PATCH][reordered] gitignore: ignore more files
by liguang 05 Nov '12

05 Nov '12

ignore *.patch, cscope.po.out, cscope.in.out Signed-off-by: liguang <lig.fnst(a)cn.fujitsu.com> --- .gitignore | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 1cd2d45..3672131 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,7 @@ *.loT *.o *.orig +*.patch *.pyc *.rej *.s @@ -184,7 +185,9 @@ Makefile.in TAGS coverage cscope.files +cscope.in.out cscope.out +cscope.po.out results.log stamp-h stamp-h.in -- 1.7.1

4 3

[libvirt] [PATCH v5 1/6] add a configure option --with-fuse to prepare introduction of fuse support for libvirt lxc
by Gao feng 05 Nov '12

05 Nov '12

add a configure option --with-fuse to prepare introduction of fuse support for libvirt lxc. With help from Daniel Signed-off-by: Gao feng <gaofeng(a)cn.fujitsu.com> --- configure.ac | 36 ++++++++++++++++++++++++++++++++++++ libvirt.spec.in | 9 +++++++++ 2 files changed, 45 insertions(+), 0 deletions(-) diff --git a/configure.ac b/configure.ac index 8810efd..0cac7fd 100644 --- a/configure.ac +++ b/configure.ac @@ -115,6 +115,7 @@ LIBSSH2_REQUIRED="1.0" LIBSSH2_TRANSPORT_REQUIRED="1.3" LIBBLKID_REQUIRED="2.17" DBUS_REQUIRED="1.0.0" +FUSE_REQUIRED="2.8.6" dnl Checks for C compiler. AC_PROG_CC @@ -1857,6 +1858,36 @@ AC_SUBST([CAPNG_CFLAGS]) AC_SUBST([CAPNG_LIBS]) +dnl libfuse +AC_ARG_WITH([fuse], + AC_HELP_STRING([--with-fuse], [use libfuse to proivde fuse filesystem support for libvirt lxc]), + [], + [with_fuse=check]) +dnl +dnl This check looks for 'fuse' +dnl +FUSE_CFLAGS= +FUSE_LIBS= +if test "x$with_fuse" != "xno"; then + PKG_CHECK_MODULES([FUSE], [fuse >= $FUSE_REQUIRED], + [with_fuse=yes], [ + if test "x$with_fuse" = "xcheck" ; then + with_fuse=no + else + AC_MSG_ERROR( + [You must install fuse Library to compile libvirt]) + fi + ]) + if test "x$with_fuse" = "xyes" ; then + FUSE_LIBS="-lfuse" + FUSE_CFLAGS="-D_FILE_OFFSET_BITS=64" + AC_DEFINE_UNQUOTED([HAVE_FUSE], 1, [whether fuse is available for libvirt lxc]) + fi +fi +AM_CONDITIONAL([HAVE_FUSE], [test "x$with_fuse" = "xyes"]) +AC_SUBST([FUSE_CFLAGS]) +AC_SUBST([FUSE_LIBS]) + dnl virsh libraries AC_CHECK_HEADERS([readline/readline.h]) @@ -3161,6 +3192,11 @@ AC_MSG_NOTICE([ capng: $CAPNG_CFLAGS $CAPNG_LIBS]) else AC_MSG_NOTICE([ capng: no]) fi +if test "$with_fuse" = "yes" ; then +AC_MSG_NOTICE([ fuse: $FUSE_CFLAGS $FUSE_LIBS]) +else +AC_MSG_NOTICE([ fuse: no]) +fi if test "$with_xen" = "yes" ; then AC_MSG_NOTICE([ xen: $XEN_CFLAGS $XEN_LIBS]) else diff --git a/libvirt.spec.in b/libvirt.spec.in index 511949e..8fe0d77 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -93,6 +93,7 @@ # A few optional bits off by default, we enable later %define with_polkit 0%{!?_without_polkit:0} %define with_capng 0%{!?_without_capng:0} +%define with_fuse 0%{!?_without_fuse:0} %define with_netcf 0%{!?_without_netcf:0} %define with_udev 0%{!?_without_udev:0} %define with_hal 0%{!?_without_hal:0} @@ -503,6 +504,9 @@ BuildRequires: numactl-devel %if %{with_capng} BuildRequires: libcap-ng-devel >= 0.5.0 %endif +%if %{with_fuse} +BuildRequires: fuse-devel >= 2.8.6 +%endif %if %{with_phyp} || %{with_libssh2_transport} %if %{with_libssh2_transport} BuildRequires: libssh2-devel >= 1.3.0 @@ -1186,6 +1190,10 @@ of recent versions of Linux (and other OSes). %define _without_capng --without-capng %endif +%if ! %{with_fuse} +%define _without_fuse --without-fuse +%endif + %if ! %{with_netcf} %define _without_netcf --without-netcf %endif @@ -1289,6 +1297,7 @@ autoreconf -if %{?_without_numactl} \ %{?_without_numad} \ %{?_without_capng} \ + %{?_without_fuse} \ %{?_without_netcf} \ %{?_without_selinux} \ %{?_with_selinux_mount} \ -- 1.7.7.6

2 14

[libvirt] for initial review: updated doc for DHCPv6
by Gene Czarcinski 04 Nov '12

04 Nov '12

I have taken a shot at updating the libvirt documentation for DHCPv6 support and am attaching the resulting patch. This is a sanity check and not a submission. I will submit the documentation patch when I submit the patches which actually do the work. Is there any other documentation I should be updating? Gene

1 0

[libvirt] [PATCH 0/2] Add new CPU flags and the AMD Opteron G5 model
by Peter Krempa 03 Nov '12

03 Nov '12

This series is based on the recent upstream submission of the new AMD CPU model. Peter Krempa (2): cpu: Add newly added cpu flags cpu: Add AMD Opteron G5 cpu model src/cpu/cpu_map.xml | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) -- 1.7.12.4

2 4

[libvirt] Release of libvirt-1.0.0
by Daniel Veillard 03 Nov '12

03 Nov '12

Well we just crossed that important milestone in the life of any project, so congratulation everybody the 1.0.0 release is out !!! For a bit of history, this is actually the 7th birthday of the project accounted from the first commit, on Nov 2 2005, public from day one ! CVS converted commit labelled "Initial revision" 2005-11-02 20:50:21 At the time I had one hypervisor (Xen) to play with, and except the general idea and some of the earlier entry point there is nothing left from that first commit, and that is just fine :-) ! Anyway back to useful informations, the release is as usual at: ftp://libvirt.org/libvirt/ as a tarball and signed rpms. For just over a month of development we are at nearly 350 commits so the pace is apparently not slowing down! There is a number of important improvements, but for a change I would like to point out the silent work of our translators communities, work being done in the framework of Transifex: https://www.transifex.com/projects/p/libvirt/ we have around 10 languages with near complete translation, historically we had 2 complete localization : japanese and ukrainian at 100% and updating within hours of a new pot source file being pushed, in the last month 5 new indian languages have completed, and various others have made significant improvements. So to those group of people helping mostly silently in the background I want to say Thank You, your work makes a difference !!! Features: - virNodeGetCPUMap: Define public API. (Viktor Mihajlovski) - Add systemd journal support (Daniel P. Berrange) - Add a qemu capabilities cache manager (Daniel P. Berrange) - USB migration support (Jiri Denemark) - various improvement and fixes when using QMP QEmu interface - Support for Xen 4.2 (Jim Fehlig) - Lot of localization enhancements (Transifex teams) Documentation: - net-update docs: s/domain/network/ (Michal Privoznik) - docs: libvirtd no longer uses abstract namespace (Eric Blake) - documentation: HTML tag fix (Philipp Hahn) - virsh: Fix POD syntax (Jiri Denemark) - docs: Fix installation of internals/*.html (Cole Robinson) - docs: virsh: clarify behavior of send-key (Cole Robinson) - maint: fix license on polkit script (Eric Blake) - doc: Sort out the relationship between <vcpu>, <vcpupin>, and <emulatorpin> (Osier Yang) - Tweak comments in the policykit rules file (Cole Robinson) - Various typos and misspellings (Ján Tomko) - qemu: Fix misleading comment for qemuDomainObjBeginJobWithDriver() (Peter Krempa) - Correct name of domain/pm/suspend-to-mem in docs (Zeeshan Ali (Khattak)) - doc: update description about user/group in qemu.conf (Marcelo Cerri) - docs: Drop useless </p> in drvphyp.html.in (Michal Privoznik) - docs: fix links in migration.html TOC (Eric Blake) - doc: Add Maven repository to Java bindings documentation (Wido den Hollander) - docs: rudimentary phyp documentation (Eric Blake) - doc: update description about security labels on formatdomain.html (Marcelo Cerri) - Add note about numeric domain names to manpage (Dave Allan) - Fix typo in header file comment (Daniel P. Berrange) - Update how to compile with -Werror (Doug Goldstein) - node_memory: Improve the docs (Osier Yang) Portability: - Don't assume pid_t is the same size as an int (Daniel P. Berrange) - build: Fix RPM build for non-x86 platforms (Viktor Mihajlovski) - build: fix linking with systemtap probes (Eric Blake) - parallels: fix build for some older compilers (Laine Stump) - Fix build with apparmor (Jiri Denemark) - build: use correct printf types for uid/gid (Eric Blake) - spec: Fix multilib issue with systemtap tapsets (Cole Robinson) - spec: Require newer sanlock on recent distros 2 (Jiri Denemark) - spec: Add runtime requirement for libssh2 (Peter Krempa) - spec: Require newer sanlock on recent distros (Jiri Denemark) - locking: Fix build with sanlock < 2.4 (Jiri Denemark) - Fix virProcessKillPainfully on Win32 (Daniel P. Berrange) - Properly parse (unsigned) long long (Guido Günther) - win32: Pretend that close-on-exec works (Matthias Bolte) - build: fix VPATH builds (Eric Blake) - build: avoid journald on rhel 5 (Eric Blake) - build: fix bitmap conversion when !CPU_ALLOC (Eric Blake) - Fix compilation of legacy xen driver with Xen 4.2 (Jim Fehlig) - build: fix detection of netcf linked with libnl1 (Christophe Fergeau) Bug Fixes: - qemu: QMP capabilities support starts with 1.2 (Doug Goldstein) - Linux Containers are not allowed to create device nodes. (Dan Walsh) - qemu: Fix name comparison in qemuMonitorJSONBlockIoThrottleInfo() (Stefan Hajnoczi) - qemu: Keep QEMU host drive prefix in BlkIoTune (Stefan Hajnoczi) - iohelper: fdatasync() at the end (Michal Privoznik) - conf: Fix private symbols exported by files in conf (Peter Krempa) - Fix arch detection for qemu-system-i386 with QMP (Daniel P. Berrange) - build: prefer mkostemp for multi-thread safety (Eric Blake) - qemu: Fix EmulatorPinInfo without emulatorpin (Martin Kletzander) - ip6tables rule removal (Gene Czarcinski) - Create temporary dir for socket (Guido Günther) - cpu: Fix definition of flag smap (Peter Krempa) - nodeinfotest: Delete NUL bytes from test data (Peter Krempa) - qemu: Do not ignore address for USB disks (Vladislav Bogdanov) - esx: Fix connection to ESX 5.1 (Martin Kletzander) - build: place attributes in correct location (Eric Blake) - qemu: Fix domxml-to-native network model conversion (Cole Robinson) - build: typo fix for qemu cpu affinity (Eric Blake) - qemu: fix attach/detach of netdevs with matching mac addrs (Laine Stump) - cpustat: fix regression when cpus are offline (Eric Blake) - build: fix type-punning bug (Eric Blake) - network: fix networkValidate check for default portgroup and vlan (Laine Stump) - Fix detection of Xen sysctl version 9 (Jim Fehlig) - selinux: Don't fail RestoreAll if file doesn't have a default label (Cole Robinson) - xml: omit domain name from comment if it contains double hyphen (Ján Tomko) - Fix disabling of apparmor/selinux security drivers (Christophe Fergeau) - storage: Don't do wait loops from VolLookupByPath (Cole Robinson) - qemu: Don't use -enable-nesting with qemu 1.2.0+ (Cole Robinson) - qemu: Don't blindly assume VNC is supported (Doug Goldstein) - test: Don't assume VNC is always available (Doug Goldstein) - virsh: Fix segfault of snapshot-list (Osier Yang) - qemu: Fix the unused parameter which causes the build failure (Osier Yang) - daemon: Avoid 'Could not find keytab file' in syslog (Cole Robinson) - network: don't allow multiple default portgroups (Laine Stump) - network: always create dnsmasq hosts and addnhosts files, even if empty (Laine Stump) - network: free/null newDef if network fails to start (Laine Stump) - blockjob: avoid segv on early error (Eric Blake) - selinux: relabel tapfd in qemuPhysIfaceConnect (Guannan Ren) - qemu: Set arch to i686 if qemu-system-i386 is found (Guido Günther) - qemu: Don't fail without emulatorpin or cpumask (Guido Günther) - network: Set to NULL after virNetworkDefFree() (Michal Privoznik) - spec: Fix dependency for lock-sanlock subpackage (Jiri Denemark) - qemu: Correctly wait for spice to migrate (Michal Privoznik) - qemu: Clear async job when p2p migration fails early (Jiri Denemark) - selinux: fix wrong tapfd relablling (Guannan Ren) - storage: lvm: lvcreate fails with allocation=0, don't do that (Cole Robinson) - conf: Fix crash with cleanup (Martin Kletzander) - Avoid straying </cpuset> (Guido Günther) - conf: fix virDevicePCIAddressEqual args (Laine Stump) - virsh: block SIGINT while getting BlockJobInfo (Ján Tomko) - esx: Fix dynamic dispatch for types with more than one level of inheritance (Matthias Bolte) - qemu: Fix QMP detection of QXL graphics (Jiri Denemark) - Call curl_global_init from virInitialize to avoid thread-safety issues (Matthias Bolte) - fix kvm_pv_eoi with kvmclock (Martin Kletzander) - Fix typo in HAVE_DBUS automake conditional (Alexander Larsson) - esx: Disable libcurl's use of signals to fix a segfault (Matthias Bolte) - S390: Buffer too small for large CPU numbers. (Viktor Mihajlovski) - Correct checking of virStrcpyStatic() return value (Kyle Mestery) - qemu: Kill processes used for QMP caps probing (Jiri Denemark) - qemu: Use proper agent entering function when freezing filesystems (Peter Krempa) - lxc: Correctly report active cgroups (Michal Privoznik) - build: avoid infinite autogen loop (Eric Blake) - Avoid bogus I/O event errors when closing the QEMU monitor (Daniel P. Berrange) - Fix QEMU test with 1.2.0 help output (Daniel P. Berrange) - network: fix dnsmasq/radvd binding to IPv6 on recent kernels (Benjamin Cama) - Fix regression starting QEMU instances without query-events (Daniel P. Berrange) - Fix handling of itanium arch name in QEMU driver (Daniel P. Berrange) - Fix potential deadlock when agent is closed (Daniel P. Berrange) - Fix (rare) deadlock in QEMU monitor callbacks (Daniel P. Berrange) - Don't skip over socket label cleanup (Daniel P. Berrange) - Don't ignore return value of qemuProcessKill (Daniel P. Berrange) - Fix deadlock in handling EOF in LXC monitor (Daniel P. Berrange) - parallels: don't give null pointers to virBitmapEqual (Dmitry Guryanov) - parallels: fix memory allocation (Dmitry Guryanov) - qemu: wait for SPICE to migrate (Michal Privoznik) - Don't use O_TRUNC when opening QEMU logfiles (Daniel P. Berrange) - Fix start of containers with custom root filesystem (Daniel P. Berrange) Improvements: - cpumap: optimize for clients that don't need online count (Eric Blake) - daemon: Make the default PolicyKit policy auth_admin_keep. (Richard W.M. Jones) - util: Improve error reporting from absolutePathFromBaseFile helper (Peter Krempa) - Make non-KVM machines work with QMP probing (Martin Kletzander) - maint: log xml during volume creation (Eric Blake) - util: do a better job of matching up pids with their binaries (Laine Stump) - sanlock: Introduce 'user' and 'group' conf variables (Michal Privoznik) - qemu: pass -usb and usb hubs earlier, so USB disks with static address are handled properly (Vladislav Bogdanov) - qemu: Report errors from iohelper (Michal Privoznik) - util: Re-format literal strings in virXMLEmitWarning (Peter Krempa) - xml: print uuids in the warning (Ján Tomko) - blockjob: relabel entire existing chain (Eric Blake) - blockjob: allow mirroring under SELinux and cgroup (Eric Blake) - blockjob: allow for existing files in block-copy (Eric Blake) - blockjob: implement block copy for qemu (Eric Blake) - blockjob: make block pivot safer (Eric Blake) - blockjob: support pivot operation on cancel (Eric Blake) - blockjob: return appropriate event and info (Eric Blake) - blockjob: react to active block copy (Eric Blake) - blockjob: add qemu capabilities related to block jobs (Eric Blake) - build: check for pod errors (Eric Blake) - build: silence compiler warning about signedness (Eric Blake) - maint: Sort .gitignore (Peter Krempa) - virsh: Remove --flags from nodesuspend (Jiri Denemark) - snapshot: improve snapshot-list error message (Eric Blake) - maint: ignore unsaved emacs files (Eric Blake) - daemon: Fix LIBVIRT_DEBUG=1 default output (Cole Robinson) - virNodeGetCPUMap: Add python binding (Viktor Mihajlovski) - virNodeGetCPUMap: Implement driver support (Viktor Mihajlovski) - virNodeGetCPUMap: Implement support function in nodeinfo (Viktor Mihajlovski) - nodeinfo: improve probing node cpu bitmap (Eric Blake) - bitmap: add virBitmapCountBits (Eric Blake) - esx: Update version checks for vSphere 5.1 (Matthias Bolte) - cpu: Add recently added cpu feature flags. (Peter Krempa) - qemu: Prohibit chaning affinity of domain process if placement is 'auto' (Osier Yang) - qemu: Keep the affinity when creating cgroup for emulator thread (Osier Yang) - qemu: Add helper to prepare cpumap for affinity setting (Osier Yang) - virNodeGetCPUMap: Implement virsh support. (Viktor Mihajlovski) - libvirt.h.in: Add new cpumap macro VIR_CPU_USED (Viktor Mihajlovski) - virNodeGetCPUMap: Implement wire protocol. (Viktor Mihajlovski) - header: declare node memory parameter handling earlier (Eric Blake) - header: declare typed parameter handling earlier (Eric Blake) - build: improve FORTIFY_SOURCE usage (Eric Blake) - qemu_migration: Transport OVS per-port data during live migration (Kyle Mestery) - openvswitch: Add utility functions for getting and setting Open vSwitch per-port data (Kyle Mestery) - qemu_migration: Add hooks to transport network data during migration (Kyle Mestery) - build: print uids as unsigned (Eric Blake) - storage: don't shadow global 'wait' declaration (Ján Tomko) - maint: update to latest gnulib (Eric Blake) - snapshot: sanity check when reusing file for snapshot (Eric Blake) - storage: let format probing work on root-squash NFS (Eric Blake) - migrate: v2: use VIR_DOMAIN_XML_MIGRATABLE when available (Ján Tomko) - qemu: set seamless migration capability (Michal Privoznik) - Log parameters passed to virFileMakePath (Cole Robinson) - Log file name passed to virConfReadFile (Cole Robinson) - blockjob: properly label disks for qemu block-commit (Eric Blake) - blockjob: refactor qemu disk chain permission grants (Eric Blake) - blockjob: implement shallow commit flag in qemu (Eric Blake) - blockjob: wire up online qemu block-commit (Eric Blake) - blockjob: manage qemu block-commit monitor command (Eric Blake) - blockjob: remove unused parameters after previous patch (Eric Blake) - storage: use cache to walk backing chain (Eric Blake) - storage: cache backing chain while qemu domain is live (Eric Blake) - storage: make it easier to find file within chain (Eric Blake) - storage: remember relative names in backing chain (Eric Blake) - storage: don't require caller to pre-allocate metadata struct (Eric Blake) - storage: get entire metadata chain in one call (Eric Blake) - storage: don't probe non-files (Eric Blake) - storage: use enum for snapshot driver type (Eric Blake) - storage: use enum for disk driver type (Eric Blake) - storage: use enum for default driver type (Eric Blake) - storage: match RNG to supported driver types (Eric Blake) - storage: treat 'aio' like 'raw' at parse time (Eric Blake) - storage: list more file types (Eric Blake) - Autogenerate AUTHORS (Cole Robinson) - qemu: Allow migration with host USB devices (Jiri Denemark) - dist: added cpu/cpu_ppc_data.h to Makefile.am (Viktor Mihajlovski) - qemu: Always format CPU topology (Jiri Denemark) - qemu: Add support for HyperV Enlightenment feature "relaxed" (Peter Krempa) - conf: Add support for HyperV Enlightenment features (Peter Krempa) - conf: Make tri-state feature options more universal (Peter Krempa) - qemu: Fixed default machine detection in qemuCapsParseMachineTypesStr (Viktor Mihajlovski) - qemu: Pin the emulator when only cpuset is specified (Martin Kletzander) - interface: add virInterfaceGetXMLDesc() in udev (Doug Goldstein) - Implement CPU model driver for PowerPC (Li Zhang) - Add one file cpu_ppc_data.h to define CPU data for PPC (Li Zhang) - selinux: remove unused variables in socket labelling (Guannan Ren) - storage: lvm: Don't overwrite lvcreate errors (Cole Robinson) - Make virInitialize thread safe (Daniel P. Berrange) - Add JSON serialization of virNetServerPtr objects for process re-exec() (Daniel P. Berrange) - Add JSON serialization of virNetServerClientPtr objects for process re-exec() (Daniel P. Berrange) - Add JSON serialization of virNetServerServicePtr objects for process re-exec() (Daniel P. Berrange) - Add JSON serialization of virNetSocketPtr objects for process re-exec() (Daniel P. Berrange) - Add JSON serialization of virLockSpacePtr objects for process re-exec() (Daniel P. Berrange) - Introduce an internal API for handling file based lockspaces (Daniel P. Berrange) - tests: Fix domain-events python test (Martin Kletzander) - maint: prepare for next release number (Eric Blake) - conf: add test for boot dev and order (Martin Kletzander) - selinux: Use raw contexts 2 (Martin Kletzander) - selinux: add security selinux function to label tapfd (Guannan Ren) - Add support for SUSPEND_DISK event (Martin Kletzander) - util: switch virLogEatParams to virLogSource (Ján Tomko) - node_memory: Add new parameter field to tune the new sysfs knob (Osier Yang) - qemu: reorganize qemuDomainChangeNet and qemuDomainChangeNetBridge (Laine Stump) - conf: virDomainDeviceInfoCopy utility function (Laine Stump) - qemu: Ignore def->cpumask if emulatorpin is specified (Osier Yang) - conf: Ignore emulatorpin if vcpu placement is auto (Osier Yang) - qemu: Initialize cpuset for hotplugged vcpu as def->cpuset (Osier Yang) - qemu: Create or remove cgroup when doing vcpu hotpluging (Osier Yang) - conf: Initialize the pinning policy for vcpus (Osier Yang) - conf: Ignore vcpupin for not onlined vcpus when parsing (Osier Yang) - Only keep one polkit rules file (Cole Robinson) - daemon: Use $(AM_V_GEN) in a few more places (Cole Robinson) - spec: Add support for libssh2 transport (Peter Krempa) - selinux: Use raw contexts (Martin Kletzander) - conf: Mark missing optional USB devices in domain XML (Jiri Denemark) - virsh: remove reference to migration in blockcopy (Ján Tomko) - qemu: Make save/restore with USB devices usable (Jiri Denemark) - Add MIGRATABLE flag for virDomainGetXMLDesc (Jiri Denemark) - qemu: Implement startupPolicy for USB passed through devices (Jiri Denemark) - qemu: Add option to treat missing USB devices as success (Jiri Denemark) - qemu: Introduce qemuFindHostdevUSBDevice (Jiri Denemark) - conf: Add support for startupPolicy for USB devices (Jiri Denemark) - locking: Implement lock failure action in sanlock driver (Jiri Denemark) - locking: Add support for lock failure action (Jiri Denemark) - locking: Pass hypervisor driver name when acquiring locks (Jiri Denemark) - locking: Add const char * parameter to avoid ugly typecasts (Jiri Denemark) - conf: Add on_lockfailure event configuration (Jiri Denemark) - conf: Rename life cycle actions to event actions (Jiri Denemark) - storage: Report UUID/name consistently in driver errors (Cole Robinson) - Change qemuSetSchedularParameters to use AFFECT_CURRENT (Daniel P. Berrange) - interface: add udevIfaceIsActive() to udev backend (Doug Goldstein) - interface: always build all available backends (Doug Goldstein) - interface: fix netcf based backend naming (Doug Goldstein) - interface: add udev based backend for virInterface (Doug Goldstein) - hooks: let virCommand do the error reporting (Eric Blake) - nodeinfo: Fully convert to new virReportError (Michal Privoznik) - virsh: add qemu-monitor-command --pretty (Eric Blake) - security: update user and group parsing in security_dac.c (Marcelo Cerri) - util: extend virGetUserID and virGetGroupID to support names and IDs (Marcelo Cerri) - python: keep consistent handling of Python integer conversion (Guannan Ren) - python: cleanup vcpu related binding APIs (Guannan Ren) - Check for private symbols presence as well (Michal Privoznik) - spec: prefer canonical name of util-linux (Eric Blake) - build: update gnulib for FreeBSD build (Eric Blake) - security: also parse user/group names instead of just IDs for DAC labels (Marcelo Cerri) - build: avoid -Wno-format on new-enough gcc (Eric Blake) - build: fix typo in debug message (Eric Blake) - hyperv: Fix and improve hypervListAllDomains (Matthias Bolte) - esx: Fix and improve esxListAllDomains function (Matthias Bolte) - build: default selinuxfs mount point to /sys/fs/selinux (Daniel J Walsh) - Add support for detecting capablities using QMP commands (Daniel P. Berrange) - Ignore error from query-cpu-definitions (Daniel P. Berrange) - Remove need to pass in a virDomainObjPtr instance to qemuMonitorOpen (Daniel P. Berrange) - ARMHF: implement /proc/cpuinfo parsing (Chuck Short) - Automatically enable systemd journal logging (Daniel P. Berrange) - Refactor qemuCapsParseDeviceStr to work from data tables (Daniel P. Berrange) - Don't initialize logging twice in libvirtd (Daniel P. Berrange) - Change logging category parameter into an enum (Daniel P. Berrange) - Include filename explicitly in logging APIs (Daniel P. Berrange) - Whitespace cleanup in logging files (Daniel P. Berrange) - s/int/virLogDestination/ in logging code (Daniel P. Berrange) - s/long long/size_t/ for file line numbers in logging code (Daniel P. Berrange) - s/int/virLogPriority/ in logging code (Daniel P. Berrange) - python: return error if PyObject obj is NULL for unwrapper helper functions (Guannan Ren) - Pass the "raw" log message to each virLogOutputFunc (Miloslav Trmač) - Split priority conversion from virLogOutputToSyslog (Miloslav Trmač) - Move command/event capabilities detection out of QEMU monitor code (Daniel P. Berrange) - Remove some unused includes in QEMU code (Daniel P. Berrange) - Add a qemuMonitorGetTargetArch() method for QMP query-target command (Daniel P. Berrange) - Add a qemuMonitorGetObjectProps() method for QMP device-list-properties command (Daniel P. Berrange) - Add a qemuMonitorGetObjectTypes() method for QMP qom-list-types command (Daniel P. Berrange) - Add a qemuMonitorGetEvents() method for QMP query-events command (Daniel P. Berrange) - Add a qemuMonitorGetCommands() method for QMP query-commands command (Daniel P. Berrange) - Add a qemuMonitorGetCPUDefinitions method for QMP query-cpu-definitions command (Daniel P. Berrange) - Add a qemuMonitorGetMachines() method for QMP query-machines command (Daniel P. Berrange) - Add a qemuMonitorGetVersion() method for QMP query-version command (Daniel P. Berrange) - Refactor guest init to support qemu-system-i386 binary too (Daniel P. Berrange) - Make qemuCapsProbeMachineTypes & qemuCapsProbeCPUModels static (Daniel P. Berrange) - Remove probing of CPU models when launching QEMU guests (Daniel P. Berrange) - Remove probing of machine types when canonicalizing XML (Daniel P. Berrange) - Remove probing of flags when launching QEMU guests (Daniel P. Berrange) - Switch over to use cache for building QEMU capabilities (Daniel P. Berrange) - Use size_t instead of int for virDomainDefPtr struct (Daniel P. Berrange) - Move most of qemuProcessKill into virProcessKillPainfully (Daniel P. Berrange) - Support Xen sysctl version 9 in Xen 4.2 (Jim Fehlig) - network: backend for virNetworkUpdate of interface list (Laine Stump) - build: avoid older gcc warning (Eric Blake) - Simplify some redundant locking while unref'ing objects (Daniel P. Berrange) - Convert virLXCMonitor to use virObject (Daniel P. Berrange) - Move virProcess{Kill,Abort,TranslateStatus} into virprocess.{c,h} (Daniel P. Berrange) - Move virProcessKill into virprocess.{h,c} (Daniel P. Berrange) - Rename virCommandTranslateStatus to virProcessTranslateStatus (Daniel P. Berrange) - Rename virPid{Abort,Wait} to virProcess{Abort,Wait} (Daniel P. Berrange) - Rename virKillProcess to virProcessKill (Daniel P. Berrange) - qemu: Avoid holding the driver lock in trivial snapshot API's (Peter Krempa) - storage: Add timeout for iscsi volume's stable path discovery (Osier Yang) - tests: test previous commit (Eric Blake) - command: Change virCommandAddEnv so it replaces existing environment variables. (Richard W.M. Jones) - command: Move environ-adding code to common function virCommandAddEnv. (Richard W.M. Jones) Cleanups: - gitignore: Ignore 'tags' (Michal Privoznik) - build: fix syntax-check tab violation (Eric Blake) - maint: consistent whitespace after 'if' (Eric Blake) - Remove a couple duplicates from AUTHORS.in (Cole Robinson) - qemu: Cleanup the unused 'nodeinfo' (Osier Yang) - AUTHORS: Remove double entry (Michal Privoznik) - Doc-fix for PowerPC CPU model driver (Li Zhang) - Fix typo in previous commit s/lik/like/ (Daniel P. Berrange) - maint: drop spurious semicolons (Eric Blake) - Fix tab vs space (Guido Günther) - private.syms: Drop virKillProcess (Michal Privoznik) - Remove xenner support (Daniel P. Berrange) - parallels: remove unneded code from parallelsDoCmdRun (Dmitry Guryanov) - parallels: remove unused member 'os' from parallelsDomObj (Dmitry Guryanov) - Remove pointless virLXCProcessMonitorDestroy method (Daniel P. Berrange) So thanks everybody for the help assembling that milestone version, and let's celebrate :-) !!! 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/

3 4

Re: [libvirt] Availability of Release Candidate 3 for 1.0.0
by Leonardo Arena 03 Nov '12

03 Nov '12

Hi, I was invited to show up here regarding BZ 871756. I'm the maintainer of libvirt on Alpine Linux [1], an uclibc-based distro. If you need more info, testing, etc. just let me know. Cheers, leonardo P.S. Sorry if I've broken the thread [1] http://alpinelinux.org/

3 12

[libvirt] [PATCH] cpumap: optimize for clients that don't need online count
by Eric Blake 03 Nov '12

03 Nov '12

It turns out that calling virNodeGetCPUMap(conn, NULL, NULL, 0) is both useful, and with Viktor's patches, common enough to optimize. Since this interface hasn't been released yet, we can change the RPC call. * src/nodeinfo.c (nodeGetCPUMap): Avoid bitmap when not needed. * src/remote/remote_protocol.x (remote_node_get_cpu_map_args): Supply two separate flags for needed arguments. * src/remote/remote_driver.c (remoteNodeGetCPUMap): Update caller. * daemon/remote.c (remoteDispatchNodeGetCPUMap): Likewise. * src/remote_protocol-structs: Regenerate. --- This has to be applied before 1.0.0 if we want it; otherwise the change to RPC wire protocol will render this patch an ABI break. I thought of one alternative, that wouldn't change the RPC size, but still would be a difference. That would be using the old need_results int as a bitmap of which of the two arguments are needed, instead of just a 1 or 0. But even that is risky enough that it should get in before we commit to this interface. daemon/remote.c | 8 ++++---- src/nodeinfo.c | 3 +++ src/remote/remote_driver.c | 3 ++- src/remote/remote_protocol.x | 3 ++- src/remote_protocol-structs | 3 ++- 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/daemon/remote.c b/daemon/remote.c index 7a9df60..340d07d 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -4578,7 +4578,7 @@ remoteDispatchNodeGetCPUMap(virNetServerPtr server ATTRIBUTE_UNUSED, remote_node_get_cpu_map_ret *ret) { unsigned char *cpumap = NULL; - unsigned int online; + unsigned int online = 0; unsigned int flags; int cpunum; int rv = -1; @@ -4592,13 +4592,13 @@ remoteDispatchNodeGetCPUMap(virNetServerPtr server ATTRIBUTE_UNUSED, flags = args->flags; - cpunum = virNodeGetCPUMap(priv->conn, args->need_results ? &cpumap : NULL, - &online, flags); + cpunum = virNodeGetCPUMap(priv->conn, args->need_map ? &cpumap : NULL, + args->need_online ? &online : NULL, flags); if (cpunum < 0) goto cleanup; /* 'serialize' return cpumap */ - if (args->need_results) { + if (args->need_map) { ret->cpumap.cpumap_len = VIR_CPU_MAPLEN(cpunum); ret->cpumap.cpumap_val = (char *) cpumap; cpumap = NULL; diff --git a/src/nodeinfo.c b/src/nodeinfo.c index 35c5f96..3348ae7 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -1277,6 +1277,9 @@ nodeGetCPUMap(virConnectPtr conn ATTRIBUTE_UNUSED, virCheckFlags(0, -1); + if (!cpumap && !online) + return nodeGetCPUCount(); + if (!(cpus = nodeGetCPUBitmap(&maxpresent))) goto cleanup; diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 71218f0..5eca0fa 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -5793,7 +5793,8 @@ remoteNodeGetCPUMap(virConnectPtr conn, remoteDriverLock(priv); - args.need_results = !!cpumap; + args.need_map = !!cpumap; + args.need_online = !!online; args.flags = flags; memset (&ret, 0, sizeof(ret)); diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index 765ffcd..d6ac3c1 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -2671,7 +2671,8 @@ struct remote_node_get_memory_parameters_ret { }; struct remote_node_get_cpu_map_args { - int need_results; + int need_map; + int need_online; unsigned int flags; }; diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs index 567864a..6fe7213 100644 --- a/src/remote_protocol-structs +++ b/src/remote_protocol-structs @@ -2127,7 +2127,8 @@ struct remote_node_get_memory_parameters_ret { int nparams; }; struct remote_node_get_cpu_map_args { - int need_results; + int need_map; + int need_online; u_int flags; }; struct remote_node_get_cpu_map_ret { -- 1.7.11.7

3 3

[libvirt] dnsmasq-248 (CentOS/RHEL) compatibility
by Gene Czarcinski 02 Nov '12

02 Nov '12

There are currently three significant libvirt patches I am involved with: 1. Change so that dnsmasq parameters are in a conf file instead of on the command line. 2. A small patch to add dnsmasq parameter interface= 3. A significant patch to add DHCPv6 support to libvirt. A concern has been raised about the compatibility of my patches with dnsmasq-2.48 which is the version on CentOS 6 and RHEL 6. While something like libvirt-1.0.0 is not officially supported, there is a strong desire not to get in the way of individuals back-porting it. Plan A: Install CentOS 6.3 into a virtual guest. Apparently, the current virt-manager has some problems running CentOS 6.3. Since I was here to drain a swap, I decided not to go after this alligator. Plan B: Get a the src.rpm for dnsmasq-2.48 from CentOS and build it on Fedora 17. Then, using a Fedora 17 virtual guest, downgrade install dnsmasq-2.48 on it. I then took four of my virtual dnsmasq conf-files than I use, slightly modify them to use interface=eth2 and common pid, hostsfile, addnhosts, and leases files. I then fed each of these configuration files to dnsmasq-2.48. Everything worked except for the one which had an IPv6 dhcp-range specified. That was not surprising dnsmasq-2.48 only supports IPv6 for dns. If someone has some additional tests they would like run, please say so. My recommendation: Incorporate my patches [when I finish the DHCPv6 one and resubmit the others]. Add (somewhere?) a warning to backporters that they will need to update their dnsmasq packages to actually do DHCPv6 but otherwise, earlier versions such as dnsmasq-2.48 will be compatible. Comments? Suggestions? Gene

2 2

[libvirt] Seven years of libvirt development history animated
by Daniel P. Berrange 02 Nov '12

02 Nov '12

To celebrate our 1.0.0 release / 7th birthday, I have prepared a new annimation of libvirt development history using gource, and made it available here: https://www.youtube.com/watch?v=TKynN8TwC0M Notice the big increase in number of contributors after the switch to GIT in mid-2009. 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 :|

2 1

[libvirt] [PATCH] logging: Do not redefine mkostemp on uclibc
by Jiri Denemark 02 Nov '12

02 Nov '12

An obsolete version of the patch that fixed building on systems with uclibc (4dbd6e96) was accidentally pushed as part of the release commit (2b435c15). Since this obsolete patch made syntax-check, commit 30b398d5 was pushed to fix that issue. But the real fix is to actually remove the offending code. This patch reverts commit 30b398d5 and the relevant part of 2b435c15. --- cfg.mk | 2 -- src/util/logging.c | 5 ----- 2 files changed, 7 deletions(-) diff --git a/cfg.mk b/cfg.mk index 963f642..cda04e4 100644 --- a/cfg.mk +++ b/cfg.mk @@ -817,5 +817,3 @@ exclude_file_name_regexp--sc_unmarked_diagnostics = \ ^(docs/apibuild.py|tests/virt-aa-helper-test)$$ exclude_file_name_regexp--sc_size_of_brackets = cfg.mk - -exclude_file_name_regexp--sc_prohibit_mkstemp = ^src/util/logging\.c$$ diff --git a/src/util/logging.c b/src/util/logging.c index 27bd74c..dd43842 100644 --- a/src/util/logging.c +++ b/src/util/logging.c @@ -58,11 +58,6 @@ #define VIR_FROM_THIS VIR_FROM_NONE -#ifdef __UCLIBC__ -/* uclibc does not implement mkostemp GNU extention */ -# define mkostemp(x,y) mkstemp(x) -#endif - VIR_ENUM_DECL(virLogSource) VIR_ENUM_IMPL(virLogSource, VIR_LOG_FROM_LAST, "file", -- 1.7.12.4

3 2

[libvirt] Proposed: optionally enable dnsmasq logging
by Gene Czarcinski 02 Nov '12

02 Nov '12

Note: the solutions listed below will all work with dnsmasq-2.48. Sometimes it is very difficult to determine what a dnsmasq problem is when it does not work as expected. Dnsmasq has to options for logging: log-quiries and log-dhcp. Either or both can be enabled. By default, neither is enabled. 1. Add an option or options to libvirtd.conf which will enable the logging on all started dnsmasq processes. While this is doable, it will also produce a great deal of syslog mesages if more than one dnsmasq process is running. 2. Add an option to libvirtd.conf which will enable the solutions given below. By default, it will not be enabled. 3. Add dnsmasq parameter conf-dir= to specify a directory (under the same directory as the leases file) where the administrator/user can add a file which contains log-queries and/or log-dhcp. 4. Add the dnsmasq parameter conf-file= to specify an additional configuration file. This would be under the same directory as the leases file and have a name of something like: <network_name>.conf-2. If the file already existed, nothing would be done. If the file did not exist, a zero-length file would be created. Currently, I favor ether 4 or the combination of 4 and 2. Note: dnsmasq would only read this secondary configuration file when it is started or restarted. Comments? Suggestions? Whatever? Gene

1 0

[libvirt] [PATCH 0/2] Add lock in libxl
by Bamvor Jian Zhang 02 Nov '12

02 Nov '12

These two patches implement a lock for long-running job(save, dump and migration) and normal job which will return in short time but maybe affect the state of virtual machine. With these patches, the normal job could not execute while the long-ruuning job or other normal job is running. In order to tracking these job, job type for normal job and long-ruuning job(will be called as async job in code) is defined. The abort job is called while user want to cancel such async job. Note that there is no cancellation function for async job in xenlight stack. So, abort function just block the cancellation of user. Update compare to v1: 1, remove migration relative job functions from lock patch. 2, update comments according to upstream's comments. Bamvor Jian Zhang (2): Introduce a lock for libxl long-running api Add lock for libxl api src/libxl/libxl_conf.h | 56 +++++ src/libxl/libxl_driver.c | 638 ++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 633 insertions(+), 61 deletions(-) -- 1.7.12

1 2

[libvirt] Coverity on libvirt-1.0.0 release
by Alex Jia 02 Nov '12

02 Nov '12

Hi all, This is a Coverity report on libvirt-1.0.0 release, for details, please check attachment. Analysis summary report: ------------------------ Files analyzed : 294 Total LoC input to cov-analyze : 391588 Functions analyzed : 9762 Paths analyzed : 1146758 Time taken by Coverity analysis : 00:20:58 Defect occurrences found : 304 Total 5 ATOMICITY 53 BAD_SIZEOF 7 CHECKED_RETURN 1 CONSTANT_EXPRESSION_RESULT 7 DEADCODE 19 FORWARD_NULL 2 LOCK 1 MISSING_BREAK 8 NEGATIVE_RETURNS 1 NO_EFFECT 7 NULL_RETURNS 2 OVERRUN_STATIC 122 RESOURCE_LEAK 1 RETURN_LOCAL 17 REVERSE_INULL 2 SIZEOF_MISMATCH 1 STRING_NULL 1 STRING_OVERFLOW 4 TAINTED_SCALAR 25 TOCTOU 9 UNINIT 1 UNREACHABLE 8 UNUSED_VALUE -- Regards, Alex

1 0

[libvirt] [PATCH] logging.c: Properly indent and ignore one syntax-check rule
by Michal Privoznik 02 Nov '12

02 Nov '12

With our fix of mkostemp (pushed as 2b435c15) we define a macro to compile with uclibc. However, this definition is conditional and thus needs to be properly indented. Moreover, with this definition sc_prohibit_mkstemp syntax-check rule keeps yelling: src/util/logging.c:63:# define mkostemp(x,y) mkstemp(x) maint.mk: use mkostemp with O_CLOEXEC instead of mkstemp Therefore we should ignore this file for this rule. --- Pushed under build-breaker rule. cfg.mk | 2 ++ src/util/logging.c | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/cfg.mk b/cfg.mk index cda04e4..963f642 100644 --- a/cfg.mk +++ b/cfg.mk @@ -817,3 +817,5 @@ exclude_file_name_regexp--sc_unmarked_diagnostics = \ ^(docs/apibuild.py|tests/virt-aa-helper-test)$$ exclude_file_name_regexp--sc_size_of_brackets = cfg.mk + +exclude_file_name_regexp--sc_prohibit_mkstemp = ^src/util/logging\.c$$ diff --git a/src/util/logging.c b/src/util/logging.c index c0b2f0b..27bd74c 100644 --- a/src/util/logging.c +++ b/src/util/logging.c @@ -60,7 +60,7 @@ #ifdef __UCLIBC__ /* uclibc does not implement mkostemp GNU extention */ -#define mkostemp(x,y) mkstemp(x) +# define mkostemp(x,y) mkstemp(x) #endif VIR_ENUM_DECL(virLogSource) -- 1.7.8.6

2 1

[libvirt] [PATCH 0/2] Add lock in libxl
by Bamvor Jian Zhang 02 Nov '12

02 Nov '12

These two patches implement a lock for long-running job(save, dump and migration) and normal job which will return in short time but maybe affect the state of virtual machine. With these patches, the normal job could not execute while the long-ruuning job or other normal job is running. In order to tracking these job, job type for normal job and long-ruuning job(will be called as async job in code) is defined. The abort job is called while user want to cancel such async job. Note that there is no cancellation function for async job in xenlight stack. So, abort function just block the cancellation of user. Bamvor Jian Zhang (2): Introduce a lock for libxl long-running api Add lock for libxl api src/libxl/libxl_conf.h | 58 +++++ src/libxl/libxl_driver.c | 665 ++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 662 insertions(+), 61 deletions(-) -- 1.7.12

4 9

[libvirt] [PATCH] qemu: use default machine type if missing it in qemu command line
by Guannan Ren 02 Nov '12

02 Nov '12

BZ:https://bugzilla.redhat.com/show_bug.cgi?id=871273 when using virsh qemu-attach to attach an existing qemu process, if it misses the -M option in qemu command line, libvirtd crashed because the NULL value of def->os.machine in later use. Example: /usr/libexec/qemu-kvm -name foo \ -cdrom /var/lib/libvirt/images/boot.img \ -monitor unix:/tmp/demo,server,nowait \ error: End of file while reading data: Input/output error error: Failed to reconnect to the hypervisor This patch tries to set default machine type if the value of def->os.machine is still NULL after qemu command line parsing. --- src/qemu/qemu_command.c | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index fe99f5d..0b6d2f8 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -8768,6 +8768,17 @@ virDomainDefPtr qemuParseCommandLine(virCapsPtr caps, } } + if (!def->os.machine) { + const char *defaultMachine = + virCapabilitiesDefaultGuestMachine(caps, + def->os.type, + def->os.arch, + virDomainVirtTypeToString(def->virtType)); + if (defaultMachine != NULL) + if (!(def->os.machine = strdup(defaultMachine))) + goto no_memory; + } + if (!nographics && def->ngraphics == 0) { virDomainGraphicsDefPtr sdl; const char *display = qemuFindEnv(progenv, "DISPLAY"); -- 1.7.1

2 4

[libvirt] [PATCH v11] support offline migration
by liguang 02 Nov '12

02 Nov '12

original migration did not aware of offline case, so, try to support offline migration quietly (did not disturb original migration) by pass VIR_MIGRATE_OFFLINE flag to migration APIs if only the domain is really inactive, and migration process will not puzzled by domain offline and exit unexpectedly. these changes did not take care of disk images the domain required, for them could be transferred by other APIs as suggested, then VIR_MIGRATE_OFFLINE should not combined with VIR_MIGRATE_NON_SHARED_*. if you want a persistent migration, you should do "virsh migrate --persistent" youself. Signed-off-by: liguang <lig.fnst(a)cn.fujitsu.com> --- include/libvirt/libvirt.h.in | 1 + src/qemu/qemu_driver.c | 15 ++++++++++ src/qemu/qemu_migration.c | 60 +++++++++++++++++++++++++++++++++++------ src/qemu/qemu_migration.h | 3 +- tools/virsh-domain.c | 6 ++++ 5 files changed, 75 insertions(+), 10 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 81f12a4..1cebc21 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -995,6 +995,7 @@ typedef enum { * whole migration process; this will be used automatically * when supported */ VIR_MIGRATE_UNSAFE = (1 << 9), /* force migration even if it is considered unsafe */ + VIR_MIGRATE_OFFLINE = (1 << 10), /* offline migrate */ } virDomainMigrateFlags; /* Domain migration. */ diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 97ad23e..38bfcab 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9622,6 +9622,20 @@ qemuDomainMigrateBegin3(virDomainPtr domain, } if (!virDomainObjIsActive(vm)) { + if (flags & VIR_MIGRATE_OFFLINE) { + if (flags & (VIR_MIGRATE_NON_SHARED_DISK| + VIR_MIGRATE_NON_SHARED_INC)) { + virReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("migrating storage handled by volume APIs")); + goto endjob; + } + if (!(flags & VIR_MIGRATE_PERSIST_DEST)) { + virReportError(VIR_ERR_OPERATION_INVALID, + "%s", _("VIR_MIGRATE_OFFLINE should combined with VIR_MIGRATE_PERSIST_DEST")); + goto endjob; + } + goto offline; + } virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("domain is not running")); goto endjob; @@ -9634,6 +9648,7 @@ qemuDomainMigrateBegin3(virDomainPtr domain, if (qemuDomainCheckEjectableMedia(driver, vm, asyncJob) < 0) goto endjob; +offline: if (!(xml = qemuMigrationBegin(driver, vm, xmlin, dname, cookieout, cookieoutlen, flags))) diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index db69a0a..b2f921e 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -70,6 +70,7 @@ enum qemuMigrationCookieFlags { QEMU_MIGRATION_COOKIE_FLAG_GRAPHICS, QEMU_MIGRATION_COOKIE_FLAG_LOCKSTATE, QEMU_MIGRATION_COOKIE_FLAG_PERSISTENT, + QEMU_MIGRATION_COOKIE_FLAG_OFFLINE, QEMU_MIGRATION_COOKIE_FLAG_LAST }; @@ -77,12 +78,13 @@ enum qemuMigrationCookieFlags { VIR_ENUM_DECL(qemuMigrationCookieFlag); VIR_ENUM_IMPL(qemuMigrationCookieFlag, QEMU_MIGRATION_COOKIE_FLAG_LAST, - "graphics", "lockstate", "persistent"); + "graphics", "lockstate", "persistent", "offline"); enum qemuMigrationCookieFeatures { QEMU_MIGRATION_COOKIE_GRAPHICS = (1 << QEMU_MIGRATION_COOKIE_FLAG_GRAPHICS), QEMU_MIGRATION_COOKIE_LOCKSTATE = (1 << QEMU_MIGRATION_COOKIE_FLAG_LOCKSTATE), QEMU_MIGRATION_COOKIE_PERSISTENT = (1 << QEMU_MIGRATION_COOKIE_FLAG_PERSISTENT), + QEMU_MIGRATION_COOKIE_OFFLINE = (1 << QEMU_MIGRATION_COOKIE_FLAG_OFFLINE), }; typedef struct _qemuMigrationCookieGraphics qemuMigrationCookieGraphics; @@ -439,6 +441,9 @@ qemuMigrationCookieXMLFormat(struct qemud_driver *driver, virBufferAdjustIndent(buf, -2); } + if (mig->flags & QEMU_MIGRATION_COOKIE_OFFLINE) + virBufferAsprintf(buf, " <offline/>\n"); + virBufferAddLit(buf, "</qemu-migration>\n"); return 0; } @@ -662,6 +667,11 @@ qemuMigrationCookieXMLParse(qemuMigrationCookiePtr mig, VIR_FREE(nodes); } + if ((flags & QEMU_MIGRATION_COOKIE_OFFLINE)) { + if (virXPathBoolean("count(./offline) > 0", ctxt)) + mig->flags |= QEMU_MIGRATION_COOKIE_OFFLINE; + } + return 0; error: @@ -721,6 +731,10 @@ qemuMigrationBakeCookie(qemuMigrationCookiePtr mig, qemuMigrationCookieAddPersistent(mig, dom) < 0) return -1; + if (flags & QEMU_MIGRATION_COOKIE_OFFLINE) { + mig->flags |= QEMU_MIGRATION_COOKIE_OFFLINE; + } + if (!(*cookieout = qemuMigrationCookieXMLFormatStr(driver, mig))) return -1; @@ -1168,6 +1182,13 @@ char *qemuMigrationBegin(struct qemud_driver *driver, QEMU_MIGRATION_COOKIE_LOCKSTATE) < 0) goto cleanup; + if (flags & VIR_MIGRATE_OFFLINE) { + if (qemuMigrationBakeCookie(mig, driver, vm, + cookieout, cookieoutlen, + QEMU_MIGRATION_COOKIE_OFFLINE) < 0) + goto cleanup; + } + if (xmlin) { if (!(def = virDomainDefParseString(driver->caps, xmlin, QEMU_EXPECTED_VIRT_TYPES, @@ -1331,6 +1352,15 @@ qemuMigrationPrepareAny(struct qemud_driver *driver, goto endjob; } + if (!(mig = qemuMigrationEatCookie(driver, vm, cookiein, cookieinlen, + QEMU_MIGRATION_COOKIE_OFFLINE))) + return ret; + + if (mig->flags & QEMU_MIGRATION_COOKIE_OFFLINE) { + ret = 0; + goto cleanup; + } + /* Start the QEMU daemon, with the same command-line arguments plus * -incoming $migrateFrom */ @@ -1873,7 +1903,8 @@ qemuMigrationRun(struct qemud_driver *driver, virLockManagerPluginGetName(driver->lockManager)); return -1; } - + if (flags & VIR_MIGRATE_OFFLINE) + return 0; if (!(mig = qemuMigrationEatCookie(driver, vm, cookiein, cookieinlen, QEMU_MIGRATION_COOKIE_GRAPHICS))) goto cleanup; @@ -2389,6 +2420,8 @@ static int doPeer2PeerMigrate3(struct qemud_driver *driver, qemuDomainObjExitRemoteWithDriver(driver, vm); } VIR_FREE(dom_xml); + if (flags & VIR_MIGRATE_OFFLINE) + goto cleanup; if (ret == -1) goto cleanup; @@ -2494,7 +2527,7 @@ finish: vm->def->name); cleanup: - if (ddomain) { + if (ddomain || (flags & VIR_MIGRATE_OFFLINE)) { virObjectUnref(ddomain); ret = 0; } else { @@ -2571,7 +2604,7 @@ static int doPeer2PeerMigrate(struct qemud_driver *driver, } /* domain may have been stopped while we were talking to remote daemon */ - if (!virDomainObjIsActive(vm)) { + if (!virDomainObjIsActive(vm) && !(flags & VIR_MIGRATE_OFFLINE)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("guest unexpectedly quit")); goto cleanup; @@ -2634,7 +2667,7 @@ qemuMigrationPerformJob(struct qemud_driver *driver, if (qemuMigrationJobStart(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT) < 0) goto cleanup; - if (!virDomainObjIsActive(vm)) { + if (!virDomainObjIsActive(vm) && !(flags & VIR_MIGRATE_OFFLINE)) { virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("domain is not running")); goto endjob; @@ -2958,6 +2991,8 @@ qemuMigrationFinish(struct qemud_driver *driver, */ if (retcode == 0) { if (!virDomainObjIsActive(vm)) { + if (flags & VIR_MIGRATE_OFFLINE) + goto offline; virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("guest unexpectedly quit")); goto endjob; @@ -2973,6 +3008,7 @@ qemuMigrationFinish(struct qemud_driver *driver, goto endjob; } + offline: if (flags & VIR_MIGRATE_PERSIST_DEST) { virDomainDefPtr vmdef; if (vm->persistent) @@ -3020,7 +3056,7 @@ qemuMigrationFinish(struct qemud_driver *driver, event = NULL; } - if (!(flags & VIR_MIGRATE_PAUSED)) { + if (!(flags & VIR_MIGRATE_PAUSED) && !(flags & VIR_MIGRATE_OFFLINE)) { /* run 'cont' on the destination, which allows migration on qemu * >= 0.10.6 to work properly. This isn't strictly necessary on * older qemu's, but it also doesn't hurt anything there @@ -3069,9 +3105,11 @@ qemuMigrationFinish(struct qemud_driver *driver, VIR_DOMAIN_EVENT_SUSPENDED, VIR_DOMAIN_EVENT_SUSPENDED_PAUSED); } - if (virDomainSaveStatus(driver->caps, driver->stateDir, vm) < 0) { - VIR_WARN("Failed to save status on vm %s", vm->def->name); - goto endjob; + if (virDomainObjIsActive(vm)) { + if (virDomainSaveStatus(driver->caps, driver->stateDir, vm) < 0) { + VIR_WARN("Failed to save status on vm %s", vm->def->name); + goto endjob; + } } /* Guest is successfully running, so cancel previous auto destroy */ @@ -3091,6 +3129,7 @@ qemuMigrationFinish(struct qemud_driver *driver, endjob: if (qemuMigrationJobFinish(driver, vm) == 0) { vm = NULL; + } else if (flags & VIR_MIGRATE_OFFLINE) { } else if (!vm->persistent && !virDomainObjIsActive(vm)) { qemuDomainRemoveInactive(driver, vm); vm = NULL; @@ -3137,6 +3176,8 @@ int qemuMigrationConfirm(struct qemud_driver *driver, if (!(mig = qemuMigrationEatCookie(driver, vm, cookiein, cookieinlen, 0))) return -1; + if (flags & VIR_MIGRATE_OFFLINE) + goto offline; /* Did the migration go as planned? If yes, kill off the * domain object, but if no, resume CPUs @@ -3173,6 +3214,7 @@ int qemuMigrationConfirm(struct qemud_driver *driver, } } +offline: qemuMigrationCookieFree(mig); rv = 0; diff --git a/src/qemu/qemu_migration.h b/src/qemu/qemu_migration.h index 7a2269a..b4f6a77 100644 --- a/src/qemu/qemu_migration.h +++ b/src/qemu/qemu_migration.h @@ -36,7 +36,8 @@ VIR_MIGRATE_NON_SHARED_DISK | \ VIR_MIGRATE_NON_SHARED_INC | \ VIR_MIGRATE_CHANGE_PROTECTION | \ - VIR_MIGRATE_UNSAFE) + VIR_MIGRATE_UNSAFE | \ + VIR_MIGRATE_OFFLINE) enum qemuMigrationJobPhase { QEMU_MIGRATION_PHASE_NONE = 0, diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 505169b..2218379 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -6647,6 +6647,7 @@ static const vshCmdOptDef opts_migrate[] = { {"dname", VSH_OT_DATA, 0, N_("rename to new name during migration (if supported)")}, {"timeout", VSH_OT_INT, 0, N_("force guest to suspend if live migration exceeds timeout (in seconds)")}, {"xml", VSH_OT_STRING, 0, N_("filename containing updated XML for the target")}, + {"offline", VSH_OT_BOOL, 0, N_("for offline migration")}, {NULL, 0, 0, NULL} }; @@ -6713,6 +6714,11 @@ doMigrate(void *opaque) if (vshCommandOptBool(cmd, "unsafe")) flags |= VIR_MIGRATE_UNSAFE; + if (vshCommandOptBool(cmd, "offline")) { + if (!virDomainIsActive(dom)) + flags |= VIR_MIGRATE_OFFLINE; + } + if (xmlfile && virFileReadAll(xmlfile, 8192, &xml) < 0) { vshError(ctl, _("file '%s' doesn't exist"), xmlfile); -- 1.7.2.5

6 10

[libvirt] [PATCH] qemu: capabilities detection for 0.15 through 1.1
by Doug Goldstein 02 Nov '12

02 Nov '12

With the introduction of the new capabilities storage relying on QMP we lost some insight into features available between 0.15 and 1.1. We use QMP on these versions but only when we go to start the actual guest rather than for querying up front. The issue is help scraping isn't an exact science while QMP is an exact science. The issue with the existing approach of checking QMP on startup is that if the command is really not there, then we never clear the bit. An example of this being a problem in on Ubuntu 12.04 LTS where the default qemu-kvm package does not include SPICE support but -help claims that it does (because -help always advertises SPICE support). So the user does not get to see our helpful message when they attempt to start up a SPICE based domain without having SPICE support. --- Really hoping a Ubuntu 12.04 user or Ubuntu developer can test this out and see if this remedies the issue. There's a long list of issues opened on Launchpad with this bug. I believe where this fix really remedies things for people is when they're using -vga std instead of -vga qxl. Due to the fact that qxl will have a spicevmc device that just won't work so they'll at least get notification that way. -vga std will result in no message and the domain not working. --- src/qemu/qemu_capabilities.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 271273c..37b50c1 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1871,6 +1871,21 @@ qemuCapsProbeQMPCommands(qemuCapsPtr caps, if ((ncommands = qemuMonitorGetCommands(mon, &commands)) < 0) return -1; + /* We want to clear these capabilities out so we can properly + * detect them. Otherwise if they're already set and we don't + * detect them, the bit won't clear. + */ + qemuCapsClear(caps, QEMU_CAPS_WAKEUP); + qemuCapsClear(caps, QEMU_CAPS_TRANSACTION); + qemuCapsClear(caps, QEMU_CAPS_BLOCKJOB_SYNC); + qemuCapsClear(caps, QEMU_CAPS_BLOCKJOB_ASYNC); + qemuCapsClear(caps, QEMU_CAPS_DUMP_GUEST_MEMORY); + qemuCapsClear(caps, QEMU_CAPS_SPICE); + qemuCapsClear(caps, QEMU_CAPS_KVM); + qemuCapsClear(caps, QEMU_CAPS_VNC); + qemuCapsClear(caps, QEMU_CAPS_BLOCK_COMMIT); + qemuCapsClear(caps, QEMU_CAPS_DRIVE_MIRROR); + for (i = 0 ; i < ncommands ; i++) { char *name = commands[i]; if (STREQ(name, "system_wakeup")) @@ -1909,6 +1924,13 @@ qemuCapsProbeQMPEvents(qemuCapsPtr caps, int nevents; size_t i; + /* We want to clear these capabilities out so we can properly + * detect them. Otherwise if they're already set and we don't + * detect them, the bit won't clear. + */ + qemuCapsClear(caps, QEMU_CAPS_BALLOON_EVENT); + qemuCapsClear(caps, QEMU_CAPS_SEAMLESS_MIGRATION); + if ((nevents = qemuMonitorGetEvents(mon, &events)) < 0) return -1; -- 1.7.8.6

1 0

[libvirt] [PATCH] qemu: QMP capabilities support starts with 1.2
by Doug Goldstein 02 Nov '12

02 Nov '12

Per the code comment in qemuCapsInitQMPBasic() and Eric, we should only use QMP for capabilities probing starting with 1.2 and newer. --- src/qemu/qemu_capabilities.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 271273c..64c0bea 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2314,7 +2314,7 @@ qemuCapsInitQMP(qemuCapsPtr caps, VIR_DEBUG("Got version %d.%d.%d (%s)", major, minor, micro, NULLSTR(package)); - if (!(major >= 1 || (major == 1 && minor >= 1))) { + if (!(major >= 1 || (major == 1 && minor >= 2))) { VIR_DEBUG("Not new enough for QMP capabilities detection"); ret = 0; goto cleanup; -- 1.7.8.6

2 3

[libvirt] [RFC: PATCH] nodeinfo: support kernels that lack socket information
by Eric Blake 02 Nov '12

02 Nov '12

On RHEL 5, I was getting a segfault trying to start libvirtd, because we were failing virNodeParseSocket but not checking for errors, and then calling CPU_SET(-1, &sock_map) as a result. But if you don't have a topology/physical_package_id file, then you can just assume that the cpu belongs to socket 0. * src/nodeinfo.c (virNodeGetCpuValue): Change bool into default_value. (virNodeParseSocket, virNodeParseNode): Update callers. --- I'm still testing this, but wanted to get eyes on it now as I think it belongs in 1.0.0 if it passes my testing. Having libvirtd dump core on RHEL 5 is not nice. I'm not quite sure when the regression was introduced, but it was caused by our refactoring of code to parse different sysfs files. src/nodeinfo.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/src/nodeinfo.c b/src/nodeinfo.c index 35c5f96..ccf0682 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -79,13 +79,14 @@ static int linuxNodeGetMemoryStats(FILE *meminfo, int *nparams); /* Return the positive decimal contents of the given - * DIR/cpu%u/FILE, or -1 on error. If MISSING_OK and the - * file could not be found, return 1 instead of an error; this is - * because some machines cannot hot-unplug cpu0, or because - * hot-unplugging is disabled. */ + * DIR/cpu%u/FILE, or -1 on error. If DEFAULT_VALUE is non-negative + * and the file could not be found, return that instead of an error; + * this is useful for machines that cannot hot-unplug cpu0, or where + * hot-unplugging is disabled, or where the kernel is too old + * to support NUMA cells, etc. */ static int virNodeGetCpuValue(const char *dir, unsigned int cpu, const char *file, - bool missing_ok) + int default_value) { char *path; FILE *pathfp; @@ -100,8 +101,8 @@ virNodeGetCpuValue(const char *dir, unsigned int cpu, const char *file, pathfp = fopen(path, "r"); if (pathfp == NULL) { - if (missing_ok && errno == ENOENT) - value = 1; + if (default_value >= 0 && errno == ENOENT) + value = default_value; else virReportSystemError(errno, _("cannot open %s"), path); goto cleanup; @@ -174,7 +175,7 @@ static int virNodeParseSocket(const char *dir, unsigned int cpu) { int ret = virNodeGetCpuValue(dir, cpu, "topology/physical_package_id", - false); + 0); # if defined(__powerpc__) || \ defined(__powerpc64__) || \ defined(__s390__) || \ @@ -236,7 +237,7 @@ virNodeParseNode(const char *node, int *sockets, int *cores, int *threads) if (sscanf(cpudirent->d_name, "cpu%u", &cpu) != 1) continue; - if ((online = virNodeGetCpuValue(node, cpu, "online", true)) < 0) + if ((online = virNodeGetCpuValue(node, cpu, "online", 1)) < 0) goto cleanup; if (!online) @@ -275,7 +276,7 @@ virNodeParseNode(const char *node, int *sockets, int *cores, int *threads) if (sscanf(cpudirent->d_name, "cpu%u", &cpu) != 1) continue; - if ((online = virNodeGetCpuValue(node, cpu, "online", true)) < 0) + if ((online = virNodeGetCpuValue(node, cpu, "online", 1)) < 0) goto cleanup; if (!online) @@ -297,7 +298,7 @@ virNodeParseNode(const char *node, int *sockets, int *cores, int *threads) /* logical cpu is equivalent to a core on s390 */ core = cpu; # else - core = virNodeGetCpuValue(node, cpu, "topology/core_id", false); + core = virNodeGetCpuValue(node, cpu, "topology/core_id", -1); # endif CPU_SET(core, &core_maps[sock]); -- 1.7.11.7

1 0

Re: [libvirt] [virt-devel] This patch removes the mknod capability from Linux Containers.
by Eric Blake 02 Nov '12

02 Nov '12

[originally posted to the wrong list] On 11/01/2012 12:57 PM, Daniel J Walsh wrote: > > 0001-Linux-Containers-are-not-allowed-to-create-device-no.patch > > >>From 3913ef4148728430cc9df79b84d5ec44130f4ac8 Mon Sep 17 00:00:00 2001 > From: rhatdan <dwalsh(a)redhat.com> I'll adjust the author attribution to match other patches of yours (we generally prefer 'git shortlog' to list full names). > Date: Thu, 1 Nov 2012 14:54:39 -0400 > Subject: [PATCH] Linux Containers are not allowed to create device nodes. > This needs to be done before the container starts. Turning > off the mknod capabilty is noticed by systemd, which will s/capabilty/capability/ > no longer attempt to create device nodes. Missing a blank line, so 'git log' tries to treat this as a really long subject line. > > This eliminates SELinux AVC messages and ugly failure messages in the journal. > --- > src/lxc/lxc_container.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c > index 2789c17..8faa664 100644 > --- a/src/lxc/lxc_container.c > +++ b/src/lxc/lxc_container.c > @@ -1717,6 +1717,7 @@ static int lxcContainerDropCapabilities(bool keepReboot ATTRIBUTE_UNUSED) > CAPNG_INHERITABLE | CAPNG_BOUNDING_SET, > CAP_SYS_MODULE, /* No kernel module loading */ > CAP_SYS_TIME, /* No changing the clock */ > + CAP_MKNOD, /* No creating device nodes */ > CAP_AUDIT_CONTROL, /* No messing with auditing status */ > CAP_MAC_ADMIN, /* No messing with LSM config */ > keepReboot ? -1 : CAP_SYS_BOOT, /* No use of reboot */ Makes sense to me. ACK; I'll clean it up and push in time for 1.0.0. -- Eric Blake eblake(a)redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

2 1

[libvirt] [PATCH 0/2] qemu: Fix incorrect qemuDomainGetBlockIoTune() results
by Stefan Hajnoczi 02 Nov '12

02 Nov '12

The qemuDomainGetBlockIoTune() function was returning incorrect results as I discovered on Fedora Virt Test Day: https://fedoraproject.org/wiki/QA:Testcase_Virtualization_IO_Throttling The problem is that I/O limits can be set but I only see zeroes when displaying them with "virsh blkdeviotune <domain> <device>" on a domain with two disks. First, we're comparing guest device names ("virtio-blk-0") instead of host device names ("drive-virtio-blk-0"). Second, the JSON monitor code has inverted string compare logic so we were skipping the device we were looking for. These patches make "virsh blkdeviotune" report correct results. Stefan Hajnoczi (2): qemu: Keep QEMU host drive prefix in BlkIoTune qemu: Fix device name comparison in qemuMonitorJSONBlockIoThrottleInfo() src/qemu/qemu_monitor_json.c | 5 +---- src/qemu/qemu_monitor_text.c | 3 --- 2 files changed, 1 insertion(+), 7 deletions(-) -- 1.7.12.1

2 3

[libvirt] [PATCH 00/20] Support for external checkpoints
by Peter Krempa 02 Nov '12

02 Nov '12

This set consists of multiple parts: The first 4 patches are a rebase of Eric's series to add external checkpoint support to the XML. I posted them as I had some conflicts to solve when rebasing them lately. Patches 5-10 are a re-send of my previously posted series to add ability to create external checkpoints. These are only rebased and I did _not_ apply review feedback to them. Patches 11-20 are new and consist of a few cleanups and refactors to implement needed functionality to revert an external snapshot. There are three new features: 1) creation of offline external snapshots 2) deletion of external snapshots (with a few limitations) 3) reverting of external snapshots When this series will be closer to being "pushable" I'll post another cleanup that will split out all snapshot related code in qemu into a separate file as it's a mess right now. Eric Blake (4): snapshot: new XML for external system checkpoint snapshot: improve disk align checking snapshot: populate new XML info for qemu snapshots snapshot: merge pre-snapshot checks Peter Krempa (16): qemu: Split out code to save domain memory to allow reuse snapshot: Add flag to enable creating checkpoints in paused state snapshot: qemu: Add async job type for snapshots snapshot: qemu: Rename qemuDomainSnapshotCreateActive snapshot: qemu: Add support for external checkpoints snapshot: qemu: Remove restrictions preventing external snapshots qemu: snapshot: Clean up snapshot retrieval to use the new helper qemu: Split out guts of qemuDomainSaveImageStartVM() to allow reuse snapshot: qemu: Add flag VIR_DOMAIN_SNAPSHOT_REVERT_STOPPED snapshot: qemu: Add support for external inactive snapshots conf: Fix private symbols exported by files in conf conf: Add helper to determine if snapshot is external snapshot: qemu: Add detail option for PMSUSPENDED event. snapshot: qemu: Fix detection of external snapshots when deleting snapshot: qemu: Add support for external snapshot deletion. snapshot: qemu: Implement reverting of external snapshots docs/formatsnapshot.html.in | 11 + docs/schemas/domainsnapshot.rng | 23 + examples/domain-events/events-c/event-test.c | 3 + include/libvirt/libvirt.h.in | 7 + src/conf/snapshot_conf.c | 102 +- src/conf/snapshot_conf.h | 6 + src/libvirt.c | 9 +- src/libvirt_private.syms | 48 +- src/qemu/qemu_domain.c | 125 ++- src/qemu/qemu_domain.h | 1 + src/qemu/qemu_driver.c | 1111 ++++++++++++++------ src/qemu/qemu_process.c | 19 + tests/domainsnapshotxml2xmlin/external_vm.xml | 10 + tests/domainsnapshotxml2xmlin/noparent.xml | 9 + tests/domainsnapshotxml2xmlout/all_parameters.xml | 1 + tests/domainsnapshotxml2xmlout/disk_snapshot.xml | 1 + tests/domainsnapshotxml2xmlout/external_vm.xml | 43 + tests/domainsnapshotxml2xmlout/full_domain.xml | 1 + tests/domainsnapshotxml2xmlout/metadata.xml | 1 + tests/domainsnapshotxml2xmlout/noparent.xml | 1 + .../noparent_nodescription.xml | 1 + .../noparent_nodescription_noactive.xml | 1 + tests/domainsnapshotxml2xmltest.c | 1 + tools/virsh-domain-monitor.c | 2 + tools/virsh-snapshot.c | 9 + tools/virsh.pod | 21 +- 26 files changed, 1207 insertions(+), 360 deletions(-) create mode 100644 tests/domainsnapshotxml2xmlin/external_vm.xml create mode 100644 tests/domainsnapshotxml2xmlin/noparent.xml create mode 100644 tests/domainsnapshotxml2xmlout/external_vm.xml -- 1.7.12.4

3 41

[libvirt] [PATCH] nodeinfo: enable nodeGetCPUCount for older kernels
by Viktor Mihajlovski 02 Nov '12

02 Nov '12

Since /sys/devices/system/cpu/present is not available on older kernels like on RHEL 5.x nodeGetCPUCount will fail there. The fallback implemented is to scan for /sys/devices/system/cpu/cpuNN entries. Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- src/nodeinfo.c | 33 ++++++++++++++++++++++++++++----- 1 files changed, 28 insertions(+), 5 deletions(-) diff --git a/src/nodeinfo.c b/src/nodeinfo.c index 35c5f96..181630f 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -953,11 +953,34 @@ int nodeGetCPUCount(void) { #ifdef __linux__ - /* XXX should we also work on older kernels, like RHEL5, that lack - * cpu/present and cpu/online files? Those kernels also lack cpu - * hotplugging, so it would be a matter of finding the largest - * cpu/cpuNN directory, and returning NN + 1 */ - return linuxParseCPUmax(SYSFS_SYSTEM_PATH "/cpu/present"); + /* to support older kernels, like RHEL5, that lack + * cpu/present we fall back to count cpu/cpuNN + * entries. + */ + char *cpupath = NULL; + int i = 0; + + if (virFileExists(SYSFS_SYSTEM_PATH "/cpu/present")) { + i = linuxParseCPUmax(SYSFS_SYSTEM_PATH "/cpu/present"); + } else if (virFileExists(SYSFS_SYSTEM_PATH "/cpu/cpu0")) { + do { + i++; + VIR_FREE(cpupath); + if (virAsprintf(&cpupath, "%s/cpu/cpu%d", + SYSFS_SYSTEM_PATH, i) < 0) { + virReportOOMError(); + return -1; + } + } while (virFileExists(cpupath)); + } else { + /* no cpu/cpu0: we give up */ + virReportError(VIR_ERR_NO_SUPPORT, "%s", + _("host cpu counting not supported on this node")); + return -1; + } + + VIR_FREE(cpupath); + return i; #else virReportError(VIR_ERR_NO_SUPPORT, "%s", _("host cpu counting not implemented on this platform")); -- 1.7.0.4

2 1

[libvirt] [PATCH] net-update docs: s/domain/network/
by Michal Privoznik 01 Nov '12

01 Nov '12

A leftover from copy paste. --- tools/virsh-network.c | 6 +++--- tools/virsh.pod | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/virsh-network.c b/tools/virsh-network.c index 6005e5b..fd9d563 100644 --- a/tools/virsh-network.c +++ b/tools/virsh-network.c @@ -755,9 +755,9 @@ static const vshCmdOptDef opts_network_update[] = { N_("name of file containing xml (or, if it starts with '<', the complete " "xml element itself) to add/modify, or to be matched for search")}, {"parent-index", VSH_OT_INT, 0, N_("which parent object to search through")}, - {"config", VSH_OT_BOOL, 0, N_("affect next boot")}, - {"live", VSH_OT_BOOL, 0, N_("affect running domain")}, - {"current", VSH_OT_BOOL, 0, N_("affect current domain")}, + {"config", VSH_OT_BOOL, 0, N_("affect next network startup")}, + {"live", VSH_OT_BOOL, 0, N_("affect running network")}, + {"current", VSH_OT_BOOL, 0, N_("affect current state of network")}, {NULL, 0, 0, NULL} }; diff --git a/tools/virsh.pod b/tools/virsh.pod index 07d6a67..38e787a 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -2062,9 +2062,9 @@ the network; if a parent-index isn't provided, the "most appropriate" <dhcp> element), but if I<--parent-index> is given, that particular instance of <ip> will get the modification. -If I<--live> is specified, affect a running guest. -If I<--config> is specified, affect the next boot of a persistent guest. -If I<--current> is specified, affect the current guest state. +If I<--live> is specified, affect a running network. +If I<--config> is specified, affect the next startup of a persistent network. +If I<--current> is specified, affect the current network state. Both I<--live> and I<--config> flags may be given, but I<--current> is exclusive. Not specifying any flag is the same as specifying I<--current>. -- 1.7.8.6

2 2

[libvirt] [PATCH v3] iohelper: fsync() at the end
by Michal Privoznik 01 Nov '12

01 Nov '12

Currently, when we are doing (managed) save, we insert the iohelper between the qemu and OS. The pipe is created, the writing end is passed to qemu and the reading end to the iohelper. It reads data and write them into given file. However, with write() being asynchronous data may still be in OS caches and hence in some (corner) cases, all migration data may have been read and written (not physically though). So qemu will report success, as well as iohelper. However, with some non local filesystems, where ENOSPACE is polled every X time units, we may get into situation where all operations succeeded but data hasn't reached the disk. And in fact will never do. Therefore we ought sync caches to make sure data has reached the block device on remote host. --- src/util/iohelper.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/util/iohelper.c b/src/util/iohelper.c index c6542ed..860e14a 100644 --- a/src/util/iohelper.c +++ b/src/util/iohelper.c @@ -179,6 +179,12 @@ runIO(const char *path, int fd, int oflags, unsigned long long length) } } + /* Ensure all data is written */ + if (fdatasync(fdout) < 0) { + virReportSystemError(errno, _("unable to fsync %s"), fdoutname); + goto cleanup; + } + ret = 0; cleanup: -- 1.7.8.6

2 3

[libvirt] [PATCHv2 0/3] Use virNodeGetCPUMap where appropriate
by Viktor Mihajlovski 01 Nov '12

01 Nov '12

This series concludes the introduction of the virNodeGetCPUMap API by replacing calls to virNodeGetInfo used only for the purpose of computing the maximum number of node CPUs (which has the potential to yield the incorrect number). Most prominently, with patch 3/3 the output of virsh vcpuinfo will now be correct for domains on hosts with offline CPUs V2 Changes: Rework based on Eric's feedback: - Use nodeGetCPUCount instead of nodeGetCPUMap - Avoid code bloat by computing node CPU count in a helper function Viktor Mihajlovski (3): qemu, lxc: Change host CPU detection logic. python: Use virNodeGetCPUMap where possible virsh: Use virNodeGetCPUMap if possible python/libvirt-override.c | 87 ++++++++++++++++++++++++++++------------------- src/lxc/lxc_controller.c | 8 ++--- src/qemu/qemu_driver.c | 14 +++----- src/qemu/qemu_process.c | 8 ++--- tools/virsh-domain.c | 32 ++++++++++++----- 5 files changed, 86 insertions(+), 63 deletions(-) -- 1.7.12.4

3 10

[libvirt] dhcp6, radvd, ip6tables, etc.
by Gene Czarcinski 01 Nov '12

01 Nov '12

OK, I have the basic implementation for libvirt support of dhcp6. Let me say again that 98% of the work was already done. There is still a bunch of work today which includes writing some tests, understanding how things such as bootp, dhcp-host, etc. should be supported with dhcp6, as well as the items I discuss below. 1. Right now, the only way that dhcp6 is in effect is if there is no dhcp4 range definition. This will be fixed/expanded so that, at a minimum, you can have both a dhcp4 and dhcp6 on the same interface. However, it appears to be easier to just pass to dnsmasq ANY/EVERY dhcp4 range or dhcp6 range defined in the xml. Comments? Any input on which approach to use or avoid? 2. I have modified radvd so both stateful (dhcp6) and stateless (SLAAC) addressing is supported with radvd for the default route. This is done on an interface basis (that is the way it works). So if any dhcp6 range is specified, then stateful is used. The way this is implemented will make it easy to add some tests verifying that the configuration parameters are working. I intend this to be an expansion to networkxml2argvtest since it has the xml specification files which determine both dnsmasq and radvd configuration parameters. 3. After completing what I thought was code that should result in a guest getting dhcp6 addresses, it was not working. Once more it took me a little time to realize that ip6tables rules were blocking it. [I have been down this path before, you would think I would realize the problem sooner.] 3a. In looking over the ip6tables rules, I saw a whole bunch of additions at the top of the INPUT chain which were accepts for udp/tcp port 53. In looking at the code in bridge_driver.c, I found that, every time a network device was started, 3 FORWARD rules and 2 INPUT rules were added, but, when the network device was destroyed, only the 3 FORWARD rules were removed. I believe this is a bug (but not high priority) and I will be submitting a separate patch to fix this. 3b. There are two different approaches for the rule which allows the dhcp6 server to work. I could add (actually insert) one rule to the INPUT chain which accepted the packet if it is "-d ff02::1:2 "--dport 547". Or, I could add (insert) a rule specifying "-i virbr__" for every IPv6 device which would be removed when the device was destroyed. 4. After getting all of this working to my satisfaction, my next mountain to climb is VM ... it really does not like network xml definitions which include a dhcp-range for an ipv6 definition. Comments? NOTE: I am implementing all of this assuming that my previous patches have been accepted ... the ones for creating a dnsmasq conf-file for parameters rather than using the dnsmasq command-line. I am sure that someone could spend the time refitting the dhcp6 patches to the old code but why get aggravated? If you folks do not want to do things that way, fine, please say so. But if it is going to be accepted, then I would like some indication of this. Gene

5 18

[libvirt] [PATCH repost] daemon: Make the default PolicyKit policy auth_admin_keep.
by Richard W.M. Jones 01 Nov '12

01 Nov '12

Reposted at Cole's request. Previous discussion here: https://www.redhat.com/archives/libvir-list/2012-October/thread.html#00682 Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming blog: http://rwmj.wordpress.com Fedora now supports 80 OCaml packages (the OPEN alternative to F#) http://cocan.org/getting_started_with_ocaml_on_red_hat_and_fedora

3 3

[libvirt] [PATCH v2] iohelper: fsync() at the end
by Michal Privoznik 01 Nov '12

01 Nov '12

Currently, when we are doing (managed) save, we insert the iohelper between the qemu and OS. The pipe is created, the writing end is passed to qemu and the reading end to the iohelper. It reads data and write them into given file. However, with write() being asynchronous data may still be in OS caches and hence in some (corner) cases, all migration data may have been read and written (not physically though). So qemu will report success, as well as iohelper. However, with some non local filesystems, where ENOSPACE is polled every X time units, we may get into situation where all operations succeeded but data hasn't reached the disk. And in fact will never do. Therefore we ought sync caches to make sure data has reached the block device on remote host. --- For more information follow: https://bugzilla.redhat.com/show_bug.cgi?id=866369 src/util/iohelper.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/src/util/iohelper.c b/src/util/iohelper.c index c6542ed..0d356c2 100644 --- a/src/util/iohelper.c +++ b/src/util/iohelper.c @@ -40,6 +40,7 @@ #include "virterror_internal.h" #include "configmake.h" #include "virrandom.h" +#include "storage_file.h" #define VIR_FROM_THIS VIR_FROM_STORAGE @@ -179,6 +180,14 @@ runIO(const char *path, int fd, int oflags, unsigned long long length) } } + /* If we are on shared FS ensure all data is written as some + * FSs may do writeback caching or polling for ENOSPC or any + * other magic that local FS does not.*/ + if (virStorageFileIsSharedFS(fdoutname) && (fdatasync(fdout) < 0)) { + virReportSystemError(errno, _("unable to fsync %s"), fdoutname); + goto cleanup; + } + ret = 0; cleanup: -- 1.7.8.6

3 2

[libvirt] [00/11] Automatically shutdown VMs on session quit
by Daniel P. Berrange 01 Nov '12

01 Nov '12

This is a followup to Alex's original proposal: https://www.redhat.com/archives/libvir-list/2012-October/msg00365.html The core idea & concepts are the same as in Alex's patch, but I realized I could take the opportunity to refactor part of libvirtd to improve life in general. The state drivers currently have an 'active' method which is polled on every iteration of the event loop to determine if any resources (such as VMs) are active. This is the kind of information we need to inhibit host shutdown/suspend, but it is not being made available in an easily consumable way. The key idea I had was to remove the 'active' method from the state drivers and instead pass in a callback to the 'startup' method in the state driver. This so called 'inhibit' callback is used by drivers to signal when they have resources active. This callback is used both to inhibit shutdown of libvirtd (when the --timeout arg is used), and to inhibit shutdown of the host OS itself. The state driver also gains a 'stop' method which is intended to stop any resources which are causing the shutdown inhibition. In other words, to save any VMs to disk. One of the side effects of this change is that the --timeout param to libvirtd actually now works much better. Only running VMs cause libvirtd shutdown to be inhibited. Networks / storage pools no longer inhibit it. This is obviously targetted at post-1.0.0

4 18

[libvirt] [PATCH] qemu: Add controllers in specified order
by Michal Privoznik 01 Nov '12

01 Nov '12

qemu is sensitive to the order of arguments passed. Hence, if a device requires a controller, the controller cmd string must precede device cmd string. The same apply for controllers, when for instance ccid controller requires usb controller. So controllers create partial ordering in which they should be added to qemu cmd line. --- The order is basically random for now, with one constraint: CCID must be preceded with USB. src/qemu/qemu_command.c | 102 +++++++++++++++++++++++++--------------------- 1 files changed, 55 insertions(+), 47 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index fe99f5d..ffeb965 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4429,7 +4429,7 @@ qemuBuildCommandLine(virConnectPtr conn, virDomainSnapshotObjPtr snapshot, enum virNetDevVPortProfileOp vmop) { - int i; + int i, j; struct utsname ut; int disableKQEMU = 0; int enableKQEMU = 0; @@ -4446,6 +4446,17 @@ qemuBuildCommandLine(virConnectPtr conn, int usbcontroller = 0; bool usblegacy = false; uname_normalize(&ut); + int contOrder[] = { + /* We don't add an explicit IDE or FD controller because the + * provided PIIX4 device already includes one. It isn't possible to + * remove the PIIX4. */ + VIR_DOMAIN_CONTROLLER_TYPE_USB, + VIR_DOMAIN_CONTROLLER_TYPE_SCSI, + VIR_DOMAIN_CONTROLLER_TYPE_SATA, + VIR_DOMAIN_CONTROLLER_TYPE_VIRTIO_SERIAL, + VIR_DOMAIN_CONTROLLER_TYPE_CCID, + }; + VIR_DEBUG("conn=%p driver=%p def=%p mon=%p json=%d " "caps=%p migrateFrom=%s migrateFD=%d " @@ -5024,61 +5035,59 @@ qemuBuildCommandLine(virConnectPtr conn, } if (qemuCapsGet(caps, QEMU_CAPS_DEVICE)) { - for (i = 0 ; i < def->ncontrollers ; i++) { - virDomainControllerDefPtr cont = def->controllers[i]; + for (j = 0; j < ARRAY_CARDINALITY(contOrder); j++) { + for (i = 0; i < def->ncontrollers; i++) { + virDomainControllerDefPtr cont = def->controllers[i]; - /* We don't add an explicit IDE or FD controller because the - * provided PIIX4 device already includes one. It isn't possible to - * remove the PIIX4. */ - if (cont->type == VIR_DOMAIN_CONTROLLER_TYPE_IDE || - cont->type == VIR_DOMAIN_CONTROLLER_TYPE_FDC) - continue; + if (cont->type != contOrder[j]) + continue; - /* Also, skip USB controllers with type none.*/ - if (cont->type == VIR_DOMAIN_CONTROLLER_TYPE_USB && - cont->model == VIR_DOMAIN_CONTROLLER_MODEL_USB_NONE) { - usbcontroller = -1; /* mark we don't want a controller */ - continue; - } + /* Also, skip USB controllers with type none.*/ + if (cont->type == VIR_DOMAIN_CONTROLLER_TYPE_USB && + cont->model == VIR_DOMAIN_CONTROLLER_MODEL_USB_NONE) { + usbcontroller = -1; /* mark we don't want a controller */ + continue; + } - /* Only recent QEMU implements a SATA (AHCI) controller */ - if (cont->type == VIR_DOMAIN_CONTROLLER_TYPE_SATA) { - if (!qemuCapsGet(caps, QEMU_CAPS_ICH9_AHCI)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("SATA is not supported with this " - "QEMU binary")); - goto error; + /* Only recent QEMU implements a SATA (AHCI) controller */ + if (cont->type == VIR_DOMAIN_CONTROLLER_TYPE_SATA) { + if (!qemuCapsGet(caps, QEMU_CAPS_ICH9_AHCI)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("SATA is not supported with this " + "QEMU binary")); + goto error; + } else { + char *devstr; + + virCommandAddArg(cmd, "-device"); + if (!(devstr = qemuBuildControllerDevStr(def, cont, + caps, NULL))) + goto error; + + virCommandAddArg(cmd, devstr); + VIR_FREE(devstr); + } + } else if (cont->type == VIR_DOMAIN_CONTROLLER_TYPE_USB && + cont->model == -1 && + !qemuCapsGet(caps, QEMU_CAPS_PIIX3_USB_UHCI)) { + if (usblegacy) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Multiple legacy USB controllers are " + "not supported")); + goto error; + } + usblegacy = true; } else { - char *devstr; - virCommandAddArg(cmd, "-device"); - if (!(devstr = qemuBuildControllerDevStr(def, cont, - caps, NULL))) + + char *devstr; + if (!(devstr = qemuBuildControllerDevStr(def, cont, caps, + &usbcontroller))) goto error; virCommandAddArg(cmd, devstr); VIR_FREE(devstr); } - } else if (cont->type == VIR_DOMAIN_CONTROLLER_TYPE_USB && - cont->model == -1 && - !qemuCapsGet(caps, QEMU_CAPS_PIIX3_USB_UHCI)) { - if (usblegacy) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Multiple legacy USB controllers are " - "not supported")); - goto error; - } - usblegacy = true; - } else { - virCommandAddArg(cmd, "-device"); - - char *devstr; - if (!(devstr = qemuBuildControllerDevStr(def, cont, caps, - &usbcontroller))) - goto error; - - virCommandAddArg(cmd, devstr); - VIR_FREE(devstr); } } } @@ -5553,7 +5562,6 @@ qemuBuildCommandLine(virConnectPtr conn, virDomainSmartcardDefPtr smartcard = def->smartcards[0]; char *devstr; virBuffer opt = VIR_BUFFER_INITIALIZER; - int j; const char *database; if (def->nsmartcards > 1 || -- 1.7.8.6

2 1

[libvirt] [PATCH] iohelper: fsync() at the end
by Michal Privoznik 01 Nov '12

01 Nov '12

Currently, when we are doing (managed) save, we insert the iohelper between the qemu and OS. The pipe is created, the writing end is passed to qemu and the reading end to the iohelper. It reads data and write them into given file. However, with write() being asynchronous data may still be in OS caches and hence in some (corner) cases, all migration data may have been read and written (not physically though). So qemu will report success, as well as iohelper. However, with some non local filesystems, where ENOSPACE is polled every X time units, we may get into situation where all operations succeeded but data hasn't reached the disk. And in fact will never do. Therefore we ought sync caches to make sure data has reached the block device on remote host. --- For more information follow: https://bugzilla.redhat.com/show_bug.cgi?id=866369 src/util/iohelper.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/src/util/iohelper.c b/src/util/iohelper.c index c6542ed..aad5cb8 100644 --- a/src/util/iohelper.c +++ b/src/util/iohelper.c @@ -179,6 +179,12 @@ runIO(const char *path, int fd, int oflags, unsigned long long length) } } + /* Ensure all data is written */ + if (fsync(fdout) < 0) { + virReportSystemError(errno, _("unable to fsync %s"), fdoutname); + goto cleanup; + } + ret = 0; cleanup: -- 1.7.8.6

2 2

[libvirt] [PATCH] gitignore: ignore more files
by liguang 01 Nov '12

01 Nov '12

ignore *.patch, cscope.po.out, cscope.in.out, tags Signed-off-by: liguang <lig.fnst(a)cn.fujitsu.com> --- .gitignore | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 1cd2d45..018b5d9 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,7 @@ *.pyc *.rej *.s +*.patch *~ .deps .gdb_history @@ -181,10 +182,13 @@ /update.log Makefile Makefile.in +tags TAGS coverage cscope.files cscope.out +cscope.in.out +cscope.po.out results.log stamp-h stamp-h.in -- 1.7.1

3 2

[libvirt] libvirt can not get right stats of a rbd pool
by yue 01 Nov '12

01 Nov '12

Allocation exceed Capacity ,but Available is not 0. #virsh pool-info 2361a6d4-0edc-3534-87ae-e7ee09199921 Name: 2361a6d4-0edc-3534-87ae-e7ee09199921 UUID: 2361a6d4-0edc-3534-87ae-e7ee09199921 State: running Persistent: yes Autostart: no Capacity: 285.57 GiB Allocation: 489.89 GiB Available: 230.59 GiB

4 3

[libvirt] [PATCH] build: Fix RPM build for non-x86 platforms
by Viktor Mihajlovski 01 Nov '12

01 Nov '12

Make the post install script for the lock-sanlock package optional to prevent break on non-x86 platforms. Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- libvirt.spec.in | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 41d2628..f8ede3f 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1568,12 +1568,13 @@ fi /bin/systemctl try-restart libvirt-guests.service >/dev/null 2>&1 || : %endif +%if %{with_sanlock} %post lock-sanlock if getent group sanlock > /dev/null ; then chmod 0770 %{_localstatedir}/lib/libvirt/sanlock chown root:sanlock %{_localstatedir}/lib/libvirt/sanlock fi - +%endif %files %defattr(-, root, root) -- 1.7.0.4

2 1

[libvirt] [PATCH] Don't assume pid_t is the same size as an int
by Daniel P. Berrange 01 Nov '12

01 Nov '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> virPidFileReadPathIfAlive passed in an 'int *' where a 'pid_t *' was expected, which breaks on Mingw64 targets. Also a few places were using '%d' for formatting pid_t, change them to '%lld' and force a cast to the longer type as done elsewhere in the same file. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/util/virpidfile.c | 4 ++-- src/util/virprocess.c | 13 +++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/util/virpidfile.c b/src/util/virpidfile.c index cb8a992..90a79c5 100644 --- a/src/util/virpidfile.c +++ b/src/util/virpidfile.c @@ -206,7 +206,7 @@ int virPidFileReadPathIfAlive(const char *path, pid_t *pid, const char *binPath) { - int ret, retPid; + int ret; bool isLink; char *procPath = NULL; char *procLink = NULL; @@ -215,7 +215,7 @@ int virPidFileReadPathIfAlive(const char *path, char *resolvedProcLink = NULL; const char deletedText[] = " (deleted)"; size_t deletedTextLen = strlen(deletedText); - + pid_t retPid; /* only set this at the very end on success */ *pid = -1; diff --git a/src/util/virprocess.c b/src/util/virprocess.c index 4bb7ebc..f8a8a49 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -250,7 +250,7 @@ virProcessKillPainfully(pid_t pid, bool force) int i, ret = -1; const char *signame = "TERM"; - VIR_DEBUG("vpid=%d force=%d", pid, force); + VIR_DEBUG("vpid=%lld force=%d", (long long)pid, force); /* This loop sends SIGTERM, then waits a few iterations (10 seconds) * to see if it dies. If the process still hasn't exited, and @@ -265,8 +265,8 @@ virProcessKillPainfully(pid_t pid, bool force) if (i == 0) { signum = SIGTERM; /* kindly suggest it should exit */ } else if ((i == 50) & force) { - VIR_DEBUG("Timed out waiting after SIGTERM to process %d, " - "sending SIGKILL", pid); + VIR_DEBUG("Timed out waiting after SIGTERM to process %lld, " + "sending SIGKILL", (long long)pid); /* No SIGKILL kill on Win32 ! Use SIGABRT instead which our * virProcessKill proc will handle more or less like SIGKILL */ #ifdef WIN32 @@ -283,8 +283,8 @@ virProcessKillPainfully(pid_t pid, bool force) if (virProcessKill(pid, signum) < 0) { if (errno != ESRCH) { virReportSystemError(errno, - _("Failed to terminate process %d with SIG%s"), - pid, signame); + _("Failed to terminate process %lld with SIG%s"), + (long long)pid, signame); goto cleanup; } ret = signum == SIGTERM ? 0 : 1; @@ -294,7 +294,8 @@ virProcessKillPainfully(pid_t pid, bool force) usleep(200 * 1000); } - VIR_DEBUG("Timed out waiting after SIGKILL to process %d", pid); + VIR_DEBUG("Timed out waiting after SIGKILL to process %lld", + (long long)pid); cleanup: return ret; -- 1.7.11.7

2 1

[libvirt] [PATCH] Fix arch detection for qemu-system-i386 with QMP
by Daniel P. Berrange 01 Nov '12

01 Nov '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> QEMU uses 'i386' for its 32-bit x86 architecture, but libvirt wants that to be 'i686', so we must fix it up Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/qemu/qemu_capabilities.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 9f15162..271273c 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2327,6 +2327,14 @@ qemuCapsInitQMP(qemuCapsPtr caps, if (!(caps->arch = qemuMonitorGetTargetArch(mon))) goto cleanup; + /* Map i386, i486, i586 to i686. */ + if (caps->arch[0] == 'i' && + caps->arch[1] != '\0' && + caps->arch[2] == '8' && + caps->arch[3] == '6' && + caps->arch[4] == '\0') + caps->arch[1] = '6'; + /* Currently only x86_64 and i686 support PCI-multibus. */ if (STREQLEN(caps->arch, "x86_64", 6) || STREQLEN(caps->arch, "i686", 4)) { -- 1.7.12.1

2 1

[libvirt] [PATCH 0/3] Use virNodeGetCPUMap where appropriate
by Viktor Mihajlovski 01 Nov '12

01 Nov '12

This series concludes the introduction of the virNodeGetCPUMap API by replacing calls to virNodeGetInfo used only for the purpose of computing the maximum number of node CPUs (which has the potential to yield the incorrect number). Most prominently, with patch 3/3 the output of virsh vcpuinfo will now be correct for domains on hosts with offline CPUs Viktor Mihajlovski (3): qemu, lxc: Change host CPU detection logic. python: Use virNodeGetCPUMap where possible virsh: Use virNodeGetCPUMap if possible python/libvirt-override.c | 100 ++++++++++++++++++++++++++++++++++------------ src/lxc/lxc_controller.c | 8 ++-- src/qemu/qemu_driver.c | 12 ++---- src/qemu/qemu_process.c | 10 ++--- tools/virsh-domain.c | 36 +++++++++++------ 5 files changed, 108 insertions(+), 58 deletions(-) -- 1.7.12.4

2 7

[libvirt] Entering freeze for libvirt-1.0.0 release
by Daniel Veillard 01 Nov '12

01 Nov '12

As scheduled, we are entering freeze for 1.0.0, yay ! I have tagged the git tree and pushed libvirt-1.0.0-rc1.tar.gz release candidate 1 to the ftp (along with rpms): ftp://libvirt.org/libvirt/ Due to the slightly higher visibility of this release, we are giving a bit more time for testing of the candidates, and the plan is to push the final version at the end of next week, so expect an rc2 at the end of the week and probably an rc3 by mid next week. Give it a try and report, thanks ! Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

7 13

[libvirt] [PATCH] docs: libvirtd no longer uses abstract namespace
by Eric Blake 01 Nov '12

01 Nov '12

Commit 905be03d2 quit using the abstract namespace, but didn't update the --help text to match. * daemon/libvirtd.c (daemonUsage): Correct socket listing. --- See also: https://www.redhat.com/archives/libvirt-users/2012-October/msg00152.html daemon/libvirtd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index d5f3e4c..624831a 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -936,7 +936,7 @@ libvirt management daemon:\n"), argv0); $XDG_CONFIG_HOME/libvirt/libvirtd.conf\n\ \n\ Sockets:\n\ - $XDG_RUNTIME_DIR/libvirt/libvirt-sock (in UNIX abstract namespace)\n\ + $XDG_RUNTIME_DIR/libvirt/libvirt-sock\n\ \n\ TLS:\n\ CA certificate: $HOME/.pki/libvirt/cacert.pem\n\ -- 1.7.11.7

2 2

[libvirt] [PATCH] gitignore: Ignore 'tags'
by Michal Privoznik 01 Nov '12

01 Nov '12

--- .gitignore | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/.gitignore b/.gitignore index 98ce398..79a055b 100644 --- a/.gitignore +++ b/.gitignore @@ -193,6 +193,7 @@ results.log stamp-h stamp-h.in stamp-h1 +tags !/gnulib/lib/Makefile.am !/gnulib/tests/Makefile.am !/m4/virt-*.m4 -- 1.7.8.6

3 3