- Devel - libvirt List Archives

[libvirt] [PATCH 0/4] Misc fixes + enhancements to the QEMU JSON mode monitor
by Daniel P. Berrange 15 Apr '10

15 Apr '10

This series is the latest update to the JSON mode monitor code, based on current QEMU state of development. This work is still ongoing, at the very least QEMU is still lacking support for device_del, drive_add netdev_add and delvm/loadvm/savedvm commands that libvirt needs.

2 8

[libvirt] Build failure on Ubuntu 9.10
by Chris Lalancette 15 Apr '10

15 Apr '10

Hey Jamie, I've starting doing some automated builds of libvirt, and I've run into this build failure on Ubuntu 9.10 (both for i386 and x86_64): Git head revision: cffe619bdf9943282cc9f6a0cf815ad9f0fe7fd7 make all-recursive make[1]: Entering directory `/root/libvirt' Making all in gnulib/lib make[2]: Entering directory `/root/libvirt/gnulib/lib' ... make all-am make[3]: Entering directory `/root/libvirt/src' ... CC libvirt_lxc-capabilities.o CC libvirt_lxc-domain_conf.o CC libvirt_lxc-cpu_conf.o CC libvirt_lxc-nwfilter_params.o CC virt_aa_helper-virt-aa-helper.o make[3]: *** No rule to make target `../src/libvirt_conf.la', needed by `virt-aa-helper'. Stop. make[3]: *** Waiting for unfinished jobs.... make[3]: Leaving directory `/root/libvirt/src' make[2]: *** [all] Error 2 make[2]: Leaving directory `/root/libvirt/src' make[1]: *** [all-recursive] Error 1 make[1]: Leaving directory `/root/libvirt' make: *** [all] Error 2 (if you want the full build log, or build with V=1, let me know). Any thoughts? -- Chris Lalancette

2 1

[libvirt] [PATCH] Fix apibuild.py warnings about missing ':'
by Matthias Bolte 15 Apr '10

15 Apr '10

