- Devel - libvirt List Archives

[libvirt] [PATCH 0/3] virsh: error reporting for empty string parameters
by Ján Tomko 03 Dec '15

03 Dec '15

https://bugzilla.redhat.com/show_bug.cgi?id=1281707 Ján Tomko (3): virsh: report errors for empty strings virsh: remove custom error for cpulist from cmdIOThreadPin virsh: rename vshCommandOptString to vshCommandOptStringQuiet tools/virsh-domain-monitor.c | 4 ++-- tools/virsh-domain.c | 34 ++++++++++++++++------------------ tools/virsh-network.c | 4 ++-- tools/virsh-nodedev.c | 4 ++-- tools/virsh-volume.c | 2 +- tools/vsh.c | 12 ++++++------ tools/vsh.h | 4 ++-- 7 files changed, 31 insertions(+), 33 deletions(-) -- 2.4.6

2 4

[libvirt] [PATCH] bridge: check for invalid MAC in networkGetDHCPLeases
by Ján Tomko 03 Dec '15

03 Dec '15

Instead of comparing garbage strings against real MAC addresses, introduce an error mesage for unparsable ones: $ virsh net-dhcp-leases default --mac t12 error: Failed to get leases info for default error: invalid MAC address: t12 https://bugzilla.redhat.com/show_bug.cgi?id=1261432 --- src/network/bridge_driver.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index a0f6494..362e294 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -3648,9 +3648,16 @@ networkGetDHCPLeases(virNetworkPtr network, virNetworkDHCPLeasePtr lease = NULL; virNetworkDHCPLeasePtr *leases_ret = NULL; virNetworkObjPtr obj; + virMacAddr mac_addr; virCheckFlags(0, -1); + /* only to check if the MAC is valid */ + if (mac && virMacAddrParse(mac, &mac_addr) < 0) { + virReportError(VIR_ERR_INVALID_MAC, "%s", mac); + return -1; + } + if (!(obj = networkObjFromNetwork(network))) return -1; -- 2.4.6

2 1

[libvirt] [PATCH] libxl: add support for mounts in HVM guests
by Cédric Bosdonnat 03 Dec '15

03 Dec '15

