- Devel - libvirt List Archives

[libvirt] [PATCH] Update to COPYING.LIB to latest LGPLv2.1 copy
by Christophe Fergeau 15 May '13

15 May '13

The text version of LGPLv2.1 available at http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt is slightly different from COPYING.LIB: - several paragraphs were rewrapped - the FSF address has changed, so the license has been changed to indicate the newer address I've checked that there are no changes in the license text apart from the updated address, which is what I want to fix with this commit. --- COPYING.LIB | 82 ++++++++++++++++++++++++++++--------------------------------- 1 file changed, 38 insertions(+), 44 deletions(-) diff --git a/COPYING.LIB b/COPYING.LIB index 89d4489..4362b49 100644 --- a/COPYING.LIB +++ b/COPYING.LIB @@ -1,9 +1,8 @@ - GNU LESSER GENERAL PUBLIC LICENSE Version 2.1, February 1999 Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -23,8 +22,7 @@ specially designated software packages--typically libraries--of the Free Software Foundation and other authors who decide to use it. You can use it too, but we suggest you first think carefully about whether this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations -below. +strategy to use in any particular case, based on the explanations below. When we speak of free software, we are referring to freedom of use, not price. Our General Public Licenses are designed to make sure that @@ -57,7 +55,7 @@ modified by someone else and passed on, the recipients should know that what they have is not the original version, so that the original author's reputation will not be affected by problems that might be introduced by others. -^L + Finally, software patents pose a constant threat to the existence of any free program. We wish to make sure that a company cannot effectively restrict the users of a free program by obtaining a @@ -89,9 +87,9 @@ libraries. However, the Lesser license provides advantages in certain special circumstances. For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it -becomes a de-facto standard. To achieve this, non-free programs must -be allowed to use the library. A more frequent case is that a free +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free library does the same job as widely used non-free libraries. In this case, there is little to gain by limiting the free library to free software only, so we use the Lesser General Public License. @@ -113,7 +111,7 @@ modification follow. Pay close attention to the difference between a "work based on the library" and a "work that uses the library". The former contains code derived from the library, whereas the latter must be combined with the library in order to run. -^L + GNU LESSER GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION @@ -138,8 +136,8 @@ included without limitation in the term "modification".) "Source code" for a work means the preferred form of the work for making modifications to it. For a library, complete source code means all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control -compilation and installation of the library. +interface definition files, plus the scripts used to control compilation +and installation of the library. Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of @@ -218,7 +216,7 @@ instead of to this License. (If a newer version than version 2 of the ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.) Do not make any other change in these notices. -^L + Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy. @@ -269,7 +267,7 @@ Library will still fall under Section 6.) distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself. -^L + 6. As an exception to the Sections above, you may also combine or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work @@ -305,10 +303,10 @@ of these things: the user installs one, as long as the modified version is interface-compatible with the version that the work was made with. - c) Accompany the work with a written offer, valid for at least - three years, to give the same user the materials specified in - Subsection 6a, above, for a charge no more than the cost of - performing this distribution. + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. d) If distribution of the work is made by offering access to copy from a designated place, offer equivalent access to copy the above @@ -331,7 +329,7 @@ restrictions of other proprietary libraries that do not normally accompany the operating system. Such a contradiction means you cannot use both them and the Library together in an executable that you distribute. -^L + 7. You may place library facilities that are a work based on the Library side-by-side in a single library together with other library facilities not covered by this License, and distribute such a combined @@ -372,7 +370,7 @@ subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties with this License. -^L + 11. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or @@ -386,10 +384,9 @@ all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Library. -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply, and the section as a whole is intended to apply in other -circumstances. +If any portion of this section is held invalid or unenforceable under any +particular circumstance, the balance of the section is intended to apply, +and the section as a whole is intended to apply in other circumstances. It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any @@ -407,11 +404,11 @@ be a consequence of the rest of this License. 12. If the distribution and/or use of the Library is restricted in certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License -may add an explicit geographical distribution limitation excluding those -countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. +original copyright holder who places the Library under this License may add +an explicit geographical distribution limitation excluding those countries, +so that distribution is permitted only in or among countries not thus +excluded. In such case, this License incorporates the limitation as if +written in the body of this License. 13. The Free Software Foundation may publish revised and/or new versions of the Lesser General Public License from time to time. @@ -425,7 +422,7 @@ conditions either of that version or of any later version published by the Free Software Foundation. If the Library does not specify a license version number, you may choose any version ever published by the Free Software Foundation. -^L + 14. If you wish to incorporate parts of the Library into other free programs whose distribution conditions are incompatible with these, write to the author to ask for permission. For software which is @@ -459,21 +456,19 @@ SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS -^L + How to Apply These Terms to Your New Libraries If you develop a new library, and you want it to be of the greatest possible use to the public, we recommend making it free software that everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms -of the ordinary General Public License). - - To apply these terms, attach the following notices to the library. -It is safest to attach them to the start of each source file to most -effectively convey the exclusion of warranty; and each file should -have at least the "copyright" line and a pointer to where the full -notice is found. +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + To apply these terms, attach the following notices to the library. It is +safest to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least the +"copyright" line and a pointer to where the full notice is found. <one line to give the library's name and a brief idea of what it does.> Copyright (C) <year> <name of author> @@ -490,17 +485,16 @@ notice is found. 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Also add information on how to contact you by electronic and paper mail. -You should also get your employer (if you work as a programmer) or -your school, if any, to sign a "copyright disclaimer" for the library, -if necessary. Here is a sample; alter the names: +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James - Random Hacker. + library `Frob' (a library for tweaking knobs) written by James Random Hacker. <signature of Ty Coon>, 1 April 1990 Ty Coon, President of Vice -- 1.8.1.4