--- I just pushed this trivial fix. src/libvirt.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index d1b7880..ff36681 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -12616,7 +12616,7 @@ error: } /** - * virDomainRevertToSnapshot + * virDomainRevertToSnapshot: * @snapshot: a domain snapshot object * @flags: unused flag parameters; callers should pass 0 * @@ -12657,7 +12657,7 @@ error: } /** - * virDomainSnapshotDelete + * virDomainSnapshotDelete: * @snapshot: a domain snapshot object * @flags: flag parameters * -- 1.6.3.3

2 1

[libvirt] [PATCH] nwfilter: fix tear down order and consolidate functions
by Stefan Berger 15 Apr '10

15 Apr '10

To avoid race-conditions, the tear down of a filter has to happen before the tap interface disappears and another tap interface with the same name can re-appear. This patch tries to fix this. In one place, where communication with the qemu monitor may fail, I am only tearing the filters down after knowing that the function did not fail. I am also moving the tear down functions into an include file for other drivers to reuse. Signed-off-by: Stefan Berger <stefanb(a)us.ibm.com> --- src/nwfilter/nwfilter_gentech_driver.h | 14 ++++++++++++++ src/qemu/qemu_conf.c | 13 ++++++++----- src/qemu/qemu_driver.c | 28 +++++++--------------------- 3 files changed, 29 insertions(+), 26 deletions(-) Index: libvirt-acl/src/qemu/qemu_conf.c =================================================================== --- libvirt-acl.orig/src/qemu/qemu_conf.c +++ libvirt-acl/src/qemu/qemu_conf.c @@ -4074,10 +4074,13 @@ int qemudBuildCommandLine(virConnectPtr goto error; if (VIR_REALLOC_N(*tapfds, (*ntapfds)+1) < 0) { + virNWFilterTearNWFilter(net); close(tapfd); goto no_memory; } + last_good_net = i; + (*tapfds)[(*ntapfds)++] = tapfd; if (snprintf(tapfd_name, sizeof(tapfd_name), "%d", tapfd) >= sizeof(tapfd_name)) @@ -4091,10 +4094,13 @@ int qemudBuildCommandLine(virConnectPtr goto error; if (VIR_REALLOC_N(*tapfds, (*ntapfds)+1) < 0) { + virNWFilterTearNWFilter(net); close(tapfd); goto no_memory; } + last_good_net = i; + (*tapfds)[(*ntapfds)++] = tapfd; if (snprintf(tapfd_name, sizeof(tapfd_name), "%d", tapfd) >= sizeof(tapfd_name)) @@ -4154,7 +4160,6 @@ int qemudBuildCommandLine(virConnectPtr goto error; ADD_ARG(host); } - last_good_net = i; } } @@ -4603,6 +4608,8 @@ int qemudBuildCommandLine(virConnectPtr no_memory: virReportOOMError(); error: + for (i = 0; i <= last_good_net; i++) + virNWFilterTearNWFilter(def->nets[i]); if (tapfds && *tapfds) { for (i = 0; i < *ntapfds; i++) @@ -4620,11 +4627,6 @@ int qemudBuildCommandLine(virConnectPtr VIR_FREE((qenv)[i]); VIR_FREE(qenv); } - for (i = 0; i <= last_good_net; i++) { - virDomainNetDefPtr net = def->nets[i]; - if ((net->filter) && (net->ifname)) - virNWFilterTeardownFilter(net); - } return -1; #undef ADD_ARG Index: libvirt-acl/src/qemu/qemu_driver.c =================================================================== --- libvirt-acl.orig/src/qemu/qemu_driver.c +++ libvirt-acl/src/qemu/qemu_driver.c @@ -3070,21 +3070,6 @@ cleanup: } -static void -qemuTearNWFilter(virDomainNetDefPtr net) { - if ((net->filter) && (net->ifname)) - virNWFilterTeardownFilter(net); -} - - -static void -qemuTearVMNWFilters(virDomainObjPtr vm) { - int i; - for (i = 0; i < vm->def->nnets; i++) - qemuTearNWFilter(vm->def->nets[i]); -} - - struct qemudHookData { virConnectPtr conn; virDomainObjPtr vm; @@ -3397,6 +3382,9 @@ static int qemudStartVMDaemon(virConnect VIR_FREE(progenv[i]); VIR_FREE(progenv); + if (ret == -1) /* The VM failed to start; tear filters before taps */ + virNWFilterTearVMNWFilters(vm); + if (tapfds) { for (i = 0 ; i < ntapfds ; i++) { close(tapfds[i]); @@ -3461,8 +3449,6 @@ cleanup: /* We jump here if we failed to start the VM for any reason * XXX investigate if we can kill this block and safely call * qemudShutdownVMDaemon even though no PID is running */ - qemuTearVMNWFilters(vm); - qemuDomainReAttachHostDevices(driver, vm->def); if (driver->securityDriver && @@ -3511,7 +3497,7 @@ static void qemudShutdownVMDaemon(struct * reporting so we don't squash a legit error. */ orig_err = virSaveLastError(); - qemuTearVMNWFilters(vm); + virNWFilterTearVMNWFilters(vm); if (driver->macFilter) { def = vm->def; @@ -7153,7 +7139,8 @@ cleanup: qemuDomainPCIAddressReleaseAddr(priv->pciaddrs, &net->info) < 0) VIR_WARN0("Unable to release PCI address on NIC"); - qemuTearNWFilter(net); + if (ret != 0) + virNWFilterTearNWFilter(net); VIR_FREE(nicstr); VIR_FREE(netstr); @@ -7953,6 +7940,8 @@ qemudDomainDetachNetDevice(struct qemud_ } qemuDomainObjExitMonitorWithDriver(driver, vm); + virNWFilterTearNWFilter(detach); + #if WITH_MACVTAP if (detach->type == VIR_DOMAIN_NET_TYPE_DIRECT) { if (detach->ifname) @@ -7970,8 +7959,6 @@ qemudDomainDetachNetDevice(struct qemud_ } } - qemuTearNWFilter(detach); - if (vm->def->nnets > 1) { memmove(vm->def->nets + i, vm->def->nets + i + 1, Index: libvirt-acl/src/nwfilter/nwfilter_gentech_driver.h =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_gentech_driver.h +++ libvirt-acl/src/nwfilter/nwfilter_gentech_driver.h @@ -65,4 +65,20 @@ void virNWFilterDomainFWUpdateCB(void *p const char *name ATTRIBUTE_UNUSED, void *data); + +/* tear down an interface's filter before tearing down the interface */ +static inline void +virNWFilterTearNWFilter(virDomainNetDefPtr net) { + if ((net->filter) && (net->ifname)) + virNWFilterTeardownFilter(net); +} + + +static inline void +virNWFilterTearVMNWFilters(virDomainObjPtr vm) { + int i; + for (i = 0; i < vm->def->nnets; i++) + virNWFilterTearNWFilter(vm->def->nets[i]); +} + #endif

3 2

[libvirt] with these, clang vs. libvirt reports no errors
by Jim Meyering 15 Apr '10

15 Apr '10

I've been running clang regularly, and there have been a few pesky false-positives that just won't go away. It's not productive to reexamine them each time, so I've wanted a way to educate clang without polluting the code with work-arounds that we'll be stuck maintaining and asking questions about long after clang becomes smart enough that those work-arounds are no longer required. My solution is to mark the work-arounds with a new macro, sa_assert (for "static analysis assert"), which acts just like the classical "assert", but is only enabled when compiled by a static analyzer like clang or coverity. The advantage of using an assert-like macro is that people already know that it must have no side-effects and that will make it easy to remove later, when clang grows up. One question you may ask is why add a new symbol, when "assert" itself can already do this via NDEBUG (defined, any assertions are disabled, not defined, they are enabled). There are a few assertions in the code now, and I prefer not to touch them, and to make it clear that these are helping us cater to static analyzers. [PATCH 1/7] sa_assert: new assert-like macro, enabled only for use with static analyzers [PATCH 2/7] build: set STATIC_ANALYSIS when running via clang or coverity [PATCH 3/7] nwfilter_ebiptables_driver.c: avoid NULL dereference [PATCH 4/7] virGetHostnameLocalhost: avoid FP NULL-ptr-deref from clang [PATCH 5/7] qemudDomainAttachSCSIDisk: avoid FP NULL-ptr-deref from clang [PATCH 6/7] xend_internal.c: assure clang that we do not dereference NULL [PATCH 7/7] qemudDomainAttachSCSIDisk: avoid FP NULL-ptr-deref from clang

6 38

[libvirt] [PATCH] Add testing for CDROM media change / eject
by Daniel P. Berrange 15 Apr '10

15 Apr '10

This tests the 3 main operations in removeable media - Eject existing media - Insert new media - Change existing media (eject followed by insert) * lib/Sys/Virt/TCK.pm: Allow a specific ostype to be requested when getting a guest config * scripts/domain/207-disk-media-change.t: Test media change, eject, and re-insert --- lib/Sys/Virt/TCK.pm | 20 +++++- scripts/domain/207-disk-media-change.t | 95 ++++++++++++++++++++++++++++++++ 2 files changed, 111 insertions(+), 4 deletions(-) create mode 100644 scripts/domain/207-disk-media-change.t diff --git a/lib/Sys/Virt/TCK.pm b/lib/Sys/Virt/TCK.pm index d32b03d..9f67c08 100644 --- a/lib/Sys/Virt/TCK.pm +++ b/lib/Sys/Virt/TCK.pm @@ -416,6 +416,7 @@ sub match_kernel { sub best_kernel { my $self = shift; my $caps = shift; + my $wantostype = shift; my $kernels = $self->config("kernels", []); @@ -425,6 +426,11 @@ sub best_kernel { my @ostype = ref($ostype) ? @{$ostype} : ($ostype); foreach $ostype (@ostype) { + if ((defined $wantostype) && + ($wantostype ne $ostype)) { + next; + } + my ($domain, $emulator, $loader) = $self->match_kernel($caps, $arch, $ostype); @@ -440,9 +446,10 @@ sub best_kernel { sub get_kernel { my $self = shift; my $caps = shift; + my $wantostype = shift; my ($cfgindex, $domain, $arch, $ostype, $emulator, $loader) = - $self->best_kernel($caps); + $self->best_kernel($caps, $wantostype); if (!defined $cfgindex) { die "cannot find any supported kernel configuration"; @@ -500,8 +507,9 @@ sub generic_machine_domain { my $self = shift; my $name = shift; my $caps = shift; + my $ostype = shift; - my %config = $self->get_kernel($caps); + my %config = $self->get_kernel($caps, $ostype); my $b = Sys::Virt::TCK::DomainBuilder->new(conn => $self->{conn}, name => $name, @@ -568,15 +576,19 @@ sub generic_container_domain { sub generic_domain { my $self = shift; my $name = @_ ? shift : "tck"; + my $ostype = @_ ? shift : undef; my $caps = Sys::Virt::TCK::Capabilities->new(xml => $self->conn->get_capabilities); - my $container = $self->best_container_domain($caps); + my $container; + + $container = $self->best_container_domain($caps) + unless $ostype && $ostype ne "exe"; if ($container) { return $self->generic_container_domain($name, $caps, $container); } else { - return $self->generic_machine_domain($name, $caps); + return $self->generic_machine_domain($name, $caps, $ostype); } } diff --git a/scripts/domain/207-disk-media-change.t b/scripts/domain/207-disk-media-change.t new file mode 100644 index 0000000..2976800 --- /dev/null +++ b/scripts/domain/207-disk-media-change.t @@ -0,0 +1,95 @@ +# -*- perl -*- +# +# Copyright (C) 2009 Red Hat, Inc. +# Copyright (C) 2009 Daniel P. Berrange +# +# This program is free software; You can redistribute it and/or modify +# it under the GNU General Public License as published by the Free +# Software Foundation; either version 2, or (at your option) any +# later version +# +# The file "LICENSE" distributed along with this file provides full +# details of the terms and conditions +# + +=pod + +=head1 NAME + +domain/207-disk-media-change.t - verify disk media change works + +=head1 DESCRIPTION + +The test case validates that it is possible to change media +on a CDROM disk in a running domain. + +=cut + +use strict; +use warnings; + +use Test::More tests => 7; + +use Sys::Virt::TCK; +use Test::Exception; + +my $tck = Sys::Virt::TCK->new(); +my $conn = eval { $tck->setup(); }; +BAIL_OUT "failed to setup test harness: $@" if $@; +END { + $tck->cleanup if $tck; +} + +my $path1 = $tck->create_sparse_disk("200-disk-media-change", "extra1.img", 100); +my $path2 = $tck->create_sparse_disk("207-disk-media-change", "extra2.img", 100); + +my $xml = $tck->generic_domain("tck", "wibble") + ->disk(src => $path1, dst => "hdc", type => "file", device => "cdrom") + ->as_xml; + +diag "Creating a new transient domain"; +my $dom; +ok_domain(sub { $dom = $conn->create_domain($xml) }, "created transient domain object"); + + +my $diskxml1 = <<EOF; +<disk type='file' device='cdrom'> + <source file='$path1'/> + <target dev='hdc'/> +</disk> +EOF +my $diskxml2 = <<EOF; +<disk type='file' device='cdrom'> + <source file='$path2'/> + <target dev='hdc'/> +</disk> +EOF +my $diskxml3 = <<EOF; +<disk type='file' device='cdrom'> + <target dev='hdc'/> +</disk> +EOF + + +my $initialxml = $dom->get_xml_description; + +diag "Changing CDROM to $path2"; +lives_ok(sub { $dom->attach_device($diskxml2); }, "disk media has been changed"); + +my $newxml = $dom->get_xml_description; + +ok($newxml =~ m|$path2|, "new XML has updated media"); + +diag "Ejecting CDROM media"; +lives_ok(sub { $dom->attach_device($diskxml3); }, "disk media has been ejected"); + +$newxml = $dom->get_xml_description; + +ok($newxml !~ m|$path2|, "new XML has no media"); + +diag "Inserting CDROM media"; +lives_ok(sub { $dom->attach_device($diskxml1); }, "disk media has been inserted"); + +my $finalxml = $dom->get_xml_description; + +is($initialxml, $finalxml, "final XML matches initial XML"); -- 1.6.6.1

1 0

[libvirt] [PATCH] Fix close_used_without_including_unistd_h error
by Matthias Bolte 14 Apr '10

14 Apr '10

Triggered by gnulib when compiling with MinGW. --- I just pushed this trivial compile fix too. src/conf/nwfilter_conf.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index f4af126..336ea3b 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -33,6 +33,7 @@ #if HAVE_NET_ETHERNET_H # include <net/ethernet.h> #endif +#include <unistd.h> #include "internal.h" -- 1.6.3.3

1 0

[libvirt] [PATCH 0/1] Variable length structure allocator
by David Allan 14 Apr '10

14 Apr '10

I've had this patch hanging around for a while, and I think it's worth committing even though the original reason for it went away. The kind of structure it allocates is reasonably common, and the oversize calculation is tricky to get right. Since we've already done the work (thanks Jim for the oversize calculation) I think it's worth keeping. Dave David Allan (1): Implement variable length structure allocator src/util/memory.c | 40 ++++++++++++++++++++++++++++++++++++++++ src/util/memory.h | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+), 0 deletions(-)

4 9

[libvirt] [PATCH] build: fix recent 'make syntax-check' failure
by Eric Blake 14 Apr '10

14 Apr '10

* src/esx/esx_vi_methods.h: Placate cppi. --- Pushing under the rule for obvious build fixes. src/esx/esx_vi_methods.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/esx/esx_vi_methods.h b/src/esx/esx_vi_methods.h index 7b6be4e..c78c649 100644 --- a/src/esx/esx_vi_methods.h +++ b/src/esx/esx_vi_methods.h @@ -2,7 +2,7 @@ /* * esx_vi_methods.h: client for the VMware VI API 2.5 to manage ESX hosts * - * Copyright (C) 2009 Matthias Bolte <matthias.bolte(a)googlemail.com> + * Copyright (C) 2009, 2010 Matthias Bolte <matthias.bolte(a)googlemail.com> * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -45,6 +45,6 @@ int esxVI_ValidateMigration esxVI_ManagedObjectReference *host, /* optional */ esxVI_Event **output); /* optional, list */ -#include "esx_vi_methods.generated.h" +# include "esx_vi_methods.generated.h" #endif /* __ESX_VI_METHODS_H__ */ -- 1.6.6.1

1 0

[libvirt] [PATCH] schematestutils.sh: improve shell portability: avoid "echo -e"
by Jim Meyering 14 Apr '10

14 Apr '10

echo -e is not portable. This is the sole remaining use in all of libvirt. >From a58cf340b5ebbca2157f43c6f23d4d6f56b848c7 Mon Sep 17 00:00:00 2001 From: Jim Meyering <meyering(a)redhat.com> Date: Wed, 14 Apr 2010 13:25:46 +0200 Subject: [PATCH] schematestutils.sh: improve shell portability: avoid "echo -e" * tests/schematestutils.sh: Use printf rather than echo -e. --- tests/schematestutils.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tests/schematestutils.sh b/tests/schematestutils.sh index f172857..f2b3b50 100644 --- a/tests/schematestutils.sh +++ b/tests/schematestutils.sh @@ -22,7 +22,7 @@ do test_result $n $(basename $(dirname $xml))"/"$(basename $xml) $ret if test "$verbose" = "1" && test $ret != 0 ; then - echo -e "$cmd\n$result" + printf '%s\n' "$cmd" "$result" fi if test "$ret" != 0 ; then f=`expr $f + 1` -- 1.7.1.rc1.248.gcefbb

4 11