- Devel - libvirt List Archives

[libvirt] [PATCH 1/2] lxc: Add virCgroupSetOwner()
by Richard Weinberger 14 Feb '14

14 Feb '14

Add a new helper function to change the permissions of a control group. This function is needed for user namespaces, we need to chmod() the cgroup to the initial uid/gid such that systemd is allowed to use the cgroup. Signed-off-by: Richard Weinberger <richard(a)nod.at> --- src/libvirt_private.syms | 1 + src/lxc/lxc_cgroup.c | 7 +++++++ src/util/vircgroup.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ src/util/vircgroup.h | 2 ++ 4 files changed, 56 insertions(+) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 2c9536a..40e72f2 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1056,6 +1056,7 @@ virCgroupSetMemory; virCgroupSetMemoryHardLimit; virCgroupSetMemorySoftLimit; virCgroupSetMemSwapHardLimit; +virCgroupSetOwner; virCgroupSupportsCpuBW; diff --git a/src/lxc/lxc_cgroup.c b/src/lxc/lxc_cgroup.c index cc0d5e8..de93528 100644 --- a/src/lxc/lxc_cgroup.c +++ b/src/lxc/lxc_cgroup.c @@ -484,6 +484,13 @@ virCgroupPtr virLXCCgroupCreate(virDomainDefPtr def) &cgroup) < 0) goto cleanup; + /* setup control group permissions for user namespace */ + if (def->idmap.uidmap) { + if (virCgroupSetOwner(cgroup, def->idmap.uidmap[0].target, + def->idmap.gidmap[0].target)) + goto cleanup; + } + cleanup: return cgroup; } diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index a6d60c5..b2666e8 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -3252,6 +3252,52 @@ cleanup: return ret; } +int virCgroupSetOwner(virCgroupPtr cgroup, uid_t uid, gid_t gid) { + size_t i; + + for (i = 0; i < VIR_CGROUP_CONTROLLER_LAST; i++) { + char *base, *entry; + DIR *dh; + struct dirent *de; + + if (!cgroup->controllers[i].mountPoint) + continue; + + if (virAsprintf(&base, "%s%s", cgroup->controllers[i].mountPoint, + cgroup->controllers[i].placement) < 0) { + virReportOOMError(); + return -1; + } + + dh = opendir(base); + while ((de = readdir(dh)) != NULL) { + if (STREQ(de->d_name, ".") || + STREQ(de->d_name, "..")) + continue; + + if (virAsprintf(&entry, "%s/%s", base, de->d_name) < 0) { + VIR_FREE(base); + virReportOOMError(); + } + + if (chown(entry, uid, gid) < 0) + virReportSystemError(errno, _("cannot chown '%s' to (%u, %u)"), + entry, uid, gid); + + VIR_FREE(entry); + } + closedir(dh); + + if (chown(base, uid, gid) < 0) + virReportSystemError(errno, _("cannot chown '%s' to (%u, %u)"), + base, uid, gid); + + VIR_FREE(base); + } + + return 0; +} + /** * virCgroupSupportsCpuBW(): diff --git a/src/util/vircgroup.h b/src/util/vircgroup.h index a70eb18..6e00f28 100644 --- a/src/util/vircgroup.h +++ b/src/util/vircgroup.h @@ -225,4 +225,6 @@ int virCgroupIsolateMount(virCgroupPtr group, bool virCgroupSupportsCpuBW(virCgroupPtr cgroup); +int virCgroupSetOwner(virCgroupPtr cgroup, uid_t uid, gid_t gid); + #endif /* __VIR_CGROUP_H__ */ -- 1.8.4.5

2 6

[libvirt] [PATCH] storage: Fix build with older compilers afeter gluster snapshot series
by Peter Krempa 14 Feb '14

14 Feb '14

