- Devel - libvirt List Archives

[libvirt] how to enable ceph-rbd in libvirt.
by yue 15 Oct '12

15 Oct '12

1.my libvirtd version is 0.9.10. i rebuild qemu with --enable-rbd. it seems not work if guest-os has a rbd disk. -----rbd disk info ---- <disk type='network' device='disk'> <driver name='qemu' type='raw'/> <auth username='cloud'> <secret type='ceph' uuid='7a91dc24-b072-43c4-98fb-4b2415322b0f'/> </auth> <source protocol='rbd' name='cloud/testrbd'> <host name='192.168.10.4' port='6789'/> </source> <target dev='vdb' bus='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> </disk> 2.-----------------------error log--------- LC_ALL=C PATH=/sbin:/usr/sbin:/bin:/usr/bin HOME=/root USER=root LOGNAME=root QEMU_AUDIO_DRV=none /usr/libexec/qemu-kvm -S -M rhel6.2.0 -enable-kvm -m 512 -smp 1,sockets=1,cores=1,threads=1 -name xpSP3 -uuid b45bd66a-6700-4905-c5f4-4c799413d7b7 -nodefconfig -nodefaults -chardev socket,id=charmonitor,path=/var/lib/libvirt/qemu/xpSP3.monitor,server,nowait -mon chardev=charmonitor,id=monitor,mode=control -rtc base=localtime,driftfix=slew -no-shutdown -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 -drive file=/var/lib/libvirt/images/xpSP3.img,if=none,id=drive-ide0-0-0,format=raw,cache=none -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 -drive file=rbd:cloud/testrbd:id=cloud:key=AQCGbGRQ+M+NGBAATtylZNiSxqCTQ4uaApd+9w==:auth_supported=cephx none:mon_host=192.168.10.4\:6789,if=none,id=drive-virtio-disk1,format=raw -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x6,drive=drive-virtio-disk1,id=virtio-disk1 -netdev tap,fd=26,id=hostnet0 -device e! 1000,netdev=hostnet0,id=net0,mac=52:54:00:2a:8c:48,bus=pci.0,addr=0x3 -chardev pty,id=charserial0 -device isa-serial,chardev=charserial0,id=serial0 -device usb-tablet,id=input0 -vnc 0.0.0.0:0 -vga std -device intel-hda,id=sound0,bus=pci.0,addr=0x4 -device hda-duplex,id=sound0-codec0,bus=sound0.0,cad=0 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 Domain id=6 is tainted: high-privileges char device redirected to /dev/pts/4 qemu-kvm: -drive file=rbd:cloud/testrbd:id=cloud:key=AQCGbGRQ+M+NGBAATtylZNiSxqCTQ4uaApd+9w==:auth_supported=cephx none:mon_host=192.168.10.4\:6789,if=none,id=drive-virtio-disk1,format=raw: could not open disk image rbd:cloud/testrbd:id=cloud:key=AQCGbGRQ+M+NGBAATtylZNiSxqCTQ4uaApd+9w==:auth_supported=cephx none:mon_host=192.168.10.4\:6789: No such file or directory 2012-10-11 10:37:24.215+0000: shutting down

3 11

[libvirt] [PATCH 0/7 v2] CPU tuning improvements
by Osier Yang 15 Oct '12

15 Oct '12

As proposed in https://www.redhat.com/archives/libvir-list/2012-October/msg00522.html, This patch set is trying to resolve the conflicts between <vcpu> , <vcpupin>, and <emulatorpin>, when doing CPU tuning for domain process or vcpu threads. PATCH 1/7 changes all the doc together, as the 3 elements are related with each other too tightly, splitting the changes in separate patches will just make things obscure and hard to review. See commit log of PATCH 1/7 for overview/details about the solution. Osier Yang (7): doc: Clarify the relationship between <vcpu>, <vcpupin>, and <emulatorpin> conf: Do not allow vcpupin's cpuid exceed current vcpus number conf: Initialize the pinning policy for vcpus qemu: Create or remove cgroup when doing vcpu hotpluging qemu: Initialize cpuset for hotplugged vcpu as def->cpuset conf: Prohibit emulatorpin if vcpu placement is auto qemu: Ignore def->cpumask if emulatorpin is specified docs/formatdomain.html.in | 42 +++++++++++------ src/conf/domain_conf.c | 103 ++++++++++++++++++++++++++++++++++++++++- src/conf/domain_conf.h | 3 + src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 110 +++++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_process.c | 3 +- 6 files changed, 243 insertions(+), 19 deletions(-) -- 1.7.7.6 Regards, Osier

2 20

[libvirt] [PATCH] daemon: Use $(AM_V_GEN) in a few more places
by Cole Robinson 14 Oct '12

14 Oct '12

--- daemon/Makefile.am | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 3405c67..1c7505b 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -84,10 +84,10 @@ augeastests_DATA = test_libvirtd.aug CLEANFILES += test_libvirtd.aug libvirtd.8: $(srcdir)/libvirtd.8.in - sed \ + $(AM_V_GEN)sed \ -e 's!SYSCONFDIR!$(sysconfdir)!g' \ -e 's!LOCALSTATEDIR!$(localstatedir)!g' \ - < $< > $@-t + < $< > $@-t && \ mv $@-t $@ libvirtd_SOURCES = $(DAEMON_SOURCES) @@ -215,15 +215,15 @@ LOGROTATE_CONFS = libvirtd.qemu.logrotate libvirtd.lxc.logrotate \ BUILT_SOURCES += $(LOGROTATE_CONFS) libvirtd.logrotate: libvirtd.logrotate.in - sed \ + $(AM_V_GEN)sed \ -e 's![@]localstatedir[@]!$(localstatedir)!g' \ - < $< > $@-t + < $< > $@-t && \ mv $@-t $@ libvirtd.qemu.logrotate: libvirtd.qemu.logrotate.in - sed \ + $(AM_V_GEN)sed \ -e 's![@]localstatedir[@]!$(localstatedir)!g' \ - < $< > $@-t + < $< > $@-t && \ mv $@-t $@ libvirtd.lxc.logrotate: libvirtd.lxc.logrotate.in -- 1.7.11.4

2 2

[libvirt] [PATCH 0/4] qemu: support live change of all netdev hostside config
by Laine Stump 14 Oct '12

14 Oct '12

This patch series resolves: https://bugzilla.redhat.com/show_bug.cgi?id=805071 It enhances virDomainUpdateDeviceFlags for network devices to allow live change of just about everything that doesn't affect what hardware is presented to the guest (e.g. the device model, mac address, PCI address, and other PCI attributes can't be changed, but the type/details of the connection to the host network can be changed, including bandwidth, type of tap device, vlan setting, nwfilter). I haven't tested the new code yet beyond compiling, but wanted to get the patches up on the list since the weekend is coming. I'll be testing this morning and hopefully won't encounter any major problems.

2 10

[libvirt] [PATCH] Properly parse (unsigned) long long
by Guido Günther 13 Oct '12

13 Oct '12

This fixes problems on platforms where sizeof(long) != sizeof(long long) like ia32. --- Cheers, -- Guido python/generator.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python/generator.py b/python/generator.py index a98a894..1ef76e1 100755 --- a/python/generator.py +++ b/python/generator.py @@ -259,8 +259,8 @@ py_types = { 'double': ('d', None, "double", "double"), 'unsigned int': ('i', None, "int", "int"), 'unsigned long': ('l', None, "long", "long"), - 'long long': ('l', None, "longlong", "long long"), - 'unsigned long long': ('l', None, "longlong", "long long"), + 'long long': ('L', None, "longlong", "long long"), + 'unsigned long long': ('K', None, "longlong", "long long"), 'unsigned char *': ('z', None, "charPtr", "char *"), 'char *': ('z', None, "charPtr", "char *"), 'const char *': ('z', None, "constcharPtr", "const char *"), -- 1.7.10.4

2 2

[libvirt] [PATCH] spec: Add support for libssh2 transport
by Peter Krempa 12 Oct '12

12 Oct '12

Libssh2 transport support was enabled lately but the spec file wasn't updated to take this into account. This caused libvirt to be built without libssh2 support in Red Hat based OSes. --- I'm not sure how the {?rhel} >= 6 macro is evaluated: Is there a possibility to be more specific with the version? libvirt.spec.in | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 318fe92..75623eb 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -108,6 +108,7 @@ %define with_systemd 0%{!?_without_systemd:0} %define with_numad 0%{!?_without_numad:0} %define with_firewalld 0%{!?_without_firewalld:0} +%define with_libssh2_transport 0%{!?_without_libssh2_transport:0} # Non-server/HV driver defaults which are always enabled %define with_python 0%{!?_without_python:1} @@ -229,6 +230,11 @@ %endif %endif +# Enable libssh2 transport for new enough distros +%if 0%{?fedora} >= 17 || 0%{?rhel} >= 6 +%define with_libssh2_transport 0%{!?_without_libssh2_transport:1} +%endif + # Disable some drivers when building without libvirt daemon. # The logic is the same as in configure.ac %if ! %{with_libvirtd} @@ -491,9 +497,13 @@ BuildRequires: numactl-devel %if %{with_capng} BuildRequires: libcap-ng-devel >= 0.5.0 %endif -%if %{with_phyp} +%if %{with_phyp} || %{with_libssh2_transport} +%if %{with_libssh2_transport} +BuildRequires: libssh2-devel >= 1.3.0 +%else BuildRequires: libssh2-devel %endif +%endif %if %{with_netcf} %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 -- 1.7.12.3

2 2

[libvirt] [PATCH] selinux: Use raw contexts
by Martin Kletzander 12 Oct '12

12 Oct '12

We are currently able to work only with non-translated SELinux contexts, but we are using functions that work with translated contexts throughout the code. This patch swaps all SELinux context translation relative calls with their raw sisters to avoid parsing problems. The problems can be experienced with mcstrans for example. Thanks Laurent Bigonville for finding this out. --- configure.ac | 4 ++-- src/security/security_selinux.c | 26 +++++++++++++------------- src/storage/storage_backend.c | 2 +- tests/securityselinuxhelper.c | 6 +++--- tests/securityselinuxtest.c | 2 +- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/configure.ac b/configure.ac index bcdea9c..08dc63d 100644 --- a/configure.ac +++ b/configure.ac @@ -1440,14 +1440,14 @@ if test "$with_selinux" != "no"; then old_libs="$LIBS" if test "$with_selinux" = "check"; then AC_CHECK_HEADER([selinux/selinux.h],[],[with_selinux=no]) - AC_CHECK_LIB([selinux], [fgetfilecon],[],[with_selinux=no]) + AC_CHECK_LIB([selinux], [fgetfilecon_raw],[],[with_selinux=no]) if test "$with_selinux" != "no"; then with_selinux="yes" fi else fail=0 AC_CHECK_HEADER([selinux/selinux.h],[],[fail=1]) - AC_CHECK_LIB([selinux], [fgetfilecon],[],[fail=1]) + AC_CHECK_LIB([selinux], [fgetfilecon_raw],[],[fail=1]) test $fail = 1 && AC_MSG_ERROR([You must install the libselinux development package in order to compile libvirt with basic SELinux support]) fi diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index d55c60d..10135ed 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -111,7 +111,7 @@ virSecuritySELinuxMCSFind(virSecurityManagerPtr mgr) char *sens, *cat, *tmp; int catMin, catMax, catRange; - if (getcon(&ourSecContext) < 0) { + if (getcon_raw(&ourSecContext) < 0) { virReportSystemError(errno, "%s", _("Unable to get current process SELinux context")); goto cleanup; @@ -252,7 +252,7 @@ virSecuritySELinuxGenNewContext(const char *basecontext, VIR_DEBUG("basecontext=%s mcs=%s isObjectContext=%d", basecontext, mcs, isObjectContext); - if (getcon(&ourSecContext) < 0) { + if (getcon_raw(&ourSecContext) < 0) { virReportSystemError(errno, "%s", _("Unable to get current process SELinux context")); goto cleanup; @@ -612,7 +612,7 @@ virSecuritySELinuxReserveSecurityLabel(virSecurityManagerPtr mgr, if (seclabel->type == VIR_DOMAIN_SECLABEL_STATIC) return 0; - if (getpidcon(pid, &pctx) == -1) { + if (getpidcon_raw(pid, &pctx) == -1) { virReportSystemError(errno, _("unable to get PID %d security context"), pid); return -1; @@ -713,7 +713,7 @@ virSecuritySELinuxGetSecurityProcessLabel(virSecurityManagerPtr mgr ATTRIBUTE_UN { security_context_t ctx; - if (getpidcon(pid, &ctx) == -1) { + if (getpidcon_raw(pid, &ctx) == -1) { virReportSystemError(errno, _("unable to get PID %d security context"), pid); @@ -753,10 +753,10 @@ virSecuritySELinuxSetFileconHelper(const char *path, char *tcon, bool optional) VIR_INFO("Setting SELinux context on '%s' to '%s'", path, tcon); - if (setfilecon(path, tcon) < 0) { + if (setfilecon_raw(path, tcon) < 0) { int setfilecon_errno = errno; - if (getfilecon(path, &econ) >= 0) { + if (getfilecon_raw(path, &econ) >= 0) { if (STREQ(tcon, econ)) { freecon(econ); /* It's alright, there's nothing to change anyway. */ @@ -818,10 +818,10 @@ virSecuritySELinuxFSetFilecon(int fd, char *tcon) VIR_INFO("Setting SELinux context on fd %d to '%s'", fd, tcon); - if (fsetfilecon(fd, tcon) < 0) { + if (fsetfilecon_raw(fd, tcon) < 0) { int fsetfilecon_errno = errno; - if (fgetfilecon(fd, &econ) >= 0) { + if (fgetfilecon_raw(fd, &econ) >= 0) { if (STREQ(tcon, econ)) { freecon(econ); /* It's alright, there's nothing to change anyway. */ @@ -1577,7 +1577,7 @@ virSecuritySELinuxSetSecurityProcessLabel(virSecurityManagerPtr mgr, return -1; } - if (setexeccon(secdef->label) == -1) { + if (setexeccon_raw(secdef->label) == -1) { virReportSystemError(errno, _("unable to set security context '%s'"), secdef->label); @@ -1622,7 +1622,7 @@ virSecuritySELinuxSetSecurityDaemonSocketLabel(virSecurityManagerPtr mgr, goto done; } - if (getcon(&scon) == -1) { + if (getcon_raw(&scon) == -1) { virReportSystemError(errno, _("unable to get current process context '%s'"), secdef->label); @@ -1645,7 +1645,7 @@ virSecuritySELinuxSetSecurityDaemonSocketLabel(virSecurityManagerPtr mgr, VIR_DEBUG("Setting VM %s socket context %s", def->name, context_str(proccon)); - if (setsockcreatecon(context_str(proccon)) == -1) { + if (setsockcreatecon_raw(context_str(proccon)) == -1) { virReportSystemError(errno, _("unable to set socket security context '%s'"), context_str(proccon)); @@ -1688,7 +1688,7 @@ virSecuritySELinuxSetSecuritySocketLabel(virSecurityManagerPtr mgr, VIR_DEBUG("Setting VM %s socket context %s", vm->name, secdef->label); - if (setsockcreatecon(secdef->label) == -1) { + if (setsockcreatecon_raw(secdef->label) == -1) { virReportSystemError(errno, _("unable to set socket security context '%s'"), secdef->label); @@ -1728,7 +1728,7 @@ virSecuritySELinuxClearSecuritySocketLabel(virSecurityManagerPtr mgr, return -1; } - if (setsockcreatecon(NULL) == -1) { + if (setsockcreatecon_raw(NULL) == -1) { virReportSystemError(errno, _("unable to clear socket security context '%s'"), secdef->label); diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index e159bd2..aea70e2 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -1227,7 +1227,7 @@ virStorageBackendUpdateVolTargetInfoFD(virStorageVolTargetPtr target, #if HAVE_SELINUX /* XXX: make this a security driver call */ - if (fgetfilecon(fd, &filecon) == -1) { + if (fgetfilecon_raw(fd, &filecon) == -1) { if (errno != ENODATA && errno != ENOTSUP) { virReportSystemError(errno, _("cannot get file context of '%s'"), diff --git a/tests/securityselinuxhelper.c b/tests/securityselinuxhelper.c index 43676de..dc63ff3 100644 --- a/tests/securityselinuxhelper.c +++ b/tests/securityselinuxhelper.c @@ -31,7 +31,7 @@ * the process context, where as in fact we're faking it all */ -int getcon(security_context_t *context) +int getcon_raw(security_context_t *context) { if (getenv("FAKE_CONTEXT") == NULL) { *context = NULL; @@ -43,7 +43,7 @@ int getcon(security_context_t *context) return 0; } -int getpidcon(pid_t pid, security_context_t *context) +int getpidcon_raw(pid_t pid, security_context_t *context) { if (pid != getpid()) { *context = NULL; @@ -60,7 +60,7 @@ int getpidcon(pid_t pid, security_context_t *context) return 0; } -int setcon(security_context_t context) +int setcon_raw(security_context_t context) { return setenv("FAKE_CONTEXT", context, 1); } diff --git a/tests/securityselinuxtest.c b/tests/securityselinuxtest.c index 848a390..8bcf3a1 100644 --- a/tests/securityselinuxtest.c +++ b/tests/securityselinuxtest.c @@ -217,7 +217,7 @@ testSELinuxGenLabel(const void *opaque) context_t con = NULL; context_t imgcon = NULL; - if (setcon((security_context_t)data->pidcon) < 0) { + if (setcon_raw((security_context_t)data->pidcon) < 0) { perror("Cannot set process security context"); return -1; } -- 1.7.12.3

2 4

[libvirt] (no subject)
by cbley＠av-test.de 12 Oct '12

12 Oct '12

>From 9c4881c67472575c3f1982f0921a4292025a9620 Mon Sep 17 00:00:00 2001 Message-Id: <9c4881c67472575c3f1982f0921a4292025a9620.1350037981.git.cbley(a)av-test.de> In-Reply-To: <cover.1350037981.git.cbley(a)av-test.de> References: <2DA6F4A3691599408358374D182280F9141CF6(a)xmb-rcd-x04.cisco.com> <cover.1350037981.git.cbley(a)av-test.de> From: cbley(a)av-test.de (Claudio Bley) Date: Fri, 17 Aug 2012 14:45:26 +0200 Subject: [PATCH 01/15] Explicitly set includeAntRuntime to false for javac tasks. To: libvir-list(a)redhat.com Organization: AV-Test GmbH, Germany This prevents warnings like this: warning: 'includeantruntime' was not set, defaulting to build.sysclasspath=last; set to false for repeatable builds --- build.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.xml b/build.xml index 0b009aa..158a8a5 100644 --- a/build.xml +++ b/build.xml @@ -42,8 +42,8 @@ </target> <target name="build" depends="init" description="builds the code and jar files"> - <javac srcdir="src/main/java" includes="**/*.java" classpathref="compile.classpath" destdir="target/classes" /> - <javac srcdir="src/test/java" includes="**/*.java" classpathref="test.classpath" destdir="target/testclasses" /> + <javac srcdir="src/main/java" debug="${javac.debug}" includes="**/*.java" classpathref="compile.classpath" destdir="target/classes" includeAntRuntime="false" /> + <javac srcdir="src/test/java" debug="${javac.debug}" includes="**/*.java" classpathref="test.classpath" destdir="target/testclasses" includeAntRuntime="false" /> <jar destfile="${jar.file}" basedir="target/classes" /> </target> -- AV-Test GmbH, Henricistraße 20, 04155 Leipzig, Germany Phone: +49 341 265 310 19 Web:<http://www.av-test.org> Eingetragen am / Registered at: Amtsgericht Stendal (HRB 114076) Geschaeftsfuehrer (CEO): Andreas Marx, Guido Habicht, Maik Morgenstern

3 3

[libvirt] (no subject)
by cbley＠av-test.de 12 Oct '12

12 Oct '12

>From 9af3b59730ed3d098fd8864cd48efd5a8dc8bcfe Mon Sep 17 00:00:00 2001 Message-Id: <9af3b59730ed3d098fd8864cd48efd5a8dc8bcfe.1350037981.git.cbley(a)av-test.de> In-Reply-To: <cover.1350037981.git.cbley(a)av-test.de> References: <2DA6F4A3691599408358374D182280F9141CF6(a)xmb-rcd-x04.cisco.com> <cover.1350037981.git.cbley(a)av-test.de> From: cbley(a)av-test.de (Claudio Bley) Date: Mon, 20 Aug 2012 16:52:28 +0200 Subject: [PATCH 07/15] Mark virConnCopyLastError and virConnGetLastError as deprecated. To: libvir-list(a)redhat.com Organization: AV-Test GmbH, Germany They are only retained for backwards compatibility. --- src/main/java/org/libvirt/jna/Libvirt.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/main/java/org/libvirt/jna/Libvirt.java b/src/main/java/org/libvirt/jna/Libvirt.java index 02457b7..be0de3b 100644 --- a/src/main/java/org/libvirt/jna/Libvirt.java +++ b/src/main/java/org/libvirt/jna/Libvirt.java @@ -109,6 +109,14 @@ public interface Libvirt extends Library { // Connection Functions String virConnectBaselineCPU(ConnectionPointer virConnectPtr, String[] xmlCPUs, int ncpus, int flags); + + /** + * @deprecated as of libvirt 0.6.0, all errors reported in the + * per-connection object are also duplicated in the global error + * object. This method remains for backwards compatibility. Use + * {@link #virCopyLastError} instead. + */ + @Deprecated int virConnCopyLastError(ConnectionPointer virConnectPtr, virError to); int virConnectClose(ConnectionPointer virConnectPtr); int virConnectCompareCPU(ConnectionPointer virConnectPtr, String xmlDesc, int flags); @@ -148,6 +156,14 @@ public interface Libvirt extends Library { ConnectionPointer virConnectOpen(String name); ConnectionPointer virConnectOpenAuth(String name, virConnectAuth auth, int flags); ConnectionPointer virConnectOpenReadOnly(String name); + + /** + * @deprecated as of libvirt 0.6.0, all errors reported in the + * per-connection object are also duplicated in the global error + * object. This method remains only for backwards compatibility. + * Use {@link #virGetLastError} instead. + */ + @Deprecated virError virConnGetLastError(ConnectionPointer virConnectPtr); int virConnResetLastError(ConnectionPointer virConnectPtr); String virConnectDomainXMLFromNative(ConnectionPointer virConnectPtr, String nativeFormat, -- AV-Test GmbH, Henricistraße 20, 04155 Leipzig, Germany Phone: +49 341 265 310 19 Web:<http://www.av-test.org> Eingetragen am / Registered at: Amtsgericht Stendal (HRB 114076) Geschaeftsfuehrer (CEO): Andreas Marx, Guido Habicht, Maik Morgenstern

1 0

[libvirt] (no subject)
by cbley＠av-test.de 12 Oct '12

12 Oct '12

>From f647654bb86a695e8ad6e3f442b3058d54647556 Mon Sep 17 00:00:00 2001 Message-Id: <f647654bb86a695e8ad6e3f442b3058d54647556.1350037981.git.cbley(a)av-test.de> In-Reply-To: <cover.1350037981.git.cbley(a)av-test.de> References: <2DA6F4A3691599408358374D182280F9141CF6(a)xmb-rcd-x04.cisco.com> <cover.1350037981.git.cbley(a)av-test.de> From: cbley(a)av-test.de (Claudio Bley) Date: Fri, 12 Oct 2012 11:01:29 +0200 Subject: [PATCH 02/15] Introduce a javac.debug property. To: libvir-list(a)redhat.com Organization: AV-Test GmbH, Germany Set this to 'true' if you want to build your .class files with debug information. --- build.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/build.xml b/build.xml index 158a8a5..0b147b0 100644 --- a/build.xml +++ b/build.xml @@ -13,6 +13,7 @@ <property name="debian.controlfile" value="${debian.pkgdir}/DEBIAN/control" /> <property name="debian.pkg" value="target/libvirt-java_${version}_all.deb" /> <property environment="env"/> + <property name="javac.debug" value="off" /> <path id="compile.classpath"> <fileset dir="${jar.dir}"> -- AV-Test GmbH, Henricistraße 20, 04155 Leipzig, Germany Phone: +49 341 265 310 19 Web:<http://www.av-test.org> Eingetragen am / Registered at: Amtsgericht Stendal (HRB 114076) Geschaeftsfuehrer (CEO): Andreas Marx, Guido Habicht, Maik Morgenstern

1 0

[libvirt] (no subject)
by cbley＠av-test.de 12 Oct '12

12 Oct '12

>From 3a4105d5eb1b4425fcf0dcb57fd1bedac6b7beb8 Mon Sep 17 00:00:00 2001 Message-Id: <3a4105d5eb1b4425fcf0dcb57fd1bedac6b7beb8.1350037981.git.cbley(a)av-test.de> In-Reply-To: <cover.1350037981.git.cbley(a)av-test.de> References: <2DA6F4A3691599408358374D182280F9141CF6(a)xmb-rcd-x04.cisco.com> <cover.1350037981.git.cbley(a)av-test.de> From: cbley(a)av-test.de (Claudio Bley) Date: Tue, 21 Aug 2012 16:06:59 +0200 Subject: [PATCH 08/15] Call processError only if a libvirt function indicates an error. To: libvir-list(a)redhat.com Organization: AV-Test GmbH, Germany Usually, when libvirt functions return an int, an error is indicated by returning -1. If libvirt functions return an object (pointer), an error is indicated by returning null. Add overloads for method processError that check for these special return values and call processError() in case an error occurred. --- src/main/java/org/libvirt/Connect.java | 430 ++++++++++---------------------- 1 file changed, 135 insertions(+), 295 deletions(-) diff --git a/src/main/java/org/libvirt/Connect.java b/src/main/java/org/libvirt/Connect.java index 5419e85..e02c601 100644 --- a/src/main/java/org/libvirt/Connect.java +++ b/src/main/java/org/libvirt/Connect.java @@ -170,7 +170,7 @@ public class Connect { public Connect(String uri) throws LibvirtException { VCP = libvirt.virConnectOpen(uri); // Check for an error - processError(); + processError(VCP); ErrorHandler.processError(Libvirt.INSTANCE); } @@ -191,7 +191,7 @@ public class Connect { VCP = libvirt.virConnectOpen(uri); } // Check for an error - processError(); + processError(VCP); ErrorHandler.processError(Libvirt.INSTANCE); } @@ -224,7 +224,7 @@ public class Connect { VCP = libvirt.virConnectOpenAuth(uri, vAuth, flags); // Check for an error - processError(); + processError(VCP); ErrorHandler.processError(Libvirt.INSTANCE); } @@ -238,9 +238,7 @@ public class Connect { * @throws LibvirtException */ public String baselineCPU(String[] xmlCPUs) throws LibvirtException { - String returnValue = libvirt.virConnectBaselineCPU(VCP, xmlCPUs, xmlCPUs.length, 0); - processError(); - return returnValue; + return processError(libvirt.virConnectBaselineCPU(VCP, xmlCPUs, xmlCPUs.length, 0)); } /** @@ -248,20 +246,19 @@ public class Connect { * the object after close() will result in an exception. * * @throws LibvirtException - * @return number of references left (>= 0) for success, -1 for failure. + * @return number of remaining references (>= 0) */ public int close() throws LibvirtException { int success = 0; if (VCP != null) { success = libvirt.virConnectClose(VCP); - processError(); // If leave an invalid pointer dangling around JVM crashes and burns // if someone tries to call a method on us // We rely on the underlying libvirt error handling to detect that // it's called with a null virConnectPointer VCP = null; } - return success; + return processError(success); } /** @@ -290,13 +287,8 @@ public class Connect { * @throws LibvirtException */ public Device deviceCreateXML(String xmlDesc) throws LibvirtException { - Device returnValue = null; - DevicePointer ptr = libvirt.virNodeDeviceCreateXML(VCP, xmlDesc, 0); - processError(); - if (ptr != null) { - returnValue = new Device(this, ptr); - } - return returnValue; + DevicePointer ptr = processError(libvirt.virNodeDeviceCreateXML(VCP, xmlDesc, 0)); + return new Device(this, ptr); } /** @@ -308,8 +300,7 @@ public class Connect { * @throws LibvirtException */ public Device deviceLookupByName(String name) throws LibvirtException { - DevicePointer ptr = libvirt.virNodeDeviceLookupByName(VCP, name); - processError(); + DevicePointer ptr = processError(libvirt.virNodeDeviceLookupByName(VCP, name)); return new Device(this, ptr); } @@ -328,13 +319,9 @@ public class Connect { * description </a> */ public Domain domainCreateLinux(String xmlDesc, int flags) throws LibvirtException { - Domain returnValue = null; - DomainPointer ptr = libvirt.virDomainCreateLinux(VCP, xmlDesc, flags); - processError(); - if (ptr != null) { - returnValue = new Domain(this, ptr); - } - return returnValue; + DomainPointer ptr = processError(libvirt.virDomainCreateLinux(VCP, xmlDesc, flags)); + + return new Domain(this, ptr); } /** @@ -347,13 +334,8 @@ public class Connect { * description </a> */ public Domain domainCreateXML(String xmlDesc, int flags) throws LibvirtException { - Domain returnValue = null; - DomainPointer ptr = libvirt.virDomainCreateXML(VCP, xmlDesc, flags); - processError(); - if (ptr != null) { - returnValue = new Domain(this, ptr); - } - return returnValue; + DomainPointer ptr = processError(libvirt.virDomainCreateXML(VCP, xmlDesc, flags)); + return new Domain(this, ptr); } /** @@ -366,13 +348,8 @@ public class Connect { * description </a> */ public Domain domainDefineXML(String xmlDesc) throws LibvirtException { - Domain returnValue = null; - DomainPointer ptr = libvirt.virDomainDefineXML(VCP, xmlDesc); - processError(); - if (ptr != null) { - returnValue = new Domain(this, ptr); - } - return returnValue; + DomainPointer ptr = processError(libvirt.virDomainDefineXML(VCP, xmlDesc)); + return new Domain(this, ptr); } /** @@ -405,16 +382,15 @@ public class Connect { * the events to monitor * @param cb * the callback function to use. - * @return . The return value from this method is a positive integer - * identifier for the callback. -1 if an error - * @throws LibvirtException + * @return The return value from this method is a positive integer + * identifier for the callback. + * @throws LibvirtException on failure */ public int domainEventRegisterAny(Domain domain, int eventId, Libvirt.VirConnectDomainEventGenericCallback cb) throws LibvirtException { DomainPointer ptr = domain == null ? null : domain.VDP; int returnValue = libvirt.virConnectDomainEventRegisterAny(VCP, ptr, eventId, cb, null, null); - processError(); - return returnValue; + return processError(returnValue); } /** @@ -426,13 +402,8 @@ public class Connect { * @throws LibvirtException */ public Domain domainLookupByID(int id) throws LibvirtException { - Domain returnValue = null; - DomainPointer ptr = libvirt.virDomainLookupByID(VCP, id); - processError(); - if (ptr != null) { - returnValue = new Domain(this, ptr); - } - return returnValue; + DomainPointer ptr = processError(libvirt.virDomainLookupByID(VCP, id)); + return new Domain(this, ptr); } /** @@ -444,13 +415,8 @@ public class Connect { * @throws LibvirtException */ public Domain domainLookupByName(String name) throws LibvirtException { - Domain returnValue = null; - DomainPointer ptr = libvirt.virDomainLookupByName(VCP, name); - processError(); - if (ptr != null) { - returnValue = new Domain(this, ptr); - } - return returnValue; + DomainPointer ptr = processError(libvirt.virDomainLookupByName(VCP, name)); + return new Domain(this, ptr); } /** @@ -465,13 +431,8 @@ public class Connect { */ public Domain domainLookupByUUID(int[] UUID) throws LibvirtException { byte[] uuidBytes = Connect.createUUIDBytes(UUID); - Domain returnValue = null; - DomainPointer ptr = libvirt.virDomainLookupByUUID(VCP, uuidBytes); - processError(); - if (ptr != null) { - returnValue = new Domain(this, ptr); - } - return returnValue; + DomainPointer ptr = processError(libvirt.virDomainLookupByUUID(VCP, uuidBytes)); + return new Domain(this, ptr); } /** @@ -495,13 +456,8 @@ public class Connect { * @throws LibvirtException */ public Domain domainLookupByUUIDString(String UUID) throws LibvirtException { - Domain returnValue = null; - DomainPointer ptr = libvirt.virDomainLookupByUUIDString(VCP, UUID); - processError(); - if (ptr != null) { - returnValue = new Domain(this, ptr); - } - return returnValue; + DomainPointer ptr = processError(libvirt.virDomainLookupByUUIDString(VCP, UUID)); + return new Domain(this, ptr); } /** @@ -513,9 +469,7 @@ public class Connect { * @throws LibvirtException */ public String domainXMLFromNative(String nativeFormat, String nativeConfig, int flags) throws LibvirtException { - String returnValue = libvirt.virConnectDomainXMLFromNative(VCP, nativeFormat, nativeConfig, 0); - processError(); - return returnValue; + return processError(libvirt.virConnectDomainXMLFromNative(VCP, nativeFormat, nativeConfig, 0)); } /** @@ -528,8 +482,7 @@ public class Connect { */ public String domainXMLToNative(String nativeFormat, String domainXML, int flags) throws LibvirtException { String returnValue = libvirt.virConnectDomainXMLToNative(VCP, nativeFormat, domainXML, 0); - processError(); - return returnValue; + return processError(returnValue); } @Override @@ -559,8 +512,7 @@ public class Connect { */ public String findStoragePoolSources(String type, String srcSpecs, int flags) throws LibvirtException { String returnValue = libvirt.virConnectFindStoragePoolSources(VCP, type, srcSpecs, flags); - processError(); - return returnValue; + return processError(returnValue); } /** @@ -573,8 +525,7 @@ public class Connect { */ public String getCapabilities() throws LibvirtException { String returnValue = libvirt.virConnectGetCapabilities(VCP); - processError(); - return returnValue; + return processError(returnValue); } /** @@ -582,8 +533,10 @@ public class Connect { */ public long getCellsFreeMemory(int startCells, int maxCells) throws LibvirtException { LongByReference returnValue = new LongByReference(); - libvirt.virNodeGetCellsFreeMemory(VCP, returnValue, startCells, maxCells); - processError(); + processError(libvirt.virNodeGetCellsFreeMemory(VCP, + returnValue, + startCells, + maxCells)); return returnValue.getValue(); } @@ -593,7 +546,7 @@ public class Connect { public long getFreeMemory() throws LibvirtException { long returnValue = 0; returnValue = libvirt.virNodeGetFreeMemory(VCP); - processError(); + if (returnValue == 0) processError(); return returnValue; } @@ -606,10 +559,7 @@ public class Connect { * @throws LibvirtException */ public String getHostName() throws LibvirtException { - String returnValue = libvirt.virConnectGetHostname(VCP); - processError(); - return returnValue; - + return processError(libvirt.virConnectGetHostname(VCP)); } /** @@ -624,8 +574,7 @@ public class Connect { public long getHypervisorVersion(String type) throws LibvirtException { LongByReference libVer = new LongByReference(); LongByReference typeVer = new LongByReference(); - libvirt.virGetVersion(libVer, type, typeVer); - processError(); + processError(libvirt.virGetVersion(libVer, type, typeVer)); return libVer.getValue(); } @@ -639,8 +588,7 @@ public class Connect { public long getLibVirVersion() throws LibvirtException { LongByReference libVer = new LongByReference(); LongByReference typeVer = new LongByReference(); - libvirt.virGetVersion(libVer, null, typeVer); - processError(); + processError(libvirt.virGetVersion(libVer, null, typeVer)); return libVer.getValue(); } @@ -654,9 +602,7 @@ public class Connect { * @throws LibvirtException */ public int getMaxVcpus(String type) throws LibvirtException { - int returnValue = libvirt.virConnectGetMaxVcpus(VCP, type); - processError(); - return returnValue; + return processError(libvirt.virConnectGetMaxVcpus(VCP, type)); } /** @@ -666,9 +612,7 @@ public class Connect { * @throws LibvirtException */ public String getType() throws LibvirtException { - String returnValue = libvirt.virConnectGetType(VCP); - processError(); - return returnValue; + return processError(libvirt.virConnectGetType(VCP)); } /** @@ -681,9 +625,7 @@ public class Connect { * @throws LibvirtException */ public String getURI() throws LibvirtException { - String returnValue = libvirt.virConnectGetURI(VCP); - processError(); - return returnValue; + return processError(libvirt.virConnectGetURI(VCP)); } /** @@ -697,8 +639,7 @@ public class Connect { */ public long getVersion() throws LibvirtException { LongByReference hvVer = new LongByReference(); - libvirt.virConnectGetVersion(VCP, hvVer); - processError(); + processError(libvirt.virConnectGetVersion(VCP, hvVer)); return hvVer.getValue(); } @@ -711,13 +652,8 @@ public class Connect { * @throws LibvirtException */ public Interface interfaceDefineXML(String xmlDesc) throws LibvirtException { - Interface returnValue = null; - InterfacePointer ptr = libvirt.virInterfaceDefineXML(VCP, xmlDesc, 0); - processError(); - if (ptr != null) { - returnValue = new Interface(this, ptr); - } - return returnValue; + InterfacePointer ptr = processError(libvirt.virInterfaceDefineXML(VCP, xmlDesc, 0)); + return new Interface(this, ptr); } /** @@ -726,13 +662,8 @@ public class Connect { * @throws LibvirtException */ public Interface interfaceLookupByMACString(String mac) throws LibvirtException { - Interface returnValue = null; - InterfacePointer ptr = libvirt.virInterfaceLookupByMACString(VCP, mac); - processError(); - if (ptr != null) { - returnValue = new Interface(this, ptr); - } - return returnValue; + InterfacePointer ptr = processError(libvirt.virInterfaceLookupByMACString(VCP, mac)); + return new Interface(this, ptr); } /** @@ -741,13 +672,8 @@ public class Connect { * @throws LibvirtException */ public Interface interfaceLookupByName(String name) throws LibvirtException { - Interface returnValue = null; - InterfacePointer ptr = libvirt.virInterfaceLookupByName(VCP, name); - processError(); - if (ptr != null) { - returnValue = new Interface(this, ptr); - } - return returnValue; + InterfacePointer ptr = processError(libvirt.virInterfaceLookupByName(VCP, name)); + return new Interface(this, ptr); } /** @@ -791,8 +717,7 @@ public class Connect { int maxnames = numOfDefinedDomains(); String[] names = new String[maxnames]; if (maxnames > 0) { - libvirt.virConnectListDefinedDomains(VCP, names, maxnames); - processError(); + processError(libvirt.virConnectListDefinedDomains(VCP, names, maxnames)); } return names; } @@ -808,8 +733,7 @@ public class Connect { int num = numOfDefinedInterfaces(); String[] returnValue = new String[num]; if (num > 0) { - libvirt.virConnectListDefinedInterfaces(VCP, returnValue, num); - processError(); + processError(libvirt.virConnectListDefinedInterfaces(VCP, returnValue, num)); } return returnValue; } @@ -826,8 +750,7 @@ public class Connect { String[] names = new String[maxnames]; if (maxnames > 0) { - libvirt.virConnectListDefinedNetworks(VCP, names, maxnames); - processError(); + processError(libvirt.virConnectListDefinedNetworks(VCP, names, maxnames)); } return names; } @@ -842,8 +765,7 @@ public class Connect { public String[] listDefinedStoragePools() throws LibvirtException { int num = numOfDefinedStoragePools(); String[] returnValue = new String[num]; - libvirt.virConnectListDefinedStoragePools(VCP, returnValue, num); - processError(); + processError(libvirt.virConnectListDefinedStoragePools(VCP, returnValue, num)); return returnValue; } @@ -858,8 +780,7 @@ public class Connect { String[] names = new String[maxDevices]; if (maxDevices > 0) { - libvirt.virNodeListDevices(VCP, capabilityName, names, maxDevices, 0); - processError(); + processError(libvirt.virNodeListDevices(VCP, capabilityName, names, maxDevices, 0)); } return names; } @@ -875,8 +796,7 @@ public class Connect { int[] ids = new int[maxids]; if (maxids > 0) { - libvirt.virConnectListDomains(VCP, ids, maxids); - processError(); + processError(libvirt.virConnectListDomains(VCP, ids, maxids)); } return ids; } @@ -892,8 +812,7 @@ public class Connect { int num = numOfInterfaces(); String[] returnValue = new String[num]; if (num > 0) { - libvirt.virConnectListInterfaces(VCP, returnValue, num); - processError(); + processError(libvirt.virConnectListInterfaces(VCP, returnValue, num)); } return returnValue; } @@ -908,8 +827,7 @@ public class Connect { int maxnames = numOfNetworkFilters(); String[] names = new String[maxnames]; if (maxnames > 0) { - libvirt.virConnectListNWFilters(VCP, names, maxnames); - processError(); + processError(libvirt.virConnectListNWFilters(VCP, names, maxnames)); } return names; } @@ -926,8 +844,7 @@ public class Connect { String[] names = new String[maxnames]; if (maxnames > 0) { - libvirt.virConnectListNetworks(VCP, names, maxnames); - processError(); + processError(libvirt.virConnectListNetworks(VCP, names, maxnames)); } return names; } @@ -941,8 +858,7 @@ public class Connect { public String[] listSecrets() throws LibvirtException { int num = numOfSecrets(); String[] returnValue = new String[num]; - libvirt.virConnectListSecrets(VCP, returnValue, num); - processError(); + processError(libvirt.virConnectListSecrets(VCP, returnValue, num)); return returnValue; } @@ -956,8 +872,7 @@ public class Connect { public String[] listStoragePools() throws LibvirtException { int num = numOfStoragePools(); String[] returnValue = new String[num]; - libvirt.virConnectListStoragePools(VCP, returnValue, num); - processError(); + processError(libvirt.virConnectListStoragePools(VCP, returnValue, num)); return returnValue; } @@ -974,13 +889,8 @@ public class Connect { * description</a> */ public Network networkCreateXML(String xmlDesc) throws LibvirtException { - Network returnValue = null; - NetworkPointer ptr = libvirt.virNetworkCreateXML(VCP, xmlDesc); - processError(); - if (ptr != null) { - returnValue = new Network(this, ptr); - } - return returnValue; + NetworkPointer ptr = processError(libvirt.virNetworkCreateXML(VCP, xmlDesc)); + return new Network(this, ptr); } /** @@ -995,13 +905,8 @@ public class Connect { * description</a> */ public Network networkDefineXML(String xmlDesc) throws LibvirtException { - Network returnValue = null; - NetworkPointer ptr = libvirt.virNetworkDefineXML(VCP, xmlDesc); - processError(); - if (ptr != null) { - returnValue = new Network(this, ptr); - } - return returnValue; + NetworkPointer ptr = processError(libvirt.virNetworkDefineXML(VCP, xmlDesc)); + return new Network(this, ptr); } /** @@ -1016,13 +921,8 @@ public class Connect { * > Libvirt Documentation </a> */ public NetworkFilter networkFilterDefineXML(String xmlDesc) throws LibvirtException { - NetworkFilter returnValue = null; - NetworkFilterPointer ptr = libvirt.virNWFilterDefineXML(VCP, xmlDesc); - processError(); - if (ptr != null) { - returnValue = new NetworkFilter(this, ptr); - } - return returnValue; + NetworkFilterPointer ptr = processError(libvirt.virNWFilterDefineXML(VCP, xmlDesc)); + return new NetworkFilter(this, ptr); } /** @@ -1037,13 +937,8 @@ public class Connect { * > Libvirt Documentation </a> */ public NetworkFilter networkFilterLookupByName(String name) throws LibvirtException { - NetworkFilter returnValue = null; - NetworkFilterPointer ptr = libvirt.virNWFilterLookupByName(VCP, name); - processError(); - if (ptr != null) { - returnValue = new NetworkFilter(this, ptr); - } - return returnValue; + NetworkFilterPointer ptr = processError(libvirt.virNWFilterLookupByName(VCP, name)); + return new NetworkFilter(this, ptr); } /** @@ -1058,13 +953,8 @@ public class Connect { */ public NetworkFilter networkFilterLookupByUUID(int[] UUID) throws LibvirtException { byte[] uuidBytes = Connect.createUUIDBytes(UUID); - NetworkFilter returnValue = null; - NetworkFilterPointer ptr = libvirt.virNWFilterLookupByUUID(VCP, uuidBytes); - processError(); - if (ptr != null) { - returnValue = new NetworkFilter(this, ptr); - } - return returnValue; + NetworkFilterPointer ptr = processError(libvirt.virNWFilterLookupByUUID(VCP, uuidBytes)); + return new NetworkFilter(this, ptr); } /** @@ -1088,13 +978,8 @@ public class Connect { * @throws LibvirtException */ public NetworkFilter networkFilterLookupByUUIDString(String UUID) throws LibvirtException { - NetworkFilter returnValue = null; - NetworkFilterPointer ptr = libvirt.virNWFilterLookupByUUIDString(VCP, UUID); - processError(); - if (ptr != null) { - returnValue = new NetworkFilter(this, ptr); - } - return returnValue; + NetworkFilterPointer ptr = processError(libvirt.virNWFilterLookupByUUIDString(VCP, UUID)); + return new NetworkFilter(this, ptr); } /** @@ -1106,13 +991,8 @@ public class Connect { * @throws LibvirtException */ public Network networkLookupByName(String name) throws LibvirtException { - Network returnValue = null; - NetworkPointer ptr = libvirt.virNetworkLookupByName(VCP, name); - processError(); - if (ptr != null) { - returnValue = new Network(this, ptr); - } - return returnValue; + NetworkPointer ptr = processError(libvirt.virNetworkLookupByName(VCP, name)); + return new Network(this, ptr); } /** @@ -1129,13 +1009,8 @@ public class Connect { @Deprecated public Network networkLookupByUUID(int[] UUID) throws LibvirtException { byte[] uuidBytes = Connect.createUUIDBytes(UUID); - Network returnValue = null; - NetworkPointer ptr = libvirt.virNetworkLookupByUUID(VCP, uuidBytes); - processError(); - if (ptr != null) { - returnValue = new Network(this, ptr); - } - return returnValue; + NetworkPointer ptr = processError(libvirt.virNetworkLookupByUUID(VCP, uuidBytes)); + return new Network(this, ptr); } /** @@ -1159,13 +1034,8 @@ public class Connect { * @throws LibvirtException */ public Network networkLookupByUUIDString(String UUID) throws LibvirtException { - Network returnValue = null; - NetworkPointer ptr = libvirt.virNetworkLookupByUUIDString(VCP, UUID); - processError(); - if (ptr != null) { - returnValue = new Network(this, ptr); - } - return returnValue; + NetworkPointer ptr = processError(libvirt.virNetworkLookupByUUIDString(VCP, UUID)); + return new Network(this, ptr); } /** @@ -1177,8 +1047,7 @@ public class Connect { */ public NodeInfo nodeInfo() throws LibvirtException { virNodeInfo vInfo = new virNodeInfo(); - libvirt.virNodeGetInfo(VCP, vInfo); - processError(); + processError(libvirt.virNodeGetInfo(VCP, vInfo)); return new NodeInfo(vInfo); } @@ -1189,9 +1058,7 @@ public class Connect { * @throws LibvirtException */ public int numOfDefinedDomains() throws LibvirtException { - int returnValue = libvirt.virConnectNumOfDefinedDomains(VCP); - processError(); - return returnValue; + return processError(libvirt.virConnectNumOfDefinedDomains(VCP)); } /** @@ -1201,9 +1068,7 @@ public class Connect { * @throws LibvirtException */ public int numOfDefinedInterfaces() throws LibvirtException { - int returnValue = libvirt.virConnectNumOfDefinedInterfaces(VCP); - processError(); - return returnValue; + return processError(libvirt.virConnectNumOfDefinedInterfaces(VCP)); } /** @@ -1213,9 +1078,7 @@ public class Connect { * @throws LibvirtException */ public int numOfDefinedNetworks() throws LibvirtException { - int returnValue = libvirt.virConnectNumOfDefinedNetworks(VCP); - processError(); - return returnValue; + return processError(libvirt.virConnectNumOfDefinedNetworks(VCP)); } /** @@ -1225,9 +1088,7 @@ public class Connect { * @throws LibvirtException */ public int numOfDefinedStoragePools() throws LibvirtException { - int returnValue = libvirt.virConnectNumOfDefinedStoragePools(VCP); - processError(); - return returnValue; + return processError(libvirt.virConnectNumOfDefinedStoragePools(VCP)); } /** @@ -1237,9 +1098,7 @@ public class Connect { * @throws LibvirtException */ public int numOfDevices(String capabilityName) throws LibvirtException { - int returnValue = libvirt.virNodeNumOfDevices(VCP, capabilityName, 0); - processError(); - return returnValue; + return processError(libvirt.virNodeNumOfDevices(VCP, capabilityName, 0)); } /** @@ -1249,9 +1108,7 @@ public class Connect { * @throws LibvirtException */ public int numOfDomains() throws LibvirtException { - int returnValue = libvirt.virConnectNumOfDomains(VCP); - processError(); - return returnValue; + return processError(libvirt.virConnectNumOfDomains(VCP)); } /** @@ -1261,9 +1118,7 @@ public class Connect { * @throws LibvirtException */ public int numOfInterfaces() throws LibvirtException { - int returnValue = libvirt.virConnectNumOfInterfaces(VCP); - processError(); - return returnValue; + return processError(libvirt.virConnectNumOfInterfaces(VCP)); } /** @@ -1273,9 +1128,7 @@ public class Connect { * @throws LibvirtException */ public int numOfNetworkFilters() throws LibvirtException { - int returnValue = libvirt.virConnectNumOfNWFilters(VCP); - processError(); - return returnValue; + return processError(libvirt.virConnectNumOfNWFilters(VCP)); } /** @@ -1285,9 +1138,7 @@ public class Connect { * @throws LibvirtException */ public int numOfNetworks() throws LibvirtException { - int returnValue = libvirt.virConnectNumOfNetworks(VCP); - processError(); - return returnValue; + return processError(libvirt.virConnectNumOfNetworks(VCP)); } /** @@ -1296,9 +1147,7 @@ public class Connect { * @return the number of secrets */ public int numOfSecrets() throws LibvirtException { - int returnValue = libvirt.virConnectNumOfSecrets(VCP); - processError(); - return returnValue; + return processError(libvirt.virConnectNumOfSecrets(VCP)); } /** @@ -1308,9 +1157,7 @@ public class Connect { * @throws LibvirtException */ public int numOfStoragePools() throws LibvirtException { - int returnValue = libvirt.virConnectNumOfStoragePools(VCP); - processError(); - return returnValue; + return processError(libvirt.virConnectNumOfStoragePools(VCP)); } /** @@ -1323,6 +1170,32 @@ public class Connect { } /** + * Calls {@link #processError()} when the given libvirt return code + * indicates an error. + * + * @param ret libvirt return code, indicating error if negative. + * @return {@code ret} + * @throws LibvirtException + */ + protected final int processError(int ret) throws LibvirtException { + if (ret < 0) processError(); + return ret; + } + + /** + * Calls {@link #processError()} if {@code arg} is null. + * + * @param arg An arbitrary object returned by libvirt. + * @return {@code arg} + * @throws LibvirtException + */ + protected final <T> T processError(T arg) throws LibvirtException { + if (arg == null) processError(); + return arg; + } + + + /** * Restores a domain saved to disk by Domain.save(). * * @param from @@ -1330,8 +1203,7 @@ public class Connect { * @throws LibvirtException */ public void restore(String from) throws LibvirtException { - libvirt.virDomainRestore(VCP, from); - processError(); + processError(libvirt.virDomainRestore(VCP, from)); } /** @@ -1347,13 +1219,8 @@ public class Connect { * @throws LibvirtException */ public Secret secretDefineXML(String xmlDesc) throws LibvirtException { - Secret returnValue = null; - SecretPointer ptr = libvirt.virSecretDefineXML(VCP, xmlDesc, 0); - processError(); - if (ptr != null) { - returnValue = new Secret(this, ptr); - } - return returnValue; + SecretPointer ptr = processError(libvirt.virSecretDefineXML(VCP, xmlDesc, 0)); + return new Secret(this, ptr); } /** @@ -1368,13 +1235,8 @@ public class Connect { */ public Secret secretLookupByUUID(int[] UUID) throws LibvirtException { byte[] uuidBytes = Connect.createUUIDBytes(UUID); - Secret returnValue = null; - SecretPointer ptr = libvirt.virSecretLookupByUUID(VCP, uuidBytes); - processError(); - if (ptr != null) { - returnValue = new Secret(this, ptr); - } - return returnValue; + SecretPointer ptr = processError(libvirt.virSecretLookupByUUID(VCP, uuidBytes)); + return new Secret(this, ptr); } /** @@ -1398,13 +1260,8 @@ public class Connect { * @throws LibvirtException */ public Secret secretLookupByUUIDString(String UUID) throws LibvirtException { - Secret returnValue = null; - SecretPointer ptr = libvirt.virSecretLookupByUUIDString(VCP, UUID); - processError(); - if (ptr != null) { - returnValue = new Secret(this, ptr); - } - return returnValue; + SecretPointer ptr = processError(libvirt.virSecretLookupByUUIDString(VCP, UUID)); + return new Secret(this, ptr); } public void setConnectionErrorCallback(Libvirt.VirErrorCallback callback) throws LibvirtException { @@ -1422,8 +1279,7 @@ public class Connect { * @throws LibvirtException */ public void setDom0Memory(long memory) throws LibvirtException { - libvirt.virDomainSetMemory(null, new NativeLong(memory)); - processError(); + processError(libvirt.virDomainSetMemory(null, new NativeLong(memory))); } /** @@ -1439,8 +1295,7 @@ public class Connect { * @throws LibvirtException */ public StoragePool storagePoolCreateXML(String xmlDesc, int flags) throws LibvirtException { - StoragePoolPointer ptr = libvirt.virStoragePoolCreateXML(VCP, xmlDesc, flags); - processError(); + StoragePoolPointer ptr = processError(libvirt.virStoragePoolCreateXML(VCP, xmlDesc, flags)); return new StoragePool(this, ptr); } @@ -1456,8 +1311,7 @@ public class Connect { * @throws LibvirtException */ public StoragePool storagePoolDefineXML(String xml, int flags) throws LibvirtException { - StoragePoolPointer ptr = libvirt.virStoragePoolDefineXML(VCP, xml, flags); - processError(); + StoragePoolPointer ptr = processError(libvirt.virStoragePoolDefineXML(VCP, xml, flags)); return new StoragePool(this, ptr); } @@ -1470,8 +1324,7 @@ public class Connect { * @throws LibvirtException */ public StoragePool storagePoolLookupByName(String name) throws LibvirtException { - StoragePoolPointer ptr = libvirt.virStoragePoolLookupByName(VCP, name); - processError(); + StoragePoolPointer ptr = processError(libvirt.virStoragePoolLookupByName(VCP, name)); return new StoragePool(this, ptr); } @@ -1487,13 +1340,8 @@ public class Connect { @Deprecated public StoragePool storagePoolLookupByUUID(int[] UUID) throws LibvirtException { byte[] uuidBytes = Connect.createUUIDBytes(UUID); - StoragePool returnValue = null; - StoragePoolPointer ptr = libvirt.virStoragePoolLookupByUUID(VCP, uuidBytes); - processError(); - if (ptr != null) { - returnValue = new StoragePool(this, ptr); - } - return returnValue; + StoragePoolPointer ptr = processError(libvirt.virStoragePoolLookupByUUID(VCP, uuidBytes)); + return new StoragePool(this, ptr); } /** @@ -1517,13 +1365,8 @@ public class Connect { * @throws LibvirtException */ public StoragePool storagePoolLookupByUUIDString(String UUID) throws LibvirtException { - StoragePool returnValue = null; - StoragePoolPointer ptr = libvirt.virStoragePoolLookupByUUIDString(VCP, UUID); - processError(); - if (ptr != null) { - returnValue = new StoragePool(this, ptr); - } - return returnValue; + StoragePoolPointer ptr = processError(libvirt.virStoragePoolLookupByUUIDString(VCP, UUID)); + return new StoragePool(this, ptr); } /** @@ -1534,8 +1377,7 @@ public class Connect { * @return a storage volume */ public StorageVol storageVolLookupByKey(String key) throws LibvirtException { - StorageVolPointer sPtr = libvirt.virStorageVolLookupByKey(VCP, key); - processError(); + StorageVolPointer sPtr = processError(libvirt.virStorageVolLookupByKey(VCP, key)); return new StorageVol(this, sPtr); } @@ -1547,8 +1389,7 @@ public class Connect { * @return a storage volume */ public StorageVol storageVolLookupByPath(String path) throws LibvirtException { - StorageVolPointer sPtr = libvirt.virStorageVolLookupByPath(VCP, path); - processError(); + StorageVolPointer sPtr = processError(libvirt.virStorageVolLookupByPath(VCP, path)); return new StorageVol(this, sPtr); } @@ -1561,8 +1402,7 @@ public class Connect { * @return the new object */ public Stream streamNew(int flags) throws LibvirtException { - StreamPointer sPtr = libvirt.virStreamNew(VCP, flags); - processError(); + StreamPointer sPtr = processError(libvirt.virStreamNew(VCP, flags)); return new Stream(this, sPtr); } -- AV-Test GmbH, Henricistraße 20, 04155 Leipzig, Germany Phone: +49 341 265 310 19 Web:<http://www.av-test.org> Eingetragen am / Registered at: Amtsgericht Stendal (HRB 114076) Geschaeftsfuehrer (CEO): Andreas Marx, Guido Habicht, Maik Morgenstern

1 0

[libvirt] (no subject)
by cbley＠av-test.de 12 Oct '12

12 Oct '12

>From 285e443aa24cde2324380ebeac83c97efc456f94 Mon Sep 17 00:00:00 2001 Message-Id: <cover.1350037981.git.cbley(a)av-test.de> In-Reply-To: <2DA6F4A3691599408358374D182280F9141CF6(a)xmb-rcd-x04.cisco.com> References: <2DA6F4A3691599408358374D182280F9141CF6(a)xmb-rcd-x04.cisco.com> From: cbley(a)av-test.de (Claudio Bley) Date: Fri, 12 Oct 2012 12:33:01 +0200 Subject: [PATCH 00/15] [libvirt-java] some improvements and bug fixes To: libvir-list(a)redhat.com Organization: AV-Test GmbH, Germany Hi. Just sending off a few patches that have piled up during the last few months. Patch #1 to #7 and #9 to #10 and #12 contain mostly cosmetic changes resp. changes to the build system. Patch #8 changes the handling of errors. It is unnecessary trying to retrieve an error when the libvirt function called did not signal any. Also, some functions never fail (return void). Patch #11 changes how errors are checked. This avoids copying and freeing an error object and hence a few JVM to native calls. Patch #13 fixes all the memory leaks I encountered by using my GDB memcheck.py script. Running the junit tests under GDB's supervision yielded 750 places of (potential) memory leaks, pointing to calls of these libvirt functions: virDomainDefineXML, virInterfaceGetXMLDesc, virConnectListDefinedDomains, virStoragePoolLookupByName, virDomainLookupByName, virNetworkGetBridgeName, virNetworkLookupByUUIDString, virDomainLookupByUUID, virDomainLookupByUUIDString, virConnectListInterfaces, virDomainGetOSType, virConnectListDefinedNetworks, virNetworkCreateXML, virStoragePoolDefineXML, virConnectOpen, virDomainCreateXML, virNetworkDefineXML, virNetworkLookupByName, virCopyLastError, virNetworkCreate, virNetworkLookupByUUID, virInterfaceLookupByName, virConnectGetHostname, virDomainGetXMLDesc, virConnectListNetworks, virNetworkGetXMLDesc After applying patch #13, the script reports this: 1. @140737220948192 #1 __GI___strdup __GI___strdup strdup.c:45 #2 ... [1] #3 Java_java_util_zip_ZipFile_open ? ?:0 #4 ... [5] 2. @140737221175744 #1 virAlloc virAlloc /build/buildd/libvirt-0.9.12/./src/util/memory.c:103 #2 virLastErrorObject virLastErrorObject /build/buildd/libvirt-0.9.12/./src/util/virterror.c:277 #3 virGetLastError virGetLastError /build/buildd/libvirt-0.9.12/./src/util/virterror.c:299 #4 ffi_call_unix64 ? ?:0 #5 ffi_call ? ?:0 #6 ... [1] #7 Java_com_sun_jna_Native_invokePointer ? ?:0 #8 ... [5] 3. @140737220736736 #1 __libc_res_nsend __libc_res_nsend res_send.c:442 #2 __libc_res_nquery __libc_res_nquery res_query.c:226 #3 __libc_res_nquerydomain __libc_res_nquerydomain res_query.c:578 #4 __libc_res_nsearch __libc_res_nsearch res_query.c:416 #5 _nss_dns_gethostbyname3_r _nss_dns_gethostbyname3_r nss_dns/dns-host.c:197 #6 gaih_inet gaih_inet ../sysdeps/posix/getaddrinfo.c:940 #7 __GI_getaddrinfo __GI_getaddrinfo ../sysdeps/posix/getaddrinfo.c:2423 #8 virGetHostname virGetHostname /build/buildd/libvirt-0.9.12/./src/util/util.c:2105 #9 virConnectGetHostname virConnectGetHostname /build/buildd/libvirt-0.9.12/./src/libvirt.c:1724 #10 ffi_call_unix64 ? ?:0 #11 ffi_call ? ?:0 #12 ... [1] #13 Java_com_sun_jna_Native_invokePointer ? ?:0 #14 ... [4] 4. @140737018598944 #1 virAlloc virAlloc /build/buildd/libvirt-0.9.12/./src/util/memory.c:103 #2 virLastErrorObject virLastErrorObject /build/buildd/libvirt-0.9.12/./src/util/virterror.c:277 #3 virResetLastError virResetLastError /build/buildd/libvirt-0.9.12/./src/util/virterror.c:428 #4 virNetworkFree virNetworkFree /build/buildd/libvirt-0.9.12/./src/libvirt.c:10151 #5 ffi_call_unix64 ? ?:0 #6 ffi_call ? ?:0 #7 ... [1] #8 Java_com_sun_jna_Native_invokeInt ? ?:0 #9 ... [2] 5. @140737221440624 #1 __libc_res_nsend __libc_res_nsend res_send.c:442 #2 __libc_res_nquery __libc_res_nquery res_query.c:226 #3 __libc_res_nquerydomain __libc_res_nquerydomain res_query.c:578 #4 __libc_res_nsearch __libc_res_nsearch res_query.c:416 #5 _nss_dns_gethostbyname3_r _nss_dns_gethostbyname3_r nss_dns/dns-host.c:197 #6 gaih_inet gaih_inet ../sysdeps/posix/getaddrinfo.c:940 #7 __GI_getaddrinfo __GI_getaddrinfo ../sysdeps/posix/getaddrinfo.c:2423 #8 virGetHostname virGetHostname /build/buildd/libvirt-0.9.12/./src/util/util.c:2105 #9 virConnectGetHostname virConnectGetHostname /build/buildd/libvirt-0.9.12/./src/libvirt.c:1724 #10 ffi_call_unix64 ? ?:0 #11 ffi_call ? ?:0 #12 ... [1] #13 Java_com_sun_jna_Native_invokePointer ? ?:0 #14 ... [4] only pointing to the following function calls: virConnectGetHostname, virNetworkFree, virGetLastError AFAICS, these are neglectable. Probably just some global memory which is not freed on exit. (for the record: I'm on Ubuntu Precise, using libvirt 0.9.12. And yes, I did call __libc_freeres on exit.) Patch #14 removes functions that should have never been wrapped. These functions do not increase the ref count and hence create Java objects that actually do not represent "real" instances on the libvirt side. I have tested with JNA 3.3.0, 3.4.{0, 1, 2}. I had JVM crashes repeatedly with all JNA versions before 3.4.2. So, I strongly recommend to use JNA 3.4.2. Claudio Bley (15): #1 Explicitly set includeAntRuntime to false for javac tasks. #2 Introduce a javac.debug property. #3 Add findbugs build file for ant. #4 Make finalize() methods protected. #5 Remove redundant public modifier from Libvirt interface methods. #6 Change visibility of class members to private to enforce encapsulation. #7 Mark virConnCopyLastError and virConnGetLastError as deprecated. #8 Call processError only if a libvirt function indicates an error. #9 Split JUnit tests and use a fixture for Connect. #10 Split "build" target and automatically rebuild out of date files. #11 Avoid unnecessary copying and calling virResetLastError. #12 Remove the libvirt instance attribute from all classes. #13 Fix memory leaks for libvirt functions returning newly allocated memory. #14 Remove functions not intended to be used by libvirt bindings. Explicitely define the order of a struct's fields. build.xml | 37 +- findbugs.xml | 36 ++ src/main/java/org/libvirt/Connect.java | 572 +++++++------------- src/main/java/org/libvirt/Device.java | 9 +- src/main/java/org/libvirt/Domain.java | 33 +- src/main/java/org/libvirt/DomainSnapshot.java | 9 +- src/main/java/org/libvirt/Error.java | 24 +- src/main/java/org/libvirt/ErrorHandler.java | 9 +- src/main/java/org/libvirt/Interface.java | 19 +- src/main/java/org/libvirt/Library.java | 88 +++ src/main/java/org/libvirt/LibvirtException.java | 2 +- src/main/java/org/libvirt/Network.java | 26 +- src/main/java/org/libvirt/NetworkFilter.java | 9 +- src/main/java/org/libvirt/Secret.java | 9 +- src/main/java/org/libvirt/StoragePool.java | 9 +- src/main/java/org/libvirt/StorageVol.java | 9 +- src/main/java/org/libvirt/Stream.java | 11 +- src/main/java/org/libvirt/jna/Libvirt.java | 502 ++++++++--------- src/main/java/org/libvirt/jna/virConnectAuth.java | 10 + .../java/org/libvirt/jna/virConnectCredential.java | 12 + .../java/org/libvirt/jna/virDomainBlockInfo.java | 8 + .../java/org/libvirt/jna/virDomainBlockStats.java | 11 + src/main/java/org/libvirt/jna/virDomainInfo.java | 11 + .../org/libvirt/jna/virDomainInterfaceStats.java | 13 + .../java/org/libvirt/jna/virDomainJobInfo.java | 18 + .../java/org/libvirt/jna/virDomainMemoryStats.java | 7 + src/main/java/org/libvirt/jna/virError.java | 19 + src/main/java/org/libvirt/jna/virNodeInfo.java | 15 + .../java/org/libvirt/jna/virSchedParameter.java | 9 + .../java/org/libvirt/jna/virStoragePoolInfo.java | 10 + .../java/org/libvirt/jna/virStorageVolInfo.java | 8 + src/main/java/org/libvirt/jna/virVcpuInfo.java | 9 + src/test/java/org/libvirt/TestJavaBindings.java | 50 +- src/test/java/org/libvirt/TestLibvirtGlobals.java | 21 + 34 files changed, 883 insertions(+), 761 deletions(-) create mode 100644 findbugs.xml create mode 100644 src/main/java/org/libvirt/Library.java create mode 100644 src/test/java/org/libvirt/TestLibvirtGlobals.java -- AV-Test GmbH, Henricistraße 20, 04155 Leipzig, Germany Phone: +49 341 265 310 19 Web:<http://www.av-test.org> Eingetragen am / Registered at: Amtsgericht Stendal (HRB 114076) Geschaeftsfuehrer (CEO): Andreas Marx, Guido Habicht, Maik Morgenstern

1 0

[libvirt] (no subject)
by cbley＠av-test.de 12 Oct '12

12 Oct '12

>From ab3c4135fe30953bf48ad526ed73c24d41f100d4 Mon Sep 17 00:00:00 2001 Message-Id: <ab3c4135fe30953bf48ad526ed73c24d41f100d4.1350037981.git.cbley(a)av-test.de> In-Reply-To: <cover.1350037981.git.cbley(a)av-test.de> References: <2DA6F4A3691599408358374D182280F9141CF6(a)xmb-rcd-x04.cisco.com> <cover.1350037981.git.cbley(a)av-test.de> From: cbley(a)av-test.de (Claudio Bley) Date: Thu, 23 Aug 2012 16:53:15 +0200 Subject: [PATCH 12/15] Remove the libvirt instance attribute from all classes. To: libvir-list(a)redhat.com Organization: AV-Test GmbH, Germany Every class contained a member called "libvirt". This member was initialized during construction to refer to the Connect.libvirt member variable, which in turn referred to the static jna.Libvirt.INSTANCE field. Add a Library class which contains a static "libvirt" field and import this field statically for convenient access. --- src/main/java/org/libvirt/Connect.java | 16 +-------------- src/main/java/org/libvirt/Device.java | 7 +------ src/main/java/org/libvirt/Domain.java | 7 +------ src/main/java/org/libvirt/DomainSnapshot.java | 7 +------ src/main/java/org/libvirt/Interface.java | 7 +------ src/main/java/org/libvirt/Library.java | 26 +++++++++++++++++++++++++ src/main/java/org/libvirt/Network.java | 7 +------ src/main/java/org/libvirt/NetworkFilter.java | 7 +------ src/main/java/org/libvirt/Secret.java | 7 +------ src/main/java/org/libvirt/StoragePool.java | 7 +------ src/main/java/org/libvirt/StorageVol.java | 7 +------ src/main/java/org/libvirt/Stream.java | 7 +------ 12 files changed, 37 insertions(+), 75 deletions(-) diff --git a/src/main/java/org/libvirt/Connect.java b/src/main/java/org/libvirt/Connect.java index e02c601..ae306d6 100644 --- a/src/main/java/org/libvirt/Connect.java +++ b/src/main/java/org/libvirt/Connect.java @@ -15,6 +15,7 @@ import org.libvirt.jna.StorageVolPointer; import org.libvirt.jna.StreamPointer; import org.libvirt.jna.virConnectAuth; import org.libvirt.jna.virNodeInfo; +import static org.libvirt.Library.libvirt; import com.sun.jna.Memory; import com.sun.jna.NativeLong; @@ -28,16 +29,6 @@ import com.sun.jna.ptr.LongByReference; */ public class Connect { - // Load the native part - static { - Libvirt.INSTANCE.virInitialize(); - try { - ErrorHandler.processError(Libvirt.INSTANCE); - } catch (Exception e) { - e.printStackTrace(); - } - } - /** * Creates a new connection object from the domain. If all you want is the * existing domain's connection, use the getConnection method directly. Thie @@ -135,11 +126,6 @@ public class Connect { protected ConnectionPointer VCP; /** - * The libvirt library - */ - Libvirt libvirt = Libvirt.INSTANCE; - - /** * Protected constructor to return a Connection with ConnectionPointer */ Connect(ConnectionPointer ptr) { diff --git a/src/main/java/org/libvirt/Device.java b/src/main/java/org/libvirt/Device.java index bc25258..416e06a 100644 --- a/src/main/java/org/libvirt/Device.java +++ b/src/main/java/org/libvirt/Device.java @@ -2,6 +2,7 @@ package org.libvirt; import org.libvirt.jna.DevicePointer; import org.libvirt.jna.Libvirt; +import static org.libvirt.Library.libvirt; /** * A device which is attached to a node @@ -19,11 +20,6 @@ public class Device { private Connect virConnect; /** - * The libvirt connection from the hypervisor - */ - protected Libvirt libvirt; - - /** * Constructs a Device object from a DevicePointer, and a Connect object. * * @param virConnect @@ -34,7 +30,6 @@ public class Device { Device(Connect virConnect, DevicePointer VDP) { this.virConnect = virConnect; this.VDP = VDP; - libvirt = virConnect.libvirt; } /** diff --git a/src/main/java/org/libvirt/Domain.java b/src/main/java/org/libvirt/Domain.java index f4f5225..45fba26 100644 --- a/src/main/java/org/libvirt/Domain.java +++ b/src/main/java/org/libvirt/Domain.java @@ -11,6 +11,7 @@ import org.libvirt.jna.virDomainJobInfo; import org.libvirt.jna.virDomainMemoryStats; import org.libvirt.jna.virSchedParameter; import org.libvirt.jna.virVcpuInfo; +import static org.libvirt.Library.libvirt; import com.sun.jna.Native; import com.sun.jna.NativeLong; @@ -86,11 +87,6 @@ public class Domain { private Connect virConnect; /** - * The libvirt connection from the hypervisor - */ - protected Libvirt libvirt; - - /** * Constructs a Domain object from a known native DomainPointer, and a * Connect object. * @@ -102,7 +98,6 @@ public class Domain { Domain(Connect virConnect, DomainPointer VDP) { this.virConnect = virConnect; this.VDP = VDP; - libvirt = virConnect.libvirt; } /** diff --git a/src/main/java/org/libvirt/DomainSnapshot.java b/src/main/java/org/libvirt/DomainSnapshot.java index 3083ca0..355d9d0 100644 --- a/src/main/java/org/libvirt/DomainSnapshot.java +++ b/src/main/java/org/libvirt/DomainSnapshot.java @@ -2,6 +2,7 @@ package org.libvirt; import org.libvirt.jna.DomainSnapshotPointer; import org.libvirt.jna.Libvirt; +import static org.libvirt.Library.libvirt; public class DomainSnapshot { @@ -15,15 +16,9 @@ public class DomainSnapshot { */ private Connect virConnect; - /** - * The libvirt connection from the hypervisor - */ - protected Libvirt libvirt; - public DomainSnapshot(Connect virConnect, DomainSnapshotPointer VDSP) { this.VDSP = VDSP; this.virConnect = virConnect; - libvirt = virConnect.libvirt; } /** diff --git a/src/main/java/org/libvirt/Interface.java b/src/main/java/org/libvirt/Interface.java index 17c189d..684adca 100644 --- a/src/main/java/org/libvirt/Interface.java +++ b/src/main/java/org/libvirt/Interface.java @@ -2,6 +2,7 @@ package org.libvirt; import org.libvirt.jna.InterfacePointer; import org.libvirt.jna.Libvirt; +import static org.libvirt.Library.libvirt; /** * A device which is attached to a node @@ -24,11 +25,6 @@ public class Interface { private Connect virConnect; /** - * The libvirt connection from the hypervisor - */ - protected Libvirt libvirt; - - /** * Constructs an Interface object from an InterfacePointer, and a Connect * object. * @@ -40,7 +36,6 @@ public class Interface { Interface(Connect virConnect, InterfacePointer VIP) { this.virConnect = virConnect; this.VIP = VIP; - libvirt = virConnect.libvirt; } /** diff --git a/src/main/java/org/libvirt/Library.java b/src/main/java/org/libvirt/Library.java new file mode 100644 index 0000000..035ed06 --- /dev/null +++ b/src/main/java/org/libvirt/Library.java @@ -0,0 +1,26 @@ +package org.libvirt; + +import org.libvirt.jna.Libvirt; + +/** + * This class represents an instance of the JNA mapped libvirt + * library. + * + * The library will get loaded when first accessing this class. + */ +final class Library { + final static Libvirt libvirt; + + // Load the native part + static { + Libvirt.INSTANCE.virInitialize(); + libvirt = Libvirt.INSTANCE; + try { + ErrorHandler.processError(Libvirt.INSTANCE); + } catch (Exception e) { + e.printStackTrace(); + } + } + + private Library() {} +} diff --git a/src/main/java/org/libvirt/Network.java b/src/main/java/org/libvirt/Network.java index acaef0e..bdb0d78 100644 --- a/src/main/java/org/libvirt/Network.java +++ b/src/main/java/org/libvirt/Network.java @@ -2,6 +2,7 @@ package org.libvirt; import org.libvirt.jna.Libvirt; import org.libvirt.jna.NetworkPointer; +import static org.libvirt.Library.libvirt; import com.sun.jna.Native; import com.sun.jna.ptr.IntByReference; @@ -22,11 +23,6 @@ public class Network { protected Connect virConnect; /** - * The libvirt connection from the hypervisor - */ - protected Libvirt libvirt; - - /** * Constructs a Network object from a known native virNetworkPtr, and a * Connect object. For use when native libvirt returns a virConnectPtr, i.e. * error handling. @@ -37,7 +33,6 @@ public class Network { Network(Connect virConnect, NetworkPointer VNP) { this.virConnect = virConnect; this.VNP = VNP; - libvirt = virConnect.libvirt; } /** diff --git a/src/main/java/org/libvirt/NetworkFilter.java b/src/main/java/org/libvirt/NetworkFilter.java index 7bc07a5..ba4d2ea 100644 --- a/src/main/java/org/libvirt/NetworkFilter.java +++ b/src/main/java/org/libvirt/NetworkFilter.java @@ -2,6 +2,7 @@ package org.libvirt; import org.libvirt.jna.Libvirt; import org.libvirt.jna.NetworkFilterPointer; +import static org.libvirt.Library.libvirt; import com.sun.jna.Native; @@ -16,15 +17,9 @@ public class NetworkFilter { */ private Connect virConnect; - /** - * The libvirt connection from the hypervisor - */ - protected Libvirt libvirt; - public NetworkFilter(Connect virConnect, NetworkFilterPointer NFP) { this.NFP = NFP; this.virConnect = virConnect; - libvirt = virConnect.libvirt; } @Override diff --git a/src/main/java/org/libvirt/Secret.java b/src/main/java/org/libvirt/Secret.java index 888cdf3..5332e02 100644 --- a/src/main/java/org/libvirt/Secret.java +++ b/src/main/java/org/libvirt/Secret.java @@ -2,6 +2,7 @@ package org.libvirt; import org.libvirt.jna.Libvirt; import org.libvirt.jna.SecretPointer; +import static org.libvirt.Library.libvirt; import com.sun.jna.Native; import com.sun.jna.NativeLong; @@ -24,15 +25,9 @@ public class Secret { */ private Connect virConnect; - /** - * The libvirt connection from the hypervisor - */ - protected Libvirt libvirt; - Secret(Connect virConnect, SecretPointer VSP) { this.virConnect = virConnect; this.VSP = VSP; - libvirt = virConnect.libvirt; } @Override diff --git a/src/main/java/org/libvirt/StoragePool.java b/src/main/java/org/libvirt/StoragePool.java index 29a18ed..2d59f68 100644 --- a/src/main/java/org/libvirt/StoragePool.java +++ b/src/main/java/org/libvirt/StoragePool.java @@ -4,6 +4,7 @@ import org.libvirt.jna.Libvirt; import org.libvirt.jna.StoragePoolPointer; import org.libvirt.jna.StorageVolPointer; import org.libvirt.jna.virStoragePoolInfo; +import static org.libvirt.Library.libvirt; import com.sun.jna.Native; import com.sun.jna.ptr.IntByReference; @@ -50,11 +51,6 @@ public class StoragePool { protected Connect virConnect; /** - * the libvirt instance - */ - protected Libvirt libvirt; - - /** * Constructs a VirStoragePool object from a known native virStoragePoolPtr, * and a VirConnect object. For use when native libvirt returns a * virStoragePoolPtr, i.e. error handling. @@ -67,7 +63,6 @@ public class StoragePool { StoragePool(Connect virConnect, StoragePoolPointer VSPP) { this.virConnect = virConnect; this.VSPP = VSPP; - libvirt = virConnect.libvirt; } /** diff --git a/src/main/java/org/libvirt/StorageVol.java b/src/main/java/org/libvirt/StorageVol.java index e2bc717..4b9db80 100644 --- a/src/main/java/org/libvirt/StorageVol.java +++ b/src/main/java/org/libvirt/StorageVol.java @@ -4,6 +4,7 @@ import org.libvirt.jna.Libvirt; import org.libvirt.jna.StoragePoolPointer; import org.libvirt.jna.StorageVolPointer; import org.libvirt.jna.virStorageVolInfo; +import static org.libvirt.Library.libvirt; /** * An acutal storage bucket. @@ -43,11 +44,6 @@ public class StorageVol { protected Connect virConnect; /** - * the libvirt instance - */ - protected Libvirt libvirt; - - /** * Constructs a VirStorageVol object from a known native virStoragePoolPtr, * and a VirConnect object. For use when native libvirt returns a * virStorageVolPtr, i.e. error handling. @@ -60,7 +56,6 @@ public class StorageVol { StorageVol(Connect virConnect, StorageVolPointer VSVP) { this.virConnect = virConnect; this.VSVP = VSVP; - libvirt = virConnect.libvirt; } /** diff --git a/src/main/java/org/libvirt/Stream.java b/src/main/java/org/libvirt/Stream.java index 06b67cf..84e300c 100644 --- a/src/main/java/org/libvirt/Stream.java +++ b/src/main/java/org/libvirt/Stream.java @@ -2,6 +2,7 @@ package org.libvirt; import org.libvirt.jna.Libvirt; import org.libvirt.jna.StreamPointer; +import static org.libvirt.Library.libvirt; import com.sun.jna.NativeLong; @@ -19,15 +20,9 @@ public class Stream { */ private Connect virConnect; - /** - * The libvirt connection from the hypervisor - */ - protected Libvirt libvirt; - Stream(Connect virConnect, StreamPointer VSP) { this.virConnect = virConnect; this.VSP = VSP; - libvirt = virConnect.libvirt; } /** -- AV-Test GmbH, Henricistraße 20, 04155 Leipzig, Germany Phone: +49 341 265 310 19 Web:<http://www.av-test.org> Eingetragen am / Registered at: Amtsgericht Stendal (HRB 114076) Geschaeftsfuehrer (CEO): Andreas Marx, Guido Habicht, Maik Morgenstern

1 0

[libvirt] (no subject)
by cbley＠av-test.de 12 Oct '12

12 Oct '12

>From 98a7ebaee92eb92fb7ee4a9f06097aec8c626468 Mon Sep 17 00:00:00 2001 Message-Id: <98a7ebaee92eb92fb7ee4a9f06097aec8c626468.1350037981.git.cbley(a)av-test.de> In-Reply-To: <cover.1350037981.git.cbley(a)av-test.de> References: <2DA6F4A3691599408358374D182280F9141CF6(a)xmb-rcd-x04.cisco.com> <cover.1350037981.git.cbley(a)av-test.de> From: cbley(a)av-test.de (Claudio Bley) Date: Mon, 20 Aug 2012 15:18:46 +0200 Subject: [PATCH 05/15] Remove redundant public modifier from Libvirt interface methods. To: libvir-list(a)redhat.com Organization: AV-Test GmbH, Germany This prevents errors reported by checkstyle, see http://checkstyle.sourceforge.net/config_modifier.html#RedundantModifier JSL 9.4: It is permitted, but discouraged as a matter of style, to redundantly specify the public and/or abstract modifier for a method declared in an interface. --- src/main/java/org/libvirt/jna/Libvirt.java | 486 ++++++++++++++-------------- 1 file changed, 243 insertions(+), 243 deletions(-) diff --git a/src/main/java/org/libvirt/jna/Libvirt.java b/src/main/java/org/libvirt/jna/Libvirt.java index e68d9ed..02457b7 100644 --- a/src/main/java/org/libvirt/jna/Libvirt.java +++ b/src/main/java/org/libvirt/jna/Libvirt.java @@ -64,40 +64,40 @@ public interface Libvirt extends Library { * Callback interface for authorization */ interface VirConnectAuthCallback extends Callback { - public int authCallback(virConnectCredential cred, int ncred, Pointer cbdata); + int authCallback(virConnectCredential cred, int ncred, Pointer cbdata); } /** * Error callback */ interface VirErrorCallback extends Callback { - public void errorCallback(Pointer userData, virError error); + void errorCallback(Pointer userData, virError error); } /** * Stream callbacks */ interface VirStreamSinkFunc extends Callback { - public int sinkCallback(StreamPointer virStreamPtr, String data, NativeLong nbytes, Pointer opaque) ; + int sinkCallback(StreamPointer virStreamPtr, String data, NativeLong nbytes, Pointer opaque) ; } interface VirStreamSourceFunc extends Callback { - public int sourceCallback(StreamPointer virStreamPtr, String data, NativeLong nbytes, Pointer opaque) ; + int sourceCallback(StreamPointer virStreamPtr, String data, NativeLong nbytes, Pointer opaque) ; } interface VirStreamEventCallback extends Callback { - public void eventCallback(StreamPointer virStreamPointer, int events, Pointer opaque) ; + void eventCallback(StreamPointer virStreamPointer, int events, Pointer opaque) ; } /** * Generic Callbacks */ interface VirFreeCallback extends Callback { - public void freeCallback(Pointer opaque) ; + void freeCallback(Pointer opaque) ; } interface VirConnectDomainEventGenericCallback extends Callback { - public void eventCallback(ConnectionPointer virConnectPtr, DomainPointer virDomainPointer, Pointer opaque) ; + void eventCallback(ConnectionPointer virConnectPtr, DomainPointer virDomainPointer, Pointer opaque) ; } Libvirt INSTANCE = (Libvirt) Native.loadLibrary("virt", Libvirt.class); @@ -108,274 +108,274 @@ public interface Libvirt extends Library { public static int VIR_DOMAIN_SCHED_FIELD_LENGTH = 80; // Connection Functions - public String virConnectBaselineCPU(ConnectionPointer virConnectPtr, String[] xmlCPUs, int ncpus, int flags); - public int virConnCopyLastError(ConnectionPointer virConnectPtr, virError to); - public int virConnectClose(ConnectionPointer virConnectPtr); - public int virConnectCompareCPU(ConnectionPointer virConnectPtr, String xmlDesc, int flags); - public int virConnectDomainEventRegisterAny(ConnectionPointer virConnectPtr, DomainPointer virDomainPtr, int eventID, Libvirt.VirConnectDomainEventGenericCallback cb, Pointer opaque, Libvirt.VirFreeCallback freecb); - public int virConnectDomainEventDeregisterAny(ConnectionPointer virConnectPtr, int callbackID) ; - public void virConnSetErrorFunc(ConnectionPointer virConnectPtr, Pointer userData, VirErrorCallback callback); - public int virConnectIsEncrypted(ConnectionPointer virConnectPtr) ; - public int virConnectIsSecure(ConnectionPointer virConnectPtr) ; - public String virConnectFindStoragePoolSources(ConnectionPointer virConnectPtr, String type, String srcSpec, int flags); - public String virConnectGetCapabilities(ConnectionPointer virConnectPtr); - public String virConnectGetHostname(ConnectionPointer virConnectPtr); - public int virConnectGetLibVersion(ConnectionPointer virConnectPtr, LongByReference libVer); - public int virConnectGetMaxVcpus(ConnectionPointer virConnectPtr, String type); - public String virConnectGetType(ConnectionPointer virConnectPtr); - public String virConnectGetURI(ConnectionPointer virConnectPtr); - public int virConnectGetVersion(ConnectionPointer virConnectPtr, LongByReference hvVer); - public int virConnectListDefinedDomains(ConnectionPointer virConnectPtr, String[] name, int maxnames); - public int virConnectListDefinedNetworks(ConnectionPointer virConnectPtr, String[] name, int maxnames); - public int virConnectListDefinedStoragePools(ConnectionPointer virConnectPtr, String[] names, int maxnames); - public int virConnectListDefinedInterfaces(ConnectionPointer virConnectPtr, String[] name, int maxNames); - public int virConnectListDomains(ConnectionPointer virConnectPtr, int[] ids, int maxnames); - public int virConnectListInterfaces(ConnectionPointer virConnectPtr, String[] name, int maxNames); - public int virConnectListNetworks(ConnectionPointer virConnectPtr, String[] name, int maxnames); - public int virConnectListNWFilters(ConnectionPointer virConnectPtr, String[] name, int maxnames); - public int virConnectListSecrets(ConnectionPointer virConnectPtr, String[] uids, int maxUids); - public int virConnectListStoragePools(ConnectionPointer virConnectPtr, String[] names, int maxnames); - public int virConnectNumOfDefinedDomains(ConnectionPointer virConnectPtr); - public int virConnectNumOfDefinedNetworks(ConnectionPointer virConnectPtr); - public int virConnectNumOfDefinedInterfaces(ConnectionPointer virConnectPtr); - public int virConnectNumOfDefinedStoragePools(ConnectionPointer virConnectPtr); - public int virConnectNumOfDomains(ConnectionPointer virConnectPtr); - public int virConnectNumOfInterfaces(ConnectionPointer virConnectPtr); - public int virConnectNumOfNetworks(ConnectionPointer virConnectPtr); - public int virConnectNumOfNWFilters(ConnectionPointer virConnectPtr); - public int virConnectNumOfSecrets(ConnectionPointer virConnectPtr); - public int virConnectNumOfStoragePools(ConnectionPointer virConnectPtr); - public ConnectionPointer virConnectOpen(String name); - public ConnectionPointer virConnectOpenAuth(String name, virConnectAuth auth, int flags); - public ConnectionPointer virConnectOpenReadOnly(String name); - public virError virConnGetLastError(ConnectionPointer virConnectPtr); - public int virConnResetLastError(ConnectionPointer virConnectPtr); - public String virConnectDomainXMLFromNative(ConnectionPointer virConnectPtr, String nativeFormat, + String virConnectBaselineCPU(ConnectionPointer virConnectPtr, String[] xmlCPUs, int ncpus, int flags); + int virConnCopyLastError(ConnectionPointer virConnectPtr, virError to); + int virConnectClose(ConnectionPointer virConnectPtr); + int virConnectCompareCPU(ConnectionPointer virConnectPtr, String xmlDesc, int flags); + int virConnectDomainEventRegisterAny(ConnectionPointer virConnectPtr, DomainPointer virDomainPtr, int eventID, Libvirt.VirConnectDomainEventGenericCallback cb, Pointer opaque, Libvirt.VirFreeCallback freecb); + int virConnectDomainEventDeregisterAny(ConnectionPointer virConnectPtr, int callbackID) ; + void virConnSetErrorFunc(ConnectionPointer virConnectPtr, Pointer userData, VirErrorCallback callback); + int virConnectIsEncrypted(ConnectionPointer virConnectPtr) ; + int virConnectIsSecure(ConnectionPointer virConnectPtr) ; + String virConnectFindStoragePoolSources(ConnectionPointer virConnectPtr, String type, String srcSpec, int flags); + String virConnectGetCapabilities(ConnectionPointer virConnectPtr); + String virConnectGetHostname(ConnectionPointer virConnectPtr); + int virConnectGetLibVersion(ConnectionPointer virConnectPtr, LongByReference libVer); + int virConnectGetMaxVcpus(ConnectionPointer virConnectPtr, String type); + String virConnectGetType(ConnectionPointer virConnectPtr); + String virConnectGetURI(ConnectionPointer virConnectPtr); + int virConnectGetVersion(ConnectionPointer virConnectPtr, LongByReference hvVer); + int virConnectListDefinedDomains(ConnectionPointer virConnectPtr, String[] name, int maxnames); + int virConnectListDefinedNetworks(ConnectionPointer virConnectPtr, String[] name, int maxnames); + int virConnectListDefinedStoragePools(ConnectionPointer virConnectPtr, String[] names, int maxnames); + int virConnectListDefinedInterfaces(ConnectionPointer virConnectPtr, String[] name, int maxNames); + int virConnectListDomains(ConnectionPointer virConnectPtr, int[] ids, int maxnames); + int virConnectListInterfaces(ConnectionPointer virConnectPtr, String[] name, int maxNames); + int virConnectListNetworks(ConnectionPointer virConnectPtr, String[] name, int maxnames); + int virConnectListNWFilters(ConnectionPointer virConnectPtr, String[] name, int maxnames); + int virConnectListSecrets(ConnectionPointer virConnectPtr, String[] uids, int maxUids); + int virConnectListStoragePools(ConnectionPointer virConnectPtr, String[] names, int maxnames); + int virConnectNumOfDefinedDomains(ConnectionPointer virConnectPtr); + int virConnectNumOfDefinedNetworks(ConnectionPointer virConnectPtr); + int virConnectNumOfDefinedInterfaces(ConnectionPointer virConnectPtr); + int virConnectNumOfDefinedStoragePools(ConnectionPointer virConnectPtr); + int virConnectNumOfDomains(ConnectionPointer virConnectPtr); + int virConnectNumOfInterfaces(ConnectionPointer virConnectPtr); + int virConnectNumOfNetworks(ConnectionPointer virConnectPtr); + int virConnectNumOfNWFilters(ConnectionPointer virConnectPtr); + int virConnectNumOfSecrets(ConnectionPointer virConnectPtr); + int virConnectNumOfStoragePools(ConnectionPointer virConnectPtr); + ConnectionPointer virConnectOpen(String name); + ConnectionPointer virConnectOpenAuth(String name, virConnectAuth auth, int flags); + ConnectionPointer virConnectOpenReadOnly(String name); + virError virConnGetLastError(ConnectionPointer virConnectPtr); + int virConnResetLastError(ConnectionPointer virConnectPtr); + String virConnectDomainXMLFromNative(ConnectionPointer virConnectPtr, String nativeFormat, String nativeConfig, int flags); - public String virConnectDomainXMLToNative(ConnectionPointer virConnectPtr, String nativeFormat, String domainXML, + String virConnectDomainXMLToNative(ConnectionPointer virConnectPtr, String nativeFormat, String domainXML, int flags); // Global functions - public int virGetVersion(LongByReference libVer, String type, LongByReference typeVer); - public int virInitialize(); - public int virCopyLastError(virError error); - public virError virGetLastError(); - public void virResetLastError(); - public void virSetErrorFunc(Pointer userData, VirErrorCallback callback); + int virGetVersion(LongByReference libVer, String type, LongByReference typeVer); + int virInitialize(); + int virCopyLastError(virError error); + virError virGetLastError(); + void virResetLastError(); + void virSetErrorFunc(Pointer userData, VirErrorCallback callback); // Domain functions - public int virDomainAbortJob(DomainPointer virDomainPtr); - public int virDomainAttachDevice(DomainPointer virDomainPtr, String deviceXML); - public int virDomainAttachDeviceFlags(DomainPointer virDomainPtr, String deviceXML, int flags); - public int virDomainBlockStats(DomainPointer virDomainPtr, String path, virDomainBlockStats stats, int size); - public int virDomainCoreDump(DomainPointer virDomainPtr, String to, int flags); - public int virDomainCreate(DomainPointer virDomainPtr); - public int virDomainCreateWithFlags(DomainPointer virDomainPtr, int flags); - public DomainPointer virDomainCreateLinux(ConnectionPointer virConnectPtr, String xmlDesc, int flags); - public DomainPointer virDomainCreateXML(ConnectionPointer virConnectPtr, String xmlDesc, int flags); - public DomainPointer virDomainDefineXML(ConnectionPointer virConnectPtr, String xmlDesc); - public int virDomainDestroy(DomainPointer virDomainPtr); - public int virDomainDetachDevice(DomainPointer virDomainPtr, String deviceXML); - public int virDomainDetachDeviceFlags(DomainPointer virDomainPtr, String deviceXML, int flags); - public int virDomainFree(DomainPointer virDomainPtr); - public int virDomainGetAutostart(DomainPointer virDomainPtr, IntByReference value); - public ConnectionPointer virDomainGetConnect(DomainPointer virDomainPtr); - public int virDomainGetBlockInfo(DomainPointer virDomainPtr, String path, virDomainBlockInfo info, int flags); - public int virDomainGetID(DomainPointer virDomainPtr); - public int virDomainGetInfo(DomainPointer virDomainPtr, virDomainInfo vInfo); - public int virDomainGetJobInfo(DomainPointer virDomainPtr, virDomainJobInfo vInfo); - public NativeLong virDomainGetMaxMemory(DomainPointer virDomainPtr); - public int virDomainGetMaxVcpus(DomainPointer virDomainPtr); - public String virDomainGetName(DomainPointer virDomainPtr); - public String virDomainGetOSType(DomainPointer virDomainPtr); - public int virDomainGetSchedulerParameters(DomainPointer virDomainPtr, virSchedParameter[] params, + int virDomainAbortJob(DomainPointer virDomainPtr); + int virDomainAttachDevice(DomainPointer virDomainPtr, String deviceXML); + int virDomainAttachDeviceFlags(DomainPointer virDomainPtr, String deviceXML, int flags); + int virDomainBlockStats(DomainPointer virDomainPtr, String path, virDomainBlockStats stats, int size); + int virDomainCoreDump(DomainPointer virDomainPtr, String to, int flags); + int virDomainCreate(DomainPointer virDomainPtr); + int virDomainCreateWithFlags(DomainPointer virDomainPtr, int flags); + DomainPointer virDomainCreateLinux(ConnectionPointer virConnectPtr, String xmlDesc, int flags); + DomainPointer virDomainCreateXML(ConnectionPointer virConnectPtr, String xmlDesc, int flags); + DomainPointer virDomainDefineXML(ConnectionPointer virConnectPtr, String xmlDesc); + int virDomainDestroy(DomainPointer virDomainPtr); + int virDomainDetachDevice(DomainPointer virDomainPtr, String deviceXML); + int virDomainDetachDeviceFlags(DomainPointer virDomainPtr, String deviceXML, int flags); + int virDomainFree(DomainPointer virDomainPtr); + int virDomainGetAutostart(DomainPointer virDomainPtr, IntByReference value); + ConnectionPointer virDomainGetConnect(DomainPointer virDomainPtr); + int virDomainGetBlockInfo(DomainPointer virDomainPtr, String path, virDomainBlockInfo info, int flags); + int virDomainGetID(DomainPointer virDomainPtr); + int virDomainGetInfo(DomainPointer virDomainPtr, virDomainInfo vInfo); + int virDomainGetJobInfo(DomainPointer virDomainPtr, virDomainJobInfo vInfo); + NativeLong virDomainGetMaxMemory(DomainPointer virDomainPtr); + int virDomainGetMaxVcpus(DomainPointer virDomainPtr); + String virDomainGetName(DomainPointer virDomainPtr); + String virDomainGetOSType(DomainPointer virDomainPtr); + int virDomainGetSchedulerParameters(DomainPointer virDomainPtr, virSchedParameter[] params, IntByReference nparams); Pointer virDomainGetSchedulerType(DomainPointer virDomainPtr, IntByReference nparams); - public int virDomainGetUUID(DomainPointer virDomainPtr, byte[] uuidString); - public int virDomainGetUUIDString(DomainPointer virDomainPtr, byte[] uuidString); - public int virDomainGetVcpus(DomainPointer virDomainPtr, virVcpuInfo[] info, int maxInfo, byte[] cpumaps, int maplen); - public String virDomainGetXMLDesc(DomainPointer virDomainPtr, int flags); - public int virDomainHasCurrentSnapshot(DomainPointer virDomainPtr, int flags); - public int virDomainHasManagedSaveImage(DomainPointer virDomainPtr, int flags); - public int virDomainInterfaceStats(DomainPointer virDomainPtr, String path, virDomainInterfaceStats stats, int size); - public int virDomainIsActive(DomainPointer virDomainPtr); - public int virDomainIsPersistent(DomainPointer virDomainPtr); - public DomainPointer virDomainLookupByID(ConnectionPointer virConnectPtr, int id); - public DomainPointer virDomainLookupByName(ConnectionPointer virConnectPtr, String name); - public DomainPointer virDomainLookupByUUID(ConnectionPointer virConnectPtr, byte[] uuidBytes); - public DomainPointer virDomainLookupByUUIDString(ConnectionPointer virConnectPtr, String uuidstr); - public int virDomainManagedSave(DomainPointer virDomainPtr, int flags); - public int virDomainManagedSaveRemove(DomainPointer virDomainPtr, int flags); - public DomainPointer virDomainMigrate(DomainPointer virDomainPtr, ConnectionPointer virConnectPtr, + int virDomainGetUUID(DomainPointer virDomainPtr, byte[] uuidString); + int virDomainGetUUIDString(DomainPointer virDomainPtr, byte[] uuidString); + int virDomainGetVcpus(DomainPointer virDomainPtr, virVcpuInfo[] info, int maxInfo, byte[] cpumaps, int maplen); + String virDomainGetXMLDesc(DomainPointer virDomainPtr, int flags); + int virDomainHasCurrentSnapshot(DomainPointer virDomainPtr, int flags); + int virDomainHasManagedSaveImage(DomainPointer virDomainPtr, int flags); + int virDomainInterfaceStats(DomainPointer virDomainPtr, String path, virDomainInterfaceStats stats, int size); + int virDomainIsActive(DomainPointer virDomainPtr); + int virDomainIsPersistent(DomainPointer virDomainPtr); + DomainPointer virDomainLookupByID(ConnectionPointer virConnectPtr, int id); + DomainPointer virDomainLookupByName(ConnectionPointer virConnectPtr, String name); + DomainPointer virDomainLookupByUUID(ConnectionPointer virConnectPtr, byte[] uuidBytes); + DomainPointer virDomainLookupByUUIDString(ConnectionPointer virConnectPtr, String uuidstr); + int virDomainManagedSave(DomainPointer virDomainPtr, int flags); + int virDomainManagedSaveRemove(DomainPointer virDomainPtr, int flags); + DomainPointer virDomainMigrate(DomainPointer virDomainPtr, ConnectionPointer virConnectPtr, NativeLong flags, String dname, String uri, NativeLong bandwidth); - public int virDomainMigrateSetMaxDowntime(DomainPointer virDomainPtr, long downtime, int flags); - public int virDomainMigrateToURI(DomainPointer virDomainPtr, String duri, + int virDomainMigrateSetMaxDowntime(DomainPointer virDomainPtr, long downtime, int flags); + int virDomainMigrateToURI(DomainPointer virDomainPtr, String duri, NativeLong flags, String dname, NativeLong bandwidth); - public int virDomainMemoryStats(DomainPointer virDomainPtr, virDomainMemoryStats[] stats, int nr_stats, int flags); - public int virDomainPinVcpu(DomainPointer virDomainPtr, int vcpu, byte[] cpumap, int maplen); - public int virDomainReboot(DomainPointer virDomainPtr, int flags); - public int virDomainRestore(ConnectionPointer virConnectPtr, String from); - public int virDomainRevertToSnapshot(DomainSnapshotPointer virDomainSnapshotPtr, int flags); - public int virDomainResume(DomainPointer virDomainPtr); - public int virDomainSave(DomainPointer virDomainPtr, String to); - public int virDomainSetAutostart(DomainPointer virDomainPtr, int autoStart); - public int virDomainSetMaxMemory(DomainPointer virDomainPtr, NativeLong maxMemory); - public int virDomainSetMemory(DomainPointer virDomainPtr, NativeLong maxMemory); - public int virDomainSetSchedulerParameters(DomainPointer virDomainPtr, virSchedParameter[] params, int nparams); - public int virDomainSetVcpus(DomainPointer virDomainPtr, int nvcpus); - public int virDomainShutdown(DomainPointer virDomainPtr); - public int virDomainSuspend(DomainPointer virDomainPtr); - public int virDomainUpdateDeviceFlags(DomainPointer virDomainPtr, String xml, int flags); - public int virDomainUndefine(DomainPointer virDomainPtr); + int virDomainMemoryStats(DomainPointer virDomainPtr, virDomainMemoryStats[] stats, int nr_stats, int flags); + int virDomainPinVcpu(DomainPointer virDomainPtr, int vcpu, byte[] cpumap, int maplen); + int virDomainReboot(DomainPointer virDomainPtr, int flags); + int virDomainRestore(ConnectionPointer virConnectPtr, String from); + int virDomainRevertToSnapshot(DomainSnapshotPointer virDomainSnapshotPtr, int flags); + int virDomainResume(DomainPointer virDomainPtr); + int virDomainSave(DomainPointer virDomainPtr, String to); + int virDomainSetAutostart(DomainPointer virDomainPtr, int autoStart); + int virDomainSetMaxMemory(DomainPointer virDomainPtr, NativeLong maxMemory); + int virDomainSetMemory(DomainPointer virDomainPtr, NativeLong maxMemory); + int virDomainSetSchedulerParameters(DomainPointer virDomainPtr, virSchedParameter[] params, int nparams); + int virDomainSetVcpus(DomainPointer virDomainPtr, int nvcpus); + int virDomainShutdown(DomainPointer virDomainPtr); + int virDomainSuspend(DomainPointer virDomainPtr); + int virDomainUpdateDeviceFlags(DomainPointer virDomainPtr, String xml, int flags); + int virDomainUndefine(DomainPointer virDomainPtr); // Network functions - public ConnectionPointer virNetworkGetConnect(NetworkPointer virnetworkPtr); - public int virNetworkCreate(NetworkPointer virConnectPtr); - public NetworkPointer virNetworkCreateXML(ConnectionPointer virConnectPtr, String xmlDesc); - public NetworkPointer virNetworkDefineXML(ConnectionPointer virConnectPtr, String xmlDesc); - public int virNetworkDestroy(NetworkPointer virConnectPtr); - public int virNetworkFree(NetworkPointer virConnectPtr); - public int virNetworkGetAutostart(NetworkPointer virNetworkPtr, IntByReference value); - public String virNetworkGetBridgeName(NetworkPointer virNetworkPtr); - public String virNetworkGetName(NetworkPointer virNetworkPtr); - public int virNetworkGetUUID(NetworkPointer virNetworkPtr, byte[] uuidString); - public int virNetworkGetUUIDString(NetworkPointer virNetworkPtr, byte[] uuidString); - public String virNetworkGetXMLDesc(NetworkPointer virNetworkPtr, int flags); - public int virNetworkIsActive(NetworkPointer virNetworkPtr); - public int virNetworkIsPersistent(NetworkPointer virNetworkPtr); - public NetworkPointer virNetworkLookupByName(ConnectionPointer virConnectPtr, String name); - public NetworkPointer virNetworkLookupByUUID(ConnectionPointer virConnectPtr, byte[] uuidBytes); - public NetworkPointer virNetworkLookupByUUIDString(ConnectionPointer virConnectPtr, String uuidstr); - public int virNetworkSetAutostart(NetworkPointer virConnectPtr, int autoStart); - public int virNetworkUndefine(NetworkPointer virConnectPtr); + ConnectionPointer virNetworkGetConnect(NetworkPointer virnetworkPtr); + int virNetworkCreate(NetworkPointer virConnectPtr); + NetworkPointer virNetworkCreateXML(ConnectionPointer virConnectPtr, String xmlDesc); + NetworkPointer virNetworkDefineXML(ConnectionPointer virConnectPtr, String xmlDesc); + int virNetworkDestroy(NetworkPointer virConnectPtr); + int virNetworkFree(NetworkPointer virConnectPtr); + int virNetworkGetAutostart(NetworkPointer virNetworkPtr, IntByReference value); + String virNetworkGetBridgeName(NetworkPointer virNetworkPtr); + String virNetworkGetName(NetworkPointer virNetworkPtr); + int virNetworkGetUUID(NetworkPointer virNetworkPtr, byte[] uuidString); + int virNetworkGetUUIDString(NetworkPointer virNetworkPtr, byte[] uuidString); + String virNetworkGetXMLDesc(NetworkPointer virNetworkPtr, int flags); + int virNetworkIsActive(NetworkPointer virNetworkPtr); + int virNetworkIsPersistent(NetworkPointer virNetworkPtr); + NetworkPointer virNetworkLookupByName(ConnectionPointer virConnectPtr, String name); + NetworkPointer virNetworkLookupByUUID(ConnectionPointer virConnectPtr, byte[] uuidBytes); + NetworkPointer virNetworkLookupByUUIDString(ConnectionPointer virConnectPtr, String uuidstr); + int virNetworkSetAutostart(NetworkPointer virConnectPtr, int autoStart); + int virNetworkUndefine(NetworkPointer virConnectPtr); // Node functions - public int virNodeGetInfo(ConnectionPointer virConnectPtr, virNodeInfo virNodeInfo); - public int virNodeGetCellsFreeMemory(ConnectionPointer virConnectPtr, LongByReference freeMems, int startCell, + int virNodeGetInfo(ConnectionPointer virConnectPtr, virNodeInfo virNodeInfo); + int virNodeGetCellsFreeMemory(ConnectionPointer virConnectPtr, LongByReference freeMems, int startCell, int maxCells); - public long virNodeGetFreeMemory(ConnectionPointer virConnectPtr); + long virNodeGetFreeMemory(ConnectionPointer virConnectPtr); // Node/Device functions - public int virNodeNumOfDevices(ConnectionPointer virConnectPtr, String capabilityName, int flags); - public int virNodeListDevices(ConnectionPointer virConnectPtr, String capabilityName, String[] names, int maxnames, + int virNodeNumOfDevices(ConnectionPointer virConnectPtr, String capabilityName, int flags); + int virNodeListDevices(ConnectionPointer virConnectPtr, String capabilityName, String[] names, int maxnames, int flags); - public DevicePointer virNodeDeviceLookupByName(ConnectionPointer virConnectPtr, String name); - public String virNodeDeviceGetName(DevicePointer virDevicePointer); - public String virNodeDeviceGetParent(DevicePointer virDevicePointer); - public int virNodeDeviceNumOfCaps(DevicePointer virDevicePointer); - public int virNodeDeviceListCaps(DevicePointer virDevicePointer, String[] names, int maxNames); - public String virNodeDeviceGetXMLDesc(DevicePointer virDevicePointer); - public int virNodeDeviceFree(DevicePointer virDevicePointer); - public int virNodeDeviceDettach(DevicePointer virDevicePointer); - public int virNodeDeviceReAttach(DevicePointer virDevicePointer); - public int virNodeDeviceReset(DevicePointer virDevicePointer); - public DevicePointer virNodeDeviceCreateXML(ConnectionPointer virConnectPtr, String xml, int flags); - public int virNodeDeviceDestroy(DevicePointer virDevicePointer); + DevicePointer virNodeDeviceLookupByName(ConnectionPointer virConnectPtr, String name); + String virNodeDeviceGetName(DevicePointer virDevicePointer); + String virNodeDeviceGetParent(DevicePointer virDevicePointer); + int virNodeDeviceNumOfCaps(DevicePointer virDevicePointer); + int virNodeDeviceListCaps(DevicePointer virDevicePointer, String[] names, int maxNames); + String virNodeDeviceGetXMLDesc(DevicePointer virDevicePointer); + int virNodeDeviceFree(DevicePointer virDevicePointer); + int virNodeDeviceDettach(DevicePointer virDevicePointer); + int virNodeDeviceReAttach(DevicePointer virDevicePointer); + int virNodeDeviceReset(DevicePointer virDevicePointer); + DevicePointer virNodeDeviceCreateXML(ConnectionPointer virConnectPtr, String xml, int flags); + int virNodeDeviceDestroy(DevicePointer virDevicePointer); // Storage Pool - public int virStoragePoolBuild(StoragePoolPointer storagePoolPtr, int flags); - public int virStoragePoolCreate(StoragePoolPointer storagePoolPtr, int flags); - public StoragePoolPointer virStoragePoolCreateXML(ConnectionPointer virConnectPtr, String xml, int flags); - public StoragePoolPointer virStoragePoolDefineXML(ConnectionPointer virConnectPtr, String xml, int flags); - public int virStoragePoolDelete(StoragePoolPointer storagePoolPtr, int flags); - public int virStoragePoolDestroy(StoragePoolPointer storagePoolPtr); - public int virStoragePoolFree(StoragePoolPointer storagePoolPtr); - public int virStoragePoolGetAutostart(StoragePoolPointer storagePoolPtr, IntByReference value); - public int virStoragePoolGetInfo(StoragePoolPointer storagePoolPtr, virStoragePoolInfo info); - public String virStoragePoolGetName(StoragePoolPointer storagePoolPtr); - public int virStoragePoolGetUUID(StoragePoolPointer storagePoolPtr, byte[] uuidString); - public int virStoragePoolGetUUIDString(StoragePoolPointer storagePoolPtr, byte[] uuidString); - public String virStoragePoolGetXMLDesc(StoragePoolPointer storagePoolPtr, int flags); - public int virStoragePoolListVolumes(StoragePoolPointer storagePoolPtr, String[] names, int maxnames); - public int virStoragePoolIsActive(StoragePoolPointer storagePoolPtr); - public int virStoragePoolIsPersistent(StoragePoolPointer storagePoolPtr); - public StoragePoolPointer virStoragePoolLookupByName(ConnectionPointer virConnectPtr, String name); - public StoragePoolPointer virStoragePoolLookupByUUID(ConnectionPointer virConnectPtr, byte[] uuidBytes); - public StoragePoolPointer virStoragePoolLookupByUUIDString(ConnectionPointer virConnectPtr, String uuidstr); - public StoragePoolPointer virStoragePoolLookupByVolume(StorageVolPointer storageVolPtr); - public int virStoragePoolNumOfVolumes(StoragePoolPointer storagePoolPtr); - public int virStoragePoolRefresh(StoragePoolPointer storagePoolPtr, int flags); - public int virStoragePoolSetAutostart(StoragePoolPointer storagePoolPtr, int autostart); - public int virStoragePoolUndefine(StoragePoolPointer storagePoolPtr); + int virStoragePoolBuild(StoragePoolPointer storagePoolPtr, int flags); + int virStoragePoolCreate(StoragePoolPointer storagePoolPtr, int flags); + StoragePoolPointer virStoragePoolCreateXML(ConnectionPointer virConnectPtr, String xml, int flags); + StoragePoolPointer virStoragePoolDefineXML(ConnectionPointer virConnectPtr, String xml, int flags); + int virStoragePoolDelete(StoragePoolPointer storagePoolPtr, int flags); + int virStoragePoolDestroy(StoragePoolPointer storagePoolPtr); + int virStoragePoolFree(StoragePoolPointer storagePoolPtr); + int virStoragePoolGetAutostart(StoragePoolPointer storagePoolPtr, IntByReference value); + int virStoragePoolGetInfo(StoragePoolPointer storagePoolPtr, virStoragePoolInfo info); + String virStoragePoolGetName(StoragePoolPointer storagePoolPtr); + int virStoragePoolGetUUID(StoragePoolPointer storagePoolPtr, byte[] uuidString); + int virStoragePoolGetUUIDString(StoragePoolPointer storagePoolPtr, byte[] uuidString); + String virStoragePoolGetXMLDesc(StoragePoolPointer storagePoolPtr, int flags); + int virStoragePoolListVolumes(StoragePoolPointer storagePoolPtr, String[] names, int maxnames); + int virStoragePoolIsActive(StoragePoolPointer storagePoolPtr); + int virStoragePoolIsPersistent(StoragePoolPointer storagePoolPtr); + StoragePoolPointer virStoragePoolLookupByName(ConnectionPointer virConnectPtr, String name); + StoragePoolPointer virStoragePoolLookupByUUID(ConnectionPointer virConnectPtr, byte[] uuidBytes); + StoragePoolPointer virStoragePoolLookupByUUIDString(ConnectionPointer virConnectPtr, String uuidstr); + StoragePoolPointer virStoragePoolLookupByVolume(StorageVolPointer storageVolPtr); + int virStoragePoolNumOfVolumes(StoragePoolPointer storagePoolPtr); + int virStoragePoolRefresh(StoragePoolPointer storagePoolPtr, int flags); + int virStoragePoolSetAutostart(StoragePoolPointer storagePoolPtr, int autostart); + int virStoragePoolUndefine(StoragePoolPointer storagePoolPtr); // Storage Vol - public StorageVolPointer virStorageVolCreateXML(StoragePoolPointer storagePoolPtr, String xml, int flags); - public StorageVolPointer virStorageVolCreateXMLFrom(StoragePoolPointer storagePoolPtr, String xml, + StorageVolPointer virStorageVolCreateXML(StoragePoolPointer storagePoolPtr, String xml, int flags); + StorageVolPointer virStorageVolCreateXMLFrom(StoragePoolPointer storagePoolPtr, String xml, StorageVolPointer cloneVolume, int flags); - public int virStorageVolDelete(StorageVolPointer storageVolPtr, int flags); - public int virStorageVolFree(StorageVolPointer storageVolPtr); - public int virStorageVolGetInfo(StorageVolPointer storageVolPtr, virStorageVolInfo info); - public String virStorageVolGetKey(StorageVolPointer storageVolPtr); - public String virStorageVolGetName(StorageVolPointer storageVolPtr); - public String virStorageVolGetPath(StorageVolPointer storageVolPtr); - public String virStorageVolGetXMLDesc(StorageVolPointer storageVolPtr, int flags); - public StorageVolPointer virStorageVolLookupByKey(ConnectionPointer virConnectPtr, String name); - public StorageVolPointer virStorageVolLookupByName(StoragePoolPointer storagePoolPtr, String name); - public StorageVolPointer virStorageVolLookupByPath(ConnectionPointer virConnectPtr, String path); - public int virStorageVolWipe(StorageVolPointer storageVolPtr, int flags); + int virStorageVolDelete(StorageVolPointer storageVolPtr, int flags); + int virStorageVolFree(StorageVolPointer storageVolPtr); + int virStorageVolGetInfo(StorageVolPointer storageVolPtr, virStorageVolInfo info); + String virStorageVolGetKey(StorageVolPointer storageVolPtr); + String virStorageVolGetName(StorageVolPointer storageVolPtr); + String virStorageVolGetPath(StorageVolPointer storageVolPtr); + String virStorageVolGetXMLDesc(StorageVolPointer storageVolPtr, int flags); + StorageVolPointer virStorageVolLookupByKey(ConnectionPointer virConnectPtr, String name); + StorageVolPointer virStorageVolLookupByName(StoragePoolPointer storagePoolPtr, String name); + StorageVolPointer virStorageVolLookupByPath(ConnectionPointer virConnectPtr, String path); + int virStorageVolWipe(StorageVolPointer storageVolPtr, int flags); // Interface Methods - public int virInterfaceCreate(InterfacePointer virDevicePointer); - public InterfacePointer virInterfaceDefineXML(ConnectionPointer virConnectPtr, String xml, int flags); - public int virInterfaceDestroy(InterfacePointer virDevicePointer); - public int virInterfaceFree(InterfacePointer virDevicePointer); - public String virInterfaceGetName(InterfacePointer virInterfacePtr); - public String virInterfaceGetMACString(InterfacePointer virInterfacePtr); - public String virInterfaceGetXMLDesc(InterfacePointer virInterfacePtr, int flags); - public int virInterfaceIsActive(InterfacePointer virDevicePointer); - public InterfacePointer virInterfaceLookupByMACString(ConnectionPointer virConnectPtr, String mac); - public InterfacePointer virInterfaceLookupByName(ConnectionPointer virConnectPtr, String name); - public int virInterfaceUndefine(InterfacePointer virDevicePointer); + int virInterfaceCreate(InterfacePointer virDevicePointer); + InterfacePointer virInterfaceDefineXML(ConnectionPointer virConnectPtr, String xml, int flags); + int virInterfaceDestroy(InterfacePointer virDevicePointer); + int virInterfaceFree(InterfacePointer virDevicePointer); + String virInterfaceGetName(InterfacePointer virInterfacePtr); + String virInterfaceGetMACString(InterfacePointer virInterfacePtr); + String virInterfaceGetXMLDesc(InterfacePointer virInterfacePtr, int flags); + int virInterfaceIsActive(InterfacePointer virDevicePointer); + InterfacePointer virInterfaceLookupByMACString(ConnectionPointer virConnectPtr, String mac); + InterfacePointer virInterfaceLookupByName(ConnectionPointer virConnectPtr, String name); + int virInterfaceUndefine(InterfacePointer virDevicePointer); // Secret Methods - public ConnectionPointer virSecretGetConnect(SecretPointer virSecretPtr); - public int virSecretFree(SecretPointer virSecretPtr); - public SecretPointer virSecretDefineXML(ConnectionPointer virConnectPtr, String xml, int flags); - public int virSecretGetUUID(SecretPointer virSecretPtr, byte[] uuidString); - public int virSecretGetUUIDString(SecretPointer virSecretPtr, byte[] uuidString); - public String virSecretGetUsageID(SecretPointer virSecretPtr); - public Pointer virSecretGetValue(SecretPointer virSecretPtr, LongByReference value_size, int flags); - public String virSecretGetXMLDesc(SecretPointer virSecretPtr, int flags); - public SecretPointer virSecretLookupByUsage(ConnectionPointer virConnectPtr, int usageType, String usageID); - public SecretPointer virSecretLookupByUUID(ConnectionPointer virConnectPtr, byte[] uuidBytes); - public SecretPointer virSecretLookupByUUIDString(ConnectionPointer virConnectPtr, String uuidstr); - public int virSecretSetValue(SecretPointer virSecretPtr, String value, NativeLong value_size, int flags); - public int virSecretSetValue(SecretPointer virSecretPtr, byte[] value, NativeLong value_size, int flags); - public int virSecretUndefine(SecretPointer virSecretPtr); + ConnectionPointer virSecretGetConnect(SecretPointer virSecretPtr); + int virSecretFree(SecretPointer virSecretPtr); + SecretPointer virSecretDefineXML(ConnectionPointer virConnectPtr, String xml, int flags); + int virSecretGetUUID(SecretPointer virSecretPtr, byte[] uuidString); + int virSecretGetUUIDString(SecretPointer virSecretPtr, byte[] uuidString); + String virSecretGetUsageID(SecretPointer virSecretPtr); + Pointer virSecretGetValue(SecretPointer virSecretPtr, LongByReference value_size, int flags); + String virSecretGetXMLDesc(SecretPointer virSecretPtr, int flags); + SecretPointer virSecretLookupByUsage(ConnectionPointer virConnectPtr, int usageType, String usageID); + SecretPointer virSecretLookupByUUID(ConnectionPointer virConnectPtr, byte[] uuidBytes); + SecretPointer virSecretLookupByUUIDString(ConnectionPointer virConnectPtr, String uuidstr); + int virSecretSetValue(SecretPointer virSecretPtr, String value, NativeLong value_size, int flags); + int virSecretSetValue(SecretPointer virSecretPtr, byte[] value, NativeLong value_size, int flags); + int virSecretUndefine(SecretPointer virSecretPtr); //Stream Methods - public int virStreamAbort(StreamPointer virStreamPtr) ; - public int virStreamEventAddCallback(StreamPointer virStreamPtr, int events, Libvirt.VirStreamEventCallback cb, + int virStreamAbort(StreamPointer virStreamPtr) ; + int virStreamEventAddCallback(StreamPointer virStreamPtr, int events, Libvirt.VirStreamEventCallback cb, Pointer opaque, Libvirt.VirFreeCallback ff); - public int virStreamEventUpdateCallback(StreamPointer virStreamPtr, int events); - public int virStreamEventRemoveCallback(StreamPointer virStreamPtr); - public int virStreamFinish(StreamPointer virStreamPtr) ; - public int virStreamFree(StreamPointer virStreamPtr) ; - public StreamPointer virStreamNew(ConnectionPointer virConnectPtr, int flags) ; - public int virStreamSend(StreamPointer virStreamPtr, String data, NativeLong size); - public int virStreamSendAll(StreamPointer virStreamPtr, Libvirt.VirStreamSourceFunc handler, Pointer opaque); - public int virStreamRecv(StreamPointer virStreamPtr, byte[] data, NativeLong length); - public int virStreamRecvAll(StreamPointer virStreamPtr, Libvirt.VirStreamSinkFunc handler, Pointer opaque); + int virStreamEventUpdateCallback(StreamPointer virStreamPtr, int events); + int virStreamEventRemoveCallback(StreamPointer virStreamPtr); + int virStreamFinish(StreamPointer virStreamPtr) ; + int virStreamFree(StreamPointer virStreamPtr) ; + StreamPointer virStreamNew(ConnectionPointer virConnectPtr, int flags) ; + int virStreamSend(StreamPointer virStreamPtr, String data, NativeLong size); + int virStreamSendAll(StreamPointer virStreamPtr, Libvirt.VirStreamSourceFunc handler, Pointer opaque); + int virStreamRecv(StreamPointer virStreamPtr, byte[] data, NativeLong length); + int virStreamRecvAll(StreamPointer virStreamPtr, Libvirt.VirStreamSinkFunc handler, Pointer opaque); //DomainSnapshot Methods - public DomainSnapshotPointer virDomainSnapshotCreateXML(DomainPointer virDomainPtr, String xmlDesc, int flags); - public DomainSnapshotPointer virDomainSnapshotCurrent(DomainPointer virDomainPtr, int flags); - public int virDomainSnapshotDelete(DomainSnapshotPointer virDomainSnapshotPtr, int flags); - public String virDomainSnapshotGetXMLDesc(DomainSnapshotPointer virDomainSnapshotPtr, int flags); - public int virDomainSnapshotFree(DomainSnapshotPointer virDomainSnapshotPtr); - public int virDomainSnapshotListNames(DomainPointer virDomainPtr, String[] names, int nameslen, int flags); - public DomainSnapshotPointer virDomainSnapshotLookupByName(DomainPointer virDomainPtr, String name, int flags); - public int virDomainSnapshotNum(DomainPointer virDomainPtr, int flags); + DomainSnapshotPointer virDomainSnapshotCreateXML(DomainPointer virDomainPtr, String xmlDesc, int flags); + DomainSnapshotPointer virDomainSnapshotCurrent(DomainPointer virDomainPtr, int flags); + int virDomainSnapshotDelete(DomainSnapshotPointer virDomainSnapshotPtr, int flags); + String virDomainSnapshotGetXMLDesc(DomainSnapshotPointer virDomainSnapshotPtr, int flags); + int virDomainSnapshotFree(DomainSnapshotPointer virDomainSnapshotPtr); + int virDomainSnapshotListNames(DomainPointer virDomainPtr, String[] names, int nameslen, int flags); + DomainSnapshotPointer virDomainSnapshotLookupByName(DomainPointer virDomainPtr, String name, int flags); + int virDomainSnapshotNum(DomainPointer virDomainPtr, int flags); // Network Filter Methods - public String virNWFilterGetXMLDesc(NetworkFilterPointer virNWFilterPtr, int flags); - public NetworkFilterPointer virNWFilterDefineXML(ConnectionPointer virConnectPtr, String xml); - public int virNWFilterFree(NetworkFilterPointer virNWFilterPtr); - public NetworkFilterPointer virNWFilterLookupByName(ConnectionPointer virConnectPtr, String name); - public NetworkFilterPointer virNWFilterLookupByUUID(ConnectionPointer virConnectPtr, byte[] uuidBytes); - public NetworkFilterPointer virNWFilterLookupByUUIDString(ConnectionPointer virConnectPtr, String uuidstr); - public String virNWFilterGetName(NetworkFilterPointer virNWFilterPtr); - public int virNWFilterGetUUID(NetworkFilterPointer virNWFilterPtr, byte[] uuidString); - public int virNWFilterGetUUIDString(NetworkFilterPointer virNWFilterPtr, byte[] uuidString); - public int virNWFilterUndefine(NetworkFilterPointer virNWFilterPtr); + String virNWFilterGetXMLDesc(NetworkFilterPointer virNWFilterPtr, int flags); + NetworkFilterPointer virNWFilterDefineXML(ConnectionPointer virConnectPtr, String xml); + int virNWFilterFree(NetworkFilterPointer virNWFilterPtr); + NetworkFilterPointer virNWFilterLookupByName(ConnectionPointer virConnectPtr, String name); + NetworkFilterPointer virNWFilterLookupByUUID(ConnectionPointer virConnectPtr, byte[] uuidBytes); + NetworkFilterPointer virNWFilterLookupByUUIDString(ConnectionPointer virConnectPtr, String uuidstr); + String virNWFilterGetName(NetworkFilterPointer virNWFilterPtr); + int virNWFilterGetUUID(NetworkFilterPointer virNWFilterPtr, byte[] uuidString); + int virNWFilterGetUUIDString(NetworkFilterPointer virNWFilterPtr, byte[] uuidString); + int virNWFilterUndefine(NetworkFilterPointer virNWFilterPtr); } -- AV-Test GmbH, Henricistraße 20, 04155 Leipzig, Germany Phone: +49 341 265 310 19 Web:<http://www.av-test.org> Eingetragen am / Registered at: Amtsgericht Stendal (HRB 114076) Geschaeftsfuehrer (CEO): Andreas Marx, Guido Habicht, Maik Morgenstern

1 0

[libvirt] (no subject)
by cbley＠av-test.de 12 Oct '12

12 Oct '12

>From 2dfe78ef3c2e5e69bb41d8db02eb433379d12fda Mon Sep 17 00:00:00 2001 Message-Id: <2dfe78ef3c2e5e69bb41d8db02eb433379d12fda.1350037981.git.cbley(a)av-test.de> In-Reply-To: <cover.1350037981.git.cbley(a)av-test.de> References: <2DA6F4A3691599408358374D182280F9141CF6(a)xmb-rcd-x04.cisco.com> <cover.1350037981.git.cbley(a)av-test.de> From: cbley(a)av-test.de (Claudio Bley) Date: Mon, 20 Aug 2012 16:50:00 +0200 Subject: [PATCH 06/15] Change visibility of class members to private to enforce encapsulation. To: libvir-list(a)redhat.com Organization: AV-Test GmbH, Germany --- src/main/java/org/libvirt/Error.java | 24 +++++++++++------------ src/main/java/org/libvirt/LibvirtException.java | 2 +- src/main/java/org/libvirt/Stream.java | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/main/java/org/libvirt/Error.java b/src/main/java/org/libvirt/Error.java index e3c3246..114e758 100644 --- a/src/main/java/org/libvirt/Error.java +++ b/src/main/java/org/libvirt/Error.java @@ -199,18 +199,18 @@ public class Error implements Serializable { */ private static final long serialVersionUID = -4780109197014633842L; - ErrorNumber code; - ErrorDomain domain; - String message; - ErrorLevel level; - ConnectionPointer VCP; /* Deprecated */ - DomainPointer VDP; /* Deprecated */ - String str1; - String str2; - String str3; - int int1; - int int2; - NetworkPointer VNP; /* Deprecated */ + private ErrorNumber code; + private ErrorDomain domain; + private String message; + private ErrorLevel level; + private ConnectionPointer VCP; /* Deprecated */ + private DomainPointer VDP; /* Deprecated */ + private String str1; + private String str2; + private String str3; + private int int1; + private int int2; + private NetworkPointer VNP; /* Deprecated */ public Error(virError vError) { code = code.wrap(vError.code); diff --git a/src/main/java/org/libvirt/LibvirtException.java b/src/main/java/org/libvirt/LibvirtException.java index 5bd2d6e..f9546be 100644 --- a/src/main/java/org/libvirt/LibvirtException.java +++ b/src/main/java/org/libvirt/LibvirtException.java @@ -11,7 +11,7 @@ public class LibvirtException extends Exception { private static final long serialVersionUID = 5566904363426773529L; - Error virError; + private Error virError; LibvirtException(Error virError) { super(virError.getMessage()); diff --git a/src/main/java/org/libvirt/Stream.java b/src/main/java/org/libvirt/Stream.java index 0056a78..06b67cf 100644 --- a/src/main/java/org/libvirt/Stream.java +++ b/src/main/java/org/libvirt/Stream.java @@ -12,7 +12,7 @@ public class Stream { /** * the native virStreamPtr. */ - StreamPointer VSP; + private StreamPointer VSP; /** * The Connect Object that represents the Hypervisor of this Domain -- AV-Test GmbH, Henricistraße 20, 04155 Leipzig, Germany Phone: +49 341 265 310 19 Web:<http://www.av-test.org> Eingetragen am / Registered at: Amtsgericht Stendal (HRB 114076) Geschaeftsfuehrer (CEO): Andreas Marx, Guido Habicht, Maik Morgenstern

1 0

[libvirt] (no subject)
by cbley＠av-test.de 12 Oct '12

12 Oct '12

>From 7c2399ae2a65c60203b29ce02b694f80505ffc8c Mon Sep 17 00:00:00 2001 Message-Id: <7c2399ae2a65c60203b29ce02b694f80505ffc8c.1350037981.git.cbley(a)av-test.de> In-Reply-To: <cover.1350037981.git.cbley(a)av-test.de> References: <2DA6F4A3691599408358374D182280F9141CF6(a)xmb-rcd-x04.cisco.com> <cover.1350037981.git.cbley(a)av-test.de> From: cbley(a)av-test.de (Claudio Bley) Date: Thu, 23 Aug 2012 14:51:28 +0200 Subject: [PATCH 11/15] Avoid unnecessary copying and calling virResetLastError. To: libvir-list(a)redhat.com Organization: AV-Test GmbH, Germany Just use virGetLastError instead of virCopyLastError. Calling virResetLastError is unnecessary because every public libvirt function will first reset the error when being called. --- src/main/java/org/libvirt/ErrorHandler.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/libvirt/ErrorHandler.java b/src/main/java/org/libvirt/ErrorHandler.java index 543829e..4dd7c90 100644 --- a/src/main/java/org/libvirt/ErrorHandler.java +++ b/src/main/java/org/libvirt/ErrorHandler.java @@ -20,14 +20,11 @@ public class ErrorHandler { * @throws LibvirtException */ public static void processError(Libvirt libvirt) throws LibvirtException { - virError vError = new virError(); - int errorCode = libvirt.virCopyLastError(vError); - if (errorCode > 0) { + virError vError = libvirt.virGetLastError(); + if (vError != null) { Error error = new Error(vError); - libvirt.virResetLastError(); /* - * FIXME: Don't throw exceptions for VIR_ERR_WARNING - * level errors + * Don't throw exceptions for VIR_ERR_WARNING level errors */ if (error.getLevel() == Error.ErrorLevel.VIR_ERR_ERROR) { throw new LibvirtException(error); -- AV-Test GmbH, Henricistraße 20, 04155 Leipzig, Germany Phone: +49 341 265 310 19 Web:<http://www.av-test.org> Eingetragen am / Registered at: Amtsgericht Stendal (HRB 114076) Geschaeftsfuehrer (CEO): Andreas Marx, Guido Habicht, Maik Morgenstern

1 0

[libvirt] (no subject)
by cbley＠av-test.de 12 Oct '12

12 Oct '12

>From af35ffd9f22c16f6162ec814f0acd93daeb94adf Mon Sep 17 00:00:00 2001 Message-Id: <af35ffd9f22c16f6162ec814f0acd93daeb94adf.1350037981.git.cbley(a)av-test.de> In-Reply-To: <cover.1350037981.git.cbley(a)av-test.de> References: <2DA6F4A3691599408358374D182280F9141CF6(a)xmb-rcd-x04.cisco.com> <cover.1350037981.git.cbley(a)av-test.de> From: cbley(a)av-test.de (Claudio Bley) Date: Fri, 17 Aug 2012 14:50:44 +0200 Subject: [PATCH 04/15] Make finalize() methods protected. To: libvir-list(a)redhat.com Organization: AV-Test GmbH, Germany Reported by findbugs: Finalizer should be protected, not public A class's finalize() method should have protected access, not public. Bug kind and pattern: FI - FI_PUBLIC_SHOULD_BE_PROTECTED --- src/main/java/org/libvirt/Connect.java | 2 +- src/main/java/org/libvirt/Device.java | 2 +- src/main/java/org/libvirt/Domain.java | 2 +- src/main/java/org/libvirt/DomainSnapshot.java | 2 +- src/main/java/org/libvirt/Interface.java | 2 +- src/main/java/org/libvirt/Network.java | 2 +- src/main/java/org/libvirt/NetworkFilter.java | 2 +- src/main/java/org/libvirt/Secret.java | 2 +- src/main/java/org/libvirt/StoragePool.java | 2 +- src/main/java/org/libvirt/StorageVol.java | 2 +- src/main/java/org/libvirt/Stream.java | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/libvirt/Connect.java b/src/main/java/org/libvirt/Connect.java index 0a94976..5419e85 100644 --- a/src/main/java/org/libvirt/Connect.java +++ b/src/main/java/org/libvirt/Connect.java @@ -533,7 +533,7 @@ public class Connect { } @Override - public void finalize() throws LibvirtException { + protected void finalize() throws LibvirtException { close(); } diff --git a/src/main/java/org/libvirt/Device.java b/src/main/java/org/libvirt/Device.java index 8a52e81..bc25258 100644 --- a/src/main/java/org/libvirt/Device.java +++ b/src/main/java/org/libvirt/Device.java @@ -68,7 +68,7 @@ public class Device { } @Override - public void finalize() throws LibvirtException { + protected void finalize() throws LibvirtException { free(); } diff --git a/src/main/java/org/libvirt/Domain.java b/src/main/java/org/libvirt/Domain.java index fc1f665..f4f5225 100644 --- a/src/main/java/org/libvirt/Domain.java +++ b/src/main/java/org/libvirt/Domain.java @@ -284,7 +284,7 @@ public class Domain { } @Override - public void finalize() throws LibvirtException { + protected void finalize() throws LibvirtException { free(); } diff --git a/src/main/java/org/libvirt/DomainSnapshot.java b/src/main/java/org/libvirt/DomainSnapshot.java index add6830..3083ca0 100644 --- a/src/main/java/org/libvirt/DomainSnapshot.java +++ b/src/main/java/org/libvirt/DomainSnapshot.java @@ -49,7 +49,7 @@ public class DomainSnapshot { } @Override - public void finalize() throws LibvirtException { + protected void finalize() throws LibvirtException { free(); } diff --git a/src/main/java/org/libvirt/Interface.java b/src/main/java/org/libvirt/Interface.java index 1ae8b94..17c189d 100644 --- a/src/main/java/org/libvirt/Interface.java +++ b/src/main/java/org/libvirt/Interface.java @@ -68,7 +68,7 @@ public class Interface { } @Override - public void finalize() throws LibvirtException { + protected void finalize() throws LibvirtException { free(); } diff --git a/src/main/java/org/libvirt/Network.java b/src/main/java/org/libvirt/Network.java index 9684cb4..acaef0e 100644 --- a/src/main/java/org/libvirt/Network.java +++ b/src/main/java/org/libvirt/Network.java @@ -65,7 +65,7 @@ public class Network { } @Override - public void finalize() throws LibvirtException { + protected void finalize() throws LibvirtException { free(); } diff --git a/src/main/java/org/libvirt/NetworkFilter.java b/src/main/java/org/libvirt/NetworkFilter.java index 016cf1a..7bc07a5 100644 --- a/src/main/java/org/libvirt/NetworkFilter.java +++ b/src/main/java/org/libvirt/NetworkFilter.java @@ -28,7 +28,7 @@ public class NetworkFilter { } @Override - public void finalize() throws LibvirtException { + protected void finalize() throws LibvirtException { free(); } diff --git a/src/main/java/org/libvirt/Secret.java b/src/main/java/org/libvirt/Secret.java index febd75b..888cdf3 100644 --- a/src/main/java/org/libvirt/Secret.java +++ b/src/main/java/org/libvirt/Secret.java @@ -36,7 +36,7 @@ public class Secret { } @Override - public void finalize() throws LibvirtException { + protected void finalize() throws LibvirtException { free(); } diff --git a/src/main/java/org/libvirt/StoragePool.java b/src/main/java/org/libvirt/StoragePool.java index 0328d8c..29a18ed 100644 --- a/src/main/java/org/libvirt/StoragePool.java +++ b/src/main/java/org/libvirt/StoragePool.java @@ -116,7 +116,7 @@ public class StoragePool { } @Override - public void finalize() throws LibvirtException { + protected void finalize() throws LibvirtException { free(); } diff --git a/src/main/java/org/libvirt/StorageVol.java b/src/main/java/org/libvirt/StorageVol.java index 1bed6e1..e2bc717 100644 --- a/src/main/java/org/libvirt/StorageVol.java +++ b/src/main/java/org/libvirt/StorageVol.java @@ -76,7 +76,7 @@ public class StorageVol { } @Override - public void finalize() throws LibvirtException { + protected void finalize() throws LibvirtException { free(); } diff --git a/src/main/java/org/libvirt/Stream.java b/src/main/java/org/libvirt/Stream.java index 6374567..0056a78 100644 --- a/src/main/java/org/libvirt/Stream.java +++ b/src/main/java/org/libvirt/Stream.java @@ -61,7 +61,7 @@ public class Stream { } @Override - public void finalize() throws LibvirtException { + protected void finalize() throws LibvirtException { free(); } -- AV-Test GmbH, Henricistraße 20, 04155 Leipzig, Germany Phone: +49 341 265 310 19 Web:<http://www.av-test.org> Eingetragen am / Registered at: Amtsgericht Stendal (HRB 114076) Geschaeftsfuehrer (CEO): Andreas Marx, Guido Habicht, Maik Morgenstern

1 0

[libvirt] (no subject)
by cbley＠av-test.de 12 Oct '12

12 Oct '12

>From ed6209290f9f2d03b26705ca3f9c03eb40309a94 Mon Sep 17 00:00:00 2001 Message-Id: <ed6209290f9f2d03b26705ca3f9c03eb40309a94.1350037981.git.cbley(a)av-test.de> In-Reply-To: <cover.1350037981.git.cbley(a)av-test.de> References: <2DA6F4A3691599408358374D182280F9141CF6(a)xmb-rcd-x04.cisco.com> <cover.1350037981.git.cbley(a)av-test.de> From: cbley(a)av-test.de (Claudio Bley) Date: Tue, 21 Aug 2012 16:31:12 +0200 Subject: [PATCH 09/15] Split JUnit tests and use a fixture for Connect. To: libvir-list(a)redhat.com Organization: AV-Test GmbH, Germany The tests have been separated into a test case requiring a libvirt connection and a test case which does not. Every test gets a new Connect instance by using a fixture. This avoids duplicate code and makes tests more consistent. --- build.xml | 9 ++-- src/test/java/org/libvirt/TestJavaBindings.java | 47 +++++++++++---------- src/test/java/org/libvirt/TestLibvirtGlobals.java | 21 +++++++++ 3 files changed, 51 insertions(+), 26 deletions(-) diff --git a/build.xml b/build.xml index 0b147b0..4b73562 100644 --- a/build.xml +++ b/build.xml @@ -49,11 +49,14 @@ </target> <target name="test" depends="build" description="tests the code"> - <junit printsummary="yes" fork="yes"> + <junit printsummary="yes" fork="yes" forkMode="perBatch"> <formatter type="plain" /> <classpath refid="test.classpath" /> - <test name="org.libvirt.TestJavaBindings" outfile="target/testResults"> - </test> + <batchtest todir="target"> + <fileset dir="src/test/java"> + <include name="**/Test*.java" /> + </fileset> + </batchtest> </junit> </target> diff --git a/src/test/java/org/libvirt/TestJavaBindings.java b/src/test/java/org/libvirt/TestJavaBindings.java index bac7a82..55ca64b 100644 --- a/src/test/java/org/libvirt/TestJavaBindings.java +++ b/src/test/java/org/libvirt/TestJavaBindings.java @@ -4,28 +4,35 @@ import java.util.UUID; import junit.framework.TestCase; -public class TestJavaBindings extends TestCase { - - int UUIDArray[] = { Integer.decode("0x00"), Integer.decode("0x4b"), Integer.decode("0x96"), Integer.decode("0xe1"), +public final class TestJavaBindings extends TestCase { + final int UUIDArray[] = { Integer.decode("0x00"), Integer.decode("0x4b"), Integer.decode("0x96"), Integer.decode("0xe1"), Integer.decode("0x2d"), Integer.decode("0x78"), Integer.decode("0xc3"), Integer.decode("0x0f"), Integer.decode("0x5a"), Integer.decode("0xa5"), Integer.decode("0xf0"), Integer.decode("0x3c"), Integer.decode("0x87"), Integer.decode("0xd2"), Integer.decode("0x1e"), Integer.decode("0x67") }; - public void testErrorCallback() throws Exception { + private Connect conn; + + protected void setUp() throws LibvirtException { + conn = new Connect("test:///default", false); + } + + protected void tearDown() throws LibvirtException { + conn.close(); + conn = null; + } + + public void testConnectionErrorCallback() throws LibvirtException { DummyErrorCallback cb = new DummyErrorCallback(); - Connect.setErrorCallback(cb); + conn.setConnectionErrorCallback(cb); + try { - Connect conn = new Connect("test:///someUrl", false); - } catch (Exception e) { - // eat it - } - assertTrue("We should have caught an error", cb.error); - Connect conn = new Connect("test:///default", false); - conn.setConnectionErrorCallback(cb) ; + conn.domainDefineXML("fail, miserably"); + } catch (LibvirtException e) {} // ignore + + assertTrue("Error callback was not called", cb.error); } public void testConnection() throws Exception { - Connect conn = new Connect("test:///default", false); assertEquals("conn.getType()", "Test", conn.getType()); assertEquals("conn.getURI()", "test:///default", conn.getURI()); assertEquals("conn.getMaxVcpus(xen)", 32, conn.getMaxVcpus("xen")); @@ -39,7 +46,6 @@ public class TestJavaBindings extends TestCase { } public void testNodeInfo() throws Exception { - Connect conn = new Connect("test:///default", false); NodeInfo nodeInfo = conn.nodeInfo(); assertEquals("nodeInfo.model", "i686", nodeInfo.model); assertEquals("nodeInfo.memory", 3145728, nodeInfo.memory); @@ -56,8 +62,6 @@ public class TestJavaBindings extends TestCase { } public void testNetworkCreate() throws Exception { - Connect conn = new Connect("test:///default", false); - Network network1 = conn.networkCreateXML("<network>" + " <name>createst</name>" + " <uuid>004b96e1-2d78-c30f-5aa5-f03c87d21e68</uuid>" + " <bridge name='createst'/>" + " <forward dev='eth0'/>" + " <ip address='192.168.66.1' netmask='255.255.255.0'>" + " <dhcp>" @@ -103,8 +107,6 @@ public class TestJavaBindings extends TestCase { } public void testDomainCreate() throws Exception { - Connect conn = new Connect("test:///default", false); - Domain dom1 = conn.domainDefineXML("<domain type='test' id='2'>" + " <name>deftest</name>" + " <uuid>004b96e1-2d78-c30f-5aa5-f03c87d21e70</uuid>" + " <memory>8388608</memory>" + " <vcpu>2</vcpu>" + " <os><type arch='i686'>hvm</type></os>" + " <on_reboot>restart</on_reboot>" @@ -129,7 +131,7 @@ public class TestJavaBindings extends TestCase { this.validateDomainData(conn.domainLookupByUUID(UUID.fromString("004b96e1-2d78-c30f-5aa5-f03c87d21e67"))); } - public void validateDomainData(Domain dom) throws Exception { + private void validateDomainData(Domain dom) throws Exception { assertEquals("dom.getName()", "createst", dom.getName()); assertEquals("dom.getMaxMemory()", 8388608, dom.getMaxMemory()); // Not supported by the test driver @@ -162,7 +164,6 @@ public class TestJavaBindings extends TestCase { } public void testInterfaces() throws Exception { - Connect conn = new Connect("test:///default", false); assertEquals("numOfInterfaces:", 1, conn.numOfInterfaces()); assertEquals("numOfInterfaces:", 0, conn.numOfDefinedInterfaces()); assertEquals("listDefinedInterfaces:", "eth1", conn.listInterfaces()[0]); @@ -188,18 +189,18 @@ public class TestJavaBindings extends TestCase { } public void testAccessAfterClose() throws Exception { - Connect conn = new Connect("test:///default", false); conn.close(); assertTrue("conn.isConnected should be false", !conn.isConnected()); + LibvirtException virException = null; try { conn.getHostName(); } catch (LibvirtException e) { - // eat it + virException = e; } + assertNotNull(virException); } public void testStoragePool() throws Exception { - Connect conn = new Connect("test:///default", false); StoragePool pool1 = conn.storagePoolDefineXML("<pool type='dir'>" + " <name>pool1</name>" + " <target>" diff --git a/src/test/java/org/libvirt/TestLibvirtGlobals.java b/src/test/java/org/libvirt/TestLibvirtGlobals.java new file mode 100644 index 0000000..b2b0d9f --- /dev/null +++ b/src/test/java/org/libvirt/TestLibvirtGlobals.java @@ -0,0 +1,21 @@ +package org.libvirt; + +import java.util.UUID; + +import junit.framework.TestCase; + +/** + * libvirt tests not requiring an active connection + */ +public class TestLibvirtGlobals extends TestCase { + public void testErrorCallback() throws Exception { + DummyErrorCallback cb = new DummyErrorCallback(); + Connect.setErrorCallback(cb); + try { + Connect conn = new Connect("test:///someUrl", false); + } catch (LibvirtException e) { + // eat it + } + assertTrue("We should have caught an error", cb.error); + } +} -- AV-Test GmbH, Henricistraße 20, 04155 Leipzig, Germany Phone: +49 341 265 310 19 Web:<http://www.av-test.org> Eingetragen am / Registered at: Amtsgericht Stendal (HRB 114076) Geschaeftsfuehrer (CEO): Andreas Marx, Guido Habicht, Maik Morgenstern

1 0

[libvirt] (no subject)
by cbley＠av-test.de 12 Oct '12

12 Oct '12

>From 285e443aa24cde2324380ebeac83c97efc456f94 Mon Sep 17 00:00:00 2001 Message-Id: <285e443aa24cde2324380ebeac83c97efc456f94.1350037981.git.cbley(a)av-test.de> In-Reply-To: <cover.1350037981.git.cbley(a)av-test.de> References: <2DA6F4A3691599408358374D182280F9141CF6(a)xmb-rcd-x04.cisco.com> <cover.1350037981.git.cbley(a)av-test.de> From: cbley(a)av-test.de (Claudio Bley) Date: Thu, 11 Oct 2012 14:58:57 +0200 Subject: [PATCH 15/15] Explicitely define the order of a struct's fields. To: libvir-list(a)redhat.com Organization: AV-Test GmbH, Germany The latest JNA version requires us to define the order of the fields in a struct explicitely because the JVM does not guarantee the order of the fields returned by Class.getFields(). --- src/main/java/org/libvirt/jna/virConnectAuth.java | 10 ++++++++++ .../java/org/libvirt/jna/virConnectCredential.java | 12 ++++++++++++ .../java/org/libvirt/jna/virDomainBlockInfo.java | 8 ++++++++ .../java/org/libvirt/jna/virDomainBlockStats.java | 11 +++++++++++ src/main/java/org/libvirt/jna/virDomainInfo.java | 11 +++++++++++ .../org/libvirt/jna/virDomainInterfaceStats.java | 13 +++++++++++++ .../java/org/libvirt/jna/virDomainJobInfo.java | 18 ++++++++++++++++++ .../java/org/libvirt/jna/virDomainMemoryStats.java | 7 +++++++ src/main/java/org/libvirt/jna/virError.java | 19 +++++++++++++++++++ src/main/java/org/libvirt/jna/virNodeInfo.java | 15 +++++++++++++++ .../java/org/libvirt/jna/virSchedParameter.java | 9 +++++++++ .../java/org/libvirt/jna/virStoragePoolInfo.java | 10 ++++++++++ .../java/org/libvirt/jna/virStorageVolInfo.java | 8 ++++++++ src/main/java/org/libvirt/jna/virVcpuInfo.java | 9 +++++++++ 14 files changed, 160 insertions(+) diff --git a/src/main/java/org/libvirt/jna/virConnectAuth.java b/src/main/java/org/libvirt/jna/virConnectAuth.java index 74dd65c..f805b89 100644 --- a/src/main/java/org/libvirt/jna/virConnectAuth.java +++ b/src/main/java/org/libvirt/jna/virConnectAuth.java @@ -3,6 +3,9 @@ package org.libvirt.jna; import com.sun.jna.Pointer; import com.sun.jna.Structure; +import java.util.List; +import java.util.Arrays; + /** * JNA mapping for the virConnectAuth structure */ @@ -11,4 +14,11 @@ public class virConnectAuth extends Structure { public int ncredtype; public Libvirt.VirConnectAuthCallback cb; public Pointer cbdata; + + protected List getFieldOrder() { + return Arrays.asList("credtype", + "ncredtype", + "cb", + "cbdata"); + } } diff --git a/src/main/java/org/libvirt/jna/virConnectCredential.java b/src/main/java/org/libvirt/jna/virConnectCredential.java index ba47482..7a750d1 100644 --- a/src/main/java/org/libvirt/jna/virConnectCredential.java +++ b/src/main/java/org/libvirt/jna/virConnectCredential.java @@ -2,6 +2,9 @@ package org.libvirt.jna; import com.sun.jna.Structure; +import java.util.List; +import java.util.Arrays; + /** * JNA mapping for the virConnectCredential structure */ @@ -13,4 +16,13 @@ public class virConnectCredential extends Structure implements Structure.ByRefer // public Pointer result; public String result; public int resultlen; + + protected List getFieldOrder() { + return Arrays.asList("type", + "prompt", + "challenge", + "defresult", + "result", + "resultlen"); + } } diff --git a/src/main/java/org/libvirt/jna/virDomainBlockInfo.java b/src/main/java/org/libvirt/jna/virDomainBlockInfo.java index 234a381..fdf8bb1 100644 --- a/src/main/java/org/libvirt/jna/virDomainBlockInfo.java +++ b/src/main/java/org/libvirt/jna/virDomainBlockInfo.java @@ -2,9 +2,17 @@ package org.libvirt.jna; import com.sun.jna.Structure; +import java.util.List; +import java.util.Arrays; + public class virDomainBlockInfo extends Structure { public long capacity; public long allocation; public long physical; + protected List getFieldOrder() { + return Arrays.asList("capacity", + "allocation", + "physical"); + } } diff --git a/src/main/java/org/libvirt/jna/virDomainBlockStats.java b/src/main/java/org/libvirt/jna/virDomainBlockStats.java index f29dba0..c7f0d8c 100644 --- a/src/main/java/org/libvirt/jna/virDomainBlockStats.java +++ b/src/main/java/org/libvirt/jna/virDomainBlockStats.java @@ -2,6 +2,9 @@ package org.libvirt.jna; import com.sun.jna.Structure; +import java.util.List; +import java.util.Arrays; + /** * JNA mapping for the virDomainBlockStats structure */ @@ -16,4 +19,12 @@ public class virDomainBlockStats extends Structure { // is correct public long errs; // this is a long long in the code, so a long mapping is // correct + + protected List getFieldOrder() { + return Arrays.asList("rd_req", + "rd_bytes", + "wr_req", + "wr_bytes", + "errs"); + } } diff --git a/src/main/java/org/libvirt/jna/virDomainInfo.java b/src/main/java/org/libvirt/jna/virDomainInfo.java index a93c0a5..8525f37 100644 --- a/src/main/java/org/libvirt/jna/virDomainInfo.java +++ b/src/main/java/org/libvirt/jna/virDomainInfo.java @@ -3,6 +3,9 @@ package org.libvirt.jna; import com.sun.jna.NativeLong; import com.sun.jna.Structure; +import java.util.List; +import java.util.Arrays; + /** * JNA mapping for the virDomainInfo structure */ @@ -12,4 +15,12 @@ public class virDomainInfo extends Structure { public NativeLong memory; public short nrVirtCpu; public long cpuTime; + + protected List getFieldOrder() { + return Arrays.asList("state", + "maxMem", + "memory", + "nrVirtCpu", + "cpuTime"); + } } diff --git a/src/main/java/org/libvirt/jna/virDomainInterfaceStats.java b/src/main/java/org/libvirt/jna/virDomainInterfaceStats.java index 1cb0e66..39ceb52 100644 --- a/src/main/java/org/libvirt/jna/virDomainInterfaceStats.java +++ b/src/main/java/org/libvirt/jna/virDomainInterfaceStats.java @@ -2,6 +2,9 @@ package org.libvirt.jna; import com.sun.jna.Structure; +import java.util.List; +import java.util.Arrays; + /** * JNA mapping for the virDomainInterfaceStats structure */ @@ -23,4 +26,14 @@ public class virDomainInterfaceStats extends Structure { public long tx_drop; // this is a long long in the code, so a long mapping // is correct + protected List getFieldOrder() { + return Arrays.asList("rx_bytes", + "rx_packets", + "rx_errs", + "rx_drop", + "tx_bytes", + "tx_packets", + "tx_errs", + "tx_drop"); + } } diff --git a/src/main/java/org/libvirt/jna/virDomainJobInfo.java b/src/main/java/org/libvirt/jna/virDomainJobInfo.java index 98b4f59..f8b63e0 100644 --- a/src/main/java/org/libvirt/jna/virDomainJobInfo.java +++ b/src/main/java/org/libvirt/jna/virDomainJobInfo.java @@ -2,6 +2,9 @@ package org.libvirt.jna; import com.sun.jna.Structure; +import java.util.List; +import java.util.Arrays; + public class virDomainJobInfo extends Structure { public int type; public long timeElapsed; @@ -15,4 +18,19 @@ public class virDomainJobInfo extends Structure { public long fileTotal; public long fileProcessed; public long fileRemaining; + + protected List getFieldOrder() { + return Arrays.asList("type", + "timeElapsed", + "timeRemaining", + "dataTotal", + "dataProcessed", + "dataRemaining", + "memTotal", + "memProcessed", + "memRemaining", + "fileTotal", + "fileProcessed", + "fileRemaining"); + } } diff --git a/src/main/java/org/libvirt/jna/virDomainMemoryStats.java b/src/main/java/org/libvirt/jna/virDomainMemoryStats.java index 7a9f5d2..1d4e075 100644 --- a/src/main/java/org/libvirt/jna/virDomainMemoryStats.java +++ b/src/main/java/org/libvirt/jna/virDomainMemoryStats.java @@ -2,7 +2,14 @@ package org.libvirt.jna; import com.sun.jna.Structure; +import java.util.List; +import java.util.Arrays; + public class virDomainMemoryStats extends Structure { public int tag ; public long val ; + + protected List getFieldOrder() { + return Arrays.asList("tag", "val"); + } } diff --git a/src/main/java/org/libvirt/jna/virError.java b/src/main/java/org/libvirt/jna/virError.java index e2580dd..b3fad6d 100644 --- a/src/main/java/org/libvirt/jna/virError.java +++ b/src/main/java/org/libvirt/jna/virError.java @@ -3,6 +3,9 @@ package org.libvirt.jna; import com.sun.jna.Pointer; import com.sun.jna.Structure; +import java.util.List; +import java.util.Arrays; + /** * JNA mapping for the virError structure */ @@ -19,4 +22,20 @@ public class virError extends Structure { public int int1; public int int2; public NetworkPointer net; + + protected List getFieldOrder() { + return Arrays.asList( + "code", + "domain", + "message", + "level", + "conn", + "dom", + "str1", + "str2", + "str3", + "int1", + "int2", + "net"); + } } diff --git a/src/main/java/org/libvirt/jna/virNodeInfo.java b/src/main/java/org/libvirt/jna/virNodeInfo.java index 532aad9..6f0d002 100644 --- a/src/main/java/org/libvirt/jna/virNodeInfo.java +++ b/src/main/java/org/libvirt/jna/virNodeInfo.java @@ -3,6 +3,9 @@ package org.libvirt.jna; import com.sun.jna.NativeLong; import com.sun.jna.Structure; +import java.util.List; +import java.util.Arrays; + /** * JNA mapping for the virNodeInfo structure */ @@ -21,4 +24,16 @@ public class virNodeInfo extends Structure { public int sockets; public int cores; public int threads; + + protected List getFieldOrder() { + return Arrays.asList( + "model", + "memory", + "cpus", + "mhz", + "nodes", + "sockets", + "cores", + "threads"); + } } \ No newline at end of file diff --git a/src/main/java/org/libvirt/jna/virSchedParameter.java b/src/main/java/org/libvirt/jna/virSchedParameter.java index 0013fff..e213f04 100644 --- a/src/main/java/org/libvirt/jna/virSchedParameter.java +++ b/src/main/java/org/libvirt/jna/virSchedParameter.java @@ -2,6 +2,9 @@ package org.libvirt.jna; import com.sun.jna.Structure; +import java.util.List; +import java.util.Arrays; + /** * JNA mapping for the virSchedParameter structure */ @@ -9,4 +12,10 @@ public class virSchedParameter extends Structure { public byte field[] = new byte[Libvirt.VIR_DOMAIN_SCHED_FIELD_LENGTH]; public int type; public virSchedParameterValue value; + + protected List getFieldOrder() { + return Arrays.asList("field", + "type", + "value"); + } } diff --git a/src/main/java/org/libvirt/jna/virStoragePoolInfo.java b/src/main/java/org/libvirt/jna/virStoragePoolInfo.java index 5a98e08..860b78e 100644 --- a/src/main/java/org/libvirt/jna/virStoragePoolInfo.java +++ b/src/main/java/org/libvirt/jna/virStoragePoolInfo.java @@ -2,6 +2,9 @@ package org.libvirt.jna; import com.sun.jna.Structure; +import java.util.List; +import java.util.Arrays; + /** * JNA mapping for the virStoragePoolInfo structure */ @@ -13,4 +16,11 @@ public class virStoragePoolInfo extends Structure { // mapping is correct public long available; // this is a long long in the code, so a long mapping // is correct + + protected List getFieldOrder() { + return Arrays.asList("state", + "capacity", + "allocation", + "available"); + } } diff --git a/src/main/java/org/libvirt/jna/virStorageVolInfo.java b/src/main/java/org/libvirt/jna/virStorageVolInfo.java index db8a5bd..d07b22e 100644 --- a/src/main/java/org/libvirt/jna/virStorageVolInfo.java +++ b/src/main/java/org/libvirt/jna/virStorageVolInfo.java @@ -2,6 +2,9 @@ package org.libvirt.jna; import com.sun.jna.Structure; +import java.util.List; +import java.util.Arrays; + /** * JNA mapping for the virStorageVolInfo structure */ @@ -12,4 +15,9 @@ public class virStorageVolInfo extends Structure { public long allocation; // this is a long long in the code, so a long // mapping is correct + protected List getFieldOrder() { + return Arrays.asList("type", + "capacity", + "allocation"); + } } \ No newline at end of file diff --git a/src/main/java/org/libvirt/jna/virVcpuInfo.java b/src/main/java/org/libvirt/jna/virVcpuInfo.java index 16f237d..7bf3448 100644 --- a/src/main/java/org/libvirt/jna/virVcpuInfo.java +++ b/src/main/java/org/libvirt/jna/virVcpuInfo.java @@ -2,6 +2,9 @@ package org.libvirt.jna; import com.sun.jna.Structure; +import java.util.List; +import java.util.Arrays; + /** * JNA mapping for the virVcpuInfo structure */ @@ -12,4 +15,10 @@ public class virVcpuInfo extends Structure { // is correct public int cpu; + protected List getFieldOrder() { + return Arrays.asList("number", + "state", + "cpuTime", + "cpu"); + } } -- AV-Test GmbH, Henricistraße 20, 04155 Leipzig, Germany Phone: +49 341 265 310 19 Web:<http://www.av-test.org> Eingetragen am / Registered at: Amtsgericht Stendal (HRB 114076) Geschaeftsfuehrer (CEO): Andreas Marx, Guido Habicht, Maik Morgenstern

1 0

[libvirt] (no subject)
by cbley＠av-test.de 12 Oct '12

12 Oct '12

>From 7c51b39360f49bb06d36abafe68a9e0ca40556ae Mon Sep 17 00:00:00 2001 Message-Id: <7c51b39360f49bb06d36abafe68a9e0ca40556ae.1350037981.git.cbley(a)av-test.de> In-Reply-To: <cover.1350037981.git.cbley(a)av-test.de> References: <2DA6F4A3691599408358374D182280F9141CF6(a)xmb-rcd-x04.cisco.com> <cover.1350037981.git.cbley(a)av-test.de> From: cbley(a)av-test.de (Claudio Bley) Date: Wed, 10 Oct 2012 11:03:34 +0200 Subject: [PATCH 13/15] Fix memory leaks for libvirt functions returning newly allocated memory. To: libvir-list(a)redhat.com Organization: AV-Test GmbH, Germany Use JNA's Native.free() method to free memory. This requires JNA version 3.3.0 or later. Remove virFree from Libvirt interface. --- src/main/java/org/libvirt/Connect.java | 109 ++++++++++++++++++---------- src/main/java/org/libvirt/Domain.java | 24 ++++-- src/main/java/org/libvirt/Interface.java | 10 ++- src/main/java/org/libvirt/Library.java | 62 ++++++++++++++++ src/main/java/org/libvirt/Network.java | 17 ++++- src/main/java/org/libvirt/jna/Libvirt.java | 37 +++++----- 6 files changed, 187 insertions(+), 72 deletions(-) diff --git a/src/main/java/org/libvirt/Connect.java b/src/main/java/org/libvirt/Connect.java index ae306d6..a775ce1 100644 --- a/src/main/java/org/libvirt/Connect.java +++ b/src/main/java/org/libvirt/Connect.java @@ -19,6 +19,7 @@ import static org.libvirt.Library.libvirt; import com.sun.jna.Memory; import com.sun.jna.NativeLong; +import com.sun.jna.Pointer; import com.sun.jna.ptr.LongByReference; /** @@ -510,8 +511,12 @@ public class Connect { * description</a> */ public String getCapabilities() throws LibvirtException { - String returnValue = libvirt.virConnectGetCapabilities(VCP); - return processError(returnValue); + Pointer ptr = processError(libvirt.virConnectGetCapabilities(VCP)); + try { + return Library.getString(ptr); + } finally { + Library.free(ptr); + } } /** @@ -545,7 +550,12 @@ public class Connect { * @throws LibvirtException */ public String getHostName() throws LibvirtException { - return processError(libvirt.virConnectGetHostname(VCP)); + Pointer ptr = processError(libvirt.virConnectGetHostname(VCP)); + try { + return Library.getString(ptr); + } finally { + Library.free(ptr); + } } /** @@ -701,11 +711,13 @@ public class Connect { */ public String[] listDefinedDomains() throws LibvirtException { int maxnames = numOfDefinedDomains(); - String[] names = new String[maxnames]; if (maxnames > 0) { - processError(libvirt.virConnectListDefinedDomains(VCP, names, maxnames)); + final Pointer[] names = new Pointer[maxnames]; + final int n = processError(libvirt.virConnectListDefinedDomains(VCP, names, maxnames)); + return Library.toStringArray(names, n); + } else { + return Library.NO_STRINGS; } - return names; } /** @@ -716,12 +728,14 @@ public class Connect { * @throws LibvirtException */ public String[] listDefinedInterfaces() throws LibvirtException { - int num = numOfDefinedInterfaces(); - String[] returnValue = new String[num]; - if (num > 0) { - processError(libvirt.virConnectListDefinedInterfaces(VCP, returnValue, num)); + final int max = numOfDefinedInterfaces(); + if (max > 0) { + final Pointer[] ifs = new Pointer[max]; + final int n = processError(libvirt.virConnectListDefinedInterfaces(VCP, ifs, max)); + return Library.toStringArray(ifs, n); + } else { + return Library.NO_STRINGS; } - return returnValue; } /** @@ -733,12 +747,13 @@ public class Connect { */ public String[] listDefinedNetworks() throws LibvirtException { int maxnames = numOfDefinedNetworks(); - String[] names = new String[maxnames]; - if (maxnames > 0) { - processError(libvirt.virConnectListDefinedNetworks(VCP, names, maxnames)); + final Pointer[] names = new Pointer[maxnames]; + final int n = processError(libvirt.virConnectListDefinedNetworks(VCP, names, maxnames)); + return Library.toStringArray(names, n); + } else { + return Library.NO_STRINGS; } - return names; } /** @@ -750,9 +765,13 @@ public class Connect { */ public String[] listDefinedStoragePools() throws LibvirtException { int num = numOfDefinedStoragePools(); - String[] returnValue = new String[num]; - processError(libvirt.virConnectListDefinedStoragePools(VCP, returnValue, num)); - return returnValue; + if (num > 0) { + Pointer[] pools = new Pointer[num]; + final int n = processError(libvirt.virConnectListDefinedStoragePools(VCP, pools, num)); + return Library.toStringArray(pools, n); + } else { + return Library.NO_STRINGS; + } } /** @@ -763,12 +782,13 @@ public class Connect { */ public String[] listDevices(String capabilityName) throws LibvirtException { int maxDevices = numOfDevices(capabilityName); - String[] names = new String[maxDevices]; - if (maxDevices > 0) { - processError(libvirt.virNodeListDevices(VCP, capabilityName, names, maxDevices, 0)); + Pointer[] names = new Pointer[maxDevices]; + final int n = processError(libvirt.virNodeListDevices(VCP, capabilityName, names, maxDevices, 0)); + return Library.toStringArray(names, n); + } else { + return Library.NO_STRINGS; } - return names; } /** @@ -796,11 +816,13 @@ public class Connect { */ public String[] listInterfaces() throws LibvirtException { int num = numOfInterfaces(); - String[] returnValue = new String[num]; if (num > 0) { - processError(libvirt.virConnectListInterfaces(VCP, returnValue, num)); + Pointer[] ifs = new Pointer[num]; + final int n = processError(libvirt.virConnectListInterfaces(VCP, ifs, num)); + return Library.toStringArray(ifs, n); + } else { + return Library.NO_STRINGS; } - return returnValue; } /** @@ -811,11 +833,13 @@ public class Connect { */ public String[] listNetworkFilters() throws LibvirtException { int maxnames = numOfNetworkFilters(); - String[] names = new String[maxnames]; if (maxnames > 0) { - processError(libvirt.virConnectListNWFilters(VCP, names, maxnames)); + Pointer[] names = new Pointer[maxnames]; + final int n = processError(libvirt.virConnectListNWFilters(VCP, names, maxnames)); + return Library.toStringArray(names, n); + } else { + return Library.NO_STRINGS; } - return names; } /** @@ -827,12 +851,13 @@ public class Connect { */ public String[] listNetworks() throws LibvirtException { int maxnames = numOfNetworks(); - String[] names = new String[maxnames]; - if (maxnames > 0) { - processError(libvirt.virConnectListNetworks(VCP, names, maxnames)); + Pointer[] names = new Pointer[maxnames]; + final int n = processError(libvirt.virConnectListNetworks(VCP, names, maxnames)); + return Library.toStringArray(names, n); + } else { + return Library.NO_STRINGS; } - return names; } /** @@ -843,9 +868,13 @@ public class Connect { */ public String[] listSecrets() throws LibvirtException { int num = numOfSecrets(); - String[] returnValue = new String[num]; - processError(libvirt.virConnectListSecrets(VCP, returnValue, num)); - return returnValue; + if (num > 0) { + Pointer[] returnValue = new Pointer[num]; + final int n = processError(libvirt.virConnectListSecrets(VCP, returnValue, num)); + return Library.toStringArray(returnValue, n); + } else { + return Library.NO_STRINGS; + } } /** @@ -857,9 +886,13 @@ public class Connect { */ public String[] listStoragePools() throws LibvirtException { int num = numOfStoragePools(); - String[] returnValue = new String[num]; - processError(libvirt.virConnectListStoragePools(VCP, returnValue, num)); - return returnValue; + if (num > 0) { + Pointer[] returnValue = new Pointer[num]; + final int n = processError(libvirt.virConnectListStoragePools(VCP, returnValue, num)); + return Library.toStringArray(returnValue, n); + } else { + return Library.NO_STRINGS; + } } /** diff --git a/src/main/java/org/libvirt/Domain.java b/src/main/java/org/libvirt/Domain.java index 45fba26..1c86bd4 100644 --- a/src/main/java/org/libvirt/Domain.java +++ b/src/main/java/org/libvirt/Domain.java @@ -426,9 +426,13 @@ public class Domain { * @throws LibvirtException */ public String getOSType() throws LibvirtException { - String returnValue = libvirt.virDomainGetOSType(VDP); + Pointer ptr = libvirt.virDomainGetOSType(VDP); processError(); - return returnValue; + try { + return Library.getString(ptr); + } finally { + Library.free(ptr); + } } /** @@ -443,8 +447,8 @@ public class Domain { Pointer pScheduler = libvirt.virDomainGetSchedulerType(VDP, nParams); processError(); if (pScheduler != null) { - String scheduler = pScheduler.getString(0); - libvirt.virFree(new PointerByReference(pScheduler)); + String scheduler = Library.getString(pScheduler); + Library.free(pScheduler); virSchedParameter[] nativeParams = new virSchedParameter[nParams.getValue()]; returnValue = new SchedParameter[nParams.getValue()]; libvirt.virDomainGetSchedulerParameters(VDP, nativeParams, nParams); @@ -472,8 +476,8 @@ public class Domain { Pointer pScheduler = libvirt.virDomainGetSchedulerType(VDP, nParams); processError(); String[] array = new String[1]; - array[0] = pScheduler.getString(0); - libvirt.virFree(new PointerByReference(pScheduler)); + array[0] = Library.getString(pScheduler); + Library.free(pScheduler); return array; } @@ -569,9 +573,13 @@ public class Domain { * Description format </a> */ public String getXMLDesc(int flags) throws LibvirtException { - String returnValue = libvirt.virDomainGetXMLDesc(VDP, flags); + Pointer ptr = libvirt.virDomainGetXMLDesc(VDP, flags); processError(); - return returnValue; + try { + return Library.getString(ptr); + } finally { + Library.free(ptr); + } } /** diff --git a/src/main/java/org/libvirt/Interface.java b/src/main/java/org/libvirt/Interface.java index 684adca..71ba3da 100644 --- a/src/main/java/org/libvirt/Interface.java +++ b/src/main/java/org/libvirt/Interface.java @@ -4,6 +4,8 @@ import org.libvirt.jna.InterfacePointer; import org.libvirt.jna.Libvirt; import static org.libvirt.Library.libvirt; +import com.sun.jna.Pointer; + /** * A device which is attached to a node */ @@ -113,9 +115,13 @@ public class Interface { * @throws LibvirtException */ public String getXMLDescription(int flags) throws LibvirtException { - String xml = libvirt.virInterfaceGetXMLDesc(VIP, flags); + Pointer xml = libvirt.virInterfaceGetXMLDesc(VIP, flags); processError(); - return xml; + try { + return Library.getString(xml); + } finally { + Library.free(xml); + } } /** diff --git a/src/main/java/org/libvirt/Library.java b/src/main/java/org/libvirt/Library.java index 035ed06..0136095 100644 --- a/src/main/java/org/libvirt/Library.java +++ b/src/main/java/org/libvirt/Library.java @@ -2,15 +2,25 @@ package org.libvirt; import org.libvirt.jna.Libvirt; +import com.sun.jna.Native; +import com.sun.jna.Pointer; + /** * This class represents an instance of the JNA mapped libvirt * library. * * The library will get loaded when first accessing this class. + * + * Additionally, this class contains internal methods to ease + * implementing the public API. */ final class Library { final static Libvirt libvirt; + // an empty string array constant + // prefer this over creating empty arrays dynamically. + final static String[] NO_STRINGS = {}; + // Load the native part static { Libvirt.INSTANCE.virInitialize(); @@ -23,4 +33,56 @@ final class Library { } private Library() {} + + /** + * Free memory pointed to by ptr. + */ + static void free(Pointer ptr) { + Native.free(Pointer.nativeValue(ptr)); + Pointer.nativeValue(ptr, 0L); + } + + /** + * Convert the data pointed to by {@code ptr} to a String. + */ + static String getString(Pointer ptr) { + final long len = ptr.indexOf(0, (byte)0); + assert (len != -1): "C-Strings must be \\0 terminated."; + + final byte[] data = ptr.getByteArray(0, (int)len); + try { + return new String(data, "utf-8"); + } catch (java.io.UnsupportedEncodingException e) { + throw new RuntimeException("Libvirt problem: UTF-8 decoding error.", e); + } + } + + /** + * Calls {@link #toStringArray(Pointer[], int)}. + */ + static String[] toStringArray(Pointer[] ptrArr) { + return toStringArray(ptrArr, ptrArr.length); + } + + /** + * Convert the given array of native pointers to "char" in + * UTF-8 encoding to an array of Strings. + * + * \note The memory used by the elements of the original array + * is freed and ptrArr is modified. + */ + static String[] toStringArray(Pointer[] ptrArr, final int size) { + try { + final String[] result = new String[size]; + for (int i = 0; i < size; ++i) { + result[i] = Library.getString(ptrArr[i]); + } + return result; + } finally { + for (int i = 0; i < size; ++i) { + Library.free(ptrArr[i]); + ptrArr[i] = null; + } + } + } } diff --git a/src/main/java/org/libvirt/Network.java b/src/main/java/org/libvirt/Network.java index bdb0d78..2244c5d 100644 --- a/src/main/java/org/libvirt/Network.java +++ b/src/main/java/org/libvirt/Network.java @@ -5,6 +5,7 @@ import org.libvirt.jna.NetworkPointer; import static org.libvirt.Library.libvirt; import com.sun.jna.Native; +import com.sun.jna.Pointer; import com.sun.jna.ptr.IntByReference; /** @@ -105,9 +106,13 @@ public class Network { * @throws LibvirtException */ public String getBridgeName() throws LibvirtException { - String returnValue = libvirt.virNetworkGetBridgeName(VNP); + final Pointer ptr = libvirt.virNetworkGetBridgeName(VNP); processError(); - return returnValue; + try { + return Library.getString(ptr); + } finally { + Library.free(ptr); + } } /** @@ -178,9 +183,13 @@ public class Network { * @throws LibvirtException */ public String getXMLDesc(int flags) throws LibvirtException { - String returnValue = libvirt.virNetworkGetXMLDesc(VNP, flags); + Pointer ptr = libvirt.virNetworkGetXMLDesc(VNP, flags); processError(); - return returnValue; + try { + return Library.getString(ptr); + } finally { + Library.free(ptr); + } } /** diff --git a/src/main/java/org/libvirt/jna/Libvirt.java b/src/main/java/org/libvirt/jna/Libvirt.java index be0de3b..5d2a291 100644 --- a/src/main/java/org/libvirt/jna/Libvirt.java +++ b/src/main/java/org/libvirt/jna/Libvirt.java @@ -56,9 +56,6 @@ import com.sun.jna.ptr.PointerByReference; * */ public interface Libvirt extends Library { - // Memory management - void virFree(PointerByReference ptr); - // Callbacks /** * Callback interface for authorization @@ -126,23 +123,23 @@ public interface Libvirt extends Library { int virConnectIsEncrypted(ConnectionPointer virConnectPtr) ; int virConnectIsSecure(ConnectionPointer virConnectPtr) ; String virConnectFindStoragePoolSources(ConnectionPointer virConnectPtr, String type, String srcSpec, int flags); - String virConnectGetCapabilities(ConnectionPointer virConnectPtr); - String virConnectGetHostname(ConnectionPointer virConnectPtr); + Pointer virConnectGetCapabilities(ConnectionPointer virConnectPtr); + Pointer virConnectGetHostname(ConnectionPointer virConnectPtr); int virConnectGetLibVersion(ConnectionPointer virConnectPtr, LongByReference libVer); int virConnectGetMaxVcpus(ConnectionPointer virConnectPtr, String type); String virConnectGetType(ConnectionPointer virConnectPtr); String virConnectGetURI(ConnectionPointer virConnectPtr); int virConnectGetVersion(ConnectionPointer virConnectPtr, LongByReference hvVer); - int virConnectListDefinedDomains(ConnectionPointer virConnectPtr, String[] name, int maxnames); - int virConnectListDefinedNetworks(ConnectionPointer virConnectPtr, String[] name, int maxnames); - int virConnectListDefinedStoragePools(ConnectionPointer virConnectPtr, String[] names, int maxnames); - int virConnectListDefinedInterfaces(ConnectionPointer virConnectPtr, String[] name, int maxNames); + int virConnectListDefinedDomains(ConnectionPointer virConnectPtr, Pointer[] name, int maxnames); + int virConnectListDefinedNetworks(ConnectionPointer virConnectPtr, Pointer[] name, int maxnames); + int virConnectListDefinedStoragePools(ConnectionPointer virConnectPtr, Pointer[] names, int maxnames); + int virConnectListDefinedInterfaces(ConnectionPointer virConnectPtr, Pointer[] name, int maxNames); int virConnectListDomains(ConnectionPointer virConnectPtr, int[] ids, int maxnames); - int virConnectListInterfaces(ConnectionPointer virConnectPtr, String[] name, int maxNames); - int virConnectListNetworks(ConnectionPointer virConnectPtr, String[] name, int maxnames); - int virConnectListNWFilters(ConnectionPointer virConnectPtr, String[] name, int maxnames); - int virConnectListSecrets(ConnectionPointer virConnectPtr, String[] uids, int maxUids); - int virConnectListStoragePools(ConnectionPointer virConnectPtr, String[] names, int maxnames); + int virConnectListInterfaces(ConnectionPointer virConnectPtr, Pointer[] name, int maxNames); + int virConnectListNetworks(ConnectionPointer virConnectPtr, Pointer[] name, int maxnames); + int virConnectListNWFilters(ConnectionPointer virConnectPtr, Pointer[] name, int maxnames); + int virConnectListSecrets(ConnectionPointer virConnectPtr, Pointer[] uids, int maxUids); + int virConnectListStoragePools(ConnectionPointer virConnectPtr, Pointer[] names, int maxnames); int virConnectNumOfDefinedDomains(ConnectionPointer virConnectPtr); int virConnectNumOfDefinedNetworks(ConnectionPointer virConnectPtr); int virConnectNumOfDefinedInterfaces(ConnectionPointer virConnectPtr); @@ -203,14 +200,14 @@ public interface Libvirt extends Library { NativeLong virDomainGetMaxMemory(DomainPointer virDomainPtr); int virDomainGetMaxVcpus(DomainPointer virDomainPtr); String virDomainGetName(DomainPointer virDomainPtr); - String virDomainGetOSType(DomainPointer virDomainPtr); + Pointer virDomainGetOSType(DomainPointer virDomainPtr); int virDomainGetSchedulerParameters(DomainPointer virDomainPtr, virSchedParameter[] params, IntByReference nparams); Pointer virDomainGetSchedulerType(DomainPointer virDomainPtr, IntByReference nparams); int virDomainGetUUID(DomainPointer virDomainPtr, byte[] uuidString); int virDomainGetUUIDString(DomainPointer virDomainPtr, byte[] uuidString); int virDomainGetVcpus(DomainPointer virDomainPtr, virVcpuInfo[] info, int maxInfo, byte[] cpumaps, int maplen); - String virDomainGetXMLDesc(DomainPointer virDomainPtr, int flags); + Pointer virDomainGetXMLDesc(DomainPointer virDomainPtr, int flags); int virDomainHasCurrentSnapshot(DomainPointer virDomainPtr, int flags); int virDomainHasManagedSaveImage(DomainPointer virDomainPtr, int flags); int virDomainInterfaceStats(DomainPointer virDomainPtr, String path, virDomainInterfaceStats stats, int size); @@ -252,11 +249,11 @@ public interface Libvirt extends Library { int virNetworkDestroy(NetworkPointer virConnectPtr); int virNetworkFree(NetworkPointer virConnectPtr); int virNetworkGetAutostart(NetworkPointer virNetworkPtr, IntByReference value); - String virNetworkGetBridgeName(NetworkPointer virNetworkPtr); + Pointer virNetworkGetBridgeName(NetworkPointer virNetworkPtr); String virNetworkGetName(NetworkPointer virNetworkPtr); int virNetworkGetUUID(NetworkPointer virNetworkPtr, byte[] uuidString); int virNetworkGetUUIDString(NetworkPointer virNetworkPtr, byte[] uuidString); - String virNetworkGetXMLDesc(NetworkPointer virNetworkPtr, int flags); + Pointer virNetworkGetXMLDesc(NetworkPointer virNetworkPtr, int flags); int virNetworkIsActive(NetworkPointer virNetworkPtr); int virNetworkIsPersistent(NetworkPointer virNetworkPtr); NetworkPointer virNetworkLookupByName(ConnectionPointer virConnectPtr, String name); @@ -273,7 +270,7 @@ public interface Libvirt extends Library { // Node/Device functions int virNodeNumOfDevices(ConnectionPointer virConnectPtr, String capabilityName, int flags); - int virNodeListDevices(ConnectionPointer virConnectPtr, String capabilityName, String[] names, int maxnames, + int virNodeListDevices(ConnectionPointer virConnectPtr, String capabilityName, Pointer[] names, int maxnames, int flags); DevicePointer virNodeDeviceLookupByName(ConnectionPointer virConnectPtr, String name); String virNodeDeviceGetName(DevicePointer virDevicePointer); @@ -337,7 +334,7 @@ public interface Libvirt extends Library { int virInterfaceFree(InterfacePointer virDevicePointer); String virInterfaceGetName(InterfacePointer virInterfacePtr); String virInterfaceGetMACString(InterfacePointer virInterfacePtr); - String virInterfaceGetXMLDesc(InterfacePointer virInterfacePtr, int flags); + Pointer virInterfaceGetXMLDesc(InterfacePointer virInterfacePtr, int flags); int virInterfaceIsActive(InterfacePointer virDevicePointer); InterfacePointer virInterfaceLookupByMACString(ConnectionPointer virConnectPtr, String mac); InterfacePointer virInterfaceLookupByName(ConnectionPointer virConnectPtr, String name); -- AV-Test GmbH, Henricistraße 20, 04155 Leipzig, Germany Phone: +49 341 265 310 19 Web:<http://www.av-test.org> Eingetragen am / Registered at: Amtsgericht Stendal (HRB 114076) Geschaeftsfuehrer (CEO): Andreas Marx, Guido Habicht, Maik Morgenstern

1 0

[libvirt] (no subject)
by cbley＠av-test.de 12 Oct '12

12 Oct '12

>From 36816ec8660c0bdf964d8d6e745754382c9f001f Mon Sep 17 00:00:00 2001 Message-Id: <36816ec8660c0bdf964d8d6e745754382c9f001f.1350037981.git.cbley(a)av-test.de> In-Reply-To: <cover.1350037981.git.cbley(a)av-test.de> References: <2DA6F4A3691599408358374D182280F9141CF6(a)xmb-rcd-x04.cisco.com> <cover.1350037981.git.cbley(a)av-test.de> From: cbley(a)av-test.de (Claudio Bley) Date: Thu, 23 Aug 2012 09:36:39 +0200 Subject: [PATCH 10/15] Split "build" target and automatically rebuild out of date files. To: libvir-list(a)redhat.com Organization: AV-Test GmbH, Germany The "build" target was split into these individual targets: "build" (default target) only compiles the main files "jar" packages the main files into a jar "buildtests" compiles the test classes The class files are rebuild when any of their dependent source file changed. --- build.xml | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/build.xml b/build.xml index 4b73562..970b91a 100644 --- a/build.xml +++ b/build.xml @@ -33,6 +33,7 @@ <target name="init"> <mkdir dir="target/classes" /> <mkdir dir="target/testclasses" /> + <mkdir dir="target/cache" /> <copy file="README.in" tofile="README" overwrite="true" filtering="true"> <filterset filtersfile="build.properties" /> </copy> @@ -42,13 +43,27 @@ <delete dir="target" /> </target> - <target name="build" depends="init" description="builds the code and jar files"> - <javac srcdir="src/main/java" debug="${javac.debug}" includes="**/*.java" classpathref="compile.classpath" destdir="target/classes" includeAntRuntime="false" /> - <javac srcdir="src/test/java" debug="${javac.debug}" includes="**/*.java" classpathref="test.classpath" destdir="target/testclasses" includeAntRuntime="false" /> + <target name="jar" description="build the jar" depends="build"> <jar destfile="${jar.file}" basedir="target/classes" /> </target> - <target name="test" depends="build" description="tests the code"> + <target name="buildtests" description="build test classes" depends="build"> + <depend srcdir="src/test/java" + destdir="target/testclasses" + cache="target/cache" + closure="true" /> + <javac srcdir="src/test/java" debug="${javac.debug}" includes="**/*.java" classpathref="test.classpath" destdir="target/testclasses" includeAntRuntime="false" /> + </target> + + <target name="build" depends="init" description="builds the code"> + <depend srcdir="src/main/java" + destdir="target/classes" + cache="target/cache" + closure="true" /> + <javac srcdir="src/main/java" debug="${javac.debug}" includes="**/*.java" classpathref="compile.classpath" destdir="target/classes" includeAntRuntime="false" /> + </target> + + <target name="test" depends="buildtests" description="tests the code"> <junit printsummary="yes" fork="yes" forkMode="perBatch"> <formatter type="plain" /> <classpath refid="test.classpath" /> @@ -81,7 +96,7 @@ </copy> </target> - <target name="deb" depends="build" description="build a debian Debian package"> + <target name="deb" depends="build,jar" description="build a debian Debian package"> <mkdir dir="${debian.pkgdir}/DEBIAN" /> <copy file="debian/control.in" tofile="${debian.controlfile}" overwrite="true" filtering="true"> <filterset filtersfile="build.properties" /> @@ -103,7 +118,7 @@ <rpm specfile="${spec}" command="-ba" topdir="${rpm.topdir}" /> </target> - <target name="maven" depends="build,docs,src" description="publish the maven repo"> + <target name="maven" depends="build,jar,docs,src" description="publish the maven repo"> <mkdir dir="target/repo" /> <get src="http://repo1.maven.org/maven2/org/apache/maven/maven-ant-tasks/2.1.3/maven-…" dest="target/maven-ant-tasks-2.1.3.jar" /> <copy file="pom.xml.in" tofile="target/pom.xml" overwrite="true" filtering="true"> -- AV-Test GmbH, Henricistraße 20, 04155 Leipzig, Germany Phone: +49 341 265 310 19 Web:<http://www.av-test.org> Eingetragen am / Registered at: Amtsgericht Stendal (HRB 114076) Geschaeftsfuehrer (CEO): Andreas Marx, Guido Habicht, Maik Morgenstern

1 0

[libvirt] (no subject)
by cbley＠av-test.de 12 Oct '12

12 Oct '12

>From 017d4d3ade44f117d4a03747fe1b2d9ee5762c0c Mon Sep 17 00:00:00 2001 Message-Id: <017d4d3ade44f117d4a03747fe1b2d9ee5762c0c.1350037981.git.cbley(a)av-test.de> In-Reply-To: <cover.1350037981.git.cbley(a)av-test.de> References: <2DA6F4A3691599408358374D182280F9141CF6(a)xmb-rcd-x04.cisco.com> <cover.1350037981.git.cbley(a)av-test.de> From: cbley(a)av-test.de (Claudio Bley) Date: Fri, 17 Aug 2012 14:47:38 +0200 Subject: [PATCH 03/15] Add findbugs build file for ant. To: libvir-list(a)redhat.com Organization: AV-Test GmbH, Germany This requires a findbugs installation and the findbugs ant library. --- findbugs.xml | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/findbugs.xml b/findbugs.xml new file mode 100644 index 0000000..18d51f2 --- /dev/null +++ b/findbugs.xml @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + + + + + + + + + + +<project name="Libvirt Java Bindings - Findbugs" default="findbugs"> +  + <taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" /> + +  + <property name="javac.debug" value="on" /> + + <import file="build.xml"/> + + <property name="findbugs.output" value="text" /> + + <target name="findbugs" depends="build"> + <findbugs home="${findbugs.home}" + output="${findbugs.output}" > + <auxClasspath refid="compile.classpath" /> + <sourcePath path="${basedir}/src/main/java" /> + <class location="${jar.file}" /> + </findbugs> + </target> + +</project> -- AV-Test GmbH, Henricistraße 20, 04155 Leipzig, Germany Phone: +49 341 265 310 19 Web:<http://www.av-test.org> Eingetragen am / Registered at: Amtsgericht Stendal (HRB 114076) Geschaeftsfuehrer (CEO): Andreas Marx, Guido Habicht, Maik Morgenstern

1 0

[libvirt] (no subject)
by cbley＠av-test.de 12 Oct '12

12 Oct '12

>From 6f7b9301dd9983ff9f761e6503cebbdb2d45e750 Mon Sep 17 00:00:00 2001 Message-Id: <6f7b9301dd9983ff9f761e6503cebbdb2d45e750.1350037981.git.cbley(a)av-test.de> In-Reply-To: <cover.1350037981.git.cbley(a)av-test.de> References: <2DA6F4A3691599408358374D182280F9141CF6(a)xmb-rcd-x04.cisco.com> <cover.1350037981.git.cbley(a)av-test.de> From: cbley(a)av-test.de (Claudio Bley) Date: Wed, 10 Oct 2012 11:23:14 +0200 Subject: [PATCH 14/15] Remove functions not intended to be used by libvirt bindings. To: libvir-list(a)redhat.com Organization: AV-Test GmbH, Germany This affects virSecretGetConnect, virNetworkGetConnect and virDomainGetConnect. The libvirt API documentation has this to say about those functions: WARNING: When writing libvirt bindings in other languages, do not use this function. Instead, store the connection and the ... object together. --- src/main/java/org/libvirt/Connect.java | 39 ----------------------- src/main/java/org/libvirt/jna/Libvirt.java | 3 -- src/test/java/org/libvirt/TestJavaBindings.java | 3 -- 3 files changed, 45 deletions(-) diff --git a/src/main/java/org/libvirt/Connect.java b/src/main/java/org/libvirt/Connect.java index a775ce1..b3e29be 100644 --- a/src/main/java/org/libvirt/Connect.java +++ b/src/main/java/org/libvirt/Connect.java @@ -31,45 +31,6 @@ import com.sun.jna.ptr.LongByReference; public class Connect { /** - * Creates a new connection object from the domain. If all you want is the - * existing domain's connection, use the getConnection method directly. Thie - * method returns a new connection. - * - * @param domain - * @return a new connection - */ - public static Connect connectionForDomain(Domain domain) { - ConnectionPointer conn = Libvirt.INSTANCE.virDomainGetConnect(domain.VDP); - return new Connect(conn); - } - - /** - * Creates a new connection object from the network. If all you want is the - * existing network's connection, use the getConnection method directly. - * Thie method returns a new connection. - * - * @param network - * @return a new connection - */ - public static Connect connectionForNetwork(Network network) { - ConnectionPointer conn = Libvirt.INSTANCE.virNetworkGetConnect(network.VNP); - return new Connect(conn); - } - - /** - * Creates a new connection object from the network. If all you want is the - * existing network's connection, use the getConnection method directly. - * Thie method returns a new connection. - * - * @param secret - * @return a new connection - */ - public static Connect connectionForSecret(Secret secret) { - ConnectionPointer conn = Libvirt.INSTANCE.virSecretGetConnect(secret.VSP); - return new Connect(conn); - } - - /** * Get the version of a connection. * * @see <a diff --git a/src/main/java/org/libvirt/jna/Libvirt.java b/src/main/java/org/libvirt/jna/Libvirt.java index 5d2a291..87979cd 100644 --- a/src/main/java/org/libvirt/jna/Libvirt.java +++ b/src/main/java/org/libvirt/jna/Libvirt.java @@ -192,7 +192,6 @@ public interface Libvirt extends Library { int virDomainDetachDeviceFlags(DomainPointer virDomainPtr, String deviceXML, int flags); int virDomainFree(DomainPointer virDomainPtr); int virDomainGetAutostart(DomainPointer virDomainPtr, IntByReference value); - ConnectionPointer virDomainGetConnect(DomainPointer virDomainPtr); int virDomainGetBlockInfo(DomainPointer virDomainPtr, String path, virDomainBlockInfo info, int flags); int virDomainGetID(DomainPointer virDomainPtr); int virDomainGetInfo(DomainPointer virDomainPtr, virDomainInfo vInfo); @@ -242,7 +241,6 @@ public interface Libvirt extends Library { int virDomainUndefine(DomainPointer virDomainPtr); // Network functions - ConnectionPointer virNetworkGetConnect(NetworkPointer virnetworkPtr); int virNetworkCreate(NetworkPointer virConnectPtr); NetworkPointer virNetworkCreateXML(ConnectionPointer virConnectPtr, String xmlDesc); NetworkPointer virNetworkDefineXML(ConnectionPointer virConnectPtr, String xmlDesc); @@ -341,7 +339,6 @@ public interface Libvirt extends Library { int virInterfaceUndefine(InterfacePointer virDevicePointer); // Secret Methods - ConnectionPointer virSecretGetConnect(SecretPointer virSecretPtr); int virSecretFree(SecretPointer virSecretPtr); SecretPointer virSecretDefineXML(ConnectionPointer virConnectPtr, String xml, int flags); int virSecretGetUUID(SecretPointer virSecretPtr, byte[] uuidString); diff --git a/src/test/java/org/libvirt/TestJavaBindings.java b/src/test/java/org/libvirt/TestJavaBindings.java index 55ca64b..bba4cdb 100644 --- a/src/test/java/org/libvirt/TestJavaBindings.java +++ b/src/test/java/org/libvirt/TestJavaBindings.java @@ -158,9 +158,6 @@ public final class TestJavaBindings extends TestCase { dom.setSchedulerParameters(pars); dom.getSchedulerParameters() ; - - assertNotNull(Connect.connectionForDomain(dom)); - assertTrue(Connect.connectionForDomain(dom) != dom.getConnect()); } public void testInterfaces() throws Exception { -- AV-Test GmbH, Henricistraße 20, 04155 Leipzig, Germany Phone: +49 341 265 310 19 Web:<http://www.av-test.org> Eingetragen am / Registered at: Amtsgericht Stendal (HRB 114076) Geschaeftsfuehrer (CEO): Andreas Marx, Guido Habicht, Maik Morgenstern

1 0

[libvirt] [PATCH] conf: Mark missing optional USB devices in domain XML
by Jiri Denemark 12 Oct '12

12 Oct '12

When startupPolicy set for a USB devices allows such device to be missing, there was no way this could be detected from domain XML. With this patch, libvirt emits a new missing='yes' attribute for such devices when active domain XML is generated. --- docs/schemas/domaincommon.rng | 8 ++++++++ src/conf/domain_conf.c | 5 +++++ 2 files changed, 13 insertions(+) diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index b142716..70bc0e2 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -1654,6 +1654,14 @@ </optional> <interleave> <element name="source"> + <optional> + <attribute name="missing"> + <choice> + <value>yes</value> + <value>no</value> + </choice> + </attribute> + </optional> <choice> <group> <ref name="usbproduct"/> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 1eda551..a2971cd 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -12102,6 +12102,11 @@ virDomainHostdevSourceFormat(virBufferPtr buf, if (def->source.subsys.u.usb.autoAddress && (flags & VIR_DOMAIN_XML_MIGRATABLE)) virBufferAddLit(buf, " autoAddress='yes'"); + + if (def->missing && + !(flags & VIR_DOMAIN_XML_INACTIVE)) + virBufferAddLit(buf, " missing='yes'"); + virBufferAddLit(buf, ">\n"); virBufferAdjustIndent(buf, 2); -- 1.7.12.3

2 2

[libvirt] [PATCH v2 0/3] command line fd passing using fd sets
by Corey Bryant 12 Oct '12

12 Oct '12

This series adds command line file descriptor passing support via a new -add-fd option. This is a follow-on to the existing QMP fd passing support provided in the following patch series: comments.gmane.org/gmane.comp.emulators.qemu/165463 The new -add-fd option is designed to mirror the add-fd QMP option as much as possible. Corey Bryant (3): monitor: Allow add-fd to any specified fd set monitor: Enable adding an inherited fd to an fd set qemu-config: Add new -add-fd command line option monitor.c | 131 +++++++++++++++++++++++++++++++------------------------ monitor.h | 2 + qapi-schema.json | 1 - qemu-config.c | 22 ++++++++++ qemu-options.hx | 35 +++++++++++++++ vl.c | 36 +++++++++++++++ 6 files changed, 170 insertions(+), 57 deletions(-) -- 1.7.11.4

3 17

[libvirt] [PATCH v1 0/3] libvirt: Implement CPU model driver for PowerPC
by Li Zhang 12 Oct '12

12 Oct '12

CPU model driver is to get host's CPU information and it also provides one mechanism to expose host's CPU information to guests during migration. When migrating one guest from one machine to another machine, it will compare the CPU information. If it is incomptible, it won't start the guest. On x86, it uses CPUID instruction to get information. When migrating the guest, if the CPU defined in guest XML file is incompatible with host CPU, cpu-baseline will find out best features to expose to guest. Refer to [http://berrange.com/posts/2010/02/15 /guest-cpu-model-configuration-in-libvirt-with-qemukvm/]. On PowerPC, it can get CPU version by mfpvr instruction. So, if PVR is different from definition in guest XML file by cpu-compare, it will fail to start guest. The CPU infromation can be got by cpu-baseline. But only CPU vendor and model can be shown, there are no features as x86. So on PowrePC, it assumes that migration only occurs between the machines with the same type CPUs on PowerPC. In this driver, there are definitions of models and PVRs for CPUs supported on PowerPC. The relationship between models and PVRs are as the following: For one specific CPU model, its PVR is unique. And also for one PVR code, the PVR code is also unique. So from the PVR code of CPU data, it's easy to get model and vendor information. It is tested on my Power machine which CPU PVR is Power7_v2.3. * cap.xml has the same definition as the host. [root@ltckvmopal2 kvm-test]# /bin/virsh cpu-compare cap.xml CPU described in cap.xml is identical to host CPU [root@ltckvmopal2 kvm-test]# /bin/virsh cpu-baseline cap.xml <cpu mode='custom' match='exact'> <model fallback='allow'>POWER7_v2.3</model> <vendor>IBM</vendor> </cpu> * cap.xml has differnt model as the host. [root@ltckvmopal2 kvm-test]# /bin/virsh cpu-compare cap.xml CPU described in cap.xml is incompatible with host CPU [root@ltckvmopal2 kvm-test]# /bin/virsh cpu-baseline cap.xml <cpu mode='custom' match='exact'> <model fallback='allow'>POWER7_v2.1</model> <vendor>IBM</vendor> </cpu> *v1 -> v2: * Fix coding style's problems in several places. * Seperate doc-fix from the coding Li Zhang (3): libvirt: Add one file cpu_ppc_data.h to define CPU data for PPC libvirt: Implement CPU model driver for PowerPC Doc-fix for PowerPC CPU model driver src/cpu/cpu.h | 3 + src/cpu/cpu_map.xml | 14 ++ src/cpu/cpu_powerpc.c | 589 ++++++++++++++++++++++++++++++++++++++++++++++-- src/cpu/cpu_ppc_data.h | 33 +++ 4 files changed, 621 insertions(+), 18 deletions(-) create mode 100644 src/cpu/cpu_ppc_data.h -- 1.7.7.6

2 11

[libvirt] [PATCHv7 0/9] blockjob: live block migration
by Eric Blake 12 Oct '12

12 Oct '12

v6 of these patches is here: https://www.redhat.com/archives/libvir-list/2012-April/msg01240.html The 'drive-mirror' command not only missed qemu 1.1 (back when I first posted these patches), but also missed qemu 1.2. Paolo is still working on re-posting his patches to the qemu lists (see patch 2/9 for a link to his previous posting, which has had two months of commentary). I'm still not anxious to have these commands committed to upstream libvirt until 'drive-mirror' is at least in qemu.git rather than just Paolo's tree, but thought it would be worth rebasing the series to track the things that have changed since April. In v7, I've adjusted the series to cater to Paolo's proposed QMP semantics (most of the review on his last patch to the qemu list was on the internals, and not the interface itself), as well as to allow working out-of-the-box with the RHEL 6.3 implementation of block copy. Unfortunately, since Paolo's patches are still in flux, I suspect this will need a v8 that has seen further testing with both upstream qemu.git and RHEL 6.3 git. Eric Blake (9): blockjob: react to active block copy blockjob: add qemu capabilities related to block jobs blockjob: return appropriate event and info blockjob: support pivot operation on cancel blockjob: make drive-reopen safer blockjob: implement block copy for qemu blockjob: allow for existing files blockjob: allow mirroring under SELinux and cgroup blockjob: relabel entire existing chain include/libvirt/libvirt.h.in | 1 + src/conf/domain_conf.c | 12 ++ src/conf/domain_conf.h | 1 + src/libvirt.c | 7 +- src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 2 + src/qemu/qemu_capabilities.h | 2 + src/qemu/qemu_driver.c | 413 ++++++++++++++++++++++++++++++++++++++++++- src/qemu/qemu_hotplug.c | 7 + src/qemu/qemu_monitor.c | 52 ++++++ src/qemu/qemu_monitor.h | 14 ++ src/qemu/qemu_monitor_json.c | 101 ++++++++++- src/qemu/qemu_monitor_json.h | 21 ++- src/qemu/qemu_process.c | 2 + 14 files changed, 625 insertions(+), 11 deletions(-) -- 1.7.11.4

3 18

[libvirt] [PATCH 0/5] udev based backend for virInterface
by Doug Goldstein 12 Oct '12

12 Oct '12

The goal is to provide a read-only virInterface provider when netcf is unavailable. With this patchset it makes virt-manager happy enough that it does not attempt to do anything with HAL to figure out the host's network devices. All patches but 4/5 are really ready for prime time. 4/5 can get merged but it is somewhat incomplete. With regards to bond and devices in a bridge. The patches are all at different versions depending on how many times they've hit the list. Doug Goldstein (5): interface: add udev based backend for virInterface interface: fix netcf based backend naming interface: always build all available backends interface: add virInterfaceGetXMLDesc() in udev interface: add udevIfaceIsActive() to udev backend configure.ac | 18 +- po/POTFILES.in | 1 + src/Makefile.am | 14 +- src/interface/interface_backend_netcf.c | 4 +- src/interface/interface_backend_udev.c | 671 +++++++++++++++++++++++++++++++ src/interface/interface_driver.c | 37 ++ src/interface/interface_driver.h | 3 + tools/virsh.c | 2 + 8 files changed, 734 insertions(+), 16 deletions(-) create mode 100644 src/interface/interface_backend_udev.c create mode 100644 src/interface/interface_driver.c -- 1.7.8.6

3 11

[libvirt] 100+ misspellings
by Jim Meyering 12 Oct '12

12 Oct '12

Hello, In case someone is interested in weeding out the inevitable false positives, here is a slightly filtered list of misspelled words in libvirt, as detected by the misspellings program from here: http://github.com/lyda/misspell-check Here's the output from this command: misspellings $(git ls-files)|grep -vE 'gnulib/|po/|ChangeLog-old' HACKING:456: particulary -> "particularly" configure.ac:1359: presense -> "presence" daemon/libvirtd.conf:254: upto -> "up to" daemon/libvirtd.conf:270: upto -> "up to" daemon/stream.c:692: upto -> "up to" docs/api.html.in:67: garanteed -> "guaranteed" docs/api.html.in:73: garanteed -> "guaranteed" docs/apibuild.py:2476: unkown -> "unknown" docs/apps.html.in:191: upto -> "up to" docs/firewall.html.in:320: managable -> "manageable","manageably" docs/formatdomain.html.in:423: ommitted -> "omitted" docs/hacking.html.in:547: particulary -> "particularly" docs/internals/locking.html.in:153: psuedo -> "pseudo" docs/news.html.in:610: commited -> "committed" docs/news.html.in:1195: dependancy -> "dependency" docs/news.html.in:1459: doesnt -> "doesn't" docs/news.html.in:1570: dependancy -> "dependency" docs/news.html.in:1837: stange -> "strange" docs/news.html.in:1838: dependancy -> "dependency" docs/news.html.in:1892: sucessful -> "successful" docs/news.html.in:1893: sucessful -> "successful" docs/news.html.in:2032: sucessful -> "successful" docs/news.html.in:2472: orginal -> "original" docs/news.html.in:2628: statment -> "statement" docs/news.html.in:2793: controling -> "controlling" docs/news.html.in:3912: Seperate -> "Separate" docs/news.html.in:5025: occurence -> "occurrence" docs/news.html.in:5592: Explictly -> "Explicitly" docs/news.html.in:6508: beeing -> "being" docs/news.html.in:7158: adressing -> "addressing","dressing" docs/news.html.in:7483: Supress -> "Suppress" docs/news.html.in:7542: occurence -> "occurrence" docs/news.html.in:7551: sucess -> "success" docs/news.html.in:7825: neccessary -> "necessary" docs/news.html.in:7902: Occurence -> "Occurrence" docs/news.html.in:7902: occurences -> "occurrences" docs/news.html.in:8472: wierd -> "weird" docs/news.html.in:8535: accomodate -> "accommodate" docs/news.html.in:8598: dependancy -> "dependency" docs/news.html.in:9008: dependancy -> "dependency" docs/news.html.in:9306: dependancy -> "dependency" docs/news.html.in:9324: dependance -> "dependence" docs/news.html.in:9520: extention -> "extension" docs/news.html.in:9587: dependance -> "dependence" docs/remote.html.in:359: agains -> "against" docs/schemas/interface.rng:7: everytime -> "every time" docs/schemas/interface.rng:175: grat -> "great" examples/domain-events/events-python/event-test.py:129: occurr -> "occur" examples/domain-events/events-python/event-test.py:172: upto -> "up to" examples/python/dominfo.py:46: runing -> "running" include/libvirt/libvirt.h.in:642: targetting -> "targeting" include/libvirt/libvirt.h.in:2935: specfic -> "specific" include/libvirt/libvirt.h.in:3207: upto -> "up to" include/libvirt/libvirt.h.in:3639: occuring -> "occurring" src/conf/domain_conf.c:4565: Unkown -> "Unknown" src/conf/domain_conf.c:4933: Unkown -> "Unknown" src/conf/domain_conf.c:6914: Wierd -> "Weird" src/conf/nwfilter_conf.c:2804: definiton -> "definition" src/internal.h:114: conciously -> "consciously" src/libvirt.c:3083: transfered -> "transferred" src/libvirt.c:4390: dependant -> "dependent" src/libvirt.c:4441: dependant -> "dependent" src/libvirt.c:11461: upto -> "up to" src/libvirt.c:11544: upto -> "up to" src/libvirt.c:14119: funtion -> "function" src/libvirt.c:14542: dependant -> "dependent" src/libvirt_internal.h:2: publically -> "publicly" src/phyp/phyp_driver.c:2067: avaliable -> "available" src/phyp/phyp_driver.c:2290: avaliable -> "available" src/phyp/phyp_driver.c:2770: avaliable -> "available" src/qemu/qemu_capabilities.c:659: existance -> "existence" src/qemu/qemu_capabilities.c:1234: targetting -> "targeting" src/qemu/qemu_conf.c:205: lenght -> "length" src/qemu/qemu_driver.c:1235: calulate -> "calculate" src/qemu/qemu_monitor_text.c:2406: everthing -> "everything" src/qemu/qemu_process.c:2657: pased -> "passed" src/rpc/virnetsaslcontext.c:153: Succesful -> "Successful" src/rpc/virnettlscontext.c:377: Succesful -> "Successful" src/storage/storage_backend_disk.c:536: boundry -> "boundary" src/storage/storage_backend_disk.c:561: boundry -> "boundary" src/storage/storage_backend_disk.c:571: boundry -> "boundary" src/storage/storage_backend_disk.c:620: boundry -> "boundary" src/storage/storage_backend_rbd.c:318: occured -> "occurred" src/uml/uml_driver.c:260: upto -> "up to" src/uml/uml_driver.c:1293: calulate -> "calculate" src/util/cgroup.c:69: HIERACHY -> "Hierarchy" src/util/cgroup.c:172: neccessarily -> "necessarily" src/util/cgroup.c:592: HIERACHY -> "Hierarchy" src/util/cgroup.c:1007: HIERACHY -> "Hierarchy" src/util/cgroup.c:2029: existance -> "existence" src/util/processinfo.c:80: upto -> "up to" src/util/processinfo.c:145: upto -> "up to" src/util/virpidfile.c:369: agin -> "again" src/util/virpidfile.c:378: agin -> "again" src/util/virsocketaddr.c:421: recieve -> "receive" src/util/virsocketaddr.c:451: recieve -> "receive" src/util/virtime.c:105: THRU -> "Through" src/util/virtime.c:162: THRU -> "Through" src/util/virtime.c:163: THRU -> "Through" src/vbox/vbox_tmpl.c:7050: becuase -> "because" src/vbox/vbox_tmpl.c:8748: devide -> "divide" src/vbox/vbox_tmpl.c:9262: persistance -> "persistence" src/xen/xend_internal.c:517: targetting -> "targeting" src/xen/xm_internal.c:177: funtion -> "function" src/xen/xm_internal.c:201: funtion -> "function" src/xen/xm_internal.c:310: funtion -> "function" src/xen/xm_internal.c:386: alot -> "a lot","allot" src/xenxs/xen_sxpr.c:814: Subsquent -> "Subsequent" tests/virnettlscontexttest.c:451: suceeds -> "succeeds" tools/virsh.pod:128: specfic -> "specific" tools/virsh.pod:597: folowing -> "following" tools/virsh.pod:2293: occurr -> "occur" tools/virsh.pod:2537: preceed -> "precede"

4 4

[libvirt] libvirt support for dhcp6 .. not time soon
by Gene Czarcinski 11 Oct '12

11 Oct '12

Well, so much for libvirt support for stateful IPv6 addresses (dhcp6). Not with the current design/implementation. The problem is UPD6 server port 547 or rather how it is used. I am not sure what the technical details are yet nor if this is "fixable", but as the situation now stands, there can be only one dhcp6 server on a system. DHCPD6 cannot live with dnsmasq and dnsmasq cannot live with another dnsmasq ... first one started grabs the port and the others die because they cannot get exclusive use. I suppose you could run one dnsmasq which supported all virtual networks but things are going to get messy when virtual networks are started/destroyed/whatever. I kludged together a little patch for libvirt which forced a dhcp-range specification for any net with an ipv6 definition. If anyone has some insight into this, I would appreciate hearing able it. If anyone knew that you could not run two or more dhcp6 servers on the same system, I realy wish that information was more widely known (or obvious). Gene

1 0

[libvirt] Fw:Re:Re: build libvirt error. lack of AppArmor .
by yue 11 Oct '12

11 Oct '12

1.my configure options is "./configure --with-selinux=no --with-secdriver-selinux=no --with-apparmor=no --with-secdriver-apparmor=no --with-init-script=redhat" because i can not start spSP3-guest-OS,infos on the internet tell security-driver should be disabled. i just test it. so --with-XXXXX=no. the second problem is details of my guest-os. 2. /var/log/libvirt/qemu/xpSP3.log. i do not know libvirtd or qemu-kvm which one can not recognize ceph-rbd? --my rbd disk configuration----------- <disk type='network' device='disk'> <driver name='qemu' type='raw'/> <auth username='cloud'> <secret type='ceph' uuid='7a91dc24-b072-43c4-98fb-4b2415322b0f'/> </auth> <source protocol='rbd' name='cloud/testrbd'> <host name='192.168.10.4' port='6789'/> </source> <target dev='vdb' bus='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/> </disk> ---xpSP3.log---------------- LC_ALL=C PATH=/sbin:/usr/sbin:/bin:/usr/bin HOME=/root USER=root LOGNAME=root QEMU_AUDIO_DRV=none /usr/libexec/qemu-kvm -S -M rhel6.2.0 -enable-kvm -m 512 -smp 1,sockets=1,cores=1,threads=1 -name xpSP3 -uuid b45bd66a-6700-4905-c5f4-4c799413d7b7 -nodefconfig -nodefaults -chardev socket,id=charmonitor,path=/var/lib/libvirt/qemu/xpSP3.monitor,server,nowait -mon chardev=charmonitor,id=monitor,mode=control -rtc base=localtime,driftfix=slew -no-shutdown -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 -drive file=/var/lib/libvirt/images/xpSP3.img,if=none,id=drive-ide0-0-0,format=raw,cache=none -device ide-drive,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 -drive file=rbd:cloud/testrbd:id=cloud:key=AQCGbGRQ+M+NGBAATtylZNiSxqCTQ4uaApd+9w==:auth_supported=cephx none:mon_host=192.168.10.4\:6789,if=none,id=drive-ide0-0-1,format=raw -device ide-drive,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 -netdev tap,fd=26,id=hostnet0 -device e1000,netdev=hostnet0,id=net0! ,mac=52:54:00:2a:8c:48,bus=pci.0,addr=0x3 -chardev pty,id=charserial0 -device isa-serial,chardev=charserial0,id=serial0 -device usb-tablet,id=input0 -vnc 0.0.0.0:0 -vga std -device intel-hda,id=sound0,bus=pci.0,addr=0x4 -device hda-duplex,id=sound0-codec0,bus=sound0.0,cad=0 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 Domain id=2 is tainted: high-privileges char device redirected to /dev/pts/4 qemu-kvm: -drive file=rbd:cloud/testrbd:id=cloud:key=AQCGbGRQ+M+NGBAATtylZNiSxqCTQ4uaApd+9w==:auth_supported=cephx none:mon_host=192.168.10.4\:6789,if=none,id=drive-ide0-0-1,format=raw: could not open disk image rbd:cloud/testrbd:id=cloud:key=AQCGbGRQ+M+NGBAATtylZNiSxqCTQ4uaApd+9w==:auth_supported=cephx none:mon_host=192.168.10.4\:6789: No such file or directory At 2012-10-11 05:11:58,"Eric Blake" <eblake(a)redhat.com> wrote: >On 10/10/2012 04:04 AM, yue wrote: >> error occur when attach a rbd-disk to domain. >> >> 1.configure: error: You must install the AppArmor development package in order to compile libvirt > >What command line did you pass to configure? AppArmor is optional (and >in fact, Fedora does not use it); so this message should only be >triggered if you passed an explicit --with-apparmor or >--with-secdriver-apparmor to configure, in which case, yes, then you >need the apparmor devel package. > >> 2. >> 2012-10-10 17:36:16.305+0000: 3808: warning : qemuDomainObjTaint:1297 : Domain id=2 name='xpSP3' uuid=b45bd66a-6700-4905-c5f4-4c799413d7b7 is tainted: high-privileges >> 2012-10-10 17:36:16.712+0000: 3808: error : qemuMonitorOpenUnix:266 : failed to connect to monitor socket: No such process > >This usually means that qemu failed to start; can you check the log file >for that guest (perhaps /var/log/libvirt/qemu/xpSP3.log) to see if there >are more details why? > >-- >Eric Blake eblake(a)redhat.com +1-919-301-3266 >Libvirt virtualization library http://libvirt.org >

1 0

[libvirt] [libvirt-glib v2] gconfig: Add API to set domain/pm tree
by Zeeshan Ali (Khattak) 11 Oct '12

11 Oct '12

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> API for new domain power management configuration. --- libvirt-gconfig/Makefile.am | 2 + .../libvirt-gconfig-domain-power-management.c | 100 +++++++++++++++++++++ .../libvirt-gconfig-domain-power-management.h | 73 +++++++++++++++ libvirt-gconfig/libvirt-gconfig-domain.c | 16 ++++ libvirt-gconfig/libvirt-gconfig-domain.h | 3 + libvirt-gconfig/libvirt-gconfig.h | 1 + libvirt-gconfig/libvirt-gconfig.sym | 11 +++ 7 files changed, 206 insertions(+) create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-power-management.c create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-power-management.h diff --git a/libvirt-gconfig/Makefile.am b/libvirt-gconfig/Makefile.am index 5a80123..caa62f0 100644 --- a/libvirt-gconfig/Makefile.am +++ b/libvirt-gconfig/Makefile.am @@ -50,6 +50,7 @@ GCONFIG_HEADER_FILES = \ libvirt-gconfig-domain-memballoon.h \ libvirt-gconfig-domain-os.h \ libvirt-gconfig-domain-parallel.h \ + libvirt-gconfig-domain-power-management.h \ libvirt-gconfig-domain-redirdev.h \ libvirt-gconfig-domain-seclabel.h \ libvirt-gconfig-domain-serial.h \ @@ -121,6 +122,7 @@ GCONFIG_SOURCE_FILES = \ libvirt-gconfig-domain-memballoon.c \ libvirt-gconfig-domain-os.c \ libvirt-gconfig-domain-parallel.c \ + libvirt-gconfig-domain-power-management.c \ libvirt-gconfig-domain-redirdev.c \ libvirt-gconfig-domain-seclabel.c \ libvirt-gconfig-domain-serial.c \ diff --git a/libvirt-gconfig/libvirt-gconfig-domain-power-management.c b/libvirt-gconfig/libvirt-gconfig-domain-power-management.c new file mode 100644 index 0000000..4bc588d --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-domain-power-management.c @@ -0,0 +1,100 @@ +/* + * libvirt-gconfig-domain-power-management.c: libvirt domain power management configuration + * + * Copyright (C) 2012 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Authors: + * + * Zeeshan Ali (Khattak) <zeeshanak(a)gnome.org> + * Christophe Fergeau <cfergeau(a)redhat.com> + */ + +#include <config.h> + +#include "libvirt-gconfig/libvirt-gconfig.h" +#include "libvirt-gconfig/libvirt-gconfig-private.h" + +#define GVIR_CONFIG_DOMAIN_POWER_MANAGEMENT_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE((obj), \ + GVIR_CONFIG_TYPE_DOMAIN_POWER_MANAGEMENT, \ + GVirConfigDomainPowerManagementPrivate)) + +struct _GVirConfigDomainPowerManagementPrivate +{ + gboolean unused; +}; + +G_DEFINE_TYPE(GVirConfigDomainPowerManagement, + gvir_config_domain_power_management, + GVIR_CONFIG_TYPE_OBJECT); + +static void gvir_config_domain_power_management_class_init + (GVirConfigDomainPowerManagementClass *klass) +{ + g_type_class_add_private(klass, sizeof(GVirConfigDomainPowerManagementPrivate)); +} + + +static void +gvir_config_domain_power_management_init(GVirConfigDomainPowerManagement *pm) +{ + g_debug("Init GVirConfigDomainPowerManagement=%p", pm); + + pm->priv = GVIR_CONFIG_DOMAIN_POWER_MANAGEMENT_GET_PRIVATE(pm); +} + + +GVirConfigDomainPowerManagement *gvir_config_domain_power_management_new(void) +{ + GVirConfigObject *object; + + object = gvir_config_object_new(GVIR_CONFIG_TYPE_DOMAIN_POWER_MANAGEMENT, + "pm", NULL); + return GVIR_CONFIG_DOMAIN_POWER_MANAGEMENT(object); +} + +GVirConfigDomainPowerManagement *gvir_config_domain_power_management_new_from_xml(const gchar *xml, + GError **error) +{ + GVirConfigObject *object; + + object = gvir_config_object_new_from_xml(GVIR_CONFIG_TYPE_DOMAIN_POWER_MANAGEMENT, + "pm", NULL, xml, error); + return GVIR_CONFIG_DOMAIN_POWER_MANAGEMENT(object); +} + +void gvir_config_domain_power_management_set_mem_suspend_enabled(GVirConfigDomainPowerManagement *pm, + gboolean enabled) +{ + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_POWER_MANAGEMENT(pm)); + + gvir_config_object_add_child_with_attribute(GVIR_CONFIG_OBJECT(pm), + "suspend-to-mem", + "enabled", + enabled? "yes" : "no"); +} + +void gvir_config_domain_power_management_set_disk_suspend_enabled(GVirConfigDomainPowerManagement *pm, + gboolean enabled) +{ + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_POWER_MANAGEMENT(pm)); + + gvir_config_object_add_child_with_attribute(GVIR_CONFIG_OBJECT(pm), + "suspend-to-disk", + "enabled", + enabled? "yes" : "no"); +} diff --git a/libvirt-gconfig/libvirt-gconfig-domain-power-management.h b/libvirt-gconfig/libvirt-gconfig-domain-power-management.h new file mode 100644 index 0000000..59dde79 --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-domain-power-management.h @@ -0,0 +1,73 @@ +/* + * libvirt-gconfig-domain-power-management.h: libvirt domain power management configuration + * + * Copyright (C) 2012 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Zeeshan Ali (Khattak) <zeeshanak(a)gnome.org> + * Christophe Fergeau <cfergeau(a)redhat.com> + */ + +#if !defined(__LIBVIRT_GCONFIG_H__) && !defined(LIBVIRT_GCONFIG_BUILD) +#error "Only <libvirt-gconfig/libvirt-gconfig.h> can be included directly." +#endif + +#ifndef __LIBVIRT_GCONFIG_DOMAIN_POWER_MANAGEMENT_H__ +#define __LIBVIRT_GCONFIG_DOMAIN_POWER_MANAGEMENT_H__ + +G_BEGIN_DECLS + +#define GVIR_CONFIG_TYPE_DOMAIN_POWER_MANAGEMENT (gvir_config_domain_power_management_get_type ()) +#define GVIR_CONFIG_DOMAIN_POWER_MANAGEMENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GVIR_CONFIG_TYPE_DOMAIN_POWER_MANAGEMENT, GVirConfigDomainPowerManagement)) +#define GVIR_CONFIG_DOMAIN_POWER_MANAGEMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GVIR_CONFIG_TYPE_DOMAIN_POWER_MANAGEMENT, GVirConfigDomainPowerManagementClass)) +#define GVIR_CONFIG_IS_DOMAIN_POWER_MANAGEMENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GVIR_CONFIG_TYPE_DOMAIN_POWER_MANAGEMENT)) +#define GVIR_CONFIG_IS_DOMAIN_POWER_MANAGEMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GVIR_CONFIG_TYPE_DOMAIN_POWER_MANAGEMENT)) +#define GVIR_CONFIG_DOMAIN_POWER_MANAGEMENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GVIR_CONFIG_TYPE_DOMAIN_POWER_MANAGEMENT, GVirConfigDomainPowerManagementClass)) + +typedef struct _GVirConfigDomainPowerManagement GVirConfigDomainPowerManagement; +typedef struct _GVirConfigDomainPowerManagementPrivate GVirConfigDomainPowerManagementPrivate; +typedef struct _GVirConfigDomainPowerManagementClass GVirConfigDomainPowerManagementClass; + +struct _GVirConfigDomainPowerManagement +{ + GVirConfigObject parent; + + GVirConfigDomainPowerManagementPrivate *priv; + + /* Do not add fields to this struct */ +}; + +struct _GVirConfigDomainPowerManagementClass +{ + GVirConfigObjectClass parent_class; + + gpointer padding[20]; +}; + +GType gvir_config_domain_power_management_get_type(void); + +GVirConfigDomainPowerManagement *gvir_config_domain_power_management_new(void); +GVirConfigDomainPowerManagement *gvir_config_domain_power_management_new_from_xml(const gchar *xml, + GError **error); +void gvir_config_domain_power_management_set_mem_suspend_enabled(GVirConfigDomainPowerManagement *pm, + gboolean enabled); +void gvir_config_domain_power_management_set_disk_suspend_enabled(GVirConfigDomainPowerManagement *pm, + gboolean enabled); + + +G_END_DECLS + +#endif /* __LIBVIRT_GCONFIG_DOMAIN_POWER_MANAGEMENT_H__ */ diff --git a/libvirt-gconfig/libvirt-gconfig-domain.c b/libvirt-gconfig/libvirt-gconfig-domain.c index e679e3a..e664351 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain.c +++ b/libvirt-gconfig/libvirt-gconfig-domain.c @@ -804,3 +804,19 @@ void gvir_config_domain_set_cpu(GVirConfigDomain *domain, "cpu", GVIR_CONFIG_OBJECT(cpu)); } + +/** + * gvir_config_domain_set_power_management: + * @domain: a #GVirConfigDomain + * @pm: (allow-none): a #GVirPowerManagement instance + */ +void gvir_config_domain_set_power_management(GVirConfigDomain *domain, + GVirConfigDomainPowerManagement *pm) +{ + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN(domain)); + g_return_if_fail(pm != NULL || GVIR_CONFIG_IS_DOMAIN_POWER_MANAGEMENT(pm)); + + gvir_config_object_attach_replace(GVIR_CONFIG_OBJECT(domain), + "pm", + GVIR_CONFIG_OBJECT(pm)); +} diff --git a/libvirt-gconfig/libvirt-gconfig-domain.h b/libvirt-gconfig/libvirt-gconfig-domain.h index a7bd73b..3a7be12 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain.h +++ b/libvirt-gconfig/libvirt-gconfig-domain.h @@ -32,6 +32,7 @@ #include <libvirt-gconfig/libvirt-gconfig-domain-device.h> #include <libvirt-gconfig/libvirt-gconfig-domain-seclabel.h> #include <libvirt-gconfig/libvirt-gconfig-domain-cpu.h> +#include <libvirt-gconfig/libvirt-gconfig-domain-power-management.h> G_BEGIN_DECLS @@ -143,6 +144,8 @@ gchar *gvir_config_domain_get_custom_xml(GVirConfigDomain *domain, GVirConfigDomainCpu *gvir_config_domain_get_cpu(GVirConfigDomain *domain); void gvir_config_domain_set_cpu(GVirConfigDomain *domain, GVirConfigDomainCpu *cpu); +void gvir_config_domain_set_power_management(GVirConfigDomain *domain, + GVirConfigDomainPowerManagement *pm); G_END_DECLS diff --git a/libvirt-gconfig/libvirt-gconfig.h b/libvirt-gconfig/libvirt-gconfig.h index 4b5ccbd..0428259 100644 --- a/libvirt-gconfig/libvirt-gconfig.h +++ b/libvirt-gconfig/libvirt-gconfig.h @@ -67,6 +67,7 @@ #include <libvirt-gconfig/libvirt-gconfig-domain-memballoon.h> #include <libvirt-gconfig/libvirt-gconfig-domain-os.h> #include <libvirt-gconfig/libvirt-gconfig-domain-parallel.h> +#include <libvirt-gconfig/libvirt-gconfig-domain-power-management.h> #include <libvirt-gconfig/libvirt-gconfig-domain-redirdev.h> #include <libvirt-gconfig/libvirt-gconfig-domain-seclabel.h> #include <libvirt-gconfig/libvirt-gconfig-domain-serial.h> diff --git a/libvirt-gconfig/libvirt-gconfig.sym b/libvirt-gconfig/libvirt-gconfig.sym index 2ec2e80..622e0f2 100644 --- a/libvirt-gconfig/libvirt-gconfig.sym +++ b/libvirt-gconfig/libvirt-gconfig.sym @@ -472,4 +472,15 @@ LIBVIRT_GCONFIG_0.1.3 { gvir_config_domain_graphics_vnc_set_socket; } LIBVIRT_GCONFIG_0.1.0; +LIBVIRT_GCONFIG_0.1.4 { + global: + gvir_config_domain_power_management_get_type; + gvir_config_domain_power_management_new; + gvir_config_domain_power_management_new_from_xml; + gvir_config_domain_power_management_set_mem_suspend_enabled; + gvir_config_domain_power_management_set_disk_suspend_enabled; + + gvir_config_domain_set_power_management; +} LIBVIRT_GCONFIG_0.1.3; + # .... define new API here using predicted next version number .... -- 1.7.12.1

2 2

[libvirt] [PATCH 0/6] Enhance save/restore/migration of domains with USB devices
by Jiri Denemark 11 Oct '12

11 Oct '12

USB devices can disappear without OS being mad about it, which makes them ideal for startupPolicy so that a domain with USB devices can be migrated to a host that lacks the USB devices. Moreover, this series allows USB devices to be re-plugged or a host to be rebooted while domains with USB devices are (managed)saved. Jiri Denemark (6): conf: Add support for startupPolicy for USB devices qemu: Introduce qemuFindHostdevUSBDevice qemu: Add option to treat missing USB devices as success qemu: Implement startupPolicy for USB passed through devices Add MIGRATABLE flag for virDomainGetXMLDesc qemu: Make save/restore with USB devices usable docs/formatdomain.html.in | 28 ++++++-- docs/schemas/domaincommon.rng | 3 + include/libvirt/libvirt.h.in | 1 + src/conf/domain_conf.c | 45 ++++++++++++- src/conf/domain_conf.h | 4 ++ src/qemu/qemu_cgroup.c | 2 + src/qemu/qemu_command.c | 20 ++++-- src/qemu/qemu_domain.c | 21 +++--- src/qemu/qemu_domain.h | 11 ++-- src/qemu/qemu_driver.c | 19 +++--- src/qemu/qemu_hostdev.c | 137 +++++++++++++++++++++++++++++----------- src/qemu/qemu_hostdev.h | 6 +- src/qemu/qemu_hotplug.c | 33 +--------- src/qemu/qemu_migration.c | 12 ++-- src/qemu/qemu_process.c | 16 ++--- src/security/security_dac.c | 16 +++-- src/security/security_selinux.c | 16 +++-- src/util/hostusb.c | 91 ++++++++++++++++++-------- src/util/hostusb.h | 22 ++++--- tools/virsh-domain.c | 4 ++ tools/virsh.pod | 7 +- 21 files changed, 351 insertions(+), 163 deletions(-) -- 1.7.12

3 20

[libvirt] [PATCH] Make the use of XDG folders variable
by Martin Kletzander 11 Oct '12

11 Oct '12

While ago, commit 32a9aac2e04c991340b66c855a1095e4e6445e54 introduced a change of the folders used to keep information in user home directories. As this can still cause problems, mainly with older SELinux policies, make this change variable with new configuration option '--disable-xdg'. --- Sorry for not splitting this patch, but either having the option and not making it work or the other way around is pretty bad (and having it in repo as a commit even worse). configure.ac | 14 +++++++ daemon/Makefile.am | 2 + daemon/libvirtd-config.c | 11 ++++++ daemon/libvirtd.c | 84 +++++++++++++++++++++++++++++++++++++----- daemon/libvirtd.pod.in | 6 +-- libvirt.spec.in | 11 ++++++ src/libvirt.c | 19 ++++++++-- src/network/bridge_driver.c | 22 ++++++++++- src/nwfilter/nwfilter_driver.c | 15 +++++++- src/qemu/qemu_driver.c | 55 ++++++++++++++++++--------- src/remote/remote_driver.c | 15 +++++++- src/secret/secret_driver.c | 13 +++++++ src/uml/uml_driver.c | 14 +++++++ src/util/virauth.c | 8 ++++ tools/virsh.c | 13 +++++++ 15 files changed, 263 insertions(+), 39 deletions(-) diff --git a/configure.ac b/configure.ac index ee51bb6..cacdefe 100644 --- a/configure.ac +++ b/configure.ac @@ -2545,6 +2545,20 @@ if test "$enable_locking" = "yes"; then fi AM_CONDITIONAL([WITH_CIL],[test "$enable_locking" = "yes"]) +dnl --enable-xdg=(yes|no) +AC_ARG_ENABLE([xdg], + [AC_HELP_STRING([--disable-xdg], + [disable using XDG folders])], + [], [enable_xdg=yes]) +if test x"$enable_xdg" = x"yes"; then + AC_DEFINE([ENABLE_XDG], [], [whether to use XDG folders]) + AC_SUBST([userconfdir], [[XDG_CONFIG_DIR/libvirt]]) + AC_SUBST([userrundir], [[XDG_RUNTIME_DIR/libvirt]]) +else + AC_SUBST([userconfdir], [[HOME/.libvirt]]) + AC_SUBST([userrundir], [HOME/.libvirt]) +fi + dnl Enable building libvirtd? AM_CONDITIONAL([WITH_LIBVIRTD],[test "x$with_libvirtd" = "xyes"]) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 3405c67..1b9ad7c 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -87,6 +87,8 @@ libvirtd.8: $(srcdir)/libvirtd.8.in sed \ -e 's!SYSCONFDIR!$(sysconfdir)!g' \ -e 's!LOCALSTATEDIR!$(localstatedir)!g' \ + -e 's!USERCONFDIR!$(userconfdir)!g' \ + -e 's!USERRUNDIR!$(userrundir)!g' \ < $< > $@-t mv $@-t $@ diff --git a/daemon/libvirtd-config.c b/daemon/libvirtd-config.c index d9dfea1..227147d 100644 --- a/daemon/libvirtd-config.c +++ b/daemon/libvirtd-config.c @@ -203,6 +203,7 @@ daemonConfigFilePath(bool privileged, char **configfile) } else { char *configdir = NULL; +#ifdef ENABLE_XDG if (!(configdir = virGetUserConfigDirectory())) goto error; @@ -210,6 +211,16 @@ daemonConfigFilePath(bool privileged, char **configfile) VIR_FREE(configdir); goto no_memory; } +#else + if (!(configdir = virGetUserDirectory())) + goto error; + + if (virAsprintf(configfile, "%s/.libvirt/libvirtd.conf", configdir) < 0) { + VIR_FREE(configdir); + goto no_memory; + } +#endif + VIR_FREE(configdir); } diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index b49acc5..c87039e 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -245,6 +245,8 @@ daemonPidFilePath(bool privileged, goto no_memory; } else { char *rundir = NULL; + +#ifdef ENABLE_XDG mode_t old_umask; if (!(rundir = virGetUserRuntimeDirectory())) @@ -261,6 +263,15 @@ daemonPidFilePath(bool privileged, VIR_FREE(rundir); goto no_memory; } +#else + if (!(rundir = virGetUserDirectory())) + goto error; + + if (virAsprintf(pidfile, "%s/.libvirt/libvirtd.pid", rundir) < 0) { + VIR_FREE(rundir); + goto no_memory; + } +#endif VIR_FREE(rundir); } @@ -293,8 +304,9 @@ daemonUnixSocketPaths(struct daemonConfig *config, goto no_memory; } else { char *rundir = NULL; - mode_t old_umask; +#ifdef ENABLE_XDG + mode_t old_umask; if (!(rundir = virGetUserRuntimeDirectory())) goto error; @@ -309,6 +321,15 @@ daemonUnixSocketPaths(struct daemonConfig *config, VIR_FREE(rundir); goto no_memory; } +#else + if (!(rundir = virGetUserDirectory())) + goto error; + + if (virAsprintf(sockfile, "@%s/.libvirt/libvirt-sock", rundir) < 0) { + VIR_FREE(rundir); + goto no_memory; + } +#endif VIR_FREE(rundir); } @@ -663,10 +684,12 @@ daemonSetupLogging(struct daemonConfig *config, LOCALSTATEDIR) == -1) goto no_memory; } else { - char *logdir = virGetUserCacheDirectory(); + char *logdir = NULL; + +#ifdef ENABLE_XDG mode_t old_umask; - if (!logdir) + if (!(logdir = virGetUserCacheDirectory())) goto error; old_umask = umask(077); @@ -681,6 +704,17 @@ daemonSetupLogging(struct daemonConfig *config, VIR_FREE(logdir); goto no_memory; } +#else + if (!(logdir = virGetUserDirectory())) + goto error; + + if (virAsprintf(&tmp, "%d:file:%s/.libvirt/libvirtd.log", + virLogGetDefaultPriority(), logdir) == -1) { + VIR_FREE(logdir); + goto no_memory; + } +#endif + VIR_FREE(logdir); } } else { @@ -801,6 +835,7 @@ static int daemonStateInit(virNetServerPtr srv) return 0; } +#ifdef ENABLE_XDG static int migrateProfile(void) { char *old_base = NULL; @@ -876,6 +911,7 @@ static int migrateProfile(void) return ret; } +#endif /* Print command-line usage. */ static void @@ -926,14 +962,14 @@ libvirt management daemon:\n"), argv0); LOCALSTATEDIR); } else { fprintf(stderr, - "%s", _("\n\ + _("\n\ Default paths:\n\ \n\ Configuration file (unless overridden by -f):\n\ - $XDG_CONFIG_HOME/libvirt/libvirtd.conf\n\ + %s/libvirtd.conf\n\ \n\ Sockets:\n\ - $XDG_RUNTIME_DIR/libvirt/libvirt-sock (in UNIX abstract namespace)\n\ + %s/libvirt-sock (in UNIX abstract namespace)\n \ \n\ TLS:\n\ CA certificate: $HOME/.pki/libvirt/cacert.pem\n\ @@ -941,8 +977,18 @@ libvirt management daemon:\n"), argv0); Server private key: $HOME/.pki/libvirt/serverkey.pem\n\ \n\ PID file:\n\ - $XDG_RUNTIME_DIR/libvirt/libvirtd.pid\n\ -\n")); + %s/libvirtd.pid\n \ +\n"), +#ifdef ENABLE_XDG + "$XDG_CONFIG_HOME/libvirt", + "$XDG_RUNTIME_DIR/libvirt", + "$XDG_RUNTIME_DIR/libvirt" +#else + "$HOME/.libvirt", + "$HOME/.libvirt", + "$HOME/.libvirt" +#endif + ); } } @@ -1115,11 +1161,13 @@ int main(int argc, char **argv) { exit(EXIT_FAILURE); } +#ifdef ENABLE_XDG if (!privileged && migrateProfile() < 0) { VIR_ERROR(_("Exiting due to failure to migrate profile")); exit(EXIT_FAILURE); } +#endif if (config->host_uuid && virSetHostUUIDStr(config->host_uuid) < 0) { @@ -1170,22 +1218,38 @@ int main(int argc, char **argv) { if (privileged) { run_dir = strdup(LOCALSTATEDIR "/run/libvirt"); } else { +#ifdef ENABLE_XDG run_dir = virGetUserRuntimeDirectory(); if (!run_dir) { VIR_ERROR(_("Can't determine user directory")); goto cleanup; } +#else + char *user_dir = virGetUserDirectory(); + + if (!user_dir) { + VIR_ERROR(_("Can't determine user directory")); + goto cleanup; + } + ignore_value(virAsprintf(&run_dir, "%s/.libvirt/", user_dir)); + VIR_FREE(user_dir); +#endif } if (!run_dir) { virReportOOMError(); goto cleanup; } - if (privileged) + if (privileged) { old_umask = umask(022); - else + } else { +#ifdef ENABLE_XDG old_umask = umask(077); +#else + old_umask = umask(022); +#endif + } VIR_DEBUG("Ensuring run dir '%s' exists", run_dir); if (virFileMakePath(run_dir) < 0) { char ebuf[1024]; diff --git a/daemon/libvirtd.pod.in b/daemon/libvirtd.pod.in index 930b752..82cb14f 100644 --- a/daemon/libvirtd.pod.in +++ b/daemon/libvirtd.pod.in @@ -112,12 +112,12 @@ The PID file to use, unless overridden by the B<-p>|B<--pid-file> option. =over -=item F<$XDG_CONFIG_HOME/libvirtd.conf> +=item F<$USERCONFDIR/libvirtd.conf> The default configuration file used by libvirtd, unless overridden on the command line using the B<-f>|B<--config> option. -=item F<$XDG_RUNTIME_DIR/libvirt/libvirt-sock> +=item F<$USERRUNDIR/libvirt-sock> The socket libvirtd will use. @@ -133,7 +133,7 @@ The TLS B<Server> certificate libvirtd will use. The TLS B<Server> private key libvirtd will use. -=item F<$XDG_RUNTIME_DIR/libvirt/libvirtd.pid> +=item F<$USERRUNDIR/libvirtd.pid> The PID file to use, unless overridden by the B<-p>|B<--pid-file> option. diff --git a/libvirt.spec.in b/libvirt.spec.in index 318fe92..0ec7e03 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -305,6 +305,12 @@ %endif +# Don't change user directories in older RHELs +%if 0%{?rhel} <= 6 +%define +%endif + + # The RHEL-5 Xen package has some feature backports. This # flag is set to enable use of those special bits on RHEL-5 %if 0%{?rhel} == 5 @@ -1210,6 +1216,10 @@ of recent versions of Linux (and other OSes). %define _with_firewalld --with-firewalld %endif +%if %{disable_xdg} +%define _disable_xdg --enable-xdg=no +%endif + %define when %(date +"%%F-%%T") %define where %(hostname) %define who %{?packager}%{!?packager:Unknown} @@ -1278,6 +1288,7 @@ autoreconf -if %{?_without_dtrace} \ %{?_without_driver_modules} \ %{?_with_firewalld} \ + %{?_disable_xdg} \ %{with_packager} \ %{with_packager_version} \ --with-qemu-user=%{qemu_user} \ diff --git a/src/libvirt.c b/src/libvirt.c index 76e4401..4a15808 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -922,15 +922,26 @@ virConnectGetConfigFilePath(void) SYSCONFDIR) < 0) goto no_memory; } else { - char *userdir = virGetUserConfigDirectory(); - if (!userdir) + char *userdir = NULL; + +#ifdef ENABLE_XDG + if (!(userdir = virGetUserConfigDirectory())) goto error; - if (virAsprintf(&path, "%s/libvirt.conf", - userdir) < 0) { + if (virAsprintf(&path, "%s/libvirt.conf", userdir) < 0) { VIR_FREE(userdir); goto no_memory; } +#else + if (!(userdir = virGetUserDirectory())) + goto error; + + if (virAsprintf(&path, "%s/.libvirt/libvirt.conf", userdir) < 0) { + VIR_FREE(userdir); + goto no_memory; + } +#endif + VIR_FREE(userdir); } diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index e1846ee..874b3be 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -302,9 +302,10 @@ networkStartup(int privileged) { if ((base = strdup (SYSCONFDIR "/libvirt")) == NULL) goto out_of_memory; } else { - char *userdir = virGetUserCacheDirectory(); + char *userdir = NULL; - if (!userdir) +#ifdef ENABLE_XDG + if (!(userdir = virGetUserCacheDirectory())) goto error; if (virAsprintf(&driverState->logDir, @@ -320,6 +321,23 @@ networkStartup(int privileged) { goto out_of_memory; } VIR_FREE(userdir); +#else + if (!(userdir = virGetUserDirectory())) + goto error; + + if (virAsprintf(&driverState->logDir, + "%s/.libvirt/qemu/log", userdir) == -1) { + VIR_FREE(userdir); + goto out_of_memory; + } + + if (virAsprintf(&base, "%s/.libvirt", userdir) == -1) { + VIR_FREE(userdir); + goto out_of_memory; + } + VIR_FREE(userdir); +#endif + } /* Configuration paths are either ~/.libvirt/qemu/... (session) or diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index a80bb66..b0be1c6 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -2,7 +2,7 @@ * nwfilter_driver.c: core driver for network filter APIs * (based on storage_driver.c) * - * Copyright (C) 2006-2011 Red Hat, Inc. + * Copyright (C) 2006-2012 Red Hat, Inc. * Copyright (C) 2006-2008 Daniel P. Berrange * Copyright (C) 2010 IBM Corporation * Copyright (C) 2010 Stefan Berger @@ -219,9 +219,22 @@ nwfilterDriverStartup(int privileged) if ((base = strdup (SYSCONFDIR "/libvirt")) == NULL) goto out_of_memory; } else { +#ifdef ENABLE_XDG base = virGetUserConfigDirectory(); if (!base) goto error; +#else + char *userdir = virGetUserDirectory(); + + if (!userdir) + goto error; + + if (virAsprintf(&base, "%s/.libvirt", userdir) == -1) { + VIR_FREE(userdir); + goto out_of_memory; + } + VIR_FREE(userdir); +#endif } if (virAsprintf(&driverState->configDir, diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index decf0fb..cc8185d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -659,36 +659,57 @@ qemudStartup(int privileged) { "%s/lib/libvirt/qemu/dump", LOCALSTATEDIR) == -1) goto out_of_memory; } else { - char *rundir; - char *cachedir; + char *tmpdir; - cachedir = virGetUserCacheDirectory(); - if (!cachedir) +#ifdef ENABLE_XDG + base = virGetUserConfigDirectory(); + if (!base) + goto error; + + tmpdir = virGetUserCacheDirectory(); + if (!tmpdir) goto error; if (virAsprintf(&qemu_driver->logDir, - "%s/qemu/log", cachedir) == -1) { - VIR_FREE(cachedir); + "%s/qemu/log", tmpdir) == -1) { + VIR_FREE(tmpdir); goto out_of_memory; } - if (virAsprintf(&qemu_driver->cacheDir, "%s/qemu/cache", cachedir) == -1) { - VIR_FREE(cachedir); + if (virAsprintf(&qemu_driver->cacheDir, "%s/qemu/cache", tmpdir) == -1) { + VIR_FREE(tmpdir); goto out_of_memory; } - VIR_FREE(cachedir); + VIR_FREE(tmpdir); - rundir = virGetUserRuntimeDirectory(); - if (!rundir) + tmpdir = virGetUserRuntimeDirectory(); + if (!tmpdir) goto error; - if (virAsprintf(&qemu_driver->stateDir, "%s/qemu/run", rundir) == -1) { - VIR_FREE(rundir); + if (virAsprintf(&qemu_driver->stateDir, "%s/qemu/run", tmpdir) == -1) { + VIR_FREE(tmpdir); goto out_of_memory; } - VIR_FREE(rundir); - - base = virGetUserConfigDirectory(); - if (!base) + VIR_FREE(tmpdir); +#else + if (!(tmpdir = virGetUserDirectory())) goto error; + + if (virAsprintf(&qemu_driver->logDir, + "%s/.libvirt/qemu/log", tmpdir) == -1) { + VIR_FREE(tmpdir); + goto out_of_memory; + } + + if (virAsprintf(&base, "%s/.libvirt", tmpdir) == -1) { + VIR_FREE(tmpdir); + goto out_of_memory; + } + + if (virAsprintf(&qemu_driver->stateDir, "%s/qemu/run", base) == -1) + goto out_of_memory; + if (virAsprintf(&qemu_driver->cacheDir, "%s/qemu/cache", base) == -1) + goto out_of_memory; +#endif + if (virAsprintf(&qemu_driver->libDir, "%s/qemu/lib", base) == -1) goto out_of_memory; if (virAsprintf(&qemu_driver->saveDir, "%s/qemu/save", base) == -1) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index fc4c696..1b6a360 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -640,15 +640,26 @@ doRemoteOpen(virConnectPtr conn, case trans_unix: if (!sockname) { if (flags & VIR_DRV_OPEN_REMOTE_USER) { - char *userdir = virGetUserRuntimeDirectory(); + char *userdir = NULL; - if (!userdir) +# ifdef ENABLE_XDG + if (!(userdir = virGetUserRuntimeDirectory())) goto failed; if (virAsprintf(&sockname, "%s/" LIBVIRTD_USER_UNIX_SOCKET, userdir) < 0) { VIR_FREE(userdir); goto no_memory; } +# else + if (!(userdir = virGetUserDirectory())) + goto failed; + + if (virAsprintf(&sockname, "%s/.libvirt/" LIBVIRTD_USER_UNIX_SOCKET, userdir) < 0) { + VIR_FREE(userdir); + goto no_memory; + } +# endif + VIR_FREE(userdir); } else { if (flags & VIR_DRV_OPEN_REMOTE_RO) diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c index 9ce1e33..846b5cc 100644 --- a/src/secret/secret_driver.c +++ b/src/secret/secret_driver.c @@ -1091,9 +1091,22 @@ secretDriverStartup(int privileged) if (base == NULL) goto out_of_memory; } else { +#ifdef ENABLE_XDG base = virGetUserConfigDirectory(); if (!base) goto error; +#else + char *userdir = virGetUserDirectory(); + + if (!userdir) + goto error; + + if (virAsprintf(&base, "%s/.libvirt", userdir) == -1) { + VIR_FREE(userdir); + goto out_of_memory; + } + VIR_FREE(userdir); +#endif } if (virAsprintf(&driverState->directory, "%s/secrets", base) == -1) goto out_of_memory; diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index c341fab..1cc5c20 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -462,9 +462,23 @@ umlStartup(int privileged) "%s/run/libvirt/uml-guest", LOCALSTATEDIR) == -1) goto out_of_memory; } else { + +#ifdef ENABLE_XDG base = virGetUserConfigDirectory(); if (!base) goto error; +#else + userdir = virGetUserDirectory(); + + if (!userdir) + goto error; + + if (virAsprintf(&base, "%s/.libvirt", userdir) == -1) { + VIR_FREE(userdir); + goto out_of_memory; + } + VIR_FREE(userdir); +#endif if (virAsprintf(&uml_driver->logDir, "%s/uml/log", base) == -1) diff --git a/src/util/virauth.c b/src/util/virauth.c index 6d9935d..a5dbc1f 100644 --- a/src/util/virauth.c +++ b/src/util/virauth.c @@ -68,11 +68,19 @@ int virAuthGetConfigFilePath(virConnectPtr conn, } } +#ifdef ENABLE_XDG if (!(userdir = virGetUserConfigDirectory())) goto cleanup; if (virAsprintf(path, "%s/auth.conf", userdir) < 0) goto no_memory; +#else + if (!(userdir = virGetUserDirectory())) + goto cleanup; + + if (virAsprintf(path, "%s/.libvirt/auth.conf", userdir) < 0) + goto no_memory; +#endif VIR_DEBUG("Checking for readability of '%s'", *path); if (access(*path, R_OK) == 0) diff --git a/tools/virsh.c b/tools/virsh.c index f0ec625..2d0e62b 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -2465,18 +2465,31 @@ vshReadlineInit(vshControl *ctl) stifle_history(500); /* Prepare to read/write history from/to the $XDG_CACHE_HOME/virsh/history file */ + +# ifdef ENABLE_XDG userdir = virGetUserCacheDirectory(); +# else + userdir = virGetUserDirectory(); +# endif if (userdir == NULL) { vshError(ctl, "%s", _("Could not determine home directory")); return -1; } +# ifdef ENABLE_XDG if (virAsprintf(&ctl->historydir, "%s/virsh", userdir) < 0) { vshError(ctl, "%s", _("Out of memory")); VIR_FREE(userdir); return -1; } +# else + if (virAsprintf(&ctl->historydir, "%s/.virsh", userdir) < 0) { + vshError(ctl, "%s", _("Out of memory")); + VIR_FREE(userdir); + return -1; + } +# endif if (virAsprintf(&ctl->historyfile, "%s/history", ctl->historydir) < 0) { vshError(ctl, "%s", _("Out of memory")); -- 1.7.12.3

2 1

[libvirt] [PATCH 0/7] External checkpoint support
by Peter Krempa 11 Oct '12

11 Oct '12

This series adds support for external system checkpoints. This series is designed to be applied on top of: http://www.redhat.com/archives/libvir-list/2012-September/msg00594.html This first series adds support for taking the snapshots. I'll follow up with adding support to revert snapshots or to add add snapshots with different parents, but I'd like to start rounds of review on this until the design settles. Peter Peter Krempa (7): qemu: Fix misleading comment for qemuDomainObjBeginJobWithDriver() 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 include/libvirt/libvirt.h.in | 4 + src/qemu/qemu_domain.c | 6 +- src/qemu/qemu_domain.h | 1 + src/qemu/qemu_driver.c | 474 +++++++++++++++++++++++++------------------ src/qemu/qemu_process.c | 19 ++ tools/virsh-domain-monitor.c | 2 + tools/virsh-snapshot.c | 6 + tools/virsh.pod | 12 +- 8 files changed, 326 insertions(+), 198 deletions(-) -- 1.7.12

2 10

[libvirt] [PATCH v2 0/6] Add support for lock failure action
by Jiri Denemark 11 Oct '12

11 Oct '12

When sanlock is used as a locking driver and sanlock deamon loses access to its lockspace, it automatically kills off the domains that had their locks stored there. Apparently some management apps would like to change this behavior by configuring what should happen when locks are lost. Patch 3/7 from v1 was dropped in v2. Other patches were updated according to review comments. More details may be found in each patch. Jiri Denemark (6): conf: Rename life cycle actions to event actions conf: Add on_lockfailure event configuration locking: Add const char * parameter to avoid ugly typecasts locking: Pass hypervisor driver name when acquiring locks locking: Add support for lock failure action locking: Implement lock failure action in sanlock driver docs/formatdomain.html.in | 37 ++++++++-- docs/internals/locking.html.in | 8 +++ docs/locking.html.in | 24 +++++++ docs/schemas/domaincommon.rng | 30 +++++++-- libvirt.spec.in | 1 + po/POTFILES.in | 1 + src/Makefile.am | 13 +++- src/conf/domain_conf.c | 85 ++++++++++++++--------- src/conf/domain_conf.h | 18 ++++- src/libvirt_private.syms | 2 + src/locking/domain_lock.c | 36 ++++++---- src/locking/domain_lock.h | 4 ++ src/locking/lock_driver.h | 8 ++- src/locking/lock_driver_nop.c | 1 + src/locking/lock_driver_sanlock.c | 114 +++++++++++++++++++++++++++---- src/locking/lock_manager.c | 10 ++- src/locking/lock_manager.h | 1 + src/locking/sanlock_helper.c | 138 ++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_conf.h | 1 + src/qemu/qemu_driver.c | 9 +-- src/qemu/qemu_hotplug.c | 15 +++-- src/qemu/qemu_process.c | 4 +- 22 files changed, 479 insertions(+), 81 deletions(-) create mode 100644 src/locking/sanlock_helper.c -- 1.7.12

2 13

[libvirt] [PATCH 0/3] vcpupin improvements
by Osier Yang 11 Oct '12

11 Oct '12

These 3 patches are to improve vcpu pinning problems: problem 1: vcpu hotplug is supported for some time, but it doesn't set pinning policy for the vcpus onlined, or doesn't remove the pinning policy for offlined vcpus. problem 2: Also each vcpu doesn't inherit the pinning policy from def->cpuset (<vcpu cpuset='0-3,^2'>4</vcpu>) if there is no policy specified explicitly for its own. This is incorrect, as it conflicts with the of def->cpuset. PATCH 3/3 fix problem 1 (based an ACKed but not pushed patch https://www.redhat.com/archives/libvir-list/2012-October/msg00372.html) PATCH 2/3 fix problem 2. Osier Yang (3): conf: Do not allow vcpupin's cpuid exceed current vcpus number conf: Initialize the pinning policy for vcpus qemu: Initialize cpuset for hotplugged vcpu as def->cpuset src/conf/domain_conf.c | 60 +++++++++++++++++++++++++++++++++++- src/conf/domain_conf.h | 3 ++ src/libvirt_private.syms | 1 + src/qemu/qemu_driver.c | 75 ++++++++++++++++++++++++++++++++++++++++----- 4 files changed, 128 insertions(+), 11 deletions(-) Regards, Osier

3 9

[libvirt] [PATCH v9] support offline migration
by liguang 11 Oct '12

11 Oct '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_*. so, this migration result is just make domain definition alive at target side. 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 | 53 ++++++++++++++++++++++++++++++++++++----- src/qemu/qemu_migration.h | 3 +- tools/virsh-domain.c | 6 ++++ 5 files changed, 70 insertions(+), 8 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 79c7689..627e9d4 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 6848924..105febf 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9631,6 +9631,15 @@ 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; + } + goto offline; + } virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("domain is not running")); goto endjob; @@ -9643,6 +9652,7 @@ qemuDomainMigrateBegin3(virDomainPtr domain, if (qemuDomainCheckEjectableMedia(driver, vm, asyncJob) < 0) goto endjob; +offline: if (!(xml = qemuMigrationBegin(driver, vm, xmlin, dname, cookieout, cookieoutlen, flags))) @@ -9878,6 +9888,11 @@ qemuDomainMigrateConfirm3(virDomainPtr domain, goto cleanup; } + if (flags & VIR_MIGRATE_OFFLINE) { + ret = 0; + goto cleanup; + } + if (!qemuMigrationJobIsActive(vm, QEMU_ASYNC_JOB_MIGRATION_OUT)) goto cleanup; diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 8e85875..411a4c2 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; @@ -1151,6 +1165,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, @@ -1314,6 +1335,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 */ @@ -1856,7 +1886,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; @@ -2372,6 +2403,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; @@ -2477,7 +2510,7 @@ finish: vm->def->name); cleanup: - if (ddomain) { + if (ddomain || (flags & VIR_MIGRATE_OFFLINE)) { virObjectUnref(ddomain); ret = 0; } else { @@ -2554,7 +2587,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; @@ -2617,7 +2650,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; @@ -2941,6 +2974,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; @@ -3038,7 +3073,7 @@ qemuMigrationFinish(struct qemud_driver *driver, goto endjob; } } - + offline: dom = virGetDomain (dconn, vm->def->name, vm->def->uuid); event = virDomainEventNewFromObj(vm, @@ -3074,6 +3109,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; @@ -3120,7 +3156,10 @@ int qemuMigrationConfirm(struct qemud_driver *driver, if (!(mig = qemuMigrationEatCookie(driver, vm, cookiein, cookieinlen, 0))) return -1; - + if (flags & VIR_MIGRATE_OFFLINE) { + rv = 0; + goto cleanup; + } /* Did the migration go as planned? If yes, kill off the * domain object, but if no, resume CPUs */ 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

3 4

[libvirt] [re-send][PATCH 0/3] non-shared migration without target disk images
by liguang 11 Oct '12

11 Oct '12

by now, if you want a non-shared migration, you have to create same files at target as source side, which seems intorlerable! this issue was reported by Reinier Schoof http://www.redhat.com/archives/libvir-list/2011-December/msg00451.html These patches try to let migrate --copy-storage-* work without pre-exist disk image files at target side. we may also hope qemu to aware of this issue hooks/qemu | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/Makefile.am | 3 ++ src/util/hooks.c | 2 +- 3 files changed, 59 insertions(+), 1 deletions(-)

4 14

[libvirt] build libvirt error. lack of AppArmor .
by yue 10 Oct '12

10 Oct '12

error occur when attach a rbd-disk to domain. 1.configure: error: You must install the AppArmor development package in order to compile libvirt 2. 2012-10-10 17:36:16.305+0000: 3808: warning : qemuDomainObjTaint:1297 : Domain id=2 name='xpSP3' uuid=b45bd66a-6700-4905-c5f4-4c799413d7b7 is tainted: high-privileges 2012-10-10 17:36:16.712+0000: 3808: error : qemuMonitorOpenUnix:266 : failed to connect to monitor socket: No such process 2012-10-10 17:36:16.712+0000: 3808: error : qemuProcessWaitForMonitor:1510 : internal error process exited while connecting to monitor: char device redirected to /dev/pts/4 qemu-kvm: -drive file=rbd:cloud/testrbd:id=cloud:key=AQCGbGRQ+M+NGBAATtylZNiSxqCTQ4uaApd+9w==:auth_supported=cephx none:mon_host=192.168.10.4\:6789,if=none,id=drive-ide0-0-1,format=raw: could not open disk image rbd:cloud/testrbd:id=cloud:key=AQCGbGRQ+M+NGBAATtylZNiSxqCTQ4uaApd+9w==:auth_supported=cephx none:mon_host=192.168.10.4\:6789: No such file or directory centos6.2 2.6.32-220.el6.x86_64

2 1

[libvirt] Correct name of domain/pm/suspend-to-mem in docs
by Zeeshan Ali (Khattak) 10 Oct '12

10 Oct '12

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> --- docs/formatdomain.html.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 3cc6c51..f9fe6ca 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -983,7 +983,7 @@ ... <pm> <suspend-to-disk enabled='no'/> - <suspend-to-ram enabled='yes'/> + <suspend-to-mem enabled='yes'/> </pm> ...</pre> -- 1.7.12.1

2 1

[libvirt] [libvirt-glib] gconfig: Add API to set domain/pm tree
by Zeeshan Ali (Khattak) 10 Oct '12

10 Oct '12

From: "Zeeshan Ali (Khattak)" <zeeshanak(a)gnome.org> API for new domain power management configuration. --- libvirt-gconfig/Makefile.am | 2 + .../libvirt-gconfig-domain-power-management.c | 101 +++++++++++++++++++++ .../libvirt-gconfig-domain-power-management.h | 76 ++++++++++++++++ libvirt-gconfig/libvirt-gconfig-domain.c | 16 ++++ libvirt-gconfig/libvirt-gconfig-domain.h | 3 + libvirt-gconfig/libvirt-gconfig.h | 1 + libvirt-gconfig/libvirt-gconfig.sym | 11 +++ 7 files changed, 210 insertions(+) create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-power-management.c create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-power-management.h diff --git a/libvirt-gconfig/Makefile.am b/libvirt-gconfig/Makefile.am index 5a80123..caa62f0 100644 --- a/libvirt-gconfig/Makefile.am +++ b/libvirt-gconfig/Makefile.am @@ -50,6 +50,7 @@ GCONFIG_HEADER_FILES = \ libvirt-gconfig-domain-memballoon.h \ libvirt-gconfig-domain-os.h \ libvirt-gconfig-domain-parallel.h \ + libvirt-gconfig-domain-power-management.h \ libvirt-gconfig-domain-redirdev.h \ libvirt-gconfig-domain-seclabel.h \ libvirt-gconfig-domain-serial.h \ @@ -121,6 +122,7 @@ GCONFIG_SOURCE_FILES = \ libvirt-gconfig-domain-memballoon.c \ libvirt-gconfig-domain-os.c \ libvirt-gconfig-domain-parallel.c \ + libvirt-gconfig-domain-power-management.c \ libvirt-gconfig-domain-redirdev.c \ libvirt-gconfig-domain-seclabel.c \ libvirt-gconfig-domain-serial.c \ diff --git a/libvirt-gconfig/libvirt-gconfig-domain-power-management.c b/libvirt-gconfig/libvirt-gconfig-domain-power-management.c new file mode 100644 index 0000000..c6b1962 --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-domain-power-management.c @@ -0,0 +1,101 @@ +/* + * libvirt-gconfig-domain-power-management.c: libvirt domain power management configuration + * + * Copyright (C) 2012 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Authors: + * + * Zeeshan Ali (Khattak) <zeeshanak(a)gnome.org> + * Christophe Fergeau <cfergeau(a)redhat.com> + */ + +#include <config.h> + +#include "libvirt-gconfig/libvirt-gconfig.h" +#include "libvirt-gconfig/libvirt-gconfig-private.h" + +#define GVIR_CONFIG_DOMAIN_POWER_MANAGEMENT_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE((obj), \ + GVIR_CONFIG_TYPE_DOMAIN_POWER_MANAGEMENT, \ + GVirConfigDomainPowerManagementPrivate)) + +struct _GVirConfigDomainPowerManagementPrivate +{ + gboolean unused; +}; + +G_DEFINE_TYPE(GVirConfigDomainPowerManagement, + gvir_config_domain_power_management, + GVIR_CONFIG_TYPE_OBJECT); + +static void gvir_config_domain_power_management_class_init + (GVirConfigDomainPowerManagementClass *klass) +{ + g_type_class_add_private(klass, sizeof(GVirConfigDomainPowerManagementPrivate)); +} + + +static void +gvir_config_domain_power_management_init(GVirConfigDomainPowerManagement *pm) +{ + g_debug("Init GVirConfigDomainPowerManagement=%p", pm); + + pm->priv = GVIR_CONFIG_DOMAIN_POWER_MANAGEMENT_GET_PRIVATE(pm); +} + + +GVirConfigDomainPowerManagement *gvir_config_domain_power_management_new(void) +{ + GVirConfigObject *object; + + object = gvir_config_object_new(GVIR_CONFIG_TYPE_DOMAIN_POWER_MANAGEMENT, + "pm", NULL); + return GVIR_CONFIG_DOMAIN_POWER_MANAGEMENT(object); +} + +GVirConfigDomainPowerManagement * +gvir_config_domain_power_management_new_from_xml(const gchar *xml, + GError **error) +{ + GVirConfigObject *object; + + object = gvir_config_object_new_from_xml(GVIR_CONFIG_TYPE_DOMAIN_POWER_MANAGEMENT, + "pm", NULL, xml, error); + return GVIR_CONFIG_DOMAIN_POWER_MANAGEMENT(object); +} + +void gvir_config_domain_power_management_set_ram_suspend_enabled + (GVirConfigDomainPowerManagement *pm, gboolean enabled) +{ + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_POWER_MANAGEMENT(pm)); + + gvir_config_object_add_child_with_attribute(GVIR_CONFIG_OBJECT(pm), + "suspend-to-ram", + "enabled", + enabled? "yes" : "no"); +} + +void gvir_config_domain_power_management_set_disk_suspend_enabled + (GVirConfigDomainPowerManagement *pm, gboolean enabled) +{ + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_POWER_MANAGEMENT(pm)); + + gvir_config_object_add_child_with_attribute(GVIR_CONFIG_OBJECT(pm), + "suspend-to-disk", + "enabled", + enabled? "yes" : "no"); +} diff --git a/libvirt-gconfig/libvirt-gconfig-domain-power-management.h b/libvirt-gconfig/libvirt-gconfig-domain-power-management.h new file mode 100644 index 0000000..1d9b3b7 --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-domain-power-management.h @@ -0,0 +1,76 @@ +/* + * libvirt-gconfig-domain-power-management.h: libvirt domain power management configuration + * + * Copyright (C) 2012 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Zeeshan Ali (Khattak) <zeeshanak(a)gnome.org> + * Christophe Fergeau <cfergeau(a)redhat.com> + */ + +#if !defined(__LIBVIRT_GCONFIG_H__) && !defined(LIBVIRT_GCONFIG_BUILD) +#error "Only <libvirt-gconfig/libvirt-gconfig.h> can be included directly." +#endif + +#ifndef __LIBVIRT_GCONFIG_DOMAIN_POWER_MANAGEMENT_H__ +#define __LIBVIRT_GCONFIG_DOMAIN_POWER_MANAGEMENT_H__ + +#include <libvirt-gconfig/libvirt-gconfig-domain-timer.h> + +G_BEGIN_DECLS + +#define GVIR_CONFIG_TYPE_DOMAIN_POWER_MANAGEMENT (gvir_config_domain_power_management_get_type ()) +#define GVIR_CONFIG_DOMAIN_POWER_MANAGEMENT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GVIR_CONFIG_TYPE_DOMAIN_POWER_MANAGEMENT, GVirConfigDomainPowerManagement)) +#define GVIR_CONFIG_DOMAIN_POWER_MANAGEMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GVIR_CONFIG_TYPE_DOMAIN_POWER_MANAGEMENT, GVirConfigDomainPowerManagementClass)) +#define GVIR_CONFIG_IS_DOMAIN_POWER_MANAGEMENT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GVIR_CONFIG_TYPE_DOMAIN_POWER_MANAGEMENT)) +#define GVIR_CONFIG_IS_DOMAIN_POWER_MANAGEMENT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GVIR_CONFIG_TYPE_DOMAIN_POWER_MANAGEMENT)) +#define GVIR_CONFIG_DOMAIN_POWER_MANAGEMENT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GVIR_CONFIG_TYPE_DOMAIN_POWER_MANAGEMENT, GVirConfigDomainPowerManagementClass)) + +typedef struct _GVirConfigDomainPowerManagement GVirConfigDomainPowerManagement; +typedef struct _GVirConfigDomainPowerManagementPrivate GVirConfigDomainPowerManagementPrivate; +typedef struct _GVirConfigDomainPowerManagementClass GVirConfigDomainPowerManagementClass; + +struct _GVirConfigDomainPowerManagement +{ + GVirConfigObject parent; + + GVirConfigDomainPowerManagementPrivate *priv; + + /* Do not add fields to this struct */ +}; + +struct _GVirConfigDomainPowerManagementClass +{ + GVirConfigObjectClass parent_class; + + gpointer padding[20]; +}; + +GType gvir_config_domain_power_management_get_type(void); + +GVirConfigDomainPowerManagement *gvir_config_domain_power_management_new(void); +GVirConfigDomainPowerManagement * +gvir_config_domain_power_management_new_from_xml(const gchar *xml, + GError **error); +void gvir_config_domain_power_management_set_ram_suspend_enabled + (GVirConfigDomainPowerManagement *pm, gboolean enabled); +void gvir_config_domain_power_management_set_disk_suspend_enabled + (GVirConfigDomainPowerManagement *pm, gboolean enabled); + + +G_END_DECLS + +#endif /* __LIBVIRT_GCONFIG_DOMAIN_POWER_MANAGEMENT_H__ */ diff --git a/libvirt-gconfig/libvirt-gconfig-domain.c b/libvirt-gconfig/libvirt-gconfig-domain.c index e679e3a..e664351 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain.c +++ b/libvirt-gconfig/libvirt-gconfig-domain.c @@ -804,3 +804,19 @@ void gvir_config_domain_set_cpu(GVirConfigDomain *domain, "cpu", GVIR_CONFIG_OBJECT(cpu)); } + +/** + * gvir_config_domain_set_power_management: + * @domain: a #GVirConfigDomain + * @pm: (allow-none): a #GVirPowerManagement instance + */ +void gvir_config_domain_set_power_management(GVirConfigDomain *domain, + GVirConfigDomainPowerManagement *pm) +{ + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN(domain)); + g_return_if_fail(pm != NULL || GVIR_CONFIG_IS_DOMAIN_POWER_MANAGEMENT(pm)); + + gvir_config_object_attach_replace(GVIR_CONFIG_OBJECT(domain), + "pm", + GVIR_CONFIG_OBJECT(pm)); +} diff --git a/libvirt-gconfig/libvirt-gconfig-domain.h b/libvirt-gconfig/libvirt-gconfig-domain.h index a7bd73b..3a7be12 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain.h +++ b/libvirt-gconfig/libvirt-gconfig-domain.h @@ -32,6 +32,7 @@ #include <libvirt-gconfig/libvirt-gconfig-domain-device.h> #include <libvirt-gconfig/libvirt-gconfig-domain-seclabel.h> #include <libvirt-gconfig/libvirt-gconfig-domain-cpu.h> +#include <libvirt-gconfig/libvirt-gconfig-domain-power-management.h> G_BEGIN_DECLS @@ -143,6 +144,8 @@ gchar *gvir_config_domain_get_custom_xml(GVirConfigDomain *domain, GVirConfigDomainCpu *gvir_config_domain_get_cpu(GVirConfigDomain *domain); void gvir_config_domain_set_cpu(GVirConfigDomain *domain, GVirConfigDomainCpu *cpu); +void gvir_config_domain_set_power_management(GVirConfigDomain *domain, + GVirConfigDomainPowerManagement *pm); G_END_DECLS diff --git a/libvirt-gconfig/libvirt-gconfig.h b/libvirt-gconfig/libvirt-gconfig.h index 4b5ccbd..0428259 100644 --- a/libvirt-gconfig/libvirt-gconfig.h +++ b/libvirt-gconfig/libvirt-gconfig.h @@ -67,6 +67,7 @@ #include <libvirt-gconfig/libvirt-gconfig-domain-memballoon.h> #include <libvirt-gconfig/libvirt-gconfig-domain-os.h> #include <libvirt-gconfig/libvirt-gconfig-domain-parallel.h> +#include <libvirt-gconfig/libvirt-gconfig-domain-power-management.h> #include <libvirt-gconfig/libvirt-gconfig-domain-redirdev.h> #include <libvirt-gconfig/libvirt-gconfig-domain-seclabel.h> #include <libvirt-gconfig/libvirt-gconfig-domain-serial.h> diff --git a/libvirt-gconfig/libvirt-gconfig.sym b/libvirt-gconfig/libvirt-gconfig.sym index 2ec2e80..c19cd79 100644 --- a/libvirt-gconfig/libvirt-gconfig.sym +++ b/libvirt-gconfig/libvirt-gconfig.sym @@ -472,4 +472,15 @@ LIBVIRT_GCONFIG_0.1.3 { gvir_config_domain_graphics_vnc_set_socket; } LIBVIRT_GCONFIG_0.1.0; +LIBVIRT_GCONFIG_0.1.4 { + global: + gvir_config_domain_power_management_get_type; + gvir_config_domain_power_management_new; + gvir_config_domain_power_management_new_from_xml; + gvir_config_domain_power_management_set_ram_suspend_enabled; + gvir_config_domain_power_management_set_disk_suspend_enabled; + + gvir_config_domain_set_power_management; +} LIBVIRT_GCONFIG_0.1.3; + # .... define new API here using predicted next version number .... -- 1.7.12.1

2 4

[libvirt] feature?
by Gene Czarcinski 10 Oct '12

10 Oct '12

By accident I had virtual guests running where the ip6 network definition was different than the one specified in the network xml file ... and it worked! Of course I did get an "extra" network address on the interface (due I assume to radvd) but it worked. Now, this is really an isolated network and I like this as a feature. For "regular" private or isolated virtual networks, the virtualization host can still get to any guest and any network ... except the ones where I had forgot to update the virtual network xml. comments? Gene

1 0

[libvirt] [PATCH] storage: Report UUID/name consistently in driver errors
by Cole Robinson 10 Oct '12

10 Oct '12

Done with: sed -i -e "s/no pool with matching uuid/no storage pool with matching uuid/g" src/storage/storage_driver.c sed -i -e 's/"%s", _("no storage pool with matching uuid")/_("no storage pool with matching uuid %s"), obj->uuid/g' src/storage/storage_driver.c sed -i -e 's/"%s", _("storage pool is not active")/_("storage pool '%s' is not active"), pool->def->name/g' src/storage/storage_driver.c And a couple fixups before, during, and after, and a manual inspection pass to make sure nothing was wonky. --- src/storage/storage_driver.c | 122 ++++++++++++++++++++++++------------------- 1 file changed, 68 insertions(+), 54 deletions(-) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 5ba3076..28829d3 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -269,7 +269,7 @@ storagePoolLookupByUUID(virConnectPtr conn, if (!pool) { virReportError(VIR_ERR_NO_STORAGE_POOL, - "%s", _("no pool with matching uuid")); + _("no storage pool with matching uuid %s"), uuid); goto cleanup; } @@ -294,7 +294,7 @@ storagePoolLookupByName(virConnectPtr conn, if (!pool) { virReportError(VIR_ERR_NO_STORAGE_POOL, - _("no pool with matching name '%s'"), name); + _("no storage pool with matching name '%s'"), name); goto cleanup; } @@ -621,13 +621,14 @@ storagePoolUndefine(virStoragePoolPtr obj) { pool = virStoragePoolObjFindByUUID(&driver->pools, obj->uuid); if (!pool) { virReportError(VIR_ERR_NO_STORAGE_POOL, - "%s", _("no storage pool with matching uuid")); + _("no storage pool with matching uuid %s"), obj->uuid); goto cleanup; } if (virStoragePoolObjIsActive(pool)) { virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("pool is still active")); + _("storage pool '%s' is still active"), + pool->def->name); goto cleanup; } @@ -679,7 +680,7 @@ storagePoolStart(virStoragePoolPtr obj, if (!pool) { virReportError(VIR_ERR_NO_STORAGE_POOL, - "%s", _("no storage pool with matching uuid")); + _("no storage pool with matching uuid %s"), obj->uuid); goto cleanup; } @@ -688,7 +689,8 @@ storagePoolStart(virStoragePoolPtr obj, if (virStoragePoolObjIsActive(pool)) { virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("pool already active")); + _("storage pool '%s' is already active"), + pool->def->name); goto cleanup; } if (backend->startPool && @@ -725,7 +727,7 @@ storagePoolBuild(virStoragePoolPtr obj, if (!pool) { virReportError(VIR_ERR_NO_STORAGE_POOL, - "%s", _("no storage pool with matching uuid")); + _("no storage pool with matching uuid %s"), obj->uuid); goto cleanup; } @@ -734,7 +736,8 @@ storagePoolBuild(virStoragePoolPtr obj, if (virStoragePoolObjIsActive(pool)) { virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("storage pool is already active")); + _("storage pool '%s' is already active"), + pool->def->name); goto cleanup; } @@ -762,7 +765,7 @@ storagePoolDestroy(virStoragePoolPtr obj) { if (!pool) { virReportError(VIR_ERR_NO_STORAGE_POOL, - "%s", _("no storage pool with matching uuid")); + _("no storage pool with matching uuid %s"), obj->uuid); goto cleanup; } @@ -771,7 +774,7 @@ storagePoolDestroy(virStoragePoolPtr obj) { if (!virStoragePoolObjIsActive(pool)) { virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("storage pool is not active")); + _("storage pool '%s' is not active"), pool->def->name); goto cleanup; } @@ -822,7 +825,7 @@ storagePoolDelete(virStoragePoolPtr obj, if (!pool) { virReportError(VIR_ERR_NO_STORAGE_POOL, - "%s", _("no storage pool with matching uuid")); + _("no storage pool with matching uuid %s"), obj->uuid); goto cleanup; } @@ -831,7 +834,8 @@ storagePoolDelete(virStoragePoolPtr obj, if (virStoragePoolObjIsActive(pool)) { virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("storage pool is still active")); + _("storage pool '%s' is still active"), + pool->def->name); goto cleanup; } @@ -875,7 +879,7 @@ storagePoolRefresh(virStoragePoolPtr obj, if (!pool) { virReportError(VIR_ERR_NO_STORAGE_POOL, - "%s", _("no storage pool with matching uuid")); + _("no storage pool with matching uuid %s"), obj->uuid); goto cleanup; } @@ -884,7 +888,7 @@ storagePoolRefresh(virStoragePoolPtr obj, if (!virStoragePoolObjIsActive(pool)) { virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("storage pool is not active")); + _("storage pool '%s' is not active"), pool->def->name); goto cleanup; } @@ -931,7 +935,7 @@ storagePoolGetInfo(virStoragePoolPtr obj, if (!pool) { virReportError(VIR_ERR_NO_STORAGE_POOL, - "%s", _("no storage pool with matching uuid")); + _("no storage pool with matching uuid %s"), obj->uuid); goto cleanup; } @@ -971,7 +975,7 @@ storagePoolGetXMLDesc(virStoragePoolPtr obj, if (!pool) { virReportError(VIR_ERR_NO_STORAGE_POOL, - "%s", _("no storage pool with matching uuid")); + _("no storage pool with matching uuid %s"), obj->uuid); goto cleanup; } @@ -1001,7 +1005,7 @@ storagePoolGetAutostart(virStoragePoolPtr obj, if (!pool) { virReportError(VIR_ERR_NO_STORAGE_POOL, - "%s", _("no pool with matching uuid")); + _("no storage pool with matching uuid %s"), obj->uuid); goto cleanup; } @@ -1030,7 +1034,7 @@ storagePoolSetAutostart(virStoragePoolPtr obj, if (!pool) { virReportError(VIR_ERR_NO_STORAGE_POOL, - "%s", _("no pool with matching uuid")); + _("no storage pool with matching uuid %s"), obj->uuid); goto cleanup; } @@ -1090,13 +1094,13 @@ storagePoolNumVolumes(virStoragePoolPtr obj) { if (!pool) { virReportError(VIR_ERR_NO_STORAGE_POOL, - "%s", _("no storage pool with matching uuid")); + _("no storage pool with matching uuid %s"), obj->uuid); goto cleanup; } if (!virStoragePoolObjIsActive(pool)) { virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("storage pool is not active")); + _("storage pool '%s' is not active"), pool->def->name); goto cleanup; } ret = pool->volumes.count; @@ -1123,13 +1127,13 @@ storagePoolListVolumes(virStoragePoolPtr obj, if (!pool) { virReportError(VIR_ERR_NO_STORAGE_POOL, - "%s", _("no storage pool with matching uuid")); + _("no storage pool with matching uuid %s"), obj->uuid); goto cleanup; } if (!virStoragePoolObjIsActive(pool)) { virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("storage pool is not active")); + _("storage pool '%s' is not active"), pool->def->name); goto cleanup; } @@ -1172,14 +1176,15 @@ storagePoolListAllVolumes(virStoragePoolPtr pool, storageDriverUnlock(driver); if (!obj) { - virReportError(VIR_ERR_NO_STORAGE_POOL, "%s", - _("no storage pool with matching uuid")); + virReportError(VIR_ERR_NO_STORAGE_POOL, + _("no storage pool with matching uuid %s"), + pool->uuid); goto cleanup; } if (!virStoragePoolObjIsActive(obj)) { - virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("storage pool is not active")); + virReportError(VIR_ERR_OPERATION_INVALID, + _("storage pool '%s' is not active"), obj->def->name); goto cleanup; } @@ -1234,13 +1239,13 @@ storageVolumeLookupByName(virStoragePoolPtr obj, if (!pool) { virReportError(VIR_ERR_NO_STORAGE_POOL, - "%s", _("no storage pool with matching uuid")); + _("no storage pool with matching uuid %s"), obj->uuid); goto cleanup; } if (!virStoragePoolObjIsActive(pool)) { virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("storage pool is not active")); + _("storage pool '%s' is not active"), pool->def->name); goto cleanup; } @@ -1288,7 +1293,7 @@ storageVolumeLookupByKey(virConnectPtr conn, if (!ret) virReportError(VIR_ERR_NO_STORAGE_VOL, - "%s", _("no storage vol with matching key")); + _("no storage vol with matching key %s"), key); return ret; } @@ -1339,7 +1344,7 @@ storageVolumeLookupByPath(virConnectPtr conn, if (!ret) virReportError(VIR_ERR_NO_STORAGE_VOL, - "%s", _("no storage vol with matching path")); + _("no storage vol with matching path %s"), path); VIR_FREE(cleanpath); storageDriverUnlock(driver); @@ -1367,13 +1372,13 @@ storageVolumeCreateXML(virStoragePoolPtr obj, if (!pool) { virReportError(VIR_ERR_NO_STORAGE_POOL, - "%s", _("no storage pool with matching uuid")); + _("no storage pool with matching uuid %s"), obj->uuid); goto cleanup; } if (!virStoragePoolObjIsActive(pool)) { virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("storage pool is not active")); + _("storage pool '%s' is not active"), pool->def->name); goto cleanup; } @@ -1386,7 +1391,7 @@ storageVolumeCreateXML(virStoragePoolPtr obj, if (virStorageVolDefFindByName(pool, voldef->name)) { virReportError(VIR_ERR_NO_STORAGE_VOL, - "%s", _("storage vol already exists")); + _("storage vol '%s' already exists"), voldef->name); goto cleanup; } @@ -1496,7 +1501,7 @@ storageVolumeCreateXMLFrom(virStoragePoolPtr obj, storageDriverUnlock(driver); if (!pool) { virReportError(VIR_ERR_NO_STORAGE_POOL, - "%s", _("no storage pool with matching uuid")); + _("no storage pool with matching uuid %s"), obj->uuid); goto cleanup; } @@ -1509,13 +1514,14 @@ storageVolumeCreateXMLFrom(virStoragePoolPtr obj, if (!virStoragePoolObjIsActive(pool)) { virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("storage pool is not active")); + _("storage pool '%s' is not active"), pool->def->name); goto cleanup; } if (origpool && !virStoragePoolObjIsActive(origpool)) { virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("storage pool is not active")); + _("storage pool '%s' is not active"), + origpool->def->name); goto cleanup; } @@ -1655,13 +1661,14 @@ storageVolumeDownload(virStorageVolPtr obj, if (!pool) { virReportError(VIR_ERR_NO_STORAGE_POOL, - "%s", _("no storage pool with matching uuid")); + _("no storage pool with matching name '%s'"), + obj->pool); goto out; } if (!virStoragePoolObjIsActive(pool)) { virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("storage pool is not active")); + _("storage pool '%s' is not active"), pool->def->name); goto out; } @@ -1717,13 +1724,14 @@ storageVolumeUpload(virStorageVolPtr obj, if (!pool) { virReportError(VIR_ERR_NO_STORAGE_POOL, - "%s", _("no storage pool with matching uuid")); + _("no storage pool with matching name '%s'"), + obj->pool); goto out; } if (!virStoragePoolObjIsActive(pool)) { virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("storage pool is not active")); + _("storage pool '%s' is not active"), pool->def->name); goto out; } @@ -1779,14 +1787,15 @@ storageVolumeResize(virStorageVolPtr obj, storageDriverUnlock(driver); if (!pool) { - virReportError(VIR_ERR_NO_STORAGE_POOL, "%s", - _("no storage pool with matching uuid")); + virReportError(VIR_ERR_NO_STORAGE_POOL, + _("no storage pool with matching name '%s'"), + obj->pool); goto out; } if (!virStoragePoolObjIsActive(pool)) { - virReportError(VIR_ERR_OPERATION_INVALID, "%s", - _("storage pool is not active")); + virReportError(VIR_ERR_OPERATION_INVALID, + _("storage pool '%s' is not active"), pool->def->name); goto out; } @@ -2074,13 +2083,14 @@ storageVolumeWipePattern(virStorageVolPtr obj, if (!pool) { virReportError(VIR_ERR_NO_STORAGE_POOL, - "%s", _("no storage pool with matching uuid")); + _("no storage pool with matching name '%s'"), + obj->pool); goto out; } if (!virStoragePoolObjIsActive(pool)) { virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("storage pool is not active")); + _("storage pool '%s' is not active"), pool->def->name); goto out; } @@ -2138,13 +2148,14 @@ storageVolumeDelete(virStorageVolPtr obj, if (!pool) { virReportError(VIR_ERR_NO_STORAGE_POOL, - "%s", _("no storage pool with matching uuid")); + _("no storage pool with matching name '%s'"), + obj->pool); goto cleanup; } if (!virStoragePoolObjIsActive(pool)) { virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("storage pool is not active")); + _("storage pool '%s' is not active"), pool->def->name); goto cleanup; } @@ -2219,13 +2230,14 @@ storageVolumeGetInfo(virStorageVolPtr obj, if (!pool) { virReportError(VIR_ERR_NO_STORAGE_POOL, - "%s", _("no storage pool with matching uuid")); + _("no storage pool with matching name '%s'"), + obj->pool); goto cleanup; } if (!virStoragePoolObjIsActive(pool)) { virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("storage pool is not active")); + _("storage pool '%s' is not active"), pool->def->name); goto cleanup; } @@ -2275,13 +2287,14 @@ storageVolumeGetXMLDesc(virStorageVolPtr obj, if (!pool) { virReportError(VIR_ERR_NO_STORAGE_POOL, - "%s", _("no storage pool with matching uuid")); + _("no storage pool with matching name '%s'"), + obj->pool); goto cleanup; } if (!virStoragePoolObjIsActive(pool)) { virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("storage pool is not active")); + _("storage pool '%s' is not active"), pool->def->name); goto cleanup; } @@ -2322,13 +2335,14 @@ storageVolumeGetPath(virStorageVolPtr obj) { storageDriverUnlock(driver); if (!pool) { virReportError(VIR_ERR_NO_STORAGE_POOL, - "%s", _("no storage pool with matching uuid")); + _("no storage pool with matching name '%s'"), + obj->pool); goto cleanup; } if (!virStoragePoolObjIsActive(pool)) { virReportError(VIR_ERR_OPERATION_INVALID, - "%s", _("storage pool is not active")); + _("storage pool '%s' is not active"), pool->def->name); goto cleanup; } -- 1.7.11.4

2 2

[libvirt] [PATCH 0/2] Cleanly save session VMs on logout/shutdown
by Alexander Larsson 10 Oct '12

10 Oct '12

Atm, when you exit the sessin (via logout or shutdown for instance) we just leave the qemu:///session handling libvirtd process around, including any running VMs. This is not particularly nice, as there is no way to know that the VMs are running, and you risk data loss if you shutdown while the VMs are running. This new version is basically the same as the previous, except it runs inside libvirtd, and it exits libvirtd too after saving the VMs. Alexander Larsson (2): virdbus: Add virDBusGetSessionBus helper Shut down session libvirtd cleanly daemon/libvirtd.c | 244 +++++++++++++++++++++++++++++++++++++++++++++++ src/libvirt_private.syms | 1 + src/util/virdbus.c | 84 ++++++++++++---- src/util/virdbus.h | 1 + 4 files changed, 310 insertions(+), 20 deletions(-) -- 1.7.12.1

2 4

[libvirt] [PATCH] Make virInitialize thread safe
by Daniel P. Berrange 10 Oct '12

10 Oct '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Currently there is a restriction that multi-threaded applications must manually call virInitialize, before threads start using libvirt, because it is not thread-safe. By switching it to use a virOnceControl initializer we gain thread safety, and thus applications no longer need to manually call it. They can rely on virConnectOpen invoking it for them. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/libvirt.c | 139 ++++++++++++++++++++++++++++++---------------------------- 1 file changed, 71 insertions(+), 68 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 76e4401..b616f41 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -59,6 +59,7 @@ #include "command.h" #include "virrandom.h" #include "viruri.h" +#include "threads.h" #ifdef WITH_TEST # include "test/test_driver.h" @@ -119,7 +120,7 @@ static int virNWFilterDriverTabCount = 0; static virStateDriverPtr virStateDriverTab[MAX_DRIVERS]; static int virStateDriverTabCount = 0; #endif -static int initialized = 0; + #if defined(POLKIT_AUTH) static int virConnectAuthGainPolkit(const char *privilege) { @@ -391,29 +392,16 @@ static struct gcry_thread_cbs virTLSThreadImpl = { } \ } while (0) -/** - * virInitialize: - * - * Initialize the library. It's better to call this routine at startup - * in multithreaded applications to avoid potential race when initializing - * the library. - * - * Calling virInitialize is mandatory, unless your first API call is one of - * virConnectOpen*. - * - * Returns 0 in case of success, -1 in case of error - */ -int -virInitialize(void) -{ - if (initialized) - return 0; - initialized = 1; +static bool virGlobalError = false; +static virOnceControl virGlobalOnce = VIR_ONCE_CONTROL_INITIALIZER; +static void +virGlobalInit(void) +{ if (virThreadInitialize() < 0 || virErrorInitialize() < 0) - return -1; + goto error; gcry_control(GCRYCTL_SET_THREAD_CBS, &virTLSThreadImpl); gcry_check_version(NULL); @@ -429,47 +417,87 @@ virInitialize(void) VIR_DEBUG("register drivers"); #if HAVE_WINSOCK2_H - if (winsock_init () == -1) return -1; + if (winsock_init () == -1) + goto error; #endif if (!bindtextdomain(PACKAGE, LOCALEDIR)) - return -1; + goto error; /* * Note that the order is important: the first ones have a higher * priority when calling virConnectOpen. */ #ifdef WITH_TEST - if (testRegister() == -1) return -1; + if (testRegister() == -1) + goto error; #endif #ifdef WITH_OPENVZ - if (openvzRegister() == -1) return -1; + if (openvzRegister() == -1) + goto error; #endif #ifdef WITH_VMWARE - if (vmwareRegister() == -1) return -1; + if (vmwareRegister() == -1) + goto error; #endif #ifdef WITH_PHYP - if (phypRegister() == -1) return -1; + if (phypRegister() == -1) + goto error; #endif #ifdef WITH_VBOX - if (vboxRegister() == -1) return -1; + if (vboxRegister() == -1) + goto error; #endif #ifdef WITH_ESX - if (esxRegister() == -1) return -1; + if (esxRegister() == -1) + goto error; #endif #ifdef WITH_HYPERV - if (hypervRegister() == -1) return -1; + if (hypervRegister() == -1) + goto error; #endif #ifdef WITH_XENAPI - if (xenapiRegister() == -1) return -1; + if (xenapiRegister() == -1) + goto error; #endif #ifdef WITH_PARALLELS - if (parallelsRegister() == -1) return -1; + if (parallelsRegister() == -1) + goto error; #endif #ifdef WITH_REMOTE - if (remoteRegister () == -1) return -1; + if (remoteRegister () == -1) + goto error; #endif + return; + +error: + virGlobalError = true; +} + +/** + * virInitialize: + * + * Initialize the library. + * + * This method is invoked automatically by any of the virConnectOpen API + * calls. Since release 1.0.0, there is no need to call this method even + * in a multithreaded application, since initialization is performed in + * a thread safe manner. + * + * The only time it would be neccessary to call virInitialize is if the + * application did not invoke virConnectOpen as its first API call. + * + * Returns 0 in case of success, -1 in case of error + */ +int +virInitialize(void) +{ + if (virOnce(&virGlobalOnce, virGlobalInit) < 0) + return -1; + + if (virGlobalError) + return -1; return 0; } @@ -553,9 +581,6 @@ DllMain (HINSTANCE instance ATTRIBUTE_UNUSED, int virRegisterNetworkDriver(virNetworkDriverPtr driver) { - if (virInitialize() < 0) - return -1; - virCheckNonNullArgReturn(driver, -1); if (virNetworkDriverTabCount >= MAX_DRIVERS) { @@ -583,9 +608,6 @@ virRegisterNetworkDriver(virNetworkDriverPtr driver) int virRegisterInterfaceDriver(virInterfaceDriverPtr driver) { - if (virInitialize() < 0) - return -1; - virCheckNonNullArgReturn(driver, -1); if (virInterfaceDriverTabCount >= MAX_DRIVERS) { @@ -613,9 +635,6 @@ virRegisterInterfaceDriver(virInterfaceDriverPtr driver) int virRegisterStorageDriver(virStorageDriverPtr driver) { - if (virInitialize() < 0) - return -1; - virCheckNonNullArgReturn(driver, -1); if (virStorageDriverTabCount >= MAX_DRIVERS) { @@ -643,9 +662,6 @@ virRegisterStorageDriver(virStorageDriverPtr driver) int virRegisterDeviceMonitor(virDeviceMonitorPtr driver) { - if (virInitialize() < 0) - return -1; - virCheckNonNullArgReturn(driver, -1); if (virDeviceMonitorTabCount >= MAX_DRIVERS) { @@ -673,9 +689,6 @@ virRegisterDeviceMonitor(virDeviceMonitorPtr driver) int virRegisterSecretDriver(virSecretDriverPtr driver) { - if (virInitialize() < 0) - return -1; - virCheckNonNullArgReturn(driver, -1); if (virSecretDriverTabCount >= MAX_DRIVERS) { @@ -703,9 +716,6 @@ virRegisterSecretDriver(virSecretDriverPtr driver) int virRegisterNWFilterDriver(virNWFilterDriverPtr driver) { - if (virInitialize() < 0) - return -1; - virCheckNonNullArgReturn(driver, -1); if (virNWFilterDriverTabCount >= MAX_DRIVERS) { @@ -736,9 +746,6 @@ virRegisterDriver(virDriverPtr driver) { VIR_DEBUG("driver=%p name=%s", driver, driver ? NULLSTR(driver->name) : "(null)"); - if (virInitialize() < 0) - return -1; - virCheckNonNullArgReturn(driver, -1); if (virDriverTabCount >= MAX_DRIVERS) { @@ -767,9 +774,6 @@ virRegisterDriver(virDriverPtr driver) int virRegisterStateDriver(virStateDriverPtr driver) { - if (virInitialize() < 0) - return -1; - virCheckNonNullArgReturn(driver, -1); if (virStateDriverTabCount >= MAX_DRIVERS) { @@ -895,9 +899,8 @@ virGetVersion(unsigned long *libVer, const char *type ATTRIBUTE_UNUSED, { VIR_DEBUG("libVir=%p, type=%s, typeVer=%p", libVer, type, typeVer); - if (!initialized) - if (virInitialize() < 0) - goto error; + if (virInitialize() < 0) + goto error; if (libVer == NULL) goto error; @@ -1332,9 +1335,9 @@ virConnectPtr virConnectOpen (const char *name) { virConnectPtr ret = NULL; - if (!initialized) - if (virInitialize() < 0) - goto error; + + if (virInitialize() < 0) + goto error; VIR_DEBUG("name=%s", name); virResetLastError(); @@ -1367,9 +1370,9 @@ virConnectPtr virConnectOpenReadOnly(const char *name) { virConnectPtr ret = NULL; - if (!initialized) - if (virInitialize() < 0) - goto error; + + if (virInitialize() < 0) + goto error; VIR_DEBUG("name=%s", name); virResetLastError(); @@ -1406,9 +1409,9 @@ virConnectOpenAuth(const char *name, unsigned int flags) { virConnectPtr ret = NULL; - if (!initialized) - if (virInitialize() < 0) - goto error; + + if (virInitialize() < 0) + goto error; VIR_DEBUG("name=%s, auth=%p, flags=%x", NULLSTR(name), auth, flags); virResetLastError(); -- 1.7.11.2

3 3

[libvirt] Schedule for the next release: 1.0.0
by Daniel Veillard 10 Oct '12

10 Oct '12

After checking with Dan and other developpers, there is some agreement that we should finally bump the major release number, and we would like to do it beginning of November i.e. in sync for the next release. As usual all API and ABIs will be kept, this is just a numbering issue ! To try to avoid if possible another "brown paper bag" release just after 1.0.0, it seems logical to extend the testing period a bit, to a week and a half. So be prepared to enter freeze for 1.0.0 around the 24th in a couple of weeks, and celebrate around Nov 2 ! Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel(a)veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/

1 0

[libvirt] [PATCH] libvirt: Change maximum CPU per node calculation.
by Viktor Mihajlovski 10 Oct '12

10 Oct '12

The macro VIR_NODEINFO_MAXCPUS computes the maximum number of supported CPUs for a node as the product of sockets, cores and threads from the virNodeInfo structure. Since topology cannot be discovered for offline CPUs, any of the values for sockets, cores or threads can be wrong (too small). As a consequence the per-VCPU CPU masks are truncated incorrectly and it's impossible to correlate the bits in the masks with actual CPUs on the host. Example: Host has 3 logical CPUs, 1 socket, 3 cores, 1 thread. Guest has 1 virtual CPU and is started while all 3 host CPUs are online. $ virsh vcpuinfo guest VCPU: 0 CPU: 0 State: running CPU time: 35.4s CPU Affinity: yyy $ echo 0 > /sys/devices/system/cpu/cpu1/online $ virsh vcpuinfo guest VCPU: 0 CPU: 0 State: running CPU time: 35.5s CPU Affinity: y- The correct display for CPU affinity would have been y-y, as the guest continues to use CPUs 0 and 2. This is not a display problem only, because it is also not possible to explicitly pin the virtual CPU to host CPUs 0 and 2, due to the truncated CPU mask. To prevent this, the following changes have been made: 1. In virNodeParseNode count all logical CPUs, offline or online and pass them back in a new argument 'maxcpus'. 2. Extend the virNodeInfo struct with a new member 'maxcpus' containing the number of all logical CPUs, online and offline. 3. Change the macro VIR_NODEINFO_MAXCPUS to return virNodeInfo.maxpus Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- include/libvirt/libvirt.h.in | 3 ++- src/nodeinfo.c | 17 +++++++++++++---- src/remote/remote_protocol.x | 1 + src/remote_protocol-structs | 1 + 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index 81f12a4..16265b5 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -445,6 +445,7 @@ struct _virNodeInfo { total number of CPU sockets otherwise */ unsigned int cores; /* number of cores per socket */ unsigned int threads;/* number of threads per core */ + unsigned int maxcpus;/* number of maximum cpus - online and offline */ }; /** @@ -1039,7 +1040,7 @@ int virDomainMigrateGetMaxSpeed(virDomainPtr domain, */ -#define VIR_NODEINFO_MAXCPUS(nodeinfo) ((nodeinfo).nodes*(nodeinfo).sockets*(nodeinfo).cores*(nodeinfo).threads) +#define VIR_NODEINFO_MAXCPUS(nodeinfo) ((nodeinfo).maxcpus) /** * virNodeInfoPtr: diff --git a/src/nodeinfo.c b/src/nodeinfo.c index c0e60d8..2e9c111 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -202,9 +202,11 @@ CPU_COUNT(cpu_set_t *set) /* parses a node entry, returning number of processors in the node and * filling arguments */ static int -virNodeParseNode(const char *node, int *sockets, int *cores, int *threads) +virNodeParseNode(const char *node, int *sockets, int *cores, + int *threads, int *cpus) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) ATTRIBUTE_NONNULL(4) + ATTRIBUTE_NONNULL(5) { int ret = -1; int processors = 0; @@ -223,6 +225,7 @@ virNodeParseNode(const char *node, int *sockets, int *cores, int *threads) *threads = 0; *cores = 0; *sockets = 0; + *cpus = 0; if (!(cpudir = opendir(node))) { virReportSystemError(errno, _("cannot opendir %s"), node); @@ -275,6 +278,8 @@ virNodeParseNode(const char *node, int *sockets, int *cores, int *threads) if (sscanf(cpudirent->d_name, "cpu%u", &cpu) != 1) continue; + (*cpus)++; + if ((online = virNodeGetCpuValue(node, cpu, "online", true)) < 0) goto cleanup; @@ -348,7 +353,7 @@ int linuxNodeInfoCPUPopulate(FILE *cpuinfo, char line[1024]; DIR *nodedir = NULL; struct dirent *nodedirent = NULL; - int cpus, cores, socks, threads; + int cpus, cores, socks, threads, maxcpus; unsigned int node; int ret = -1; char *sysfs_nodedir = NULL; @@ -358,6 +363,7 @@ int linuxNodeInfoCPUPopulate(FILE *cpuinfo, nodeinfo->mhz = 0; nodeinfo->cores = 0; nodeinfo->nodes = 0; + nodeinfo->maxcpus = 0; /* Start with parsing CPU clock speed from /proc/cpuinfo */ while (fgets(line, sizeof(line), cpuinfo) != NULL) { @@ -470,12 +476,13 @@ int linuxNodeInfoCPUPopulate(FILE *cpuinfo, } if ((cpus = virNodeParseNode(sysfs_cpudir, &socks, - &cores, &threads)) < 0) + &cores, &threads, &maxcpus)) < 0) goto cleanup; VIR_FREE(sysfs_cpudir); nodeinfo->cpus += cpus; + nodeinfo->maxcpus += maxcpus; if (socks > nodeinfo->sockets) nodeinfo->sockets = socks; @@ -505,7 +512,8 @@ fallback: goto cleanup; } - if ((cpus = virNodeParseNode(sysfs_cpudir, &socks, &cores, &threads)) < 0) + if ((cpus = virNodeParseNode(sysfs_cpudir, &socks, &cores, + &threads, &maxcpus)) < 0) goto cleanup; nodeinfo->nodes = 1; @@ -513,6 +521,7 @@ fallback: nodeinfo->sockets = socks; nodeinfo->cores = cores; nodeinfo->threads = threads; + nodeinfo->maxcpus = maxcpus; done: /* There should always be at least one cpu, socket, node, and thread. */ diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index b0b530c..40883d0 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -465,6 +465,7 @@ struct remote_node_get_info_ret { /* insert@1 */ int sockets; int cores; int threads; + int maxcpus; }; struct remote_get_capabilities_ret { diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs index 4d2627a..8fece92 100644 --- a/src/remote_protocol-structs +++ b/src/remote_protocol-structs @@ -144,6 +144,7 @@ struct remote_node_get_info_ret { int sockets; int cores; int threads; + int maxcpus; }; struct remote_get_capabilities_ret { remote_nonnull_string capabilities; -- 1.7.0.4

2 3

[libvirt] [PATCH] qemu: Create or remove cgroup when doing vcpu (un)hotpluging
by Osier Yang 10 Oct '12

10 Oct '12

Various APIs use cgroup to either set or get the statistics of host or guest. Hotplug or unhotplug new vcpus without creating or removing the cgroup for the vcpus could cause problems for those APIs. E.g. % virsh vcpucount dom maximum config 10 maximum live 10 current config 1 current live 1 % virsh setvcpu dom 2 % virsh schedinfo dom --set vcpu_quota=1000 Scheduler : posix error: Unable to find vcpu cgroup for rhel6.2(vcpu: 1): No such file or directory This patch fixes the problem by creating cgroups for each of the onlined vcpus, and destroying cgroups for each of the offlined vcpus. --- src/qemu/qemu_driver.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 53 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 97ad23e..b8ceca1 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3601,6 +3601,8 @@ static int qemudDomainHotplugVcpus(struct qemud_driver *driver, int vcpus = oldvcpus; pid_t *cpupids = NULL; int ncpupids; + virCgroupPtr cgroup = NULL; + virCgroupPtr cgroup_vcpu = NULL; qemuDomainObjEnterMonitor(driver, vm); @@ -3654,6 +3656,53 @@ static int qemudDomainHotplugVcpus(struct qemud_driver *driver, goto cleanup; } + if (virCgroupForDomain(driver->cgroup, vm->def->name, &cgroup, 0) == 0) { + int rv = -1; + + if (nvcpus > oldvcpus) { + for (i = oldvcpus; i < nvcpus; i++) { + /* Create cgroup for the onlined vcpu */ + rv = virCgroupForVcpu(cgroup, i, &cgroup_vcpu, 1); + if (rv < 0) { + virReportSystemError(-rv, + _("Unable to create vcpu cgroup for %s(vcpu:" + " %d)"), + vm->def->name, i); + goto cleanup; + } + + /* Add vcpu thread to the cgroup */ + rv = virCgroupAddTask(cgroup_vcpu, cpupids[i]); + if (rv < 0) { + virReportSystemError(-rv, + _("unable to add vcpu %d task %d to cgroup"), + i, cpupids[i]); + virCgroupRemove(cgroup_vcpu); + goto cleanup; + } + + virCgroupFree(&cgroup_vcpu); + } + } else { + for (i = oldvcpus - 1; i >= nvcpus; i--) { + rv = virCgroupForVcpu(cgroup, i, &cgroup_vcpu, 0); + if (rv < 0) { + virReportSystemError(-rv, + _("Unable to access vcpu cgroup for %s(vcpu:" + " %d)"), + vm->def->name, i); + goto cleanup; + } + + /* Remove cgroup for the offlined vcpu */ + virCgroupRemove(cgroup_vcpu); + virCgroupFree(&cgroup_vcpu); + } + } + + virCgroupFree(&cgroup); + } + priv->nvcpupids = ncpupids; VIR_FREE(priv->vcpupids); priv->vcpupids = cpupids; @@ -3664,6 +3713,10 @@ cleanup: vm->def->vcpus = vcpus; VIR_FREE(cpupids); virDomainAuditVcpu(vm, oldvcpus, nvcpus, "update", rc == 1); + if (cgroup) + virCgroupFree(&cgroup); + if (cgroup_vcpu) + virCgroupFree(&cgroup_vcpu); return ret; unsupported: -- 1.7.7.6

3 3

[libvirt] [PATCH] win32: Pretend that close-on-exec works
by Matthias Bolte 09 Oct '12

09 Oct '12

Currently virNetSocketNew fails because virSetCloseExec fails as there is no proper implementation for it on Windows at the moment. Workaround this by pretending that setting close-on-exec on the fd works. This can be done because libvirt currently lacks the ability to create child processes on Windows anyway. So there is no point in failing to set a flag that isn't useful at the moment anyway. --- src/util/util.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/util/util.c b/src/util/util.c index 43fdaf1..356a03a 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -275,7 +275,11 @@ int virSetInherit(int fd, bool inherit) { int virSetInherit(int fd ATTRIBUTE_UNUSED, bool inherit ATTRIBUTE_UNUSED) { - return -1; + /* FIXME: Currently creating child processes is not supported on + * Win32, so there is no point in failing calls that are only relevant + * when creating child processes. So just pretend that we changed the + * inheritance property of the given fd as requested. */ + return 0; } #endif /* WIN32 */ -- 1.7.4.1

2 2

[libvirt] [PATCH] esx: Fix dynamic dispatch for types with more than one level of inheritance
by Matthias Bolte 09 Oct '12

09 Oct '12

Traverse the whole inheritance hierarchy for dynamic dispatch as it is already done for the dynamic cast. Also make AnyType cast errors more verbose. Reported by Ata Bohra. --- src/esx/esx_vi_generator.py | 36 ++++++++++++++++++++++++------------ src/esx/esx_vi_types.c | 12 ++++++++---- 2 files changed, 32 insertions(+), 16 deletions(-) diff --git a/src/esx/esx_vi_generator.py b/src/esx/esx_vi_generator.py index c4bbb03..af4e7e8 100755 --- a/src/esx/esx_vi_generator.py +++ b/src/esx/esx_vi_generator.py @@ -484,6 +484,26 @@ class Object(Type): return members + def generate_dispatch(self, suffix, is_first=True): + source = "" + + if self.extended_by is not None: + if not is_first: + source += "\n" + + source += " /* %s */\n" % self.name + + for extended_by in self.extended_by: + source += " ESX_VI__TEMPLATE__DISPATCH__%s(%s)\n" \ + % (suffix, extended_by) + + for extended_by in self.extended_by: + source += objects_by_name[extended_by] \ + .generate_dispatch(suffix, False) + + return source + + def generate_free_code(self, add_banner=False): source = "" @@ -835,9 +855,7 @@ class Object(Type): source += "ESX_VI__TEMPLATE__DYNAMIC_DEEP_COPY(%s,\n" % self.name source += "{\n" - for extended_by in self.extended_by: - source += " ESX_VI__TEMPLATE__DISPATCH__DEEP_COPY(%s)\n" \ - % extended_by + source += self.generate_dispatch('DEEP_COPY') source += "},\n" source += "{\n" @@ -863,9 +881,7 @@ class Object(Type): % self.name source += "{\n" - for extended_by in self.extended_by: - source += " ESX_VI__TEMPLATE__DISPATCH__CAST_FROM_ANY_TYPE(%s)\n" \ - % extended_by + source += self.generate_dispatch('CAST_FROM_ANY_TYPE') source += "})\n\n" @@ -895,9 +911,7 @@ class Object(Type): source += "ESX_VI__TEMPLATE__DYNAMIC_SERIALIZE(%s,\n" % self.name source += "{\n" - for extended_by in self.extended_by: - source += " ESX_VI__TEMPLATE__DISPATCH__SERIALIZE(%s)\n" \ - % extended_by + source += self.generate_dispatch('SERIALIZE') source += "},\n" source += "{\n" @@ -933,9 +947,7 @@ class Object(Type): % self.name source += "{\n" - for extended_by in self.extended_by: - source += " ESX_VI__TEMPLATE__DISPATCH__DESERIALIZE(%s)\n" \ - % extended_by + source += self.generate_dispatch('DESERIALIZE') source += "},\n" source += "{\n" diff --git a/src/esx/esx_vi_types.c b/src/esx/esx_vi_types.c index d2c71c7..c5ddb51 100644 --- a/src/esx/esx_vi_types.c +++ b/src/esx/esx_vi_types.c @@ -212,8 +212,10 @@ { \ if (anyType->type != esxVI_Type_##_type) { \ virReportError(VIR_ERR_INTERNAL_ERROR, \ - _("Call to %s for unexpected type '%s'"), \ - __FUNCTION__, anyType->other); \ + _("Call to %s for unexpected type '%s', " \ + "expected '%s'"), \ + __FUNCTION__, anyType->other, \ + esxVI_Type_ToString(esxVI_Type_##_type)); \ return -1; \ } \ }, /* nothing */) @@ -225,8 +227,10 @@ { \ if (anyType->type != esxVI_Type_##_type) { \ virReportError(VIR_ERR_INTERNAL_ERROR, \ - _("Call to %s for unexpected type '%s'"), \ - __FUNCTION__, anyType->other); \ + _("Call to %s for unexpected type '%s', " \ + "expected '%s'"), \ + __FUNCTION__, anyType->other, \ + esxVI_Type_ToString(esxVI_Type_##_type)); \ return -1; \ } \ }, Value) -- 1.7.4.1

2 2

[libvirt] IPV6 and routing
by Gene Czarcinski 09 Oct '12

09 Oct '12

As I have mentioned in other messages, I am interested in having full support for IPv6 in libvirt. To me this includes having dhcp6 for IPV6 address assignment and using RA (radvd) to establish the default route. This is what I am using on my real LANs. Before starting into adding dhcp6 support to libvirt, I wanted to see just how it works with the current software. First of all, it appears that, when nat or routed are specified for IPv4, the IPv6 is routed. If it is an isolated/private network, then it can only work with other guests on that network. The iptables and ip6tables settings corresponded and were as expected. On the virtualization host, both IPv4 and IPv6 forwarding are enabled. While I can easily do stuff like ping6 and ssh -6 from virtual guests to the virtualization host, I have been unable to do anything with external hosts ... unless I add a static route for the virtual IPv6 network on the target host back to the virtualization host. This is the only way I have gotten anything to work. To complicate things, it seem that "everything" wants the IPv6 network to have prefix=64 or things do not work correctly. The real systems use fd00:dead:beef:17::/64 for their network. The virtual networks all use fd00:face:17:xx::/64 for their networks. The network traffic on the virtualization host is forwarded to the target host ... I can see the packets with wireshark on the target host. On the target host I tried specifying a static route for network fd00:face:17::/48 ... well, that really screwed things up, resulted in some "redirects" from the virtualization host saying the that it was sent a malformed packed ... it took a reboot to clean things up. OK, so leave the fd00:face:17:6::/64 static route on the target host but subnetwork this network on the virtualization host using networks like fd00:face:17:6:8::/80 and fd00:face:6:9::/80. This works if I manually configure IPv6 on the virtual guest. Since radvd is "upset" by a non-prefix=64 network, I was not surprised when the guest's automatic IPv6 address/network was not configured. OK, what am I missing? What don't I understand? If IPv6 is going to be useful in virtualization, then there must be some "easy" way to have other systems understand that the virtualization host is acting as a router for the virtual IPv6 networks it runs. While being able to go between the virtualization hosts and the virtual guests is very useful, I do not consider this sufficient. I have googled and found some stuff as well as reading more RFCs than I wanted to but I cannot find anything to address this issue. IIRC, I did find something under a libvirt document that indicates "routed" will be used for some kind of subnetworking. Does libvirt need an IPv6 "NAT" to make this work? Comments? Suggestions? Gene

3 5

[libvirt] ANNOUNCE: libvirt 0.9.11.6 maintenance release
by Cole Robinson 09 Oct '12

09 Oct '12

libvirt 0.9.11.6 maintenance release is now available. This is libvirt 0.9.11 with additional bugfixes that have accumulated upstream since the initial release. This release can be downloaded at: http://libvirt.org/sources/stable_updates/libvirt-0.9.11.6.tar.gz Changes in this version: * remove dnsmasq command line parameter "--filterwin2k" * dnsmasq: avoid forwarding queries without a domain * security: Fix libvirtd crash possibility For info about past maintenance releases, see: http://wiki.libvirt.org/page/Maintenance_Releases Thanks, Cole

3 3

[libvirt] [PATCH] hooks: let virCommand do the error reporting
by Eric Blake 09 Oct '12

09 Oct '12

The code was reporting raw exit status without decoding it into normal vs. signal exit. virCommandRun already does this, but with a different error type, so all we have to do is recast the error to the correct type. Reported by li guang. * src/util/hooks.c (virHookCall): Simplify. --- In response to: https://www.redhat.com/archives/libvir-list/2012-October/msg00308.html src/util/hooks.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/util/hooks.c b/src/util/hooks.c index f5890d2..8817a4e 100644 --- a/src/util/hooks.c +++ b/src/util/hooks.c @@ -1,7 +1,7 @@ /* * hooks.c: implementation of the synchronous hooks support * - * Copyright (C) 2010-2011 Red Hat, Inc. + * Copyright (C) 2010-2012 Red Hat, Inc. * Copyright (C) 2010 Daniel Veillard * * This library is free software; you can redistribute it and/or @@ -206,7 +206,6 @@ virHookCall(int driver, char **output) { int ret; - int exitstatus; char *path; virCommandPtr cmd; const char *drvstr; @@ -279,12 +278,11 @@ virHookCall(int driver, if (output) virCommandSetOutputBuffer(cmd, output); - ret = virCommandRun(cmd, &exitstatus); - if (ret == 0 && exitstatus != 0) { - virReportError(VIR_ERR_HOOK_SCRIPT_FAILED, - _("Hook script %s %s failed with error code %d"), - path, drvstr, exitstatus); - ret = -1; + ret = virCommandRun(cmd, NULL); + if (ret < 0) { + /* Convert INTERNAL_ERROR into known error. */ + virErrorPtr err = virGetLastError(); + virReportError(VIR_ERR_HOOK_SCRIPT_FAILED, "%s", err->message); } virCommandFree(cmd); -- 1.7.11.4

2 3

[libvirt] [libvirt-designer][PATCH 1/2] spec: Update changelog
by Michal Privoznik 09 Oct '12

09 Oct '12

to reflect the brand new release --- libvirt-designer.spec.in | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/libvirt-designer.spec.in b/libvirt-designer.spec.in index 667366c..2ff7487 100644 --- a/libvirt-designer.spec.in +++ b/libvirt-designer.spec.in @@ -103,3 +103,6 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/libvirt-designer %changelog + +Tue Oct 09 2012 Daniel P. Berrange <berrange(a)redhat.com> 0.0.1-1 +- created -- 1.7.8.6

2 5

[libvirt] [PATCH] doc: update description about user/group in qemu.conf
by Marcelo Cerri 09 Oct '12

09 Oct '12

As a side effect of changes in the functions virGetUserID and virGetGroupID, the user and group configurations for DAC in qemu.conf are now able to accept both names and IDs, supporting a leading plus sign to ensure that a numeric value will not be interpreted as a name. This patch updates the comments in qemu.conf, including a description of this new behavior. --- src/qemu/qemu.conf | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index 18105ca..dd853c8 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -180,10 +180,25 @@ # guests will be blocked. Defaults to 0. #security_require_confined = 1 -# The user ID for QEMU processes run by the system instance. +# The user for QEMU processes run by the system instance. It can be +# specified as a user name or as a user id. The qemu driver will try to +# parse this value first as a name and then, if the name doesn't exist, +# as a user id. +# +# Since a sequence of digits is a valid user name, a leading plus sign +# can be used to ensure that a user id will not be interpreted as a user +# name. +# +# Some examples of valid values are: +# +# user = "qemu" # A user named "qemu" +# user = "+0" # Super user (uid=0) +# user = "100" # A user named "100" or a user with uid=100 +# #user = "root" -# The group ID for QEMU processes run by the system instance. +# The group for QEMU processes run by the system instance. It can be +# specified in a similar way to user. #group = "root" # Whether libvirt should dynamically change file ownership -- 1.7.12

2 1

[libvirt] [PATCH] nodeinfo: Fully convert to new virReportError
by Michal Privoznik 09 Oct '12

09 Oct '12

With our latest s/[a-z]+ReportError/virReportError/ rewrite (47ab34e2) we forgot to update arm part of the code. --- Thanks to my masochist idea of compiling libvirt on my Raspberry PI I've discovered this. Pushing under trivial & build breaker (on arm platforms obviously) rules. For those who are interested, it took ages and we don't build cleanly: http://pastebin.com/dkrJaV5Z But I am not sure how to fix those 'cast increases required alignment of target type' warnings. And I am not sure anybody else is ever going to use libvirt on arm. src/nodeinfo.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/nodeinfo.c b/src/nodeinfo.c index 4cbfe63..c0e60d8 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -423,8 +423,8 @@ int linuxNodeInfoCPUPopulate(FILE *cpuinfo, buf++; if (*buf != ':' || !buf[1]) { - nodeReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("parsing cpu MHz from cpuinfo")); + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("parsing cpu MHz from cpuinfo")); goto cleanup; } -- 1.7.8.6

3 2

[libvirt] [PATCH] docs: Drop useless in drvphyp.html.in
by Michal Privoznik 09 Oct '12

09 Oct '12

--- Pushing under trivial rule. docs/drvphyp.html.in | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/docs/drvphyp.html.in b/docs/drvphyp.html.in index 0bd20dd..50e26b2 100644 --- a/docs/drvphyp.html.in +++ b/docs/drvphyp.html.in @@ -43,6 +43,5 @@ phyp://user@ivm/system (IVM connection) <pre> phyp://[username@]{hmc|ivm}/managed_system </pre> - </body></html> -- 1.7.8.6

1 0

[libvirt] [PATCH v2 0/2] extend virGetUserID and virGetGroupID
by Marcelo Cerri 09 Oct '12

09 Oct '12

This patch series moves the logic for parsing users and groups in a similar way to coreutils' chown from security_dac.c to util.c, as suggested by Eric Blake. This change has two majors side effects: 1. Some error messages that were issued when security_dac.c tried to parse an ID as a name are no longer issued. 2. The keys `user` and `group` in qemu.conf can now be defined in the same way that in DAC security labels. Peter Krempa's fix for correctly handling errors returned by getpwnam_r and getgrnam_r is squashed into this patch series. Marcelo Cerri (2): util: extend virGetUserID and virGetGroupID to support names and IDs security: update user and group parsing in security_dac.c src/security/security_dac.c | 45 +++----------- src/util/util.c | 143 ++++++++++++++++++++++++++++++++------------ 2 files changed, 112 insertions(+), 76 deletions(-) -- 1.7.12

2 4

[libvirt] [PATCH 0/3] Cleanly save session VMs on logout/shutdown
by Alexander Larsson 09 Oct '12

09 Oct '12

Atm, when you exit the sessin (via logout or shutdown for instance) we just leave the qemu:///session handling libvirtd process around, including any running VMs. This is not particularly nice, as there is no way to know that the VMs are running, and you risk data loss if you shutdown while the VMs are running. This patch series adds a babysitter to the session that will track session lifetime and shutdown events and save running VMs as needed. Outstanding questions: Can this code be inside libvirtd itself? I.E. is it possible to do VM management calls like virDomainManagedSave() from inside libvirtd itself. If not, who will launch the babysitter? Alexander Larsson (3): Fix typo in HAVE_DBUS automake conditional virdbus: Add virDBusGetSessionBus helper Add new libvirt-babysitter tool configure.ac | 2 +- src/util/virdbus.c | 84 ++++++++++---- src/util/virdbus.h | 1 + tools/Makefile.am | 21 ++++ tools/libvirt-babysitter.c | 276 +++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 363 insertions(+), 21 deletions(-) create mode 100644 tools/libvirt-babysitter.c -- 1.7.12.1

4 9

[libvirt] [PATCH 00/12] Structured syslog (Lumberjack/CEE) support
by Miloslav Trmač 09 Oct '12

09 Oct '12

This patch set adds structured syslog support to libvirt. In short, the idea is to embed JSON in a syslog record. This format is used in a new log output type called "syslog/json". Example "syslog/json" record (line-wrapped for readability): Sep 20 19:59:40 kulicka libvirt: @cee: {"msg":"libvirt version: 0.10.1", "category":"../../src/test/test_driver.c","priority":"info", "funcname":"virLogVMessage","line":769, "timestamp":"2012-09-20 17:59:40.853+0000"} compared with existing "syslog" record format: Sep 20 20:02:24 kulicka libvirt: 5896: info : libvirt version: 0.10.1 This JSON embedding format is defined by the Lumberjack project led by the major Open Source syslog implementations (https://fedorahosted.org/lumberjack/) The format is also a base for a future MITRE CEE standard. Some of the fields are specified at https://fedorahosted.org/lumberjack/wiki/FieldList , but applications are free to use whatever fields make sense for them. The JSON structure makes easy to process logs by programs without writing code that understands the specific format used by each application, or using unreliable regexps (https://fedorahosted.org/ceelog/ is a companion project that allows processing such logs). Current systems will store and these records unmodified and present them to users unmodified, but tools (and probably /var/log/messages) will be able to show only the "msg" field; this allows us to add more detailed information without worsening the user experience (the example above already shows added information that is currently being thrown away when logging to syslog). The patch set, aside from building the required infrastructure, has two main components: * Add the "syslog/json" output type, and use it to record all information passed to virLogMessage. The example result is shown above. This primarily makes it easier to parse the message. * Allow callers of virLogMessage to add arbitrary additional JSON fields, and use it in virRaiseErrorFull and its callers. Because the additional fields for errors include virErrorDomain and virErrorNumber, this allows _programs_ to _automatically_ detect the event and react to it, perhaps alerting the user about a situation that requires immediate attention, or automatically suggesting a solution. This has not been possible until now because the current logs contain only a translated error message, so the log record doesn't contain anything stable that could be detected by a program. It is assumed that other parts of libvirt may add more event-specific JSON fields in the future, based on demand by applications that process the logs; I have, however, no immediate plans to add more. Miloslav Trmač (12): Drop unused return value of virLogOutputFunc Add JSON API for preallocated objects. Split yajl_gen allocation into a separate function. Split adding object properties from virJSONValueToStringOne Add a JSON generator API. Pass the "raw" log message to each virLogOutputFunc Split priority conversion from virLogOutputToSyslog Add "syslog/json" log output format. Add a JSON properties parameter to virLog{,V}Message Add a JSON properties parameter to virLogOutputFunc Add detailed error information to JSON syslog Add a test for the new error reporting mechanism. docs/logging.html.in | 3 + src/libvirt_private.syms | 4 + src/uml/uml_conf.c | 2 +- src/util/json.c | 232 +++++++++++++++++++++++++++++++++++++++++----- src/util/json.h | 26 ++++++ src/util/logging.c | 233 ++++++++++++++++++++++++++++++++++------------- src/util/logging.h | 35 +++---- src/util/viraudit.c | 4 +- src/util/virterror.c | 32 ++++++- tests/Makefile.am | 6 +- tests/errorjsontest.c | 211 ++++++++++++++++++++++++++++++++++++++++++ tests/testutils.c | 7 +- 12 files changed, 684 insertions(+), 111 deletions(-) create mode 100644 tests/errorjsontest.c -- 1.7.11.4

4 24

[libvirt] [ANNOUNCE] libvirt-designer 0.0.1 release
by Daniel P. Berrange 09 Oct '12

09 Oct '12

I am pleased to announce that the first release of the libvirt-designer package, version 0.0.1, is now available from ftp://ftp.libvirt.org/libvirt/designer/ The packages are GPG signed with Key fingerprint: DAF3 A6FD B26B 6291 2D0E 8E3F BE86 EBB4 1510 4FDF (4096R) New in this release: - Everything ! The libvirt-designer package provides a library that integrates libosinfo and libvirt-gconfig. Given an operating system identifier and libvirt host capabilities, it queries the libosinfo database to determine optimal hardware configuration and uses this information to design suitable domain XML for running the OS as a guest. In a similar manner it facilitates the setup of guest hardware devices such as disks, network interfaces, video cards, etc. These APIs are inspired by experience creating internal APIs for similar tasks in the virt-install/virt-manager projects. Since it builds on libosinfo and libvirt-gconfig, the libvirt-designer library relies on GObject introspection to provide access to its APIs for non-C programming languages. In addition it explicitly avoids a direct depedancy on libvirt.so, to enable usage by applications using alternative SNMP, CIM, etc bindings to libvirt, or those applications which simply need to construct libvirt XML without actually booting the guests afterwards. These early releases of libvirt-designer should be considered experimental. While we don't actively plan to change/break the API/ABI, we are not going to guarantee API/ABI stability of libvirt-designer at this time. Follow up comments about libvirt-designer should be directed to the regular libvir-list(a)redhat.com development list. Thanks to all the people involved in contributing to this release, in particular Michal who is actually doing the vast majority of the hard work here. Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

1 0

[libvirt] [PATCH] qemu: Fix QMP detection of QXL graphics
by Jiri Denemark 09 Oct '12

09 Oct '12

With the recent introduction of QMP capabilities probing, libvirt failed to detect support for QXL graphics in QEMU 1.2 and newer. In addition to fixing that, this patch also causes libvirt to detect QXL support for qemu-kvm-0.13.0, which doesn't advertise it in -help output but mentions it in device list. Since qemu-kvm-0.13.0 supported -spice, it looks like not having qxl in -help was a bug. --- src/qemu/qemu_capabilities.c | 1 + tests/qemuhelptest.c | 1 + 2 files changed, 2 insertions(+) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index d16a7bc..982b875 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1276,6 +1276,7 @@ struct qemuCapsStringFlags qemuCapsObjectTypes[] = { { "virtio-scsi-pci", QEMU_CAPS_VIRTIO_SCSI_PCI }, { "spicevmc", QEMU_CAPS_DEVICE_SPICEVMC }, { "qxl-vga", QEMU_CAPS_DEVICE_QXL_VGA }, + { "qxl", QEMU_CAPS_VGA_QXL }, { "sga", QEMU_CAPS_SGA }, { "scsi-block", QEMU_CAPS_SCSI_BLOCK }, { "scsi-cd", QEMU_CAPS_SCSI_CD }, diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c index 681f425..df30ac1 100644 --- a/tests/qemuhelptest.c +++ b/tests/qemuhelptest.c @@ -467,6 +467,7 @@ mymain(void) QEMU_CAPS_NESTING, QEMU_CAPS_NAME_PROCESS, QEMU_CAPS_SMBIOS_TYPE, + QEMU_CAPS_VGA_QXL, QEMU_CAPS_SPICE, QEMU_CAPS_VGA_NONE, QEMU_CAPS_MIGRATE_QEMU_FD, -- 1.7.12

3 3

[libvirt] [PATCH 0/3] non-shared migration without target disk images
by liguang 09 Oct '12

09 Oct '12

by now, if you want a non-shared migration, you have to create same files at target as source side, which seems intorlerable! this issue was reported by Reinier Schoof http://www.redhat.com/archives/libvir-list/2011-December/msg00451.html These patches try to let migrate --copy-storage-* work without pre-exist disk image files at target side. we may also hope qemu to aware of this issue hooks/qemu | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/Makefile.am | 3 ++ src/util/hooks.c | 2 +- 3 files changed, 59 insertions(+), 1 deletions(-)

3 7

[libvirt] [libvirt-list] question about the commands: domhostname and hostname
by Li Zhang 09 Oct '12

09 Oct '12

Hi all, I am testing the virsh commands, and I found that these two commands: * domhostname * hostname >From the manual of virsh commands: * hostname Print the hypervisor hostname. * domhostname domain Returns the hostname of a domain, if the hypervisor makes it available It seems that both of them want to get the host name. What's the difference between them? >From the source code, domhostname only is supported for openvz on 0.10.1. Will this be only for openvz in the future? Any idea? Thanks a lot in advance. -:) -- Best Regards -Li

3 7

[libvirt] virsh blockcommit tests (w/ libvirt & qemu git)
by Kashyap Chamarthy 09 Oct '12

09 Oct '12

Hi, Here are a few tests I've done over the weekend to test blockcommit w/ Eric's block commit patches: - https://www.redhat.com/archives/libvir-list/2012-October/msg00091.html - https://www.redhat.com/archives/libvir-list/2012-October/msg00091.html Most of these are from an earlier disscussion from Eric. (1) (POSITIVE-TEST) Commit data from 3 backing image files into 'base' (top to base) using blockcommit, w/ base & resulting overlays as qcow2: actual state: [base] <-- [snap-1] <-- [snap-2] <-- [snap3] <-- [active-layer] desired state: [base] <-- [act-f17-base.qcow2] (resulting in invalidating snap1, snap2, snap3) #======================# [root@moon libvirt]# virsh blockcommit --domain f17-base vda --wait --base /export/vmimgs2/f17-base.qcow2 --top /export/vmimgs2/snap3-f17-base.qcow2 --verbose Block Commit: [100 %] Commit complete [root@moon libvirt]# #======================# [root@moon ~]# qemu-img info /export/vmimgs2/act-f17-base.qcow2 image: /export/vmimgs2/act-f17-base.qcow2 file format: qcow2 virtual size: 2.0G (2147483648 bytes) disk size: 648K cluster_size: 65536 backing file: /export/vmimgs2/f17-base.qcow2 [root@moon ~]# #======================# (2) (POSITIVE-TEST) Commit data from 2 backing image files into 'base' (top to base) using blockcommit, w/ base as raw & resulting overlays as qcow2: actual state: [base] <-- [snap-1] <-- [snap-2] <-- [snap3] <-- [active-layer] desired state: [base] <--- [snap-3] <--- [active-layer] (resulting in invalidating snap1, snap2) #======================# [root@moon qemu]# virsh blockcommit --domain test-f17base vda --wait --base /var/lib/libvirt/images/snap1-of-test-f17base.qcow2 --top /var/lib/ libvirt/images/snap3-of-test-f17base.qcow2 --verbose Block Commit: [100 %] Commit complete [root@moon qemu]# #======================# [root@moon qemu]# qemu-img info /var/lib/libvirt/images/snap4-of-test-f17base.qcow2 image: /var/lib/libvirt/images/snap4-of-test-f17base.qcow2 file format: qcow2 virtual size: 1.0G (1073741824 bytes) disk size: 2.3M cluster_size: 65536 backing file: /var/lib/libvirt/images/snap1-of-test-f17base.qcow2 [root@moon qemu]# #======================# (3) (NEGATIVE-TEST) Try blockcommit to a base image which is a 'raw' device - Question: I assume the below is expected, right? We cannot do blockcommit into a NON-qcow2 base file? #======================# [root@moon qemu]# virsh blockcommit --domain raw-base vda --wait --base /export/vmimgs2/raw-base.img --top /var/lib/libvirt/images/snap3-b-raw-base.qcow2 --verbose error: internal error unable to execute QEMU command 'block-commit': Could not open '/export/vmimgs2/raw-base.img' [root@moon qemu]# #======================# (4) (NEGATIVE-TEST) Try blockcommit while the guest is 'offline' #======================# [root@moon qemu]# virsh blockcommit --domain test-f17base vda --wait --base /var/lib/libvirt/images/snap1-of-test-f17-base.qcow2 --top /var/lib/libvirt/images/snap3-of-test-f17-base.qcow2 --verbose error: Requested operation is not valid: domain is not running #======================# (5) (NEGATIVE-TEST) Provide a non-existent file path for base or top(and both) #======================# [root@moon qemu]# virsh blockcommit --domain test-f17base vda --wait --base /var/lib/libvirt/images/snap1-of-test-f17base.qcow2 --top /var/lib/libvirt/images/snap3-of--f17base.qcow2 --verbose error: internal error unable to execute QEMU command 'block-commit': Top image file /var/lib/libvirt/images/snap3-of--f17base.qcow2 not found #======================# [root@moon qemu]# virsh blockcommit --domain test-f17base vda --wait --base /var/lib/libvirt/images/snap1-of--f17base.qcow2 --top /var/lib/libvirt/images/snap3-of-test-f17base.qcow2 --verbose error: internal error unable to execute QEMU command 'block-commit': Base '/var/lib/libvirt/images/snap1-of--f17base.qcow2' not found #======================# [root@moon qemu]# virsh blockcommit --domain test-f17base vda --wait --base /var/lib/libvirt/images/snap1-of--f17base.qcow2 --top /var/lib/libvirt/images/snap3-of--f17base.qcow2 --verbose error: internal error unable to execute QEMU command 'block-commit': Base '/var/lib/libvirt/images/snap1-of--f17base.qcow2' not found #======================# (6) (NEGATIVE-TEST) Provide --base & --top values out of order: #======================# [root@moon qemu]# virsh blockcommit --domain test-f17base vda --wait --base /var/lib/libvirt/images/snap3-of-test-f17base.qcow2 --top /var/lib/libvirt/images/snap1-of-test-f17base.qcow2 --verbose error: internal error unable to execute QEMU command 'block-commit': Base '/var/lib/libvirt/images/snap3-of-test-f17base.qcow2' not found [root@moon qemu]# #======================# NOTES: ----- (a) To quickly check differences between the snapshot image files, I added a text file in each of the snapshot images, just before taking a snapshot. And, when I do a commit operation, I just check w/ 'guestfish' on the relevant disk image if all the expected content reflect. $ guestfish --ro -i -a /export/vmimgs2/f17-base.qcow2 Welcome to guestfish, the libguestfs filesystem interactive shell for editing virtual machine filesystems. Type: 'help' for help on commands 'man' to read the manual 'quit' to quit the shell Operating system: Fedora release 17 (Beefy Miracle) /dev/sda1 mounted on / ><fs> ls /export file2.txt file3.txt file4.txt ><fs> Is there a simpler way? (b) The snapshot-create command I use is something like below: # virsh snapshot-create-as --domain raw-base snap4 snap4-desc --disk-only --diskspec vda,snapshot=external,file=/var/lib/libvirt/images/snap4-b-raw-base.qcow2 --atomic Question: At this point in time, I guess 'snapshot-revert' command is not uhelpful for any practical purposes while dealing with external snapshots,right? - To rephrase, is there a way(in future?),a coherent way to use 'blockcommit'(or blockpull) in conjunction with 'snapshot-revert' command? Yet to test: (1) Use a raw block device(LVM, or direct block /dev/sda1) as backing file (2) Try testing the case of a backing file smaller than the top file being committed ( with data located at various offsets) + In-progress: I'm testing this by adding a 'virsh attach-device' Thanks -- /kashyap

2 4

[libvirt] [PATCH] fix-up an implicit build dead-loop in cfg.mk
by liguang 09 Oct '12

09 Oct '12

if gnulib submodule happened to be dirty, build process will fall into '_autogen' target trap in cfg.mk recursively, so break this dead-loop. Signed-off-by: liguang <lig.fnst(a)cn.fujitsu.com> --- cfg.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/cfg.mk b/cfg.mk index bbfd4a2..92966d5 100644 --- a/cfg.mk +++ b/cfg.mk @@ -699,7 +699,7 @@ ifeq (0,$(MAKELEVEL)) test "$$stamp" = "$$actual"; echo $$?) _clean_requested = $(filter %clean,$(MAKECMDGOALS)) ifeq (1,$(_update_required)$(_clean_requested)) - $(info INFO: gnulib update required; running ./autogen.sh first) + $(error ERR: gnulib update required; running ./autogen.sh first) Makefile: _autogen endif endif -- 1.7.2.5

3 3

[libvirt] [PATCH] virsh: add qemu-monitor-command --pretty
by Eric Blake 09 Oct '12

09 Oct '12

I was using qemu-monitor-command during development, and found it quite hard to use. Compare the results of this patch on ease of reading: $ virsh qemu-monitor-command dom '{"execute":"query-version"}' {"return":{"qemu":{"micro":1,"minor":12,"major":0},"package":"(qemu-kvm-0.12.1.2)"},"id":"libvirt-7683"} $ virsh qemu-monitor-command --pretty dom '{"execute":"query-version"}' { "return": { "qemu": { "micro": 1, "minor": 12, "major": 0 }, "package": "(qemu-kvm-0.12.1.2)" }, "id": "libvirt-7674" } * tools/virsh-host.c (cmdQemuMonitorCommand): New option. * tools/virsh.pod (qemu-monitor-command): Document it. --- Note that 'qemu-monitor-command dom --pretty --hmp info version' happens to truncate 0.12.1(qemu-kvm-0.12.1.2) into just 0.12 (since that is the portion of the prefix of the string that forms a valid JSON subsequence); we probably have a bug in virJSONValueFromString for not rejecting trailing junk, but that's a matter for another patch; for now, I just documented that --hmp and --pretty don't make sense together in the man page. tools/virsh-host.c | 15 +++++++++++++++ tools/virsh.pod | 10 ++++++---- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/tools/virsh-host.c b/tools/virsh-host.c index 2c46336..40ad8de 100644 --- a/tools/virsh-host.c +++ b/tools/virsh-host.c @@ -38,6 +38,7 @@ #include "virsh-domain.h" #include "xml.h" #include "virtypedparam.h" +#include "json.h" /* * "capabilities" command @@ -529,6 +530,8 @@ static const vshCmdInfo info_qemu_monitor_command[] = { static const vshCmdOptDef opts_qemu_monitor_command[] = { {"domain", VSH_OT_DATA, VSH_OFLAG_REQ, N_("domain name, id or uuid")}, {"hmp", VSH_OT_BOOL, 0, N_("command is in human monitor protocol")}, + {"pretty", VSH_OT_BOOL, 0, + N_("pretty-print any qemu monitor protocol output")}, {"cmd", VSH_OT_ARGV, VSH_OFLAG_REQ, N_("command")}, {NULL, 0, 0, NULL} }; @@ -544,6 +547,7 @@ cmdQemuMonitorCommand(vshControl *ctl, const vshCmd *cmd) const vshCmdOpt *opt = NULL; virBuffer buf = VIR_BUFFER_INITIALIZER; bool pad = false; + virJSONValuePtr pretty = NULL; dom = vshCommandOptDomain(ctl, cmd, NULL); if (dom == NULL) @@ -567,6 +571,16 @@ cmdQemuMonitorCommand(vshControl *ctl, const vshCmd *cmd) if (virDomainQemuMonitorCommand(dom, monitor_cmd, &result, flags) < 0) goto cleanup; + if (vshCommandOptBool(cmd, "pretty")) { + char *tmp; + pretty = virJSONValueFromString(result); + if (pretty && (tmp = virJSONValueToString(pretty, true))) { + VIR_FREE(result); + result = tmp; + } else { + vshResetLibvirtError(); + } + } vshPrint(ctl, "%s\n", result); ret = true; @@ -574,6 +588,7 @@ cmdQemuMonitorCommand(vshControl *ctl, const vshCmd *cmd) cleanup: VIR_FREE(result); VIR_FREE(monitor_cmd); + virJSONValueFree(pretty); if (dom) virDomainFree(dom); diff --git a/tools/virsh.pod b/tools/virsh.pod index c02ffe8..ac8a00f 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -2910,15 +2910,17 @@ attaching to an externally launched QEMU process. There may be issues with the guest ABI changing upon migration, and hotunplug may not work. -=item B<qemu-monitor-command> I<domain> [I<--hmp>] I<command>... +=item B<qemu-monitor-command> I<domain> { [I<--hmp>] | [I<--pretty>] } +I<command>... Send an arbitrary monitor command I<command> to domain I<domain> through the qemu monitor. The results of the command will be printed on stdout. If I<--hmp> is passed, the command is considered to be a human monitor command and libvirt will automatically convert it into QMP if needed. In that case -the result will also be converted back from QMP. If more than one argument -is provided for I<command>, they are concatenated with a space in between -before passing the single command to the monitor. +the result will also be converted back from QMP. If I<--pretty> is given, +and the monitor uses QMP, then the output will be pretty-printed. If more +than one argument is provided for I<command>, they are concatenated with a +space in between before passing the single command to the monitor. =back -- 1.7.11.4

2 2

[libvirt] Fwd: Failed to get host power management capabilities
by David Torres 08 Oct '12

08 Oct '12

Hi all, My name is David Torres, I am from Costa Rica. See this is the problem I have with the KVM instalation: 2012-10-03 20:28:17.395+0000: 25793: warning : qemuCapsInit:856 : Failed to get host power management capabilities 2012-10-03 20:28:17.661+0000: 25793: error : virExecWithHook:328 : Cannot find 'pm-is-supported' in path: No such file or directory And this error from the kern.log: Oct 4 21:50:53 kvm kernel: [22727.849902] device vnet0 entered promiscuous mode Oct 4 21:50:53 kvm kernel: [22727.883686] br0: port 2(vnet0) entering forwarding state Oct 4 21:50:53 kvm kernel: [22727.883692] br0: port 2(vnet0) entering forwarding state Oct 4 21:50:53 kvm kernel: [22728.130242] br0: port 2(vnet0) entering forwarding state Oct 4 21:50:53 kvm kernel: [22728.134443] br0: port 2(vnet0) entering disabled state Oct 4 21:50:53 kvm kernel: [22728.135238] device vnet0 left promiscuous mode Oct 4 21:50:53 kvm kernel: [22728.135242] br0: port 2(vnet0) entering disabled state Oct 4 21:50:54 kvm kernel: [22728.673620] type=1400 audit(1349409054.320:42): apparmor="STATUS" operation="profile_remove" name="libvirt-9b75f498-7959-7321-9461-d729d9c60668" pid=6349 comm="apparmor_parser" And when I try to create a Virtual Machine from the Virtual Machine Monitor, I got this error message: 2012-10-04 22:59:32.154+0000: 1333: error : qemuProcessReadLogOutput:1006 : internal error Process exited while reading console log output: char device redirected to /dev/pts/2 Could not access KVM kernel module: Is a directory failed to initialize KVM: Is a directory No accelerator found! I already enabled the virtualization feature on the BIOS and run the modprobe kvm-intel command also. No error message was received during the instalation process. So I am stuck on this problem :(.... I will appreciate sooo much any help. Thank you so much in advanced Regards

2 1

[libvirt] [PATCH] Call curl_global_init from virInitialize to avoid thread-safety issues
by Matthias Bolte 08 Oct '12

08 Oct '12

curl_global_init is not thread-safe. curl_easy_init might call curl_global_init when it was no called before. But curl_easy_init can be called from different threads by the ESX driver. Therefore, call curl_global_init from virInitialize to stop curl_easy_init from calling it. Reported by Benjamin Wang. --- configure.ac | 10 +++++++++- src/libvirt.c | 8 ++++++++ src/xenapi/xenapi_driver.c | 1 - 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 6d50985..0013d9d 100644 --- a/configure.ac +++ b/configure.ac @@ -2299,9 +2299,12 @@ dnl LIBCURL_CFLAGS="" LIBCURL_LIBS="" +have_curl=no if test "$with_esx" = "yes" || test "$with_esx" = "check" || test "$with_xenapi" = "yes" || test "$with_xenapi" = "check"; then PKG_CHECK_MODULES(LIBCURL, libcurl >= $LIBCURL_REQUIRED, [ + have_curl=yes + if test "$with_esx" = "check"; then with_esx=yes fi @@ -2326,6 +2329,11 @@ if test "$with_esx" = "yes" || test "$with_esx" = "check" || test "$with_xenapi" ]) fi +if test "$have_curl" = "yes" ; then + AC_DEFINE_UNQUOTED([HAVE_LIBCURL], 1, [whether libcurl is available]) +fi +AM_CONDITIONAL([HAVE_LIBCURL], [test "$have_curl" = "yes"]) + if test "$with_esx" = "yes" ; then AC_DEFINE_UNQUOTED([WITH_ESX], 1, [whether ESX driver is enabled]) @@ -3081,7 +3089,7 @@ AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([ libxml: $LIBXML_CFLAGS $LIBXML_LIBS]) AC_MSG_NOTICE([ dlopen: $DLOPEN_LIBS]) -if test "$with_esx" = "yes" ; then +if test "$have_curl" = "yes" ; then AC_MSG_NOTICE([ libcurl: $LIBCURL_CFLAGS $LIBCURL_LIBS]) else AC_MSG_NOTICE([ libcurl: no]) diff --git a/src/libvirt.c b/src/libvirt.c index ada9a86..76e4401 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -41,6 +41,10 @@ # include <winsock2.h> #endif +#ifdef HAVE_LIBCURL +# include <curl/curl.h> +#endif + #include "virterror_internal.h" #include "logging.h" #include "datatypes.h" @@ -418,6 +422,10 @@ virInitialize(void) virNetTLSInit(); +#if HAVE_LIBCURL + curl_global_init(CURL_GLOBAL_DEFAULT); +#endif + VIR_DEBUG("register drivers"); #if HAVE_WINSOCK2_H diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c index 2fac561..d60ad23 100644 --- a/src/xenapi/xenapi_driver.c +++ b/src/xenapi/xenapi_driver.c @@ -171,7 +171,6 @@ xenapiOpen (virConnectPtr conn, virConnectAuthPtr auth, xmlInitParser(); xmlKeepBlanksDefault(0); xen_init(); - curl_global_init(CURL_GLOBAL_ALL); privP->session = xen_session_login_with_password(call_func, privP, username, password, xen_api_latest_version); -- 1.7.4.1

2 2

[libvirt] [PATCH 0/2] extend virGetUserID and virGetGroupID
by Marcelo Cerri 08 Oct '12

08 Oct '12

This patch series moves the logic for parsing users and groups in a similar way to coreutils' chown from security_dac.c to util.c, as suggested by Eric Blake. This change has two majors side effects: 1. Some error messages that were issued when security_dac.c tried to parse an ID as a name are no longer issued. 2. The keys `user` and `group` in qemu.conf can now be defined in the same way that in DAC security labels. Marcelo Cerri (2): util: extend virGetUserID and virGetGroupID to support names and IDs security: update user and group parsing in security_dac.c src/security/security_dac.c | 40 ++++++--------------- src/util/util.c | 87 ++++++++++++++++++++++++++++++++++++++------- 2 files changed, 84 insertions(+), 43 deletions(-) -- 1.7.12

3 18

[libvirt] [PATCH] util: Improve error reporting from getgrnam_r and friends
by Peter Krempa 08 Oct '12

08 Oct '12

Error reporting for getgrnam_r() isn't that broken as in getgrnam(). This patch enhances virGetUserIDByName() and virGetGroupIDByName() so that they error out if retrieval of the information failed but just log a debug message if the entry was not found. >From the man page for getgrnam_r(): RETURN VALUE ... On success, getgrnam_r() and getgrgid_r() return zero, and set *result to grp. If no matching group record was found, these functions return 0 and store NULL in *result. In case of error, an error number is returned, and NULL is stored in *result. --- This patch has to be applied on top of: http://www.redhat.com/archives/libvir-list/2012-October/msg00190.html src/util/util.c | 70 +++++++++++++++++++++++++++++---------------------------- 1 file changed, 36 insertions(+), 34 deletions(-) diff --git a/src/util/util.c b/src/util/util.c index 694ed3d..8ddae0d 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -2501,12 +2501,13 @@ char *virGetGroupName(gid_t gid) */ static int virGetUserIDByName(const char *name, uid_t *uid) { - char *strbuf; + char *strbuf = NULL; struct passwd pwbuf; struct passwd *pw = NULL; long val = sysconf(_SC_GETPW_R_SIZE_MAX); size_t strbuflen = val; int rc; + int ret = -1; /* sysconf is a hint; if it fails, fall back to a reasonable size */ if (val < 0) @@ -2514,35 +2515,35 @@ static int virGetUserIDByName(const char *name, uid_t *uid) if (VIR_ALLOC_N(strbuf, strbuflen) < 0) { virReportOOMError(); - return -1; + goto cleanup; } - /* - * From the manpage (terrifying but true): - * - * ERRORS - * 0 or ENOENT or ESRCH or EBADF or EPERM or ... - * The given name or uid was not found. - */ while ((rc = getpwnam_r(name, &pwbuf, strbuf, strbuflen, &pw)) == ERANGE) { if (VIR_RESIZE_N(strbuf, strbuflen, strbuflen, strbuflen) < 0) { virReportOOMError(); - VIR_FREE(strbuf); - return -1; + goto cleanup; } } - if (rc != 0 || pw == NULL) { - VIR_DEBUG("Failed to find user record for user '%s' (error = %d)", - name, rc); - VIR_FREE(strbuf); - return 1; + + if (rc != 0) { + virReportSystemError(rc, _("Failed to get user record for name '%s'"), + name); + goto cleanup; + } + + if (!pw) { + VIR_DEBUG("User record for user '%s' does not exist", name); + ret = 1; + goto cleanup; } *uid = pw->pw_uid; + ret = 0; +cleanup: VIR_FREE(strbuf); - return 0; + return ret; } /* Try to match a user id based on `user`. The default behavior is to parse @@ -2581,12 +2582,13 @@ int virGetUserID(const char *user, uid_t *uid) */ static int virGetGroupIDByName(const char *name, gid_t *gid) { - char *strbuf; + char *strbuf = NULL; struct group grbuf; struct group *gr = NULL; long val = sysconf(_SC_GETGR_R_SIZE_MAX); size_t strbuflen = val; int rc; + int ret = -1; /* sysconf is a hint; if it fails, fall back to a reasonable size */ if (val < 0) @@ -2594,35 +2596,35 @@ static int virGetGroupIDByName(const char *name, gid_t *gid) if (VIR_ALLOC_N(strbuf, strbuflen) < 0) { virReportOOMError(); - return -1; + goto cleanup; } - /* - * From the manpage (terrifying but true): - * - * ERRORS - * 0 or ENOENT or ESRCH or EBADF or EPERM or ... - * The given name or uid was not found. - */ while ((rc = getgrnam_r(name, &grbuf, strbuf, strbuflen, &gr)) == ERANGE) { if (VIR_RESIZE_N(strbuf, strbuflen, strbuflen, strbuflen) < 0) { virReportOOMError(); - VIR_FREE(strbuf); - return -1; + goto cleanup; } } - if (rc != 0 || gr == NULL) { - VIR_DEBUG("Failed to find group record for group '%s' (error = %d)", - name, rc); - VIR_FREE(strbuf); - return 1; + + if (rc != 0) { + virReportSystemError(rc, _("Failed to get group record for name '%s'"), + name); + goto cleanup; + } + + if (!gr) { + VIR_DEBUG("Group record for group '%s' does not exist", name); + ret = 1; + goto cleanup; } *gid = gr->gr_gid; + ret = 0; +cleanup: VIR_FREE(strbuf); - return 0; + return ret; } /* Try to match a group id based on `group`. The default behavior is to parse -- 1.7.12

3 4

[libvirt] [PATCH] fix kvm_pv_eoi with kvmclock
by Martin Kletzander 08 Oct '12

08 Oct '12

When both kvmclock and kvm_pv_eoi are configured (either disabled or enabled) libvirt will generate invalid CPU specification due to the fact that even though kvmclock causes the CPU to be specified, it doesn't set have_cpu flag to true (and the new kvm_pv_eoi as well). This patch fixes the issue and adds a test exactly for that to show that it is fixed correctly (and also to keep it that way in the future of course). --- src/qemu/qemu_command.c | 2 ++ .../qemuxml2argv-kvmclock+eoi-disabled.args | 4 ++++ .../qemuxml2argv-kvmclock+eoi-disabled.xml | 27 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + 4 files changed, 34 insertions(+) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-kvmclock+eoi-disabled.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-kvmclock+eoi-disabled.xml diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 20730a9..09f412e 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4210,6 +4210,7 @@ qemuBuildCpuArgStr(const struct qemud_driver *driver, virBufferAsprintf(&buf, "%s,%ckvmclock", have_cpu ? "" : default_model, sign); + have_cpu = true; break; } } @@ -4224,6 +4225,7 @@ qemuBuildCpuArgStr(const struct qemud_driver *driver, virBufferAsprintf(&buf, "%s,%ckvm_pv_eoi", have_cpu ? "" : default_model, sign); + have_cpu = true; } if (virBufferError(&buf)) diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvmclock+eoi-disabled.args b/tests/qemuxml2argvdata/qemuxml2argv-kvmclock+eoi-disabled.args new file mode 100644 index 0000000..f7ade0a --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-kvmclock+eoi-disabled.args @@ -0,0 +1,4 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test /usr/bin/qemu -S -M pc \ +-cpu qemu32,-kvmclock,-kvm_pv_eoi -m 214 -smp 6 -nographic -monitor \ +unix:/tmp/test-monitor,server,nowait -boot n -net none -serial \ +none -parallel none -usb diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvmclock+eoi-disabled.xml b/tests/qemuxml2argvdata/qemuxml2argv-kvmclock+eoi-disabled.xml new file mode 100644 index 0000000..a79b09f --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-kvmclock+eoi-disabled.xml @@ -0,0 +1,27 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> + <vcpu placement='static'>6</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='network'/> + </os> + <features> + <acpi/> + <apic eoi='off'/> + <pae/> + </features> + <clock offset='utc'> + <timer name='kvmclock' present='no'/> + </clock> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <controller type='usb' index='0'/> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 0757e37..7732ae1 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -407,6 +407,7 @@ mymain(void) DO_TEST("cpu-eoi-enabled", QEMU_CAPS_ENABLE_KVM); DO_TEST("eoi-disabled", NONE); DO_TEST("eoi-enabled", NONE); + DO_TEST("kvmclock+eoi-disabled", QEMU_CAPS_ENABLE_KVM); DO_TEST("hugepages", QEMU_CAPS_MEM_PATH); DO_TEST("disk-cdrom", NONE); -- 1.7.12

2 2

[libvirt] [PATCH] qemu: Fix parsing of x86 CPU models
by Jiri Denemark 08 Oct '12

08 Oct '12

QEMU changed the output of -cpu ? and CPU models can now be followed by its description. Our parser just used both model name and its description as a model name, which made any model with a description unusable with libvirt. --- src/qemu/qemu_capabilities.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index a5eb995..d16a7bc 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -379,7 +379,7 @@ typedef int qemuCapsPtr caps); /* Format: - * <arch> <model> + * <arch> <model> <description> * qemu-0.13 encloses some model names in []: * <arch> [<model>] */ @@ -389,6 +389,7 @@ qemuCapsParseX86Models(const char *output, { const char *p = output; const char *next; + const char *end; int ret = -1; do { @@ -416,8 +417,12 @@ qemuCapsParseX86Models(const char *output, goto cleanup; } - if (next) - len = next - p - 1; + end = next ? next - 1 : NULL; + if ((t = strchr(p, ' ')) && (!next || t < next)) + end = t; + + if (end) + len = end - p; else len = strlen(p); -- 1.7.12

2 5

[libvirt] [ANNOUNCE] libvirt-glib 0.1.3 release
by Daniel P. Berrange 08 Oct '12

08 Oct '12

I am pleased to announce that a new release of the libvirt-glib package, version 0.1.3, is now available from ftp://libvirt.org/libvirt/glib/ The packages are GPG signed with Key fingerprint: DAF3 A6FD B26B 6291 2D0E 8E3F BE86 EBB4 1510 4FDF (4096R) New in this release: - Improve documentation for set_memory method in GVirConfigDomain - Handle size units for memory attributes - Add API for current memory - Fix python example to specify virt type - Use 1 GB of RAM in python example instead 1 TB ! - Add API to get hypervisor name and version - Avoid NULL format string for g_set_error - Fix XXX_new_with_xml constructors for config objects - Add misc getters for VNC/SPICE config attributes - Add handling of PMSUSPENDED state - Add handling of WAKEUP events - Require libvirt 0.10.2 minimum - Add API for domain PM wakeup libvirt-glib comprises three distinct libraries: - libvirt-glib - Integrate with the GLib event loop and error handling - libvirt-gconfig - Representation of libvirt XML documents as GObjects - libvirt-gobject - Mapping of libvirt APIs into the GObject type system NB: While libvirt aims to be API/ABI stable forever, with libvirt-glib we are not yet guaranteeing that libvirt-glib libraries are API/ABI permanently stable. As of the 0.0.8 release, we have tentatively frozen the API/ABI with the intent of being longterm stable hereafter, but there is still a small chance we might find flaws requiring an API/ABI change. The likelihood of this is low, however, and we will strive to avoid it. Follow up comments about libvirt-glib should be directed to the regular libvir-list(a)redhat.com development list. Thanks to all the people involved in contributing to this release. Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

1 0

[libvirt] Core dump caused by misusing openssl in multithread scenario!
by Benjamin Wang (gendwang) 08 Oct '12

08 Oct '12

Hi, I am running libvirt with ESXi driver in multithread scenario to access ESXi by https. Sometimes a core dump will be generated as following: #0 0x0000003f9b030265 in raise () from /lib64/libc.so.6 #1 0x0000003f9b031d10 in abort () from /lib64/libc.so.6 #2 0x0000003f9b06a84b in __libc_message () from /lib64/libc.so.6 #3 0x0000003f9b072fae in _int_malloc () from /lib64/libc.so.6 #4 0x0000003f9b074cde in malloc () from /lib64/libc.so.6 #5 0x0000003f9b07963b in strerror () from /lib64/libc.so.6 #6 0x0000003fa188032a in ERR_load_ERR_strings () from /lib64/libcrypto.so.6 #7 0x0000003fa187fde9 in ERR_load_crypto_strings () from /lib64/libcrypto.so.6 #8 0x0000003fa48309d9 in SSL_load_error_strings () from /lib64/libssl.so.6 #9 0x00002aaaba8e612e in Curl_ossl_init () from /opt/CSCOppm-unit/hypervisor/libcurl/lib/libcurl.so.4 #10 0x00002aaaba8ee6c1 in curl_global_init () from /opt/CSCOppm-unit/hypervisor/libcurl/lib/libcurl.so.4 #11 0x00002aaaba8ee6f8 in curl_easy_init () from /opt/CSCOppm-unit/hypervisor/libcurl/lib/libcurl.so.4 #12 0x00002aaaba0d932b in esxVI_SessionIsActive (ctx=0x2aaac093ca80, sessionID=0x2aaac06932a0 "`3i\300\252*", userName=0x2aaac0ae6e80 "root", output=0xffffffffffffffff) at esx/esx_vi_methods.generated.c:599 #13 0x00002aaaba0c7a60 in esxStorageVolumeLookupByKey (conn=0x7412, key=0x76c1 <Address 0x76c1 out of bounds>) at esx/esx_storage_driver.c:825 I checked that currently ESXi driver didn't initialize openssl. Because libcurl will not handle openssl for multi-thread. According to openssl API, libvirt should register two methods to support mutli-threads. The detailed description is as following: http://www.openssl.org/docs/crypto/threads.html I have changed code as following: 1. virInitialize() in libvirt.c Old Code: int virInitialize(void) { ... virLogSetFromEnv(); virNetTLSInit(); ... } New Code: int virInitialize(void) { ... virLogSetFromEnv(); virNetTLSInit(); virOpenSSLInit(); ... } 2. In virnetServer.c New Code: pthread_mutex_t *lock_cs; long *lock_count; void virOpenSSLLockCallback(int mode, int type, const char *file ATTRIBUTE_UNUSED, int line ATTRIBUTE_UNUSED) { if (mode & CRYPTO_LOCK) { pthread_mutex_lock(&(lock_cs[type])); lock_count[type]++; } else { pthread_mutex_unlock(&(lock_cs[type])); } } unsigned long virOpenSSLIdCallback(void) { unsigned long ret; ret=(unsigned long)pthread_self(); return(ret); } void virOpenSSLInit(void) { int i; lock_cs=OPENSSL_malloc(CRYPTO_num_locks() * sizeof(pthread_mutex_t)); lock_count=OPENSSL_malloc(CRYPTO_num_locks() * sizeof(long)); for (i=0; i<CRYPTO_num_locks(); i++) { lock_count[i]=0; pthread_mutex_init(&(lock_cs[i]),NULL); } CRYPTO_set_id_callback(virOpenSSLIdCallback); CRYPTO_set_locking_callback(virOpenSSLLockCallback); } To be honest, virOpenSSLInit/ virOpenSSLIdCallback/ virOpenSSLLockCallback should not be defined in this file. But It seems that Makefile generated by autoconfig can't handle the new file recursively. What about this solution? If you have any comments, please feel free to contact me. BTW: If I add a new source/header file, is there a simple way to change Makefile? B.R. Benjamin Wang

3 10

[libvirt] [PATCH v2 0/2] python: cleanup vcpu related binding APIs
by Guannan Ren 08 Oct '12

08 Oct '12

The first version https://www.redhat.com/archives/libvir-list/2012-April/msg00848.html Sorry for so late. I will go on adding error handling and make it strong for python binding APIs if necessary Guannan Ren python: cleanup vcpu related binding APIs python: return error if PyObject obj is NULL for unwrapper helper functions python/libvirt-override.c | 171 ++++++++++++++++++++++++++++++++++++++-------------- python/typewrappers.c | 43 +++++++++++++- 2 files changed, 164 insertions(+), 50 deletions(-)

2 9

[libvirt] [PATCH 0/7] Add support for lock failure action
by Jiri Denemark 08 Oct '12

08 Oct '12

When sanlock is used as a locking driver and sanlock deamon loses access to its lockspace, it automatically kills off the domains that had their locks stored there. Apparently some management apps would like to change this behavior by configuring what should happen when locks are lost. Everything except the sanlock_helper code from patch 7/7 should be stable. The helper code may need some additional work (perhaps even touching other parts of libvirtd internals) because some lock failure action does not work as expected. For example, when automatic disk locks are enabled, the "pause" action will result in libvirtd calling back to sanlock and since it doesn't have access to the lockspace, the call would just hang. However, since currently the only requestor for this feature is VDSM and it doesn't use automatic disk locks, the sanlock_helper could work for them without any modifications. And since current sanlock_helper implementation is supposed to be changed when libvirtd gains administrative interface (see patch 7/7 for more details) we may even just live with its limitations for the time being. Jiri Denemark (7): conf: Generalize life cycle actions to event actions conf: Add on_lockfailure event configuration qemu: Use macro instead of "qemu" in the context of URI scheme locking: Add const char * parameter to avoid ugly typecasts locking: Pass hypervisor driver name when acquiring locks locking: Add support for lock failure action locking: Implement lock failure action in sanlock driver docs/formatdomain.html.in | 37 +++++-- docs/internals/locking.html.in | 8 ++ docs/schemas/domaincommon.rng | 30 +++++- libvirt.spec.in | 1 + src/Makefile.am | 13 ++- src/conf/domain_conf.c | 85 +++++++++------ src/conf/domain_conf.h | 18 +++- src/libvirt_private.syms | 2 + src/locking/domain_lock.c | 36 ++++--- src/locking/domain_lock.h | 4 + src/locking/lock_driver.h | 8 +- src/locking/lock_driver_nop.c | 1 + src/locking/lock_driver_sanlock.c | 114 +++++++++++++++++--- src/locking/lock_manager.c | 10 +- src/locking/lock_manager.h | 1 + src/locking/sanlock_helper.c | 214 ++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_conf.h | 2 + src/qemu/qemu_driver.c | 21 ++-- src/qemu/qemu_hotplug.c | 15 ++- src/qemu/qemu_process.c | 4 +- 20 files changed, 537 insertions(+), 87 deletions(-) create mode 100644 src/locking/sanlock_helper.c -- 1.7.12

2 14

[libvirt] Support for qemu snapshot=on drives in libvirt
by Richard W.M. Jones 08 Oct '12

08 Oct '12

I notice that the qemu driver doesn't support snapshot drives (-drive file=foo,snapshot=on). This is important for libguestfs. Currently libguestfs hacks this using <qemu:arg>. That works fine for static disks in the libvirt XML, but lack of direct support in libvirt is a blocker for adding hotplugging to libguestfs. In qemu, the snapshot=on feature does several things: (a) It creates a temporary qcow2 disk in $TMPDIR. (b) It sets the backing file of the temporary disk to the real disk. (c) When running, writes to the disk go to the temporary overlay, and not to the real disk. (d) I believe it also lets you commit changes from the temporary disk to the backing file using a monitor command ("commit"? "save"?). However we don't need or use this feature. (e) When qemu exits, the temporary qcow2 disk is deleted. So note that when you use snapshot=on there is an implicit dependency on the $TMPDIR environment variable. I don't know of a way to create the snapshot in another directory (at least, not using snapshot=on .. possibly one can do it by creating an explicit overlay disk in libvirt). A simple implementation therefore would be to add a <snapshot/> element to <disk>. It would just add snapshot=on and ignore concerns about $TMPDIR. Or reuse the <readonly/> flag? Note that these disks are writable. A more complex implementation would create an explicit overlay disk in libvirt and clean it up afterwards. This would let us control where the temporary disk is created. XML might look like this: <snapshot [tmp=...] /> I'm also concerned about the time is takes to run the external 'qemu-img create' command, which is non-trivial in some versions of qemu. In libguestfs, every millisecond counts. $ time qemu-img create -f qcow2 test.qcow2 10M Formatting 'test.qcow2', fmt=qcow2 size=10485760 encryption=off cluster_size=65536 real 0m0.610s user 0m0.022s sys 0m0.009s Or, can this be done using existing libvirt features? Any thoughts on this before I implement something ... 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

4 9

[libvirt] [PATCH] python: keep consistent handling of Python integer conversion
by Guannan Ren 08 Oct '12

08 Oct '12

libvirt_ulonglongUnwrap requires the integer type of python obj. But libvirt_longlongUnwrap still could handle python obj of Pyfloat_type which causes the float value to be rounded up to an integer. For example >>> dom.setSchedulerParameters({'vcpu_quota': 0.88}) 0 libvirt_longlongUnwrap treats 0.88 as a valid value 0 However >>> dom.setSchedulerParameters({'cpu_shares': 1000.22}) libvirt_ulonglongUnwrap will throw out an error "TypeError: an integer is required" The patch make this consistent. --- python/typewrappers.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/python/typewrappers.c b/python/typewrappers.c index 7580689..d633603 100644 --- a/python/typewrappers.c +++ b/python/typewrappers.c @@ -220,7 +220,7 @@ libvirt_ulongUnwrap(PyObject *obj, unsigned long *val) int libvirt_longlongUnwrap(PyObject *obj, long long *val) { - long long llong_val; + long long llong_val = -1; if (!obj) { PyErr_SetString(PyExc_TypeError, "unexpected type"); @@ -230,7 +230,11 @@ libvirt_longlongUnwrap(PyObject *obj, long long *val) /* If obj is of PyInt_Type, PyLong_AsLongLong * will call PyInt_AsLong() to handle it automatically. */ - llong_val = PyLong_AsLongLong(obj); + if (PyInt_Check(obj) || PyLong_Check(obj)) + llong_val = PyLong_AsLongLong(obj); + else + PyErr_SetString(PyExc_TypeError, "an integer is required"); + if ((llong_val == -1) && PyErr_Occurred()) return -1; -- 1.7.11.2

2 2

[libvirt] [RFC] Private data pointer for virStoragePool and virStorageVol structs
by Matthias Bolte 08 Oct '12

08 Oct '12

Ata Bohra proposed a backend concept for the ESX storage driver to simplify the addition of iSCSI support to the ESX storage driver. The problem here is that most of the storage driver functions need to determine the backend to be used from the pool name. This overhead can be avoided by adding a private data pointer to the virStoragePool and virStorageVol structs that the ESX storage driver can use to store a pointer to the correct backend. struct _virStoragePool { virObject object; virConnectPtr conn; char *name; unsigned char uuid[VIR_UUID_BUFLEN]; void *privateData; virFreeCallback privateDataFreeFunc; }; struct _virStorageVol { virObject object; virConnectPtr conn; char *pool; char *name; char *key; void *privateData; virFreeCallback privateDataFreeFunc; }; virGetStoragePool and virGetStorageVol would set privateData and privateDataFreeFunc as given by the caller. virStoragePoolDispose and virStorageVolDispose would call privateDataFreeFunc if set. Comments? -- Matthias Bolte http://photron.blogspot.com

2 1

[libvirt] ANNOUNCE: libvirt 0.9.6.3 maintenance release
by Cole Robinson 08 Oct '12

08 Oct '12

libvirt 0.9.6.3 maintenance release is now available. This is libvirt 0.9.6 with additional bugfixes that have accumulated upstream since the initial release. This release can be downloaded at: http://libvirt.org/sources/stable_updates/libvirt-0.9.6.3.tar.gz Changes in this version: * security: Fix libvirtd crash possibility For info about past maintenance releases, see: http://wiki.libvirt.org/page/Maintenance_Releases Thanks, Cole

1 0

[libvirt] [PATCH v3] esx: Support VLAN tags in virtual network port groups
by Matthias Bolte 07 Oct '12

07 Oct '12

--- v2: Use network level VLAN config if there is no portgroup specific VLAN config given. v3: Add ESX_VLAN_TRUNK define for magic number 4095 src/esx/esx_network_driver.c | 70 +++++++++++++++++++++++++++++++++++++++--- 1 files changed, 65 insertions(+), 5 deletions(-) diff --git a/src/esx/esx_network_driver.c b/src/esx/esx_network_driver.c index 09d46d3..21eabbe 100644 --- a/src/esx/esx_network_driver.c +++ b/src/esx/esx_network_driver.c @@ -45,6 +45,9 @@ */ verify(MD5_DIGEST_SIZE == VIR_UUID_BUFLEN); +/* ESX utilizes the VLAN ID of 4095 to mean that this port is in trunk mode */ +#define ESX_VLAN_TRUNK 4095 + static virDrvOpenStatus @@ -489,7 +492,42 @@ esxNetworkDefineXML(virConnectPtr conn, const char *xml) goto cleanup; } - hostPortGroupSpec->vlanId->value = 0; + if (def->portGroups[i].vlan.trunk) { + /* FIXME: Change this once tag-less trunk-mode is supported */ + if (def->portGroups[i].vlan.nTags != 1 || + *def->portGroups[i].vlan.tag != ESX_VLAN_TRUNK) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("VLAN tag has to be %d in trunk mode"), + ESX_VLAN_TRUNK); + goto cleanup; + } + + hostPortGroupSpec->vlanId->value = ESX_VLAN_TRUNK; + } else if (def->portGroups[i].vlan.nTags == 1) { + hostPortGroupSpec->vlanId->value = *def->portGroups[i].vlan.tag; + } else if (def->portGroups[i].vlan.nTags > 1) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Can apply one VLAN tag per port group only")); + goto cleanup; + } else if (def->vlan.trunk) { + /* FIXME: Change this once tag-less trunk-mode is supported */ + if (def->vlan.nTags != 1 || *def->vlan.tag != ESX_VLAN_TRUNK) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("VLAN tag has to be %d in trunk mode"), + ESX_VLAN_TRUNK); + goto cleanup; + } + + hostPortGroupSpec->vlanId->value = ESX_VLAN_TRUNK; + } else if (def->vlan.nTags == 1) { + hostPortGroupSpec->vlanId->value = *def->vlan.tag; + } else if (def->vlan.nTags > 1) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Can apply one VLAN tag per port group only")); + goto cleanup; + } else { + hostPortGroupSpec->vlanId->value = 0; + } if (def->portGroups[i].bandwidth != NULL) { if (esxBandwidthToShapingPolicy @@ -519,6 +557,8 @@ esxNetworkDefineXML(virConnectPtr conn, const char *xml) network = virGetNetwork(conn, hostVirtualSwitch->name, md5); cleanup: + /* FIXME: need to remove virtual switch if adding port groups failed */ + virNetworkDefFree(def); esxVI_HostVirtualSwitch_Free(&hostVirtualSwitch); esxVI_HostPortGroup_Free(&hostPortGroupList); @@ -695,6 +735,7 @@ esxNetworkGetXMLDesc(virNetworkPtr network_, unsigned int flags) esxVI_String *hostPortGroupKey = NULL; esxVI_String *networkName = NULL; virNetworkDefPtr def; + virPortGroupDefPtr portGroup; if (esxVI_EnsureSession(priv->primary) < 0) { return NULL; @@ -824,9 +865,12 @@ esxNetworkGetXMLDesc(virNetworkPtr network_, unsigned int flags) for (networkName = networkNameList; networkName != NULL; networkName = networkName->_next) { if (STREQ(networkName->value, hostPortGroup->spec->name)) { - def->portGroups[def->nPortGroups].name = strdup(networkName->value); + portGroup = &def->portGroups[def->nPortGroups]; + ++def->nPortGroups; + + portGroup->name = strdup(networkName->value); - if (def->portGroups[def->nPortGroups].name == NULL) { + if (portGroup->name == NULL) { virReportOOMError(); goto cleanup; } @@ -834,13 +878,29 @@ esxNetworkGetXMLDesc(virNetworkPtr network_, unsigned int flags) if (hostPortGroup->spec->policy != NULL) { if (esxShapingPolicyToBandwidth (hostPortGroup->spec->policy->shapingPolicy, - &def->portGroups[def->nPortGroups].bandwidth) < 0) { + &portGroup->bandwidth) < 0) { ++def->nPortGroups; goto cleanup; } } - ++def->nPortGroups; + if (hostPortGroup->spec->vlanId->value > 0) { + if (hostPortGroup->spec->vlanId->value == ESX_VLAN_TRUNK) { + portGroup->vlan.trunk = true; + } + + /* FIXME: Remove this once tag-less trunk-mode is supported */ + portGroup->vlan.nTags = 1; + + if (VIR_ALLOC_N(portGroup->vlan.tag, 1) < 0) { + virReportOOMError(); + goto cleanup; + } + + *portGroup->vlan.tag = + hostPortGroup->spec->vlanId->value; + } + break; } } -- 1.7.4.1

2 3

[libvirt] [PATCH v2] esx: Support VLAN tags in virtual network port groups
by Matthias Bolte 07 Oct '12

07 Oct '12

--- v2: Utilize tag-less VLAN trunk mode: https://www.redhat.com/archives/libvir-list/2012-October/msg00214.html src/esx/esx_network_driver.c | 64 ++++++++++++++++++++++++++++++++++++++--- 1 files changed, 59 insertions(+), 5 deletions(-) diff --git a/src/esx/esx_network_driver.c b/src/esx/esx_network_driver.c index c8f101a..98e64ee 100644 --- a/src/esx/esx_network_driver.c +++ b/src/esx/esx_network_driver.c @@ -45,6 +45,9 @@ */ verify(MD5_DIGEST_SIZE == VIR_UUID_BUFLEN); +/* ESX utilizes the VLAN ID of 4095 to mean that this port is in trunk mode */ +#define ESX_VLAN_TRUNK 4095 + static virDrvOpenStatus @@ -489,7 +492,37 @@ esxNetworkDefineXML(virConnectPtr conn, const char *xml) goto cleanup; } - hostPortGroupSpec->vlanId->value = 0; + if (def->portGroups[i].vlan.trunk) { + if (def->portGroups[i].vlan.nTags != 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Trunk mode cannot be limited to a subset of tags")); + goto cleanup; + } + + hostPortGroupSpec->vlanId->value = ESX_VLAN_TRUNK; + } else if (def->portGroups[i].vlan.nTags == 1) { + hostPortGroupSpec->vlanId->value = *def->portGroups[i].vlan.tag; + } else if (def->portGroups[i].vlan.nTags > 1) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Can apply one VLAN tag per port group only")); + goto cleanup; + } else if (def->vlan.trunk) { + if (def->vlan.nTags != 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Trunk mode cannot be limited to a subset of tags")); + goto cleanup; + } + + hostPortGroupSpec->vlanId->value = ESX_VLAN_TRUNK; + } else if (def->vlan.nTags == 1) { + hostPortGroupSpec->vlanId->value = *def->vlan.tag; + } else if (def->vlan.nTags > 1) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Can apply one VLAN tag per port group only")); + goto cleanup; + } else { + hostPortGroupSpec->vlanId->value = 0; + } if (def->portGroups[i].bandwidth != NULL) { if (esxBandwidthToShapingPolicy @@ -519,6 +552,8 @@ esxNetworkDefineXML(virConnectPtr conn, const char *xml) network = virGetNetwork(conn, hostVirtualSwitch->name, md5); cleanup: + /* FIXME: need to remove virtual switch if adding port groups failed */ + virNetworkDefFree(def); esxVI_HostVirtualSwitch_Free(&hostVirtualSwitch); esxVI_HostPortGroup_Free(&hostPortGroupList); @@ -695,6 +730,7 @@ esxNetworkGetXMLDesc(virNetworkPtr network_, unsigned int flags) esxVI_String *hostPortGroupKey = NULL; esxVI_String *networkName = NULL; virNetworkDefPtr def; + virPortGroupDefPtr portGroup; if (esxVI_EnsureSession(priv->primary) < 0) { return NULL; @@ -824,9 +860,12 @@ esxNetworkGetXMLDesc(virNetworkPtr network_, unsigned int flags) for (networkName = networkNameList; networkName != NULL; networkName = networkName->_next) { if (STREQ(networkName->value, hostPortGroup->spec->name)) { - def->portGroups[def->nPortGroups].name = strdup(networkName->value); + portGroup = &def->portGroups[def->nPortGroups]; + ++def->nPortGroups; + + portGroup->name = strdup(networkName->value); - if (def->portGroups[def->nPortGroups].name == NULL) { + if (portGroup->name == NULL) { virReportOOMError(); goto cleanup; } @@ -834,13 +873,28 @@ esxNetworkGetXMLDesc(virNetworkPtr network_, unsigned int flags) if (hostPortGroup->spec->policy != NULL) { if (esxShapingPolicyToBandwidth (hostPortGroup->spec->policy->shapingPolicy, - &def->portGroups[def->nPortGroups].bandwidth) < 0) { + &portGroup->bandwidth) < 0) { ++def->nPortGroups; goto cleanup; } } - ++def->nPortGroups; + if (hostPortGroup->spec->vlanId->value > 0) { + if (hostPortGroup->spec->vlanId->value == ESX_VLAN_TRUNK) { + portGroup->vlan.trunk = true; + } else { + portGroup->vlan.nTags = 1; + + if (VIR_ALLOC_N(portGroup->vlan.tag, 1) < 0) { + virReportOOMError(); + goto cleanup; + } + + *portGroup->vlan.tag = + hostPortGroup->spec->vlanId->value; + } + } + break; } } -- 1.7.4.1

1 0

[libvirt] [PATCH] network: Allow <vlan trunk='yes'/> without explicit <tag> subelements
by Matthias Bolte 07 Oct '12

07 Oct '12

Until now at least one <tag> subelement was required for a <vlan> element. An optional trunk='yes' attribute can be used to indicate trunking of the given tags. This is not how VLAN tagging works with ESX. One can either specify a single VLAN tag per virtual network or enable trunking for all possible VLAN tags. It is not possible to limit trunking to a subset of tags. This cannot be represented properly with the current network config format. This patch removes the requirement for at least on tag per <vlan> element and adapts all related code to deal with the new situation. --- docs/formatnetwork.html.in | 8 +++- docs/schemas/networkcommon.rng | 4 +- src/conf/domain_conf.c | 6 ++- src/conf/netdev_vlan_conf.c | 58 ++++++++++++++++++++--------------- src/network/bridge_driver.c | 28 +++++++++++++++++ src/util/virnetdevopenvswitch.c | 9 ++++- src/util/virnetdevvlan.c | 8 ++++- tests/networkxml2xmlin/esx-net.xml | 15 +++++++++ tests/networkxml2xmlout/esx-net.xml | 15 +++++++++ tests/networkxml2xmltest.c | 1 + 10 files changed, 118 insertions(+), 34 deletions(-) create mode 100644 tests/networkxml2xmlin/esx-net.xml create mode 100644 tests/networkxml2xmlout/esx-net.xml diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in index 49206dd..5d601e1 100644 --- a/docs/formatnetwork.html.in +++ b/docs/formatnetwork.html.in @@ -398,7 +398,7 @@ transparent to the guest, an optional <code><vlan></code> element can specify one or more vlan tags to apply to the traffic of all guests using this - network Since 0.10.0. (openvswitch + network since 0.10.0. (openvswitch and type='hostdev' SR-IOV networks do support transparent vlan tagging of guest traffic; everything else, including standard linux bridges and libvirt's own virtual networks, do not @@ -410,7 +410,11 @@ assumed that the user wants to do VLAN trunking using all the specified tags. In the case that vlan trunking with a single tag is desired, the optional attribute <code>trunk='yes'</code> can - be added to the vlan element. + be added to the vlan element. Since 0.10.3 + <code>trunk='yes'</code> can be set while specifing no + <code><vlan></code> elements at all to indicate trunking of all + available vlan tags. This is supported by ESX only and is the only + trunking mode that ESX supports. <code><vlan></code> elements can also be specified in diff --git a/docs/schemas/networkcommon.rng b/docs/schemas/networkcommon.rng index c7749e7..70cdcbb 100644 --- a/docs/schemas/networkcommon.rng +++ b/docs/schemas/networkcommon.rng @@ -192,7 +192,7 @@ <value>yes</value> </attribute> </optional> - <oneOrMore> + <zeroOrMore> <element name="tag"> <attribute name="id"> <data type="unsignedInt"> @@ -201,7 +201,7 @@ </attribute> <empty/> </element> - </oneOrMore> + </zeroOrMore> </element> </define> </grammar> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 33e1e7f..65a201c 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -14897,9 +14897,11 @@ virDomainNetGetActualVlan(virDomainNetDefPtr iface) { if (iface->type == VIR_DOMAIN_NET_TYPE_NETWORK && iface->data.network.actual && - iface->data.network.actual->vlan.nTags > 0) + (iface->data.network.actual->vlan.nTags > 0 || + iface->data.network.actual->vlan.trunk)) return &iface->data.network.actual->vlan; - if (iface->vlan.nTags > 0) + if (iface->vlan.nTags > 0 || + iface->vlan.trunk) return &iface->vlan; return 0; } diff --git a/src/conf/netdev_vlan_conf.c b/src/conf/netdev_vlan_conf.c index 6a0511a..8f9aa04 100644 --- a/src/conf/netdev_vlan_conf.c +++ b/src/conf/netdev_vlan_conf.c @@ -42,33 +42,28 @@ virNetDevVlanParse(xmlNodePtr node, xmlXPathContextPtr ctxt, virNetDevVlanPtr de if (nTags < 0) goto error; - if (nTags == 0) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("missing tag id - each <vlan> must have " - "at least one <tag id='n'/> subelement")); - goto error; - } - - if (VIR_ALLOC_N(def->tag, nTags) < 0) { - virReportOOMError(); - goto error; - } - - for (ii = 0; ii < nTags; ii++) { - unsigned long id; - - ctxt->node = tagNodes[ii]; - if (virXPathULong("string(./@id)", ctxt, &id) < 0) { - virReportError(VIR_ERR_XML_ERROR, "%s", - _("missing or invalid vlan tag id attribute")); + if (nTags > 0) { + if (VIR_ALLOC_N(def->tag, nTags) < 0) { + virReportOOMError(); goto error; } - if (id > 4095) { - virReportError(VIR_ERR_XML_ERROR, - _("vlan tag id %lu too large (maximum 4095)"), id); - goto error; + + for (ii = 0; ii < nTags; ii++) { + unsigned long id; + + ctxt->node = tagNodes[ii]; + if (virXPathULong("string(./@id)", ctxt, &id) < 0) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("missing or invalid vlan tag id attribute")); + goto error; + } + if (id > 4095) { + virReportError(VIR_ERR_XML_ERROR, + _("vlan tag id %lu too large (maximum 4095)"), id); + goto error; + } + def->tag[ii] = id; } - def->tag[ii] = id; } def->nTags = nTags; @@ -99,6 +94,14 @@ virNetDevVlanParse(xmlNodePtr node, xmlXPathContextPtr ctxt, virNetDevVlanPtr de } } + /* only in trunk mode the tag subelements can be omitted */ + if (!def->trunk && nTags == 0) { + virReportError(VIR_ERR_XML_ERROR, "%s", + _("invalid element - each <vlan> must have at least " + "one <tag id='n'/> subelement and/or \"trunk='yes'\"")); + goto error; + } + ret = 0; error: ctxt->node = save; @@ -113,8 +116,13 @@ virNetDevVlanFormat(virNetDevVlanPtr def, virBufferPtr buf) { int ii; - if (def->nTags == 0) + if (def->nTags == 0) { + if (def->trunk) { + virBufferAddLit(buf, "<vlan trunk='yes'/>\n"); + } + return 0; + } if (!def->tag) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index e1846ee..37ddb07 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -2616,6 +2616,14 @@ networkValidate(virNetworkDefPtr def) int ii; bool vlanUsed, vlanAllowed; + if (def->vlan.nTags == 0 && def->vlan.trunk) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("<vlan> element specified for network %s is missing at " + "least one <tag> subelement required for trunk mode"), + def->name); + return -1; + } + /* The only type of networks that currently support transparent * vlan configuration are those using hostdev sr-iov devices from * a pool, and those using an Open vSwitch bridge. @@ -2627,6 +2635,13 @@ networkValidate(virNetworkDefPtr def) vlanUsed = def->vlan.nTags > 0; for (ii = 0; ii < def->nPortGroups && !(vlanUsed && vlanAllowed); ii++) { + if (def->portGroups[ii].vlan.nTags == 0 && def->portGroups[ii].vlan.trunk) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("<vlan> element specified for portgroup %s of network %s " + "is missing at least one <tag> subelement required for trunk mode"), + def->portGroups[ii].name, def->name); + return -1; + } if (def->portGroups[ii].vlan.nTags > 0) vlanUsed = true; if (def->forwardType == VIR_NETWORK_FORWARD_BRIDGE && @@ -3352,6 +3367,8 @@ networkAllocateActualDevice(virDomainNetDefPtr iface) /* it's handy to have this initialized if we skip directly to validate */ if (iface->vlan.nTags > 0) vlan = &iface->vlan; + else if (iface->vlan.trunk) + goto trunk_error; if (iface->type != VIR_DOMAIN_NET_TYPE_NETWORK) goto validate; @@ -3627,10 +3644,16 @@ networkAllocateActualDevice(virDomainNetDefPtr iface) /* copy appropriate vlan info to actualNet */ if (iface->vlan.nTags > 0) vlan = &iface->vlan; + else if (iface->vlan.trunk) + goto trunk_error; else if (portgroup && portgroup->vlan.nTags > 0) vlan = &portgroup->vlan; + else if (portgroup && portgroup->vlan.trunk) + goto trunk_error; else if (netdef && netdef->vlan.nTags > 0) vlan = &netdef->vlan; + else if (netdef && netdef->vlan.trunk) + goto trunk_error; if (virNetDevVlanCopy(&iface->data.network.actual->vlan, vlan) < 0) goto error; @@ -3699,6 +3722,11 @@ error: iface->data.network.actual = NULL; } goto cleanup; + +trunk_error: + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("vlan trunk mode without a tag is not supported")); + goto cleanup; } /* networkNotifyActualDevice: diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c index a6993b6..3b29dcc 100644 --- a/src/util/virnetdevopenvswitch.c +++ b/src/util/virnetdevopenvswitch.c @@ -80,14 +80,19 @@ int virNetDevOpenvswitchAddPort(const char *brname, const char *ifname, goto out_of_memory; } - if (virtVlan && virtVlan->nTags > 0) { + if (virtVlan && (virtVlan->nTags > 0 || virtVlan->trunk)) { + if (virtVlan->nTags == 0 && virtVlan->trunk) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("vlan trunk mode without a tag is not supported")); + goto cleanup; + } /* Trunk port first */ if (virtVlan->trunk) { virBufferAddLit(&buf, "trunk="); /* - * Trunk ports have at least one VLAN. Do the first one + * Trunk ports must have at least one VLAN. Do the first one * outside the "for" loop so we can put a "," at the * start of the for loop if there are more than one VLANs * on this trunk port. diff --git a/src/util/virnetdevvlan.c b/src/util/virnetdevvlan.c index 7a6ff9b..4cf95dc 100644 --- a/src/util/virnetdevvlan.c +++ b/src/util/virnetdevvlan.c @@ -31,6 +31,7 @@ void virNetDevVlanClear(virNetDevVlanPtr vlan) { + vlan->trunk = false; VIR_FREE(vlan->tag); vlan->nTags = 0; } @@ -79,9 +80,14 @@ virNetDevVlanEqual(const virNetDevVlanPtr a, const virNetDevVlanPtr b) int virNetDevVlanCopy(virNetDevVlanPtr dst, const virNetDevVlanPtr src) { - if (!src || src->nTags == 0) + if (!src) return 0; + if (src->nTags == 0) { + dst->trunk = src->trunk; + return 0; + } + if (VIR_ALLOC_N(dst->tag, src->nTags) < 0) { virReportOOMError(); return -1; diff --git a/tests/networkxml2xmlin/esx-net.xml b/tests/networkxml2xmlin/esx-net.xml new file mode 100644 index 0000000..546c634 --- /dev/null +++ b/tests/networkxml2xmlin/esx-net.xml @@ -0,0 +1,15 @@ +<network> + <name>vSwitch0</name> + <uuid>2f467347-8b4e-8655-e7d6-c4c3fb968009</uuid> + <forward dev='vmnic0' mode='bridge'> + <interface dev='vmnic0'/> + </forward> + <portgroup name='Network1'> + <vlan trunk='yes'/> + </portgroup> + <portgroup name='Network2'> + <vlan> + <tag id='536'/> + </vlan> + </portgroup> +</network> diff --git a/tests/networkxml2xmlout/esx-net.xml b/tests/networkxml2xmlout/esx-net.xml new file mode 100644 index 0000000..546c634 --- /dev/null +++ b/tests/networkxml2xmlout/esx-net.xml @@ -0,0 +1,15 @@ +<network> + <name>vSwitch0</name> + <uuid>2f467347-8b4e-8655-e7d6-c4c3fb968009</uuid> + <forward dev='vmnic0' mode='bridge'> + <interface dev='vmnic0'/> + </forward> + <portgroup name='Network1'> + <vlan trunk='yes'/> + </portgroup> + <portgroup name='Network2'> + <vlan> + <tag id='536'/> + </vlan> + </portgroup> +</network> diff --git a/tests/networkxml2xmltest.c b/tests/networkxml2xmltest.c index e57d190..426c541 100644 --- a/tests/networkxml2xmltest.c +++ b/tests/networkxml2xmltest.c @@ -108,6 +108,7 @@ mymain(void) DO_TEST_FULL("passthrough-pf", VIR_NETWORK_XML_INACTIVE); DO_TEST("hostdev"); DO_TEST_FULL("hostdev-pf", VIR_NETWORK_XML_INACTIVE); + DO_TEST("esx-net"); return ret==0 ? EXIT_SUCCESS : EXIT_FAILURE; } -- 1.7.4.1

1 0

[libvirt] [with libvirt-git] creating an f17 guest fails with -- Bus 'pci.0' not found
by Kashyap Chamarthy 07 Oct '12

07 Oct '12

Heya, So, creating a guest w/ virt-install fails w/ latest libvirt This is what I see in the guest logs: qemu-kvm: -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2: Bus 'pci.0' not found 2012-10-07 11:24:49.145+0000: shutting down This is clearly reproducible with latest git on Fedora-18. And I was able to create guest just fine w/ 'libvirt-daemon-kvm-0.10.2-3') ---------------------------------------- $ rpm -q qemu-kvm libvirt-daemon-kvm python-virtinst qemu-kvm-1.2.0-11.fc18.x86_64 libvirt-daemon-kvm-0.10.2-4.fc18.x86_64 python-virtinst-0.600.3-1.fc18.1.noarch ---------------------------------------- (NOTE: The above libvirt is built from git, on OCT-06-2012, hence you see a bump in the 'release' number there) That's what the log in /var/log/libvirt/qemu/f17-jeos4.log says ---------------------------------------------------- 2012-10-07 11:24:48.764+0000: starting up LC_ALL=C PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin /usr/bin/qemu-kvm -name f17jeos-4 -S -M isapc -enable-kvm -m 1024 -smp 1,sockets=1,cores=1,threads=1 -uuid 32036aaf-f0c0-2922-056f-64986f63783e -nographic -no-user-config -nodefaults -chardev socket,id=charmonitor,path=/var/lib/libvirt/qemu/f17jeos-4.monitor,server,nowait -mon chardev=charmonitor,id=monitor,mode=control -rtc base=utc -no-reboot -no-shutdown -kernel /var/lib/libvirt/boot/virtinst-vmlinuz.bfAHEc -initrd /var/lib/libvirt/boot/virtinst-initrd.img.QEwMoX -append method=http://download.eng.pnq.redhat.com/pub/fedora/linux/releases/17/Fedo… ks=file:/fed.ks console=tty0 console=ttyS0,115200 serial rd_NO_PLYMOUTH -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 -drive file=/export/vmimgs2/f17jeos-4.qcow2,if=none,id=drive-virtio-disk0,format=qcow2,cache=none -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 -netdev tap,fd=27,id=hostnet0,vhost=on,vhostfd=28 -device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:48:3c:ac,bus=pci.0,addr=0x3 -chardev pty,id=charserial0 -device isa-serial,chardev=charserial0,id=serial0 -device usb-tablet,id=input0 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 char device redirected to /dev/pts/11 qemu-kvm: -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2: Bus 'pci.0' not found 2012-10-07 11:24:49.145+0000: shutting down [kashyap@moon virt-scripts]$ ---------------------------------------------------- On virt-install stdout: ---------------------------------------------------- . . . Retrieving file vmlinuz... | 8.9 MB 00:00:00 !!! Retrieving file initrd.img... | 46 MB 00:00:02 !!! ERROR Unable to read from monitor: Connection reset by peer Domain installation does not appear to have been successful. ---------------------------------------------------- This was the script I used creat guest -- http://kashyapc.fedorapeople.org/virt/jeos-guest-create.bash Any hints? -- /kashyap

1 0

[libvirt] Two core dumps are generated in multi-thread scenarios
by Benjamin Wang (gendwang) 07 Oct '12

07 Oct '12

Hi, I found two core dumps generated in multi-thread scenarios in ESX part. Case1: libcurl support multi-thread core dump: #12 0x00002aaabea89712 in addbyter () from /usr/local/lib/libcurl.so.4 #13 0x00002aaabea89b86 in dprintf_formatf () from /usr/local/lib/libcurl.so.4 #14 0x00002aaabea8b055 in curl_mvsnprintf () from /usr/local/lib/libcurl.so.4 #15 0x00002aaabea7678f in Curl_failf () from /usr/local/lib/libcurl.so.4 #16 0x00002aaabea6d871 in Curl_resolv_timeout () from /usr/local/lib/libcurl.so.4 #17 0x00000006e8a8f230 in ?? () Fix code: esxVI_CURL_Connect() in esx_vi.c: I add a new line as following: curl_easy_setopt(curl->handle, CURLOPT_NOSIGNAL, 1); Case2: libssl support multi-thread core dump: #0 0x0000003f9b030265 in raise () from /lib64/libc.so.6 #1 0x0000003f9b031d10 in abort () from /lib64/libc.so.6 #2 0x0000003f9b06a84b in __libc_message () from /lib64/libc.so.6 #3 0x0000003f9b072fae in _int_malloc () from /lib64/libc.so.6 #4 0x0000003f9b074cde in malloc () from /lib64/libc.so.6 #5 0x0000003f9b07963b in strerror () from /lib64/libc.so.6 #6 0x0000003fa188032a in ERR_load_ERR_strings () from /lib64/libcrypto.so.6 #7 0x0000003fa187fde9 in ERR_load_crypto_strings () from /lib64/libcrypto.so.6 #8 0x0000003fa48309d9 in SSL_load_error_strings () from /lib64/libssl.so.6 #9 0x00002aaaba8e612e in Curl_ossl_init () from /opt/CSCOppm-unit/hypervisor/libcurl/lib/libcurl.so.4 #10 0x00002aaaba8ee6c1 in curl_global_init () from /opt/CSCOppm-unit/hypervisor/libcurl/lib/libcurl.so.4 #11 0x00002aaaba8ee6f8 in curl_easy_init () from /opt/CSCOppm-unit/hypervisor/libcurl/lib/libcurl.so.4 #12 0x00002aaaba0d932b in esxVI_RegisterVM_Task (ctx=0x2aaaba0d96d1, _this=0x5cf54b20, path=0x50e921c0 "10.74.125.50", name=0x2aaac0ae6e80 "root", asTemplate=3228119712, pool=0x5cf54b20, host=0x2aaac0693270, output=0x50e921a0) at esx/esx_vi_methods.generated.c:480 Possible Problem: Two callback functions(locking_function and threadid_func) need to be set. http://www.openssl.org/docs/crypto/threads.html#DESCRIPTION Would you help to give some comments about this two core dump? B.R. Benjamin Wang

3 5

[libvirt] [PATCH] esx: Disable libcurl's use of signals to fix a segfault
by Matthias Bolte 07 Oct '12

07 Oct '12

libcurl uses a SIGALRM in combination with sigsetjmp/siglongjmp to be able to abort a DNS lookup when it takes too long. The problem with this in a multi-threaded application is that the signal handler for SIGALRM and the call to siglongjmp can be executed on a thread that is different from the one that initially did the SIGALRM setup and the call to sigsetjmp. In the reported case this triggered a segfault. Disable libcurl's use of signals to avoid this situation. This has the disadvantage of losing the ability to abort DNS lookups which might result in libcurl getting stuck in a DNS lookup in the worst case. Reported by Benjamin Wang. --- src/esx/esx_vi.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 275b858..125eaee 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -330,6 +330,7 @@ esxVI_CURL_Connect(esxVI_CURL *curl, esxUtil_ParsedUri *parsedUri) } curl_easy_setopt(curl->handle, CURLOPT_USERAGENT, "libvirt-esx"); + curl_easy_setopt(curl->handle, CURLOPT_NOSIGNAL, 1); curl_easy_setopt(curl->handle, CURLOPT_HEADER, 0); curl_easy_setopt(curl->handle, CURLOPT_FOLLOWLOCATION, 0); curl_easy_setopt(curl->handle, CURLOPT_SSL_VERIFYPEER, -- 1.7.4.1

2 2

[libvirt] [with libvirt/qemu git] invoking 'qemu-system-x86_64' fails w/: -netdev bridge, br=virbr0, id=hostnet0 Device 'bridge' could not be initialized"
by Kashyap Chamarthy 06 Oct '12

06 Oct '12

Hi, I'm on latest master, w/ Eric's block-commit patches applied =========================================================== [kashyap@moon libvirt-k]$ git status # On branch master # Your branch is ahead of 'origin/master' by 2 commits. # nothing to commit (working directory clean) [kashyap@moon libvirt-k]$ =========================================================== [kashyap@moon libvirt-k]$ # ./autogen.sh ; make -j5 ; make check =========================================================== Now, then define an xml [see complete xml at the bottom] #-----------------------------------------------------------# [kashyap@moon libvirt-k]$ ./run ./tools/virsh define /var/tmp/f17-base.xml Domain f17-base defined from /var/tmp/f17-base.xml #-----------------------------------------------------------# Try to start the guest now: #-----------------------------------------------------------# [kashyap@moon libvirt-k]$ ./run ./tools/virsh start f17-base error: Failed to start domain f17-base error: internal error Process exited while reading console log output: char device redirected to /dev/pts/6 failed to launch bridge helper qemu-system-x86_64: -netdev bridge,br=virbr0,id=hostnet0: Device 'bridge' could not be initialized [kashyap@moon libvirt-k]$ #-----------------------------------------------------------# The emulator is pointed to latest qemu-system-x86_64 compiled from latest qemu-git #-----------------------------------------------------------# [kashyap@moon libvirt-k]$ egrep -i 'emulator|bridge' /var/tmp/f17-base.xml <emulator>/home/kashyap/projects/qemu/x86_64-softmmu/qemu-system-x86_64</emulator> <interface type='bridge'> <source bridge='virbr0'/> [kashyap@moon libvirt-k]$ #-----------------------------------------------------------# [kashyap@moon libvirt-k]$ brctl show bridge name bridge id STP enabled interfaces br0 8000.00215e6fb9f4 no eth0 virbr0 8000.525400573710 yes virbr0-nic [kashyap@moon libvirt-k]$ #-----------------------------------------------------------# [kashyap@moon libvirt-k]$ ./run ./tools/virsh version Compiled against library: libvirt 0.10.2 Using library: libvirt 0.10.2 Using API: QEMU 0.10.2 Cannot extract running QEMU hypervisor version [kashyap@moon libvirt-k]$ #-----------------------------------------------------------# [kashyap@moon libvirt-k]$ ps -ef | grep libvirtd kashyap 2277 1 2 17:07 ? 00:00:00 /home/kashyap/projects/libvirt-k/daemon/.libs/lt-libvirtd --timeout=30 kashyap 2392 11303 0 17:07 pts/15 00:00:00 grep --color=auto libvirtd [kashyap@moon libvirt-k]$ #-----------------------------------------------------------# That's what I see in the local log file: #-----------------------------------------------------------# [kashyap@moon libvirt-k]$ cat ~/.cache/libvirt/qemu/log/f17-base.log 2012-10-06 11:37:41.155+0000: starting up LC_ALL=C LD_LIBRARY_PATH=/home/kashyap/projects/libvirt-k/src/.libs PATH=/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/home/kashyap/.local/bin:/home/kashyap/bin:/home/kashyap/.local/bin:/home/kashyap/bin HOME=/home/kashyap USER=kashyap LOGNAME=kashyap /home/kashyap/projects/qemu/x86_64-softmmu/qemu-system-x86_64 -name f17-base -S -M pc-1.2 -enable-kvm -m 2048 -smp 2,sockets=2,cores=1,threads=1 -uuid 8d54ced1-2662-bcae-0804-d4a3e65e9ff6 -nographic -no-user-config -nodefaults -chardev socket,id=charmonitor,path=/home/kashyap/.config/libvirt/qemu/lib/f17-base.monitor,server,nowait -mon chardev=charmonitor,id=monitor,mode=control -rtc base=utc -no-shutdown -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 -drive file=/var/lib/libvirt/images/f17-base.qcow2,if=none,id=drive-virtio-disk0,format=qcow2,cache=none -device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 -netdev bridge,br=virbr0,id=hostnet0 -device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:51:00:a9:f1:7f,bus=pci.0,addr=0x3 -chardev pty,id=charserial0 -device isa-serial,chardev=charserial0,id=serial0 -device usb-tablet,id=input0 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 char device redirected to /dev/pts/6 failed to launch bridge helper qemu-system-x86_64: -netdev bridge,br=virbr0,id=hostnet0: Device 'bridge' could not be initialized 2012-10-06 11:37:41.281+0000: shutting down [kashyap@moon libvirt-k]$ #-----------------------------------------------------------# And that's the xml file: #-----------------------------------------------------------# <domain type='kvm'> <name>f17-base</name> <uuid>8d54ced1-2662-bcae-0804-d4a3e65e9ff6</uuid> <memory unit='KiB'>2097152</memory> <currentMemory unit='KiB'>2097152</currentMemory> <vcpu placement='static'>2</vcpu> <os> <type arch='x86_64' machine='pc-1.2'>hvm</type> <boot dev='hd'/> </os> <features> <acpi/> <apic/> <pae/> </features> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>restart</on_crash> <devices> <emulator>/home/kashyap/projects/qemu/x86_64-softmmu/qemu-system-x86_64</emulator> <disk type='file' device='disk'> <driver name='qemu' type='qcow2' cache='none'/> <source file='/var/lib/libvirt/images/f17-base.qcow2'/> <target dev='vda' bus='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </disk> <controller type='usb' index='0'> <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/> </controller> <interface type='bridge'> <mac address='52:51:00:a9:f1:7f'/> <source bridge='br0'/> <model type='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> <serial type='pty'> <target port='0'/> </serial> <console type='pty'> <target type='serial' port='0'/> </console> <input type='tablet' bus='usb'/> <memballoon model='virtio'> <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> </memballoon> </devices> </domain> #-----------------------------------------------------------# Other notes: Rich Jones suggested me to do a build dep for qemu & re-try [kashyap@moon qemu]$ yum-builddep qemu [kashyap@moon qemu]$ ./configure --target-list=x86_64-softmmu --disable-werror ; make -j5 and re-configure qemu. And still no dice, I see the same 'bridge' could not be initialized Any hints here? -- /kashyap

1 2

[libvirt] [PATCHv5] interface: add udev based backend for virInterface
by Doug Goldstein 06 Oct '12

06 Oct '12

Add a read-only udev based backend for virInterface. Useful for distros that do not have netcf support yet. Multiple libvirt based utilities use a HAL based fallback when virInterface is not available which is less than ideal. This implements: * virConnectNumOfInterfaces() * virConnectListInterfaces() * virConnectNumOfDefinedInterfaces() * virConnectListDefinedInterfaces() * virConnectInterfaceLookupByName() * virConnectInterfaceLookupByMACString() --- Change from v4: * Fix up udev reference counting Change from v3: * fix make syntax-check issues * check strdup() and handle that case * simplify configure check Change from v2: * rebase from master Change from v1: * rebase from master configure.ac | 18 +- po/POTFILES.in | 1 + src/Makefile.am | 12 +- src/interface/interface_backend_udev.c | 438 ++++++++++++++++++++++++++++++++ tools/virsh.c | 2 + 5 files changed, 458 insertions(+), 13 deletions(-) create mode 100644 src/interface/interface_backend_udev.c diff --git a/configure.ac b/configure.ac index 13967e9..eee87ae 100644 --- a/configure.ac +++ b/configure.ac @@ -2799,18 +2799,12 @@ if test "$with_libvirtd" = "no" ; then with_interface=no fi -dnl The interface driver depends on the netcf library -if test "$with_interface:$with_netcf" = "check:yes" ; then - with_interface=yes -fi - -if test "$with_interface:$with_netcf" = "check:no" ; then - with_interface=no -fi - -if test "$with_interface:$with_netcf" = "yes:no" ; then - AC_MSG_ERROR([Requested the Interface driver without netcf support]) -fi +dnl The interface driver depends on the netcf library or udev library +case $with_interface:$with_netcf:$with_udev in + check:*yes*) with_interface=yes ;; + check:no:no) with_interface=no ;; + yes:no:no) AC_MSG_ERROR([Requested the Interface driver without netcf or udev support]) ;; +esac if test "$with_interface" = "yes" ; then AC_DEFINE_UNQUOTED([WITH_INTERFACE], [1], diff --git a/po/POTFILES.in b/po/POTFILES.in index 74d8dcc..2538225 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -41,6 +41,7 @@ src/hyperv/hyperv_driver.c src/hyperv/hyperv_util.c src/hyperv/hyperv_wmi.c src/interface/interface_backend_netcf.c +src/interface/interface_backend_udev.c src/internal.h src/libvirt.c src/libvirt-qemu.c diff --git a/src/Makefile.am b/src/Makefile.am index ae3d491..98448c1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -558,11 +558,16 @@ INTERFACE_DRIVER_SOURCES = if WITH_INTERFACE INTERFACE_DRIVER_SOURCES += \ interface/interface_driver.h -endif if WITH_NETCF INTERFACE_DRIVER_SOURCES += \ interface/interface_backend_netcf.c +else +if HAVE_UDEV +INTERFACE_DRIVER_SOURCES += \ + interface/interface_backend_udev.c +endif +endif endif SECRET_DRIVER_SOURCES = \ @@ -1045,6 +1050,11 @@ libvirt_driver_interface_la_LIBADD = if WITH_NETCF libvirt_driver_interface_la_CFLAGS += $(NETCF_CFLAGS) libvirt_driver_interface_la_LIBADD += $(NETCF_LIBS) +else +if HAVE_UDEV +libvirt_driver_interface_la_CFLAGS += $(UDEV_CFLAGS) +libvirt_driver_interface_la_LIBADD += $(UDEV_LIBS) +endif endif if WITH_DRIVER_MODULES libvirt_driver_interface_la_LIBADD += ../gnulib/lib/libgnu.la diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c new file mode 100644 index 0000000..b6e9f55 --- /dev/null +++ b/src/interface/interface_backend_udev.c @@ -0,0 +1,438 @@ +/* + * interface_backend_udev.c: udev backend for virInterface + * + * Copyright (C) 2012 Doug Goldstein <cardoe(a)cardoe.com> + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. + */ +#include <config.h> + +#include <libudev.h> + +#include "virterror_internal.h" +#include "datatypes.h" +#include "interface_driver.h" +#include "interface_conf.h" +#include "memory.h" + +#define VIR_FROM_THIS VIR_FROM_INTERFACE + +struct udev_iface_driver { + struct udev *udev; +}; + +enum udev_status { UDEV_IFACE_ACTIVE, UDEV_IFACE_INACTIVE, UDEV_IFACE_ALL }; + +static struct udev_enumerate * +udevIfaceGetDevices(struct udev *udev, enum udev_status status) +{ + struct udev_enumerate *enumerate; + + /* Check input params for sanity */ + if (!udev) + return NULL; + + /* Create a new enumeration to create a list */ + enumerate = udev_enumerate_new(udev); + + if (!enumerate) + return NULL; + + /* Enumerate all network subsystem devices */ + udev_enumerate_add_match_subsystem(enumerate, "net"); + + /* Ignore devices that are part of a bridge */ + udev_enumerate_add_nomatch_sysattr(enumerate, "brport/state", NULL); + + /* State of the device */ + switch (status) { + case UDEV_IFACE_ACTIVE: + udev_enumerate_add_match_sysattr(enumerate, "operstate", "up"); + break; + + case UDEV_IFACE_INACTIVE: + udev_enumerate_add_match_sysattr(enumerate, "operstate", "down"); + break; + + case UDEV_IFACE_ALL: + break; + } + + /* We don't want to see the TUN devices that QEMU creates for other gets + * running on this machine. By saying nomatch NULL, we just are getting + * devices without the tun_flags sysattr. + */ + udev_enumerate_add_nomatch_sysattr(enumerate, "tun_flags", NULL); + + return enumerate; +} + +static virDrvOpenStatus +udevIfaceOpenInterface(virConnectPtr conn, + virConnectAuthPtr auth ATTRIBUTE_UNUSED, + unsigned int flags) +{ + struct udev_iface_driver *driverState = NULL; + + virCheckFlags(0, VIR_DRV_OPEN_ERROR); + + if (VIR_ALLOC(driverState) < 0) { + virReportOOMError(); + goto err; + } + + driverState->udev = udev_new(); + if (!driverState->udev) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("failed to create udev context")); + goto err; + } + + conn->interfacePrivateData = driverState; + + return VIR_DRV_OPEN_SUCCESS; + +err: + VIR_FREE(driverState); + + return VIR_DRV_OPEN_ERROR; +} + +static int +udevIfaceCloseInterface(virConnectPtr conn) +{ + struct udev_iface_driver *driverState; + + if (conn->interfacePrivateData != NULL) { + driverState = conn->interfacePrivateData; + + udev_unref(driverState->udev); + + VIR_FREE(driverState); + } + + conn->interfacePrivateData = NULL; + return 0; +} + +static int +udevIfaceNumOfInterfaces(virConnectPtr conn) +{ + struct udev_iface_driver *driverState = conn->interfacePrivateData; + struct udev *udev = udev_ref(driverState->udev); + struct udev_enumerate *enumerate = NULL; + struct udev_list_entry *devices; + struct udev_list_entry *dev_entry; + int count = 0; + + enumerate = udevIfaceGetDevices(udev, UDEV_IFACE_ACTIVE); + + if (!enumerate) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("failed to get number of active interfaces on host")); + count = -1; + goto err; + } + + /* Do the scan to load up the enumeration */ + udev_enumerate_scan_devices(enumerate); + + /* Get a list we can walk */ + devices = udev_enumerate_get_list_entry(enumerate); + + /* For each item so we can count */ + udev_list_entry_foreach(dev_entry, devices) { + count++; + } + +err: + if (enumerate) + udev_enumerate_unref(enumerate); + udev_unref(udev); + + return count; +} + +static int +udevIfaceListInterfaces(virConnectPtr conn, char **const names, int names_len) +{ + struct udev_iface_driver *driverState = conn->interfacePrivateData; + struct udev *udev = udev_ref(driverState->udev); + struct udev_enumerate *enumerate = NULL; + struct udev_list_entry *devices; + struct udev_list_entry *dev_entry; + int count = 0; + + enumerate = udevIfaceGetDevices(udev, UDEV_IFACE_ACTIVE); + + if (!enumerate) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("failed to get list of active interfaces on host")); + goto err; + } + + /* Do the scan to load up the enumeration */ + udev_enumerate_scan_devices(enumerate); + + /* Get a list we can walk */ + devices = udev_enumerate_get_list_entry(enumerate); + + /* For each item so we can count */ + udev_list_entry_foreach(dev_entry, devices) { + struct udev_device *dev; + const char *path; + + /* Ensure we won't exceed the size of our array */ + if (count > names_len) + break; + + path = udev_list_entry_get_name(dev_entry); + dev = udev_device_new_from_syspath(udev, path); + names[count] = strdup(udev_device_get_sysname(dev)); + udev_device_unref(dev); + + /* If strdup() failed, we are out of memory */ + if (!names[count]) { + virReportOOMError(); + goto err; + } + + count++; + } + + udev_enumerate_unref(enumerate); + udev_unref(udev); + + return count; + +err: + if (enumerate) + udev_enumerate_unref(enumerate); + udev_unref(udev); + + for (names_len = 0; names_len < count; names_len++) + VIR_FREE(names[names_len]); + + return -1; +} + +static int +udevIfaceNumOfDefinedInterfaces(virConnectPtr conn) +{ + struct udev_iface_driver *driverState = conn->interfacePrivateData; + struct udev *udev = udev_ref(driverState->udev); + struct udev_enumerate *enumerate = NULL; + struct udev_list_entry *devices; + struct udev_list_entry *dev_entry; + int count = 0; + + enumerate = udevIfaceGetDevices(udev, UDEV_IFACE_INACTIVE); + + if (!enumerate) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("failed to get number of defined interfaces on host")); + count = -1; + goto err; + } + + /* Do the scan to load up the enumeration */ + udev_enumerate_scan_devices(enumerate); + + /* Get a list we can walk */ + devices = udev_enumerate_get_list_entry(enumerate); + + /* For each item so we can count */ + udev_list_entry_foreach(dev_entry, devices) { + count++; + } + +err: + if (enumerate) + udev_enumerate_unref(enumerate); + udev_unref(udev); + + return count; +} + +static int +udevIfaceListDefinedInterfaces(virConnectPtr conn, + char **const names, + int names_len) +{ + struct udev_iface_driver *driverState = conn->interfacePrivateData; + struct udev *udev = udev_ref(driverState->udev); + struct udev_enumerate *enumerate = NULL; + struct udev_list_entry *devices; + struct udev_list_entry *dev_entry; + int count = 0; + + enumerate = udevIfaceGetDevices(udev, UDEV_IFACE_INACTIVE); + + if (!enumerate) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("failed to get list of defined interfaces on host")); + goto err; + } + + /* Do the scan to load up the enumeration */ + udev_enumerate_scan_devices(enumerate); + + /* Get a list we can walk */ + devices = udev_enumerate_get_list_entry(enumerate); + + /* For each item so we can count */ + udev_list_entry_foreach(dev_entry, devices) { + struct udev_device *dev; + const char *path; + + /* Ensure we won't exceed the size of our array */ + if (count > names_len) + break; + + path = udev_list_entry_get_name(dev_entry); + dev = udev_device_new_from_syspath(udev, path); + names[count] = strdup(udev_device_get_sysname(dev)); + udev_device_unref(dev); + + /* If strdup() failed, we are out of memory */ + if (!names[count]) { + virReportOOMError(); + goto err; + } + + count++; + } + + udev_enumerate_unref(enumerate); + udev_unref(udev); + + return count; + +err: + if (enumerate) + udev_enumerate_unref(enumerate); + udev_unref(udev); + + for (names_len = 0; names_len < count; names_len++) + VIR_FREE(names[names_len]); + + return -1; +} + +static virInterfacePtr +udevIfaceLookupByName(virConnectPtr conn, const char *name) +{ + struct udev_iface_driver *driverState = conn->interfacePrivateData; + struct udev *udev = udev_ref(driverState->udev); + struct udev_device *dev; + const char *macaddr; + virInterfacePtr ret = NULL; + + /* get a device reference based on the device name */ + dev = udev_device_new_from_subsystem_sysname(udev, "net", name); + if (!dev) { + virReportError(VIR_ERR_NO_INTERFACE, + _("couldn't find interface named '%s'"), + name); + goto err; + } + + macaddr = udev_device_get_sysattr_value(dev, "address"); + ret = virGetInterface(conn, name, macaddr); + udev_device_unref(dev); + +err: + udev_unref(udev); + + return ret; +} + +static virInterfacePtr +udevIfaceLookupByMACString(virConnectPtr conn, const char *macstr) +{ + struct udev_iface_driver *driverState = conn->interfacePrivateData; + struct udev *udev = udev_ref(driverState->udev); + struct udev_enumerate *enumerate = NULL; + struct udev_list_entry *dev_entry; + struct udev_device *dev; + const char *name; + virInterfacePtr ret = NULL; + + enumerate = udevIfaceGetDevices(udev, UDEV_IFACE_ALL); + + if (!enumerate) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("failed to lookup interface with MAC address '%s'"), + macstr); + goto err; + } + + /* Match on MAC */ + udev_enumerate_add_match_sysattr(enumerate, "address", macstr); + + /* Do the scan to load up the enumeration */ + udev_enumerate_scan_devices(enumerate); + + /* Get a list we can walk */ + dev_entry = udev_enumerate_get_list_entry(enumerate); + + /* Check that we got something back */ + if (!dev_entry) { + virReportError(VIR_ERR_NO_INTERFACE, + _("couldn't find interface with MAC address '%s'"), + macstr); + goto err; + } + + /* Check that we didn't get multiple items back */ + if (udev_list_entry_get_next(dev_entry)) { + virReportError(VIR_ERR_MULTIPLE_INTERFACES, + _("the MAC address '%s' matches multiple interfaces"), + macstr); + goto err; + } + + dev = udev_device_new_from_syspath(udev, udev_list_entry_get_name(dev_entry)); + name = udev_device_get_sysname(dev); + ret = virGetInterface(conn, name, macstr); + udev_device_unref(dev); + +err: + if (enumerate) + udev_enumerate_unref(enumerate); + udev_unref(udev); + + return ret; +} + +static virInterfaceDriver udevIfaceDriver = { + "Interface", + .open = udevIfaceOpenInterface, /* 0.10.3 */ + .close = udevIfaceCloseInterface, /* 0.10.3 */ + .numOfInterfaces = udevIfaceNumOfInterfaces, /* 0.10.3 */ + .listInterfaces = udevIfaceListInterfaces, /* 0.10.3 */ + .numOfDefinedInterfaces = udevIfaceNumOfDefinedInterfaces, /* 0.10.3 */ + .listDefinedInterfaces = udevIfaceListDefinedInterfaces, /* 0.10.3 */ + .interfaceLookupByName = udevIfaceLookupByName, /* 0.10.3 */ + .interfaceLookupByMACString = udevIfaceLookupByMACString, /* 0.10.3 */ +}; + +int +interfaceRegister(void) { + if (virRegisterInterfaceDriver(&udevIfaceDriver) < 0) + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("failed to register udev interface driver")); + return 0; +} diff --git a/tools/virsh.c b/tools/virsh.c index b32ee8b..f0ec625 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -2708,6 +2708,8 @@ vshShowVersion(vshControl *ctl ATTRIBUTE_UNUSED) vshPrint(ctl, " Interface"); # if defined(WITH_NETCF) vshPrint(ctl, " netcf"); +# elif defined(HAVE_UDEV) + vshPrint(ctl, " udev"); # endif #endif #ifdef WITH_NWFILTER -- 1.7.8.6

2 2

[libvirt] [PATCH 0/n] qemu block-commit support
by Eric Blake 05 Oct '12

05 Oct '12

I'm slowly making progress towards having block-commit doing something useful. First up is online support, using qemu 1.3 block-commit (hmm, that commit is in Kevin's pull request, but Anthony hasn't yet taken it into qemu.git proper, and the interface might still have more tweaks before the actual qemu 1.3 release in December, so this may be a case of me posting patches but not applying them to libvirt for another month or two). I'm still trying to test this code, as well as to write followup patches to allow things to work with SELinux enforcing, but wanted to at least get this thread started. Eric Blake (2): blockjob: manage qemu block-commit monitor command blockjob: wire up online qemu block-commit src/qemu/qemu_capabilities.c | 3 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_driver.c | 79 ++++++++++++++++++++++++++++++++++++++++++++ src/qemu/qemu_monitor.c | 30 +++++++++++++++++ src/qemu/qemu_monitor.h | 7 ++++ src/qemu/qemu_monitor_json.c | 34 +++++++++++++++++++ src/qemu/qemu_monitor_json.h | 7 ++++ 7 files changed, 161 insertions(+) -- 1.7.11.4

3 12

[libvirt] [PATCH 0/4] command line fd passing using fd sets
by Corey Bryant 05 Oct '12

05 Oct '12

This series adds command line file descriptor passing support to the -drive option. This is a follow-on to the existing QMP fd passing support provided in the following patch series: comments.gmane.org/gmane.comp.emulators.qemu/165463 An example of using the new -drive fd and opaque options: qemu-kvm -drive fd=24,opaque="rdwr:/path/file",index=0,media=disk When an fd, and optionally opaque, are passed with -drive, they are added to an automatically generated fd set. The file name is also generated in the form of "/dev/fdset/nnn", where nnn is the fd set ID. qemu_open() already knows how to handle a filename of this format. qemu_open() searches the corresponding fd set for an fd and when it finds a match, QEMU goes on to use a dup of that fd just like it would have used an fd that it opened itself. Corey Bryant (4): monitor: Less restrictive fd matching for fd sets monitor: Enable adding an inherited fd to an fd set qemu-config: Add -drive fd and opaque options blockdev: Process -drive fd and opaque options blockdev.c | 40 +++++++++++++++++- monitor.c | 128 ++++++++++++++++++++++++++++++++------------------------ monitor.h | 3 ++ qemu-config.c | 8 ++++ qemu-options.hx | 15 ++++++- 5 files changed, 135 insertions(+), 59 deletions(-) -- 1.7.11.4

3 14

[libvirt] with latest libvirt(from git) on F18, time to take internal snapshot increases as snapshot count rises
by Kashyap Chamarthy 05 Oct '12

05 Oct '12

Hi, the below three internal snapshots were taken when the guest is running 'live'. Any hints on why the time to take snapshots keep increasing ? If you notice, the 2nd and 3rd internal snaphtots took more than 4 minutes each (note: there is no noticeable content change from snap1 ) #==================================================# [root@localhost vmimages]# time virsh snapshot-create-as f17vm3-with-b snap1 snap1-f17vm3-desc Domain snapshot snap1 created real 0m57.734s user 0m0.009s sys 0m0.024s [root@localhost vmimages]# [root@localhost vmimages]# virsh snapshot-list f17vm3-with-b Name Creation Time State ------------------------------------------------------------ snap1 2012-10-04 06:55:38 -0400 running [root@localhost vmimages]# #==================================================# [root@localhost vmimages]# time virsh snapshot-create-as f17vm3-with-b snap2 snap2-f17vm3-desc Domain snapshot snap2 created real 4m19.126s user 0m0.020s sys 0m0.030s [root@localhost vmimages]# #==================================================# [root@localhost vmimages]# time virsh snapshot-create-as f17vm3-with-b snap3 snap3-f17vm3-desc Domain snapshot snap3 created real 4m45.053s user 0m0.013s sys 0m0.032s [root@localhost vmimages]# #==================================================# [root@localhost qemu]# qemu-img info /home/kashyap/vmimages/f17vm3-with-b.qcow2 image: /home/kashyap/vmimages/f17vm3-with-b.qcow2 file format: qcow2 virtual size: 5.0G (5368709120 bytes) disk size: 755M cluster_size: 65536 backing file: /home/kashyap/vmimages/base-f17.qcow2 Snapshot list: ID TAG VM SIZE DATE VM CLOCK 1 snap1 232M 2012-10-04 06:55:38 19:58:19.804 2 snap2 247M 2012-10-04 07:03:09 20:04:53.360 3 snap3 244M 2012-10-04 07:08:23 20:05:48.889 4 snap4 0 2012-10-04 08:51:16 00:00:00.000 5 snap5 0 2012-10-04 08:53:04 00:00:00.000 [root@localhost qemu]# #==================================================# [root@localhost qemu]# virsh snapshot-list f17vm3-with-b Name Creation Time State ------------------------------------------------------------ snap1 2012-10-04 06:55:38 -0400 running snap2 2012-10-04 07:03:08 -0400 running snap3 2012-10-04 07:08:23 -0400 running snap4 2012-10-04 08:51:16 -0400 shutoff snap5 2012-10-04 08:53:04 -0400 shutoff [root@localhost qemu]# #==================================================# -- /kashyap

2 4

[libvirt] [PATCH] S390: Buffer too small for large CPU numbers.
by Viktor Mihajlovski 05 Oct '12

05 Oct '12

The output buffer for virFileReadAll was too small for systems with more than 30 CPUs which leads to a log entry and incorrect behavior. The new size will be sufficient for the current architectural limits. Signed-off-by: Viktor Mihajlovski <mihajlov(a)linux.vnet.ibm.com> --- src/util/sysinfo.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/util/sysinfo.c b/src/util/sysinfo.c index d38b4ff..8add936 100644 --- a/src/util/sysinfo.c +++ b/src/util/sysinfo.c @@ -361,7 +361,7 @@ virSysinfoRead(void) { goto no_memory; /* Gather info from /proc/cpuinfo */ - if (virFileReadAll(CPUINFO, 2048, &outbuf) < 0) { + if (virFileReadAll(CPUINFO, 8192, &outbuf) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to open %s"), CPUINFO); return NULL; @@ -376,7 +376,7 @@ virSysinfoRead(void) { VIR_FREE(outbuf); /* Gather info from /proc/sysinfo */ - if (virFileReadAll(SYSINFO, 4096, &outbuf) < 0) { + if (virFileReadAll(SYSINFO, 8192, &outbuf) < 0) { virReportError(VIR_ERR_INTERNAL_ERROR, _("Failed to open %s"), SYSINFO); return NULL; -- 1.7.0.4

2 2

[libvirt] [PATCH] Check for private symbols presence as well
by Michal Privoznik 05 Oct '12

05 Oct '12

Currently, we are checking if libvirt.so contains public symbols. However, sometimes we rename an internal symbol and forget to change libvirt_private.syms accordingly. Hence, it's safer to check for internal symbols as well. --- src/Makefile.am | 7 ++++++- src/check-symfile.pl | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index ae3d491..c5840c0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -318,8 +318,13 @@ if WITH_LINUX check-symfile: libvirt.syms libvirt.la $(AM_V_GEN)$(PERL) $(srcdir)/check-symfile.pl libvirt.syms \ .libs/libvirt.so + +check-private-symfile: libvirt_private.syms libvirt.la + $(AM_V_GEN)$(PERL) $(srcdir)/check-symfile.pl libvirt_private.syms \ + .libs/libvirt.so else check-symfile: +check-private-symfile: endif PROTOCOL_STRUCTS = \ @@ -344,7 +349,7 @@ else !WITH_REMOTE check-protocol: endif EXTRA_DIST += $(PROTOCOL_STRUCTS) check-symfile.pl -check-local: check-protocol check-symfile +check-local: check-protocol check-symfile check-private-symfile .PHONY: check-protocol $(PROTOCOL_STRUCTS:structs=struct) # Mock driver, covering domains, storage, networks, etc diff --git a/src/check-symfile.pl b/src/check-symfile.pl index ac37b46..435e045 100755 --- a/src/check-symfile.pl +++ b/src/check-symfile.pl @@ -44,7 +44,7 @@ foreach my $elflib (@elflibs) { close NM; } -foreach my $sym (@wantsyms) { +foreach my $sym (keys(%wantsyms)) { next if exists $gotsyms{$sym}; print STDERR "Expected symbol $sym is not in ELF library\n"; -- 1.7.8.6

2 5

[libvirt] [libvirt-php] Function calls blocking on Ubuntu 12.04
by Rory Slegtenhorst 05 Oct '12

05 Oct '12

Dear List, Please note I am not subscribed to this list. I just wanted to state my problem, and will wait for a fix when it comes. I have sucessfully compiled libvirt-php-0.4.5 on Ubuntu 12.04. I ran into some problems when using the library in simple php code, specifically trying to retrieve a screenshot. 1. libvirt_domain_get_screenshot_api returns a PHP fatal about it not being defined ?!? I have not looked into this at all. It was the first of the two I tried, and went on for the other :) 2. libvirt_domain_get_screenshot blocks forever I investigated this one, as from my debug logging, I could see things were going right. My browser just never finishes loading. I traced it down vnc.c on line x where a loop is started. The loop never seems to finish (unsure why though), and commenting out the loop fixes my problem. With kind regards, Rory Slegtenhorst rory dot slegtenhorst at gmail dot com

1 1

[libvirt] [PATCH] private.syms: Drop virKillProcess
by Michal Privoznik 05 Oct '12

05 Oct '12

After it got renamed to virProcessKill (cf470068a11) it is no longer needed in the private syms file. --- It is trivial, but maybe worth inventing cfg.mk macro that does check if all symbols fro private syms are defined somewhere. However, I am not that familiar with cfg.mk, so if anybody has any idea ... src/libvirt_private.syms | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index eebc52a..a8c81e7 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1246,7 +1246,6 @@ virGetUserName; virHexToBin; virIndexToDiskName; virIsDevMapperDevice; -virKillProcess; virParseNumber; virParseVersionString; virPipeReadUntilEOF; -- 1.7.8.6

2 2

[libvirt] [PATCH v3 0/2] security: support for names on DAC labels
by Marcelo Cerri 05 Oct '12

05 Oct '12

This patch series extends label parsing for DAC security driver and updates the related documentation. This version basically uses virReportError instead of VIR_DEBUG for error messages. Marcelo Cerri (2): security: also parse user/group names instead of just IDs for DAC labels doc: update description about security labels on formatdomain.html docs/formatdomain.html.in | 14 ++++++- src/security/security_dac.c | 92 ++++++++++++++++++++++++++++++++++----------- 2 files changed, 82 insertions(+), 24 deletions(-) -- 1.7.12

3 8

[libvirt] [PATCH] spec: prefer canonical name of util-linux
by Eric Blake 05 Oct '12

05 Oct '12

I noticed that in two places, we require util-linux, and in a third, we require util-linux-ng. On Fedora (I tested F15 through rawhide), util-linux-ng is obsoleted by util-linux; on RHEL 6, util-linux is obsoleted by util-linux-ng. That is, on either platform, either name will get you the correct package installed (where the preferred name on fedora is util-linux, and on RHEL 6 is util-linux-ng). But on RHEL 5, there is no util-linux-ng * libvirt.spec.in (Requires): Use util-linux, not util-linux-ng. --- I debated about pushing this under the trivial rule, but decided not to. Also, if you look at Fedora's git repository for libvirt, you'll notice that Peter Robinson attempted this same patch for F17 in commit f9de2f6, but with no explanation why. libvirt.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 11e3199..e3d0a2d 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -614,7 +614,7 @@ Requires: PolicyKit >= 0.6 %if %{with_storage_fs} Requires: nfs-utils # For mkfs -Requires: util-linux-ng +Requires: util-linux # For pool-build probing for existing pools BuildRequires: libblkid-devel >= 2.17 # For glusterfs -- 1.7.11.4

2 2

[libvirt] migration.html page issues
by Eric Blake 05 Oct '12

05 Oct '12

Compare the table of contents on http://libvirt.org/migration.html to most other pages on libvirt.org. For some reason, the build process of converting migration.html.in into live html is rendering all links to internal anchors as '#' instead of full '#name' links. I'm throwing this out there in case someone else knows more quickly how to fix the problem (I'm not very fluent with all the xsltproc conversion stuff in the docs directory). -- Eric Blake eblake(a)redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

2 2