- Devel - libvirt List Archives

[libvirt] [PATCH] virsh domxml-from-native to treat SCSI as the bus type for pseries by default
by Shivaprasad G Bhat 24 Oct '13

24 Oct '13

From: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com> The bus type IDE being enum Zero, the bus type on pseries system appears as IDE for all the disk types. Pseries platform needs this to appear as SCSI instead of IDE. Signed-off-by: Shivaprasad G Bhat <sbhat(a)linux.vnet.ibm.com> --- src/qemu/qemu_command.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index abb62e9..728409f 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -9995,6 +9995,7 @@ error: static virDomainDiskDefPtr qemuParseCommandLineDisk(virDomainXMLOptionPtr xmlopt, const char *val, + virDomainDefPtr dom, int nvirtiodisk, bool old_style_ceph_args) { @@ -10018,7 +10019,11 @@ qemuParseCommandLineDisk(virDomainXMLOptionPtr xmlopt, if (VIR_ALLOC(def) < 0) goto cleanup; - def->bus = VIR_DOMAIN_DISK_BUS_IDE; + if (((dom->os.arch == VIR_ARCH_PPC64) && + dom->os.machine && STREQ(dom->os.machine, "pseries"))) + def->bus = VIR_DOMAIN_DISK_BUS_SCSI; + else + def->bus = VIR_DOMAIN_DISK_BUS_IDE; def->device = VIR_DOMAIN_DISK_DEVICE_DISK; def->type = VIR_DOMAIN_DISK_TYPE_FILE; @@ -11332,8 +11337,13 @@ qemuParseCommandLine(virCapsPtr qemuCaps, disk->type = VIR_DOMAIN_DISK_TYPE_FILE; if (STREQ(arg, "-cdrom")) { disk->device = VIR_DOMAIN_DISK_DEVICE_CDROM; - if (VIR_STRDUP(disk->dst, "hdc") < 0) - goto error; + if (((def->os.arch == VIR_ARCH_PPC64) && + def->os.machine && STREQ(def->os.machine, "pseries"))) { + disk->bus = VIR_DOMAIN_DISK_BUS_SCSI; + if (VIR_STRDUP(disk->dst, "sdc") < 0) + goto error; + } else if (VIR_STRDUP(disk->dst, "hdc") < 0) + goto error; disk->readonly = true; } else { if (STRPREFIX(arg, "-fd")) { @@ -11345,6 +11355,9 @@ qemuParseCommandLine(virCapsPtr qemuCaps, disk->bus = VIR_DOMAIN_DISK_BUS_IDE; else disk->bus = VIR_DOMAIN_DISK_BUS_SCSI; + if (((def->os.arch == VIR_ARCH_PPC64) && + def->os.machine && STREQ(def->os.machine, "pseries"))) + disk->bus = VIR_DOMAIN_DISK_BUS_SCSI; } if (VIR_STRDUP(disk->dst, arg + 1) < 0) goto error; @@ -11636,7 +11649,7 @@ qemuParseCommandLine(virCapsPtr qemuCaps, } } else if (STREQ(arg, "-drive")) { WANT_VALUE(); - if (!(disk = qemuParseCommandLineDisk(xmlopt, val, + if (!(disk = qemuParseCommandLineDisk(xmlopt, val, def, nvirtiodisk, ceph_args != NULL))) goto error;

3 2

[libvirt] [PATCH] Ignore GNU Global tag files
by Martin Kletzander 23 Oct '13

23 Oct '13

... the same way we ignore other TAGS Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index db5abcd..e372876 100644 --- a/.gitignore +++ b/.gitignore @@ -233,6 +233,9 @@ /tools/virt-*-validate /tools/virt-sanlock-cleanup /update.log +GPATH +GRTAGS +GTAGS Makefile Makefile.in TAGS -- 1.8.4

2 2

[libvirt] build: fix linking virt-login-shell
by Jim Fehlig 23 Oct '13

23 Oct '13

After commit 3e2f27e1, I've noticed build failures of virt-login-shell when libapparmor-devel is installed on the build host CCLD virt-login-shell ../src/.libs/libvirt-setuid-rpc-client.a(libvirt_setuid_rpc_client_la-vircommand.o): In function `virExec': /home/jfehlig/virt/upstream/libvirt/src/util/vircommand.c:653: undefined reference to `aa_change_profile' collect2: error: ld returned 1 exit status I was about to commit an easy fix under the build-breaker rule (build-fix-1.patch), but thought to extend the notion of SECDRIVER_LIBS to SECDRIVER_CFLAGS, and use both throughout src/Makefile.am where it makes sense (build-fix-2.patch). Should I just stick with the simple fix, or is something along the lines of patch 2 preferred? Regards, Jim

5 7

[libvirt] [PATCH] build: Fix prohibit_int_ijk (and iijjkk) on RHEL 5
by Martin Kletzander 23 Oct '13

23 Oct '13

On RHEL 5, make syntax-check was failing because even strings like 'int isTempChain' matched the 'int i' rule. To be honest, I haven't found the root cause, but the change added makes it work as expected and keeps the proper behavior on newer systems as well. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Notes: I'm not pushing this one as a build breaker since I haven't found the root cause, so feel free to object and fix it differently. cfg.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cfg.mk b/cfg.mk index 56821e2..e9da282 100644 --- a/cfg.mk +++ b/cfg.mk @@ -555,12 +555,12 @@ sc_avoid_attribute_unused_in_header: $(_sc_search_regexp) sc_prohibit_int_ijk: - @prohibit='\<(int|unsigned) ([^(]* )*(i|j|k)(\s|,|;)' \ + @prohibit='\<(int|unsigned) ([^(]* )*(i|j|k)\>(\s|,|;)' \ halt='use size_t, not int/unsigned int for loop vars i, j, k' \ $(_sc_search_regexp) sc_prohibit_loop_iijjkk: - @prohibit='\<(int|unsigned) ([^=]+ )*(ii|jj|kk)(\s|,|;)' \ + @prohibit='\<(int|unsigned) ([^=]+ )*(ii|jj|kk)\>(\s|,|;)' \ halt='use i, j, k for loop iterators, not ii, jj, kk' \ $(_sc_search_regexp) -- 1.8.4

3 7

[libvirt] [PATCH 0/5]virsh: solutions for hiding '--shareable' option
by Chen Hanxiao 23 Oct '13

23 Oct '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> As Daniel mentioned, '--shareable' should be hidden from users. But we had to take care of backwards compatibility. These patches give solutions to solve these issues. Chen Hanxiao (5): [libvirt]virsh: disable config readonly and shareable in virsh command [libvirt]virsh: introduce flags VSH_OFLAG_IGNORE [libvirt]virsh: if VSH_OFLAG_IGNORE set, don't show it in '--help' [libvirt]virsh: If VSH_OFLAG_IGNORE set, don't auto complete in virsh [libvirt]virsh: mark '--shareable' as VSH_OFLAG_IGNORE tools/virsh-domain.c | 3 ++- tools/virsh.c | 9 +++++++++ tools/virsh.h | 1 + tools/virsh.pod | 3 +-- 4 files changed, 13 insertions(+), 3 deletions(-) -- 1.8.2.1

3 19

Re: [libvirt] [RESEND][PATCHv5 1/4] add hostdev passthrough common library
by Daniel P. Berrange 23 Oct '13

23 Oct '13

On Wed, Oct 23, 2013 at 04:15:57PM +0800, Chunyan Liu wrote: > 2013/10/15 Daniel P. Berrange <berrange(a)redhat.com> > > > On Fri, Sep 13, 2013 at 11:34:34AM +0800, Chunyan Liu wrote: > > > Add hostdev passthrough common library so that it could be shared by all > > drivers > > > and maintain a global hostdev state. > > > > > > Signed-off-by: Chunyan Liu <cyliu(a)suse.com> > > > --- > > > docs/schemas/domaincommon.rng | 1 + > > > src/conf/domain_conf.c | 3 +- > > > src/conf/domain_conf.h | 1 + > > > > I'd prefer to see these changes to the XML parser be done in a separate > > patch - either before or after this patch. > > > > > diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c > > > index 0abf80b..4d6d07b 100644 > > > --- a/src/libxl/libxl_domain.c > > > +++ b/src/libxl/libxl_domain.c > > > @@ -393,6 +393,15 @@ libxlDomainDeviceDefPostParse(virDomainDeviceDefPtr > > dev, > > > STRNEQ(def->os.type, "hvm")) > > > dev->data.chr->targetType = > > VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_XEN; > > > > > > + if (dev->type == VIR_DOMAIN_DEVICE_HOSTDEV) { > > > + virDomainHostdevDefPtr hostdev = dev->data.hostdev; > > > + > > > + if (hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS && > > > + hostdev->source.subsys.type == > > VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI && > > > + hostdev->source.subsys.u.pci.backend == > > VIR_DOMAIN_HOSTDEV_PCI_BACKEND_DEFAULT) > > > + hostdev->source.subsys.u.pci.backend = > > VIR_DOMAIN_HOSTDEV_PCI_BACKEND_XEN; > > > + } > > > + > > > return 0; > > > } > > > > > > > This should be separate too. > > > > > diff --git a/src/util/virhostdev.c b/src/util/virhostdev.c > > > new file mode 100644 > > > index 0000000..d131160 > > > --- /dev/null > > > +++ b/src/util/virhostdev.c > > > @@ -0,0 +1,1335 @@ > > > +/* virhostdev.c: hostdev management > > > + * > > > + * Copyright (C) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. > > > + * Copyright (C) 2006-2007, 2009-2013 Red Hat, Inc. > > > + * Copyright (C) 2006 Daniel P. Berrange > > > + * > > > + * This library is free software; you can redistribute it and/or > > > + * modify it under the terms of the GNU Lesser General Public > > > + * License as published by the Free Software Foundation; either > > > + * version 2.1 of the License, or (at your option) any later version. > > > + * > > > + * This library is distributed in the hope that it will be useful, > > > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > > > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > > > + * Lesser General Public License for more details. > > > + * > > > + * You should have received a copy of the GNU Lesser General Public > > > + * License along with this library. If not, see > > > + * <http://www.gnu.org/licenses/>. > > > + * > > > + * Author: Chunyan Liu <cyliu(a)suse.com> > > > + * Author: Daniel P. Berrange <berrange(a)redhat.com> > > > + */ > > > + > > > +#include <config.h> > > > + > > > +#include "virhostdev.h" > > > + > > > +#include <sys/types.h> > > > +#include <sys/stat.h> > > > +#include <unistd.h> > > > +#include <stdlib.h> > > > +#include <stdio.h> > > > + > > > +#include "viralloc.h" > > > +#include "virstring.h" > > > +#include "virfile.h" > > > +#include "virerror.h" > > > +#include "virlog.h" > > > +#include "virpci.h" > > > +#include "virusb.h" > > > +#include "virscsi.h" > > > +#include "virnetdev.h" > > > +#include "virutil.h" > > > +#include "configmake.h" > > > + > > > +#define VIR_FROM_THIS VIR_FROM_NONE > > > + > > > +#define HOSTDEV_STATE_DIR LOCALSTATEDIR "/run/libvirt/hostdevmgr" > > > + > > > +struct _virHostdevManager{ > > > + char *stateDir; > > > + > > > + virPCIDeviceListPtr activePciHostdevs; > > > + virPCIDeviceListPtr inactivePciHostdevs; > > > + virUSBDeviceListPtr activeUsbHostdevs; > > > + virSCSIDeviceListPtr activeScsiHostdevs; > > > +}; > > > + > > > +static virHostdevManagerPtr hostdevMgr; > > > + > > > +static void > > > +virHostdevManagerCleanup(void) > > > +{ > > > + if (!hostdevMgr) > > > + return; > > > + > > > + virObjectUnref(hostdevMgr->activePciHostdevs); > > > + virObjectUnref(hostdevMgr->inactivePciHostdevs); > > > + virObjectUnref(hostdevMgr->activeUsbHostdevs); > > > + VIR_FREE(hostdevMgr->stateDir); > > > + > > > + VIR_FREE(hostdevMgr); > > > +} > > > + > > > +static int > > > +virHostdevOnceInit(void) > > > +{ > > > + if (VIR_ALLOC(hostdevMgr) < 0) > > > + goto error; > > > + > > > + if ((hostdevMgr->activePciHostdevs = virPCIDeviceListNew()) == NULL) > > > + goto error; > > > + > > > + if ((hostdevMgr->activeUsbHostdevs = virUSBDeviceListNew()) == NULL) > > > + goto error; > > > + > > > + if ((hostdevMgr->inactivePciHostdevs = virPCIDeviceListNew()) == > > NULL) > > > + goto error; > > > + > > > + if ((hostdevMgr->activeScsiHostdevs = virSCSIDeviceListNew()) == > > NULL) > > > + goto error; > > > + > > > + if (VIR_STRDUP(hostdevMgr->stateDir, HOSTDEV_STATE_DIR) < 0) > > > + goto error; > > > > Hmm, this is going to lead to some upgrade problems when libvirt is > > restarted with existing VMs present. I think we'll need some code > > in this initialization which looks for the old QEMU-specific path > > and if found, tries to move the data into the new location. > > > > > I'll do that. But IMO, finding and moving data in the initialization > function is a little bit painful. > The hostdevMgr->stateDir is only used to save/store net config of a SR-IOV > device, the file name could be pflinkdev_ > vfindex or pflinkdev (e.g, eth0, eth0_vf0, p1p2, p1p2_vf0, etc.), hard to > match through some fix rule. > Now that it's a upgrade requirement, and I think it only affects when an > existing VM has a hostdev that stores net config in the old stateDir, we > can also handle it the restore net config part. (To check whether filename > is in hostdevMgr->stateDir, if not and hypervisor is qemu, try to find in > old stateDir /var/run/libvirt/qemu/.) > How do you think? If that's OK. I'll posting revised version. Yeah, should be ok. Just want to minimise the amount of code to deal with back compat, whichever approach you choose. Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

1 0

Re: [libvirt] Support QEMU Live Upgrade in Libvirt
by Eric Blake 23 Oct '13

23 Oct '13

On 10/23/2013 03:58 AM, Zhou Zheng Sheng wrote: > Thanks! I am now starting to investigate if we can re-use parts of > migration code after some refactoring, and how much code should be > written from scratch. I am not very clear about how the new flow looks > like. I think the migration protocol v3 is quite reasonable for dealing > with various cases and errors in the migration. After all, QEMU live > upgrade is implemented as migration under the hood, so I think common > migration management logic would be applied to it too. For example, if > QEMU live upgrade migration fails, target domain should be destroyed and > source domain should be resumed. Maybe I can re-use some of the parts in > the migration protocol v3 flow. Is it even possible to resume the original process if you have already page-flipped the memory to the destination process? I'm worried that there may be some catastrophic paths that are non-recoverable, but hope that's not the case. > > By the way. It seems my mail sent to libvir-list(a)redhat.com is not > appearing in the list. I'm already a member in the list. I see in the > subscribing web page saying first time posts need moderator approval. I > thought I've posted before. Maybe it's too long since my last activity. > I also tried to join the list again and the system sent me a mail saying > I was already a member. I sent a mail to libvir-list-owner(a)redhat.com > asking for help but no response yet. Am I blocked? Or is it just because > I didn't add a [libvirt] tag in the title? I thought the tag is added > automatically when I was posting in other lists. Would you have a look > at my subscription status? Thank you! > No idea what's going on there - I checked and didn't see anything stuck in the mod queue or any indication of blacklisting on your email address. Sometimes things just get stuck in queues somewhere, and eventually show up later. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

1 0

[libvirt] [PATCH] network: Add a missing check in bridge_driver.c
by Hongwei Bi 22 Oct '13

22 Oct '13

Signed-off-by: Hongwei Bi <hwbi2008(a)gmail.com> --- src/network/bridge_driver.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 8787bdb..73375f0 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -1107,7 +1107,8 @@ networkStartDhcpDaemon(virNetworkDriverStatePtr driver, if (dctx == NULL) goto cleanup; - dnsmasqCapsRefresh(&driver->dnsmasqCaps, false); + if (dnsmasqCapsRefresh(&driver->dnsmasqCaps, false) < 0) + goto cleanup; ret = networkBuildDhcpDaemonCommandLine(network, &cmd, pidfile, dctx, driver->dnsmasqCaps); -- 1.8.1.2

2 2

[libvirt] libvirt python is not correctly passing file descriptors to underlying virDomainCreateWithFiles
by Marian Neagul 22 Oct '13

22 Oct '13

Dear All, While working on a component handling container management I stumbled on a bug in the libvirt python bindings: basically the python bindings fail in properly translating the python file descriptor list to a native C array. The primary symptom was that inside the container the file descriptors are created but mapped to '/dev/null' instead of the original file descriptors This problem was discovered in libvirt 1.1.2 but the problem exists also in the current git head. I'm attaching a simple patch fixing the bug, and re-establishing the expected behaviour. I've also opened a bugzilla issue at https://bugzilla.redhat.com/show_bug.cgi?id=1021434 I hope this fix is acceptable and that it can be incorporated in the code base. :) Marian ~~~~~~~~~~~~~~~ Marian Neagul Universitatea de Vest din Timisoara Facultatea de Matematică și Informatică Centrul de Cercetare in Informatica marian(a)info.uvt.ro marian(a)hpc.uvt.ro

3 3

[libvirt] [libvirt-glib PATCH] Add filterref and filterref parameter support.
by Ian Main 22 Oct '13

22 Oct '13

This patch adds support for setting filterref's on interfaces. Also supported are parameters to the filterref's. Signed-off-by: Ian Main <imain(a)redhat.com> --- examples/config-demo.py | 9 +- libvirt-gconfig/Makefile.am | 4 + ...-gconfig-domain-interface-filterref-parameter.c | 101 ++++++++++++++ ...-gconfig-domain-interface-filterref-parameter.h | 75 ++++++++++ .../libvirt-gconfig-domain-interface-filterref.c | 155 +++++++++++++++++++++ .../libvirt-gconfig-domain-interface-filterref.h | 76 ++++++++++ libvirt-gconfig/libvirt-gconfig-domain-interface.c | 41 ++++++ libvirt-gconfig/libvirt-gconfig-domain-interface.h | 5 + libvirt-gconfig/libvirt-gconfig.h | 2 + libvirt-gconfig/libvirt-gconfig.sym | 18 +++ 10 files changed, 485 insertions(+), 1 deletion(-) create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-interface-filterref-parameter.c create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-interface-filterref-parameter.h create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-interface-filterref.c create mode 100644 libvirt-gconfig/libvirt-gconfig-domain-interface-filterref.h diff --git a/examples/config-demo.py b/examples/config-demo.py index 09b9e89..0566d66 100644 --- a/examples/config-demo.py +++ b/examples/config-demo.py @@ -28,13 +28,20 @@ disk.set_type(LibvirtGConfig.DomainDiskType.FILE) disk.set_guest_device_type(LibvirtGConfig.DomainDiskGuestDeviceType.DISK) disk.set_source("/tmp/foo/bar") disk.set_driver_name("qemu") -disk.set_driver_format(LibvirtGConfig.DriverType.QCOW2) +disk.set_driver_format(LibvirtGConfig.DomainDiskFormat.QCOW2) disk.set_target_bus(LibvirtGConfig.DomainDiskBus.IDE) disk.set_target_dev("hda") domain.add_device(disk) interface = LibvirtGConfig.DomainInterfaceNetwork.new() interface.set_source("default") +filterref = LibvirtGConfig.DomainInterfaceFilterref.new() +filterref.set_filter("clean-traffic") +parameter = LibvirtGConfig.DomainInterfaceFilterrefParameter.new() +parameter.set_name("IP") +parameter.set_value("205.23.12.40") +filterref.add_parameter(parameter) +interface.set_filterref(filterref) domain.add_device(interface) interface = LibvirtGConfig.DomainInterfaceUser.new() diff --git a/libvirt-gconfig/Makefile.am b/libvirt-gconfig/Makefile.am index 35dc978..48f0547 100644 --- a/libvirt-gconfig/Makefile.am +++ b/libvirt-gconfig/Makefile.am @@ -49,6 +49,8 @@ GCONFIG_HEADER_FILES = \ libvirt-gconfig-domain-interface-bridge.h \ libvirt-gconfig-domain-interface-network.h \ libvirt-gconfig-domain-interface-user.h \ + libvirt-gconfig-domain-interface-filterref.h \ + libvirt-gconfig-domain-interface-filterref-parameter.h \ libvirt-gconfig-domain-memballoon.h \ libvirt-gconfig-domain-os.h \ libvirt-gconfig-domain-parallel.h \ @@ -131,6 +133,8 @@ GCONFIG_SOURCE_FILES = \ libvirt-gconfig-domain-interface-bridge.c \ libvirt-gconfig-domain-interface-network.c \ libvirt-gconfig-domain-interface-user.c \ + libvirt-gconfig-domain-interface-filterref.c \ + libvirt-gconfig-domain-interface-filterref-parameter.c \ libvirt-gconfig-domain-memballoon.c \ libvirt-gconfig-domain-os.c \ libvirt-gconfig-domain-parallel.c \ diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref-parameter.c b/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref-parameter.c new file mode 100644 index 0000000..e697e86 --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref-parameter.c @@ -0,0 +1,101 @@ +/* + * libvirt-gconfig-domain-interface-filterref-parameter.c: + * libvirt filterref parameters + * + * Copyright (C) 2013 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Authors: Ian Main <imain(a)redhat.com> + * Daniel P. Berrange <berrange(a)redhat.com> + */ + +#include <config.h> + +#include "libvirt-gconfig/libvirt-gconfig.h" +#include "libvirt-gconfig/libvirt-gconfig-private.h" + +#define GVIR_CONFIG_DOMAIN_INTERFACE_FILTERREF_PARAMETER_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF_PARAMETER, GVirConfigDomainInterfaceFilterrefParameterPrivate)) + +struct _GVirConfigDomainInterfaceFilterrefParameterPrivate +{ + gboolean unused; +}; + +G_DEFINE_TYPE(GVirConfigDomainInterfaceFilterrefParameter, gvir_config_domain_interface_filterref_parameter, GVIR_CONFIG_TYPE_OBJECT); + +static void gvir_config_domain_interface_filterref_parameter_class_init(GVirConfigDomainInterfaceFilterrefParameterClass *klass) +{ + g_type_class_add_private(klass, sizeof(GVirConfigDomainInterfaceFilterrefParameterPrivate)); +} + +static void gvir_config_domain_interface_filterref_parameter_init(GVirConfigDomainInterfaceFilterrefParameter *parameter) +{ + g_debug("Init GVirConfigDomainInterfaceFilterrefParameter=%p", parameter); + + parameter->priv = GVIR_CONFIG_DOMAIN_INTERFACE_FILTERREF_PARAMETER_GET_PRIVATE(parameter); +} + +GVirConfigDomainInterfaceFilterrefParameter *gvir_config_domain_interface_filterref_parameter_new(void) +{ + GVirConfigObject *object; + + object = gvir_config_object_new(GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF_PARAMETER, + "parameter", NULL); + return GVIR_CONFIG_DOMAIN_INTERFACE_FILTERREF_PARAMETER(object); +} + +GVirConfigDomainInterfaceFilterrefParameter * +gvir_config_domain_interface_filterref_parameter_new_from_xml(const gchar *xml, GError **error) +{ + GVirConfigObject *object; + + object = gvir_config_object_new_from_xml(GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF_PARAMETER, + "parameter", + NULL, + xml, + error); + + return GVIR_CONFIG_DOMAIN_INTERFACE_FILTERREF_PARAMETER(object); +} + +void gvir_config_domain_interface_filterref_parameter_set_name(GVirConfigDomainInterfaceFilterrefParameter *parameter, const gchar *name) +{ + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_INTERFACE_FILTERREF_PARAMETER(parameter)); + gvir_config_object_set_attribute(GVIR_CONFIG_OBJECT(parameter), + "name", name, NULL); +} + +void gvir_config_domain_interface_filterref_parameter_set_value(GVirConfigDomainInterfaceFilterrefParameter *parameter, const gchar *value) +{ + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_INTERFACE_FILTERREF_PARAMETER(parameter)); + gvir_config_object_set_attribute(GVIR_CONFIG_OBJECT(parameter), + "value", value, NULL); +} + +const gchar *gvir_config_domain_interface_filterref_parameter_get_name(GVirConfigDomainInterfaceFilterrefParameter *parameter) +{ + return gvir_config_object_get_attribute(GVIR_CONFIG_OBJECT(parameter), + NULL, + "name"); +} +const gchar *gvir_config_domain_interface_filterref_parameter_get_value(GVirConfigDomainInterfaceFilterrefParameter *parameter) +{ + return gvir_config_object_get_attribute(GVIR_CONFIG_OBJECT(parameter), + NULL, + "value"); +} + diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref-parameter.h b/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref-parameter.h new file mode 100644 index 0000000..a768c84 --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref-parameter.h @@ -0,0 +1,75 @@ +/* + * libvirt-gconfig-domain-interface-filterref-parameter.h: + * libvirt filterref parameters + * + * Copyright (C) 2013 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Authors: Ian Main <imain(a)redhat.com> + * Daniel P. Berrange <berrange(a)redhat.com> + */ + +#if !defined(__LIBVIRT_GCONFIG_H__) && !defined(LIBVIRT_GCONFIG_BUILD) +#error "Only <libvirt-gconfig/libvirt-gconfig.h> can be included directly." +#endif + +#ifndef __LIBVIRT_GCONFIG_DOMAIN_INTERFACE_FILTERREF_PARAMETER_H__ +#define __LIBVIRT_GCONFIG_DOMAIN_INTERFACE_FILTERREF_PARAMETER_H__ + +G_BEGIN_DECLS + +#define GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF_PARAMETER (gvir_config_domain_interface_filterref_parameter_get_type ()) +#define GVIR_CONFIG_DOMAIN_INTERFACE_FILTERREF_PARAMETER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF_PARAMETER, GVirConfigDomainInterfaceFilterrefParameter)) +#define GVIR_CONFIG_DOMAIN_INTERFACE_FILTERREF_PARAMETER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF_PARAMETER, GVirConfigDomainInterfaceFilterrefParameterClass)) +#define GVIR_CONFIG_IS_DOMAIN_INTERFACE_FILTERREF_PARAMETER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF_PARAMETER)) +#define GVIR_CONFIG_IS_DOMAIN_INTERFACE_FILTERREF_PARAMETER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF_PARAMETER)) +#define GVIR_CONFIG_DOMAIN_INTERFACE_FILTERREF_PARAMETER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF_PARAMETER, GVirConfigDomainInterfaceFilterrefParameterClass)) + +typedef struct _GVirConfigDomainInterfaceFilterrefParameter GVirConfigDomainInterfaceFilterrefParameter; +typedef struct _GVirConfigDomainInterfaceFilterrefParameterPrivate GVirConfigDomainInterfaceFilterrefParameterPrivate; +typedef struct _GVirConfigDomainInterfaceFilterrefParameterClass GVirConfigDomainInterfaceFilterrefParameterClass; + +struct _GVirConfigDomainInterfaceFilterrefParameter +{ + GVirConfigObject parent; + + GVirConfigDomainInterfaceFilterrefParameterPrivate *priv; + + /* Do not add fields to this struct */ +}; + +struct _GVirConfigDomainInterfaceFilterrefParameterClass +{ + GVirConfigObjectClass parent_class; + + gpointer padding[20]; +}; + +GType gvir_config_domain_interface_filterref_parameter_get_type(void); + +GVirConfigDomainInterfaceFilterrefParameter *gvir_config_domain_interface_filterref_parameter_new(void); + +GVirConfigDomainInterfaceFilterrefParameter * +gvir_config_domain_interface_filterref_parameter_new_from_xml(const gchar *xml, GError **error); + +void gvir_config_domain_interface_filterref_parameter_set_name(GVirConfigDomainInterfaceFilterrefParameter *parameter, const gchar *name); +void gvir_config_domain_interface_filterref_parameter_set_value(GVirConfigDomainInterfaceFilterrefParameter *parameter, const gchar *value); +const gchar *gvir_config_domain_interface_filterref_parameter_get_name(GVirConfigDomainInterfaceFilterrefParameter *parameter); +const gchar *gvir_config_domain_interface_filterref_parameter_get_value(GVirConfigDomainInterfaceFilterrefParameter *parameter); + +G_END_DECLS + +#endif /* __LIBVIRT_GCONFIG_DOMAIN_INTERFACE_FILTERREF_PARAMETER_H__ */ diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref.c b/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref.c new file mode 100644 index 0000000..cc8b246 --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref.c @@ -0,0 +1,155 @@ +/* + * libvirt-gconfig-domain-interface-network-filterref.c: + * libvirt filter reference config. + * + * Copyright (C) 2013 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Author: Ian Main <imain(a)redhat.com> + */ + +#include <config.h> + +#include "libvirt-gconfig/libvirt-gconfig.h" +#include "libvirt-gconfig/libvirt-gconfig-private.h" + +#define GVIR_CONFIG_DOMAIN_INTERFACE_FILTERREF_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF, GVirConfigDomainInterfaceFilterrefPrivate)) + +struct _GVirConfigDomainInterfaceFilterrefPrivate +{ + gboolean unused; +}; + +G_DEFINE_TYPE(GVirConfigDomainInterfaceFilterref, gvir_config_domain_interface_filterref, GVIR_CONFIG_TYPE_OBJECT); + +static void gvir_config_domain_interface_filterref_class_init(GVirConfigDomainInterfaceFilterrefClass *klass) +{ + g_type_class_add_private(klass, sizeof(GVirConfigDomainInterfaceFilterrefPrivate)); +} + +static void gvir_config_domain_interface_filterref_init(GVirConfigDomainInterfaceFilterref *filterref) +{ + g_debug("Init GVirConfigDomainInterfaceFilterref=%p", filterref); + + filterref->priv = GVIR_CONFIG_DOMAIN_INTERFACE_FILTERREF_GET_PRIVATE(filterref); +} + + +GVirConfigDomainInterfaceFilterref *gvir_config_domain_interface_filterref_new(void) +{ + GVirConfigObject *object; + + object = gvir_config_object_new(GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF, + "filterref", NULL); + return GVIR_CONFIG_DOMAIN_INTERFACE_FILTERREF(object); +} + +GVirConfigDomainInterfaceFilterref *gvir_config_domain_interface_filterref_new_from_xml(const gchar *xml, + GError **error) +{ + GVirConfigObject *object; + + object = gvir_config_object_new_from_xml(GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF, + "filterref", NULL, xml, error); + if (g_strcmp0(gvir_config_object_get_attribute(object, NULL, "type"), "filterref") != 0) { + g_object_unref(G_OBJECT(object)); + return NULL; + } + return GVIR_CONFIG_DOMAIN_INTERFACE_FILTERREF(object); +} + +void gvir_config_domain_interface_filterref_set_filter(GVirConfigDomainInterfaceFilterref *filterref, + const char *filter) +{ + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_INTERFACE_FILTERREF(filterref)); + + gvir_config_object_set_attribute(GVIR_CONFIG_OBJECT(filterref), + "filter", filter, NULL); +} + +const char *gvir_config_domain_interface_filterref_get_filter(GVirConfigDomainInterfaceFilterref *filterref) +{ + return gvir_config_object_get_attribute(GVIR_CONFIG_OBJECT(filterref), + NULL, + "filter"); +} + +void gvir_config_domain_interface_filterref_add_parameter(GVirConfigDomainInterfaceFilterref *filterref, + GVirConfigDomainInterfaceFilterrefParameter *parameter) +{ + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_INTERFACE_FILTERREF(filterref)); + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_INTERFACE_FILTERREF_PARAMETER(parameter)); + + gvir_config_object_attach_add(GVIR_CONFIG_OBJECT(filterref), + GVIR_CONFIG_OBJECT(parameter)); +} + +struct GetParameterData { + GVirConfigXmlDoc *doc; + GList *parameters; +}; + + +static gboolean add_filterref_parameter(xmlNodePtr node, gpointer opaque) +{ + struct GetParameterData* data = (struct GetParameterData*)opaque; + GVirConfigObject *parameter; + + if (g_strcmp0((const gchar *)node->name, "parameter") != 0) + return TRUE; + + parameter = gvir_config_object_new_from_tree(GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF_PARAMETER, + if (parameter != NULL) + data->parameters = g_list_append(data->parameters, parameter); + else + g_debug("Failed to parse %s node", node->name); + + return TRUE; +} + +/** + * gvir_config_domain_interface_filterref_get_parameters: + * @filterref: a #GVirConfigDomainInterfaceFilterref + * + * Gets the list of parameters attached to @filterref. The returned list should be + * freed with g_list_free(), after its elements have been unreffed with + * g_object_unref(). + * + * Returns: (element-type LibvirtGConfig.DomainInterfaceFilterrefParameter) (transfer full): + * a newly allocated #GList of #GVirConfigDomainInterfaceFilterrefParameter. + */ +GList *gvir_config_domain_interface_filterref_get_parameters(GVirConfigDomainInterfaceFilterref *filterref) +{ + struct GetParameterData data; + + g_return_val_if_fail(GVIR_CONFIG_IS_DOMAIN_INTERFACE_FILTERREF(filterref), NULL); + + g_object_get(G_OBJECT(filterref), "doc", &data.doc, NULL); + data.parameters = NULL; + + gvir_config_object_foreach_child(GVIR_CONFIG_OBJECT(filterref), + NULL, + add_filterref_parameter, + &data); + + if (data.doc != NULL) { + g_object_unref(G_OBJECT(data.doc)); + } + + return data.parameters; +} + diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref.h b/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref.h new file mode 100644 index 0000000..ee785c2 --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref.h @@ -0,0 +1,76 @@ +/* + * libvirt-gconfig-domain-interface-network-filterref.h: libvirt filter reference config + * + * Copyright (C) 2013 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see + * <http://www.gnu.org/licenses/>. + * + * Author: Ian Main <imain(a)redhat.com> + */ + +#if !defined(__LIBVIRT_GCONFIG_H__) && !defined(LIBVIRT_GCONFIG_BUILD) +#error "Only <libvirt-gconfig/libvirt-gconfig.h> can be included directly." +#endif + +#ifndef __LIBVIRT_GCONFIG_DOMAIN_INTERFACE_FILTERREF_H__ +#define __LIBVIRT_GCONFIG_DOMAIN_INTERFACE_FILTERREF_H__ + +G_BEGIN_DECLS + +#define GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF (gvir_config_domain_interface_filterref_get_type ()) +#define GVIR_CONFIG_DOMAIN_INTERFACE_FILTERREF(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF, GVirConfigDomainInterfaceFilterref)) +#define GVIR_CONFIG_DOMAIN_INTERFACE_FILTERREF_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF, GVirConfigDomainInterfaceFilterrefClass)) +#define GVIR_CONFIG_IS_DOMAIN_INTERFACE_FILTERREF(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF)) +#define GVIR_CONFIG_IS_DOMAIN_INTERFACE_FILTERREF_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF)) +#define GVIR_CONFIG_DOMAIN_INTERFACE_FILTERREF_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF, GVirConfigDomainInterfaceFilterrefClass)) + +typedef struct _GVirConfigDomainInterfaceFilterref GVirConfigDomainInterfaceFilterref; +typedef struct _GVirConfigDomainInterfaceFilterrefPrivate GVirConfigDomainInterfaceFilterrefPrivate; +typedef struct _GVirConfigDomainInterfaceFilterrefClass GVirConfigDomainInterfaceFilterrefClass; + +struct _GVirConfigDomainInterfaceFilterref +{ + GVirConfigObject parent; + + GVirConfigDomainInterfaceFilterrefPrivate *priv; + + /* Do not add fields to this struct */ +}; + +struct _GVirConfigDomainInterfaceFilterrefClass +{ + GVirConfigObjectClass parent_class; + + gpointer padding[20]; +}; + +GType gvir_config_domain_interface_filterref_get_type(void); + +GVirConfigDomainInterfaceFilterref *gvir_config_domain_interface_filterref_new(void); + +GVirConfigDomainInterfaceFilterref * +gvir_config_domain_interface_filterref_new_from_xml(const gchar *xml, GError **error); + +void gvir_config_domain_interface_filterref_set_filter(GVirConfigDomainInterfaceFilterref *filterref, + const char *filter); +const char *gvir_config_domain_interface_filterref_get_filter(GVirConfigDomainInterfaceFilterref *filterref); + +void gvir_config_domain_interface_filterref_add_parameter(GVirConfigDomainInterfaceFilterref *filterref, + GVirConfigDomainInterfaceFilterrefParameter *parameter); +GList *gvir_config_domain_interface_filterref_get_parameters(GVirConfigDomainInterfaceFilterref *filterref); + +G_END_DECLS + +#endif /* __LIBVIRT_GCONFIG_DOMAIN_INTERFACE_FILTERREF_H__ */ diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface.c b/libvirt-gconfig/libvirt-gconfig-domain-interface.c index 86a0c34..ce1b3f0 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-interface.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface.c @@ -131,6 +131,47 @@ const char *gvir_config_domain_interface_get_model(GVirConfigDomainInterface *in "model", "type"); } +/** + * gvir_config_domain_interface_set_filterref: + * @interface: a #GVirConfigDomainInterface + * @filterref: (allow-none): the filterref to set + */ +void gvir_config_domain_interface_set_filterref(GVirConfigDomainInterface *interface, + GVirConfigDomainInterfaceFilterref *filterref) +{ + g_return_if_fail(GVIR_CONFIG_IS_DOMAIN_INTERFACE(interface)); + g_return_if_fail(filterref == NULL || GVIR_CONFIG_IS_DOMAIN_INTERFACE_FILTERREF(filterref)); + + gvir_config_object_attach_replace(GVIR_CONFIG_OBJECT(interface), + "filterref", + GVIR_CONFIG_OBJECT(filterref)); +} + +/** + * gvir_config_domain_interface_get_filterref: + * @interface: a #GVirConfigDomainInterface + * + * Gets the filterref associated with the @interface + * + * Returns: (transfer full): A #GVirConfigDomainInterfaceFilterref. The returned + * object should be unreffed with g_object_unref() when no longer needed. + */ + +GVirConfigDomainInterfaceFilterref *gvir_config_domain_interface_get_filterref(GVirConfigDomainInterface *interface) +{ + GVirConfigObject *object; + + g_return_val_if_fail(GVIR_CONFIG_IS_DOMAIN_INTERFACE(interface), NULL); + + object = gvir_config_object_get_child_with_type + (GVIR_CONFIG_OBJECT(interface), + "filterref", + GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_FILTERREF); + + return GVIR_CONFIG_DOMAIN_INTERFACE_FILTERREF(object); +} + + G_GNUC_INTERNAL GVirConfigDomainDevice * gvir_config_domain_interface_new_from_tree(GVirConfigXmlDoc *doc, xmlNodePtr tree) diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface.h b/libvirt-gconfig/libvirt-gconfig-domain-interface.h index 65c5d0b..2b0c22f 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-interface.h +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface.h @@ -27,6 +27,8 @@ #ifndef __LIBVIRT_GCONFIG_DOMAIN_INTERFACE_H__ #define __LIBVIRT_GCONFIG_DOMAIN_INTERFACE_H__ +#include <libvirt-gconfig/libvirt-gconfig-domain-interface-filterref.h> + G_BEGIN_DECLS #define GVIR_CONFIG_TYPE_DOMAIN_INTERFACE (gvir_config_domain_interface_get_type ()) @@ -76,6 +78,9 @@ const char *gvir_config_domain_interface_get_ifname(GVirConfigDomainInterface *i GVirConfigDomainInterfaceLinkState gvir_config_domain_interface_get_link_state(GVirConfigDomainInterface *interface); const char *gvir_config_domain_interface_get_mac(GVirConfigDomainInterface *interface); const char *gvir_config_domain_interface_get_model(GVirConfigDomainInterface *interface); +void gvir_config_domain_interface_set_filterref(GVirConfigDomainInterface *interface, + GVirConfigDomainInterfaceFilterref *filterref); +GVirConfigDomainInterfaceFilterref *gvir_config_domain_interface_get_filterref(GVirConfigDomainInterface *interface); G_END_DECLS diff --git a/libvirt-gconfig/libvirt-gconfig.h b/libvirt-gconfig/libvirt-gconfig.h index 03e8ce7..14386b9 100644 --- a/libvirt-gconfig/libvirt-gconfig.h +++ b/libvirt-gconfig/libvirt-gconfig.h @@ -62,6 +62,8 @@ #include <libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.h> #include <libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.h> #include <libvirt-gconfig/libvirt-gconfig-domain-input.h> +#include <libvirt-gconfig/libvirt-gconfig-domain-interface-filterref-parameter.h> +#include <libvirt-gconfig/libvirt-gconfig-domain-interface-filterref.h> #include <libvirt-gconfig/libvirt-gconfig-domain-interface.h> #include <libvirt-gconfig/libvirt-gconfig-domain-interface-bridge.h> #include <libvirt-gconfig/libvirt-gconfig-domain-interface-network.h> diff --git a/libvirt-gconfig/libvirt-gconfig.sym b/libvirt-gconfig/libvirt-gconfig.sym index 72eafc1..5065047 100644 --- a/libvirt-gconfig/libvirt-gconfig.sym +++ b/libvirt-gconfig/libvirt-gconfig.sym @@ -608,6 +608,24 @@ global: gvir_config_domain_graphics_rdp_set_replace_user; gvir_config_object_new_from_xml; + + gvir_config_domain_interface_set_filterref; + gvir_config_domain_interface_get_filterref; + + gvir_config_domain_interface_filterref_get_type; + gvir_config_domain_interface_filterref_new; + gvir_config_domain_interface_filterref_new_from_xml; + gvir_config_domain_interface_filterref_set_filter; + gvir_config_domain_interface_filterref_get_filter; + gvir_config_domain_interface_filterref_add_parameter; + gvir_config_domain_interface_filterref_get_parameters; + gvir_config_domain_interface_filterref_parameter_get_type; + gvir_config_domain_interface_filterref_parameter_new; + gvir_config_domain_interface_filterref_parameter_new_from_xml; + gvir_config_domain_interface_filterref_parameter_set_name; + gvir_config_domain_interface_filterref_parameter_set_value; + gvir_config_domain_interface_filterref_parameter_get_name; + gvir_config_domain_interface_filterref_parameter_get_value; } LIBVIRT_GCONFIG_0.1.7; # .... define new API here using predicted next version number .... -- 1.8.1.4

3 5

[libvirt] [PATCH] build: fix build of virt-login-shell on systems with older gnutls
by Jim Fehlig 22 Oct '13

22 Oct '13

On systems where gnutls uses libgcrypt, I'm seeing the following build failure libvirt.c:314: error: variable 'virTLSThreadImpl' has initializer but incomplete type libvirt.c:319: error: 'GCRY_THREAD_OPTION_PTHREAD' undeclared here (not in a function) ... Fix by undefining WITH_GNUTLS_GCRYPT in config-post.h Signed-off-by: Jim Fehlig <jfehlig(a)suse.com> --- Although I'm more confident in this fix vs the previously reported virt-login-shell build failure, I'd still prefer an ACK before pushing. config-post.h | 1 + 1 file changed, 1 insertion(+) diff --git a/config-post.h b/config-post.h index d371e8c..8367200 100644 --- a/config-post.h +++ b/config-post.h @@ -34,6 +34,7 @@ # undef WITH_CURL # undef WITH_DTRACE_PROBES # undef WITH_GNUTLS +# undef WITH_GNUTLS_GCRYPT # undef WITH_MACVTAP # undef WITH_NUMACTL # undef WITH_SASL -- 1.8.1.4

3 5

[libvirt] [PATCH] python: Fix Create*WithFiles filefd passing
by Martin Kletzander 22 Oct '13

22 Oct '13

From: Marian Neagul <marian(a)info.uvt.ro> Commit d76227be added functions virDomainCreateWithFiles and virDomainCreateXMLWithFiles, but there was a little piece missing in python bindings. This patch fixes proper passing of file descriptors in the overwrites of these functions. Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- Notes: I checked that Marian's patch works as expected and that it really fixes the issue. python/libvirt-override.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/python/libvirt-override.c b/python/libvirt-override.c index 4800d1d..2e58bf9 100644 --- a/python/libvirt-override.c +++ b/python/libvirt-override.c @@ -7157,6 +7157,8 @@ libvirt_virDomainCreateWithFiles(PyObject *self ATTRIBUTE_UNUSED, PyObject *args if (libvirt_intUnwrap(pyfd, &fd) < 0) goto cleanup; + + files[i] = fd; } LIBVIRT_BEGIN_ALLOW_THREADS; @@ -7201,6 +7203,8 @@ libvirt_virDomainCreateXMLWithFiles(PyObject *self ATTRIBUTE_UNUSED, PyObject *a if (libvirt_intUnwrap(pyfd, &fd) < 0) goto cleanup; + + files[i] = fd; } LIBVIRT_BEGIN_ALLOW_THREADS; -- 1.8.4

3 3

[libvirt] [PATCH] maint: typo fixes
by Eric Blake 22 Oct '13

22 Oct '13

* ChangeLog-old: s/guarentee/guarantee/ Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing as trivial. ChangeLog-old | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog-old b/ChangeLog-old index e07b11c..ba738c4 100644 --- a/ChangeLog-old +++ b/ChangeLog-old @@ -13920,7 +13920,7 @@ Tue Feb 27 10:20:43 EST 2007 Daniel P. Berrange <berrange(a)redhat.com> * src/xend_internal.c: Only hardcode port = 5900+domid if running against old XenD < 3.0.3, because in newer XenD - port is guarenteed to be available in XenStore if the VNC + port is guaranteed to be available in XenStore if the VNC server is running. Mon Feb 26 15:33:08 IST 2007 Mark McLoughlin <markmc(a)redhat.com> @@ -15228,7 +15228,7 @@ Sun Sep 3 12:34:23 EDT 2006 Daniel Berrange <berrange(a)redhat.com> iterating over list of ids/names, because it is not neccessarily the same as the value returned by virConnectNumOfDomains. Use qsort to sort active domains by Id, and inactive domains by name, since - there is no guarenteed sort ordering when listing domains. For inactive + there is no guaranteed sort ordering when listing domains. For inactive domains display a '-' instead of '-1' to make it clear they have no sensible ID number. -- 1.8.3.1

1 0

[libvirt] [PATCH] rpc: Retrieve peer PID via new getsockopt() for Mac
by Doug Goldstein 22 Oct '13

22 Oct '13

While LOCAL_PEERCRED on the BSDs does not return the pid information of the peer, Mac OS X 10.8 added LOCAL_PEERPID to retrieve the pid so we should use that when its available to get that information. --- v3: * Consider EOPNOTSUPP as non-fatal in case they've built on 10.8 but run the binary on 10.6 as that's the error you'll get back in that case. v2: * Make LOCAL_PEERPID call non-fatal in case the user built the binary on a system that supports it but then runs it on a kernel that does not support it --- src/rpc/virnetsocket.c | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index b2ebefe..f73bc50 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -1197,12 +1197,36 @@ int virNetSocketGetUNIXIdentity(virNetSocketPtr sock, goto cleanup; } - /* PID and process creation time are not supported on BSDs */ + /* PID and process creation time are not supported on BSDs by + * LOCAL_PEERCRED. + */ *pid = -1; *timestamp = -1; *uid = cr.cr_uid; *gid = cr.cr_gid; +# ifdef LOCAL_PEERPID + /* Exists on Mac OS X 10.8 for retrieving the peer's PID */ + cr_len = sizeof(*pid); + + if (getsockopt(sock->fd, VIR_SOL_PEERCRED, LOCAL_PEERPID, pid, &cr_len) < 0) { + /* Ensure this is set to something sane as there are no guarentees + * as to what its set to now. + */ + *pid = -1; + + /* If this was built on a system with LOCAL_PEERPID defined but + * the kernel doesn't support it we'll get back EOPNOTSUPP so + * treat all errors but EOPNOTSUPP as fatal + */ + if (errno != EOPNOTSUPP) { + virReportSystemError(errno, "%s", + _("Failed to get client socket PID")); + goto cleanup; + } + } +# endif + ret = 0; cleanup: -- 1.8.1.5

3 2

[libvirt] [PATCH] nodeinfo: fix physical memory size on Mac OS X
by Ryota Ozaki 22 Oct '13

22 Oct '13

HW_PHYSMEM is available on Mac OS X as well as FreeBSD, however, its resulting value for Mac OS X is 32 bits. Mac OS X provides HW_MEMSIZE that is 64 bits version of HW_PHYSMEM. We have to use it. I tested the patch on Mac OS X 10.6.8, 10.7.4, 10.8.5 and FreeBSD 9.2. Signed-off-by: Ryota Ozaki <ozaki.ryota(a)gmail.com> --- src/nodeinfo.c | 38 ++++++++++++++++++++++++++++---------- 1 file changed, 28 insertions(+), 10 deletions(-) diff --git a/src/nodeinfo.c b/src/nodeinfo.c index 70814c2..a0fdfe7 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -73,6 +73,33 @@ appleFreebsdNodeGetCPUCount(void) return ncpu; } + +/* VIR_HW_PHYSMEM - the resulting value of HW_PHYSMEM of FreeBSD + * is 64 bits while that of Mac OS X is still 32 bits. + * Mac OS X provides HW_MEMSIZE for 64 bits version of HW_PHYSMEM + * since 10.6.8 (Snow Leopard) at least. + */ +# ifdef HW_MEMSIZE +# define VIR_HW_PHYSMEM HW_MEMSIZE +# else +# define VIR_HW_PHYSMEM HW_PHYSMEM +# endif +static int +appleFreebsdNodeGetMemorySize(unsigned long *memory) +{ + int mib[2] = { CTL_HW, VIR_HW_PHYSMEM }; + unsigned long physmem; + size_t len = sizeof(physmem); + + if (sysctl(mib, 2, &physmem, &len, NULL, 0) == -1) { + virReportSystemError(errno, "%s", _("cannot obtain memory size")); + return -1; + } + + *memory = (unsigned long)(physmem / 1024); + + return 0; +} #endif #ifdef __linux__ @@ -914,17 +941,8 @@ cleanup: nodeinfo->mhz = cpu_freq / 1000000; # endif - /* get memory information */ - int mib[2] = { CTL_HW, HW_PHYSMEM }; - unsigned long physmem; - size_t len = sizeof(physmem); - - if (sysctl(mib, 2, &physmem, &len, NULL, 0) == -1) { - virReportSystemError(errno, "%s", _("cannot obtain memory size")); + if (appleFreebsdNodeGetMemorySize(&nodeinfo->memory) < 0) return -1; - } - - nodeinfo->memory = (unsigned long)(physmem / 1024); return 0; } -- 1.8.4

2 4

[libvirt] [PATCH] xenapi: fix the coding stype in xenapi_driver.c
by Hongwei Bi 22 Oct '13

22 Oct '13

Signed-off-by: Hongwei Bi <hwbi2008(a)gmail.com> --- src/xenapi/xenapi_driver.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c index 4b522c0..82af6f8 100644 --- a/src/xenapi/xenapi_driver.c +++ b/src/xenapi/xenapi_driver.c @@ -437,7 +437,8 @@ xenapiConnectGetCapabilities(virConnectPtr conn) virCapsPtr caps = ((struct _xenapiPrivate *)(conn->privateData))->caps; if (caps) { char *xml = virCapabilitiesFormatXML(caps); - if (!xml) goto cleanup; + if (!xml) + goto cleanup; return xml; } cleanup: -- 1.8.1.2

2 2

[libvirt] [PATCH] virsh: Fix job watching when STDIN is not a tty
by Peter Krempa 22 Oct '13

22 Oct '13

In commit b46c4787dde79b015dad67dedda4ccf6ff1a3082 I changed the code to watch long running jobs in virsh. Unfortunately I didn't take into account that poll may get a hangup if the terminal is not a TTY and will be closed. This patch avoids polling the STDIN fd when there's no TTY. --- tools/virsh-domain.c | 7 ++++++- tools/virsh.c | 7 +++++++ tools/virsh.h | 2 ++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index b75f331..5aabccd 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -3529,6 +3529,7 @@ vshWatchJob(vshControl *ctl, bool functionReturn = false; sigset_t sigmask, oldsigmask; bool jobStarted = false; + nfds_t npollfd = 2; sigemptyset(&sigmask); sigaddset(&sigmask, SIGINT); @@ -3539,9 +3540,13 @@ vshWatchJob(vshControl *ctl, sigemptyset(&sig_action.sa_mask); sigaction(SIGINT, &sig_action, &old_sig_action); + /* don't poll on STDIN if we are not using a terminal */ + if (!vshTTYAvailable(ctl)) + npollfd = 1; + GETTIMEOFDAY(&start); while (1) { - ret = poll((struct pollfd *)&pollfd, 2, 500); + ret = poll((struct pollfd *)&pollfd, npollfd, 500); if (ret > 0) { if (pollfd[1].revents & POLLIN && saferead(STDIN_FILENO, &retchar, sizeof(retchar)) > 0) { diff --git a/tools/virsh.c b/tools/virsh.c index a76229a..8425f53 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -2226,6 +2226,13 @@ vshTTYIsInterruptCharacter(vshControl *ctl ATTRIBUTE_UNUSED, } +bool +vshTTYAvailable(vshControl *ctl) +{ + return ctl->istty; +} + + int vshTTYDisableInterrupt(vshControl *ctl ATTRIBUTE_UNUSED) { diff --git a/tools/virsh.h b/tools/virsh.h index f978d94..b843788 100644 --- a/tools/virsh.h +++ b/tools/virsh.h @@ -365,6 +365,8 @@ bool vshTTYIsInterruptCharacter(vshControl *ctl, const char chr); int vshTTYDisableInterrupt(vshControl *ctl); int vshTTYRestore(vshControl *ctl); int vshTTYMakeRaw(vshControl *ctl, bool report_errors); +bool vshTTYAvailable(vshControl *ctl); + /* allocation wrappers */ void *_vshMalloc(vshControl *ctl, size_t sz, const char *filename, int line); -- 1.8.3.2

2 2

[libvirt] [PATCH] Also undef WITH_GNUTLS_GCRYPT
by Guido Günther 22 Oct '13

22 Oct '13

If we disallow gnutls we need to disallow gcrypt to since WITH_GNUTLS_GCRYPT only works with WITH_GNUTLS per configure.ac. Othwise we fail to build .libs/libvirt_setuid_rpc_client_la-libvirt.o like: libvirt.c:314:15: error: variable 'virTLSThreadImpl' has initializer but incomplete type static struct gcry_thread_cbs virTLSThreadImpl = { ^ libvirt.c:319:5: error: 'GCRY_THREAD_OPTION_PTHREAD' undeclared here (not in a function) GCRY_THREAD_OPTION_PTHREAD, ^ ...and so on. See: http://honk.sigxcpu.org:8001/job/libvirt-build/1769/console --- config-post.h | 1 + 1 file changed, 1 insertion(+) diff --git a/config-post.h b/config-post.h index d371e8c..8367200 100644 --- a/config-post.h +++ b/config-post.h @@ -34,6 +34,7 @@ # undef WITH_CURL # undef WITH_DTRACE_PROBES # undef WITH_GNUTLS +# undef WITH_GNUTLS_GCRYPT # undef WITH_MACVTAP # undef WITH_NUMACTL # undef WITH_SASL -- 1.8.4.rc3

2 1

[libvirt] [PATCH] Get rid of shadowed booleans
by Michal Privoznik 22 Oct '13

22 Oct '13

There are still two places where we are using 1bit width unsigned integer to store a boolean. There's no real need for this and these occurrences can be replaced with 'bool'. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/conf/interface_conf.h | 4 ++-- src/rpc/virnetserver.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/conf/interface_conf.h b/src/conf/interface_conf.h index 4857822..0e22575 100644 --- a/src/conf/interface_conf.h +++ b/src/conf/interface_conf.h @@ -164,7 +164,7 @@ typedef virInterfaceObj *virInterfaceObjPtr; struct _virInterfaceObj { virMutex lock; - unsigned int active:1; /* 1 if interface is active (up) */ + bool active; /* true if interface is active (up) */ virInterfaceDefPtr def; /* The interface definition */ }; @@ -175,7 +175,7 @@ struct _virInterfaceObjList { virInterfaceObjPtr *objs; }; -static inline int +static inline bool virInterfaceObjIsActive(const virInterfaceObj *iface) { return iface->active; diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index 2306e10..8907768 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -95,7 +95,7 @@ struct _virNetServer { unsigned int keepaliveCount; bool keepaliveRequired; - unsigned int quit :1; + bool quit; #ifdef WITH_GNUTLS virNetTLSContextPtr tls; @@ -1035,7 +1035,7 @@ static void virNetServerAutoShutdownTimer(int timerid ATTRIBUTE_UNUSED, if (!srv->autoShutdownInhibitions) { VIR_DEBUG("Automatic shutdown triggered"); - srv->quit = 1; + srv->quit = true; } virObjectUnlock(srv); @@ -1074,7 +1074,7 @@ void virNetServerRun(virNetServerPtr srv) virNetServerMDNSStart(srv->mdns) < 0) goto cleanup; - srv->quit = 0; + srv->quit = false; if (srv->autoShutdownTimeout && (timerid = virEventAddTimeout(-1, @@ -1162,7 +1162,7 @@ void virNetServerQuit(virNetServerPtr srv) virObjectLock(srv); VIR_DEBUG("Quit requested %p", srv); - srv->quit = 1; + srv->quit = true; virObjectUnlock(srv); } -- 1.8.1.5

2 1

[libvirt] [PATCH 0/2] Fix 'make check' on RHEL-5.10
by Michal Privoznik 22 Oct '13

22 Oct '13

There are two tests failing for me on RHEL-5.10 and current git HEAD. Fix them. Michal Privoznik (2): tests: Use lv_abs_top_builddir instead of bare abs_top_builddir vircgroupmock: Mock access() to some more files tests/Makefile.am | 2 +- tests/vircgroupmock.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) -- 1.8.1.5

2 4

[libvirt] libvirt VF indexing issue
by Niilona 22 Oct '13

22 Oct '13

libvirt points to wrong VF -channel, when trying to change MAC -address. libvirt v1 1.0.2 linux driver : ixgbe 3.17.3 Symptom description ---------------------------------- 1.) How the VF channels are seen in the Host ( correct in increasing address order ) command : ls -la /sys/bus/pci/devices/0000\:04\:00.0/ .................. lrwxrwxrwx 1 root root 0 Oct 17 12:25 virtfn0 -> ../0000:04:10.0/ lrwxrwxrwx 1 root root 0 Oct 17 12:25 virtfn1 -> ../0000:04:10.2/ lrwxrwxrwx 1 root root 0 Oct 17 12:25 virtfn10 -> ../0000:04:12.4/ lrwxrwxrwx 1 root root 0 Oct 17 12:25 virtfn11 -> ../0000:04:12.6/ lrwxrwxrwx 1 root root 0 Oct 17 12:25 virtfn12 -> ../0000:04:13.0/ lrwxrwxrwx 1 root root 0 Oct 17 12:25 virtfn13 -> ../0000:04:13.2/ lrwxrwxrwx 1 root root 0 Oct 17 12:25 virtfn2 -> ../0000:04:10.4/ lrwxrwxrwx 1 root root 0 Oct 17 12:25 virtfn3 -> ../0000:04:10.6/ lrwxrwxrwx 1 root root 0 Oct 17 12:25 virtfn4 -> ../0000:04:11.0/ lrwxrwxrwx 1 root root 0 Oct 17 12:25 virtfn5 -> ../0000:04:11.2/ lrwxrwxrwx 1 root root 0 Oct 17 12:25 virtfn6 -> ../0000:04:11.4/ lrwxrwxrwx 1 root root 0 Oct 17 12:25 virtfn7 -> ../0000:04:11.6/ lrwxrwxrwx 1 root root 0 Oct 17 12:25 virtfn8 -> ../0000:04:12.0/ lrwxrwxrwx 1 root root 0 Oct 17 12:25 virtfn9 -> ../0000:04:12.2/ ----------------------- 2.) How the libvirt sees them virsh nodedev-dumpxml pci_0000_04_00_0 <device> <name>pci_0000_04_00_0</name> <parent>pci_0000_00_03_0</parent> <driver> <name>ixgbe</name> </driver> <capability type='pci'> <domain>0</domain> <bus>4</bus> <slot>0</slot> <function>0</function> <product id='0x10fb'>82599EB 10-Gigabit SFI/SFP+ Network Connection</product> <vendor id='0x8086'>Intel Corporation</vendor> <capability type='virt_functions'> <address domain='0x0000' bus='0x04' slot='0x12' function='0x4'/> <address domain='0x0000' bus='0x04' slot='0x12' function='0x6'/> <address domain='0x0000' bus='0x04' slot='0x13' function='0x0'/> <address domain='0x0000' bus='0x04' slot='0x13' function='0x2'/> <address domain='0x0000' bus='0x04' slot='0x10' function='0x0'/> <address domain='0x0000' bus='0x04' slot='0x10' function='0x2'/> <address domain='0x0000' bus='0x04' slot='0x10' function='0x4'/> <address domain='0x0000' bus='0x04' slot='0x10' function='0x6'/> <address domain='0x0000' bus='0x04' slot='0x11' function='0x0'/> <address domain='0x0000' bus='0x04' slot='0x11' function='0x2'/> <address domain='0x0000' bus='0x04' slot='0x11' function='0x4'/> <address domain='0x0000' bus='0x04' slot='0x11' function='0x6'/> <address domain='0x0000' bus='0x04' slot='0x12' function='0x0'/> <address domain='0x0000' bus='0x04' slot='0x12' function='0x2'/> </capability> </capability> </device> 3.) Libvirt sets MAC -address in slot/position 5 instead of 1 ip link show eth10 87: eth10: <BROADCAST,MULTICAST,PROMISC,UP,LOWER_UP> mtu 2100 qdisc mq state UP mode DEFAULT qlen 1000 link/ether 00:1b:21:b9:a5:60 brd ff:ff:ff:ff:ff:ff vf 0 MAC 92:e2:6b:53:a7:c2, spoof checking off <------ this is the slot, MAC tried to set vf 1 MAC 0a:04:38:2c:79:35, spoof checking off vf 2 MAC b2:46:b6:91:44:2e, spoof checking off vf 3 MAC de:b6:28:da:20:44, spoof checking off vf 4 MAC 02:00:00:80:00:01, spoof checking off <--------- MAC sets in wrong slot vf 5 MAC 02:00:00:80:00:02, spoof checking off vf 6 MAC 02:00:00:80:00:20, spoof checking off vf 7 MAC 02:00:00:80:00:30, spoof checking off vf 8 MAC 52:54:00:de:f8:08, spoof checking off vf 9 MAC 5e:b0:d0:34:d6:cc, spoof checking off vf 10 MAC d2:88:5c:2d:db:b5, spoof checking off vf 11 MAC 6a:06:8a:9c:31:8b, spoof checking off vf 12 MAC 4a:38:be:8f:b3:bf, spoof checking off vf 13 MAC b6:c1:d4:12:d3:3d, spoof checking off 5.) Question : Why this happens in ixgbe -driver and when we try to use more than 10 VF's/physical port. ?

2 1

[libvirt] [PATCH] libvirt_setuid_rpc_client_la: Link APPARMOR libs
by Michal Privoznik 22 Oct '13

22 Oct '13

The libvirt_setuid_rpc_client_la depends on vircommand.c, in which we are conditionally calling aa_change_profile() - an AppArmor helper function. However, in linking the libvirt-setuid-rpc-client.la we have forgot to link AppArmor libraries leaving us with following error: make[3]: Entering directory `/home/zippy/work/libvirt/libvirt.git/tools' CCLD virsh CCLD virt-host-validate CCLD virt-login-shell ../src/.libs/libvirt-setuid-rpc-client.a(libvirt_setuid_rpc_client_la-vircommand.o): In function `virExec': /home/zippy/work/libvirt/libvirt.git/src/util/vircommand.c:653: undefined reference to `aa_change_profile' collect2: error: ld returned 1 exit status make[3]: *** [virt-login-shell] Error 1 make[3]: *** Waiting for unfinished jobs.... Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/Makefile.am | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am index 9dab4df..688c34c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2027,15 +2027,19 @@ libvirt_setuid_rpc_client_la_SOURCES = \ libvirt_setuid_rpc_client_la_LDFLAGS = \ $(AM_LDFLAGS) \ $(LIBXML_LIBS) \ - $(SELINUX_LIBS) \ - $(NULL) + $(SELINUX_LIBS) libvirt_setuid_rpc_client_la_CFLAGS = \ -DLIBVIRT_SETUID_RPC_CLIENT \ -I$(top_srcdir)/src/conf \ -I$(top_srcdir)/src/rpc \ $(AM_CFLAGS) \ - $(SELINUX_CFLAGS) \ - $(NULL) + $(SELINUX_CFLAGS) + +if WITH_SECDRIVER_APPARMOR +libvirt_setuid_rpc_client_la_LDFLAGS += $(APPARMOR_LIBS) +libvirt_setuid_rpc_client_la_CFLAGS += $(APPARMOR_CFLAGS) +endif WITH_SECDRIVER_APPARMOR + endif WITH_LXC lockdriverdir = $(libdir)/libvirt/lock-driver -- 1.8.1.5

2 2

[libvirt] Exploring linbvirt.
by cooldharma06 22 Oct '13

22 Oct '13

hi, i am started to exploring libvirt. i am using the version libvirt-1.1.3 and i want to know (or) find the path how the libvirt is creating VM with xen (libxl) in the source. Any guide or reference is available for this. How i can find the path of calling sequence for other operations(api). Guide me to get some idea on debugging the libvirt. Regards, cooldharma06

2 3

[libvirt] [libvirt-test-API][PATCH] npiv: Add basic NPIV test case
by jmiao 22 Oct '13

22 Oct '13

The original NPIV test function create_virtual_hba doesn't check the validation of fabric_wwn, this patch modify create_virtual_hba to check fabric_wwn whether is invalid (0xffffffff). One the other hand, add a function destroy_virtual_hba to clean the vHBA which is created by create_virtual_hba. Add a global variable wwnn to global.cfg for create_virtual_hba. And add the test case conf file basic_npiv.conf. Signed-off-by: jmiao <jmiao(a)redhat.com> --- cases/basic_npiv.conf | 3 +++ global.cfg | 10 ++++++++- repos/npiv/create_virtual_hba.py | 24 +++++++++++--------- repos/npiv/destroy_virtual_hba.py | 46 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 72 insertions(+), 11 deletions(-) create mode 100644 cases/basic_npiv.conf create mode 100644 repos/npiv/destroy_virtual_hba.py diff --git a/cases/basic_npiv.conf b/cases/basic_npiv.conf new file mode 100644 index 0000000..b9cbd04 --- /dev/null +++ b/cases/basic_npiv.conf @@ -0,0 +1,3 @@ +npiv:create_virtual_hba + +npiv:destroy_virtual_hba diff --git a/global.cfg b/global.cfg index db8f71e..a35b985 100644 --- a/global.cfg +++ b/global.cfg @@ -210,7 +210,15 @@ testnic = eth1 # a PCI device to use for attach/detach/reset tests # for example testpci = 00:19.0 -testpci = +testpci = 00:19.0 + +################################################################ +# +# NPIV wwpn +# + +# a word wide port name to use for create_virtual_hba tests +wwnn = ################################################################ # diff --git a/repos/npiv/create_virtual_hba.py b/repos/npiv/create_virtual_hba.py index 0a02a9b..b637127 100644 --- a/repos/npiv/create_virtual_hba.py +++ b/repos/npiv/create_virtual_hba.py @@ -21,7 +21,7 @@ def check_nodedev_create(wwpn, device_name): vport name in all FC list, to see if it exists. """ - pname_list = commands.getoutput("ls -1 -d /sys/class/*_host/host*/* \ + pname_list = commands.getoutput("ls -1 -d /sys/class/*_host/host*/* | grep port_name") for pname in pname_list.split("\n"): portid = open(pname).read()[2:].strip('\n') @@ -38,11 +38,11 @@ def check_nodedev_parent(nodedev_obj, device_parent, device_name): current_parent = nodedev_obj.parent() if device_parent == current_parent: - logger.info("The parent of node device '%s' is %s" \ + logger.info("The parent of node device '%s' is %s" % (device_name, current_parent)) return True else: - logger.info("Refer to bug 593995. The parent of node device \ + logger.info("Refer to bug 593995. The parent of node device '%s' is '%s'" % (device_name, current_parent)) return False @@ -63,35 +63,39 @@ def create_virtual_hba(params): fc_xml = nodedev.XMLDesc(0) fc_cap = re.search('vport_ops', fc_xml) if fc_cap: + doc = xml.dom.minidom.parseString(fc_xml) + logger.info("NPIV support on '%s'" % fc_name) + fabric_wwn = doc.getElementsByTagName('fabric_wwn')[0].childNodes[0].nodeValue.encode('ascii', 'ignore') + if fabric_wwn == 'ffffffff': + logger.info("fabric_wwn of '%s' is ffffffff" % fc_name) + continue device_parent = fc_name xmlstr = xmlstr.replace('PARENT', device_parent) - doc = xml.dom.minidom.parseString(fc_xml) wwnn_node = doc.getElementsByTagName('wwnn')[0] xmlstr = xmlstr.replace('WWNN', wwnn_node.childNodes[0].nodeValue.encode('ascii', 'ignore')) - logger.info("NPIV support on '%s'" % fc_name) break else: logger.info("No NPIV capabilities on '%s'" % fc_name) logger.debug("node device xml:\n%s" % xmlstr) - return 0 try: logger.info("creating a virtual HBA ...") nodedev_obj = conn.nodeDeviceCreateXML(xmlstr, 0) dev_name = nodedev_obj.name() - if check_nodedev_create(wwpn, dev_name) and \ + if check_nodedev_create(wwpn, dev_name) and check_nodedev_parent(nodedev_obj, device_parent, dev_name): - logger.info("the virtual HBA '%s' was created successfully" \ + logger.info("the virtual HBA '%s' was created successfully" % dev_name) + sharedmod.data['vhba'] = dev_name return 0 else: - logger.error("fail to create the virtual HBA '%s'" \ + logger.error("fail to create the virtual HBA '%s'" % dev_name) return 1 except libvirtError, e: - logger.error("API error message: %s, error code is %s" \ + logger.error("API error message: %s, error code is %s" % (e.message, e.get_error_code())) logger.error("Error: fail to create %s virtual hba" % dev_name) return 1 diff --git a/repos/npiv/destroy_virtual_hba.py b/repos/npiv/destroy_virtual_hba.py new file mode 100644 index 0000000..7864ed4 --- /dev/null +++ b/repos/npiv/destroy_virtual_hba.py @@ -0,0 +1,46 @@ +#!/usr/bin/env python +# To test vHBA destroying. + +import libvirt +from libvirt import libvirtError + +from src import sharedmod + +required_params = () +optional_params = {} + +def destroy_virtual_hba(params): + """Destroy the vHBA created before.""" + global logger + logger = params['logger'] + + conn = sharedmod.libvirtobj['conn'] + + if not sharedmod.data.has_key('vhba'): + logger.error("Failed to find the created vhba.") + return 1 + + dev_name = sharedmod.data['vhba'] + + logger.info("destroying the virtual HBA %s" % dev_name) + + + try: + nodedev_obj = conn.nodeDeviceLookupByName(dev_name) + + nodedev_obj.destroy() + + scsi_list = conn.listDevices('scsi_host', 0) + + for fc_name in scsi_list: + if fc_name == dev_name: + logger.error("Fail to destroy the virtual HBA %s" % dev_name) + return 1 + + except libvirtError, e: + logger.error("API error message: %s, error code is %s" + % (e.message, e.get_error_code())) + logger.error("Error: fail to destroy %s virtual hba" % dev_name) + return 1 + + return 0 -- 1.8.2.1

2 1

Re: [libvirt] [Qemu-devel] [REMINDER] Key Signing Party at KVM Forum
by Eric Blake 22 Oct '13

22 Oct '13

Forwarding this information on: On 10/22/2013 10:56 AM, Anthony Liguori wrote: > Hi, > > We'll be hosting a key signing party at KVM Forum on Wednesday during > the Hackathon. > > More information is at: > > http://wiki.qemu.org/KeySigningParty2013 > > Here is the set of people who have sent me their fingerprints so far: > > http://wiki.qemu.org/download/keysigning.txt > > If you plan on participating, please make sure you key is in this list > and if it is not, send me the output of gpg --fingerprint for the key > you wish to use. I may have missed your mail so even if you sent me > something, please check again. > > Make sure you bring proper ID too. Passports are the best form of ID. > > Please note that the key server on the wiki is currently down so > please ignore that part of the howto. > > Regards, > > Anthony Liguori > > > -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

1 0

[libvirt] [PATCH]docs: fix some typos about 'informations'
by Chen Hanxiao 22 Oct '13

22 Oct '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> s/informations/information Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- docs/bugs.html.in | 6 +++--- docs/logging.html.in | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/bugs.html.in b/docs/bugs.html.in index 71e43e4..2295ae9 100644 --- a/docs/bugs.html.in +++ b/docs/bugs.html.in @@ -132,7 +132,7 @@ crash, the simplest is to run the program under gdb, reproduce the steps leading to the crash and then issue a gdb "bt -a" command to get the stack trace, attach it to the bug. Note that for the - data to be really useful libvirt debug informations must be present + data to be really useful libvirt debug information must be present for example by installing libvirt debuginfo package on Fedora or Red Hat Enterprise Linux (with debuginfo-install libvirt) prior to running gdb.</p> @@ -147,11 +147,11 @@ <pre> # ps -o etime,pid `pgrep libvirt` ... note the process id from the output # gdb /usr/sbin/libvirtd -.... some informations about gdb and loading debug data +.... some information about gdb and loading debug data (gdb) attach $the_damon_process_id .... (gdb) thread apply all bt -.... informations to attach to the bug +.... information to attach to the bug (gdb) </pre> diff --git a/docs/logging.html.in b/docs/logging.html.in index 86e178c..1cd15a1 100644 --- a/docs/logging.html.in +++ b/docs/logging.html.in @@ -68,7 +68,7 @@ <ul> <li>1 or "debug": asking the library to log every message emitted, though the filters can be used to avoid filling up the output</li> - <li>2 or "info": log all non-debugging informations</li> + <li>2 or "info": log all non-debugging information</li> <li>3 or "warn": log warnings and errors, that's the default value</li> <li>4 or "error": log only error messages</li> </ul></li> @@ -89,7 +89,7 @@ <ul> <li>4: only errors</li> <li>3: warnings and errors</li> - <li>2: informations, warnings and errors</li> + <li>2: information, warnings and errors</li> <li>1: debug and everything</li> </ul></li> <li>log_filters: defines logging filters</li> -- 1.8.2.1

2 1

Re: [libvirt] Support QEMU Live Upgrade in Libvirt
by Eric Blake 22 Oct '13

22 Oct '13

On 10/21/2013 08:16 AM, Zhou Zheng Sheng wrote: > Hi all, > > Recently QEMU developers are working on a feature to allow upgrading a > live QEMU instance to a new version without restarting the VM. This is > implemented as live migration between the old and new QEMU process on > the same host [1]. Here is the the use case: > > 1) Guests are running QEMU release 1.6.1. > 2) Admin installs QEMU release 1.6.2 via RPM or deb. > 3) Admin starts a new VM using the updated QEMU binary, and asks the old > QEMU process to migrate the VM to the newly started VM. This is NOT migration, but qemu upgrading. Libvirt has a very strong notion that migration is between two distinct hosts, and libvirt WILL DEADLOCK if you attempt to migrate to the same host (because of assumptions that libvirt makes about the control sequence of managing the migration). While live upgrade may use migration under the hood in qemu, we would need to add a new API to libvirt to expose the functionality as a qemu in-place upgrade, rather than trying to add it as a flag to the existing libvirt migration, because it would be something we want done by a single libvirtd rather than reusing the code paths of existing migration which requires handshakes between two libvirtd. > The problem is that it requires twice host memory as the original VM > does during the upgrading. Thus comes the ongoing development of using > the system call vmsplice() to move memory pages between two QEMU > instances, so that the kernel can just perform page re-mapping from > source QEMU process to destination QEMU process in a zero-copy manner. > This is expected to reduce memory consumption and speedup the whole > procedure. This mechanism is based on Unix domain socket, pipes and FD > inter-process passing magic [2]. Yes, I would love to have libvirt expose this functionality; it's just that I think we need a new libvirt API for it. > > Solution #2 Adding New API virDomainHypervisorLiveUpgrade() > > Another idea is to have a new API and new flow dedicated to this > feature. In my opinion, I think it's good to have a API to do hypervisor > live upgrade in general, and we implement it in QEMU driver using a > special local migration procedure. We can also provide a default > implementation for all the hypervisors using this local migration trick > if possible. However the work to do is much more than solution #1. The > basic functions such as ACL, XML parsing, front-end device creation, > QEMU process handling and so on can be re-used, but it seems most of the > code in qemu_migration.c can not be re-used without massive refactoring. > The UUID problem discussed the solution #1 is also still need to be solved. This is the only viable solution. Are you interested in starting patches along this direction? -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

1 1

Re: [libvirt] why no progress shown after introduce NBD migration cookie
by Zhanghaoyu (A) 22 Oct '13

22 Oct '13

>>>> hi Michal, >>>> >>>> I used libvirt-1.0.3, ran below command to perform live migration, why no progress shown up? >>>> virsh migrate --live --verbose --copy-storage-all <domain> >>>> qemu+tcp://<dest ip>/system >>>> >>>> If replacing libvirt-1.0.3 with libvirt-1.0.2, the migration >>>> progress shown up, if performing migration without "--copy-storage-all", the migration progress shown up, too. >>>> >>>> Thanks, >>>> Zhang Haoyu >>>> >>> >>> Because since 1.0.3 we are using NBD to migrate storage. Truth is, >>> qemu is reporting progress of storage migration, however, there is no generic formula to combine storage migration and internal state migration into one number. With NBD the process is something like this: >> >> How to use NBD to migrate storage? >> Does NBD server in destination start automatically as soon as migration initiated, or some other configurations needed? >> What's the advantages of using NBD to migrate storage over traditional method that migrating the storage in iteration way, just like the way in which migrating the memory? >> Sorry for my poor knowledge in NBD, by which I used to implement shared storage for live migration without storage. > >NBD is used whenever both src and dst of migration is new enough to use it. That is, libvirt >= 1.0.3 and qemu >= 1.0.3. The NBD is turned on by libvirt whenever the conditions are met. User has no control over this. >The advantage is: only specified disks can be transferred (currently not supported in libvirt), the previous implementation was buggy (according to some qemu developers), the storage is migrated via separate channel (a new connection) so it can be possible (in the future) to split migration of RAM + internal state and storage. Could you make a detailed statement for the buggy previous implementation, please ? Thanks, Zhang Haoyu > >So frankly speaking, there's no real advantage for users now - besides not using buggy implementation. > >Michal > >BTW: It's better to ask these kind of info on the libvir-list next time, others might contribute with much more info as well (e.g. some qemu developers tend to watch the libvir-list too).

2 1

[libvirt] [libvirt-test-API][PATCH] nodedevice: Add nodedevice test case
by jmiao 22 Oct '13

22 Oct '13

This patch adds node device test case to cover API: listAllDevice, listCaps, numOfCaps, parent, name. It lists all node devices by checking each uevent file of node in sysfs. If the keywords are found in uevent, it will add this node to node device, and record relationship with its parent node device. Signed-off-by: jmiao <jmiao(a)redhat.com> --- cases/basic_nodedevice.conf | 10 ++ repos/nodedevice/capabilities.py | 63 ++++++++ repos/nodedevice/list_nodedevices.py | 276 +++++++++++++++++++++++++++++++++++ repos/nodedevice/parent_name.py | 63 ++++++++ 4 files changed, 412 insertions(+) create mode 100644 repos/nodedevice/capabilities.py create mode 100644 repos/nodedevice/list_nodedevices.py create mode 100644 repos/nodedevice/parent_name.py diff --git a/cases/basic_nodedevice.conf b/cases/basic_nodedevice.conf index 85a68f7..1a19bde 100644 --- a/cases/basic_nodedevice.conf +++ b/cases/basic_nodedevice.conf @@ -1,3 +1,13 @@ +nodedevice:list_nodedevices + +nodedevice:parent_name + pciaddress + $testpci + +nodedevice:capabilities + pciaddress + $testpci + nodedevice:detach pciaddress $testpci diff --git a/repos/nodedevice/capabilities.py b/repos/nodedevice/capabilities.py new file mode 100644 index 0000000..9b94376 --- /dev/null +++ b/repos/nodedevice/capabilities.py @@ -0,0 +1,63 @@ +#!/usr/bin/env python + +import libvirt +from libvirt import libvirtError + +from src import sharedmod + +required_params = ('pciaddress',) +optional_params = {} + +def capabilities(params): + """check the capabilities of a given node device""" + global logger + logger = params['logger'] + + pciaddress = params['pciaddress'] + + nodedevice = None + + node_capabilities = [] + + if not sharedmod.data.has_key('all_nodes'): + logger.error("Failed to get nodes.") + return 1 + + + (bus, slot_func) = pciaddress.split(":") + (slot, func) = slot_func.split(".") + device_name = "pci_0000_%s_%s_%s" % (bus, slot, func) + logger.debug("the name of the pci device is: %s" % device_name) + + nodes = sharedmod.data['all_nodes'] + + for entry in nodes: + if cmp(entry.name, device_name): + nodedevice = entry + else: + if nodedevice is None: + logger.error("parent_name cannot find %s" % device_name) + return 1 + + conn = sharedmod.libvirtobj['conn'] + + try: + node_obj = conn.nodeDeviceLookupByName(device_name) + node_capabilities = node_obj.listCaps() + + logger.info("%s capabilities: %s" %(device_name, node_capabilities)) + + if len(node_capabilities) != node_obj.numOfCaps(): + logger.error("The number of node capabilities error") + return 1 + + if not cmp(node_capabilities[0], nodedevice.capability): + logger.error("%s capabilities error: %s, should be %s." + % (device_name, node_capabilities[0], nodedevice.capability)) + return 1 + except libvirtError, e: + logger.error("API error message: %s, error code is %s" + % (e.message, e.get_error_code())) + return 1 + + return 0 diff --git a/repos/nodedevice/list_nodedevices.py b/repos/nodedevice/list_nodedevices.py new file mode 100644 index 0000000..eb1f242 --- /dev/null +++ b/repos/nodedevice/list_nodedevices.py @@ -0,0 +1,276 @@ +#!/usr/bin/env python +# list all node devices from host + +import commands + +import libvirt +from libvirt import libvirtError + +from src import sharedmod + +required_params = () +optional_params = {} + +g_pci = [] +g_usb_device = [] +g_usb = [] +g_scsi_host = [] +g_scsi_target = [] +g_scsi = [] +g_net = [] +g_storage = [] +g_nodes = [] + +options = { 'pci' : ['PCI_ID', g_pci, 'pci_'], + 'usb_device' : ['DEVTYPE=usb_device', g_usb_device, 'usb_'], + 'usb' : ['DEVTYPE=usb_interface', g_usb, 'usb_'], + 'scsi_host' : ['DEVTYPE=scsi_host', g_scsi_host, 'scsi_'], + 'scsi_target' : ['DEVTYPE=scsi_target', g_scsi_target, 'scsi_'], + 'scsi' : ['DEVTYPE=scsi_device', g_scsi, 'scsi_'], + } + +class NodeDevice(object): + """A NodeDevice class to record related information.""" + def __init__(self, name, path): + """init""" + self.name = name + self.path = path + self.parent = None + self.capability = None + + def create_child(self, name, path, cap): + """create_child function""" + child = NodeDevice(name, path) + child.parent = self + child.capability = cap + return child + +def format_name(name): + """format name to libvirt style: pci_0000_00_00_0""" + name = name.replace('.', '_') + name = name.replace(':', '_') + name = name.replace('-', '_') + return name + +def extract_name(path): + """ + extract name from a path. The argument must be a path which ending with + '/', and it will be parsed by this function. + """ + pos2 = path.rfind('/') + path = path[0:pos2] + pos1 = path.rfind('/') + path = path[pos1+1:pos2] + return format_name(path) + +def list_net(root): + """list all net nodedevices""" + global g_net, g_pci + cmd = "ip link | awk {'print $2'}" + (status, ret) = commands.getstatusoutput(cmd) + if status != 0: + return 1 + + tmp = ret.split('\n') + + # bubble sort to reduce the replicated mac + for i in reversed(range(0, len(tmp)/2)): + for j in reversed(range(i, len(tmp)/2)): + if i != j and tmp[i*2+1] == tmp[j*2+1]: + del tmp[i*2+1] + del tmp[i*2] + + for i in range(0, len(tmp)/2): + cmd = "ethtool -i %s | grep driver" % tmp[i*2][0:len(tmp[i*2])-1] + (status, ret) = commands.getstatusoutput(cmd) + if status != 0: + g_net.append(root.create_child("net_" + format_name(tmp[i*2] + + tmp[i*2+1]), root.path, "net")) + continue + + cmd = "echo %s | awk {'print $2'}" % ret + (status, ret) = commands.getstatusoutput(cmd) + driver = ret + + cmd = "echo %s | egrep -v 'tun|bridge'" % driver + (status, ret) = commands.getstatusoutput(cmd) + if status == 0: + for entry in g_pci: + cmd = "cat %s/uevent | grep %s" % (entry.path, driver) + (status, ret) = commands.getstatusoutput(cmd) + if status == 0: + g_net.append(entry.create_child("net_" + format_name( + tmp[i*2] + tmp[i*2+1]), entry.path, "net")) + else: + g_net.append(root.create_child("net_" + format_name(tmp[i*2] + + tmp[i*2+1]), root.path, "net")) + + + return 0 + +def list_scsi_host(node): + """list all scsi host nodedevices""" + cmd = "find %s -name host*" % node.path + (status, ret) = commands.getstatusoutput(cmd) + if status != 0: + return 1 + if len(ret) == 0: + return 1 + + dir = ret.split('\n') + + for entry in dir: + entry_path = entry + '/' + cmd = "cat %s/uevent | egrep -i '%s'" % (entry_path, + options['scsi_host'][0]) + (status, ret) = commands.getstatusoutput(cmd) + if status == 0: + options['scsi_host'][1].append(node.create_child( + options['scsi_host'][2] + extract_name(entry_path), + entry_path, 'scsi_host')) + + +def list_storage(root): + """list all storage nodedevices""" + global g_nodes, g_storage + cmd = "find %s -name block | sed -e 's/block//'" % root.path + (status, ret) = commands.getstatusoutput(cmd) + if status != 0: + return 1 + + if len(ret) == 0: + return 1 + + blk = ret.split('\n') + + for blk_entry in blk: + for node_entry in g_nodes: + if cmp(blk_entry, node_entry.path) == 0: + cmd = "ls %s/block" % blk_entry + (status, ret) = commands.getstatusoutput(cmd) + if status != 0: + continue + + g_storage.append(node_entry.create_child("block_" + ret, + blk_entry+"block/", "storage")) + return 0 + + +def list_node(node_device, path, cap, checktop): + """list a nodedevices though path.""" + dirs = [] + if checktop == True: + cmd = "cat %suevent | egrep -i '%s'" % (path, options[cap][0]) + (status, ret) = commands.getstatusoutput(cmd) + if status != 0: + return 1 + else: + options[cap][1].append(node_device.create_child(options[cap][2] + + extract_name(path), path, cap)) + + cmd = "ls %s" % path + (status, ret) = commands.getstatusoutput(cmd) + if status != 0: + return 1 + + cmd = "ls -l %s | grep '^d' | awk {'print $9'}" % path + (status, ret) = commands.getstatusoutput(cmd) + + if len(ret) == 0: + return 1 + + dirs = ret.split('\n') + + for entry in dirs: + list_node(node_device, path + entry + "/", cap, True) + + return 0 + + +def list_nodedevices(params): + """list all nodedevices""" + global logger + global g_nodes, g_pci, g_usb_device, g_usb, g_net + global g_scsi_host, g_scsi_target, g_scsi, g_storage + ret = 0 + + logger = params['logger'] + + root = NodeDevice("computer", "/sys/devices/pci0000:00/") + g_nodes.append(root) + + # find pci + list_node(root, root.path, 'pci', False) + g_nodes += g_pci + + # find usb_device + for entry in g_pci: + list_node(entry, entry.path, 'usb_device', False) + g_nodes += g_usb_device + + # find usb + for entry in g_usb_device: + list_node(entry, entry.path, 'usb', False) + g_nodes += g_usb + + # find scsi_host + for entry in g_pci + g_usb: + list_scsi_host(entry) + g_nodes += g_scsi_host + + # find scsi_target + for entry in g_scsi_host: + list_node(entry, entry.path, 'scsi_target', False) + g_nodes += g_scsi_target + + # find scsi + for entry in g_scsi_target: + list_node(entry, entry.path, 'scsi', False) + g_nodes += g_scsi + + # find net + list_net(root) + g_nodes += g_net + + # find storage + list_storage(root) + g_nodes += g_storage + + logger.debug("Traverse the node device list") + + sharedmod.data['all_nodes'] = g_nodes + + try: + conn = sharedmod.libvirtobj['conn'] + retlist = conn.listAllDevices(0) + + if len(retlist) > len(g_nodes): + for entry in g_nodes: + print entry.name + logger.error("list_all_node_devices miss some devices") + return 1 + elif len(retlist) < len(g_nodes): + for entry in g_nodes: + print entry.name + logger.error("listAllDevices miss some devices") + return 1 + + for entry in retlist: + checked = 0 + for node in g_nodes: + if entry.name().find(node.name) == 0: + logger.info("%s \033[32mchecked\033[0m" % entry.name()) + checked = 1 + ret = 0 + else: + if checked == 0: + logger.error("%s \033[31mnot found\033[0m" % entry.name()) + ret = 1 + + + except libvirtError, e: + logger.error("API error message: %s, error code is %s" + % (e.message, e.get_error_code())) + return 1 + + return ret diff --git a/repos/nodedevice/parent_name.py b/repos/nodedevice/parent_name.py new file mode 100644 index 0000000..5ce27f5 --- /dev/null +++ b/repos/nodedevice/parent_name.py @@ -0,0 +1,63 @@ +#!/usr/bin/env python + +import os +import sys + +import libvirt +from libvirt import libvirtError + +from src import sharedmod +from utils import utils + +required_params = ('pciaddress',) +optional_params = {} + +def parent_name(params): + """check nodedevice parant and name API""" + global logger + logger = params['logger'] + + pciaddress = params['pciaddress'] + + nodedevice = None + + if not sharedmod.data.has_key('all_nodes'): + logger.error("Failed to get nodes.") + return 1 + + + (bus, slot_func) = pciaddress.split(":") + (slot, func) = slot_func.split(".") + device_name = "pci_0000_%s_%s_%s" % (bus, slot, func) + logger.debug("the name of the pci device is: %s" % device_name) + + nodes = sharedmod.data['all_nodes'] + + for entry in nodes: + if cmp(entry.name, device_name): + nodedevice = entry + else: + if nodedevice is None: + logger.error("parent_name cannot find %s" % device_name) + return 1 + + parent_nodedevice = nodedevice.parent + + conn = sharedmod.libvirtobj['conn'] + + try: + node_obj = conn.nodeDeviceLookupByName(device_name) + parent_node_name = node_obj.parent() + + logger.info("%s's parent name is %s" %(device_name, parent_node_name)) + + if not cmp(parent_node_name, parent_nodedevice.name): + logger.error("%s's parent device name error: %s, should be %s." + % (device_name, parent_node_name, parent_nodedevice.name)) + return 1 + except libvirtError, e: + logger.error("API error message: %s, error code is %s" + % (e.message, e.get_error_code())) + return 1 + + return 0 -- 1.8.2.1

1 0

[libvirt] test failures with -Bsymbolic-functions on Ubuntu
by Claudio Bley 21 Oct '13

21 Oct '13

Hi. I'm trying to build an Ubuntu package of the latest liberty release in order to deploy it on a few different machines. Unfortunately, 1 of the 93 tests failed: ---------------------------------------------------------------------- TEST: virnetserverclienttest libvirt: error : An error occurred, but the cause is unknown ! 1 FAIL FAIL: virnetserverclienttest ---------------------------------------------------------------------- Apparently, Ubuntu is passing the -Bsymbolic-functions flag to the linker which causes the pre-loading and mocking of the virEventAddTimeout function of libvirt.so to fail. Other tests print error messages as well, but they won't fail. Now, I'm wondering whether there is a way to prevent passing the -Bsymbolic-functions flag to the linker when compiling the library, but force re-linking using this flag when installing using libtool? I'd appreciate any other ideas as well of course. Thanks! Claudio -- AV-Test GmbH, Henricistraße 20, 04155 Leipzig, Germany Phone: +49 341 265 310 19 Web:<http://www.av-test.org> Eingetragen am / Registered at: Amtsgericht Stendal (HRB 114076) Geschaeftsfuehrer (CEO): Andreas Marx, Guido Habicht, Maik Morgenstern

1 0

[libvirt] [PATCH 0/3] fix removal of <interface type='hostdev'>
by Laine Stump 21 Oct '13

21 Oct '13

1/3 is a cleanup, but not strictly necessary to solve the current bug 2/3 is just code movement of an entire function to avoid a forward ref. 3/3 is what actually fixes the bug. This resolves https://bugzilla.redhat.com/show_bug.cgi?id=1005682 Laine Stump (3): qemu: simplify calling qemuDomainHostdevNetConfigRestore qemu: move qemuDomainRemoveNetDevice to avoid forward reference qemu: fix removal of <interface type='hostdev'> src/qemu/qemu_hostdev.c | 33 +++++------- src/qemu/qemu_hotplug.c | 141 ++++++++++++++++++++++++------------------------ 2 files changed, 85 insertions(+), 89 deletions(-) -- 1.8.3.1

2 4

[libvirt] [PATCH] Fix perms for virConnectDomainXML{To, From}Native (CVE-2013-4401)
by Daniel P. Berrange 21 Oct '13

21 Oct '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The virConnectDomainXMLToNative API should require 'connect:write' not 'connect:read', since it will trigger execution of the QEMU binaries listed in the XML. Also make virConnectDomainXMLFromNative API require a full read-write connection and 'connect:write' permission. Although the current impl doesn't trigger execution of QEMU, we should not rely on that impl detail from an API permissioning POV. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> Pushed as a security fix --- src/libvirt.c | 4 ++++ src/remote/remote_protocol.x | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index 9f579a6..7fa675a 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -4611,6 +4611,10 @@ char *virConnectDomainXMLFromNative(virConnectPtr conn, virDispatchError(NULL); return NULL; } + if (conn->flags & VIR_CONNECT_RO) { + virLibDomainError(VIR_ERR_OPERATION_DENIED, __FUNCTION__); + goto error; + } virCheckNonNullArgGoto(nativeFormat, error); virCheckNonNullArgGoto(nativeConfig, error); diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index 810eeca..f942670 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -3826,13 +3826,13 @@ enum remote_procedure { /** * @generate: both - * @acl: connect:read + * @acl: connect:write */ REMOTE_PROC_CONNECT_DOMAIN_XML_FROM_NATIVE = 135, /** * @generate: both - * @acl: connect:read + * @acl: connect:write */ REMOTE_PROC_CONNECT_DOMAIN_XML_TO_NATIVE = 136, -- 1.8.3.1

1 0

[libvirt] [PATCH]doc: fix a typo in formatdomain
by Chen Hanxiao 21 Oct '13

21 Oct '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> s/effect/affect Signed-off-by: Chen Hanxiao <chenhanxiao(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 c5a3fa8..7cf6b58 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -272,7 +272,7 @@ no arguments. To specify the initial argv, use the <code>initarg</code> element, repeated as many time as is required. The <code>cmdline</code> element, if set will be used to provide an equivalent to <code>/proc/cmdline</code> - but will not effect init argv. + but will not affect init argv. </p> <pre> -- 1.8.2.1

2 1

[libvirt] [PATCH] qemu: Fix augeas support for migration ports
by Michal Privoznik 18 Oct '13

18 Oct '13

Commit e3ef20d7 allows user to configure migration ports range via qemu.conf. However, it forgot to update augeas definition file and even the test data was malicious. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under trivial and build breaker rules. src/qemu/libvirtd_qemu.aug | 2 ++ src/qemu/test_libvirtd_qemu.aug.in | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug index 93a2a29..a9ff421 100644 --- a/src/qemu/libvirtd_qemu.aug +++ b/src/qemu/libvirtd_qemu.aug @@ -82,6 +82,8 @@ module Libvirtd_qemu = | int_entry "keepalive_count" let network_entry = str_entry "migration_address" + | int_entry "migration_port_min" + | int_entry "migration_port_max" (* Each entry in the config is one of the following ... *) let entry = vnc_entry diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in index 8f4b3a9..81fedd6 100644 --- a/src/qemu/test_libvirtd_qemu.aug.in +++ b/src/qemu/test_libvirtd_qemu.aug.in @@ -70,5 +70,5 @@ module Test_libvirtd_qemu = { "keepalive_count" = "5" } { "seccomp_sandbox" = "1" } { "migration_address" = "127.0.0.1" } -{ "migration_port_min" = "1234" } -{ "migration_port_max" = "12345" } +{ "migration_port_min" = "49152" } +{ "migration_port_max" = "49215" } -- 1.8.1.5

2 1

Re: [libvirt] [Users] vdsmd seg fault
by Dan Kenigsberg 18 Oct '13

18 Oct '13

On Fri, Oct 18, 2013 at 11:32:51AM -0700, Jason Brooks wrote: > > On Fri, 2013-10-18 at 14:16 +0300, Dan Kenigsberg wrote: > > On Thu, Oct 17, 2013 at 05:15:48PM -0400, Jason Brooks wrote: > > > > > > > > > ----- Original Message ----- > > > > From: "Dan Ferris" <dferris(a)prometheusresearch.com> > > > > To: "<users(a)ovirt.org>" <users(a)ovirt.org> > > > > Sent: Tuesday, October 15, 2013 9:24:44 AM > > > > Subject: [Users] vdsmd seg fault > > > > > > > > I updated to the latest Fedora 19 on two test servers, and now vdsmd > > > > will not start. > > > > > > > > Systedctl says this: > > > > > > > > dsmd.service - Virtual Desktop Server Manager > > > > Loaded: loaded (/usr/lib/systemd/system/vdsmd.service; enabled) > > > > Active: failed (Result: exit-code) since Mon 2013-10-14 12:31:30 > > > > EDT; 23h ago > > > > Process: 1788 ExecStart=/lib/systemd/systemd-vdsmd start > > > > (code=exited, status=139) > > > > > > > > Oct 14 12:31:30 rs0-ovirt0.rexdb.us python[1862]: DIGEST-MD5 ask_user_info() > > > > Oct 14 12:31:30 rs0-ovirt0.rexdb.us python[1862]: DIGEST-MD5 client step 2 > > > > Oct 14 12:31:30 rs0-ovirt0.rexdb.us python[1862]: DIGEST-MD5 ask_user_info() > > > > Oct 14 12:31:30 rs0-ovirt0.rexdb.us python[1862]: DIGEST-MD5 > > > > make_client_response() > > > > Oct 14 12:31:30 rs0-ovirt0.rexdb.us python[1862]: DIGEST-MD5 client step 3 > > > > Oct 14 12:31:30 rs0-ovirt0.rexdb.us systemd-vdsmd[1788]: > > > > /lib/systemd/systemd-vdsmd: line 185: 1862 Segmentation fault > > > > "$VDSM_TOOL" nwfilter > > > > Oct 14 12:31:30 rs0-ovirt0.rexdb.us systemd-vdsmd[1788]: vdsm: Failed to > > > > define network filters on libvirt[FAILED] > > > > Oct 14 12:31:30 rs0-ovirt0.rexdb.us systemd[1]: vdsmd.service: control > > > > process exited, code=exited status=139 > > > > Oct 14 12:31:30 rs0-ovirt0.rexdb.us systemd[1]: Failed to start Virtual > > > > Desktop Server Manager. > > > > Oct 14 12:31:30 rs0-ovirt0.rexdb.us systemd[1]: Unit vdsmd.service > > > > entered failed state. > > > > > > > > Has anyone else experienced this? > > > > > > I just hit this on one of my test installs. > > > > > > I did yum downgrade libvirt* and then vdsmd would start > > > > Which was the faulty libvirt? Was there anything interesting at the > > /var/log/libvirtd.log? > > libvirt-1.0.5.6-3.fc19 -- it started fine until I rebooted. SElinux is > permissive on these machines, btw. These machines are nested inside of > my main oVirt install, as well. > > I couldn't see anything in the libvirtd.log that looked different from > the libvirtd.log on a node w/ the downgraded libvirt. Maybe someone on libvir-list can suggest why something like conn.nwfilterLookupByName(self.filterName).undefine() conn.nwfilterDefineXML(self.buildFilterXml() suddenly segfaults when run in a systemd unit context?

1 0

[libvirt] [PATCH] Fix a problem introduced by commit 99889012
by Geoff Hickey 18 Oct '13

18 Oct '13

The meaning of one line of code was accidentally inverted. --- src/esx/esx_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 5d8baa5..886d984 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -1003,7 +1003,7 @@ esxConnectOpen(virConnectPtr conn, virConnectAuthPtr auth, } /* Connect to vCenter */ - if (!priv->parsedUri->vCenter) { + if (priv->parsedUri->vCenter) { if (STREQ(priv->parsedUri->vCenter, "*")) { if (!potentialVCenterIpAddress) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", -- 1.8.1.2

2 1

[libvirt] [PATCH] docs: Expand description of host-model CPU mode
by Jiri Denemark 18 Oct '13

18 Oct '13

host-model is a nice idea but it's current implementation make it useless on some hosts so it should be used with care. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- docs/formatdomain.html.in | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index c5a3fa8..491a6a9 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -924,7 +924,16 @@ model even if the destination host contains more capable CPUs for the running instance of the guest; but shutting down and restarting the guest may present different hardware to the guest according to - the capabilities of the new host.</dd> + the capabilities of the new host. <strong>Beware</strong>, due to the + way libvirt detects host CPU and due to the fact libvirt does not + talk to QEMU/KVM when creating the CPU model, CPU configuration + created using <code>host-model</code> may not work as expected. The + guest CPU may differ from the configuration and it may also confuse + guest OS by using a combination of CPU features and other parameters + (such as CPUID level) that don't work. Until these issues are fixed, + it's a good idea to avoid using <code>host-model</code> and use + <code>custom</code> mode with just the CPU model from host + capabilities XML.</dd> <dt><code>host-passthrough</code></dt> <dd>With this mode, the CPU visible to the guest should be exactly the same as the host CPU even in the aspects that libvirt does not -- 1.8.4

2 2

[libvirt] [PATCH] qemu: Make migration port range configurable
by Jiri Denemark 18 Oct '13

18 Oct '13

Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu.conf | 11 +++++++++++ src/qemu/qemu_conf.c | 21 +++++++++++++++++++++ src/qemu/qemu_conf.h | 2 ++ src/qemu/qemu_driver.c | 4 ++-- src/qemu/test_libvirtd_qemu.aug.in | 2 ++ 5 files changed, 38 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index bf57b9c..a6d7c15 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -436,3 +436,14 @@ # Override the listen address for all incoming migrations. Defaults to # 0.0.0.0 or :: in case if both host and qemu are capable of IPv6. #migration_address = "127.0.0.1" + + +# Override the port range used for incoming migrations. +# +# Minimum must be greater than 0, however when QEMU is not running as root, +# setting the minimum to be lower than 1024 will not work. +# +# Maximum must be lower then 65535. +# +#migration_port_min = 49152 +#migration_port_max = 49215 diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 44a2296..b80f399 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -225,6 +225,9 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged) cfg->webSocketPortMin = QEMU_WEBSOCKET_PORT_MIN; cfg->webSocketPortMax = QEMU_WEBSOCKET_PORT_MAX; + cfg->migrationPortMin = QEMU_MIGRATION_PORT_MIN; + cfg->migrationPortMax = QEMU_MIGRATION_PORT_MAX; + #if defined HAVE_MNTENT_H && defined HAVE_GETMNTENT_R /* For privileged driver, try and find hugepage mount automatically. * Non-privileged driver requires admin to create a dir for the @@ -459,6 +462,24 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, goto cleanup; } + GET_VALUE_LONG("migration_port_min", cfg->migrationPortMin); + if (cfg->migrationPortMin <= 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("%s: migration_port_min: port must be greater than 0"), + filename); + goto cleanup; + } + + GET_VALUE_LONG("migration_port_max", cfg->migrationPortMax); + if (cfg->migrationPortMax > 65535 || + cfg->migrationPortMax < cfg->migrationPortMin) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("%s: migration_port_max: port must be between " + "the minimal port %d and 65535"), + filename, cfg->migrationPortMin); + goto cleanup; + } + p = virConfGetValue(conf, "user"); CHECK_TYPE("user", VIR_CONF_STRING); if (p && p->str && diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index 863d215..2b04cdb 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -159,6 +159,8 @@ struct _virQEMUDriverConfig { /* The default for -incoming */ char *migrationAddress; + int migrationPortMin; + int migrationPortMax; }; /* Main driver state */ diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 895681b..4977b12 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -688,8 +688,8 @@ qemuStateInitialize(bool privileged, goto error; if ((qemu_driver->migrationPorts = - virPortAllocatorNew(QEMU_MIGRATION_PORT_MIN, - QEMU_MIGRATION_PORT_MAX)) == NULL) + virPortAllocatorNew(cfg->migrationPortMin, + cfg->migrationPortMax)) == NULL) goto error; if (qemuSecurityInit(qemu_driver) < 0) diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in index 7af3f64..71a29df 100644 --- a/src/qemu/test_libvirtd_qemu.aug.in +++ b/src/qemu/test_libvirtd_qemu.aug.in @@ -68,3 +68,5 @@ module Test_libvirtd_qemu = { "keepalive_count" = "5" } { "seccomp_sandbox" = "1" } { "migration_address" = "127.0.0.1" } +{ "migration_port_min" = "1234" } +{ "migration_port_max" = "12345" } -- 1.8.3.2

2 2

[libvirt] [PATCH] qemu: Avoid assigning unavailable migration ports
by Jiri Denemark 18 Oct '13

18 Oct '13

From: WangYufei <james.wangyufei(a)huawei.com> https://bugzilla.redhat.com/show_bug.cgi?id=1019053 When we migrate vms concurrently, there's a chance that libvirtd on destination assigns the same port for different migrations, which will lead to migration failure during prepare phase on destination. So we use virPortAllocator here to solve the problem. Signed-off-by: WangYufei <james.wangyufei(a)huawei.com> Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com> --- src/qemu/qemu_command.h | 3 +++ src/qemu/qemu_conf.h | 6 +++--- src/qemu/qemu_domain.h | 1 + src/qemu/qemu_driver.c | 6 ++++++ src/qemu/qemu_migration.c | 39 +++++++++++++++++++++++++-------------- 5 files changed, 38 insertions(+), 17 deletions(-) diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index 2e2acfb..3277ba4 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -51,6 +51,9 @@ # define QEMU_WEBSOCKET_PORT_MIN 5700 # define QEMU_WEBSOCKET_PORT_MAX 65535 +# define QEMU_MIGRATION_PORT_MIN 49152 +# define QEMU_MIGRATION_PORT_MAX 49215 + typedef struct _qemuBuildCommandLineCallbacks qemuBuildCommandLineCallbacks; typedef qemuBuildCommandLineCallbacks *qemuBuildCommandLineCallbacksPtr; struct _qemuBuildCommandLineCallbacks { diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index ea3c691..863d215 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -225,6 +225,9 @@ struct _virQEMUDriver { /* Immutable pointer, self-locking APIs */ virPortAllocatorPtr webSocketPorts; + /* Immutable pointer, self-locking APIs */ + virPortAllocatorPtr migrationPorts; + /* Immutable pointer, lockless APIs*/ virSysinfoDefPtr hostsysinfo; @@ -246,9 +249,6 @@ struct _qemuDomainCmdlineDef { char **env_value; }; -/* Port numbers used for KVM migration. */ -# define QEMUD_MIGRATION_FIRST_PORT 49152 -# define QEMUD_MIGRATION_NUM_PORTS 64 void qemuDomainCmdlineDefFree(qemuDomainCmdlineDefPtr def); diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 5d9fab9..2f9d20f 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -160,6 +160,7 @@ struct _qemuDomainObjPrivate { unsigned long migMaxBandwidth; char *origname; int nbdPort; /* Port used for migration with NBD */ + int migrationPort; virChrdevsPtr devs; diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 746da26..895681b 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -687,6 +687,11 @@ qemuStateInitialize(bool privileged, cfg->webSocketPortMax)) == NULL) goto error; + if ((qemu_driver->migrationPorts = + virPortAllocatorNew(QEMU_MIGRATION_PORT_MIN, + QEMU_MIGRATION_PORT_MAX)) == NULL) + goto error; + if (qemuSecurityInit(qemu_driver) < 0) goto error; @@ -993,6 +998,7 @@ qemuStateCleanup(void) { virObjectUnref(qemu_driver->domains); virObjectUnref(qemu_driver->remotePorts); virObjectUnref(qemu_driver->webSocketPorts); + virObjectUnref(qemu_driver->migrationPorts); virObjectUnref(qemu_driver->xmlopt); diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 38edadb..a77aeb7 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -2141,6 +2141,9 @@ qemuMigrationPrepareCleanup(virQEMUDriverPtr driver, qemuDomainJobTypeToString(priv->job.active), qemuDomainAsyncJobTypeToString(priv->job.asyncJob)); + virPortAllocatorRelease(driver->migrationPorts, priv->migrationPort); + priv->migrationPort = 0; + if (!qemuMigrationJobIsActive(vm, QEMU_ASYNC_JOB_MIGRATION_IN)) return; qemuDomainObjDiscardAsyncJob(driver, vm); @@ -2156,7 +2159,8 @@ qemuMigrationPrepareAny(virQEMUDriverPtr driver, virDomainDefPtr *def, const char *origname, virStreamPtr st, - unsigned int port, + unsigned short port, + bool autoPort, const char *listenAddress, unsigned long flags) { @@ -2436,6 +2440,8 @@ done: goto cleanup; } + if (autoPort) + priv->migrationPort = port; ret = 0; cleanup: @@ -2503,7 +2509,7 @@ qemuMigrationPrepareTunnel(virQEMUDriverPtr driver, ret = qemuMigrationPrepareAny(driver, dconn, cookiein, cookieinlen, cookieout, cookieoutlen, def, origname, - st, 0, NULL, flags); + st, 0, false, NULL, flags); return ret; } @@ -2522,8 +2528,8 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, const char *listenAddress, unsigned long flags) { - static int port = 0; - int this_port; + unsigned short port = 0; + bool autoPort = true; char *hostname = NULL; const char *p; char *uri_str = NULL; @@ -2550,8 +2556,8 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, * to be a correct hostname which refers to the target machine). */ if (uri_in == NULL) { - this_port = QEMUD_MIGRATION_FIRST_PORT + port++; - if (port == QEMUD_MIGRATION_NUM_PORTS) port = 0; + if (virPortAllocatorAcquire(driver->migrationPorts, &port) < 0) + goto cleanup; /* Get hostname */ if ((hostname = virGetHostname()) == NULL) @@ -2570,7 +2576,7 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, * new targets accept both syntaxes though. */ /* Caller frees */ - if (virAsprintf(uri_out, "tcp:%s:%d", hostname, this_port) < 0) + if (virAsprintf(uri_out, "tcp:%s:%d", hostname, port) < 0) goto cleanup; } else { /* Check the URI starts with "tcp:". We will escape the @@ -2607,16 +2613,16 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, if (uri->port == 0) { /* Generate a port */ - this_port = QEMUD_MIGRATION_FIRST_PORT + port++; - if (port == QEMUD_MIGRATION_NUM_PORTS) - port = 0; + if (virPortAllocatorAcquire(driver->migrationPorts, &port) < 0) + goto cleanup; /* Caller frees */ - if (virAsprintf(uri_out, "%s:%d", uri_in, this_port) < 0) + if (virAsprintf(uri_out, "%s:%d", uri_in, port) < 0) goto cleanup; } else { - this_port = uri->port; + port = uri->port; + autoPort = false; } } @@ -2625,12 +2631,15 @@ qemuMigrationPrepareDirect(virQEMUDriverPtr driver, ret = qemuMigrationPrepareAny(driver, dconn, cookiein, cookieinlen, cookieout, cookieoutlen, def, origname, - NULL, this_port, listenAddress, flags); + NULL, port, autoPort, listenAddress, flags); cleanup: virURIFree(uri); VIR_FREE(hostname); - if (ret != 0) + if (ret != 0) { VIR_FREE(*uri_out); + if (autoPort) + virPortAllocatorRelease(driver->migrationPorts, port); + } return ret; } @@ -4410,6 +4419,8 @@ qemuMigrationFinish(virQEMUDriverPtr driver, } qemuMigrationStopNBDServer(driver, vm, mig); + virPortAllocatorRelease(driver->migrationPorts, priv->migrationPort); + priv->migrationPort = 0; if (flags & VIR_MIGRATE_PERSIST_DEST) { virDomainDefPtr vmdef; -- 1.8.3.2

2 3

[libvirt] [PATCH] viralloc.h: Fix typo in VIR_APPEND_ELEMENT_COPY_QUIT
by Michal Privoznik 18 Oct '13

18 Oct '13

In fact, the suffix should be _QUIET not _QUIT to stress the fact, that no OOM error is reported on error. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under trivial rule. src/util/viralloc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/viralloc.h b/src/util/viralloc.h index 2ed654d..55372e5 100644 --- a/src/util/viralloc.h +++ b/src/util/viralloc.h @@ -446,7 +446,7 @@ void virFree(void *ptrptr) ATTRIBUTE_NONNULL(1); virInsertElementsN(&(ptr), sizeof(*(ptr)), -1, &(count), \ VIR_TYPEMATCH(ptr, &(newelem)), &(newelem), true, false, \ false, 0, NULL, NULL, 0) -# define VIR_APPEND_ELEMENT_COPY_QUIT(Eptr, count, newelem) \ +# define VIR_APPEND_ELEMENT_COPY_QUIET(ptr, count, newelem) \ virInsertElementsN(&(ptr), sizeof(*(ptr)), -1, &(count), \ VIR_TYPEMATCH(ptr, &(newelem)), &(newelem), false, false, \ false, 0, NULL, NULL, 0) -- 1.8.1.5

1 0

[libvirt] [PATCH] remote:Fix the parameter passed to remoteDispatchConnectDomainEventDeregisterAny() should be eventID
by Wangyufei (A) 18 Oct '13

18 Oct '13

>From 0832ab83685e20580c8128f5505096e71e747b8a Mon Sep 17 00:00:00 2001 From: zhouyimin <zhouyimin(a)huawei.com> Date: Thu, 17 Oct 2013 15:59:21 +0800 Subject: [PATCH] remote:Fix the parameter passed to remoteDispatchConnectDomainEventDeregisterAny() should be eventID Introduced by 7b87a3 When I quit the process which only register VIR_DOMAIN_EVENT_ID_REBOOT, I got error like: "libvirt: XML-RPC error : internal error: domain event 0 not registered". Then I add the following code, it fixed. Signed-off-by: zhouyimin <zhouyimin(a)huawei.com> --- src/remote/remote_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 87ef5a9..115d0bc 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -5137,7 +5137,7 @@ static int remoteConnectDomainEventDeregisterAny(virConnectPtr conn, /* If that was the last callback for this eventID, we need to disable * events on the server */ if (count == 0) { - args.eventID = callbackID; + args.eventID = eventID; if (call(conn, priv, 0, REMOTE_PROC_CONNECT_DOMAIN_EVENT_DEREGISTER_ANY, (xdrproc_t) xdr_remote_connect_domain_event_deregister_any_args, (char *) &args, -- 1.7.3.1.msysgit.0 Best Regards, -WangYufei

3 5

[libvirt] [FWD: [Qemu-devel] KVM Forum 2013 presentations on Google+ (Hangouts on-air)]
by Daniel P. Berrange 18 Oct '13

18 Oct '13

FYI for those not able to visit KVM Forum this year, we're attempting to have presentations streaming via G+. No guarantees about success, since we're at mercy of the Hotel net connection, but if streaming fails we'll at least have recordings of all sessions to be uploaded afterwards. Keep an eye on the G+ community mentioned below if you want to try and catch any live sessions. We'll put info in there if we suceed in streaming. Also code reviews next week may be subject to delay, since the Red Hat libvirt team will be at the KVM Forum. Regards, Daniel ----- Forwarded message from "Ademar de Souza Reis Jr." <areis(a)redhat.com> ----- > Date: Thu, 17 Oct 2013 17:33:53 -0300 > From: "Ademar de Souza Reis Jr." <areis(a)redhat.com> > To: qemu-devel(a)nongnu.org > Subject: [Qemu-devel] KVM Forum 2013 presentations on Google+ (Hangouts on-air) > > Hi there. > > We're going to broadcast the KVM Forum 2013 presentations and > keynotes using Google+ "Hangouts On-air". We also plan to have > etherpads available for live discussions and notes. > > We're doing our best to make sure the audio/video/internet > quality is good. We can't promise anything at this point, but > hopefully those of you who won't be able to attend might find it > useful. > > Stay tuned! > > Our Google+ page: > http://gplus.to/kvmforum2013 > > Youtube Channel (linked to the page above): > http://www.youtube.com/channel/UCRCSQmAOh7yzgheq-emy1xA > > The program schedule: > http://events.linuxfoundation.org/events/kvm-forum/program/schedule > > Cheers! > - Ademar > > -- > Ademar de Souza Reis Jr. > Red Hat > > ^[:wq! > > ----- End forwarded message ----- -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|

1 0

[libvirt] [PATCH v4 0/2] Libvirt Wireshark Dissector
by Yuto KAWAMURA(kawamuray) 18 Oct '13

18 Oct '13

From: "Yuto KAWAMURA(kawamuray)" <kawamuray.dadada(a)gmail.com> Changes from version 3: * Merge tools/wireshark/.gitignore into ROOT/.gitignore * Fix dissect_xdr_pointer() bug which pointed by Michal * Added -module option to libvirt_la_LDFLAGS respecting official build process Introduce Wireshark dissector plugin which adds support to Wireshark for dissecting libvirt RPC protocol. This feature was presented by Michal Privoznik year before last[1]. But it did only support dissecting packet headers. This time I enhanced that dissector to support dissecting packet payload. Furthermore, I provide code generator of dissector. So you can get fresh build of dissector from libvirt RPC specification file at any version you like. [1] http://www.redhat.com/archives/libvir-list/2011-October/msg00301.html Yuto KAWAMURA(kawamuray) (2): Introduce Libvirt Wireshark dissector Add sample output of Wireshark dissector .gitignore | 2 + Makefile.am | 3 +- cfg.mk | 8 +- configure.ac | 72 +- tools/wireshark/Makefile.am | 22 + tools/wireshark/README.md | 31 + tools/wireshark/samples/libvirt-sample.pdml | 206 ++++++ tools/wireshark/src/Makefile.am | 42 ++ tools/wireshark/src/packet-libvirt.c | 512 ++++++++++++++ tools/wireshark/src/packet-libvirt.h | 128 ++++ tools/wireshark/util/genxdrstub.pl | 1011 +++++++++++++++++++++++++++ tools/wireshark/util/make-dissector-reg | 198 ++++++ 12 files changed, 2229 insertions(+), 6 deletions(-) create mode 100644 tools/wireshark/Makefile.am create mode 100644 tools/wireshark/README.md create mode 100644 tools/wireshark/samples/libvirt-sample.pdml create mode 100644 tools/wireshark/src/Makefile.am create mode 100644 tools/wireshark/src/packet-libvirt.c create mode 100644 tools/wireshark/src/packet-libvirt.h create mode 100755 tools/wireshark/util/genxdrstub.pl create mode 100755 tools/wireshark/util/make-dissector-reg -- 1.8.1.5

1 2

[libvirt] [PATCH 0/4] Start cleaning up nodeinfo.c
by Peter Krempa 18 Oct '13

18 Oct '13

Some parts of nodeinfo.c are a mess. This series is a start of cleanup effort on that file that should result also into tests being written to test the nodeinfo code as it was shown to be fragile. To avoid sending a huge series I will send it continuously as I progress. Peter Krempa (4): nodeinfo: Rename linuxNodeInfoCPUPopulate and export it properly numa: Introduce virNumaIsAvailable and use it instead of numa_available nodeinfo: Avoid forward declarations of static functions numa: Introduce virNumaGetMaxNode and use it instead of numa_max_node src/libvirt_linux.syms | 2 +- src/libvirt_private.syms | 2 + src/nodeinfo.c | 173 +++++++++++++++++++++++------------------------ src/nodeinfo.h | 5 ++ src/util/virnuma.c | 51 ++++++++++++++ src/util/virnuma.h | 4 ++ tests/nodeinfotest.c | 6 +- 7 files changed, 148 insertions(+), 95 deletions(-) -- 1.8.3.2

1 5

[libvirt] [PATCHv3 RESEND 0/5] Handling of undefine and redefine snapshots with VirtualBox 4.2
by Manuel VIVES 18 Oct '13

18 Oct '13

Hi, This is a serie of patches in order to support undefining and redefining snapshots with VirtualBox 4.2. The serie of patches is rather big, and adds among other things some utility functions unrelated to VirtualBox in patches 1 & 2. The code review could be done in several parts: e.g. patches 1 & 2 separately to validate the utility functions. The VirtualBox API provides only high level operations to manipulate snapshots, so it not possible to support flags like VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE and VIR_DOMAIN_SNAPSHOT_DELETE_METADATA_ONLY with only API calls. Following an IRC talk with Eric Blake, the decision was taken to emulate these behaviours by manipulating directly the .vbox XML files. The first two patches are some util methods for handling uuid and strings that will be used after. The third patch brings more details in the snapshot XML returned by libvirt. We will need those modifications in order to redefine the snapshots. The fourth patch brings the support of the VIR_DOMAIN_SNAPSHOT_CREATE_REDEFINE and VIR_DOMAIN_SNAPSHOT_CREATE_CURRENT flags in virDomainSnapshotCreateXML. The fifth and last patch brings the support of the VIR_DOMAIN_SNAPSHOT_DELETE_METADATA_ONLY flag in virDomainSnapshotDelete. The patches are only for Virtualbox 4.2 Regards, Manuel VIVES V3: * Use of STREQ_NULLABLE instead of STREQ in one case * Fix the method for finding uuids according to Ján Tomko review V2: * Fix a licence problem with the method for string replacement Manuel VIVES (5): viruuid.h/c: Util method for finding uuid patterns in some strings virstring.h/c: Util method for making some find and replace in strings vbox_tmpl.c: Better XML description for snapshots vbox_tmpl.c: Patch for redefining snapshots vbox_tmpl.c: Add methods for undefining snapshots po/POTFILES.in | 1 + src/conf/domain_conf.c | 2 +- src/libvirt_private.syms | 2 + src/util/virstring.c | 48 ++ src/util/virstring.h | 2 + src/util/viruuid.c | 81 ++ src/util/viruuid.h | 1 + src/vbox/vbox_tmpl.c | 1846 +++++++++++++++++++++++++++++++++++++++++++--- 8 files changed, 1871 insertions(+), 112 deletions(-) -- 1.7.10.4

1 5

[libvirt] [PATCH] qemuDomainCleanupRemove: s/memmove/VIR_DELETE_ELEMENT_INPLACE/
by Michal Privoznik 18 Oct '13

18 Oct '13

The last argument of memmove is the amount of bytes to be moved. The amount is in Bytes. We are moving some void pointers around. However, since sizeof(void *) is not Byte on any architecture, we've got the arithmetic wrong. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- src/qemu/qemu_domain.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index d054d64..b8aec2d 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -2235,12 +2235,9 @@ qemuDomainCleanupRemove(virDomainObjPtr vm, VIR_DEBUG("vm=%s, cb=%p", vm->def->name, cb); for (i = 0; i < priv->ncleanupCallbacks; i++) { - if (priv->cleanupCallbacks[i] == cb) { - memmove(priv->cleanupCallbacks + i, - priv->cleanupCallbacks + i + 1, - priv->ncleanupCallbacks - i - 1); - priv->ncleanupCallbacks--; - } + if (priv->cleanupCallbacks[i] == cb) + VIR_DELETE_ELEMENT_INPLACE(priv->cleanupCallbacks, + i, priv->ncleanupCallbacks); } VIR_SHRINK_N(priv->cleanupCallbacks, -- 1.8.1.5

3 2

[libvirt] [PATCH v2] qemu_migration: Avoid crashing if domain dies too quickly
by Michal Privoznik 18 Oct '13

18 Oct '13

I've noticed a SIGSEGV-ing libvirtd on the destination when the qemu died too quickly = in Prepare phase. What is happening here is: 1) [Thread 3493] We are in qemuMigrationPrepareAny() and calling qemuProcessStart() which subsequently calls qemuProcessWaitForMonitor() and qemuConnectMonitor(). So far so good. The qemuMonitorOpen() succeeds, however switching monitor to QMP mode fails as qemu died meanwhile. That is qemuMonitorSetCapabilities() returns -1. 2013-10-08 15:54:10.629+0000: 3493: debug : qemuMonitorSetCapabilities:1356 : mon=0x14a53da0 2013-10-08 15:54:10.630+0000: 3493: debug : qemuMonitorJSONCommandWithFd:262 : Send command '{"execute":"qmp_capabilities","id":"libvirt-1"}' for write with FD -1 2013-10-08 15:54:10.630+0000: 3493: debug : virEventPollUpdateHandle:147 : EVENT_POLL_UPDATE_HANDLE: watch=17 events=13 ... 2013-10-08 15:54:10.631+0000: 3493: debug : qemuMonitorSend:956 : QEMU_MONITOR_SEND_MSG: mon=0x14a53da0 msg={"execute":"qmp_capabilities","id":"libvirt-1"} fd=-1 2013-10-08 15:54:10.631+0000: 3262: debug : virEventPollRunOnce:641 : Poll got 1 event(s) 2) [Thread 3262] The event loop is trying to do the talking to monitor. However, qemu is dead already, remember? 2013-10-08 15:54:13.436+0000: 3262: error : qemuMonitorIORead:551 : Unable to read from monitor: Connection reset by peer 2013-10-08 15:54:13.516+0000: 3262: debug : virFileClose:90 : Closed fd 25 ... 2013-10-08 15:54:13.533+0000: 3493: debug : qemuMonitorSend:968 : Send command resulted in error internal error: early end of file from monitor: possible problem: 3) [Thread 3493] qemuProcessStart() failed. No big deal. Go to the 'endjob' label and subsequently to the 'cleanup'. Since the domain is not persistent and ret is -1, the qemuDomainRemoveInactive() is called. This has an (unpleasant) effect of virObjectUnref()-in the @vm object. Unpleasant because the event loop which is about to trigger EOF callback still holds a pointer to the @vm (not the reference). See the valgrind output below. 4) [Thread 3262] So the even loop starts triggering EOF: 2013-10-08 15:54:13.542+0000: 3262: debug : qemuMonitorIO:729 : Triggering EOF callback 2013-10-08 15:54:13.543+0000: 3262: debug : qemuProcessHandleMonitorEOF:294 : Received EOF on 0x14549110 'migt10' And the monitor is cleaned up. This results in calling qemuProcessHandleMonitorEOF with the @vm pointer passed. The pointer is kept in qemuMonitor struct. ==3262== Thread 1: ==3262== Invalid read of size 4 ==3262== at 0x77ECCAA: pthread_mutex_lock (in /lib64/libpthread-2.15.so) ==3262== by 0x52FAA06: virMutexLock (virthreadpthread.c:85) ==3262== by 0x52E3891: virObjectLock (virobject.c:320) ==3262== by 0x11626743: qemuProcessHandleMonitorEOF (qemu_process.c:296) ==3262== by 0x11642593: qemuMonitorIO (qemu_monitor.c:730) ==3262== by 0x52BD526: virEventPollDispatchHandles (vireventpoll.c:501) ==3262== by 0x52BDD49: virEventPollRunOnce (vireventpoll.c:648) ==3262== by 0x52BBC68: virEventRunDefaultImpl (virevent.c:274) ==3262== by 0x542D3D9: virNetServerRun (virnetserver.c:1112) ==3262== by 0x11F368: main (libvirtd.c:1513) ==3262== Address 0x14549128 is 24 bytes inside a block of size 136 free'd ==3262== at 0x4C2AF5C: free (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==3262== by 0x529B1FF: virFree (viralloc.c:580) ==3262== by 0x52E3703: virObjectUnref (virobject.c:270) ==3262== by 0x531557E: virDomainObjListRemove (domain_conf.c:2355) ==3262== by 0x1160E899: qemuDomainRemoveInactive (qemu_domain.c:2061) ==3262== by 0x1163A0C6: qemuMigrationPrepareAny (qemu_migration.c:2450) ==3262== by 0x1163A923: qemuMigrationPrepareDirect (qemu_migration.c:2626) ==3262== by 0x11682D71: qemuDomainMigratePrepare3Params (qemu_driver.c:10309) ==3262== by 0x53B0976: virDomainMigratePrepare3Params (libvirt.c:7266) ==3262== by 0x1502D3: remoteDispatchDomainMigratePrepare3Params (remote.c:4797) ==3262== by 0x12DECA: remoteDispatchDomainMigratePrepare3ParamsHelper (remote_dispatch.h:5741) ==3262== by 0x54322EB: virNetServerProgramDispatchCall (virnetserverprogram.c:435) The mon->vm is set in qemuMonitorOpenInternal() which is the correct place to increase @vm ref counter. The correct place to decrease the ref counter is then qemuMonitorDispose(). Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- It turned out the hack from v1 is no longer needed. In fact, my reasoning there flavouring the hack was flawed. src/qemu/qemu_capabilities.c | 14 ++++++++++---- src/qemu/qemu_monitor.c | 4 +++- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 7c39c1c..17095b4 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -2587,7 +2587,8 @@ virQEMUCapsInitQMP(virQEMUCapsPtr qemuCaps, char *monpath = NULL; char *pidfile = NULL; pid_t pid = 0; - virDomainObj vm; + virDomainObjPtr vm = NULL; + virDomainXMLOptionPtr xmlopt = NULL; /* the ".sock" sufix is important to avoid a possible clash with a qemu * domain called "capabilities" @@ -2650,10 +2651,13 @@ virQEMUCapsInitQMP(virQEMUCapsPtr qemuCaps, goto cleanup; } - memset(&vm, 0, sizeof(vm)); - vm.pid = pid; + if (!(xmlopt = virDomainXMLOptionNew(NULL, NULL, NULL)) || + !(vm = virDomainObjNew(xmlopt))) + goto cleanup; + + vm->pid = pid; - if (!(mon = qemuMonitorOpen(&vm, &config, true, &callbacks, NULL))) { + if (!(mon = qemuMonitorOpen(vm, &config, true, &callbacks, NULL))) { ret = 0; goto cleanup; } @@ -2673,6 +2677,8 @@ cleanup: virCommandFree(cmd); VIR_FREE(monarg); VIR_FREE(monpath); + virObjectUnref(vm); + virObjectUnref(xmlopt); if (pid != 0) { char ebuf[1024]; diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index a601ee0..2bafe28 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -255,6 +255,8 @@ static void qemuMonitorDispose(void *obj) VIR_DEBUG("mon=%p", mon); if (mon->cb && mon->cb->destroy) (mon->cb->destroy)(mon, mon->vm, mon->callbackOpaque); + virObjectUnref(mon->vm); + virCondDestroy(&mon->notify); VIR_FREE(mon->buffer); virJSONValueFree(mon->options); @@ -781,7 +783,7 @@ qemuMonitorOpenInternal(virDomainObjPtr vm, } mon->fd = fd; mon->hasSendFD = hasSendFD; - mon->vm = vm; + mon->vm = virObjectRef(vm); mon->json = json; if (json) mon->waitGreeting = true; -- 1.8.1.5

3 7

[libvirt] [PATCH]daemon: don't free domain if it's null
by Chen Hanxiao 18 Oct '13

18 Oct '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> If we fail to get domain, we had to judge whether it's null or not when doing 'cleanup'. Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- daemon/remote.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/daemon/remote.c b/daemon/remote.c index f3de6a0..decaecc 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -4643,7 +4643,8 @@ lxcDispatchDomainOpenNamespace(virNetServerPtr server ATTRIBUTE_UNUSED, cleanup: if (rv < 0) virNetMessageSaveError(rerr); - virDomainFree(dom); + if (dom) + virDomainFree(dom); return rv; } -- 1.8.2.1

2 1

[libvirt] [PATCH] Fix typo s/SASL_CONF_DIR/SASL_CONF_PATH/ in QEMU VNC code
by Daniel P. Berrange 18 Oct '13

18 Oct '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The QEMU VNC client arg code has a long standing typo of SASL_CONF_DIR when it should be SASL_CONFIG_PATH for the env variable name. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/qemu/qemu_command.c | 2 +- tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args | 2 +- tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 814f368..5e6b0c0 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7125,7 +7125,7 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfigPtr cfg, virBufferAddLit(&opt, ",sasl"); if (cfg->vncSASLdir) - virCommandAddEnvPair(cmd, "SASL_CONF_DIR", cfg->vncSASLdir); + virCommandAddEnvPair(cmd, "SASL_CONF_PATH", cfg->vncSASLdir); /* TODO: Support ACLs later */ } diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args index 67ef88f..239fde1 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args @@ -1,5 +1,5 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ -SASL_CONF_DIR=/root/.sasl2 QEMU_AUDIO_DRV=none \ +SASL_CONF_PATH=/root/.sasl2 QEMU_AUDIO_DRV=none \ /usr/bin/qemu -S -M pc -m 214 \ -smp 1 -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -vnc \ diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args index d71a998..c681b1b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args @@ -1,5 +1,5 @@ LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test \ -SASL_CONF_DIR=/root/.sasl2 QEMU_AUDIO_DRV=none \ +SASL_CONF_PATH=/root/.sasl2 QEMU_AUDIO_DRV=none \ /usr/bin/qemu -S -M pc -m 214 \ -smp 1 -monitor unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ /dev/HostVG/QEMUGuest1 -net none -serial none -parallel none -vnc \ -- 1.8.3.1

3 2

[libvirt] [PATCH]virsh: improve usability of '--print-xml' flag for attach-disk command
by Chen Hanxiao 18 Oct '13

18 Oct '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> '--print-xml' option is very useful for doing some test. But we had to specify a real domain for it. This patch could enable us to specify a fake domain when using --print-xml option. Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- tools/virsh-domain.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 2aed9f9..565966d 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -528,13 +528,6 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) if (live) flags |= VIR_DOMAIN_AFFECT_LIVE; - if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) - return false; - - if (persistent && - virDomainIsActive(dom) == 1) - flags |= VIR_DOMAIN_AFFECT_LIVE; - if (vshCommandOptStringReq(ctl, cmd, "source", &source) < 0 || vshCommandOptStringReq(ctl, cmd, "target", &target) < 0 || vshCommandOptStringReq(ctl, cmd, "driver", &driver) < 0 || @@ -672,6 +665,13 @@ cmdAttachDisk(vshControl *ctl, const vshCmd *cmd) goto cleanup; } + if (!(dom = vshCommandOptDomain(ctl, cmd, NULL))) + return false; + + if (persistent && + virDomainIsActive(dom) == 1) + flags |= VIR_DOMAIN_AFFECT_LIVE; + if (flags) ret = virDomainAttachDeviceFlags(dom, xml, flags); else -- 1.8.2.1

2 2