- Devel - libvirt List Archives

[libvirt] [PATCH] qemu: Fix virsh freeze when blockcopy storage file is removed
by Erik Skultety 04 Dec '14

04 Dec '14

If someone removes blockcopy storage file when still in mirroring phase and then requesting blockjob abort using pivot, virsh cmd freezes. This is not an issue with older qemu versions which did not support asynchronous jobs (which we prefer by default). As we have reached the mirroring phase successfully, polling monitor for blockjob info always returns 1 and the loop never ends. This fix introduces a check for qemuDomainBlockPivot return code, possibly skipping the asynchronous waiting completely, if an error occured and asynchronous waiting was the preferred method. Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1139567 --- src/qemu/qemu_driver.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 5dc62b0..2e11938 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -15606,6 +15606,8 @@ qemuDomainBlockJobImpl(virDomainObjPtr vm, if (disk->mirror && (flags & VIR_DOMAIN_BLOCK_JOB_ABORT_PIVOT)) { ret = qemuDomainBlockPivot(conn, driver, vm, device, disk); + if (ret < 0 && async) + goto endjob; goto waitjob; } if (disk->mirror) { -- 1.9.3

3 2

[libvirt] [PATCH] qemu: output error when try to hotplug unsupport console
by Luyao Huang 04 Dec '14

04 Dec '14

https://bugzilla.redhat.com/show_bug.cgi?id=1164627 When try to use attach-device to hotplug a qemu unsupport sonsole, command will return success, and add a console in vm's xml.But this doesn't work in qemu, qemu doesn't support these console.Add a error output when try to hotplug a unsupport console in qemuBuildConsoleChrDeviceStr. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/qemu/qemu_command.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 1399ce4..2bf4a83 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -10069,13 +10069,17 @@ qemuBuildConsoleChrDeviceStr(char **deviceStr, break; case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SERIAL: + break; case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_NONE: case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_XEN: case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_UML: case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_LXC: case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_OPENVZ: case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_LAST: - break; + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unsupported console target type %s"), + NULLSTR(virDomainChrConsoleTargetTypeToString(chr->targetType))); + return ret; } ret = 0; -- 1.8.3.1

4 4

[libvirt] [PATCH] network: Let domains be restricted to local DNS
by Josh Stone 04 Dec '14

04 Dec '14

This adds a new "localOnly" attribute on the domain element of the network xml. With this set to "yes", DNS requests under that domain will only be resolved by libvirt's dnsmasq, never forwarded upstream. This was how it worked before commit f69a6b987d616, and I found that functionality useful. For example, I have my host's NetworkManager dnsmasq configured to forward that domain to libvirt's dnsmasq, so I can easily resolve guest names from outside. But if libvirt's dnsmasq doesn't know a name and forwards it to the host, I'd get an endless forwarding loop. Now I can set localOnly="yes" to prevent the loop. Signed-off-by: Josh Stone <jistone(a)redhat.com> Cc: Laine Stump <laine(a)laine.org> --- docs/formatnetwork.html.in | 12 +++++++++++- docs/schemas/network.rng | 3 +++ src/conf/network_conf.c | 5 +++++ src/conf/network_conf.h | 1 + src/network/bridge_driver.c | 5 +++++ .../networkxml2confdata/nat-network-dns-local-domain.conf | 14 ++++++++++++++ tests/networkxml2confdata/nat-network-dns-local-domain.xml | 9 +++++++++ tests/networkxml2conftest.c | 1 + 8 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 tests/networkxml2confdata/nat-network-dns-local-domain.conf create mode 100644 tests/networkxml2confdata/nat-network-dns-local-domain.xml diff --git a/docs/formatnetwork.html.in b/docs/formatnetwork.html.in index dc438aee8622..defcdba00930 100644 --- a/docs/formatnetwork.html.in +++ b/docs/formatnetwork.html.in @@ -82,7 +82,7 @@ <pre> ... <bridge name="virbr0" stp="on" delay="5"/> - <domain name="example.com"/> + <domain name="example.com" localOnly="no"/> <forward mode="nat" dev="eth0"/> ...</pre> @@ -113,6 +113,16 @@ a <code><forward></code> mode of "nat" or "route" (or an isolated network with no <code><forward></code> element). Since 0.4.5 + + + If the optional <code>localOnly</code> attribute on the + <code>domain</code> element is "yes", then DNS requests under + this domain will only be resolved by the virtual network's own + DNS server - they will not be forwarded to the host's upstream + DNS server. If <code>localOnly</code> is "no", and by + default, unresolved requests will be forwarded. + Since 1.2.11 + </dd> <dt><code>forward</code></dt> <dd>Inclusion of the <code>forward</code> element indicates that diff --git a/docs/schemas/network.rng b/docs/schemas/network.rng index 4546f8037580..a1da28092375 100644 --- a/docs/schemas/network.rng +++ b/docs/schemas/network.rng @@ -225,6 +225,9 @@ <optional> <element name="domain"> <attribute name="name"><ref name="dnsName"/></attribute> + <optional> + <attribute name="localOnly"><ref name="virYesNo"/></attribute> + </optional> </element> </optional> diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 067334e87cb0..61451c39805f 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -2083,6 +2083,11 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt) /* Parse network domain information */ def->domain = virXPathString("string(./domain[1]/@name)", ctxt); + tmp = virXPathString("string(./domain[1]/@localOnly)", ctxt); + if (tmp) { + def->domain_local = STRCASEEQ(tmp, "yes"); + VIR_FREE(tmp); + } if ((bandwidthNode = virXPathNode("./bandwidth", ctxt)) != NULL && (def->bandwidth = virNetDevBandwidthParse(bandwidthNode, -1)) == NULL) diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h index 660cd2d10cd1..6308a7dcfbf7 100644 --- a/src/conf/network_conf.h +++ b/src/conf/network_conf.h @@ -232,6 +232,7 @@ struct _virNetworkDef { char *bridge; /* Name of bridge device */ char *domain; + bool domain_local; /* Choose not to forward dns for this domain */ unsigned long delay; /* Bridge forward delay (ms) */ bool stp; /* Spanning tree protocol */ virMacAddr mac; /* mac address of bridge device */ diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 6cb421c52850..dfa375d3aa72 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -912,6 +912,11 @@ networkDnsmasqConfContents(virNetworkObjPtr network, } if (network->def->domain) { + if (network->def->domain_local) { + virBufferAsprintf(&configbuf, + "local=/%s/\n", + network->def->domain); + } virBufferAsprintf(&configbuf, "domain=%s\n" "expand-hosts\n", diff --git a/tests/networkxml2confdata/nat-network-dns-local-domain.conf b/tests/networkxml2confdata/nat-network-dns-local-domain.conf new file mode 100644 index 000000000000..5f41b9186cbc --- /dev/null +++ b/tests/networkxml2confdata/nat-network-dns-local-domain.conf @@ -0,0 +1,14 @@ +##WARNING: THIS IS AN AUTO-GENERATED FILE. CHANGES TO IT ARE LIKELY TO BE +##OVERWRITTEN AND LOST. Changes to this configuration should be made using: +## virsh net-edit default +## or other application using the libvirt API. +## +## dnsmasq conf file created by libvirt +strict-order +local=/example.com/ +domain=example.com +expand-hosts +except-interface=lo +bind-dynamic +interface=virbr0 +addn-hosts=/var/lib/libvirt/dnsmasq/default.addnhosts diff --git a/tests/networkxml2confdata/nat-network-dns-local-domain.xml b/tests/networkxml2confdata/nat-network-dns-local-domain.xml new file mode 100644 index 000000000000..a92d71f1f2f6 --- /dev/null +++ b/tests/networkxml2confdata/nat-network-dns-local-domain.xml @@ -0,0 +1,9 @@ +<network> + <name>default</name> + <uuid>81ff0d90-c91e-6742-64da-4a736edb9a9c</uuid> + <forward dev='eth0' mode='nat'/> + <bridge name='virbr0' stp='on' delay='0' /> + <domain name='example.com' localOnly='yes'/> + <ip address='192.168.122.1' netmask='255.255.255.0'> + </ip> +</network> diff --git a/tests/networkxml2conftest.c b/tests/networkxml2conftest.c index 4f1d9345ffe4..d2aa8c62cfcd 100644 --- a/tests/networkxml2conftest.c +++ b/tests/networkxml2conftest.c @@ -146,6 +146,7 @@ mymain(void) DO_TEST("nat-network-dns-hosts", full); DO_TEST("nat-network-dns-forward-plain", full); DO_TEST("nat-network-dns-forwarders", full); + DO_TEST("nat-network-dns-local-domain", full); DO_TEST("dhcp6-network", dhcpv6); DO_TEST("dhcp6-nat-network", dhcpv6); DO_TEST("dhcp6host-routed-network", dhcpv6); -- 2.1.0

4 9

[libvirt] [PATCH] docs: More html/docs changes from libvirt.h.in split
by John Ferlan 03 Dec '14

03 Dec '14

This changes the display from: libvirt-storage: APIs for management of storages to libvirt-storage: APIs for management of storage pools and volumes In making that change I expected my build tree html output to be regenerated; however, it wasn't because the dependency for the separated libvirt-storage.h wasn't there. It was only present for libvirt.h.in So I added each in the order displayed on the docs/html/index.html page Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- docs/Makefile.am | 11 +++++++++++ include/libvirt/libvirt-storage.h | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index bb52c35..d624827 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -291,6 +291,17 @@ $(python_generated_files): $(APIBUILD_STAMP) $(APIBUILD_STAMP): $(srcdir)/apibuild.py \ $(srcdir)/../include/libvirt/libvirt.h.in \ + $(srcdir)/../include/libvirt/libvirt-domain-snapshot.h \ + $(srcdir)/../include/libvirt/libvirt-domain.h \ + $(srcdir)/../include/libvirt/libvirt-event.h \ + $(srcdir)/../include/libvirt/libvirt-host.h \ + $(srcdir)/../include/libvirt/libvirt-interface.h \ + $(srcdir)/../include/libvirt/libvirt-network.h \ + $(srcdir)/../include/libvirt/libvirt-nodedev.h \ + $(srcdir)/../include/libvirt/libvirt-nwfilter.h \ + $(srcdir)/../include/libvirt/libvirt-secret.h \ + $(srcdir)/../include/libvirt/libvirt-storage.h \ + $(srcdir)/../include/libvirt/libvirt-stream.h \ $(srcdir)/../include/libvirt/libvirt-lxc.h \ $(srcdir)/../include/libvirt/libvirt-qemu.h \ $(srcdir)/../include/libvirt/virterror.h \ diff --git a/include/libvirt/libvirt-storage.h b/include/libvirt/libvirt-storage.h index 7b2a72d..1f3087b 100644 --- a/include/libvirt/libvirt-storage.h +++ b/include/libvirt/libvirt-storage.h @@ -1,7 +1,7 @@ /* * libvirt-storage.h - * Summary: APIs for management of storages - * Description: Provides APIs for the management of storages + * Summary: APIs for management of storage pools and volumes + * Description: Provides APIs for the management of storage pools and volumes * Author: Daniel Veillard <veillard(a)redhat.com> * * Copyright (C) 2006-2014 Red Hat, Inc. -- 1.9.3

2 1

[libvirt] how to pin disk order when adding SATA disk with virt-manager ?
by Jason Vas Dias 03 Dec '14

03 Dec '14

Hi - this is my first post to this list - sorry if this is a newbie question, but: I want to mount 7 LVM disk volumes under my guest : Physical Host Volume: Guest Device: Guest FS: /dev/mapper/VG_A-vol1 : /dev/sda : /root file system /dev/mapper/VG_S-swap2 : swap : swap partition /dev/mapper/VG_C-vol3 : /dev/sdc : /home file system /dev/mapper/VG_G-vol7 : /dev/sdg : /x some necessary other storage I am booting with the "Direct Boot" option and kernel command line containing "root=/dev/sda" - ie. there HAS to be some particular /dev/sdX where X is the virtual order of the disks on the virtual SATA bus / device minor number to letter mapping . Every time I add a new volume via the virt-manager the ordering of ALL disks change , and I must manually discover which drive letter ('a-g' in /dev/sd[a-g]) maps to which disk , even though the ordering as shown in the GUI remains the same - ie. when I click on the 'SATA Disk 1' icon in the virt-manager 'Details...' tab, it still shows the correct LVM is associated with Disk 1, but the system does not boot because what was '/dev/sda' is now '/dev/sdb' . Is this a bug ? Can I request a "New Feature" which would allow me to specify the "Bus Sequence Number" in the Virtual Disk panel (where I currently can specify Source Path, Disk Bus, Advanced Options etc... ) - surely you could let users map disks to devices in a way that does not change with each new disk added ? Anyway, that's my 2 cents on $subject . Any thoughts / suggestions gratefully received . Thanks & Regards , Jason

1 0

[libvirt] [PATCH] cpu: fix possible crash in getModels
by Pavel Hrdina 03 Dec '14

03 Dec '14

Commit 86a15a25 introduced a new cpu driver API 'getModels'. Public API allow you to pass NULL for models to get only number of existing models. However the new code will crash with segfault so we have to count with the possibility that the user wants only the number. There is also difference in order of the models gathered by this new API as the old approach was inserting the elements to the end of the array so we should use 'VIR_APPEND_ELEMENT'. Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com> --- src/cpu/cpu_powerpc.c | 15 ++++++++++----- src/cpu/cpu_x86.c | 15 ++++++++++----- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/src/cpu/cpu_powerpc.c b/src/cpu/cpu_powerpc.c index 871401b..86f80b3 100644 --- a/src/cpu/cpu_powerpc.c +++ b/src/cpu/cpu_powerpc.c @@ -666,11 +666,15 @@ ppcGetModels(char ***models) model = map->models; while (model != NULL) { - if (VIR_STRDUP(name, model->name) < 0) - goto error; + if (models) { + if (VIR_STRDUP(name, model->name) < 0) + goto error; - if (VIR_INSERT_ELEMENT(*models, 0, nmodels, name) < 0) - goto error; + if (VIR_APPEND_ELEMENT(*models, nmodels, name) < 0) + goto error; + } else { + nmodels++; + } model = model->next; } @@ -681,7 +685,8 @@ ppcGetModels(char ***models) return nmodels; error: - virStringFreeList(*models); + if (models) + virStringFreeList(*models); nmodels = -1; goto cleanup; } diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index f6dcba4..dfbc16c 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -2176,11 +2176,15 @@ x86GetModels(char ***models) model = map->models; while (model != NULL) { - if (VIR_STRDUP(name, model->name) < 0) - goto error; + if (models) { + if (VIR_STRDUP(name, model->name) < 0) + goto error; - if (VIR_INSERT_ELEMENT(*models, 0, nmodels, name) < 0) - goto error; + if (VIR_APPEND_ELEMENT(*models, nmodels, name) < 0) + goto error; + } else { + nmodels++; + } model = model->next; } @@ -2188,7 +2192,8 @@ x86GetModels(char ***models) return nmodels; error: - virStringFreeList(*models); + if (models) + virStringFreeList(*models); return -1; } -- 2.0.4

2 2

[libvirt] [PATCH 0/2] qemu: Refactor reconnecting after daemon restart
by Peter Krempa 03 Dec '14

03 Dec '14

Peter Krempa (2): qemu: driver: Reload snapshots and managedsaves prior to reconnecting qemu: process: Refactor reconnecting to qemu processes src/qemu/qemu_driver.c | 4 +- src/qemu/qemu_process.c | 167 ++++++++++++++++++++++-------------------------- 2 files changed, 78 insertions(+), 93 deletions(-) -- 2.1.0

2 4

[libvirt] [PATCH 0/2] leaseshelper: Coverity/whitespace fixes
by Peter Krempa 03 Dec '14

03 Dec '14

Peter Krempa (2): leaseshelper: Skip entries missing expiry time on INIT action leaseshelper: Fix incorrect alignment of a switch case src/network/leaseshelper.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) -- 2.1.0

2 5

[libvirt] [PATCH] tests: Fix misplaced parenthesis in qemumonitorjsontest
by Martin Kletzander 03 Dec '14

03 Dec '14

When trying clang, it found out that we were comparing sizeof with 0 even though we wanted to check the return value of memcmp. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- tests/qemumonitorjsontest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c index 5bfcd20..d3ae29a 100644 --- a/tests/qemumonitorjsontest.c +++ b/tests/qemumonitorjsontest.c @@ -1879,7 +1879,7 @@ testQemuMonitorJSONqemuMonitorJSONSetBlockIoThrottle(const void *data) "drive-virtio-disk0", &info, false) < 0) goto cleanup; - if (memcmp(&info, &expectedInfo, sizeof(info) != 0)) { + if (memcmp(&info, &expectedInfo, sizeof(info)) != 0) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", "Invalid @info"); goto cleanup; -- 2.1.3

3 3

[libvirt] [PATCHv5 0/3] leaseshelper: Couple of improvements
by Peter Krempa 03 Dec '14

03 Dec '14

Nehal J Wani (1): leaseshelper: improvements to support all events Peter Krempa (2): leaseshelper: Refactor control flow network: dnsmasq: Don't format lease file path src/network/bridge_driver.c | 16 +- src/network/bridge_driver.h | 3 - src/network/leaseshelper.c | 246 +++++++++++++++------ tests/networkxml2confdata/dhcp6-nat-network.conf | 1 - tests/networkxml2confdata/dhcp6-network.conf | 1 - tests/networkxml2confdata/isolated-network.conf | 1 - .../nat-network-dns-srv-record-minimal.conf | 1 - .../nat-network-dns-srv-record.conf | 1 - .../nat-network-dns-txt-record.conf | 1 - tests/networkxml2confdata/nat-network.conf | 1 - tests/networkxml2confdata/netboot-network.conf | 1 - .../networkxml2confdata/netboot-proxy-network.conf | 1 - tests/networkxml2conftest.c | 12 - 13 files changed, 181 insertions(+), 105 deletions(-) -- 2.1.0

4 8

[libvirt] [PATCH] storage: fix crash caused by no check return before set close
by Luyao Huang 03 Dec '14

03 Dec '14

https://bugzilla.redhat.com/show_bug.cgi?id=1087104#c5 When try to use a invalid offset do volupload, libvirt will get failed in virFDStreamOpenFileInternal, but seems libvirt do not check the return in storageVolUpload, and call virFDStreamSetInternalCloseCb , but stream doesn't have a privateData (is NULL), then crash. Although libvirt have a check for invalid offset in cmdVolUpload, but i think there should have some other way to touch off this crash. 0 0x00007f09429a9c10 in pthread_mutex_lock () from /lib64/libpthread.so.0 1 0x00007f094514dbf5 in virMutexLock (m=<optimized out>) at util/virthread.c:88 2 0x00007f09451cb211 in virFDStreamSetInternalCloseCb at fdstream.c:795 3 0x00007f092ff2c9eb in storageVolUpload at storage/storage_driver.c:2098 4 0x00007f09451f46e0 in virStorageVolUpload at libvirt.c:14000 5 0x00007f0945c78fa1 in remoteDispatchStorageVolUpload at remote_dispatch.h:14339 6 remoteDispatchStorageVolUploadHelper at remote_dispatch.h:14309 7 0x00007f094524a192 in virNetServerProgramDispatchCall at rpc/virnetserverprogram.c:437 Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/storage/storage_driver.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index 7f33d6f..7f4de19 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -2111,8 +2111,9 @@ storageVolUpload(virStorageVolPtr obj, goto cleanup; } - ret = backend->uploadVol(obj->conn, pool, vol, stream, - offset, length, flags); + if ((ret = backend->uploadVol(obj->conn, pool, vol, stream, + offset, length, flags)) < 0) + goto cleanup; /* Add cleanup callback - call after uploadVol since the stream * is then fully set up -- 1.8.3.1

2 1

[libvirt] [PATCH 0/2] Rework reference locking; in QEMU, for starters
by Martin Kletzander 03 Dec '14

03 Dec '14

Our reference locking for objects is great and powerful thing. The problem is that it was either not followed through completely or the design was not complete, but it doesn't matter now. There are few bugs in the code due to the reference counting and the daemon is lacking some performance in specific scenarios. This "series" tried to fix that using the following idea: - Each API working with a domain object that has to get it from the list will have its *own* reference, not borrowed one from the list. - When adding a domain into the list, the reference counter is increased (this is the reference that is there just for being in the list) and when being removed, it is decreased. No special-casing of "if this is was the last reference" and other funny stuff. - When job is created, there is no need to increase the reference counter as there are at least two references for the domain: 1) The API that created the job has one, so if it's not async it will be kept until the API ends and at that point the job won't exist any more. 2) The domain list has one and even though I said nobody needs to rely on that, async APIs probably will do that, but there's an excuse for that. In order to remove the domain from the list, you need a job and that won't succeed unless the async one ended. So we're good in this case as well. After searching through the code for all things that needed to be removed and fixing everything I could possibly think of, I tried a few things on my setup and it looks like it works. However, I haven't tried *every single API*, but I hope that's understandable. On the other hand, I asked Pavel to try running virt-test with these patches applied, hopefully we'll get an idea about how reliable this "series" is. I used "series" (with quotes) on purpose, because first patch just adds two new wrappers for slightly modified function and the second one changes the whole qemu driver at once. Unfortunately the second patch couldn't be broken up to more parts due to the nature of the fix. Enough chit-chat, let's look at the codes! Martin Kletzander (2): conf: Rework virDomainObjListFindByUUID to allow more concurrent APIs qemu: completely rework reference counting src/conf/domain_conf.c | 27 +- src/conf/domain_conf.h | 2 + src/libvirt_private.syms | 1 + src/qemu/THREADS.txt | 40 ++- src/qemu/qemu_domain.c | 28 +- src/qemu/qemu_domain.h | 12 +- src/qemu/qemu_driver.c | 708 ++++++++++++++++------------------------------ src/qemu/qemu_migration.c | 108 +++---- src/qemu/qemu_migration.h | 10 +- src/qemu/qemu_process.c | 126 ++++----- 10 files changed, 406 insertions(+), 656 deletions(-) -- 2.1.3

3 13

[libvirt] [PATCH v2] qemu: Allow UEFI paths to be specified at compile time
by Michal Privoznik 03 Dec '14

03 Dec '14

Up until now there are just two ways how to specify UEFI paths to libvirt. The first one is editing qemu.conf, the other is editing qemu_conf.c and recompile. Therefore, two new configure options are invented: --with-default-loader --with-default-nvram. At the same time, the list of default paths is extended to AAVMF. which is an aarch64 port of OVMF. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- diff to v1: -introduce configure options too configure.ac | 22 ++++++++++++++++++++++ src/qemu/qemu.conf | 12 +++++++++--- src/qemu/qemu_conf.c | 24 ++++++++++++++++++++---- src/qemu/test_libvirtd_qemu.aug.in | 1 + 4 files changed, 52 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index 9fd44b2..c22ac75 100644 --- a/configure.ac +++ b/configure.ac @@ -2786,6 +2786,28 @@ AC_ARG_WITH([default-editor], [DEFAULT_EDITOR=vi]) AC_DEFINE_UNQUOTED([DEFAULT_EDITOR], ["$DEFAULT_EDITOR"], [Default editor to use]) +AC_ARG_WITH([default-loader], + [AS_HELP_STRING([--with-default-loader], + [Default UEFI loader path @<:@default=paths to OVMF and its clones@:>@])], + [with_default_loader=${withval}], + [with_default_loader=no]) +AC_ARG_WITH([default-nvram], + [AS_HELP_STRING([--with-default-nvram], + [Default UEFI NVRAM path @<:@default=paths to OVMF and its clones@:>@])], + [with_default_nvram=${withval}], + [with_default_nvram=no]) + +if test "$with_default_loader:$with_default_nvram" != "no:no"; then + if test "$with_default_loader" = "no"; then + AC_MSG_ERROR([Can't use nvram without loader]) + fi + if test "$with_default_nvram" = "no"; then + AC_MSG_ERROR([Can't use loader without nvram]) + fi + AC_DEFINE_UNQUOTED([DEFAULT_LOADER], ["$with_default_loader"], [Default UEFI loader]) + AC_DEFINE_UNQUOTED([DEFAULT_NVRAM], ["$with_default_nvram"], [Default UEFI nvram]) +fi + # Some GNULIB base64 symbols clash with a kerberos library AC_DEFINE_UNQUOTED([isbase64],[libvirt_gl_isbase64],[Hack to avoid symbol clash]) AC_DEFINE_UNQUOTED([base64_encode],[libvirt_gl_base64_encode],[Hack to avoid symbol clash]) diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index c6db568..1c589a2 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -506,6 +506,12 @@ # however, have different variables store. Therefore the nvram is # a list of strings when a single item is in form of: # ${PATH_TO_UEFI_FW}:${PATH_TO_UEFI_VARS}. -# Later, when libvirt creates per domain variable store, this -# list is searched for the master image. -#nvram = [ "/usr/share/OVMF/OVMF_CODE.fd:/usr/share/OVMF/OVMF_VARS.fd" ] +# Later, when libvirt creates per domain variable store, this list is +# searched for the master image. The UEFI firmware can be called +# differently for different guest architectures. For instance, it's OVMF +# for x86_64 and i686, but it's AAVMF for aarch64. The libvirt default +# follows this scheme. +#nvram = [ +# "/usr/share/OVMF/OVMF_CODE.fd:/usr/share/OVMF/OVMF_VARS.fd", +# "/usr/share/AAVMF/AAVMF_CODE.fd:/usr/share/AAVMF/AAVMF_VARS.fd" +#] diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 4764bef..d268fc3 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -107,8 +107,10 @@ void qemuDomainCmdlineDefFree(qemuDomainCmdlineDefPtr def) VIR_FREE(def); } -#define VIR_QEMU_LOADER_FILE_PATH "/usr/share/OVMF/OVMF_CODE.fd" -#define VIR_QEMU_NVRAM_FILE_PATH "/usr/share/OVMF/OVMF_VARS.fd" +#define VIR_QEMU_OVMF_LOADER_PATH "/usr/share/AAVMF/AAVMF_CODE.fd" +#define VIR_QEMU_OVMF_NVRAM_PATH "/usr/share/AAVMF/AAVMF_VARS.fd" +#define VIR_QEMU_AAVMF_LOADER_PATH "/usr/share/OVMF/OVMF_CODE.fd" +#define VIR_QEMU_AAVMF_NVRAM_PATH "/usr/share/OVMF/OVMF_VARS.fd" virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged) { @@ -258,15 +260,29 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged) cfg->logTimestamp = true; +#if defined(DEFAULT_LOADER) && defined(DEFAULT_NVRAM) if (VIR_ALLOC_N(cfg->loader, 1) < 0 || VIR_ALLOC_N(cfg->nvram, 1) < 0) goto error; cfg->nloader = 1; - if (VIR_STRDUP(cfg->loader[0], VIR_QEMU_LOADER_FILE_PATH) < 0 || - VIR_STRDUP(cfg->nvram[0], VIR_QEMU_NVRAM_FILE_PATH) < 0) + if (VIR_STRDUP(cfg->loader[0], DEFAULT_LOADER) < 0 || + VIR_STRDUP(cfg->nvram[0], DEFAULT_NVRAM) < 0) goto error; +#else /* defined(DEFAULT_LOADER && defined(DEFAULT_NVRAM) */ + + if (VIR_ALLOC_N(cfg->loader, 2) < 0 || + VIR_ALLOC_N(cfg->nvram, 2) < 0) + goto error; + cfg->nloader = 2; + + if (VIR_STRDUP(cfg->loader[0], VIR_QEMU_OVMF_LOADER_PATH) < 0 || + VIR_STRDUP(cfg->nvram[0], VIR_QEMU_OVMF_NVRAM_PATH) < 0 || + VIR_STRDUP(cfg->loader[1], VIR_QEMU_AAVMF_LOADER_PATH) < 0 || + VIR_STRDUP(cfg->nvram[1], VIR_QEMU_AAVMF_NVRAM_PATH) < 0) + goto error; +#endif /* defined(DEFAULT_LOADER && defined(DEFAULT_NVRAM) */ return cfg; error: diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in index 30fd27e..fc4935b 100644 --- a/src/qemu/test_libvirtd_qemu.aug.in +++ b/src/qemu/test_libvirtd_qemu.aug.in @@ -76,4 +76,5 @@ module Test_libvirtd_qemu = { "log_timestamp" = "0" } { "nvram" { "1" = "/usr/share/OVMF/OVMF_CODE.fd:/usr/share/OVMF/OVMF_VARS.fd" } + { "2" = "/usr/share/AAVMF/AAVMF_CODE.fd:/usr/share/AAVMF/AAVMF_VARS.fd" } } -- 2.0.4

5 12

[libvirt] [PATCH] virsh: vol-upload disallow negative offset
by Shanzhi Yu 03 Dec '14

03 Dec '14

In commit 570d0f, it should diable negative offset both in cmdVolDownload and cmdVolUpload according the description, while it really didn't in cmdVolUpload Disable it in this patch Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1087104 Signed-off-by: Shanzhi Yu <shyu(a)redhat.com> --- tools/virsh-volume.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/virsh-volume.c b/tools/virsh-volume.c index 27bd81d..d585ee2 100644 --- a/tools/virsh-volume.c +++ b/tools/virsh-volume.c @@ -677,13 +677,13 @@ cmdVolUpload(vshControl *ctl, const vshCmd *cmd) const char *name = NULL; unsigned long long offset = 0, length = 0; - if (vshCommandOptULongLongWrap(cmd, "offset", &offset) < 0) { - vshError(ctl, _("Unable to parse integer")); + if (vshCommandOptULongLong(cmd, "offset", &offset) < 0) { + vshError(ctl, _("Unable to parse offset value")); return false; } if (vshCommandOptULongLongWrap(cmd, "length", &length) < 0) { - vshError(ctl, _("Unable to parse integer")); + vshError(ctl, _("Unable to parse length value")); return false; } -- 2.1.0

2 1

[libvirt] [PATCH 0/2] fix attached vm cannot get a right label
by Luyao Huang 03 Dec '14

03 Dec '14

When call qemuProcessAttach to attach a qemu process, libvirt will generate a wrong label for DAC, and do not set imagelabel for both of them, no imagelabel will cause some other issue. After this patch guest label will be : <seclabel type='static' model='selinux' relabel='yes'> <label>unconfined_u:unconfined_r:unconfined_t:s0-s0:c0.c1023</label> <imagelabel>system_u:object_r:svirt_image_t:s0-s0:c0.c1023</imagelabel> </seclabel> <seclabel type='static' model='dac' relabel='yes'> <label>+0:+0</label> <imagelabel>+0:+0</imagelabel> </seclabel> Luyao Huang (2): qemu: fix some small issue in qemuProcessAttach security: Add a new func use stat to get process DAC label src/qemu/qemu_process.c | 10 ++++++--- src/security/security_dac.c | 50 +++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 55 insertions(+), 5 deletions(-) -- 1.8.3.1

2 11

[libvirt] [PATCH] lxc: give RW access to /proc/sys/net/ipv[46] to containers
by Cédric Bosdonnat 03 Dec '14

03 Dec '14

Some programs want to change some values for the network interfaces configuration in /proc/sys/net/ipv[46] folders. Giving RW access on them allows wicked to work on openSUSE 13.2+. In order to mount those folders RW but keep the rest of /proc/sys RO, we add temporary mounts for these folders before bind-mounting /proc/sys. --- src/lxc/lxc_container.c | 97 +++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 82 insertions(+), 15 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 3b08b86..8eb2547 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -800,15 +800,20 @@ typedef struct { int mflags; bool skipUserNS; bool skipUnmounted; + bool temporary; } virLXCBasicMountInfo; static const virLXCBasicMountInfo lxcBasicMounts[] = { - { "proc", "/proc", "proc", MS_NOSUID|MS_NOEXEC|MS_NODEV, false, false }, - { "/proc/sys", "/proc/sys", NULL, MS_BIND|MS_RDONLY, false, false }, - { "sysfs", "/sys", "sysfs", MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY, false, false }, - { "securityfs", "/sys/kernel/security", "securityfs", MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY, true, true }, + { "proc", "/proc", "proc", MS_NOSUID|MS_NOEXEC|MS_NODEV, false, false, false }, + { "/proc/sys/net/ipv4", "TMP1", NULL, MS_BIND, false, false, true }, + { "/proc/sys/net/ipv6", "TMP2", NULL, MS_BIND, false, false, true }, + { "/proc/sys", "/proc/sys", NULL, MS_BIND|MS_RDONLY, false, false, false }, + { "TMP1", "/proc/sys/net/ipv4", NULL, MS_BIND, false, false, false }, + { "TMP2", "/proc/sys/net/ipv6", NULL, MS_BIND, false, false, false }, + { "sysfs", "/sys", "sysfs", MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY, false, false, false }, + { "securityfs", "/sys/kernel/security", "securityfs", MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY, true, true, false }, #if WITH_SELINUX - { SELINUX_MOUNT, SELINUX_MOUNT, "selinuxfs", MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY, true, true }, + { SELINUX_MOUNT, SELINUX_MOUNT, "selinuxfs", MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY, true, true, false }, #endif }; @@ -885,14 +890,23 @@ static int lxcContainerSetReadOnly(void) static int lxcContainerMountBasicFS(bool userns_enabled, bool netns_disabled) { - size_t i; + size_t i, j; int rc = -1; char* mnt_src = NULL; + char* mnt_dst = NULL; int mnt_mflags; + char **tmpkeys = NULL; + char **tmppaths = NULL; + size_t nmounts = ARRAY_CARDINALITY(lxcBasicMounts); VIR_DEBUG("Mounting basic filesystems"); - for (i = 0; i < ARRAY_CARDINALITY(lxcBasicMounts); i++) { + if (VIR_ALLOC_N(tmpkeys, nmounts) < 0 || + VIR_ALLOC_N(tmppaths, nmounts) < 0) { + goto cleanup; + } + + for (i = 0; i < nmounts; i++) { bool bindOverReadonly; virLXCBasicMountInfo const *mnt = &lxcBasicMounts[i]; @@ -906,11 +920,36 @@ static int lxcContainerMountBasicFS(bool userns_enabled, goto cleanup; mnt_mflags = MS_NOSUID|MS_NOEXEC|MS_NODEV|MS_RDONLY|MS_BIND; } else { - if (VIR_STRDUP(mnt_src, mnt->src) < 0) + /* Look for potential temporary folder match */ + for (j = 0; j < i; j++) { + if (STREQ_NULLABLE(mnt->src, tmpkeys[j])) { + if (VIR_STRDUP(mnt_src, tmppaths[j]) < 0) + goto cleanup; + break; + } + } + if (!mnt_src && VIR_STRDUP(mnt_src, mnt->src) < 0) goto cleanup; mnt_mflags = mnt->mflags; } + if (mnt->temporary) { + char tmppath[] = "/tmp/mount-XXXXXX"; + if (mkdtemp(tmppath) == NULL) { + virReportSystemError(errno, + _("Failed to create temporary folder %s"), + tmppath); + } + if (VIR_STRDUP(tmppaths[i], tmppath) < 0 || + VIR_STRDUP(tmpkeys[i], mnt->dst) < 0 || + VIR_STRDUP(mnt_dst, tmppath) < 0) { + goto cleanup; + } + } else { + if (VIR_STRDUP(mnt_dst, mnt->dst) < 0) + goto cleanup; + } + VIR_DEBUG("Processing %s -> %s", mnt_src, mnt->dst); @@ -940,10 +979,18 @@ static int lxcContainerMountBasicFS(bool userns_enabled, continue; } - if (virFileMakePath(mnt->dst) < 0) { + /* Some source files or folders may not exist like /proc/sys/net/ipv6 + * as they may depend on a kernel module being loaded. */ + if (STRPREFIX(mnt_src, "/") && virFileExists(mnt_src)) { + VIR_DEBUG("Skipping: missing %s", mnt_src); + VIR_FREE(mnt_src); + continue; + } + + if (virFileMakePath(mnt_dst) < 0) { virReportSystemError(errno, _("Failed to mkdir %s"), - mnt_src); + mnt_dst); goto cleanup; } @@ -957,32 +1004,52 @@ static int lxcContainerMountBasicFS(bool userns_enabled, bindOverReadonly = !!(mnt_mflags & MS_RDONLY); VIR_DEBUG("Mount %s on %s type=%s flags=%x", - mnt_src, mnt->dst, mnt->type, mnt_mflags & ~MS_RDONLY); - if (mount(mnt_src, mnt->dst, mnt->type, mnt_mflags & ~MS_RDONLY, NULL) < 0) { + mnt_src, mnt_dst, mnt->type, mnt_mflags & ~MS_RDONLY); + if (mount(mnt_src, mnt_dst, mnt->type, mnt_mflags & ~MS_RDONLY, NULL) < 0) { virReportSystemError(errno, _("Failed to mount %s on %s type %s flags=%x"), - mnt_src, mnt->dst, NULLSTR(mnt->type), + mnt_src, mnt_dst, NULLSTR(mnt->type), mnt_mflags & ~MS_RDONLY); goto cleanup; } if (bindOverReadonly && - mount(mnt_src, mnt->dst, NULL, + mount(mnt_src, mnt_dst, NULL, MS_BIND|MS_REMOUNT|MS_RDONLY, NULL) < 0) { virReportSystemError(errno, _("Failed to re-mount %s on %s flags=%x"), - mnt_src, mnt->dst, + mnt_src, mnt_dst, MS_BIND|MS_REMOUNT|MS_RDONLY); goto cleanup; } VIR_FREE(mnt_src); + VIR_FREE(mnt_dst); } rc = 0; cleanup: + /* Cleanup temporary mounts */ + for (i = 0; i < nmounts; i++) { + virLXCBasicMountInfo const *mnt = &lxcBasicMounts[i]; + if (mnt->temporary) { + if (umount(tmppaths[i]) < 0) { + virReportSystemError(errno, + _("Failed to un-mount temporary %s"), + tmppaths[i]); + } + if (virFileDeleteTree(tmppaths[i]) < 0) + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Failed to remove temporary folder %s"), + tmppaths[i]); + } + } + + virStringFreeList(tmpkeys); + virStringFreeList(tmppaths); VIR_FREE(mnt_src); + VIR_FREE(mnt_dst); VIR_DEBUG("rc=%d", rc); return rc; } -- 2.1.2

2 1

[libvirt] [PATCH] libvirt.spec.in: BuildRequires: python-devel
by Michal Privoznik 03 Dec '14

03 Dec '14

As of f48ab7d8 we are trying to use python-devel to check python's version (or at least gnulib is doing that). However, the specfile doesn't say anything about it and therefore bootstrapping may fail on a minimal installation on rawhide. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- libvirt.spec.in | 1 + 1 file changed, 1 insertion(+) diff --git a/libvirt.spec.in b/libvirt.spec.in index 0959483..083612c 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -424,6 +424,7 @@ BuildRequires: automake BuildRequires: gettext-devel BuildRequires: libtool BuildRequires: /usr/bin/pod2man +BuildRequires: python-devel %endif BuildRequires: git BuildRequires: perl -- 2.0.4

3 4

[libvirt] ANNOUNCE: virt-manager 1.1.0 released
by Cole Robinson 02 Dec '14

02 Dec '14

I'm happy to announce the release of virt-manager 1.1.0! virt-manager is a desktop application for managing KVM, Xen, and LXC virtualization via libvirt. The release can be downloaded from: http://virt-manager.org/download/ The direct download links are: http://virt-manager.org/download/sources/virt-manager/virt-manager-1.1.0.ta… This release includes: - Switch to libosinfo as OS metadata database (Giuseppe Scrivano) - Use libosinfo for OS detection from CDROM media labels (Giuseppe Scrivano) - Use libosinfo for improved OS defaults, like recommended disk size (Giuseppe Scrivano) - virt-image tool has been removed, as previously announced - Enable Hyper-V enlightenments for Windows VMs - Revert virtio-console default, back to plain serial console - Experimental q35 option in new VM 'customize' dialog - UI for virtual network QoS settings (Giuseppe Scrivano) - virt-install: --disk discard= support (Jim Minter) - addhardware: Add spiceport UI (Marc-André Lureau) - virt-install: --events on_poweroff etc. support (Chen Hanxiao) - cli --network portgroup= support and UI support - cli --boot initargs= and UI support - addhardware: allow setting controller model (Chen Hanxiao) - virt-install: support setting hugepage options (Chen Hanxiao) Thanks to everyone who has contributed to this release through testing, bug reporting, submitting patches, and otherwise sending in feedback! Thanks, Cole

2 7

[libvirt] [PATCH v3 0/4] Precreate storage on migration
by Michal Privoznik 02 Dec '14

02 Dec '14

diff to v2: -nits found by Peter fixed Michal Privoznik (4): storage: Introduce storagePoolLookupByTargetPath qemuMonitorJSONBlockStatsUpdateCapacity: Don't skip disks qemu_migration: Send disk sizes to the other side qemu_migration: Precreate missing storage src/libvirt-domain.c | 3 + src/qemu/qemu_migration.c | 319 ++++++++++++++++++++++++++++++++++++++++--- src/qemu/qemu_monitor_json.c | 14 +- src/storage/storage_driver.c | 42 ++++++ src/storage/storage_driver.h | 4 + 5 files changed, 358 insertions(+), 24 deletions(-) -- 2.0.4

2 8

[libvirt] [PATCH 00/11] Replace virXXXFree calls with virObjectUnref
by John Ferlan 02 Dec '14

02 Dec '14

Based on some recent review comments and a bit of internal IRC, this set of patches will change all the existing virXXXFree calls found in daemon/* and src/* to be virObjectUnref instead and then add a rule to inhibit usage unless the string/call is found in docs/*, tests/*, examples/*, tools/*, cfg.mk, libvirt_public.syms, include/libvirt/libvirt-*.h, and src/libvirt-*.c Most of this was brute force to start with and adding the rule afterwards caught a few oddball places. The reason for not wanting to call a virXXXFree function is because it will reset the last error, potentially clearing something and resulting in a message "an error was encountered but the cause is unknown". There were some places in the code which saved the last error, called the free function, then restored the last error. Those have now been adjusted to avoid that processing. Anything that required checking for a non NULL pointer prior to calling the virXXXFree is now not necessary since the virObjectUnref will check for NULL before continuing; whereas, the virXXXFree functions didn't allow NULL. If usage of the virXXXFree function is found during syntax-check, a message such as the following will be displayed: include/libvirt/libvirt-storage.h:256:int virStoragePoolFree (virStoragePoolPtr pool); include/libvirt/libvirt-storage.h:336:int virStorageVolFree (virStorageVolPtr vol); maint.mk: avoid using virXXXFree, use virObjectUnref instead make: *** [sc_prohibit_virXXXFree] Error 1 John Ferlan (11): rpc: Replace virXXXFree with virObjectUnref Replace virDomainFree with virObjectUnref Replace virNetworkFree with virObjectUnref Replace virNodeDeviceFree with virObjectUnref Replace virStorageVolFree with virObjectUnref Replace virStoragePoolFree with virObjectUnref Replace virStreamFree with virObjectUnref Replace virSecretFree with virObjectUnref Replace virNWFilterFree with virObjectUnref Replace virInterfaceFree with virObjectUnref Replace virDomainSnapshotFree with virObjectUnref cfg.mk | 12 +++ daemon/remote.c | 168 ++++++++++++-------------------- daemon/stream.c | 2 +- src/conf/domain_event.c | 4 +- src/conf/network_conf.c | 6 +- src/conf/network_event.c | 2 +- src/conf/node_device_conf.c | 6 +- src/conf/storage_conf.c | 6 +- src/conf/virchrdev.c | 4 +- src/esx/esx_driver.c | 2 +- src/fdstream.c | 2 +- src/hyperv/hyperv_driver.c | 2 +- src/interface/interface_backend_netcf.c | 6 +- src/interface/interface_backend_udev.c | 2 +- src/libxl/libxl_conf.c | 7 +- src/locking/sanlock_helper.c | 3 +- src/lxc/lxc_driver.c | 8 +- src/lxc/lxc_process.c | 8 +- src/nwfilter/nwfilter_driver.c | 6 +- src/qemu/qemu_command.c | 8 +- src/qemu/qemu_driver.c | 4 +- src/qemu/qemu_hotplug.c | 8 +- src/remote/remote_driver.c | 76 +++++++-------- src/rpc/gendispatch.pl | 17 ++-- src/secret/secret_driver.c | 6 +- src/storage/storage_backend.c | 4 +- src/storage/storage_backend_fs.c | 4 +- src/storage/storage_backend_rbd.c | 3 +- src/storage/storage_driver.c | 20 +--- src/uml/uml_conf.c | 2 +- src/vbox/vbox_common.c | 6 +- src/xenconfig/xen_common.c | 2 +- src/xenconfig/xen_sxpr.c | 2 +- 33 files changed, 155 insertions(+), 263 deletions(-) -- 1.9.3

3 24

[libvirt] [PATCH] qemu: update disk chain in vm->newDef when block job compeleted
by weiwei li 02 Dec '14

02 Dec '14

A bug will be hitted with libvirt+qemu+kvm when doing follow steps: 1.initial status :vm = base+z(z is a snapshot) 2. call snapshotCreateXML( ): vm = base+z +z' 3. call blockRebase( ): vm = base+z''(z rebase to z') 4.(after rebasing work done) vm shutdown and then start an error occured like this: "unable to set user and group to '0:0' on ' /path/to/disk': No such file or directory A second start may sucess. The error message reported by virSecurityDACSetSecurityDiskLabel when the disk chain is misused(that is base+z +z', after rebase, but z' was deleted yet).virSecurityDACSetSecurityDiskLabel used an old disk chain after rebasing. In qemuProcessHandleBlockJob when rebase complete, the disk chain in vm->def is updated but vm->newDef is not(when vm->newDef is not null). In shutdown( actrully in qemuProcessStop ), if vm->newDef is not null , vm->def will be replaced by vm->newDef, which contains a wrong disk chain!!! Then the next start will failed with above message. To fix it, update disk chain in vm->newDef in qemuProcessHandleBlockJob. Signed-off-by: Weiwei Li <nuonuoli(a)tencent.com> --- src/qemu/qemu_process.c | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 24e5f0f..0491249 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -1033,6 +1033,7 @@ qemuProcessHandleBlockJob(qemuMonitorPtr mon ATTRIBUTE_UNUSED, virDomainDiskDefPtr disk; virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); virDomainDiskDefPtr persistDisk = NULL; + virDomainDiskDefPtr newDisk = NULL; bool save = false; virObjectLock(vm); @@ -1101,6 +1102,32 @@ qemuProcessHandleBlockJob(qemuMonitorPtr mon ATTRIBUTE_UNUSED, disk->mirrorJob = VIR_DOMAIN_BLOCK_JOB_TYPE_UNKNOWN; ignore_value(qemuDomainDetermineDiskChain(driver, vm, disk, true, true)); + /* Chang vm->newDef disk chain */ + if (!persistDisk && vm->newDef){ + int indx = virDomainDiskIndexByName(vm->newDef, + disk->dst, + false); + virStorageSourcePtr copy = NULL; + + if (indx >=0){ + newDisk = vm->newDef->disks[indx]; + copy = virStorageSourceCopy(disk->src, false); + if (virStorageSourceInitChainElement(copy, + newDisk->src, + false) < 0) { + VIR_WARN("Unable to update newDef definition " + "on vm %s after block job", + vm->def->name); + virStorageSourceFree(copy); + copy = NULL; + newDisk = NULL; + } + } + if (copy){ + virStorageSourceFree(newDisk->src); + newDisk->src = copy; + } + } } else if (disk->mirror && (type == VIR_DOMAIN_BLOCK_JOB_TYPE_COPY || type == VIR_DOMAIN_BLOCK_JOB_TYPE_ACTIVE_COMMIT)) { -- 1.7.1

2 2

[libvirt] [PATCH] parallels: fix compilation of parallels_storage.c
by Dmitry Guryanov 02 Dec '14

02 Dec '14

virConnect.privateData is void *, so we can't access fields of parallelsConn, pointer to which is stored in virConnect.privateData. So replace all occurences of conn->privateData->storageState with privconn->storageState. Signed-off-by: Dmitry Guryanov <dguryanov(a)parallels.com> --- src/parallels/parallels_storage.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/parallels/parallels_storage.c b/src/parallels/parallels_storage.c index e1b6ea8..882cbd0 100644 --- a/src/parallels/parallels_storage.c +++ b/src/parallels/parallels_storage.c @@ -72,8 +72,8 @@ parallelsStorageClose(virConnectPtr conn) { parallelsConnPtr privconn = conn->privateData; - virStorageDriverStatePtr storageState = conn->privateData->storageState; - conn->privateData->storageState = NULL; + virStorageDriverStatePtr storageState = privconn->storageState; + privconn->storageState = NULL; parallelsStorageLock(storageState); virStoragePoolObjListFree(&privconn->pools); @@ -189,7 +189,7 @@ parallelsPoolCreateByPath(virConnectPtr conn, const char *path) if (!(pool = virStoragePoolObjAssignDef(pools, def))) goto error; - if (virStoragePoolObjSaveDef(conn->privateData->storageState, pool, def) < 0) { + if (virStoragePoolObjSaveDef(privconn->storageState, pool, def) < 0) { virStoragePoolObjRemove(pools, pool); goto error; } @@ -404,7 +404,7 @@ parallelsPoolsAdd(virDomainObjPtr dom, static int parallelsLoadPools(virConnectPtr conn) { parallelsConnPtr privconn = conn->privateData; - virStorageDriverStatePtr storageState = conn->privateData->storageState; + virStorageDriverStatePtr storageState = privconn->storageState; char *base = NULL; size_t i; @@ -461,6 +461,7 @@ parallelsStorageOpen(virConnectPtr conn, virConnectAuthPtr auth ATTRIBUTE_UNUSED, unsigned int flags) { + parallelsConnPtr privconn = conn->privateData; virStorageDriverStatePtr storageState; virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); @@ -475,7 +476,7 @@ parallelsStorageOpen(virConnectPtr conn, return VIR_DRV_OPEN_ERROR; } - conn->privateData->storageState = storageState; + privconn->storageState = storageState; parallelsStorageLock(storageState); if (parallelsLoadPools(conn)) @@ -728,7 +729,7 @@ parallelsStoragePoolDefineXML(virConnectPtr conn, if (!(pool = virStoragePoolObjAssignDef(&privconn->pools, def))) goto cleanup; - if (virStoragePoolObjSaveDef(conn->privateData->storageState, pool, def) < 0) { + if (virStoragePoolObjSaveDef(privconn->storageState, pool, def) < 0) { virStoragePoolObjRemove(&privconn->pools, pool); def = NULL; goto cleanup; -- 1.9.3

2 1

[libvirt] [PATCH 0/2] Simplify MAC address generation on update
by Ján Tomko 02 Dec '14

02 Dec '14

https://bugzilla.redhat.com/show_bug.cgi?id=1156367 Ján Tomko (2): Silently ignore MAC in NetworkLoadConfig Generate a MAC when loading a config instead of package update libvirt.spec.in | 42 ------------------------------------------ src/conf/network_conf.c | 8 ++++++++ 2 files changed, 8 insertions(+), 42 deletions(-) -- 2.0.4

2 4

[libvirt] [PATCHv3 00/16] Network configuration for lxc containers
by Cédric Bosdonnat 02 Dec '14

02 Dec '14

Hi all, Here is a rebased version of v2. Nothing changed except the 'since' version number in the added doc that has been updated. -- Cedric Cédric Bosdonnat (16): Forgot to cleanup ifname_guest* in domain network def parsing Domain conf: allow more than one IP address for net devices LXC: set IP addresses to veth devices in the container lxc conf2xml: convert IP addresses Allow network capabilities hostdev to configure IP addresses lxc conf2xml: convert ip addresses for hostdev NICs Domain network devices can now have a <gateway> element lxc conf2xml: convert lxc.network.ipv[46].gateway LXC: use the new net devices gateway definition LXC: honour network devices link state Wrong place for virDomainNetIpsFormat virNetDevSetIPv4Address: libnl implementation Renamed virNetDevSetIPv4Address to virNetDevSetIPAddress virNetDevAddRoute: implementation using netlink virNetDevClearIPv4Address: netlink implementation Renamed virNetDevClearIPv4Address to virNetDevClearIPAddress docs/formatdomain.html.in | 39 +++ docs/schemas/domaincommon.rng | 55 +++- src/conf/domain_conf.c | 214 +++++++++++++-- src/conf/domain_conf.h | 22 +- src/libvirt_private.syms | 7 +- src/lxc/lxc_container.c | 74 ++++- src/lxc/lxc_native.c | 173 ++++++++---- src/network/bridge_driver.c | 4 +- src/openvz/openvz_conf.c | 2 +- src/openvz/openvz_driver.c | 6 +- src/qemu/qemu_driver.c | 25 +- src/qemu/qemu_hotplug.c | 6 +- src/uml/uml_conf.c | 2 +- src/util/virnetdev.c | 305 ++++++++++++++++++--- src/util/virnetdev.h | 12 +- src/util/virnetlink.c | 38 +++ src/util/virnetlink.h | 2 + src/vbox/vbox_common.c | 3 +- src/xenconfig/xen_common.c | 15 +- src/xenconfig/xen_sxpr.c | 12 +- .../lxcconf2xmldata/lxcconf2xml-physnetwork.config | 4 + tests/lxcconf2xmldata/lxcconf2xml-physnetwork.xml | 3 + tests/lxcconf2xmldata/lxcconf2xml-simple.config | 4 + tests/lxcconf2xmldata/lxcconf2xml-simple.xml | 3 + tests/lxcxml2xmldata/lxc-hostdev.xml | 3 + tests/lxcxml2xmldata/lxc-idmap.xml | 3 + 26 files changed, 880 insertions(+), 156 deletions(-) -- 1.8.4.5

6 39

[libvirt] [PATCH v2 0/4] Precreate storage on migration
by Michal Privoznik 02 Dec '14

02 Dec '14

Version two of: https://www.redhat.com/archives/libvir-list/2014-November/msg01048.html diff to v1: -Switch from qemuDomainGetBlockInfoImpl() to qemuMonitorBlockStatsUpdateCapacity() -s/alloc/capacity/ -small fixes raised by Peter Michal Privoznik (4): storage: Introduce storagePoolLookupByPath qemuMonitorJSONBlockStatsUpdateCapacity: Don't skip disks qemu_migration: Send disk sizes to the other side qemu_migration: Precreate missing storage src/qemu/qemu_migration.c | 313 ++++++++++++++++++++++++++++++++++++++++--- src/qemu/qemu_monitor_json.c | 12 +- src/storage/storage_driver.c | 36 +++++ src/storage/storage_driver.h | 4 + 4 files changed, 342 insertions(+), 23 deletions(-) -- 2.0.4

2 8