- Devel - libvirt List Archives

[libvirt] [PATCH] spec: Automatically apply all patches with git
by Jiri Denemark 24 Nov '14

24 Nov '14

With this change, any patch declared in libvirt.spec with Patch[0-9]* is automatically applied in %prep. Unlike with the standard %patch[0-9]*, patches are applied with "git am" to avoid some unexpected results. However, as a result of this, all patches must be in the right format for "git am" to be able to apply them; they should ideally be generated from git using "git format-patch". Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- libvirt.spec.in | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index 6fcaa3e..0959483 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -425,6 +425,7 @@ BuildRequires: gettext-devel BuildRequires: libtool BuildRequires: /usr/bin/pod2man %endif +BuildRequires: git BuildRequires: perl BuildRequires: python %if %{with_systemd} @@ -1198,6 +1199,41 @@ driver %prep %setup -q +# Patches have to be stored in a temporary file because RPM has +# a limit on the length of the result of any macro expansion; +# if the string is longer, it's silently cropped +%{lua: + tmp = os.tmpname(); + f = io.open(tmp, "w+"); + count = 0; + for i, p in ipairs(patches) do + f:write(p.."\n"); + count = count + 1; + end; + f:close(); + print("PATCHCOUNT="..count.."\n") + print("PATCHLIST="..tmp.."\n") +} + +git init -q +git config user.name rpm-build +git config user.email rpm-build +git config gc.auto 0 +git add . +git commit -q -a --author 'rpm-build <rpm-build>' \ + -m '%{name}-%{version} base' + +COUNT=$(grep '\.patch$' $PATCHLIST | wc -l) +if [ $COUNT -ne $PATCHCOUNT ]; then + echo "Found $COUNT patches in $PATCHLIST, expected $PATCHCOUNT" + exit 1 +fi +if [ $COUNT -gt 0 ]; then + xargs git am <$PATCHLIST || exit 1 +fi +echo "Applied $COUNT patches" +rm -f $PATCHLIST + %build %if ! %{with_xen} %define _without_xen --without-xen -- 2.1.3

3 3

[libvirt] lxcContainerResolveSymlinks failing on cascading FS
by Cedric Bosdonnat 24 Nov '14

24 Nov '14

Hi all, As an example, the following command virt-sandbox-service create --network dhcp,source=default --unitfile sshd.service mysshd -i 512 generates a container definition containing these filesystems (in the same order): <filesystem type='file' accessmode='passthrough'> <source file='/var/lib/libvirt/images/mysshd.raw'/> <target dir='/var/lib/libvirt/filesystems/mysshd'/> </filesystem> <filesystem type='bind' accessmode='passthrough'> <source dir='/var/lib/libvirt/filesystems/mysshd/var'/> <target dir='/var'/> </filesystem> Since /var/lib/libvirt/filesystems/mysshd contains nothing, the second FS needs the first one to be mounted for the source directory to exist. The problem comes with lxcContainerResolveSymlinks() being run before any file system is actually mounted. So the container can't be started and we get the following error: Failed to access '/var/lib/libvirt/filesystems/mysshd/var': No such file or directory This would work if the symlinks were resolved right before mounting the FS instead of before mounting any of them. Any strong opinion against it? -- Cedric

2 1

[libvirt] [PATCH V2 0/4] libxl migration improvements
by Jim Fehlig 21 Nov '14

21 Nov '14

V2 of https://www.redhat.com/archives/libvir-list/2014-November/msg00423.html Patch 1 has been fixed based on Michal's feedback. Patch 2 is new in V2. I mistakenly dropped it when reordering the patches for the V1 submission. Patches 3 and 4 also have some minor adjustments from V1. See individual patches for details. Jim Fehlig (4): libxl: Receive migration data in a thread libxl: acquire job in migration finish phase libxl: start domain paused on migration dst libxl: destroy domain in migration finish phase on failure src/libxl/libxl_driver.c | 17 +++++--- src/libxl/libxl_migration.c | 103 +++++++++++++++++++++++++++++++++----------- 2 files changed, 90 insertions(+), 30 deletions(-) -- 1.8.4.5

2 6

Re: [libvirt] [Xen-devel] dom0 kenrel crashes for openstack + libvirt + libxl
by Ian Campbell 21 Nov '14

