- Devel - libvirt List Archives

[libvirt] [PATCH] qemu: Label correct per-VM path when starting
by Martin Kletzander 26 Aug '15

26 Aug '15

Commit f1f68ca33433825ce0deed2d96f1990200bc6618 overused mdir_name() event though it was not needed in the latest version, hence labelling directory one level up in the tree and not the one it should. If anyone with SElinux managed to try run a domain with guest agent set up, it's highly possible that they will need to run 'restorecon -F /var/lib/libvirt/qemu/channel/target' to fix what was done. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/qemu/qemu_process.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index 93ccd2a706b9..f7eb2b609437 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -46,7 +46,6 @@ #include "cpu/cpu.h" #include "datatypes.h" -#include "dirname.h" #include "virlog.h" #include "virerror.h" #include "viralloc.h" @@ -4390,7 +4389,7 @@ int qemuProcessStart(virConnectPtr conn, unsigned int hostdev_flags = 0; size_t nnicindexes = 0; int *nicindexes = NULL; - char *tmppath = NULL, *tmpdirpath = NULL; + char *tmppath = NULL; VIR_DEBUG("vm=%p name=%s id=%d asyncJob=%d migrateFrom=%s stdin_fd=%d " "stdin_path=%s snapshot=%p vmop=%d flags=0x%x", @@ -4738,15 +4737,11 @@ int qemuProcessStart(virConnectPtr conn, if (virFileMakePath(tmppath) < 0) goto cleanup; - if (!(tmpdirpath = mdir_name(tmppath))) - goto cleanup; - if (virSecurityManagerDomainSetDirLabel(driver->securityManager, - vm->def, tmpdirpath) < 0) + vm->def, tmppath) < 0) goto cleanup; VIR_FREE(tmppath); - VIR_FREE(tmpdirpath); if (virAsprintf(&tmppath, "%s/domain-%s", cfg->channelTargetDir, vm->def->name) < 0) @@ -4755,14 +4750,10 @@ int qemuProcessStart(virConnectPtr conn, if (virFileMakePath(tmppath) < 0) goto cleanup; - if (!(tmpdirpath = mdir_name(tmppath))) - goto cleanup; - if (virSecurityManagerDomainSetDirLabel(driver->securityManager, - vm->def, tmpdirpath) < 0) + vm->def, tmppath) < 0) goto cleanup; - VIR_FREE(tmpdirpath); VIR_FREE(tmppath); /* now that we know it is about to start call the hook if present */ @@ -5119,7 +5110,6 @@ int qemuProcessStart(virConnectPtr conn, * if we failed to initialize the now running VM. kill it off and * pretend we never started it */ VIR_FREE(tmppath); - VIR_FREE(tmpdirpath); VIR_FREE(nodeset); virCommandFree(cmd); VIR_FORCE_CLOSE(logfile); -- 2.5.0

3 3

[libvirt] [PATCH] util: Don't save/set MAC address for macvtap+passthrough+802.1Qbh
by Laine Stump 26 Aug '15

26 Aug '15