3 7

[libvirt] [PATCH v3 0/2] VNC WebSocket support
by Martin Kletzander 15 May '13

15 May '13

I'm re-sending this series even after previous ACK, because I've found out there was missing virPortAllocatorRelease call when disposing of domain. There were also many cleanups in the meantime and both John and Eric found out some nits in the previous series. I also *somehow* lost the tests (not even git-reflog found them) and had to re-create them again. Martin Kletzander (2): Add VNC WebSocket support qemu: Add VNC WebSocket support docs/formatdomain.html.in | 5 ++ docs/schemas/domaincommon.rng | 5 ++ src/conf/domain_conf.c | 16 ++++++ src/conf/domain_conf.h | 1 + src/qemu/libvirtd_qemu.aug | 2 + src/qemu/qemu.conf | 6 +++ src/qemu/qemu_capabilities.c | 5 ++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 60 +++++++++++++++++++++- src/qemu/qemu_command.h | 3 ++ src/qemu/qemu_conf.c | 32 ++++++++++++ src/qemu/qemu_conf.h | 6 +++ src/qemu/qemu_driver.c | 5 ++ src/qemu/qemu_process.c | 44 ++++++++++++---- src/qemu/test_libvirtd_qemu.aug.in | 2 + tests/qemuargv2xmltest.c | 1 + .../qemuxml2argv-graphics-vnc-websocket.args | 4 ++ .../qemuxml2argv-graphics-vnc-websocket.xml | 28 ++++++++++ tests/qemuxml2argvtest.c | 1 + tests/qemuxml2xmltest.c | 1 + 20 files changed, 216 insertions(+), 12 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-websocket.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-websocket.xml -- 1.8.2.1

3 6

[libvirt] [PATCH 0/6] Ensure clean compile with clang
by Daniel P. Berrange 15 May '13

15 May '13

From: "Daniel P. Berrange" <berrange(a)redhat.com> There are various problems building libvirt with clang, which mostly revolve around compiler warning handling. This series fixes all the problems I see with clang 3.2 on a Fedora 19 x86_64 host. Daniel P. Berrange (6): Ensure consistent enablement of gcc 'diagnostic' pragma Workaround issue with clang and inline functions with static vars Ignore cast alignment warnings in inotify code for Xen. Correctly detect warning flags with clang Only pass -export-dynamic to linker, not compiler Don't duplicate compiler warning flags when linking configure.ac | 4 ++-- daemon/Makefile.am | 1 - m4/virt-compile-warnings.m4 | 29 +++++++++++++++++++++++++---- src/Makefile.am | 11 +++-------- src/internal.h | 2 +- src/xen/xen_inotify.c | 3 +++ tests/vircgroupmock.c | 7 ++++++- tools/Makefile.am | 4 +--- 8 files changed, 41 insertions(+), 20 deletions(-) -- 1.8.2.1