21 Nov '14

On Fri, 2014-11-21 at 14:18 +0000, David Vrabel wrote: > On 21/11/14 14:05, Ian Campbell wrote: > > On Fri, 2014-11-21 at 09:28 +0000, Ian Campbell wrote: > >> I think libvirt is wrong to specify an absolute path here, IMHO by > >> default it should just specify "pygrub" and let libxl figure out the > >> correct path. Jim, what do you think? > > > > e.g. something like the following untested (but pretty obvious[0]) > > patch. > [...] > > +# define "pygrub" > > I'm going to go with pretty obviously broken. You're missing the macro > name. Doh! Indeed... Lets try that again... 8<---------- >From 9f2d8da8264b426f54b92378e9e00973694193d4 Mon Sep 17 00:00:00 2001 From: Ian Campbell <ian.campbell(a)citrix.com> Date: Fri, 21 Nov 2014 14:00:38 +0000 Subject: [PATCH] libxl: Allow libxl to find pygrub binary. Specifying an explicit path to pygrub (e.g. BINDIR "/pygrub") only works if Xen and libvirt happen to be installed to the same prefix. A more flexible approach is to simply specify "pygrub" which will cause libxl to use the correct path which it knows (since it is built with the same prefix as pygrub). This is particular problematic in the Debian packaging, since the Debian Xen package relocates pygrub into a libexec dir, however I think this change makes sense upstream. Signed-off-by: Ian Campbell <ian.campbell(a)citrix.com> --- .gnulib | 2 +- src/libxl/libxl_conf.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gnulib b/.gnulib index 9565c3b..2d28074 160000 --- a/.gnulib +++ b/.gnulib @@ -1 +1 @@ -Subproject commit 9565c3be73eb6d76b7b42a21d68d2e00a62abb6d +Subproject commit 2d280742a9e30088aa169f53353765d5daafe4c0 diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h index 25f77ea..d7a3971 100644 --- a/src/libxl/libxl_conf.h +++ b/src/libxl/libxl_conf.h @@ -53,7 +53,7 @@ # define LIBXL_LIB_DIR LOCALSTATEDIR "/lib/libvirt/libxl" # define LIBXL_SAVE_DIR LIBXL_LIB_DIR "/save" # define LIBXL_DUMP_DIR LIBXL_LIB_DIR "/dump" -# define LIBXL_BOOTLOADER_PATH BINDIR "/pygrub" +# define LIBXL_BOOTLOADER_PATH "pygrub" /* libxl interface for setting VCPU affinity changed in 4.5. In fact, a new * parameter has been added, representative of 'VCPU soft affinity'. If one -- 1.7.10.4

2 2

Re: [libvirt] [Xen-devel] dom0 kenrel crashes for openstack + libvirt + libxl
by Ian Campbell 21 Nov '14

21 Nov '14

On Fri, 2014-11-21 at 09:28 +0000, Ian Campbell wrote: > I think libvirt is wrong to specify an absolute path here, IMHO by > default it should just specify "pygrub" and let libxl figure out the > correct path. Jim, what do you think? e.g. something like the following untested (but pretty obvious[0]) patch. I'm currently rebuilding Debian's libvirt package with this included so I can give it a go. Ian. [0] famous last words, I know! 8<--------------- >From 4edbcbdc7e28896121832d8e226e7aeccf30633c Mon Sep 17 00:00:00 2001 From: Ian Campbell <ian.campbell(a)citrix.com> Date: Fri, 21 Nov 2014 14:00:38 +0000 Subject: [PATCH] libxl: Allow libxl to find pygrub binary. Specifying an explicit path to pygrub (e.g. BINDIR "/pygrub") only works if Xen and libvirt happen to be installed to the same prefix. A more flexible approach is to simply specify "pygrub" which will cause libxl to use the correct path which it knows (since it is built with the same prefix as pygrub). This is particular problematic in the Debian packaging, since the Debian Xen package relocates pygrub into a libexec dir, however I think this change makes sense upstream. Signed-off-by: Ian Campbell <ian.campbell(a)citrix.com> --- src/libxl/libxl_conf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h index 25f77ea..3669e68 100644 --- a/src/libxl/libxl_conf.h +++ b/src/libxl/libxl_conf.h @@ -53,7 +53,7 @@ # define LIBXL_LIB_DIR LOCALSTATEDIR "/lib/libvirt/libxl" # define LIBXL_SAVE_DIR LIBXL_LIB_DIR "/save" # define LIBXL_DUMP_DIR LIBXL_LIB_DIR "/dump" -# define LIBXL_BOOTLOADER_PATH BINDIR "/pygrub" +# define "pygrub" /* libxl interface for setting VCPU affinity changed in 4.5. In fact, a new * parameter has been added, representative of 'VCPU soft affinity'. If one -- 1.7.10.4