Before libvirt sets the MAC address of the physdev (the physical ethernet device) linked to a macvtap passthrough device, it always saves the previous MAC address to restore when the guest is finished (following a "leave nothing behind" policy). It has even done this for macvtap devices that have an 802.1Qbh port profile attached to them. It turns out that this is unnecessary, because the port profile Associate/Disassociate operations do that for us. Beyond that, with a recent change to the way we retrieve the MAC address (commit cb3fe38c), all attempts to start a macvtap passthrough device with an 802.1Qbh port profile attached to a Cisco VMFEX card (which uses the "enic" driver in the kernel) to fail. This patch puts extra qualifiers around both the save/set and the restore of the physdev address, so that it isn't done if there is an 802.1Qbh port profile associated with it. This resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1257004 --- Stefan - do you know if this save/restore of MAC address is also unnecessary/erroneous for 802.1Qbg? If so, I'll just disable it any time a virtportprofile is present, since those are the only two port profile types that are valid with macvtap anyway. src/util/virnetdevmacvlan.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index 213b8eb..9c4da1f 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -777,11 +777,17 @@ int virNetDevMacVLanCreateWithVPortProfile(const char *tgifname, * address must be reset when the VM is shut down. * This is especially important when using SRIOV capable cards that * emulate their switch in firmware. + * + * Note that this saving/setting of the MAC address must *NOT* be + * done if the interface is setup with an 802.1Qbh. In that case, + * the 802.1Qbh "port associate" operation will take care of + * saving/setting the MAC address. */ - if (mode == VIR_NETDEV_MACVLAN_MODE_PASSTHRU) { - if (virNetDevReplaceNetConfig(linkdev, -1, macaddress, -1, stateDir) < 0) - return -1; - } + if (mode == VIR_NETDEV_MACVLAN_MODE_PASSTHRU && + !(virtPortProfile && + virtPortProfile->virtPortType == VIR_NETDEV_VPORT_PROFILE_8021QBH) && + virNetDevReplaceNetConfig(linkdev, -1, macaddress, -1, stateDir) < 0) + return -1; if (tgifname) { if ((ret = virNetDevExists(tgifname)) < 0) @@ -913,7 +919,9 @@ int virNetDevMacVLanDeleteWithVPortProfile(const char *ifname, int ret = 0; int vf = -1; - if (mode == VIR_NETDEV_MACVLAN_MODE_PASSTHRU) + if (mode == VIR_NETDEV_MACVLAN_MODE_PASSTHRU && + !(virtPortProfile && + virtPortProfile->virtPortType == VIR_NETDEV_VPORT_PROFILE_8021QBH)) ignore_value(virNetDevRestoreNetConfig(linkdev, vf, stateDir)); if (ifname) { -- 2.1.0

2 1

[libvirt] [PATCHv2] qemu: fix not update weight in def after success
by Luyao Huang 26 Aug '15

26 Aug '15

https://bugzilla.redhat.com/show_bug.cgi?id=1253107 Call virCgroupGetBlkioWeight to re-read blkio.weight right after it are set in order to keep our internal structures up-to-date. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/qemu/qemu_driver.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index b6ac075..5cc38ad 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9183,7 +9183,8 @@ qemuDomainSetBlkioParameters(virDomainPtr dom, virTypedParameterPtr param = &params[i]; if (STREQ(param->field, VIR_DOMAIN_BLKIO_WEIGHT)) { - if (virCgroupSetBlkioWeight(priv->cgroup, param->value.ui) < 0) + if (virCgroupSetBlkioWeight(priv->cgroup, param->value.ui) < 0 || + virCgroupGetBlkioWeight(priv->cgroup, &def->blkio.weight) < 0) ret = -1; } else if (STREQ(param->field, VIR_DOMAIN_BLKIO_DEVICE_WEIGHT) || STREQ(param->field, VIR_DOMAIN_BLKIO_DEVICE_READ_IOPS) || -- 1.8.3.1

3 2

[libvirt] [PATCHv2] utils: Remove the logging of errors from virNetDevSendEthtoolIoctl
by Moshe Levi 25 Aug '15

25 Aug '15

This patch remove the logging of errors of ioctl api and instead let the caller to choose what errors to log --- src/util/virnetdev.c | 56 ++++++++++++++----------------------------------- 1 files changed, 16 insertions(+), 40 deletions(-) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index 2f3690e..5fcf805 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -3032,39 +3032,15 @@ static int virNetDevSendEthtoolIoctl(const char *ifname, void *cmd) { int ret = -1; - int sock = -1; - virIfreq ifr; - - sock = socket(AF_LOCAL, SOCK_DGRAM, 0); - if (sock < 0) { - virReportSystemError(errno, "%s", _("Cannot open control socket")); - goto cleanup; - } + int fd; + struct ifreq ifr; - memset(&ifr, 0, sizeof(ifr)); - strcpy(ifr.ifr_name, ifname); + if ((fd = virNetDevSetupControl(ifname, &ifr)) < 0) + return ret; ifr.ifr_data = cmd; - ret = ioctl(sock, SIOCETHTOOL, &ifr); - if (ret != 0) { - switch (errno) { - case EPERM: - VIR_DEBUG("ethtool ioctl: permission denied"); - break; - case EINVAL: - VIR_DEBUG("ethtool ioctl: invalid request"); - break; - case EOPNOTSUPP: - VIR_DEBUG("ethtool ioctl: request not supported"); - break; - default: - virReportSystemError(errno, "%s", _("ethtool ioctl error")); - goto cleanup; - } - } + ret = ioctl(fd, SIOCETHTOOL, &ifr); - cleanup: - if (sock) - VIR_FORCE_CLOSE(sock); + VIR_FORCE_CLOSE(fd); return ret; } @@ -3081,12 +3057,12 @@ virNetDevSendEthtoolIoctl(const char *ifname, void *cmd) static int virNetDevFeatureAvailable(const char *ifname, struct ethtool_value *cmd) { - int ret = -1; - cmd = (void*)cmd; - if (!virNetDevSendEthtoolIoctl(ifname, cmd)) - ret = cmd->data > 0 ? 1 : 0; - return ret; + if (virNetDevSendEthtoolIoctl(ifname, cmd) < 0) { + virReportSystemError(errno, _("Cannot get device %s flags"), ifname); + return -1; + } + return cmd->data > 0 ? 1 : 0; } @@ -3103,12 +3079,12 @@ virNetDevFeatureAvailable(const char *ifname, struct ethtool_value *cmd) static int virNetDevGFeatureAvailable(const char *ifname, struct ethtool_gfeatures *cmd) { - int ret = -1; - cmd = (void*)cmd; - if (!virNetDevSendEthtoolIoctl(ifname, cmd)) - ret = FEATURE_BIT_IS_SET(cmd->features, TX_UDP_TNL, active); - return ret; + if (virNetDevSendEthtoolIoctl(ifname, cmd) < 0) { + virReportSystemError(errno, _("Cannot get device %s generic features"), ifname); + return -1; + } + return FEATURE_BIT_IS_SET(cmd->features, TX_UDP_TNL, active); } # endif -- 1.7.1

2 1

[libvirt] [PATCH 2/2] Rename page about vz driver
by Sergey Bronnikov 25 Aug '15

25 Aug '15

--- docs/{drvparallels.html.in => drvvirtuozzo.html.in} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename docs/{drvparallels.html.in => drvvirtuozzo.html.in} (100%) diff --git a/docs/drvparallels.html.in b/docs/drvvirtuozzo.html.in similarity index 100% rename from docs/drvparallels.html.in rename to docs/drvvirtuozzo.html.in -- 2.3.2 (Apple Git-55)

2 1

[libvirt] [PATCH 1/2] Parallels driver was renamed to Virtuozzo. Replace old name by new one on libvirt site
by Sergey Bronnikov 25 Aug '15

25 Aug '15

--- docs/api.html.in | 2 +- docs/drivers.html.in | 2 +- docs/drvparallels.html.in | 24 ++++++++++++------------ docs/formatdomain.html.in | 6 +++--- docs/index.html.in | 2 +- docs/schemas/domaincommon.rng | 2 +- docs/sitemap.html.in | 4 ++-- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/docs/api.html.in b/docs/api.html.in index 5c64db1..c38bed2 100644 --- a/docs/api.html.in +++ b/docs/api.html.in @@ -330,7 +330,7 @@ daemon through the <a href="remote.html">remote</a> driver via an <a href="internals/rpc.html">RPC</a>. Some hypervisors do support client-side connections and responses, such as Test, OpenVZ, VMware, - Power VM (phyp), VirtualBox (vbox), ESX, Hyper-V, Xen, and Parallels. + Power VM (phyp), VirtualBox (vbox), ESX, Hyper-V, Xen, and Virtuozzo. The libvirtd daemon service is started on the host at system boot time and can also be restarted at any time by a properly privileged user, such as root. The libvirtd daemon uses the same libvirt API diff --git a/docs/drivers.html.in b/docs/drivers.html.in index a1d4240..be7483b 100644 --- a/docs/drivers.html.in +++ b/docs/drivers.html.in @@ -32,7 +32,7 @@ <li><strong><a href="drvxen.html">Xen</a></strong></li> <li><strong><a href="drvhyperv.html">Microsoft Hyper-V</a></strong></li> <li><strong><a href="drvphyp.html">IBM PowerVM (phyp)</a></strong></li> - <li><strong><a href="drvparallels.html">Parallels</a></strong></li> + <li><strong><a href="drvvirtuozzo.html">Virtuozzo</a></strong></li> <li><strong><a href="drvbhyve.html">Bhyve</a></strong> - The BSD Hypervisor</li> </ul> diff --git a/docs/drvparallels.html.in b/docs/drvparallels.html.in index 927cc40..28c8242 100644 --- a/docs/drvparallels.html.in +++ b/docs/drvparallels.html.in @@ -2,43 +2,43 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <body> - <h1>Parallels Cloud Server driver</h1> + <h1>Virtuozzo driver</h1> <ul id="toc"></ul> <p> - The libvirt Parallels driver can manage Parallels Cloud Server starting from version 6.0. + The libvirt vz driver can manage Virtuozzo starting from version 6.0. </p> <h2><a name="project">Project Links</a></h2> <ul> <li> - The <a href="http://www.parallels.com/products/server/baremetal/sp/">Parallels Cloud Server</a> Virtualization Solution. + The <a href="http://www.odin.com/products/virtuozzo/">Virtuozzo</a> Solution. </li> </ul> - <h2><a name="uri">Connections to the Parallels Cloud Server driver</a></h2> + <h2><a name="uri">Connections to the Virtuozzo driver</a></h2> <p> - The libvirt Parallels driver is a single-instance privileged driver, with a driver name of 'parallels'. Some example connection URIs for the libvirt driver are: + The libvirt Virtuozzo driver is a single-instance privileged driver, with a driver name of 'virtuozzo'. Some example connection URIs for the libvirt driver are: </p> <pre> -parallels:///system (local access) -parallels+unix:///system (local access) -parallels://example.com/system (remote access, TLS/x509) -parallels+tcp://example.com/system (remote access, SASl/Kerberos) -parallels+ssh://root@example.com/system (remote access, SSH tunnelled) +vz:///system (local access) +vz+unix:///system (local access) +vz://example.com/system (remote access, TLS/x509) +vz+tcp://example.com/system (remote access, SASl/Kerberos) +vz+ssh://root@example.com/system (remote access, SSH tunnelled) </pre> <h2><a name="example">Example guest domain XML configuration</a></h2> <p> - Parallels driver require at least one hard disk for new domains + Virtuozzo driver require at least one hard disk for new domains at this time. It is used for defining directory, where VM should be created. </p> <pre> -<domain type='parallels'> +<domain type='vz'> <name>demo</name> <uuid>54cdecad-4492-4e31-a209-33cc21d64057</uuid> <description>some description</description> diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index d0c1741..6874ccf 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -2773,7 +2773,7 @@ attribute provides the format type. For example, LXC supports a type of "loop", with a format of "raw" or "nbd" with any format. QEMU supports a type of "path" - or "handle", but no formats. Parallels driver supports + or "handle", but no formats. Virtuozzo driver supports a type of "ploop" with a format of "ploop". </li> </ul> @@ -5038,13 +5038,13 @@ qemu-kvm -net nic,model=? /dev/null <p> You can provide the amount of video memory in kibibytes (blocks of 1024 bytes) using <code>vram</code>. This is supported only for guest - type of "libxl", "parallels", "qemu", "vbox", "vmx" and "xen". If no + type of "libxl", "vz", "qemu", "vbox", "vmx" and "xen". If no value is provided the default is used. If the size is not a power of two it will be rounded to closest one. </p> <p> The number of screen can be set using <code>heads</code>. This is - supported only for guests type of "parallels", "kvm", "vbox" and "vmx". + supported only for guests type of "vz", "kvm", "vbox" and "vmx". </p> <p> For guest type of kvm the optional attribute <code>ram</code> diff --git a/docs/index.html.in b/docs/index.html.in index c94f444..7b0c149 100644 --- a/docs/index.html.in +++ b/docs/index.html.in @@ -72,7 +72,7 @@ The <a href="http://libvirt.org/drvphyp.html">IBM PowerVM</a> hypervisor </li> <li> - The <a href="http://libvirt.org/drvparallels.html">Parallels</a> hypervisor + The <a href="http://libvirt.org/drvirtuozzo.html">Virtuozzo</a> hypervisor </li> <li> The <a href="http://libvirt.org/drvbhyve.html">Bhyve</a> hypervisor diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 1120003..a926b75 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -200,7 +200,7 @@ <value>hyperv</value> <value>vbox</value> <value>phyp</value> - <value>parallels</value> + <value>vz</value> <value>bhyve</value> </choice> </attribute> diff --git a/docs/sitemap.html.in b/docs/sitemap.html.in index a9fa945..7e3746e 100644 --- a/docs/sitemap.html.in +++ b/docs/sitemap.html.in @@ -259,8 +259,8 @@ <span>Driver for IBM PowerVM</span> </li> <li> - <a href="drvparallels.html">Parallels</a> - <span>Driver for Parallels Cloud Server</span> + <a href="drvvirtuozzo.html">Virtuozzo</a> + <span>Driver for Virtuozzo</span> </li> <li> <a href="drvbhyve.html">Bhyve</a> -- 2.3.2 (Apple Git-55)

2 1

[libvirt] [PATCH] qemu: add a check for nodeset in qemuDomainSetNumaParamsLive
by Luyao Huang 25 Aug '15

25 Aug '15

We will try to set the node to cpuset.mems without check if it is available, since we already have helper to check this. Call virNumaNodesetIsAvailable to check if node is available, then try to change it in the cgroup. Signed-off-by: Luyao Huang <lhuang(a)redhat.com> --- src/qemu/qemu_driver.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index fa655b5..45dfca0 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -9977,6 +9977,9 @@ qemuDomainSetNumaParamsLive(virDomainObjPtr vm, goto cleanup; } + if (!virNumaNodesetIsAvailable(nodeset)) + goto cleanup; + /* Ensure the cpuset string is formatted before passing to cgroup */ if (!(nodeset_str = virBitmapFormat(nodeset))) goto cleanup; -- 1.8.3.1

3 2

[libvirt] [PATCH] fix vol-create when target allocation=0
by Chunyan Liu 25 Aug '15

25 Aug '15

Regression is introduced by commit e30297b0. After that, it will report "Cannot fill file" error with following xml file: <volume> <name>virtinst-vmlinuz-xen.tP1NHh</name> <capacity>4343792</capacity> <allocation>0</allocation> <target> <format type="raw"/> <nocow/> </target> </volume> Because of this, installing xen pv guest with virt-manager fails. Reason is: posix_fallocate(int fd, off_t offset, off_t len) will return EINVAL when len is equal to 0. So, this patch adds a check before calling safezero(). Signed-off-by: Chunyan Liu <cyliu(a)suse.com> --- src/storage/storage_backend.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index db49739..2a265af 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -455,7 +455,7 @@ createRawFile(int fd, virStorageVolDefPtr vol, pos = inputvol->target.capacity - remain; } - if (need_alloc) { + if (need_alloc && (vol->target.allocation > pos)) { if (safezero(fd, pos, vol->target.allocation - pos) < 0) { ret = -errno; virReportSystemError(errno, _("cannot fill file '%s'"), -- 2.1.4

4 5

[libvirt] [PATCH] storage: only run safezero if allocation is > 0
by Guido Günther 24 Aug '15

24 Aug '15

While a zero allocation in safezero should be fine it isn't when we use posix_fallocate which returns EINVAL on a zero allocation. While we could skip the zero allocation in safezero_posix_fallocate it's an optimization to do it for all allocations. This fixes vm installation via virtinst for me which otherwise aborts like: Starting install... Retrieving file linux... | 5.9 MB 00:01 ... Retrieving file initrd.gz... | 29 MB 00:07 ... ERROR Couldn't create storage volume 'virtinst-linux.sBgds4': 'cannot fill file '/var/lib/libvirt/boot/virtinst-linux.sBgds4': Invalid argument' --- No idea while this didn't show up earlier though. src/storage/storage_backend.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index db49739..0418473 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -455,7 +455,7 @@ createRawFile(int fd, virStorageVolDefPtr vol, pos = inputvol->target.capacity - remain; } - if (need_alloc) { + if (need_alloc && (vol->target.allocation - pos > 0)) { if (safezero(fd, pos, vol->target.allocation - pos) < 0) { ret = -errno; virReportSystemError(errno, _("cannot fill file '%s'"), -- 2.1.4

3 2

[libvirt] compressed stream support
by Vasiliy Tolstov 24 Aug '15

24 Aug '15

I want to able to get VolumeUpload and VolumeUpload compressed on the fly (for example to minimize network load) Some times ago i ask this question in this list, and get some suggestions from developers. But as i see, May be not good to detect compressor from libvirt config, but create new stream functions that have in flags somewhere compressor type. So when data uploaded/downloaded stream Recv/Send functions able to compress/decompress on the fly. But i'm not understand some things: 1) user run volumedownload with offset (uncompressed size) and length. But when user recieve data - resulted len < requested len. How to deal with this? 2) how to display progress when downloading/uploading data? in case of uncompressed size thing very simple (i know all size and transfered), but in case of compressed data how to determine progress ? Thanks! -- Vasiliy Tolstov, e-mail: v.tolstov(a)selfip.ru

1 1