In commit e32268184b4fd1611ed5ffd3c758b8f6a34152e6 I accidentally added twice a typedef for virStorageFileBackend when I moved it between files across patch iterations. The double declaration breaks build on older compilers in RHEL5 and FreeBSD. Remove the spurious definition. --- Notes: Pushed under the build-breaker rule. src/storage/storage_backend.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/storage/storage_backend.h b/src/storage/storage_backend.h index 1c7ad1e..5314411 100644 --- a/src/storage/storage_backend.h +++ b/src/storage/storage_backend.h @@ -207,9 +207,6 @@ typedef int (*virStorageFileBackendStat)(virStorageFilePtr file, struct stat *st); -typedef struct _virStorageFileBackend virStorageFileBackend; -typedef virStorageFileBackend *virStorageFileBackendPtr; - virStorageFileBackendPtr virStorageFileBackendForType(int type, int protocol); struct _virStorageFileBackend { -- 1.8.5.3

1 0

[libvirt] [PATCH v7 0/7] Support keyboard device
by Li Zhang 14 Feb '14

14 Feb '14

From: Li Zhang <zhlcindy(a)linux.vnet.ibm.com> This patchset is to add keyboard input device. For PPC64, it doesn't support a default keyboard device when the graphic is enabled. Libvirt supports QEMU command line as "-device VGA" which won't create any keyboard device for it. So it requires libvirt to add a default USB keyboard device for it. This patchset is to add keyboard input device and a default USB keyboard for PPC64. The related discussion in QEMU community: http://lists.nongnu.org/archive/html/qemu-devel/2013-11/msg01734.html Li Zhang (7): conf: Add a keyboard input device type conf: Add one interface to add default input devices conf: Remove the implicit PS2 mouse for non-X86 and platforms and add an implicit PS2 keyboard device for X86 platforms. qemu_cap: Add USB keyboard capability qemu: format qemu command line for USB keyboard xen: format xen command line for USB keyboard Add a default USB keyboard and USB mouse for PPC64 v7 -> v6: * Corret indention errors in code. (Jan Tomko) * Correct make check error in xen driver. (Jan Tomko) * Split 5/6 to 2 parts, qemu and xen. (Jan Tomko) v6 -> v5: * Change kbd to keyboard, and correct -usbdevice parameter. * Remove implicit PS/2 keyboard output in XML in case older libvirtd can read it. (Jan Tomko) * Remove implicit keyboard for XEN to make it safer. v5 -> v4: * Add PS/2 KBD definition in XML file. (Daniel.P.Berrange) * Allow PS/2 KBD devices and set KBD default bus as PS2 for X86, USB for non-x86. (Daniel.P.Berrange) * Add an implicit PS/2 KBD as PS/2 mouse. (Danniel.P.Berrange) v4 -> v3: * Don't remove PS2 mouse device for other virtualization drivers (Jan Tomko). v3 -> v2: * Handle the KBD device type in xen and QEMU driver. (Daniel.P.Berrange) * Remove PS2 mouse device for non-X86 platforms. * Move virDomainDefMaybeAddInput to a new patch. (Jan Tomko) * Replace VIR_REALLOC_N with VIR_APPEND_ELEMENT. (Jan Tomoko) * Fix several typos. (Jan Tomoko) * Add a virReportError when QEMU_CAPS_DEVICE_USB_KBD can't be gotten. (Jan Tomoko) v2 -> v1: * change ifs to switch clause. * reconstruct the patches docs/schemas/domaincommon.rng | 1 + src/conf/domain_conf.c | 112 ++++++++++++++------- src/conf/domain_conf.h | 5 + src/libvirt_private.syms | 1 + src/qemu/qemu_capabilities.c | 3 + src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 41 ++++++-- src/qemu/qemu_domain.c | 23 ++++- src/util/virarch.h | 2 + src/xenxs/xen_sxpr.c | 27 +++-- src/xenxs/xen_xm.c | 30 ++++-- tests/qemucapabilitiesdata/caps_1.2.2-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.3.1-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.4.2-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.5.3-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.0-1.caps | 1 + tests/qemucapabilitiesdata/caps_1.6.50-1.caps | 1 + tests/qemuhelptest.c | 8 ++ .../qemuxml2argvdata/qemuxml2argv-pseries-disk.xml | 3 +- .../qemuxml2argv-pseries-usb-kbd.args | 9 ++ .../qemuxml2argv-pseries-usb-kbd.xml | 19 ++++ tests/qemuxml2argvtest.c | 3 + 22 files changed, 227 insertions(+), 67 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-kbd.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-kbd.xml -- 1.8.2.1

1 7

[libvirt] [PATCH v3 00/21] LXC configuration conversion
by Cédric Bosdonnat 14 Feb '14

14 Feb '14

Here is an updated version of the patch set fixing comments from Daniel. It also adds 3 commits: * One adding conversion for the newly supported blkio throttle tune in lxc driver. * One actually using the state of the veth network device in lxc driver. * One adding the ability to give major:minor numbers instead of a path for blkio tune devices. The last one is a way to address Daniel's comment on the /dev/block/... paths. Cédric Bosdonnat (21): Improve virConf parse to handle LXC config format LXC driver: started implementing connectDomainXMLFromNative LXC from native: import rootfs LXC from native: migrate fstab and lxc.mount.entry LXC from native: implement no network conversion LXC from native: migrate veth network configuration LXC from native: convert phys network types to net hostdev devices LXC from native: convert lxc.tty to console devices LXC from native: convert macvlan network configuration LXC from native: convert lxc.id_map into <idmap> LXC from native: migrate memory tuning LXC from native: map lxc.cgroup.cpu.* LXC from native: map lxc.cgroup.cpuset.* LXC from native: add lxc.cgroup.blkio.* mapping LXC from native: map lxc.arch to /domain/os/type@arch LXC from native: map block filesystems LXC from native: map vlan network type LXC: added some doc on domxml-from-native with mention of limitations LXC from native: convert blkio throttle config lxc: honor link state=up for veth interfaces blkiotune: allow <node major='' minor=''/> in place of <path> .gitignore | 1 + docs/drvlxc.html.in | 34 +- docs/formatdomain.html.in | 10 +- po/POTFILES.in | 1 + src/Makefile.am | 1 + src/conf/domain_conf.c | 45 +- src/conf/domain_conf.h | 2 + src/libvirt_private.syms | 1 + src/lxc/lxc_cgroup.c | 5 + src/lxc/lxc_container.c | 2 +- src/lxc/lxc_container.h | 2 + src/lxc/lxc_driver.c | 41 + src/lxc/lxc_native.c | 952 +++++++++++++++++++++ src/lxc/lxc_native.h | 32 + src/lxc/lxc_process.c | 5 + src/qemu/qemu_cgroup.c | 5 + src/qemu/qemu_driver.c | 10 + src/util/vircgroup.c | 126 ++- src/util/vircgroup.h | 10 + src/util/virconf.c | 46 +- src/util/virconf.h | 10 + tests/Makefile.am | 7 +- tests/lxcconf2xmldata/lxcconf2xml-blkiotune.config | 11 + tests/lxcconf2xmldata/lxcconf2xml-blkiotune.xml | 39 + .../lxcconf2xmldata/lxcconf2xml-cpusettune.config | 6 + tests/lxcconf2xmldata/lxcconf2xml-cpusettune.xml | 27 + tests/lxcconf2xmldata/lxcconf2xml-cputune.config | 7 + tests/lxcconf2xmldata/lxcconf2xml-cputune.xml | 29 + tests/lxcconf2xmldata/lxcconf2xml-fstab.config | 37 + tests/lxcconf2xmldata/lxcconf2xml-idmap.config | 5 + tests/lxcconf2xmldata/lxcconf2xml-idmap.xml | 28 + .../lxcconf2xml-macvlannetwork.config | 13 + .../lxcconf2xmldata/lxcconf2xml-macvlannetwork.xml | 26 + tests/lxcconf2xmldata/lxcconf2xml-memtune.config | 10 + tests/lxcconf2xmldata/lxcconf2xml-memtune.xml | 29 + .../lxcconf2xmldata/lxcconf2xml-nonenetwork.config | 4 + tests/lxcconf2xmldata/lxcconf2xml-nonenetwork.xml | 21 + tests/lxcconf2xmldata/lxcconf2xml-nonetwork.config | 3 + tests/lxcconf2xmldata/lxcconf2xml-nonetwork.xml | 24 + .../lxcconf2xmldata/lxcconf2xml-physnetwork.config | 6 + tests/lxcconf2xmldata/lxcconf2xml-physnetwork.xml | 26 + tests/lxcconf2xmldata/lxcconf2xml-simple.config | 41 + tests/lxcconf2xmldata/lxcconf2xml-simple.xml | 41 + .../lxcconf2xmldata/lxcconf2xml-vlannetwork.config | 12 + tests/lxcconf2xmldata/lxcconf2xml-vlannetwork.xml | 26 + tests/lxcconf2xmltest.c | 131 +++ 46 files changed, 1865 insertions(+), 85 deletions(-) create mode 100644 src/lxc/lxc_native.c create mode 100644 src/lxc/lxc_native.h create mode 100644 tests/lxcconf2xmldata/lxcconf2xml-blkiotune.config create mode 100644 tests/lxcconf2xmldata/lxcconf2xml-blkiotune.xml create mode 100644 tests/lxcconf2xmldata/lxcconf2xml-cpusettune.config create mode 100644 tests/lxcconf2xmldata/lxcconf2xml-cpusettune.xml create mode 100644 tests/lxcconf2xmldata/lxcconf2xml-cputune.config create mode 100644 tests/lxcconf2xmldata/lxcconf2xml-cputune.xml create mode 100644 tests/lxcconf2xmldata/lxcconf2xml-fstab.config create mode 100644 tests/lxcconf2xmldata/lxcconf2xml-idmap.config create mode 100644 tests/lxcconf2xmldata/lxcconf2xml-idmap.xml create mode 100644 tests/lxcconf2xmldata/lxcconf2xml-macvlannetwork.config create mode 100644 tests/lxcconf2xmldata/lxcconf2xml-macvlannetwork.xml create mode 100644 tests/lxcconf2xmldata/lxcconf2xml-memtune.config create mode 100644 tests/lxcconf2xmldata/lxcconf2xml-memtune.xml create mode 100644 tests/lxcconf2xmldata/lxcconf2xml-nonenetwork.config create mode 100644 tests/lxcconf2xmldata/lxcconf2xml-nonenetwork.xml create mode 100644 tests/lxcconf2xmldata/lxcconf2xml-nonetwork.config create mode 100644 tests/lxcconf2xmldata/lxcconf2xml-nonetwork.xml create mode 100644 tests/lxcconf2xmldata/lxcconf2xml-physnetwork.config create mode 100644 tests/lxcconf2xmldata/lxcconf2xml-physnetwork.xml create mode 100644 tests/lxcconf2xmldata/lxcconf2xml-simple.config create mode 100644 tests/lxcconf2xmldata/lxcconf2xml-simple.xml create mode 100644 tests/lxcconf2xmldata/lxcconf2xml-vlannetwork.config create mode 100644 tests/lxcconf2xmldata/lxcconf2xml-vlannetwork.xml create mode 100644 tests/lxcconf2xmltest.c -- 1.8.5.2

5 50

Re: [libvirt] [PATCH RFC 0/2] support compression with dumping guest memory
by Qiao Nuohan 13 Feb '14

13 Feb '14

On 01/29/2014 10:04 AM, qiaonuohan wrote: > --memory-only option is introduced without compression supported. Therefore, > this is a freature regression of virsh dump. This patchset is used to add > compression support in libvirt side and please refer the following address to > see the qemu side, the lastest version of qemu side v7(ready for comment now). > > http://lists.gnu.org/archive/html/qemu-devel/2014-01/msg03669.html > > qiaonuohan (2): > support compression when --memory-only option is specified > support configuring the format of dumping memory in qemu.conf > > include/libvirt/libvirt.h.in | 18 +++++++++---- > src/libvirt.c | 15 +++++++++++ > src/qemu/libvirtd_qemu.aug | 1 + > src/qemu/qemu.conf | 6 +++++ > src/qemu/qemu_conf.c | 2 ++ > src/qemu/qemu_conf.h | 1 + > src/qemu/qemu_driver.c | 52 +++++++++++++++++++++++++++++++++++--- > src/qemu/qemu_monitor.c | 6 ++--- > src/qemu/qemu_monitor.h | 3 ++- > src/qemu/qemu_monitor_json.c | 4 ++- > src/qemu/qemu_monitor_json.h | 3 ++- > src/qemu/test_libvirtd_qemu.aug.in | 1 + > tests/qemumonitorjsontest.c | 2 +- > tools/virsh-domain.c | 29 +++++++++++++++++++++ > 14 files changed, 127 insertions(+), 16 deletions(-) > Hello Do you have some comments on my patches? -- Regards Qiao Nuohan

2 1

[libvirt] Get Info for QEMU/KVM storage and volume
by Qiang Fu 13 Feb '14

13 Feb '14

Hi all, I am new to libvirt. Right now I am trying to use libvirt to get statistics information (size, free space and so on) on host storage and vm volume running on QEMU/KVM hypervisor. However when I looked at the API support matrix: http://libvirt.org/hvsupport.html#virStorageDriver It seems the storage pool APIs do not support QEMU/KVM even for the latest version of libvirt. Can anyone suggest any workaround solution? Or will there be any plan in the future for libvirt to support that? Thanks in advance, Bruce

1 0

[libvirt] [PATCHv5 0/7] Gluster snapshot series
by Peter Krempa 13 Feb '14

13 Feb '14

New version after the recent feedback and fixing a few bugs found while testing. Please see individual patches for changes. Peter Krempa (7): storage: Add APIs for internal handling of files via the storage driver storage: Implement file storage APIs in the default storage driver storage: add file functions for local and block files storage: Add storage file backends for gluster qemu: Switch snapshot deletion to the new API functions qemu: snapshot: Use new APIs to detect presence of existing storage files qemu: snapshot: Add support for external active snapshots on gluster docs/formatsnapshot.html.in | 5 +- docs/hvsupport.pl | 4 +- po/POTFILES.in | 1 + src/Makefile.am | 1 + src/check-aclrules.pl | 1 + src/check-drivername.pl | 1 + src/driver.h | 30 ++++- src/libvirt_private.c | 180 ++++++++++++++++++++++++++++++ src/libvirt_private.h | 61 ++++++++++ src/libvirt_private.syms | 9 ++ src/qemu/qemu_command.c | 2 +- src/qemu/qemu_command.h | 9 ++ src/qemu/qemu_driver.c | 204 ++++++++++++++++++++++++++-------- src/storage/storage_backend.c | 42 +++++++ src/storage/storage_backend.h | 43 +++++++ src/storage/storage_backend_fs.c | 48 ++++++++ src/storage/storage_backend_fs.h | 2 + src/storage/storage_backend_gluster.c | 143 ++++++++++++++++++++++++ src/storage/storage_backend_gluster.h | 1 + src/storage/storage_driver.c | 95 ++++++++++++++++ 20 files changed, 829 insertions(+), 53 deletions(-) create mode 100644 src/libvirt_private.c create mode 100644 src/libvirt_private.h -- 1.8.5.3

3 16

[libvirt] [PATCH] qemu driver: sync guest time via qemu-guest-agent when domain is resumed
by Marcelo Tosatti 13 Feb '14

13 Feb '14

Since QEMU commit "kvmclock: clock should count only if vm is running" (http://lists.gnu.org/archive/html/qemu-devel/2013-06/msg01225.html) guests have their realtime clock stopped during pause. To correct the situation, invoke guest agent to sync time from host time. Signed-off-by: Marcelo Tosatti <mtosatti(a)redhat.com> diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 8bcd98e..df01244 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -2695,6 +2695,40 @@ qemuProcessPrepareMonitorChr(virQEMUDriverConfigPtr cfg, } + +#include <sys/time.h> + +static void +qemuAgentSyncGuestTime(virDomainObjPtr vm) +{ + int ret; + struct timeval tv; + char *result; + qemuDomainObjPrivatePtr priv; + char buf[500]; + + priv = vm->privateData; + + ret = gettimeofday(&tv, NULL); + if (ret) { + virReportSystemError(errno, "%s", _("gettimeofday failure")); + return; + } + + memset(buf, 0, sizeof(buf)); + + sprintf(buf, "{ \"execute\": \"guest-set-time\"," + "\"arguments\":{\"time\":%lld}}\" ", + tv.tv_usec * 1000 + (tv.tv_sec * 1000000000LL)); + + qemuDomainObjEnterAgent(vm); + ret = qemuAgentArbitraryCommand(priv->agent, buf, &result, + VIR_DOMAIN_QEMU_AGENT_COMMAND_DEFAULT); + qemuDomainObjExitAgent(vm); + if (ret < 0) + VIR_FREE(result); +} + /* * Precondition: vm must be locked, and a job must be active. * This method will call {Enter,Exit}Monitor @@ -2727,6 +2761,7 @@ qemuProcessStartCPUs(virQEMUDriverPtr driver, virDomainObjPtr vm, if (ret == 0) { virDomainObjSetState(vm, VIR_DOMAIN_RUNNING, reason); + qemuAgentSyncGuestTime(vm); } else { if (virDomainLockProcessPause(driver->lockManager, vm, &priv->lockState) < 0) VIR_WARN("Unable to release lease on %s", vm->def->name);

4 16

[libvirt] [PATCH] spec: add missing dep of libvirt-daemon-config-nwfilter
by Eric Blake 13 Feb '14

13 Feb '14

Similar to cf76c4b, if modules are used, then nwfilter configuration requires the nwfilter driver module. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- libvirt.spec.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index 2d57c71..2b44c21 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -737,6 +737,9 @@ Summary: Network filter configuration files for the libvirtd daemon Group: Development/Libraries Requires: libvirt-daemon = %{version}-%{release} + %if %{with_driver_modules} +Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release} + %endif %description daemon-config-nwfilter Network filter configuration files for cleaning guest traffic -- 1.8.5.3

2 2

[libvirt] [PATCH] spec: require libvirt-wireshark from libvirt metapackage
by Eric Blake 13 Feb '14

13 Feb '14

In general, the 'libvirt' metapackage should pull in all subpackages. Fix this for the wireshark subpackage created in commit f9ada9f. * libvirt.spec.in (Requires): Add dependency. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- libvirt.spec.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index d3e6048..2d57c71 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -428,6 +428,9 @@ Requires: libvirt-daemon-driver-storage = %{version}-%{release} Requires: libvirt-daemon-driver-network = %{version}-%{release} Requires: libvirt-daemon-driver-nodedev = %{version}-%{release} %endif + %if %{with_wireshark} +Requires: libvirt-wireshark = %{version}-%{release} + %endif %endif Requires: libvirt-client = %{version}-%{release} -- 1.8.5.3

4 7

[libvirt] [PATCH] rpm: create libvirt-wireshark sub-package
by Eric Blake 13 Feb '14

13 Feb '14

On Fedora 20, with wireshark-devel installed, 'make rpm' failed due to installed but unpackaged files related to wireshark. As F20 is already released without wireshark, I chose to add a new sub-package that is enabled only for F21 and later. Furthermore, all existing wireshark plugins belong to the wireshark package, so I got to invent behavior of how the first third-part wireshark module will behave. * libvirt.spec.in (with_wireshark): Add new conditional. * configure.ac (ws-plugindir): Improve wording. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- I was tempted to push this as a build-breaker fix for 'make rpm', but rpms are close enough to black magic that I decided a review is safer, after all. Tested with both F20 (not built) and F21 (new subpackage built just fine), using normal build of all subpackages and also a build with '%client_only 1' in ~/.rpmmacros to ensure that it indeed works in a client-only setup. configure.ac | 4 ++-- libvirt.spec.in | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 884e0e4..23e2201 100644 --- a/configure.ac +++ b/configure.ac @@ -2578,8 +2578,8 @@ AM_CONDITIONAL([WITH_WIRESHARK_DISSECTOR], [test "$with_wireshark_dissector" = " AC_ARG_WITH([ws-plugindir], [AS_HELP_STRING([--with-ws-plugindir], - [wireshark plugins directory that plugin will installed])], - [ ws_plugindir=$withval ]) + [wireshark plugins directory for use when installing wireshark plugin])], + [ws_plugindir=$withval]) if test "$with_wireshark_dissector" != "no" && test -z "$ws_plugindir"; then ws_version=`$WIRESHARK -v | head -1 | cut -f 2 -d' '` diff --git a/libvirt.spec.in b/libvirt.spec.in index 5229ece..e006f2b 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -129,6 +129,7 @@ %define with_numad 0%{!?_without_numad:0} %define with_firewalld 0%{!?_without_firewalld:0} %define with_libssh2 0%{!?_without_libssh2:0} +%define with_wireshark 0%{!?_without_wireshark:0} # Non-server/HV driver defaults which are always enabled %define with_sasl 0%{!?_without_sasl:1} @@ -269,6 +270,11 @@ %define with_libssh2 0%{!?_without_libssh2:1} %endif +# Enable wireshark plugins for all distros shipping libvirt 1.2.2 or newer +%if 0%{?fedora} >= 21 + %define with_wireshark 0%{!?_without_wireshark:1} +%endif + # Disable some drivers when building without libvirt daemon. # The logic is the same as in configure.ac %if ! %{with_libvirtd} @@ -631,6 +637,10 @@ BuildRequires: scrub BuildRequires: numad %endif +%if %{with_wireshark} +BuildRequires: wireshark-devel +%endif + Provides: bundled(gnulib) %description @@ -1115,6 +1125,17 @@ Requires: cyrus-sasl-md5 Shared libraries and client binaries needed to access to the virtualization capabilities of recent versions of Linux (and other OSes). +%if %{with_wireshark} +%package wireshark +Summary: Wireshark dissector plugin for libvirt RPC transactions +Group: Development/Libraries +Requires: wireshark +Requires: %{name}-client = %{version}-%{release} + +%description wireshark +Wireshark dissector plugin for better analysis of libvirt RPC traffic. +%endif + %if %{with_lxc} %package login-shell Summary: Login shell for connecting users to an LXC container @@ -1340,6 +1361,10 @@ driver %define _with_firewalld --with-firewalld %endif +%if ! %{with_wireshark} + %define _without_wireshark --without-wireshark-dissector +%endif + %define when %(date +"%%F-%%T") %define where %(hostname) %define who %{?packager}%{!?packager:Unknown} @@ -1412,6 +1437,7 @@ driver %{?_without_dtrace} \ %{?_without_driver_modules} \ %{?_with_firewalld} \ + %{?_without_wireshark} \ %{with_packager} \ %{with_packager_version} \ --with-qemu-user=%{qemu_user} \ @@ -1442,6 +1468,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt/lock-driver/*.a rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt/connection-driver/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt/connection-driver/*.a %endif +%if %{with_wireshark} +rm -f $RPM_BUILD_ROOT%{_libdir}/wireshark/plugins/*/libvirt.la +%endif %if %{with_network} install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/lib/libvirt/dnsmasq/ @@ -2117,6 +2146,11 @@ exit 0 %config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf %endif +%if %{with_wireshark} +%files wireshark +%{_libdir}/wireshark/plugins/*/libvirt.so +%endif + %if %{with_lxc} %files login-shell %attr(4750, root, virtlogin) %{_bindir}/virt-login-shell -- 1.8.5.3

3 7

[libvirt] [PATCH] lxc from native: removed now remaining useless line
by Cédric Bosdonnat 13 Feb '14

13 Feb '14

--- src/lxc/lxc_native.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/lxc/lxc_native.c b/src/lxc/lxc_native.c index ee07635..2cf479d 100644 --- a/src/lxc/lxc_native.c +++ b/src/lxc/lxc_native.c @@ -900,7 +900,6 @@ lxcParseConfigString(const char *config) } /* Loop over lxc.mount.entry to add filesystem devices for them */ - value = virConfGetValue(properties, "lxc.mount.entry"); if (virConfWalk(properties, lxcFstabWalkCallback, vmdef) < 0) goto error; -- 1.8.5.2

2 1

[libvirt] [PATCH] Fix stream related spelling mistakes
by Philipp Hahn 13 Feb '14

13 Feb '14

Consistent spelling of all-uppercase I/O. Signed-off-by: Philipp Hahn <hahn(a)univention.de> --- libvirt-override-virStream.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libvirt-override-virStream.py b/libvirt-override-virStream.py index 53000da..e9dd09a 100644 --- a/libvirt-override-virStream.py +++ b/libvirt-override-virStream.py @@ -28,7 +28,7 @@ def recvAll(self, handler, opaque): """Receive the entire data stream, sending the data to the requested data sink. This is simply a convenient alternative - to virStreamRecv, for apps that do blocking-I/o. + to virStreamRecv, for apps that do blocking-I/O. A hypothetical handler function looks like: @@ -61,7 +61,7 @@ """ Send the entire data stream, reading the data from the requested data source. This is simply a convenient alternative - to virStreamSend, for apps that do blocking-I/o. + to virStreamSend, for apps that do blocking-I/O. A hypothetical handler function looks like: -- 1.8.5.3

2 1

[libvirt] [PATCH] Fix stream related spelling mistakes
by Philipp Hahn 13 Feb '14

13 Feb '14

Remove double "is". Consistent spelling of all-uppercase I/O. Signed-off-by: Philipp Hahn <hahn(a)univention.de> --- src/libvirt.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 9cc5b1c..666ab1e 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -15890,7 +15890,7 @@ error: * * Send the entire data stream, reading the data from the * requested data source. This is simply a convenient alternative - * to virStreamSend, for apps that do blocking-I/o. + * to virStreamSend, for apps that do blocking-I/O. * * An example using this with a hypothetical file upload * API looks like @@ -15983,7 +15983,7 @@ cleanup: * * Receive the entire data stream, sending the data to the * requested data sink. This is simply a convenient alternative - * to virStreamRecv, for apps that do blocking-I/o. + * to virStreamRecv, for apps that do blocking-I/O. * * An example using this with a hypothetical file download * API looks like @@ -16192,7 +16192,7 @@ error: * virStreamFinish: * @stream: pointer to the stream object * - * Indicate that there is no further data is to be transmitted + * Indicate that there is no further data to be transmitted * on the stream. For output streams this should be called once * all data has been written. For input streams this should be * called once virStreamRecv returns end-of-file. -- 1.8.5.3

2 1

[libvirt] [Question] Is it a bug about cpu model Westmere?
by Wangyufei (James) 13 Feb '14

13 Feb '14

Hello, I find that the cpu model Westmere defined in recently qemu has the cupid CPUID_EXT_PCLMULQDQ, but the cpu model Westmere defined in libvirt doesn't have it, SandyBridge defined in libvirt has it. In my opinion, the same cpu model defined in qemu and libvirt should have the same cpuids, or there'll be some problem happened. First, am I right? Second, if I'm right, whose bug it is? Libvirt or qemu? Thanks for your attention. Best Regards, -WangYufei

2 1

[libvirt] [PATCH] bandwidth: Adjust documentation
by John Ferlan 12 Feb '14

12 Feb '14

Recent autotest/virt-test testing on f20 discovered an anomaly in how the bandwidth options are documented and used. This was discovered due to a bug fix in the /sbin/tc utility found in iproute-3.11.0.1 (on f20) in which overflow was actually caught and returned as an error. The fix was first introduced in iproute-3.10 (search on iproute2 commit 'a303853e'). The autotest/virt-test test for virsh domiftune was attempting to send the largest unsigned integer value (4294967295) for maximum value testing. The libvirt xml implementation was designed to manage values in kibibytes (eg, 1024 blocks of bytes), thus when this value was passed to /sbin/tc, it (now) properly rejected the 4294967295kbps value. Investigation of the problem discovered that formatdomain.html.in and formatnetwork.html.in described the elements and property types slightly differently, although they use the same code - virNetDevBandwidthParseRate() (shared by portgroups, domains, and networks xml parsers). Rather than have the descriptions in two places, this patch will combine and reword the description under formatnetwork.html.in and have formatdomain.html.in link to that description. This documentation faux pas was continued into the virsh man page where the bandwidth description for both 'attach-interface' and 'domiftune' did not indicate the scope of each value, thus leading to the test using largest unsigned integer value, which ultimately will be wrong. Additionally, modified the virnetdevbandwidth.h to use kibibytes instead of kbytes (to be more clear). Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- docs/formatdomain.html.in | 35 +++---------------- docs/formatnetwork.html.in | 81 ++++++++++++++++++++++++++++++++----------- src/util/virnetdevbandwidth.h | 8 ++--- tools/virsh.pod | 10 ++++-- 4 files changed, 77 insertions(+), 57 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index 4660983..ea1a97b 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -3750,37 +3750,10 @@ qemu-kvm -net nic,model=? /dev/null <p> This part of interface XML provides setting quality of service. Incoming - and outgoing traffic can be shaped independently. The - <code>bandwidth</code> element can have at most one <code>inbound</code> - and at most one <code>outbound</code> child elements. Leaving any of these - children element out result in no QoS applied on that traffic direction. - So, when you want to shape only domain's incoming traffic, use - <code>inbound</code> only, and vice versa. Each of these elements have one - mandatory attribute <code>average</code> (or <code>floor</code> as - described below). <code>average</code> specifies average bit rate on - the interface being shaped. Then there are two optional attributes: - <code>peak</code>, which specifies maximum rate at which interface can send - data, and <code>burst</code>, amount of bytes that can be burst at - <code>peak</code> speed. Accepted values for attributes are integer - numbers. The units for <code>average</code> and <code>peak</code> attributes - are kilobytes per second, and for the <code>burst</code> just kilobytes. - Note the limitation of implementation: the <code>peak</code> attribute in - <code>outbound</code> element is ignored (as linux ingress filters don't - know it yet). <span class="since">Since 0.9.4</span> The <code>inbound</code> can - optionally have <code>floor</code> attribute. This is there for - guaranteeing minimal throughput for shaped interfaces. This, however, - requires that all traffic goes through one point where QoS decisions can - take place. That's why this attribute works only for virtual networks for - now (that is <code><interface type='network'/></code> with a - forward type of route, nat, or no forward at all). Moreover, the - virtual network the interface is connected to is required to have at least - inbound QoS set (<code>average</code> at least). Moreover, with - <code>floor</code> attribute users don't need to specify - <code>average</code>. However, <code>peak</code> and <code>burst</code> - attributes still require <code>average</code>. Currently, linux kernel - doesn't allow ingress qdiscs to have any classes therefore - <code>floor</code> can be applied only on <code>inbound</code> and not - <code>outbound</code>. <span class="since">Since 1.0.1</span> + and outgoing traffic can be shaped independently. + The <code>bandwidth</code> element and its child elements are described + in the <a href="formatnetwork.html#elementQoS">QoS</a> section of + the Network XML. </p> <h5><a name="elementVlanTag">Setting VLAN tag (on supported network types only)</a></h5> diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in index 1ca1bec..de71ebf 100644 --- a/docs/formatnetwork.html.in +++ b/docs/formatnetwork.html.in @@ -412,40 +412,81 @@ <p> The <code><bandwidth></code> element allows setting - quality of service for a particular network. - <span class="since">Since 0.9.4</span> The limits specified + quality of service for a particular network + (<span class="since">since 0.9.4</span>). For a <code>domain</code> + object, the limits specified are applied to the domain traffic. + For a <code>network</code> object, the limits specified are applied to the aggregate of all traffic to/from all guest interfaces attached to that network, <b>not</b> to each guest - interface individually. Setting <code>bandwidth</code> for a + interface individually. Setting <code>bandwidth</code> for a network is supported only for networks with a <code><forward></code> mode of <code>route</code>, <code>nat</code>, or no mode at all - (i.e. an "isolated" network). <code>bandwidth</code> setting + (i.e. an "isolated" network). Setting <code>bandwidth</code> is <b>not</b> supported for forward modes of <code>bridge</code>, <code>passthrough</code>, <code>private</code>, or <code>hostdev</code>, and attempts to do this will lead to - a failure to define the network (or to create a transient - network). + a failure to define the network (or to create a transient network). </p> <p> Incoming and outgoing traffic can be shaped independently. The - <code>bandwidth</code> element can have at most - one <code>inbound</code> and at most one <code>outbound</code> + <code>bandwidth</code> element can have at most one + <code>inbound</code> and at most one <code>outbound</code> child element. Leaving either of these children elements out results in no QoS applied for that traffic direction. So, - when you want to shape only a network's incoming traffic, use + when you want to shape only incoming traffic, use <code>inbound</code> only, and vice versa. Each of these - elements have one mandatory attribute - <code>average</code>, - which specifies the desired average bit rate for the interface - being shaped (in kibibytes/second). There are also two - optional attributes: <code>peak</code>, which specifies the - maximum rate at which the bridge can send data (again in - kibibytes/second), and <code>burst</code> - the amount of - bytes that can be transmitted in a single burst at - <code>peak</code> speed (in kibibytes). Accepted values for - attributes are integer numbers. The allotted bandwidth is - shared equally between domains connected to the network. + elements have one mandatory attribute - <code>average</code> (or + <code>floor</code> as described below). The attributes are as follows, + where accepted values for each attribute is an integer number. </p> + <dl> + <dt><code>average</code></dt> + <dd> + Specifies the desired average bit rate for the interface + being shaped (in kibibytes/second). + </dd> + <dt><code>peak</code></dt> + <dd> + Optional attribute which specifies the maximum rate at + which the bridge can send data (in kibibytes/second). + Note the limitation of implementation: this attribute in the + <code>outbound</code> element is ignored (as Linux ingress + filters don't know it yet). + </dd> + <dt><code>burst</code></dt> + <dd> + Optional attribute which specifies the amount of kibibytes that + can be transmitted in a single burst at <code>peak</code> speed. + </dd> + <dt><code>floor</code></dt> + <dd> + Optional attribute available only for the <code>inbound</code> + element. This attribute guarantees minimal throughput for + shaped interfaces. This, however, requires that all traffic + goes through one point where QoS decisions can take place, hence + why this attribute works only for virtual networks for now + (that is <code><interface type='network'/></code> with a + forward type of route, nat, or no forward at all). Moreover, the + virtual network the interface is connected to is required to have + at least inbound QoS set (<code>average</code> at least). If + using the <code>floor</code> attribute users don't need to specify + <code>average</code>. However, <code>peak</code> and + <code>burst</code> attributes still require <code>average</code>. + Currently, the Linux kernel doesn't allow ingress qdiscs to have + any classes therefore <code>floor</code> can be applied only + on <code>inbound</code> and not <code>outbound</code>. + </dd> + </dl> + + <p> + Note that a kibibyte is a block of 1024 bytes. Attributes + <code>average</code>, <code>peak</code>, and <code>burst</code> + are available <span class="since">since 0.9.4</span>, while + the <code>floor</code> attribute is only available + <span class="since">since 1.0.1</span>. + </p> + <p> A <code><portgroup></code> element can also include a <code><bandwidth></code> element. In that case, the @@ -561,7 +602,7 @@ network), and each portgroup has a name, as well as various subelements associated with it. The currently supported subelements are <code><bandwidth></code> - (documented <a href="formatdomain.html#elementQoS">here</a>) + (described <a href="formatnetwork.html#elementQoS">here</a>) and <code><virtualport></code> (documented <a href="formatdomain.html#elementsNICSDirect">here</a>). If a domain interface definition specifies a portgroup (by diff --git a/src/util/virnetdevbandwidth.h b/src/util/virnetdevbandwidth.h index 4606a07..2a22820 100644 --- a/src/util/virnetdevbandwidth.h +++ b/src/util/virnetdevbandwidth.h @@ -29,10 +29,10 @@ typedef struct _virNetDevBandwidthRate virNetDevBandwidthRate; typedef virNetDevBandwidthRate *virNetDevBandwidthRatePtr; struct _virNetDevBandwidthRate { - unsigned long long average; /* kbytes/s */ - unsigned long long peak; /* kbytes/s */ - unsigned long long floor; /* kbytes/s */ - unsigned long long burst; /* kbytes */ + unsigned long long average; /* kibibytes/s */ + unsigned long long peak; /* kibibytes/s */ + unsigned long long floor; /* kibibytes/s */ + unsigned long long burst; /* kibibytes */ }; typedef struct _virNetDevBandwidth virNetDevBandwidth; diff --git a/tools/virsh.pod b/tools/virsh.pod index f221475..2cf58a6 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -680,7 +680,11 @@ or the MAC address. If no I<--inbound> or I<--outbound> is specified, this command will query and show the bandwidth settings. Otherwise, it will set the inbound or outbound bandwidth. I<average,peak,burst> is the same as -in command I<attach-interface>. +in command I<attach-interface>. Values for I<average>, I<peak>, and +I<burst> are expressed in kibibytes (blocks of 1024 bytes) as described +in the Network XML documentation at +L<http://libvirt.org/formatnetwork.html#elementQoS>. + If I<--live> is specified, affect a running guest. If I<--config> is specified, affect the next boot of a persistent guest. @@ -2019,7 +2023,9 @@ of the network interface. I<script> allows to specify a path to a script handling a bridge instead of the default one. I<model> allows to specify the model type. I<inbound> and I<outbound> control the bandwidth of the interface. I<peak> and I<burst> are optional, so "average,peak", "average,,burst" and -"average" are also legal. +"average" are also legal. Values for I<average>, I<peak>, and I<burst> are +expressed in kibibytes (blocks of 1024 bytes) as described in the Network +XML documentation at L<http://libvirt.org/formatnetwork.html#elementQoS>. If I<--live> is specified, affect a running domain. If I<--config> is specified, affect the next startup of a persistent domain. -- 1.8.4.2

1 1

[libvirt] [PATCHv2] spec: add missing dep of libvirt-daemon-config-network
by Eric Blake 12 Feb '14

12 Feb '14

From: Thierry Parmentelat <thierry.parmentelat(a)inria.fr> When building modules, libvirt-daemon-config-network requires libvirt-daemon-driver-network to ensure the 'default' network is setup properly Signed-off-by: Eric Blake <eblake(a)redhat.com> --- v2: make dep dependent on whether subpackage is created libvirt.spec.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index 4d804e6..d3e6048 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -720,6 +720,9 @@ Summary: Default configuration files for the libvirtd daemon Group: Development/Libraries Requires: libvirt-daemon = %{version}-%{release} + %if %{with_driver_modules} +Requires: libvirt-daemon-driver-network = %{version}-%{release} + %endif %description daemon-config-network Default configuration files for setting up NAT based networking -- 1.8.5.3

2 2

[libvirt] libvirt default network
by Thierry Parmentelat 12 Feb '14

12 Feb '14

Hi This is in echo to a message originally sent on libvirt-users, but having not received any answer yet so we figured we would try this list instead So, we use libvirt on various flavours of fedora; with fedora18 we were using libvirt-1.0.4, that we rebuilt using a slightly modified version of mainstream specfile Under fedora20 we’ve first tried using the libvirt version that comes with vanilla fedora - 1.1.3 - but are seeing glitches that apparently are fixed in 1.2.1, so we’re giving this a shot The problem we have is, right after installation of our libvirt rpm, the ‘default’ network is not known to the system: [root@vnode07 ~]# virsh -c lxc:// net-dumpxml default error: failed to get network 'default' error: Network not found: no network with matching name ‘default' While the ‘source’ file for this default network did ship with the rpm [root@vnode07 ~]# rpm -qf /usr/share/libvirt/networks/default.xml libvirt-daemon-driver-network-1.2.1-0.x86_64 ------------ What we used to have with 1.0.4 and 1.1.3 at that same point (right after yum install) is [root@vnode05 ~]# virsh -c lxc:// net-dumpxml default <network connections='1510’> .. </network> — So, I’m confident we can tweak our specfile to get this to work by adding something like net-define / net-autostart / net-start somewhere near the post install script of the daemon package or something However we would appreciate some insight as to how this would happen in the first place; is this an intentional change on your end ? or did we screw that up somehow ? if so, I could not find out precisely how this network definition is supposed to take place when the package gets installed, any hint / insight on that would be much appreciated Thanks in advance

4 9

Re: [libvirt] [libvirt-users] Help? Running into problems with migrateToURI2() and virDomainDefCheckABIStability()
by Cole Robinson 12 Feb '14

12 Feb '14

On 02/12/2014 01:03 PM, Chris Friesen wrote: > On 02/11/2014 04:45 PM, Cole Robinson wrote: >> On 02/10/2014 06:46 PM, Chris Friesen wrote: >>> Hi, >>> >>> We've run into a problem with libvirt 1.1.2 and are looking for some comments >>> on whether this is a bug or design intent. >>> >>> We're trying to use migrateToURI() but we're using a few things (numatune, >>> vcpu mask, etc.) that may need adjustment during the migration. We found that >>> migrateToURI2() mostly works if we use XML created by copying the domain XML >>> from the running instance and modifying the appropriate sections. >>> >>> The problem that we're seeing is that the serial console checking in >>> libvirt/src/conf/domain_conf.c::virDomainDefCheckABIStability() is failing >>> even though we haven't touched the serial console XML: > >> I think we will have to see the XML your passing before and after edit to >> figure out what's going wrong. Also, showing all the arguments you are >> invoking the migration APIs with. > > > Okay, this is going to be a long message. :) > > We're calling it as: > > dom.migrateToURI2(duri, muri, xml_str, logical_sum, None, CONF.live_migration_bandwidth) > > Here are the supplied arguments: > duri = u'qemu+tcp://compute-0/system' > muri = u'tcp://compute-0' > flaglist = ['VIR_MIGRATE_UNDEFINE_SOURCE', 'VIR_MIGRATE_PEER2PEER', 'VIR_MIGRATE_LIVE'] > logical_sum = 19, (logical OR of flaglist) > CONF.live_migration_bandwidth = 0 > > Grabbing original XML prior to migration: > > dom_xml = etree.fromstring(dom.XMLDesc(0)) > xml_str = etree.tostring(dom_xml) > > xml_str (BEFORE) = > <domain type="qemu" id="2"> > <name>instance-00000006</name> > <uuid>2e13869b-edc0-40dc-92e3-1f2ffde60cce</uuid> > <dpdk> > <process type="secondary"/> > <file prefix="vs"/> > <cpu list="0"/> > <memory channels="4"/> > </dpdk> > <memory unit="KiB">262144</memory> > <currentMemory unit="KiB">262144</currentMemory> > <memoryBacking> > <hugepages/> > </memoryBacking> > <vcpu placement="static" cpuset="1-2">2</vcpu> > <cputune> > <vcpupin vcpu="0" cpuset="1"/> > <vcpupin vcpu="1" cpuset="2"/> > <emulatorpin cpuset="1-2"/> > </cputune> > <numatune> > <memory mode="preferred" nodeset="0"/> > </numatune> > <sysinfo type="smbios"> > <system> > <entry name="manufacturer">OpenStack Foundation</entry> > <entry name="product">OpenStack Nova</entry> > <entry name="version">2013.2.2</entry> > <entry name="serial">771a1b10-d2f7-4ebb-b21e-4040560732f5</entry> > <entry name="uuid">2e13869b-edc0-40dc-92e3-1f2ffde60cce</entry> > </system> > </sysinfo> > <os> > <type arch="x86_64" machine="pc-i440fx-1.4">hvm</type> > <boot dev="hd"/> > <smbios mode="sysinfo"/> > </os> > <features> > <acpi/> > <apic/> > </features> > <clock offset="utc"/> > <on_poweroff>destroy</on_poweroff> > <on_reboot>restart</on_reboot> > <on_crash>destroy</on_crash> > <devices> > <emulator>/usr/bin/qemu-system-x86_64</emulator> > <disk type="file" device="disk"> > <driver name="qemu" type="qcow2" cache="none"/> > <source file="/etc/nova/instances/2e13869b-edc0-40dc-92e3-1f2ffde60cce/disk"/> > <target dev="vda" bus="virtio"/> > <alias name="virtio-disk0"/> > <address type="pci" domain="0x0000" bus="0x00" slot="0x05" function="0x0"/> > </disk> > <controller type="usb" index="0"> > <alias name="usb0"/> > <address type="pci" domain="0x0000" bus="0x00" slot="0x01" function="0x2"/> > </controller> > <controller type="pci" index="0" model="pci-root"> > <alias name="pci.0"/> > </controller> > <interface type="vswitch"> > <mac address="fa:16:3e:fb:34:6b"/> > <source network="4db95d31-64f1-4f10-9138-5fe68c0d77ac"/> > <target dev="7bc76b0e-b12a-4153-8ce8-d3d145c51e6f"/> > <model type="e1000"/> > <alias name="net0"/> > <address type="pci" domain="0x0000" bus="0x00" slot="0x03" function="0x0"/> > </interface> > <interface type="vswitch"> > <mac address="fa:16:3e:d5:b9:50"/> > <source network="8512742c-af3e-4787-b2d8-b0b9ab160297"/> > <target dev="33ab1061-7fa4-4250-99a4-dd7eb4029aa1"/> > <model type="e1000"/> > <alias name="net1"/> > <address type="pci" domain="0x0000" bus="0x00" slot="0x04" function="0x0"/> > </interface> > <serial type="file"> > <source path="/etc/nova/instances/2e13869b-edc0-40dc-92e3-1f2ffde60cce/console.log"/> > <target port="0"/> > <alias name="serial0"/> > </serial> > <serial type="pty"> > <source path="/dev/pts/1"/> > <target port="1"/> > <alias name="serial1"/> > </serial> > <console type="file"> > <source path="/etc/nova/instances/2e13869b-edc0-40dc-92e3-1f2ffde60cce/console.log"/> > <target type="serial" port="0"/> > <alias name="serial0"/> > </console> > <input type="tablet" bus="usb"> > <alias name="input0"/> > </input> > <input type="mouse" bus="ps2"/> > <graphics type="vnc" port="5900" autoport="yes" listen="0.0.0.0" keymap="en-us"> > <listen type="address" address="0.0.0.0"/> > </graphics> > <video> > <model type="cirrus" vram="9216" heads="1"/> > <alias name="video0"/> > <address type="pci" domain="0x0000" bus="0x00" slot="0x02" function="0x0"/> > </video> > <memballoon model="virtio"> > <alias name="balloon0"/> > <address type="pci" domain="0x0000" bus="0x00" slot="0x06" function="0x0"/> > </memballoon> > </devices> > <seclabel type="none"/> > </domain> > > > > This is the modified XML, specifically updating vcpu, cputune, numatune. > In this case they actually have the same values as above but there are > whitespace differences: > > > xml_str (MODIFIED) = > <domain type="qemu" id="2"> > <name>instance-00000006</name> > <uuid>2e13869b-edc0-40dc-92e3-1f2ffde60cce</uuid> > <dpdk> > <process type="secondary"/> > <file prefix="vs"/> > <cpu list="0"/> > <memory channels="4"/> > </dpdk> > <memory unit="KiB">262144</memory> > <currentMemory unit="KiB">262144</currentMemory> > <memoryBacking> > <hugepages/> > </memoryBacking> > <vcpu placement="static" cpuset="1,2">2</vcpu> > <cputune> > <vcpupin vcpu="0" cpuset="1"/><vcpupin vcpu="1" cpuset="2"/><emulatorpin cpuset="1,2"/></cputune> > <numatune> > <memory mode="preferred" nodeset="0"/></numatune> > <sysinfo type="smbios"> > <system> > <entry name="manufacturer">OpenStack Foundation</entry> > <entry name="product">OpenStack Nova</entry> > <entry name="version">2013.2.2</entry> > <entry name="serial">771a1b10-d2f7-4ebb-b21e-4040560732f5</entry> > <entry name="uuid">2e13869b-edc0-40dc-92e3-1f2ffde60cce</entry> > </system> > </sysinfo> > <os> > <type arch="x86_64" machine="pc-i440fx-1.4">hvm</type> > <boot dev="hd"/> > <smbios mode="sysinfo"/> > </os> > <features> > <acpi/> > <apic/> > </features> > <clock offset="utc"/> > <on_poweroff>destroy</on_poweroff> > <on_reboot>restart</on_reboot> > <on_crash>destroy</on_crash> > <devices> > <emulator>/usr/bin/qemu-system-x86_64</emulator> > <disk type="file" device="disk"> > <driver name="qemu" type="qcow2" cache="none"/> > <source file="/etc/nova/instances/2e13869b-edc0-40dc-92e3-1f2ffde60cce/disk"/> > <target dev="vda" bus="virtio"/> > <alias name="virtio-disk0"/> > <address type="pci" domain="0x0000" bus="0x00" slot="0x05" function="0x0"/> > </disk> > <controller type="usb" index="0"> > <alias name="usb0"/> > <address type="pci" domain="0x0000" bus="0x00" slot="0x01" function="0x2"/> > </controller> > <controller type="pci" index="0" model="pci-root"> > <alias name="pci.0"/> > </controller> > <interface type="vswitch"> > <mac address="fa:16:3e:fb:34:6b"/> > <source network="4db95d31-64f1-4f10-9138-5fe68c0d77ac"/> > <target dev="7bc76b0e-b12a-4153-8ce8-d3d145c51e6f"/> > <model type="e1000"/> > <alias name="net0"/> > <address type="pci" domain="0x0000" bus="0x00" slot="0x03" function="0x0"/> > </interface> > <interface type="vswitch"> > <mac address="fa:16:3e:d5:b9:50"/> > <source network="8512742c-af3e-4787-b2d8-b0b9ab160297"/> > <target dev="33ab1061-7fa4-4250-99a4-dd7eb4029aa1"/> > <model type="e1000"/> > <alias name="net1"/> > <address type="pci" domain="0x0000" bus="0x00" slot="0x04" function="0x0"/> > </interface> > <serial type="file"> > <source path="/etc/nova/instances/2e13869b-edc0-40dc-92e3-1f2ffde60cce/console.log"/> > <target port="0"/> > <alias name="serial0"/> > </serial> > <serial type="pty"> > <source path="/dev/pts/1"/> > <target port="1"/> > <alias name="serial1"/> > </serial> > <console type="file"> > <source path="/etc/nova/instances/2e13869b-edc0-40dc-92e3-1f2ffde60cce/console.log"/> > <target type="serial" port="0"/> > <alias name="serial0"/> > </console> > <input type="tablet" bus="usb"> > <alias name="input0"/> > </input> > <input type="mouse" bus="ps2"/> > <graphics type="vnc" port="5900" autoport="yes" listen="0.0.0.0" keymap="en-us"> > <listen type="address" address="0.0.0.0"/> > </graphics> > <video> > <model type="cirrus" vram="9216" heads="1"/> > <alias name="video0"/> > <address type="pci" domain="0x0000" bus="0x00" slot="0x02" function="0x0"/> > </video> > <memballoon model="virtio"> > <alias name="balloon0"/> > <address type="pci" domain="0x0000" bus="0x00" slot="0x06" function="0x0"/> > </memballoon> > </devices> > <seclabel type="none"/> > </domain> > > > > Calling migrateToURI2 then gives the following error : > 2014-02-12 03:37:17.738 1251 ERROR nova.virt.libvirt.driver [-] [instance: 2e13869b-edc0-40dc-92e3-1f2ffde60cce] Live Migration failure: unsupported configuration: Target domain console count 1 does not match source 0 > > > If we remove the this section : > <serial type="pty"> > <source path="/dev/pts/1"/> > <target port="1"/> > <alias name="serial1"/> > </serial> > > Then we get the following error : > 2014-02-12 04:19:12.689 1278 ERROR nova.virt.libvirt.driver [-] [instance: 90335c32-a7ae-4c99-8e5a-cd177f6b3c22] Live Migration failure: unsupported configuration: Target domain serial port count 1 does not match source 2 > > If we remove just the following line: > <source path="/dev/pts/1"/> > > so the modified portion looks like this, > <serial type="file"> > <source path="/etc/nova/instances/00b99f94-436e-406b-8459-83e77758f154/console.log"/> > <target port="0"/> > <alias name="serial0"/> > </serial> > <serial type="pty"> > <target port="1"/> > <alias name="serial1"/> > </serial> > <console type="file"> > <source path="/etc/nova/instances/00b99f94-436e-406b-8459-83e77758f154/console.log"/> > <target type="serial" port="0"/> > <alias name="serial0"/> > </console> > <input type="tablet" bus="usb"> > > Then we get this error : > > 2014-02-12 04:29:06.402 5175 ERROR nova.virt.libvirt.driver [-] [instance: 00b99f94-436e-406b-8459-83e77758f154] Live Migration failure: unsupported configuration: Target domain console count 1 does not match source 0 > > If we modify it with empty <serial type='pty'> element like this: > > <serial type="file"> > <source path="/etc/nova/instances/b1103349-8c9f-4315-9144-03fc22f09be1/console.log"/> > <target port="0"/> > <alias name="serial0"/> > </serial> > <serial type="pty"> > </serial> > <console type="file"> > <source path="/etc/nova/instances/b1103349-8c9f-4315-9144-03fc22f09be1/console.log"/> > <target type="serial" port="0"/> > <alias name="serial0"/> > </console> > > Then we get this error: > > 2014-02-12 04:36:45.686 5358 ERROR nova.virt.libvirt.driver [-] [instance: b1103349-8c9f-4315-9144-03fc22f09be1] Live Migration failure: unsupported configuration: Target domain console count 1 does not match source 0 > > If we modify it with empty <serial type='pty'> element and also remove > <console type='file'> section completely like this : > > <serial type="file"> > <source path="/etc/nova/instances/8cccb4ad-2abc-4513-b8fd-bfb811301677/console.log"/> > <target port="0"/> > <alias name="serial0"/> > </serial> > <serial type="pty"> > </serial> > > Then this successfully migrates! > > However, it then fails on subsequent migration back to the original host. Prior to migrating > back the domain XML serial/console section looks like: > > <serial type="file"> > <source path="/etc/nova/instances/8cccb4ad-2abc-4513-b8fd-bfb811301677/console.log"/> > <target port="0"/> > <alias name="serial0"/> > </serial> > <serial type="pty"> > <source path="/dev/pts/1"/> > <target port="1"/> > <alias name="serial1"/> > </serial> > <console type="file"> > <source path="/etc/nova/instances/8cccb4ad-2abc-4513-b8fd-bfb811301677/console.log"/> > <target type="serial" port="0"/> > <alias name="serial0"/> > </console> > > After modifying empty <serial type='pty'> element and removing the <console type='file'> section > it looks like this : > > <serial type="file"> > <source path="/etc/nova/instances/8cccb4ad-2abc-4513-b8fd-bfb811301677/console.log"/> > <target port="0"/> > <alias name="serial0"/> > </serial> > <serial type="pty"> > </serial> > > But this give the following error when migrating back: > > 2014-02-12 06:00:19.831 7125 ERROR nova.virt.libvirt.driver [-] [instance: 8cccb4ad-2abc-4513-b8fd-bfb811301677] Live Migration failure: unsupported configuration: Target domain console count 0 does not match source 1 > Thanks for the detailed info. Can you put that into an upstream libvirt bug report? http://libvirt.org/bugs.html Does this sound familiar to any other libvirt devs? - Cole

1 0

[libvirt] [PATCHv2 0/6] server-side domain event filtering
by Eric Blake 12 Feb '14

12 Feb '14

v1 was here: https://www.redhat.com/archives/libvir-list/2014-January/msg00689.html Since then, I've rebased it on top of this patch which still needs review: https://www.redhat.com/archives/libvir-list/2014-January/msg01406.html as well as added patch 6 so that we don't have to repeat the exercise of adding a new RPC down the road. Eric Blake (6): event: dynamically manage server-side RPC domain events event: server RPC protocol tweaks for domain lifecycle events event: prepare client to track domain callbackID event: client RPC protocol tweaks for domain lifecycle events event: convert remaining domain events to new style event: pass reason for PM events daemon/libvirtd.h | 3 +- daemon/remote.c | 665 ++++++++++++++++++++++++++------- src/conf/domain_event.c | 184 ++++++++-- src/conf/domain_event.h | 28 +- src/conf/network_event.c | 6 +- src/conf/object_event.c | 35 +- src/conf/object_event_private.h | 6 +- src/libvirt_internal.h | 7 +- src/remote/remote_driver.c | 796 ++++++++++++++++++++++++++++++++-------- src/remote/remote_protocol.x | 195 +++++++++- src/remote_protocol-structs | 95 +++++ 11 files changed, 1679 insertions(+), 341 deletions(-) -- 1.8.5.3

2 15

[libvirt] [PATCH] Fixed build with clang.
by Cédric Bosdonnat 12 Feb '14

12 Feb '14

Two unused global variables, and DBUS_TYPE_INVALID used as a const char*. --- src/phyp/phyp_driver.c | 1 - src/storage/storage_backend_scsi.c | 24 ------------------------ src/util/virdbus.c | 2 +- 3 files changed, 1 insertion(+), 26 deletions(-) diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index 20b5bd4..9adb6b0 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -66,7 +66,6 @@ * */ static unsigned const int HMC = 0; -static unsigned const int IVM = 127; static unsigned const int PHYP_IFACENAME_SIZE = 24; static unsigned const int PHYP_MAC_SIZE = 12; diff --git a/src/storage/storage_backend_scsi.c b/src/storage/storage_backend_scsi.c index b38e530..44f17c9 100644 --- a/src/storage/storage_backend_scsi.c +++ b/src/storage/storage_backend_scsi.c @@ -107,30 +107,6 @@ struct diskType { unsigned long long magic; }; -static struct diskType const disk_types[] = { - { VIR_STORAGE_POOL_DISK_LVM2, 0x218, 8, 0x31303020324D564CULL }, - { VIR_STORAGE_POOL_DISK_GPT, 0x200, 8, 0x5452415020494645ULL }, - { VIR_STORAGE_POOL_DISK_DVH, 0x0, 4, 0x41A9E50BULL }, - { VIR_STORAGE_POOL_DISK_MAC, 0x0, 2, 0x5245ULL }, - { VIR_STORAGE_POOL_DISK_BSD, 0x40, 4, 0x82564557ULL }, - { VIR_STORAGE_POOL_DISK_SUN, 0x1fc, 2, 0xBEDAULL }, - /* - * NOTE: pc98 is funky; the actual signature is 0x55AA (just like dos), so - * we can't use that. At the moment I'm relying on the "dummy" IPL - * bootloader data that comes from parted. Luckily, the chances of running - * into a pc98 machine running libvirt are approximately nil. - */ - /*{ 0x1fe, 2, 0xAA55UL },*/ - { VIR_STORAGE_POOL_DISK_PC98, 0x0, 8, 0x314C5049000000CBULL }, - /* - * NOTE: the order is important here; some other disk types (like GPT and - * and PC98) also have 0x55AA at this offset. For that reason, the DOS - * one must be the last one. - */ - { VIR_STORAGE_POOL_DISK_DOS, 0x1fe, 2, 0xAA55ULL }, - { -1, 0x0, 0, 0x0ULL }, -}; - static int virStorageBackendSCSIUpdateVolTargetInfo(virStorageVolTargetPtr target, unsigned long long *allocation, diff --git a/src/util/virdbus.c b/src/util/virdbus.c index a0cbbfe..a6232b7 100644 --- a/src/util/virdbus.c +++ b/src/util/virdbus.c @@ -1281,7 +1281,7 @@ int virDBusIsServiceEnabled(const char *name) "/org/freedesktop/DBus", "org.freedesktop.DBus", "ListActivatableNames", - DBUS_TYPE_INVALID) < 0) + NULL) < 0) return ret; if (!dbus_message_iter_init(reply, &iter) || -- 1.8.5.2

3 4

[libvirt] [PATCH] storage: handle NULL return from virGetStorageVol
by Michael Chapman 12 Feb '14

12 Feb '14

virGetStorageVol can return NULL on out-of-memory. If it does, cleanly abort the volume clone operation. Signed-off-by: Michael Chapman <mike(a)very.puzzling.org> --- src/storage/storage_driver.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index c83aa8a..2f7b2e5 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -1828,6 +1828,10 @@ storageVolCreateXMLFrom(virStoragePoolPtr obj, pool->volumes.objs[pool->volumes.count++] = newvol; volobj = virGetStorageVol(obj->conn, pool->def->name, newvol->name, newvol->key, NULL, NULL); + if (!volobj) { + pool->volumes.count--; + goto cleanup; + } /* Drop the pool lock during volume allocation */ pool->asyncjobs++; -- 1.8.3.1

2 1

[libvirt] [PATCH 0/2] Partially revert separation of volume creating and building
by Ján Tomko 12 Feb '14

12 Feb '14

The storage driver expects 'createVol' to fill out the volume key. For disk and logical backends, we generate the key only after the volume has been built. Revert the separation commits for these backends. Ján Tomko (2): Revert "storage: lvm: Separate creating of the volume from building" Revert "storage: disk: Separate creating of the volume from building" src/storage/storage_backend_disk.c | 44 ++++++++----------------- src/storage/storage_backend_logical.c | 60 ++++++++++++++--------------------- 2 files changed, 37 insertions(+), 67 deletions(-) -- 1.8.3.2

2 4

[libvirt] [PATCH] Fix leaks in vircapstest
by Ján Tomko 12 Feb '14

12 Feb '14

Coverity complains about cell_cpus being leaked on error and valgrind shows 'caps' is leaked on success. Introduced in eb64e87. --- tests/vircapstest.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/vircapstest.c b/tests/vircapstest.c index a40771d..4264e9e 100644 --- a/tests/vircapstest.c +++ b/tests/vircapstest.c @@ -40,7 +40,7 @@ static virCapsPtr buildNUMATopology(int seq) { virCapsPtr caps; - virCapsHostNUMACellCPUPtr cell_cpus; + virCapsHostNUMACellCPUPtr cell_cpus = NULL; int core_id, cell_id; int id; @@ -75,6 +75,8 @@ buildNUMATopology(int seq) return caps; error: + virCapabilitiesClearHostNUMACellCPUTopology(cell_cpus, MAX_CPUS_IN_CELL); + VIR_FREE(cell_cpus); virObjectUnref(caps); return NULL; @@ -87,7 +89,7 @@ test_virCapabilitiesGetCpusForNodemask(const void *data ATTRIBUTE_UNUSED) const char *nodestr = "3,4,5,6"; virBitmapPtr nodemask = NULL; virBitmapPtr cpumap = NULL; - virCapsPtr caps; + virCapsPtr caps = NULL; int mask_size = 8; int ret = -1; @@ -107,6 +109,7 @@ test_virCapabilitiesGetCpusForNodemask(const void *data ATTRIBUTE_UNUSED) ret = 0; error: + virObjectUnref(caps); virBitmapFree(nodemask); virBitmapFree(cpumap); return ret; -- 1.8.3.2

2 2

[libvirt] [PATCH] AppArmor: Fix the place where the template should be installed
by Cédric Bosdonnat 12 Feb '14

12 Feb '14

The security driver expects /etc/apparmor.d/libvirt/TEMPLATE but we installed it to /etc/apparmor.d/libvirtd/TEMPLATE. Move the template to the expected place since that code was here long before. --- examples/apparmor/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/apparmor/Makefile.am b/examples/apparmor/Makefile.am index 6e69440..2630fef 100644 --- a/examples/apparmor/Makefile.am +++ b/examples/apparmor/Makefile.am @@ -32,7 +32,7 @@ abstractions_DATA = \ libvirt-qemu \ $(NULL) -templatesdir = $(apparmordir)/libvirtd +templatesdir = $(apparmordir)/libvirt templates_DATA = \ TEMPLATE \ $(NULL) -- 1.8.5.2

2 1