- Devel - libvirt List Archives

[libvirt] [PATCH] virsh: new environment variable VIRSH_HISTSIZE
by Pavel Raiskup 29 Oct '13

29 Oct '13

Allow adjust the number of commands to remember in the command history. * tools/virsh.c (vshReadlineInit): Read and sanity the VIRSH_HISTSIZE variable. (VIRSH_HISTSIZE_MAX): New constant. * tools/virsh.pod: Document VIRSH_HISTSIZE variable. --- tools/virsh.c | 17 ++++++++++++++++- tools/virsh.pod | 5 +++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/tools/virsh.c b/tools/virsh.c index bad78c9..58bc841 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -2748,11 +2748,14 @@ vshReadlineCompletion(const char *text, int start, return matches; } +#define VIRSH_HISTSIZE_MAX 500000 static int vshReadlineInit(vshControl *ctl) { char *userdir = NULL; + int max_history = 500; + char *histsize_str; /* Allow conditional parsing of the ~/.inputrc file. */ rl_readline_name = "virsh"; @@ -2761,7 +2764,19 @@ vshReadlineInit(vshControl *ctl) rl_attempted_completion_function = vshReadlineCompletion; /* Limit the total size of the history buffer */ - stifle_history(500); + if ((histsize_str = getenv("VIRSH_HISTSIZE"))) { + if (virStrToLong_i(histsize_str, NULL, 10, &max_history) < 0) { + vshError(ctl, "%s", _("Bad $VIRSH_HISTSIZE value.")); + VIR_FREE(userdir); + return -1; + } else if (max_history > VIRSH_HISTSIZE_MAX || max_history < 0) { + vshError(ctl, _("$VIRSH_HISTSIZE value should be between 0 and %d"), + VIRSH_HISTSIZE_MAX); + VIR_FREE(userdir); + return -1; + } + } + stifle_history(max_history); /* Prepare to read/write history from/to the $XDG_CACHE_HOME/virsh/history file */ userdir = virGetUserCacheDirectory(); diff --git a/tools/virsh.pod b/tools/virsh.pod index 23d17c4..dac9a08 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -3349,6 +3349,11 @@ The editor to use by the B<edit> and related options. The editor to use by the B<edit> and related options, if C<VISUAL> is not set. +=item VIRSH_HISTSIZE + +The number of commands to remember in the command history. The +default value is 500. + =item LIBVIRT_DEBUG=LEVEL Turn on verbose debugging of all libvirt API calls. Valid levels are -- 1.8.3.1

3 4

[libvirt] [PATCH 0/2 v2] improve auto complete in virsh
by Chen Hanxiao 29 Oct '13

29 Oct '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> Chen Hanxiao (2): [libvirt]virsh: introduce member excludeOption in vshCmdOptDef and improve auto complete with it [libvirt]virsh: set --shareable and --mode's new member: excludeOption tools/virsh-domain.c | 6 ++++-- tools/virsh.c | 34 ++++++++++++++++++++++++++++++++++ tools/virsh.h | 1 + 3 files changed, 39 insertions(+), 2 deletions(-) -- 1.8.2.1

2 4

[libvirt] [PATCH v2 REPOST 0/6] Try to fix selinux/securityfs mount handling in LXC
by Daniel P. Berrange 29 Oct '13

29 Oct '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Update of https://www.redhat.com/archives/libvir-list/2013-October/msg00270.html Previously I just re-sent the one patch needing changes. This time I am reposting the whole series after rebasing. Daniel P. Berrange (6): Add virFileIsMountPoint function Remove unused 'opts' field from LXC basic mounts struct Remove pointless 'srcpath' variable in lxcContainerMountBasicFS Remove duplicate entries in lxcBasicMounts array Add flag to lxcBasicMounts to control use in user namespaces Skip any files which are not mounted on the host src/libvirt_private.syms | 1 + src/lxc/lxc_container.c | 86 +++++++++++++++++++++++++++++------------------- src/util/virfile.c | 50 ++++++++++++++++++++++++++++ src/util/virfile.h | 2 ++ 4 files changed, 105 insertions(+), 34 deletions(-) -- 1.8.3.1

2 8

[libvirt] Schedule for next release
by Daniel Veillard 29 Oct '13

29 Oct '13

Assuming we want to release around the end of the month means we ought to enter freeze next week around the 24 or 25, but I know I will be very busy and have a hard time on those days. So potentially I will try to do the freeze on the Saturday 26 for a release around Nov 1st, but there is a slight risk that the release of 1.1.4 will be postponed if I fail to this while in Edinburgh (BTW a lot of libvirt developpers will be there around the KVM forum and LinuxCon events). Daniel -- Daniel Veillard | Open Source and Standards, Red Hat veillard(a)redhat.com | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ http://veillard.com/ | virtualization library http://libvirt.org/

3 3

[libvirt] [PATCH] Quick fix for config-demo.py
by Ian Main 28 Oct '13

28 Oct '13

I guess this must have been changed and the demo not updated. Fix the demo so it uses the right value. Signed-off-by: Ian Main <imain(a)redhat.com> --- examples/config-demo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/config-demo.py b/examples/config-demo.py index 367d99a..c28d8b9 100644 --- a/examples/config-demo.py +++ b/examples/config-demo.py @@ -28,7 +28,7 @@ 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) -- 1.8.1.4

3 3

[libvirt] [PATCH v2 REPOST] Try to fix selinux/securityfs mount handling in LXC
by Daniel P. Berrange 28 Oct '13

28 Oct '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> Update of https://www.redhat.com/archives/libvir-list/2013-October/msg00270.html Previously I just re-sent the one patch needing changes. This time I am reposting the whole series after rebasing. Daniel P. Berrange (1): Skip any files which are not mounted on the host src/lxc/lxc_container.c | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) -- 1.8.3.1

1 1

[libvirt] [PATCH] Don't update dom->persistent without lock held
by Daniel P. Berrange 28 Oct '13

28 Oct '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> virDomainObjListLoadAllConfigs sets dom->persistent after having released its lock on the domain object. This exposes a possible race condition. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/conf/domain_conf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 562d98b..51c4e29 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -17373,9 +17373,9 @@ virDomainObjListLoadAllConfigs(virDomainObjListPtr doms, notify, opaque); if (dom) { - virObjectUnlock(dom); if (!liveStatus) dom->persistent = 1; + virObjectUnlock(dom); } } -- 1.8.3.1

2 1

[libvirt] [PATCH]lxc: don't always print debug log in lxcContainerSetID
by Chen Hanxiao 28 Oct '13

28 Oct '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> lxcContainerSetID is used for user namespace. If we don't enable user namespace, don't print debug log. Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/lxc/lxc_container.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 56df69e..ed1fe29 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -420,12 +420,14 @@ static int lxcContainerSetID(virDomainDefPtr def) * for this container. And user namespace is only enabled * when nuidmap&ngidmap is not zero */ - VIR_DEBUG("Set UID/GID to 0/0"); - if (def->idmap.nuidmap && - virSetUIDGID(0, 0, NULL, 0) < 0) { - virReportSystemError(errno, "%s", - _("setuid or setgid failed")); - return -1; + if (def->idmap.nuidmap) { + if (virSetUIDGID(0, 0, NULL, 0) < 0) { + virReportSystemError(errno, "%s", + _("setuid or setgid failed")); + return -1; + } else { + VIR_DEBUG("Set UID/GID to 0/0"); + } } return 0; -- 1.8.2.1

2 3

[libvirt] [PATCH 0/2] improve auto complete in virsh
by Chen Hanxiao 28 Oct '13

28 Oct '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> Chen Hanxiao (2): [libvirt]virsh: introduce member exclude_option in vshCmdOptDef and improve auto complete with it [libvirt]virsh: set --shareable and --mode's new member: exclude_option tools/virsh-domain.c | 6 ++++-- tools/virsh.c | 8 ++++++++ tools/virsh.h | 1 + 3 files changed, 13 insertions(+), 2 deletions(-) -- 1.8.2.1

2 4

Re: [libvirt] /dev/tty node in containers
by Daniel P. Berrange 25 Oct '13

25 Oct '13

On Thu, Oct 24, 2013 at 12:10:53PM -0700, Sukadev Bhattiprolu wrote: > > Is there a reason libvirt does not create /dev/tty in a LXC container ? You're not mentioning what version of libvirt you're using. This was added recently commit 9a0ac6d9c21b914f887d2a1e0051b5beffa81bd7 Author: Richard Weinberger <richard(a)nod.at> Date: Tue Jul 9 11:05:14 2013 +0100 LXC: Create /dev/tty within a container Many applications use /dev/tty to read from stdin. e.g. zypper on openSUSE. Let's create this device node to unbreak those applications. As /dev/tty is a synonym for the current controlling terminal it cannot harm the host or any other containers. Signed-off-by: Richard Weinberger <richard(a)nod.at> Available in release 1.1.1 or later. 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

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

25 Oct '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> s/no/not 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 8ad755b..aa90701 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -3163,7 +3163,7 @@ parameters in its <code><parameters></code> element - an <code>interfaceid</code> which is a standard uuid used to uniquely identify this particular interface to Open vSwitch (if - you do no specify one, a random interfaceid will be generated + you do not specify one, a random interfaceid will be generated for you when you first define the interface), and an optional <code>profileid</code> which is sent to Open vSwitch as the interfaces "port-profile". -- 1.8.2.1

2 1

[libvirt] [PATCH 0/3] Add complete blkiotune support for per-device with blkio cgroup
by Guan Qiang 25 Oct '13

25 Oct '13

From: Guan Qiang <hzguanqiang(a)corp.netease.com> The patches add a complete blkiotune support per-device with blkio cgroup for both lxc or qemu driver, by extending the existed 'domainSetBlkioParameters' and 'domainGetBlkioParameters' interface. Beside device weight, read/write bps and iops throttle can be set per-device with these patches. Virsh command 'blkiotune' is extended to support the above function too. Guan Qiang (3): qemu: add blkiotune support for device iops and bps throttle setting lxc: add blkiotune support for per device blkiotune: add virsh support for blkiotune interface docs/formatdomain.html.in | 8 + docs/schemas/domaincommon.rng | 28 +- include/libvirt/libvirt.h.in | 40 ++ src/conf/domain_conf.c | 115 ++- src/conf/domain_conf.h | 16 +- src/libvirt_private.syms | 4 +- src/lxc/lxc_cgroup.c | 9 +- src/lxc/lxc_driver.c | 743 +++++++++++++++++++- src/qemu/qemu_cgroup.c | 10 +- src/qemu/qemu_driver.c | 579 +++++++++++++-- src/util/vircgroup.c | 79 ++- src/util/vircgroup.h | 8 +- .../qemuxml2argv-blkiotune-device.xml | 4 + tools/virsh-domain.c | 64 ++ tools/virsh.pod | 32 +- 15 files changed, 1614 insertions(+), 125 deletions(-) -- 1.7.9.5

2 4

Re: [libvirt] [Qemu-devel] [PATCH 14/17] add new RanState RAN_STATE_FLIPPING_MIGRATE
by Eric Blake 24 Oct '13

24 Oct '13

On 10/22/2013 04:25 AM, Lei Li wrote: > Introduce new RanState RAN_STATE_FLIPPING_MIGRATE and > add it to runstate_needs_reset(). > > Signed-off-by: Lei Li <lilei(a)linux.vnet.ibm.com> > --- > qapi-schema.json | 11 +++++++---- > vl.c | 12 +++++++++++- > 2 files changed, 18 insertions(+), 5 deletions(-) > > diff --git a/qapi-schema.json b/qapi-schema.json > index 523a5b2..8178d0c 100644 > --- a/qapi-schema.json > +++ b/qapi-schema.json > @@ -176,12 +176,15 @@ > # @watchdog: the watchdog action is configured to pause and has been triggered > # > # @guest-panicked: guest has been panicked as a result of guest OS panic > +# > +# @flipping-migrate: guest is paused to start unix_page_flipping migration > +# process We probably ought to enhance the docs to mention '(since 1.8)' for this field (and likewise for other enum values added after the original introduction of the enum). Last time we added a new user-visible runstate, it broke migration with older libvirt versions that weren't prepared to see the new state (hmm, I need to check if libvirt has fixed that in the meantime; adding a cc...). Paolo's advice at the time was that it is okay to require a new libvirt when using a new qemu, and that libvirt should be taught to treat all unknown RunState as if they were 'running'; although for this particular addition it might be nicer to have libvirt lump 'inmigrate' and 'flipping-migrate' to the same usage. > ## > { 'enum': 'RunState', > - 'data': [ 'debug', 'inmigrate', 'internal-error', 'io-error', 'paused', > - 'postmigrate', 'prelaunch', 'finish-migrate', 'restore-vm', > - 'running', 'save-vm', 'shutdown', 'suspended', 'watchdog', > - 'guest-panicked' ] } > + 'data': [ 'debug', 'flipping-migrate', 'inmigrate', 'internal-error', > + 'io-error', 'paused', 'postmigrate', 'prelaunch', 'finish-migrate', > + 'restore-vm', 'running', 'save-vm', 'shutdown', 'suspended', > + 'watchdog', 'guest-panicked' ] } > -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

2 1

Re: [libvirt] [Qemu-devel] [PATCH 14/17] add new RanState RAN_STATE_FLIPPING_MIGRATE
by Eric Blake 24 Oct '13

24 Oct '13

On 10/22/2013 07:28 AM, Lei Li wrote: >>> # @guest-panicked: guest has been panicked as a result of guest OS >>> panic >>> +# >>> +# @flipping-migrate: guest is paused to start unix_page_flipping >>> migration >>> +# process >> We probably ought to enhance the docs to mention '(since 1.8)' for this >> field (and likewise for other enum values added after the original >> introduction of the enum). > > Hi Eric, > > Sure, will do. > > BTW, I was hoping this feature could be accepted and merged to QEMU 1.7 > release. http://wiki.qemu.org/Planning/1.7 Soft freeze has already happened, so it's up to the maintainers whether there is still time to be adding this feature in 1.7 - but yes, that would affect the tag you list in your docs. -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

2 1

[libvirt] [PATCH] Avoid Coverity DEADCODE warning
by John Ferlan 24 Oct '13

24 Oct '13

Commit '922b7fda' resulted in two DEADCODE warnings from Coverity in remoteDispatchAuthPolkit and virAccessDriverPolkitFormatProcess. Commit '604ae657' modified the daemon.c code to remove the deadcode issue, but did not do so for viracessdriverpolkit.c. This just mimics the same changes Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/access/viraccessdriverpolkit.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/src/access/viraccessdriverpolkit.c b/src/access/viraccessdriverpolkit.c index ff82583..b9907ba 100644 --- a/src/access/viraccessdriverpolkit.c +++ b/src/access/viraccessdriverpolkit.c @@ -76,8 +76,9 @@ virAccessDriverPolkitFormatProcess(const char *actionid) const char *callerTime = NULL; const char *callerUid = NULL; char *ret = NULL; - bool supportsuid = false; - static bool polkitInsecureWarned; +#ifndef PKCHECK_SUPPORTS_UID + static bool polkitInsecureWarned = false; +#endif if (!identity) { virAccessError(VIR_ERR_ACCESS_DENIED, @@ -109,19 +110,17 @@ virAccessDriverPolkitFormatProcess(const char *actionid) } #ifdef PKCHECK_SUPPORTS_UID - supportsuid = true; -#endif - if (supportsuid) { - if (virAsprintf(&ret, "%s,%s,%s", callerPid, callerTime, callerUid) < 0) - goto cleanup; - } else { - if (!polkitInsecureWarned) { - VIR_WARN("No support for caller UID with pkcheck. This deployment is known to be insecure."); - polkitInsecureWarned = true; - } - if (virAsprintf(&ret, "%s,%s", callerPid, callerTime) < 0) - goto cleanup; + if (virAsprintf(&ret, "%s,%s,%s", callerPid, callerTime, callerUid) < 0) + goto cleanup; +#else + if (!polkitInsecureWarned) { + VIR_WARN("No support for caller UID with pkcheck. " + "This deployment is known to be insecure."); + polkitInsecureWarned = true; } + if (virAsprintf(&ret, "%s,%s", callerPid, callerTime) < 0) + goto cleanup; +#endif cleanup: virObjectUnref(identity); -- 1.8.3.1

3 4

[libvirt] [PATCHv2 0/2] virsh: hide 'attach-disk --shareable'
by Eric Blake 24 Oct '13

24 Oct '13

As promised here: https://www.redhat.com/archives/libvir-list/2013-October/msg01047.html Eric Blake (2): virsh: allow alias to expand to opt=value pair virsh: undocument --shareable (--mode already covers it) tests/virshtest.c | 1 + tools/virsh-domain.c | 11 ++++------ tools/virsh.c | 58 ++++++++++++++++++++++++++++++++++++++++++++-------- tools/virsh.pod | 4 ++-- 4 files changed, 57 insertions(+), 17 deletions(-) -- 1.8.3.1

3 6

[libvirt] [PATCH] libxl: Fix possible invalid read
by Martin Kletzander 24 Oct '13

24 Oct '13

According to the following valgrind output, there seems to be a invalid limit for the iterator (captured on Fedora 19): ==3945== Invalid read of size 1 ==3945== at 0x1E1FA410: libxlVmStart (libxl_driver.c:475) ==3945== by 0x1E1FAD9A: libxlDomainCreateWithFlags (libxl_driver.c:2633) ==3945== by 0x5187D46: virDomainCreate (libvirt.c:9439) ==3945== by 0x13BAA6: remoteDispatchDomainCreateHelper (remote_dispatch.h:2910) ==3945== by 0x51DE5B9: virNetServerProgramDispatch (virnetserverprogram.c:435) ==3945== by 0x51D93E7: virNetServerHandleJob (virnetserver.c:165) ==3945== by 0x50F5BF4: virThreadPoolWorker (virthreadpool.c:144) ==3945== by 0x50F5670: virThreadHelper (virthreadpthread.c:161) ==3945== by 0x8046C52: start_thread (pthread_create.c:308) ==3945== by 0x8758E1C: clone (clone.S:113) ==3945== Address 0x23424d81 is 0 bytes after a block of size 1 alloc'd ==3945== at 0x4A08121: calloc (in /usr/lib64/valgrind/vgpreload_memcheck-amd64-linux.so) ==3945== by 0x50B1F8C: virAllocN (viralloc.c:189) ==3945== by 0x1E1FA3CA: libxlVmStart (libxl_driver.c:468) ==3945== by 0x1E1FAD9A: libxlDomainCreateWithFlags (libxl_driver.c:2633) ==3945== by 0x5187D46: virDomainCreate (libvirt.c:9439) ==3945== by 0x13BAA6: remoteDispatchDomainCreateHelper (remote_dispatch.h:2910) ==3945== by 0x51DE5B9: virNetServerProgramDispatch (virnetserverprogram.c:435) ==3945== by 0x51D93E7: virNetServerHandleJob (virnetserver.c:165) ==3945== by 0x50F5BF4: virThreadPoolWorker (virthreadpool.c:144) ==3945== by 0x50F5670: virThreadHelper (virthreadpthread.c:161) ==3945== by 0x8046C52: start_thread (pthread_create.c:308) ==3945== by 0x8758E1C: clone (clone.S:113) ==3945== Related: https://bugzilla.redhat.com/show_bug.cgi?id=1013045 Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com> --- src/libxl/libxl_driver.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index e2a6d44..4928695 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -454,6 +454,7 @@ libxlDomainSetVcpuAffinities(libxlDriverPrivatePtr driver, virDomainObjPtr vm) size_t cpumaplen; int vcpu; size_t i; + size_t limit; int ret = -1; if (libxlDoNodeGetInfo(driver, &nodeinfo) < 0) @@ -470,7 +471,8 @@ libxlDomainSetVcpuAffinities(libxlDriverPrivatePtr driver, virDomainObjPtr vm) cpumask = (uint8_t*) def->cputune.vcpupin[vcpu]->cpumask; - for (i = 0; i < VIR_DOMAIN_CPUMASK_LEN; ++i) { + limit = MIN(VIR_DOMAIN_CPUMASK_LEN, cpumaplen); + for (i = 0; i < limit; ++i) { if (cpumask[i]) VIR_USE_CPU(cpumap, i); } -- 1.8.4

2 2

[libvirt] failed to write to disk on vm with lvm pool
by Vasiliy Tolstov 24 Oct '13

24 Oct '13