5 18

[libvirt] [PATCH] tests: Add fchostdata in EXTRA_DIST
by Osier Yang 15 May '13

15 May '13

Pushed under build-breaker rule. --- tests/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index f53e208..2822d39 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -86,7 +86,8 @@ EXTRA_DIST = \ xmconfigdata \ xml2sexprdata \ xml2vmxdata \ - .valgrind.supp + .valgrind.supp \ + fchostdata test_helpers = commandhelper ssh test_conf test_programs = virshtest sockettest \ -- 1.8.1.4

2 2

[libvirt] [libvirt PATCH 0/2] qemu: disable memory merge at guest startup
by Osier Yang 15 May '13

15 May '13

*** BLURB HERE *** Eric Blake (1): qemu: detect -machine mem-merge capability Osier Yang (1): qemu: New XML to disable memory merge at guest startup docs/formatdomain.html.in | 13 +++++--- docs/schemas/domaincommon.rng | 5 +++ src/conf/domain_conf.c | 20 ++++++++---- src/conf/domain_conf.h | 1 + src/qemu/qemu_capabilities.c | 37 ++++++++++++++++++++++ src/qemu/qemu_capabilities.h | 1 + src/qemu/qemu_command.c | 22 +++++++++++++ tests/qemuargv2xmltest.c | 2 ++ .../qemuxml2argv-nosharepages.args | 4 +++ .../qemuxml2argvdata/qemuxml2argv-nosharepages.xml | 31 ++++++++++++++++++ tests/qemuxml2argvtest.c | 1 + tests/qemuxml2xmltest.c | 1 + 12 files changed, 128 insertions(+), 10 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-nosharepages.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-nosharepages.xml -- 1.8.1.4

2 6

[libvirt] [libvirt-tck PATCH v2 1/3] add three APIs testing for block
by Zhe Peng 15 May '13

15 May '13