1 0

[libvirt] [PATCH 00/12] Unbreak vm's backed by RBD disks
by Peter Krempa 21 Nov '14

21 Nov '14

After recent refactors, starting a VM whose disk is backed by RBD storage would fail as the parser for the backing file specification string was not implemented in the metadata crawler. Reuse qemu's parser to do this and fix a few things around. Peter Krempa (12): docs: domain: Move docs for storage hosts under the <source> element test: virstoragetest: Add testing of network disk details util: buffer: Clarify scope of the escape operation in virBufferEscape util: storage: Add notice for extension of struct virStorageSource util: storage: Copy hosts of a storage file only if they exist qemu: Refactor qemuBuildNetworkDriveURI to take a virStorageSourcePtr tests: Reflow the expected output from RBD disk test util: split out qemuParseRBDString into a common helper util: storagefile: Split out parsing of NBD string into a separate func storage: Allow parsing of RBD backing strings when building backing chain storage: rbd: qemu: Add support for specifying internal RBD snapshots storage: rbd: Implement support for passing config file option docs/formatdomain.html.in | 128 +++++---- docs/schemas/domaincommon.rng | 16 ++ src/conf/domain_conf.c | 52 +++- src/conf/domain_conf.h | 1 + src/conf/snapshot_conf.c | 6 +- src/libvirt_private.syms | 1 + src/qemu/qemu_command.c | 268 +++++------------- src/util/virbuffer.c | 5 +- src/util/virstoragefile.c | 313 +++++++++++++++++---- src/util/virstoragefile.h | 14 +- .../qemuxml2argv-disk-drive-network-rbd.args | 16 +- .../qemuxml2argv-disk-drive-network-rbd.xml | 25 ++ tests/virstoragetest.c | 65 ++++- 13 files changed, 587 insertions(+), 323 deletions(-) -- 2.1.0

2 27

[libvirt] [PATCH] virsh: sync domdisplay help and manual
by Martin Kletzander 21 Nov '14