Xen HVM guests are running a QEMU, libxl allows passing QEMU parameters in the d_config.b_info.extra list. Take advantage of that to implement support for 9pfs mounts. For this to work, xen's qemu needs to be built with virtfs enabled, or an upstream qemu needs to be used. --- Note that two functions have been picked from the qemu driver's code. src/libxl/libxl_conf.c | 174 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 174 insertions(+) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 4eed5ca..4437e8f 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -55,6 +55,7 @@ VIR_LOG_INIT("libxl.libxl_conf"); /* see xen-unstable.hg/xen/include/asm-x86/cpufeature.h */ #define LIBXL_X86_FEATURE_PAE_MASK 0x40 +#define LIBXL_FSDEV_HOST_PREFIX "fsdev-" struct guest_arch { virArch arch; @@ -84,6 +85,15 @@ static int libxlConfigOnceInit(void) VIR_ONCE_GLOBAL_INIT(libxlConfig) +VIR_ENUM_DECL(libxlDomainFSDriver) +VIR_ENUM_IMPL(libxlDomainFSDriver, VIR_DOMAIN_FS_DRIVER_TYPE_LAST, + "local", + "local", + "handle", + NULL, + NULL, + NULL); + static void libxlDriverConfigDispose(void *obj) { @@ -1854,6 +1864,167 @@ libxlMakeCapabilities(libxl_ctx *ctx) return NULL; } +static char * +libxlBuildQemuFSStr(virDomainFSDefPtr fs) +{ + virBuffer opt = VIR_BUFFER_INITIALIZER; + const char *driver = libxlDomainFSDriverTypeToString(fs->fsdriver); + const char *wrpolicy = virDomainFSWrpolicyTypeToString(fs->wrpolicy); + + if (fs->type != VIR_DOMAIN_FS_TYPE_MOUNT) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("only supports mount filesystem type")); + goto error; + } + + if (!driver) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Filesystem driver type not supported")); + goto error; + } + virBufferAdd(&opt, driver, -1); + + if (fs->fsdriver == VIR_DOMAIN_FS_DRIVER_TYPE_PATH || + fs->fsdriver == VIR_DOMAIN_FS_DRIVER_TYPE_DEFAULT) { + if (fs->accessmode == VIR_DOMAIN_FS_ACCESSMODE_MAPPED) { + virBufferAddLit(&opt, ",security_model=mapped"); + } else if (fs->accessmode == VIR_DOMAIN_FS_ACCESSMODE_PASSTHROUGH) { + virBufferAddLit(&opt, ",security_model=passthrough"); + } else if (fs->accessmode == VIR_DOMAIN_FS_ACCESSMODE_SQUASH) { + virBufferAddLit(&opt, ",security_model=none"); + } + } else { + /* For other fs drivers, default(passthru) should always + * be supported */ + if (fs->accessmode != VIR_DOMAIN_FS_ACCESSMODE_PASSTHROUGH) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("only supports passthrough accessmode")); + goto error; + } + } + + if (fs->wrpolicy) + virBufferAsprintf(&opt, ",writeout=%s", wrpolicy); + + virBufferAsprintf(&opt, ",id=%s%s", LIBXL_FSDEV_HOST_PREFIX, fs->info.alias); + virBufferAsprintf(&opt, ",path=%s", fs->src); + + if (fs->readonly) + virBufferAddLit(&opt, ",readonly"); + + if (virBufferCheckError(&opt) < 0) + goto error; + + return virBufferContentAndReset(&opt); + + error: + virBufferFreeAndReset(&opt); + return NULL; +} + + +static char * +libxlBuildQemuFSDevStr(virDomainFSDefPtr fs) +{ + virBuffer opt = VIR_BUFFER_INITIALIZER; + + if (fs->type != VIR_DOMAIN_FS_TYPE_MOUNT) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("can only passthrough directories")); + goto error; + } + + if (fs->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW) + virBufferAddLit(&opt, "virtio-9p-ccw"); + else + virBufferAddLit(&opt, "virtio-9p-pci"); + + virBufferAsprintf(&opt, ",id=%s", fs->info.alias); + virBufferAsprintf(&opt, ",fsdev=%s%s", LIBXL_FSDEV_HOST_PREFIX, fs->info.alias); + virBufferAsprintf(&opt, ",mount_tag=%s", fs->dst); + + if (virBufferCheckError(&opt) < 0) + goto error; + + return virBufferContentAndReset(&opt); + + error: + virBufferFreeAndReset(&opt); + return NULL; +} + +static int +libxlMakeMountList(virDomainDefPtr def, + libxl_domain_config *d_config) +{ + int ret = -1; + size_t i; + size_t nextra = 0; + char *fsstr = NULL; + char *fsdevstr = NULL; + char *fsdevargstr = NULL; + char *deviceargstr = NULL; + + if (def->nfss > 0 && def->os.type != VIR_DOMAIN_OSTYPE_HVM) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("only HVM guests supports mounts")); + return ret; + } + + /* Make sure we have an allocated array, not ending with NULL */ + if (!d_config->b_info.extra) { + if (VIR_ALLOC(d_config->b_info.extra) < 0) + return ret; + nextra = 0; + } else { + nextra = virStringListLength(d_config->b_info.extra) + 1; + if (VIR_DELETE_ELEMENT(d_config->b_info.extra, nextra, nextra) < 0) + return ret; + } + + /* Add the QEMU options to d_config->b_info->extra + * -fsdev local,id=virtio9p,path=%s,security_model=none + * -device virtio-9p-pci,fsdev=virtio9p,mount_tag=%s + */ + for (i = 0; i < def->nfss; i++) { + virDomainFSDefPtr fs = def->fss[i]; + + /* Assign an alias */ + if (virAsprintf(&fs->info.alias, "fs%zu", i) < 0) + goto cleanup; + + if (!(fsstr = libxlBuildQemuFSStr(fs))) + goto cleanup; + if (!(fsdevstr = libxlBuildQemuFSDevStr(fs))) + goto cleanup; + + if (VIR_STRDUP(fsdevargstr, "-fsdev") < 0 || + VIR_STRDUP(deviceargstr, "-device") < 0) + goto cleanup; + + + /* Append to the extras before terminating NULL */ + if (VIR_APPEND_ELEMENT(d_config->b_info.extra, nextra, fsdevargstr) < 0 || + VIR_APPEND_ELEMENT(d_config->b_info.extra, nextra, fsstr) < 0 || + VIR_APPEND_ELEMENT(d_config->b_info.extra, nextra, deviceargstr) < 0 || + VIR_APPEND_ELEMENT(d_config->b_info.extra, nextra, fsdevstr) < 0) + goto cleanup; + } + ret = 0; + + /* Add the terminating NULL item */ + if (VIR_RESIZE_N(d_config->b_info.extra, nextra, nextra, 1) < 0) + goto cleanup; + d_config->b_info.extra[nextra++] = NULL; + + cleanup: + VIR_FREE(fsstr); + VIR_FREE(fsdevstr); + VIR_FREE(fsdevargstr); + VIR_FREE(deviceargstr); + return ret; +} + int libxlBuildDomainConfig(virPortAllocatorPtr graphicsports, virDomainDefPtr def, @@ -1883,6 +2054,9 @@ libxlBuildDomainConfig(virPortAllocatorPtr graphicsports, if (libxlMakePCIList(def, d_config) < 0) return -1; + if (libxlMakeMountList(def, d_config) < 0) + return -1; + /* * Now that any potential VFBs are defined, update the build info with * the data of the primary display. Some day libxl might implicitely do -- 2.1.4