new script for block APIs dom->block_resize dom->get_block_info dom->block_peek --- scripts/domain/121-block-info.t | 137 +++++++++++++++++++++++++++++++++++++++ 1 files changed, 137 insertions(+), 0 deletions(-) create mode 100644 scripts/domain/121-block-info.t diff --git a/scripts/domain/121-block-info.t b/scripts/domain/121-block-info.t new file mode 100644 index 0000000..17ebb2e --- /dev/null +++ b/scripts/domain/121-block-info.t @@ -0,0 +1,137 @@ +# -*- perl -*- +# +# Copyright (C) 2013 Red Hat, Inc. +# Copyright (C) 2013 Zhe Peng <zpeng(a)redhat.com> +# +# 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/121-block-info.t + +=head1 DESCRIPTION + +The test case validates that all following APIs work well include +dom->block_resize +dom->get_block_info +dom->block_peek + +=cut + +use strict; +use warnings; + +use Test::More tests => 29; + +use Sys::Virt::TCK; +use Test::Exception; +use File::stat; + +my $tck = Sys::Virt::TCK->new(); +my $conn = eval { $tck->setup(); }; +BAIL_OUT "failed to setup test harness: $@" if $@; +END { + $tck->cleanup if $tck; +} + +# test is_alive +my $live = $conn->is_alive(); +ok($live > 0, "Connection is alive"); + +my $xml = $tck->generic_pool("dir")->as_xml; + +diag "Defining transient storage pool"; +my $pool; +ok_pool(sub { $pool = $conn->define_storage_pool($xml) }, "define transient storage pool"); +lives_ok(sub { $pool->build(0) }, "built storage pool"); +lives_ok(sub { $pool->create }, "started storage pool"); + +my $volallocxml = $tck->generic_volume("tck", "raw", 1024*1024*50)->allocation(1024*1024*50)->as_xml; +my ($vol, $path, $st); +ok_volume { $vol = $pool->create_volume($volallocxml) } "create fully allocated raw volume"; + +my $volallocxml2 = $tck->generic_volume("tck2", "raw", 1024*1024*50)->allocation(1024*1024)->as_xml; +my ($vol2, $path2, $st2); +ok_volume { $vol2 = $pool->create_volume($volallocxml2) } "create not fully allocated raw volume"; + +my $volallocxml3 = $tck->generic_volume("tck3", "qcow2", 1024*1024*50)->allocation(1024*1024)->as_xml; +my ($vol3, $path3, $st3); +ok_volume { $vol3 = $pool->create_volume($volallocxml3) } "create qcow2 volume"; + +$path = xpath($vol, "string(/volume/target/path)"); +$st = stat($path); +ok($st, "path $path exists"); +is($st->size, 1024*1024*50, "size is 50M"); + +$path2 = xpath($vol2, "string(/volume/target/path)"); +$st2 = stat($path2); +ok($st2, "path $path2 exists"); + +$path3 = xpath($vol3, "string(/volume/target/path)"); +$st3 = stat($path3); +ok($st3, "path $path3 exists"); + +diag "Generic guest with pervious created vol"; +my $disktype = "raw"; +my $dst = "vda"; +my $dst2 = "vdb"; +my $dst3 = "vdc"; +my $guest = $tck->generic_domain("tck"); +$guest->rmdisk(); + +$guest->disk(format => { name => "qemu", type => $disktype }, type => "file", src => $path, dst => $dst); +$guest->disk(format => { name => "qemu", type => $disktype }, type => "file", src=> $path2, dst => $dst2); +$guest->disk(format => { name => "qemu", type => "qcow2" }, type => "file", src=> $path3, dst => $dst3); +$guest->interface(type => "network", source => "default", model => "virtio", mac => "52:54:00:22:22:22"); + +$xml = $guest->as_xml; +my $dom; +ok_domain(sub { $dom = $conn->create_domain($xml) }, "Create domain"); +$xml = $dom->get_xml_description(); + +is($dom->get_block_info($dst2,0)->{capacity}, 1024*1024*50, "Get disk capacity info"); +is($dom->get_block_info($dst2,0)->{allocation}, 1024*1024, "Get disk allocation info"); +is($dom->get_block_info($dst2,0)->{physical}, 1024*1024, "Get disk physical info"); + + +is($dom->get_block_info($dst,0)->{capacity}, 1024*1024*50, "Get disk capacity info"); +is($dom->get_block_info($dst,0)->{allocation}, 1024*1024*50, "Get disk allocation info"); +is($dom->get_block_info($dst,0)->{physical}, 1024*1024*50, "Get disk physical info"); + +diag "Test block_resize"; +lives_ok(sub {$dom->block_resize($dst, 512*50)}, "resize to 512*50 KB"); +$st = stat($path); +is($st->size, 512*1024*50, "size is 25M"); + +is($dom->get_block_info($dst,0)->{capacity}, 1024*512*50, "Get disk capacity info"); +is($dom->get_block_info($dst,0)->{allocation}, 1024*512*50, "Get disk allocation info"); +is($dom->get_block_info($dst,0)->{physical}, 1024*512*50, "Get disk physical info"); + +lives_ok(sub {$dom->block_resize($dst, 1024*50)}, "resize to 1024*50 KB"); +$st = stat($path); +is($st->size, 1024*1024*50, "size is 50M"); + +diag "Test block_peek"; +my $date = "test"; +system("echo $date > $path"); +is($dom->block_peek($path,0,4,0), $date, "Get date from raw image"); + +#qcow2 file start with hexadecimal:0x51 0x46 0x49 (ASCII: "QFI") +is($dom->block_peek($path3,0,3,0), "QFI", "Get date from qcow2 image"); + +lives_ok(sub { $vol->delete(0) }, "deleted volume"); + +diag "Destroy domain"; +$dom->destroy; + +ok_error(sub { $conn->get_domain_by_name("tck") }, "NO_DOMAIN error raised from missing domain", 42); + -- 1.7.7.6

3 8