Hi all. Today i can't mkfs.ext3 inside virual machine while install it (ubuntu 13.04). Why this happening? On other node i see that virSecurityDACSetOwnership sets perms on /dev/vg/xxx and /dev/dm-xxx, but in this host this not happening. Libvirt logs: 2013-10-24 07:50:15.639+0000: 3700: info : virNetDevProbeVnetHdr:94 : Enabling IFF_VNET_HDR 2013-10-24 07:50:15.782+0000: 3700: info : virSecurityDACSetOwnership:271 : Setting DAC user and group on '/dev/vg/402' to '108:102' 2013-10-24 07:50:15.783+0000: 3700: info : virSecurityDACSetOwnership:271 : Setting DAC user and group on '/srv/ubuntu/13.04/kernel' to '108:102' 2013-10-24 07:50:15.783+0000: 3700: info : virSecurityDACSetOwnership:271 : Setting DAC user and group on '/srv/ubuntu/13.04/initrd' to '108:102' 2013-10-24 07:50:16.386+0000: 3700: warning : virCgroupMoveTask:887 : no vm cgroup in controller 3 2013-10-24 07:50:16.386+0000: 3700: warning : virCgroupMoveTask:887 : no vm cgroup in controller 4 2013-10-24 07:50:16.386+0000: 3700: warning : virCgroupMoveTask:887 : no vm cgroup in controller 6 domainxml disk: <disk type='block' device='disk'> <driver name='qemu' type='raw' cache='none' io='native' ioeventfd='on' event_idx='off'/> <source dev='/dev/vg/402'/> <target dev='vda' bus='virtio'/> <alias name='virtio-disk0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </disk> pool xml <pool type='logical'> <name>default</name> <uuid>2a135e38-dd92-1b4d-bd82-3aafd369d207</uuid> <capacity unit='bytes'>3000454086656</capacity> <allocation unit='bytes'>386547056640</allocation> <available unit='bytes'>2613907030016</available> <source> <device path='/dev/bcache0'/> <name>vg</name> <format type='lvm2'/> </source> <target> <path>/dev/vg</path> <permissions> <mode>0711</mode> <owner>-1</owner> <group>-1</group> </permissions> </target> </pool> qemu.log: 2013-10-24 07:50:15.777+0000: starting up LC_ALL=C PATH=/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/sbin:/sbin:/bin QEMU_AUDIO_DRV=none /usr/bin/qemu-system-x86_64 -name 402 -S -M pc-1.0 -enable-kvm -m 1024 -smp 1,sockets=1,cores=1,threads=1 -uuid 0ee50ad7-8c2b-57e9-5bee-0000571d77c1 -no-user-config -nodefaults -chardev socket,id=charmonitor,path=/var/lib/libvirt/qemu/402.monitor,server,nowait -mon chardev=charmonitor,id=monitor,mode=control -rtc base=utc -no-reboot -no-shutdown -kernel /srv/ubuntu/13.04/kernel -initrd /srv/ubuntu/13.04/initrd -append ks=file:///ks.cfg -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 -drive file=/dev/vg/402,if=none,id=drive-virtio-disk0,format=raw,cache=none,aio=native -device virtio-blk-pci,ioeventfd=on,event_idx=off,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 -drive if=none,id=drive-ide0-1-0,readonly=on,format=raw -device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 -netdev tap,fd=22,id=hostnet0,vhost=on,vhostfd=23 -device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:00:01:55,bus=pci.0,addr=0x3 -chardev pty,id=charserial0 -device isa-serial,chardev=charserial0,id=serial0 -chardev spicevmc,id=charchannel0,name=vdagent -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,id=channel0,name=com.redhat.spice.0 -chardev socket,id=charchannel1,path=/var/lib/libvirt/qemu/402.agent,server,nowait -device virtserialport,bus=virtio-serial0.0,nr=2,chardev=charchannel1,id=channel1,name=org.mighost.agent.0 -vnc 0.0.0.0:0,password -vga std -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 char device redirected to /dev/pts/0 (label charserial0) -- Vasiliy Tolstov, e-mail: v.tolstov(a)selfip.ru jabber: vase(a)selfip.ru

1 1

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

24 Oct '13

This patch adds support for setting filterref's on interfaces. Also supported are parameters to the filterref's. V2: - alphabetical orderized (don't look it up!) Makefile.am - s/set_filter/set_name/ s/get_filter/get_name/ - remove trailing whitespace. - fix missing line. - add return_val_if_fail check. - moved qcow fix in demo to a new patch. - fixed new_from_xml(). Signed-off-by: Ian Main <imain(a)redhat.com> --- examples/config-demo.py | 7 + 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 | 157 +++++++++++++++++++++ .../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, 486 insertions(+) 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..367d99a 100644 --- a/examples/config-demo.py +++ b/examples/config-demo.py @@ -35,6 +35,13 @@ domain.add_device(disk) interface = LibvirtGConfig.DomainInterfaceNetwork.new() interface.set_source("default") +filterref = LibvirtGConfig.DomainInterfaceFilterref.new() +filterref.set_name("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..0793da1 100644 --- a/libvirt-gconfig/Makefile.am +++ b/libvirt-gconfig/Makefile.am @@ -47,6 +47,8 @@ GCONFIG_HEADER_FILES = \ libvirt-gconfig-domain-input.h \ libvirt-gconfig-domain-interface.h \ libvirt-gconfig-domain-interface-bridge.h \ + libvirt-gconfig-domain-interface-filterref.h \ + libvirt-gconfig-domain-interface-filterref-parameter.h \ libvirt-gconfig-domain-interface-network.h \ libvirt-gconfig-domain-interface-user.h \ libvirt-gconfig-domain-memballoon.h \ @@ -129,6 +131,8 @@ GCONFIG_SOURCE_FILES = \ libvirt-gconfig-domain-input.c \ libvirt-gconfig-domain-interface.c \ libvirt-gconfig-domain-interface-bridge.c \ + libvirt-gconfig-domain-interface-filterref.c \ + libvirt-gconfig-domain-interface-filterref-parameter.c \ libvirt-gconfig-domain-interface-network.c \ libvirt-gconfig-domain-interface-user.c \ libvirt-gconfig-domain-memballoon.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..4874aee --- /dev/null +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface-filterref.c @@ -0,0 +1,157 @@ +/* + * 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, "filter"), "filterref") != 0) { + g_object_unref(G_OBJECT(object)); + return NULL; + } + return GVIR_CONFIG_DOMAIN_INTERFACE_FILTERREF(object); +} + +void gvir_config_domain_interface_filterref_set_name(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_name(GVirConfigDomainInterfaceFilterref *filterref) +{ + g_return_val_if_fail(GVIR_CONFIG_IS_DOMAIN_INTERFACE_FILTERREF(filterref), NULL); + 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, + data->doc, NULL, node); + 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..4a2bfd4 --- /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_name(GVirConfigDomainInterfaceFilterref *filterref, + const char *filter); +const char *gvir_config_domain_interface_filterref_get_name(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..a5f8b05 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_name; + gvir_config_domain_interface_filterref_get_name; + 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

2 1

[libvirt] [PATCH] virsh: fix doc typos
by Eric Blake 24 Oct '13

24 Oct '13

Reported in https://bugzilla.redhat.com/show_bug.cgi?id=1022872 * tools/virsh.pod: s/COMMMANDS/COMMANDS/ Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing as trivial. tools/virsh.pod | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index 7af5503..68e6e86 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -2823,7 +2823,7 @@ B<blockresize> for live resizing. =back -=head1 SECRET COMMMANDS +=head1 SECRET COMMANDS The following commands manipulate "secrets" (e.g. passwords, passphrases and encryption keys). Libvirt can store secrets independently from their use, and @@ -2870,7 +2870,7 @@ I<--no-private> to list the non-private ones. =back -=head1 SNAPSHOT COMMMANDS +=head1 SNAPSHOT COMMANDS The following commands manipulate domain snapshots. Snapshots take the disk, memory, and device state of a domain at a point-of-time, and save it @@ -3170,7 +3170,7 @@ the data contents from that point in time. =back -=head1 NWFILTER COMMMANDS +=head1 NWFILTER COMMANDS The following commands manipulate network filters. Network filters allow filtering of the network traffic coming from and going to virtual machines. -- 1.8.3.1

1 0

[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 23 Oct '13

23 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 23 Oct '13

23 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 23 Oct '13

23 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 23 Oct '13

23 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

[libvirt] [PATCH 0/3] esx: Remove unnecessary NULL comparisons
by Geoff Hickey 17 Oct '13

17 Oct '13

In reply to my last submit, Eric Blake suggested removing an explicit NULL comparison, and instead to simply use the pointer in a boolean context, as in: if (ptr) instead of if (ptr != NULL). Since the second form was used thoughout the esx code, making this change in one place wouldn't have advanced the cause of consistency in the code. This series of patches makes this change throughout the esx code. There are no logic changes. The result is (arguably) easier to read. Geoff Hickey (3): esx: Remove unnecessary NULL comparisons (1/3) esx: Remove unnecessary NULL comparisons (2/3) esx: Remove unnecessary NULL comparisons (3/3) src/esx/esx_driver.c | 244 +++++++++--------- src/esx/esx_interface_driver.c | 10 +- src/esx/esx_network_driver.c | 64 ++--- src/esx/esx_storage_backend_iscsi.c | 44 ++-- src/esx/esx_storage_backend_vmfs.c | 86 +++---- src/esx/esx_storage_driver.c | 6 +- src/esx/esx_util.c | 48 ++-- src/esx/esx_vi.c | 475 ++++++++++++++++++------------------ src/esx/esx_vi_methods.c | 10 +- src/esx/esx_vi_types.c | 88 +++---- 10 files changed, 535 insertions(+), 540 deletions(-) -- 1.8.1.2

2 5

[libvirt] [PATCH] Remove ATTRIBUTE_NONNULL(3) from qemuMonitorJSONDrivePivot
by John Ferlan 17 Oct '13

17 Oct '13

The header definition didn't match the function declaration, so adjusted header to reflect the definition. Found during a Coverity build where STATIC_ANALYSIS is enabled resulting in the internal.h adding __nonnull__ handling to arguments. Commit '6d264c91' added support for the qemuMonitorJSONDrivePivot() and commit 'fbc3adc9' added a corresponding test which ended up triggering the build failure which I didn't notice until today! Signed-off-by: John Ferlan <jferlan(a)redhat.com> --- src/qemu/qemu_monitor_json.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h index 51cf19c..a1a7548 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -250,7 +250,7 @@ int qemuMonitorJSONDrivePivot(qemuMonitorPtr mon, const char *device, const char *file, const char *format) - ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3); + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); int qemuMonitorJSONBlockCommit(qemuMonitorPtr mon, const char *device, -- 1.8.3.1

2 1

[libvirt] [PATCH] Add support for SPICE SASL
by Christophe Fergeau 17 Oct '13

17 Oct '13

This adds a spice_sasl boolean option to qemu.conf to mimic what is donc for VNC SASL support. I did not add a spice_sasl_dir option as the corresponding vnc_sasl_dir option sets a SASL_CONF_DIR environment variable, but I could not find any reference to that variable in either QEMU or cyrus-sasl, and Google was not helpful either. --- src/qemu/libvirtd_qemu.aug | 1 + src/qemu/qemu.conf | 11 ++++++ src/qemu/qemu_command.c | 2 + src/qemu/qemu_conf.c | 1 + src/qemu/qemu_conf.h | 1 + src/qemu/test_libvirtd_qemu.aug.in | 1 + .../qemuxml2argv-graphics-spice-sasl.args | 12 ++++++ .../qemuxml2argv-graphics-spice-sasl.xml | 45 ++++++++++++++++++++++ tests/qemuxml2argvtest.c | 6 +++ 9 files changed, 80 insertions(+) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.xml diff --git a/src/qemu/libvirtd_qemu.aug b/src/qemu/libvirtd_qemu.aug index 32db983..3dc1b43 100644 --- a/src/qemu/libvirtd_qemu.aug +++ b/src/qemu/libvirtd_qemu.aug @@ -38,6 +38,7 @@ module Libvirtd_qemu = | bool_entry "spice_tls" | str_entry "spice_tls_x509_cert_dir" | str_entry "spice_password" + | bool_entry "spice_sasl" let nogfx_entry = bool_entry "nographics_allow_host_audio" diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf index bf57b9c..7b128aa 100644 --- a/src/qemu/qemu.conf +++ b/src/qemu/qemu.conf @@ -140,6 +140,17 @@ #spice_password = "XYZ12345" +# Enable use of SASL encryption on the SPICE server. This requires +# a SPICE client which supports the SASL protocol extension. +# Examples include vinagre, virt-viewer and virt-manager +# itself. +# +# It is necessary to configure /etc/sasl2/qemu.conf to choose +# the desired SASL plugin (eg, GSSPI for Kerberos) +# +#spice_sasl = 1 + + # By default, if no graphical front end is configured, libvirt will disable # QEMU audio output since directly talking to alsa/pulseaudio may not work # with various security settings. If you know what you're doing, enable diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index abb62e9..ea5cfcb 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -7340,6 +7340,8 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfigPtr cfg, * migration algorithm silently. */ virBufferAddLit(&opt, ",seamless-migration=on"); } + if (cfg->spiceSASL) + virBufferAddLit(&opt, ",sasl"); virCommandAddArg(cmd, "-spice"); virCommandAddArgBuffer(cmd, &opt); diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 44a2296..532b0ff 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -399,6 +399,7 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg, GET_VALUE_STR("spice_tls_x509_cert_dir", cfg->spiceTLSx509certdir); GET_VALUE_STR("spice_listen", cfg->spiceListen); GET_VALUE_STR("spice_password", cfg->spicePassword); + GET_VALUE_BOOL("spice_sasl", cfg->spiceSASL); GET_VALUE_LONG("remote_websocket_port_min", cfg->webSocketPortMin); diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index ea3c691..35a2515 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -110,6 +110,7 @@ struct _virQEMUDriverConfig { char *vncSASLdir; bool spiceTLS; + bool spiceSASL; char *spiceTLSx509certdir; char *spiceListen; char *spicePassword; diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in index 7af3f64..f759db5 100644 --- a/src/qemu/test_libvirtd_qemu.aug.in +++ b/src/qemu/test_libvirtd_qemu.aug.in @@ -15,6 +15,7 @@ module Test_libvirtd_qemu = { "spice_tls" = "1" } { "spice_tls_x509_cert_dir" = "/etc/pki/libvirt-spice" } { "spice_password" = "XYZ12345" } +{ "spice_sasl" = "1" } { "nographics_allow_host_audio" = "1" } { "remote_display_port_min" = "5900" } { "remote_display_port_max" = "65535" } diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args new file mode 100644 index 0000000..4fe78a5 --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args @@ -0,0 +1,12 @@ +LC_ALL=C PATH=/bin HOME=/home/test USER=test LOGNAME=test QEMU_AUDIO_DRV=spice \ +/usr/bin/qemu -S -M pc -m 214 -smp 1 -nodefaults -monitor \ +unix:/tmp/test-monitor,server,nowait -no-acpi -boot c -usb -hda \ +/dev/HostVG/QEMUGuest1 -spice port=5903,tls-port=5904,addr=127.0.0.1,\ +x509-dir=/etc/pki/libvirt-spice,tls-channel=default,tls-channel=main,\ +plaintext-channel=inputs,\ +image-compression=auto_glz,jpeg-wan-compression=auto,\ +zlib-glz-wan-compression=auto,\ +playback-compression=on,streaming-video=filter,disable-copy-paste,sasl -vga \ +qxl -global qxl.ram_size=67108864 -global qxl.vram_size=18874368 \ +-device qxl,id=video1,ram_size=67108864,vram_size=33554432,bus=pci.0,addr=0x4 \ +-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.xml new file mode 100644 index 0000000..b22fbcc --- /dev/null +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.xml @@ -0,0 +1,45 @@ +<domain type='qemu'> + <name>QEMUGuest1</name> + <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> + <vcpu placement='static'>1</vcpu> + <os> + <type arch='i686' machine='pc'>hvm</type> + <boot dev='hd'/> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/bin/qemu</emulator> + <disk type='block' device='disk'> + <source dev='/dev/HostVG/QEMUGuest1'/> + <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='usb' index='0'/> + <controller type='ide' index='0'/> + <controller type='pci' index='0' model='pci-root'/> + <input type='mouse' bus='ps2'/> + <graphics type='spice' port='5903' tlsPort='5904' autoport='no' listen='127.0.0.1' defaultMode='secure'> + <listen type='address' address='127.0.0.1'/> + <channel name='main' mode='secure'/> + <channel name='inputs' mode='insecure'/> + <image compression='auto_glz'/> + <jpeg compression='auto'/> + <zlib compression='auto'/> + <playback compression='on'/> + <streaming mode='filter'/> + <clipboard copypaste='no'/> + </graphics> + <video> + <model type='qxl' ram='65536' vram='18432' heads='1'/> + </video> + <video> + <model type='qxl' ram='65536' vram='32768' heads='1'/> + </video> + <memballoon model='virtio'/> + </devices> +</domain> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 060acf2..1cdb964 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -685,6 +685,12 @@ mymain(void) QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_USB_HUB, QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_USB_REDIR, QEMU_CAPS_CHARDEV_SPICEVMC); + driver.config->spiceSASL = 1; + DO_TEST("graphics-spice-sasl", + QEMU_CAPS_VGA, QEMU_CAPS_VGA_QXL, + QEMU_CAPS_DEVICE, QEMU_CAPS_SPICE, + QEMU_CAPS_DEVICE_QXL); + driver.config->spiceSASL = 0; DO_TEST("input-usbmouse", NONE); DO_TEST("input-usbtablet", NONE); -- 1.8.3.1

2 2

[libvirt] [PATCH] netcf: Don't complain when cleanup is called before init
by Christophe Fergeau 17 Oct '13

17 Oct '13

netcfStateInitialize() initializes the driverState variable, and when netcfStateCleanup is called, it will call virReportError() if driverState is NULL. This is not consistent with what other state objects are doing, they return -1 without reporting an error in such cases. See also https://www.redhat.com/archives/libvir-list/2013-October/msg00809.html: On Thu, Oct 17, 2013 at 01:40:19PM +0100, Daniel P. Berrange wrote: > We don't want virStateCleanup to skip execution if virStateInitialize > has failed though - every callback in virStateCleanup should be written > to be safe if its corresponding init function hasn't run. --- src/interface/interface_backend_netcf.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/interface/interface_backend_netcf.c b/src/interface/interface_backend_netcf.c index fac059d..c4e18c4 100644 --- a/src/interface/interface_backend_netcf.c +++ b/src/interface/interface_backend_netcf.c @@ -100,11 +100,8 @@ netcfStateInitialize(bool privileged ATTRIBUTE_UNUSED, static int netcfStateCleanup(void) { - if (!driverState) { - virReportError(VIR_ERR_INTERNAL_ERROR, "%s", - _("Attempt to close netcf state driver already closed")); + if (!driverState) return -1; - } if (virObjectUnref(driverState)) { virReportError(VIR_ERR_INTERNAL_ERROR, "%s", -- 1.8.3.1

2 1

[libvirt] [PATCH] vircgroupmock.c: Avoid crashing if lstat() not found
by Michal Privoznik 17 Oct '13

17 Oct '13

In init_syms() we admit that stat() may not exists (in favor of existing __lxstat). However, if previously an library checked for existence of these two symbols and wisely has chosen the existing one, now, that we've mocked the both symbols, we are confusing the library. Moreover, such library will get SIGSEGV immediately after wrong decision, since reallstat is NULL. Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- tests/vircgroupmock.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tests/vircgroupmock.c b/tests/vircgroupmock.c index adc1718..0b44fda 100644 --- a/tests/vircgroupmock.c +++ b/tests/vircgroupmock.c @@ -542,10 +542,16 @@ int lstat(const char *path, struct stat *sb) errno = ENOMEM; return -1; } - ret = reallstat(newpath, sb); + if (reallstat) + ret = reallstat(newpath, sb); + else + ret = real__lxstat(_STAT_VER, newpath, sb); free(newpath); } else { - ret = reallstat(path, sb); + if (reallstat) + ret = reallstat(path, sb); + else + ret = real__lxstat(_STAT_VER, path, sb); } return ret; } -- 1.8.1.5

2 1

[libvirt] Migration issue php-libvirt
by Umar Draz 17 Oct '13

17 Oct '13

Hi All I am trying to migrate offline domain on other URI but its not working due to this error Failure!Libvirt last error: Requested operation is not valid: domain is not running I tried to use this option but not working VIR_MIGRATE_OFFLINE Please anybody help me? Br. Umar

4 8

[libvirt] [PATCH v3 0/2] expose baselabel for each sec model/virt type
by Giuseppe Scrivano 17 Oct '13

17 Oct '13

Now each security model can define its own base label, that describes the default security context used by libvirt to run an hypervisor process. This information is exposed to users trough the host capabilities XML. *v3 major changes - support LXC - merge virSecurityDACSetUser and virSecurityDACSetGroup in virSecurityDACSetUserAndGroup - DAC sets the baselabel in virSecurityDACSetUserAndGroup - Use virDomainVirtTypeToString instead of hardcoding the name Giuseppe Scrivano (2): security: add new internal function "virSecurityManagerGetBaseLabel" capabilities: add baselabel per sec driver/virt type to secmodel docs/schemas/capability.rng | 8 ++++ src/conf/capabilities.c | 60 +++++++++++++++++++++++++++- src/conf/capabilities.h | 14 +++++++ src/libvirt_private.syms | 2 + src/lxc/lxc_conf.c | 10 ++++- src/qemu/qemu_conf.c | 21 ++++++++-- src/security/security_apparmor.c | 8 ++++ src/security/security_dac.c | 34 +++++++++++----- src/security/security_dac.h | 7 ++-- src/security/security_driver.h | 4 ++ src/security/security_manager.c | 22 +++++++++- src/security/security_manager.h | 2 + src/security/security_nop.c | 10 +++++ src/security/security_selinux.c | 12 ++++++ src/security/security_stack.c | 9 +++++ tests/capabilityschemadata/caps-qemu-kvm.xml | 2 + tests/capabilityschemadata/caps-test3.xml | 2 + 17 files changed, 204 insertions(+), 23 deletions(-) -- 1.8.3.1

2 9

[libvirt] PATCH: better error checking for LOCAL_PEERCRED
by Brian Candler 17 Oct '13

17 Oct '13

I was debugging libvirt with OSX today, and got as far as finding the problem with LOCAL_PEERCRED, then googled this only to find that Ryota Ozaki had fixed the problems a few days ago! However you still may find the following patch useful. It tightens up the checking in the LOCAL_PEERCRED block, and in particular fixes the unlocking of the socket in the error return path for invalid groups, by using the same logic from SO_PEERCRED - have a 'goto cleanup' in all return paths. (Detail: I found that when getsockopt was being called with SOL_SOCKET, cr_ngroups was typically <0, probably because it was uninitialised. However once the check for this was tightened, it hung because the socket wasn't being unlocked on return. So better to (a) initialise it to a negative value anyway, and (b) fix the return path) However I have not checked that NGROUPS is defined on other BSD-like systems. You could just have "if (cr.cr_ngroups <= 0)" instead. Regards, Brian Candler. --- src/rpc/virnetsocket.c.orig 2013-10-10 22:37:49.000000000 +0100 +++ src/rpc/virnetsocket.c 2013-10-12 22:51:57.000000000 +0100 @@ -1157,8 +1157,10 @@ { struct xucred cr; socklen_t cr_len = sizeof(cr); + int ret = -1; virObjectLock(sock); + cr.cr_ngroups = -1; # if defined(__APPLE__) if (getsockopt(sock->fd, SOL_LOCAL, LOCAL_PEERCRED, &cr, &cr_len) < 0) { # else @@ -1166,20 +1168,19 @@ # endif virReportSystemError(errno, "%s", _("Failed to get client socket identity")); - virObjectUnlock(sock); - return -1; + goto cleanup; } if (cr.cr_version != XUCRED_VERSION) { virReportError(VIR_ERR_SYSTEM_ERROR, "%s", _("Failed to get valid client socket identity")); - return -1; + goto cleanup; } - if (cr.cr_ngroups == 0) { + if (cr.cr_ngroups <= 0 || cr.cr_ngroups > NGROUPS) { virReportError(VIR_ERR_SYSTEM_ERROR, "%s", _("Failed to get valid client socket identity groups")); - return -1; + goto cleanup; } /* PID and process creation time are not supported on BSDs */ @@ -1188,8 +1189,11 @@ *uid = cr.cr_uid; *gid = cr.cr_gid; + ret = 0; + +cleanup: virObjectUnlock(sock); - return 0; + return ret; } #else int virNetSocketGetUNIXIdentity(virNetSocketPtr sock ATTRIBUTE_UNUSED,

3 5

[libvirt] [PATCH 0/6] AArch64 support for libvirt.
by Pranavkumar Sawargaonkar 17 Oct '13

17 Oct '13

This patchset extends libvirt for AArch64 (armv8a). All patches have been tested on APM X-Gene SoC and we are able to run libvirtd on APM X-Gene SOC and spawn VMs remotely using virsh and virt-manager. Pranavkumar Sawargaonkar (6): AArch64: Add AArch64 architecture to list of valid arches. AArch64: CPU Support for AArch64 (ARMv8 64bit). AArch64: Parse cputopology from /proc/cpuinfo. Implement minimal sysinfo for AArch64 platforms. Add parsing of AArch64 qemu capabilities. AArch64: Add qemu capabilities schemeta for test. src/Makefile.am | 1 + src/cpu/cpu.c | 2 + src/cpu/cpu_aarch64.c | 79 ++++++++++++++++++++++++++ src/cpu/cpu_aarch64.h | 31 ++++++++++ src/nodeinfo.c | 5 +- src/qemu/qemu_capabilities.c | 4 ++ src/util/virarch.c | 1 + src/util/virarch.h | 1 + src/util/virsysinfo.c | 3 +- tests/capabilityschemadata/caps-qemu-kvm.xml | 11 ++++ tests/sysinfodata/aarch64cpuinfo.data | 10 ++++ tests/sysinfodata/aarch64sysinfo.expect | 10 ++++ tests/sysinfotest.c | 14 ++++- 13 files changed, 168 insertions(+), 4 deletions(-) create mode 100644 src/cpu/cpu_aarch64.c create mode 100644 src/cpu/cpu_aarch64.h create mode 100644 tests/sysinfodata/aarch64cpuinfo.data create mode 100644 tests/sysinfodata/aarch64sysinfo.expect -- 1.7.9.5

4 24

[libvirt] [PATCH]virsh: fix a typo in virsh-domain
by Chen Hanxiao 17 Oct '13

17 Oct '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> s/it's/its Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- tools/virsh-domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index 6d241db..9017cac 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -3036,7 +3036,7 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd) &ctxt))) goto error; - /* tokenize the string from user and save it's parts into an array */ + /* tokenize the string from user and save its parts into an array */ if (vol_string && (nvol_list = vshStringToArray(vol_string, &vol_list)) < 0) goto error; -- 1.8.2.1