4 3

[libvirt] blockcopy qemu fail and libvirt
by Vasiliy Tolstov 03 Dec '15

03 Dec '15

Hi, i'm use qemu 2.4.0 and libvirt 1.2.16 and try blockcopy to migrate vm disk virsh -c qemu+ssh://root@xxx/system blockcopy domain sda /dev/nbd2 --wait --pivot libvirt says: Successfully pivoted 2015-12-01 14:37:18.188+0000: 18288: info : libvirt version: 1.2.16 2015-12-01 14:37:18.188+0000: 18288: warning : virEventPollUpdateTimeout:268 : Ignoring invalid update timer -1 but virsh command returns zero exit code qemu blockcopy failed and target device contains zeroes. i see some qemu git commits about block/migration and block that can fix this isse, does qemu-devs confirm that this bug is fixed? Also libvirt devs - do you know about this libvirt issue (when virsh doing blockcopy and qemu process does not success complete blockcopy) ? -- Vasiliy Tolstov, e-mail: v.tolstov(a)selfip.ru

1 0

[libvirt] [PATCH] add a nodnsmasq option for networks
by Serge Hallyn 03 Dec '15

03 Dec '15

Some people want to define a libvirt network but have dns served by another daemon. Libvirt used to support that, but hasn't for several years. Two long-open bugs on this are https://bugzilla.redhat.com/show_bug.cgi?id=636115 https://bugs.launchpad.net/ubuntu/+source/libvirt/+bug/584862 I'm not certain whether we really want to support this, as another option is to simply create the bridge with external tools and tell libvirt vms to use that bridge. However, if we do want to support it, this patch provides that support. This patch allows an admin to set <nodnsmasq>true</nodnsmasq> in a bridge definition to avoid having libvirt start a dnsmasq. Signed-off-by: Serge Hallyn <serge.hallyn(a)ubuntu.com> --- src/conf/network_conf.c | 15 +++++++++++++++ src/conf/network_conf.h | 1 + src/network/bridge_driver.c | 2 +- 3 files changed, 17 insertions(+), 1 deletion(-) Index: libvirt-1.2.16/src/conf/network_conf.c =================================================================== --- libvirt-1.2.16.orig/src/conf/network_conf.c +++ libvirt-1.2.16/src/conf/network_conf.c @@ -1985,6 +1985,7 @@ virNetworkDefParseXML(xmlXPathContextPtr xmlNodePtr virtPortNode = NULL; xmlNodePtr forwardNode = NULL; char *ipv6nogwStr = NULL; + char *noDnsmasqStr = NULL; char *trustGuestRxFilters = NULL; xmlNodePtr save = ctxt->node; xmlNodePtr bandwidthNode = NULL; @@ -2018,6 +2019,20 @@ virNetworkDefParseXML(xmlXPathContextPtr def->uuid_specified = true; } + /* check if user requested no dnsmasq */ + noDnsmasqStr = virXPathString("string(./nodnsmasq[1])", ctxt); + if (noDnsmasqStr) { + if (STREQ(noDnsmasqStr, "yes") || STREQ(noDnsmasqStr, "true")) { + def->nodnsmasq = true; + } else if (STRNEQ(noDnsmasqStr, "no") && STRNEQ(noDnsmasqStr, "false")) { + virReportError(VIR_ERR_XML_ERROR, + _("Invalid nodnsmasq setting '%s' in network '%s'"), + noDnsmasqStr, def->name); + goto error; + } + VIR_FREE(noDnsmasqStr); + } + /* check if definitions with no IPv6 gateway addresses is to * allow guest-to-guest communications. */ @@ -2660,6 +2675,9 @@ virNetworkDefFormatBuf(virBufferPtr buf, virUUIDFormat(uuid, uuidstr); virBufferAsprintf(buf, "<uuid>%s</uuid>\n", uuidstr); + if (def->nodnsmasq) + virBufferAsprintf(buf, "<nodnsmasq>true</nodnsmasq>\n"); + if (def->forward.type != VIR_NETWORK_FORWARD_NONE) { const char *dev = NULL; if (!def->forward.npfs) Index: libvirt-1.2.16/src/conf/network_conf.h =================================================================== --- libvirt-1.2.16.orig/src/conf/network_conf.h +++ libvirt-1.2.16/src/conf/network_conf.h @@ -231,6 +231,7 @@ struct _virNetworkDef { bool stp; /* Spanning tree protocol */ virMacAddr mac; /* mac address of bridge device */ bool mac_specified; + bool nodnsmasq; /* specified if ip6tables rules added * when no ipv6 gateway addresses specified. Index: libvirt-1.2.16/src/network/bridge_driver.c =================================================================== --- libvirt-1.2.16.orig/src/network/bridge_driver.c +++ libvirt-1.2.16/src/network/bridge_driver.c @@ -2146,7 +2146,7 @@ networkStartNetworkVirtual(virNetworkDri /* start dnsmasq if there are any IP addresses (v4 or v6) */ - if ((v4present || v6present) && + if ((v4present || v6present) && !network->def->nodnsmasq && networkStartDhcpDaemon(driver, network) < 0) goto err3;

2 2

[libvirt] [PATCH v2 0/2] libxl: implement virDomainInterfaceStats
by Joao Martins 02 Dec '15

02 Dec '15

Hey, This patch series implements virDomainInterfaceStats but based on "ConsoleCallback" as opposed of doing it in libxlDomainStart. The series is divided as following: Patch 1 renames console callback to something more generic and Patch 2 implements virDomainInterfaceStats also taking the previous review (v3 statistics) comments. Changes since v1: - Improve error reporting in case interface is not known - Use libxl_device_nic_list as opposed to libxl_domain_config Regards, Joao Joao Martins (2): libxl: rename libxlConsoleCallback libxl: implement virDomainInterfaceStats src/libxl/libxl_domain.c | 33 ++++++++++++++++++++++++++++-- src/libxl/libxl_driver.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 83 insertions(+), 2 deletions(-) -- 2.1.4

2 8

[libvirt] [PATCH] network: selectively disable -Wcast-align in virNetDevParseDadStatus
by Ian Campbell 02 Dec '15

02 Dec '15

Commit 0f7436ca54c9 "network: wait for DAD to finish for bridge IPv6 addresses" results in: CC util/libvirt_util_la-virnetdevmacvlan.lo util/virnetdev.c: In function 'virNetDevParseDadStatus': util/virnetdev.c:1319:188: error: cast increases required alignment of target type [-Werror=cast-align] util/virnetdev.c:1332:41: error: cast increases required alignment of target type [-Werror=cast-align] util/virnetdev.c:1334:92: error: cast increases required alignment of target type [-Werror=cast-align] cc1: all warnings being treated as errors on at least ARM platforms. The three macros involved (NLMSG_NEXT, IFA_RTA and RTA_NEXT) all appear to correctly take care of alignment, therefore suppress Wcast-align around their uses. Signed-off-by: Ian Campbell <ian.campbell(a)citrix.com> Cc: Maxim Perevedentsev <mperevedentsev(a)virtuozzo.com> Cc: Laine Stump <laine(a)laine.org> Cc: Dario Faggioli <dario.faggioli(a)citrix.com> Cc: Jim Fehlig <jfehlig(a)suse.com> --- src/util/virnetdev.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index ade9afa..0bc809e 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -1316,7 +1316,10 @@ virNetDevParseDadStatus(struct nlmsghdr *nlh, int len, struct rtattr *rtattr_ptr; size_t i; struct in6_addr *addr; + + VIR_WARNINGS_NO_CAST_ALIGN for (; NLMSG_OK(nlh, len); nlh = NLMSG_NEXT(nlh, len)) { + VIR_WARNINGS_RESET if (NLMSG_PAYLOAD(nlh, 0) < sizeof(struct ifaddrmsg)) { /* Message without payload is the last one. */ break; @@ -1329,9 +1332,11 @@ virNetDevParseDadStatus(struct nlmsghdr *nlh, int len, } ifaddrmsg_len = IFA_PAYLOAD(nlh); + VIR_WARNINGS_NO_CAST_ALIGN rtattr_ptr = (struct rtattr *) IFA_RTA(ifaddrmsg_ptr); for (; RTA_OK(rtattr_ptr, ifaddrmsg_len); rtattr_ptr = RTA_NEXT(rtattr_ptr, ifaddrmsg_len)) { + VIR_WARNINGS_RESET if (RTA_PAYLOAD(rtattr_ptr) != sizeof(struct in6_addr)) { /* No address: ignore. */ continue; -- 2.1.4

3 4

[libvirt] [libvirt-perl][PATCH] Add VIR_FROM_LOGGING constant
by Michal Privoznik 02 Dec '15

02 Dec '15

Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Virt.xs | 1 + lib/Sys/Virt/Error.pm | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/Virt.xs b/Virt.xs index c7cce27..db04fc2 100644 --- a/Virt.xs +++ b/Virt.xs @@ -8239,6 +8239,7 @@ BOOT: REGISTER_CONSTANT(VIR_FROM_POLKIT, FROM_POLKIT); REGISTER_CONSTANT(VIR_FROM_THREAD, FROM_THREAD); REGISTER_CONSTANT(VIR_FROM_ADMIN, FROM_ADMIN); + REGISTER_CONSTANT(VIR_FROM_LOGGING, FROM_LOGGING); REGISTER_CONSTANT(VIR_ERR_OK, ERR_OK); diff --git a/lib/Sys/Virt/Error.pm b/lib/Sys/Virt/Error.pm index d254daa..c5e1609 100644 --- a/lib/Sys/Virt/Error.pm +++ b/lib/Sys/Virt/Error.pm @@ -386,6 +386,10 @@ The thread helper utils The administrative service +=item Sys::Virt::Error::FROM_LOGGING + +The logging service + =back =head2 ERROR CODE CONSTANTS -- 2.4.10

2 1

[libvirt] Sign up for wiki?
by Scott Bronson 02 Dec '15

02 Dec '15

Hi, I'd like to update http://wiki.libvirt.org/page/Networking#Forwarding_Incoming_Connections The python script is now a broken link, and there's a better one at https://github.com/saschpe/libvirt-hook-qemu Username of 'bronson' is easiest for me to remember. Thanks! - Scott

2 1

[libvirt] [PATCH] fix LSB part of virtlogd runlevel script
by Olaf Hering 02 Dec '15

02 Dec '15

Currently pkg build of master branch fails: [ 300s] + /usr/lib/rpm/brp-boot-scripts [ 300s] E: File `virtlogd' is missing `Required-Start', please add even if empty! [ 300s] W: File `virtlogd' is missing `Required-Stop', please add even if empty! [ 300s] E: File `virtlogd' has empty `Default-Start', please specify default runlevel(s)! [ 300s] ERROR: found one or more broken init or boot scripts, please fix them. [ 300s] For more information about LSB headers please read the manual [ 300s] page of of insserv by executing the command `man 8 insserv'. [ 300s] If you don't understand this, mailto=werner(a)suse.de [ 300s] error: Bad exit status from /var/tmp/rpm-tmp.44965 (%install) Add the required tags, fix the existing tags. Use soft dependency "Should-Start" because virtlogd may work without network. Signed-off-by: Olaf Hering <olaf(a)aepfle.de> --- src/logging/virtlogd.init.in | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/logging/virtlogd.init.in b/src/logging/virtlogd.init.in index 1408236..cc03615 100644 --- a/src/logging/virtlogd.init.in +++ b/src/logging/virtlogd.init.in @@ -5,8 +5,12 @@ # ### BEGIN INIT INFO # Provides: virtlogd -# Default-Start: -# Default-Stop: 0 1 2 3 4 5 6 +# Default-Start: 3 5 +# Required-Start: +# Required-Stop: +# Should-Start: $network $remote_fs +# Should-Stop $network $remote_fs: +# Default-Stop: 0 1 2 4 6 # Short-Description: virtual machine log manager # Description: This is a daemon for managing logs # of virtual machine consoles

2 4