[libvirt] [PATCH] spec: fix outdated comment
by Eric Blake 15 May '13

15 May '13

https://bugzilla.redhat.com/show_bug.cgi?id=963016 points out that we don't use initscripts by default on Fedora any more. * libvirt.spec.in (Requires): Better explanation of gettext. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Pushing under the trivial rule. libvirt.spec.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index f4ec6eb..ad9cea2 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -1022,7 +1022,7 @@ Requires: ncurses # So remote clients can access libvirt over SSH tunnel # (client invokes 'nc' against the UNIX socket on the server) Requires: nc -# Needed by libvirt-guests init script. +# Needed by /usr/libexec/libvirt-guests.sh script. Requires: gettext # Needed by virt-pki-validate script. Requires: gnutls-utils -- 1.8.1.4

1 0

[libvirt] latency between LIFECYCLE event and notification generation
by nishant burte 15 May '13

15 May '13

Hi, I want to know following about LIFECYCLE events of libvirt. 1. about the the latency of these events happening and notification generation. e.g. suppose a VM goes down. How much time it takes to realize that the particular VM has gone down(going to say, DEFINED state) and then notification is generated? 2. Second question is, can someone please explain what are the sequence of steps happen between a VM going down and the notification is generated? Could you please answer both the queries? Thanks Nishant

3 5

[libvirt] [PATCH v3] nwfilter: check for inverted ctdir
by Stefan Berger 15 May '13

15 May '13

Linux netfilter at some point (Linux 2.6.39) inverted the meaning of the '--ctdir reply' and newer netfilter implementations now expect '--ctdir original' instead and vice-versa. We check for the kernel version and assume that all Linux kernels with version 2.6.39 have the newer inverted logic. Signed-off-by: Stefan Berger <stefanb(a)linux.vnet.ibm.com> --- v2->v3: - using uname now to check for Linux kernel version number v1->v2: - using virSocketAddrParseIPv4 --- src/nwfilter/nwfilter_ebiptables_driver.c | 54 ++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) Index: libvirt-acl/src/nwfilter/nwfilter_ebiptables_driver.c =================================================================== --- libvirt-acl.orig/src/nwfilter/nwfilter_ebiptables_driver.c +++ libvirt-acl/src/nwfilter/nwfilter_ebiptables_driver.c @@ -27,6 +27,7 @@ #include <string.h> #include <sys/stat.h> #include <fcntl.h> +#include <sys/utsname.h> #include "internal.h" @@ -85,6 +86,17 @@ static char *iptables_cmd_path; static char *ip6tables_cmd_path; static char *grep_cmd_path; +/* + * --ctdir original vs. --ctdir reply's meaning was inverted in netfilter + * at some point (Linux 2.6.39) + */ +enum ctdirStatus { + CTDIR_STATUS_UNKNOWN = 0, + CTDIR_STATUS_CORRECTED = 1, + CTDIR_STATUS_OLD = 2, +}; +static enum ctdirStatus iptables_ctdir_corrected; + #define PRINT_ROOT_CHAIN(buf, prefix, ifname) \ snprintf(buf, sizeof(buf), "libvirt-%c-%s", prefix, ifname) #define PRINT_CHAIN(buf, prefix, ifname, suffix) \ @@ -1262,6 +1274,17 @@ iptablesEnforceDirection(int directionIn virNWFilterRuleDefPtr rule, virBufferPtr buf) { + switch (iptables_ctdir_corrected) { + case CTDIR_STATUS_UNKNOWN: + /* could not be determined or s.th. is seriously wrong */ + return; + case CTDIR_STATUS_CORRECTED: + directionIn = !directionIn; + break; + case CTDIR_STATUS_OLD: + break; + } + if (rule->tt != VIR_NWFILTER_RULE_DIRECTION_INOUT) virBufferAsprintf(buf, " -m conntrack --ctdir %s", (directionIn) ? "Original" @@ -4304,6 +4327,34 @@ ebiptablesDriverTestCLITools(void) return ret; } +static void +ebiptablesDriverProbeCtdir(void) +{ + struct utsname utsname; + unsigned int major, minor, micro; + + iptables_ctdir_corrected = CTDIR_STATUS_UNKNOWN; + + if (uname(&utsname) < 0) { + VIR_ERROR(_("Call to utsname failed: %d"), errno); + return; + } + + /* following Linux lxr, the logic was inverted in 2.6.39 */ + if (sscanf(utsname.release, "%u.%u.%u", &major, &minor, &micro) != 3) { + VIR_ERROR(_("Could not detect kernel version from string %s"), + utsname.release); + return; + } + + if (major >= 3 || + (major == 2 && minor == 6 && micro >= 39)) + iptables_ctdir_corrected = CTDIR_STATUS_CORRECTED; + else + iptables_ctdir_corrected = CTDIR_STATUS_OLD; + +} + static int ebiptablesDriverInit(bool privileged) { @@ -4341,6 +4392,9 @@ ebiptablesDriverInit(bool privileged) return -ENOTSUP; } + if (iptables_cmd_path) + ebiptablesDriverProbeCtdir(); + ebiptables_driver.flags = TECHDRV_FLAG_INITIALIZED; return 0;