2 1

[libvirt] [PATCH] build: use the gnulib version of the .m4 files when present
by Giuseppe Scrivano 16 Oct '13

16 Oct '13

prevent aclocal to prefer .m4 files under m4/ to the version provided by gnulib. I have noticed this after './configure --help' gave me two different versions of "--enable-threads". This was caused by aclocal that preferred the version of lock.m4 provided by autopoint instead of using the newer version distributed with gnulib. Signed-off-by: Giuseppe Scrivano <gscrivan(a)redhat.com> --- bootstrap.conf | 5 ----- 1 file changed, 5 deletions(-) diff --git a/bootstrap.conf b/bootstrap.conf index 68c4a89..e7353e2 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -191,11 +191,6 @@ gnulib_tool_option_extras="\ " local_gl_dir=gnulib/local -# Convince bootstrap to use multiple m4 directories. -: ${ACLOCAL=aclocal} -ACLOCAL="$ACLOCAL -I m4" -export ACLOCAL - # Build prerequisites # Note that some of these programs are only required for 'make dist' to # succeed from a fresh git checkout; not all of these programs are -- 1.8.3.1

3 5

[libvirt] [PATCH] storage: document existing pools
by Eric Blake 16 Oct '13

16 Oct '13

We forgot to document several pool types. Furthermore, the RNG grammar did not allow arbitrary interleaving, which makes it harder than necessary to create a new pool from XML. * docs/formatstorage.html.in: Add docs for scsi, mpath, rbd, and sheepdog. * docs/schemas/storagepool.rng: Allow interleaving. * tests/storagepoolxml2xmlin/pool-sheepdog.xml: Test interleave. * tests/storagepoolxml2xmlin/pool-iscsi-auth.xml: Likewise. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- docs/formatstorage.html.in | 44 +-- docs/schemas/storagepool.rng | 356 ++++++++++++++----------- tests/storagepoolxml2xmlin/pool-iscsi-auth.xml | 12 +- tests/storagepoolxml2xmlin/pool-sheepdog.xml | 6 +- 4 files changed, 238 insertions(+), 180 deletions(-) diff --git a/docs/formatstorage.html.in b/docs/formatstorage.html.in index 3300d67..6f79b0c 100644 --- a/docs/formatstorage.html.in +++ b/docs/formatstorage.html.in @@ -18,9 +18,12 @@ The top level tag for a storage pool document is 'pool'. It has a single attribute <code>type</code>, which is one of <code>dir</code>, <code>fs</code>, <code>netfs</code>, <code>disk</code>, - <code>iscsi</code>, <code>logical</code>. This corresponds to the + <code>iscsi</code>, <code>logical</code>, <code>scsi</code> + (all <span class="since">since 0.4.1</span>), <code>mpath</code> + (<span class="since">since 0.7.1</span>), <code>rbd</code> + (<span class="since">since 0.9.13</span>), or <code>sheepdog</code> + (<span class="since">since 0.10.0</span>). This corresponds to the storage backend drivers listed further along in this document. - The storage pool XML format is available <span class="since">since 0.4.1</span> </p> <h3><a name="StoragePoolFirst">General metadata</a></h3> @@ -64,7 +67,8 @@ <p> A single <code>source</code> element is contained within the top level <code>pool</code> element. This tag is used to describe the source of - the storage pool. It can contain the following child elements: + the storage pool. The set of child elements that it will contain + depend on the pool type, but come from the following child elements: </p> <pre> @@ -89,17 +93,18 @@ <dl> <dt><code>device</code></dt> - <dd>Provides the source for pools backed by physical devices. + <dd>Provides the source for pools backed by physical devices + (fs, logical, disk, iscsi). May be repeated multiple times depending on backend driver. Contains a single attribute <code>path</code> which is the fully qualified path to the block device node. <span class="since">Since 0.4.1</span></dd> - <dt><code>directory</code></dt> - <dd>Provides the source for pools backed by directories. May + <dt><code>dir</code></dt> + <dd>Provides the source for pools backed by directories (dir). May only occur once. Contains a single attribute <code>path</code> which is the fully qualified path to the backing directory. <span class="since">Since 0.4.1</span></dd> <dt><code>adapter</code></dt> - <dd>Provides the source for pools backed by SCSI adapters. May + <dd>Provides the source for pools backed by SCSI adapters (scsi). May only occur once. Attribute <code>name</code> is the SCSI adapter name (ex. "scsi_host1". NB, although a name such as "host1" is still supported for backwards compatibility, it is not recommended). @@ -120,7 +125,8 @@ <span class="since">Since 0.6.2</span></dd> <dt><code>host</code></dt> <dd>Provides the source for pools backed by storage from a - remote server. Will be used in combination with a <code>directory</code> + remote server (netfs, iscsi, rbd, sheepdog). Will be + used in combination with a <code>directory</code> or <code>device</code> element. Contains an attribute <code>name</code> which is the hostname or IP address of the server. May optionally contain a <code>port</code> attribute for the protocol specific @@ -128,18 +134,19 @@ <dt><code>auth</code></dt> <dd>If present, the <code>auth</code> element provides the authentication credentials needed to access the source by the - setting of the <code>type</code> attribute. The <code>type</code> - must be either "chap" or "ceph". Additionally a mandatory attribute + setting of the <code>type</code> attribute (iscsi, + rbd). The <code>type</code> + must be either "chap" or "ceph". Use "ceph" for + Ceph RBD (Rados Block Device) network sources and use "iscsi" for CHAP + (Challenge-Handshake Authentication Protocol) iSCSI + targets. Additionally a mandatory attribute <code>username</code> identifies the username to use during authentication as well as a sub-element <code>secret</code> with a mandatory attribute <code>type</code>, to tie back to a <a href="formatsecret.html">libvirt secret object</a> that holds the actual password or other credentials. The domain XML intentionally does not expose the password, only the reference - to the object that manages the password. The secret element - <code>type</code> must be either "ceph" or "iscsi". Use "ceph" for - Ceph RBD (Rados Block Device) network sources and use "iscsi" for CHAP - (Challenge-Handshake Authentication Protocol) iSCSI targets. + to the object that manages the password. The <code>secret</code> element requires either a <code>uuid</code> attribute with the UUID of the secret object or a <code>usage</code> attribute matching the key that was specified in the @@ -148,11 +155,12 @@ </dd> <dt><code>name</code></dt> <dd>Provides the source for pools backed by storage from a - named element (e.g., a logical volume group name). + named element (logical, rbd, sheepdog). Contains a string identifier. <span class="since">Since 0.4.5</span></dd> <dt><code>format</code></dt> - <dd>Provides information about the format of the pool. This + <dd>Provides information about the format of the pool (fs, + netfs, disk, logical). This contains a single attribute <code>type</code> whose value is backend specific. This is typically used to indicate filesystem type, or network filesystem type, or partition table type, or @@ -174,7 +182,9 @@ <p> A single <code>target</code> element is contained within the top level - <code>pool</code> element. This tag is used to describe the mapping of + <code>pool</code> element for some types of pools (dir, fs, + netfs, logical, disk, iscsi, scsi, mpath). This tag is used to + describe the mapping of the storage pool into the host filesystem. It can contain the following child elements: </p> diff --git a/docs/schemas/storagepool.rng b/docs/schemas/storagepool.rng index a4ef5af..66d3c22 100644 --- a/docs/schemas/storagepool.rng +++ b/docs/schemas/storagepool.rng @@ -29,192 +29,224 @@ <attribute name='type'> <value>dir</value> </attribute> - <ref name='commonmetadata'/> - <ref name='sizing'/> - <ref name='sourcedir'/> - <ref name='target'/> + <interleave> + <ref name='commonmetadata'/> + <ref name='sizing'/> + <ref name='sourcedir'/> + <ref name='target'/> + </interleave> </define> <define name='poolfs'> <attribute name='type'> <value>fs</value> </attribute> - <ref name='commonmetadata'/> - <ref name='sizing'/> - <ref name='sourcefs'/> - <ref name='target'/> + <interleave> + <ref name='commonmetadata'/> + <ref name='sizing'/> + <ref name='sourcefs'/> + <ref name='target'/> + </interleave> </define> <define name='poolnetfs'> <attribute name='type'> <value>netfs</value> </attribute> - <ref name='commonmetadata'/> - <ref name='sizing'/> - <ref name='sourcenetfs'/> - <ref name='target'/> + <interleave> + <ref name='commonmetadata'/> + <ref name='sizing'/> + <ref name='sourcenetfs'/> + <ref name='target'/> + </interleave> </define> <define name='poollogical'> <attribute name='type'> <value>logical</value> </attribute> - <ref name='commonmetadata'/> - <ref name='sizing'/> - <ref name='sourcelogical'/> - <ref name='targetlogical'/> + <interleave> + <ref name='commonmetadata'/> + <ref name='sizing'/> + <ref name='sourcelogical'/> + <ref name='targetlogical'/> + </interleave> </define> <define name='pooldisk'> <attribute name='type'> <value>disk</value> </attribute> - <ref name='commonmetadata'/> - <ref name='sizing'/> - <ref name='sourcedisk'/> - <ref name='target'/> + <interleave> + <ref name='commonmetadata'/> + <ref name='sizing'/> + <ref name='sourcedisk'/> + <ref name='target'/> + </interleave> </define> <define name='pooliscsi'> <attribute name='type'> <value>iscsi</value> </attribute> - <ref name='commonmetadata'/> - <ref name='sizing'/> - <ref name='sourceiscsi'/> - <ref name='target'/> + <interleave> + <ref name='commonmetadata'/> + <ref name='sizing'/> + <ref name='sourceiscsi'/> + <ref name='target'/> + </interleave> </define> <define name='poolscsi'> <attribute name='type'> <value>scsi</value> </attribute> - <ref name='commonmetadata'/> - <ref name='sizing'/> - <ref name='sourcescsi'/> - <ref name='target'/> + <interleave> + <ref name='commonmetadata'/> + <ref name='sizing'/> + <ref name='sourcescsi'/> + <ref name='target'/> + </interleave> </define> <define name='poolmpath'> <attribute name='type'> <value>mpath</value> </attribute> - <ref name='commonmetadata'/> - <ref name='sizing'/> - <optional> - <ref name='sourcempath'/> - </optional> - <ref name='target'/> + <interleave> + <ref name='commonmetadata'/> + <ref name='sizing'/> + <optional> + <ref name='sourcempath'/> + </optional> + <ref name='target'/> + </interleave> </define> <define name='poolrbd'> <attribute name='type'> <value>rbd</value> </attribute> - <ref name='commonmetadata'/> - <ref name='sizing'/> - <ref name='sourcerbd'/> + <interleave> + <ref name='commonmetadata'/> + <ref name='sizing'/> + <ref name='sourcerbd'/> + </interleave> </define> <define name='poolsheepdog'> <attribute name='type'> <value>sheepdog</value> </attribute> - <ref name='commonmetadata'/> - <ref name='sizing'/> - <ref name='sourcesheepdog'/> + <interleave> + <ref name='commonmetadata'/> + <ref name='sizing'/> + <ref name='sourcesheepdog'/> + </interleave> </define> <define name='sourceinfovendor'> - <optional> - <element name='vendor'> - <attribute name='name'> - <text/> - </attribute> - </element> - </optional> - <optional> - <element name='product'> - <attribute name='name'> - <text/> - </attribute> - </element> - </optional> + <interleave> + <optional> + <element name='vendor'> + <attribute name='name'> + <text/> + </attribute> + </element> + </optional> + <optional> + <element name='product'> + <attribute name='name'> + <text/> + </attribute> + </element> + </optional> + </interleave> </define> <define name='commonmetadata'> - <element name='name'> - <ref name='genericName'/> - </element> - <optional> - <element name='uuid'> - <ref name='UUID'/> + <interleave> + <element name='name'> + <ref name='genericName'/> </element> - </optional> + <optional> + <element name='uuid'> + <ref name='UUID'/> + </element> + </optional> + </interleave> </define> <define name='sizing'> - <optional> - <element name='capacity'> - <ref name='scaledInteger'/> - </element> - </optional> - <optional> - <element name='allocation'> - <ref name='scaledInteger'/> - </element> - </optional> - <optional> - <element name='available'> - <ref name='scaledInteger'/> - </element> - </optional> + <interleave> + <optional> + <element name='capacity'> + <ref name='scaledInteger'/> + </element> + </optional> + <optional> + <element name='allocation'> + <ref name='scaledInteger'/> + </element> + </optional> + <optional> + <element name='available'> + <ref name='scaledInteger'/> + </element> + </optional> + </interleave> </define> <define name='permissions'> <optional> <element name='permissions'> - <element name='mode'> - <ref name='octalMode'/> - </element> - <element name='owner'> - <choice> - <ref name='unsignedInt'/> - <value>-1</value> - </choice> - </element> - <element name='group'> - <choice> - <ref name='unsignedInt'/> - <value>-1</value> - </choice> - </element> - <optional> - <element name='label'> - <text/> - </element> - </optional> + <interleave> + <element name='mode'> + <ref name='octalMode'/> + </element> + <element name='owner'> + <choice> + <ref name='unsignedInt'/> + <value>-1</value> + </choice> + </element> + <element name='group'> + <choice> + <ref name='unsignedInt'/> + <value>-1</value> + </choice> + </element> + <optional> + <element name='label'> + <text/> + </element> + </optional> + </interleave> </element> </optional> </define> <define name='target'> <element name='target'> - <element name='path'> - <ref name='absFilePath'/> - </element> - <ref name='permissions'/> + <interleave> + <element name='path'> + <ref name='absFilePath'/> + </element> + <ref name='permissions'/> + </interleave> </element> </define> <define name='targetlogical'> <element name='target'> - <optional> - <element name='path'> - <ref name='absFilePath'/> - </element> - </optional> - <ref name='permissions'/> + <interleave> + <optional> + <element name='path'> + <ref name='absFilePath'/> + </element> + </optional> + <ref name='permissions'/> + </interleave> </element> </define> @@ -413,74 +445,86 @@ <define name='sourcefs'> <element name='source'> - <ref name='sourceinfodev'/> - <ref name='sourcefmtfs'/> - <optional> - <ref name='sourceinfovendor'/> - </optional> + <interleave> + <ref name='sourceinfodev'/> + <ref name='sourcefmtfs'/> + <optional> + <ref name='sourceinfovendor'/> + </optional> + </interleave> </element> </define> <define name='sourcenetfs'> <element name='source'> - <ref name='sourceinfohost'/> - <ref name='sourceinfodir'/> - <ref name='sourcefmtnetfs'/> - <optional> - <ref name='sourceinfovendor'/> - </optional> + <interleave> + <ref name='sourceinfohost'/> + <ref name='sourceinfodir'/> + <ref name='sourcefmtnetfs'/> + <optional> + <ref name='sourceinfovendor'/> + </optional> + </interleave> </element> </define> <define name='sourcelogical'> <element name='source'> - <oneOrMore> + <interleave> + <oneOrMore> + <optional> + <ref name='sourceinfoname'/> + </optional> + <optional> + <ref name='sourceinfodev'/> + </optional> + </oneOrMore> + <ref name='sourcefmtlogical'/> <optional> - <ref name='sourceinfoname'/> - </optional> - <optional> - <ref name='sourceinfodev'/> + <ref name='sourceinfovendor'/> </optional> - </oneOrMore> - <ref name='sourcefmtlogical'/> - <optional> - <ref name='sourceinfovendor'/> - </optional> + </interleave> </element> </define> <define name='sourcedisk'> <element name='source'> - <ref name='sourceinfodev'/> - <ref name='sourcefmtdisk'/> - <optional> - <ref name='sourceinfovendor'/> - </optional> + <interleave> + <ref name='sourceinfodev'/> + <ref name='sourcefmtdisk'/> + <optional> + <ref name='sourceinfovendor'/> + </optional> + </interleave> </element> </define> <define name='sourceiscsi'> <element name='source'> - <ref name='sourceinfohost'/> - <ref name='sourceinfodev'/> - <optional> - <ref name='initiatorinfo'/> - </optional> - <optional> - <ref name='sourceinfoauth'/> - </optional> - <optional> - <ref name='sourceinfovendor'/> - </optional> + <interleave> + <ref name='sourceinfohost'/> + <ref name='sourceinfodev'/> + <optional> + <ref name='initiatorinfo'/> + </optional> + <optional> + <ref name='sourceinfoauth'/> + </optional> + <optional> + <ref name='sourceinfovendor'/> + </optional> + </interleave> </element> </define> <define name='sourcescsi'> <element name='source'> - <ref name='sourceinfoadapter'/> - <optional> - <ref name='sourceinfovendor'/> - </optional> + <interleave> + <ref name='sourceinfoadapter'/> + <optional> + <ref name='sourceinfovendor'/> + </optional> + </interleave> </element> </define> @@ -492,18 +536,22 @@ <define name='sourcerbd'> <element name='source'> - <ref name='sourceinfoname'/> - <ref name='sourceinfohost'/> - <optional> - <ref name='sourceinfoauth'/> - </optional> + <interleave> + <ref name='sourceinfoname'/> + <ref name='sourceinfohost'/> + <optional> + <ref name='sourceinfoauth'/> + </optional> + </interleave> </element> </define> <define name='sourcesheepdog'> <element name='source'> - <ref name='sourceinfohost'/> - <ref name='sourceinfoname'/> + <interleave> + <ref name='sourceinfohost'/> + <ref name='sourceinfoname'/> + </interleave> </element> </define> diff --git a/tests/storagepoolxml2xmlin/pool-iscsi-auth.xml b/tests/storagepoolxml2xmlin/pool-iscsi-auth.xml index c81eb60..5e5d336 100644 --- a/tests/storagepoolxml2xmlin/pool-iscsi-auth.xml +++ b/tests/storagepoolxml2xmlin/pool-iscsi-auth.xml @@ -1,19 +1,19 @@ <pool type='iscsi'> - <name>virtimages</name> - <uuid>e9392370-2917-565e-692b-d057f46512d6</uuid> <source> - <host name="iscsi.example.com"/> - <device path="demo-target"/> <auth type='chap' username='admin'> <secret uuid='2ec115d7-3a88-3ceb-bc12-0ac909a6fd87'/> </auth> + <device path="demo-target"/> + <host name="iscsi.example.com"/> </source> + <uuid>e9392370-2917-565e-692b-d057f46512d6</uuid> <target> - <path>/dev/disk/by-path</path> <permissions> - <mode>0700</mode> <owner>0</owner> + <mode>0700</mode> <group>0</group> </permissions> + <path>/dev/disk/by-path</path> </target> + <name>virtimages</name> </pool> diff --git a/tests/storagepoolxml2xmlin/pool-sheepdog.xml b/tests/storagepoolxml2xmlin/pool-sheepdog.xml index 1287047..49b6baf 100644 --- a/tests/storagepoolxml2xmlin/pool-sheepdog.xml +++ b/tests/storagepoolxml2xmlin/pool-sheepdog.xml @@ -1,8 +1,8 @@ <pool type='sheepdog'> - <name>sheepdog</name> - <uuid>65fcba04-5b13-bd93-cff3-52ce48e11ad7</uuid> <source> - <host name='localhost' port='7000'/> <name>sheepdog</name> + <host name='localhost' port='7000'/> </source> + <uuid>65fcba04-5b13-bd93-cff3-52ce48e11ad7</uuid> + <name>sheepdog</name> </pool> -- 1.8.3.1