21 Nov '14

Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- tools/virsh-domain.c | 2 +- tools/virsh.pod | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index cf45a88..0572275 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -9915,7 +9915,7 @@ static const vshCmdOptDef opts_domdisplay[] = { }, {.name = "type", .type = VSH_OT_DATA, - .help = N_("select particular graphics display " + .help = N_("select particular graphical display " "(e.g. \"vnc\", \"spice\", \"rdp\")") }, {.name = NULL} diff --git a/tools/virsh.pod b/tools/virsh.pod index d5608cc..5a577f6 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1138,11 +1138,13 @@ I<size> is a scaled integer (see B<NOTES> above) which defaults to KiB "B" to get bytes (note that for historical reasons, this differs from B<vol-resize> which defaults to bytes without a suffix). -=item B<domdisplay> I<domain> [I<--include-password>] +=item B<domdisplay> I<domain> [I<--include-password>] [[I<--type>] B<type>] Output a URI which can be used to connect to the graphical display of the -domain via VNC, SPICE or RDP. If I<--include-password> is specified, the -SPICE channel password will be included in the URI. +domain via VNC, SPICE or RDP. The particular graphical display type can +be selected using the B<type> parameter (e.g. "vnc", "spice", "rdp"). If +I<--include-password> is specified, the SPICE channel password will be +included in the URI. =item B<domfsfreeze> I<domain> [[I<--mountpoint>] B<mountpoint>...] -- 2.1.3

2 1

[libvirt] [PATCH 00/11] Introduce guest agent lifecycle event and impl for qemu
by Peter Krempa 21 Nov '14

21 Nov '14

Peter Krempa (11): qemu: process: report useful error if alias formatting fails conf: Annotate source enums for character device struct members test: xml2xml: Print full filenames if xml2xml test fails qemu: monitor: Rename and improve qemuMonitorGetPtyPaths conf: Add channel state for virtio channels to the XML qemu: Add handling for VSERPORT_CHANGE event qemu: chardev: Extract more information about character devices qemu: process: Refresh virtio channel guest state when connecting to mon event: Add guest agent lifecycle event examples: Add support for the guest agent lifecycle event qemu: Emit the guest agent lifecycle event daemon/remote.c | 36 +++++ docs/formatdomain.html.in | 9 +- docs/schemas/domaincommon.rng | 3 + examples/object-events/event-test.c | 43 +++++- include/libvirt/libvirt-domain.h | 28 ++++ src/conf/domain_conf.c | 35 ++++- src/conf/domain_conf.h | 19 ++- src/conf/domain_event.c | 78 ++++++++++ src/conf/domain_event.h | 9 ++ src/libvirt_private.syms | 2 + src/qemu/qemu_domain.h | 1 + src/qemu/qemu_driver.c | 62 ++++++++ src/qemu/qemu_monitor.c | 56 ++++++-- src/qemu/qemu_monitor.h | 20 ++- src/qemu/qemu_monitor_json.c | 84 ++++++++--- src/qemu/qemu_monitor_json.h | 4 +- src/qemu/qemu_monitor_text.c | 21 ++- src/qemu/qemu_monitor_text.h | 4 +- src/qemu/qemu_process.c | 157 ++++++++++++++++++--- src/remote/remote_driver.c | 31 ++++ src/remote/remote_protocol.x | 16 ++- src/remote_protocol-structs | 7 + tests/qemumonitorjsontest.c | 59 +++++--- .../qemuxml2argv-channel-virtio-state.args | 17 +++ .../qemuxml2argv-channel-virtio-state.xml | 42 ++++++ tests/qemuxml2argvtest.c | 2 + .../qemuxml2xmlout-channel-virtio-state-active.xml | 43 ++++++ ...emuxml2xmlout-channel-virtio-state-inactive.xml | 42 ++++++ tests/qemuxml2xmltest.c | 3 +- tests/testutils.c | 35 ++++- tests/testutils.h | 5 + tools/virsh-domain.c | 40 ++++++ 32 files changed, 922 insertions(+), 91 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-state.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-state.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-virtio-state-active.xml create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-virtio-state-inactive.xml -- 2.1.0

4 33

[libvirt] [PATCH] docs: fix a typo in formatdomain.html
by Chen Fan 21 Nov '14

21 Nov '14

Signed-off-by: Chen Fan <chen.fan.fnst(a)cn.fujitsu.com> --- 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 9364eb5..6a15074 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -3413,7 +3413,7 @@ setting for the attribute is <code>no</code> for security reasons and support depends on the guest network device model as well as the type of connection on the host - currently it is - only supported for the virtio ddevice model and for macvtap + only supported for the virtio device model and for macvtap connections on the host. </p> <p> -- 1.9.3

2 1

[libvirt] [PATCH] storage: qemu: Fix security labelling of new image chain elements
by Peter Krempa 21 Nov '14

21 Nov '14

When creating a disk image snapshot the libvirt code would blindly copy the parents label to the newly created image. This runs into problems when you start a VM from an image hosted on NFS (or other storage system that doesn't support selinux labels) and the snapshot destination is on a storage system that does support selinux labels. Libvirt's code in that case generates a different security label for the image hosted on NFS. This label is valid only for NFS images and doesn't allow access in case of a locally stored image. To fix this issue libvirt needs to refrain from copying security information in cases where the default domain seclabel is a better choice. This patch repurposes the now unused @force argument of virStorageSourceInitChainElement to denote whether a copy of the security labelling stuff should be attempted or not. This allows to fine-control the copy operation for cases where we need to keep the label of the old disk vs. the cases where we need to keep the label unset to use the default domain imagelabel. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1151718 --- Note: I've opted not to change to use the default label when doing a block-copy via the old API as there is no way to specify a new label all other options now allow to provide a different label via the XML that was provided by the user. src/qemu/qemu_driver.c | 14 ++++++++------ src/qemu/qemu_process.c | 2 +- src/util/virstoragefile.c | 16 +++++++--------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 74d1bdc..0343713 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -15861,7 +15861,8 @@ qemuDomainBlockCopyCommon(virDomainObjPtr vm, unsigned long long bandwidth, unsigned int granularity, unsigned long long buf_size, - unsigned int flags) + unsigned int flags, + bool keepParentLabel) { virQEMUDriverPtr driver = conn->privateData; qemuDomainObjPrivatePtr priv; @@ -15992,7 +15993,8 @@ qemuDomainBlockCopyCommon(virDomainObjPtr vm, if (mirror->format > 0) format = virStorageFileFormatTypeToString(mirror->format); - if (virStorageSourceInitChainElement(mirror, disk->src, false) < 0) + if (virStorageSourceInitChainElement(mirror, disk->src, + keepParentLabel) < 0) goto endjob; if (qemuDomainPrepareDiskChainElement(driver, vm, mirror, @@ -16104,7 +16106,7 @@ qemuDomainBlockRebase(virDomainPtr dom, const char *path, const char *base, flags &= (VIR_DOMAIN_BLOCK_REBASE_SHALLOW | VIR_DOMAIN_BLOCK_REBASE_REUSE_EXT); ret = qemuDomainBlockCopyCommon(vm, dom->conn, path, dest, - bandwidth, 0, 0, flags); + bandwidth, 0, 0, flags, true); vm = NULL; dest = NULL; @@ -16177,8 +16179,8 @@ qemuDomainBlockCopy(virDomainPtr dom, const char *disk, const char *destxml, VIR_DOMAIN_XML_INACTIVE))) goto cleanup; - ret = qemuDomainBlockCopyCommon(vm, dom->conn, disk, dest, - bandwidth, granularity, buf_size, flags); + ret = qemuDomainBlockCopyCommon(vm, dom->conn, disk, dest, bandwidth, + granularity, buf_size, flags, false); vm = NULL; cleanup: @@ -16353,7 +16355,7 @@ qemuDomainBlockCommit(virDomainPtr dom, goto endjob; if (virStorageSourceInitChainElement(mirror, disk->src, - false) < 0) + true) < 0) goto endjob; } diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index b782984..1f22bd0 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1064,7 +1064,7 @@ qemuProcessHandleBlockJob(qemuMonitorPtr mon ATTRIBUTE_UNUSED, copy = virStorageSourceCopy(disk->mirror, false); if (virStorageSourceInitChainElement(copy, persistDisk->src, - false) < 0) { + true) < 0) { VIR_WARN("Unable to update persistent definition " "on vm %s after block job", vm->def->name); diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c index aa97f75..5287c51 100644 --- a/src/util/virstoragefile.c +++ b/src/util/virstoragefile.c @@ -1900,28 +1900,26 @@ virStorageSourceCopy(const virStorageSource *src, * virStorageSourceInitChainElement: * @newelem: New backing chain element disk source * @old: Existing top level disk source - * @force: Force-copy the information + * @transferLabels: Transfer security lables. * * Transfers relevant information from the existing disk source to the new * backing chain element if they weren't supplied so that labelling info * and possibly other stuff is correct. * - * If @force is true, user-supplied information for the new backing store - * element is overwritten from @old instead of keeping it. + * If @transferLabels is true, security labels from the existing disk are copied + * to the new disk. Otherwise the default domain imagelabel label will be used. * * Returns 0 on success, -1 on error. */ int virStorageSourceInitChainElement(virStorageSourcePtr newelem, virStorageSourcePtr old, - bool force) + bool transferLables) { int ret = -1; - if (force) - virStorageSourceSeclabelsClear(newelem); - - if (!newelem->seclabels && + if (transferLables && + !newelem->seclabels && virStorageSourceSeclabelsCopy(newelem, old) < 0) goto cleanup; @@ -2367,7 +2365,7 @@ virStorageSourceNewFromBacking(virStorageSourcePtr parent) } /* copy parent's labelling and other top level stuff */ - if (virStorageSourceInitChainElement(ret, parent, false) < 0) + if (virStorageSourceInitChainElement(ret, parent, true) < 0) goto error; } -- 2.1.0

2 2