3 3

[libvirt] [PATCH 0/7] util: Fixes for NPIV related helpers
by Osier Yang 15 May '13

15 May '13

Osier Yang (7): util: Fix regression of wwn reading util: Fix regression introduced by commit 4360a098441 util: Don't miss the slash in constructed path util: Change virIsCapable* to return bool util: Update the comment for virGetFCHostNameByWWN util: Honor the passed sysfs_prefix tests: Add tests for fc_host src/node_device/node_device_linux_sysfs.c | 4 +- src/util/virutil.c | 47 +++--- src/util/virutil.h | 4 +- tests/Makefile.am | 5 + tests/fchostdata/fc_host/host4/fabric_name | 1 + tests/fchostdata/fc_host/host4/max_npiv_vports | 1 + tests/fchostdata/fc_host/host4/node_name | 1 + tests/fchostdata/fc_host/host4/npiv_vports_inuse | 1 + tests/fchostdata/fc_host/host4/port_name | 1 + tests/fchostdata/fc_host/host4/port_state | 1 + tests/fchostdata/fc_host/host4/vport_create | 0 tests/fchostdata/fc_host/host4/vport_delete | 0 tests/fchostdata/fc_host/host5/fabric_name | 1 + tests/fchostdata/fc_host/host5/max_npiv_vports | 1 + tests/fchostdata/fc_host/host5/node_name | 1 + tests/fchostdata/fc_host/host5/npiv_vports_inuse | 1 + tests/fchostdata/fc_host/host5/port_name | 1 + tests/fchostdata/fc_host/host5/port_state | 1 + tests/fchostdata/fc_host/host5/vport_create | 0 tests/fchostdata/fc_host/host5/vport_delete | 0 tests/fchosttest.c | 175 +++++++++++++++++++++++ 21 files changed, 220 insertions(+), 27 deletions(-) create mode 100644 tests/fchostdata/fc_host/host4/fabric_name create mode 100644 tests/fchostdata/fc_host/host4/max_npiv_vports create mode 100644 tests/fchostdata/fc_host/host4/node_name create mode 100644 tests/fchostdata/fc_host/host4/npiv_vports_inuse create mode 100644 tests/fchostdata/fc_host/host4/port_name create mode 100644 tests/fchostdata/fc_host/host4/port_state create mode 100644 tests/fchostdata/fc_host/host4/vport_create create mode 100644 tests/fchostdata/fc_host/host4/vport_delete create mode 100644 tests/fchostdata/fc_host/host5/fabric_name create mode 100644 tests/fchostdata/fc_host/host5/max_npiv_vports create mode 100644 tests/fchostdata/fc_host/host5/node_name create mode 100644 tests/fchostdata/fc_host/host5/npiv_vports_inuse create mode 100644 tests/fchostdata/fc_host/host5/port_name create mode 100644 tests/fchostdata/fc_host/host5/port_state create mode 100644 tests/fchostdata/fc_host/host5/vport_create create mode 100644 tests/fchostdata/fc_host/host5/vport_delete create mode 100644 tests/fchosttest.c -- 1.8.1.4

5 27