2 2

[libvirt] [PATCH] remote-driver: Fix 'leav' typo in comment
by Christophe Fergeau 16 Oct '13

16 Oct '13

--- Pushed under the trivial rule. src/remote/remote_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index 96ccb99..87ef5a9 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -3721,7 +3721,7 @@ static int remoteAuthCredSASL2Vir(int vircred) * * Build up the SASL callback structure. We register one callback for * each credential type that the libvirt client indicated they support. - * We explicitly leav the callback function pointer at NULL though, + * We explicitly leave the callback function pointer at NULL though, * because we don't actually want to get SASL callbacks triggered. * Instead, we want the start/step functions to return SASL_INTERACT. * This lets us give the libvirt client a list of all required -- 1.8.3.1

1 0

[libvirt] [PATCH v2] rpc: Correct the wrong payload size checking
by Osier Yang 16 Oct '13

16 Oct '13

<...> /* Size of message length field. Not counted in VIR_NET_MESSAGE_MAX * and VIR_NET_MESSAGE_INITIAL. */ const VIR_NET_MESSAGE_LEN_MAX = 4; </...> However, msg->bufferLength includes the length word. The wrong checking was introduced by commit e914dcfd. * src/rpc/virnetmessage.c: - Correct the checking in virNetMessageEncodePayloadRaw - Use a new variable to track the new payload length in virNetMessageEncodePayloadRaw --- src/rpc/virnetmessage.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/rpc/virnetmessage.c b/src/rpc/virnetmessage.c index 8f4e4bc..d60366b 100644 --- a/src/rpc/virnetmessage.c +++ b/src/rpc/virnetmessage.c @@ -346,15 +346,16 @@ int virNetMessageEncodePayload(virNetMessagePtr msg, /* Try to encode the payload. If the buffer is too small increase it. */ while (!(*filter)(&xdr, data)) { - if ((msg->bufferLength - VIR_NET_MESSAGE_LEN_MAX) * 4 > VIR_NET_MESSAGE_MAX) { + unsigned int newlen = (msg->bufferLength - VIR_NET_MESSAGE_LEN_MAX) * 4; + + if (newlen > VIR_NET_MESSAGE_MAX) { virReportError(VIR_ERR_RPC, "%s", _("Unable to encode message payload")); goto error; } xdr_destroy(&xdr); - msg->bufferLength = (msg->bufferLength - VIR_NET_MESSAGE_LEN_MAX) * 4 + - VIR_NET_MESSAGE_LEN_MAX; + msg->bufferLength = newlen + VIR_NET_MESSAGE_LEN_MAX; if (VIR_REALLOC_N(msg->buffer, msg->bufferLength) < 0) goto error; @@ -426,10 +427,15 @@ int virNetMessageEncodePayloadRaw(virNetMessagePtr msg, /* If the message buffer is too small for the payload increase it accordingly. */ if ((msg->bufferLength - msg->bufferOffset) < len) { - if ((msg->bufferOffset + len) > VIR_NET_MESSAGE_MAX) { + if ((msg->bufferOffset + len) > + (VIR_NET_MESSAGE_MAX + VIR_NET_MESSAGE_LEN_MAX)) { virReportError(VIR_ERR_RPC, - _("Stream data too long to send (%zu bytes needed, %zu bytes available)"), - len, (VIR_NET_MESSAGE_MAX - msg->bufferOffset)); + _("Stream data too long to send " + "(%zu bytes needed, %zu bytes available)"), + len, + VIR_NET_MESSAGE_MAX + + VIR_NET_MESSAGE_LEN_MAX - + msg->bufferOffset); return -1; } -- 1.8.1.4

2 2

[libvirt] [PATCH] qemu: Fix the wrong logic of building cmd line for volume type disk
by Osier Yang 16 Oct '13

16 Oct '13

It builds a "libiscsi" uri if the volume type is "file" and "disk->auth.username" is specified, but I even see no reason to build the "libiscsi" uri for a "file" type volume, and the logic to check whether "disk->auth.username" is specified is also beyond understanding. It produces unexpected result like below: Disk config (pool is of 'fs' type): <disk type='volume' device='disk'> <driver name='qemu' type='raw'/> <auth username='myuser'> </auth> <source pool='default' volume='f18.img'/> <target dev='sda' bus='scsi'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> % virsh start f18 error: Failed to start domain f18 error: internal error: iscsi accepts only one host --- src/qemu/qemu_command.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index abb62e9..9b6a27d 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3806,13 +3806,7 @@ qemuBuildVolumeString(virConnectPtr conn, } break; case VIR_STORAGE_VOL_FILE: - if (disk->auth.username) { - if (qemuBuildISCSIString(conn, disk, opt) < 0) - goto cleanup; - virBufferAddChar(opt, ','); - } else { - virBufferEscape(opt, ',', ",", "file=%s,", disk->src); - } + virBufferEscape(opt, ',', ",", "file=%s,", disk->src); break; case VIR_STORAGE_VOL_NETWORK: /* Keep the compiler quite, qemuTranslateDiskSourcePool already -- 1.8.1.4

2 1

[libvirt] [PATCH v2] Introduce new OOM testing support
by Daniel P. Berrange 16 Oct '13

16 Oct '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> The previous OOM testing support would re-run the entire "main" method each iteration, failing a different malloc each time. When a test suite has 'n' allocations, the number of repeats requires is (n * (n + 1) ) / 2. This gets very large, very quickly. This new OOM testing support instead integrates at the virtTestRun level, so each individual test case gets repeated, instead of the entire test suite. This means the values of 'n' are orders of magnitude smaller. The simple usage is $ VIR_TEST_OOM=1 ./qemuxml2argvtest ... 29) QEMU XML-2-ARGV clock-utc ... OK Test OOM for nalloc=36 .................................... OK 30) QEMU XML-2-ARGV clock-localtime ... OK Test OOM for nalloc=36 .................................... OK 31) QEMU XML-2-ARGV clock-france ... OK Test OOM for nalloc=38 ...................................... OK ... the second lines reports how many mallocs have to be failed, and thus how many repeats of the test will be run. If it crashes, then running under valgrind will often show the problem $ VIR_TEST_OOM=1 ../run valgrind ./qemuxml2argvtest When debugging problems it is also helpful to select an individual test case $ VIR_TEST_RANGE=30 VIR_TEST_OOM=1 ../run valgrind ./qemuxml2argvtest When things get really tricky, it is possible to request that just specific allocs are failed. eg to fail allocs 5 -> 12, use $ VIR_TEST_RANGE=30 VIR_TEST_OOM=1:5-12 ../run valgrind ./qemuxml2argvtest In the worse case, you might want to know the stack trace of the alloc which was failed then VIR_TEST_OOM_TRACE can be set. If it is set to 1 then it will only print if it thinks a mistake happened. This is often not reliable, so setting it to 2 will make it print the stack trace for every alloc that is failed. $ VIR_TEST_OOM_TRACE=2 VIR_TEST_RANGE=30 VIR_TEST_OOM=1:5-5 ../run valgrind ./qemuxml2argvtest 30) QEMU XML-2-ARGV clock-localtime ... OK Test OOM for nalloc=36 !virAllocN /home/berrange/src/virt/libvirt/src/util/viralloc.c:180 virHashCreateFull /home/berrange/src/virt/libvirt/src/util/virhash.c:144 virDomainDefParseXML /home/berrange/src/virt/libvirt/src/conf/domain_conf.c:11745 virDomainDefParseNode /home/berrange/src/virt/libvirt/src/conf/domain_conf.c:12646 virDomainDefParse /home/berrange/src/virt/libvirt/src/conf/domain_conf.c:12590 testCompareXMLToArgvFiles /home/berrange/src/virt/libvirt/tests/qemuxml2argvtest.c:106 virtTestRun /home/berrange/src/virt/libvirt/tests/testutils.c:250 mymain /home/berrange/src/virt/libvirt/tests/qemuxml2argvtest.c:418 (discriminator 2) virtTestMain /home/berrange/src/virt/libvirt/tests/testutils.c:750 ?? ??:0 _start ??:? FAILED Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- docs/internals/oomtesting.html.in | 213 ++++++++++++++++++++++++++++++++++++++ docs/sitemap.html.in | 4 + tests/qemuargv2xmltest.c | 14 +-- tests/qemuxml2argvtest.c | 12 ++- tests/qemuxmlnstest.c | 18 ++-- tests/testutils.c | 195 +++++++++++++++++++++++++++++++++- tests/testutils.h | 2 + 7 files changed, 437 insertions(+), 21 deletions(-) create mode 100644 docs/internals/oomtesting.html.in diff --git a/docs/internals/oomtesting.html.in b/docs/internals/oomtesting.html.in new file mode 100644 index 0000000..652aff6 --- /dev/null +++ b/docs/internals/oomtesting.html.in @@ -0,0 +1,213 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> + <body> + <h1>Out of memory testing</h1> + + <ul id="toc"></ul> + + + <p> + This page describes how to use the test suite todo out of memory + testing. + </p> + + <h2>Building with OOM testing</h2> + + <p> + Since OOM testing requires hooking into the malloc APIs, it is + not enabled by default. The flag <code>--enable-test-oom</code> + must be given to <code>configure</code>. When this is done the + libvirt allocation APIs will have some hooks enabled. + </p> + + <pre> +$ ./configure --enable-test-oom +</pre> + + + <h2><a name="basicoom">Basic OOM testing support</a></h2> + + <p> + The first step in validating OOM usage is to run a test suite + with full OOM testing enabled. This is done by setting the + <code>VIR_TEST_OOM=1</code> environment variable. The way this + works is that it runs the test once normally to "prime" any + static memory allocations. Then it runs it once more counting + the total number of memory allocations. Then it runs it in a + loop failing a different memory allocation each time. For every + memory allocation failure triggered, it expects the test case + to return an error. OOM testing is quite slow requiring each + test case to be executed O(n) times, where 'n' is the total + number of memory allocations. This results in a total number + of memory allocations of '(n * (n + 1) ) / 2' + </p> + + <pre> +$ VIR_TEST_OOM=1 ./qemuxml2argvtest + 1) QEMU XML-2-ARGV minimal ... OK + Test OOM for nalloc=42 .......................................... OK + 2) QEMU XML-2-ARGV minimal-s390 ... OK + Test OOM for nalloc=28 ............................ OK + 3) QEMU XML-2-ARGV machine-aliases1 ... OK + Test OOM for nalloc=38 ...................................... OK + 4) QEMU XML-2-ARGV machine-aliases2 ... OK + Test OOM for nalloc=38 ...................................... OK + 5) QEMU XML-2-ARGV machine-core-on ... OK + Test OOM for nalloc=37 ..................................... OK +...snip... +</pre> + + <p> + In this output, the first line shows the normal execution and + the test number, and the second line shows the total number + of memory allocations from that test case. + </p> + + <h3><a name="valgrind">Tracking failures with valgrind</a></h3> + + <p> + The test suite should obviously *not* crash during OOM testing. + If it does crash, then to assist in tracking down the problem + it is worth using valgrind and only running a single test case. + For example, supposing test case 5 crashed. Then re-run the + test with + </p> + + <pre> +$ VIR_TEST_OOM=1 VIR_TEST_RANGE=5 ../run valgrind ./qemuxml2argvtest +...snip... + 5) QEMU XML-2-ARGV machine-core-on ... OK + Test OOM for nalloc=37 ..................................... OK +...snip... + </pre> + + <p> + Valgrind should report the cause of the crash - for example a + double free or use of uninitialized memory or NULL pointer + access. + </p> + + <h3><a name="stacktraces">Tracking failures with stack traces</a></h3> + + <p> + With some really difficult bugs valgrind is not sufficient to + identify the cause. In this case, it is useful to identify the + precise allocation which was failed, to allow the code path + to the error to be traced. The <code>VIR_TEST_OOM</code> + env variable can be given a range of memory allocations to + test. So if a test case has 150 allocations, it can be told + to only test allocation numbers 7-10. The <code>VIR_TEST_OOM_TRACE</code> + variable can be used to print out stack traces. + </p> + + <pre> +$ VIR_TEST_OOM_TRACE=2 VIR_TEST_OOM=1:7-10 VIR_TEST_RANGE=5 \ + ../run valgrind ./qemuxml2argvtest + 5) QEMU XML-2-ARGV machine-core-on ... OK + Test OOM for nalloc=37 !virAllocN +/home/berrange/src/virt/libvirt/src/util/viralloc.c:180 +virDomainDefParseXML +/home/berrange/src/virt/libvirt/src/conf/domain_conf.c:11786 (discriminator 1) +virDomainDefParseNode +/home/berrange/src/virt/libvirt/src/conf/domain_conf.c:12677 +virDomainDefParse +/home/berrange/src/virt/libvirt/src/conf/domain_conf.c:12621 +testCompareXMLToArgvFiles +/home/berrange/src/virt/libvirt/tests/qemuxml2argvtest.c:107 +virtTestRun +/home/berrange/src/virt/libvirt/tests/testutils.c:266 +mymain +/home/berrange/src/virt/libvirt/tests/qemuxml2argvtest.c:388 (discriminator 2) +virtTestMain +/home/berrange/src/virt/libvirt/tests/testutils.c:791 +__libc_start_main +??:? +_start +??:? +!virAlloc +/home/berrange/src/virt/libvirt/src/util/viralloc.c:133 +virDomainDiskDefParseXML +/home/berrange/src/virt/libvirt/src/conf/domain_conf.c:4790 +virDomainDefParseXML +/home/berrange/src/virt/libvirt/src/conf/domain_conf.c:11797 +virDomainDefParseNode +/home/berrange/src/virt/libvirt/src/conf/domain_conf.c:12677 +virDomainDefParse +/home/berrange/src/virt/libvirt/src/conf/domain_conf.c:12621 +testCompareXMLToArgvFiles +/home/berrange/src/virt/libvirt/tests/qemuxml2argvtest.c:107 +virtTestRun +/home/berrange/src/virt/libvirt/tests/testutils.c:266 +mymain +/home/berrange/src/virt/libvirt/tests/qemuxml2argvtest.c:388 (discriminator 2) +virtTestMain +/home/berrange/src/virt/libvirt/tests/testutils.c:791 +__libc_start_main +??:? +_start +??:? +!virAllocN +/home/berrange/src/virt/libvirt/src/util/viralloc.c:180 +virXPathNodeSet +/home/berrange/src/virt/libvirt/src/util/virxml.c:609 +virDomainDefParseXML +/home/berrange/src/virt/libvirt/src/conf/domain_conf.c:11805 +virDomainDefParseNode +/home/berrange/src/virt/libvirt/src/conf/domain_conf.c:12677 +virDomainDefParse +/home/berrange/src/virt/libvirt/src/conf/domain_conf.c:12621 +testCompareXMLToArgvFiles +/home/berrange/src/virt/libvirt/tests/qemuxml2argvtest.c:107 +virtTestRun +/home/berrange/src/virt/libvirt/tests/testutils.c:266 +mymain +/home/berrange/src/virt/libvirt/tests/qemuxml2argvtest.c:388 (discriminator 2) +virtTestMain +/home/berrange/src/virt/libvirt/tests/testutils.c:791 +__libc_start_main +??:? +_start +??:? +!virAllocN +/home/berrange/src/virt/libvirt/src/util/viralloc.c:180 +virDomainDefParseXML +/home/berrange/src/virt/libvirt/src/conf/domain_conf.c:11808 (discriminator 1) +virDomainDefParseNode +/home/berrange/src/virt/libvirt/src/conf/domain_conf.c:12677 +virDomainDefParse +/home/berrange/src/virt/libvirt/src/conf/domain_conf.c:12621 +testCompareXMLToArgvFiles +/home/berrange/src/virt/libvirt/tests/qemuxml2argvtest.c:107 +virtTestRun +/home/berrange/src/virt/libvirt/tests/testutils.c:266 +mymain +/home/berrange/src/virt/libvirt/tests/qemuxml2argvtest.c:388 (discriminator 2) +virtTestMain +/home/berrange/src/virt/libvirt/tests/testutils.c:791 +__libc_start_main +??:? +_start +??:? + </pre> + + <h3><a name="noncrash">Non-crash related problems</a></h3> + + <p> + Not all memory allocation bugs result in code crashing. Sometimes + the code will be silently ignoring the allocation failure, resulting + in incorrect data being produced. For example the XML parser may + mistakenly treat an allocation failure as indicating that an XML + attribute was not set in the input document. It is hard to identify + these problems from the test suite automatically. For this, the + test suites should be run with <code>VIR_TEST_DEBUG=1</code> set + and then stderr analysed for any unexpected data. For example, + the XML conversion may show an embedded "(null)" literal, or the + test suite might complain about missing elements / attributes + in the actual vs expected data. These are all signs of bugs in + OOM handling. In the future the OOM tests will be enhanced to + validate that an error VIR_ERR_NO_MEMORY is returned for each + allocation failed, rather than some other error. + </p> + </body> +</html> diff --git a/docs/sitemap.html.in b/docs/sitemap.html.in index d821a9e..d885f02 100644 --- a/docs/sitemap.html.in +++ b/docs/sitemap.html.in @@ -338,6 +338,10 @@ <a href="internals/locking.html">Lock managers</a> <span>Use lock managers to protect disk content</span> </li> + <li> + <a href="internals/oomtesting.html">Out of memory testing</a> + <span>Simulating OOM conditions in the test suite</span> + </li> </ul> </li> <li> diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c index 6dd8bb0..92fc89a 100644 --- a/tests/qemuargv2xmltest.c +++ b/tests/qemuargv2xmltest.c @@ -42,7 +42,6 @@ static int testCompareXMLToArgvFiles(const char *xml, char *cmd = NULL; int ret = -1; virDomainDefPtr vmdef = NULL; - char *log; if (virtTestLoadFile(cmdfile, &cmd) < 0) goto fail; @@ -53,13 +52,16 @@ static int testCompareXMLToArgvFiles(const char *xml, cmd, NULL, NULL, NULL))) goto fail; - if ((log = virtTestLogContentAndReset()) == NULL) - goto fail; - if ((*log != '\0') != expect_warning) { + if (!virtTestOOMActive()) { + char *log; + if ((log = virtTestLogContentAndReset()) == NULL) + goto fail; + if ((*log != '\0') != expect_warning) { + VIR_FREE(log); + goto fail; + } VIR_FREE(log); - goto fail; } - VIR_FREE(log); if (!(actualxml = virDomainDefFormat(vmdef, 0))) goto fail; diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 060acf2..83ddbad 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -107,7 +107,8 @@ static int testCompareXMLToArgvFiles(const char *xml, if (!(vmdef = virDomainDefParseFile(xml, driver.caps, driver.xmlopt, QEMU_EXPECTED_VIRT_TYPES, VIR_DOMAIN_XML_INACTIVE))) { - if (flags & FLAG_EXPECT_PARSE_ERROR) + if (!virtTestOOMActive() && + (flags & FLAG_EXPECT_PARSE_ERROR)) goto ok; goto out; } @@ -170,7 +171,8 @@ static int testCompareXMLToArgvFiles(const char *xml, migrateFrom, migrateFd, NULL, VIR_NETDEV_VPORT_PROFILE_OP_NO_OP, &testCallbacks))) { - if (flags & FLAG_EXPECT_FAILURE) { + if (!virtTestOOMActive() && + (flags & FLAG_EXPECT_FAILURE)) { ret = 0; if (virTestGetDebug() > 1) fprintf(stderr, "Got expected error: %s\n", @@ -184,7 +186,8 @@ static int testCompareXMLToArgvFiles(const char *xml, goto out; } - if (!!virGetLastError() != !!(flags & FLAG_EXPECT_ERROR)) { + if (!virtTestOOMActive() && + (!!virGetLastError() != !!(flags & FLAG_EXPECT_ERROR))) { if (virTestGetDebug() && (log = virtTestLogContentAndReset())) fprintf(stderr, "\n%s", log); goto out; @@ -205,7 +208,8 @@ static int testCompareXMLToArgvFiles(const char *xml, } ok: - if (flags & FLAG_EXPECT_ERROR) { + if (!virtTestOOMActive() && + (flags & FLAG_EXPECT_ERROR)) { /* need to suppress the errors */ virResetLastError(); } diff --git a/tests/qemuxmlnstest.c b/tests/qemuxmlnstest.c index 2cc15d1..38c98bd 100644 --- a/tests/qemuxmlnstest.c +++ b/tests/qemuxmlnstest.c @@ -117,15 +117,17 @@ static int testCompareXMLToArgvFiles(const char *xml, &testCallbacks))) goto fail; - if (!!virGetLastError() != expectError) { - if (virTestGetDebug() && (log = virtTestLogContentAndReset())) - fprintf(stderr, "\n%s", log); - goto fail; - } + if (!virtTestOOMActive()) { + if (!!virGetLastError() != expectError) { + if (virTestGetDebug() && (log = virtTestLogContentAndReset())) + fprintf(stderr, "\n%s", log); + goto fail; + } - if (expectError) { - /* need to suppress the errors */ - virResetLastError(); + if (expectError) { + /* need to suppress the errors */ + virResetLastError(); + } } if (!(actualargv = virCommandToString(cmd))) diff --git a/tests/testutils.c b/tests/testutils.c index 5d634b4..bc1e34e 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -47,6 +47,13 @@ #include "virprocess.h" #include "virstring.h" +#ifdef TEST_OOM +# ifdef TEST_OOM_TRACE +#include <dlfcn.h> +#include <execinfo.h> +# endif +#endif + #ifdef HAVE_PATHS_H # include <paths.h> #endif @@ -64,6 +71,18 @@ static unsigned int testDebug = -1; static unsigned int testVerbose = -1; static unsigned int testExpensive = -1; +#ifdef TEST_OOM +static unsigned int testOOM = 0; +static unsigned int testOOMStart = -1; +static unsigned int testOOMEnd = -1; +static unsigned int testOOMTrace = 0; +# ifdef TEST_OOM_TRACE +void *testAllocStack[30]; +int ntestAllocStack; +# endif +#endif +static bool testOOMActive = false; + static size_t testCounter = 0; static size_t testStart = 0; static size_t testEnd = 0; @@ -71,6 +90,19 @@ static size_t testEnd = 0; char *progname; char *abs_srcdir; +bool virtTestOOMActive(void) +{ + return testOOMActive; +} + +#ifdef TEST_OOM_TRACE +static void virTestAllocHook(int nalloc ATTRIBUTE_UNUSED, + void *opaque ATTRIBUTE_UNUSED) +{ + ntestAllocStack = backtrace(testAllocStack, ARRAY_CARDINALITY(testAllocStack)); +} +#endif + void virtTestResult(const char *name, int ret, const char *msg, ...) { va_list vargs; @@ -109,6 +141,35 @@ void virtTestResult(const char *name, int ret, const char *msg, ...) va_end(vargs); } +#ifdef TEST_OOM_TRACE +static void +virTestShowTrace(void) +{ + size_t j; + for (j = 2; j < ntestAllocStack; j++) { + Dl_info info; + char *cmd; + + dladdr(testAllocStack[j], &info); + if (info.dli_fname && + strstr(info.dli_fname, ".so")) { + if (virAsprintf(&cmd, "addr2line -f -e %s %p", + info.dli_fname, + ((void*)((unsigned long long)testAllocStack[j] + - (unsigned long long)info.dli_fbase))) < 0) + continue; + } else { + if (virAsprintf(&cmd, "addr2line -f -e %s %p", + (char*)(info.dli_fname ? info.dli_fname : "<unknown>"), + testAllocStack[j]) < 0) + continue; + } + ignore_value(system(cmd)); + VIR_FREE(cmd); + } +} +#endif + /* * Runs test * @@ -155,7 +216,7 @@ virtTestRun(const char *title, !((testCounter-1) % 40)) { fprintf(stderr, " %-3zu\n", (testCounter-1)); fprintf(stderr, " "); - } + } if (ret == 0) fprintf(stderr, "."); else if (ret == EXIT_AM_SKIP) @@ -164,6 +225,77 @@ virtTestRun(const char *title, fprintf(stderr, "!"); } +#ifdef TEST_OOM + if (testOOM && ret != EXIT_AM_SKIP) { + int nalloc; + int oomret; + int start, end; + size_t i; + virResetLastError(); + virAllocTestInit(); +# ifdef TEST_OOM_TRACE + virAllocTestHook(virTestAllocHook, NULL); +# endif + oomret = body(data); + nalloc = virAllocTestCount(); + fprintf(stderr, " Test OOM for nalloc=%d ", nalloc); + if (testOOMStart == -1 || + testOOMEnd == -1) { + start = 0; + end = nalloc; + } else { + start = testOOMStart; + end = testOOMEnd + 1; + } + testOOMActive = true; + for (i = start; i < end; i++) { + bool missingFail = false; +# ifdef TEST_OOM_TRACE + memset(testAllocStack, 0, ARRAY_CARDINALITY(testAllocStack)); + ntestAllocStack = 0; +# endif + virAllocTestOOM(i + 1, 1); + oomret = body(data); + + /* fprintf() disabled because XML parsing APIs don't allow + * distinguish between element / attribute not present + * in the XML (which is non-fatal), vs OOM / malformed + * which should be fatal. Thus error reporting for + * optionally present XML is mostly broken. + */ + if (oomret == 0) { + missingFail = true; +# if 0 + fprintf(stderr, " alloc %zu failed but no err status\n", i + 1); +# endif + } else { + virErrorPtr lerr = virGetLastError(); + if (!lerr) { +# if 0 + fprintf(stderr, " alloc %zu failed but no error report\n", i + 1); +# endif + missingFail = true; + } + } + if ((missingFail && testOOMTrace) || (testOOMTrace > 1)) { + fprintf(stderr, "%s", "!"); +# ifdef TEST_OOM_TRACE + virTestShowTrace(); +# endif + ret = -1; + } else { + fprintf(stderr, "%s", "."); + } + } + testOOMActive = false; + if (ret == 0) + fprintf(stderr, " OK\n"); + else + fprintf(stderr, " FAILED\n"); + virAllocTestInit(); + } +#endif /* TEST_OOM */ + return ret; } @@ -192,7 +324,6 @@ virtTestLoadFile(const char *file, char **buf) tmplen = buflen = st.st_size + 1; if (VIR_ALLOC_N(*buf, buflen) < 0) { - fprintf(stderr, "%s: larger than available memory (> %d)\n", file, buflen); VIR_FORCE_FCLOSE(fp); return -1; } @@ -468,7 +599,8 @@ virtTestLogOutput(virLogSource source ATTRIBUTE_UNUSED, { struct virtTestLogData *log = data; virCheckFlags(VIR_LOG_STACK_TRACE,); - virBufferAsprintf(&log->buf, "%s: %s", timestamp, str); + if (!testOOMActive) + virBufferAsprintf(&log->buf, "%s: %s", timestamp, str); } static void @@ -537,6 +669,9 @@ int virtTestMain(int argc, int ret; bool abs_srcdir_cleanup = false; char *testRange = NULL; +#ifdef TEST_OOM + char *oomstr; +#endif abs_srcdir = getenv("abs_srcdir"); if (!abs_srcdir) { @@ -597,6 +732,60 @@ int virtTestMain(int argc, } } +#ifdef TEST_OOM + if ((oomstr = getenv("VIR_TEST_OOM")) != NULL) { + char *next; + if (testDebug == -1) + testDebug = 1; + testOOM = 1; + if (oomstr[0] != '\0' && + oomstr[1] == ':') { + if (virStrToLong_ui(oomstr + 2, &next, 10, &testOOMStart) < 0) { + fprintf(stderr, "Cannot parse range %s\n", oomstr); + return EXIT_FAILURE; + } + if (*next == '\0') { + testOOMEnd = testOOMStart; + } else { + if (*next != '-') { + fprintf(stderr, "Cannot parse range %s\n", oomstr); + return EXIT_FAILURE; + } + if (virStrToLong_ui(next+1, NULL, 10, &testOOMEnd) < 0) { + fprintf(stderr, "Cannot parse range %s\n", oomstr); + return EXIT_FAILURE; + } + } + } else { + testOOMStart = -1; + testOOMEnd = -1; + } + } + +# ifdef TEST_OOM_TRACE + if ((oomstr = getenv("VIR_TEST_OOM_TRACE")) != NULL) { + if (virStrToLong_ui(oomstr, NULL, 10, &testOOMTrace) < 0) { + fprintf(stderr, "Cannot parse oom trace %s\n", oomstr); + return EXIT_FAILURE; + } + } +# else + if (getenv("VIR_TEST_OOM_TRACE")) { + fprintf(stderr, "%s", "OOM test tracing not enabled in this build\n"); + return EXIT_FAILURE; + } +# endif +#else /* TEST_OOM */ + if (getenv("VIR_TEST_OOM")) { + fprintf(stderr, "%s", "OOM testing not enabled in this build\n"); + return EXIT_FAILURE; + } + if (getenv("VIR_TEST_OOM_TRACE")) { + fprintf(stderr, "%s", "OOM test tracing not enabled in this build\n"); + return EXIT_FAILURE; + } +#endif /* TEST_OOM */ + ret = (func)(); if (abs_srcdir_cleanup) diff --git a/tests/testutils.h b/tests/testutils.h index 478b53c..e6f494d 100644 --- a/tests/testutils.h +++ b/tests/testutils.h @@ -40,6 +40,8 @@ extern char *progname; extern char *abs_srcdir; +bool virtTestOOMActive(void); + void virtTestResult(const char *name, int ret, const char *msg, ...) ATTRIBUTE_FMT_PRINTF(3,4); int virtTestRun(const char *title, -- 1.8.3.1

1 0

[libvirt] [PATCH 0/6] Try to fix selinux/securityfs mount handling in LXC
by Daniel P. Berrange 16 Oct '13

16 Oct '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> This series tries to address the problem of LXC containers failing to start because 'securityfs' is not compiled in. In doing this some general cleanup was performed on the LXC mount code. Daniel P. Berrange (6): Add virFileIsMountPoint function Remove unused 'opts' field from LXC basic mounts struct Remove pointless 'srcpath' variable in lxcContainerMountBasicFS Remove duplicate entries in lxcBasicMounts array Add flag to lxcBasicMounts to control use in user namespaces Skip any files which are not mounted on the host src/libvirt_private.syms | 1 + src/lxc/lxc_container.c | 86 +++++++++++++++++++++++++++++------------------- src/util/virfile.c | 58 ++++++++++++++++++++++++++++++++ src/util/virfile.h | 2 ++ 4 files changed, 113 insertions(+), 34 deletions(-) -- 1.8.3.1

4 16

[libvirt] [PATCHv2 00/23] Better approach to add the "pvticketlocks" feature
by Peter Krempa 16 Oct '13

16 Oct '13

This version resolves conflicts with Eric's const correctnes series. The paravirtual spinlock feature was introduced recently into the qemu and linux code base. To test it you need the most recent -rc version of the linux kernel and the git version of qemu. As the requirements to activate this feature in the guest are really volatile (kernel support, qemu support .. .) I decided to improve the original version so that it detects if the feature was actually enabled in the guest. This avoids possible problems with breaking guest ABI when migrating between two hosts with different kernels. Additionally we may start enforcin other features too. This patchset is partialy based on Jiri's work on getting actual cpu definition from a running qemu. Jiri Denemark (8): cpu: Add support for loading and storing CPU data cpu: x86: Rename struct cpuX86cpuid as virCPUx86CPUID cpu: x86: Rename struct cpuX86Data as virCPUx86Data cpu: x86: Rename x86DataFree() as virCPUx86DataFree() cpu: x86: Rename x86MakeCPUData as virCPUx86MakeData cpu: x86: Rename x86DataAddCpuid as virCPUx86DataAddCPUID cpu: Export few x86-specific APIs qemu: Add monitor APIs to fetch CPUID data from QEMU Peter Krempa (15): schema: Rename option to make it reusable conf: Clean up few error messages qemu: command: Fix macro indentation cpu: x86: Rename data_iterator and DATA_ITERATOR_INIT cpu: x86: Fix return types of x86cpuidMatch and x86cpuidMatchMasked cpu: x86: Fix function header formatting and whitespace cpu: x86: Use whitespace to clarify context and use consistent labels cpu: x86: Clean up error messages in x86VendorLoad() qemu: Clean up check of maximum cpu count supported by a machine type cpu_x86: Refactor storage of CPUID data to add support for KVM features cpu: x86: Parse the CPU feature map only once cpu: x86: Add internal CPUID features support and KVM feature bits conf: Refactor storing and usage of feature flags qemu: Add support for paravirtual spinlocks in the guest qemu: process: Validate specific CPUID flags of a guest docs/formatdomain.html.in | 7 + docs/schemas/domaincommon.rng | 18 +- src/conf/domain_conf.c | 200 ++++-- src/conf/domain_conf.h | 3 +- src/cpu/cpu.c | 41 ++ src/cpu/cpu.h | 16 +- src/cpu/cpu_x86.c | 699 ++++++++++++--------- src/cpu/cpu_x86.h | 9 + src/cpu/cpu_x86_data.h | 26 +- src/libvirt_private.syms | 8 + src/libxl/libxl_conf.c | 9 +- src/lxc/lxc_container.c | 6 +- src/qemu/qemu_command.c | 31 +- src/qemu/qemu_monitor.c | 21 + src/qemu/qemu_monitor.h | 3 + src/qemu/qemu_monitor_json.c | 107 ++++ src/qemu/qemu_monitor_json.h | 3 + src/qemu/qemu_process.c | 50 +- src/vbox/vbox_tmpl.c | 45 +- src/xenapi/xenapi_driver.c | 10 +- src/xenapi/xenapi_utils.c | 22 +- src/xenxs/xen_sxpr.c | 20 +- src/xenxs/xen_xm.c | 30 +- tests/Makefile.am | 1 + .../qemumonitorjson-getcpu-empty.data | 2 + .../qemumonitorjson-getcpu-empty.json | 46 ++ .../qemumonitorjson-getcpu-filtered.data | 4 + .../qemumonitorjson-getcpu-filtered.json | 46 ++ .../qemumonitorjson-getcpu-full.data | 5 + .../qemumonitorjson-getcpu-full.json | 46 ++ .../qemumonitorjson-getcpu-host.data | 6 + .../qemumonitorjson-getcpu-host.json | 45 ++ tests/qemumonitorjsontest.c | 76 +++ .../qemuxml2argv-pv-spinlock-disabled.args | 5 + .../qemuxml2argv-pv-spinlock-disabled.xml | 26 + .../qemuxml2argv-pv-spinlock-enabled.args | 5 + .../qemuxml2argv-pv-spinlock-enabled.xml | 26 + tests/qemuxml2argvtest.c | 2 + tests/qemuxml2xmltest.c | 2 + 39 files changed, 1279 insertions(+), 448 deletions(-) create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-getcpu-empty.data create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-getcpu-empty.json create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-getcpu-filtered.data create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-getcpu-filtered.json create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-getcpu-full.data create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-getcpu-full.json create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-getcpu-host.data create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-getcpu-host.json create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-disabled.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-disabled.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-enabled.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-enabled.xml -- 1.8.3.2

3 50

[libvirt] [PATCH] virprocess: make virProcessGetStartTime work on Mac OS X
by Ryota Ozaki 16 Oct '13

16 Oct '13

This patch addresses the following warning output by libvirtd: warning : virProcessGetStartTime:843 : Process start time of pid XXXXX not available on this platform For Mac OS X, we can use similar instructions to FreeBSD to get the start time of a process. The difference between them is struct kinfo_proc; kinfo_proc.ki_start is the start time of a process for FreeBSD while kinfo_proc.kp_proc.p_starttime for Mac OS X. Note that this patch works for Lion and Mountain Lion, however, doesn't work for Snow Leopard for some reason; sysctlnametomib("kern.proc.pid", ...) fails on Snow Leopard with the following error: error : virProcessGetStartTime:822 : Unable to get MIB of kern.proc.pid: No such file or directory This is unexpected. man 3 sysctl of Snow Leopard says it should work... Anyway libvirtd is able to launch on Snow Leopard regardless of the error. Signed-off-by: Ryota Ozaki <ozaki.ryota(a)gmail.com> --- src/util/virprocess.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/util/virprocess.c b/src/util/virprocess.c index 9fc3207..5a0ed0d 100644 --- a/src/util/virprocess.c +++ b/src/util/virprocess.c @@ -32,7 +32,7 @@ #endif #include <sched.h> -#ifdef __FreeBSD__ +#if defined(__FreeBSD__) || defined(__APPLE__) # include <sys/param.h> # include <sys/sysctl.h> # include <sys/user.h> @@ -809,7 +809,7 @@ cleanup: VIR_FREE(buf); return ret; } -#elif defined(__FreeBSD__) +#elif defined(__FreeBSD__) || defined(__APPLE__) int virProcessGetStartTime(pid_t pid, unsigned long long *timestamp) { @@ -817,7 +817,12 @@ int virProcessGetStartTime(pid_t pid, int mib[4]; size_t len = 4; - sysctlnametomib("kern.proc.pid", mib, &len); + /* FIXME: It doesn't work on Snow Leopard for some reason */ + if (sysctlnametomib("kern.proc.pid", mib, &len) < 0) { + virReportSystemError(errno, "%s", + _("Unable to get MIB of kern.proc.pid")); + return -1; + } len = sizeof(struct kinfo_proc); mib[3] = pid; @@ -828,7 +833,11 @@ int virProcessGetStartTime(pid_t pid, return -1; } +# if defined(__FreeBSD__) *timestamp = (unsigned long long)p.ki_start.tv_sec; +# else + *timestamp = (unsigned long long)p.kp_proc.p_starttime.tv_sec; +# endif return 0; -- 1.8.4

2 2

[libvirt] [PATCH 0/3] leave cgroup value checking to kernel
by Chen Hanxiao 16 Oct '13

16 Oct '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> Since 2.6.39, kernel changed the minimum weight of device blkio while libvirt hard-coded the value range checking. So we should leave the job of checking to kernel. Chen Hanxiao (3): [libvirt]docs: change the minimum weight description for blkio [libvirt]cgroup: show error when EINVAL caught [libvirt]cgroup: leave value checking to kernel docs/formatdomain.html.in | 6 ++++-- src/util/vircgroup.c | 26 +++++++++++--------------- tools/virsh.pod | 11 ++++++----- 3 files changed, 21 insertions(+), 22 deletions(-) -- 1.8.2.1

2 7

[libvirt] [PATCH v3]LXC: Helper function for checking permission of dir when userns enabled
by Chen Hanxiao 16 Oct '13

16 Oct '13

From: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> If we enable userns, the process with uid/gid in idmap should have enough permission to access dir we provided for containers. Currently, the debug log is very implicit or misleading sometimes. This patch will help clarify this for us when using debug log or virsh. v2: syntax-check clean v3: reliable method for checking permission of dir Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/lxc/lxc_container.c | 88 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 8abaea0..9a05e30 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -110,6 +110,13 @@ struct __lxc_child_argv { int handshakefd; }; +typedef struct __lxc_userns_DirPermCheck_argv lxc_userns_DirPermCheck_argv_t; +struct __lxc_userns_DirPermCheck_argv { + uid_t uid; + gid_t gid; + virDomainDefPtr vmDef; +}; + static int lxcContainerMountFSBlock(virDomainFSDefPtr fs, const char *srcprefix); @@ -1829,6 +1836,84 @@ lxcNeedNetworkNamespace(virDomainDefPtr def) return false; } +static +int lxcContainerCheckDirPermissionChild(void *argv) +{ + size_t i; + lxc_userns_DirPermCheck_argv_t *args = argv; + uid_t uid = args->uid; + uid_t gid = args->gid; + virDomainDefPtr vmDef = args->vmDef; + char *path; + + if (virSetUIDGID(uid, gid, NULL, 0) < 0) { + virReportSystemError(errno, "%s", + _("setuid or setgid failed")); + _exit(-1); + } + + for (i = 0; i < vmDef->nfss; i++) { + path = vmDef->fss[i]->src; + if (access(path, R_OK) || access(path, W_OK) || virFileIsExecutable(path)) { + VIR_DEBUG("Src dir '%s' does not belong to uid/gid: %d/%d", + vmDef->fss[i]->src, uid, gid); + _exit(-1); + } + } + + _exit(0); +} + +/* + * Helper function for helping check + * whether we have enough privilege + * to operate the source dir when userns enabled + * @vmDef: pointer to vm definition structure + * Returns 0 on success or -1 in case of error + */ +static int +lxcContainerCheckDirPermission(virDomainDefPtr vmDef) +{ + uid_t uid; + gid_t gid; + int cpid = 0; + int status; + char *childStack; + char *stack; + int flags = SIGCHLD; + + uid = vmDef->idmap.uidmap[0].target; + gid = vmDef->idmap.gidmap[0].target; + + lxc_userns_DirPermCheck_argv_t args = { + .uid = uid, + .gid = gid, + .vmDef = vmDef + }; + + if (VIR_ALLOC_N(stack, getpagesize() * 4) < 0) + return -1; + + childStack = stack + (getpagesize() * 4); + cpid = clone(lxcContainerCheckDirPermissionChild, childStack, flags, &args); + VIR_FREE(stack); + if (cpid < 0) { + virReportSystemError(errno, "%s", + _("Unable to clone to check permission of directory")); + return -1; + } else if (virProcessWait(cpid, &status) < 0) { + return -1; + } + + if (WEXITSTATUS(status) != 0) { + virReportSystemError(errno, "%s", + _("Check the permission of source dir provided for container")); + return -1; + } + + return 0; +} + /** * lxcContainerStart: * @def: pointer to virtual machine structure @@ -1880,6 +1965,9 @@ int lxcContainerStart(virDomainDefPtr def, if (userns_supported()) { VIR_DEBUG("Enable user namespace"); cflags |= CLONE_NEWUSER; + if (lxcContainerCheckDirPermission(def) < 0) { + return -1; + } } else { virReportSystemError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Kernel doesn't support user namespace")); -- 1.8.2.1

2 4

Re: [libvirt] [Qemu-devel] [RFC PATCH] spapr-vty: workaround "reg" property for old kernels
by Anthony Liguori 16 Oct '13

16 Oct '13

On Tue, Oct 15, 2013 at 3:47 PM, Alexey Kardashevskiy <aik(a)ozlabs.ru> wrote: > On 10/16/2013 02:03 AM, Alexander Graf wrote: >> On 10/15/2013 10:50 AM, Alexey Kardashevskiy wrote: >>> Old kernels (< 3.1) handle hvcX devices different in different parts. >>> Sometime the kernel assumes that the hvc device numbers start from zero >>> and if there is just one hvc, then it is hvc0. >>> >>> However kernel's add_preferred_console() uses the very last byte of >>> the VTY's "reg" property as an hvc number so it might end up with something >>> different than hvc. >>> >>> The problem appears on SLES11SP3 and RHEL6. If to run QEMU without >>> -nodefaults, then the default VTY is created first on a VIO bus and gets >>> reg==0x71000000 so it will be hvc0 and everything will be fine. >>> If to run QEMU with: >>> -nodefaults \ >>> -chardev "socket,id=char1,host=localhost,port=8001,server,telnet,mux=on" \ >>> -device "spapr-vty,chardev=char1" \ >>> -mon "chardev=char1,mode=readline,id=mon1" \ >>> >>> then the exactly the same config is expected but in this case spapr-vty >>> gets reg==0x71000001 and therefore it becomes hvc1 and lots of debug >>> output is missing. SLES11SP3 does not even boot as /dev/console is >>> redirected to /dev/hvc0 which is dead. >>> >>> The issue can be solved by manual selection of VTY's "reg" property to >>> have last byte equal to zero. >>> >>> The alternative would be to use separate "reg" property counter for >>> automatic "reg" property generation and this is what the patch does. >>> >>> Signed-off-by: Alexey Kardashevskiy<aik(a)ozlabs.ru> >>> --- >>> >>> Since libvirt uses "-nodefault" a lot and in this case "spapr-nvram" gets >>> created first and gets reg=0x71000000, we cannot just ignore this. Also, >>> it does not seem an option to require libvirt users to specify spapr-vty >>> "reg" property every time. >>> >>> Can anyone think of a simpler solutionu? Thanks. >>> >>> >>> --- >>> hw/ppc/spapr_vio.c | 7 ++++++- >>> include/hw/ppc/spapr_vio.h | 1 + >>> 2 files changed, 7 insertions(+), 1 deletion(-) >>> >>> diff --git a/hw/ppc/spapr_vio.c b/hw/ppc/spapr_vio.c >>> index a6a0a51..2d56950 100644 >>> --- a/hw/ppc/spapr_vio.c >>> +++ b/hw/ppc/spapr_vio.c >>> @@ -438,7 +438,11 @@ static int spapr_vio_busdev_init(DeviceState *qdev) >>> VIOsPAPRBus *bus = DO_UPCAST(VIOsPAPRBus, bus, >>> dev->qdev.parent_bus); >>> >>> do { >>> - dev->reg = bus->next_reg++; >>> + if (!object_dynamic_cast(OBJECT(qdev), "spapr-vty")) { >>> + dev->reg = bus->next_reg++; >>> + } else { >>> + dev->reg = bus->next_vty_reg++; >>> + } >>> } while (reg_conflict(dev)); >>> } >>> >>> @@ -501,6 +505,7 @@ VIOsPAPRBus *spapr_vio_bus_init(void) >>> qbus = qbus_create(TYPE_SPAPR_VIO_BUS, dev, "spapr-vio"); >>> bus = DO_UPCAST(VIOsPAPRBus, bus, qbus); >>> bus->next_reg = 0x71000000; >>> + bus->next_vty_reg = 0x71000100; >> >> This breaks as soon as you pass in more than 0x100 devices that are non-vty >> into the guest, no? > > Will we ever have this much? Ah, anyway, this code already checks if the > address is taken and fails if it is. And there is still a possibility to > assign addresses manually. > >> The reg property really describes the virtual slot a device is in. > > We use 0x71000000. I saw xmls from libvirt where VTY's reg is 0x30000000. > Whether it is a slot or not, QEMU/SLOF/Kernel does not seem to care about > absolute value :) > >> Couldn't >> we do that allocation explicitly and push it from libvirt, just like we do >> it with the slots for PCI? Yes, this is the only solution. We make no promises with respect to argument ordering. libvirt needs to explicitly specify reg values to create a stable device tree (just like it does with PCI). Regards, Anthony Liguori > > That is the other possibility, yes. But in this case "-nodefaults" must not > create spapr-nvram automatically and if we do that, we'll break existing > setups. > > >> >> >> Alex >> >> >>> >>> /* hcall-vio */ >>> spapr_register_hypercall(H_VIO_SIGNAL, h_vio_signal); >>> diff --git a/include/hw/ppc/spapr_vio.h b/include/hw/ppc/spapr_vio.h >>> index d8b3b03..3a92d9e 100644 >>> --- a/include/hw/ppc/spapr_vio.h >>> +++ b/include/hw/ppc/spapr_vio.h >>> @@ -73,6 +73,7 @@ struct VIOsPAPRDevice { >>> struct VIOsPAPRBus { >>> BusState bus; >>> uint32_t next_reg; >>> + uint32_t next_vty_reg; >>> int (*init)(VIOsPAPRDevice *dev); >>> int (*devnode)(VIOsPAPRDevice *dev, void *fdt, int node_off); >>> }; >> > > > -- > Alexey >

1 0

[libvirt] [PATCHv2] Ignore thin pool LVM devices.
by Dusty Mabe 15 Oct '13

15 Oct '13

This should resolve: https://bugzilla.redhat.com/show_bug.cgi?id=924672 For BZ 924672 the problem stems from the fact that thin pool logical volume devices show up in /sbin/lvs output just like normal logical volumes do. Libvirt incorrectly assumes they are just normal logical volumes and that they will have a corresponding /dev/vgname/lvname device that has been created by udev and tries to use this device. To illustrate here is an example of the /dev/vgname/ directory and the lvs output for a normal lv, thin lv, and thin pool: LV VG Attr LSize Pool Origin Data% Move Log Copy% Convert lv vgguests -wi-a---- 1.00g pool vgguests twi-a-tz- 11.00g 0.00 thinlv vgguests Vwi-a-tz- 1.00g pool 0.00 total 0 lrwxrwxrwx. 1 root root 7 Oct 8 19:35 lv -> ../dm-7 lrwxrwxrwx. 1 root root 7 Oct 8 19:37 thinlv -> ../dm-6 This patch modifies virStorageBackendLogicalMakeVol() to ignore thin pool devices. --- src/storage/storage_backend_logical.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index a1a37a1..81ee4a4 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -85,6 +85,14 @@ virStorageBackendLogicalMakeVol(virStoragePoolObjPtr pool, if (attrs[4] != 'a') return 0; + /* + * Skip thin pools(t). These show up in normal lvs output + * but do not have a corresponding /dev/$vg/$lv device that + * is created by udev. This breaks assumptions in later code. + */ + if (attrs[0] == 't') + return 0; + /* See if we're only looking for a specific volume */ if (data != NULL) { vol = data; -- 1.8.3.1

2 2

[libvirt] [libvirt-sandbox PATCH] Add filter support.
by Ian Main 15 Oct '13

15 Oct '13

This patch adds two new classes, filterref and filterref-parameter. Network interfaces can now have an associated filter reference with any number of filterref parameters. Also added filter= option to virt-sandbox tool. --- libvirt-sandbox/Makefile.am | 4 + .../libvirt-sandbox-builder-container.c | 37 +++- libvirt-sandbox/libvirt-sandbox-builder-machine.c | 36 ++++ ...rt-sandbox-config-network-filterref-parameter.c | 205 ++++++++++++++++++++ ...rt-sandbox-config-network-filterref-parameter.h | 75 ++++++++ .../libvirt-sandbox-config-network-filterref.c | 209 +++++++++++++++++++++ .../libvirt-sandbox-config-network-filterref.h | 75 ++++++++ libvirt-sandbox/libvirt-sandbox-config-network.c | 33 ++++ libvirt-sandbox/libvirt-sandbox-config-network.h | 4 + libvirt-sandbox/libvirt-sandbox-config.c | 39 ++++ libvirt-sandbox/libvirt-sandbox.h | 2 + libvirt-sandbox/libvirt-sandbox.sym | 14 ++ 12 files changed, 732 insertions(+), 1 deletion(-) create mode 100644 libvirt-sandbox/libvirt-sandbox-config-network-filterref-parameter.c create mode 100644 libvirt-sandbox/libvirt-sandbox-config-network-filterref-parameter.h create mode 100644 libvirt-sandbox/libvirt-sandbox-config-network-filterref.c create mode 100644 libvirt-sandbox/libvirt-sandbox-config-network-filterref.h diff --git a/libvirt-sandbox/Makefile.am b/libvirt-sandbox/Makefile.am index 0882490..4de8766 100644 --- a/libvirt-sandbox/Makefile.am +++ b/libvirt-sandbox/Makefile.am @@ -57,6 +57,8 @@ SANDBOX_HEADER_FILES = \ libvirt-sandbox-config.h \ libvirt-sandbox-config-network.h \ libvirt-sandbox-config-network-address.h \ + libvirt-sandbox-config-network-filterref.h \ + libvirt-sandbox-config-network-filterref-parameter.h \ libvirt-sandbox-config-network-route.h \ libvirt-sandbox-config-mount.h \ libvirt-sandbox-config-mount-file.h \ @@ -85,6 +87,8 @@ SANDBOX_SOURCE_FILES = \ libvirt-sandbox-config.c \ libvirt-sandbox-config-network.c \ libvirt-sandbox-config-network-address.c \ + libvirt-sandbox-config-network-filterref.c \ + libvirt-sandbox-config-network-filterref-parameter.c \ libvirt-sandbox-config-network-route.c \ libvirt-sandbox-config-mount.c \ libvirt-sandbox-config-mount-file.c \ diff --git a/libvirt-sandbox/libvirt-sandbox-builder-container.c b/libvirt-sandbox/libvirt-sandbox-builder-container.c index 43ee5ef..193b777 100644 --- a/libvirt-sandbox/libvirt-sandbox-builder-container.c +++ b/libvirt-sandbox/libvirt-sandbox-builder-container.c @@ -319,11 +319,12 @@ static gboolean gvir_sandbox_builder_container_construct_devices(GVirSandboxBuil g_list_foreach(mounts, (GFunc)g_object_unref, NULL); g_list_free(mounts); - tmp = networks = gvir_sandbox_config_get_networks(config); while (tmp) { const gchar *source, *mac; GVirSandboxConfigNetwork *network = GVIR_SANDBOX_CONFIG_NETWORK(tmp->data); + GVirSandboxConfigNetworkFilterref *filterref; + GVirConfigDomainInterfaceFilterref *glib_fref; iface = gvir_config_domain_interface_network_new(); source = gvir_sandbox_config_network_get_source(network); @@ -339,6 +340,40 @@ static gboolean gvir_sandbox_builder_container_construct_devices(GVirSandboxBuil gvir_config_domain_add_device(domain, GVIR_CONFIG_DOMAIN_DEVICE(iface)); + + filterref = gvir_sandbox_config_network_get_filterref(network); + if (filterref) { + GList *param_iter, *parameters; + const gchar *fref_name = gvir_sandbox_config_network_filterref_get_filter(filterref); + glib_fref = gvir_config_domain_interface_filterref_new(); + gvir_config_domain_interface_filterref_set_filter(glib_fref, fref_name); + param_iter = parameters = gvir_sandbox_config_network_filterref_get_parameters(filterref); + while (param_iter) { + const gchar *name; + const gchar *value; + GVirSandboxConfigNetworkFilterrefParameter *param = GVIR_SANDBOX_CONFIG_NETWORK_FILTERREF_PARAMETER(param_iter->data); + GVirConfigDomainInterfaceFilterrefParameter *glib_param; + + name = gvir_sandbox_config_network_filterref_parameter_get_name(param); + value = gvir_sandbox_config_network_filterref_parameter_get_value(param); + + glib_param = gvir_config_domain_interface_filterref_parameter_new(); + gvir_config_domain_interface_filterref_parameter_set_name(glib_param, name); + gvir_config_domain_interface_filterref_parameter_set_value(glib_param, value); + + gvir_config_domain_interface_filterref_add_parameter(glib_fref, glib_param); + g_object_unref(glib_param); + + param_iter = param_iter->next; + } + + g_list_foreach(parameters, (GFunc)g_object_unref, NULL); + g_list_free(parameters); + + gvir_config_domain_interface_set_filterref(GVIR_CONFIG_DOMAIN_INTERFACE(iface), glib_fref); + g_object_unref(glib_fref); + } + g_object_unref(iface); tmp = tmp->next; diff --git a/libvirt-sandbox/libvirt-sandbox-builder-machine.c b/libvirt-sandbox/libvirt-sandbox-builder-machine.c index a8c5d8c..072bbbe 100644 --- a/libvirt-sandbox/libvirt-sandbox-builder-machine.c +++ b/libvirt-sandbox/libvirt-sandbox-builder-machine.c @@ -577,6 +577,8 @@ static gboolean gvir_sandbox_builder_machine_construct_devices(GVirSandboxBuilde while (tmp) { const gchar *source, *mac; GVirSandboxConfigNetwork *network = GVIR_SANDBOX_CONFIG_NETWORK(tmp->data); + GVirSandboxConfigNetworkFilterref *filterref; + GVirConfigDomainInterfaceFilterref *glib_fref; source = gvir_sandbox_config_network_get_source(network); if (source) { @@ -596,6 +598,40 @@ static gboolean gvir_sandbox_builder_machine_construct_devices(GVirSandboxBuilde gvir_config_domain_add_device(domain, GVIR_CONFIG_DOMAIN_DEVICE(iface)); + + filterref = gvir_sandbox_config_network_get_filterref(network); + if (filterref) { + GList *param_iter, *parameters; + const gchar *fref_name = gvir_sandbox_config_network_filterref_get_filter(filterref); + glib_fref = gvir_config_domain_interface_filterref_new(); + gvir_config_domain_interface_filterref_set_filter(glib_fref, fref_name); + param_iter = parameters = gvir_sandbox_config_network_filterref_get_parameters(filterref); + while (param_iter) { + const gchar *name; + const gchar *value; + GVirSandboxConfigNetworkFilterrefParameter *param = GVIR_SANDBOX_CONFIG_NETWORK_FILTERREF_PARAMETER(param_iter->data); + GVirConfigDomainInterfaceFilterrefParameter *glib_param; + + name = gvir_sandbox_config_network_filterref_parameter_get_name(param); + value = gvir_sandbox_config_network_filterref_parameter_get_value(param); + + glib_param = gvir_config_domain_interface_filterref_parameter_new(); + gvir_config_domain_interface_filterref_parameter_set_name(glib_param, name); + gvir_config_domain_interface_filterref_parameter_set_value(glib_param, value); + + gvir_config_domain_interface_filterref_add_parameter(glib_fref, glib_param); + g_object_unref(glib_param); + + param_iter = param_iter->next; + } + + g_list_foreach(parameters, (GFunc)g_object_unref, NULL); + g_list_free(parameters); + + gvir_config_domain_interface_set_filterref(iface, glib_fref); + g_object_unref(glib_fref); + } + g_object_unref(iface); tmp = tmp->next; diff --git a/libvirt-sandbox/libvirt-sandbox-config-network-filterref-parameter.c b/libvirt-sandbox/libvirt-sandbox-config-network-filterref-parameter.c new file mode 100644 index 0000000..c1ed941 --- /dev/null +++ b/libvirt-sandbox/libvirt-sandbox-config-network-filterref-parameter.c @@ -0,0 +1,205 @@ +/* + * libvirt-sandbox-config-network-filterref-parameter.c: libvirt sandbox configuration + * + * 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, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Author: Ian Main <imain(a)redhat.com> + */ + +#include <config.h> +#include <string.h> + +#include "libvirt-sandbox/libvirt-sandbox.h" + +/** + * SECTION: libvirt-sandbox-config-network-filterref-parameter + * @short_description: Set parameters for a filter reference. + * @include: libvirt-sandbox/libvirt-sandbox.h + * + * Provides an object to store filter parameter name and value. + * + * The GVirSandboxConfigNetworkFilterrefParameter object stores a + * name and value required to set a single parameter of a filter reference. + */ + +#define GVIR_SANDBOX_CONFIG_NETWORK_FILTERREF_PARAMETER_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_SANDBOX_TYPE_CONFIG_NETWORK_FILTERREF_PARAMETER, GVirSandboxConfigNetworkFilterrefParameterPrivate)) + +struct _GVirSandboxConfigNetworkFilterrefParameterPrivate +{ + gchar *name; + gchar *value; +}; + +G_DEFINE_TYPE(GVirSandboxConfigNetworkFilterrefParameter, gvir_sandbox_config_network_filterref_parameter, G_TYPE_OBJECT); + + +enum { + PROP_0, + PROP_NAME, + PROP_VALUE, +}; + +enum { + LAST_SIGNAL +}; + +//static gint signals[LAST_SIGNAL]; + + +static void gvir_sandbox_config_network_filterref_parameter_get_property(GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + GVirSandboxConfigNetworkFilterrefParameter *config = GVIR_SANDBOX_CONFIG_NETWORK_FILTERREF_PARAMETER(object); + GVirSandboxConfigNetworkFilterrefParameterPrivate *priv = config->priv; + + switch (prop_id) { + case PROP_NAME: + g_value_set_string(value, priv->name); + break; + + case PROP_VALUE: + g_value_set_string(value, priv->value); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); + } +} + + +static void gvir_sandbox_config_network_filterref_parameter_set_property(GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) +{ + GVirSandboxConfigNetworkFilterrefParameter *config = GVIR_SANDBOX_CONFIG_NETWORK_FILTERREF_PARAMETER(object); + GVirSandboxConfigNetworkFilterrefParameterPrivate *priv = config->priv; + + switch (prop_id) { + case PROP_NAME: + g_free(priv->name); + priv->name = g_value_dup_string(value); + break; + + case PROP_VALUE: + g_free(priv->value); + priv->value = g_value_dup_string(value); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); + } +} + + +static void gvir_sandbox_config_network_filterref_parameter_finalize(GObject *object) +{ + GVirSandboxConfigNetworkFilterrefParameter *config = GVIR_SANDBOX_CONFIG_NETWORK_FILTERREF_PARAMETER(object); + GVirSandboxConfigNetworkFilterrefParameterPrivate *priv = config->priv; + + g_free(priv->name); + g_free(priv->value); + + G_OBJECT_CLASS(gvir_sandbox_config_network_filterref_parameter_parent_class)->finalize(object); +} + + +static void gvir_sandbox_config_network_filterref_parameter_class_init(GVirSandboxConfigNetworkFilterrefParameterClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS(klass); + + object_class->finalize = gvir_sandbox_config_network_filterref_parameter_finalize; + object_class->get_property = gvir_sandbox_config_network_filterref_parameter_get_property; + object_class->set_property = gvir_sandbox_config_network_filterref_parameter_set_property; + + g_object_class_install_property(object_class, + PROP_NAME, + g_param_spec_string("name", + "Name", + "Name of parameter", + NULL, + G_PARAM_READABLE | + G_PARAM_WRITABLE | + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_BLURB)); + + g_object_class_install_property(object_class, + PROP_VALUE, + g_param_spec_string("value", + "Value", + "Value of parameter", + NULL, + G_PARAM_READABLE | + G_PARAM_WRITABLE | + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_BLURB)); + + g_type_class_add_private(klass, sizeof(GVirSandboxConfigNetworkFilterrefParameterPrivate)); +} + + +static void gvir_sandbox_config_network_filterref_parameter_init(GVirSandboxConfigNetworkFilterrefParameter *param) +{ + param->priv = GVIR_SANDBOX_CONFIG_NETWORK_FILTERREF_PARAMETER_GET_PRIVATE(param); +} + + +/** + * gvir_sandbox_config_network_filterref_parameter_new: + * + * Create a new network config with DHCP enabled + * + * Returns: (transfer full): a new sandbox network object + */ +GVirSandboxConfigNetworkFilterrefParameter *gvir_sandbox_config_network_filterref_parameter_new(void) +{ + return GVIR_SANDBOX_CONFIG_NETWORK_FILTERREF_PARAMETER(g_object_new(GVIR_SANDBOX_TYPE_CONFIG_NETWORK_FILTERREF_PARAMETER, + NULL)); +} + +void gvir_sandbox_config_network_filterref_parameter_set_name(GVirSandboxConfigNetworkFilterrefParameter *param, + const gchar *name) +{ + GVirSandboxConfigNetworkFilterrefParameterPrivate *priv = param->priv; + g_free(priv->name); + priv->name = g_strdup(name); +} + +const gchar *gvir_sandbox_config_network_filterref_parameter_get_name(GVirSandboxConfigNetworkFilterrefParameter *param) +{ + GVirSandboxConfigNetworkFilterrefParameterPrivate *priv = param->priv; + return priv->name; +} + +void gvir_sandbox_config_network_filterref_parameter_set_value(GVirSandboxConfigNetworkFilterrefParameter *param, + const gchar *value) +{ + GVirSandboxConfigNetworkFilterrefParameterPrivate *priv = param->priv; + g_free(priv->value); + priv->value = g_strdup(value); +} + +const gchar *gvir_sandbox_config_network_filterref_parameter_get_value(GVirSandboxConfigNetworkFilterrefParameter *param) +{ + GVirSandboxConfigNetworkFilterrefParameterPrivate *priv = param->priv; + return priv->value; +} diff --git a/libvirt-sandbox/libvirt-sandbox-config-network-filterref-parameter.h b/libvirt-sandbox/libvirt-sandbox-config-network-filterref-parameter.h new file mode 100644 index 0000000..f40895f --- /dev/null +++ b/libvirt-sandbox/libvirt-sandbox-config-network-filterref-parameter.h @@ -0,0 +1,75 @@ +/* + * libvirt-sandbox-config-network-filterref-parameter.h: libvirt sandbox configuration + * + * 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, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Author: Ian Main <imain(a)redhat.com> + */ + +#if !defined(__LIBVIRT_SANDBOX_H__) && !defined(LIBVIRT_SANDBOX_BUILD) +#error "Only <libvirt-sandbox/libvirt-sandbox.h> can be included directly." +#endif + +#ifndef __LIBVIRT_SANDBOX_CONFIG_NETWORK_FILTERREF_PARAMETER_H__ +#define __LIBVIRT_SANDBOX_CONFIG_NETWORK_FILTERREF_PARAMETER_H__ + +G_BEGIN_DECLS + +#define GVIR_SANDBOX_TYPE_CONFIG_NETWORK_FILTERREF_PARAMETER (gvir_sandbox_config_network_filterref_parameter_get_type ()) +#define GVIR_SANDBOX_CONFIG_NETWORK_FILTERREF_PARAMETER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GVIR_SANDBOX_TYPE_CONFIG_NETWORK_FILTERREF_PARAMETER, GVirSandboxConfigNetworkFilterrefParameter)) +#define GVIR_SANDBOX_CONFIG_NETWORK_FILTERREF_PARAMETER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GVIR_SANDBOX_TYPE_CONFIG_NETWORK_FILTERREF_PARAMETER, GVirSandboxConfigNetworkFilterrefParameterClass)) +#define GVIR_SANDBOX_IS_CONFIG_NETWORK_FILTERREF_PARAMETER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GVIR_SANDBOX_TYPE_CONFIG_NETWORK_FILTERREF_PARAMETER)) +#define GVIR_SANDBOX_IS_CONFIG_NETWORK_FILTERREF_PARAMETER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GVIR_SANDBOX_TYPE_CONFIG_NETWORK_FILTERREF_PARAMETER)) +#define GVIR_SANDBOX_CONFIG_NETWORK_FILTERREF_PARAMETER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GVIR_SANDBOX_TYPE_CONFIG_NETWORK_FILTERREF_PARAMETER, GVirSandboxConfigNetworkFilterrefParameterClass)) + +#define GVIR_SANDBOX_TYPE_CONFIG_NETWORK_FILTERREF_PARAMETER_HANDLE (gvir_sandbox_config_network_filterref_parameter_handle_get_type ()) + +typedef struct _GVirSandboxConfigNetworkFilterrefParameter GVirSandboxConfigNetworkFilterrefParameter; +typedef struct _GVirSandboxConfigNetworkFilterrefParameterPrivate GVirSandboxConfigNetworkFilterrefParameterPrivate; +typedef struct _GVirSandboxConfigNetworkFilterrefParameterClass GVirSandboxConfigNetworkFilterrefParameterClass; + +struct _GVirSandboxConfigNetworkFilterrefParameter +{ + GObject parent; + + GVirSandboxConfigNetworkFilterrefParameterPrivate *priv; + + /* Do not add fields to this struct */ +}; + +struct _GVirSandboxConfigNetworkFilterrefParameterClass +{ + GObjectClass parent_class; + + gpointer padding[LIBVIRT_SANDBOX_CLASS_PADDING]; +}; + +GType gvir_sandbox_config_network_filterref_parameter_get_type(void); + +GVirSandboxConfigNetworkFilterrefParameter *gvir_sandbox_config_network_filterref_parameter_new(void); + +void gvir_sandbox_config_network_filterref_parameter_set_name(GVirSandboxConfigNetworkFilterrefParameter *param, + const gchar *name); +const gchar *gvir_sandbox_config_network_filterref_parameter_get_name(GVirSandboxConfigNetworkFilterrefParameter *param); + +void gvir_sandbox_config_network_filterref_parameter_set_value(GVirSandboxConfigNetworkFilterrefParameter *param, + const gchar *value); +const gchar *gvir_sandbox_config_network_filterref_parameter_get_value(GVirSandboxConfigNetworkFilterrefParameter *param); + +G_END_DECLS + +#endif /* __LIBVIRT_SANDBOX_CONFIG_NETWORK_FILTERREF_PARAMETER_H__ */ diff --git a/libvirt-sandbox/libvirt-sandbox-config-network-filterref.c b/libvirt-sandbox/libvirt-sandbox-config-network-filterref.c new file mode 100644 index 0000000..ee8ff89 --- /dev/null +++ b/libvirt-sandbox/libvirt-sandbox-config-network-filterref.c @@ -0,0 +1,209 @@ +/* + * libvirt-sandbox-config-mount.c: libvirt sandbox configuration + * + * 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, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Author: Ian Main <imain(a)redhat.com> + */ + +#include <config.h> +#include <string.h> + +#include "libvirt-sandbox/libvirt-sandbox.h" + +/** + * SECTION: libvirt-sandbox-config-network-filterref + * @short_description: Add a network filter to a network interface. + * @include: libvirt-sandbox/libvirt-sandbox.h + * @see_aloso: #GVirSandboxConfig + * + * Provides an object to store the name of the filter reference. + * + * The GVirSandboxConfigNetworkFilterref object stores the name of the filter + * references associated with a network interface. + */ + +#define GVIR_SANDBOX_CONFIG_NETWORK_FILTERREF_GET_PRIVATE(obj) \ + (G_TYPE_INSTANCE_GET_PRIVATE((obj), GVIR_SANDBOX_TYPE_CONFIG_NETWORK_FILTERREF, GVirSandboxConfigNetworkFilterrefPrivate)) + +struct _GVirSandboxConfigNetworkFilterrefPrivate +{ + gchar *filter; + GList *parameters; +}; + +G_DEFINE_TYPE(GVirSandboxConfigNetworkFilterref, gvir_sandbox_config_network_filterref, G_TYPE_OBJECT); + + +enum { + PROP_0, + PROP_FILTER +}; + +enum { + LAST_SIGNAL +}; + +//static gint signals[LAST_SIGNAL]; + +static void gvir_sandbox_config_network_filterref_get_property(GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + GVirSandboxConfigNetworkFilterref *config = GVIR_SANDBOX_CONFIG_NETWORK_FILTERREF(object); + GVirSandboxConfigNetworkFilterrefPrivate *priv = config->priv; + + switch (prop_id) { + case PROP_FILTER: + g_value_set_string(value, priv->filter); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); + } +} + + +static void gvir_sandbox_config_network_filterref_set_property(GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) +{ + GVirSandboxConfigNetworkFilterref *config = GVIR_SANDBOX_CONFIG_NETWORK_FILTERREF(object); + GVirSandboxConfigNetworkFilterrefPrivate *priv = config->priv; + + switch (prop_id) { + case PROP_FILTER: + g_free(priv->filter); + priv->filter = g_value_dup_string(value); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec); + } +} + + + +static void gvir_sandbox_config_network_filterref_finalize(GObject *object) +{ + GVirSandboxConfigNetworkFilterref *config = GVIR_SANDBOX_CONFIG_NETWORK_FILTERREF(object); + GVirSandboxConfigNetworkFilterrefPrivate *priv = config->priv; + + g_free(priv->filter); + g_list_foreach(priv->parameters, (GFunc)g_object_unref, NULL); + + G_OBJECT_CLASS(gvir_sandbox_config_network_filterref_parent_class)->finalize(object); +} + + +static void gvir_sandbox_config_network_filterref_class_init(GVirSandboxConfigNetworkFilterrefClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS(klass); + + object_class->finalize = gvir_sandbox_config_network_filterref_finalize; + object_class->get_property = gvir_sandbox_config_network_filterref_get_property; + object_class->set_property = gvir_sandbox_config_network_filterref_set_property; + + g_object_class_install_property(object_class, + PROP_FILTER, + g_param_spec_string("filter", + "Filter name", + "The filter reference name", + NULL, + G_PARAM_READABLE | + G_PARAM_WRITABLE | + G_PARAM_CONSTRUCT_ONLY | + G_PARAM_STATIC_NAME | + G_PARAM_STATIC_NICK | + G_PARAM_STATIC_BLURB)); + + g_type_class_add_private(klass, sizeof(GVirSandboxConfigNetworkFilterrefPrivate)); +} + +/** + * gvir_sandbox_config_network_filterref_new: + * + * Create a new network filterref config. + * + * Returns: (transfer full): a new sandbox network_filterref object + */ +GVirSandboxConfigNetworkFilterref *gvir_sandbox_config_network_filterref_new(void) +{ + return GVIR_SANDBOX_CONFIG_NETWORK_FILTERREF(g_object_new(GVIR_SANDBOX_TYPE_CONFIG_NETWORK_FILTERREF, + NULL)); +} + + +static void gvir_sandbox_config_network_filterref_init(GVirSandboxConfigNetworkFilterref *config) +{ + config->priv = GVIR_SANDBOX_CONFIG_NETWORK_FILTERREF_GET_PRIVATE(config); +} + + +/** + * gvir_sandbox_config_network_filterref_get_filter: + * @config: (transfer none): the network filter reference name + * + * Retrieves the network filter reference name. + * + * Returns: (transfer none): the network filter reference name. + */ +const gchar *gvir_sandbox_config_network_filterref_get_filter(GVirSandboxConfigNetworkFilterref *config) +{ + GVirSandboxConfigNetworkFilterrefPrivate *priv = config->priv; + return priv->filter; +} + +void gvir_sandbox_config_network_filterref_set_filter(GVirSandboxConfigNetworkFilterref *config, + const gchar *name) +{ + GVirSandboxConfigNetworkFilterrefPrivate *priv = config->priv; + g_free(priv->filter); + priv->filter = g_strdup(name); +} + +/** + * gvir_sandbox_config_network_filterref_add_parameter: + * @filter: (transfer none): the network filter reference. + * @param: (transfer none): the filter parameter + * + * Add a parameter to a network filter reference. + */ +void gvir_sandbox_config_network_filterref_add_parameter(GVirSandboxConfigNetworkFilterref *filter, + GVirSandboxConfigNetworkFilterrefParameter *param) +{ + GVirSandboxConfigNetworkFilterrefPrivate *priv = filter->priv; + priv->parameters = g_list_append(priv->parameters, g_object_ref(param)); +} + + +/** + * gvir_sandbox_config_network_filterref_get_parameters: + * @filter: (transfer none): the filter reference configuration + * + * Retrieve the list of parameters associated with a network filter reference + * + * Returns: (transfer full)(element-type GVirSandboxConfigNetworkFilterrefParameter): the parameter list + */ +GList *gvir_sandbox_config_network_filterref_get_parameters(GVirSandboxConfigNetworkFilterref *filter) +{ + GVirSandboxConfigNetworkFilterrefPrivate *priv = filter->priv; + g_list_foreach(priv->parameters, (GFunc)g_object_ref, NULL); + return g_list_copy(priv->parameters); +} diff --git a/libvirt-sandbox/libvirt-sandbox-config-network-filterref.h b/libvirt-sandbox/libvirt-sandbox-config-network-filterref.h new file mode 100644 index 0000000..5d264a5 --- /dev/null +++ b/libvirt-sandbox/libvirt-sandbox-config-network-filterref.h @@ -0,0 +1,75 @@ +/* + * libvirt-sandbox-config-mount.h: libvirt sandbox configuration + * + * 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, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * + * Author: Ian Main <imain(a)redhat.com> + */ + +#if !defined(__LIBVIRT_SANDBOX_H__) && !defined(LIBVIRT_SANDBOX_BUILD) +#error "Only <libvirt-sandbox/libvirt-sandbox.h> can be included directly." +#endif + +#ifndef __LIBVIRT_SANDBOX_CONFIG_NETWORK_FILTERREF_H__ +#define __LIBVIRT_SANDBOX_CONFIG_NETWORK_FILTERREF_H__ + +G_BEGIN_DECLS + +#define GVIR_SANDBOX_TYPE_CONFIG_NETWORK_FILTERREF (gvir_sandbox_config_network_filterref_get_type ()) +#define GVIR_SANDBOX_CONFIG_NETWORK_FILTERREF(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GVIR_SANDBOX_TYPE_CONFIG_NETWORK_FILTERREF, GVirSandboxConfigNetworkFilterref)) +#define GVIR_SANDBOX_CONFIG_NETWORK_FILTERREF_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GVIR_SANDBOX_TYPE_CONFIG_NETWORK_FILTERREF, GVirSandboxConfigNetworkFilterrefClass)) +#define GVIR_SANDBOX_IS_CONFIG_NETWORK_FILTERREF(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GVIR_SANDBOX_TYPE_CONFIG_NETWORK_FILTERREF)) +#define GVIR_SANDBOX_IS_CONFIG_NETWORK_FILTERREF_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GVIR_SANDBOX_TYPE_CONFIG_NETWORK_FILTERREF)) +#define GVIR_SANDBOX_CONFIG_NETWORK_FILTERREF_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GVIR_SANDBOX_TYPE_CONFIG_NETWORK_FILTERREF, GVirSandboxConfigNetworkFilterrefClass)) + +#define GVIR_SANDBOX_TYPE_CONFIG_NETWORK_FILTERREF_HANDLE (gvir_sandbox_config_network_filterref_handle_get_type ()) + +typedef struct _GVirSandboxConfigNetworkFilterref GVirSandboxConfigNetworkFilterref; +typedef struct _GVirSandboxConfigNetworkFilterrefPrivate GVirSandboxConfigNetworkFilterrefPrivate; +typedef struct _GVirSandboxConfigNetworkFilterrefClass GVirSandboxConfigNetworkFilterrefClass; + +struct _GVirSandboxConfigNetworkFilterref +{ + GObject parent; + + GVirSandboxConfigNetworkFilterrefPrivate *priv; + + /* Do not add fields to this struct */ +}; + +struct _GVirSandboxConfigNetworkFilterrefClass +{ + GObjectClass parent_class; + + gpointer padding[LIBVIRT_SANDBOX_CLASS_PADDING]; +}; + +GType gvir_sandbox_config_network_filterref_get_type(void); + +GVirSandboxConfigNetworkFilterref *gvir_sandbox_config_network_filterref_new(void); + +const gchar *gvir_sandbox_config_network_filterref_get_filter(GVirSandboxConfigNetworkFilterref *config); +void gvir_sandbox_config_network_filterref_set_filter(GVirSandboxConfigNetworkFilterref *filter, const gchar *name); + +void gvir_sandbox_config_network_filterref_add_parameter(GVirSandboxConfigNetworkFilterref *filter, + GVirSandboxConfigNetworkFilterrefParameter *param); +GList *gvir_sandbox_config_network_filterref_get_parameters(GVirSandboxConfigNetworkFilterref *filter); + + +G_END_DECLS + +#endif /* __LIBVIRT_SANDBOX_CONFIG_NETWORK_FILTERREF_H__ */ diff --git a/libvirt-sandbox/libvirt-sandbox-config-network.c b/libvirt-sandbox/libvirt-sandbox-config-network.c index 7e7c015..555a360 100644 --- a/libvirt-sandbox/libvirt-sandbox-config-network.c +++ b/libvirt-sandbox/libvirt-sandbox-config-network.c @@ -47,6 +47,7 @@ struct _GVirSandboxConfigNetworkPrivate gchar *mac; GList *routes; GList *addrs; + GVirSandboxConfigNetworkFilterref *filterref; }; G_DEFINE_TYPE(GVirSandboxConfigNetwork, gvir_sandbox_config_network, G_TYPE_OBJECT); @@ -285,6 +286,38 @@ GList *gvir_sandbox_config_network_get_addresses(GVirSandboxConfigNetwork *confi } /** + * gvir_sandbox_config_network_set_filterref: + * @config: (transfer none): the sandbox network configuration + * @ref: (transfer none): the network filterref + * + * Set a network filterref for the given network. + */ +void gvir_sandbox_config_network_set_filterref(GVirSandboxConfigNetwork *config, + GVirSandboxConfigNetworkFilterref *filterref) +{ + GVirSandboxConfigNetworkPrivate *priv = config->priv; + if (priv->filterref) + g_object_unref(priv->filterref); + priv->filterref = g_object_ref(filterref); +} + + +/** + * gvir_sandbox_config_network_get_filterref: + * @config: (transfer none): the sandbox network configuration + * + * Retrieve the associated filter reference. + * + * Returns: (transfer none): The associated filter reference. + */ +GVirSandboxConfigNetworkFilterref *gvir_sandbox_config_network_get_filterref(GVirSandboxConfigNetwork *config) +{ + GVirSandboxConfigNetworkPrivate *priv = config->priv; + return priv->filterref; +} + + +/** * gvir_sandbox_config_network_add_route: * @config: (transfer none): the sandbox network configuration * @addr: (transfer none): the network route diff --git a/libvirt-sandbox/libvirt-sandbox-config-network.h b/libvirt-sandbox/libvirt-sandbox-config-network.h index d926fd1..4a52221 100644 --- a/libvirt-sandbox/libvirt-sandbox-config-network.h +++ b/libvirt-sandbox/libvirt-sandbox-config-network.h @@ -78,6 +78,10 @@ void gvir_sandbox_config_network_add_address(GVirSandboxConfigNetwork *config, GVirSandboxConfigNetworkAddress *addr); GList *gvir_sandbox_config_network_get_addresses(GVirSandboxConfigNetwork *config); +void gvir_sandbox_config_network_set_filterref(GVirSandboxConfigNetwork *config, + GVirSandboxConfigNetworkFilterref *ref); +GVirSandboxConfigNetworkFilterref *gvir_sandbox_config_network_get_filterref(GVirSandboxConfigNetwork *config); + void gvir_sandbox_config_network_add_route(GVirSandboxConfigNetwork *config, GVirSandboxConfigNetworkRoute *addr); GList *gvir_sandbox_config_network_get_routes(GVirSandboxConfigNetwork *config); diff --git a/libvirt-sandbox/libvirt-sandbox-config.c b/libvirt-sandbox/libvirt-sandbox-config.c index b1525a1..af21dbc 100644 --- a/libvirt-sandbox/libvirt-sandbox-config.c +++ b/libvirt-sandbox/libvirt-sandbox-config.c @@ -911,6 +911,8 @@ gboolean gvir_sandbox_config_add_network_strv(GVirSandboxConfig *config, * source=private,address=192.168.122.1/24%192.168.122.255, * address=192.168.122.1/24%192.168.122.255,address=2001:212::204:2/64 * route=192.168.122.255/24%192.168.1.1 + * filter=clean-traffic + * filter.ip=192.168.122.1 */ gboolean gvir_sandbox_config_add_network_opts(GVirSandboxConfig *config, const gchar *network, @@ -924,8 +926,10 @@ gboolean gvir_sandbox_config_add_network_opts(GVirSandboxConfig *config, gchar **params = g_strsplit(network, ",", 50); gsize j = 0; GVirSandboxConfigNetwork *net; + GVirSandboxConfigNetworkFilterref *filter; net = gvir_sandbox_config_network_new(); + filter = gvir_sandbox_config_network_filterref_new(); gvir_sandbox_config_network_set_dhcp(net, FALSE); while (params && params[j]) { @@ -947,6 +951,40 @@ gboolean gvir_sandbox_config_add_network_opts(GVirSandboxConfig *config, } else if (g_str_has_prefix(param, "mac=")) { gvir_sandbox_config_network_set_mac(net, param + strlen("mac=")); + } else if (g_str_has_prefix(param, "filter.")) { + GVirSandboxConfigNetworkFilterrefParameter *filter_param; + gchar *tail = g_strdup(param + strlen("filter.")); + gchar *equ = g_strrstr(tail, "="); + gchar *name, *name_up, *value; + + if (equ == NULL) { + g_free(tail); + g_set_error(error, GVIR_SANDBOX_CONFIG_ERROR, 0, + _("No assignment in filter parameter configuration")); + g_object_unref(net); + goto cleanup; + } + + name = g_strndup(tail, equ - tail); + value = g_strdup(equ + 1); + /* Convert to upcase for convenience. */ + name_up = g_ascii_strup(name, -1); + g_free(name); + + filter_param = gvir_sandbox_config_network_filterref_parameter_new(); + gvir_sandbox_config_network_filterref_parameter_set_name(filter_param, name_up); + gvir_sandbox_config_network_filterref_parameter_set_value(filter_param, value); + gvir_sandbox_config_network_filterref_add_parameter(filter, filter_param); + + g_free(tail); + g_free(name_up); + g_free(value); + } else if (g_str_has_prefix(param, "filter=")) { + gchar *name = g_strdup(param + strlen("filter=")); + + gvir_sandbox_config_network_filterref_set_filter(filter, name); + gvir_sandbox_config_network_set_filterref(net, filter); + g_free(name); } else if (g_str_has_prefix(param, "address=")) { GVirSandboxConfigNetworkAddress *addr; GInetAddress *primaryaddr; @@ -1090,6 +1128,7 @@ gboolean gvir_sandbox_config_add_network_opts(GVirSandboxConfig *config, ret = TRUE; cleanup: + g_object_unref(filter); return ret; } diff --git a/libvirt-sandbox/libvirt-sandbox.h b/libvirt-sandbox/libvirt-sandbox.h index a3f0b2c..7a2d3bf 100644 --- a/libvirt-sandbox/libvirt-sandbox.h +++ b/libvirt-sandbox/libvirt-sandbox.h @@ -37,6 +37,8 @@ #include <libvirt-sandbox/libvirt-sandbox-config-mount-guest-bind.h> #include <libvirt-sandbox/libvirt-sandbox-config-mount-ram.h> #include <libvirt-sandbox/libvirt-sandbox-config-network-address.h> +#include <libvirt-sandbox/libvirt-sandbox-config-network-filterref-parameter.h> +#include <libvirt-sandbox/libvirt-sandbox-config-network-filterref.h> #include <libvirt-sandbox/libvirt-sandbox-config-network-route.h> #include <libvirt-sandbox/libvirt-sandbox-config-network.h> #include <libvirt-sandbox/libvirt-sandbox-config.h> diff --git a/libvirt-sandbox/libvirt-sandbox.sym b/libvirt-sandbox/libvirt-sandbox.sym index 7b7c8be..02c69a3 100644 --- a/libvirt-sandbox/libvirt-sandbox.sym +++ b/libvirt-sandbox/libvirt-sandbox.sym @@ -44,6 +44,7 @@ LIBVIRT_SANDBOX_0.2.1 { gvir_sandbox_config_mount_ram_set_usage; gvir_sandbox_config_network_add_address; + gvir_sandbox_config_network_set_filterref; gvir_sandbox_config_network_add_route; gvir_sandbox_config_network_get_type; gvir_sandbox_config_network_get_dhcp; @@ -51,6 +52,7 @@ LIBVIRT_SANDBOX_0.2.1 { gvir_sandbox_config_network_get_source; gvir_sandbox_config_network_get_routes; gvir_sandbox_config_network_get_addresses; + gvir_sandbox_config_network_get_filterref; gvir_sandbox_config_network_new; gvir_sandbox_config_network_set_dhcp; gvir_sandbox_config_network_set_mac; @@ -65,6 +67,18 @@ LIBVIRT_SANDBOX_0.2.1 { gvir_sandbox_config_network_address_set_primary; gvir_sandbox_config_network_address_set_prefix; + gvir_sandbox_config_network_filterref_get_type; + gvir_sandbox_config_network_filterref_new; + gvir_sandbox_config_network_filterref_get_filter; + gvir_sandbox_config_network_filterref_set_filter; + + gvir_sandbox_config_network_filterref_parameter_get_type; + gvir_sandbox_config_network_filterref_parameter_new; + gvir_sandbox_config_network_filterref_parameter_get_name; + gvir_sandbox_config_network_filterref_parameter_set_name; + gvir_sandbox_config_network_filterref_parameter_get_value; + gvir_sandbox_config_network_filterref_parameter_set_value; + gvir_sandbox_config_network_route_get_type; gvir_sandbox_config_network_route_get_prefix; gvir_sandbox_config_network_route_get_gateway; -- 1.8.1.4

1 0

[libvirt] [PATCH] domain_conf.c: Initialize arrVar and cntVar
by Michal Privoznik 15 Oct '13

15 Oct '13

Some ancient gcc fails to see the variables are initialized in a separate function and a false positive is produced: cc1: warnings being treated as errors conf/domain_conf.c: In function 'virDomainChrGetDomainPtrs': conf/domain_conf.c:10342: error: 'arrVar' may be used uninitialized in this function [-Wuninitialized] conf/domain_conf.c:10343: error: 'cntVar' may be used uninitialized in this function [-Wuninitialized] conf/domain_conf.c: In function 'virDomainChrInsert': conf/domain_conf.c:10362: error: 'arrPtr' may be used uninitialized in this function [-Wuninitialized] conf/domain_conf.c:10363: error: 'cntPtr' may be used uninitialized in this function [-Wuninitialized] conf/domain_conf.c: In function 'virDomainChrRemove': conf/domain_conf.c:10374: error: 'arrPtr' may be used uninitialized in this function [-Wuninitialized] conf/domain_conf.c:10375: error: 'cntPtr' may be used uninitialized in this function [-Wuninitialized] Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- Pushed under build breaker and trivial rules. src/conf/domain_conf.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 365de77..562d98b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -10339,8 +10339,8 @@ virDomainChrGetDomainPtrs(const virDomainDef *vmdef, const virDomainChrDef ***arrPtr, size_t *cntPtr) { - virDomainChrDef ***arrVar; - size_t *cntVar; + virDomainChrDef ***arrVar = NULL; + size_t *cntVar = NULL; /* Cast away const; we add it back in the final assignment. */ virDomainChrGetDomainPtrsInternal((virDomainDefPtr) vmdef, type, @@ -10359,8 +10359,8 @@ int virDomainChrInsert(virDomainDefPtr vmdef, virDomainChrDefPtr chr) { - virDomainChrDefPtr **arrPtr; - size_t *cntPtr; + virDomainChrDefPtr **arrPtr = NULL; + size_t *cntPtr = NULL; virDomainChrGetDomainPtrsInternal(vmdef, chr->deviceType, &arrPtr, &cntPtr); @@ -10371,8 +10371,8 @@ virDomainChrDefPtr virDomainChrRemove(virDomainDefPtr vmdef, virDomainChrDefPtr chr) { - virDomainChrDefPtr ret, **arrPtr; - size_t i, *cntPtr; + virDomainChrDefPtr ret, **arrPtr = NULL; + size_t i, *cntPtr = NULL; virDomainChrGetDomainPtrsInternal(vmdef, chr->deviceType, &arrPtr, &cntPtr); -- 1.8.1.5

1 0

[libvirt] [PATCH 1/2] vbox: assemble duplicate state conversions
by Ryota Ozaki 15 Oct '13

15 Oct '13

Signed-off-by: Ryota Ozaki <ozaki.ryota(a)gmail.com> --- src/vbox/vbox_tmpl.c | 70 +++++++++++++++++----------------------------------- 1 file changed, 22 insertions(+), 48 deletions(-) diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index 5e5ea85..10a3775 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -1912,6 +1912,26 @@ cleanup: return ret; } +static virDomainState vboxConvertState(enum MachineState state) { + switch (state) { + case MachineState_Running: + return VIR_DOMAIN_RUNNING; + case MachineState_Stuck: + return VIR_DOMAIN_BLOCKED; + case MachineState_Paused: + return VIR_DOMAIN_PAUSED; + case MachineState_Stopping: + return VIR_DOMAIN_SHUTDOWN; + case MachineState_PoweredOff: + return VIR_DOMAIN_SHUTOFF; + case MachineState_Aborted: + return VIR_DOMAIN_CRASHED; + case MachineState_Null: + default: + return VIR_DOMAIN_NOSTATE; + } +} + static int vboxDomainGetInfo(virDomainPtr dom, virDomainInfoPtr info) { VBOX_OBJECT_CHECK(dom->conn, int, -1); vboxArray machines = VBOX_ARRAY_INITIALIZER; @@ -1972,30 +1992,7 @@ static int vboxDomainGetInfo(virDomainPtr dom, virDomainInfoPtr info) { info->nrVirtCpu = CPUCount; info->memory = memorySize * 1024; info->maxMem = maxMemorySize * 1024; - switch (state) { - case MachineState_Running: - info->state = VIR_DOMAIN_RUNNING; - break; - case MachineState_Stuck: - info->state = VIR_DOMAIN_BLOCKED; - break; - case MachineState_Paused: - info->state = VIR_DOMAIN_PAUSED; - break; - case MachineState_Stopping: - info->state = VIR_DOMAIN_SHUTDOWN; - break; - case MachineState_PoweredOff: - info->state = VIR_DOMAIN_SHUTOFF; - break; - case MachineState_Aborted: - info->state = VIR_DOMAIN_CRASHED; - break; - case MachineState_Null: - default: - info->state = VIR_DOMAIN_NOSTATE; - break; - } + info->state = vboxConvertState(state); ret = 0; } @@ -2038,30 +2035,7 @@ vboxDomainGetState(virDomainPtr dom, machine->vtbl->GetState(machine, &mstate); - switch (mstate) { - case MachineState_Running: - *state = VIR_DOMAIN_RUNNING; - break; - case MachineState_Stuck: - *state = VIR_DOMAIN_BLOCKED; - break; - case MachineState_Paused: - *state = VIR_DOMAIN_PAUSED; - break; - case MachineState_Stopping: - *state = VIR_DOMAIN_SHUTDOWN; - break; - case MachineState_PoweredOff: - *state = VIR_DOMAIN_SHUTOFF; - break; - case MachineState_Aborted: - *state = VIR_DOMAIN_CRASHED; - break; - case MachineState_Null: - default: - *state = VIR_DOMAIN_NOSTATE; - break; - } + *state = vboxConvertState(mstate); if (reason) *reason = 0; -- 1.8.4

2 4

[libvirt] [RESEND][PATCH] esx: Fix floppy.fileName handling in the vmx file parser
by Geoff Hickey 15 Oct '13

15 Oct '13

[Updated to include unit tests] The vmx file parsing code was reporting errors when parsing floppy.fileName entries if the filename didn't end in .flp. There is no such restriction in ESX; even using the GUI to configure floppy filenames you can specify any arbitrary file with any extension. Fix by changing the vmx parsing code so that it uses the floppy.fileType value to determine whether floppy.fileName refers to a block device or a regular file. Also remove code that would have generated an error if no floppy.fileName was specified. This is not an error either. Updated the floppy tests in vmx2xmltest.c and xml2vmxtest.c. --- src/vmx/vmx.c | 28 ++++------------------------ tests/vmx2xmldata/vmx2xml-floppy-file.vmx | 3 +++ tests/vmx2xmldata/vmx2xml-floppy-file.xml | 5 +++++ tests/xml2vmxdata/xml2vmx-floppy-file.vmx | 4 +++- tests/xml2vmxdata/xml2vmx-floppy-file.xml | 4 ++++ 5 files changed, 19 insertions(+), 25 deletions(-) diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 36bc338..48487f8 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -2250,27 +2250,14 @@ virVMXParseDisk(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virConfPtr con goto cleanup; } } else if (device == VIR_DOMAIN_DISK_DEVICE_FLOPPY) { - if (virFileHasSuffix(fileName, ".flp")) { - if (fileType != NULL) { - if (STRCASENEQ(fileType, "file")) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Expecting VMX entry '%s' to be 'file' but " - "found '%s'"), fileType_name, fileType); - goto cleanup; - } - } - - (*def)->type = VIR_DOMAIN_DISK_TYPE_FILE; - (*def)->src = ctx->parseFileName(fileName, ctx->opaque); - - if ((*def)->src == NULL) { - goto cleanup; - } - } else if (fileType != NULL && STRCASEEQ(fileType, "device")) { + if (fileType != NULL && STRCASEEQ(fileType, "device")) { (*def)->type = VIR_DOMAIN_DISK_TYPE_BLOCK; (*def)->src = fileName; fileName = NULL; + } else if (fileType != NULL && STRCASEEQ(fileType, "file")) { + (*def)->type = VIR_DOMAIN_DISK_TYPE_FILE; + (*def)->src = ctx->parseFileName(fileName, ctx->opaque); } else { virReportError(VIR_ERR_INTERNAL_ERROR, _("Invalid or not yet handled value '%s' " @@ -3538,13 +3525,6 @@ virVMXFormatFloppy(virVMXContext *ctx, virDomainDiskDefPtr def, virBufferAsprintf(buffer, "floppy%d.fileType = \"file\"\n", unit); if (def->src != NULL) { - if (! virFileHasSuffix(def->src, ".flp")) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Image file for floppy '%s' has unsupported " - "suffix, expecting '.flp'"), def->dst); - return -1; - } - fileName = ctx->formatFileName(def->src, ctx->opaque); if (fileName == NULL) { diff --git a/tests/vmx2xmldata/vmx2xml-floppy-file.vmx b/tests/vmx2xmldata/vmx2xml-floppy-file.vmx index b9ee81b..344ac78 100644 --- a/tests/vmx2xmldata/vmx2xml-floppy-file.vmx +++ b/tests/vmx2xmldata/vmx2xml-floppy-file.vmx @@ -3,3 +3,6 @@ virtualHW.version = "4" floppy0.present = "true" floppy0.fileType = "file" floppy0.fileName = "floppy.flp" +floppy1.present = "true" +floppy1.fileType = "file" +floppy1.fileName = "floppy" \ No newline at end of file diff --git a/tests/vmx2xmldata/vmx2xml-floppy-file.xml b/tests/vmx2xmldata/vmx2xml-floppy-file.xml index f62320f..40f70d3 100644 --- a/tests/vmx2xmldata/vmx2xml-floppy-file.xml +++ b/tests/vmx2xmldata/vmx2xml-floppy-file.xml @@ -16,6 +16,11 @@ <target dev='fda' bus='fdc'/> <address type='drive' controller='0' bus='0' target='0' unit='0'/> </disk> + <disk type='file' device='floppy'> + <source file='[datastore] directory/floppy'/> + <target dev='fdb' bus='fdc'/> + <address type='drive' controller='0' bus='0' target='0' unit='1'/> + </disk> <controller type='fdc' index='0'/> <video> <model type='vmvga' vram='4096'/> diff --git a/tests/xml2vmxdata/xml2vmx-floppy-file.vmx b/tests/xml2vmxdata/xml2vmx-floppy-file.vmx index 11ffb01..b8ffc1e 100644 --- a/tests/xml2vmxdata/xml2vmx-floppy-file.vmx +++ b/tests/xml2vmxdata/xml2vmx-floppy-file.vmx @@ -9,4 +9,6 @@ numvcpus = "1" floppy0.present = "true" floppy0.fileType = "file" floppy0.fileName = "/vmfs/volumes/testing/floppy.flp" -floppy1.present = "false" +floppy1.present = "true" +floppy1.fileType = "file" +floppy1.fileName = "/vmfs/volumes/testing/floppy1" diff --git a/tests/xml2vmxdata/xml2vmx-floppy-file.xml b/tests/xml2vmxdata/xml2vmx-floppy-file.xml index 83598b3..119113a 100644 --- a/tests/xml2vmxdata/xml2vmx-floppy-file.xml +++ b/tests/xml2vmxdata/xml2vmx-floppy-file.xml @@ -10,5 +10,9 @@ <source file='[testing] floppy.flp'/> <target dev='fda' bus='fdc'/> </disk> + <disk type='file' device='floppy'> + <source file='[testing] floppy1'/> + <target dev='fdb' bus='fdc'/> + </disk> </devices> </domain> -- 1.8.1.2

2 2

[libvirt] [PATCH] network: Remove unnecessary check in networkRadvdConfContents
by Hongwei Bi 15 Oct '13

15 Oct '13

Since there is a check on configbuf through virBufferError(), it is not necessary to check configstr and report OOM again. Signed-off-by: Hongwei Bi <hwbi2008(a)gmail.com> --- src/network/bridge_driver.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 8787bdb..ec40e0c 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -1312,10 +1312,7 @@ networkRadvdConfContents(virNetworkObjPtr network, char **configstr) virReportOOMError(); goto cleanup; } - if (!(*configstr = virBufferContentAndReset(&configbuf))) { - virReportOOMError(); - goto cleanup; - } + *configstr = virBufferContentAndReset(&configbuf); } ret = 0; -- 1.8.1.2

1 0

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

15 Oct '13

--- 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

1 0

[libvirt] [PATCH] fix typo in lxc_driver.c and virsh-nodedev.c
by Hongwei Bi 15 Oct '13

15 Oct '13

--- src/lxc/lxc_driver.c | 2 +- tools/virsh-nodedev.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index e3a34d6..870e4a9 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -887,7 +887,7 @@ cleanup: } /** - * lxcDomainCreateWithFlags: + * lxcDomainCreateWithFiles: * @dom: domain to start * @flags: Must be 0 for now * diff --git a/tools/virsh-nodedev.c b/tools/virsh-nodedev.c index 3a2d12b..ebfac94 100644 --- a/tools/virsh-nodedev.c +++ b/tools/virsh-nodedev.c @@ -308,7 +308,7 @@ fallback: goto cleanup; } - /* Check if the device's capability matches with provied + /* Check if the device's capability matches with provided * capabilities. */ size_t j, k; -- 1.8.1.2

2 1