- Devel - libvirt List Archives

[libvirt] [PATCH] maint: avoid regression on copyright listings
by Eric Blake 27 Jul '12

27 Jul '12

Commit f9ce7dad6 tried to kill uses of a raw street address, but missed a few instances. Automate things so we don't introduce new problems in the future. * cfg.mk (sc_copyright_address): New rule. (exclude_file_name_regexp--sc_copyright_address): Add exemption. * bootstrap.conf: Adjust offenders. * build-aux/augeas-gentest.pl: Likewise. * examples/systemtap/events.stp: Likewise. * examples/systemtap/qemu-monitor.stp: Likewise. * examples/systemtap/rpc-monitor.stp: Likewise. * src/dtrace2systemtap.pl: Likewise. * src/esx/esx_vi_generator.py: Likewise. * src/hyperv/hyperv_wmi_generator.py: Likewise. * src/remote/qemu_protocol.x: Likewise. * src/remote/remote_protocol.x: Likewise. * src/rpc/gensystemtap.pl: Likewise. * src/rpc/virnetprotocol.x: Likewise. * tests/object-locking.ml: Likewise. * tools/virt-xml-validate.in: Likewise. --- Not that I'm trying to demean Boston, but right now, the only mention of it in our source code happens to come from stale LGPL reference source boilerplate. bootstrap.conf | 4 +--- build-aux/augeas-gentest.pl | 3 +-- cfg.mk | 10 ++++++++++ examples/systemtap/events.stp | 3 +-- examples/systemtap/qemu-monitor.stp | 3 +-- examples/systemtap/rpc-monitor.stp | 3 +-- src/dtrace2systemtap.pl | 5 ++--- src/esx/esx_vi_generator.py | 3 +-- src/hyperv/hyperv_wmi_generator.py | 3 +-- src/remote/qemu_protocol.x | 3 +-- src/remote/remote_protocol.x | 3 +-- src/rpc/gensystemtap.pl | 5 ++--- src/rpc/virnetprotocol.x | 5 ++--- tests/object-locking.ml | 5 ++--- tools/virt-xml-validate.in | 5 ++--- 15 files changed, 29 insertions(+), 34 deletions(-) diff --git a/bootstrap.conf b/bootstrap.conf index 3ac84f4..84e37e7 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -13,9 +13,7 @@ # GNU 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - +# License along with this library; if not, see <http://www.gnu.org/licenses/>. # gnulib modules used by this package. gnulib_modules=' diff --git a/build-aux/augeas-gentest.pl b/build-aux/augeas-gentest.pl index a5f9fd3..9cdc400 100755 --- a/build-aux/augeas-gentest.pl +++ b/build-aux/augeas-gentest.pl @@ -14,8 +14,7 @@ # 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# License along with this library; if not, see <http://www.gnu.org/licenses/>. # # Authors: # Daniel P. Berrange <berrange(a)redhat.com> diff --git a/cfg.mk b/cfg.mk index 68f3a91..88131cb 100644 --- a/cfg.mk +++ b/cfg.mk @@ -622,6 +622,13 @@ sc_copyright_format: halt='spell Red Hat as two words' \ $(_sc_search_regexp) +# Prefer the new URL listing over the old street address listing when +# calling out where to get a copy of the [L]GPL. +sc_copyright_address: + @prohibit=Boston,' MA' \ + halt='Point to <http://www.gnu.org/licenses/>, not an address' \ + $(_sc_search_regexp) + # Some functions/macros produce messages intended solely for developers # and maintainers. Do not mark them for translation. sc_prohibit_gettext_markup: @@ -736,6 +743,9 @@ exclude_file_name_regexp--sc_avoid_write = \ exclude_file_name_regexp--sc_bindtextdomain = ^(tests|examples)/ +exclude_file_name_regexp--sc_copyright_address = \ + ^COPYING\.LIB$$ + exclude_file_name_regexp--sc_flags_usage = ^(docs/|src/util/virnetdevtap\.c$$) exclude_file_name_regexp--sc_libvirt_unmarked_diagnostics = \ diff --git a/examples/systemtap/events.stp b/examples/systemtap/events.stp index 7184000..3703be5 100644 --- a/examples/systemtap/events.stp +++ b/examples/systemtap/events.stp @@ -13,8 +13,7 @@ # 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# License along with this library; if not, see <http://www.gnu.org/licenses/>. # # Author: Daniel P. Berrange <berrange(a)redhat.com> # diff --git a/examples/systemtap/qemu-monitor.stp b/examples/systemtap/qemu-monitor.stp index b9d9b25..50f706f 100644 --- a/examples/systemtap/qemu-monitor.stp +++ b/examples/systemtap/qemu-monitor.stp @@ -13,8 +13,7 @@ # 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# License along with this library; if not, see <http://www.gnu.org/licenses/>. # # Author: Daniel P. Berrange <berrange(a)redhat.com> # diff --git a/examples/systemtap/rpc-monitor.stp b/examples/systemtap/rpc-monitor.stp index 69d7593..8b9dc1e 100644 --- a/examples/systemtap/rpc-monitor.stp +++ b/examples/systemtap/rpc-monitor.stp @@ -13,8 +13,7 @@ # 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# License along with this library; if not, see <http://www.gnu.org/licenses/>. # # Author: Daniel P. Berrange <berrange(a)redhat.com> # diff --git a/src/dtrace2systemtap.pl b/src/dtrace2systemtap.pl index 4c6c249..91c9452 100755 --- a/src/dtrace2systemtap.pl +++ b/src/dtrace2systemtap.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl # -# Copyright (C) 2011 Red Hat, Inc. +# Copyright (C) 2011-2012 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 @@ -13,8 +13,7 @@ # 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# License along with this library; if not, see <http://www.gnu.org/licenses/>. # # Author: Daniel P. Berrange <berrange(a)redhat.com> # diff --git a/src/esx/esx_vi_generator.py b/src/esx/esx_vi_generator.py index 97b8e15..2a344cc 100755 --- a/src/esx/esx_vi_generator.py +++ b/src/esx/esx_vi_generator.py @@ -16,8 +16,7 @@ # 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# License along with this library; if not, see <http://www.gnu.org/licenses/>. # import sys diff --git a/src/hyperv/hyperv_wmi_generator.py b/src/hyperv/hyperv_wmi_generator.py index 93f5ac2..d2d44d2 100755 --- a/src/hyperv/hyperv_wmi_generator.py +++ b/src/hyperv/hyperv_wmi_generator.py @@ -16,8 +16,7 @@ # 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# License along with this library; if not, see <http://www.gnu.org/licenses/>. # import sys diff --git a/src/remote/qemu_protocol.x b/src/remote/qemu_protocol.x index 5afe680..3536319 100644 --- a/src/remote/qemu_protocol.x +++ b/src/remote/qemu_protocol.x @@ -16,8 +16,7 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; if not, see <http://www.gnu.org/licenses/>. * * Author: Chris Lalancette <clalance(a)redhat.com> */ diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x index dd460d4..bdfa8ff 100644 --- a/src/remote/remote_protocol.x +++ b/src/remote/remote_protocol.x @@ -16,8 +16,7 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; if not, see <http://www.gnu.org/licenses/>. * * Author: Richard Jones <rjones(a)redhat.com> */ diff --git a/src/rpc/gensystemtap.pl b/src/rpc/gensystemtap.pl index 1cf9c0f..0adf900 100755 --- a/src/rpc/gensystemtap.pl +++ b/src/rpc/gensystemtap.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl # -# Copyright (C) 2011 Red Hat, Inc. +# Copyright (C) 2011-2012 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 @@ -13,8 +13,7 @@ # 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# License along with this library; if not, see <http://www.gnu.org/licenses/>. # # Author: Daniel P. Berrange <berrange(a)redhat.com> # diff --git a/src/rpc/virnetprotocol.x b/src/rpc/virnetprotocol.x index 9663ddb..f81a059 100644 --- a/src/rpc/virnetprotocol.x +++ b/src/rpc/virnetprotocol.x @@ -1,7 +1,7 @@ /* -*- c -*- * virnetprotocol.x: basic protocol for all RPC services. * - * Copyright (C) 2006-2011 Red Hat, Inc. + * Copyright (C) 2006-2012 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 @@ -14,8 +14,7 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; if not, see <http://www.gnu.org/licenses/>. * * Author: Richard Jones <rjones(a)redhat.com> */ diff --git a/tests/object-locking.ml b/tests/object-locking.ml index 68c414e..e952fe7 100644 --- a/tests/object-locking.ml +++ b/tests/object-locking.ml @@ -1,7 +1,7 @@ (* * Analyse libvirt driver API methods for mutex locking mistakes * - * Copyright (C) 2008-2010 Red Hat, Inc. + * Copyright (C) 2008-2010, 2012 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 @@ -14,8 +14,7 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; if not, see <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> *) diff --git a/tools/virt-xml-validate.in b/tools/virt-xml-validate.in index 9ba3a0a..ce13aff 100644 --- a/tools/virt-xml-validate.in +++ b/tools/virt-xml-validate.in @@ -10,9 +10,8 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# 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/>. set -e -- 1.7.11.2

2 3

[libvirt] [PATCH 0/2] Fix build of docs
by Peter Krempa 27 Jul '12

27 Jul '12

This series probably would qualify as build breaker but I'm posting it anyways. Without this, docs building in apibuild.py fails. Peter Krempa (2): docs: Add method to print warnings in docBuilder class lib: Revert removing of Summary and Description fields in headers docs/apibuild.py | 5 +++++ include/libvirt/libvirt-qemu.h | 3 +++ include/libvirt/libvirt.h.in | 3 +++ include/libvirt/virterror.h | 3 +++ 4 files changed, 14 insertions(+), 0 deletions(-) -- 1.7.8.6

2 4

[libvirt] [PATCH] Remove tabs from all perl files & enforce this
by Daniel P. Berrange 27 Jul '12

27 Jul '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> The cfg.mk file rule to check for tab characters was not applied to perl files. Much of our Perl code is full of tabs as a result. Kill them, kill them all ! --- build-aux/augeas-gentest.pl | 42 +++---- cfg.mk | 2 +- docs/hvsupport.pl | 268 +++++++++++++++++++++---------------------- docs/todo.pl | 42 +++---- src/check-symfile.pl | 4 +- src/dtrace2systemtap.pl | 104 ++++++++--------- src/rpc/gendispatch.pl | 180 ++++++++++++++--------------- src/rpc/genprotocol.pl | 106 ++++++++--------- src/rpc/gensystemtap.pl | 48 ++++---- tests/oomtrace.pl | 6 +- 10 files changed, 401 insertions(+), 401 deletions(-) diff --git a/build-aux/augeas-gentest.pl b/build-aux/augeas-gentest.pl index a5f9fd3..607ea20 100755 --- a/build-aux/augeas-gentest.pl +++ b/build-aux/augeas-gentest.pl @@ -41,28 +41,28 @@ open TEMPLATE, "<", $template or die "cannot read $template: $!"; my $group = 0; while (<TEMPLATE>) { if (/::CONFIG::/) { - my $group = 0; - print AUGTEST " let conf = \""; - while (<CONFIG>) { - if (/^#\w/) { - s/^#//; - s/\"/\\\"/g; - print AUGTEST $_; - $group = /\[\s$/; - } elsif ($group) { - s/\"/\\\"/g; - if (/#\s*\]/) { - $group = 0; - } - if (/^#/) { - s/^#//; - print AUGTEST $_; - } - } - } - print AUGTEST "\"\n"; + my $group = 0; + print AUGTEST " let conf = \""; + while (<CONFIG>) { + if (/^#\w/) { + s/^#//; + s/\"/\\\"/g; + print AUGTEST $_; + $group = /\[\s$/; + } elsif ($group) { + s/\"/\\\"/g; + if (/#\s*\]/) { + $group = 0; + } + if (/^#/) { + s/^#//; + print AUGTEST $_; + } + } + } + print AUGTEST "\"\n"; } else { - print AUGTEST $_; + print AUGTEST $_; } } diff --git a/cfg.mk b/cfg.mk index 68f3a91..aa457f9 100644 --- a/cfg.mk +++ b/cfg.mk @@ -453,7 +453,7 @@ sc_size_of_brackets: # Ensure that no C source file, docs, or rng schema uses TABs for # indentation. Also match *.h.in files, to get libvirt.h.in. Exclude # files in gnulib, since they're imported. -space_indent_files=(\.(rng|s?[ch](\.in)?|html.in|py|syms)|(daemon|tools)/.*\.in) +space_indent_files=(\.(rng|s?[ch](\.in)?|html.in|py|pl|syms)|(daemon|tools)/.*\.in) sc_TAB_in_indentation: @prohibit='^ * ' \ in_vc_files='$(space_indent_files)$$' \ diff --git a/docs/hvsupport.pl b/docs/hvsupport.pl index b0d1f0f..4871739 100755 --- a/docs/hvsupport.pl +++ b/docs/hvsupport.pl @@ -27,9 +27,9 @@ my %groupheaders = ( my @srcs; find({ wanted => sub { - if (m!$srcdir/.*/\w+_(driver|tmpl|monitor|hal|udev)\.c$!) { - push @srcs, $_ if $_ !~ /vbox_driver\.c/; - } + if (m!$srcdir/.*/\w+_(driver|tmpl|monitor|hal|udev)\.c$!) { + push @srcs, $_ if $_ !~ /vbox_driver\.c/; + } }, no_chdir => 1}, $srcdir); my $line; @@ -47,26 +47,26 @@ while (defined($line = <FILE>)) { next if $line =~ /^\s*$/; next if $line =~ /^\s*(global|local):/; if ($line =~ /^\s*LIBVIRT_(\d+\.\d+\.\d+)\s*{\s*$/) { - if (defined $vers) { - die "malformed syms file"; - } - $vers = $1; + if (defined $vers) { + die "malformed syms file"; + } + $vers = $1; } elsif ($line =~ /\s*}\s*;\s*$/) { - if (defined $prevvers) { - die "malformed syms file"; - } - $prevvers = $vers; - $vers = undef; + if (defined $prevvers) { + die "malformed syms file"; + } + $prevvers = $vers; + $vers = undef; } elsif ($line =~ /\s*}\s*LIBVIRT_(\d+\.\d+\.\d+)\s*;\s*$/) { - if ($1 ne $prevvers) { - die "malformed syms file $1 != $vers"; - } - $prevvers = $vers; - $vers = undef; + if ($1 ne $prevvers) { + die "malformed syms file $1 != $vers"; + } + $prevvers = $vers; + $vers = undef; } elsif ($line =~ /\s*(\w+)\s*;\s*$/) { - $apis{$1} = $vers; + $apis{$1} = $vers; } else { - die "unexpected data $line\n"; + die "unexpected data $line\n"; } } @@ -86,26 +86,26 @@ while (defined($line = <FILE>)) { next if $line =~ /^\s*$/; next if $line =~ /^\s*(global|local):/; if ($line =~ /^\s*LIBVIRT_QEMU_(\d+\.\d+\.\d+)\s*{\s*$/) { - if (defined $vers) { - die "malformed syms file"; - } - $vers = $1; + if (defined $vers) { + die "malformed syms file"; + } + $vers = $1; } elsif ($line =~ /\s*}\s*;\s*$/) { - if (defined $prevvers) { - die "malformed syms file"; - } - $prevvers = $vers; - $vers = undef; + if (defined $prevvers) { + die "malformed syms file"; + } + $prevvers = $vers; + $vers = undef; } elsif ($line =~ /\s*}\s*LIBVIRT_QEMU_(\d+\.\d+\.\d+)\s*;\s*$/) { - if ($1 ne $prevvers) { - die "malformed syms file $1 != $vers"; - } - $prevvers = $vers; - $vers = undef; + if ($1 ne $prevvers) { + die "malformed syms file $1 != $vers"; + } + $prevvers = $vers; + $vers = undef; } elsif ($line =~ /\s*(\w+)\s*;\s*$/) { - $apis{$1} = $vers; + $apis{$1} = $vers; } else { - die "unexpected data $line\n"; + die "unexpected data $line\n"; } } @@ -143,31 +143,31 @@ my %groups; my $ingrp; while (defined($line = <FILE>)) { if ($line =~ /struct _(vir\w*(?:Driver|Monitor))/) { - my $grp = $1; - if ($grp ne "virStateDriver" && - $grp ne "virStreamDriver") { - $ingrp = $grp; - $groups{$ingrp} = { apis => {}, drivers => {} }; - } + my $grp = $1; + if ($grp ne "virStateDriver" && + $grp ne "virStreamDriver") { + $ingrp = $grp; + $groups{$ingrp} = { apis => {}, drivers => {} }; + } } elsif ($ingrp) { - if ($line =~ /^\s*vir(?:Drv|DevMon)(\w+)\s+(\w+);\s*$/) { - my $field = $2; - my $name = $1; - - my $api; - if (exists $apis{"vir$name"}) { - $api = "vir$name"; - } elsif (exists $apis{"virConnect$name"}) { - $api = "virConnect$name"; - } elsif (exists $apis{"virNode$name"}) { - $api = "virNode$name"; - } else { - die "driver $name does not have a public API"; - } - $groups{$ingrp}->{apis}->{$field} = $api; - } elsif ($line =~ /};/) { - $ingrp = undef; - } + if ($line =~ /^\s*vir(?:Drv|DevMon)(\w+)\s+(\w+);\s*$/) { + my $field = $2; + my $name = $1; + + my $api; + if (exists $apis{"vir$name"}) { + $api = "vir$name"; + } elsif (exists $apis{"virConnect$name"}) { + $api = "virConnect$name"; + } elsif (exists $apis{"virNode$name"}) { + $api = "virNode$name"; + } else { + die "driver $name does not have a public API"; + } + $groups{$ingrp}->{apis}->{$field} = $api; + } elsif ($line =~ /};/) { + $ingrp = undef; + } } } @@ -179,60 +179,60 @@ close FILE; foreach my $src (@srcs) { open FILE, "<$src" or - die "cannot read $src: $!"; + die "cannot read $src: $!"; $ingrp = undef; my $impl; while (defined($line = <FILE>)) { - if (!$ingrp) { - foreach my $grp (keys %groups) { - if ($line =~ /^\s*(?:static\s+)?$grp\s+(\w+)\s*=\s*{/ || - $line =~ /^\s*(?:static\s+)?$grp\s+NAME$\w+$\s*=\s*{/) { - $ingrp = $grp; - $impl = $src; - - if ($impl =~ m,.*/node_device_(\w+)\.c,) { - $impl = $1; - } else { - $impl =~ s,.*/(\w+?)_((\w+)_)?(\w+)\.c,$1,; - } - - if ($groups{$ingrp}->{drivers}->{$impl}) { - die "Group $ingrp already contains $impl"; - } - - $groups{$ingrp}->{drivers}->{$impl} = {}; - } - } - - } else { - if ($line =~ m!\s*\.(\w+)\s*=\s*(\w+)\s*,?\s*(?:/\*\s*(\d+\.\d+\.\d+)\s*\*/\s*)?$!) { - my $api = $1; - my $meth = $2; - my $vers = $3; - - next if $api eq "no" || $api eq "name"; - - die "Method $meth in $src is missing version" unless defined $vers; - - die "Driver method for $api is NULL in $src" if $meth eq "NULL"; - - if (!exists($groups{$ingrp}->{apis}->{$api})) { - die "Found unexpected method $api in $ingrp\n"; - } - - $groups{$ingrp}->{drivers}->{$impl}->{$api} = $vers; - if ($api eq "domainMigratePrepare" || - $api eq "domainMigratePrepare2" || - $api eq "domainMigratePrepare3") { - $groups{$ingrp}->{drivers}->{$impl}->{"domainMigrate"} = $vers - unless $groups{$ingrp}->{drivers}->{$impl}->{"domainMigrate"}; - } - - } elsif ($line =~ /}/) { - $ingrp = undef; - } - } + if (!$ingrp) { + foreach my $grp (keys %groups) { + if ($line =~ /^\s*(?:static\s+)?$grp\s+(\w+)\s*=\s*{/ || + $line =~ /^\s*(?:static\s+)?$grp\s+NAME$\w+$\s*=\s*{/) { + $ingrp = $grp; + $impl = $src; + + if ($impl =~ m,.*/node_device_(\w+)\.c,) { + $impl = $1; + } else { + $impl =~ s,.*/(\w+?)_((\w+)_)?(\w+)\.c,$1,; + } + + if ($groups{$ingrp}->{drivers}->{$impl}) { + die "Group $ingrp already contains $impl"; + } + + $groups{$ingrp}->{drivers}->{$impl} = {}; + } + } + + } else { + if ($line =~ m!\s*\.(\w+)\s*=\s*(\w+)\s*,?\s*(?:/\*\s*(\d+\.\d+\.\d+)\s*\*/\s*)?$!) { + my $api = $1; + my $meth = $2; + my $vers = $3; + + next if $api eq "no" || $api eq "name"; + + die "Method $meth in $src is missing version" unless defined $vers; + + die "Driver method for $api is NULL in $src" if $meth eq "NULL"; + + if (!exists($groups{$ingrp}->{apis}->{$api})) { + die "Found unexpected method $api in $ingrp\n"; + } + + $groups{$ingrp}->{drivers}->{$impl}->{$api} = $vers; + if ($api eq "domainMigratePrepare" || + $api eq "domainMigratePrepare2" || + $api eq "domainMigratePrepare3") { + $groups{$ingrp}->{drivers}->{$impl}->{"domainMigrate"} = $vers + unless $groups{$ingrp}->{drivers}->{$impl}->{"domainMigrate"}; + } + + } elsif ($line =~ /}/) { + $ingrp = undef; + } + } } close FILE; @@ -253,21 +253,21 @@ foreach my $drv (keys %{$groups{"virDriver"}->{drivers}}) { my $openVersStr = $groups{"virDriver"}->{drivers}->{$drv}->{"open"}; my $openVers; if ($openVersStr =~ /(\d+)\.(\d+)\.(\d+)/) { - $openVers = ($1 * 1000 * 1000) + ($2 * 1000) + $3; + $openVers = ($1 * 1000 * 1000) + ($2 * 1000) + $3; } # virConnectOpenReadOnly always matches virConnectOpen version $groups{"virDriver"}->{drivers}->{$drv}->{"openReadOnly"} = - $groups{"virDriver"}->{drivers}->{$drv}->{"open"}; + $groups{"virDriver"}->{drivers}->{$drv}->{"open"}; # virConnectOpenAuth is always 0.4.0 if the driver existed # before this time, otherwise it matches the version of # the driver's virConnectOpen entry if ($openVersStr eq "Y" || - $openVers >= $openAuthVers) { - $groups{"virDriver"}->{drivers}->{$drv}->{"openAuth"} = $openVersStr; + $openVers >= $openAuthVers) { + $groups{"virDriver"}->{drivers}->{$drv}->{"openAuth"} = $openVersStr; } else { - $groups{"virDriver"}->{drivers}->{$drv}->{"openAuth"} = "0.4.0"; + $groups{"virDriver"}->{drivers}->{$drv}->{"openAuth"} = "0.4.0"; } } @@ -283,17 +283,17 @@ foreach my $drv (keys %{$groups{"virDriver"}->{drivers}}) { next unless defined $createVersStr; my $createVers; if ($createVersStr =~ /(\d+)\.(\d+)\.(\d+)/) { - $createVers = ($1 * 1000 * 1000) + ($2 * 1000) + $3; + $createVers = ($1 * 1000 * 1000) + ($2 * 1000) + $3; } # virCreateLinux is always 0.0.3 if the driver existed # before this time, otherwise it matches the version of # the driver's virCreateXML entry if ($createVersStr eq "Y" || - $createVers >= $createAPIVers) { - $groups{"virDriver"}->{drivers}->{$drv}->{"domainCreateLinux"} = $createVersStr; + $createVers >= $createAPIVers) { + $groups{"virDriver"}->{drivers}->{$drv}->{"domainCreateLinux"} = $createVersStr; } else { - $groups{"virDriver"}->{drivers}->{$drv}->{"domainCreateLinux"} = "0.0.3"; + $groups{"virDriver"}->{drivers}->{$drv}->{"domainCreateLinux"} = "0.0.3"; } } @@ -329,7 +329,7 @@ foreach my $grp (sort { $a cmp $b } keys %groups) { EOF foreach my $drv (sort { $a cmp $b } keys %{$groups{$grp}->{drivers}}) { - print " <th>$drv</th>\n"; + print " <th>$drv</th>\n"; } print <<EOF; @@ -340,27 +340,27 @@ EOF my $row = 0; foreach my $field (sort { - $groups{$grp}->{apis}->{$a} - cmp - $groups{$grp}->{apis}->{$b} - } keys %{$groups{$grp}->{apis}}) { - my $api = $groups{$grp}->{apis}->{$field}; - my $vers = $apis{$api}; - print <<EOF; + $groups{$grp}->{apis}->{$a} + cmp + $groups{$grp}->{apis}->{$b} + } keys %{$groups{$grp}->{apis}}) { + my $api = $groups{$grp}->{apis}->{$field}; + my $vers = $apis{$api}; + print <<EOF; <tr> <td><a href=\"html/libvirt-libvirt.html#$api\">$api</a></td> <td>$vers</td> EOF foreach my $drv (sort {$a cmp $b } keys %{$groups{$grp}->{drivers}}) { - if (exists $groups{$grp}->{drivers}->{$drv}->{$field}) { - print "<td>", $groups{$grp}->{drivers}->{$drv}->{$field}, "</td>\n"; - } else { - print "<td></td>\n"; - } + if (exists $groups{$grp}->{drivers}->{$drv}->{$field}) { + print "<td>", $groups{$grp}->{drivers}->{$drv}->{$field}, "</td>\n"; + } else { + print "<td></td>\n"; + } } - print <<EOF; + print <<EOF; </tr> EOF @@ -373,13 +373,13 @@ EOF EOF foreach my $drv (sort { $a cmp $b } keys %{$groups{$grp}->{drivers}}) { - print " <th>$drv</th>\n"; + print " <th>$drv</th>\n"; } print <<EOF; </tr> EOF - } + } } diff --git a/docs/todo.pl b/docs/todo.pl index 1183ff5..68d82d4 100755 --- a/docs/todo.pl +++ b/docs/todo.pl @@ -22,17 +22,17 @@ my $blurb = $cfg->get("output/blurb", undef); $SIG{__DIE__} = sub { my $err = shift; if (UNIVERSAL::isa($err, "BZ::Client::Exception")) { - die "Unable to access bugzilla: " . $err->message; + die "Unable to access bugzilla: " . $err->message; } die $err; }; my $client = BZ::Client->new(url => $server, - user => $username, - password => $password); + user => $username, + password => $password); my $todo = BZ::Client::Bug->search($client, {'product' => $product, - 'alias' => $todoalias}); + 'alias' => $todoalias}); die "Cannot find bug alias 'libvirtTodo'" unless $#{$todo} > -1; my $todoid = $todo->[0]->{'bug_id'}; @@ -42,7 +42,7 @@ $todosummary =~ s/^\s*\[\s*RFE\s*\]\s*:?\s*//; $todosummary =~ s/^\s*Tracker\s*:\s*//; my $trackers = BZ::Client::Bug->search($client, {'product' => $product, - 'blocked' => $todoid }); + 'blocked' => $todoid }); my @trackers; @@ -55,27 +55,27 @@ foreach my $tracker (@{$trackers}) { $summary =~ s/^\s*Tracker\s*:\s*//; push @trackers, { - id => $tracker->{'bug_id'}, - summary => $summary, - features => [], + id => $tracker->{'bug_id'}, + summary => $summary, + features => [], }; } foreach my $tracker (@trackers) { my $features = BZ::Client::Bug->search($client, {'product' => $product, - 'blocked' => $tracker->{id}}); + 'blocked' => $tracker->{id}}); foreach my $feature (@{$features}) { - next if $feature->{'bug_status'} eq "CLOSED"; + next if $feature->{'bug_status'} eq "CLOSED"; - my $summary = $feature->{'short_desc'}; - $summary =~ s/^\s*RFE\s*:\s*//; - $summary =~ s/^\s*\[\s*RFE\s*\]\s*:?\s*//; + my $summary = $feature->{'short_desc'}; + $summary =~ s/^\s*RFE\s*:\s*//; + $summary =~ s/^\s*\[\s*RFE\s*\]\s*:?\s*//; - push @{$tracker->{features}}, { - id => $feature->{'bug_id'}, - summary => $summary, - }; + push @{$tracker->{features}}, { + id => $feature->{'bug_id'}, + summary => $summary, + }; } } @@ -108,11 +108,11 @@ foreach my $tracker (sort { $a->{summary} cmp $b->{summary} } @trackers) { print " <h2><a href=\"$server/$id\">$summary</a></h2>\n"; print " <ul>\n"; foreach my $feature (sort { $a->{summary} cmp $b->{summary} } @{$tracker->{features}}) { - $summary = &escape($feature->{summary}); - $summary =~ s,^([^:]+):,<strong>$1</strong>,; + $summary = &escape($feature->{summary}); + $summary =~ s,^([^:]+):,<strong>$1</strong>,; - $id = $feature->{id}; - print " <li>$summary (<strong>rhbz <a href=\"$server/$id\">$id</a></strong>)</li>\n"; + $id = $feature->{id}; + print " <li>$summary (<strong>rhbz <a href=\"$server/$id\">$id</a></strong>)</li>\n"; } print " </ul>\n"; } diff --git a/src/check-symfile.pl b/src/check-symfile.pl index 19ffec5..73cdfcd 100755 --- a/src/check-symfile.pl +++ b/src/check-symfile.pl @@ -34,9 +34,9 @@ foreach my $elflib (@elflibs) { open NM, "-|", "nm", $elflib or die "cannot run 'nm $elflib': $!"; while (<NM>) { - next unless /^\S+\s(?:T|D)\s(\S+)\s*$/; + next unless /^\S+\s(?:T|D)\s(\S+)\s*$/; - $gotsyms{$1} = 1; + $gotsyms{$1} = 1; } close NM; diff --git a/src/dtrace2systemtap.pl b/src/dtrace2systemtap.pl index 4c6c249..8852379 100755 --- a/src/dtrace2systemtap.pl +++ b/src/dtrace2systemtap.pl @@ -46,38 +46,38 @@ while (<>) { next if /^\s*};\s*$/; if (m,^\s*\#,) { - if (m,^\s*\#\s*file:\s*(\S+)\s*$,) { - $file = $1; - push @files, $file; - $files{$file} = { prefix => undef, probes => [] }; - } elsif (m,^\s*\#\s*prefix:\s*(\S+)\s*$,) { - $files{$file}->{prefix} = $1; - } elsif (m,^\s*\#\s*binary:\s*(\S+)\s*$,) { - $files{$file}->{binary} = $1; - } else { - # ignore unknown comments - } + if (m,^\s*\#\s*file:\s*(\S+)\s*$,) { + $file = $1; + push @files, $file; + $files{$file} = { prefix => undef, probes => [] }; + } elsif (m,^\s*\#\s*prefix:\s*(\S+)\s*$,) { + $files{$file}->{prefix} = $1; + } elsif (m,^\s*\#\s*binary:\s*(\S+)\s*$,) { + $files{$file}->{binary} = $1; + } else { + # ignore unknown comments + } } else { - if (m,\s*probe\s+([a-zA-Z0-9_]+)$(.*?)($;)?$,) { - $probe = $1; - $args = $2; - if ($3) { - push @{$files{$file}->{probes}}, [$probe, $args]; - $probe = $args = undef; - } - } elsif ($probe) { - if (m,^(.*?)(\);)?$,) { - $args .= $1; - if ($2) { - push @{$files{$file}->{probes}}, [$probe, $args]; - $probe = $args = undef; - } - } else { - die "unexpected data $_ on line $."; - } - } else { - die "unexpected data $_ on line $."; - } + if (m,\s*probe\s+([a-zA-Z0-9_]+)$(.*?)($;)?$,) { + $probe = $1; + $args = $2; + if ($3) { + push @{$files{$file}->{probes}}, [$probe, $args]; + $probe = $args = undef; + } + } elsif ($probe) { + if (m,^(.*?)(\);)?$,) { + $args .= $1; + if ($2) { + push @{$files{$file}->{probes}}, [$probe, $args]; + $probe = $args = undef; + } + } else { + die "unexpected data $_ on line $."; + } + } else { + die "unexpected data $_ on line $."; + } } } @@ -88,32 +88,32 @@ foreach my $file (@files) { print "# $file\n\n"; foreach my $probe (@probes) { - my $name = $probe->[0]; - my $args = $probe->[1]; + my $name = $probe->[0]; + my $args = $probe->[1]; - my $pname = $name; - $pname =~ s/${prefix}_/libvirt.$prefix./; + my $pname = $name; + $pname =~ s/${prefix}_/libvirt.$prefix./; - my $binary = "$libdir/libvirt.so"; - if (exists $files{$file}->{binary}) { - $binary = $sbindir . "/" . $files{$file}->{binary}; - } + my $binary = "$libdir/libvirt.so"; + if (exists $files{$file}->{binary}) { + $binary = $sbindir . "/" . $files{$file}->{binary}; + } - print "probe $pname = process(\"$binary\").mark(\"$name\") {\n"; + print "probe $pname = process(\"$binary\").mark(\"$name\") {\n"; - my @args = split /,/, $args; - for (my $i = 0 ; $i <= $#args ; $i++) { - my $arg = $args[$i]; - my $isstr = $arg =~ /char\s+\*/; - $arg =~ s/^.*\s\*?(\S+)$/$1/; + my @args = split /,/, $args; + for (my $i = 0 ; $i <= $#args ; $i++) { + my $arg = $args[$i]; + my $isstr = $arg =~ /char\s+\*/; + $arg =~ s/^.*\s\*?(\S+)$/$1/; - if ($isstr) { - print " $arg = user_string(\$arg", $i + 1, ");\n"; - } else { - print " $arg = \$arg", $i + 1, ";\n"; - } - } - print "}\n\n"; + if ($isstr) { + print " $arg = user_string(\$arg", $i + 1, ");\n"; + } else { + print " $arg = \$arg", $i + 1, ";\n"; + } + } + print "}\n\n"; } print "\n"; } diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl index 17bfb2e..3a66445 100755 --- a/src/rpc/gendispatch.pl +++ b/src/rpc/gendispatch.pl @@ -54,11 +54,11 @@ sub name_to_ProcName { my @elems; if ($name =~ /_/ || (lc $name) eq "open" || (lc $name) eq "close") { - @elems = split /_/, $name; - @elems = map lc, @elems; - @elems = map ucfirst, @elems; + @elems = split /_/, $name; + @elems = map lc, @elems; + @elems = map ucfirst, @elems; } else { - @elems = $name; + @elems = $name; } @elems = map { fixup_name($_) } @elems; my $procname = join "", @elems; @@ -332,53 +332,53 @@ elsif ($opt_b) { # skip things which are REMOTE_MESSAGE next if $call->{msg}; - my $name = $structprefix . "Dispatch" . $call->{ProcName}; - my $argtype = $call->{args}; - my $rettype = $call->{ret}; - - my $argann = $argtype ne "void" ? "" : " ATTRIBUTE_UNUSED"; - my $retann = $rettype ne "void" ? "" : " ATTRIBUTE_UNUSED"; - - # First we print out a function declaration for the - # real dispatcher body - print "static int ${name}(\n"; - print " virNetServerPtr server,\n"; - print " virNetServerClientPtr client,\n"; - print " virNetMessagePtr msg,\n"; - print " virNetMessageErrorPtr rerr"; - if ($argtype ne "void") { - print ",\n $argtype *args"; - } - if ($rettype ne "void") { - print ",\n $rettype *ret"; - } - print ");\n"; - - - # Next we print out a generic wrapper method which has - # fixed function signature, for use in the dispatcher - # table. This simply callers the real dispatcher method - print "static int ${name}Helper(\n"; - print " virNetServerPtr server,\n"; - print " virNetServerClientPtr client,\n"; - print " virNetMessagePtr msg,\n"; - print " virNetMessageErrorPtr rerr,\n"; - print " void *args$argann,\n"; - print " void *ret$retann)\n"; - print "{\n"; - print " VIR_DEBUG(\"server=%p client=%p msg=%p rerr=%p args=%p ret=%p\", server, client, msg, rerr, args, ret);\n"; - print " return $name(server, client, msg, rerr"; - if ($argtype ne "void") { - print ", args"; - } - if ($rettype ne "void") { - print ", ret"; - } - print ");\n"; - print "}\n"; - - # Finally we print out the dispatcher method body impl - # (if possible) + my $name = $structprefix . "Dispatch" . $call->{ProcName}; + my $argtype = $call->{args}; + my $rettype = $call->{ret}; + + my $argann = $argtype ne "void" ? "" : " ATTRIBUTE_UNUSED"; + my $retann = $rettype ne "void" ? "" : " ATTRIBUTE_UNUSED"; + + # First we print out a function declaration for the + # real dispatcher body + print "static int ${name}(\n"; + print " virNetServerPtr server,\n"; + print " virNetServerClientPtr client,\n"; + print " virNetMessagePtr msg,\n"; + print " virNetMessageErrorPtr rerr"; + if ($argtype ne "void") { + print ",\n $argtype *args"; + } + if ($rettype ne "void") { + print ",\n $rettype *ret"; + } + print ");\n"; + + + # Next we print out a generic wrapper method which has + # fixed function signature, for use in the dispatcher + # table. This simply callers the real dispatcher method + print "static int ${name}Helper(\n"; + print " virNetServerPtr server,\n"; + print " virNetServerClientPtr client,\n"; + print " virNetMessagePtr msg,\n"; + print " virNetMessageErrorPtr rerr,\n"; + print " void *args$argann,\n"; + print " void *ret$retann)\n"; + print "{\n"; + print " VIR_DEBUG(\"server=%p client=%p msg=%p rerr=%p args=%p ret=%p\", server, client, msg, rerr, args, ret);\n"; + print " return $name(server, client, msg, rerr"; + if ($argtype ne "void") { + print ", args"; + } + if ($rettype ne "void") { + print ", ret"; + } + print ");\n"; + print "}\n"; + + # Finally we print out the dispatcher method body impl + # (if possible) if (!exists($generate{$call->{ProcName}})) { print "/* ${structprefix}Dispatch$call->{ProcName} body has " . "to be implemented manually */\n\n\n\n"; @@ -794,18 +794,18 @@ elsif ($opt_b) { } # print functions signature - print "static int $name(\n"; - print " virNetServerPtr server ATTRIBUTE_UNUSED,\n"; - print " virNetServerClientPtr client,\n"; - print " virNetMessagePtr msg ATTRIBUTE_UNUSED,\n"; - print " virNetMessageErrorPtr rerr"; + print "static int $name(\n"; + print " virNetServerPtr server ATTRIBUTE_UNUSED,\n"; + print " virNetServerClientPtr client,\n"; + print " virNetMessagePtr msg ATTRIBUTE_UNUSED,\n"; + print " virNetMessageErrorPtr rerr"; if ($argtype ne "void") { - print ",\n $argtype *args"; - } + print ",\n $argtype *args"; + } if ($rettype ne "void") { - print ",\n $rettype *ret"; - } - print ")\n"; + print ",\n $rettype *ret"; + } + print ")\n"; # print function body print "{\n"; @@ -814,7 +814,7 @@ elsif ($opt_b) { foreach my $var (@vars_list) { print " $var;\n"; } - print " struct daemonClientPrivate *priv =\n"; + print " struct daemonClientPrivate *priv =\n"; print " virNetServerClientGetPrivateData(client);\n"; if ($call->{streamflag} ne "none") { @@ -994,32 +994,32 @@ elsif ($opt_b) { print "virNetServerProgramProc ${structprefix}Procs[] = {\n"; for ($id = 0 ; $id <= $#calls ; $id++) { - my ($comment, $name, $argtype, $arglen, $argfilter, $retlen, $retfilter, $priority); - - if (defined $calls[$id] && !$calls[$id]->{msg}) { - $comment = "/* Method $calls[$id]->{ProcName} => $id */"; - $name = $structprefix . "Dispatch" . $calls[$id]->{ProcName} . "Helper"; - my $argtype = $calls[$id]->{args}; - my $rettype = $calls[$id]->{ret}; - $arglen = $argtype ne "void" ? "sizeof($argtype)" : "0"; - $retlen = $rettype ne "void" ? "sizeof($rettype)" : "0"; - $argfilter = $argtype ne "void" ? "xdr_$argtype" : "xdr_void"; - $retfilter = $rettype ne "void" ? "xdr_$rettype" : "xdr_void"; - } else { - if ($calls[$id]->{msg}) { - $comment = "/* Async event $calls[$id]->{ProcName} => $id */"; - } else { - $comment = "/* Unused $id */"; - } - $name = "NULL"; - $arglen = $retlen = 0; - $argfilter = "xdr_void"; - $retfilter = "xdr_void"; - } + my ($comment, $name, $argtype, $arglen, $argfilter, $retlen, $retfilter, $priority); + + if (defined $calls[$id] && !$calls[$id]->{msg}) { + $comment = "/* Method $calls[$id]->{ProcName} => $id */"; + $name = $structprefix . "Dispatch" . $calls[$id]->{ProcName} . "Helper"; + my $argtype = $calls[$id]->{args}; + my $rettype = $calls[$id]->{ret}; + $arglen = $argtype ne "void" ? "sizeof($argtype)" : "0"; + $retlen = $rettype ne "void" ? "sizeof($rettype)" : "0"; + $argfilter = $argtype ne "void" ? "xdr_$argtype" : "xdr_void"; + $retfilter = $rettype ne "void" ? "xdr_$rettype" : "xdr_void"; + } else { + if ($calls[$id]->{msg}) { + $comment = "/* Async event $calls[$id]->{ProcName} => $id */"; + } else { + $comment = "/* Unused $id */"; + } + $name = "NULL"; + $arglen = $retlen = 0; + $argfilter = "xdr_void"; + $retfilter = "xdr_void"; + } $priority = defined $calls[$id]->{priority} ? $calls[$id]->{priority} : 0; - print "{ $comment\n ${name},\n $arglen,\n (xdrproc_t)$argfilter,\n $retlen,\n (xdrproc_t)$retfilter,\n true,\n $priority\n},\n"; + print "{ $comment\n ${name},\n $arglen,\n (xdrproc_t)$argfilter,\n $retlen,\n (xdrproc_t)$retfilter,\n true,\n $priority\n},\n"; } print "};\n"; print "size_t ${structprefix}NProcs = ARRAY_CARDINALITY(${structprefix}Procs);\n"; @@ -1039,8 +1039,8 @@ elsif ($opt_k) { # skip procedures not on generate list next if ! exists($generate{$call->{ProcName}}); - my $argtype = $call->{args}; - my $rettype = $call->{ret}; + my $argtype = $call->{args}; + my $rettype = $call->{ret}; # handle arguments to the function my @args_list = (); @@ -1574,10 +1574,10 @@ elsif ($opt_k) { } if ($call->{ProcName} eq "DomainDestroy" || - $call->{ProcName} eq "DomainSave" || - $call->{ProcName} eq "DomainManagedSave") { + $call->{ProcName} eq "DomainSave" || + $call->{ProcName} eq "DomainManagedSave") { # SPECIAL: virDomain{Destroy|Save|ManagedSave} need to reset - # the domain id explicitly on success + # the domain id explicitly on success print " dom->id = -1;\n"; } diff --git a/src/rpc/genprotocol.pl b/src/rpc/genprotocol.pl index f8e68f5..c8c1570 100755 --- a/src/rpc/genprotocol.pl +++ b/src/rpc/genprotocol.pl @@ -41,14 +41,14 @@ while (<RPCGEN>) { # We only want to fixup the GLibc rpcgen output # So just print data unchanged, if non-Linux unless ($fixup) { - print TARGET; - next; + print TARGET; + next; } if (m/^{/) { - $in_function = 1; - print TARGET; - next; + $in_function = 1; + print TARGET; + next; } s/\t/ /g; @@ -64,58 +64,58 @@ while (<RPCGEN>) { s/(?<!IXDR_GET_INT32 )IXDR_GET_LONG/IXDR_GET_INT32/g; if (m/^}/) { - $in_function = 0; - - # Note: The body of the function is in @function. - - # Remove decl of buf, if buf isn't used in the function. - my @uses = grep /[^.>]\bbuf\b/, @function; - @function = grep !/[^.>]\bbuf\b/, @function if @uses == 1; - - # Remove decl of i, if i isn't used in the function. - @uses = grep /[^.>]\bi\b/, @function; - @function = grep !/[^.>]\bi\b/, @function if @uses == 1; - - # (char **)&objp->... gives: - # warning: dereferencing type-punned pointer will break - # strict-aliasing rules - # so rewrite it. - my %uses = (); - my $i = 0; - foreach (@function) { - $uses{$1} = $i++ if m/$char \*\*$\&(objp->[a-z_.]+_val)/i; - } - if (keys %uses >= 1) { - my $i = 1; - - foreach (keys %uses) { - $i = $uses{$_}; - unshift @function, - (" char **objp_cpp$i = (char **) (void *) &$_;\n"); - $i++; - } - @function = - map { s{$char \*\*$\&(objp->[a-z_.]+_val)} - {objp_cpp$uses{$1}}gi; $_ } @function; - } - - # The code uses 'IXDR_PUT_{U_,}LONG' but it's wrong in two - # ways: Firstly these functions are deprecated and don't - # work on 64 bit platforms. Secondly the return value should - # be ignored. Correct both these mistakes. - @function = - map { s/\bIXDR_PUT_((U_)?)LONG\b/(void)IXDR_PUT_$1INT32/; $_ } - map { s/\bXDR_INLINE\b/(int32_t*)XDR_INLINE/; $_ } - @function; - - print TARGET (join ("", @function)); - @function = (); + $in_function = 0; + + # Note: The body of the function is in @function. + + # Remove decl of buf, if buf isn't used in the function. + my @uses = grep /[^.>]\bbuf\b/, @function; + @function = grep !/[^.>]\bbuf\b/, @function if @uses == 1; + + # Remove decl of i, if i isn't used in the function. + @uses = grep /[^.>]\bi\b/, @function; + @function = grep !/[^.>]\bi\b/, @function if @uses == 1; + + # (char **)&objp->... gives: + # warning: dereferencing type-punned pointer will break + # strict-aliasing rules + # so rewrite it. + my %uses = (); + my $i = 0; + foreach (@function) { + $uses{$1} = $i++ if m/$char \*\*$\&(objp->[a-z_.]+_val)/i; + } + if (keys %uses >= 1) { + my $i = 1; + + foreach (keys %uses) { + $i = $uses{$_}; + unshift @function, + (" char **objp_cpp$i = (char **) (void *) &$_;\n"); + $i++; + } + @function = + map { s{$char \*\*$\&(objp->[a-z_.]+_val)} + {objp_cpp$uses{$1}}gi; $_ } @function; + } + + # The code uses 'IXDR_PUT_{U_,}LONG' but it's wrong in two + # ways: Firstly these functions are deprecated and don't + # work on 64 bit platforms. Secondly the return value should + # be ignored. Correct both these mistakes. + @function = + map { s/\bIXDR_PUT_((U_)?)LONG\b/(void)IXDR_PUT_$1INT32/; $_ } + map { s/\bXDR_INLINE\b/(int32_t*)XDR_INLINE/; $_ } + @function; + + print TARGET (join ("", @function)); + @function = (); } unless ($in_function) { - print TARGET; + print TARGET; } else { - push @function, $_; + push @function, $_; } } diff --git a/src/rpc/gensystemtap.pl b/src/rpc/gensystemtap.pl index 1cf9c0f..41c5625 100755 --- a/src/rpc/gensystemtap.pl +++ b/src/rpc/gensystemtap.pl @@ -37,33 +37,33 @@ my $intype = 0; my $inauth = 0; while (<>) { if (/enum\s+virNetMessageType/) { - $intype = 1; + $intype = 1; } elsif (/enum\s+virNetMessageStatus/) { - $instatus = 1; + $instatus = 1; } elsif (/enum remote_auth_type/) { - $inauth = 1; + $inauth = 1; } elsif (/}/) { - $instatus = $intype = $inauth = 0; + $instatus = $intype = $inauth = 0; } elsif ($instatus) { - if (/^\s+VIR_NET_(\w+)\s*=\s*(\d+),?$/) { - $status{$2} = lc $1; - } + if (/^\s+VIR_NET_(\w+)\s*=\s*(\d+),?$/) { + $status{$2} = lc $1; + } } elsif ($intype) { - if (/^\s+VIR_NET_(\w+)\s*=\s*(\d+),?$/) { - $type{$2} = lc $1; - } + if (/^\s+VIR_NET_(\w+)\s*=\s*(\d+),?$/) { + $type{$2} = lc $1; + } } elsif ($inauth) { - if (/^\s+REMOTE_AUTH_(\w+)\s*=\s*(\d+),?$/) { - $auth{$2} = lc $1; - } + if (/^\s+REMOTE_AUTH_(\w+)\s*=\s*(\d+),?$/) { + $auth{$2} = lc $1; + } } else { - if (/(\w+)_PROGRAM\s*=\s*0x([a-fA-F0-9]+)\s*;/) { - $funcs{lc $1} = { id => hex($2), version => undef, progs => [] }; - } elsif (/(\w+)_PROTOCOL_VERSION\s*=\s*(\d+)\s*;/) { - $funcs{lc $1}->{version} = $2; - } elsif (/(\w+)_PROC_(.*?)\s+=\s+(\d+)/) { - $funcs{lc $1}->{progs}->[$3] = lc $2; - } + if (/(\w+)_PROGRAM\s*=\s*0x([a-fA-F0-9]+)\s*;/) { + $funcs{lc $1} = { id => hex($2), version => undef, progs => [] }; + } elsif (/(\w+)_PROTOCOL_VERSION\s*=\s*(\d+)\s*;/) { + $funcs{lc $1}->{version} = $2; + } elsif (/(\w+)_PROC_(.*?)\s+=\s+(\d+)/) { + $funcs{lc $1}->{progs}->[$3] = lc $2; + } } } @@ -172,10 +172,10 @@ foreach my $prog (keys %funcs) { my $pfirst = 1; for (my $id = 1 ; $id <= $#{$funcs{$prog}->{progs}} ; $id++) { - my $cond = $pfirst ? "if" : "} else if"; - $pfirst = 0; - print " $cond (proc == $id) {\n"; - print " procstr = \"", $funcs{$prog}->{progs}->[$id], "\";\n"; + my $cond = $pfirst ? "if" : "} else if"; + $pfirst = 0; + print " $cond (proc == $id) {\n"; + print " procstr = \"", $funcs{$prog}->{progs}->[$id], "\";\n"; } print " } else {\n"; print " procstr = \"unknown\";\n"; diff --git a/tests/oomtrace.pl b/tests/oomtrace.pl index c615ed9..6d423e7 100755 --- a/tests/oomtrace.pl +++ b/tests/oomtrace.pl @@ -21,7 +21,7 @@ my %lines; foreach (@data) { if (/^\s*TRACE:\s+(\S+?)(?:$.*$)?\s+\[0x(.*)\]\s*$/ ) { - $trace{$2} = $1; + $trace{$2} = $1; } } @@ -34,8 +34,8 @@ foreach my $key (keys %trace) { foreach (@data) { if (/^\s*TRACE:\s+(\S+?)(?:$.*$)?\s+\[0x(.*)\]\s*$/ ) { - print $lines{$2}; + print $lines{$2}; } else { - print; + print; } } -- 1.7.10.4

3 3

[libvirt] Can I run a shell script in Guest OS via libvirt
by Doan Van Tuyen 27 Jul '12

27 Jul '12

Hi all. I amd trying to use libvirt-php to build a public cloud. I used Vmware hypervisor (free), XEN and KVM. Now I want to create a Virtual Machine from template. After that, I want to install some application on that VM. *Can I run a shell script in Guest OS via Libvirt?* Tuyen V. Doan --------------------------------------------------------------------------------------------------------------- Đoàn Văn Tuyển Mobile: 0904.554.112 Email : DoanVanTuyen(a)gmail.com ITBachKhoa(a)yahoo.com.vn -------------------------------------------- Ti`m di.a diem http://timdiadiem.net

2 1

[libvirt] [PATCH 1/8] parallels: add driver skeleton
by Dmitry Guryanov 27 Jul '12

27 Jul '12

Parallels Cloud Server is a cloud-ready virtualization solution that allows users to simultaneously run multiple virtual machines and containers on the same physical server. More information can be found here: http://www.parallels.com/products/pcs/ Also beta version of Parallels Cloud Server can be downloaded there. Signed-off-by: Dmitry Guryanov <dguryanov(a)parallels.com> --- configure.ac | 61 ++++++--- docs/drvparallels.html.in | 28 ++++ include/libvirt/virterror.h | 1 + libvirt.spec.in | 9 +- mingw-libvirt.spec.in | 6 + po/POTFILES.in | 1 + src/Makefile.am | 13 ++ src/conf/domain_conf.c | 3 +- src/conf/domain_conf.h | 1 + src/driver.h | 1 + src/libvirt.c | 9 ++ src/parallels/parallels_driver.c | 287 ++++++++++++++++++++++++++++++++++++++ src/parallels/parallels_driver.h | 28 ++++ src/util/virterror.c | 3 +- 14 files changed, 429 insertions(+), 22 deletions(-) create mode 100644 docs/drvparallels.html.in create mode 100644 src/parallels/parallels_driver.c create mode 100644 src/parallels/parallels_driver.h diff --git a/configure.ac b/configure.ac index 3cc7b3c..400ac3b 100644 --- a/configure.ac +++ b/configure.ac @@ -330,6 +330,8 @@ AC_ARG_WITH([esx], AC_HELP_STRING([--with-esx], [add ESX support @<:@default=check@:>@]),[],[with_esx=check]) AC_ARG_WITH([hyperv], AC_HELP_STRING([--with-hyperv], [add Hyper-V support @<:@default=check@:>@]),[],[with_hyperv=check]) +AC_ARG_WITH([parallels], + AC_HELP_STRING([--with-parallels], [add Parallels Cloud Server support @<:@default=check@:>@]),[],[with_parallels=check]) AC_ARG_WITH([test], AC_HELP_STRING([--with-test], [add test driver support @<:@default=yes@:>@]),[],[with_test=yes]) AC_ARG_WITH([remote], @@ -788,6 +790,26 @@ fi AM_CONDITIONAL([WITH_LXC], [test "$with_lxc" = "yes"]) dnl +dnl Checks for the Parallels driver +dnl + +if test "$with_parallels" = "check"; then + with_parallels=$with_linux + if test ! $host_cpu = 'x86_64'; then + with_parallels=no + fi +fi + +if test "$with_parallels" = "yes" && test "$with_linux" = "no"; then + AC_MSG_ERROR([The Parallels driver can be enabled on Linux only.]) +fi + +if test "$with_parallels" = "yes"; then + AC_DEFINE_UNQUOTED([WITH_PARALLELS], 1, [whether Parallels driver is enabled]) +fi +AM_CONDITIONAL([WITH_PARALLELS], [test "$with_parallels" = "yes"]) + +dnl dnl check for shell that understands <> redirection without truncation, dnl needed by src/qemu/qemu_monitor_{text,json}.c. dnl @@ -2824,25 +2846,26 @@ AC_MSG_NOTICE([=====================]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([Drivers]) AC_MSG_NOTICE([]) -AC_MSG_NOTICE([ Xen: $with_xen]) -AC_MSG_NOTICE([ QEMU: $with_qemu]) -AC_MSG_NOTICE([ UML: $with_uml]) -AC_MSG_NOTICE([ OpenVZ: $with_openvz]) -AC_MSG_NOTICE([ VMware: $with_vmware]) -AC_MSG_NOTICE([ VBox: $with_vbox]) -AC_MSG_NOTICE([ XenAPI: $with_xenapi]) -AC_MSG_NOTICE([xenlight: $with_libxl]) -AC_MSG_NOTICE([ LXC: $with_lxc]) -AC_MSG_NOTICE([ PHYP: $with_phyp]) -AC_MSG_NOTICE([ ESX: $with_esx]) -AC_MSG_NOTICE([ Hyper-V: $with_hyperv]) -AC_MSG_NOTICE([ Test: $with_test]) -AC_MSG_NOTICE([ Remote: $with_remote]) -AC_MSG_NOTICE([ Network: $with_network]) -AC_MSG_NOTICE([Libvirtd: $with_libvirtd]) -AC_MSG_NOTICE([ netcf: $with_netcf]) -AC_MSG_NOTICE([ macvtap: $with_macvtap]) -AC_MSG_NOTICE([virtport: $with_virtualport]) +AC_MSG_NOTICE([ Xen: $with_xen]) +AC_MSG_NOTICE([ QEMU: $with_qemu]) +AC_MSG_NOTICE([ UML: $with_uml]) +AC_MSG_NOTICE([ OpenVZ: $with_openvz]) +AC_MSG_NOTICE([ VMware: $with_vmware]) +AC_MSG_NOTICE([ VBox: $with_vbox]) +AC_MSG_NOTICE([ XenAPI: $with_xenapi]) +AC_MSG_NOTICE([ xenlight: $with_libxl]) +AC_MSG_NOTICE([ LXC: $with_lxc]) +AC_MSG_NOTICE([ PHYP: $with_phyp]) +AC_MSG_NOTICE([ ESX: $with_esx]) +AC_MSG_NOTICE([ Hyper-V: $with_hyperv]) +AC_MSG_NOTICE([Parallels: $with_parallels]) +AC_MSG_NOTICE([ Test: $with_test]) +AC_MSG_NOTICE([ Remote: $with_remote]) +AC_MSG_NOTICE([ Network: $with_network]) +AC_MSG_NOTICE([ Libvirtd: $with_libvirtd]) +AC_MSG_NOTICE([ netcf: $with_netcf]) +AC_MSG_NOTICE([ macvtap: $with_macvtap]) +AC_MSG_NOTICE([ virtport: $with_virtualport]) AC_MSG_NOTICE([]) AC_MSG_NOTICE([Storage Drivers]) AC_MSG_NOTICE([]) diff --git a/docs/drvparallels.html.in b/docs/drvparallels.html.in new file mode 100644 index 0000000..40a0fe5 --- /dev/null +++ b/docs/drvparallels.html.in @@ -0,0 +1,28 @@ +<html><body> + <h1>Parallels Cloud Server driver</h1> + <ul id="toc"></ul> + <p> + The libvirt Parallels driver can manage Parallels Cloud Server starting from version 6.0. + </p> + + + <h2><a name="project">Project Links</a></h2> + <ul> + <li> + The <a href="http://www.parallels.com/products/server/baremetal/sp/">Parallels Cloud Server</a> Virtualization Solution. + </li> + </ul> + + + <h2><a name="uri">Connections to the Parallels Cloud Server driver</a></h2> + <p> + The libvirt Parallels driver is a single-instance privileged driver, with a driver name of 'parallels'. Some example connection URIs for the libvirt driver are: + </p> +<pre> +parallels:///default (local access) +parallels+unix:///default (local access) +parallels://example.com/default (remote access, TLS/x509) +parallels+tcp://example.com/default (remote access, SASl/Kerberos) +parallels+ssh://root@example.com/default (remote access, SSH tunnelled) +</pre> +</body></html> diff --git a/include/libvirt/virterror.h b/include/libvirt/virterror.h index 0e0bc9c..1c58c66 100644 --- a/include/libvirt/virterror.h +++ b/include/libvirt/virterror.h @@ -97,6 +97,7 @@ typedef enum { VIR_FROM_URI = 45, /* Error from URI handling */ VIR_FROM_AUTH = 46, /* Error from auth handling */ VIR_FROM_DBUS = 47, /* Error from DBus */ + VIR_FROM_PARALLELS = 48, /* Error from Parallels */ # ifdef VIR_ENUM_SENTINELS VIR_ERR_DOMAIN_LAST diff --git a/libvirt.spec.in b/libvirt.spec.in index cfcfc1c..c642f80 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -67,6 +67,7 @@ %define with_esx 0%{!?_without_esx:1} %define with_hyperv 0%{!?_without_hyperv:1} %define with_xenapi 0%{!?_without_xenapi:1} +%define with_parallels 0%{!?_without_parallels:1} # Then the secondary host drivers, which run inside libvirtd %define with_network 0%{!?_without_network:%{server_drivers}} @@ -136,6 +137,7 @@ %define with_xenapi 0 %define with_libxl 0 %define with_hyperv 0 +%define with_parallels 0 %endif # Fedora 17 / RHEL-7 are first where we use systemd. Although earlier @@ -1068,6 +1070,10 @@ of recent versions of Linux (and other OSes). %define _without_vmware --without-vmware %endif +%if ! %{with_parallels} +%define _without_parallels --without-parallels +%endif + %if ! %{with_polkit} %define _without_polkit --without-polkit %endif @@ -1210,6 +1216,7 @@ autoreconf -if %{?_without_esx} \ %{?_without_hyperv} \ %{?_without_vmware} \ + %{?_without_parallels} \ %{?_without_network} \ %{?_with_rhel5_api} \ %{?_without_storage_fs} \ @@ -1401,7 +1408,7 @@ fi /sbin/chkconfig --add libvirtd if [ "$1" -ge "1" ]; then - /sbin/service libvirtd condrestart > /dev/null 2>&1 + /sbin/service libvirtd condrestart > /dev/null 2>&1 fi %endif diff --git a/mingw-libvirt.spec.in b/mingw-libvirt.spec.in index d2a8cf3..4695895 100644 --- a/mingw-libvirt.spec.in +++ b/mingw-libvirt.spec.in @@ -13,6 +13,7 @@ # missing libwsman, so can't build hyper-v %define with_hyperv 0%{!?_without_hyperv:0} %define with_xenapi 0%{!?_without_xenapi:1} +%define with_parallels 0%{!?_without_parallels:0} # RHEL ships ESX but not PowerHypervisor, HyperV, or libxenserver (xenapi) %if 0%{?rhel} @@ -125,6 +126,10 @@ MinGW Windows libvirt virtualization library, static version. %define _without_xenapi --without-xenapi %endif +%if ! %{with_parallels} +%define _without_parallels --without-parallels +%endif + %if 0%{?enable_autotools} autoreconf -if %endif @@ -148,6 +153,7 @@ autoreconf -if %{?_without_esx} \ %{?_without_hyperv} \ --without-vmware \ + --without-parallels \ --without-netcf \ --without-audit \ --without-dtrace diff --git a/po/POTFILES.in b/po/POTFILES.in index 0f32918..c4a84a9 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -64,6 +64,7 @@ src/nwfilter/nwfilter_learnipaddr.c src/openvz/openvz_conf.c src/openvz/openvz_driver.c src/openvz/openvz_util.c +src/parallels/parallels_driver.c src/phyp/phyp_driver.c src/qemu/qemu_agent.c src/qemu/qemu_bridge_filter.c diff --git a/src/Makefile.am b/src/Makefile.am index 93fcf3b..ca0c930 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -483,6 +483,10 @@ HYPERV_DRIVER_EXTRA_DIST = \ hyperv/hyperv_wmi_generator.py \ $(HYPERV_DRIVER_GENERATED) +PARALLELS_DRIVER_SOURCES = \ + parallels/parallels_driver.h \ + parallels/parallels_driver.c + NETWORK_DRIVER_SOURCES = \ network/bridge_driver.h network/bridge_driver.c @@ -921,6 +925,14 @@ libvirt_driver_hyperv_la_LIBADD = $(OPENWSMAN_LIBS) libvirt_driver_hyperv_la_SOURCES = $(HYPERV_DRIVER_SOURCES) endif +if WITH_PARALLELS +noinst_LTLIBRARIES += libvirt_driver_parallels.la +libvirt_la_BUILT_LIBADD += libvirt_driver_parallels.la +libvirt_driver_parallels_la_CFLAGS = \ + -I$(top_srcdir)/src/conf $(AM_CFLAGS) +libvirt_driver_parallels_la_SOURCES = $(PARALLELS_DRIVER_SOURCES) +endif + if WITH_NETWORK noinst_LTLIBRARIES += libvirt_driver_network_impl.la libvirt_driver_network_la_SOURCES = @@ -1132,6 +1144,7 @@ EXTRA_DIST += \ $(ESX_DRIVER_EXTRA_DIST) \ $(HYPERV_DRIVER_SOURCES) \ $(HYPERV_DRIVER_EXTRA_DIST) \ + $(PARALLELS_DRIVER_SOURCES) \ $(NETWORK_DRIVER_SOURCES) \ $(INTERFACE_DRIVER_SOURCES) \ $(STORAGE_DRIVER_SOURCES) \ diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index c53722a..e695417 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -93,7 +93,8 @@ VIR_ENUM_IMPL(virDomainVirt, VIR_DOMAIN_VIRT_LAST, "vmware", "hyperv", "vbox", - "phyp") + "phyp", + "parallels") VIR_ENUM_IMPL(virDomainBoot, VIR_DOMAIN_BOOT_LAST, "fd", diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index bc02caf..0db1693 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -160,6 +160,7 @@ enum virDomainVirtType { VIR_DOMAIN_VIRT_HYPERV, VIR_DOMAIN_VIRT_VBOX, VIR_DOMAIN_VIRT_PHYP, + VIR_DOMAIN_VIRT_PARALLELS, VIR_DOMAIN_VIRT_LAST, }; diff --git a/src/driver.h b/src/driver.h index 46d9846..aab9766 100644 --- a/src/driver.h +++ b/src/driver.h @@ -31,6 +31,7 @@ typedef enum { VIR_DRV_VMWARE = 13, VIR_DRV_LIBXL = 14, VIR_DRV_HYPERV = 15, + VIR_DRV_PARALLELS = 16, } virDrvNo; diff --git a/src/libvirt.c b/src/libvirt.c index 8315b4f..e3cc832 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -72,6 +72,9 @@ #ifdef WITH_XENAPI # include "xenapi/xenapi_driver.h" #endif +#ifdef WITH_PARALLELS +# include "parallels/parallels_driver.h" +#endif #define VIR_FROM_THIS VIR_FROM_NONE @@ -443,6 +446,9 @@ virInitialize(void) #ifdef WITH_XENAPI if (xenapiRegister() == -1) return -1; #endif +#ifdef WITH_PARALLELS + if (parallelsRegister() == -1) return -1; +#endif #ifdef WITH_REMOTE if (remoteRegister () == -1) return -1; #endif @@ -1144,6 +1150,9 @@ do_open (const char *name, #ifndef WITH_XENAPI STRCASEEQ(ret->uri->scheme, "xenapi") || #endif +#ifndef WITH_PARALLELS + STRCASEEQ(ret->uri->scheme, "parallels") || +#endif false)) { virReportErrorHelper(VIR_FROM_NONE, VIR_ERR_CONFIG_UNSUPPORTED, __FILE__, __FUNCTION__, __LINE__, diff --git a/src/parallels/parallels_driver.c b/src/parallels/parallels_driver.c new file mode 100644 index 0000000..00a9074 --- /dev/null +++ b/src/parallels/parallels_driver.c @@ -0,0 +1,287 @@ +/* + * parallels_driver.c: core driver functions for managing + * Parallels Cloud Server hosts + * + * Copyright (C) 2012 Parallels, 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#include <config.h> + +#include <sys/types.h> +#include <sys/poll.h> +#include <limits.h> +#include <string.h> +#include <stdio.h> +#include <stdarg.h> +#include <stdlib.h> +#include <unistd.h> +#include <errno.h> +#include <sys/utsname.h> +#include <sys/stat.h> +#include <fcntl.h> +#include <paths.h> +#include <pwd.h> +#include <stdio.h> +#include <sys/wait.h> +#include <sys/time.h> +#include <sys/statvfs.h> + +#include "datatypes.h" +#include "virterror_internal.h" +#include "memory.h" +#include "util.h" +#include "logging.h" +#include "command.h" +#include "configmake.h" +#include "storage_file.h" +#include "nodeinfo.h" +#include "json.h" +#include "domain_conf.h" +#include "storage_conf.h" +#include "domain_event.h" + +#include "parallels_driver.h" + +#define VIR_FROM_THIS VIR_FROM_PARALLELS + +#define PRLCTL "prlctl" +#define PARALLELS_DEFAULT_ARCH "x86_64" + +struct _parallelsConn { + virMutex lock; + virDomainObjList domains; + virStoragePoolObjList pools; + virCapsPtr caps; + virDomainEventStatePtr domainEventState; +}; + +typedef struct _parallelsConn parallelsConn; +typedef struct _parallelsConn *parallelsConnPtr; + +static int parallelsClose(virConnectPtr conn); + +static void +parallelsDriverLock(parallelsConnPtr driver) +{ + virMutexLock(&driver->lock); +} + +static void +parallelsDriverUnlock(parallelsConnPtr driver) +{ + virMutexUnlock(&driver->lock); +} + +static int +parallelsDefaultConsoleType(const char *ostype ATTRIBUTE_UNUSED) +{ + return VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SERIAL; +} + +static virCapsPtr +parallelsBuildCapabilities(void) +{ + virCapsPtr caps; + virCapsGuestPtr guest; + struct utsname utsname; + uname(&utsname); + + if ((caps = virCapabilitiesNew(utsname.machine, 0, 0)) == NULL) + goto no_memory; + + if (nodeCapsInitNUMA(caps) < 0) + goto no_memory; + + virCapabilitiesSetMacPrefix(caps, (unsigned char[]) { + 0x42, 0x1C, 0x00}); + + if ((guest = virCapabilitiesAddGuest(caps, "hvm", PARALLELS_DEFAULT_ARCH, + 64, "parallels", + NULL, 0, NULL)) == NULL) + goto no_memory; + + if (virCapabilitiesAddGuestDomain(guest, + "parallels", NULL, NULL, 0, NULL) == NULL) + goto no_memory; + + caps->defaultConsoleTargetType = parallelsDefaultConsoleType; + return caps; + + no_memory: + virReportOOMError(); + virCapabilitiesFree(caps); + return NULL; +} + +static char * +parallelsGetCapabilities(virConnectPtr conn) +{ + parallelsConnPtr privconn = conn->privateData; + char *xml; + + parallelsDriverLock(privconn); + if ((xml = virCapabilitiesFormatXML(privconn->caps)) == NULL) + virReportOOMError(); + parallelsDriverUnlock(privconn); + return xml; +} + +static int +parallelsOpenDefault(virConnectPtr conn) +{ + parallelsConnPtr privconn; + + if (VIR_ALLOC(privconn) < 0) { + virReportOOMError(); + return VIR_DRV_OPEN_ERROR; + } + if (virMutexInit(&privconn->lock) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("cannot initialize mutex")); + goto error; + } + + if (!(privconn->caps = parallelsBuildCapabilities())) + goto error; + + if (virDomainObjListInit(&privconn->domains) < 0) + goto error; + + conn->privateData = privconn; + + return VIR_DRV_OPEN_SUCCESS; + + error: + virDomainObjListDeinit(&privconn->domains); + virCapabilitiesFree(privconn->caps); + virStoragePoolObjListFree(&privconn->pools); + VIR_FREE(privconn); + return VIR_DRV_OPEN_ERROR; +} + +static virDrvOpenStatus +parallelsOpen(virConnectPtr conn, + virConnectAuthPtr auth ATTRIBUTE_UNUSED, + unsigned int flags) +{ + int ret; + parallelsConnPtr privconn; + virCheckFlags(VIR_CONNECT_RO, VIR_DRV_OPEN_ERROR); + + if (!conn->uri) + return VIR_DRV_OPEN_DECLINED; + + if (!conn->uri->scheme || STRNEQ(conn->uri->scheme, "parallels")) + return VIR_DRV_OPEN_DECLINED; + + /* Remote driver should handle these. */ + if (conn->uri->server) + return VIR_DRV_OPEN_DECLINED; + + /* From this point on, the connection is for us. */ + if (!conn->uri->path || + conn->uri->path[0] == '\0' || + (conn->uri->path[0] == '/' && conn->uri->path[1] == '\0')) { + virReportError(VIR_ERR_INVALID_ARG, "%s", + _("parallelsOpen: supply a path or use " + "parallels:///default")); + return VIR_DRV_OPEN_ERROR; + } + + if (STREQ(conn->uri->path, "/default")) + ret = parallelsOpenDefault(conn); + else + return VIR_DRV_OPEN_DECLINED; + + if (ret != VIR_DRV_OPEN_SUCCESS) + return ret; + + privconn = conn->privateData; + parallelsDriverLock(privconn); + privconn->domainEventState = virDomainEventStateNew(); + if (!privconn->domainEventState) { + parallelsDriverUnlock(privconn); + parallelsClose(conn); + return VIR_DRV_OPEN_ERROR; + } + + parallelsDriverUnlock(privconn); + return VIR_DRV_OPEN_SUCCESS; +} + +static int +parallelsClose(virConnectPtr conn) +{ + parallelsConnPtr privconn = conn->privateData; + + parallelsDriverLock(privconn); + virCapabilitiesFree(privconn->caps); + virDomainObjListDeinit(&privconn->domains); + virDomainEventStateFree(privconn->domainEventState); + conn->privateData = NULL; + + parallelsDriverUnlock(privconn); + virMutexDestroy(&privconn->lock); + + VIR_FREE(privconn); + return 0; +} + +static int +parallelsGetVersion(virConnectPtr conn ATTRIBUTE_UNUSED, unsigned long *hvVer) +{ + /* TODO */ + *hvVer = 6; + return 0; +} + +static virDriver parallelsDriver = { + .no = VIR_DRV_PARALLELS, + .name = "Parallels", + .open = parallelsOpen, /* 0.10.0 */ + .close = parallelsClose, /* 0.10.0 */ + .version = parallelsGetVersion, /* 0.10.0 */ + .getHostname = virGetHostname, /* 0.10.0 */ + .nodeGetInfo = nodeGetInfo, /* 0.10.0 */ + .getCapabilities = parallelsGetCapabilities, /* 0.10.0 */ +}; + +/** + * parallelsRegister: + * + * Registers the parallels driver + */ +int +parallelsRegister(void) +{ + char *prlctl_path; + + prlctl_path = virFindFileInPath(PRLCTL); + if (!prlctl_path) { + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Can't find prlctl command in the PATH env")); + return VIR_DRV_OPEN_ERROR; + } + + VIR_FREE(prlctl_path); + + if (virRegisterDriver(&parallelsDriver) < 0) + return -1; + + return 0; +} diff --git a/src/parallels/parallels_driver.h b/src/parallels/parallels_driver.h new file mode 100644 index 0000000..0a021c9 --- /dev/null +++ b/src/parallels/parallels_driver.h @@ -0,0 +1,28 @@ +/* + * parallels_driver.c: core driver functions for managing + * Parallels Cloud Server hosts + * + * Copyright (C) 2012 Parallels, 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#ifndef PARALLELS_DRIVER_H +# define PARALLELS_DRIVER_H + +int parallelsRegister(void); + +#endif diff --git a/src/util/virterror.c b/src/util/virterror.c index b5c6853..8cf738a 100644 --- a/src/util/virterror.c +++ b/src/util/virterror.c @@ -99,7 +99,8 @@ VIR_ENUM_IMPL(virErrorDomain, VIR_ERR_DOMAIN_LAST, "URI Utils", /* 45 */ "Authentication Utils", - "DBus Utils" + "DBus Utils", + "Parallels Cloud Server" ) -- 1.7.1

2 18

[libvirt] [PATCH] maint: Use consistent copyright.
by [4mWho should the emails appear to be from? [Osier Yang 27 Jul '12

27 Jul '12

From: Osier Yang <jyang(a)redhat.com> This is a follow up patch of commit f9ce7dad6, it modifies all the files which declare the copyright like "See COPYING.LIB for the License of this software" to use the detailed/consistent one. And deserts the outdated comments like: * libvirt-qemu.h: * Summary: qemu specific interfaces * Description: Provides the interfaces of the libvirt library to handle * qemu specific methods * * Copy: Copyright (C) 2010, 2012 Red Hat, Inc. Uses the more compact style like: * libvirt-qemu.h: Interfaces specific for QEMU/KVM driver * * Copyright (C) 2010, 2012 Red Hat, Inc. --- include/libvirt/libvirt-qemu.h | 21 +++++++++++++++------ include/libvirt/libvirt.h.in | 21 +++++++++++++++------ include/libvirt/virterror.h | 21 +++++++++++++++------ src/libvirt.c | 14 +++++++++++++- src/security/virt-aa-helper.c | 14 +++++++++++++- src/util/buf.c | 14 +++++++++++++- src/util/buf.h | 14 +++++++++++++- src/util/cgroup.c | 14 +++++++++++++- src/util/cgroup.h | 14 +++++++++++++- src/util/conf.c | 14 +++++++++++++- src/util/conf.h | 14 +++++++++++++- src/util/stats_linux.c | 14 +++++++++++++- src/util/stats_linux.h | 14 +++++++++++++- src/util/virterror.c | 16 ++++++++++++++-- src/util/viruri.c | 14 +++++++++++++- src/util/viruri.h | 14 +++++++++++++- src/util/xml.c | 14 +++++++++++++- src/xen/block_stats.c | 14 +++++++++++++- src/xen/block_stats.h | 14 +++++++++++++- src/xen/xen_driver.c | 14 +++++++++++++- src/xen/xen_driver.h | 14 +++++++++++++- src/xen/xen_hypervisor.c | 14 +++++++++++++- src/xen/xen_hypervisor.h | 14 +++++++++++++- src/xen/xs_internal.c | 14 +++++++++++++- src/xen/xs_internal.h | 14 +++++++++++++- tests/testutils.c | 14 +++++++++++++- tests/testutils.h | 14 +++++++++++++- tools/virsh-edit.c | 14 +++++++++++++- tools/virsh.c | 14 +++++++++++++- 29 files changed, 384 insertions(+), 45 deletions(-) diff --git a/include/libvirt/libvirt-qemu.h b/include/libvirt/libvirt-qemu.h index ba75ae3..6f4aedc 100644 --- a/include/libvirt/libvirt-qemu.h +++ b/include/libvirt/libvirt-qemu.h @@ -1,12 +1,21 @@ /* -*- c -*- - * libvirt-qemu.h: - * Summary: qemu specific interfaces - * Description: Provides the interfaces of the libvirt library to handle - * qemu specific methods + * libvirt-qemu.h: Interfaces specific for QEMU/KVM driver * - * Copy: Copyright (C) 2010, 2012 Red Hat, Inc. + * Copyright (C) 2010, 2012 Red Hat, Inc. * - * See COPYING.LIB for the License of this software + * 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: Chris Lalancette <clalance(a)redhat.com> */ diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index fcef461..fc7fa85 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -1,12 +1,21 @@ /* -*- c -*- - * libvirt.h: - * Summary: core interfaces for the libvirt library - * Description: Provides the interfaces of the libvirt library to handle - * virtualized domains + * libvirt.h: Core interfaces for the libvirt library * - * Copy: Copyright (C) 2005-2006, 2010-2012 Red Hat, Inc. + * Copyright (C) 2005-2006, 2010-2012 Red Hat, Inc. * - * See COPYING.LIB for the License of this software + * 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: Daniel Veillard <veillard(a)redhat.com> */ diff --git a/include/libvirt/virterror.h b/include/libvirt/virterror.h index 0e0bc9c..b3f80ab 100644 --- a/include/libvirt/virterror.h +++ b/include/libvirt/virterror.h @@ -1,12 +1,21 @@ /* - * virterror.h: - * Summary: error handling interfaces for the libvirt library - * Description: Provides the interfaces of the libvirt library to handle - * errors raised while using the library. + * virterror.h: Error handling interfaces for the libvirt library * - * Copy: Copyright (C) 2006, 2010-2012 Red Hat, Inc. + * Copyright (C) 2006, 2010-2012 Red Hat, Inc. * - * See COPYING.LIB for the License of this software + * 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: Daniel Veillard <veillard(a)redhat.com> */ diff --git a/src/libvirt.c b/src/libvirt.c index 8315b4f..de22d81 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -4,7 +4,19 @@ * * Copyright (C) 2005-2006, 2008-2012 Red Hat, Inc. * - * See COPYING.LIB for the License of this software + * 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/>. * * Daniel Veillard <veillard(a)redhat.com> */ diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 056362c..5352a4a 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -5,7 +5,19 @@ * Copyright (C) 2010-2012 Red Hat, Inc. * Copyright (C) 2009-2011 Canonical Ltd. * - * See COPYING.LIB for the License of this software + * 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: * Jamie Strandboge <jamie(a)canonical.com> diff --git a/src/util/buf.c b/src/util/buf.c index 6c7c501..a7e5bd4 100644 --- a/src/util/buf.c +++ b/src/util/buf.c @@ -3,7 +3,19 @@ * * Copyright (C) 2005-2008, 2010-2012 Red Hat, Inc. * - * See COPYING.LIB for the License of this software + * 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/>. * * Daniel Veillard <veillard(a)redhat.com> */ diff --git a/src/util/buf.h b/src/util/buf.h index 2750b17..c58f1d7 100644 --- a/src/util/buf.h +++ b/src/util/buf.h @@ -3,7 +3,19 @@ * * Copyright (C) 2005-2008, 2011, 2012 Red Hat, Inc. * - * See COPYING.LIB for the License of this software + * 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/>. * * Daniel Veillard <veillard(a)redhat.com> */ diff --git a/src/util/cgroup.c b/src/util/cgroup.c index 5b32881..6c29c87 100644 --- a/src/util/cgroup.c +++ b/src/util/cgroup.c @@ -4,7 +4,19 @@ * Copyright (C) 2010-2012 Red Hat, Inc. * Copyright IBM Corp. 2008 * - * See COPYING.LIB for the License of this software + * 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: * Dan Smith <danms(a)us.ibm.com> diff --git a/src/util/cgroup.h b/src/util/cgroup.h index 05325ae..265f7c9 100644 --- a/src/util/cgroup.h +++ b/src/util/cgroup.h @@ -4,7 +4,19 @@ * Copyright (C) 2011-2012 Red Hat, Inc. * Copyright IBM Corp. 2008 * - * See COPYING.LIB for the License of this software + * 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: * Dan Smith <danms(a)us.ibm.com> diff --git a/src/util/conf.c b/src/util/conf.c index b9392f7..8c1a963 100644 --- a/src/util/conf.c +++ b/src/util/conf.c @@ -3,7 +3,19 @@ * * Copyright (C) 2006-2012 Red Hat, Inc. * - * See COPYING.LIB for the License of this software + * 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/>. * * Daniel Veillard <veillard(a)redhat.com> */ diff --git a/src/util/conf.h b/src/util/conf.h index e7d470d..6af2377 100644 --- a/src/util/conf.h +++ b/src/util/conf.h @@ -3,7 +3,19 @@ * * Copyright (C) 2006, 2007 Red Hat, Inc. * - * See COPYING.LIB for the License of this software + * 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/>. * * Daniel Veillard <veillard(a)redhat.com> */ diff --git a/src/util/stats_linux.c b/src/util/stats_linux.c index a74ed6a..2a1c6ee 100644 --- a/src/util/stats_linux.c +++ b/src/util/stats_linux.c @@ -3,7 +3,19 @@ * * Copyright (C) 2007-2010 Red Hat, Inc. * - * See COPYING.LIB for the License of this software + * 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/>. * * Richard W.M. Jones <rjones(a)redhat.com> */ diff --git a/src/util/stats_linux.h b/src/util/stats_linux.h index 0aff832..73aeb5f 100644 --- a/src/util/stats_linux.h +++ b/src/util/stats_linux.h @@ -3,7 +3,19 @@ * * Copyright (C) 2007 Red Hat, Inc. * - * See COPYING.LIB for the License of this software + * 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/>. * * Richard W.M. Jones <rjones(a)redhat.com> */ diff --git a/src/util/virterror.c b/src/util/virterror.c index b5c6853..74adeed 100644 --- a/src/util/virterror.c +++ b/src/util/virterror.c @@ -1,9 +1,21 @@ /* * virterror.c: implements error handling and reporting code for libvirt * - * Copy: Copyright (C) 2006, 2008-2012 Red Hat, Inc. + * Copyright (C) 2006, 2008-2012 Red Hat, Inc. * - * See COPYING.LIB for the License of this software + * 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: Daniel Veillard <veillard(a)redhat.com> */ diff --git a/src/util/viruri.c b/src/util/viruri.c index 791a412..1cbfbc1 100644 --- a/src/util/viruri.c +++ b/src/util/viruri.c @@ -3,7 +3,19 @@ * * Copyright (C) 2012 Red Hat, Inc. * - * See COPYING.LIB for the License of this software + * 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/>. */ #include <config.h> diff --git a/src/util/viruri.h b/src/util/viruri.h index 79a5668..571bf3c 100644 --- a/src/util/viruri.h +++ b/src/util/viruri.h @@ -3,7 +3,19 @@ * * Copyright (C) 2012 Red Hat, Inc. * - * See COPYING.LIB for the License of this software + * 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/>. */ #ifndef __VIR_URI_H__ diff --git a/src/util/xml.c b/src/util/xml.c index 4c88a06..b093d5f 100644 --- a/src/util/xml.c +++ b/src/util/xml.c @@ -3,7 +3,19 @@ * * Copyright (C) 2005, 2007-2012 Red Hat, Inc. * - * See COPYING.LIB for the License of this software + * 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/>. * * Daniel Veillard <veillard(a)redhat.com> */ diff --git a/src/xen/block_stats.c b/src/xen/block_stats.c index 3d77720..b42666e 100644 --- a/src/xen/block_stats.c +++ b/src/xen/block_stats.c @@ -3,7 +3,19 @@ * * Copyright (C) 2007-2009 Red Hat, Inc. * - * See COPYING.LIB for the License of this software + * 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/>. * * Richard W.M. Jones <rjones(a)redhat.com> */ diff --git a/src/xen/block_stats.h b/src/xen/block_stats.h index c94f645..5eecc6e 100644 --- a/src/xen/block_stats.h +++ b/src/xen/block_stats.h @@ -3,7 +3,19 @@ * * Copyright (C) 2007 Red Hat, Inc. * - * See COPYING.LIB for the License of this software + * 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/>. * * Richard W.M. Jones <rjones(a)redhat.com> */ diff --git a/src/xen/xen_driver.c b/src/xen/xen_driver.c index f01ce16..d33737e 100644 --- a/src/xen/xen_driver.c +++ b/src/xen/xen_driver.c @@ -3,7 +3,19 @@ * * Copyright (C) 2007-2012 Red Hat, Inc. * - * See COPYING.LIB for the License of this software + * 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/>. * * Richard W.M. Jones <rjones(a)redhat.com> */ diff --git a/src/xen/xen_driver.h b/src/xen/xen_driver.h index 3cefea3..0b3138a 100644 --- a/src/xen/xen_driver.h +++ b/src/xen/xen_driver.h @@ -3,7 +3,19 @@ * * Copyright (C) 2007, 2010-2011 Red Hat, Inc. * - * See COPYING.LIB for the License of this software + * 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/>. * * Richard W.M. Jones <rjones(a)redhat.com> */ diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c index 986621a..86e0514 100644 --- a/src/xen/xen_hypervisor.c +++ b/src/xen/xen_hypervisor.c @@ -3,7 +3,19 @@ * * Copyright (C) 2005-2012 Red Hat, Inc. * - * See COPYING.LIB for the License of this software + * 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/>. * * Daniel Veillard <veillard(a)redhat.com> */ diff --git a/src/xen/xen_hypervisor.h b/src/xen/xen_hypervisor.h index 55a99f1..61434dc 100644 --- a/src/xen/xen_hypervisor.h +++ b/src/xen/xen_hypervisor.h @@ -3,7 +3,19 @@ * * Copyright (C) 2005, 2010-2011 Red Hat, Inc. * - * See COPYING.LIB for the License of this software + * 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/>. * * Daniel Veillard <veillard(a)redhat.com> */ diff --git a/src/xen/xs_internal.c b/src/xen/xs_internal.c index 8f52e8f..e56d1a4 100644 --- a/src/xen/xs_internal.c +++ b/src/xen/xs_internal.c @@ -3,7 +3,19 @@ * * Copyright (C) 2006, 2009-2012 Red Hat, Inc. * - * See COPYING.LIB for the License of this software + * 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/>. * * Daniel Veillard <veillard(a)redhat.com> */ diff --git a/src/xen/xs_internal.h b/src/xen/xs_internal.h index 1ada0f3..b9438ea 100644 --- a/src/xen/xs_internal.h +++ b/src/xen/xs_internal.h @@ -3,7 +3,19 @@ * * Copyright (C) 2006, 2010-2012 Red Hat, Inc. * - * See COPYING.LIB for the License of this software + * 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/>. * * Daniel Veillard <veillard(a)redhat.com> */ diff --git a/tests/testutils.c b/tests/testutils.c index 8f2ca51..171321f 100644 --- a/tests/testutils.c +++ b/tests/testutils.c @@ -3,7 +3,19 @@ * * Copyright (C) 2005-2012 Red Hat, Inc. * - * See COPYING.LIB for the License of this software + * 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/>. * * Karel Zak <kzak(a)redhat.com> */ diff --git a/tests/testutils.h b/tests/testutils.h index f8c7567..f372c23 100644 --- a/tests/testutils.h +++ b/tests/testutils.h @@ -3,7 +3,19 @@ * * Copyright (C) 2005, 2008-2012 Red Hat, Inc. * - * See COPYING.LIB for the License of this software + * 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/>. * * Karel Zak <kzak(a)redhat.com> */ diff --git a/tools/virsh-edit.c b/tools/virsh-edit.c index 27140e2..4dea4b8 100644 --- a/tools/virsh-edit.c +++ b/tools/virsh-edit.c @@ -3,7 +3,19 @@ * * Copyright (C) 2012 Red Hat, Inc. * - * See COPYING.LIB for the License of this software. + * 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/>. * * Usage: * Define macros: diff --git a/tools/virsh.c b/tools/virsh.c index 5658796..8de0518 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -3,7 +3,19 @@ * * Copyright (C) 2005, 2007-2012 Red Hat, Inc. * - * See COPYING.LIB for the License of this software + * 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/>. * * Daniel Veillard <veillard(a)redhat.com> * Karel Zak <kzak(a)redhat.com> -- 1.7.7.3

3 2

[libvirt] [PATCH 00/13 v2] Split virsh
by Osier Yang 27 Jul '12

27 Jul '12

There are conflicts after splitting 2/11 and 3/11, so post the whole set again. v1 - v2: * split 2/11, and 3/11 for the patches were too big. However, the new 3/13 is still quite big. I will send it individualy after compression. This splits virsh.c by the command groups, except 'virsh itself' group, each group will have a separate .c, filled with the its commands, a few helpers, and command group definition moved from virsh.c. and virsh.c simply include those new .c files. It still could be optimized, but this set could set up the skelton, and further optimization could be later patches. Osier Yang (13): virsh: Move definition of cmds and cmd groups right at the top of main virsh: Split cmds for domain monitoring from virsh.c virsh: Split cmds of domain group from virsh.c virsh: Split cmds of storage volume group from virsh.c virsh: Split cmds of storage pool group from virsh.c virsh: Split cmds to manage network from virsh.c virsh: Split cmds to manage host interface from virsh.c virsh: Split cmds to manage network filter from virsh.c virsh: Split cmds to manage secret from virsh.c virsh: Split cmds to manage domain snapshot from virsh.c virsh: Split cmds in host group from virsh.c virsh: Split cmds in node device group from virsh.c virsh: Move command group definition into its own file tools/virsh-domain-monitor.c | 1701 ++++ tools/virsh-domain.c | 8139 +++++++++++++++++++ tools/virsh-host.c | 839 ++ tools/virsh-interface.c | 1032 +++ tools/virsh-network.c | 710 ++ tools/virsh-nodedev.c | 402 + tools/virsh-nwfilter.c | 324 + tools/virsh-pool.c | 1442 ++++ tools/virsh-secret.c | 373 + tools/virsh-snapshot.c | 1628 ++++ tools/virsh-volume.c | 1462 ++++ tools/virsh.c |18474 +----------------------------------------- 12 files changed, 18361 insertions(+), 18165 deletions(-) create mode 100644 tools/virsh-domain-monitor.c create mode 100644 tools/virsh-domain.c create mode 100644 tools/virsh-host.c create mode 100644 tools/virsh-interface.c create mode 100644 tools/virsh-network.c create mode 100644 tools/virsh-nodedev.c create mode 100644 tools/virsh-nwfilter.c create mode 100644 tools/virsh-pool.c create mode 100644 tools/virsh-secret.c create mode 100644 tools/virsh-snapshot.c create mode 100644 tools/virsh-volume.c Regards, Osier

5 35

[libvirt] [PATCHv2 0/2] Refactor and fix error resetting on fallback paths in virsh
by Peter Krempa 27 Jul '12

27 Jul '12

This series fixes places where errors were not reset correctly and adds a function for resetting libvirt errors in virsh that simplifies this operation. v2 is a rebase of the previous version as it conflicted with the rewrite of cmdUndefine. Peter Krempa (2): virsh: Refactor error clearing on graceful fallback paths virsh: Fix error resetting on fallback paths tools/virsh-domain-monitor.c | 16 ++++++---------- tools/virsh-domain.c | 36 ++++++++++++------------------------ tools/virsh-network.c | 3 +-- tools/virsh-pool.c | 3 +-- tools/virsh-snapshot.c | 19 +++++++------------ tools/virsh.c | 13 +++++++++++-- 6 files changed, 38 insertions(+), 52 deletions(-) -- 1.7.8.6

2 5

[libvirt] [PATCH] maint: don't permit format strings without %
by Eric Blake 26 Jul '12

26 Jul '12

Any time we have a string with no % passed through gettext, a translator can inject a % to cause a stack overread. When there is nothing to format, it's easier to ask for a string that cannot be used as a formatter, by using a trivial "%s" format instead. In the past, we have used --disable-nls to catch some of the offenders, but that doesn't get run very often, and many more uses have crept in. Syntax check to the rescue! The syntax check can catch uses such as virReportError(code, _("split " "string")); by using a sed script to fold context lines into one pattern space before checking for a string without %. This patch is just mechanical insertion of %s; there are probably several messages touched by this patch where we would be better off giving the user more information than a fixed string. * cfg.mk (sc_prohibit_diagnostic_without_format): New rule. * src/datatypes.c (virUnrefConnect, virGetDomain) (virUnrefDomain, virGetNetwork, virUnrefNetwork, virGetInterface) (virUnrefInterface, virGetStoragePool, virUnrefStoragePool) (virGetStorageVol, virUnrefStorageVol, virGetNodeDevice) (virGetSecret, virUnrefSecret, virGetNWFilter, virUnrefNWFilter) (virGetDomainSnapshot, virUnrefDomainSnapshot): Add %s wrapper. * src/lxc/lxc_driver.c (lxcDomainSetBlkioParameters) (lxcDomainGetBlkioParameters): Likewise. * src/conf/domain_conf.c (virSecurityDeviceLabelDefParseXML) (virDomainDiskDefParseXML, virDomainGraphicsDefParseXML): Likewise. * src/conf/network_conf.c (virNetworkDNSHostsDefParseXML) (virNetworkDefParseXML): Likewise. * src/conf/nwfilter_conf.c (virNWFilterIsValidChainName): Likewise. * src/conf/nwfilter_params.c (virNWFilterVarValueCreateSimple) (virNWFilterVarAccessParse): Likewise. * src/libvirt.c (virDomainSave, virDomainSaveFlags) (virDomainRestore, virDomainRestoreFlags) (virDomainSaveImageGetXMLDesc, virDomainSaveImageDefineXML) (virDomainCoreDump, virDomainGetXMLDesc) (virDomainMigrateVersion1, virDomainMigrateVersion2) (virDomainMigrateVersion3, virDomainMigrate, virDomainMigrate2) (virStreamSendAll, virStreamRecvAll) (virDomainSnapshotGetXMLDesc): Likewise. * src/nwfilter/nwfilter_dhcpsnoop.c (virNWFilterSnoopReqLeaseDel) (virNWFilterDHCPSnoopReq): Likewise. * src/openvz/openvz_driver.c (openvzUpdateDevice): Likewise. * src/openvz/openvz_util.c (openvzKBPerPages): Likewise. * src/qemu/qemu_cgroup.c (qemuSetupCgroup): Likewise. * src/qemu/qemu_command.c (qemuBuildHubDevStr, qemuBuildChrChardevStr) (qemuBuildCommandLine): Likewise. * src/qemu/qemu_driver.c (qemuDomainGetPercpuStats): Likewise. * src/qemu/qemu_hotplug.c (qemuDomainAttachNetDevice): Likewise. * src/rpc/virnetsaslcontext.c (virNetSASLSessionGetIdentity): Likewise. * src/rpc/virnetsocket.c (virNetSocketNewConnectUNIX) (virNetSocketSendFD, virNetSocketRecvFD): Likewise. * src/storage/storage_backend_disk.c (virStorageBackendDiskBuildPool): Likewise. * src/storage/storage_backend_fs.c (virStorageBackendFileSystemProbe) (virStorageBackendFileSystemBuild): Likewise. * src/storage/storage_backend_rbd.c (virStorageBackendRBDOpenRADOSConn): Likewise. * src/storage/storage_driver.c (storageVolumeResize): Likewise. * src/test/test_driver.c (testInterfaceChangeBegin) (testInterfaceChangeCommit, testInterfaceChangeRollback): Likewise. * src/vbox/vbox_tmpl.c (vboxListAllDomains): Likewise. * src/xenxs/xen_sxpr.c (xenFormatSxprDisk, xenFormatSxpr): Likewise. * src/xenxs/xen_xm.c (xenXMConfigGetUUID, xenFormatXMDisk) (xenFormatXM): Likewise. --- danpb asked me on IRC if it was possible to automate the checking for our recent %s additions. Of course, my answer was yes, before I knew it would take me three hours to get here... cfg.mk | 15 ++++++++++++- src/conf/domain_conf.c | 22 +++++++++---------- src/conf/network_conf.c | 8 +++---- src/conf/nwfilter_conf.c | 4 ++-- src/conf/nwfilter_params.c | 8 +++---- src/datatypes.c | 41 +++++++++++++++++++----------------- src/libvirt.c | 34 +++++++++++++++--------------- src/lxc/lxc_driver.c | 6 ++++-- src/nwfilter/nwfilter_dhcpsnoop.c | 5 +++-- src/openvz/openvz_driver.c | 2 +- src/openvz/openvz_util.c | 2 +- src/qemu/qemu_cgroup.c | 4 ++-- src/qemu/qemu_command.c | 8 +++---- src/qemu/qemu_driver.c | 2 +- src/qemu/qemu_hotplug.c | 2 +- src/rpc/virnetsaslcontext.c | 4 ++-- src/rpc/virnetsocket.c | 6 +++--- src/storage/storage_backend_disk.c | 8 +++---- src/storage/storage_backend_fs.c | 8 +++---- src/storage/storage_backend_rbd.c | 8 +++---- src/storage/storage_driver.c | 10 ++++----- src/test/test_driver.c | 6 +++--- src/vbox/vbox_tmpl.c | 2 +- src/xenxs/xen_sxpr.c | 6 +++--- src/xenxs/xen_xm.c | 8 +++---- 25 files changed, 124 insertions(+), 105 deletions(-) diff --git a/cfg.mk b/cfg.mk index d054e5a..085ef34 100644 --- a/cfg.mk +++ b/cfg.mk @@ -547,7 +547,7 @@ msg_gen_function += xenapiSessionErrorHandler # msg_gen_function += vshPrint # msg_gen_function += vshError -func_or := $(shell printf '$(msg_gen_function)'|tr -s '[[:space:]]' '|') +func_or := $(shell echo $(msg_gen_function)|tr -s '[[:space:]]' '|') func_re := ($(func_or)) # Look for diagnostics that aren't marked for translation. @@ -567,6 +567,19 @@ sc_libvirt_unmarked_diagnostics: { echo '$(ME): found unmarked diagnostic(s)' 1>&2; \ exit 1; } || : +# Look for diagnostics that lack a % in the format string, except that we +# allow VIR_ERROR to do this, and ignore functions that take a single +# string rather than a format argument. +sc_prohibit_diagnostic_without_format: + @{ grep -nE '\<$(func_re) *\(.*;$$' $$($(VC_LIST_EXCEPT)); \ + grep -A2 -nE '\<$(func_re) *\(.*,$$' $$($(VC_LIST_EXCEPT)); } \ + | sed -rn -e ':l; /[,"]$$/ {N;b l;}' \ + -e '/xenapiSessionErrorHandler/d' \ + -e '/\<$(func_re) *\([^"]*"([^%"]|"\n[^"]*")*"[,)]/p' \ + | grep -vE '(VIR_ERROR|vah_(error|warning))' && \ + { echo '$(ME): found diagnostic without %' 1>&2; \ + exit 1; } || : + # Like the above, but prohibit a newline at the end of a diagnostic. # This is subject to false positives partly because it naively looks for # `\n"', which may not be the end of the string, and also because it takes diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 1b5dad9..c92c6d4 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -3236,7 +3236,7 @@ virSecurityDeviceLabelDefParseXML(virSecurityDeviceLabelDefPtr *def, (*def)->label = p; if ((*def)->label && (*def)->norelabel) { - virReportError(VIR_ERR_XML_ERROR, + virReportError(VIR_ERR_XML_ERROR, "%s", _("Cannot specify a label if relabelling is turned off")); VIR_FREE((*def)->label); VIR_FREE(*def); @@ -3423,7 +3423,7 @@ virDomainDiskDefParseXML(virCapsPtr caps, } if (!(source = virXMLPropString(cur, "name")) && def->protocol != VIR_DOMAIN_DISK_PROTOCOL_NBD) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("missing name for disk source")); goto error; } @@ -3509,7 +3509,7 @@ virDomainDiskDefParseXML(virCapsPtr caps, } else if (xmlStrEqual(cur->name, BAD_CAST "auth")) { authUsername = virXMLPropString(cur, "username"); if (authUsername == NULL) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("missing username for auth")); goto error; } @@ -3521,7 +3521,7 @@ virDomainDiskDefParseXML(virCapsPtr caps, xmlStrEqual(child->name, BAD_CAST "secret")) { usageType = virXMLPropString(child, "type"); if (usageType == NULL) { - virReportError(VIR_ERR_XML_ERROR, + virReportError(VIR_ERR_XML_ERROR, "%s", _("missing type for secret")); goto error; } @@ -3537,7 +3537,7 @@ virDomainDiskDefParseXML(virCapsPtr caps, authUsage = virXMLPropString(child, "usage"); if (authUUID != NULL && authUsage != NULL) { - virReportError(VIR_ERR_XML_ERROR, + virReportError(VIR_ERR_XML_ERROR, "%s", _("only one of uuid and usage can be specified")); goto error; } @@ -3599,7 +3599,7 @@ virDomainDiskDefParseXML(virCapsPtr caps, def->blkdeviotune.read_bytes_sec) || (def->blkdeviotune.total_bytes_sec && def->blkdeviotune.write_bytes_sec)) { - virReportError(VIR_ERR_XML_ERROR, + virReportError(VIR_ERR_XML_ERROR, "%s", _("total and read/write bytes_sec " "cannot be set at the same time")); goto error; @@ -3609,7 +3609,7 @@ virDomainDiskDefParseXML(virCapsPtr caps, def->blkdeviotune.read_iops_sec) || (def->blkdeviotune.total_iops_sec && def->blkdeviotune.write_iops_sec)) { - virReportError(VIR_ERR_XML_ERROR, + virReportError(VIR_ERR_XML_ERROR, "%s", _("total and read/write iops_sec " "cannot be set at the same time")); goto error; @@ -3825,7 +3825,7 @@ virDomainDiskDefParseXML(virCapsPtr caps, if (ioeventfd) { if (def->bus != VIR_DOMAIN_DISK_BUS_VIRTIO) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("disk ioeventfd mode supported " "only for virtio bus")); goto error; @@ -3843,7 +3843,7 @@ virDomainDiskDefParseXML(virCapsPtr caps, if (event_idx) { if (def->bus != VIR_DOMAIN_DISK_BUS_VIRTIO) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("disk event_idx mode supported " "only for virtio bus")); goto error; @@ -6411,7 +6411,7 @@ virDomainGraphicsDefParseXML(xmlNodePtr node, if ((compressionVal = virDomainGraphicsSpicePlaybackCompressionTypeFromString(compression)) <= 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("unknown spice playback compression")); VIR_FREE(compression); goto error; @@ -6431,7 +6431,7 @@ virDomainGraphicsDefParseXML(xmlNodePtr node, } if ((modeVal = virDomainGraphicsSpiceStreamingModeTypeFromString(mode)) <= 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("unknown spice streaming mode")); VIR_FREE(mode); goto error; diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 41864be..5550c95 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -519,7 +519,7 @@ virNetworkDNSHostsDefParseXML(virNetworkDNSDefPtr def, if (!(ip = virXMLPropString(node, "ip")) || (virSocketAddrParse(&inaddr, ip, AF_UNSPEC) < 0)) { - virReportError(VIR_ERR_XML_DETAIL, + virReportError(VIR_ERR_XML_DETAIL, "%s", _("Missing IP address in DNS host definition")); VIR_FREE(ip); goto error; @@ -1086,7 +1086,7 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt) nForwardPfs = virXPathNodeSet("./pf", ctxt, &forwardPfNodes); if (nForwardIfs < 0 || nForwardPfs < 0) { - virReportError(VIR_ERR_XML_ERROR, + virReportError(VIR_ERR_XML_ERROR, "%s", _("No interface pool or SRIOV physical device given")); goto error; } @@ -1098,7 +1098,7 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt) } if (forwardDev) { - virReportError(VIR_ERR_XML_ERROR, + virReportError(VIR_ERR_XML_ERROR, "%s", _("A forward Dev should not be used when using a SRIOV PF")); goto error; } @@ -1116,7 +1116,7 @@ virNetworkDefParseXML(xmlXPathContextPtr ctxt) forwardDev = NULL; def->nForwardPfs++; } else if (nForwardPfs > 1) { - virReportError(VIR_ERR_XML_ERROR, + virReportError(VIR_ERR_XML_ERROR, "%s", _("Use of more than one physical interface is not allowed")); goto error; } diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index 70fadaa..2b68f41 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -2,7 +2,7 @@ * nwfilter_conf.c: network filter XML processing * (derived from storage_conf.c) * - * Copyright (C) 2006-2011 Red Hat, Inc. + * Copyright (C) 2006-2012 Red Hat, Inc. * Copyright (C) 2006-2008 Daniel P. Berrange * * Copyright (C) 2010-2011 IBM Corporation @@ -2423,7 +2423,7 @@ virNWFilterIsValidChainName(const char *chainname) } if (chainname[strspn(chainname, VALID_CHAINNAME)] != 0) { - virReportError(VIR_ERR_INVALID_ARG, + virReportError(VIR_ERR_INVALID_ARG, "%s", _("Chain name contains invalid characters")); return false; } diff --git a/src/conf/nwfilter_params.c b/src/conf/nwfilter_params.c index d08e860..6481c84 100644 --- a/src/conf/nwfilter_params.c +++ b/src/conf/nwfilter_params.c @@ -113,7 +113,7 @@ virNWFilterVarValueCreateSimple(char *value) virNWFilterVarValuePtr val; if (!isValidVarValue(value)) { - virReportError(VIR_ERR_INVALID_ARG, + virReportError(VIR_ERR_INVALID_ARG, "%s", _("Variable value contains invalid character")); return NULL; } @@ -998,10 +998,10 @@ virNWFilterVarAccessParse(const char *varAccess) } if (parseError) { if (dest->accessType == VIR_NWFILTER_VAR_ACCESS_ELEMENT) - virReportError(VIR_ERR_INVALID_ARG, + virReportError(VIR_ERR_INVALID_ARG, "%s", _("Malformatted array index")); else - virReportError(VIR_ERR_INVALID_ARG, + virReportError(VIR_ERR_INVALID_ARG, "%s", _("Malformatted iterator id")); goto err_exit; } @@ -1026,7 +1026,7 @@ virNWFilterVarAccessParse(const char *varAccess) return dest; } else { - virReportError(VIR_ERR_INVALID_ARG, + virReportError(VIR_ERR_INVALID_ARG, "%s", _("Malformatted variable")); } diff --git a/src/datatypes.c b/src/datatypes.c index d718170..c5c4717 100644 --- a/src/datatypes.c +++ b/src/datatypes.c @@ -1,7 +1,7 @@ /* * datatypes.h: management of structs for public data types * - * Copyright (C) 2006-2011 Red Hat, Inc. + * Copyright (C) 2006-2012 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 @@ -138,7 +138,7 @@ virUnrefConnect(virConnectPtr conn) { int refs; if ((!VIR_IS_CONNECT(conn))) { - virLibConnError(VIR_ERR_INVALID_CONN, _("no connection")); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", _("no connection")); return -1; } virMutexLock(&conn->lock); @@ -173,7 +173,7 @@ virGetDomain(virConnectPtr conn, const char *name, const unsigned char *uuid) { char uuidstr[VIR_UUID_STRING_BUFLEN]; if (!VIR_IS_CONNECT(conn)) { - virLibConnError(VIR_ERR_INVALID_CONN, _("no connection")); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", _("no connection")); return NULL; } virCheckNonNullArgReturn(name, NULL); @@ -264,7 +264,8 @@ virUnrefDomain(virDomainPtr domain) { int refs; if (!VIR_IS_CONNECTED_DOMAIN(domain)) { - virLibConnError(VIR_ERR_INVALID_DOMAIN, _("bad domain or no connection")); + virLibConnError(VIR_ERR_INVALID_DOMAIN, "%s", + _("bad domain or no connection")); return -1; } virMutexLock(&domain->conn->lock); @@ -300,7 +301,7 @@ virGetNetwork(virConnectPtr conn, const char *name, const unsigned char *uuid) { char uuidstr[VIR_UUID_STRING_BUFLEN]; if (!VIR_IS_CONNECT(conn)) { - virLibConnError(VIR_ERR_INVALID_CONN, _("no connection")); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", _("no connection")); return NULL; } virCheckNonNullArgReturn(name, NULL); @@ -389,7 +390,7 @@ virUnrefNetwork(virNetworkPtr network) { int refs; if (!VIR_IS_CONNECTED_NETWORK(network)) { - virLibConnError(VIR_ERR_INVALID_NETWORK, + virLibConnError(VIR_ERR_INVALID_NETWORK, "%s", _("bad network or no connection")); return -1; } @@ -427,7 +428,7 @@ virGetInterface(virConnectPtr conn, const char *name, const char *mac) { virInterfacePtr ret = NULL; if (!VIR_IS_CONNECT(conn)) { - virLibConnError(VIR_ERR_INVALID_CONN, _("no connection")); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", _("no connection")); return NULL; } virCheckNonNullArgReturn(name, NULL); @@ -522,7 +523,7 @@ virUnrefInterface(virInterfacePtr iface) { int refs; if (!VIR_IS_CONNECTED_INTERFACE(iface)) { - virLibConnError(VIR_ERR_INVALID_INTERFACE, + virLibConnError(VIR_ERR_INVALID_INTERFACE, "%s", _("bad interface or no connection")); return -1; } @@ -561,7 +562,7 @@ virGetStoragePool(virConnectPtr conn, const char *name, char uuidstr[VIR_UUID_STRING_BUFLEN]; if (!VIR_IS_CONNECT(conn)) { - virLibConnError(VIR_ERR_INVALID_CONN, _("no connection")); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", _("no connection")); return NULL; } virCheckNonNullArgReturn(name, NULL); @@ -651,7 +652,7 @@ virUnrefStoragePool(virStoragePoolPtr pool) { int refs; if (!VIR_IS_CONNECTED_STORAGE_POOL(pool)) { - virLibConnError(VIR_ERR_INVALID_STORAGE_POOL, + virLibConnError(VIR_ERR_INVALID_STORAGE_POOL, "%s", _("bad storage pool or no connection")); return -1; } @@ -690,7 +691,7 @@ virGetStorageVol(virConnectPtr conn, const char *pool, const char *name, virStorageVolPtr ret = NULL; if (!VIR_IS_CONNECT(conn)) { - virLibConnError(VIR_ERR_INVALID_CONN, _("no connection")); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", _("no connection")); return NULL; } virCheckNonNullArgReturn(name, NULL); @@ -790,7 +791,7 @@ virUnrefStorageVol(virStorageVolPtr vol) { int refs; if (!VIR_IS_CONNECTED_STORAGE_VOL(vol)) { - virLibConnError(VIR_ERR_INVALID_STORAGE_VOL, + virLibConnError(VIR_ERR_INVALID_STORAGE_VOL, "%s", _("bad storage volume or no connection")); return -1; } @@ -827,7 +828,7 @@ virGetNodeDevice(virConnectPtr conn, const char *name) virNodeDevicePtr ret = NULL; if (!VIR_IS_CONNECT(conn)) { - virLibConnError(VIR_ERR_INVALID_CONN, _("no connection")); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", _("no connection")); return NULL; } virCheckNonNullArgReturn(name, NULL); @@ -945,7 +946,7 @@ virGetSecret(virConnectPtr conn, const unsigned char *uuid, char uuidstr[VIR_UUID_STRING_BUFLEN]; if (!VIR_IS_CONNECT(conn)) { - virLibConnError(VIR_ERR_INVALID_CONN, _("no connection")); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", _("no connection")); return NULL; } virCheckNonNullArgReturn(uuid, NULL); @@ -1031,7 +1032,8 @@ virUnrefSecret(virSecretPtr secret) { int refs; if (!VIR_IS_CONNECTED_SECRET(secret)) { - virLibConnError(VIR_ERR_INVALID_SECRET, _("bad secret or no connection")); + virLibConnError(VIR_ERR_INVALID_SECRET, "%s", + _("bad secret or no connection")); return -1; } virMutexLock(&secret->conn->lock); @@ -1126,7 +1128,7 @@ virGetNWFilter(virConnectPtr conn, const char *name, const unsigned char *uuid) char uuidstr[VIR_UUID_STRING_BUFLEN]; if (!VIR_IS_CONNECT(conn)) { - virLibConnError(VIR_ERR_INVALID_CONN, _("no connection")); + virLibConnError(VIR_ERR_INVALID_CONN, "%s", _("no connection")); return NULL; } virCheckNonNullArgReturn(name, NULL); @@ -1218,7 +1220,7 @@ virUnrefNWFilter(virNWFilterPtr nwfilter) int refs; if (!VIR_IS_CONNECTED_NWFILTER(nwfilter)) { - virLibConnError(VIR_ERR_INVALID_NWFILTER, + virLibConnError(VIR_ERR_INVALID_NWFILTER, "%s", _("bad nwfilter or no connection")); return -1; } @@ -1244,7 +1246,7 @@ virGetDomainSnapshot(virDomainPtr domain, const char *name) virDomainSnapshotPtr ret = NULL; if (!VIR_IS_DOMAIN(domain)) { - virLibConnError(VIR_ERR_INVALID_DOMAIN, _("bad domain")); + virLibConnError(VIR_ERR_INVALID_DOMAIN, "%s", _("bad domain")); return NULL; } virCheckNonNullArgReturn(name, NULL); @@ -1307,7 +1309,8 @@ virUnrefDomainSnapshot(virDomainSnapshotPtr snapshot) int refs; if (!VIR_IS_DOMAIN_SNAPSHOT(snapshot)) { - virLibConnError(VIR_ERR_INVALID_DOMAIN_SNAPSHOT, _("not a snapshot")); + virLibConnError(VIR_ERR_INVALID_DOMAIN_SNAPSHOT, "%s", + _("not a snapshot")); return -1; } diff --git a/src/libvirt.c b/src/libvirt.c index 8315b4f..1ed9e32 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -2555,7 +2555,7 @@ virDomainSave(virDomainPtr domain, const char *to) /* We must absolutize the file path as the save is done out of process */ if (virFileAbsPath(to, &absolute_to) < 0) { - virLibConnError(VIR_ERR_INTERNAL_ERROR, + virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s", _("could not build absolute output file path")); goto error; } @@ -2650,7 +2650,7 @@ virDomainSaveFlags(virDomainPtr domain, const char *to, /* We must absolutize the file path as the save is done out of process */ if (virFileAbsPath(to, &absolute_to) < 0) { - virLibConnError(VIR_ERR_INTERNAL_ERROR, + virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s", _("could not build absolute output file path")); goto error; } @@ -2706,7 +2706,7 @@ virDomainRestore(virConnectPtr conn, const char *from) /* We must absolutize the file path as the restore is done out of process */ if (virFileAbsPath(from, &absolute_from) < 0) { - virLibConnError(VIR_ERR_INTERNAL_ERROR, + virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s", _("could not build absolute input file path")); goto error; } @@ -2788,7 +2788,7 @@ virDomainRestoreFlags(virConnectPtr conn, const char *from, const char *dxml, /* We must absolutize the file path as the restore is done out of process */ if (virFileAbsPath(from, &absolute_from) < 0) { - virLibConnError(VIR_ERR_INTERNAL_ERROR, + virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s", _("could not build absolute input file path")); goto error; } @@ -2845,7 +2845,7 @@ virDomainSaveImageGetXMLDesc(virConnectPtr conn, const char *file, virCheckNonNullArgGoto(file, error); if ((conn->flags & VIR_CONNECT_RO) && (flags & VIR_DOMAIN_XML_SECURE)) { - virLibConnError(VIR_ERR_OPERATION_DENIED, + virLibConnError(VIR_ERR_OPERATION_DENIED, "%s", _("virDomainSaveImageGetXMLDesc with secure flag")); goto error; } @@ -2856,7 +2856,7 @@ virDomainSaveImageGetXMLDesc(virConnectPtr conn, const char *file, /* We must absolutize the file path as the read is done out of process */ if (virFileAbsPath(file, &absolute_file) < 0) { - virLibConnError(VIR_ERR_INTERNAL_ERROR, + virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s", _("could not build absolute input file path")); goto error; } @@ -2937,7 +2937,7 @@ virDomainSaveImageDefineXML(virConnectPtr conn, const char *file, /* We must absolutize the file path as the read is done out of process */ if (virFileAbsPath(file, &absolute_file) < 0) { - virLibConnError(VIR_ERR_INTERNAL_ERROR, + virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s", _("could not build absolute input file path")); goto error; } @@ -3029,7 +3029,7 @@ virDomainCoreDump(virDomainPtr domain, const char *to, unsigned int flags) /* We must absolutize the file path as the save is done out of process */ if (virFileAbsPath(to, &absolute_to) < 0) { - virLibConnError(VIR_ERR_INTERNAL_ERROR, + virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s", _("could not build absolute core file path")); goto error; } @@ -4341,7 +4341,7 @@ virDomainGetXMLDesc(virDomainPtr domain, unsigned int flags) conn = domain->conn; if ((conn->flags & VIR_CONNECT_RO) && (flags & VIR_DOMAIN_XML_SECURE)) { - virLibConnError(VIR_ERR_OPERATION_DENIED, + virLibConnError(VIR_ERR_OPERATION_DENIED, "%s", _("virDomainGetXMLDesc with secure flag")); goto error; } @@ -4523,7 +4523,7 @@ virDomainMigrateVersion1 (virDomainPtr domain, goto done; if (uri == NULL && uri_out == NULL) { - virLibConnError(VIR_ERR_INTERNAL_ERROR, + virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s", _("domainMigratePrepare did not set uri")); goto done; } @@ -4635,7 +4635,7 @@ virDomainMigrateVersion2 (virDomainPtr domain, goto done; if (uri == NULL && uri_out == NULL) { - virLibConnError(VIR_ERR_INTERNAL_ERROR, + virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s", _("domainMigratePrepare2 did not set uri")); virDispatchError(domain->conn); cancelled = 1; @@ -4781,7 +4781,7 @@ virDomainMigrateVersion3(virDomainPtr domain, } if (uri == NULL && uri_out == NULL) { - virLibConnError(VIR_ERR_INTERNAL_ERROR, + virLibConnError(VIR_ERR_INTERNAL_ERROR, "%s", _("domainMigratePrepare3 did not set uri")); virDispatchError(domain->conn); goto finish; @@ -5198,7 +5198,7 @@ virDomainMigrate (virDomainPtr domain, } flags &= ~VIR_MIGRATE_CHANGE_PROTECTION; if (flags & VIR_MIGRATE_TUNNELLED) { - virLibConnError(VIR_ERR_OPERATION_INVALID, + virLibConnError(VIR_ERR_OPERATION_INVALID, "%s", _("cannot perform tunnelled migration without using peer2peer flag")); goto error; } @@ -5400,7 +5400,7 @@ virDomainMigrate2(virDomainPtr domain, } flags &= ~VIR_MIGRATE_CHANGE_PROTECTION; if (flags & VIR_MIGRATE_TUNNELLED) { - virLibConnError(VIR_ERR_OPERATION_INVALID, + virLibConnError(VIR_ERR_OPERATION_INVALID, "%s", _("cannot perform tunnelled migration without using peer2peer flag")); goto error; } @@ -14951,7 +14951,7 @@ int virStreamSendAll(virStreamPtr stream, virCheckNonNullArgGoto(handler, cleanup); if (stream->flags & VIR_STREAM_NONBLOCK) { - virLibConnError(VIR_ERR_OPERATION_INVALID, + virLibConnError(VIR_ERR_OPERATION_INVALID, "%s", _("data sources cannot be used for non-blocking streams")); goto cleanup; } @@ -15050,7 +15050,7 @@ int virStreamRecvAll(virStreamPtr stream, virCheckNonNullArgGoto(handler, cleanup); if (stream->flags & VIR_STREAM_NONBLOCK) { - virLibConnError(VIR_ERR_OPERATION_INVALID, + virLibConnError(VIR_ERR_OPERATION_INVALID, "%s", _("data sinks cannot be used for non-blocking streams")); goto cleanup; } @@ -17040,7 +17040,7 @@ virDomainSnapshotGetXMLDesc(virDomainSnapshotPtr snapshot, conn = snapshot->domain->conn; if ((conn->flags & VIR_CONNECT_RO) && (flags & VIR_DOMAIN_XML_SECURE)) { - virLibConnError(VIR_ERR_OPERATION_DENIED, + virLibConnError(VIR_ERR_OPERATION_DENIED, "%s", _("virDomainSnapshotGetXMLDesc with secure flag")); goto error; } diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 09c64b2..a057bdd 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -2023,7 +2023,8 @@ lxcDomainSetBlkioParameters(virDomainPtr dom, if (flags & VIR_DOMAIN_AFFECT_LIVE) { if (!lxcCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_BLKIO)) { - lxcError(VIR_ERR_OPERATION_INVALID, _("blkio cgroup isn't mounted")); + lxcError(VIR_ERR_OPERATION_INVALID, "%s", + _("blkio cgroup isn't mounted")); goto cleanup; } @@ -2127,7 +2128,8 @@ lxcDomainGetBlkioParameters(virDomainPtr dom, if (flags & VIR_DOMAIN_AFFECT_LIVE) { if (!lxcCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_BLKIO)) { - lxcError(VIR_ERR_OPERATION_INVALID, _("blkio cgroup isn't mounted")); + lxcError(VIR_ERR_OPERATION_INVALID, "%s", + _("blkio cgroup isn't mounted")); goto cleanup; } diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c index 0a12be5..1971e1a 100644 --- a/src/nwfilter/nwfilter_dhcpsnoop.c +++ b/src/nwfilter/nwfilter_dhcpsnoop.c @@ -2,6 +2,7 @@ * nwfilter_dhcpsnoop.c: support for DHCP snooping used by a VM * on an interface * + * Copyright (C) 2012 Red Hat, Inc. * Copyright (C) 2011,2012 IBM Corp. * * Authors: @@ -886,7 +887,7 @@ virNWFilterSnoopReqLeaseDel(virNWFilterSnoopReqPtr req, if (req->techdriver && req->techdriver->applyDHCPOnlyRules(req->ifname, &req->macaddr, dhcpsrvrs, false) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("virNWFilterSnoopListDel failed")); ret = -1; } @@ -1633,7 +1634,7 @@ virNWFilterDHCPSnoopReq(virNWFilterTechDriverPtr techdriver, if (techdriver->applyDHCPOnlyRules(req->ifname, &req->macaddr, dhcpsrvrs, false) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("applyDHCPOnlyRules " "failed - spoofing not protected!")); goto exit_snoopreqput; diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index a144408..43819a4 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -2017,7 +2017,7 @@ openvzUpdateDevice(virDomainDefPtr vmdef, || cur->accessmode != fs->accessmode || cur->wrpolicy != fs->wrpolicy || cur->readonly != fs->readonly) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Can only modify disk quota")); return -1; } diff --git a/src/openvz/openvz_util.c b/src/openvz/openvz_util.c index a878dd6..17528a0 100644 --- a/src/openvz/openvz_util.c +++ b/src/openvz/openvz_util.c @@ -45,7 +45,7 @@ openvzKBPerPages(void) if (kb_per_pages > 0) { kb_per_pages /= 1024; } else { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Can't determine page size")); kb_per_pages = 0; return -1; diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index b93887c..9b59738 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -333,7 +333,7 @@ int qemuSetupCgroup(struct qemud_driver *driver, } } } else { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Block I/O tuning is not available on this host")); goto cleanup; } @@ -372,7 +372,7 @@ int qemuSetupCgroup(struct qemud_driver *driver, } } } else { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Memory cgroup is not available on this host")); } } diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index d6df4ee..1641929 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -3424,7 +3424,7 @@ qemuBuildHubDevStr(virDomainHubDefPtr dev, } if (!qemuCapsGet(qemuCaps, QEMU_CAPS_USB_HUB)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("usb-hub not supported by QEMU binary")); goto error; } @@ -3553,7 +3553,7 @@ qemuBuildChrChardevStr(virDomainChrSourceDefPtr dev, const char *alias, case VIR_DOMAIN_CHR_TYPE_SPICEVMC: if (!qemuCapsGet(qemuCaps, QEMU_CAPS_CHARDEV_SPICEVMC)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("spicevmc not supported in this QEMU binary")); goto error; } @@ -4806,7 +4806,7 @@ qemuBuildCommandLine(virConnectPtr conn, def->controllers[i]->model == -1 && !qemuCapsGet(qemuCaps, QEMU_CAPS_PIIX3_USB_UHCI)) { if (usblegacy) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("Multiple legacy USB controller not supported")); goto error; } @@ -5813,7 +5813,7 @@ qemuBuildCommandLine(virConnectPtr conn, switch (mode) { case VIR_DOMAIN_GRAPHICS_SPICE_CHANNEL_MODE_SECURE: if (!driver->spiceTLS) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("spice secure channels set in XML configuration, but TLS is disabled in qemu.conf")); goto error; } diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index ecd2ec1..79ca208 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -12886,7 +12886,7 @@ qemuDomainGetPercpuStats(virDomainPtr domain, if (!map[i]) { cpu_time = 0; } else if (virStrToLong_ull(pos, &pos, 10, &cpu_time) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("cpuacct parse error")); goto cleanup; } else { diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index d7e2a73..66ac683 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -832,7 +832,7 @@ int qemuDomainAttachNetDevice(virConnectPtr conn, goto try_remove; } } else { - virReportError(VIR_ERR_OPERATION_FAILED, + virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("setting of link state not supported: Link is up")); } diff --git a/src/rpc/virnetsaslcontext.c b/src/rpc/virnetsaslcontext.c index 9943057..d35d016 100644 --- a/src/rpc/virnetsaslcontext.c +++ b/src/rpc/virnetsaslcontext.c @@ -1,7 +1,7 @@ /* * virnetsaslcontext.c: SASL encryption/auth handling * - * Copyright (C) 2010-2011 Red Hat, Inc. + * Copyright (C) 2010-2012 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 @@ -313,7 +313,7 @@ const char *virNetSASLSessionGetIdentity(virNetSASLSessionPtr sasl) goto cleanup; } if (val == NULL) { - virReportError(VIR_ERR_AUTH_FAILED, + virReportError(VIR_ERR_AUTH_FAILED, "%s", _("no client username was found")); goto cleanup; } diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index aee3c19..87afa2c 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -482,7 +482,7 @@ int virNetSocketNewConnectUNIX(const char *path, remoteAddr.len = sizeof(remoteAddr.data.un); if (spawnDaemon && !binary) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Auto-spawn of daemon requested, but no binary specified")); return -1; } @@ -1178,7 +1178,7 @@ int virNetSocketSendFD(virNetSocketPtr sock, int fd) { int ret = -1; if (!virNetSocketHasPassFD(sock)) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Sending file descriptors is not supported on this socket")); return -1; } @@ -1212,7 +1212,7 @@ int virNetSocketRecvFD(virNetSocketPtr sock, int *fd) *fd = -1; if (!virNetSocketHasPassFD(sock)) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("Receiving file descriptors is not supported on this socket")); return -1; } diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backend_disk.c index 75d2927..fc3a9d2 100644 --- a/src/storage/storage_backend_disk.c +++ b/src/storage/storage_backend_disk.c @@ -1,7 +1,7 @@ /* * storage_backend_disk.c: storage backend for disk handling * - * Copyright (C) 2007-2008, 2010-2011 Red Hat, Inc. + * Copyright (C) 2007-2008, 2010-2012 Red Hat, Inc. * Copyright (C) 2007-2008 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -399,7 +399,7 @@ virStorageBackendDiskBuildPool(virConnectPtr conn ATTRIBUTE_UNUSED, if (flags == (VIR_STORAGE_POOL_BUILD_OVERWRITE | VIR_STORAGE_POOL_BUILD_NO_OVERWRITE)) { - virReportError(VIR_ERR_OPERATION_INVALID, + virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("Overwrite and no overwrite flags" " are mutually exclusive")); goto error; @@ -415,10 +415,10 @@ virStorageBackendDiskBuildPool(virConnectPtr conn ATTRIBUTE_UNUSED, if (check > 0) { ok_to_mklabel = true; } else if (check < 0) { - virReportError(VIR_ERR_OPERATION_FAILED, + virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("Error checking for disk label")); } else { - virReportError(VIR_ERR_OPERATION_INVALID, + virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("Disk label already present")); } } diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index 8da985e..cb5e3f3 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -1,7 +1,7 @@ /* * storage_backend_fs.c: storage backend for FS and directory handling * - * Copyright (C) 2007-2011 Red Hat, Inc. + * Copyright (C) 2007-2012 Red Hat, Inc. * Copyright (C) 2007-2008 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -598,7 +598,7 @@ virStorageBackendFileSystemProbe(const char *device, } if (blkid_do_probe(probe) != 1) { - virReportError(VIR_ERR_STORAGE_PROBE_FAILED, + virReportError(VIR_ERR_STORAGE_PROBE_FAILED, "%s", _("Found additional probes to run, " "filesystem probing may be incorrect")); ret = FILESYSTEM_PROBE_ERROR; @@ -620,7 +620,7 @@ static virStoragePoolProbeResult virStorageBackendFileSystemProbe(const char *device ATTRIBUTE_UNUSED, const char *format ATTRIBUTE_UNUSED) { - virReportError(VIR_ERR_OPERATION_INVALID, + virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("probing for filesystems is unsupported " "by this build")); @@ -743,7 +743,7 @@ virStorageBackendFileSystemBuild(virConnectPtr conn ATTRIBUTE_UNUSED, if (flags == (VIR_STORAGE_POOL_BUILD_OVERWRITE | VIR_STORAGE_POOL_BUILD_NO_OVERWRITE)) { - virReportError(VIR_ERR_OPERATION_INVALID, + virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("Overwrite and no overwrite flags" " are mutually exclusive")); goto error; diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index 4df0b54..185ad0e 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -65,7 +65,7 @@ static int virStorageBackendRBDOpenRADOSConn(virStorageBackendRBDStatePtr *ptr, VIR_DEBUG("Using cephx authorization"); if (rados_create(&ptr->cluster, pool->def->source.auth.cephx.username) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("failed to initialize RADOS")); goto cleanup; } @@ -84,7 +84,7 @@ static int virStorageBackendRBDOpenRADOSConn(virStorageBackendRBDStatePtr *ptr, } if (secret == NULL) { - virReportError(VIR_ERR_NO_SECRET, + virReportError(VIR_ERR_NO_SECRET, "%s", _("failed to find the secret")); goto cleanup; } @@ -95,7 +95,7 @@ static int virStorageBackendRBDOpenRADOSConn(virStorageBackendRBDStatePtr *ptr, memset(secret_value, 0, secret_value_size); if (rados_key == NULL) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("failed to decode the RADOS key")); goto cleanup; } @@ -119,7 +119,7 @@ static int virStorageBackendRBDOpenRADOSConn(virStorageBackendRBDStatePtr *ptr, } else { VIR_DEBUG("Not using cephx authorization"); if (rados_create(&ptr->cluster, NULL) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("failed to create the RADOS cluster")); goto cleanup; } diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index c9b8021..e83b1e5 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -1715,13 +1715,13 @@ storageVolumeResize(virStorageVolPtr obj, storageDriverUnlock(driver); if (!pool) { - virReportError(VIR_ERR_NO_STORAGE_POOL, + virReportError(VIR_ERR_NO_STORAGE_POOL, "%s", _("no storage pool with matching uuid")); goto out; } if (!virStoragePoolObjIsActive(pool)) { - virReportError(VIR_ERR_OPERATION_INVALID, + virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("storage pool is not active")); goto out; } @@ -1753,20 +1753,20 @@ storageVolumeResize(virStorageVolPtr obj, } if (abs_capacity < vol->allocation) { - virReportError(VIR_ERR_INVALID_ARG, + virReportError(VIR_ERR_INVALID_ARG, "%s", _("can't shrink capacity below " "existing allocation")); goto out; } if (abs_capacity > vol->capacity + pool->def->available) { - virReportError(VIR_ERR_OPERATION_FAILED, + virReportError(VIR_ERR_OPERATION_FAILED, "%s", _("Not enough space left on storage pool")); goto out; } if (!backend->resizeVol) { - virReportError(VIR_ERR_NO_SUPPORT, + virReportError(VIR_ERR_NO_SUPPORT, "%s", _("storage pool does not support changing of " "volume capacity")); goto out; diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 990b20d..a36af7e 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -3534,7 +3534,7 @@ static int testInterfaceChangeBegin(virConnectPtr conn, testDriverLock(privconn); if (privconn->transaction_running) { - virReportError(VIR_ERR_OPERATION_INVALID, + virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("there is another transaction running.")); goto cleanup; } @@ -3562,7 +3562,7 @@ static int testInterfaceChangeCommit(virConnectPtr conn, testDriverLock(privconn); if (!privconn->transaction_running) { - virReportError(VIR_ERR_OPERATION_INVALID, + virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("no transaction running, " "nothing to be committed.")); goto cleanup; @@ -3590,7 +3590,7 @@ static int testInterfaceChangeRollback(virConnectPtr conn, testDriverLock(privconn); if (!privconn->transaction_running) { - virReportError(VIR_ERR_OPERATION_INVALID, + virReportError(VIR_ERR_OPERATION_INVALID, "%s", _("no transaction running, " "nothing to rollback.")); goto cleanup; diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index 17e7e9a..b672b24 100644 --- a/src/vbox/vbox_tmpl.c +++ b/src/vbox/vbox_tmpl.c @@ -9311,7 +9311,7 @@ vboxListAllDomains(virConnectPtr conn, if (MATCH(VIR_CONNECT_LIST_FILTERS_SNAPSHOT)) { rc = machine->vtbl->GetSnapshotCount(machine, &snapshotCount); if (NS_FAILED(rc)) { - virReportError(VIR_ERR_INTERNAL_ERROR, + virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("could not get snapshot count for listed domains")); goto cleanup; } diff --git a/src/xenxs/xen_sxpr.c b/src/xenxs/xen_sxpr.c index 42533ce..4e005f4 100644 --- a/src/xenxs/xen_sxpr.c +++ b/src/xenxs/xen_sxpr.c @@ -1870,7 +1870,7 @@ xenFormatSxprDisk(virDomainDiskDefPtr def, else virBufferAddLit(buf, "(mode 'w')"); if (def->transient) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("transient disks not supported yet")); return -1; } @@ -2515,7 +2515,7 @@ xenFormatSxpr(virConnectPtr conn, break; case VIR_DOMAIN_CLOCK_OFFSET_UTC: if (def->clock.data.utc_reset) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("unsupported clock adjustment='reset'")); goto error; } @@ -2524,7 +2524,7 @@ xenFormatSxpr(virConnectPtr conn, break; case VIR_DOMAIN_CLOCK_OFFSET_LOCALTIME: if (def->clock.data.utc_reset) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("unsupported clock adjustment='reset'")); goto error; } diff --git a/src/xenxs/xen_xm.c b/src/xenxs/xen_xm.c index 99e736e..76c1faa 100644 --- a/src/xenxs/xen_xm.c +++ b/src/xenxs/xen_xm.c @@ -208,7 +208,7 @@ static int xenXMConfigGetUUID(virConfPtr conf, const char *name, unsigned char * virConfValuePtr val; if (!uuid || !name || !conf) { - virReportError(VIR_ERR_INVALID_ARG, + virReportError(VIR_ERR_INVALID_ARG, "%s", _("Arguments must be non null")); return -1; } @@ -1242,7 +1242,7 @@ static int xenFormatXMDisk(virConfValuePtr list, else virBufferAddLit(&buf, ",w"); if (disk->transient) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("transient disks not supported yet")); return -1; } @@ -1686,7 +1686,7 @@ virConfPtr xenFormatXM(virConnectPtr conn, break; case VIR_DOMAIN_CLOCK_OFFSET_UTC: if (def->clock.data.utc_reset) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("unsupported clock adjustment='reset'")); goto cleanup; } @@ -1695,7 +1695,7 @@ virConfPtr xenFormatXM(virConnectPtr conn, break; case VIR_DOMAIN_CLOCK_OFFSET_LOCALTIME: if (def->clock.data.utc_reset) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", _("unsupported clock adjustment='reset'")); goto cleanup; } -- 1.7.10.4

3 5

[libvirt] [PATCH v8 0/8] Add basic driver for Parallels Virtuozzo Server
by Dmitry Guryanov 26 Jul '12

26 Jul '12

Parallels Cloud Server is a virtualization solution that allows users to simultaneously run multiple virtual machines and containers on the same physical server. More information can be found here: http://www.parallels.com/products/pcs/ Also beta version of Parallels Cloud Server can be downloaded there. Dmitry Guryanov (8): parallels: add driver skeleton parallels: add functions to list domains and get info parallels: implement functions for domain life cycle management parallels: get info about serial ports parallels: add support of VNC remote display parallels: implement virDomainDefineXML operation for existing domains parallels: add storage driver parallels: implement VM creation cfg.mk | 1 + configure.ac | 23 + docs/drvparallels.html.in | 28 + include/libvirt/virterror.h | 2 +- libvirt.spec.in | 9 +- po/POTFILES.in | 4 + src/Makefile.am | 15 + src/conf/domain_conf.c | 3 +- src/conf/domain_conf.h | 1 + src/driver.h | 1 + src/libvirt.c | 9 + src/parallels/parallels_driver.c | 1309 +++++++++++++++++++++++++++++++++ src/parallels/parallels_driver.h | 75 ++ src/parallels/parallels_storage.c | 1456 +++++++++++++++++++++++++++++++++++++ src/parallels/parallels_utils.c | 131 ++++ src/util/virterror.c | 3 +- 16 files changed, 3066 insertions(+), 4 deletions(-) create mode 100644 docs/drvparallels.html.in create mode 100644 src/parallels/parallels_driver.c create mode 100644 src/parallels/parallels_driver.h create mode 100644 src/parallels/parallels_storage.c create mode 100644 src/parallels/parallels_utils.c

3 28

[libvirt] [PATCH 0/6 v3] Support forward mode='hostdev' and interface pools
by Shradha Shah 26 Jul '12

26 Jul '12

This patch series supports the forward mode='hostdev'. The functionality of this mode is the same as interface type='hostdev' but with the added benefit of using interface pools. The patch series also contains a patch to support use of interface names and PCI device addresses interchangeably in a network xml, and return the appropriate one in actualDevice when networkAllocateActualDevice is called. At the top level managed attribute can be specified with identical results as when it's specified for a hostdev. Currently forward mode='hostdev' does not support USB devices. Shradha Shah (6): Prerequisite Patch. virDomainDevicePCIAddress and respective functions moved to a new file called conf/device_conf.ch Moved the code to create implicit interface pool from PF to a new function RNG updates, new xml parser/formatter code to support forward mode=hostdev Code to return interface name or pci_addr of the VF in actualDevice Forward Mode Hostdev network driver Implementation Forward Mode 'Hostdev' qemu driver implementation docs/formatnetwork.html.in | 62 ++++++ docs/schemas/network.rng | 82 ++++++++- include/libvirt/virterror.h | 1 + src/Makefile.am | 7 +- src/conf/device_conf.c | 135 +++++++++++++ src/conf/device_conf.h | 65 +++++++ src/conf/domain_conf.c | 114 ++---------- src/conf/domain_conf.h | 25 +--- src/conf/network_conf.c | 126 +++++++++++-- src/conf/network_conf.h | 29 +++- src/libvirt_private.syms | 10 +- src/network/bridge_driver.c | 322 +++++++++++++++++++++++++------- src/qemu/qemu_command.c | 27 ++- src/qemu/qemu_hotplug.c | 7 +- src/qemu/qemu_monitor.c | 14 +- src/qemu/qemu_monitor.h | 17 +- src/qemu/qemu_monitor_json.c | 14 +- src/qemu/qemu_monitor_json.h | 14 +- src/qemu/qemu_monitor_text.c | 16 +- src/qemu/qemu_monitor_text.h | 14 +- src/util/virnetdev.c | 29 ++-- src/util/virnetdev.h | 4 +- src/xen/xend_internal.c | 3 +- tests/networkxml2xmlin/hostdev-pf.xml | 11 + tests/networkxml2xmlin/hostdev.xml | 10 + tests/networkxml2xmlout/hostdev-pf.xml | 7 + tests/networkxml2xmlout/hostdev.xml | 10 + tests/networkxml2xmltest.c | 2 + 28 files changed, 890 insertions(+), 287 deletions(-) create mode 100644 src/conf/device_conf.c create mode 100644 src/conf/device_conf.h create mode 100644 tests/networkxml2xmlin/hostdev-pf.xml create mode 100644 tests/networkxml2xmlin/hostdev.xml create mode 100644 tests/networkxml2xmlout/hostdev-pf.xml create mode 100644 tests/networkxml2xmlout/hostdev.xml -- 1.7.4.4

2 9

[libvirt] [PATCH] virsh: check if specified debug level is in range
by Ján Tomko 26 Jul '12

26 Jul '12

--- tools/virsh.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 5658796..34ae171 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -3097,6 +3097,10 @@ vshParseArgv(vshControl *ctl, int argc, char **argv) vshError(ctl, "%s", _("option -d takes a numeric argument")); exit(EXIT_FAILURE); } + if (ctl->debug < VSH_ERR_DEBUG || ctl->debug > VSH_ERR_ERROR) { + vshError(ctl, _("ignoring debug level %d out of range [0-4]"), + ctl->debug); + } break; case 'h': vshUsage(); -- 1.7.8.6

2 3

[libvirt] No /dev/tty device within LXC guest?
by Yufang Zhang 26 Jul '12

26 Jul '12

Hi all, When I create a LXC guest(RHEL5.4) via libvirt, the guest could boot successfully. I could ping to guest, but can not ssh into the it. The secure log in the guest shows that this is due to lack of '/dev/tty' device: # tail /path/to/rootfs/of/container/var/log/secure Jul 27 04:25:25 xen2143v sshd[671]: Accepted password for zhangyufang from 10.0.0.1 port 34102 ssh2 Jul 27 04:25:25 xen2143v sshd[671]: pam_unix(sshd:session): session opened for user zhangyufang by (uid=0) Jul 27 04:25:25 xen2143v sshd[671]: pam_loginuid(sshd:session): set_loginuid failed *Jul 27 04:25:25 xen2143v sshd[671]: error: PAM: pam_open_session(): Cannot make/remove an entry for the specified session* *Jul 27 04:25:25 xen2143v sshd[674]: error: open /dev/tty failed - could not set controlling tty: No such file or directory* *Jul 27 04:25:25 xen2143v sshd[673]: Received disconnect from 10.0.0.1: 11: disconnected by user* The xml of the guest: # virsh --connect lxc:/// dumpxml instance-00000034 <domain type='lxc' id='30090'> <name>instance-00000034</name> <uuid>8387e0f1-6df3-41c8-82ba-cde7d2b60844</uuid> <memory>524288</memory> <currentMemory>524288</currentMemory> <vcpu>1</vcpu> <os> <type arch='x86_64'>exe</type> <init>/sbin/init</init> </os> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> <emulator>/usr/libexec/libvirt_lxc</emulator> <filesystem type='mount' accessmode='passthrough'> <source dir='/var/lib/nova/instances/instance-00000034/rootfs'/> <target dir='/'/> </filesystem> <interface type='bridge'> <mac address='fa:16:3e:3c:1d:95'/> <source bridge='demonetbr0'/> <target dev='veth0'/> <filterref filter='nova-instance-instance-00000034-fa163e3c1d95'> <parameter name='DHCPSERVER' value='10.0.0.1'/> <parameter name='IP' value='10.0.0.3'/> </filterref> </interface> <console type='pty' tty='/dev/pts/0'> <source path='/dev/pts/0'/> <target type='serial' port='0'/> </console> </devices> </domain> Could anyone point me to where the problem is? Thanks. Best Regards. Yufang

1 0

[libvirt] [PATCH 0/2] Refactor and fix error resetting on fallback paths in virsh
by Peter Krempa 26 Jul '12

26 Jul '12

This series fixes places where errors were not reset correctly and adds a function for resetting libvirt errors in virsh. Peter Krempa (2): virsh: Refactor error clearing on graceful fallback paths virsh: Fix error resetting on fallback paths tools/virsh-domain-monitor.c | 16 ++++++---------- tools/virsh-domain.c | 35 ++++++++++++----------------------- tools/virsh-network.c | 3 +-- tools/virsh-pool.c | 3 +-- tools/virsh-snapshot.c | 19 +++++++------------ tools/virsh.c | 13 +++++++++++-- 6 files changed, 38 insertions(+), 51 deletions(-) -- 1.7.8.6

1 3

[libvirt] [PATCH v3][PATCH] add test case for block job lifecycle testing
by Kyla Zhang 26 Jul '12

26 Jul '12

v3: Add skip for block_pull not implemented v2: Add skip block for qemu only and 120s timeout for test v1: Add tests for block job lifecyle and the test flow is as follows: create 50M qed img with qed backing img-> block pull->abort block job->resume block pull->set block job speed-> wait to finish --- scripts/qemu/300-blockjob-lifecycle.t | 146 +++++++++++++++++++++++++++++++++ 1 files changed, 146 insertions(+), 0 deletions(-) create mode 100644 scripts/qemu/300-blockjob-lifecycle.t diff --git a/scripts/qemu/300-blockjob-lifecycle.t b/scripts/qemu/300-blockjob-lifecycle.t new file mode 100644 index 0000000..e43dfe2 --- /dev/null +++ b/scripts/qemu/300-blockjob-lifecycle.t @@ -0,0 +1,146 @@ +# -*- perl -*- +# +# Copyright (C) 2011-2012 Red Hat, Inc. +# Copyright (C) 2011 Xiaoqiang Hu <xhu 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 + +qemu/300-blockjob-lifecycle.t - verify the lifecycle of block job: +block pull, set block job speed, get block job info and abort block job + +=head1 DESCRIPTION + +The test case validates that it is possible to block pull, set block job +speed, get block job info and abort block job for domain using qed img +with qed backing img + +=cut + +use strict; +use warnings; + +use Test::More tests => 16; + +use Sys::Virt::TCK; +use Test::Exception; +use File::Spec::Functions qw(catfile); +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; +} + +SKIP:{ + skip "Only relevant to QEMU driver", 16 unless $conn->get_type() eq "QEMU"; + my $xml = $tck->generic_pool("dir") + ->mode("0755")->as_xml; + + diag "Defining transient storage pool $xml"; + 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 $volbackxml = $tck->generic_volume("tck-back", "qed", 1024*1024*50)->allocation(0)->as_xml; + + my ($volback, $pathback); + diag "back $volbackxml"; + ok_volume(sub { $volback = $pool->create_volume($volbackxml) }, "create qed backing file volume"); + + my $st; + $pathback = xpath($volback, "string(/volume/target/path)"); + $st = stat($pathback); + + ok($st, "path $pathback exists"); + + ok($st->size < 1024*1024, "size is < 1M"); + + my $volmainxml = $tck->generic_volume("tck-main", "qed", 1024*1024*50) + ->backing_file($pathback) + ->backing_format("qed") + ->allocation(0)->as_xml; + + my ($volmain, $pathmain); + diag "main $volmainxml"; + ok_volume(sub { $volmain = $pool->create_volume($volmainxml) }, "create qed backing file volume"); + + $pathmain = xpath($volmain, "string(/volume/target/path)"); + $st = stat($pathmain); + + ok($st, "path $pathmain exists"); + + ok($st->size < 1024*1024, "size is < 1M"); + + # define the guest at a qed image + # and the backing store in this qed image. + $xml = $tck->generic_domain("tck") + ->disk(format => { name => "qemu", type => "qed" }, + type => "file", + src => $pathmain, + dst => "vdb") + ->as_xml; + + diag "Defining an inactive domain config $xml"; + my $dom; + ok_domain(sub { $dom = $conn->define_domain($xml) }, "defined persistent domain config"); + + diag "Starting inactive domain config"; + $dom->create; + ok($dom->get_id() > 0, "running domain has an ID > 0"); + + # start to block pull and bandwidth is 1MB/S + my ($bandwidth, $flags, $jobinfo, $timeout); + # 1MB/S + $bandwidth = 1; + $flags=0; + eval { $dom->block_pull($pathmain, $bandwidth, $flags); }; + SKIP: { + skip "block_pull not implemented", 5 if $@ && $@->code() == 55; + + # $jobinfo is a hash reference summarising the execution state of the block job + # and it has four keys:cur, end, bandwidth, type + $jobinfo = $dom->get_block_job_info($pathmain, $flags); + ok($jobinfo->{bandwidth} == $bandwidth, "start to block pull and block job bandwidth is $bandwidth"."MB/S"); + + $dom->abort_block_job($pathmain, $flags); + $jobinfo = $dom->get_block_job_info($pathmain, $flags); + ok($jobinfo->{type} == 0, "abort block job"); + + $dom->block_pull($pathmain, $bandwidth, $flags); + $jobinfo = $dom->get_block_job_info($pathmain, $flags); + ok($jobinfo->{bandwidth} == $bandwidth, "continue to block pull and block job bandwidth is $bandwidth"."MB/S"); + + # set block job bandwidth to 2MB/S + $bandwidth = 2; + $dom->set_block_job_speed($pathmain, $bandwidth, $flags); + $jobinfo = $dom->get_block_job_info($pathmain, $flags); + ok($jobinfo->{bandwidth} == $bandwidth, "block job bandwidth is set to $bandwidth"."MB/S"); + + # wait for the end of block pull and timeout is 120s + $timeout = 120; + while($jobinfo->{cur} < $jobinfo->{end} && $jobinfo->{type} == 1 && $timeout > 0) { + sleep(1); + $jobinfo = $dom->get_block_job_info($pathmain, $flags); + $timeout--; + } + + diag "block pull is not finished in 120S" if $jobinfo->{type} == 1 && $timeout == 0; + ok($jobinfo->{type} == 0, "block pull is finished"); + } +} +# end -- 1.7.1

1 0

[libvirt] [PATCH] virsh: Check for existence of storage before undefining the domain
by Peter Krempa 26 Jul '12

26 Jul '12

When undefining a domain and removing associated storage using "virsh undefine --storage" the domain was at first undefined and after that the storage removal proces was started. If the user specified an invalid disk to remove, the error could not be corrected. This patch moves enumeration and filtering of volumes that should be removed before the domain is undefined, but the removal process is still kept after the domain has been undefined. --- tools/virsh.c | 280 +++++++++++++++++++++++++++++---------------------------- 1 files changed, 144 insertions(+), 136 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 0354822..e6b8e5f 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -3007,6 +3007,12 @@ static const vshCmdOptDef opts_undefine[] = { {NULL, 0, 0, NULL} }; +typedef struct { + virStorageVolPtr vol; + char *source; + char *target; +} vshUndefineVolume; + static bool cmdUndefine(vshControl *ctl, const vshCmd *cmd) { @@ -3019,7 +3025,6 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd) bool managed_save = vshCommandOptBool(cmd, "managed-save"); bool snapshots_metadata = vshCommandOptBool(cmd, "snapshots-metadata"); bool wipe_storage = vshCommandOptBool(cmd, "wipe-storage"); - bool remove_storage = false; bool remove_all_storage = vshCommandOptBool(cmd, "remove-all-storage"); /* Positive if these items exist. */ int has_managed_save = 0; @@ -3031,6 +3036,8 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd) int rc = -1; int running; /* list of volumes to remove along with this domain */ + vshUndefineVolume *vlist = NULL; + int nvols = 0; const char *volumes_arg = NULL; char *volumes = NULL; char **volume_tokens = NULL; @@ -3045,8 +3052,10 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd) xmlXPathContextPtr ctxt = NULL; xmlNodePtr *vol_nodes = NULL; int nvolumes = 0; - virStorageVolPtr vol = NULL; - bool vol_del_failed = false; + bool vol_not_found = false; + + ignore_value(vshCommandOptString(cmd, "storage", &volumes_arg)); + volumes = vshStrdup(ctl, volumes_arg); if (managed_save) { flags |= VIR_DOMAIN_UNDEFINE_MANAGED_SAVE; @@ -3063,36 +3072,21 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd) if (!(dom = vshCommandOptDomain(ctl, cmd, &name))) return false; - /* check if a string that should contain list of volumes to remove is present */ - if (vshCommandOptString(cmd, "storage", &volumes_arg) > 0) { - volumes = vshStrdup(ctl, volumes_arg); - - if (remove_all_storage) { - vshError(ctl, _("Specified both --storage and --remove-all-storage")); - goto cleanup; - } - remove_storage = true; - } - /* Do some flag manipulation. The goal here is to disable bits * from flags to reduce the likelihood of a server rejecting * unknown flag bits, as well as to track conditions which are * safe by default for the given hypervisor and server version. */ - running = virDomainIsActive(dom); - if (running < 0) { - virshReportError(ctl); - goto cleanup; - } + if ((running = virDomainIsActive(dom)) < 0) + goto error; + if (!running) { /* Undefine with snapshots only fails for inactive domains, * and managed save only exists on inactive domains; if * running, then we don't want to remove anything. */ has_managed_save = virDomainHasManagedSaveImage(dom, 0); if (has_managed_save < 0) { - if (last_error->code != VIR_ERR_NO_SUPPORT) { - virshReportError(ctl); - goto cleanup; - } + if (last_error->code != VIR_ERR_NO_SUPPORT) + goto error; virFreeError(last_error); last_error = NULL; has_managed_save = 0; @@ -3100,10 +3094,8 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd) has_snapshots = virDomainSnapshotNum(dom, 0); if (has_snapshots < 0) { - if (last_error->code != VIR_ERR_NO_SUPPORT) { - virshReportError(ctl); - goto cleanup; - } + if (last_error->code != VIR_ERR_NO_SUPPORT) + goto error; virFreeError(last_error); last_error = NULL; has_snapshots = 0; @@ -3137,16 +3129,116 @@ cmdUndefine(vshControl *ctl, const vshCmd *cmd) } /* Stash domain description for later use */ - if (remove_storage || remove_all_storage) { + if (volumes || remove_all_storage) { if (running) { vshError(ctl, _("Storage volume deletion is supported only on stopped domains")); goto cleanup; } + if (volumes && remove_all_storage) { + vshError(ctl, _("Specified both --storage and --remove-all-storage")); + goto cleanup; + } + if (!(def = virDomainGetXMLDesc(dom, 0))) { vshError(ctl, _("Could not retrieve domain XML description")); goto cleanup; } + + if (!(doc = virXMLParseStringCtxt(def, _("(domain_definition)"), + &ctxt))) + goto error; + + /* tokenize the string from user and save it's parts into an array */ + if (volumes) { + /* count the delimiters */ + volume_tok = volumes; + nvolume_tokens = 1; /* we need at least one member */ + while (*volume_tok) { + if (*(volume_tok++) == ',') + nvolume_tokens++; + } + + volume_tokens = vshCalloc(ctl, nvolume_tokens, sizeof(char *)); + + /* tokenize the input string */ + nvolume_tokens = 0; + volume_tok = volumes; + do { + volume_tokens[nvolume_tokens] = strsep(&volume_tok, ","); + nvolume_tokens++; + } while (volume_tok); + } + + if ((nvolumes = virXPathNodeSet("./devices/disk", ctxt, + &vol_nodes)) < 0) + goto error; + + if (nvolumes > 0) + vlist = vshCalloc(ctl, nvolumes, sizeof(*vlist)); + + for (vol_i = 0; vol_i < nvolumes; vol_i++) { + ctxt->node = vol_nodes[vol_i]; + + /* get volume source and target paths */ + if (!(target = virXPathString("string(./target/@dev)", ctxt))) + goto error; + + if (!(source = virXPathString("string(" + "./source/@file|" + "./source/@dir|" + "./source/@name|" + "./source/@dev)", ctxt))) { + if (last_error && last_error->code != VIR_ERR_OK) + goto error; + else + continue; + } + + /* lookup if volume was selected by user */ + if (volumes) { + volume_tok = NULL; + for (tok_i = 0; tok_i < nvolume_tokens; tok_i++) { + if (volume_tokens[tok_i] && + (STREQ(volume_tokens[tok_i], target) || + STREQ(volume_tokens[tok_i], source))) { + volume_tok = volume_tokens[tok_i]; + volume_tokens[tok_i] = NULL; + break; + } + } + if (!volume_tok) + continue; + } + + if (!(vlist[nvols].vol = virStorageVolLookupByPath(ctl->conn, + source))) { + vshPrint(ctl, + _("Storage volume '%s'(%s) is not managed by libvirt. " + "Remove it manually.\n"), target, source); + virFreeError(last_error); + last_error = NULL; + continue; + } + vlist[nvols].source = source; + vlist[nvols].target = target; + nvols++; + } + + /* print volumes specified by user that were not found in domain definition */ + if (volumes) { + for (tok_i = 0; tok_i < nvolume_tokens; tok_i++) { + if (volume_tokens[tok_i]) { + vshError(ctl, _("Volume '%s' was not found in domain's " + "definition.\n"), + volume_tokens[tok_i]); + vol_not_found = true; + } + } + + if (vol_not_found) + goto cleanup; + } } /* Generally we want to try the new API first. However, while @@ -3202,96 +3294,15 @@ out: } /* try to undefine storage volumes associated with this domain, if it's requested */ - if (remove_storage || remove_all_storage) { - ret = false; - - /* tokenize the string from user and save it's parts into an array */ - if (volumes) { - /* count the delimiters */ - volume_tok = volumes; - nvolume_tokens = 1; /* we need at least one member */ - while (*volume_tok) { - if (*volume_tok == ',') - nvolume_tokens++; - volume_tok++; - } - - volume_tokens = vshCalloc(ctl, nvolume_tokens, sizeof(char *)); - - /* tokenize the input string */ - nvolume_tokens = 0; - volume_tok = volumes; - do { - volume_tokens[nvolume_tokens] = strsep(&volume_tok, ","); - nvolume_tokens++; - } while (volume_tok); - } - - doc = virXMLParseStringCtxt(def, _("(domain_definition)"), &ctxt); - if (!doc) - goto cleanup; - - nvolumes = virXPathNodeSet("./devices/disk", ctxt, &vol_nodes); - - if (nvolumes < 0) - goto cleanup; - - for (vol_i = 0; vol_i < nvolumes; vol_i++) { - ctxt->node = vol_nodes[vol_i]; - VIR_FREE(target); - VIR_FREE(source); - if (vol) { - virStorageVolFree(vol); - vol = NULL; - } - - /* get volume source and target paths */ - if (!(target = virXPathString("string(./target/@dev)", ctxt))) { - vshError(ctl, _("Failed to enumerate devices")); - goto cleanup; - } - - if (!(source = virXPathString("string(" - "./source/@file|" - "./source/@dir|" - "./source/@name|" - "./source/@dev)", ctxt)) && - virGetLastError()) - goto cleanup; - - /* lookup if volume was selected by user */ - if (volumes) { - volume_tok = NULL; - for (tok_i = 0; tok_i < nvolume_tokens; tok_i++) { - if (volume_tokens[tok_i] && - (STREQ_NULLABLE(volume_tokens[tok_i], target) || - STREQ_NULLABLE(volume_tokens[tok_i], source))) { - volume_tok = volume_tokens[tok_i]; - volume_tokens[tok_i] = NULL; - break; - } - } - if (!volume_tok) - continue; - } - - if (!source) - continue; - - if (!(vol = virStorageVolLookupByPath(ctl->conn, source))) { - vshPrint(ctl, - _("Storage volume '%s'(%s) is not managed by libvirt. " - "Remove it manually.\n"), target, source); - virResetLastError(); - continue; - } - + if (nvols) { + for (vol_i = 0; vol_i < nvols; vol_i++) { if (wipe_storage) { - vshPrint(ctl, _("Wiping volume '%s'(%s) ... "), target, source); + vshPrint(ctl, _("Wiping volume '%s'(%s) ... "), + vlist[vol_i].target, vlist[vol_i].source); fflush(stdout); - if (virStorageVolWipe(vol, 0) < 0) { + if (virStorageVolWipe(vlist[vol_i].vol, 0) < 0) { vshError(ctl, _("Failed! Volume not removed.")); - vol_del_failed = true; + ret = false; continue; } else { vshPrint(ctl, _("Done.\n")); @@ -3299,41 +3310,38 @@ out: } /* delete the volume */ - if (virStorageVolDelete(vol, 0) < 0) { + if (virStorageVolDelete(vlist[vol_i].vol, 0) < 0) { vshError(ctl, _("Failed to remove storage volume '%s'(%s)"), - target, source); - vol_del_failed = true; - } - vshPrint(ctl, _("Volume '%s' removed.\n"), volume_tok?volume_tok:source); - } - - /* print volumes specified by user that were not found in domain definition */ - if (volumes) { - for (tok_i = 0; tok_i < nvolume_tokens; tok_i++) { - if (volume_tokens[tok_i]) - vshPrint(ctl, _("Volume '%s' was not found in domain's " - "definition.\n"), - volume_tokens[tok_i]); + vlist[vol_i].target, vlist[vol_i].source); + ret = false; + } else { + vshPrint(ctl, _("Volume '%s'(%s) removed.\n"), + vlist[vol_i].target, vlist[vol_i].source); } } - - if (!vol_del_failed) - ret = true; } cleanup: - VIR_FREE(source); - VIR_FREE(target); + for (vol_i = 0; vol_i < nvols; vol_i++) { + VIR_FREE(vlist[vol_i].source); + VIR_FREE(vlist[vol_i].target); + if (vlist[vol_i].vol) + virStorageVolFree(vlist[vol_i].vol); + } + VIR_FREE(vlist); + VIR_FREE(volumes); VIR_FREE(volume_tokens); VIR_FREE(def); VIR_FREE(vol_nodes); - if (vol) - virStorageVolFree(vol); xmlFreeDoc(doc); xmlXPathFreeContext(ctxt); virDomainFree(dom); return ret; + +error: + virshReportError(ctl); + goto cleanup; } -- 1.7.8.6

2 4

[libvirt] [PATCH v3] util: set minimum value of nodesuspend duration to 60 seconds
by Guannan Ren 26 Jul '12

26 Jul '12

Change the permissible minimum value of nodesuspend duration time to 60 seconds. If option is less than the value, reports error. Update virsh help and manpage the infomation. --- src/util/virnodesuspend.c | 2 +- tools/virsh.c | 2 +- tools/virsh.pod | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/util/virnodesuspend.c b/src/util/virnodesuspend.c index 71beb3d..91dfdf6 100644 --- a/src/util/virnodesuspend.c +++ b/src/util/virnodesuspend.c @@ -90,7 +90,7 @@ static int virNodeSuspendSetNodeWakeup(unsigned long long alarmTime) virCommandPtr setAlarmCmd; int ret = -1; - if (alarmTime <= MIN_TIME_REQ_FOR_SUSPEND) { + if (alarmTime < MIN_TIME_REQ_FOR_SUSPEND) { virReportError(VIR_ERR_INVALID_ARG, "%s", _("Suspend duration is too short")); return -1; } diff --git a/tools/virsh.c b/tools/virsh.c index 6d65036..d236950 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -6986,7 +6986,7 @@ static const vshCmdInfo info_nodesuspend[] = { static const vshCmdOptDef opts_node_suspend[] = { {"target", VSH_OT_DATA, VSH_OFLAG_REQ, N_("mem(Suspend-to-RAM), " "disk(Suspend-to-Disk), hybrid(Hybrid-Suspend)")}, - {"duration", VSH_OT_INT, VSH_OFLAG_REQ, N_("Suspend duration in seconds")}, + {"duration", VSH_OT_INT, VSH_OFLAG_REQ, N_("Suspend duration in seconds, at least 60")}, {"flags", VSH_OT_INT, VSH_OFLAG_NONE, N_("Suspend flags, 0 for default")}, {NULL, 0, 0, NULL} }; diff --git a/tools/virsh.pod b/tools/virsh.pod index 6ecf6ce..dffd588 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -290,7 +290,8 @@ If I<cell> is specified, this will prints specified cell statistics only. Puts the node (host machine) into a system-wide sleep state such as Suspend-to-RAM, Suspend-to-Disk or Hybrid-Suspend and sets up a Real-Time-Clock interrupt to fire (to wake up the node) after a time delay -specified by the 'duration' parameter. +specified by the 'duration' parameter. The duration time should be +at least 60 seconds. =item B<capabilities> -- 1.7.7.5

2 2

[libvirt] [PATCH] doc: add more description on libvirtd option timeout
by Guannan Ren 26 Jul '12

26 Jul '12

Only when there is no running guest, virtual network, etc on each registered drivers and no client connections, the timeout take effect. --- daemon/libvirtd.pod.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daemon/libvirtd.pod.in b/daemon/libvirtd.pod.in index ea6c37d..75c9040 100644 --- a/daemon/libvirtd.pod.in +++ b/daemon/libvirtd.pod.in @@ -54,7 +54,7 @@ Use this name for the PID file, overriding the default value. =item B<-t, --timeout> I<SECONDS> -Exit after timeout period (in seconds) expires. +When there is no any active resources on each registered driver and client connections, exit after timeout period (in seconds) expires. =item B<-v, --verbose> -- 1.7.10.4

2 5

[libvirt] [PATCH 0/4] Improve netlink to support all protocols.
by tangchen 26 Jul '12

26 Jul '12

Now, netlink in libvirt only suport NETLINK_ROUTE protocol. But we need other netlinks, especially to support cpu and memory hotplug. These patches did the following things: 1) Change global variable "server" to an array to store all the netlink sockets, and modified all the API prototypes. 2) Introduce a new API virNetlinkEventServiceStopAll() to stop all netlink servers. 3) Modify all the function calls. Tang Chen (4): Improve netlink to support all protocol. Introduce virNetlinkEventServiceStopAll() to stop all netlink services in libvirt. Modify all the function calls for API in virnetlink.c DEBUG: print out netlink message. daemon/libvirtd.c | 12 +- src/libvirt_private.syms | 1 + src/util/virnetdev.c | 6 +- src/util/virnetdevmacvlan.c | 12 +- src/util/virnetdevvportprofile.c | 7 +- src/util/virnetlink.c | 235 +++++++++++++++++++++++++++++++------- src/util/virnetlink.h | 22 ++-- 7 files changed, 232 insertions(+), 63 deletions(-) -- 1.7.10.2 -- Best Regards, Tang chen

1 5

Re: [libvirt] [PATCH] vl: add -libvirt-caps option for libvirt to stop parsing help output
by Eric Blake 26 Jul '12

26 Jul '12

[adding libvirt] On 07/25/2012 01:47 PM, Anthony Liguori wrote: > The help output is going to change dramatically for 0.13. We've spent too long 0.13? How long have you been sitting on this commit? :) > waiting for a perfect solution to capabilities handling and the end loser is > the direct consumer of QEMU because the help output is awful. > > I will not apply any patches that change help output until 0.13 development > opens up. This should give libvirt adequate time to implement support for > dealing with this new option. > > This capabilities set comes directly from libvirt's source code so it's entirely > adequate for libvirt's purposes. We can still explore more sophisticated > approaches that are more general purpose but the help output will be changing. We've gone a long way with things like newer libvirt requiring QMP, and being able to use query-commands and even 'qemu -device ?' to figure out which devices are present, which is already more reliable than parsing -help output. There may still be a few things to fix (for example, I already pointed out that libvirt 0.9.13 is bogus for refusing to even attempt 'qemu -device,?' unless it guesses from '-help' output that it will work; it would be better to just attempt it in the first place and deal with the fallout), but it should be easy to fix in time for libvirt 0.10.0, and certainly coordinate things so that new enough libvirt comes out close to the time of qemu 1.2. > +++ b/libvirt-caps.c > @@ -0,0 +1,166 @@ > +/* > + * Libvirt capabilities > + * > + * Copyright IBM, Corp. 2012 > + * > + * Authors: > + * Anthony Liguori <aliguori(a)us.ibm.com> > + * > + * This work is licensed under the terms of the GNU GPL, version 2 or later. > + * See the COPYING file in the top-level directory. > + * > + */ > + > +#include "libvirt-caps.h" > +#include "qemu-common.h" > + > +/* Make sure this stays in sync with libvirt/src/qemu/qemu_capabilities.c */ This is the part I'm most worried about - it says that any time libvirt decides to flag a new capability that it cares about within qemu, then both libvirt and qemu have to be upgraded in lockstep to coordinate the use of that capability. The problem is that sometimes libvirt doesn't care about a capability until after qemu has already been released (for example, we didn't realize the power of fd: migration until several releases after qemu had first implemented it, at which point when we added the capability bit, we were able to retroactively detect it for several qemu versions by parsing -help). > + > +static const char *supported_caps[] = { > +// "kqemu", > + "vnc-colon", > + "no-reboot", > + "drive", > + "drive-boot", > + ... > + "drive-iotune", > + "system_wakeup", > + "scsi-disk.channel", > + "scsi-block", > + "transaction", > + > + NULL Already incomplete. For example, libvirt has recently added block-job-sync, block-job-async, scsi-cd, and several others. Thankfully, these days most of the new feature bits being added in libvirt's qemu_capabilities.h are related to things that were probed from 'qemu -device ?' or from QMP 'query-commands', and not from something additionally scraped from '-help' for the first time. I had to go back to libvirt commit 63b4243 (May 15) to find a capability that libvirt learned by scraping -help output (namely, support for -no-user-config). But yet this is one of the important config bits that libvirt really needs to know, and not one that can easily be learned from machine-parseable '-device ?' I'm worried that an interface like this will let libvirt know about the existing features that libvirt is trying to use, but will hurt the ability of adding new feature detection in to libvirt (basically, a newer libvirt wouldn't be able to retroactively take advantage of an older feature already present in older qemu without parsing some back-channel, at which point what good was having this libvirt-specific channel?). There's also another problem if we decide to keep this file synced across projects: > +++ b/libvirt-caps.h > @@ -0,0 +1,19 @@ > +/* > + * Libvirt capabilities > + * > + * Copyright IBM, Corp. 2012 > + * > + * Authors: > + * Anthony Liguori <aliguori(a)us.ibm.com> > + * > + * This work is licensed under the terms of the GNU GPL, version 2 or later. > + * See the COPYING file in the top-level directory. Libvirt is LGPLv2+. You can obviously upgrade to GPLv2+ as part of importing the code from libvirt to qemu; but if you decide that a new feature is worth adding a bit to this file, then libvirt can't do the reverse sync unless you relax the license of this file. -- Eric Blake eblake(a)redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org

1 0

[libvirt] Changing qemu's -help output
by Luiz Capitulino 25 Jul '12

25 Jul '12

On Wed, 25 Jul 2012 20:02:53 +0100 Peter Maydell <peter.maydell(a)linaro.org> wrote: > On 25 July 2012 20:02, Luiz Capitulino <lcapitulino(a)redhat.com> wrote: > > On Wed, 25 Jul 2012 19:58:02 +0100 > > Peter Maydell <peter.maydell(a)linaro.org> wrote: > >> I think we should simply say "no, parsing -help is broken and wrong and it > >> was obviously broken and wrong and we are in fact going to change the > >> help output for QEMU 1.2, and you will need a new libvirt that can > >> cope with that". We can't be held hostage forever to really bad decisions > >> like that. > > > > We have to provide an alternative before doing that. > > Try whatever it is you wanted to try, see if it barfs. Or don't use it. Libvirt folks can answer if this is feasible (CC'ing them), I'd guess it's not.

2 1

[libvirt] [PATCH v2] virsh man page - domain-id consistency
by Jan Tomko 25 Jul '12

25 Jul '12

Using 'domain' to represent domain name, domain id or uuid all over the man page, to be consistent with virsh help. --- diff to v1: I used domain-id instead of domain, per Eric's review comments. tools/virsh.pod | 145 +++++++++++++++++++++++++++---------------------------- 1 files changed, 72 insertions(+), 73 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index 4bddf15..a5a2297 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -24,15 +24,14 @@ KVM, LXC, OpenVZ, VirtualBox and VMware ESX. The basic structure of most virsh usage is: - virsh [OPTION]... <command> <domain-id> [ARG]... + virsh [OPTION]... <command> <domain> [ARG]... -Where I<command> is one of the commands listed below, I<domain-id> -is the numeric domain id, or the domain name (which will be internally -translated to domain id), and I<ARGS> are command specific -options. There are a few exceptions to this rule in the cases where -the command in question acts on all domains, the entire machine, -or directly on the xen hypervisor. Those exceptions will be clear for -each of those commands. +Where I<command> is one of the commands listed below, I<domain> is the numeric +domain id, or the domain name, or the domain UUID and I<ARGS> are command +specific options. There are a few exceptions to this rule in the cases where +the command in question acts on all domains, the entire machine, or directly +on the xen hypervisor. Those exceptions will be clear for each of those +commands. The B<virsh> program can be used either to run one I<COMMAND> by giving the command and its arguments on the shell command line, or a I<COMMAND_STRING> @@ -302,7 +301,7 @@ description see: L<http://libvirt.org/formatcaps.html> The XML also show the NUMA topology information if available. -=item B<inject-nmi> I<domain-id> +=item B<inject-nmi> I<domain> Inject NMI to the guest. @@ -492,18 +491,18 @@ specified, then the output will be escaped for use in XML. =head1 DOMAIN COMMANDS The following commands manipulate domains directly, as stated -previously most commands take domain-id as the first parameter. The -I<domain-id> can be specified as a short integer, a name or a full UUID. +previously most commands take domain as the first parameter. The +I<domain> can be specified as a short integer, a name or a full UUID. =over 4 -=item B<autostart> [I<--disable>] I<domain-id> +=item B<autostart> [I<--disable>] I<domain> Configure a domain to be automatically started at boot. The option I<--disable> disables autostarting. -=item B<console> I<domain-id> [I<devname>] [I<--safe>] [I<--force>] +=item B<console> I<domain> [I<devname>] [I<--safe>] [I<--force>] Connect the virtual serial console for the guest. The optional I<devname> parameter refers to the device alias of an alternate @@ -529,7 +528,7 @@ exits. B<Example> - virsh dumpxml <domain-id> > domain.xml + virsh dumpxml <domain> > domain.xml vi domain.xml (or make changes with your other text editor) virsh create < domain.xml @@ -539,7 +538,7 @@ Define a domain from an XML <file>. The domain definition is registered but not started. If domain is already running, the changes will take effect on the next boot. -=item B<desc> I<domain-id> [[I<--live>] [I<--config>] | +=item B<desc> I<domain> [[I<--live>] [I<--config>] | [I<--current>]] [I<--title>] [I<--edit>] [I<--new-desc> New description or title message] @@ -562,16 +561,16 @@ Flag I<--title> selects operation on the title field instead of description. If neither of I<--edit> and I<--new-desc> are specified the note or description is displayed instead of being modified. -=item B<destroy> I<domain-id> [I<--graceful>] +=item B<destroy> I<domain> [I<--graceful>] -Immediately terminate the domain domain-id. This doesn't give the domain +Immediately terminate the domain I<domain>. This doesn't give the domain OS any chance to react, and it's the equivalent of ripping the power cord out on a physical machine. In most cases you will want to use the B<shutdown> command instead. However, this does not delete any storage volumes used by the guest, and if the domain is persistent, it can be restarted later. -If I<domain-id> is transient, then the metadata of any snapshots will +If I<domain> is transient, then the metadata of any snapshots will be lost once the guest stops running, but the snapshot contents still exist, and a new domain with the same name and UUID can restore the snapshot metadata with B<snapshot-create>. @@ -650,7 +649,7 @@ on hypervisor. Get memory stats for a running domain. -=item B<domblkerror> I<domain-id> +=item B<domblkerror> I<domain> Show errors on block devices. This command usually comes handy when B<domstate> command says that a domain was paused due to I/O error. @@ -820,13 +819,13 @@ I<size> is a scaled integer (see B<NOTES> above) which defaults to KiB "B" to get bytes (note that for historical reasons, this differs from B<vol-resize> which defaults to bytes without a suffix). -=item B<domdisplay> I<domain-id> [I<--include-password>] +=item B<domdisplay> I<domain> [I<--include-password>] Output a URI which can be used to connect to the graphical display of the domain via VNC, SPICE or RDP. If I<--include-password> is specified, the SPICE channel password will be included in the URI. -=item B<dominfo> I<domain-id> +=item B<dominfo> I<domain> Returns basic information about the domain. @@ -838,11 +837,11 @@ Convert a domain name or id to domain UUID Convert a domain name (or UUID) to a domain id -=item B<domjobabort> I<domain-id-or-uuid> +=item B<domjobabort> I<domain> Abort the currently running domain job. -=item B<domjobinfo> I<domain-id-or-uuid> +=item B<domjobinfo> I<domain> Returns information about jobs running on a domain. @@ -850,12 +849,12 @@ Returns information about jobs running on a domain. Convert a domain Id (or UUID) to domain name -=item B<domstate> I<domain-id> [I<--reason>] +=item B<domstate> I<domain> [I<--reason>] Returns state about a domain. I<--reason> tells virsh to also print reason for the state. -=item B<domcontrol> I<domain-id> +=item B<domcontrol> I<domain> Returns state of an interface to VMM used to control a domain. For states other than "ok" or "error" the command also prints number of @@ -875,7 +874,7 @@ configuration format named by I<format>. For QEMU/KVM hypervisor, the I<format> argument must be B<qemu-argv>. For Xen hypervisor, the I<format> argument may be B<xen-xm> or B<xen-sxpr>. -=item B<dump> I<domain-id> I<corefilepath> [I<--bypass-cache>] +=item B<dump> I<domain> I<corefilepath> [I<--bypass-cache>] { [I<--live>] | [I<--crash>] | [I<--reset>] } [I<--verbose>] [I<--memory-only>] Dumps the core of a domain to a file for analysis. @@ -899,7 +898,7 @@ B<dump> command. I<--verbose> displays the progress of dump. NOTE: Some hypervisors may require the user to manually ensure proper permissions on file and path specified by argument I<corefilepath>. -=item B<dumpxml> I<domain-id> [I<--inactive>] [I<--security-info>] +=item B<dumpxml> I<domain> [I<--inactive>] [I<--security-info>] [I<--update-cpu>] Output the domain information as an XML dump to stdout, this format can be used @@ -910,7 +909,7 @@ Using I<--security-info> will also include security sensitive information in the XML dump. I<--update-cpu> updates domain CPU requirements according to host CPU. -=item B<edit> I<domain-id> +=item B<edit> I<domain> Edit the XML configuration file for a domain, which will affect the next boot of the guest. @@ -926,7 +925,7 @@ except that it does some error checking. The editor used can be supplied by the C<$VISUAL> or C<$EDITOR> environment variables, and defaults to C<vi>. -=item B<managedsave> I<domain-id> [I<--bypass-cache>] +=item B<managedsave> I<domain> [I<--bypass-cache>] [{I<--running> | I<--paused>}] [I<--verbose>] Save and destroy (stop) a running domain, so it can be restarted from the same @@ -948,7 +947,7 @@ state the B<start> should use. The B<dominfo> command can be used to query whether a domain currently has any managed save image. -=item B<managedsave-remove> I<domain-id> +=item B<managedsave-remove> I<domain> Remove the B<managedsave> state file for a domain, if it exists. This ensures the domain will do a full boot the next time it is started. @@ -970,7 +969,7 @@ stats. =item B<migrate> [I<--live>] [I<--direct>] [I<--p2p> [I<--tunnelled>]] [I<--persistent>] [I<--undefinesource>] [I<--suspend>] [I<--copy-storage-all>] [I<--copy-storage-inc>] [I<--change-protection>] [I<--unsafe>] [I<--verbose>] -I<domain-id> I<desturi> [I<migrateuri>] [I<dname>] +I<domain> I<desturi> [I<migrateuri>] [I<dname>] [I<--timeout> B<seconds>] [I<--xml> B<file>] Migrate domain to another host. Add I<--live> for live migration; I<--p2p> @@ -1030,18 +1029,18 @@ seen from the source machine. =back -=item B<migrate-setmaxdowntime> I<domain-id> I<downtime> +=item B<migrate-setmaxdowntime> I<domain> I<downtime> Set maximum tolerable downtime for a domain which is being live-migrated to another host. The I<downtime> is a number of milliseconds the guest is allowed to be down at the end of live migration. -=item B<migrate-setspeed> I<domain-id> I<bandwidth> +=item B<migrate-setspeed> I<domain> I<bandwidth> Set the maximum migration bandwidth (in Mbps) for a domain which is being migrated to another host. -=item B<migrate-getspeed> I<domain-id> +=item B<migrate-getspeed> I<domain> Get the maximum migration bandwidth (in Mbps) for a domain. @@ -1064,7 +1063,7 @@ If I<--live> is specified, set scheduler information of a running guest. If I<--config> is specified, affect the next boot of a persistent guest. If I<--current> is specified, affect the current guest state. -=item B<reboot> I<domain-id> [I<--mode acpi|agent>] +=item B<reboot> I<domain> [I<--mode acpi|agent>] Reboot a domain. This acts just as if the domain had the B<reboot> command run from the console. The command returns as soon as it has @@ -1078,7 +1077,7 @@ By default the hypervisor will try to pick a suitable shutdown method. To specify an alternative method, the I<--mode> parameter can specify C<acpi> or C<agent>. -=item B<reset> I<domain-id> +=item B<reset> I<domain> Reset a domain immediately without any guest shutdown. B<reset> emulates the power reset button on a machine, where all guest @@ -1110,7 +1109,7 @@ should not reuse the saved state file for a second B<restore> unless you have also reverted all storage volumes back to the same contents as when the state file was created. -=item B<save> I<domain-id> I<state-file> [I<--bypass-cache>] [I<--xml> B<file>] +=item B<save> I<domain> I<state-file> [I<--bypass-cache>] [I<--xml> B<file>] [{I<--running> | I<--paused>}] [I<--verbose>] Saves a running domain (RAM, but not disk state) to a state file so that @@ -1187,11 +1186,11 @@ except that it does some error checking. The editor used can be supplied by the C<$VISUAL> or C<$EDITOR> environment variables, and defaults to C<vi>. -=item B<schedinfo> [I<--set> B<parameter=value>] I<domain-id> [[I<--config>] +=item B<schedinfo> [I<--set> B<parameter=value>] I<domain> [[I<--config>] [I<--live>] | [I<--current>]] =item B<schedinfo> [I<--weight> B<number>] [I<--cap> B<number>] -I<domain-id> +I<domain> Allows you to show (and set) the domain scheduler parameters. The parameters available for each hypervisor are: @@ -1221,7 +1220,7 @@ B<Note>: The vcpu_period parameter has a valid value range of 1000-1000000 or 1000-18446744073709551 or less than 0. The value 0 for either parameter is the same as not specifying that parameter. -=item B<screenshot> I<domain-id> [I<imagefilepath>] [I<--screen> B<screenID>] +=item B<screenshot> I<domain> [I<imagefilepath>] [I<--screen> B<screenID>] Takes a screenshot of a current domain console and stores it into a file. Optionally, if hypervisor supports more displays for a domain, I<screenID> @@ -1230,10 +1229,10 @@ of screen. In case of multiple graphics cards, heads are enumerated before devices, e.g. having two graphics cards, both with four heads, screen ID 5 addresses the second head on the second card. -=item B<send-key> I<domain-id> [I<--codeset> B<codeset>] +=item B<send-key> I<domain> [I<--codeset> B<codeset>] [I<--holdtime> B<holdtime>] I<keycode>... -Parse the I<keycode> sequence as keystrokes to send to I<domain-id>. +Parse the I<keycode> sequence as keystrokes to send to I<domain>. Each I<keycode> can either be a numeric value or a symbolic name from the corresponding codeset. If I<--holdtime> is given, each keystroke will be held for that many milliseconds. The default codeset is @@ -1311,7 +1310,7 @@ B<Examples> # send a tab, held for 1 second virsh send-key --holdtime 1000 0xf -=item B<setmem> I<domain-id> B<size> [[I<--config>] [I<--live>] | +=item B<setmem> I<domain> B<size> [[I<--config>] [I<--live>] | [I<--current>]] Change the memory allocation for a guest domain. @@ -1332,7 +1331,7 @@ For example, vSphere/ESX rounds the parameter up to mebibytes (1024 kibibytes). For Xen, you can only adjust the memory of a running domain if the domain is paravirtualized or running the PV balloon driver. -=item B<setmaxmem> I<domain-id> B<size> [[I<--config>] [I<--live>] | +=item B<setmaxmem> I<domain> B<size> [[I<--config>] [I<--live>] | [I<--current>]] Change the maximum memory allocation limit for a guest domain. @@ -1352,7 +1351,7 @@ up to the nearest kibibyte. Some hypervisors require a larger granularity than KiB, and requests that are not an even multiple will be rounded up. For example, vSphere/ESX rounds the parameter up to mebibytes (1024 kibibytes). -=item B<memtune> I<domain-id> [I<--hard-limit> B<size>] +=item B<memtune> I<domain> [I<--hard-limit> B<size>] [I<--soft-limit> B<size>] [I<--swap-hard-limit> B<size>] [I<--min-guarantee> B<size>] [[I<--config>] [I<--live>] | [I<--current>]] @@ -1399,7 +1398,7 @@ The guaranteed minimum memory allocation for the guest. Specifying -1 as a value for these limits is interpreted as unlimited. -=item B<blkiotune> I<domain-id> [I<--weight> B<weight>] +=item B<blkiotune> I<domain> [I<--weight> B<weight>] [I<--device-weights> B<device-weights>] [[I<--config>] [I<--live>] | [I<--current>]] @@ -1420,7 +1419,7 @@ Both I<--live> and I<--config> flags may be given, but I<--current> is exclusive. If no flag is specified, behavior is different depending on hypervisor. -=item B<setvcpus> I<domain-id> I<count> [I<--maximum>] [[I<--config>] +=item B<setvcpus> I<domain> I<count> [I<--maximum>] [[I<--config>] [I<--live>] | [I<--current>]] Change the number of virtual CPUs active in a guest domain. By default, @@ -1451,7 +1450,7 @@ The I<--maximum> flag controls the maximum number of virtual cpus that can be hot-plugged the next time the domain is booted. As such, it must only be used with the I<--config> flag, and not with the I<--live> flag. -=item B<shutdown> I<domain-id> [I<--mode acpi|agent>] +=item B<shutdown> I<domain> [I<--mode acpi|agent>] Gracefully shuts down a domain. This coordinates with the domain OS to perform graceful shutdown, so there is no guarantee that it will @@ -1461,7 +1460,7 @@ services must be shutdown in the domain. The exact behavior of a domain when it shuts down is set by the I<on_shutdown> parameter in the domain's XML definition. -If I<domain-id> is transient, then the metadata of any snapshots will +If I<domain> is transient, then the metadata of any snapshots will be lost once the guest stops running, but the snapshot contents still exist, and a new domain with the same name and UUID can restore the snapshot metadata with B<snapshot-create>. @@ -1470,8 +1469,8 @@ By default the hypervisor will try to pick a suitable shutdown method. To specify an alternative method, the I<--mode> parameter can specify C<acpi> or C<agent>. -=item B<start> I<domain-name> [I<--console>] [I<--paused>] [I<--autodestroy>] -[I<--bypass-cache>] [I<--force-boot>] +=item B<start> I<domain-name-or-uuid> [I<--console>] [I<--paused>] +[I<--autodestroy>] [I<--bypass-cache>] [I<--force-boot>] Start a (previously defined) inactive domain, either from the last B<managedsave> state, or via a fresh boot if no managedsave state is @@ -1485,18 +1484,18 @@ the restore will avoid the file system cache, although this may slow down the operation. If I<--force-boot> is specified, then any managedsave state is discarded and a fresh boot occurs. -=item B<suspend> I<domain-id> +=item B<suspend> I<domain> Suspend a running domain. It is kept in memory but won't be scheduled anymore. -=item B<resume> I<domain-id> +=item B<resume> I<domain> Moves a domain out of the suspended state. This will allow a previously suspended domain to now be eligible for scheduling by the underlying hypervisor. -=item B<dompmsuspend> I<domain-id> I<target> [I<--duration>] +=item B<dompmsuspend> I<domain> I<target> [I<--duration>] Suspend a running domain into one of these states (possible I<target> values): @@ -1512,18 +1511,18 @@ hypervisor driver and 0 should be used.). Note that this command requires a guest agent configured and running in the domain's guest OS. -=item B<dompmwakeup> I<domain-id> +=item B<dompmwakeup> I<domain> Wakeup a domain suspended by dompmsuspend command. Injects a wakeup into the guest that previously used dompmsuspend, rather than waiting for the previously requested duration (if any) to elapse. -=item B<ttyconsole> I<domain-id> +=item B<ttyconsole> I<domain> Output the device used for the TTY console of the domain. If the information is not available the processes will provide an exit code of 1. -=item B<undefine> I<domain-id> [I<--managed-save>] [I<--snapshots-metadata>] +=item B<undefine> I<domain> [I<--managed-save>] [I<--snapshots-metadata>] [ {I<--storage> B<volumes> | I<--remove-all-storage>} I<--wipe-storage>] Undefine a domain. If the domain is running, this converts it to a @@ -1558,13 +1557,13 @@ The flag I<--wipe-storage> specifies that the storage volumes should be wiped before removal. NOTE: For an inactive domain, the domain name or UUID must be used as the -I<domain-id>. +I<domain>. -=item B<vcpucount> I<domain-id> [{I<--maximum> | I<--active>} +=item B<vcpucount> I<domain> [{I<--maximum> | I<--active>} {I<--config> | I<--live> | I<--current>}] Print information about the virtual cpu counts of the given -I<domain-id>. If no flags are specified, all possible counts are +I<domain>. If no flags are specified, all possible counts are listed in a table; otherwise, the output is limited to just the numeric value requested. For historical reasons, the table lists the label "current" on the rows that can be queried in isolation @@ -1580,12 +1579,12 @@ state of the domain (corresponding to I<--live> if running, or I<--config> if inactive); these three flags are mutually exclusive. Thus, this command always takes exactly zero or two flags. -=item B<vcpuinfo> I<domain-id> +=item B<vcpuinfo> I<domain> Returns basic information about the domain virtual CPUs, like the number of vCPUs, the running time, the affinity to physical processors. -=item B<vcpupin> I<domain-id> [I<vcpu>] [I<cpulist>] [[I<--live>] +=item B<vcpupin> I<domain> [I<vcpu>] [I<cpulist>] [[I<--live>] [I<--config>] | [I<--current>]] Query or change the pinning of domain VCPUs to host physical CPUs. To @@ -1607,7 +1606,7 @@ If no flag is specified, behavior is different depending on hypervisor. B<Note>: The expression is sequentially evaluated, so "0-15,^8" is identical to "9-14,0-7,15" but not identical to "^8,0-15". -=item B<vncdisplay> I<domain-id> +=item B<vncdisplay> I<domain> Output the IP address and port number for the VNC display. If the information is not available the processes will provide an exit code of 1. @@ -1617,14 +1616,14 @@ is not available the processes will provide an exit code of 1. =head1 DEVICE COMMANDS The following commands manipulate devices associated to domains. -The domain-id can be specified as a short integer, a name or a full UUID. +The I<domain> can be specified as a short integer, a name or a full UUID. To better understand the values allowed as options for the command reading the documentation at L<http://libvirt.org/formatdomain.html> on the format of the device sections to get the most accurate set of accepted values. =over 4 -=item B<attach-device> I<domain-id> I<FILE> [I<--config>] +=item B<attach-device> I<domain> I<FILE> [I<--config>] Attach a device to the domain, using a device definition in an XML file using a device definition element such as <disk> or <interface> @@ -1639,7 +1638,7 @@ within an existing device; consider using B<update-device> for this usage. For passthrough host devices, see also B<nodedev-detach>, needed if the device does not use managed mode. -=item B<attach-disk> I<domain-id> I<source> I<target> +=item B<attach-disk> I<domain> I<source> I<target> [I<--driver driver>] [I<--subdriver subdriver>] [I<--cache cache>] [I<--type type>] [I<--mode mode>] [I<--config>] [I<--sourcetype soucetype>] [I<--serial serial>] [I<--shareable>] [I<--rawio>] [I<--address address>] @@ -1667,7 +1666,7 @@ scsi:controller.bus.unit or ide:controller.bus.unit. I<multifunction> indicates specified pci address is a multifunction pci device address. -=item B<attach-interface> I<domain-id> I<type> I<source> +=item B<attach-interface> I<domain> I<type> I<source> [I<--target target>] [I<--mac mac>] [I<--script script>] [I<--model model>] [I<--config>] [I<--inbound average,peak,burst>] [I<--outbound average,peak,burst>] @@ -1691,7 +1690,7 @@ B<Note>: the optional target value is the name of a device to be created as the back-end on the node. If not provided a device named "vnetN" or "vifN" will be created automatically. -=item B<detach-device> I<domain-id> I<FILE> [I<--config>] +=item B<detach-device> I<domain> I<FILE> [I<--config>] Detach a device from the domain, takes the same kind of XML descriptions as command B<attach-device>. @@ -1701,7 +1700,7 @@ I<--config>. For passthrough host devices, see also B<nodedev-reattach>, needed if the device does not use managed mode. -=item B<detach-disk> I<domain-id> I<target> [I<--config>] +=item B<detach-disk> I<domain> I<target> [I<--config>] Detach a disk device from a domain. The I<target> is the device as seen from the domain. @@ -1709,7 +1708,7 @@ If I<--config> is specified, alter persistent configuration, effect observed on next boot, for compatibility purposes, I<--persistent> is alias of I<--config>. -=item B<detach-interface> I<domain-id> I<type> [I<--mac mac>] [I<--config>] +=item B<detach-interface> I<domain> I<type> [I<--mac mac>] [I<--config>] Detach a network interface from a domain. I<type> can be either I<network> to indicate a physical network device or @@ -1720,9 +1719,9 @@ If I<--config> is specified, alter persistent configuration, effect observed on next boot, for compatibility purposes, I<--persistent> is alias of I<--config>. -=item B<update-device> I<domain-id> I<file> [I<--config>] [I<--force>] +=item B<update-device> I<domain> I<file> [I<--config>] [I<--force>] -Update the characteristics of a device associated with I<domain-id>, +Update the characteristics of a device associated with I<domain>, based on the device definition in an XML I<file>. If the I<--config> option is used, the changes will take affect the next time libvirt starts the domain. For compatibility purposes, I<--persistent> is @@ -1732,7 +1731,7 @@ the domain. See the documentation at L<http://libvirt.org/formatdomain.html#elementsDevices> to learn about libvirt XML format for a device. -=item B<change-media> I<domain-id> I<path> [I<--eject>] [I<--insert>] +=item B<change-media> I<domain> I<path> [I<--eject>] [I<--insert>] [I<--update>] [I<source>] [I<--force>] [[I<--live>] [I<--config>] | [I<--current>]] Change media of CDROM or floppy drive. I<path> can be the fully-qualified path -- 1.7.8.6

3 2

[libvirt] [PATCH] Fixup manpage names and copyright dates
by Laine Stump 25 Jul '12

25 Jul '12

The copyright dates in the manpages haven't been updated in awhile. Also, when pod2man converts a pod file into a manpage, it will only remove the extension from the filename if it is ".pod". Some of the libvirt pod files are named *.pod.in, and that filename is placed unchanged into the manpage. This patch uses pod2man's --name option to fix that. Believe it or not, there's even a BZ for this: https://bugzilla.redhat.com/show_bug.cgi?id=819364 --- daemon/Makefile.am | 2 +- daemon/libvirtd.pod.in | 2 +- tools/Makefile.am | 8 ++++---- tools/virt-pki-validate.in | 2 +- tools/virt-xml-validate.in | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 74250f6..4c72b7b 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -376,7 +376,7 @@ POD2MAN = pod2man -c "Virtualization Support" \ -r "$(PACKAGE)-$(VERSION)" -s 8 $(srcdir)/libvirtd.8.in: libvirtd.pod.in - $(AM_V_GEN)$(POD2MAN) $< $@ + $(AM_V_GEN)$(POD2MAN) --name LIBVIRTD $< $@ # This is needed for clients too, so can't wrap in # the WITH_LIBVIRTD conditional diff --git a/daemon/libvirtd.pod.in b/daemon/libvirtd.pod.in index ea6c37d..3ada67c 100644 --- a/daemon/libvirtd.pod.in +++ b/daemon/libvirtd.pod.in @@ -150,7 +150,7 @@ Please refer to the AUTHORS file distributed with libvirt. =head1 COPYRIGHT -Copyright (C) 2006-2010 Red Hat, Inc., and the authors listed in the +Copyright (C) 2006-2012 Red Hat, Inc., and the authors listed in the libvirt AUTHORS file. =head1 LICENSE diff --git a/tools/Makefile.am b/tools/Makefile.am index c82a2fb..723db8e 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -52,17 +52,17 @@ virt-xml-validate: virt-xml-validate.in Makefile || (rm $@ && exit 1) && chmod +x $@ virt-xml-validate.1: virt-xml-validate.in - $(AM_V_GEN)$(POD2MAN) $< $(srcdir)/$@ + $(AM_V_GEN)$(POD2MAN) --name VIRT-XML-VALIDATE $< $(srcdir)/$@ virt-pki-validate: virt-pki-validate.in Makefile $(AM_V_GEN)sed -e 's,[@]SYSCONFDIR@,$(sysconfdir),' < $< > $@ \ || (rm $@ && exit 1) && chmod +x $@ virt-pki-validate.1: virt-pki-validate.in - $(AM_V_GEN)$(POD2MAN) $< $(srcdir)/$@ + $(AM_V_GEN)$(POD2MAN) --name VIRT-PKI-VALIDATE $< $(srcdir)/$@ virt-host-validate.1: virt-host-validate.c - $(AM_V_GEN)$(POD2MAN) $< $(srcdir)/$@ + $(AM_V_GEN)$(POD2MAN) --name VIRT-HOST-VALIDATE $< $(srcdir)/$@ virt-sanlock-cleanup: virt-sanlock-cleanup.in Makefile $(AM_V_GEN)sed -e 's,[@]SYSCONFDIR@,$(sysconfdir),' \ @@ -70,7 +70,7 @@ virt-sanlock-cleanup: virt-sanlock-cleanup.in Makefile || (rm $@ && exit 1) && chmod +x $@ virt-sanlock-cleanup.8: virt-sanlock-cleanup.in - $(AM_V_GEN)$(POD2MAN) $< $(srcdir)/$@ + $(AM_V_GEN)$(POD2MAN) --name VIRT-SANLOCK-CLEANUP $< $(srcdir)/$@ virt_host_validate_SOURCES = \ virt-host-validate.c \ diff --git a/tools/virt-pki-validate.in b/tools/virt-pki-validate.in index 4164758..866a235 100755 --- a/tools/virt-pki-validate.in +++ b/tools/virt-pki-validate.in @@ -310,7 +310,7 @@ Alternatively report bugs to your software distributor / vendor. =head1 COPYRIGHT -Copyright (C) 2006-2010 by Red Hat, Inc. +Copyright (C) 2006-2012 by Red Hat, Inc. =head1 LICENSE diff --git a/tools/virt-xml-validate.in b/tools/virt-xml-validate.in index 1959261..9ba3a0a 100644 --- a/tools/virt-xml-validate.in +++ b/tools/virt-xml-validate.in @@ -134,7 +134,7 @@ Alternatively report bugs to your software distributor / vendor. =head1 COPYRIGHT -Copyright (C) 2009-2010 by Red Hat, Inc. +Copyright (C) 2009-2012 by Red Hat, Inc. Copyright (C) 2009 by Daniel P. Berrange =head1 LICENSE -- 1.7.11.2

2 4

[libvirt] [PATCH] conf: Fix typo in virDomainHostdevSubsys comment
by Jiri Denemark 25 Jul '12

25 Jul '12

--- Pushed under trivial rule. src/conf/domain_conf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 469d3b6..bc02caf 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -366,7 +366,7 @@ enum virDomainHostdevSubsysType { typedef struct _virDomainHostdevSubsys virDomainHostdevSubsys; typedef virDomainHostdevSubsys *virDomainHostdevSubsysPtr; struct _virDomainHostdevSubsys { - int type; /* enum virDomainHostdevBusType */ + int type; /* enum virDomainHostdevSubsysType */ union { struct { unsigned bus; -- 1.7.11.1

1 0

[libvirt] Remove "-S" option in libvirt generated argv
by B Veera-B37207 25 Jul '12

25 Jul '12

Hi Daniel, How can remove "-S" option in libvirt generated command from xml file. Regards, Veera.

2 1

[libvirt] [PATCH] selinux: Do not automatically label images of unconfined domains
by Jiri Denemark 25 Jul '12

25 Jul '12

When an unconfined domain is begin started, it doesn't make any sense to automatically relabel its disk images with the default label. Morever, doing so would fail because the generated label would be generated without the "s0" sensitivity (since mcs is NULL in this case). --- src/security/security_selinux.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index ca19b70..02808a4 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -370,8 +370,13 @@ virSecuritySELinuxGenSecurityLabel(virSecurityManagerPtr mgr, goto cleanup; } - if (!def->seclabel.norelabel) { - def->seclabel.imagelabel = virSecuritySELinuxGenNewContext(data->file_context, mcs); + /* Generating image label does not make any sense if the domain itself + * will not be labeled. + */ + if (def->seclabel.type != VIR_DOMAIN_SECLABEL_NONE && + !def->seclabel.norelabel) { + def->seclabel.imagelabel = + virSecuritySELinuxGenNewContext(data->file_context, mcs); if (!def->seclabel.imagelabel) { virReportError(VIR_ERR_INTERNAL_ERROR, _("cannot generate selinux context for %s"), mcs); -- 1.7.11.1

2 2

[libvirt] [PATCH] util: fix a typo on return value
by Guannan Ren 25 Jul '12

25 Jul '12

virNetDevTapCreateInBridgePort returns 0 in case of success or -1 on failure --- src/util/virnetdevtap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c index 6ccc380..83f2ecd 100644 --- a/src/util/virnetdevtap.c +++ b/src/util/virnetdevtap.c @@ -341,5 +341,5 @@ int virNetDevTapCreateInBridgePort(const char *brname, if (tapfd) VIR_FORCE_CLOSE(*tapfd); - return errno; + return -1; } -- 1.7.7.5

2 6

[libvirt] [PATCH] virsh: Clean up and refactor cmdDomDisplay() and fix some possible leaks
by Peter Krempa 25 Jul '12

25 Jul '12

This patch refactors cmdDomDisplay to update coding style and remove some possible memory leaks on error paths. This patch also fixes flag variable type to unsigned. --- tools/virsh.c | 76 ++++++++++++++++++++++++++------------------------------ 1 files changed, 35 insertions(+), 41 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 6d65036..eea580d 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -13861,16 +13861,15 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) virDomainPtr dom; virBuffer buf = VIR_BUFFER_INITIALIZER; bool ret = false; - char *doc; - char *xpath; - char *listen_addr; + char *doc = NULL; + char *xpath = NULL; + char *listen_addr = NULL; int port, tls_port = 0; char *passwd = NULL; char *output = NULL; const char *scheme[] = { "vnc", "spice", "rdp", NULL }; int iter = 0; - int tmp; - int flags = 0; + unsigned int flags = 0; if (!vshConnectionUsability(ctl, ctl->conn)) return false; @@ -13886,40 +13885,34 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) if (vshCommandOptBool(cmd, "include-password")) flags |= VIR_DOMAIN_XML_SECURE; - doc = virDomainGetXMLDesc(dom, flags); - - if (!doc) + if (!(doc = virDomainGetXMLDesc(dom, flags))) goto cleanup; - xml = virXMLParseStringCtxt(doc, _("(domain_definition)"), &ctxt); - VIR_FREE(doc); - if (!xml) + if (!(xml = virXMLParseStringCtxt(doc, _("(domain_definition)"), &ctxt))) goto cleanup; /* Attempt to grab our display info */ for (iter = 0; scheme[iter] != NULL; iter++) { /* Create our XPATH lookup for the current display's port */ - virAsprintf(&xpath, "string(/domain/devices/graphics[@type='%s']" - "/@port)", scheme[iter]); - if (!xpath) { + VIR_FREE(xpath); + if (virAsprintf(&xpath, + "string(/domain/devices/graphics[@type='%s']/@port)", + scheme[iter]) < 0) { virReportOOMError(); goto cleanup; } - /* Attempt to get the port number for the current graphics scheme */ - tmp = virXPathInt(xpath, ctxt, &port); - VIR_FREE(xpath); - - /* If there is no port number for this type, then jump to the next - * scheme + /* Attempt to get the port number for the current graphics scheme. + * If there is no port number for this type, then jump to the next scheme. */ - if (tmp) + if (virXPathInt(xpath, ctxt, &port) < 0) continue; /* Create our XPATH lookup for the current display's address */ - virAsprintf(&xpath, "string(/domain/devices/graphics[@type='%s']" - "/@listen)", scheme[iter]); - if (!xpath) { + VIR_FREE(xpath); + if (virAsprintf(&xpath, + "string(/domain/devices/graphics[@type='%s']/@listen)", + scheme[iter]) < 0) { virReportOOMError(); goto cleanup; } @@ -13928,7 +13921,6 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) * graphics scheme */ listen_addr = virXPathString(xpath, ctxt); - VIR_FREE(xpath); /* Per scheme data mangling */ if (STREQ(scheme[iter], "vnc")) { @@ -13936,31 +13928,32 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) port -= 5900; } else if (STREQ(scheme[iter], "spice")) { /* Create our XPATH lookup for the SPICE TLS Port */ - virAsprintf(&xpath, "string(/domain/devices/graphics[@type='%s']" - "/@tlsPort)", scheme[iter]); - if (!xpath) { + VIR_FREE(xpath); + if (virAsprintf(&xpath, + "string(/domain/devices/graphics[@type='%s']" + "/@tlsPort)", + scheme[iter]) < 0) { virReportOOMError(); goto cleanup; } /* Attempt to get the TLS port number for SPICE */ - tmp = virXPathInt(xpath, ctxt, &tls_port); - VIR_FREE(xpath); - if (tmp) + if (virXPathInt(xpath, ctxt, &tls_port) < 0) tls_port = 0; if (vshCommandOptBool(cmd, "include-password")) { /* Create our XPATH lookup for the SPICE password */ - virAsprintf(&xpath, "string(/domain/devices/graphics" - "[@type='%s']/@passwd)", scheme[iter]); - if (!xpath) { + VIR_FREE(xpath); + if (virAsprintf(&xpath, + "string(/domain/devices/graphics" + "[@type='%s']/@passwd)", + scheme[iter]) < 0) { virReportOOMError(); goto cleanup; } /* Attempt to get the SPICE password */ passwd = virXPathString(xpath, ctxt); - VIR_FREE(xpath); } } @@ -13968,12 +13961,11 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) virBufferAsprintf(&buf, "%s://", scheme[iter]); /* Then host name or IP */ - if (!listen_addr || STREQ((const char *)listen_addr, "0.0.0.0")) + if (!listen_addr || STREQ(listen_addr, "0.0.0.0")) virBufferAddLit(&buf, "localhost"); else virBufferAsprintf(&buf, "%s", listen_addr); - VIR_FREE(listen_addr); /* Add the port */ if (STREQ(scheme[iter], "spice")) @@ -13986,10 +13978,8 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) virBufferAsprintf(&buf, "&tls-port=%d", tls_port); /* Password */ - if (passwd) { + if (passwd) virBufferAsprintf(&buf, "&password=%s", passwd); - VIR_FREE(passwd); - } /* Ensure we can print our URI */ if (virBufferError(&buf)) { @@ -14000,7 +13990,6 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) /* Print out our full URI */ output = virBufferContentAndReset(&buf); vshPrint(ctl, "%s", output); - VIR_FREE(output); /* We got what we came for so return successfully */ ret = true; @@ -14008,6 +13997,11 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) } cleanup: + VIR_FREE(doc); + VIR_FREE(xpath); + VIR_FREE(listen_addr); + VIR_FREE(passwd); + VIR_FREE(output); xmlXPathFreeContext(ctxt); xmlFreeDoc(xml); virDomainFree(dom); -- 1.7.8.6

2 1

[libvirt] [PATCH v2] fixed SegFault in virauth
by Martin Kletzander 25 Jul '12

25 Jul '12

No check for conn->uri being NULL in virAuthGetConfigFilePath (valid state) made the client segfault. This happens for example with these settings: - no virtualbox driver installed (modifies conn->uri) - no default URI set (VIRSH_DEFAULT_CONNECT_URI="", LIBVIRT_DEFAULT_URI="", uri_default="") - auth_sock_rw="sasl" - virsh run as root That are unfortunately the settings with fresh Fedora 17 installation with VDSM. The check ought to be enough as conn->uri being NULL is valid in later code and is handled properly. --- v2: - copyright modified properly this time src/util/virauth.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/util/virauth.c b/src/util/virauth.c index e6b1db0..5539c3c 100644 --- a/src/util/virauth.c +++ b/src/util/virauth.c @@ -1,6 +1,7 @@ /* * virauth.c: authentication related utility functions * + * Copyright (C) 2012 Red Hat, Inc. * Copyright (C) 2010 Matthias Bolte <matthias.bolte(a)googlemail.com> * * This library is free software; you can redistribute it and/or @@ -54,14 +55,16 @@ int virAuthGetConfigFilePath(virConnectPtr conn, return 0; } - for (i = 0 ; i < conn->uri->paramsCount ; i++) { - if (STREQ_NULLABLE(conn->uri->params[i].name, "authfile") && - conn->uri->params[i].value) { - VIR_DEBUG("Using path from URI '%s'", - conn->uri->params[i].value); - if (!(*path = strdup(conn->uri->params[i].value))) - goto no_memory; - return 0; + if (conn && conn->uri) { + for (i = 0 ; i < conn->uri->paramsCount ; i++) { + if (STREQ_NULLABLE(conn->uri->params[i].name, "authfile") && + conn->uri->params[i].value) { + VIR_DEBUG("Using path from URI '%s'", + conn->uri->params[i].value); + if (!(*path = strdup(conn->uri->params[i].value))) + goto no_memory; + return 0; + } } } -- 1.7.8.6

2 2

[libvirt] [PATCH v2] virsh: fixed domdisplay command
by Martin Kletzander 25 Jul '12

25 Jul '12

The 'domdisplay' command didn't properly evaluate '--include-password' option. --- v2: - switched to using 'flags' - kept the second condition in place - fixed indentation after virAsprintf tools/virsh.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 5888d6c..5f96445 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -13870,6 +13870,7 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) const char *scheme[] = { "vnc", "spice", "rdp", NULL }; int iter = 0; int tmp; + int flags = 0; if (!vshConnectionUsability(ctl, ctl->conn)) return false; @@ -13882,7 +13883,11 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) goto cleanup; } - doc = virDomainGetXMLDesc(dom, 0); + if (vshCommandOptBool(cmd, "include-password")) + flags |= VIR_DOMAIN_XML_SECURE; + + doc = virDomainGetXMLDesc(dom, flags); + if (!doc) goto cleanup; @@ -13944,10 +13949,10 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) if (tmp) tls_port = 0; - if (vshCommandOptBool(cmd, "daemon")) { + if (vshCommandOptBool(cmd, "include-password")) { /* Create our XPATH lookup for the SPICE password */ virAsprintf(&xpath, "string(/domain/devices/graphics" - "[@type='%s']/@passwd)", scheme[iter]); + "[@type='%s']/@passwd)", scheme[iter]); if (!xpath) { virReportOOMError(); goto cleanup; -- 1.7.8.6

3 4

[libvirt] [PATCH v2][TCK] add test case for block job lifecycle testing
by Kyla Zhang 25 Jul '12

25 Jul '12

From: Xiaoqiang Hu <xhu(a)redhat.com> v2: Add skip block for qemu only and 120s timeout for test v1: Add tests for block job lifecyle and the test flow is as follows: create 50M qed img with qed backing img-> block pull->abort block job->resume block pull->set block job speed-> wait to finish --- scripts/qemu/300-blockjob-lifecycle.t | 142 +++++++++++++++++++++++++++++++++ 1 files changed, 142 insertions(+), 0 deletions(-) create mode 100644 scripts/qemu/300-blockjob-lifecycle.t diff --git a/scripts/qemu/300-blockjob-lifecycle.t b/scripts/qemu/300-blockjob-lifecycle.t new file mode 100644 index 0000000..7840d43 --- /dev/null +++ b/scripts/qemu/300-blockjob-lifecycle.t @@ -0,0 +1,142 @@ +# -*- perl -*- +# +# Copyright (C) 2011-2012 Red Hat, Inc. +# Copyright (C) 2011 Xiaoqiang Hu <xhu 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 + +qemu/300-blockjob-lifecycle.t - verify the lifecycle of block job: +block pull, set block job speed, get block job info and abort block job + +=head1 DESCRIPTION + +The test case validates that it is possible to block pull, set block job +speed, get block job info and abort block job for domain using qed img +with qed backing img + +=cut + +use strict; +use warnings; + +use Test::More tests => 16; + +use Sys::Virt::TCK; +use Test::Exception; +use File::Spec::Functions qw(catfile); +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; +} + +SKIP:{ + skip "Only relevant to QEMU driver", 16 unless $conn->get_type() eq "QEMU"; + my $xml = $tck->generic_pool("dir") + ->mode("0755")->as_xml; + + diag "Defining transient storage pool $xml"; + 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 $volbackxml = $tck->generic_volume("tck-back", "qed", 1024*1024*50)->allocation(0)->as_xml; + + my ($volback, $pathback); + diag "back $volbackxml"; + ok_volume(sub { $volback = $pool->create_volume($volbackxml) }, "create qed backing file volume"); + + my $st; + $pathback = xpath($volback, "string(/volume/target/path)"); + $st = stat($pathback); + + ok($st, "path $pathback exists"); + + ok($st->size < 1024*1024, "size is < 1M"); + + my $volmainxml = $tck->generic_volume("tck-main", "qed", 1024*1024*50) + ->backing_file($pathback) + ->backing_format("qed") + ->allocation(0)->as_xml; + + my ($volmain, $pathmain); + diag "main $volmainxml"; + ok_volume(sub { $volmain = $pool->create_volume($volmainxml) }, "create qed backing file volume"); + + $pathmain = xpath($volmain, "string(/volume/target/path)"); + $st = stat($pathmain); + + ok($st, "path $pathmain exists"); + + ok($st->size < 1024*1024, "size is < 1M"); + + # define the guest at a qed image + # and the backing store in this qed image. + $xml = $tck->generic_domain("tck") + ->disk(format => { name => "qemu", type => "qed" }, + type => "file", + src => $pathmain, + dst => "vdb") + ->as_xml; + + diag "Defining an inactive domain config $xml"; + my $dom; + ok_domain(sub { $dom = $conn->define_domain($xml) }, "defined persistent domain config"); + + diag "Starting inactive domain config"; + $dom->create; + ok($dom->get_id() > 0, "running domain has an ID > 0"); + + # start to block pull and bandwidth is 1MB/S + my ($bandwidth, $flags, $jobinfo, $timeout); + # 1MB/S + $bandwidth = 1; + $flags=0; + $dom->block_pull($pathmain, $bandwidth, $flags); + # $jobinfo is a hash reference summarising the execution state of the block job + # and it has four keys:cur, end, bandwidth, type + $jobinfo = $dom->get_block_job_info($pathmain, $flags); + ok($jobinfo->{bandwidth} == $bandwidth, "start to block pull and block job bandwidth is $bandwidth"."MB/S"); + + $dom->abort_block_job($pathmain, $flags); + $jobinfo = $dom->get_block_job_info($pathmain, $flags); + ok($jobinfo->{type} == 0, "abort block job"); + + $dom->block_pull($pathmain, $bandwidth, $flags); + $jobinfo = $dom->get_block_job_info($pathmain, $flags); + ok($jobinfo->{bandwidth} == $bandwidth, "continue to block pull and block job bandwidth is $bandwidth"."MB/S"); + + # set block job bandwidth to 2MB/S + $bandwidth = 2; + $dom->set_block_job_speed($pathmain, $bandwidth, $flags); + $jobinfo = $dom->get_block_job_info($pathmain, $flags); + ok($jobinfo->{bandwidth} == $bandwidth, "block job bandwidth is set to $bandwidth"."MB/S"); + + # wait for the end of block pull and timeout is 120s + $timeout = 120; + while($jobinfo->{cur} < $jobinfo->{end} && $jobinfo->{type} == 1 && $timeout > 0) { + sleep(1); + $jobinfo = $dom->get_block_job_info($pathmain, $flags); + $timeout--; + } + + diag "block pull is not finished in 120S" if $jobinfo->{type} == 1 && $timeout == 0; + ok($jobinfo->{type} == 0, "block pull is finished"); +} +# end -- 1.7.3

2 1

[libvirt] [PATCH][TCK] add tests for network interface transaction
by Kyla Zhang 24 Jul '12

24 Jul '12

From: Xiaoqiang Hu <xhu(a)redhat.com> add tests for network interface transaction: interface_change_begin, interface_change_commit and interface_change_rollback --- .../networks/110-interface-change-transaction.t | 81 ++++++++++++++++++++ 1 files changed, 81 insertions(+), 0 deletions(-) create mode 100644 scripts/networks/110-interface-change-transaction.t diff --git a/scripts/networks/110-interface-change-transaction.t b/scripts/networks/110-interface-change-transaction.t new file mode 100644 index 0000000..f518d9f --- /dev/null +++ b/scripts/networks/110-interface-change-transaction.t @@ -0,0 +1,81 @@ +# -*- perl -*- +# +# Copyright (C) 2012-2013 Red Hat, Inc. +# Copyright (C) 2012-2013 Xiaoqiang Hu <xhu(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 + +networks/110-interface-lifecycle.t: test transaction for changing the +configuration of one or more network interfaces + +=head1 DESCRIPTION + +The test case validates the transaction for changing the configuration +of one or more network interfaces + +=cut + +use strict; +use warnings; + +use Test::More tests => 2; + +use Sys::Virt::TCK; +use Test::Exception; + +my $network_script_dir = "/etc/sysconfig/network-scripts"; +my $test_interface_name = "ifcfg-interface-tck-test"; +my $test_interface_cfg = $network_script_dir."/".$test_interface_name; +my $tck = Sys::Virt::TCK->new(); +my $conn = eval { $tck->setup(); }; +BAIL_OUT "failed to setup test harness: $@" if $@; +END { + $tck->cleanup if $tck; + unlink $test_interface_cfg if -f $test_interface_cfg; +} + +my $ret; + +unlink $test_interface_cfg if -f $test_interface_cfg; + +eval { $conn->interface_change_begin(); }; +SKIP: { + skip "interface_change_begin/commit/rollback not implemented", 2 if $@ && err_not_implemented($@); + + $ret = system("cat <<EOF > $test_interface_cfg +DEVICE=\"interface-tck-test\" +BOOTPROTO=\"none\" +ONBOOT=\"no\" +EOF +"); + + $conn->interface_change_rollback(); + ok(! -e $test_interface_cfg, "interface rollback"); + + unlink $test_interface_cfg if -f $test_interface_cfg; + + $conn->interface_change_begin(); + + $ret = system("cat <<EOF > $test_interface_cfg +DEVICE=\"interface-tck-test\" +BOOTPROTO=\"none\" +ONBOOT=\"no\" +EOF +"); + + $conn->interface_change_commit(); + ok(-e $test_interface_cfg, "interface commit"); +} + +# end -- 1.7.3

3 2

[libvirt] [PATCH] virsh: Clarify that memtune parameters may be rounded in the man page
by Jan Tomko 24 Jul '12

24 Jul '12

--- tools/virsh.pod | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index b4a3d5c..6ecf6ce 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -1366,7 +1366,10 @@ appropriate limit is adjusted if supported by the hypervisor. LXC and QEMU/KVM support I<--hard-limit>, I<--soft-limit>, and I<--swap-hard-limit>. I<--min-guarantee> is supported only by ESX hypervisor. Each of these limits are scaled integers (see B<NOTES> above), with a default of -kibibytes (blocks of 1024 bytes) if no suffix is present. +kibibytes (blocks of 1024 bytes) if no suffix is present. Libvirt rounds +up to the nearest kibibyte. Some hypervisors require a larger granularity +than KiB, and requests that are not an even multiple will be rounded up. +For example, vSphere/ESX rounds the parameter up to mebibytes (1024 kibibytes). If I<--live> is specified, affect a running guest. If I<--config> is specified, affect the next boot of a persistent guest. -- 1.7.8.6

2 1

[libvirt] [PATCH] Fix libnl CFLAGS/LIBS inclusion
by Doug Goldstein 24 Jul '12

24 Jul '12

When using libnl use the variables pkg-config provides incase there are additional libraries or CFLAGS required to build it. Specificially if the libnl headers are not directly in /usr/include. --- daemon/Makefile.am | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 71e91cd..ae14467 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -99,6 +99,7 @@ libvirtd_CFLAGS = \ $(XDR_CFLAGS) $(POLKIT_CFLAGS) $(DBUS_CFLAGS) \ $(WARN_CFLAGS) \ $(COVERAGE_CFLAGS) \ + $(LIBNL_CFLAGS) \ -DQEMUD_PID_FILE="\"$(QEMUD_PID_FILE)\"" \ -DREMOTE_PID_FILE="\"$(REMOTE_PID_FILE)\"" @@ -111,7 +112,8 @@ libvirtd_LDADD = \ $(GNUTLS_LIBS) \ $(SASL_LIBS) \ $(DBUS_LIBS) \ - $(POLKIT_LIBS) + $(POLKIT_LIBS) \ + $(LIBNL_LIBS) if WITH_DTRACE_PROBES libvirtd_LDADD += ../src/libvirt_probes.lo -- 1.7.8.6

2 1

[libvirt] [PATCH] tests: reduce length of nodeinfodata test names
by Eric Blake 24 Jul '12

24 Jul '12

Commit ddd6bef4 fixed an issue where 'make dist' failed to create a tarball because we have files with relative names longer than 100 bytes by the time you include a 'libvirt-0.9.13' prefix, by switching to the ustart format. Unfortunately, even with ustar format, the use of 'tar -ch' with symbolic links that resolve to a file name too long also fails (omitting the -h works, but automake automatically passes -h); such symlinks were added in commit 6dcf98c, which resulted in 'make dist' breaking again. The solution is to rename the offending symlinks to something shorter, by shortening the entire nodeinfodata naming scheme. * tests/nodeinfotest.c (mymain): Shorten test names. (linuxTestNodeInfo): Accommodate new names. * tests/nodeinfodata/*: Rename files accordingly. --- This LOOKS huge, but is really just a couple of 'git mv' commands and a change to nodeinfotest.c. Scroll to the bottom for the real change; I've shortened boring parts of this mail to get past the 100k mail cap enforced by the list. ...fs-test-1-ppc.cpuinfo => linux-ppc-test1.cpuinfo} | 0 ...1-cpu-ppc-output.txt => linux-ppc-test1.expected} | 0 .../cpu/cpu0/online | 0 ... ...5-cpu-x86-output.txt => linux-x86-test5.expected} | 0 ...fs-test-6-x86.cpuinfo => linux-x86-test6.cpuinfo} | 0 ...6-cpu-x86-output.txt => linux-x86-test6.expected} | 0 tests/nodeinfotest.c | 18 +++++++++--------- 447 files changed, 9 insertions(+), 9 deletions(-) rename tests/nodeinfodata/{linux-nodeinfo-sysfs-test-1-ppc.cpuinfo => linux-ppc-test1.cpuinfo} (100%) ... rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-5-cpu-x86-output.txt rename to tests/nodeinfodata/linux-x86-test5.expected diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6-x86.cpuinfo b/tests/nodeinfodata/linux-x86-test6.cpuinfo similarity index 100% rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-6-x86.cpuinfo rename to tests/nodeinfodata/linux-x86-test6.cpuinfo diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6-cpu-x86-output.txt b/tests/nodeinfodata/linux-x86-test6.expected similarity index 100% rename from tests/nodeinfodata/linux-nodeinfo-sysfs-test-6-cpu-x86-output.txt rename to tests/nodeinfodata/linux-x86-test6.expected diff --git a/tests/nodeinfotest.c b/tests/nodeinfotest.c index 851acd0..c44cc8a 100644 --- a/tests/nodeinfotest.c +++ b/tests/nodeinfotest.c @@ -100,9 +100,9 @@ linuxTestNodeInfo(const void *data) if (virAsprintf(&sysfs_dir, "%s/nodeinfodata/linux-%s", abs_srcdir, test) < 0 || virAsprintf(&cpuinfo, "%s/nodeinfodata/linux-%s-%s.cpuinfo", - abs_srcdir, test, arch) < 0 || - virAsprintf(&output, "%s/nodeinfodata/linux-%s-cpu-%s-output.txt", - abs_srcdir, test, arch) < 0) { + abs_srcdir, arch, test) < 0 || + virAsprintf(&output, "%s/nodeinfodata/linux-%s-%s.expected", + abs_srcdir, arch, test) < 0) { goto cleanup; } @@ -123,14 +123,14 @@ mymain(void) int ret = 0; int i; const char *nodeData[] = { - "nodeinfo-sysfs-test-1", + "test1", # if !(defined(__powerpc__) || \ defined(__powerpc64__)) - "nodeinfo-sysfs-test-2", - "nodeinfo-sysfs-test-3", - "nodeinfo-sysfs-test-4", - "nodeinfo-sysfs-test-5", - "nodeinfo-sysfs-test-6", + "test2", + "test3", + "test4", + "test5", + "test6", # endif }; -- 1.7.10.4

4 4

[libvirt] [PATCH] Remove two non-existant NWFilter driver symbols from .syms
by Daniel P. Berrange 24 Jul '12

24 Jul '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> virNWFilterGetIpAddrForIfname and virNWFilterDelIpAddrForIfname do not exist, so remove them from libvirt_nwfilter.syms Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/libvirt_nwfilter.syms | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/libvirt_nwfilter.syms b/src/libvirt_nwfilter.syms index 106415f..23dfa15 100644 --- a/src/libvirt_nwfilter.syms +++ b/src/libvirt_nwfilter.syms @@ -9,6 +9,4 @@ virNWFilterTeardownFilter; # nwfilter_learnipaddr.h -virNWFilterGetIpAddrForIfname; -virNWFilterDelIpAddrForIfname; virNWFilterLookupLearnReq; -- 1.7.10.4

3 2

[libvirt] [PATCH] doc: update the minimum value for nodesuspend time duration
by Guannan Ren 24 Jul '12

24 Jul '12

libvirt asks the duration time is above 60 seconds in code src/util/virnodesuspend.c: define MIN_TIME_REQ_FOR_SUSPEND 60 /* in seconds */ We should update the information in virsh help and manpage. --- tools/virsh.c | 3 ++- tools/virsh.pod | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index b9e159b..95b2689 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -6986,7 +6986,8 @@ static const vshCmdInfo info_nodesuspend[] = { static const vshCmdOptDef opts_node_suspend[] = { {"target", VSH_OT_DATA, VSH_OFLAG_REQ, N_("mem(Suspend-to-RAM), " "disk(Suspend-to-Disk), hybrid(Hybrid-Suspend)")}, - {"duration", VSH_OT_INT, VSH_OFLAG_REQ, N_("Suspend duration in seconds")}, + {"duration", VSH_OT_INT, VSH_OFLAG_REQ, N_("Suspend duration in seconds, " + "above 60 seconds at least")}, {"flags", VSH_OT_INT, VSH_OFLAG_NONE, N_("Suspend flags, 0 for default")}, {NULL, 0, 0, NULL} }; diff --git a/tools/virsh.pod b/tools/virsh.pod index 4bddf15..8d41b05 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -290,7 +290,8 @@ If I<cell> is specified, this will prints specified cell statistics only. Puts the node (host machine) into a system-wide sleep state such as Suspend-to-RAM, Suspend-to-Disk or Hybrid-Suspend and sets up a Real-Time-Clock interrupt to fire (to wake up the node) after a time delay -specified by the 'duration' parameter. +specified by the 'duration' parameter. The duration time should be given +above 60 seconds. =item B<capabilities> -- 1.7.7.5

3 8

[libvirt] [PATCH] Add a test case that checks there are no bogus entries in .syms
by Daniel P. Berrange 24 Jul '12

24 Jul '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> During refactoring of code, it has proved common to forget to remove old symbols from the .syms file. While the Win32 linker will complain about this, the Linux ELF linker does not. The new test case validates that every symbol listed in the .syms file actually exists in the built ELF libraries. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/Makefile.am | 42 ++++++++++++++++++++++++++++++++++++++- src/check-symfile.pl | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 95 insertions(+), 1 deletion(-) create mode 100755 src/check-symfile.pl diff --git a/src/Makefile.am b/src/Makefile.am index 44da1fa..c6c4aff 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -306,6 +306,46 @@ PDWTAGS = \ echo 'WARNING: install the dwarves package to get pdwtags' >&2; \ fi +ALL_ELF_LIBS = $(builddir)/.libs/libvirt.so +if WITH_DRIVER_MODULES +if WITH_QEMU +ALL_ELF_LIBS += $(builddir)/.libs/libvirt_driver_qemu.so +endif +if WITH_LXC +ALL_ELF_LIBS += $(builddir)/.libs/libvirt_driver_lxc.so +endif +if WITH_UML +ALL_ELF_LIBS += $(builddir)/.libs/libvirt_driver_uml.so +endif +if WITH_XEN +ALL_ELF_LIBS += $(builddir)/.libs/libvirt_driver_xen.so +endif +if WITH_LIBXL +ALL_ELF_LIBS += $(builddir)/.libs/libvirt_driver_libxl.so +endif +if WITH_NETCF +ALL_ELF_LIBS += $(builddir)/.libs/libvirt_driver_interface.so +endif +if WITH_NETWORK +ALL_ELF_LIBS += $(builddir)/.libs/libvirt_driver_network.so +endif +if WITH_NODE_DEVICES +ALL_ELF_LIBS += $(builddir)/.libs/libvirt_driver_nodedev.so +endif +if WITH_NWFILTER +ALL_ELF_LIBS += $(builddir)/.libs/libvirt_driver_nwfilter.so +endif +if WITH_SECRETS +ALL_ELF_LIBS += $(builddir)/.libs/libvirt_driver_secret.so +endif +if WITH_STORAGE +ALL_ELF_LIBS += $(builddir)/.libs/libvirt_driver_storage.so +endif +endif + +check-symfile: libvirt.syms $(ALL_ELF_LIBS:%.so=%.la) + $(AM_V_GEN)$(PERL) $(srcdir)/check-symfile.pl libvirt.syms $(ALL_ELF_LIBS) + PROTOCOL_STRUCTS = \ $(srcdir)/remote_protocol-structs \ $(srcdir)/qemu_protocol-structs \ @@ -328,7 +368,7 @@ else !WITH_REMOTE check-protocol: endif EXTRA_DIST += $(PROTOCOL_STRUCTS) -check-local: check-protocol +check-local: check-protocol check-symfile .PHONY: check-protocol $(PROTOCOL_STRUCTS:structs=struct) # Mock driver, covering domains, storage, networks, etc diff --git a/src/check-symfile.pl b/src/check-symfile.pl new file mode 100755 index 0000000..19ffec5 --- /dev/null +++ b/src/check-symfile.pl @@ -0,0 +1,54 @@ +#!/usr/bin/perl + +die "syntax: $0 SYMFILE ELFLIB(S)" unless int(@ARGV) >= 2; + +my $symfile = shift @ARGV; +my @elflibs = @ARGV; + +my @wantsyms; +my %gotsyms; + +# Skip on non-linux +if ($^O ne "linux") { + return 77; # Automake's skip code +} + +open SYMFILE, $symfile or die "cannot read $symfile: $!"; + +while (<SYMFILE>) { + next if /{/; + next if /}/; + next if /global:/; + next if /local:/; + next if /^\s*$/; + next if /^\s*#/; + next if /\*/; + + die "malformed line $_" unless /^\s*(\S+);$/; + + push @wantsyms, $1; +} +close SYMFILE; + +foreach my $elflib (@elflibs) { + open NM, "-|", "nm", $elflib or die "cannot run 'nm $elflib': $!"; + + while (<NM>) { + next unless /^\S+\s(?:T|D)\s(\S+)\s*$/; + + $gotsyms{$1} = 1; + } + + close NM; +} + +my $ret = 0; + +foreach my $sym (@wantsyms) { + next if exists $gotsyms{$sym}; + + print STDERR "Expected symbol $sym is not in ELF library\n"; + $ret = 1; +} + +exit($ret); -- 1.7.10.4

2 1

[libvirt] [PATCH] building: fix deps error when some drivers are not built
by Wen Congyang 24 Jul '12

24 Jul '12

libvirt-daemon-driver-XXX should be depent on only when with_driver_modules is 1. libvirt-daemon-driver-libxl should be depent on only when with_libxl is 1. libvirt-daemon-driver-lxc should be depent on only when with_lxc is 1. libvirt-daemon-driver-qemu should be depent on only when with_qemu is 1. libvirt-daemon-driver-uml should be depent on only when with_uml is 1. libvirt-daemon-driver-xen should be depent on only when with_xen is 1. --- libvirt.spec.in | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/libvirt.spec.in b/libvirt.spec.in index 140a182..cfcfc1c 100644 --- a/libvirt.spec.in +++ b/libvirt.spec.in @@ -326,11 +326,22 @@ Requires: libvirt-daemon-config-network = %{version}-%{release} %if %{with_nwfilter} Requires: libvirt-daemon-config-nwfilter = %{version}-%{release} %endif +%if %{with_driver_modules} +%if %{with_libxl} Requires: libvirt-daemon-driver-libxl = %{version}-%{release} +%endif +%if %{with_lxc} Requires: libvirt-daemon-driver-lxc = %{version}-%{release} +%endif +%if %{with_qemu} Requires: libvirt-daemon-driver-qemu = %{version}-%{release} +%endif +%if %{with_uml} Requires: libvirt-daemon-driver-uml = %{version}-%{release} +%endif +%if %{with_xen} Requires: libvirt-daemon-driver-xen = %{version}-%{release} +%endif Requires: libvirt-daemon-driver-interface = %{version}-%{release} Requires: libvirt-daemon-driver-secret = %{version}-%{release} @@ -339,6 +350,7 @@ Requires: libvirt-daemon-driver-network = %{version}-%{release} Requires: libvirt-daemon-driver-nodedev = %{version}-%{release} Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release} %endif +%endif Requires: libvirt-client = %{version}-%{release} # All build-time requirements. Run-time requirements are @@ -750,7 +762,9 @@ Summary: Qemu driver plugin for the libvirtd daemon Group: Development/Libraries Requires: libvirt-daemon = %{version}-%{release} # There really is a hard cross-driver dependency here +%if %{with_driver_modules} Requires: libvirt-daemon-driver-network = %{version}-%{release} +%endif %description daemon-driver-qemu The qemu driver plugin for the libvirtd daemon, providing @@ -765,7 +779,9 @@ Summary: LXC driver plugin for the libvirtd daemon Group: Development/Libraries Requires: libvirt-daemon = %{version}-%{release} # There really is a hard cross-driver dependency here +%if %{with_driver_modules} Requires: libvirt-daemon-driver-network = %{version}-%{release} +%endif %description daemon-driver-lxc The LXC driver plugin for the libvirtd daemon, providing -- 1.7.1

3 2

[libvirt] Unable to start VM Libvirt-0.9.13
by B Veera-B37207 24 Jul '12

24 Jul '12

Hi Daniel, I am unable to start VM Lbvirt Version : Compiled against library: libvir 0.9.13 Using library: libvir 0.9.13 Using API: QEMU 0.9.13 Running hypervisor: QEMU 1.0.0 Here is my command: LC_ALL=C PATH=/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin HOME=/home/root USER=root LOGNAME=root /usr/bin/qemu-system-ppc -name new -M ppce500v2 -enable-kvm -m 256 -smp 1,sockets=1,cores=1,threads=1 -uuid eebd22bb-c1db-da23-ca6d-f54c9c23282f -nographic -nodefconfig -nodefaults -rtc base=utc -no-shutdown -kernel /boot/uImage-p2020rdb.bin -initrd /home/root/guest.rootfs.ext2.gz -append "root=/dev/ram rw console=ttyS0,115200" -serial tcp::4444,server,telnet -chardev socket,id=charserial0,host=,port=4444,path=/usr/local/var/lib/libvirt/qemu/new.monitor,server,nowait -device virtio-balloon-pci,id=balloon0 -nodefconfig -nodefaults -chardev socket,id=charmonitor,path=/usr/local/var/lib/libvirt/qemu/new.monitor,server,nowait -mon chardev=charmonitor,id=monitor,mode=control -rtc base=utc -no-shutdown -device piix3-usb-uhci,id=usb -netdev tap,script=/home/root/qemu-ifup,id=hostnet0 -device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:fa:d4:84 -mem-path /var/lib/hugetlbfs/pagesize-4MB -dtb /usr/share/qemu/ppce500v2.dtb I am able to start VM using above command, but when I convert to xml I unable to start VM XML File: <domain type='kvm' xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'> <name>new</name> <uuid>eebd22bb-c1db-da23-ca6d-f54c9c23282f</uuid> <memory unit='KiB'>262144</memory> <currentMemory unit='KiB'>262144</currentMemory> <vcpu placement='static'>1</vcpu> <os> <type arch='ppc' machine='ppce500v2'>hvm</type> <kernel>/boot/uImage-p2020rdb.bin</kernel> <initrd>/home/root/guest.rootfs.ext2.gz</initrd> <cmdline>root=/dev/ram rw console=ttyS0,115200</cmdline> </os> <features> <acpi/> </features> <cpu> <topology sockets='1' cores='1' threads='1'/> </cpu> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/qemu-system-ppc</emulator> <serial type='tcp'> <source mode='bind' host='' service='4444'/> <protocol type='raw'/> <target port='0'/> </serial> <console type='tcp'> <source mode='bind' host='' service='4444'/> <protocol type='raw'/> <target type='serial' port='0'/> </console> <memballoon model='virtio'/> </devices> <qemu:commandline> <qemu:arg value='-nodefconfig'/> <qemu:arg value='-nodefaults'/> <qemu:arg value='-rtc'/> <qemu:arg value='base=utc'/> <qemu:arg value='-no-shutdown'/> <qemu:arg value='-chardev'/> <qemu:arg value='socket,id=charserial0,host=,port=4444,path=/usr/local/var/lib/libvirt/qemu/new.monitor,server,nowait'/> <qemu:arg value='-device'/> <qemu:arg value='virtio-balloon-pci,id=balloon0'/> <qemu:arg value='-nodefconfig'/> <qemu:arg value='-nodefaults'/> <qemu:arg value='-chardev'/> <qemu:arg value='socket,id=charmonitor,path=/usr/local/var/lib/libvirt/qemu/new.monitor,server,nowait'/> <qemu:arg value='-mon'/> <qemu:arg value='chardev=charmonitor,id=monitor,mode=control'/> <qemu:arg value='-rtc'/> <qemu:arg value='base=utc'/> <qemu:arg value='-no-shutdown'/> <qemu:arg value='-device'/> <qemu:arg value='piix3-usb-uhci,id=usb'/> <qemu:arg value='-netdev'/> <qemu:arg value='tap,script=/home/root/qemu-ifup,id=hostnet0'/> <qemu:arg value='-device'/> <qemu:arg value='virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:fa:d4:84'/> <qemu:arg value='-mem-path'/> <qemu:arg value='/var/lib/hugetlbfs/pagesize-4MB'/> <qemu:arg value='-dtb'/> <qemu:arg value='/usr/share/qemu/ppce500v2.dtb'/> </qemu:commandline> </domain> Error: "internal error process exited while connecting to monitor: qemu-system-ppc: -dev ice piix3-usb-uhci,id=usb,bus=pci,addr=0x1.0x2: Bus 'pci' not found" Regards, Veera.

1 0

[libvirt] [libvirt-glib PATCHv2] Fix *_new_from_xml
by Christophe Fergeau 24 Jul '12

24 Jul '12

For objects with a subtype 'type' attribute, when the _new_from_xml function was called, the 'type' attribute was forcefully set to the right value rather than checking that the passed-in value matches the type of the subclass we are trying to instantiate. This commit changes this, and returns NULL when the value of the 'type' attribute of the passed-in XML document does not match the expected type. --- libvirt-gconfig/libvirt-gconfig-domain-address-pci.c | 5 ++++- libvirt-gconfig/libvirt-gconfig-domain-address-usb.c | 5 ++++- libvirt-gconfig/libvirt-gconfig-domain-chardev-source-pty.c | 5 ++++- libvirt-gconfig/libvirt-gconfig-domain-chardev-source-spicevmc.c | 5 ++++- libvirt-gconfig/libvirt-gconfig-domain-controller-usb.c | 5 ++++- libvirt-gconfig/libvirt-gconfig-domain-graphics-sdl.c | 5 +++-- libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.c | 5 +++-- libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.c | 5 +++-- libvirt-gconfig/libvirt-gconfig-domain-interface-bridge.c | 5 +++-- libvirt-gconfig/libvirt-gconfig-domain-interface-network.c | 5 +++-- libvirt-gconfig/libvirt-gconfig-domain-interface-user.c | 5 +++-- libvirt-gconfig/libvirt-gconfig-domain-timer-pit.c | 5 ++++- libvirt-gconfig/libvirt-gconfig-domain-timer-rtc.c | 5 ++++- 13 files changed, 46 insertions(+), 19 deletions(-) diff --git a/libvirt-gconfig/libvirt-gconfig-domain-address-pci.c b/libvirt-gconfig/libvirt-gconfig-domain-address-pci.c index 48e3872..16fe256 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-address-pci.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-address-pci.c @@ -67,7 +67,10 @@ GVirConfigDomainAddressPci *gvir_config_domain_address_pci_new_from_xml(const gc object = gvir_config_object_new_from_xml(GVIR_CONFIG_TYPE_DOMAIN_ADDRESS_PCI, "address", NULL, xml, error); - gvir_config_object_set_attribute(object, "type", "pci", NULL); + if (g_strcmp0(gvir_config_object_get_attribute(object, NULL, "type"), "pci") != 0) { + g_object_unref(G_OBJECT(object)); + return NULL; + } return GVIR_CONFIG_DOMAIN_ADDRESS_PCI(object); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-address-usb.c b/libvirt-gconfig/libvirt-gconfig-domain-address-usb.c index 3da5811..fdddcfb 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-address-usb.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-address-usb.c @@ -67,7 +67,10 @@ GVirConfigDomainAddressUsb *gvir_config_domain_address_usb_new_from_xml(const gc object = gvir_config_object_new_from_xml(GVIR_CONFIG_TYPE_DOMAIN_ADDRESS_USB, "address", NULL, xml, error); - gvir_config_object_set_attribute(object, "type", "usb", NULL); + if (g_strcmp0(gvir_config_object_get_attribute(object, NULL, "type"), "usb") != 0) { + g_object_unref(G_OBJECT(object)); + return NULL; + } return GVIR_CONFIG_DOMAIN_ADDRESS_USB(object); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-pty.c b/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-pty.c index 201e123..12e6f18 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-pty.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-pty.c @@ -75,7 +75,10 @@ GVirConfigDomainChardevSourcePty *gvir_config_domain_chardev_source_pty_new_from */ object = gvir_config_object_new_from_xml(GVIR_CONFIG_TYPE_DOMAIN_CHARDEV_SOURCE_PTY, "dummy", NULL, xml, error); - gvir_config_object_set_attribute(object, "type", "pty", NULL); + if (g_strcmp0(gvir_config_object_get_attribute(object, NULL, "type"), "pty") != 0) { + g_object_unref(G_OBJECT(object)); + return NULL; + } return GVIR_CONFIG_DOMAIN_CHARDEV_SOURCE_PTY(object); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-spicevmc.c b/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-spicevmc.c index 22eabf5..3590e55 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-spicevmc.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-chardev-source-spicevmc.c @@ -75,6 +75,9 @@ GVirConfigDomainChardevSourceSpiceVmc *gvir_config_domain_chardev_source_spicevm */ object = gvir_config_object_new_from_xml(GVIR_CONFIG_TYPE_DOMAIN_CHARDEV_SOURCE_SPICE_VMC, "dummy", NULL, xml, error); - gvir_config_object_set_attribute(object, "type", "spicevmc", NULL); + if (g_strcmp0(gvir_config_object_get_attribute(object, NULL, "type"), "spicevmc") != 0) { + g_object_unref(G_OBJECT(object)); + return NULL; + } return GVIR_CONFIG_DOMAIN_CHARDEV_SOURCE_SPICE_VMC(object); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-controller-usb.c b/libvirt-gconfig/libvirt-gconfig-domain-controller-usb.c index 1fd248c..f4d3901 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-controller-usb.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-controller-usb.c @@ -167,7 +167,10 @@ GVirConfigDomainControllerUsb *gvir_config_domain_controller_usb_new_from_xml(co object = gvir_config_object_new_from_xml(GVIR_CONFIG_TYPE_DOMAIN_CONTROLLER_USB, "controller", NULL, xml, error); - gvir_config_object_set_attribute(object, "type", "usb", NULL); + if (g_strcmp0(gvir_config_object_get_attribute(object, NULL, "type"), "usb") != 0) { + g_object_unref(G_OBJECT(object)); + return NULL; + } return GVIR_CONFIG_DOMAIN_CONTROLLER_USB(object); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-graphics-sdl.c b/libvirt-gconfig/libvirt-gconfig-domain-graphics-sdl.c index 7871ae5..8b22ad0 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-graphics-sdl.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-graphics-sdl.c @@ -68,9 +68,10 @@ gvir_config_domain_graphics_sdl_new_from_xml(const gchar *xml, object = gvir_config_object_new_from_xml(GVIR_CONFIG_TYPE_DOMAIN_GRAPHICS_SDL, "graphics", NULL, xml, error); - if (object == NULL) + if (g_strcmp0(gvir_config_object_get_attribute(object, NULL, "type"), "sdl") != 0) { + g_object_unref(G_OBJECT(object)); return NULL; - gvir_config_object_set_attribute(object, "type", "sdl", NULL); + } return GVIR_CONFIG_DOMAIN_GRAPHICS_SDL(object); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.c b/libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.c index e60a778..61d3f5b 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-graphics-spice.c @@ -68,9 +68,10 @@ gvir_config_domain_graphics_spice_new_from_xml(const gchar *xml, object = gvir_config_object_new_from_xml(GVIR_CONFIG_TYPE_DOMAIN_GRAPHICS_SPICE, "graphics", NULL, xml, error); - if (object == NULL) + if (g_strcmp0(gvir_config_object_get_attribute(object, NULL, "type"), "spice") != 0) { + g_object_unref(G_OBJECT(object)); return NULL; - gvir_config_object_set_attribute(object, "type", "spice", NULL); + } return GVIR_CONFIG_DOMAIN_GRAPHICS_SPICE(object); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.c b/libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.c index d9d1303..f2fc9d5 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-graphics-vnc.c @@ -68,9 +68,10 @@ gvir_config_domain_graphics_vnc_new_from_xml(const gchar *xml, object = gvir_config_object_new_from_xml(GVIR_CONFIG_TYPE_DOMAIN_GRAPHICS_VNC, "graphics", NULL, xml, error); - if (object == NULL) + if (g_strcmp0(gvir_config_object_get_attribute(object, NULL, "type"), "vnc") != 0) { + g_object_unref(G_OBJECT(object)); return NULL; - gvir_config_object_set_attribute(object, "type", "vnc", NULL); + } return GVIR_CONFIG_DOMAIN_GRAPHICS_VNC(object); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface-bridge.c b/libvirt-gconfig/libvirt-gconfig-domain-interface-bridge.c index ea5eafa..09a7efc 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-interface-bridge.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface-bridge.c @@ -70,9 +70,10 @@ GVirConfigDomainInterfaceBridge *gvir_config_domain_interface_bridge_new_from_xm object = gvir_config_object_new_from_xml(GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_BRIDGE, "interface", NULL, xml, error); - if (object == NULL) + if (g_strcmp0(gvir_config_object_get_attribute(object, NULL, "type"), "bridge") != 0) { + g_object_unref(G_OBJECT(object)); return NULL; - gvir_config_object_set_attribute(object, "type", "bridge", NULL); + } return GVIR_CONFIG_DOMAIN_INTERFACE_BRIDGE(object); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface-network.c b/libvirt-gconfig/libvirt-gconfig-domain-interface-network.c index 1a7bfad..ce39234 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-interface-network.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface-network.c @@ -69,9 +69,10 @@ GVirConfigDomainInterfaceNetwork *gvir_config_domain_interface_network_new_from_ object = gvir_config_object_new_from_xml(GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_NETWORK, "interface", NULL, xml, error); - if (object == NULL) + if (g_strcmp0(gvir_config_object_get_attribute(object, NULL, "type"), "network") != 0) { + g_object_unref(G_OBJECT(object)); return NULL; - gvir_config_object_set_attribute(object, "type", "network", NULL); + } return GVIR_CONFIG_DOMAIN_INTERFACE_NETWORK(object); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-interface-user.c b/libvirt-gconfig/libvirt-gconfig-domain-interface-user.c index a455a73..4ede31f 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-interface-user.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-interface-user.c @@ -69,8 +69,9 @@ GVirConfigDomainInterfaceUser *gvir_config_domain_interface_user_new_from_xml(co object = gvir_config_object_new_from_xml(GVIR_CONFIG_TYPE_DOMAIN_INTERFACE_USER, "interface", NULL, xml, error); - if (object == NULL) + if (g_strcmp0(gvir_config_object_get_attribute(object, NULL, "type"), "user") != 0) { + g_object_unref(G_OBJECT(object)); return NULL; - gvir_config_object_set_attribute(object, "type", "user", NULL); + } return GVIR_CONFIG_DOMAIN_INTERFACE_USER(object); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-timer-pit.c b/libvirt-gconfig/libvirt-gconfig-domain-timer-pit.c index d75cd30..16f7e03 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-timer-pit.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-timer-pit.c @@ -67,6 +67,9 @@ GVirConfigDomainTimerPit *gvir_config_domain_timer_pit_new_from_xml(const gchar object = gvir_config_object_new_from_xml(GVIR_CONFIG_TYPE_DOMAIN_TIMER_PIT, "timer", NULL, xml, error); - gvir_config_object_set_attribute(object, "name", "pit", NULL); + if (g_strcmp0(gvir_config_object_get_attribute(object, NULL, "type"), "pit") != 0) { + g_object_unref(G_OBJECT(object)); + return NULL; + } return GVIR_CONFIG_DOMAIN_TIMER_PIT(object); } diff --git a/libvirt-gconfig/libvirt-gconfig-domain-timer-rtc.c b/libvirt-gconfig/libvirt-gconfig-domain-timer-rtc.c index b99c1e3..19783df 100644 --- a/libvirt-gconfig/libvirt-gconfig-domain-timer-rtc.c +++ b/libvirt-gconfig/libvirt-gconfig-domain-timer-rtc.c @@ -67,6 +67,9 @@ GVirConfigDomainTimerRtc *gvir_config_domain_timer_rtc_new_from_xml(const gchar object = gvir_config_object_new_from_xml(GVIR_CONFIG_TYPE_DOMAIN_TIMER_RTC, "timer", NULL, xml, error); - gvir_config_object_set_attribute(object, "name", "rtc", NULL); + if (g_strcmp0(gvir_config_object_get_attribute(object, NULL, "type"), "rtc") != 0) { + g_object_unref(G_OBJECT(object)); + return NULL; + } return GVIR_CONFIG_DOMAIN_TIMER_RTC(object); } -- 1.7.10.4

3 5

[libvirt] [PATCH 00/13] Support hypervisor-threads-pin in vcpupin.
by tangchen 24 Jul '12

24 Jul '12

Hi~ Users can use vcpupin command to bind a vcpu thread to a specific physical cpu. But besides vcpu threads, there are alse some other threads created by qemu (known as hypervisor threads) that could not be explicitly bound to physical cpus. The first 3 patches are from Wen Congyang, which implement Cgroup for differrent hypervisors. The other 10 patches implemented hypervisor threads binding, in two ways: 1) Use sched_setaffinity() function; 2) Use cpuset cgroup. A new xml element is introduced, and vcpupin command is improved, see below. 1. Introduce new xml elements: <cputune> ...... <hypervisorpin cpuset='1'/> </cputune> 2. Improve vcpupin command to support hypervisor threads binding. For example, vm1 has the following configuration: <cputune> <vcpupin vcpu='1' cpuset='1'/> <vcpupin vcpu='0' cpuset='0'/> <hypervisorpin cpuset='1'/> </cputune> 1) query all threads pining # vcpupin vm1 VCPU: CPU Affinity ---------------------------------- 0: 0 1: 1 Hypervisor: CPU Affinity ---------------------------------- *: 1 2) query hypervisor threads pining only # vcpupin vm1 --hypervisor Hypervisor: CPU Affinity ---------------------------------- *: 1 3) change hypervisor threads pining # vcpupin vm1 --hypervisor 0-1 # vcpupin vm1 --hypervisor Hypervisor: CPU Affinity ---------------------------------- *: 0-1 # taskset -p 397 pid 397's current affinity mask: 3 Note: If users want to pin a vcpu thread to pcpu, --vcpu option could no longer be omitted. Tang Chen (10): Enable cpuset cgroup and synchronous vcpupin info to cgroup. Support hypervisorpin xml parse. Introduce qemuSetupCgroupHypervisorPin and synchronize hypervisorpin info to cgroup. Add qemuProcessSetHypervisorAffinites and set hypervisor threads affinities Introduce virDomainHypervisorPinAdd and virDomainHypervisorPinDel functions Introduce qemudDomainPinHypervisorFlags and qemudDomainGetHypervisorPinInfo in qemu driver. Introduce remoteDomainPinHypervisorFlags and remoteDomainGetHypervisorPinInfo functions in remote driver. Introduce remoteDispatchDomainPinHypervisorFlags and remoteDispatchDomainGetHypervisorPinInfo functions. Introduce virDomainPinHypervisorFlags and virDomainGetHypervisorPinInfo functions. Improve vcpupin to support hypervisorpin dynically. Wen Congyang (3): Introduce the function virCgroupForHypervisor Introduce the function virCgroupMoveTask create a new cgroup and move all hypervisor threads to the new cgroup .gnulib | 2 +- daemon/remote.c | 103 +++++++++ docs/schemas/domaincommon.rng | 7 + include/libvirt/libvirt.h.in | 10 + src/conf/domain_conf.c | 173 ++++++++++++++- src/conf/domain_conf.h | 7 + src/driver.h | 13 ++ src/libvirt.c | 147 +++++++++++++ src/libvirt_private.syms | 7 + src/libvirt_public.syms | 2 + src/qemu/qemu_cgroup.c | 147 ++++++++++++- src/qemu/qemu_cgroup.h | 5 + src/qemu/qemu_driver.c | 261 ++++++++++++++++++++++- src/qemu/qemu_process.c | 60 +++++- src/remote/remote_driver.c | 102 +++++++++ src/remote/remote_protocol.x | 23 +- src/remote_protocol-structs | 24 +++ src/util/cgroup.c | 204 +++++++++++++++++- src/util/cgroup.h | 15 ++ tests/qemuxml2argvdata/qemuxml2argv-cputune.xml | 1 + tests/vcpupin | 6 +- tools/virsh.c | 147 ++++++++----- tools/virsh.pod | 16 +- 23 files changed, 1405 insertions(+), 77 deletions(-) -- 1.7.10.2 -- Best Regards, Tang chen

3 22

[libvirt] [PATCH] virsh: fixed domdisplay command
by Martin Kletzander 24 Jul '12

24 Jul '12

The 'domdisplay' command didn't properly evaluate '--include-password' option. --- tools/virsh.c | 35 +++++++++++++++++++++++------------ 1 files changed, 23 insertions(+), 12 deletions(-) diff --git a/tools/virsh.c b/tools/virsh.c index 5888d6c..e0765ba 100644 --- a/tools/virsh.c +++ b/tools/virsh.c @@ -66,6 +66,7 @@ #include "virtypedparam.h" #include "intprops.h" #include "conf/virdomainlist.h" +#include "datatypes.h" static char *progname; @@ -13882,7 +13883,16 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) goto cleanup; } - doc = virDomainGetXMLDesc(dom, 0); + if (!vshCommandOptBool(cmd, "include-password")) + doc = virDomainGetXMLDesc(dom, 0); + else { + if (ctl->conn->flags & VIR_DOMAIN_XML_SECURE) { + vshError(ctl, _("Cannot get password with read-only connection")); + goto cleanup; + } + doc = virDomainGetXMLDesc(dom, VIR_DOMAIN_XML_SECURE); + } + if (!doc) goto cleanup; @@ -13944,19 +13954,20 @@ cmdDomDisplay(vshControl *ctl, const vshCmd *cmd) if (tmp) tls_port = 0; - if (vshCommandOptBool(cmd, "daemon")) { - /* Create our XPATH lookup for the SPICE password */ - virAsprintf(&xpath, "string(/domain/devices/graphics" + /* Create our XPATH lookup for the SPICE password */ + virAsprintf(&xpath, "string(/domain/devices/graphics" "[@type='%s']/@passwd)", scheme[iter]); - if (!xpath) { - virReportOOMError(); - goto cleanup; - } - - /* Attempt to get the SPICE password */ - passwd = virXPathString(xpath, ctxt); - VIR_FREE(xpath); + if (!xpath) { + virReportOOMError(); + goto cleanup; } + + /* Attempt to get the SPICE password + * + * This will return NULL automatically if the + * virDomainGetXMLDesc wasn't secure */ + passwd = virXPathString(xpath, ctxt); + VIR_FREE(xpath); } /* Build up the full URI, starting with the scheme */ -- 1.7.8.6

4 7

[libvirt] [PATCH 00/11] Split virsh
by Osier Yang 24 Jul '12

24 Jul '12

This splits virsh.c by the command groups, except 'virsh itself' group, each group will have a separate .c, filled with the its commands, a few helpers, and command group definition moved from virsh.c. and virsh.c simply include those new .c files. It still could be optimized, but this set could set up the skelton, and further optimization could be later patches. Osier Yang (11): virsh: Move definition of cmds and cmd groups right at the top of main virsh: Split cmds for domain and domain monitoring from virsh.c virsh: Split cmds for storage pool and storage volume from virsh.c virsh: Split cmds to manage network from virsh.c virsh: Split cmds to manage host interface from virsh.c virsh: Split cmds to manage network filter from virsh.c virsh: Split cmds to manage secret from virsh.c virsh: Split cmds to manage domain snapshot from virsh.c virsh: Split cmds in host group from virsh.c virsh: Split cmds in node device group from virsh.c virsh: Move command group definition into its own file tools/virsh-domain-monitor.c | 1701 ++++ tools/virsh-domain.c | 8139 +++++++++++++++++++ tools/virsh-host.c | 839 ++ tools/virsh-interface.c | 1032 +++ tools/virsh-network.c | 710 ++ tools/virsh-nodedev.c | 402 + tools/virsh-nwfilter.c | 324 + tools/virsh-pool.c | 1442 ++++ tools/virsh-secret.c | 373 + tools/virsh-snapshot.c | 1628 ++++ tools/virsh-volume.c | 1462 ++++ tools/virsh.c |18474 +----------------------------------------- 12 files changed, 18361 insertions(+), 18165 deletions(-) create mode 100644 tools/virsh-domain-monitor.c create mode 100644 tools/virsh-domain.c create mode 100644 tools/virsh-host.c create mode 100644 tools/virsh-interface.c create mode 100644 tools/virsh-network.c create mode 100644 tools/virsh-nodedev.c create mode 100644 tools/virsh-nwfilter.c create mode 100644 tools/virsh-pool.c create mode 100644 tools/virsh-secret.c create mode 100644 tools/virsh-snapshot.c create mode 100644 tools/virsh-volume.c Regards, Osier

2 11

[libvirt] [PATCH] adding handling EINTR to poll to make it more robust
by Royce Lv 24 Jul '12

24 Jul '12

some system call and signal will interrupt poll, making event loop stops and fails to react events and keepalive message from libvirt. adding handling EINTR to poll to make it more robust Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- examples/domain-events/events-python/event-test.py | 87 +++++++++++--------- 1 file changed, 46 insertions(+), 41 deletions(-) diff --git a/examples/domain-events/events-python/event-test.py b/examples/domain-events/events-python/event-test.py index 96dc268..6b655cd 100644 --- a/examples/domain-events/events-python/event-test.py +++ b/examples/domain-events/events-python/event-test.py @@ -178,48 +178,53 @@ class virEventLoopPure: def run_once(self): sleep = -1 self.runningPoll = True - next = self.next_timeout() - debug("Next timeout due at %d" % next) - if next > 0: - now = int(time.time() * 1000) - if now >= next: - sleep = 0 - else: - sleep = (next - now) / 1000.0 - - debug("Poll with a sleep of %d" % sleep) - events = self.poll.poll(sleep) - - # Dispatch any file handle events that occurred - for (fd, revents) in events: - # See if the events was from the self-pipe - # telling us to wakup. if so, then discard - # the data just continue - if fd == self.pipetrick[0]: - self.pendingWakeup = False - data = os.read(fd, 1) - continue - - h = self.get_handle_by_fd(fd) - if h: - debug("Dispatch fd %d handle %d events %d" % (fd, h.get_id(), revents)) - h.dispatch(self.events_from_poll(revents)) - - now = int(time.time() * 1000) - for t in self.timers: - interval = t.get_interval() - if interval < 0: - continue + try: + next = self.next_timeout() + debug("Next timeout due at %d" % next) + if next > 0: + now = int(time.time() * 1000) + if now >= next: + sleep = 0 + else: + sleep = (next - now) / 1000.0 + + debug("Poll with a sleep of %d" % sleep) + events = self.poll.poll(sleep) + + # Dispatch any file handle events that occurred + for (fd, revents) in events: + # See if the events was from the self-pipe + # telling us to wakup. if so, then discard + # the data just continue + if fd == self.pipetrick[0]: + self.pendingWakeup = False + data = os.read(fd, 1) + continue + + h = self.get_handle_by_fd(fd) + if h: + debug("Dispatch fd %d handle %d events %d" % (fd, h.get_id(), revents)) + h.dispatch(self.events_from_poll(revents)) - want = t.get_last_fired() + interval - # Deduct 20ms, since schedular timeslice - # means we could be ever so slightly early - if now >= (want-20): - debug("Dispatch timer %d now %s want %s" % (t.get_id(), str(now), str(want))) - t.set_last_fired(now) - t.dispatch() - - self.runningPoll = False + now = int(time.time() * 1000) + for t in self.timers: + interval = t.get_interval() + if interval < 0: + continue + + want = t.get_last_fired() + interval + # Deduct 20ms, since scheduler timeslice + # means we could be ever so slightly early + if now >= (want-20): + debug("Dispatch timer %d now %s want %s" % (t.get_id(), str(now), str(want))) + t.set_last_fired(now) + t.dispatch() + + except (os.error, select.error), e: + if e.args[0] != errno.EINTR: + raise + finally: + self.runningPoll = False # Actually the event loop forever -- 1.7.10.4

3 2

[libvirt] [PATCH] build: regenerate .png files
by Eric Blake 24 Jul '12

24 Jul '12

We don't expect people to have tools installed to regenerate .png from .fig by default. However, since commit 5eb3df8, several .fig files were updated without regenerating the .png file, and as a result, 'make dist' ends up regenerating those five files, or worse, failing because of missing tools. Additionally, the generation of .png files is nondeterministic (the resulting files contain a timestamp), which means prior to this patch, running 'make dist' from two checkouts will end up producing different tarball contents (two 'make dist' runs will always produce different tar files, since tarballs also contain timestamps; but unpacking the tarballs and doing a recursive diff will show if the contents are unchanged). Running 'make *.png' in the docs directory and committing the result means the timestamps are now up-to-date, and 'make dist' no longer has anything to do. This gets us closer to the goal of two checkouts being able to produce the same tarball. * docs/libvirt-*.png: Regenerate. --- Found when testing 'make dist' on a machine without ImageMagick installed (for the 'convert' program). docs/libvirt-daemon-arch.png | Bin 16479 -> 11624 bytes docs/libvirt-driver-arch.png | Bin 16835 -> 12555 bytes docs/libvirt-net-logical.png | Bin 7387 -> 11243 bytes docs/libvirt-net-physical.png | Bin 10666 -> 11336 bytes docs/libvirt-object-model.png | Bin 14327 -> 9559 bytes 5 files changed, 0 insertions(+), 0 deletions(-) diff --git a/docs/libvirt-daemon-arch.png b/docs/libvirt-daemon-arch.png index b7ed2f689112e45ffd5b108ed7a03f9808618d96..621a55cdbfebf968ed079e3940b5bd3da22321a1 100644 GIT binary patch literal 11624 [actual patch stripped for mailing list length limits - it's just a regeneration of binary files] -- 1.7.10.4

3 3

[libvirt] qemu and <transient/> disks
by Richard W.M. Jones 24 Jul '12

24 Jul '12

Partly following up this message: https://www.redhat.com/archives/libvirt-users/2011-October/msg00142.html > > And what about qemu's option "snapshot=on" ? > > Unreliable. It won't work with SELinux (since qemu tries to create the > snapshot on /tmp), and it makes your guest unmigratable. I think that > it is easier to have libvirt use qemu-img to create a qcow2 wrapper > prior to booting the guest, at which point the solution is easier to > control from an sVirt perspective, and is more likely to allow us to > figure out a way to make things work with migration (at least, I'm > hoping I can figure out how to migrate a guest with a transient disk). Lack of this feature is pretty annoying, particularly since (a) libguestfs needs it and (b) it's a trivial patch to add snapshot=on to the qemu driver. So to concentrate on the two objections above: - Why is SELinux concerned about qemu creating and using a file in /tmp? Obviously it should stop qemu opening and reading random files from /tmp but that would be a different rule surely? - The documentation actually states that using <transient/> may make your guest unable to migrate, and in any case we don't care. > But if you want to use qemu's snapshot=on in the meantime, you can > use the <qemu:commandline> namespace XML to add it. Is there an example how to do this? It seems like it might be possible using a global qemu '-set device.<id>.snapshot=on' parameter, but how can I know what <id> libvirt will give to a '-drive' parameter? (I found from experimentation that it's something like "drive-virtio-disk0", but I can't track down the bit of code that produces this string yet ...) Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming blog: http://rwmj.wordpress.com Fedora now supports 80 OCaml packages (the OPEN alternative to F#) http://cocan.org/getting_started_with_ocaml_on_red_hat_and_fedora

3 4

[libvirt] [PATCH] [libvirt-java] Fix javadoc warnings.
by Claudio Bley 23 Jul '12

23 Jul '12

Hi. I sent a few mails on friday, 6th July, via gmane.org but they haven't made it to the list yet. As I'm a subscriber now, I'm resending them directly. Sorry for any duplicates in advance. Here's a patch fixing these javadoc warnings: --- [javadoc] x:\src\libvirt-java\src\main\java\org\libvirt\Connect.java:387: warning - @return tag has no arguments. [javadoc] x:\src\libvirt-java\src\main\java\org\libvirt\Connect.java:644: warning - @return tag has no arguments. [javadoc] x:\src\libvirt-java\src\main\java\org\libvirt\Connect.java:658: warning - @return tag has no arguments. [javadoc] x:\src\libvirt-java\src\main\java\org\libvirt\Domain.java:681: warning - @return tag has no arguments. [javadoc] x:\src\libvirt-java\src\main\java\org\libvirt\Domain.java:795: warning - Tag @see: reference not found: http [javadoc] ://www.libvirt.org/html/libvirt-libvirt.html#virDomainMigrateToURI [javadoc] x:\src\libvirt-java\src\main\java\org\libvirt\DomainSnapshot.java:40: warning - @return tag has no arguments. [javadoc] x:\src\libvirt-java\src\main\java\org\libvirt\StoragePool.java:349: warning - @return tag has no arguments. [javadoc] x:\src\libvirt-java\src\main\java\org\libvirt\Stream.java:130: warning - Tag @see:illegal character: "58" in "http://www.libvirt.org/html/libvi rt-libvirt.html#virStreamRecvAll" [javadoc] x:\src\libvirt-java\src\main\java\org\libvirt\Stream.java:130: warning - Tag @see:illegal character: "47" in "http://www.libvirt.org/html/libvi rt-libvirt.html#virStreamRecvAll" [javadoc] x:\src\libvirt-java\src\main\java\org\libvirt\Stream.java:130: warning - Tag @see:illegal character: "47" in "http://www.libvirt.org/html/libvi rt-libvirt.html#virStreamRecvAll" [javadoc] x:\src\libvirt-java\src\main\java\org\libvirt\Stream.java:130: warning - Tag @see:illegal character: "47" in "http://www.libvirt.org/html/libvi rt-libvirt.html#virStreamRecvAll" [javadoc] x:\src\libvirt-java\src\main\java\org\libvirt\Stream.java:130: warning - Tag @see:illegal character: "47" in "http://www.libvirt.org/html/libvi rt-libvirt.html#virStreamRecvAll" [javadoc] x:\src\libvirt-java\src\main\java\org\libvirt\Stream.java:130: warning - Tag @see:illegal character: "45" in "http://www.libvirt.org/html/libvi rt-libvirt.html#virStreamRecvAll" [javadoc] x:\src\libvirt-java\src\main\java\org\libvirt\Stream.java:130: warning - Tag @see: reference not found: http://www.libvirt.org/html/libvirt-lib virt.html#virStreamRecvAll --- --- diff --git a/src/main/java/org/libvirt/Connect.java b/src/main/java/org/libvirt/Connect.java index 77336f0..de75f20 100644 --- a/src/main/java/org/libvirt/Connect.java +++ b/src/main/java/org/libvirt/Connect.java @@ -381,7 +381,7 @@ public class Connect { * Documentation</a> * @param callbackID * the callback to deregister - * @return + * @return 0 on success, -1 on failure * @throws LibvirtException */ public int domainEventDeregister(int callbackID) throws LibvirtException { @@ -400,7 +400,7 @@ public class Connect { int action); } - private interface GenericCallback { + protected interface GenericCallback { void eventCallback(Connect connect, Domain domain); } public interface RebootCallback extends GenericCallback { @@ -638,7 +638,7 @@ public class Connect { * domain configuration file describing the domain. The format of the native * data is hypervisor dependant. * - * @return + * @return domain XML as String, or {@code null} on error * @throws LibvirtException */ public String domainXMLFromNative(String nativeFormat, String nativeConfig, int flags) throws LibvirtException { @@ -652,7 +652,7 @@ public class Connect { * native configuration file describing the domain. The format of the native * data is hypervisor dependant. * - * @return + * @return domain XML as String, or {@code null} on error * @throws LibvirtException */ public String domainXMLToNative(String nativeFormat, String domainXML, int flags) throws LibvirtException { diff --git a/src/main/java/org/libvirt/Domain.java b/src/main/java/org/libvirt/Domain.java index fd7a03a..fe9f3b0 100644 --- a/src/main/java/org/libvirt/Domain.java +++ b/src/main/java/org/libvirt/Domain.java @@ -675,7 +675,7 @@ public class Domain { * @see <a * href="http://www.libvirt.org/html/libvirt-libvirt.html#virDomainManagedSaveRemove">Libvirt * Documentation</a> - * @return + * @return 0 in case of success, and -1 in case of error * @throws LibvirtException */ public int managedSaveRemote() throws LibvirtException { @@ -778,8 +778,9 @@ public class Domain { * Migrate the domain object from its current host to the destination host * given by duri. * - * @see http - * ://www.libvirt.org/html/libvirt-libvirt.html#virDomainMigrateToURI + * @see <a + * href="http://www.libvirt.org/html/libvirt-libvirt.html#virDomainMigrateToURI"> + * virDomainMigrateToURI</a> * * @param uri * The destination URI diff --git a/src/main/java/org/libvirt/DomainSnapshot.java b/src/main/java/org/libvirt/DomainSnapshot.java index e9a23d6..add6830 100644 --- a/src/main/java/org/libvirt/DomainSnapshot.java +++ b/src/main/java/org/libvirt/DomainSnapshot.java @@ -34,7 +34,7 @@ public class DomainSnapshot { * Documentation</a> * @param flags * controls teh deletion - * @return + * @return 0 if the selected snapshot(s) were successfully deleted, -1 on error. * @throws LibvirtException */ public int delete(int flags) throws LibvirtException { diff --git a/src/main/java/org/libvirt/StoragePool.java b/src/main/java/org/libvirt/StoragePool.java index a3d59a9..0328d8c 100644 --- a/src/main/java/org/libvirt/StoragePool.java +++ b/src/main/java/org/libvirt/StoragePool.java @@ -343,7 +343,7 @@ public class StoragePool { * as input. Information for the new volume (name, perms) are passed via a * typical volume XML description. * - * @return + * @return The storage volume, or {@code null} on error. * @throws LibvirtException */ public StorageVol storageVolCreateXMLFrom(String xmlDesc, StorageVol cloneVolume, int flags) diff --git a/src/main/java/org/libvirt/Stream.java b/src/main/java/org/libvirt/Stream.java index fdef3a4..6374567 100644 --- a/src/main/java/org/libvirt/Stream.java +++ b/src/main/java/org/libvirt/Stream.java @@ -121,7 +121,7 @@ public class Stream { /** * Batch receive method * - * @see http://www.libvirt.org/html/libvirt-libvirt.html#virStreamRecvAll + * @see <a href="http://www.libvirt.org/html/libvirt-libvirt.html#virStreamRecvAll">virStreamRecvAll</a> * @param handler * the callback handler * @return 0 if successfule, -1 otherwise --- Best regards, 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

2 4

[libvirt] [PATCH] fixed segfault in virauth
by Martin Kletzander 23 Jul '12

23 Jul '12

No check for conn->uri being NULL in virAuthGetConfigFilePath (valid state) made the client segfault. This happens with fresh defalt VDSM configuration for example. The check ought to be enough as conn->uri being NULL is valid in later code. --- src/util/virauth.c | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/util/virauth.c b/src/util/virauth.c index e6b1db0..2c1a4ae 100644 --- a/src/util/virauth.c +++ b/src/util/virauth.c @@ -1,7 +1,7 @@ /* * virauth.c: authentication related utility functions * - * Copyright (C) 2010 Matthias Bolte <matthias.bolte(a)googlemail.com> + * Copyright (C) 2010, 2012 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 @@ -54,14 +54,16 @@ int virAuthGetConfigFilePath(virConnectPtr conn, return 0; } - for (i = 0 ; i < conn->uri->paramsCount ; i++) { - if (STREQ_NULLABLE(conn->uri->params[i].name, "authfile") && - conn->uri->params[i].value) { - VIR_DEBUG("Using path from URI '%s'", - conn->uri->params[i].value); - if (!(*path = strdup(conn->uri->params[i].value))) - goto no_memory; - return 0; + if (conn && conn->uri) { + for (i = 0 ; i < conn->uri->paramsCount ; i++) { + if (STREQ_NULLABLE(conn->uri->params[i].name, "authfile") && + conn->uri->params[i].value) { + VIR_DEBUG("Using path from URI '%s'", + conn->uri->params[i].value); + if (!(*path = strdup(conn->uri->params[i].value))) + goto no_memory; + return 0; + } } } -- 1.7.8.6

3 2

[libvirt] [PATCH] qemu: Set swap_hard_limit before hard_limit
by Osier Yang 23 Jul '12

23 Jul '12

Setting hard_limit larger than previous swap_hard_limit must fail, it's not that good if one wants to change the swap_hard_limit and hard_limit together. E.g. % virsh memtune rhel6 hard_limit : 1000000 soft_limit : 1000000 swap_hard_limit: 1000000 % virsh memtune rhel6 --hard-limit 1000020 --soft-limit 1000020 \ --swap-hard-limit 1000020 --live This patch reoder the limits setting to set the swap_hard_limit first. --- src/qemu/qemu_driver.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index dc04d13..1abdd27 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -6625,43 +6625,43 @@ qemuDomainSetMemoryParameters(virDomainPtr dom, for (i = 0; i < nparams; i++) { virTypedParameterPtr param = &params[i]; - if (STREQ(param->field, VIR_DOMAIN_MEMORY_HARD_LIMIT)) { + if (STREQ(param->field, VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT)) { if (flags & VIR_DOMAIN_AFFECT_LIVE) { - rc = virCgroupSetMemoryHardLimit(group, params[i].value.ul); + rc = virCgroupSetMemSwapHardLimit(group, params[i].value.ul); if (rc != 0) { virReportSystemError(-rc, "%s", - _("unable to set memory hard_limit tunable")); + _("unable to set swap_hard_limit tunable")); ret = -1; } } - if (flags & VIR_DOMAIN_AFFECT_CONFIG) { - persistentDef->mem.hard_limit = params[i].value.ul; + persistentDef->mem.swap_hard_limit = params[i].value.ul; } - } else if (STREQ(param->field, VIR_DOMAIN_MEMORY_SOFT_LIMIT)) { + } else if (STREQ(param->field, VIR_DOMAIN_MEMORY_HARD_LIMIT)) { if (flags & VIR_DOMAIN_AFFECT_LIVE) { - rc = virCgroupSetMemorySoftLimit(group, params[i].value.ul); + rc = virCgroupSetMemoryHardLimit(group, params[i].value.ul); if (rc != 0) { virReportSystemError(-rc, "%s", - _("unable to set memory soft_limit tunable")); + _("unable to set memory hard_limit tunable")); ret = -1; } } if (flags & VIR_DOMAIN_AFFECT_CONFIG) { - persistentDef->mem.soft_limit = params[i].value.ul; + persistentDef->mem.hard_limit = params[i].value.ul; } - } else if (STREQ(param->field, VIR_DOMAIN_MEMORY_SWAP_HARD_LIMIT)) { + } else if (STREQ(param->field, VIR_DOMAIN_MEMORY_SOFT_LIMIT)) { if (flags & VIR_DOMAIN_AFFECT_LIVE) { - rc = virCgroupSetMemSwapHardLimit(group, params[i].value.ul); + rc = virCgroupSetMemorySoftLimit(group, params[i].value.ul); if (rc != 0) { virReportSystemError(-rc, "%s", - _("unable to set swap_hard_limit tunable")); + _("unable to set memory soft_limit tunable")); ret = -1; } } + if (flags & VIR_DOMAIN_AFFECT_CONFIG) { - persistentDef->mem.swap_hard_limit = params[i].value.ul; + persistentDef->mem.soft_limit = params[i].value.ul; } } } -- 1.7.7.3

3 3

[libvirt] [PATCH] More advanced auto-detection of driver module directory
by Daniel P. Berrange 23 Jul '12

23 Jul '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> When running directly from GIT, libvirtd attempts to locate the directory containing loadable modules. This currently only works if executing libvirtd with a CWD inside the libvirt source tree. Switch to locate based on the path to the current binary instead --- daemon/libvirtd.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index b5c0102..a7bb9dd 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -972,9 +972,27 @@ int main(int argc, char **argv) { virLogSetFromEnv(); #ifdef WITH_DRIVER_MODULES - if (strstr(argv[0], "lt-libvirtd") && - (access("./.git", R_OK) >= 0 || access("../.git", R_OK) >= 0)) - virDriverModuleInitialize("./src/.libs"); + if (strstr(argv[0], "lt-libvirtd")) { + char *tmp = strrchr(argv[0], '/'); + if (!tmp) { + fprintf(stderr, _("%s: cannot identify driver directory\n"), argv[0]); + exit(EXIT_FAILURE); + } + *tmp = '\0'; + char *driverdir; + if (virAsprintf(&driverdir, "%s/../../src/.libs", argv[0]) < 0) { + fprintf(stderr, _("%s: initialization failed\n"), argv[0]); + exit(EXIT_FAILURE); + } + if (access(driverdir, R_OK) < 0) { + fprintf(stderr, _("%s: expected driver directory '%s' is missing\n"), + argv[0], driverdir); + exit(EXIT_FAILURE); + } + virDriverModuleInitialize(driverdir); + *tmp = '/'; + /* Must not free 'driverdir' - it is still used */ + } #endif while (1) { -- 1.7.10.4

2 1

[libvirt] [PATCH] Make ESX & Hyper-V code generator safe with parallel builds
by Daniel P. Berrange 23 Jul '12

23 Jul '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> If from a clean GIT checkout 'make -j 8' is run, the ESX and Hyper-V code will be generated multiple times over. This is because there are multiple files being generated from one invocation of the generator script. make does not realize this and so invokes the generator once per file. This doesn't matter with serialized builds, but with parallel builds multiple instances of the generator get run at once. make[2]: Entering directory `/home/berrange/src/virt/libvirt/src' GEN util/virkeymaps.h GEN remote/remote_protocol.h GEN remote/remote_client_bodies.h GEN remote/qemu_protocol.h GEN remote/qemu_client_bodies.h GEN esx/esx_vi_methods.generated.c GEN esx/esx_vi_methods.generated.h GEN esx/esx_vi_methods.generated.macro GEN esx/esx_vi_types.generated.c GEN esx/esx_vi_types.generated.h GEN esx/esx_vi_types.generated.typedef GEN esx/esx_vi_types.generated.typedef GEN esx/esx_vi_types.generated.typeenum GEN esx/esx_vi_types.generated.typetostring GEN esx/esx_vi_types.generated.typefromstring GEN esx/esx_vi_types.generated.h GEN esx/esx_vi_types.generated.c GEN esx/esx_vi_methods.generated.h GEN esx/esx_vi_methods.generated.c GEN esx/esx_vi_methods.generated.macro GEN esx/esx_vi.generated.h GEN esx/esx_vi.generated.c GEN esx/esx_vi_types.generated.typeenum GEN esx/esx_vi_types.generated.typedef GEN esx/esx_vi_types.generated.typeenum GEN esx/esx_vi_types.generated.typetostring GEN esx/esx_vi_types.generated.typefromstring GEN esx/esx_vi_types.generated.h GEN esx/esx_vi_types.generated.c GEN esx/esx_vi_methods.generated.h ...snip... GEN hyperv/hyperv_wmi.generated.h GEN libvirt_qemu_probes.h GEN locking/qemu-sanlock.conf GEN hyperv/hyperv_wmi.generated.c GEN rpc/virnetprotocol.h GEN hyperv/hyperv_wmi_classes.generated.typedef GEN hyperv/hyperv_wmi_classes.generated.h GEN hyperv/hyperv_wmi_classes.generated.c GEN rpc/virkeepaliveprotocol.h GEN remote/remote_protocol.c GEN remote/qemu_protocol.c GEN rpc/virkeepaliveprotocol.c GEN rpc/virnetprotocol.c GEN libvirt.def Prevent this using a timestamp file to control generation, as was previously done for the python bindings in commit a7868e0131516ef2dece82586edd52dc87fe336c Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- .gitignore | 1 + src/Makefile.am | 25 ++++++++++++++++++++----- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 46dbcdf..b4cbb5f 100644 --- a/.gitignore +++ b/.gitignore @@ -93,6 +93,7 @@ /python/libvirt.py /python/libvirt_qemu.py /sc_* +/src/.*.stamp /src/esx/*.generated.* /src/hyperv/*.generated.* /src/libvirt*.def diff --git a/src/Makefile.am b/src/Makefile.am index a9f8d94..93fcf3b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -874,9 +874,17 @@ endif BUILT_SOURCES += $(ESX_DRIVER_GENERATED) -$(ESX_DRIVER_GENERATED): $(srcdir)/esx/esx_vi_generator.input \ +ESX_GENERATED_STAMP = .esx_vi_generator.stamp + +$(ESX_DRIVER_GENERATED): $(ESX_GENERATED_STAMP) + +$(ESX_GENERATED_STAMP): $(srcdir)/esx/esx_vi_generator.input \ $(srcdir)/esx/esx_vi_generator.py - $(AM_V_GEN)srcdir=$(srcdir) $(PYTHON) $(srcdir)/esx/esx_vi_generator.py + $(AM_V_GEN)srcdir=$(srcdir) $(PYTHON) $(srcdir)/esx/esx_vi_generator.py \ + && touch $@ + +MAINTAINERCLEANFILES += $(ESX_DRIVER_GENERATED) $(ESX_GENERATED_STAMP) + if WITH_ESX noinst_LTLIBRARIES += libvirt_driver_esx.la @@ -892,9 +900,16 @@ endif BUILT_SOURCES += $(HYPERV_DRIVER_GENERATED) -$(HYPERV_DRIVER_GENERATED): $(srcdir)/hyperv/hyperv_wmi_generator.input \ +HYPERV_GENERATED_STAMP = .hyperv_wmi_generator.stamp + +$(HYPERV_DRIVER_GENERATED): $(HYPERV_GENERATED_STAMP) + +$(HYPERV_GENERATED_STAMP): $(srcdir)/hyperv/hyperv_wmi_generator.input \ $(srcdir)/hyperv/hyperv_wmi_generator.py - $(AM_V_GEN)srcdir=$(srcdir) $(PYTHON) $(srcdir)/hyperv/hyperv_wmi_generator.py + $(AM_V_GEN)srcdir=$(srcdir) $(PYTHON) $(srcdir)/hyperv/hyperv_wmi_generator.py \ + && touch $@ + +MAINTAINERCLEANFILES += $(HYPERV_DRIVER_GENERATED) $(HYPERV_GENERATED_STAMP) if WITH_HYPERV noinst_LTLIBRARIES += libvirt_driver_hyperv.la @@ -1675,4 +1690,4 @@ endif CLEANFILES += *.gcov .libs/*.gcda .libs/*.gcno *.gcno *.gcda *.i *.s DISTCLEANFILES += $(GENERATED_SYM_FILES) -MAINTAINERCLEANFILES += $(REMOTE_DRIVER_GENERATED) $(VIR_NET_RPC_GENERATED) $(ESX_DRIVER_GENERATED) +MAINTAINERCLEANFILES += $(REMOTE_DRIVER_GENERATED) $(VIR_NET_RPC_GENERATED) -- 1.7.10.4

2 1

[libvirt] [PATCH libguestfs 0/4] Add a libvirt backend to libguestfs.
by Richard W.M. Jones 23 Jul '12

23 Jul '12

This preliminary patch series adds a libvirt backend to libguestfs. It's for review only because although it launches the guest OK, there are some missing features that need to be implemented. The meat of the patch is in part 4/4. To save you the trouble of interpreting libxml2 fragments, an example of the generated XML and the corresponding qemu command line are attached below. Note the hack required to work around lack of support for '-drive [...]snapshot=on' Some questions: - I've tried to use the minimum set of XML possible to create the guest, leaving libvirt to fill out as much as possible. How does this XML look? - The <name> is mandatory, and I generate one randomly. Is this a good idea? I notice that my $HOME/.libvirt directory fills up with random files. Really I'd like libvirt to generate a random name and just deal with the logfiles. - How do we query libvirt to find out if qemu supports virtio-scsi? - Will <source file> work if the source is a host device? - Since when has <memory unit> attribute been available? For example, is it available in RHEL 6? - I'm using type="kvm" and I've only tested this on baremetal, but I don't want to force KVM. If only software emulation is available, I'd like to use it. - Is there an easy way to get -cpu host? Although I have the libvirt capabilities, I'd prefer not to have to parse it if I can avoid that, since libxml2 from C is so arcane. Comments: - <source mode> attribute is undocumented. Rich. ---------------------------------------------------------------------- <?xml version="1.0"?> <domain type="kvm" xmlns:qemu="http://libvirt.org/schemas/domain/qemu/1.0"> <name>1dhdpe3sb9ub2vxd</name> <memory unit="MiB">500</memory> <currentMemory unit="MiB">500</currentMemory> <vcpu>1</vcpu> <clock offset="utc"/> <os> <type>hvm</type> <kernel>/home/rjones/d/libguestfs/.guestfs-500/kernel.3198</kernel> <initrd>/home/rjones/d/libguestfs/.guestfs-500/initrd.3198</initrd> <cmdline>panic=1 console=ttyS0 udevtimeout=600 no_timer_check acpi=off printk.time=1 cgroup_disable=memory root=/dev/sdb selinux=0 guestfs_verbose=1 TERM=xterm </cmdline> </os> <devices> <controller type="scsi" index="0" model="virtio-scsi"/> <disk type="file" device="disk"> <source file="/home/rjones/d/libguestfs/test1.img"/> <target dev="sda" bus="scsi"/> <driver name="qemu" format="raw" cache="none"/> <address type="drive" controller="0" bus="0" target="0" unit="0"/> </disk> <disk type="file" device="disk"> <source file="/home/rjones/d/libguestfs/.guestfs-500/root.3198"/> <target dev="sdb" bus="scsi"/> <driver name="qemu" format="raw" cache="unsafe"/> <address type="drive" controller="0" bus="0" target="1" unit="0"/> </disk> <channel type="unix"> <source mode="bind" path="/home/rjones/d/libguestfs/libguestfsSSg3Kl/guestfsd.sock"/> <target type="virtio" name="org.libguestfs.channel.0"/> </channel> </devices> <qemu:commandline> <qemu:arg value="-set"/> <qemu:arg value="drive.drive-scsi0-0-1-0.snapshot=on"/> </qemu:commandline> </domain> /usr/bin/qemu-kvm -S -M pc-1.1 -enable-kvm -m 500 -smp 1,sockets=1,cores=1,threads=1 -name 1dhdpe3sb9ub2vxd -uuid efcc8ab8-7193-da14-a72c-acbb82a1b975 -nographic -nodefconfig -nodefaults -chardev socket,id=charmonitor,path=/home/rjones/.libvirt/qemu/lib/1dhdpe3sb9ub2vxd.monitor,server,nowait -mon chardev=charmonitor,id=monitor,mode=control -rtc base=utc -no-shutdown -no-acpi -kernel /home/rjones/d/libguestfs/.guestfs-500/kernel.3198 -initrd /home/rjones/d/libguestfs/.guestfs-500/initrd.3198 -append panic=1 console=ttyS0 udevtimeout=600 no_timer_check acpi=off printk.time=1 cgroup_disable=memory root=/dev/sdb selinux=0 guestfs_verbose=1 TERM=xterm -device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 -device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 -device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x4 -drive file=/home/rjones/d/libguestfs/test1.img,if=none,id=drive-scsi0-0-0-0,format=raw,cache=none -device scsi-disk,bus=scsi0.0,channel=0,scsi-id=0,lun=0,drive=driv! e-scsi0-0-0-0,id=scsi0-0-0-0,bootindex=1 -drive file=/home/rjones/d/libguestfs/.guestfs-500/root.3198,if=none,id=drive-scsi0-0-1-0,format=raw,cache=unsafe -device scsi-disk,bus=scsi0.0,channel=0,scsi-id=1,lun=0,drive=drive-scsi0-0-1-0,id=scsi0-0-1-0 -chardev socket,id=charchannel0,path=/home/rjones/d/libguestfs/libguestfsSSg3Kl/guestfsd.sock,server,nowait -device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,id=channel0,name=org.libguestfs.channel.0 -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 -set drive.drive-scsi0-0-1-0.snapshot=on

2 18

[libvirt] [PATCHv5 0/2] Implementation of virConnectListAllDomains() for esx and hyperv
by Peter Krempa 23 Jul '12

23 Jul '12

This is the rest of the virConnectListAllDomains() that is not yet merged. I've rebased it to current upstream and bumped the version numbers. Peter Krempa (2): hyperv: Add implementation for virConnectListAllDomains() esx: Add implementation for virConnectListAllDomains() src/esx/esx_driver.c | 195 ++++++++++++++++++++++++++++++++++++++++++++ src/hyperv/hyperv_driver.c | 136 ++++++++++++++++++++++++++++++ 2 files changed, 331 insertions(+), 0 deletions(-) -- 1.7.8.6

1 2

[libvirt] [PATCH 00/23] Convert remaining areas of code to use virReportError
by Daniel P. Berrange 23 Jul '12

23 Jul '12

6 52

[libvirt] [PATCHv2 0/6] Add usb controller model="none"
by Peter Krempa 23 Jul '12

23 Jul '12

This is a rebase of the previous version. There are no changes except solving conflicts in tests/qemuxml2argvtest.c after new tests were added lately. This series adds support for completely disabling USB bus for a host if a user requires this. For this to work a new USB controller model "none" was added that removes the USB bus. The controller is added in patches 2-4. Patch 1 cleans up some nits (and is not necessary) and patches 5 and 6 tweak qemuxml2argvtest and add tests to check the new controller. Peter Krempa (6): maint: Clean up coding style domain_conf: Add USB controler model "none" domain_conf: Add helpers to verify if device configuration is valid qemu: Add support for "none" USB controller tests: Add support for catching domain XML parsing errors tests: Add tests to check the new USB "none" controller docs/schemas/domaincommon.rng | 1 + src/conf/domain_conf.c | 121 +++++- src/conf/domain_conf.h | 6 + src/libvirt_private.syms | 2 + src/qemu/qemu_command.c | 29 +- src/qemu/qemu_driver.c | 13 +- .../qemuxml2argvdata/qemuxml2argv-usb-none-hub.xml | 19 + .../qemuxml2argv-usb-none-other.xml | 19 + .../qemuxml2argv-usb-none-usbtablet.xml | 21 + tests/qemuxml2argvdata/qemuxml2argv-usb-none.args | 5 + tests/qemuxml2argvdata/qemuxml2argv-usb-none.xml | 16 + tests/qemuxml2argvtest.c | 515 ++++++++++---------- 12 files changed, 495 insertions(+), 272 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-none-hub.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-none-other.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-none-usbtablet.xml create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-none.args create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-usb-none.xml -- 1.7.8.6

3 16

[libvirt] [PATCH] Fix time keeping example for the guest clock
by Doug Goldstein 23 Jul '12

23 Jul '12

The time keeping example was missing quotes which resulted in an error if you copied and pasted the example into a domain's XML. Additionally the rest of the examples use single quotes (') instead of double quotes (") so standardized that. --- docs/formatdomain.html.in | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in index b6e0d5d..b8db76e 100644 --- a/docs/formatdomain.html.in +++ b/docs/formatdomain.html.in @@ -983,11 +983,11 @@ <pre> ... - <clock offset="localtime"> - <timer name="rtc" tickpolicy="catchup" track="guest"> - <catchup threshold=123 slew=120 limit=10000/> + <clock offset='localtime'> + <timer name='rtc' tickpolicy='catchup' track='guest'> + <catchup threshold='123' slew='120' limit='10000'/> </timer> - <timer name="pit" tickpolicy="delay"/> + <timer name='pit' tickpolicy='delay'/> </clock> ...</pre> -- 1.7.8.6

2 1

[libvirt] [PATCH] Fix test failure when no IPv6 is avail
by Doug Goldstein 23 Jul '12

23 Jul '12

When the system doesn't have IPv6 available (e.g. not built into the kernel or the module isn't loaded), you can not create an IPv6 socket. The test determines earlier on that IPv6 isn't available then goes and creates a socket. This makes socket creation conditional on IPv6 availability. --- tests/virnetsockettest.c | 25 +++++++++++++++---------- 1 files changed, 15 insertions(+), 10 deletions(-) diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c index 204113e..33c6fd4 100644 --- a/tests/virnetsockettest.c +++ b/tests/virnetsockettest.c @@ -90,11 +90,13 @@ checkProtocols(bool *hasIPv4, bool *hasIPv6, if ((s4 = socket(AF_INET, SOCK_STREAM, 0)) < 0) goto cleanup; - if ((s6 = socket(AF_INET6, SOCK_STREAM, 0)) < 0) - goto cleanup; + if (*hasIPv6) { + if ((s6 = socket(AF_INET6, SOCK_STREAM, 0)) < 0) + goto cleanup; - if (setsockopt(s6, IPPROTO_IPV6, IPV6_V6ONLY, &only, sizeof(only)) < 0) - goto cleanup; + if (setsockopt(s6, IPPROTO_IPV6, IPV6_V6ONLY, &only, sizeof(only)) < 0) + goto cleanup; + } memset(&in4, 0, sizeof(in4)); memset(&in6, 0, sizeof(in6)); @@ -114,13 +116,16 @@ checkProtocols(bool *hasIPv4, bool *hasIPv6, } goto cleanup; } - if (bind(s6, (struct sockaddr *)&in6, sizeof(in6)) < 0) { - if (errno == EADDRINUSE) { - VIR_FORCE_CLOSE(s4); - VIR_FORCE_CLOSE(s6); - continue; + + if (*hasIPv6) { + if (bind(s6, (struct sockaddr *)&in6, sizeof(in6)) < 0) { + if (errno == EADDRINUSE) { + VIR_FORCE_CLOSE(s4); + VIR_FORCE_CLOSE(s6); + continue; + } + goto cleanup; } - goto cleanup; } *freePort = BASE_PORT + i; -- 1.7.8.6

2 1

[libvirt] Preferred CPU model not allowed by hypervisor
by Jared 23 Jul '12

23 Jul '12

Hi. I'm having a weird problem where libvirt/qemu/kvm won't let me use the model processor I have defined in my domain's config file. Instead, I get the error message in libvirtd.log that: warning : x86Decode:1346 : Preferred CPU model Nehalem not allowed by hypervisor; closest supported model will be used If I review the qemu log for that particular domain, I see that my CPU has been changed to this: -cpu kvm64,+lahf_lm,+popcnt,+sse4.2,+sse4.1,+ssse3 (in other places, I see it set to core2duo rather than kvm64) However, it *should* be Nehalem. For some background, I'm running lvm on a westmere proc, which is the successor to Nehalem. I'm specifying Nehalem as the target platform, though, to make it easier to migrate to another server if necessary. I do have this same problem if I set this to Westmere, though, so it's not unique to Nehalem. As for support and capabilities, libvirt correctly detects my host CPU as Westmere: $ virsh capabilities | grep model <model>Westmere</model> qemu-kvm does (as far as I can tell) support Nehalem: $ qemu-kvm -cpu ?model | grep Nehalem x86 Nehalem Intel Core i7 9xx (Nehalem Class Core i7) Nehalem is defined in qmeu's target-x86_64.conf: grep Nehalem /etc/qemu/target-x86_64.conf name = "Nehalem" model_id = "Intel Core i7 9xx (Nehalem Class Core i7)" And if I run a cpu check on the processor, it seems to work fine: $ qemu-kvm -cpu Nehalem,check VNC server running on `127.0.0.1:5900' So, I I'm creating the new domain as a virt-install with the qemu-kvm backend as follows: virt-install --name=test --ram=1024 --arch=x86_64 --vcpus=2 --cpu=Nehalem --virt-type=kvm <SNIP> This results in the following cpu configuration: <cpu mode='custom' match='exact'> <model fallback='allow'>Nehalem</model> </cpu> But then, when I start this domain, I get the error message posted above. Any ideas what's going on here? I'm at a loss, and unfortunately I don't have much experience with kvm/libvirt just yet so I don't know what I should be focusing on for troubleshooting. Would appreciate any suggestions or guidance. Thanks. -- Jared

3 4

[libvirt] [RFC] [PATCH] Support for uevent netlink and hotplug event.
by tangchen 23 Jul '12

23 Jul '12

NOTE: This patch is just for some comments, so that we can try to improve netlink support in libvirt. This patch introduces a new global array servers[MAX_LINKS], and all the netlink protocol (at most 32 protocols) can be supportted. And also, it creates a NETLINK_KOBJECT_UEVENT socket to listen to hotplug events. Signed-off-by: Tang Chen <tangchen(a)cn.fujitsu.com> --- src/libvirt_private.syms | 1 + src/util/virnetlink.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++ src/util/virnetlink.h | 5 +++ 3 files changed, 109 insertions(+) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index 7373281..0ef21d9 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1378,6 +1378,7 @@ virNetlinkEventServiceIsRunning; virNetlinkEventServiceLocalPid; virNetlinkEventServiceStop; virNetlinkEventServiceStart; +virNetlinkEventServiceStartProtocol; virNetlinkShutdown; virNetlinkStartup; diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c index bb0dae9..489c149 100644 --- a/src/util/virnetlink.c +++ b/src/util/virnetlink.c @@ -98,6 +98,7 @@ static int nextWatch = 1; # define NETLINK_EVENT_ALLOC_EXTENT 10 static virNetlinkEventSrvPrivatePtr server = NULL; +static virNetlinkEventSrvPrivatePtr servers[MAX_LINKS] = {NULL}; static virNetlinkHandle *placeholder_nlhandle = NULL; /* Function definitions */ @@ -307,6 +308,8 @@ virNetlinkEventCallback(int watch, return; } + VIR_INFO("%s", msg); + virNetlinkEventServerLock(srv); VIR_DEBUG("dispatching to max %d clients, called from event watch %d", @@ -398,6 +401,106 @@ int virNetlinkEventServiceLocalPid(void) /** + * virNetlinkEventServiceStartProtocol: + * + * start a monitor to receive netlink messages for libvirtd. + * This registers a netlink socket with the event interface. + * + * @protocol: netlink protocol + * @groups: broadcast groups to join + * Returns -1 if the monitor cannot be registered, 0 upon success + */ +int +virNetlinkEventServiceStartProtocol(int protocol, int groups) +{ + virNetlinkEventSrvPrivatePtr srv; + int fd; + int ret = -1; + + if (protocol < 0 || protocol >= MAX_LINKS || + groups < 0 || groups >= 32) { + return -EINVAL; + } + + if (servers[protocol]) + return 0; + + VIR_INFO("starting netlink event service with protocol %d", protocol); + + if (VIR_ALLOC(srv) < 0) { + virReportOOMError(); + return -1; + } + + if (virMutexInit(&srv->lock) < 0) { + VIR_FREE(srv); + return -1; + } + + virNetlinkEventServerLock(srv); + + /* Allocate a new socket and get fd */ + srv->netlinknh = virNetlinkAlloc(); + + if (!srv->netlinknh) { + virReportSystemError(errno, + "%s", _("cannot allocate nlhandle for virNetlinkEvent server")); + goto error_locked; + } + + nl_join_groups(srv->netlinknh, groups); + + if (nl_connect(srv->netlinknh, protocol) < 0) { + virReportSystemError(errno, + "%s", _("cannot connect to netlink socket")); + goto error_server; + } + + fd = nl_socket_get_fd(srv->netlinknh); + + if (fd < 0) { + virReportSystemError(errno, + "%s", _("cannot get netlink socket fd")); + goto error_server; + } + + if (nl_socket_set_nonblocking(srv->netlinknh)) { + virReportSystemError(errno, "%s", + _("cannot set netlink socket nonblocking")); + goto error_server; + } + + if ((srv->eventwatch = virEventAddHandle(fd, + VIR_EVENT_HANDLE_READABLE, + virNetlinkEventCallback, + srv, NULL)) < 0) { + netlinkError(VIR_ERR_INTERNAL_ERROR, "%s", + _("Failed to add netlink event handle watch")); + goto error_server; + } + + srv->netlinkfd = fd; + VIR_DEBUG("netlink event listener on fd: %i running", fd); + + ret = 0; + servers[protocol] = srv; + +error_server: + if (ret < 0) { + nl_close(srv->netlinknh); + virNetlinkFree(srv->netlinknh); + } +error_locked: + virNetlinkEventServerUnlock(srv); + if (ret < 0) { + virMutexDestroy(&srv->lock); + VIR_FREE(srv); + } + return ret; +} + + +/** * virNetlinkEventServiceStart: * * start a monitor to receive netlink messages for libvirtd. diff --git a/src/util/virnetlink.h b/src/util/virnetlink.h index 8ec27c9..256f129 100644 --- a/src/util/virnetlink.h +++ b/src/util/virnetlink.h @@ -59,6 +59,11 @@ int virNetlinkEventServiceStop(void); int virNetlinkEventServiceStart(void); /** + * startNetlinkEventServerProtocol: start a monitor with specified protocol to receive netlink messages for libvirtd + */ +int virNetlinkEventServiceStartProtocol(int protocol, int groups); + +/** * virNetlinkEventServiceIsRunning: returns if the netlink event service is running. */ bool virNetlinkEventServiceIsRunning(void); -- 1.7.10.2

2 3

[libvirt] [Libvirt][PATCH] ESX: Fix ESX_VI__TEMPLATE__DYNAMIC_DEEP_COPY
by Ata E Husain Bohra 23 Jul '12

23 Jul '12

Fix addresses two issues: 1. Fix generator code to allow deep copy operation for objects with Dynamic_Cast capabilities. 2. Add missing deep copy routine to Long datatype. Signed-off-by: Ata E Husain Bohra <ata.husain(a)hotmail.com> --- src/esx/esx_vi_generator.py | 2 +- src/esx/esx_vi_types.c | 29 ++++++++++++++++++++++++++++- src/esx/esx_vi_types.h | 1 + 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/src/esx/esx_vi_generator.py b/src/esx/esx_vi_generator.py index 8a128df..97b8e15 100755 --- a/src/esx/esx_vi_generator.py +++ b/src/esx/esx_vi_generator.py @@ -832,7 +832,7 @@ class Object(Type): else: if self.features & Object.FEATURE__DEEP_COPY: source += "/* esxVI_%s_DeepCopy */\n" % self.name - source += "ESX_VI__TEMPLATE__DYNAMIC_DEEP_COPY(%s)\n" % self.name + source += "ESX_VI__TEMPLATE__DYNAMIC_DEEP_COPY(%s,\n" % self.name source += "{\n" for extended_by in self.extended_by: diff --git a/src/esx/esx_vi_types.c b/src/esx/esx_vi_types.c index 844fb65..8211c93 100644 --- a/src/esx/esx_vi_types.c +++ b/src/esx/esx_vi_types.c @@ -549,6 +549,21 @@ } +#define ESX_VI__TEMPLATE__DEEPCOPY_DISPATCH(_actual_type, __type, _dispatch, \ + _error_return) \ + switch (_actual_type) { \ + _dispatch \ + \ + case esxVI_Type_##__type: \ + break; \ + \ + default: \ + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, \ + _("Call to %s for unexpected type '%s'"), __FUNCTION__, \ + esxVI_Type_ToString(_actual_type)); \ + return _error_return; \ + } + #define ESX_VI__TEMPLATE__DISPATCH__FREE(_type) \ case esxVI_Type_##_type: \ @@ -559,7 +574,7 @@ #define ESX_VI__TEMPLATE__DISPATCH__DEEP_COPY(_type) \ case esxVI_Type_##_type: \ - return esxVI_##_type##_DeepCopy((esxVI_##_type **)dst, \ + return esxVI_##_type##_DeepCopy((esxVI_##_type **)dest, \ (esxVI_##_type *)src); @@ -584,6 +599,12 @@ +#define ESX_VI__TEMPLATE__DYNAMIC_DEEP_COPY(__type, _dispatch, _body) \ + ESX_VI__TEMPLATE__DEEP_COPY(__type, \ + ESX_VI__TEMPLATE__DEEPCOPY_DISPATCH(src->_type, __type, _dispatch, -1) \ + _body) + + #define ESX_VI__TEMPLATE__DYNAMIC_FREE(__type, _dispatch, _body) \ ESX_VI__TEMPLATE__FREE(__type, \ ESX_VI__TEMPLATE__DISPATCH(item->_type, __type, _dispatch, \ @@ -1334,6 +1355,12 @@ ESX_VI__TEMPLATE__VALIDATE(Long, { }) +/* esxVI_Long_DeepCopy */ +ESX_VI__TEMPLATE__DEEP_COPY(Long, +{ + (*dest)->value = src->value; +}) + /* esxVI_Long_AppendToList */ ESX_VI__TEMPLATE__LIST__APPEND(Long) diff --git a/src/esx/esx_vi_types.h b/src/esx/esx_vi_types.h index 3d843bf..e8d355e 100644 --- a/src/esx/esx_vi_types.h +++ b/src/esx/esx_vi_types.h @@ -235,6 +235,7 @@ struct _esxVI_Long { int esxVI_Long_Alloc(esxVI_Long **number); void esxVI_Long_Free(esxVI_Long **numberList); int esxVI_Long_Validate(esxVI_Long *number); +int esxVI_Long_DeepCopy(esxVI_Long **dest, esxVI_Long *src); int esxVI_Long_AppendToList(esxVI_Long **numberList, esxVI_Long *number); int esxVI_Long_CastFromAnyType(esxVI_AnyType *anyType, esxVI_Long **number); int esxVI_Long_Serialize(esxVI_Long *number, const char *element, -- 1.7.9.5

3 2

[libvirt] [PATCH] Desert the FSF address in copyright
by Osier Yang 23 Jul '12

23 Jul '12

Per the FSF address could be changed from time to time, and GNU recommends the following now: (http://www.gnu.org/licenses/gpl-howto.html) You should have received a copy of the GNU General Public License along with Foobar. If not, see <http://www.gnu.org/licenses/>. This patch removes the explicit FSF address, and uses above instead (of course, with inserting 'Lesser' before 'General'). Except a bunch of files for security driver, all others are changed automatically, the copyright for securify files are not complete, that's why to do it manually: src/security/security_selinux.h src/security/security_driver.h src/security/security_selinux.c src/security/security_apparmor.h src/security/security_apparmor.c src/security/security_driver.c --- daemon/libvirtd-config.c | 4 ++-- daemon/libvirtd-config.h | 4 ++-- daemon/libvirtd.c | 4 ++-- daemon/libvirtd.h | 4 ++-- daemon/remote.c | 4 ++-- daemon/remote.h | 4 ++-- daemon/stream.c | 4 ++-- daemon/stream.h | 4 ++-- src/conf/capabilities.c | 4 ++-- src/conf/capabilities.h | 4 ++-- src/conf/cpu_conf.c | 4 ++-- src/conf/cpu_conf.h | 4 ++-- src/conf/domain_audit.c | 4 ++-- src/conf/domain_audit.h | 4 ++-- src/conf/domain_conf.c | 4 ++-- src/conf/domain_conf.h | 4 ++-- src/conf/domain_event.c | 4 ++-- src/conf/domain_event.h | 4 ++-- src/conf/domain_nwfilter.c | 4 ++-- src/conf/domain_nwfilter.h | 4 ++-- src/conf/interface_conf.c | 4 ++-- src/conf/interface_conf.h | 4 ++-- src/conf/netdev_bandwidth_conf.c | 4 ++-- src/conf/netdev_bandwidth_conf.h | 4 ++-- src/conf/netdev_vport_profile_conf.c | 4 ++-- src/conf/netdev_vport_profile_conf.h | 4 ++-- src/conf/network_conf.c | 4 ++-- src/conf/network_conf.h | 4 ++-- src/conf/node_device_conf.c | 4 ++-- src/conf/node_device_conf.h | 4 ++-- src/conf/nwfilter_conf.c | 4 ++-- src/conf/nwfilter_conf.h | 4 ++-- src/conf/nwfilter_ipaddrmap.c | 4 ++-- src/conf/nwfilter_ipaddrmap.h | 4 ++-- src/conf/nwfilter_params.c | 4 ++-- src/conf/nwfilter_params.h | 4 ++-- src/conf/secret_conf.c | 4 ++-- src/conf/secret_conf.h | 4 ++-- src/conf/storage_conf.c | 4 ++-- src/conf/storage_conf.h | 4 ++-- src/conf/storage_encryption_conf.c | 4 ++-- src/conf/storage_encryption_conf.h | 4 ++-- src/conf/virconsole.c | 4 ++-- src/conf/virconsole.h | 4 ++-- src/conf/virdomainlist.c | 4 ++-- src/conf/virdomainlist.h | 4 ++-- src/cpu/cpu.c | 4 ++-- src/cpu/cpu.h | 4 ++-- src/cpu/cpu_arm.c | 4 ++-- src/cpu/cpu_arm.h | 4 ++-- src/cpu/cpu_generic.c | 4 ++-- src/cpu/cpu_generic.h | 4 ++-- src/cpu/cpu_map.c | 4 ++-- src/cpu/cpu_map.h | 4 ++-- src/cpu/cpu_powerpc.c | 4 ++-- src/cpu/cpu_powerpc.h | 4 ++-- src/cpu/cpu_s390.c | 4 ++-- src/cpu/cpu_s390.h | 4 ++-- src/cpu/cpu_x86.c | 4 ++-- src/cpu/cpu_x86.h | 4 ++-- src/cpu/cpu_x86_data.h | 4 ++-- src/datatypes.c | 4 ++-- src/datatypes.h | 4 ++-- src/driver.c | 4 ++-- src/esx/esx_device_monitor.c | 4 ++-- src/esx/esx_device_monitor.h | 4 ++-- src/esx/esx_driver.c | 4 ++-- src/esx/esx_driver.h | 4 ++-- src/esx/esx_interface_driver.c | 4 ++-- src/esx/esx_interface_driver.h | 4 ++-- src/esx/esx_network_driver.c | 4 ++-- src/esx/esx_network_driver.h | 4 ++-- src/esx/esx_nwfilter_driver.c | 4 ++-- src/esx/esx_nwfilter_driver.h | 4 ++-- src/esx/esx_private.h | 4 ++-- src/esx/esx_secret_driver.c | 4 ++-- src/esx/esx_secret_driver.h | 4 ++-- src/esx/esx_storage_driver.c | 4 ++-- src/esx/esx_storage_driver.h | 4 ++-- src/esx/esx_util.c | 4 ++-- src/esx/esx_util.h | 4 ++-- src/esx/esx_vi.c | 4 ++-- src/esx/esx_vi.h | 4 ++-- src/esx/esx_vi_methods.c | 4 ++-- src/esx/esx_vi_methods.h | 4 ++-- src/esx/esx_vi_types.c | 4 ++-- src/esx/esx_vi_types.h | 4 ++-- src/fdstream.c | 4 ++-- src/fdstream.h | 4 ++-- src/gnutls_1_0_compat.h | 4 ++-- src/hyperv/hyperv_device_monitor.c | 4 ++-- src/hyperv/hyperv_device_monitor.h | 4 ++-- src/hyperv/hyperv_driver.c | 4 ++-- src/hyperv/hyperv_driver.h | 4 ++-- src/hyperv/hyperv_interface_driver.c | 4 ++-- src/hyperv/hyperv_interface_driver.h | 4 ++-- src/hyperv/hyperv_network_driver.c | 4 ++-- src/hyperv/hyperv_network_driver.h | 4 ++-- src/hyperv/hyperv_nwfilter_driver.c | 4 ++-- src/hyperv/hyperv_nwfilter_driver.h | 4 ++-- src/hyperv/hyperv_private.h | 4 ++-- src/hyperv/hyperv_secret_driver.c | 4 ++-- src/hyperv/hyperv_secret_driver.h | 4 ++-- src/hyperv/hyperv_storage_driver.c | 4 ++-- src/hyperv/hyperv_storage_driver.h | 4 ++-- src/hyperv/hyperv_util.c | 4 ++-- src/hyperv/hyperv_util.h | 4 ++-- src/hyperv/hyperv_wmi.c | 4 ++-- src/hyperv/hyperv_wmi.h | 4 ++-- src/hyperv/hyperv_wmi_classes.c | 4 ++-- src/hyperv/hyperv_wmi_classes.h | 4 ++-- src/hyperv/openwsman.h | 4 ++-- src/interface/netcf_driver.c | 4 ++-- src/interface/netcf_driver.h | 4 ++-- src/libvirt-qemu.c | 4 ++-- src/libvirt_internal.h | 4 ++-- src/libxl/libxl_conf.c | 4 ++-- src/libxl/libxl_conf.h | 4 ++-- src/libxl/libxl_driver.c | 4 ++-- src/libxl/libxl_driver.h | 4 ++-- src/locking/domain_lock.c | 4 ++-- src/locking/domain_lock.h | 4 ++-- src/locking/lock_driver.h | 4 ++-- src/locking/lock_driver_nop.c | 4 ++-- src/locking/lock_driver_nop.h | 4 ++-- src/locking/lock_driver_sanlock.c | 4 ++-- src/locking/lock_manager.c | 4 ++-- src/locking/lock_manager.h | 4 ++-- src/lxc/lxc_cgroup.c | 4 ++-- src/lxc/lxc_cgroup.h | 4 ++-- src/lxc/lxc_conf.c | 4 ++-- src/lxc/lxc_conf.h | 4 ++-- src/lxc/lxc_container.c | 4 ++-- src/lxc/lxc_container.h | 4 ++-- src/lxc/lxc_controller.c | 4 ++-- src/lxc/lxc_domain.c | 4 ++-- src/lxc/lxc_domain.h | 4 ++-- src/lxc/lxc_driver.c | 4 ++-- src/lxc/lxc_driver.h | 4 ++-- src/lxc/lxc_process.c | 4 ++-- src/lxc/lxc_process.h | 4 ++-- src/network/bridge_driver.c | 4 ++-- src/network/bridge_driver.h | 4 ++-- src/node_device/node_device_driver.c | 4 ++-- src/node_device/node_device_driver.h | 4 ++-- src/node_device/node_device_hal.c | 4 ++-- src/node_device/node_device_hal.h | 4 ++-- src/node_device/node_device_linux_sysfs.c | 4 ++-- src/node_device/node_device_udev.c | 4 ++-- src/node_device/node_device_udev.h | 4 ++-- src/nodeinfo.c | 4 ++-- src/nodeinfo.h | 4 ++-- src/nwfilter/nwfilter_dhcpsnoop.c | 4 ++-- src/nwfilter/nwfilter_dhcpsnoop.h | 4 ++-- src/nwfilter/nwfilter_driver.c | 4 ++-- src/nwfilter/nwfilter_driver.h | 4 ++-- src/nwfilter/nwfilter_ebiptables_driver.c | 4 ++-- src/nwfilter/nwfilter_ebiptables_driver.h | 4 ++-- src/nwfilter/nwfilter_gentech_driver.c | 4 ++-- src/nwfilter/nwfilter_gentech_driver.h | 4 ++-- src/nwfilter/nwfilter_learnipaddr.c | 4 ++-- src/nwfilter/nwfilter_learnipaddr.h | 4 ++-- src/openvz/openvz_conf.c | 4 ++-- src/openvz/openvz_conf.h | 4 ++-- src/openvz/openvz_driver.c | 4 ++-- src/openvz/openvz_driver.h | 4 ++-- src/openvz/openvz_util.c | 4 ++-- src/openvz/openvz_util.h | 4 ++-- src/phyp/phyp_driver.c | 4 ++-- src/phyp/phyp_driver.h | 4 ++-- src/qemu/qemu_agent.c | 4 ++-- src/qemu/qemu_agent.h | 4 ++-- src/qemu/qemu_bridge_filter.c | 4 ++-- src/qemu/qemu_bridge_filter.h | 4 ++-- src/qemu/qemu_capabilities.c | 4 ++-- src/qemu/qemu_capabilities.h | 4 ++-- src/qemu/qemu_cgroup.c | 4 ++-- src/qemu/qemu_cgroup.h | 4 ++-- src/qemu/qemu_command.c | 4 ++-- src/qemu/qemu_command.h | 4 ++-- src/qemu/qemu_conf.c | 4 ++-- src/qemu/qemu_conf.h | 4 ++-- src/qemu/qemu_domain.c | 4 ++-- src/qemu/qemu_domain.h | 4 ++-- src/qemu/qemu_driver.c | 4 ++-- src/qemu/qemu_driver.h | 4 ++-- src/qemu/qemu_hostdev.c | 4 ++-- src/qemu/qemu_hostdev.h | 4 ++-- src/qemu/qemu_hotplug.c | 4 ++-- src/qemu/qemu_hotplug.h | 4 ++-- src/qemu/qemu_migration.c | 4 ++-- src/qemu/qemu_migration.h | 4 ++-- src/qemu/qemu_monitor.c | 4 ++-- src/qemu/qemu_monitor.h | 4 ++-- src/qemu/qemu_monitor_json.c | 4 ++-- src/qemu/qemu_monitor_json.h | 4 ++-- src/qemu/qemu_monitor_text.c | 4 ++-- src/qemu/qemu_monitor_text.h | 4 ++-- src/qemu/qemu_process.c | 4 ++-- src/qemu/qemu_process.h | 4 ++-- src/remote/remote_driver.c | 4 ++-- src/remote/remote_driver.h | 4 ++-- src/rpc/virkeepalive.c | 4 ++-- src/rpc/virkeepalive.h | 4 ++-- src/rpc/virnetclient.c | 4 ++-- src/rpc/virnetclient.h | 4 ++-- src/rpc/virnetclientprogram.c | 4 ++-- src/rpc/virnetclientprogram.h | 4 ++-- src/rpc/virnetclientstream.c | 4 ++-- src/rpc/virnetclientstream.h | 4 ++-- src/rpc/virnetmessage.c | 4 ++-- src/rpc/virnetmessage.h | 4 ++-- src/rpc/virnetsaslcontext.c | 4 ++-- src/rpc/virnetsaslcontext.h | 4 ++-- src/rpc/virnetserver.c | 4 ++-- src/rpc/virnetserver.h | 4 ++-- src/rpc/virnetserverclient.c | 4 ++-- src/rpc/virnetserverclient.h | 4 ++-- src/rpc/virnetservermdns.c | 4 ++-- src/rpc/virnetservermdns.h | 4 ++-- src/rpc/virnetserverprogram.c | 4 ++-- src/rpc/virnetserverprogram.h | 4 ++-- src/rpc/virnetserverservice.c | 4 ++-- src/rpc/virnetserverservice.h | 4 ++-- src/rpc/virnetsocket.c | 4 ++-- src/rpc/virnetsocket.h | 4 ++-- src/rpc/virnettlscontext.c | 4 ++-- src/rpc/virnettlscontext.h | 4 ++-- src/secret/secret_driver.c | 4 ++-- src/secret/secret_driver.h | 4 ++-- src/security/security_apparmor.c | 10 ++++++++++ src/security/security_apparmor.h | 10 +++++++++- src/security/security_dac.c | 4 ++-- src/security/security_dac.h | 4 ++-- src/security/security_driver.c | 9 +++++++++ src/security/security_driver.h | 9 +++++++++ src/security/security_manager.c | 4 ++-- src/security/security_manager.h | 4 ++-- src/security/security_nop.c | 4 ++-- src/security/security_nop.h | 4 ++-- src/security/security_selinux.c | 9 +++++++++ src/security/security_selinux.h | 9 +++++++++ src/security/security_stack.c | 4 ++-- src/security/security_stack.h | 4 ++-- src/storage/parthelper.c | 4 ++-- src/storage/storage_backend.c | 4 ++-- src/storage/storage_backend.h | 4 ++-- src/storage/storage_backend_disk.c | 4 ++-- src/storage/storage_backend_disk.h | 4 ++-- src/storage/storage_backend_fs.c | 4 ++-- src/storage/storage_backend_fs.h | 4 ++-- src/storage/storage_backend_iscsi.c | 4 ++-- src/storage/storage_backend_iscsi.h | 4 ++-- src/storage/storage_backend_logical.c | 4 ++-- src/storage/storage_backend_logical.h | 4 ++-- src/storage/storage_backend_mpath.c | 4 ++-- src/storage/storage_backend_mpath.h | 4 ++-- src/storage/storage_backend_rbd.c | 4 ++-- src/storage/storage_backend_rbd.h | 4 ++-- src/storage/storage_backend_scsi.c | 4 ++-- src/storage/storage_backend_scsi.h | 4 ++-- src/storage/storage_backend_sheepdog.c | 4 ++-- src/storage/storage_backend_sheepdog.h | 4 ++-- src/storage/storage_driver.c | 4 ++-- src/storage/storage_driver.h | 4 ++-- src/test/test_driver.c | 4 ++-- src/test/test_driver.h | 4 ++-- src/uml/uml_conf.c | 4 ++-- src/uml/uml_conf.h | 4 ++-- src/uml/uml_driver.c | 4 ++-- src/uml/uml_driver.h | 4 ++-- src/util/bitmap.c | 4 ++-- src/util/bitmap.h | 4 ++-- src/util/command.c | 4 ++-- src/util/command.h | 4 ++-- src/util/dnsmasq.c | 4 ++-- src/util/dnsmasq.h | 4 ++-- src/util/ebtables.c | 4 ++-- src/util/ebtables.h | 4 ++-- src/util/event.c | 4 ++-- src/util/event.h | 4 ++-- src/util/event_poll.c | 4 ++-- src/util/event_poll.h | 4 ++-- src/util/hooks.c | 4 ++-- src/util/hooks.h | 4 ++-- src/util/hostusb.c | 4 ++-- src/util/hostusb.h | 4 ++-- src/util/iohelper.c | 4 ++-- src/util/iptables.c | 4 ++-- src/util/iptables.h | 4 ++-- src/util/json.c | 4 ++-- src/util/json.h | 4 ++-- src/util/logging.c | 4 ++-- src/util/logging.h | 4 ++-- src/util/memory.c | 4 ++-- src/util/memory.h | 4 ++-- src/util/pci.c | 4 ++-- src/util/pci.h | 4 ++-- src/util/processinfo.c | 4 ++-- src/util/processinfo.h | 4 ++-- src/util/storage_file.c | 4 ++-- src/util/storage_file.h | 4 ++-- src/util/sysinfo.c | 4 ++-- src/util/sysinfo.h | 4 ++-- src/util/threadpool.c | 4 ++-- src/util/threadpool.h | 4 ++-- src/util/threads-pthread.c | 4 ++-- src/util/threads-pthread.h | 4 ++-- src/util/threads-win32.c | 4 ++-- src/util/threads-win32.h | 4 ++-- src/util/threads.c | 4 ++-- src/util/threads.h | 4 ++-- src/util/util.c | 4 ++-- src/util/util.h | 4 ++-- src/util/uuid.c | 4 ++-- src/util/uuid.h | 4 ++-- src/util/viratomic.h | 4 ++-- src/util/viraudit.c | 4 ++-- src/util/viraudit.h | 4 ++-- src/util/virauth.c | 4 ++-- src/util/virauth.h | 4 ++-- src/util/virauthconfig.c | 4 ++-- src/util/virauthconfig.h | 4 ++-- src/util/virdbus.c | 4 ++-- src/util/virdbus.h | 4 ++-- src/util/virfile.c | 4 ++-- src/util/virfile.h | 4 ++-- src/util/virhashcode.c | 4 ++-- src/util/virhashcode.h | 4 ++-- src/util/virkeycode.c | 4 ++-- src/util/virkeycode.h | 4 ++-- src/util/virkeyfile.c | 4 ++-- src/util/virkeyfile.h | 4 ++-- src/util/virmacaddr.c | 4 ++-- src/util/virmacaddr.h | 4 ++-- src/util/virnetdev.c | 4 ++-- src/util/virnetdev.h | 4 ++-- src/util/virnetdevbandwidth.c | 4 ++-- src/util/virnetdevbandwidth.h | 4 ++-- src/util/virnetdevbridge.c | 4 ++-- src/util/virnetdevbridge.h | 4 ++-- src/util/virnetdevmacvlan.c | 4 ++-- src/util/virnetdevmacvlan.h | 4 ++-- src/util/virnetdevopenvswitch.c | 4 ++-- src/util/virnetdevopenvswitch.h | 4 ++-- src/util/virnetdevtap.c | 4 ++-- src/util/virnetdevtap.h | 4 ++-- src/util/virnetdevveth.c | 4 ++-- src/util/virnetdevveth.h | 4 ++-- src/util/virnetdevvportprofile.c | 4 ++-- src/util/virnetdevvportprofile.h | 4 ++-- src/util/virnetlink.c | 4 ++-- src/util/virnetlink.h | 4 ++-- src/util/virnodesuspend.c | 4 ++-- src/util/virnodesuspend.h | 4 ++-- src/util/virpidfile.c | 4 ++-- src/util/virpidfile.h | 4 ++-- src/util/virrandom.c | 4 ++-- src/util/virrandom.h | 4 ++-- src/util/virsocketaddr.c | 4 ++-- src/util/virsocketaddr.h | 4 ++-- src/util/virterror_internal.h | 4 ++-- src/util/virtime.c | 4 ++-- src/util/virtime.h | 4 ++-- src/util/virtypedparam.c | 4 ++-- src/util/virtypedparam.h | 4 ++-- src/vbox/vbox_MSCOMGlue.c | 4 ++-- src/vbox/vbox_MSCOMGlue.h | 4 ++-- src/vbox/vbox_glue.c | 4 ++-- src/vbox/vbox_glue.h | 4 ++-- src/vmware/vmware_conf.c | 4 ++-- src/vmware/vmware_conf.h | 4 ++-- src/vmware/vmware_driver.c | 4 ++-- src/vmware/vmware_driver.h | 4 ++-- src/vmx/vmx.c | 4 ++-- src/vmx/vmx.h | 4 ++-- src/xen/xen_inotify.c | 4 ++-- src/xen/xen_inotify.h | 4 ++-- src/xen/xm_internal.c | 4 ++-- src/xen/xm_internal.h | 4 ++-- src/xenapi/xenapi_driver.c | 4 ++-- src/xenapi/xenapi_driver.h | 4 ++-- src/xenapi/xenapi_driver_private.h | 4 ++-- src/xenapi/xenapi_utils.c | 4 ++-- src/xenapi/xenapi_utils.h | 4 ++-- src/xenxs/xen_sxpr.c | 4 ++-- src/xenxs/xen_sxpr.h | 4 ++-- src/xenxs/xen_xm.c | 4 ++-- src/xenxs/xen_xm.h | 4 ++-- src/xenxs/xenxs_private.h | 4 ++-- tests/commandhelper.c | 4 ++-- tests/commandtest.c | 4 ++-- tests/cputest.c | 4 ++-- tests/eventtest.c | 4 ++-- tests/libvirtdconftest.c | 4 ++-- tests/shunloadhelper.c | 4 ++-- tests/shunloadtest.c | 4 ++-- tests/sockettest.c | 4 ++-- tests/ssh.c | 4 ++-- tests/storagebackendsheepdogtest.c | 4 ++-- tests/virauthconfigtest.c | 4 ++-- tests/virdrivermoduletest.c | 4 ++-- tests/virkeyfiletest.c | 4 ++-- tests/virnetmessagetest.c | 4 ++-- tests/virnetsockettest.c | 4 ++-- tests/virnettlscontexttest.c | 4 ++-- tests/virtimetest.c | 4 ++-- tests/viruritest.c | 4 ++-- tests/xmconfigtest.c | 4 ++-- tools/console.c | 4 ++-- tools/console.h | 4 ++-- tools/virt-host-validate-common.c | 4 ++-- tools/virt-host-validate-common.h | 4 ++-- tools/virt-host-validate-lxc.c | 4 ++-- tools/virt-host-validate-lxc.h | 4 ++-- tools/virt-host-validate-qemu.c | 4 ++-- tools/virt-host-validate-qemu.h | 4 ++-- tools/virt-host-validate.c | 4 ++-- 418 files changed, 879 insertions(+), 825 deletions(-) diff --git a/daemon/libvirtd-config.c b/daemon/libvirtd-config.c index 2875927..5374bcc 100644 --- a/daemon/libvirtd-config.c +++ b/daemon/libvirtd-config.c @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/daemon/libvirtd-config.h b/daemon/libvirtd-config.h index 082cb9c..e9c58cb 100644 --- a/daemon/libvirtd-config.h +++ b/daemon/libvirtd-config.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/daemon/libvirtd.c b/daemon/libvirtd.c index 8c434a0..b5c0102 100644 --- a/daemon/libvirtd.c +++ b/daemon/libvirtd.c @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/daemon/libvirtd.h b/daemon/libvirtd.h index fc169d3..726a1fb 100644 --- a/daemon/libvirtd.h +++ b/daemon/libvirtd.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/daemon/remote.c b/daemon/remote.c index a323852..80626a2 100644 --- a/daemon/remote.c +++ b/daemon/remote.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Richard W.M. Jones <rjones(a)redhat.com> */ diff --git a/daemon/remote.h b/daemon/remote.h index d3e1b2d..9f662cb 100644 --- a/daemon/remote.h +++ b/daemon/remote.h @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Richard W.M. Jones <rjones(a)redhat.com> * Author: Daniel P. Berrange <berrange(a)redhat.com> diff --git a/daemon/stream.c b/daemon/stream.c index a0e96af..6f26ee5 100644 --- a/daemon/stream.c +++ b/daemon/stream.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/daemon/stream.h b/daemon/stream.h index 7c2d8dc..2c74ab7 100644 --- a/daemon/stream.h +++ b/daemon/stream.h @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c index cc7d018..8b9b516 100644 --- a/src/conf/capabilities.c +++ b/src/conf/capabilities.c @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/conf/capabilities.h b/src/conf/capabilities.h index 9568b4c..460b273 100644 --- a/src/conf/capabilities.h +++ b/src/conf/capabilities.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c index 175a7ed..87e9540 100644 --- a/src/conf/cpu_conf.c +++ b/src/conf/cpu_conf.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * Jiri Denemark <jdenemar(a)redhat.com> diff --git a/src/conf/cpu_conf.h b/src/conf/cpu_conf.h index 2df0a50..601e208 100644 --- a/src/conf/cpu_conf.h +++ b/src/conf/cpu_conf.h @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * Jiri Denemark <jdenemar(a)redhat.com> diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c index cb81fa0..5300371 100644 --- a/src/conf/domain_audit.c +++ b/src/conf/domain_audit.c @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/conf/domain_audit.h b/src/conf/domain_audit.h index eaa26d0..b430da7 100644 --- a/src/conf/domain_audit.h +++ b/src/conf/domain_audit.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 1b5dad9..41726ff 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 6c777e7..469d3b6 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c index c2a3127..f72bc8c 100644 --- a/src/conf/domain_event.c +++ b/src/conf/domain_event.c @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Ben Guthro */ diff --git a/src/conf/domain_event.h b/src/conf/domain_event.h index 1274751..0a48bde 100644 --- a/src/conf/domain_event.h +++ b/src/conf/domain_event.h @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Ben Guthro */ diff --git a/src/conf/domain_nwfilter.c b/src/conf/domain_nwfilter.c index 644b57c..a6e63e1 100644 --- a/src/conf/domain_nwfilter.c +++ b/src/conf/domain_nwfilter.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Stefan Berger <stefanb(a)us.ibm.com> */ diff --git a/src/conf/domain_nwfilter.h b/src/conf/domain_nwfilter.h index 9330c22..9662c0a 100644 --- a/src/conf/domain_nwfilter.h +++ b/src/conf/domain_nwfilter.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Stefan Berger <stefanb(a)us.ibm.com> */ diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c index e054210..1249f12 100644 --- a/src/conf/interface_conf.c +++ b/src/conf/interface_conf.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel Veillard <veillard(a)redhat.com> * Laine Stump <laine(a)redhat.com> diff --git a/src/conf/interface_conf.h b/src/conf/interface_conf.h index c5630d4..a83b120 100644 --- a/src/conf/interface_conf.h +++ b/src/conf/interface_conf.h @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel Veillard <veillard(a)redhat.com> * Laine Stump <laine(a)redhat.com> diff --git a/src/conf/netdev_bandwidth_conf.c b/src/conf/netdev_bandwidth_conf.c index 4dbf18d..832f6db 100644 --- a/src/conf/netdev_bandwidth_conf.c +++ b/src/conf/netdev_bandwidth_conf.c @@ -12,8 +12,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * Michal Privoznik <mprivozn(a)redhat.com> diff --git a/src/conf/netdev_bandwidth_conf.h b/src/conf/netdev_bandwidth_conf.h index 4bb7def..3123b66 100644 --- a/src/conf/netdev_bandwidth_conf.h +++ b/src/conf/netdev_bandwidth_conf.h @@ -12,8 +12,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * Michal Privoznik <mprivozn(a)redhat.com> diff --git a/src/conf/netdev_vport_profile_conf.c b/src/conf/netdev_vport_profile_conf.c index 2699310..d008042 100644 --- a/src/conf/netdev_vport_profile_conf.c +++ b/src/conf/netdev_vport_profile_conf.c @@ -12,8 +12,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * Stefan Berger <stefanb(a)us.ibm.com> diff --git a/src/conf/netdev_vport_profile_conf.h b/src/conf/netdev_vport_profile_conf.h index 30084d5..367bdf3 100644 --- a/src/conf/netdev_vport_profile_conf.h +++ b/src/conf/netdev_vport_profile_conf.h @@ -12,8 +12,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * Stefan Berger <stefanb(a)us.ibm.com> diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 41864be..5827f7c 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/conf/network_conf.h b/src/conf/network_conf.h index 745d972..1c640a9 100644 --- a/src/conf/network_conf.h +++ b/src/conf/network_conf.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c index 7144415..048c70c 100644 --- a/src/conf/node_device_conf.c +++ b/src/conf/node_device_conf.c @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: David F. Lively <dlively(a)virtualiron.com> */ diff --git a/src/conf/node_device_conf.h b/src/conf/node_device_conf.h index ddf5fca..41c9fcc 100644 --- a/src/conf/node_device_conf.h +++ b/src/conf/node_device_conf.h @@ -16,8 +16,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: David F. Lively <dlively(a)virtualiron.com> */ diff --git a/src/conf/nwfilter_conf.c b/src/conf/nwfilter_conf.c index 70fadaa..a5e38b2 100644 --- a/src/conf/nwfilter_conf.c +++ b/src/conf/nwfilter_conf.c @@ -19,8 +19,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Stefan Berger <stefanb(a)us.ibm.com> */ diff --git a/src/conf/nwfilter_conf.h b/src/conf/nwfilter_conf.h index 5cffded..8b05d04 100644 --- a/src/conf/nwfilter_conf.h +++ b/src/conf/nwfilter_conf.h @@ -18,8 +18,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Stefan Berger <stefanb(a)us.ibm.com> */ diff --git a/src/conf/nwfilter_ipaddrmap.c b/src/conf/nwfilter_ipaddrmap.c index c72958b..5087be8 100644 --- a/src/conf/nwfilter_ipaddrmap.c +++ b/src/conf/nwfilter_ipaddrmap.c @@ -18,8 +18,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. */ #include <config.h> diff --git a/src/conf/nwfilter_ipaddrmap.h b/src/conf/nwfilter_ipaddrmap.h index 3411a99..0a34ed6 100644 --- a/src/conf/nwfilter_ipaddrmap.h +++ b/src/conf/nwfilter_ipaddrmap.h @@ -18,8 +18,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/conf/nwfilter_params.c b/src/conf/nwfilter_params.c index d08e860..839d704 100644 --- a/src/conf/nwfilter_params.c +++ b/src/conf/nwfilter_params.c @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Stefan Berger <stefanb(a)us.ibm.com> */ diff --git a/src/conf/nwfilter_params.h b/src/conf/nwfilter_params.h index f0fd216..a44e2cf 100644 --- a/src/conf/nwfilter_params.h +++ b/src/conf/nwfilter_params.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Stefan Berger <stefanb(a)us.ibm.com> */ diff --git a/src/conf/secret_conf.c b/src/conf/secret_conf.c index 0f72596..d03503e 100644 --- a/src/conf/secret_conf.c +++ b/src/conf/secret_conf.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Red Hat Author: Miloslav Trmač <mitr(a)redhat.com> */ diff --git a/src/conf/secret_conf.h b/src/conf/secret_conf.h index 854b380..511c52d 100644 --- a/src/conf/secret_conf.h +++ b/src/conf/secret_conf.h @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Red Hat Author: Miloslav Trmač <mitr(a)redhat.com> */ diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 6ce9208..7944555 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h index 6f84340..8c4b202 100644 --- a/src/conf/storage_conf.h +++ b/src/conf/storage_conf.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/conf/storage_encryption_conf.c b/src/conf/storage_encryption_conf.c index 63cb7f4..801f4a2 100644 --- a/src/conf/storage_encryption_conf.c +++ b/src/conf/storage_encryption_conf.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Red Hat Author: Miloslav Trmač <mitr(a)redhat.com> */ diff --git a/src/conf/storage_encryption_conf.h b/src/conf/storage_encryption_conf.h index cfb088c..4fa568b 100644 --- a/src/conf/storage_encryption_conf.h +++ b/src/conf/storage_encryption_conf.h @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Red Hat Author: Miloslav Trmač <mitr(a)redhat.com> */ diff --git a/src/conf/virconsole.c b/src/conf/virconsole.c index fe47039..05e2b07 100644 --- a/src/conf/virconsole.c +++ b/src/conf/virconsole.c @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Peter Krempa <pkrempa(a)redhat.com> */ diff --git a/src/conf/virconsole.h b/src/conf/virconsole.h index 7cdf578..4d256f9 100644 --- a/src/conf/virconsole.h +++ b/src/conf/virconsole.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Peter Krempa <pkrempa(a)redhat.com> */ diff --git a/src/conf/virdomainlist.c b/src/conf/virdomainlist.c index 2b0b878..c882bc2 100644 --- a/src/conf/virdomainlist.c +++ b/src/conf/virdomainlist.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Peter Krempa <pkrempa(a)redhat.com> */ diff --git a/src/conf/virdomainlist.h b/src/conf/virdomainlist.h index e623129..322e5b8 100644 --- a/src/conf/virdomainlist.h +++ b/src/conf/virdomainlist.h @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Peter Krempa <pkrempa(a)redhat.com> */ diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c index c7a08c0..2afa90f 100644 --- a/src/cpu/cpu.c +++ b/src/cpu/cpu.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * Jiri Denemark <jdenemar(a)redhat.com> diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h index 8d6db44..3f74ef5 100644 --- a/src/cpu/cpu.h +++ b/src/cpu/cpu.h @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * Jiri Denemark <jdenemar(a)redhat.com> diff --git a/src/cpu/cpu_arm.c b/src/cpu/cpu_arm.c index d6c991f..28d78ed 100644 --- a/src/cpu/cpu_arm.c +++ b/src/cpu/cpu_arm.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * Chuck Short <chuck.short(a)canonical.com> diff --git a/src/cpu/cpu_arm.h b/src/cpu/cpu_arm.h index 6c3b3d3..b78ea2e 100644 --- a/src/cpu/cpu_arm.h +++ b/src/cpu/cpu_arm.h @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * Chuck Short <chuck.short(a)canonical.com> diff --git a/src/cpu/cpu_generic.c b/src/cpu/cpu_generic.c index cba6cfa..8f6edcf 100644 --- a/src/cpu/cpu_generic.c +++ b/src/cpu/cpu_generic.c @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * Jiri Denemark <jdenemar(a)redhat.com> diff --git a/src/cpu/cpu_generic.h b/src/cpu/cpu_generic.h index b494468..9ac5b88 100644 --- a/src/cpu/cpu_generic.h +++ b/src/cpu/cpu_generic.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * Jiri Denemark <jdenemar(a)redhat.com> diff --git a/src/cpu/cpu_map.c b/src/cpu/cpu_map.c index 9749423..a848960 100644 --- a/src/cpu/cpu_map.c +++ b/src/cpu/cpu_map.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * Jiri Denemark <jdenemar(a)redhat.com> diff --git a/src/cpu/cpu_map.h b/src/cpu/cpu_map.h index acf4cc4..d751ac7 100644 --- a/src/cpu/cpu_map.h +++ b/src/cpu/cpu_map.h @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * Jiri Denemark <jdenemar(a)redhat.com> diff --git a/src/cpu/cpu_powerpc.c b/src/cpu/cpu_powerpc.c index ed81694..6bab5fd 100644 --- a/src/cpu/cpu_powerpc.c +++ b/src/cpu/cpu_powerpc.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * Anton Blanchard <anton(a)au.ibm.com> diff --git a/src/cpu/cpu_powerpc.h b/src/cpu/cpu_powerpc.h index 2e0c1a5..8bc2fe5 100644 --- a/src/cpu/cpu_powerpc.h +++ b/src/cpu/cpu_powerpc.h @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * Anton Blanchard <anton(a)au.ibm.com> diff --git a/src/cpu/cpu_s390.c b/src/cpu/cpu_s390.c index eb2acef..f95e18f 100644 --- a/src/cpu/cpu_s390.c +++ b/src/cpu/cpu_s390.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * Thang Pham <thang.pham(a)us.ibm.com> diff --git a/src/cpu/cpu_s390.h b/src/cpu/cpu_s390.h index 4f28cf9..119a6d6 100644 --- a/src/cpu/cpu_s390.h +++ b/src/cpu/cpu_s390.h @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * Thang Pham <thang.pham(a)us.ibm.com> diff --git a/src/cpu/cpu_x86.c b/src/cpu/cpu_x86.c index dce0a09..a5f7405 100644 --- a/src/cpu/cpu_x86.c +++ b/src/cpu/cpu_x86.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * Jiri Denemark <jdenemar(a)redhat.com> diff --git a/src/cpu/cpu_x86.h b/src/cpu/cpu_x86.h index dd47c2c..b820d8b 100644 --- a/src/cpu/cpu_x86.h +++ b/src/cpu/cpu_x86.h @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * Jiri Denemark <jdenemar(a)redhat.com> diff --git a/src/cpu/cpu_x86_data.h b/src/cpu/cpu_x86_data.h index 34a5b06..0d6f1a9 100644 --- a/src/cpu/cpu_x86_data.h +++ b/src/cpu/cpu_x86_data.h @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * Jiri Denemark <jdenemar(a)redhat.com> diff --git a/src/datatypes.c b/src/datatypes.c index d718170..699c4a8 100644 --- a/src/datatypes.c +++ b/src/datatypes.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/datatypes.h b/src/datatypes.h index fc284d2..9ad2d01 100644 --- a/src/datatypes.h +++ b/src/datatypes.h @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/driver.c b/src/driver.c index da4bee5..0049b79 100644 --- a/src/driver.c +++ b/src/driver.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/esx/esx_device_monitor.c b/src/esx/esx_device_monitor.c index 2eba2b0..d85c7e5 100644 --- a/src/esx/esx_device_monitor.c +++ b/src/esx/esx_device_monitor.c @@ -17,8 +17,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/esx/esx_device_monitor.h b/src/esx/esx_device_monitor.h index c19599e..0594ad2 100644 --- a/src/esx/esx_device_monitor.h +++ b/src/esx/esx_device_monitor.h @@ -16,8 +16,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index f110ba3..47957cc 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -17,8 +17,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/esx/esx_driver.h b/src/esx/esx_driver.h index 7138aca..1079afd 100644 --- a/src/esx/esx_driver.h +++ b/src/esx/esx_driver.h @@ -16,8 +16,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/esx/esx_interface_driver.c b/src/esx/esx_interface_driver.c index 5713137..501409a 100644 --- a/src/esx/esx_interface_driver.c +++ b/src/esx/esx_interface_driver.c @@ -17,8 +17,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/esx/esx_interface_driver.h b/src/esx/esx_interface_driver.h index ac04f79..141372d 100644 --- a/src/esx/esx_interface_driver.h +++ b/src/esx/esx_interface_driver.h @@ -16,8 +16,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/esx/esx_network_driver.c b/src/esx/esx_network_driver.c index 224c764..2e0e40b 100644 --- a/src/esx/esx_network_driver.c +++ b/src/esx/esx_network_driver.c @@ -17,8 +17,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/esx/esx_network_driver.h b/src/esx/esx_network_driver.h index 9f06d5a..779d0bc 100644 --- a/src/esx/esx_network_driver.h +++ b/src/esx/esx_network_driver.h @@ -16,8 +16,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/esx/esx_nwfilter_driver.c b/src/esx/esx_nwfilter_driver.c index 6056d6d..8bd2631 100644 --- a/src/esx/esx_nwfilter_driver.c +++ b/src/esx/esx_nwfilter_driver.c @@ -17,8 +17,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/esx/esx_nwfilter_driver.h b/src/esx/esx_nwfilter_driver.h index 64cceab..94236da 100644 --- a/src/esx/esx_nwfilter_driver.h +++ b/src/esx/esx_nwfilter_driver.h @@ -16,8 +16,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/esx/esx_private.h b/src/esx/esx_private.h index 58d1233..671bfb9 100644 --- a/src/esx/esx_private.h +++ b/src/esx/esx_private.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/esx/esx_secret_driver.c b/src/esx/esx_secret_driver.c index c37b62d..ce6dacd 100644 --- a/src/esx/esx_secret_driver.c +++ b/src/esx/esx_secret_driver.c @@ -16,8 +16,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/esx/esx_secret_driver.h b/src/esx/esx_secret_driver.h index d9ee7eb..4ed1172 100644 --- a/src/esx/esx_secret_driver.h +++ b/src/esx/esx_secret_driver.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/esx/esx_storage_driver.c b/src/esx/esx_storage_driver.c index b200e56..348bd62 100644 --- a/src/esx/esx_storage_driver.c +++ b/src/esx/esx_storage_driver.c @@ -17,8 +17,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/esx/esx_storage_driver.h b/src/esx/esx_storage_driver.h index 21098e9..417775d 100644 --- a/src/esx/esx_storage_driver.h +++ b/src/esx/esx_storage_driver.h @@ -16,8 +16,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/esx/esx_util.c b/src/esx/esx_util.c index 6ed3a3e..9288218 100644 --- a/src/esx/esx_util.c +++ b/src/esx/esx_util.c @@ -17,8 +17,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/esx/esx_util.h b/src/esx/esx_util.h index a69b3f4..07492c1 100644 --- a/src/esx/esx_util.h +++ b/src/esx/esx_util.h @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index b1b5d70..ab79afe 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -16,8 +16,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h index dd42925..4b84be8 100644 --- a/src/esx/esx_vi.h +++ b/src/esx/esx_vi.h @@ -16,8 +16,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/esx/esx_vi_methods.c b/src/esx/esx_vi_methods.c index 77588c2..2e5819f 100644 --- a/src/esx/esx_vi_methods.c +++ b/src/esx/esx_vi_methods.c @@ -16,8 +16,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/esx/esx_vi_methods.h b/src/esx/esx_vi_methods.h index c78c649..4c6b047 100644 --- a/src/esx/esx_vi_methods.h +++ b/src/esx/esx_vi_methods.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/esx/esx_vi_types.c b/src/esx/esx_vi_types.c index 9e67eff..da4f389 100644 --- a/src/esx/esx_vi_types.c +++ b/src/esx/esx_vi_types.c @@ -16,8 +16,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/esx/esx_vi_types.h b/src/esx/esx_vi_types.h index 3d843bf..c92889c 100644 --- a/src/esx/esx_vi_types.h +++ b/src/esx/esx_vi_types.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/fdstream.c b/src/fdstream.c index 647db53..214f636 100644 --- a/src/fdstream.c +++ b/src/fdstream.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/fdstream.h b/src/fdstream.h index f08cab9..160e3cc 100644 --- a/src/fdstream.h +++ b/src/fdstream.h @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/gnutls_1_0_compat.h b/src/gnutls_1_0_compat.h index ebe97fd..eb0c046 100644 --- a/src/gnutls_1_0_compat.h +++ b/src/gnutls_1_0_compat.h @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Richard W.M. Jones <rjones(a)redhat.com> */ diff --git a/src/hyperv/hyperv_device_monitor.c b/src/hyperv/hyperv_device_monitor.c index 675d43a..50ce72f 100644 --- a/src/hyperv/hyperv_device_monitor.c +++ b/src/hyperv/hyperv_device_monitor.c @@ -16,8 +16,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/hyperv/hyperv_device_monitor.h b/src/hyperv/hyperv_device_monitor.h index 864e8af..a148108 100644 --- a/src/hyperv/hyperv_device_monitor.h +++ b/src/hyperv/hyperv_device_monitor.h @@ -16,8 +16,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c index 17685ea..664b435 100644 --- a/src/hyperv/hyperv_driver.c +++ b/src/hyperv/hyperv_driver.c @@ -16,8 +16,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/hyperv/hyperv_driver.h b/src/hyperv/hyperv_driver.h index 17ffa2c..14168d1 100644 --- a/src/hyperv/hyperv_driver.h +++ b/src/hyperv/hyperv_driver.h @@ -16,8 +16,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/hyperv/hyperv_interface_driver.c b/src/hyperv/hyperv_interface_driver.c index f2e8dee..29f173b 100644 --- a/src/hyperv/hyperv_interface_driver.c +++ b/src/hyperv/hyperv_interface_driver.c @@ -16,8 +16,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/hyperv/hyperv_interface_driver.h b/src/hyperv/hyperv_interface_driver.h index 730234c..324097b 100644 --- a/src/hyperv/hyperv_interface_driver.h +++ b/src/hyperv/hyperv_interface_driver.h @@ -16,8 +16,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/hyperv/hyperv_network_driver.c b/src/hyperv/hyperv_network_driver.c index 92a43e3..792c7f7 100644 --- a/src/hyperv/hyperv_network_driver.c +++ b/src/hyperv/hyperv_network_driver.c @@ -16,8 +16,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/hyperv/hyperv_network_driver.h b/src/hyperv/hyperv_network_driver.h index 49c856f..645b0ae 100644 --- a/src/hyperv/hyperv_network_driver.h +++ b/src/hyperv/hyperv_network_driver.h @@ -16,8 +16,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/hyperv/hyperv_nwfilter_driver.c b/src/hyperv/hyperv_nwfilter_driver.c index b5d8069..2906a35 100644 --- a/src/hyperv/hyperv_nwfilter_driver.c +++ b/src/hyperv/hyperv_nwfilter_driver.c @@ -16,8 +16,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/hyperv/hyperv_nwfilter_driver.h b/src/hyperv/hyperv_nwfilter_driver.h index ef4f660..35de2de 100644 --- a/src/hyperv/hyperv_nwfilter_driver.h +++ b/src/hyperv/hyperv_nwfilter_driver.h @@ -16,8 +16,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/hyperv/hyperv_private.h b/src/hyperv/hyperv_private.h index 677c5bc..808d607 100644 --- a/src/hyperv/hyperv_private.h +++ b/src/hyperv/hyperv_private.h @@ -16,8 +16,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/hyperv/hyperv_secret_driver.c b/src/hyperv/hyperv_secret_driver.c index b238e06..e62def7 100644 --- a/src/hyperv/hyperv_secret_driver.c +++ b/src/hyperv/hyperv_secret_driver.c @@ -16,8 +16,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/hyperv/hyperv_secret_driver.h b/src/hyperv/hyperv_secret_driver.h index a7e9f25..8dc938f 100644 --- a/src/hyperv/hyperv_secret_driver.h +++ b/src/hyperv/hyperv_secret_driver.h @@ -16,8 +16,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/hyperv/hyperv_storage_driver.c b/src/hyperv/hyperv_storage_driver.c index 4bfefd0..c429abf 100644 --- a/src/hyperv/hyperv_storage_driver.c +++ b/src/hyperv/hyperv_storage_driver.c @@ -16,8 +16,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/hyperv/hyperv_storage_driver.h b/src/hyperv/hyperv_storage_driver.h index c9bca22..9b69796 100644 --- a/src/hyperv/hyperv_storage_driver.h +++ b/src/hyperv/hyperv_storage_driver.h @@ -16,8 +16,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/hyperv/hyperv_util.c b/src/hyperv/hyperv_util.c index 86d140f..e74e261 100644 --- a/src/hyperv/hyperv_util.c +++ b/src/hyperv/hyperv_util.c @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/hyperv/hyperv_util.h b/src/hyperv/hyperv_util.h index d9d1c84..88928a4 100644 --- a/src/hyperv/hyperv_util.h +++ b/src/hyperv/hyperv_util.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/hyperv/hyperv_wmi.c b/src/hyperv/hyperv_wmi.c index 4a2dfff..32ea81c 100644 --- a/src/hyperv/hyperv_wmi.c +++ b/src/hyperv/hyperv_wmi.c @@ -17,8 +17,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/hyperv/hyperv_wmi.h b/src/hyperv/hyperv_wmi.h index fae6d4f..4418514 100644 --- a/src/hyperv/hyperv_wmi.h +++ b/src/hyperv/hyperv_wmi.h @@ -17,8 +17,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/hyperv/hyperv_wmi_classes.c b/src/hyperv/hyperv_wmi_classes.c index ed5e314..6e23e68 100644 --- a/src/hyperv/hyperv_wmi_classes.c +++ b/src/hyperv/hyperv_wmi_classes.c @@ -16,8 +16,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/hyperv/hyperv_wmi_classes.h b/src/hyperv/hyperv_wmi_classes.h index 5c97ca6..bb8bed1 100644 --- a/src/hyperv/hyperv_wmi_classes.h +++ b/src/hyperv/hyperv_wmi_classes.h @@ -16,8 +16,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/hyperv/openwsman.h b/src/hyperv/openwsman.h index 8bc0604..0b4e830 100644 --- a/src/hyperv/openwsman.h +++ b/src/hyperv/openwsman.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/interface/netcf_driver.c b/src/interface/netcf_driver.c index 39fa721..935be66 100644 --- a/src/interface/netcf_driver.c +++ b/src/interface/netcf_driver.c @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Laine Stump <laine(a)redhat.com> */ diff --git a/src/interface/netcf_driver.h b/src/interface/netcf_driver.h index eb3a55d..38fbc77 100644 --- a/src/interface/netcf_driver.h +++ b/src/interface/netcf_driver.h @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Laine Stump <laine(a)redhat.com> */ diff --git a/src/libvirt-qemu.c b/src/libvirt-qemu.c index 4b2f8c2..78480bb 100644 --- a/src/libvirt-qemu.c +++ b/src/libvirt-qemu.c @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Chris Lalancette <clalance(a)redhat.com> */ diff --git a/src/libvirt_internal.h b/src/libvirt_internal.h index 01ba689..707a982 100644 --- a/src/libvirt_internal.h +++ b/src/libvirt_internal.h @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * NB This file is ABI sensitive. Things here impact the wire * protocol ABI in the remote driver. Same rules as for things diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 28966cd..e9eaed7 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * Jim Fehlig <jfehlig(a)novell.com> diff --git a/src/libxl/libxl_conf.h b/src/libxl/libxl_conf.h index 3067c52..325298a 100644 --- a/src/libxl/libxl_conf.h +++ b/src/libxl/libxl_conf.h @@ -13,8 +13,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * Jim Fehlig <jfehlig(a)novell.com> diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c index edf5c33..873f973 100644 --- a/src/libxl/libxl_driver.c +++ b/src/libxl/libxl_driver.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * Jim Fehlig <jfehlig(a)novell.com> diff --git a/src/libxl/libxl_driver.h b/src/libxl/libxl_driver.h index 4632d33..364adf9 100644 --- a/src/libxl/libxl_driver.h +++ b/src/libxl/libxl_driver.h @@ -12,8 +12,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * Jim Fehlig <jfehlig(a)novell.com> diff --git a/src/locking/domain_lock.c b/src/locking/domain_lock.c index de1937c..55f5640 100644 --- a/src/locking/domain_lock.c +++ b/src/locking/domain_lock.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/locking/domain_lock.h b/src/locking/domain_lock.h index dd35c7c..e6f845f 100644 --- a/src/locking/domain_lock.h +++ b/src/locking/domain_lock.h @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/locking/lock_driver.h b/src/locking/lock_driver.h index 357a8d5..6f9eb5f 100644 --- a/src/locking/lock_driver.h +++ b/src/locking/lock_driver.h @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/locking/lock_driver_nop.c b/src/locking/lock_driver_nop.c index 2ca6c4d..73799fb 100644 --- a/src/locking/lock_driver_nop.c +++ b/src/locking/lock_driver_nop.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/locking/lock_driver_nop.h b/src/locking/lock_driver_nop.h index 4be5377..d233bbb 100644 --- a/src/locking/lock_driver_nop.h +++ b/src/locking/lock_driver_nop.h @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/locking/lock_driver_sanlock.c b/src/locking/lock_driver_sanlock.c index 2352968..7c71af3 100644 --- a/src/locking/lock_driver_sanlock.c +++ b/src/locking/lock_driver_sanlock.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/locking/lock_manager.c b/src/locking/lock_manager.c index d7929e3..18e739e 100644 --- a/src/locking/lock_manager.c +++ b/src/locking/lock_manager.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/locking/lock_manager.h b/src/locking/lock_manager.h index 0fb3bb7..b548d45 100644 --- a/src/locking/lock_manager.h +++ b/src/locking/lock_manager.h @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/lxc/lxc_cgroup.c b/src/lxc/lxc_cgroup.c index ddd4901..aca6309 100644 --- a/src/lxc/lxc_cgroup.c +++ b/src/lxc/lxc_cgroup.c @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. */ #include <config.h> diff --git a/src/lxc/lxc_cgroup.h b/src/lxc/lxc_cgroup.h index 97bb12a..8ff1015 100644 --- a/src/lxc/lxc_cgroup.h +++ b/src/lxc/lxc_cgroup.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. */ #ifndef __VIR_LXC_CGROUP_H__ diff --git a/src/lxc/lxc_conf.c b/src/lxc/lxc_conf.c index 72547c4..81b3b3f 100644 --- a/src/lxc/lxc_conf.c +++ b/src/lxc/lxc_conf.c @@ -18,8 +18,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/lxc/lxc_conf.h b/src/lxc/lxc_conf.h index 937da16..1c653e3 100644 --- a/src/lxc/lxc_conf.h +++ b/src/lxc/lxc_conf.h @@ -18,8 +18,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. */ #ifndef LXC_CONF_H diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c index 6fdf359..74242b2 100644 --- a/src/lxc/lxc_container.c +++ b/src/lxc/lxc_container.c @@ -19,8 +19,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. */ #include <config.h> diff --git a/src/lxc/lxc_container.h b/src/lxc/lxc_container.h index 6f1cc8b..2a98cc7 100644 --- a/src/lxc/lxc_container.h +++ b/src/lxc/lxc_container.h @@ -17,8 +17,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. */ #ifndef LXC_CONTAINER_H diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c index 4777d51..10f0b8a 100644 --- a/src/lxc/lxc_controller.c +++ b/src/lxc/lxc_controller.c @@ -18,8 +18,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. */ #include <config.h> diff --git a/src/lxc/lxc_domain.c b/src/lxc/lxc_domain.c index 75fd74f..f78dc09 100644 --- a/src/lxc/lxc_domain.c +++ b/src/lxc/lxc_domain.c @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. */ #include <config.h> diff --git a/src/lxc/lxc_domain.h b/src/lxc/lxc_domain.h index e97b2b4..9629465 100644 --- a/src/lxc/lxc_domain.h +++ b/src/lxc/lxc_domain.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. */ diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index 09c64b2..ba07a80 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -18,8 +18,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. */ #include <config.h> diff --git a/src/lxc/lxc_driver.h b/src/lxc/lxc_driver.h index 7864fd0..7227bc7 100644 --- a/src/lxc/lxc_driver.h +++ b/src/lxc/lxc_driver.h @@ -17,8 +17,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. */ #ifndef LXC_DRIVER_H diff --git a/src/lxc/lxc_process.c b/src/lxc/lxc_process.c index 12f6ae6..ab27cbe 100644 --- a/src/lxc/lxc_process.c +++ b/src/lxc/lxc_process.c @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. */ #include <config.h> diff --git a/src/lxc/lxc_process.h b/src/lxc/lxc_process.h index b4b707b..d763a69 100644 --- a/src/lxc/lxc_process.h +++ b/src/lxc/lxc_process.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. */ #ifndef __LXC_PROCESS_H__ diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index bb2a765..a5046f1 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/network/bridge_driver.h b/src/network/bridge_driver.h index 4913126..6620ecb 100644 --- a/src/network/bridge_driver.h +++ b/src/network/bridge_driver.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c index 83db775..d44924c 100644 --- a/src/node_device/node_device_driver.c +++ b/src/node_device/node_device_driver.c @@ -16,8 +16,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: David F. Lively <dlively(a)virtualiron.com> */ diff --git a/src/node_device/node_device_driver.h b/src/node_device/node_device_driver.h index 673e95b..6f680a5 100644 --- a/src/node_device/node_device_driver.h +++ b/src/node_device/node_device_driver.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: David F. Lively <dlively(a)virtualiron.com> */ diff --git a/src/node_device/node_device_hal.c b/src/node_device/node_device_hal.c index 7f8b076..9d63a29 100644 --- a/src/node_device/node_device_hal.c +++ b/src/node_device/node_device_hal.c @@ -16,8 +16,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: David F. Lively <dlively(a)virtualiron.com> */ diff --git a/src/node_device/node_device_hal.h b/src/node_device/node_device_hal.h index 3cb22a6..da93b91 100644 --- a/src/node_device/node_device_hal.h +++ b/src/node_device/node_device_hal.h @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/node_device/node_device_linux_sysfs.c b/src/node_device/node_device_linux_sysfs.c index 6df73a3..4046d69 100644 --- a/src/node_device/node_device_linux_sysfs.c +++ b/src/node_device/node_device_linux_sysfs.c @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c index aa96abd..265cbd4 100644 --- a/src/node_device/node_device_udev.c +++ b/src/node_device/node_device_udev.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Dave Allan <dallan(a)redhat.com> */ diff --git a/src/node_device/node_device_udev.h b/src/node_device/node_device_udev.h index cdaa142..312c853 100644 --- a/src/node_device/node_device_udev.h +++ b/src/node_device/node_device_udev.h @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Dave Allan <dallan(a)redhat.com> */ diff --git a/src/nodeinfo.c b/src/nodeinfo.c index 76b5619..84a5d66 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/nodeinfo.h b/src/nodeinfo.h index 7d2ef1d..12090e2 100644 --- a/src/nodeinfo.h +++ b/src/nodeinfo.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/nwfilter/nwfilter_dhcpsnoop.c b/src/nwfilter/nwfilter_dhcpsnoop.c index 0a12be5..aee57ed 100644 --- a/src/nwfilter/nwfilter_dhcpsnoop.c +++ b/src/nwfilter/nwfilter_dhcpsnoop.c @@ -19,8 +19,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Based in part on work by Stefan Berger <stefanb(a)us.ibm.com> */ diff --git a/src/nwfilter/nwfilter_dhcpsnoop.h b/src/nwfilter/nwfilter_dhcpsnoop.h index 70ff5b2..07fe250 100644 --- a/src/nwfilter/nwfilter_dhcpsnoop.h +++ b/src/nwfilter/nwfilter_dhcpsnoop.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: David L Stevens <dlstevens(a)us.ibm.com> */ diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index 9034549..4fa73f8 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -18,8 +18,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> * Stefan Berger <stefanb(a)us.ibm.com> diff --git a/src/nwfilter/nwfilter_driver.h b/src/nwfilter/nwfilter_driver.h index 3f60560..f1f22e8 100644 --- a/src/nwfilter/nwfilter_driver.h +++ b/src/nwfilter/nwfilter_driver.h @@ -18,8 +18,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> * Stefan Berger <stefanb(a)us.ibm.com> diff --git a/src/nwfilter/nwfilter_ebiptables_driver.c b/src/nwfilter/nwfilter_ebiptables_driver.c index 18195c3..6d6bc3b 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.c +++ b/src/nwfilter/nwfilter_ebiptables_driver.c @@ -16,8 +16,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Stefan Berger <stefanb(a)us.ibm.com> */ diff --git a/src/nwfilter/nwfilter_ebiptables_driver.h b/src/nwfilter/nwfilter_ebiptables_driver.h index 47ddff5..e55b9d8 100644 --- a/src/nwfilter/nwfilter_ebiptables_driver.h +++ b/src/nwfilter/nwfilter_ebiptables_driver.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Stefan Berger <stefanb(a)us.ibm.com> */ diff --git a/src/nwfilter/nwfilter_gentech_driver.c b/src/nwfilter/nwfilter_gentech_driver.c index 48fc440..5976dc7 100644 --- a/src/nwfilter/nwfilter_gentech_driver.c +++ b/src/nwfilter/nwfilter_gentech_driver.c @@ -16,8 +16,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Stefan Berger <stefanb(a)us.ibm.com> */ diff --git a/src/nwfilter/nwfilter_gentech_driver.h b/src/nwfilter/nwfilter_gentech_driver.h index f0da42c..8824462 100644 --- a/src/nwfilter/nwfilter_gentech_driver.h +++ b/src/nwfilter/nwfilter_gentech_driver.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Stefan Berger <stefanb(a)us.ibm.com> */ diff --git a/src/nwfilter/nwfilter_learnipaddr.c b/src/nwfilter/nwfilter_learnipaddr.c index f86fc97..cb80050 100644 --- a/src/nwfilter/nwfilter_learnipaddr.c +++ b/src/nwfilter/nwfilter_learnipaddr.c @@ -17,8 +17,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Stefan Berger <stefanb(a)us.ibm.com> */ diff --git a/src/nwfilter/nwfilter_learnipaddr.h b/src/nwfilter/nwfilter_learnipaddr.h index 5cb974f..977b16d 100644 --- a/src/nwfilter/nwfilter_learnipaddr.h +++ b/src/nwfilter/nwfilter_learnipaddr.h @@ -16,8 +16,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Stefan Berger <stefanb(a)us.ibm.com> */ diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c index 697d9e1..5dc071c 100644 --- a/src/openvz/openvz_conf.c +++ b/src/openvz/openvz_conf.c @@ -17,8 +17,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * Shuveb Hussain <shuveb(a)binarykarma.com> diff --git a/src/openvz/openvz_conf.h b/src/openvz/openvz_conf.h index 3c783b7..0c604a5 100644 --- a/src/openvz/openvz_conf.h +++ b/src/openvz/openvz_conf.h @@ -17,8 +17,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * Shuveb Hussain <shuveb(a)binarykarma.com> diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index a144408..428b944 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -17,8 +17,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * Shuveb Hussain <shuveb(a)binarykarma.com> diff --git a/src/openvz/openvz_driver.h b/src/openvz/openvz_driver.h index 5be9ce7..79181a3 100644 --- a/src/openvz/openvz_driver.h +++ b/src/openvz/openvz_driver.h @@ -16,8 +16,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * Shuveb Hussain <shuveb(a)binarykarma.com> diff --git a/src/openvz/openvz_util.c b/src/openvz/openvz_util.c index a878dd6..89066ab 100644 --- a/src/openvz/openvz_util.c +++ b/src/openvz/openvz_util.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/openvz/openvz_util.h b/src/openvz/openvz_util.h index 94c527f..cf1d374 100644 --- a/src/openvz/openvz_util.h +++ b/src/openvz/openvz_util.h @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c index 25de1ab..0ebdfff 100644 --- a/src/phyp/phyp_driver.c +++ b/src/phyp/phyp_driver.c @@ -18,8 +18,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. */ #include <config.h> diff --git a/src/phyp/phyp_driver.h b/src/phyp/phyp_driver.h index a22156c..47aa91e 100644 --- a/src/phyp/phyp_driver.h +++ b/src/phyp/phyp_driver.h @@ -18,8 +18,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. */ #ifndef PHYP_DRIVER_H diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c index a3dbc45..14bf11b 100644 --- a/src/qemu/qemu_agent.c +++ b/src/qemu/qemu_agent.c @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/qemu/qemu_agent.h b/src/qemu/qemu_agent.h index 0816d90..860e7e5 100644 --- a/src/qemu/qemu_agent.h +++ b/src/qemu/qemu_agent.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/qemu/qemu_bridge_filter.c b/src/qemu/qemu_bridge_filter.c index e55b031..0d4cfa8 100644 --- a/src/qemu/qemu_bridge_filter.c +++ b/src/qemu/qemu_bridge_filter.c @@ -13,8 +13,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * Gerhard Stenzel <gerhard.stenzel(a)de.ibm.com> diff --git a/src/qemu/qemu_bridge_filter.h b/src/qemu/qemu_bridge_filter.h index 85ca8d0..f1ae0a5 100644 --- a/src/qemu/qemu_bridge_filter.h +++ b/src/qemu/qemu_bridge_filter.h @@ -13,8 +13,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * Gerhard Stenzel <gerhard.stenzel(a)de.ibm.com> diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 8e1177c..85c49a2 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index ca54829..e8251dc 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index b93887c..32184e7 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/qemu/qemu_cgroup.h b/src/qemu/qemu_cgroup.h index c1023b3..5973430 100644 --- a/src/qemu/qemu_cgroup.h +++ b/src/qemu/qemu_cgroup.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index d6df4ee..c1d23fb 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index ddf426f..3ccf4d7 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c index 7735ffe..b7db277 100644 --- a/src/qemu/qemu_conf.c +++ b/src/qemu/qemu_conf.c @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h index 4234807..92e4968 100644 --- a/src/qemu/qemu_conf.h +++ b/src/qemu/qemu_conf.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index 42875b4..86f0265 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h index 3a5f1f3..9f9467d 100644 --- a/src/qemu/qemu_domain.h +++ b/src/qemu/qemu_domain.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index ecd2ec1..6cf3882 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/qemu/qemu_driver.h b/src/qemu/qemu_driver.h index 73da9e4..94e4d89 100644 --- a/src/qemu/qemu_driver.h +++ b/src/qemu/qemu_driver.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/qemu/qemu_hostdev.c b/src/qemu/qemu_hostdev.c index c55545d..7619fd0 100644 --- a/src/qemu/qemu_hostdev.c +++ b/src/qemu/qemu_hostdev.c @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/qemu/qemu_hostdev.h b/src/qemu/qemu_hostdev.h index a8acccf..1737f34 100644 --- a/src/qemu/qemu_hostdev.h +++ b/src/qemu/qemu_hostdev.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index d7e2a73..7880606 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/qemu/qemu_hotplug.h b/src/qemu/qemu_hotplug.h index e6d7843..f3a0d83 100644 --- a/src/qemu/qemu_hotplug.h +++ b/src/qemu/qemu_hotplug.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c index 12cf31d..7663e5e 100644 --- a/src/qemu/qemu_migration.c +++ b/src/qemu/qemu_migration.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/qemu/qemu_migration.h b/src/qemu/qemu_migration.h index 5fab0ca..e6ca215 100644 --- a/src/qemu/qemu_migration.h +++ b/src/qemu/qemu_migration.h @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c index 7ed0909..20395b0 100644 --- a/src/qemu/qemu_monitor.c +++ b/src/qemu/qemu_monitor.c @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h index c96282b..995948b 100644 --- a/src/qemu/qemu_monitor.h +++ b/src/qemu/qemu_monitor.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c index 5c16284..dd6536f 100644 --- a/src/qemu/qemu_monitor_json.c +++ b/src/qemu/qemu_monitor_json.c @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h index 5293895..e732178 100644 --- a/src/qemu/qemu_monitor_json.h +++ b/src/qemu/qemu_monitor_json.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index c7de172..fa17927 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/src/qemu/qemu_monitor_text.c @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/qemu/qemu_monitor_text.h b/src/qemu/qemu_monitor_text.h index 4525864..c6fd464 100644 --- a/src/qemu/qemu_monitor_text.h +++ b/src/qemu/qemu_monitor_text.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index dad5304..685ea7c 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h index d13778d..2e74bec 100644 --- a/src/qemu/qemu_process.h +++ b/src/qemu/qemu_process.h @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c index aa0e6d6..a69e69a 100644 --- a/src/remote/remote_driver.c +++ b/src/remote/remote_driver.c @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Richard Jones <rjones(a)redhat.com> */ diff --git a/src/remote/remote_driver.h b/src/remote/remote_driver.h index aca9412..1ab4290 100644 --- a/src/remote/remote_driver.h +++ b/src/remote/remote_driver.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Richard Jones <rjones(a)redhat.com> */ diff --git a/src/rpc/virkeepalive.c b/src/rpc/virkeepalive.c index c05847a..ffb059e 100644 --- a/src/rpc/virkeepalive.c +++ b/src/rpc/virkeepalive.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Jiri Denemark <jdenemar(a)redhat.com> */ diff --git a/src/rpc/virkeepalive.h b/src/rpc/virkeepalive.h index 1e25214..52e1d04 100644 --- a/src/rpc/virkeepalive.h +++ b/src/rpc/virkeepalive.h @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Jiri Denemark <jdenemar(a)redhat.com> */ diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c index f877934..0e7e423 100644 --- a/src/rpc/virnetclient.c +++ b/src/rpc/virnetclient.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/rpc/virnetclient.h b/src/rpc/virnetclient.h index 13b4f96..3b8cbb2 100644 --- a/src/rpc/virnetclient.h +++ b/src/rpc/virnetclient.h @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/rpc/virnetclientprogram.c b/src/rpc/virnetclientprogram.c index 47e6adc..c7d2409 100644 --- a/src/rpc/virnetclientprogram.c +++ b/src/rpc/virnetclientprogram.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/rpc/virnetclientprogram.h b/src/rpc/virnetclientprogram.h index 14a4c96..f799f2e 100644 --- a/src/rpc/virnetclientprogram.h +++ b/src/rpc/virnetclientprogram.h @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/rpc/virnetclientstream.c b/src/rpc/virnetclientstream.c index f230d20..8580e39 100644 --- a/src/rpc/virnetclientstream.c +++ b/src/rpc/virnetclientstream.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/rpc/virnetclientstream.h b/src/rpc/virnetclientstream.h index fd7a2ee..00d598a 100644 --- a/src/rpc/virnetclientstream.h +++ b/src/rpc/virnetclientstream.h @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/rpc/virnetmessage.c b/src/rpc/virnetmessage.c index 4b5adb8..be4076f 100644 --- a/src/rpc/virnetmessage.c +++ b/src/rpc/virnetmessage.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. */ #include <config.h> diff --git a/src/rpc/virnetmessage.h b/src/rpc/virnetmessage.h index 8f36a70..8f5bcf2 100644 --- a/src/rpc/virnetmessage.h +++ b/src/rpc/virnetmessage.h @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. */ #ifndef __VIR_NET_MESSAGE_H__ diff --git a/src/rpc/virnetsaslcontext.c b/src/rpc/virnetsaslcontext.c index 9943057..9c737d0 100644 --- a/src/rpc/virnetsaslcontext.c +++ b/src/rpc/virnetsaslcontext.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. */ #include <config.h> diff --git a/src/rpc/virnetsaslcontext.h b/src/rpc/virnetsaslcontext.h index 774139c..914c45c 100644 --- a/src/rpc/virnetsaslcontext.h +++ b/src/rpc/virnetsaslcontext.h @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. */ #ifndef __VIR_NET_CLIENT_SASL_CONTEXT_H__ diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c index 257cef7..248ad9f 100644 --- a/src/rpc/virnetserver.c +++ b/src/rpc/virnetserver.c @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/rpc/virnetserver.h b/src/rpc/virnetserver.h index 438f524..92f741a 100644 --- a/src/rpc/virnetserver.h +++ b/src/rpc/virnetserver.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/rpc/virnetserverclient.c b/src/rpc/virnetserverclient.c index d6b348b..d0a144c 100644 --- a/src/rpc/virnetserverclient.c +++ b/src/rpc/virnetserverclient.c @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/rpc/virnetserverclient.h b/src/rpc/virnetserverclient.h index 154a160..606c428 100644 --- a/src/rpc/virnetserverclient.h +++ b/src/rpc/virnetserverclient.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/rpc/virnetservermdns.c b/src/rpc/virnetservermdns.c index a63cbbc..274be19 100644 --- a/src/rpc/virnetservermdns.c +++ b/src/rpc/virnetservermdns.c @@ -17,8 +17,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/rpc/virnetservermdns.h b/src/rpc/virnetservermdns.h index a482aef..5fe5d3c 100644 --- a/src/rpc/virnetservermdns.h +++ b/src/rpc/virnetservermdns.h @@ -17,8 +17,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/rpc/virnetserverprogram.c b/src/rpc/virnetserverprogram.c index 001e18d..c083fb3 100644 --- a/src/rpc/virnetserverprogram.c +++ b/src/rpc/virnetserverprogram.c @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/rpc/virnetserverprogram.h b/src/rpc/virnetserverprogram.h index aa9f3cf..015ecef 100644 --- a/src/rpc/virnetserverprogram.h +++ b/src/rpc/virnetserverprogram.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/rpc/virnetserverservice.c b/src/rpc/virnetserverservice.c index 28202a4..2880df3 100644 --- a/src/rpc/virnetserverservice.c +++ b/src/rpc/virnetserverservice.c @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/rpc/virnetserverservice.h b/src/rpc/virnetserverservice.h index 8540bd9..d6bf98b 100644 --- a/src/rpc/virnetserverservice.h +++ b/src/rpc/virnetserverservice.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index aee3c19..31c4e28 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/rpc/virnetsocket.h b/src/rpc/virnetsocket.h index 5ba7c8f..6c8e77c 100644 --- a/src/rpc/virnetsocket.h +++ b/src/rpc/virnetsocket.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c index adbc0de..5ae22f2 100644 --- a/src/rpc/virnettlscontext.c +++ b/src/rpc/virnettlscontext.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. */ #include <config.h> diff --git a/src/rpc/virnettlscontext.h b/src/rpc/virnettlscontext.h index fdfce6d..8893da9 100644 --- a/src/rpc/virnettlscontext.h +++ b/src/rpc/virnettlscontext.h @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. */ #ifndef __VIR_NET_TLS_CONTEXT_H__ diff --git a/src/secret/secret_driver.c b/src/secret/secret_driver.c index af3bfcf..7f92776 100644 --- a/src/secret/secret_driver.c +++ b/src/secret/secret_driver.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Red Hat Author: Miloslav Trmač <mitr(a)redhat.com> */ diff --git a/src/secret/secret_driver.h b/src/secret/secret_driver.h index 54a60a1..fe8e46b 100644 --- a/src/secret/secret_driver.h +++ b/src/secret/secret_driver.h @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Red Hat Author: Miloslav Trmač <mitr(a)redhat.com> */ diff --git a/src/security/security_apparmor.c b/src/security/security_apparmor.c index 8c95f78..3385232 100644 --- a/src/security/security_apparmor.c +++ b/src/security/security_apparmor.c @@ -1,5 +1,6 @@ /* * AppArmor security driver for libvirt + * * Copyright (C) 2011 Red Hat, Inc. * Copyright (C) 2009-2010 Canonical Ltd. * @@ -8,6 +9,15 @@ * 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: * Jamie Strandboge <jamie(a)canonical.com> * Based on security_selinux.c by James Morris <jmorris(a)namei.org> diff --git a/src/security/security_apparmor.h b/src/security/security_apparmor.h index ffd8288..d0dd0a1 100644 --- a/src/security/security_apparmor.h +++ b/src/security/security_apparmor.h @@ -1,4 +1,3 @@ - /* * Copyright (C) 2009 Canonical Ltd. * @@ -7,6 +6,15 @@ * 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: * Jamie Strandboge <jamie(a)canonical.com> * diff --git a/src/security/security_dac.c b/src/security/security_dac.c index 9182b39..f398c3f 100644 --- a/src/security/security_dac.c +++ b/src/security/security_dac.c @@ -12,8 +12,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * POSIX DAC security driver */ diff --git a/src/security/security_dac.h b/src/security/security_dac.h index ccd9d1c..b312b03 100644 --- a/src/security/security_dac.h +++ b/src/security/security_dac.h @@ -12,8 +12,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * POSIX DAC security driver */ diff --git a/src/security/security_driver.c b/src/security/security_driver.c index 5cc6178..7ff5f17 100644 --- a/src/security/security_driver.c +++ b/src/security/security_driver.c @@ -6,6 +6,15 @@ * 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: * James Morris <jmorris(a)namei.org> * Dan Walsh <dwalsh(a)redhat.com> diff --git a/src/security/security_driver.h b/src/security/security_driver.h index c68615d..e459ada 100644 --- a/src/security/security_driver.h +++ b/src/security/security_driver.h @@ -6,6 +6,15 @@ * 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: * James Morris <jmorris(a)namei.org> * diff --git a/src/security/security_manager.c b/src/security/security_manager.c index e7d0360..2e1be4d 100644 --- a/src/security/security_manager.c +++ b/src/security/security_manager.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/security/security_manager.h b/src/security/security_manager.h index af16e75..36d801b 100644 --- a/src/security/security_manager.h +++ b/src/security/security_manager.h @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/security/security_nop.c b/src/security/security_nop.c index 5f90df3..a6b18da 100644 --- a/src/security/security_nop.c +++ b/src/security/security_nop.c @@ -12,8 +12,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/security/security_nop.h b/src/security/security_nop.h index 589a75d..24d5d0a 100644 --- a/src/security/security_nop.h +++ b/src/security/security_nop.h @@ -12,8 +12,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c index 131c058..ca19b70 100644 --- a/src/security/security_selinux.c +++ b/src/security/security_selinux.c @@ -6,6 +6,15 @@ * 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: * James Morris <jmorris(a)namei.org> * Dan Walsh <dwalsh(a)redhat.com> diff --git a/src/security/security_selinux.h b/src/security/security_selinux.h index aa67421..09d7ef6 100644 --- a/src/security/security_selinux.h +++ b/src/security/security_selinux.h @@ -6,6 +6,15 @@ * 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: * James Morris <jmorris(a)namei.org> * diff --git a/src/security/security_stack.c b/src/security/security_stack.c index 65d30d6..65d9dd7 100644 --- a/src/security/security_stack.c +++ b/src/security/security_stack.c @@ -12,8 +12,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Stacked security driver */ diff --git a/src/security/security_stack.h b/src/security/security_stack.h index bc83ff3..fd0d26f 100644 --- a/src/security/security_stack.h +++ b/src/security/security_stack.h @@ -12,8 +12,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Stacked security driver */ diff --git a/src/storage/parthelper.c b/src/storage/parthelper.c index 964aa78..b5d4acc 100644 --- a/src/storage/parthelper.c +++ b/src/storage/parthelper.c @@ -24,8 +24,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index 1095615..e677cda 100644 --- a/src/storage/storage_backend.c +++ b/src/storage/storage_backend.c @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/storage/storage_backend.h b/src/storage/storage_backend.h index 4c371fb..bafd6b6 100644 --- a/src/storage/storage_backend.h +++ b/src/storage/storage_backend.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backend_disk.c index 75d2927..0fc2995 100644 --- a/src/storage/storage_backend_disk.c +++ b/src/storage/storage_backend_disk.c @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/storage/storage_backend_disk.h b/src/storage/storage_backend_disk.h index 9d4773e..b02d3b3 100644 --- a/src/storage/storage_backend_disk.h +++ b/src/storage/storage_backend_disk.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/storage/storage_backend_fs.c b/src/storage/storage_backend_fs.c index 8da985e..29d6341 100644 --- a/src/storage/storage_backend_fs.c +++ b/src/storage/storage_backend_fs.c @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/storage/storage_backend_fs.h b/src/storage/storage_backend_fs.h index 4f69056..14e927d 100644 --- a/src/storage/storage_backend_fs.h +++ b/src/storage/storage_backend_fs.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/storage/storage_backend_iscsi.c b/src/storage/storage_backend_iscsi.c index 0e14558..b2f0c6c 100644 --- a/src/storage/storage_backend_iscsi.c +++ b/src/storage/storage_backend_iscsi.c @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/storage/storage_backend_iscsi.h b/src/storage/storage_backend_iscsi.h index 6f18280..e8b5d31 100644 --- a/src/storage/storage_backend_iscsi.h +++ b/src/storage/storage_backend_iscsi.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index ac116de..97152ae 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/storage/storage_backend_logical.h b/src/storage/storage_backend_logical.h index 2ee1683..ae220f2 100644 --- a/src/storage/storage_backend_logical.h +++ b/src/storage/storage_backend_logical.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/storage/storage_backend_mpath.c b/src/storage/storage_backend_mpath.c index 685cbf4..fadc08a 100644 --- a/src/storage/storage_backend_mpath.c +++ b/src/storage/storage_backend_mpath.c @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Dave Allan <dallan(a)redhat.com> */ diff --git a/src/storage/storage_backend_mpath.h b/src/storage/storage_backend_mpath.h index a060a13..e146332 100644 --- a/src/storage/storage_backend_mpath.h +++ b/src/storage/storage_backend_mpath.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Dave Allan <dallan(a)redhat.com> */ diff --git a/src/storage/storage_backend_rbd.c b/src/storage/storage_backend_rbd.c index 4df0b54..0342e9f 100644 --- a/src/storage/storage_backend_rbd.c +++ b/src/storage/storage_backend_rbd.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Wido den Hollander <wido(a)widodh.nl> */ diff --git a/src/storage/storage_backend_rbd.h b/src/storage/storage_backend_rbd.h index 2ae2513..d3b9d76 100644 --- a/src/storage/storage_backend_rbd.h +++ b/src/storage/storage_backend_rbd.h @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Wido den Hollander <wido(a)widodh.nl> */ diff --git a/src/storage/storage_backend_scsi.c b/src/storage/storage_backend_scsi.c index f215876..9689fb0 100644 --- a/src/storage/storage_backend_scsi.c +++ b/src/storage/storage_backend_scsi.c @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange redhat com> */ diff --git a/src/storage/storage_backend_scsi.h b/src/storage/storage_backend_scsi.h index c3af173..aed289a 100644 --- a/src/storage/storage_backend_scsi.h +++ b/src/storage/storage_backend_scsi.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange redhat com> */ diff --git a/src/storage/storage_backend_sheepdog.c b/src/storage/storage_backend_sheepdog.c index 55ca5c1..430c0e9 100644 --- a/src/storage/storage_backend_sheepdog.c +++ b/src/storage/storage_backend_sheepdog.c @@ -16,8 +16,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Wido den Hollander <wido(a)widodh.nl> * Frank Spijkerman <frank.spijkerman(a)avira.com> diff --git a/src/storage/storage_backend_sheepdog.h b/src/storage/storage_backend_sheepdog.h index 51ef7a4..9c4e1fd 100644 --- a/src/storage/storage_backend_sheepdog.h +++ b/src/storage/storage_backend_sheepdog.h @@ -16,8 +16,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Wido den Hollander <wido(a)widodh.nl> * Frank Spijkerman <frank.spijkerman(a)avira.com> diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index c9b8021..4ad9155 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/storage/storage_driver.h b/src/storage/storage_driver.h index b3e2554..ac9a4be 100644 --- a/src/storage/storage_driver.h +++ b/src/storage/storage_driver.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/test/test_driver.c b/src/test/test_driver.c index 990b20d..3c2056e 100644 --- a/src/test/test_driver.c +++ b/src/test/test_driver.c @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Daniel Berrange <berrange(a)redhat.com> */ diff --git a/src/test/test_driver.h b/src/test/test_driver.h index deb0caf..67d4218 100644 --- a/src/test/test_driver.h +++ b/src/test/test_driver.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Daniel Berrange <berrange(a)redhat.com> */ diff --git a/src/uml/uml_conf.c b/src/uml/uml_conf.c index de1cf46..4c299d8 100644 --- a/src/uml/uml_conf.c +++ b/src/uml/uml_conf.c @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/uml/uml_conf.h b/src/uml/uml_conf.h index 13b4328..ee91e61 100644 --- a/src/uml/uml_conf.h +++ b/src/uml/uml_conf.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c index 128b112..a4a9258 100644 --- a/src/uml/uml_driver.c +++ b/src/uml/uml_driver.c @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/uml/uml_driver.h b/src/uml/uml_driver.h index b7b8d9d..11ba592 100644 --- a/src/uml/uml_driver.h +++ b/src/uml/uml_driver.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/util/bitmap.c b/src/util/bitmap.c index 8c326c4..53a8a38 100644 --- a/src/util/bitmap.c +++ b/src/util/bitmap.c @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Jim Fehlig <jfehlig(a)novell.com> */ diff --git a/src/util/bitmap.h b/src/util/bitmap.h index ef62cca..c3e6222 100644 --- a/src/util/bitmap.h +++ b/src/util/bitmap.h @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Jim Fehlig <jfehlig(a)novell.com> */ diff --git a/src/util/command.c b/src/util/command.c index c02a7f1..35080d2 100644 --- a/src/util/command.c +++ b/src/util/command.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/util/command.h b/src/util/command.h index 07aa0b3..34d93a8 100644 --- a/src/util/command.h +++ b/src/util/command.h @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/util/dnsmasq.c b/src/util/dnsmasq.c index dcb7195..9b26ba1 100644 --- a/src/util/dnsmasq.c +++ b/src/util/dnsmasq.c @@ -13,8 +13,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Based on iptables.c */ diff --git a/src/util/dnsmasq.h b/src/util/dnsmasq.h index 2bec726..e489148 100644 --- a/src/util/dnsmasq.h +++ b/src/util/dnsmasq.h @@ -13,8 +13,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * based on iptables.h */ diff --git a/src/util/ebtables.c b/src/util/ebtables.c index 4943d13..ca056b1 100644 --- a/src/util/ebtables.c +++ b/src/util/ebtables.c @@ -13,8 +13,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * based on iptables.c * Authors: diff --git a/src/util/ebtables.h b/src/util/ebtables.h index d4f3cf8..05c624b 100644 --- a/src/util/ebtables.h +++ b/src/util/ebtables.h @@ -13,8 +13,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * based on iptables.h * Authors: diff --git a/src/util/event.c b/src/util/event.c index 495a1f3..f33a4fa 100644 --- a/src/util/event.c +++ b/src/util/event.c @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/util/event.h b/src/util/event.h index 2fef314..3d9f95f 100644 --- a/src/util/event.h +++ b/src/util/event.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/util/event_poll.c b/src/util/event_poll.c index 273200d..1bc1d41 100644 --- a/src/util/event_poll.c +++ b/src/util/event_poll.c @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/util/event_poll.h b/src/util/event_poll.h index 4ab3789..31c7dc7 100644 --- a/src/util/event_poll.h +++ b/src/util/event_poll.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/util/hooks.c b/src/util/hooks.c index 1e462a9..2361e72 100644 --- a/src/util/hooks.c +++ b/src/util/hooks.c @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel Veillard <veillard(a)redhat.com> */ diff --git a/src/util/hooks.h b/src/util/hooks.h index 1af7c04..4986d0c 100644 --- a/src/util/hooks.h +++ b/src/util/hooks.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel Veillard <veillard(a)redhat.com> */ diff --git a/src/util/hostusb.c b/src/util/hostusb.c index 755135d..789c0b8 100644 --- a/src/util/hostusb.c +++ b/src/util/hostusb.c @@ -12,8 +12,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * Daniel P. Berrange <berrange(a)redhat.com> diff --git a/src/util/hostusb.h b/src/util/hostusb.h index 27e07dc..3468dc8 100644 --- a/src/util/hostusb.h +++ b/src/util/hostusb.h @@ -12,8 +12,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * Daniel P. Berrange <berrange(a)redhat.com> diff --git a/src/util/iohelper.c b/src/util/iohelper.c index 0794193..0732cac 100644 --- a/src/util/iohelper.c +++ b/src/util/iohelper.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> * diff --git a/src/util/iptables.c b/src/util/iptables.c index f63ae25..b23aca9 100644 --- a/src/util/iptables.c +++ b/src/util/iptables.c @@ -12,8 +12,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * Mark McLoughlin <markmc(a)redhat.com> diff --git a/src/util/iptables.h b/src/util/iptables.h index 429f29c..30e0898 100644 --- a/src/util/iptables.h +++ b/src/util/iptables.h @@ -12,8 +12,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * Mark McLoughlin <markmc(a)redhat.com> diff --git a/src/util/json.c b/src/util/json.c index ae3686f..5132989 100644 --- a/src/util/json.c +++ b/src/util/json.c @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/util/json.h b/src/util/json.h index 436405f..c8bd504 100644 --- a/src/util/json.h +++ b/src/util/json.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/util/logging.c b/src/util/logging.c index f8233cd..73e7eb6 100644 --- a/src/util/logging.c +++ b/src/util/logging.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/util/logging.h b/src/util/logging.h index db648cb..d2bedcf 100644 --- a/src/util/logging.h +++ b/src/util/logging.h @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/util/memory.c b/src/util/memory.c index 90ca29a..92cb962 100644 --- a/src/util/memory.c +++ b/src/util/memory.c @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/util/memory.h b/src/util/memory.h index 9b6da39..ce11f16 100644 --- a/src/util/memory.h +++ b/src/util/memory.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/util/pci.c b/src/util/pci.c index 062005d..137521b 100644 --- a/src/util/pci.c +++ b/src/util/pci.c @@ -12,8 +12,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * Mark McLoughlin <markmc(a)redhat.com> diff --git a/src/util/pci.h b/src/util/pci.h index b71bb12..8bbab07 100644 --- a/src/util/pci.h +++ b/src/util/pci.h @@ -12,8 +12,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * Mark McLoughlin <markmc(a)redhat.com> diff --git a/src/util/processinfo.c b/src/util/processinfo.c index af19723..16ab8af 100644 --- a/src/util/processinfo.c +++ b/src/util/processinfo.c @@ -12,8 +12,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * Daniel P. Berrange <berrange(a)redhat.com> diff --git a/src/util/processinfo.h b/src/util/processinfo.h index 65a7171..a648bb8 100644 --- a/src/util/processinfo.h +++ b/src/util/processinfo.h @@ -12,8 +12,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * Daniel P. Berrange <berrange(a)redhat.com> diff --git a/src/util/storage_file.c b/src/util/storage_file.c index 530071e..f38aa8e 100644 --- a/src/util/storage_file.c +++ b/src/util/storage_file.c @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/util/storage_file.h b/src/util/storage_file.h index 13d0e87..1fbe08e 100644 --- a/src/util/storage_file.h +++ b/src/util/storage_file.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/util/sysinfo.c b/src/util/sysinfo.c index ca4e56e..92c3539 100644 --- a/src/util/sysinfo.c +++ b/src/util/sysinfo.c @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel Veillard <veillard(a)redhat.com> */ diff --git a/src/util/sysinfo.h b/src/util/sysinfo.h index bee43ee..b36dee4 100644 --- a/src/util/sysinfo.h +++ b/src/util/sysinfo.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel Veillard <veillard(a)redhat.com> */ diff --git a/src/util/threadpool.c b/src/util/threadpool.c index 305a22f..63c5ea0 100644 --- a/src/util/threadpool.c +++ b/src/util/threadpool.c @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * Hu Tao <hutao(a)cn.fujitsu.com> diff --git a/src/util/threadpool.h b/src/util/threadpool.h index c4612ad..894b278 100644 --- a/src/util/threadpool.h +++ b/src/util/threadpool.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: * Hu Tao <hutao(a)cn.fujitsu.com> diff --git a/src/util/threads-pthread.c b/src/util/threads-pthread.c index ea64887..4bc06ff 100644 --- a/src/util/threads-pthread.c +++ b/src/util/threads-pthread.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/util/threads-pthread.h b/src/util/threads-pthread.h index dcaacb7..62b41e8 100644 --- a/src/util/threads-pthread.h +++ b/src/util/threads-pthread.h @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/util/threads-win32.c b/src/util/threads-win32.c index 20756a1..59c1674 100644 --- a/src/util/threads-win32.c +++ b/src/util/threads-win32.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/util/threads-win32.h b/src/util/threads-win32.h index 1b23402..830aaa7 100644 --- a/src/util/threads-win32.h +++ b/src/util/threads-win32.h @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/util/threads.c b/src/util/threads.c index 4ebce56..98b4cba 100644 --- a/src/util/threads.c +++ b/src/util/threads.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/util/threads.h b/src/util/threads.h index 8f192cf..173cbec 100644 --- a/src/util/threads.h +++ b/src/util/threads.h @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/util/util.c b/src/util/util.c index d1ba0d0..e5bb27b 100644 --- a/src/util/util.c +++ b/src/util/util.c @@ -17,8 +17,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> * File created Jul 18, 2007 - Shuveb Hussain <shuveb(a)binarykarma.com> diff --git a/src/util/util.h b/src/util/util.h index 33226b2..d151c27 100644 --- a/src/util/util.h +++ b/src/util/util.h @@ -16,8 +16,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * File created Jul 18, 2007 - Shuveb Hussain <shuveb(a)binarykarma.com> */ diff --git a/src/util/uuid.c b/src/util/uuid.c index a0ceb3e..1efde69 100644 --- a/src/util/uuid.c +++ b/src/util/uuid.c @@ -12,8 +12,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * Mark McLoughlin <markmc(a)redhat.com> diff --git a/src/util/uuid.h b/src/util/uuid.h index 7dbfad5..da56a92 100644 --- a/src/util/uuid.h +++ b/src/util/uuid.h @@ -12,8 +12,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * Mark McLoughlin <markmc(a)redhat.com> diff --git a/src/util/viratomic.h b/src/util/viratomic.h index 5fee35b..246fe2b 100644 --- a/src/util/viratomic.h +++ b/src/util/viratomic.h @@ -17,8 +17,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/util/viraudit.c b/src/util/viraudit.c index df58edf..691d2f1 100644 --- a/src/util/viraudit.c +++ b/src/util/viraudit.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/util/viraudit.h b/src/util/viraudit.h index 9d8c359..42a4f8c 100644 --- a/src/util/viraudit.h +++ b/src/util/viraudit.h @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/util/virauth.c b/src/util/virauth.c index 5412ca6..e6b1db0 100644 --- a/src/util/virauth.c +++ b/src/util/virauth.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/util/virauth.h b/src/util/virauth.h index 1b315c7..94e081e 100644 --- a/src/util/virauth.h +++ b/src/util/virauth.h @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/util/virauthconfig.c b/src/util/virauthconfig.c index 20a5571..099fe55 100644 --- a/src/util/virauthconfig.c +++ b/src/util/virauthconfig.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/util/virauthconfig.h b/src/util/virauthconfig.h index cbeef85..fce439a 100644 --- a/src/util/virauthconfig.h +++ b/src/util/virauthconfig.h @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/util/virdbus.c b/src/util/virdbus.c index 0402027..da1b143 100644 --- a/src/util/virdbus.c +++ b/src/util/virdbus.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/util/virdbus.h b/src/util/virdbus.h index 7d9ec8f..92d0db0 100644 --- a/src/util/virdbus.h +++ b/src/util/virdbus.h @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/util/virfile.c b/src/util/virfile.c index 4294da7..5c99976 100644 --- a/src/util/virfile.c +++ b/src/util/virfile.c @@ -17,8 +17,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/util/virfile.h b/src/util/virfile.h index 101953a..3b4b4f8 100644 --- a/src/util/virfile.h +++ b/src/util/virfile.h @@ -17,8 +17,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/util/virhashcode.c b/src/util/virhashcode.c index d16d544..d437cdf 100644 --- a/src/util/virhashcode.c +++ b/src/util/virhashcode.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * The hash code generation is based on the public domain MurmurHash3 from Austin Appleby: * http://code.google.com/p/smhasher/source/browse/trunk/MurmurHash3.cpp diff --git a/src/util/virhashcode.h b/src/util/virhashcode.h index a38043e..2fb7a95 100644 --- a/src/util/virhashcode.h +++ b/src/util/virhashcode.h @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * The hash code generation is based on the public domain MurmurHash3 from Austin Appleby: * http://code.google.com/p/smhasher/source/browse/trunk/MurmurHash3.cpp diff --git a/src/util/virkeycode.c b/src/util/virkeycode.c index f85fe4a..bb181b1 100644 --- a/src/util/virkeycode.c +++ b/src/util/virkeycode.c @@ -12,8 +12,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/util/virkeycode.h b/src/util/virkeycode.h index 17e1e9d..6db6b43 100644 --- a/src/util/virkeycode.h +++ b/src/util/virkeycode.h @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/util/virkeyfile.c b/src/util/virkeyfile.c index 4efb897..9b307cf 100644 --- a/src/util/virkeyfile.c +++ b/src/util/virkeyfile.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * Daniel P. Berrange <berrange(a)redhat.com> diff --git a/src/util/virkeyfile.h b/src/util/virkeyfile.h index 098ef59..162e991 100644 --- a/src/util/virkeyfile.h +++ b/src/util/virkeyfile.h @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * Daniel P. Berrange <berrange(a)redhat.com> diff --git a/src/util/virmacaddr.c b/src/util/virmacaddr.c index 887e1ac..c07976b 100644 --- a/src/util/virmacaddr.c +++ b/src/util/virmacaddr.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * Daniel P. Berrange <berrange(a)redhat.com> diff --git a/src/util/virmacaddr.h b/src/util/virmacaddr.h index a767557..fdac362 100644 --- a/src/util/virmacaddr.h +++ b/src/util/virmacaddr.h @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * Daniel P. Berrange <berrange(a)redhat.com> diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index de397c5..f1ee0a4 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -12,8 +12,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * Mark McLoughlin <markmc(a)redhat.com> diff --git a/src/util/virnetdev.h b/src/util/virnetdev.h index 4c1a0d9..c663e49 100644 --- a/src/util/virnetdev.h +++ b/src/util/virnetdev.h @@ -12,8 +12,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * Mark McLoughlin <markmc(a)redhat.com> diff --git a/src/util/virnetdevbandwidth.c b/src/util/virnetdevbandwidth.c index b6686b2..b23ccd3 100644 --- a/src/util/virnetdevbandwidth.c +++ b/src/util/virnetdevbandwidth.c @@ -12,8 +12,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * Michal Privoznik <mprivozn(a)redhat.com> diff --git a/src/util/virnetdevbandwidth.h b/src/util/virnetdevbandwidth.h index 58decff..18384ae 100644 --- a/src/util/virnetdevbandwidth.h +++ b/src/util/virnetdevbandwidth.h @@ -12,8 +12,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * Michal Privoznik <mprivozn(a)redhat.com> diff --git a/src/util/virnetdevbridge.c b/src/util/virnetdevbridge.c index 08c8f5c..a616d8e 100644 --- a/src/util/virnetdevbridge.c +++ b/src/util/virnetdevbridge.c @@ -12,8 +12,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * Mark McLoughlin <markmc(a)redhat.com> diff --git a/src/util/virnetdevbridge.h b/src/util/virnetdevbridge.h index 98fc1d2..9ec1af0 100644 --- a/src/util/virnetdevbridge.h +++ b/src/util/virnetdevbridge.h @@ -12,8 +12,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * Mark McLoughlin <markmc(a)redhat.com> diff --git a/src/util/virnetdevmacvlan.c b/src/util/virnetdevmacvlan.c index 559fac5..cfad2de 100644 --- a/src/util/virnetdevmacvlan.c +++ b/src/util/virnetdevmacvlan.c @@ -13,8 +13,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * Stefan Berger <stefanb(a)us.ibm.com> diff --git a/src/util/virnetdevmacvlan.h b/src/util/virnetdevmacvlan.h index 3d5afce..b22b088 100644 --- a/src/util/virnetdevmacvlan.h +++ b/src/util/virnetdevmacvlan.h @@ -13,8 +13,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * Stefan Berger <stefanb(a)us.ibm.com> diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c index fda4439..7e0beef 100644 --- a/src/util/virnetdevopenvswitch.c +++ b/src/util/virnetdevopenvswitch.c @@ -12,8 +12,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * Dan Wendlandt <dan(a)nicira.com> diff --git a/src/util/virnetdevopenvswitch.h b/src/util/virnetdevopenvswitch.h index 5adfabd..fbf9168 100644 --- a/src/util/virnetdevopenvswitch.h +++ b/src/util/virnetdevopenvswitch.h @@ -12,8 +12,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * Dan Wendlandt <dan(a)nicira.com> diff --git a/src/util/virnetdevtap.c b/src/util/virnetdevtap.c index e6b1ae5..6ccc380 100644 --- a/src/util/virnetdevtap.c +++ b/src/util/virnetdevtap.c @@ -12,8 +12,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * Mark McLoughlin <markmc(a)redhat.com> diff --git a/src/util/virnetdevtap.h b/src/util/virnetdevtap.h index f14d1c9..ce3365e 100644 --- a/src/util/virnetdevtap.h +++ b/src/util/virnetdevtap.h @@ -12,8 +12,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * Mark McLoughlin <markmc(a)redhat.com> diff --git a/src/util/virnetdevveth.c b/src/util/virnetdevveth.c index b996cfe..38d7b18 100644 --- a/src/util/virnetdevveth.c +++ b/src/util/virnetdevveth.c @@ -13,8 +13,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * David L. Leskovec <dlesko at linux.vnet.ibm.com> diff --git a/src/util/virnetdevveth.h b/src/util/virnetdevveth.h index 0d450f1..69fd04f 100644 --- a/src/util/virnetdevveth.h +++ b/src/util/virnetdevveth.h @@ -13,8 +13,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * David L. Leskovec <dlesko at linux.vnet.ibm.com> diff --git a/src/util/virnetdevvportprofile.c b/src/util/virnetdevvportprofile.c index 089ec8a..506240b 100644 --- a/src/util/virnetdevvportprofile.c +++ b/src/util/virnetdevvportprofile.c @@ -12,8 +12,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * Stefan Berger <stefanb(a)us.ibm.com> diff --git a/src/util/virnetdevvportprofile.h b/src/util/virnetdevvportprofile.h index 1c93f77..6cce1bb 100644 --- a/src/util/virnetdevvportprofile.h +++ b/src/util/virnetdevvportprofile.h @@ -12,8 +12,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * Stefan Berger <stefanb(a)us.ibm.com> diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c index b1ec777..4a31b1c 100644 --- a/src/util/virnetlink.c +++ b/src/util/virnetlink.c @@ -13,8 +13,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * Stefan Berger <stefanb(a)us.ibm.com> diff --git a/src/util/virnetlink.h b/src/util/virnetlink.h index b7f64ca..1997c8d 100644 --- a/src/util/virnetlink.h +++ b/src/util/virnetlink.h @@ -13,8 +13,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. */ #ifndef __VIR_NETLINK_H__ diff --git a/src/util/virnodesuspend.c b/src/util/virnodesuspend.c index 2978b1c..71beb3d 100644 --- a/src/util/virnodesuspend.c +++ b/src/util/virnodesuspend.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/util/virnodesuspend.h b/src/util/virnodesuspend.h index 5debde2..a6927ac 100644 --- a/src/util/virnodesuspend.h +++ b/src/util/virnodesuspend.h @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/util/virpidfile.c b/src/util/virpidfile.c index d6235d2..7c78924 100644 --- a/src/util/virpidfile.c +++ b/src/util/virpidfile.c @@ -16,8 +16,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/util/virpidfile.h b/src/util/virpidfile.h index dc44fc9..6227bb1 100644 --- a/src/util/virpidfile.h +++ b/src/util/virpidfile.h @@ -16,8 +16,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/util/virrandom.c b/src/util/virrandom.c index 88413ab..b815ce2 100644 --- a/src/util/virrandom.c +++ b/src/util/virrandom.c @@ -12,8 +12,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * Daniel P. Berrange <berrange(a)redhat.com> diff --git a/src/util/virrandom.h b/src/util/virrandom.h index 24ab0b1..aa2c8b4 100644 --- a/src/util/virrandom.h +++ b/src/util/virrandom.h @@ -12,8 +12,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * Daniel P. Berrange <berrange(a)redhat.com> diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c index 603d2ec..36ac2fb 100644 --- a/src/util/virsocketaddr.c +++ b/src/util/virsocketaddr.c @@ -12,8 +12,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * Daniel Veillard <veillard(a)redhat.com> diff --git a/src/util/virsocketaddr.h b/src/util/virsocketaddr.h index b71a8af..ba863e2 100644 --- a/src/util/virsocketaddr.h +++ b/src/util/virsocketaddr.h @@ -12,8 +12,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Authors: * Daniel Veillard <veillard(a)redhat.com> diff --git a/src/util/virterror_internal.h b/src/util/virterror_internal.h index 06417b5..b82b905 100644 --- a/src/util/virterror_internal.h +++ b/src/util/virterror_internal.h @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/util/virtime.c b/src/util/virtime.c index 92b6cdd..926bb50 100644 --- a/src/util/virtime.c +++ b/src/util/virtime.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> * diff --git a/src/util/virtime.h b/src/util/virtime.h index 59954c2..e21662b 100644 --- a/src/util/virtime.h +++ b/src/util/virtime.h @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/src/util/virtypedparam.c b/src/util/virtypedparam.c index d1a1eea..d68d79f 100644 --- a/src/util/virtypedparam.c +++ b/src/util/virtypedparam.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/util/virtypedparam.h b/src/util/virtypedparam.h index 7c513ed..f117b84 100644 --- a/src/util/virtypedparam.h +++ b/src/util/virtypedparam.h @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/vbox/vbox_MSCOMGlue.c b/src/vbox/vbox_MSCOMGlue.c index 68810fb..eb688b8 100644 --- a/src/vbox/vbox_MSCOMGlue.c +++ b/src/vbox/vbox_MSCOMGlue.c @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/vbox/vbox_MSCOMGlue.h b/src/vbox/vbox_MSCOMGlue.h index 83b2ce1..cd0b5a6 100644 --- a/src/vbox/vbox_MSCOMGlue.h +++ b/src/vbox/vbox_MSCOMGlue.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/vbox/vbox_glue.c b/src/vbox/vbox_glue.c index 5fca843..dbd600d 100644 --- a/src/vbox/vbox_glue.c +++ b/src/vbox/vbox_glue.c @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/vbox/vbox_glue.h b/src/vbox/vbox_glue.h index bbc244b..e074d75 100644 --- a/src/vbox/vbox_glue.h +++ b/src/vbox/vbox_glue.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/vmware/vmware_conf.c b/src/vmware/vmware_conf.c index e7a9dfa..9fb95c4 100644 --- a/src/vmware/vmware_conf.c +++ b/src/vmware/vmware_conf.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. */ /*---------------------------------------------------------------------------*/ diff --git a/src/vmware/vmware_conf.h b/src/vmware/vmware_conf.h index 9053eba..1b2b079 100644 --- a/src/vmware/vmware_conf.h +++ b/src/vmware/vmware_conf.h @@ -12,8 +12,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. */ /*---------------------------------------------------------------------------*/ diff --git a/src/vmware/vmware_driver.c b/src/vmware/vmware_driver.c index 9af5078..6c6347a 100644 --- a/src/vmware/vmware_driver.c +++ b/src/vmware/vmware_driver.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. */ /*---------------------------------------------------------------------------*/ diff --git a/src/vmware/vmware_driver.h b/src/vmware/vmware_driver.h index 71186de..0e48d81 100644 --- a/src/vmware/vmware_driver.h +++ b/src/vmware/vmware_driver.h @@ -12,8 +12,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. */ /*---------------------------------------------------------------------------*/ diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 3f05b16..c775e78 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -16,8 +16,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/vmx/vmx.h b/src/vmx/vmx.h index 4d54660..c516d70 100644 --- a/src/vmx/vmx.h +++ b/src/vmx/vmx.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/src/xen/xen_inotify.c b/src/xen/xen_inotify.c index 7185366..24e70a6 100644 --- a/src/xen/xen_inotify.c +++ b/src/xen/xen_inotify.c @@ -18,8 +18,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Ben Guthro */ diff --git a/src/xen/xen_inotify.h b/src/xen/xen_inotify.h index 74f4dff..984351b 100644 --- a/src/xen/xen_inotify.h +++ b/src/xen/xen_inotify.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Ben Guthro */ diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c index c073f25..f9ccbab 100644 --- a/src/xen/xm_internal.c +++ b/src/xen/xm_internal.c @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> * diff --git a/src/xen/xm_internal.h b/src/xen/xm_internal.h index 3e1f886..190d32e 100644 --- a/src/xen/xm_internal.h +++ b/src/xen/xm_internal.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> * diff --git a/src/xenapi/xenapi_driver.c b/src/xenapi/xenapi_driver.c index 38a7cd0..5608de8 100644 --- a/src/xenapi/xenapi_driver.c +++ b/src/xenapi/xenapi_driver.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Sharadha Prabhakar <sharadha.prabhakar(a)citrix.com> */ diff --git a/src/xenapi/xenapi_driver.h b/src/xenapi/xenapi_driver.h index a47c132..647cd98 100644 --- a/src/xenapi/xenapi_driver.h +++ b/src/xenapi/xenapi_driver.h @@ -13,8 +13,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Sharadha Prabhakar <sharadha.prabhakar(a)citrix.com> */ diff --git a/src/xenapi/xenapi_driver_private.h b/src/xenapi/xenapi_driver_private.h index cfcaa75..07f7995 100644 --- a/src/xenapi/xenapi_driver_private.h +++ b/src/xenapi/xenapi_driver_private.h @@ -13,8 +13,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Sharadha Prabhakar <sharadha.prabhakar(a)citrix.com> */ diff --git a/src/xenapi/xenapi_utils.c b/src/xenapi/xenapi_utils.c index c8b12de..3031a17 100644 --- a/src/xenapi/xenapi_utils.c +++ b/src/xenapi/xenapi_utils.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Sharadha Prabhakar <sharadha.prabhakar(a)citrix.com> */ diff --git a/src/xenapi/xenapi_utils.h b/src/xenapi/xenapi_utils.h index aa1ff74..5912446 100644 --- a/src/xenapi/xenapi_utils.h +++ b/src/xenapi/xenapi_utils.h @@ -13,8 +13,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Sharadha Prabhakar <sharadha.prabhakar(a)citrix.com> */ diff --git a/src/xenxs/xen_sxpr.c b/src/xenxs/xen_sxpr.c index 42533ce..c84ce35 100644 --- a/src/xenxs/xen_sxpr.c +++ b/src/xenxs/xen_sxpr.c @@ -16,8 +16,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Anthony Liguori <aliguori(a)us.ibm.com> * Author: Daniel Veillard <veillard(a)redhat.com> diff --git a/src/xenxs/xen_sxpr.h b/src/xenxs/xen_sxpr.h index e5380ab..3433f68 100644 --- a/src/xenxs/xen_sxpr.h +++ b/src/xenxs/xen_sxpr.h @@ -16,8 +16,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Anthony Liguori <aliguori(a)us.ibm.com> * Author: Daniel Veillard <veillard(a)redhat.com> diff --git a/src/xenxs/xen_xm.c b/src/xenxs/xen_xm.c index 99e736e..20347d3 100644 --- a/src/xenxs/xen_xm.c +++ b/src/xenxs/xen_xm.c @@ -16,8 +16,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> * Author: Markus Groß <gross(a)univention.de> diff --git a/src/xenxs/xen_xm.h b/src/xenxs/xen_xm.h index 7b53ab6..0689fe0 100644 --- a/src/xenxs/xen_xm.h +++ b/src/xenxs/xen_xm.h @@ -16,8 +16,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> * Author: Markus Groß <gross(a)univention.de> diff --git a/src/xenxs/xenxs_private.h b/src/xenxs/xenxs_private.h index 4fc9461..d0ba59a 100644 --- a/src/xenxs/xenxs_private.h +++ b/src/xenxs/xenxs_private.h @@ -15,8 +15,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Richard W.M. Jones <rjones(a)redhat.com> * Author: Markus Groß <gross(a)univention.de> diff --git a/tests/commandhelper.c b/tests/commandhelper.c index ec0c458..29da1a5 100644 --- a/tests/commandhelper.c +++ b/tests/commandhelper.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. */ #include <config.h> diff --git a/tests/commandtest.c b/tests/commandtest.c index fa445d3..b1c7523 100644 --- a/tests/commandtest.c +++ b/tests/commandtest.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. */ #include <config.h> diff --git a/tests/cputest.c b/tests/cputest.c index ccc17fd..1ca0b85 100644 --- a/tests/cputest.c +++ b/tests/cputest.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Jiri Denemark <jdenemar(a)redhat.com> */ diff --git a/tests/eventtest.c b/tests/eventtest.c index 4c45860..2dea75b 100644 --- a/tests/eventtest.c +++ b/tests/eventtest.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/tests/libvirtdconftest.c b/tests/libvirtdconftest.c index f97bf80..b394d54 100644 --- a/tests/libvirtdconftest.c +++ b/tests/libvirtdconftest.c @@ -12,8 +12,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/tests/shunloadhelper.c b/tests/shunloadhelper.c index efd8af0..51307b2 100644 --- a/tests/shunloadhelper.c +++ b/tests/shunloadhelper.c @@ -12,8 +12,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/tests/shunloadtest.c b/tests/shunloadtest.c index 45ef0a1..7b5ea5d 100644 --- a/tests/shunloadtest.c +++ b/tests/shunloadtest.c @@ -12,8 +12,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/tests/sockettest.c b/tests/sockettest.c index 777da4a..e58140f 100644 --- a/tests/sockettest.c +++ b/tests/sockettest.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/tests/ssh.c b/tests/ssh.c index 49b6bce..e6e8f42 100644 --- a/tests/ssh.c +++ b/tests/ssh.c @@ -12,8 +12,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/tests/storagebackendsheepdogtest.c b/tests/storagebackendsheepdogtest.c index 0870829..b7b3b35 100644 --- a/tests/storagebackendsheepdogtest.c +++ b/tests/storagebackendsheepdogtest.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Sebastian Wiedenroth <sebastian.wiedenroth(a)skylime.net> */ diff --git a/tests/virauthconfigtest.c b/tests/virauthconfigtest.c index 6d0bc51..9b1b537 100644 --- a/tests/virauthconfigtest.c +++ b/tests/virauthconfigtest.c @@ -12,8 +12,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/tests/virdrivermoduletest.c b/tests/virdrivermoduletest.c index 405574e..8762de4 100644 --- a/tests/virdrivermoduletest.c +++ b/tests/virdrivermoduletest.c @@ -12,8 +12,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/tests/virkeyfiletest.c b/tests/virkeyfiletest.c index 0d0931c..92b64bf 100644 --- a/tests/virkeyfiletest.c +++ b/tests/virkeyfiletest.c @@ -12,8 +12,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/tests/virnetmessagetest.c b/tests/virnetmessagetest.c index 0408b5b..02c68c2 100644 --- a/tests/virnetmessagetest.c +++ b/tests/virnetmessagetest.c @@ -12,8 +12,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c index 204113e..d65b949 100644 --- a/tests/virnetsockettest.c +++ b/tests/virnetsockettest.c @@ -12,8 +12,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/tests/virnettlscontexttest.c b/tests/virnettlscontexttest.c index e745487..0dfaa23 100644 --- a/tests/virnettlscontexttest.c +++ b/tests/virnettlscontexttest.c @@ -12,8 +12,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/tests/virtimetest.c b/tests/virtimetest.c index ac06e89..c151f70 100644 --- a/tests/virtimetest.c +++ b/tests/virtimetest.c @@ -12,8 +12,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/tests/viruritest.c b/tests/viruritest.c index 48cbaf5..93deb12 100644 --- a/tests/viruritest.c +++ b/tests/viruritest.c @@ -12,8 +12,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> */ diff --git a/tests/xmconfigtest.c b/tests/xmconfigtest.c index 9956bf2..3a0937e 100644 --- a/tests/xmconfigtest.c +++ b/tests/xmconfigtest.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Author: Daniel P. Berrange <berrange(a)redhat.com> * diff --git a/tools/console.c b/tools/console.c index 90e54e3..afece27 100644 --- a/tools/console.c +++ b/tools/console.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Daniel Berrange <berrange(a)redhat.com> */ diff --git a/tools/console.h b/tools/console.h index 1feea9e..c1448a7 100644 --- a/tools/console.h +++ b/tools/console.h @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * * Daniel Berrange <berrange(a)redhat.com> */ diff --git a/tools/virt-host-validate-common.c b/tools/virt-host-validate-common.c index 066343c..e947a53 100644 --- a/tools/virt-host-validate-common.c +++ b/tools/virt-host-validate-common.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/tools/virt-host-validate-common.h b/tools/virt-host-validate-common.h index 93d8a83..184dddf 100644 --- a/tools/virt-host-validate-common.h +++ b/tools/virt-host-validate-common.h @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/tools/virt-host-validate-lxc.c b/tools/virt-host-validate-lxc.c index 9d69b67..321b209 100644 --- a/tools/virt-host-validate-lxc.c +++ b/tools/virt-host-validate-lxc.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/tools/virt-host-validate-lxc.h b/tools/virt-host-validate-lxc.h index 7efc229..64e3a83 100644 --- a/tools/virt-host-validate-lxc.h +++ b/tools/virt-host-validate-lxc.h @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/tools/virt-host-validate-qemu.c b/tools/virt-host-validate-qemu.c index b65d449..f9c3188 100644 --- a/tools/virt-host-validate-qemu.c +++ b/tools/virt-host-validate-qemu.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/tools/virt-host-validate-qemu.h b/tools/virt-host-validate-qemu.h index ba5f03b..99153b8 100644 --- a/tools/virt-host-validate-qemu.h +++ b/tools/virt-host-validate-qemu.h @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ diff --git a/tools/virt-host-validate.c b/tools/virt-host-validate.c index cdf8302..e32d358 100644 --- a/tools/virt-host-validate.c +++ b/tools/virt-host-validate.c @@ -14,8 +14,8 @@ * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * License along with this library; If not, see + * <http://www.gnu.org/licenses/>. * */ -- 1.7.7.3

2 3

[libvirt] ESX: failure while performing "CastFromAnyType"
by Ata E Husain Bohra 21 Jul '12

21 Jul '12

Hi All, I am trying to extend “iscsi” support for iSCSI driver, currently am stuck at getting iSCSI target list from the hypervisor. I am using hostSystem object (propertyNameList is set to “config.storageDevice.hostBusAdapter”) to retrieve list of “HostHostBusAdapter” from ESX, but the call fails to perform “CastFromAnyType” from ObjectContent –> HostHostBusAdapter. The esx_vi_generator.input object definition looks like this: object HostHostBusAdapter String key o String device r Int bus r String status r String model r String driver o String pci o end esx_vi_generaor.py is modified as follows: "HostHostBusAdapter" : Object.FEATURE__ANY_TYPE | Object.FEATURE__LIST, Using gdb, I see the failure occurs at: esx/esx_vi.c:esxVI_List_CastFromAnyType(..) line 1631: .. if (esxVI_AnyType_Deserialize(childNode, &childAnyType) < 0 || castFromAnyTypeFunc(childAnyType, &item) < 0 || esxVI_List_Append(list, item) < 0) { goto cleanup; } .. In one of my earlier patches (subject: Add routines to interface driver) I patched esx_vi_generator.py to deserialize “string list”; as the patch is still under review I manually applied the branch to this branch but no change (did not expect change as structure does not contain any list object). I am wondering what else is missing to make it work. Any suggestion how to debug/fix this issue is highly appreciated. Thanks! Ata

3 5

[libvirt] [PATCH 0/2] vmx: handle shared folders
by Jean-Baptiste Rouault 21 Jul '12

21 Jul '12

The following patches add support for shared folders for VMware domains Jean-Baptiste Rouault (2): vmx: handle shared folders formatting vmx: handle shared folders parsing src/vmx/vmx.c | 193 +++++++++++++++++++++++++++- src/vmx/vmx.h | 5 + tests/vmx2xmldata/vmx2xml-sharedfolder.vmx | 9 ++ tests/vmx2xmldata/vmx2xml-sharedfolder.xml | 22 ++++ tests/vmx2xmltest.c | 2 + tests/xml2vmxdata/xml2vmx-sharedfolder.vmx | 18 +++ tests/xml2vmxdata/xml2vmx-sharedfolder.xml | 14 ++ tests/xml2vmxtest.c | 2 + 8 files changed, 263 insertions(+), 2 deletions(-) create mode 100644 tests/vmx2xmldata/vmx2xml-sharedfolder.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-sharedfolder.xml create mode 100644 tests/xml2vmxdata/xml2vmx-sharedfolder.vmx create mode 100644 tests/xml2vmxdata/xml2vmx-sharedfolder.xml -- 1.7.10.4

2 4

[libvirt] [PATCH 00/13] Introduce a virObject module fo reference counting
by Daniel P. Berrange 21 Jul '12

21 Jul '12

Last year Hu Tao posted a series which introduced a virObject type and converted the QEMU driver to use this for some of its objects https://www.redhat.com/archives/libvir-list/2011-April/msg00316.html While the idea was generally encouraged, the impl was never updated with review feedback, although some of the atomic ops code was updated and merged. This series is an attempt to address the same problem. The significant things in this series - Instead of storing a 'destroy' pointer in virObject itself, introduce a separate 'virClass' concept. As we add more functionality to virObject, the benefit of not duplicating class-level data in each object instance will be great - The virObject APIs take a 'void *' instead of virObjectPtr to avoid the need to litter the code with casts, albeit at a slight loss in compile time type safety checking - Replace our current atomic ops code with GLib's impl which is more complete, in particular it has Win32 support - Add a macro to facilitate creating one-time init functions usig virOnce - Convert all our public API objects to use this new code - Convert all code in src/rpc, src/conf and src/qemu to the new object APIs In the future the things I plan to do are - Add a mutex to virObject - nearly all subclasses make use of a mutex, so it makes sense to provide one in the base class - Add generic support for callbacks. Currently each module deals with callbacks in a rather adhoc fashion. THis will create something similar in concept to GLib's 'signal' capabilities, though somewhat simpler. .gitignore | 1 configure.ac | 59 ++ daemon/libvirtd.c | 27 - daemon/remote.c | 8 daemon/stream.c | 19 src/Makefile.am | 7 src/conf/domain_conf.c | 59 -- src/conf/domain_conf.h | 8 src/conf/domain_event.c | 8 src/datatypes.c | 999 ++++++++------------------------------ src/datatypes.h | 264 +++------- src/libvirt.c | 131 +--- src/libvirt_atomic.syms | 3 src/libvirt_private.syms | 42 - src/libvirt_probes.d | 31 - src/libxl/libxl_driver.c | 6 src/lxc/lxc_controller.c | 8 src/nwfilter/nwfilter_dhcpsnoop.c | 48 - src/openvz/openvz_conf.c | 17 src/phyp/phyp_driver.c | 14 src/qemu/qemu_agent.c | 86 +-- src/qemu/qemu_agent.h | 3 src/qemu/qemu_command.c | 2 src/qemu/qemu_domain.c | 49 - src/qemu/qemu_domain.h | 8 src/qemu/qemu_driver.c | 2 src/qemu/qemu_migration.c | 34 - src/qemu/qemu_migration.h | 4 src/qemu/qemu_monitor.c | 97 +-- src/qemu/qemu_monitor.h | 3 src/qemu/qemu_process.c | 52 - src/remote/remote_driver.c | 26 src/rpc/gendispatch.pl | 4 src/rpc/virkeepalive.c | 73 +- src/rpc/virkeepalive.h | 4 src/rpc/virnetclient.c | 117 +--- src/rpc/virnetclient.h | 4 src/rpc/virnetclientprogram.c | 43 - src/rpc/virnetclientprogram.h | 5 src/rpc/virnetclientstream.c | 65 +- src/rpc/virnetclientstream.h | 5 src/rpc/virnetsaslcontext.c | 106 +--- src/rpc/virnetsaslcontext.h | 8 src/rpc/virnetserver.c | 82 +-- src/rpc/virnetserver.h | 5 src/rpc/virnetserverclient.c | 134 ++--- src/rpc/virnetserverclient.h | 5 src/rpc/virnetserverprogram.c | 49 - src/rpc/virnetserverprogram.h | 8 src/rpc/virnetserverservice.c | 97 +-- src/rpc/virnetserverservice.h | 5 src/rpc/virnetsocket.c | 85 +-- src/rpc/virnetsocket.h | 3 src/rpc/virnettlscontext.c | 110 +--- src/rpc/virnettlscontext.h | 10 src/storage/storage_driver.c | 4 src/util/logging.c | 54 -- src/util/logging.h | 2 src/util/threads.h | 49 + src/util/viratomic.c | 35 + src/util/viratomic.h | 424 +++++++++++++--- src/util/virfile.c | 4 src/util/virnodesuspend.c | 25 src/util/virnodesuspend.h | 1 src/util/virobject.c | 203 +++++++ src/util/virobject.h | 60 ++ src/vbox/vbox_tmpl.c | 2 src/vmware/vmware_conf.c | 4 src/xen/xend_internal.c | 4 tests/Makefile.am | 5 tests/qemuxml2argvtest.c | 21 tests/qemuxmlnstest.c | 2 tests/sexpr2xmltest.c | 2 tests/viratomictest.c | 180 ++++++ tests/virnetsockettest.c | 26 tests/virnettlscontexttest.c | 10 tests/xmconfigtest.c | 4 77 files changed, 2105 insertions(+), 2168 deletions(-)

3 41

[libvirt] [PATCH 2/2] Use ATTRIBUTE_UNUSED for unused variable.
by Ata E Husain Bohra 20 Jul '12

20 Jul '12

--- src/esx/esx_interface_driver.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/esx/esx_interface_driver.c b/src/esx/esx_interface_driver.c index b1ba5e2..01caed0 100644 --- a/src/esx/esx_interface_driver.c +++ b/src/esx/esx_interface_driver.c @@ -107,10 +107,8 @@ cleanup: static int -esxNumOfDefinedInterfaces(virConnectPtr conn) +esxNumOfDefinedInterfaces(virConnectPtr conn ATTRIBUTE_UNUSED) { - conn->interfacePrivateData = NULL; - // ESX interfaces are always active return 0; } @@ -162,14 +160,10 @@ esxListInterfaces(virConnectPtr conn, char **names, int maxnames) static int -esxListDefinedInterfaces(virConnectPtr conn, char **names, int maxnames) +esxListDefinedInterfaces(virConnectPtr conn ATTRIBUTE_UNUSED, + char **names ATTRIBUTE_UNUSED, + int maxnames ATTRIBUTE_UNUSED) { - conn->interfacePrivateData = conn->privateData; - *names = NULL; - - /* keeps compiler happy */ - VIR_DEBUG("max interfaces: %d", maxnames); - // ESX interfaces are always active return 0; } -- 1.7.9.5

1 0

[libvirt] [PATCH v3 0/2] ESX: Add routines to interface driver
by Ata E Husain Bohra 20 Jul '12

20 Jul '12

Repost of https://www.redhat.com/archives/libvir-list/2012-July/msg00990.html. Thanks Eric for pointing the message-ID issue with earlier post. Ata E Husain Bohra (2): ESX: Add routines to interface driver Use ATTRIBUTE_UNUSED for unused variable. src/esx/esx_interface_driver.c | 500 +++++++++++++++++++++++++++++++++++++++- src/esx/esx_vi.c | 126 ++++++++++ src/esx/esx_vi.h | 10 + src/esx/esx_vi_generator.input | 227 ++++++++++++++++++ src/esx/esx_vi_generator.py | 31 ++- src/esx/esx_vi_types.c | 18 +- 6 files changed, 907 insertions(+), 5 deletions(-) -- 1.7.9.5

1 0

[libvirt] [PATCH] tests: avoid seclabeltest crash
by Eric Blake 20 Jul '12

20 Jul '12

Commit a56c347 introduced a use of random numbers into seclabel handling, but failed to initialize the random number generator in the testsuite. * tests/seclabeltest.c (main): Initialize randomness. --- Pushing under the build-breaker rule to avoid a SIGSEGV. I don't know if Dan's pending patches for one-shot initializer cleanups will be impacted or make this harder to forget in the future. tests/seclabeltest.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/tests/seclabeltest.c b/tests/seclabeltest.c index 2f65ec1..7283ca1 100644 --- a/tests/seclabeltest.c +++ b/tests/seclabeltest.c @@ -6,6 +6,7 @@ #include <string.h> #include <errno.h> #include "security/security_driver.h" +#include "virrandom.h" int main (int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED) @@ -13,10 +14,14 @@ main (int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED) virSecurityManagerPtr mgr; const char *doi, *model; + if (virThreadInitialize() < 0 || + virRandomInitialize(time(NULL) ^ getpid())) + exit(1); + mgr = virSecurityManagerNew(NULL, "QEMU", false, true, false); if (mgr == NULL) { fprintf (stderr, "Failed to start security driver"); - exit (-1); + exit(1); } model = virSecurityManagerGetModel(mgr); @@ -24,7 +29,7 @@ main (int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED) { fprintf (stderr, "Failed to copy secModel model: %s", strerror (errno)); - exit (-1); + exit(1); } doi = virSecurityManagerGetDOI(mgr); @@ -32,7 +37,7 @@ main (int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED) { fprintf (stderr, "Failed to copy secModel DOI: %s", strerror (errno)); - exit (-1); + exit(1); } virSecurityManagerFree(mgr); -- 1.7.10.4

1 0

[libvirt] [PATCHv2 0/5] Allow to query a guest's hostname
by Guido Günther 20 Jul '12

20 Jul '12

The following patches allow to query a guest's hostname. Once we also have support to set the hostname via the domain's xml we can also print it in "virsh dominfo" by default so I left it out for now. I left the version at 0.9.14. It'd be happy to change this ot 0.10 should we settle for that one. Changes since last time: * drop patch to print hostname in "virsh list" * add remote protocoll support * Addressed Eric's style comments * openvzVEGetStringParam: Let virCommandRun do the error printing and missing error handling * Don't return empty hostnames but raise VIR_ERR_OPERATION_FAILED instead Cheers, -- Guido Guido Günther (5): Add virDomainGetHostname virsh: Add domhostname remote: Provide RPC call for domainGetHostname openvz: Add openvzVEGetStringParam openvz: Implement domainGetHostname include/libvirt/libvirt.h.in | 2 ++ src/driver.h | 6 ++++++ src/libvirt.c | 45 ++++++++++++++++++++++++++++++++++++++++++ src/libvirt_openvz.syms | 2 +- src/libvirt_public.syms | 5 +++++ src/openvz/openvz_driver.c | 42 +++++++++++++++++++++++++++++++++++++++ src/openvz/openvz_util.c | 32 ++++++++++++++++++++++++++++++ src/openvz/openvz_util.h | 1 + src/remote/remote_driver.c | 1 + src/remote/remote_protocol.x | 12 ++++++++++- src/remote_protocol-structs | 8 ++++++++ tools/virsh.c | 44 +++++++++++++++++++++++++++++++++++++++++ tools/virsh.pod | 4 ++++ 13 files changed, 202 insertions(+), 2 deletions(-) -- 1.7.10.4

3 13

[libvirt] [PATCH v2 0/3] Misc changes to SELinux driver
by Daniel P. Berrange 20 Jul '12

20 Jul '12

This is a repost of https://www.redhat.com/archives/libvir-list/2012-May/msg01186.html No changes except to rebase.

2 8

[libvirt] [PATCH 1/5] Add public API to register a callback to be invoked on connection close
by Daniel P. Berrange 20 Jul '12

20 Jul '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Define a new virConnectSetCloseCallback() public API which allows registering a callback to be invoked when the connection to a hypervisor is closed. The callback is provided with the reason for the close, which may be 'error', 'eof' or 'keepalive'. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- include/libvirt/libvirt.h.in | 40 +++++++++++++++++++++++-------- src/datatypes.c | 4 ++++ src/datatypes.h | 5 ++++ src/libvirt.c | 53 ++++++++++++++++++++++++++++++++++++++++++ src/libvirt_public.syms | 6 +++++ 5 files changed, 98 insertions(+), 10 deletions(-) diff --git a/include/libvirt/libvirt.h.in b/include/libvirt/libvirt.h.in index e34438c..74b3f90 100644 --- a/include/libvirt/libvirt.h.in +++ b/include/libvirt/libvirt.h.in @@ -49,6 +49,17 @@ extern "C" { * defines VIR_ENUM_SENTINELS. Enumerations for bit values do not * have a *_LAST value, but additional bits may be defined. */ +/* + * virFreeCallback: + * @opaque: opaque user data provided at registration + * + * Type for a domain event callback when the event is deregistered and + * need to be freed, @opaque is provided along with the callback at + * registration time + */ +typedef void (*virFreeCallback)(void *opaque); + + /** * virConnect: * @@ -1148,6 +1159,25 @@ int virConnectSetKeepAlive(virConnectPtr conn, int interval, unsigned int count); +typedef enum { + VIR_CONNECT_CLOSE_REASON_ERROR = 1, /* Misc I/O error */ + VIR_CONNECT_CLOSE_REASON_EOF = 2, /* End-of-file from server */ + VIR_CONNECT_CLOSE_REASON_KEEPALIVE = 3, /* Keepalive timer triggered */ + VIR_CONNECT_CLOSE_REASON_CLIENT = 4, /* Client requested it */ + +# ifdef VIR_ENUM_SENTINELS + VIR_CONNECT_CLOSE_REASON_LAST +# endif +} virConnectCloseReason; + +typedef void (*virConnectCloseFunc)(virConnectPtr conn, + int reason, + void *opaque); + +int virConnectSetCloseCallback(virConnectPtr conn, + virConnectCloseFunc cb, + void *opaque, + virFreeCallback freecb); /* * Capabilities of the connection / driver. @@ -2861,16 +2891,6 @@ typedef int (*virConnectDomainEventCallback)(virConnectPtr conn, int detail, void *opaque); -/* - * virFreeCallback: - * @opaque: opaque user data provided at registration - * - * Type for a domain event callback when the event is deregistered and - * need to be freed, @opaque is provided along with the callback at - * registration time - */ -typedef void (*virFreeCallback)(void *opaque); - int virConnectDomainEventRegister(virConnectPtr conn, virConnectDomainEventCallback cb, void *opaque, diff --git a/src/datatypes.c b/src/datatypes.c index d718170..5d415b8 100644 --- a/src/datatypes.c +++ b/src/datatypes.c @@ -115,6 +115,10 @@ virReleaseConnect(virConnectPtr conn) { virMutexLock(&conn->lock); + if (conn->closeOpaque && + conn->closeFreeCallback) + conn->closeFreeCallback(conn->closeOpaque); + virResetError(&conn->err); virURIFree(conn->uri); diff --git a/src/datatypes.h b/src/datatypes.h index fc284d2..af054ac 100644 --- a/src/datatypes.h +++ b/src/datatypes.h @@ -187,6 +187,11 @@ struct _virConnect { virErrorFunc handler; /* associated handlet */ void *userData; /* the user data */ + /* Per-connection close callback */ + virConnectCloseFunc closeCallback; + void *closeOpaque; + virFreeCallback closeFreeCallback; + int refs; /* reference count */ }; diff --git a/src/libvirt.c b/src/libvirt.c index df78e8a..8acb87f 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -18613,6 +18613,59 @@ error: /** + * virConnectSetCloseCallback: + * @conn: pointer to connection object + * @cb: callback to invoke upon close + * @opaque: user data to pass to @cb + * @freecb: callback to free @opaque + * + * Registers a callback to be invoked when the connection + * is closed. This callback is invoked when there is any + * condition that causes the socket connection to the + * hypervisor to be closed. + * + * This function is only applicable to hypervisor drivers + * which maintain a persistent open connection. Drivers + * which open a new connection for every operation will + * not invoke this. + * + * The @freecb must not invoke any other libvirt public + * APIs, since it is not called from a re-entrant safe + * context. + * + * Returns 0 on success, -1 on error + */ +int virConnectSetCloseCallback(virConnectPtr conn, + virConnectCloseFunc cb, + void *opaque, + virFreeCallback freecb) +{ + VIR_DEBUG("conn=%p", conn); + + virResetLastError(); + + if (!VIR_IS_CONNECT(conn)) { + virLibConnError(VIR_ERR_INVALID_CONN, __FUNCTION__); + virDispatchError(NULL); + return -1; + } + + virMutexLock(&conn->lock); + + if (conn->closeOpaque && + conn->closeFreeCallback) + conn->closeFreeCallback(conn->closeOpaque); + + conn->closeCallback = cb; + conn->closeOpaque = opaque; + conn->closeFreeCallback = freecb; + + virMutexUnlock(&conn->lock); + + return 0; +} + +/** * virDomainSetBlockIoTune: * @dom: pointer to domain object * @disk: path to the block device, or device shorthand diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms index 2913a81..dab8725 100644 --- a/src/libvirt_public.syms +++ b/src/libvirt_public.syms @@ -544,4 +544,10 @@ LIBVIRT_0.9.13 { virDomainSnapshotRef; } LIBVIRT_0.9.11; + +LIBVIRT_0.9.14 { + global: + virConnectSetCloseCallback; +} LIBVIRT_0.9.13; + # .... define new API here using predicted next version number .... -- 1.7.10.4

2 15

[libvirt] [PATCH 0/3] Updates for Xen error reporting
by Daniel P. Berrange 20 Jul '12

20 Jul '12

This is an update of the previous patch to make Xen use virReportError. Before that can be done, some cleanup in Xen was required

2 6

[libvirt] [PATCH 00/50] Atomic APIs to list objects
by Osier Yang 20 Jul '12

20 Jul '12

Except the already supported APIs for domain and domain snapshot, this series add the APIs for all the left objects, including storage pool, storage vol, network, interface, node device, nwfilter, secret. * Storage pool: - Support filtering the returned pool objects by active|inactive, persistent|transient, autostart|no-autostart, and pool types. - New options for virsh, --type to accept multiple pool types. * Storage vol: - Simply returns all the vol objects of a pool. * Network: - Support filtering the results using flags active|inactive, persistent|transient, autostart|no-autostart - New options for virsh. * Interface: - Support filtering the results using flags active|inactive. It's still O(n) underlying, as interface driver doesn't manage the objects itself, but using netcf lib instead. And netcf APIs don't support returning the struct yet. * Node Device: - Support filtering the results using capabilities type of the devices. - Extend --cap to accept multiple capability type. * Network Filter: - Simply returns all the objects. * Secret: - Simply returns all the objects. All the commands are tested with both new libvirt with the APIs support, or old libvirt without the support. By the way, I'm wondering if should split the virsh wood, it's really big now, and still growing up. It might take a bit more time to compile if it's splitted into multiple files (split it by the command group?) though, but it's good for maintaining and eyes (I have a small screen). Any opinions? Osier Yang (50): Fix indentions list: Expose pool type via virStoragePoolGetInfo list: Rename virdomainlist.[ch] for common use list: Define new API virStorageListALlStoragePools list: Add helpers for listing storage pool objects list: Implement the RPC calls for virConnectListAllStoragePools list: Implement listAllStoragePools for storage driver list: Implement listAllStoragePools for test driver list: Add helper to convert strings separated by ',' to array virsh: Fix the wrong doc for pool-list list: Change MATCH for common use in virsh list: Use virConnectListAllStoragePools in virsh virsh: Use vshPrint instead of printf python: Expose virStorageListAllStoragePools to python binding list: Define new API virStoragePoolListAllVolumes list: Implemente RPC calls for virStoragePoolListAllVolumes list: Implement virStoragePoolListAllVolumes for storage driver list: Implement virStoragePoolListAllVolumes for test driver list: Use virStoragePoolListAllVolumes in virsh list: Expose virStoragePoolListAllVolumes to Python binding list: Define new API virConnectListAllNetworks list: Implement RPC calls for virConnectListAllNetworks list: Add helpers to list network objects list: Implement listAllNetworks for network driver list: Implement listAllNetworks for test driver list: Use virConnectListAllNetworks in virsh list: Expose virConnectListAllNetworks to Python binding daemon: Fix the wrong macro name list: Define new API virConnectListAllInterfaces list: Implemente RPC calls for virConnectListAllInterfaces list: Implement listAllInterfaces list: Use virConnectListAllInterfaces in virsh list: Expose virConnectListAllInterfaces to Python binding list: Define new API virConnectListAllNodeDevices list: Implemente RPC calls for virConnectListAllNodeDevices list: Add helpers for listing node devices list: Implement listAllNodeDevices list: Expose virConnectListAllNodeDevices to Python binding virsh: Fix a bug of nodedev-list list: Use virConnectListAllNodeDevices in virsh list: Define new API virConnectListAllNWFilters list: Implement RPC calls for virConnectListAllNWFilters list: Implement listAllNWFilters list: Use virConnectListAllNWFilters in virsh list: Expose virConnectListAllNWFilters to Python binding list: Define new API virConnectListAllSecrets list: Implement RPC calls for virConnectListAllSecrets list: Implement listAllSecrets list: Use virConnectListAllSecrets in virsh list: Expose virConnectListAllSecrets to Python binding daemon/libvirtd.c | 2 +- daemon/remote.c | 382 +++++ include/libvirt/libvirt.h.in | 117 ++- python/generator.py | 11 +- python/libvirt-override-api.xml | 44 +- python/libvirt-override-virConnect.py | 72 + python/libvirt-override-virStoragePool.py | 11 + python/libvirt-override.c | 337 +++++ src/Makefile.am | 8 +- src/conf/domain_conf.c | 2 +- src/conf/storage_conf.h | 19 - src/conf/virdomainlist.c | 222 --- src/conf/virdomainlist.h | 84 -- src/conf/virobjectlist.c | 535 +++++++ src/conf/virobjectlist.h | 162 +++ src/datatypes.h | 48 +- src/driver.h | 35 +- src/interface/netcf_driver.c | 135 ++ src/libvirt.c | 429 ++++++- src/libvirt_private.syms | 6 +- src/libvirt_public.syms | 11 + src/libxl/libxl_driver.c | 4 +- src/lxc/lxc_driver.c | 4 +- src/network/bridge_driver.c | 18 + src/node_device/node_device_driver.c | 16 + src/node_device/node_device_driver.h | 3 + src/node_device/node_device_hal.c | 1 + src/node_device/node_device_udev.c | 1 + src/nwfilter/nwfilter_driver.c | 57 + src/openvz/openvz_driver.c | 4 +- src/qemu/qemu_driver.c | 4 +- src/remote/remote_driver.c | 449 ++++++ src/remote/remote_protocol.x | 78 +- src/remote_protocol-structs | 85 ++ src/secret/secret_driver.c | 58 +- src/storage/storage_driver.c | 88 ++ src/test/test_driver.c | 105 ++- src/uml/uml_driver.c | 4 +- src/vbox/vbox_tmpl.c | 10 +- src/vmware/vmware_driver.c | 4 +- tests/virdrivermoduletest.c | 2 +- tools/virsh.c | 2206 ++++++++++++++++++++++------- tools/virsh.pod | 51 +- 43 files changed, 4982 insertions(+), 942 deletions(-) create mode 100644 python/libvirt-override-virStoragePool.py delete mode 100644 src/conf/virdomainlist.c delete mode 100644 src/conf/virdomainlist.h create mode 100644 src/conf/virobjectlist.c create mode 100644 src/conf/virobjectlist.h Regards, Osier

5 64

[libvirt] [PATCH] Disable NWFilter driver completely when unprivileged
by Daniel P. Berrange 20 Jul '12

20 Jul '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> Running libvirtd unprivileged results in a warning message from the NWFilter driver virNWFilterSnoopLeaseFileRefresh:1882 : open("/var/run/libvirt/network/nwfilter.ltmp"): No such file or directory Since it requires privileged network access, this driver should not even run when unprivileged. Signed-off-by: Daniel P. Berrange <berrange(a)redhat.com> --- src/nwfilter/nwfilter_driver.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c index 58d91f9..9034549 100644 --- a/src/nwfilter/nwfilter_driver.c +++ b/src/nwfilter/nwfilter_driver.c @@ -68,6 +68,9 @@ static int nwfilterDriverStartup(int privileged) { char *base = NULL; + if (!privileged) + return 0; + if (virNWFilterIPAddrMapInit() < 0) return -1; if (virNWFilterLearnInit() < 0) -- 1.7.10.4

2 1

[libvirt] [PATCH v2] storage: netfs and iscsi need option srcSpec for resource discovery
by Guannan Ren 20 Jul '12

20 Jul '12

The option 'srcSpec' to virsh command find-storage-pool-sources is optional for logical type of storage pool, but mandatory for netfs and iscsi type. When missing the option for netfs and iscsi, libvirt reports XML parsing error due to null string option srcSpec. error: Failed to find any netfs pool sources error: (storage_source_specification):1: Document is empty (null) This patch adds a check for it, error info changed to: error: Failed to find any netfs pool sources error: internal error pool type 'netfs' need option \ --srcSpec for source discovery --- src/storage/storage_driver.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c index fbc630d..8486fdf 100644 --- a/src/storage/storage_driver.c +++ b/src/storage/storage_driver.c @@ -458,6 +458,14 @@ storageFindPoolSources(virConnectPtr conn, goto cleanup; } + if ((*srcSpec == '\0') && (backend_type == VIR_STORAGE_POOL_ISCSI || + backend_type == VIR_STORAGE_POOL_NETFS)) { + virStorageReportError(VIR_ERR_INTERNAL_ERROR, + _("pool type '%s' needs option --srcSpec " + "for source discovery"), type); + goto cleanup; + } + ret = backend->findPoolSources(conn, srcSpec, flags); cleanup: -- 1.7.7.5

2 2

[libvirt] [PATCH] don't make lxc_driver static
by Gao feng 20 Jul '12

20 Jul '12

because it will be used in lxc_process.c below is the error information debug : virDriverLoadModule:66 : Module load lxc error : virDriverLoadModule:78 : failed to load module /usr/local/lib/libvirt/connection-driver/libvirt_driver_lxc.so /usr/local/lib/libvirt/connection-driver/libvirt_driver_lxc.so: undefined symbol: lxc_driver Signed-off-by: Gao feng <gaofeng(a)cn.fujitsu.com> --- src/lxc/lxc_driver.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index d7f052f..09c64b2 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -72,7 +72,7 @@ static int lxcStartup(int privileged); static int lxcShutdown(void); -static lxc_driver_t *lxc_driver = NULL; +lxc_driver_t *lxc_driver = NULL; /* Functions */ -- 1.7.7.6

2 1

[libvirt] Libvirt/LXC/SystemD/SELinux Hackfest at Linux Plumbers, San Diego
by Daniel P. Berrange 20 Jul '12

20 Jul '12

Hi Folks, This years Linux Plumbers Conference (LPC)[1] is taking place in San Diego in the last week of August (co-located with LinuxCon). Since there is alot of integration between libvirt / LXC / SystemD and SELinux, and many of the key developers from those projects will be at LPC, Lennart proposed we hold a hackfest at LPC on this subject To quote Lennart's blog[2]: "On 28th of August we'll have a hackfest on the topic of closer integration of libvirt, LXC, systemd and SELinux, colocated with LPC in San Diego, California. We'll have a number of key people from these projects participating, including Dan Walsh, Eric Paris, Daniel P. Berrange, Kay Sievers and myself. Topics we'll cover: making Fedora/Linux boot entirely cleanly in normal containers, teaching systemd's control tools minimal container-awareness (such as being able to list all services of all containers in one go, in addition to those running on the host system), unified journal logging across multiple containers, the systemd container interface, auditing and containers, running multiple instances from the same /usr tree, and a lot more... Who should attend? Everybody hacking on the mentioned projects who wants to help integrating them with the goal of turning them into a secure, reliable, powerful container solution for Linux. Who should not attend? If you don't hack on any of these projects, or if you are not interested in closer integration of at least two of these projects. How to register? Just show up. You get extra points however for letting us know in advance (just send us an email). Attendance is free." NB, note the date - 28th of August is the Tuesday - ie the day *before* the main LPC conference programme begins. We have space reserved in the main hotel for the hackfest on this day. Regards, Daniel [1] http://www.linuxplumbersconf.org/2012/ [2] http://0pointer.de/blog/hackfests.html -- |: 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] virsh man page - domain-id consistency
by Jan Tomko 20 Jul '12

20 Jul '12

Using 'domain-id' to represent domain name, domain id or uuid, as introduced in the DOMAIN COMMANDS section. --- tools/virsh.pod | 86 +++++++++++++++++++++++++++--------------------------- 1 files changed, 43 insertions(+), 43 deletions(-) diff --git a/tools/virsh.pod b/tools/virsh.pod index 4bddf15..ed1efde 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -580,11 +580,11 @@ If I<--graceful> is specified, don't resort to extreme measures (e.g. SIGKILL) when the guest doesn't stop after a reasonable timeout; return an error instead. -=item B<domblkstat> I<domain> I<block-device> [I<--human>] +=item B<domblkstat> I<domain-id> I<block-device> [I<--human>] Get device block stats for a running domain. A I<block-device> corresponds to a unique target name (<target dev='name'/>) or source file (<source -file='name'/>) for one of the disk devices attached to I<domain> (see +file='name'/>) for one of the disk devices attached to I<domain-id> (see also B<domblklist> for listing these names). Use I<--human> for a more human readable output. @@ -605,11 +605,11 @@ B<Explanation of fields> (fields appear in the folowing order): flush_total_times - total time flush operations took (ns) <-- other fields provided by hypervisor --> -=item B<domifstat> I<domain> I<interface-device> +=item B<domifstat> I<domain-id> I<interface-device> Get network interface stats for a running domain. -=item B<domif-setlink> I<domain> I<interface-device> I<state> [I<--config>] +=item B<domif-setlink> I<domain-id> I<interface-device> I<state> [I<--config>] Modify link state of the domain's virtual interface. Possible values for state are "up" and "down. If I<--config> is specified, only the persistent @@ -617,7 +617,7 @@ configuration of the domain is modified, for compatibility purposes, I<--persistent> is alias of I<--config>. I<interface-device> can be the interface's target name or the MAC address. -=item B<domif-getlink> I<domain> I<interface-device> [I<--config>] +=item B<domif-getlink> I<domain-id> I<interface-device> [I<--config>] Query link state of the domain's virtual interface. If I<--config> is specified, query the persistent configuration, for compatibility @@ -625,7 +625,7 @@ purposes, I<--persistent> is alias of I<--config>. I<interface-device> can be the interface's target name or the MAC address. -=item B<domiftune> I<domain> I<interface-device> +=item B<domiftune> I<domain-id> I<interface-device> [[I<--config>] [I<--live>] | [I<--current>]] [I<--inbound average,peak,burst>] [I<--outbound average,peak,burst>] @@ -646,7 +646,7 @@ Both I<--live> and I<--current> flags may be given, but I<--current> is exclusive. If no flag is specified, behavior is different depending on hypervisor. -=item B<dommemstat> I<domain> +=item B<dommemstat> I<domain-id> Get memory stats for a running domain. @@ -657,17 +657,17 @@ B<domstate> command says that a domain was paused due to I/O error. The B<domblkerror> command lists all block devices in error state and the error seen on each of them. -=item B<domblkinfo> I<domain> I<block-device> +=item B<domblkinfo> I<domain-id> I<block-device> Get block device size info for a domain. A I<block-device> corresponds to a unique target name (<target dev='name'/>) or source file (<source -file='name'/>) for one of the disk devices attached to I<domain> (see +file='name'/>) for one of the disk devices attached to I<domain-id> (see also B<domblklist> for listing these names). -=item B<domblklist> I<domain> [I<--inactive>] [I<--details>] +=item B<domblklist> I<domain-id> [I<--inactive>] [I<--details>] Print a table showing the brief information of all block devices -associated with I<domain>. If I<--inactive> is specified, query the +associated with I<domain-id>. If I<--inactive> is specified, query the block devices that will be used on the next boot, rather than those currently in use by a running domain. If I<--details> is specified, disk type and device value will also be printed. Other contexts @@ -675,16 +675,16 @@ that require a block device name (such as I<domblkinfo> or I<snapshot-create> for disk snapshots) will accept either target or unique source names printed by this command. -=item B<domiflist> I<domain> [I<--inactive>] +=item B<domiflist> I<domain-id> [I<--inactive>] Print a table showing the brief information of all virtual interfaces -associated with I<domain>. If I<--inactive> is specified, query the +associated with I<domain-id>. If I<--inactive> is specified, query the virtual interfaces that will be used on the next boot, rather than those currently in use by a running domain. Other contexts that require a MAC address of virtual interface (such as I<detach-interface> or I<domif-setlink>) will accept the MAC address printed by this command. -=item B<blockcopy> I<domain> I<path> I<dest> [I<bandwidth>] [I<--shallow>] +=item B<blockcopy> I<domain-id> I<path> I<dest> [I<bandwidth>] [I<--shallow>] [I<--reuse-external>] [I<--raw>] [I<--wait> [I<--verbose] [{I<--pivot> | I<--finish>}] [I<--timeout> B<seconds>] [I<--async>]] @@ -725,7 +725,7 @@ is done cleaning up. I<path> specifies fully-qualified path of the disk. I<bandwidth> specifies copying bandwidth limit in Mbps. -=item B<blockpull> I<domain> I<path> [I<bandwidth>] [I<base>] +=item B<blockpull> I<domain-id> I<path> [I<bandwidth>] [I<base>] [I<--wait> [I<--verbose>] [I<--timeout> B<seconds>] [I<--async]] Populate a disk from its backing image chain. By default, this command @@ -748,19 +748,19 @@ longer until the job is done cleaning up. I<path> specifies fully-qualified path of the disk; it corresponds to a unique target name (<target dev='name'/>) or source file (<source -file='name'/>) for one of the disk devices attached to I<domain> (see +file='name'/>) for one of the disk devices attached to I<domain-id> (see also B<domblklist> for listing these names). I<bandwidth> specifies copying bandwidth limit in Mbps. -=item B<blkdeviotune> I<domain> I<device> +=item B<blkdeviotune> I<domain-id> I<device> [[I<--config>] [I<--live>] | [I<--current>]] [[I<total-bytes-sec>] | [I<read-bytes-sec>] [I<write-bytes-sec>]] [[I<total-iops-sec>] | [I<read-iops-sec>] [I<write-iops-sec>]] -Set or query the block disk io parameters for a block device of I<domain>. +Set or query the block disk io parameters for a block device of I<domain-id>. I<device> specifies a unique target name (<target dev='name'/>) or source file (<source file='name'/>) for one of the disk devices attached to -I<domain> (see also B<domblklist> for listing these names). +I<domain-id> (see also B<domblklist> for listing these names). If no limit is specified, it will query current I/O limits setting. Otherwise, alter the limits with these flags: @@ -786,7 +786,7 @@ Both I<--live> and I<--current> flags may be given, but I<--current> is exclusive. If no flag is specified, behavior is different depending on hypervisor. -=item B<blockjob> I<domain> I<path> { [I<--abort>] [I<--async>] [I<--pivot>] | +=item B<blockjob> I<domain-id> I<path> { [I<--abort>] [I<--async>] [I<--pivot>] | [I<--info>] | [I<bandwidth>] } Manage active block operations. There are three modes: I<--info>, @@ -795,7 +795,7 @@ or I<--pivot> implies I<--abort>. I<path> specifies fully-qualified path of the disk; it corresponds to a unique target name (<target dev='name'/>) or source file (<source -file='name'/>) for one of the disk devices attached to I<domain> (see +file='name'/>) for one of the disk devices attached to I<domain-id> (see also B<domblklist> for listing these names). If I<--abort> is specified, the active job on the specified disk will @@ -807,12 +807,12 @@ If I<--info> is specified, the active job information on the specified disk will be printed. I<bandwidth> can be used to set bandwidth limit for the active job. -=item B<blockresize> I<domain> I<path> I<size> +=item B<blockresize> I<domain-id> I<path> I<size> Resize a block device of domain while the domain is running, I<path> specifies the absolute path of the block device; it corresponds to a unique target name (<target dev='name'/>) or source file (<source -file='name'/>) for one of the disk devices attached to I<domain> (see +file='name'/>) for one of the disk devices attached to I<domain-id> (see also B<domblklist> for listing these names). I<size> is a scaled integer (see B<NOTES> above) which defaults to KiB @@ -838,11 +838,11 @@ Convert a domain name or id to domain UUID Convert a domain name (or UUID) to a domain id -=item B<domjobabort> I<domain-id-or-uuid> +=item B<domjobabort> I<domain-id> Abort the currently running domain job. -=item B<domjobinfo> I<domain-id-or-uuid> +=item B<domjobinfo> I<domain-id> Returns information about jobs running on a domain. @@ -959,7 +959,7 @@ Provide the maximum number of virtual CPUs supported for a guest VM on this connection. If provided, the I<type> parameter must be a valid type attribute for the <domain> element of XML. -=item B<cpu-stats> I<domain> [I<--total>] [I<start>] [I<count>] +=item B<cpu-stats> I<domain-id> [I<--total>] [I<start>] [I<count>] Provide cpu statistics information of a domain. The domain should be running. Default it shows stats for all CPUs, and a total. Use @@ -1045,7 +1045,7 @@ migrated to another host. Get the maximum migration bandwidth (in Mbps) for a domain. -=item B<numatune> I<domain> [I<--mode> B<mode>] [I<--nodeset> B<nodeset>] +=item B<numatune> I<domain-id> [I<--mode> B<mode>] [I<--nodeset> B<nodeset>] [[I<--config>] [I<--live>] | [I<--current>]] Set or get a domain's numa parameters, corresponding to the <numatune> @@ -1470,7 +1470,7 @@ By default the hypervisor will try to pick a suitable shutdown method. To specify an alternative method, the I<--mode> parameter can specify C<acpi> or C<agent>. -=item B<start> I<domain-name> [I<--console>] [I<--paused>] [I<--autodestroy>] +=item B<start> I<domain-name-or-uuid> [I<--console>] [I<--paused>] [I<--autodestroy>] [I<--bypass-cache>] [I<--force-boot>] Start a (previously defined) inactive domain, either from the last @@ -2424,11 +2424,11 @@ used to represent properties of snapshots. =over 4 -=item B<snapshot-create> I<domain> [I<xmlfile>] {[I<--redefine> [I<--current>]] +=item B<snapshot-create> I<domain-id> [I<xmlfile>] {[I<--redefine> [I<--current>]] | [I<--no-metadata>] [I<--halt>] [I<--disk-only>] [I<--reuse-external>] [I<--quiesce>] [I<--atomic>]} -Create a snapshot for domain I<domain> with the properties specified in +Create a snapshot for domain I<domain-id> with the properties specified in I<xmlfile>. Normally, the only properties settable for a domain snapshot are the <name> and <description> elements, as well as <disks> if I<--disk-only> is given; the rest of the fields are @@ -2484,12 +2484,12 @@ a persistent domain. However, for transient domains, snapshot metadata is silently lost when the domain quits running (whether by command such as B<destroy> or by internal guest action). -=item B<snapshot-create-as> I<domain> {[I<--print-xml>] +=item B<snapshot-create-as> I<domain-id> {[I<--print-xml>] | [I<--no-metadata>] [I<--halt>] [I<--reuse-external>]} [I<name>] [I<description>] [I<--disk-only> [I<--quiesce>] [I<--atomic>] [[I<--diskspec>] B<diskspec>]...] -Create a snapshot for domain I<domain> with the given <name> and +Create a snapshot for domain I<domain-id> with the given <name> and <description>; if either value is omitted, libvirt will choose a value. If I<--print-xml> is specified, then XML appropriate for I<snapshot-create> is output, rather than actually creating a snapshot. @@ -2503,7 +2503,7 @@ arguments to add <disk> elements to the xml. Each <diskspec> is in the form B<disk[,snapshot=type][,driver=type][,file=name]>. To include a literal comma in B<disk> or in B<file=name>, escape it with a second comma. A literal I<--diskspec> must preceed each B<diskspec> unless -all three of I<domain>, I<name>, and I<description> are also present. +all three of I<domain-id>, I<name>, and I<description> are also present. For example, a diskspec of "vda,snapshot=external,file=/path/to,,new" results in the following XML: <disk name='vda' snapshot='external'> @@ -2532,7 +2532,7 @@ this. If this flag is not specified, then some hypervisors may fail after partially performing the action, and B<dumpxml> must be used to see whether any partial changes occurred. -=item B<snapshot-current> I<domain> {[I<--name>] | [I<--security-info>] +=item B<snapshot-current> I<domain-id> {[I<--name>] | [I<--security-info>] | [I<snapshotname>]} Without I<snapshotname>, this will output the snapshot XML for the domain's @@ -2544,7 +2544,7 @@ the XML. With I<snapshotname>, this is a request to make the existing named snapshot become the current snapshot, without reverting the domain. -=item B<snapshot-edit> I<domain> [I<snapshotname>] [I<--current>] +=item B<snapshot-edit> I<domain-id> [I<snapshotname>] [I<--current>] {[I<--rename>] | [I<--clone>]} Edit the XML configuration file for I<snapshotname> of a domain. If @@ -2572,12 +2572,12 @@ a snapshot name must be done with care, since the contents of some snapshots, such as internal snapshots within a single qcow2 file, are accessible only from the original name. -=item B<snapshot-info> I<domain> {I<snapshot> | I<--current>} +=item B<snapshot-info> I<domain-id> {I<snapshot> | I<--current>} Output basic information about a named <snapshot>, or the current snapshot with I<--current>. -=item B<snapshot-list> I<domain> [{I<--parent> | I<--roots> | I<--tree>}] +=item B<snapshot-list> I<domain-id> [{I<--parent> | I<--roots> | I<--tree>}] [{[I<--from>] B<snapshot> | I<--current>} [I<--descendants>]] [I<--metadata>] [I<--no-metadata>] [I<--leaves>] [I<--no-leaves>] @@ -2613,18 +2613,18 @@ a transient domain. Likewise, if I<--no-metadata> is specified, the list will be filtered to just snapshots that exist without the need for libvirt metadata. -=item B<snapshot-dumpxml> I<domain> I<snapshot> [I<--security-info>] +=item B<snapshot-dumpxml> I<domain-id> I<snapshot> [I<--security-info>] Output the snapshot XML for the domain's snapshot named I<snapshot>. Using I<--security-info> will also include security sensitive information. Use B<snapshot-current> to easily access the XML of the current snapshot. -=item B<snapshot-parent> I<domain> {I<snapshot> | I<--current>} +=item B<snapshot-parent> I<domain-id> {I<snapshot> | I<--current>} Output the name of the parent snapshot, if any, for the given I<snapshot>, or for the current snapshot with I<--current>. -=item B<snapshot-revert> I<domain> {I<snapshot> | I<--current>} +=item B<snapshot-revert> I<domain-id> {I<snapshot> | I<--current>} [{I<--running> | I<--paused>}] [I<--force>] Revert the given domain to the snapshot specified by I<snapshot>, or to @@ -2658,7 +2658,7 @@ snapshot that uses a provably incompatible configuration, as well as with an inactive snapshot that is combined with the I<--start> or I<--pause> flag. -=item B<snapshot-delete> I<domain> {I<snapshot> | I<--current>} [I<--metadata>] +=item B<snapshot-delete> I<domain-id> {I<snapshot> | I<--current>} [I<--metadata>] [{I<--children> | I<--children-only>}] Delete the snapshot for the domain named I<snapshot>, or the current @@ -2761,9 +2761,9 @@ attaching to an externally launched QEMU process. There may be issues with the guest ABI changing upon migration, and hotunplug may not work. -=item B<qemu-monitor-command> I<domain> [I<--hmp>] I<command>... +=item B<qemu-monitor-command> I<domain-id> [I<--hmp>] I<command>... -Send an arbitrary monitor command I<command> to domain I<domain> through the +Send an arbitrary monitor command I<command> to domain I<domain-id> through the qemu monitor. The results of the command will be printed on stdout. If I<--hmp> is passed, the command is considered to be a human monitor command and libvirt will automatically convert it into QMP if needed. In that case -- 1.7.8.6

3 2

[libvirt] [PATCH v3 2/2] ESX: Add routines to interface driver- Use ATTRIBUTE_UNUSED for unused variable.
by Ata E Husain Bohra 20 Jul '12

20 Jul '12

--- src/esx/esx_interface_driver.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/esx/esx_interface_driver.c b/src/esx/esx_interface_driver.c index b1ba5e2..01caed0 100644 --- a/src/esx/esx_interface_driver.c +++ b/src/esx/esx_interface_driver.c @@ -107,10 +107,8 @@ cleanup: static int -esxNumOfDefinedInterfaces(virConnectPtr conn) +esxNumOfDefinedInterfaces(virConnectPtr conn ATTRIBUTE_UNUSED) { - conn->interfacePrivateData = NULL; - // ESX interfaces are always active return 0; } @@ -162,14 +160,10 @@ esxListInterfaces(virConnectPtr conn, char **names, int maxnames) static int -esxListDefinedInterfaces(virConnectPtr conn, char **names, int maxnames) +esxListDefinedInterfaces(virConnectPtr conn ATTRIBUTE_UNUSED, + char **names ATTRIBUTE_UNUSED, + int maxnames ATTRIBUTE_UNUSED) { - conn->interfacePrivateData = conn->privateData; - *names = NULL; - - /* keeps compiler happy */ - VIR_DEBUG("max interfaces: %d", maxnames); - // ESX interfaces are always active return 0; } -- 1.7.9.5

1 0

[libvirt] [PATCH v3 1/2] ESX: Add routines to interface driver
by Ata E Husain Bohra 20 Jul '12

20 Jul '12

Add following routines to esx_interface_driver: esxNumOfInterfaces, esxNumOfDefinedInterfaces, esxListInterfaces, esxListDefinedInterfaces, esxInterfaceLookupByMACString, esxInterfaceGetXMLDesc, esxInterfaceUndefine, esxInterfaceCreate, esxInterfaceDestroy Signed-off-by: Ata E Husain Bohra <ata.husain(a)hotmail.com> --- src/esx/esx_interface_driver.c | 506 +++++++++++++++++++++++++++++++++++++++- src/esx/esx_vi.c | 126 ++++++++++ src/esx/esx_vi.h | 10 + src/esx/esx_vi_generator.input | 227 ++++++++++++++++++ src/esx/esx_vi_generator.py | 31 ++- src/esx/esx_vi_types.c | 18 +- 6 files changed, 913 insertions(+), 5 deletions(-) diff --git a/src/esx/esx_interface_driver.c b/src/esx/esx_interface_driver.c index 5713137..b1ba5e2 100644 --- a/src/esx/esx_interface_driver.c +++ b/src/esx/esx_interface_driver.c @@ -23,6 +23,9 @@ */ #include <config.h> +#include <sys/socket.h> +#include <netinet/in.h> +#include <arpa/inet.h> #include "internal.h" #include "util.h" @@ -34,6 +37,7 @@ #include "esx_vi.h" #include "esx_vi_methods.h" #include "esx_util.h" +#include "interface_conf.h" #define VIR_FROM_THIS VIR_FROM_ESX @@ -67,10 +71,508 @@ esxInterfaceClose(virConnectPtr conn) +static int +esxNumOfInterfaces(virConnectPtr conn) +{ + esxPrivate *priv = conn->interfacePrivateData; + esxVI_HostVirtualNic *virtualNicList = NULL; + const esxVI_HostVirtualNic *virtualNic = NULL; + int count = 0; + + if (esxVI_EnsureSession(priv->primary) < 0 || + esxVI_LookupVirtualNicList(priv->primary, &virtualNicList) < 0) { + goto cleanup; + } + + if (virtualNicList == NULL) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not retrieve vNic List")); + + goto cleanup; + } + + for (virtualNic = virtualNicList; + virtualNic != NULL; + virtualNic = virtualNic->_next) { + count++; + } + +cleanup: + + esxVI_HostVirtualNic_Free(&virtualNicList); + + return count; +} + + + +static int +esxNumOfDefinedInterfaces(virConnectPtr conn) +{ + conn->interfacePrivateData = NULL; + + // ESX interfaces are always active + return 0; +} + + + +static int +esxListInterfaces(virConnectPtr conn, char **names, int maxnames) +{ + esxPrivate *priv = conn->interfacePrivateData; + esxVI_HostVirtualNic *virtualNicList = NULL; + const esxVI_HostVirtualNic *virtualNic = NULL; + int result = -1; + int i = 0; + + if (esxVI_EnsureSession(priv->primary) < 0 || + esxVI_LookupVirtualNicList(priv->primary, + &virtualNicList) < 0) { + goto cleanup; + } + + if (virtualNicList == NULL) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not retrieve vNIC List")); + goto cleanup; + } + + for (i= 0, virtualNic = virtualNicList; + virtualNic != NULL && i < maxnames; + ++i, virtualNic = virtualNic->_next) { + names[i] = strdup(virtualNic->device); + + if (names[i] == NULL) { + for(;i >=0;--i) { + VIR_FREE(names[i]); + } + virReportOOMError(); + goto cleanup; + } + } + + result = i; + cleanup: + esxVI_HostVirtualNic_Free(&virtualNicList); + + return result; +} + + + +static int +esxListDefinedInterfaces(virConnectPtr conn, char **names, int maxnames) +{ + conn->interfacePrivateData = conn->privateData; + *names = NULL; + + /* keeps compiler happy */ + VIR_DEBUG("max interfaces: %d", maxnames); + + // ESX interfaces are always active + return 0; +} + + + +static virInterfacePtr +esxInterfaceLookupByName(virConnectPtr conn, const char *name) +{ + esxPrivate *priv = conn->interfacePrivateData; + esxVI_HostVirtualNic *virtualNicList = NULL; + const esxVI_HostVirtualNic *virtualNic = NULL; + virInterfacePtr ret = NULL; + + if (esxVI_EnsureSession(priv->primary) < 0 || + esxVI_LookupVirtualNicList(priv->primary, + &virtualNicList) < 0) { + goto cleanup; + } + + if (virtualNicList == 0) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not retrieve vNIC List")); + goto cleanup; + } + + + for(virtualNic = virtualNicList; + virtualNic != NULL; + virtualNic = virtualNic->_next) { + if (STREQ(virtualNic->device, name)) { + if (virtualNic->spec == NULL || + virtualNic->spec->mac == NULL) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Malformed HostVirtualNicSpec")); + goto cleanup; + } + + ret = virGetInterface(conn, virtualNic->device, virtualNic->spec->mac); + break; + } + } + + cleanup: + esxVI_HostVirtualNic_Free(&virtualNicList); + + return ret; +} + + + +static virInterfacePtr +esxInterfaceLookupByMACString(virConnectPtr conn, const char *mac) +{ + esxPrivate *priv = conn->interfacePrivateData; + esxVI_HostVirtualNic *virtualNicList = NULL; + const esxVI_HostVirtualNic *virtualNic = NULL; + virInterfacePtr ret = NULL; + + if (esxVI_EnsureSession(priv->primary) < 0 || + esxVI_LookupVirtualNicList(priv->primary, + &virtualNicList) < 0) { + goto cleanup; + } + + if (virtualNicList == 0) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not retrieve vNIC List")); + goto cleanup; + } + + + for(virtualNic = virtualNicList; + virtualNic != NULL; + virtualNic = virtualNic->_next) { + if (virtualNic->spec == NULL || + virtualNic->spec->mac == NULL) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Malformed HostVirtualNicSpec")); + goto cleanup; + } + + if (STREQ(virtualNic->spec->mac, mac)) { + ret = virGetInterface(conn, virtualNic->device, virtualNic->spec->mac); + break; + } + } + + cleanup: + esxVI_HostVirtualNic_Free(&virtualNicList); + + return ret; +} + + + +static char* +esxInterfaceGetXMLDesc(virInterfacePtr iface, unsigned int flags) +{ + esxPrivate *priv = iface->conn->interfacePrivateData; + esxVI_HostVirtualNic *virtualNicList = NULL; + const esxVI_HostVirtualNic *virtualNic = NULL; + esxVI_PhysicalNic *physicalNicList = NULL; + const esxVI_PhysicalNic *physicalNic = NULL; + esxVI_PhysicalNic *matchingPhysicalNicList = NULL; + esxVI_HostIpRouteConfig *ipRouteConfig = NULL; + esxVI_HostPortGroup *portGroupList = NULL; + esxVI_HostVirtualSwitch *virtualSwitchList = NULL; + esxVI_String *propertyNameList = NULL; + esxVI_ObjectContent *hostSystem = NULL; + esxVI_DynamicProperty *dynamicProperty = NULL; + virInterfaceDefPtr def = NULL; + int use_static = 0; + struct in_addr addr; + uint32_t host_addr = 0; + int zero_count = 0; + int masklen = 0; + int i = 0; + char *ret = NULL; + + if (VIR_INTERFACE_XML_INACTIVE & flags) { + use_static = 1; + } + + if (esxVI_EnsureSession(priv->primary) < 0 || + esxVI_String_AppendValueListToList(&propertyNameList, + "config.network.vnic\0" + "config.network.ipRouteConfig\0" + "config.network.vswitch\0" + "config.network.pnic\0" + "config.network.portgroup\0") < 0 || + esxVI_LookupHostSystemProperties(priv->primary, propertyNameList, + &hostSystem) < 0) { + goto cleanup; + } + + for (dynamicProperty = hostSystem->propSet; dynamicProperty != NULL; + dynamicProperty = dynamicProperty->_next) { + if (STREQ(dynamicProperty->name, "config.network.vnic")) { + if (esxVI_HostVirtualNic_CastListFromAnyType( + dynamicProperty->val, &virtualNicList) < 0) { + goto cleanup; + } + } else if (STREQ(dynamicProperty->name, + "config.network.ipRouteConfig")) { + if (esxVI_HostIpRouteConfig_CastFromAnyType( + dynamicProperty->val, &ipRouteConfig)) { + goto cleanup; + } + } else if (STREQ(dynamicProperty->name, "config.network.vswitch")) { + if (esxVI_HostVirtualSwitch_CastListFromAnyType + (dynamicProperty->val, &virtualSwitchList) < 0) { + goto cleanup; + } + } else if (STREQ(dynamicProperty->name, "config.network.pnic")) { + if (esxVI_PhysicalNic_CastListFromAnyType( + dynamicProperty->val, &physicalNicList) < 0) { + goto cleanup; + } + } else if (STREQ(dynamicProperty->name, "config.network.portgroup")) { + if (esxVI_HostPortGroup_CastListFromAnyType( + dynamicProperty->val, &portGroupList) < 0) { + goto cleanup; + } + } else { + VIR_WARN("Unexpected '%s' property", dynamicProperty->name); + } + } + + if (!virtualNicList || + !ipRouteConfig || + !virtualSwitchList || + !portGroupList) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Unable to retrieve network parameters")); + + goto cleanup; + } + + for (virtualNic = virtualNicList; + virtualNic != NULL; + virtualNic = virtualNic->_next) { + if (STREQ(virtualNic->device, iface->name)) { + break; + } + } + + if (virtualNic == NULL) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not find Interface")); + goto cleanup; + } + + if (esxVI_LookupPhysicalNicFromPortGroup(virtualNic->portgroup, + portGroupList, + virtualSwitchList, + physicalNicList, + &matchingPhysicalNicList) < 0) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("No Physical NIC found matching Virtual NIC's portgroup")); + goto cleanup; + } + + /* + * populate virInterfaceDef object to obtain + * libvirt interface domain xml. + */ + if (VIR_ALLOC(def) < 0) { + virReportOOMError(); + goto cleanup; + } + + def->type = VIR_INTERFACE_TYPE_BRIDGE; + def->name = strdup(virtualNic->device); + if (virtualNic->spec->mtu && virtualNic->spec->mtu->value) { + def->mtu = virtualNic->spec->mtu->value; + } else { + def->mtu = 1500; + } + + def->startmode = VIR_INTERFACE_START_ONBOOT; + + if (!use_static && virtualNic->spec->mac) { + def->mac = strdup(virtualNic->spec->mac); + } + + /* TODO - Handle VLAN (via portgroup?) */ + if (virtualNic->spec->ip->subnetMask && + *virtualNic->spec->ip->subnetMask && + inet_aton(virtualNic->spec->ip->subnetMask, &addr) == 0) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Error parsing netmask")); + goto cleanup; + } + + host_addr = ntohl(addr.s_addr); + /* Calculate masklen */ + for (i = 0; i < 32; ++i) { + if (host_addr & 0x01) { + break; + } + zero_count++; + host_addr >>= 1; + } + masklen = 32 - zero_count; + + /* append protocol field */ + def->nprotos = 1; + if (VIR_ALLOC_N(def->protos, def->nprotos) < 0) { + virReportOOMError(); + goto cleanup; + } + + /* TODO - Add IPv6 Support */ + for (i = 0; i < def->nprotos; ++i) { + if (VIR_ALLOC(def->protos[i]) < 0) { + goto cleanup; + } + + def->protos[i]->family = strdup("ipv4"); + if (virtualNic->spec->ip->dhcp == 1) { + def->protos[i]->dhcp = 1; + } + def->protos[i]->nips = 1; + if (virtualNic->spec->ip->dhcp != 1 || !use_static) { + if (virtualNic->spec->ip->ipAddress && + *virtualNic->spec->ip->ipAddress) { + int j =0; + if (VIR_ALLOC_N(def->protos[i]->ips, def->protos[i]->nips) + < 0) { + virReportOOMError(); + goto cleanup; + } + + for (j=0; j < def->protos[i]->nips; ++j) { + if (VIR_ALLOC(def->protos[i]->ips[j]) < 0) { + virReportOOMError(); + goto cleanup; + } + def->protos[i]->ips[0]->address = + strdup(virtualNic->spec->ip->ipAddress); + def->protos[i]->ips[0]->prefix = masklen; + def->protos[i]->gateway = + strdup(ipRouteConfig->defaultGateway); + } + } + } + } + + /* Add bridge information */ + def->data.bridge.stp = 0; /* off */ + + /** + * traversing physical nic list twice, first to get total + * interfaces and second to populate interface items. + * Total Complexity ~= O(N); also total physical nics + * cannot be that large number + */ + for (physicalNic = matchingPhysicalNicList, i = 0; physicalNic != NULL; + physicalNic = physicalNic->_next, ++i) { + } + + if ( i > 0) { + if (VIR_ALLOC_N(def->data.bridge.itf, i) < 0) { + virReportOOMError(); + goto cleanup; + } + def->data.bridge.nbItf = i; + for (physicalNic = matchingPhysicalNicList, i = 0; physicalNic != NULL; + physicalNic = physicalNic->_next, ++i) { + virInterfaceDefPtr itf = NULL; + if (VIR_ALLOC(itf) < 0) { + virReportOOMError(); + goto cleanup; + } + itf->type = VIR_INTERFACE_TYPE_ETHERNET; + itf->name = strdup(physicalNic->device); + itf->mac = strdup(physicalNic->mac); + + def->data.bridge.itf[i] = itf; + } + } + + ret = virInterfaceDefFormat(def); + if (!ret) { + goto cleanup; + } + + cleanup: + esxVI_HostVirtualNic_Free(&virtualNicList); + esxVI_PhysicalNic_Free(&physicalNicList); + esxVI_PhysicalNic_Free(&matchingPhysicalNicList); + esxVI_HostPortGroup_Free(&portGroupList); + esxVI_HostVirtualSwitch_Free(&virtualSwitchList); + esxVI_HostIpRouteConfig_Free(&ipRouteConfig); + esxVI_ObjectContent_Free(&hostSystem); + esxVI_String_Free(&propertyNameList); + virInterfaceDefFree(def); + + return ret; +} + + + +static int +esxInterfaceUndefine(virInterfacePtr iface) +{ + esxPrivate *priv = iface->conn->interfacePrivateData; + + if (esxVI_RemoveVirtualNic( + priv->primary, + priv->primary->hostSystem->configManager->networkSystem, + iface->name) < 0) { + ESX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Error deleting interface")); + return -1; + } + + return 0; +} + + + +static int +esxInterfaceCreate(virInterfacePtr iface, unsigned int flags) +{ + iface->conn->interfacePrivateData = NULL; + + virCheckFlags(0, -1); + + /* ESX interfaces are always active */ + return 0; +} + + + +static int +esxInterfaceDestroy(virInterfacePtr iface, unsigned int flags) +{ + iface->conn->interfacePrivateData = NULL; + + virCheckFlags(0, -1); + + /* ESX interfaces can not be deactivated */ + return 1; +} + + + static virInterfaceDriver esxInterfaceDriver = { .name = "ESX", - .open = esxInterfaceOpen, /* 0.7.6 */ - .close = esxInterfaceClose, /* 0.7.6 */ + .open = esxInterfaceOpen, /* 0.7.6 */ + .close = esxInterfaceClose, /* 0.7.6 */ + .numOfInterfaces = esxNumOfInterfaces, /* 0.9.x */ + .numOfDefinedInterfaces = esxNumOfDefinedInterfaces, /* 0.9.x */ + .listInterfaces = esxListInterfaces, /* 0.9.x */ + .listDefinedInterfaces = esxListDefinedInterfaces, /* 0.9.x */ + .interfaceLookupByName = esxInterfaceLookupByName, /* 0.9.x */ + .interfaceLookupByMACString = esxInterfaceLookupByMACString, /* 0.9.x */ + .interfaceGetXMLDesc = esxInterfaceGetXMLDesc, /* 0.9.x */ + .interfaceUndefine = esxInterfaceUndefine, /* 0.9.x */ + .interfaceCreate = esxInterfaceCreate, /* 0.9.x */ + .interfaceDestroy = esxInterfaceDestroy, /* 0.9.x */ }; diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 48718b6..80ddb76 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -4523,6 +4523,132 @@ esxVI_LookupManagedObjectHelper(esxVI_Context *ctx, return result; } +int +esxVI_LookupVirtualNicList(esxVI_Context* ctx, + esxVI_HostVirtualNic** virtualNicList) +{ + int result = -1; + esxVI_String *propertyNameList = NULL; + esxVI_DynamicProperty *dynamicProperty = NULL; + esxVI_ObjectContent* hostSystem = NULL; + + if (esxVI_String_AppendValueListToList( + &propertyNameList, "config.network.vnic\0") < 0 || + esxVI_LookupHostSystemProperties(ctx, propertyNameList, &hostSystem) < 0) { + goto cleanup; + } + if (hostSystem == NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not retrieve the HostSystem object")); + + goto cleanup; + } + + for (dynamicProperty = hostSystem->propSet; + dynamicProperty != NULL; + dynamicProperty = dynamicProperty->_next) { + if (STREQ(dynamicProperty->name, "config.network.vnic")) { + if (esxVI_HostVirtualNic_CastListFromAnyType(dynamicProperty->val, + virtualNicList) < 0) { + goto cleanup; + } + break; + } else { + VIR_WARN("Unexpected '%s' property", dynamicProperty->name); + } + } + + result = 0; + +cleanup: + esxVI_String_Free(&propertyNameList); + esxVI_ObjectContent_Free(&hostSystem); + + return result; +} + +int +esxVI_LookupPhysicalNicFromPortGroup( + const char *portgroup, + const esxVI_HostPortGroup *portGroupList, + const esxVI_HostVirtualSwitch *virtualSwitchList, + const esxVI_PhysicalNic *physicalNicList, + esxVI_PhysicalNic **ret_physicalNicList) +{ + int result = -1; + const esxVI_HostPortGroup *portGroup = NULL; + const esxVI_HostVirtualSwitch *virtualSwitch = NULL; + esxVI_PhysicalNic *matchingPhysicalNicList = NULL; + const esxVI_PhysicalNic *physicalNic = NULL; + esxVI_PhysicalNic *tempPhysicalNic = NULL; + const esxVI_String *pnicKey = NULL; + + if (portgroup == NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("No Portgroup found!")); + goto cleanup; + } + + /* Go through all the port groups to find the one that matches. */ + for (portGroup = portGroupList; + portGroup != NULL; + portGroup = portGroup->_next) { + if (STREQ(portGroup->spec->name, portgroup)) { + break; + } + } + + if (portGroup == NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not find Host port group")); + goto cleanup; + } + + /* Go through all the virtual switches to find the one that matches */ + for (virtualSwitch = virtualSwitchList; + virtualSwitch != NULL; + virtualSwitch = virtualSwitch->_next) { + if (STREQ(portGroup->spec->vswitchName, virtualSwitch->name)) { + break; + } + } + + if (virtualSwitch == NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Could not find Virtual Switch")); + goto cleanup; + } + + /* Go through all physical nics */ + for (pnicKey = virtualSwitch->pnic; + pnicKey != NULL; + pnicKey = pnicKey->_next) { + /* O(n^2), but probably faster than a hash due to small N */ + for (physicalNic = physicalNicList; + physicalNic != NULL; + physicalNic = physicalNic->_next) { + + if (STREQ(pnicKey->value, physicalNic->key)) { + if (esxVI_PhysicalNic_DeepCopy(&tempPhysicalNic, + (esxVI_PhysicalNic *)physicalNic) < 0 || + esxVI_PhysicalNic_AppendToList(&matchingPhysicalNicList, + tempPhysicalNic) < 0) { + goto cleanup; + } + tempPhysicalNic = NULL; + } + } + } + + *ret_physicalNicList = matchingPhysicalNicList; + matchingPhysicalNicList = NULL; /* no cleanup needed */ + tempPhysicalNic = NULL; /* no cleanup needed */ + result = 0; + cleanup: + esxVI_PhysicalNic_Free(&matchingPhysicalNicList); + esxVI_PhysicalNic_Free(&tempPhysicalNic); + return result; +} #include "esx_vi.generated.c" diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h index 9560bd2..9b694b5 100644 --- a/src/esx/esx_vi.h +++ b/src/esx/esx_vi.h @@ -505,6 +505,16 @@ int esxVI_ParseHostCpuIdInfo(esxVI_ParsedHostCpuIdInfo *parsedHostCpuIdInfo, int esxVI_ProductVersionToDefaultVirtualHWVersion(esxVI_ProductVersion productVersion); +int esxVI_LookupVirtualNicList(esxVI_Context* ctx, + esxVI_HostVirtualNic** virtualNicList); + +int esxVI_LookupPhysicalNicFromPortGroup( + const char *portgroup, + const esxVI_HostPortGroup *portGroupList, + const esxVI_HostVirtualSwitch *virtualSwitchList, + const esxVI_PhysicalNic *physicalNicList, + esxVI_PhysicalNic **ret_physicalNicList); + # include "esx_vi.generated.h" #endif /* __ESX_VI_H__ */ diff --git a/src/esx/esx_vi_generator.input b/src/esx/esx_vi_generator.input index 1a67a8c..64f8389 100644 --- a/src/esx/esx_vi_generator.input +++ b/src/esx/esx_vi_generator.input @@ -57,6 +57,29 @@ enum AutoStartWaitHeartbeatSetting systemDefault end +enum HostConfigChangeOperation + add + edit + remove +end + +enum HostIpConfigIpV6AdressStatus + deprecated + duplicate + inaccessible + invalid + preferred + tentative + unknown +end + +enum HostIpConfigV6AdressConfigType + dhcp + linklayer + manual + other + random +end enum ManagedEntityStatus gray @@ -197,6 +220,12 @@ object DeviceBackedVirtualDiskSpec extends VirtualDiskSpec String device r end +object DistributedVirtualSwitchPortConnection + Int connectionCookie o + String portgroupKey o + String portKey o + String switchUuid r +end object DynamicProperty String name r @@ -316,6 +345,34 @@ object HostFileSystemVolume Long capacity r end +object HostIpConfig + Boolean dhcp r + String ipAddress o + HostIpConfigIpV6AddressConfiguration ipV6Config o + String subnetMask o +end + +object HostIpConfigIpV6Address + String dadState o + String ipAddress r + DateTime lifetime o + String operation o + String origin o + Int prefixLength r +end + +object HostIpConfigIpV6AddressConfiguration + Boolean autoConfigurationEnabled o + Boolean dhcpV6Enabled o + HostIpConfigIpV6Address ipV6Address ol +end + +object HostIpRouteConfig + String defaultGateway o + String gatewayDevice o + String ipV6DefaultGateway o + String ipV6GatewayDevice o +end object HostMountInfo String path o @@ -331,11 +388,131 @@ object HostNasVolume extends HostFileSystemVolume end +object HostNicTeamingPolicy + String policy o + Boolean reversePolicy o + Boolean notifySwitches o + Boolean rollingOrder o + HostNicFailureCriteria failureCriteria o + HostNicOrderPolicy nicOrder o +end + +object HostNetOffloadCapabilities + Boolean csumOffload o + Boolean tcpSegmentation o + Boolean zeroCopyXmit o +end + +object HostNetworkSecurityPolicy + Boolean allowPromiscuous o + Boolean macChanges o + Boolean forgedTransmits o +end + +object HostNetworkPolicy + HostNetworkSecurityPolicy security o + HostNicTeamingPolicy nicTeaming o + HostNetOffloadCapabilities offloadPolicy o + HostNetworkTrafficShapingPolicy shapingPolicy o +end + +object HostNetworkTrafficShapingPolicy + Boolean enabled o +end + +object HostNicFailureCriteria + String checkSpeed o + Int speed o + Boolean checkDuplex o + Boolean fullDuplex o + Boolean checkErrorPercent o + Int percentage o + Boolean checkBeacon o +end + +object HostNicOrderPolicy + String activeNic ol + String standbyNic ol +end + +object HostPortGroup + String key r + HostPortGroupPort port ol + String vswitch r + HostNetworkPolicy computedPolicy r + HostPortGroupSpec spec r +end + +object HostPortGroupPort + String key o + String mac ol + String type r +end + +object HostPortGroupSpec + String name r + Int vlanId r + String vswitchName r + HostNetworkPolicy policy r +end + object HostScsiDiskPartition String diskName r Int partition r end +object HostVirtualNic + String device r + String key r + String port o + String portgroup r + HostVirtualNicSpec spec r +end + +object HostVirtualNicSpec + DistributedVirtualSwitchPortConnection distributedVirtualPort o + HostIpConfig ip o + String mac o + Int mtu o + String portgroup o + Boolean tsoEnabled o +end + + +object HostVirtualSwitch + String key r + Int mtu o + String name r + Int numPorts r + Int numPortsAvailable r + String pnic ol + String portgroup ol + HostVirtualSwitchSpec spec r +end + +object HostVirtualSwitchBridge +end + +object HostVirtualSwitchAutoBridge extends HostVirtualSwitchBridge + String excludedNicDevice ol +end + +object HostVirtualSwitchBeaconBridge extends HostVirtualSwitchBridge + Int interval r +end + +object HostVirtualSwitchBondBridge extends HostVirtualSwitchBridge + HostVirtualSwitchBeaconBridge beacon o + LinkDiscoveryProtocolConfig linkDiscoveryProtocolConfig o + String nicDevice rl +end + +object HostVirtualSwitchSpec + HostVirtualSwitchBridge bridge o + Int mtu o + Int numPorts r + HostNetworkPolicy policy o +end object HostVmfsVolume extends HostFileSystemVolume Int blockSizeMb r @@ -355,6 +532,10 @@ end object IsoImageFileQuery extends FileQuery end +object LinkDiscoveryProtocolConfig + String operation r + String protocol r +end object LocalDatastoreInfo extends DatastoreInfo String path o @@ -398,6 +579,10 @@ object OptionType Boolean valueIsReadonly o end +object OptionValue + String key r + AnyType value r +end object PerfCounterInfo Int key r @@ -454,6 +639,27 @@ object PerfSampleInfo Int interval r end +object PhysicalNic + String device r + String driver o + String key o + PhysicalNicInfo linkSpeed o + String mac r + String pci r + PhysicalNicSpec spec r + PhysicalNicInfo validLinkSpecification ol + Boolean wakeOnLanSupported r +end + +object PhysicalNicInfo + Boolean duplex r + Int speedMb r +end + +object PhysicalNicSpec + HostIpConfig ip o + PhysicalNicInfo linkSpeed o +end object PropertyChange String name r @@ -773,6 +979,13 @@ end # Methods # +method AddVirtualNic returns String r + ManagedObjectReference _this r + String portgroup r + HostVirtualNicSpec nic r +end + + method AnswerVM ManagedObjectReference _this r String questionId r @@ -954,6 +1167,10 @@ method RemoveSnapshot_Task returns ManagedObjectReference r Boolean removeChildren r end +method RemoveVirtualNic + ManagedObjectReference _this r + String device r +end method RetrieveProperties returns ObjectContent ol ManagedObjectReference _this:propertyCollector r @@ -1002,6 +1219,16 @@ method UnregisterVM ManagedObjectReference _this r end +method UpdateIpRouteConfig + ManagedObjectReference _this r + HostIpRouteConfig config r +end + +method UpdateVirtualNic + ManagedObjectReference _this r + String device r + HostVirtualNicSpec nic r +end method WaitForUpdates returns UpdateSet r ManagedObjectReference _this:propertyCollector r diff --git a/src/esx/esx_vi_generator.py b/src/esx/esx_vi_generator.py index 8a128df..f4e4a11 100755 --- a/src/esx/esx_vi_generator.py +++ b/src/esx/esx_vi_generator.py @@ -371,8 +371,12 @@ class Property(Member): % self.name elif self.occurrence in [OCCURRENCE__REQUIRED_LIST, OCCURRENCE__OPTIONAL_LIST]: - return " ESX_VI__TEMPLATE__PROPERTY__DESERIALIZE_LIST(%s, %s)\n" \ - % (self.type, self.name) + if self.type == "String": + return " ESX_VI__TEMPLATE__PROPERTY__DESERIALIZE_STRING_LIST(%s, %s)\n" \ + % (self.type, self.name) + else: + return " ESX_VI__TEMPLATE__PROPERTY__DESERIALIZE_LIST(%s, %s)\n" \ + % (self.type, self.name) elif self.type == "String": return " ESX_VI__TEMPLATE__PROPERTY__DESERIALIZE_VALUE(String, %s)\n" \ % self.name @@ -1519,8 +1523,31 @@ additional_object_features = { "AutoStartDefaults" : Object.FEATURE__AN Object.FEATURE__ANY_TYPE, "HostDatastoreBrowserSearchResults" : Object.FEATURE__LIST | Object.FEATURE__ANY_TYPE, + "HostIpConfig" : Object.FEATURE__DEEP_COPY, + "HostIpRouteConfig" : Object.FEATURE__ANY_TYPE, + "HostIpConfigIpV6Address" : Object.FEATURE__LIST | + Object.FEATURE__ANY_TYPE | + Object.FEATURE__DEEP_COPY, + "HostIpConfigIpV6AddressConfiguration" : Object.FEATURE__DEEP_COPY, + "HostPortGroup" : Object.FEATURE__LIST | + Object.FEATURE__ANY_TYPE, + "HostVirtualNic" : Object.FEATURE__ANY_TYPE | + Object.FEATURE__LIST, + "HostVirtualSwitch" : Object.FEATURE__ANY_TYPE | + Object.FEATURE__LIST, + "KeyValue" : Object.FEATURE__ANY_TYPE, "ManagedObjectReference" : Object.FEATURE__ANY_TYPE, + "PhysicalNic" : Object.FEATURE__LIST | + Object.FEATURE__ANY_TYPE | + Object.FEATURE__DEEP_COPY, "ObjectContent" : Object.FEATURE__DEEP_COPY, + "OptionValue" : Object.FEATURE__ANY_TYPE | + Object.FEATURE__LIST, + "PhysicalNic" : Object.FEATURE__LIST | + Object.FEATURE__ANY_TYPE | + Object.FEATURE__DEEP_COPY, + "PhysicalNicSpec" : Object.FEATURE__DEEP_COPY, + "PhysicalNicLinkInfo" : Object.FEATURE__LIST, "ResourcePoolResourceUsage" : Object.FEATURE__ANY_TYPE, "ServiceContent" : Object.FEATURE__DESERIALIZE, "SharesInfo" : Object.FEATURE__ANY_TYPE, diff --git a/src/esx/esx_vi_types.c b/src/esx/esx_vi_types.c index bcc310f..f23af8d 100644 --- a/src/esx/esx_vi_types.c +++ b/src/esx/esx_vi_types.c @@ -475,7 +475,23 @@ continue; \ } - +#define ESX_VI__TEMPLATE__PROPERTY__DESERIALIZE_STRING_LIST(_type, _name) \ + if (xmlStrEqual(childNode->name, BAD_CAST #_name)) { \ + char *value = NULL; \ + \ + if (esxVI_String_DeserializeValue(childNode, &value) < 0 || \ + value == NULL) { \ + goto failure; \ + } \ + \ + if (esxVI_##_type##_AppendValueToList(&(*ptrptr)->_name, \ + value) < 0) { \ + VIR_FREE(value); \ + goto failure; \ + } \ + \ + continue; \ + } /* * A required property must be != 0 (NULL for pointers, "undefined" == 0 for -- 1.7.9.5

1 0

[libvirt] [PATCH v3 0/2] ESX: Add routines to interface driver
by Ata E Husain Bohra 20 Jul '12

20 Jul '12

Updated code to use ATTRIBUTE_UNUSED for un-used variable. Ata E Husain Bohra (2): ESX: Add routines to interface driver Use ATTRIBUTE_UNUSED for unused variable. src/esx/esx_interface_driver.c | 500 +++++++++++++++++++++++++++++++++++++++- src/esx/esx_vi.c | 126 ++++++++++ src/esx/esx_vi.h | 10 + src/esx/esx_vi_generator.input | 227 ++++++++++++++++++ src/esx/esx_vi_generator.py | 31 ++- src/esx/esx_vi_types.c | 18 +- 6 files changed, 907 insertions(+), 5 deletions(-) -- 1.7.9.5

1 0

[libvirt] Intend to add OVA installation API
by Ata Bohra 20 Jul '12

20 Jul '12

Hi Everyone, I am relatively new to libvirt community; have worked on it from last half year mostly towards adding few missing APIs especially for ESX driver. One of the features I worked was installing a domain (VM) using OVAs. It is been a long time OVA became defacto standard for distributing and installing Virtual Machines, but surprisingly libvirt does not provide support for it. I wanted to perform a quick sanity int the community so that I am not stepping on anyone feet here. So far, I have working code, but to contribute upstream would require a bit of a cleanup work. One of the concern that I intend to get inputs on: OVA is a tar format archive, the first pre-requisite is to parse OVA and get following information: 1. XML descriptor. 2. VMDKs for transfer after domain is created on the hypervisor. (in ESX world that is done by getting a lease object and then transmitting the disk bits to hypervisor) I am wondering, where should I put the common code to parse OVA? My initial thought is to enhance conf/domain_conf.* file, given it already provides parsing routines for XML descriptor. Waiting for your feedback on this one. As I am familiar with ESX libvirt interaction, so the immediate plan is to enhance ESX driver, hopefully in near future will contribute the same feature to KVM/Xen etc. Thanks! Ata

4 6

[libvirt] Different mac address used in libvirtd
by Yong Sheng Gong 19 Jul '12

19 Jul '12

Hi, I found libvirtd will create vnet0 with a different mac other than the one defined in domain file. The mac in Domain file will be used by qemu-kvm. I want to know how libvirtd decides the mac for vnet0, Who can give me a hint about the location of the libvirtd codes which does this work? I cannot find how the libvirtd translates the mac from one defined in domain file to vnet0's one in src/util/bridge.c: brSetInterfaceMac() Thanks Yong Sheng Gong [root@robinlinux eclipsecdt]# virsh dumpxml 2 <domain type='kvm' id='2'> <name>instance-00000002</name> <uuid>03e9993b-eafa-4021-b929-4a51ce9635d5</uuid> <memory>524288</memory> <currentMemory>524288</currentMemory> <vcpu>1</vcpu> <os> <type arch='x86_64' machine='pc-0.14'>hvm</type> <kernel>/var/lib/nova/instances/instance-00000002/kernel</kernel> <initrd>/var/lib/nova/instances/instance-00000002/ramdisk</initrd> <cmdline>root=/dev/vda console=ttyS0</cmdline> <boot dev='hd'/> </os> <features> <acpi/> </features> <clock offset='utc'> <timer name='pit' tickpolicy='delay'/> <timer name='rtc' tickpolicy='catchup'/> </clock> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> <emulator>/usr/libexec/qemu-kvm</emulator> <disk type='file' device='disk'> <driver name='qemu' type='qcow2' cache='none'/> <source file='/var/lib/nova/instances/instance-00000002/disk'/> <target dev='vda' bus='virtio'/> <alias name='virtio-disk0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/> </disk> <interface type='bridge'> <mac address='fa:16:3e:28:64:c2'/> <source bridge='br100'/> <target dev='vnet0'/> <filterref filter='nova-instance-instance-00000002-fa163e2864c2'> <parameter name='DHCPSERVER' value='10.0.1.1'/> <parameter name='PROJNET' value='10.0.1.0'/> <parameter name='PROJMASK' value='255.255.255.0'/> <parameter name='IP' value='10.0.1.2'/> </filterref> <alias name='net0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/> </interface> <serial type='file'> <source path='/var/lib/nova/instances/instance-00000002/console.log'/> <target port='0'/> <alias name='serial0'/> </serial> <serial type='pty'> <source path='/dev/pts/1'/> <target port='1'/> <alias name='serial1'/> </serial> <console type='file'> <source path='/var/lib/nova/instances/instance-00000002/console.log'/> <target type='serial' port='0'/> <alias name='serial0'/> </console> <input type='tablet' bus='usb'> <alias name='input0'/> </input> <input type='mouse' bus='ps2'/> <graphics type='vnc' port='5900' autoport='yes' listen='127.0.0.1' keymap='en-us'> <listen type='address' address='127.0.0.1'/> </graphics> <video> <model type='cirrus' vram='9216' heads='1'/> <alias name='video0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/> </video> <memballoon model='virtio'> <alias name='balloon0'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> </memballoon> </devices> </domain> [root@robinlinux eclipsecdt]# ifconfig vnet0 vnet0 Link encap:Ethernet HWaddr FE:16:3E:28:64:C2 inet6 addr: fe80::fc16:3eff:fe28:64c2/64 Scope:Link UP BROADCAST RUNNING MULTICAST MTU:1500 Metric:1 RX packets:553 errors:0 dropped:0 overruns:0 frame:0 TX packets:1485 errors:0 dropped:0 overruns:0 carrier:0 collisions:0 txqueuelen:500 RX bytes:136360 (133.1 KiB) TX bytes:280590 (274.0 KiB)

3 2

[libvirt] [PATCH] Fix Xen driver to have sensible error messages
by Daniel P. Berrange 19 Jul '12

19 Jul '12

From: "Daniel P. Berrange" <berrange(a)redhat.com> The Xen driver had a number of error reports which passed a constant string without format specifiers and was missing "%s". Furthermore the errors were related to failing system calls, but virReportSystemError was not used. So the only useful piece of info (the errno) was being discarded --- cfg.mk | 2 +- src/xen/xen_hypervisor.c | 114 ++++++++++++++++++++++------------------------ 2 files changed, 55 insertions(+), 61 deletions(-) diff --git a/cfg.mk b/cfg.mk index 4225336..46331fd 100644 --- a/cfg.mk +++ b/cfg.mk @@ -540,6 +540,7 @@ msg_gen_function += virReportError msg_gen_function += virReportErrorHelper msg_gen_function += virReportSystemError msg_gen_function += virSecurityReportError +msg_gen_function += virXenError msg_gen_function += virXenInotifyError msg_gen_function += virXenStoreError msg_gen_function += virXendError @@ -552,7 +553,6 @@ msg_gen_function += xenXMError # so that they are translatable. # msg_gen_function += fprintf # msg_gen_function += testError -# msg_gen_function += virXenError # msg_gen_function += vshPrint # msg_gen_function += vshError diff --git a/src/xen/xen_hypervisor.c b/src/xen/xen_hypervisor.c index b4ec579..9747010 100644 --- a/src/xen/xen_hypervisor.c +++ b/src/xen/xen_hypervisor.c @@ -526,9 +526,15 @@ static int lock_pages(void *addr, size_t len) { #ifdef __linux__ - return mlock(addr, len); + if (mlock(addr, len) < 0) { + virReportSystemError(errno, + _("Unable to lock %zu bytes of memory"), + len); + return -1; + } + return 0; #elif defined(__sun) - return 0; + return 0; #endif } @@ -536,9 +542,15 @@ static int unlock_pages(void *addr, size_t len) { #ifdef __linux__ - return munlock(addr, len); + if (munlock(addr, len) < 0) { + virReportSystemError(errno, + _("Unable to unlock %zu bytes of memory"), + len); + return -1; + } + return 0; #elif defined(__sun) - return 0; + return 0; #endif } @@ -900,21 +912,18 @@ xenHypervisorDoV0Op(int handle, xen_op_v0 * op) hc.op = __HYPERVISOR_dom0_op; hc.arg[0] = (unsigned long) op; - if (lock_pages(op, sizeof(dom0_op_t)) < 0) { - virXenError(VIR_ERR_XEN_CALL, " locking"); + if (lock_pages(op, sizeof(dom0_op_t)) < 0) return -1; - } ret = ioctl(handle, xen_ioctl_hypercall_cmd, (unsigned long) &hc); if (ret < 0) { - virXenError(VIR_ERR_XEN_CALL, " ioctl %d", - xen_ioctl_hypercall_cmd); + virReportSystemError(errno, + _("Unable to issue hypervisor ioctl %d"), + xen_ioctl_hypercall_cmd); } - if (unlock_pages(op, sizeof(dom0_op_t)) < 0) { - virXenError(VIR_ERR_XEN_CALL, " releasing"); + if (unlock_pages(op, sizeof(dom0_op_t)) < 0) ret = -1; - } if (ret < 0) return -1; @@ -942,21 +951,18 @@ xenHypervisorDoV1Op(int handle, xen_op_v1* op) hc.op = __HYPERVISOR_dom0_op; hc.arg[0] = (unsigned long) op; - if (lock_pages(op, sizeof(dom0_op_t)) < 0) { - virXenError(VIR_ERR_XEN_CALL, " locking"); + if (lock_pages(op, sizeof(dom0_op_t)) < 0) return -1; - } ret = ioctl(handle, xen_ioctl_hypercall_cmd, (unsigned long) &hc); if (ret < 0) { - virXenError(VIR_ERR_XEN_CALL, " ioctl %d", - xen_ioctl_hypercall_cmd); + virReportSystemError(errno, + _("Unable to issue hypervisor ioctl %d"), + xen_ioctl_hypercall_cmd); } - if (unlock_pages(op, sizeof(dom0_op_t)) < 0) { - virXenError(VIR_ERR_XEN_CALL, " releasing"); + if (unlock_pages(op, sizeof(dom0_op_t)) < 0) ret = -1; - } if (ret < 0) return -1; @@ -985,21 +991,18 @@ xenHypervisorDoV2Sys(int handle, xen_op_v2_sys* op) hc.op = __HYPERVISOR_sysctl; hc.arg[0] = (unsigned long) op; - if (lock_pages(op, sizeof(dom0_op_t)) < 0) { - virXenError(VIR_ERR_XEN_CALL, " locking"); + if (lock_pages(op, sizeof(dom0_op_t)) < 0) return -1; - } ret = ioctl(handle, xen_ioctl_hypercall_cmd, (unsigned long) &hc); if (ret < 0) { - virXenError(VIR_ERR_XEN_CALL, " sys ioctl %d", - xen_ioctl_hypercall_cmd); + virReportSystemError(errno, + _("Unable to issue hypervisor ioctl %d"), + xen_ioctl_hypercall_cmd); } - if (unlock_pages(op, sizeof(dom0_op_t)) < 0) { - virXenError(VIR_ERR_XEN_CALL, " releasing"); + if (unlock_pages(op, sizeof(dom0_op_t)) < 0) ret = -1; - } if (ret < 0) return -1; @@ -1028,21 +1031,18 @@ xenHypervisorDoV2Dom(int handle, xen_op_v2_dom* op) hc.op = __HYPERVISOR_domctl; hc.arg[0] = (unsigned long) op; - if (lock_pages(op, sizeof(dom0_op_t)) < 0) { - virXenError(VIR_ERR_XEN_CALL, " locking"); + if (lock_pages(op, sizeof(dom0_op_t)) < 0) return -1; - } ret = ioctl(handle, xen_ioctl_hypercall_cmd, (unsigned long) &hc); if (ret < 0) { - virXenError(VIR_ERR_XEN_CALL, " ioctl %d", - xen_ioctl_hypercall_cmd); + virReportSystemError(errno, + _("Unable to issue hypervisor ioctl %d"), + xen_ioctl_hypercall_cmd); } - if (unlock_pages(op, sizeof(dom0_op_t)) < 0) { - virXenError(VIR_ERR_XEN_CALL, " releasing"); + if (unlock_pages(op, sizeof(dom0_op_t)) < 0) ret = -1; - } if (ret < 0) return -1; @@ -1068,10 +1068,9 @@ virXen_getdomaininfolist(int handle, int first_domain, int maxids, int ret = -1; if (lock_pages(XEN_GETDOMAININFOLIST_DATA(dominfos), - XEN_GETDOMAININFO_SIZE * maxids) < 0) { - virXenError(VIR_ERR_XEN_CALL, " locking"); + XEN_GETDOMAININFO_SIZE * maxids) < 0) return -1; - } + if (hv_versions.hypervisor > 1) { xen_op_v2_sys op; @@ -1123,10 +1122,9 @@ virXen_getdomaininfolist(int handle, int first_domain, int maxids, ret = op.u.getdomaininfolist.num_domains; } if (unlock_pages(XEN_GETDOMAININFOLIST_DATA(dominfos), - XEN_GETDOMAININFO_SIZE * maxids) < 0) { - virXenError(VIR_ERR_XEN_CALL, " release"); + XEN_GETDOMAININFO_SIZE * maxids) < 0) ret = -1; - } + return ret; } @@ -1747,10 +1745,9 @@ virXen_setvcpumap(int handle, int id, unsigned int vcpu, if (hv_versions.hypervisor > 1) { xen_op_v2_dom op; - if (lock_pages(cpumap, maplen) < 0) { - virXenError(VIR_ERR_XEN_CALL, " locking"); + if (lock_pages(cpumap, maplen) < 0) return -1; - } + memset(&op, 0, sizeof(op)); op.cmd = XEN_V2_OP_SETVCPUMAP; op.domain = (domid_t) id; @@ -1782,10 +1779,8 @@ virXen_setvcpumap(int handle, int id, unsigned int vcpu, ret = xenHypervisorDoV2Dom(handle, &op); VIR_FREE(new); - if (unlock_pages(cpumap, maplen) < 0) { - virXenError(VIR_ERR_XEN_CALL, " release"); + if (unlock_pages(cpumap, maplen) < 0) ret = -1; - } } else { cpumap_t xen_cpumap; /* limited to 64 CPUs in old hypervisors */ uint64_t *pm = &xen_cpumap; @@ -1879,10 +1874,9 @@ virXen_getvcpusinfo(int handle, int id, unsigned int vcpu, virVcpuInfoPtr ipt, ipt->cpu = op.u.getvcpuinfod5.online ? (int)op.u.getvcpuinfod5.cpu : -1; } if ((cpumap != NULL) && (maplen > 0)) { - if (lock_pages(cpumap, maplen) < 0) { - virXenError(VIR_ERR_XEN_CALL, " locking"); + if (lock_pages(cpumap, maplen) < 0) return -1; - } + memset(cpumap, 0, maplen); memset(&op, 0, sizeof(op)); op.cmd = XEN_V2_OP_GETVCPUMAP; @@ -1897,10 +1891,8 @@ virXen_getvcpusinfo(int handle, int id, unsigned int vcpu, virVcpuInfoPtr ipt, op.u.getvcpumapd5.cpumap.nr_cpus = maplen * 8; } ret = xenHypervisorDoV2Dom(handle, &op); - if (unlock_pages(cpumap, maplen) < 0) { - virXenError(VIR_ERR_XEN_CALL, " release"); + if (unlock_pages(cpumap, maplen) < 0) ret = -1; - } } } else { int mapl = maplen; @@ -2079,8 +2071,9 @@ xenHypervisorInit(struct xenHypervisorVersions *override_versions) */ hv_versions.hypervisor = -1; - virXenError(VIR_ERR_XEN_CALL, " ioctl %lu", - (unsigned long) IOCTL_PRIVCMD_HYPERCALL); + virReportSystemError(errno, + _("Unable to issue hypervisor ioctl %lu"), + (unsigned long)IOCTL_PRIVCMD_HYPERCALL); VIR_FORCE_CLOSE(fd); in_init = 0; return -1; @@ -2178,14 +2171,15 @@ xenHypervisorInit(struct xenHypervisorVersions *override_versions) goto done; } + /* * we failed to make the getdomaininfolist hypercall */ - - VIR_DEBUG("Failed to find any Xen hypervisor method"); hv_versions.hypervisor = -1; - virXenError(VIR_ERR_XEN_CALL, " ioctl %lu", - (unsigned long)IOCTL_PRIVCMD_HYPERCALL); + virReportSystemError(errno, + _("Unable to issue hypervisor ioctl %lu"), + (unsigned long)IOCTL_PRIVCMD_HYPERCALL); + VIR_DEBUG("Failed to find any Xen hypervisor method"); VIR_FORCE_CLOSE(fd); in_init = 0; VIR_FREE(ipt); -- 1.7.10.4

2 1

[libvirt] [PATCH] qemu: Set reasonable RSS limit on domain startup
by Michal Privoznik 19 Jul '12

19 Jul '12

If there's a memory leak in qemu or qemu is exploited the host's system will sooner or later start trashing instead of killing the bad process. This however has impact on performance and other guests as well. Therefore we should set a reasonable RSS limit even when user hasn't set any. It's better to be secure by default. --- src/qemu/qemu_cgroup.c | 73 +++++++++++++++++++++++++++--------------------- 1 files changed, 41 insertions(+), 32 deletions(-) diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c index e39f5e1..2c158c1 100644 --- a/src/qemu/qemu_cgroup.c +++ b/src/qemu/qemu_cgroup.c @@ -339,42 +339,51 @@ int qemuSetupCgroup(struct qemud_driver *driver, } } - if (vm->def->mem.hard_limit != 0 || - vm->def->mem.soft_limit != 0 || - vm->def->mem.swap_hard_limit != 0) { - if (qemuCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_MEMORY)) { - if (vm->def->mem.hard_limit != 0) { - rc = virCgroupSetMemoryHardLimit(cgroup, vm->def->mem.hard_limit); - if (rc != 0) { - virReportSystemError(-rc, - _("Unable to set memory hard limit for domain %s"), - vm->def->name); - goto cleanup; - } - } - if (vm->def->mem.soft_limit != 0) { - rc = virCgroupSetMemorySoftLimit(cgroup, vm->def->mem.soft_limit); - if (rc != 0) { - virReportSystemError(-rc, - _("Unable to set memory soft limit for domain %s"), - vm->def->name); - goto cleanup; - } + if (qemuCgroupControllerActive(driver, VIR_CGROUP_CONTROLLER_MEMORY)) { + unsigned long long hard_limit = vm->def->mem.hard_limit; + + if (!hard_limit) { + /* If there is no hard_limit set, set a reasonable + * one to avoid system trashing caused by exploited qemu. + * As 'reasonable limit' has been chosen: + * (1 + k) * (domain memory) + F + * where k = 0.02 and F = 200MB. */ + hard_limit = vm->def->mem.max_balloon * 1.02 + 204800; + } + + rc = virCgroupSetMemoryHardLimit(cgroup, hard_limit); + if (rc != 0) { + virReportSystemError(-rc, + _("Unable to set memory hard limit for domain %s"), + vm->def->name); + goto cleanup; + } + if (vm->def->mem.soft_limit != 0) { + rc = virCgroupSetMemorySoftLimit(cgroup, vm->def->mem.soft_limit); + if (rc != 0) { + virReportSystemError(-rc, + _("Unable to set memory soft limit for domain %s"), + vm->def->name); + goto cleanup; } + } - if (vm->def->mem.swap_hard_limit != 0) { - rc = virCgroupSetMemSwapHardLimit(cgroup, vm->def->mem.swap_hard_limit); - if (rc != 0) { - virReportSystemError(-rc, - _("Unable to set swap hard limit for domain %s"), - vm->def->name); - goto cleanup; - } + if (vm->def->mem.swap_hard_limit != 0) { + rc = virCgroupSetMemSwapHardLimit(cgroup, vm->def->mem.swap_hard_limit); + if (rc != 0) { + virReportSystemError(-rc, + _("Unable to set swap hard limit for domain %s"), + vm->def->name); + goto cleanup; } - } else { - qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Memory cgroup is not available on this host")); } + } else if (vm->def->mem.hard_limit != 0 || + vm->def->mem.soft_limit != 0 || + vm->def->mem.swap_hard_limit != 0) { + qemuReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Memory cgroup is not available on this host")); + } else { + VIR_WARN("Could not autoset a RSS limit for domain %s", vm->def->name); } if (vm->def->cputune.shares != 0) { -- 1.7.8.6

6 5

[libvirt] libvirt qemu cgroup problem
by faicker mo 19 Jul '12

19 Jul '12

I want to use the cgroup with libvirt+qemu. The VM runs well. But the libvirt report error, here is the libvirt debug info: 2012-07-19 09:40:10.726+0000: 32341: debug : virCgroupNew:603 : New group / 2012-07-19 09:40:10.726+0000: 32341: info : qemudStartup:597 : Unable to create cgroup for driver: No such device or address 2012-07-19 09:40:10.726+0000: 32341: debug : virLockManagerNopInit:35 : version=1000000 configFile=(null) flags=0 2012-07-19 09:40:10.726+0000: 32341: info : qemudLoadDriverConfig:332 : Configured cgroup controller 'cpu' 2012-07-19 09:40:10.726+0000: 32341: info : qemudLoadDriverConfig:332 : Configured cgroup controller 'cpuacct' 2012-07-19 09:40:10.726+0000: 32341: info : qemudLoadDriverConfig:332 : Configured cgroup controller 'cpuset' 2012-07-19 09:40:10.726+0000: 32341: info : qemudLoadDriverConfig:332 : Configured cgroup controller 'memory' 2012-07-19 09:40:10.726+0000: 32341: info : qemudLoadDriverConfig:332 : Configured cgroup controller 'devices' 2012-07-19 09:40:10.726+0000: 32341: info : qemudLoadDriverConfig:332 : Configured cgroup controller 'blkio' I can't find the /sys/fs/cgroup dir or any other dir? virsh blkiotune test error: Unable to get blkio parameters error: Requested operation is not valid: blkio cgroup isn't mounted ------ thank you.

1 0

[libvirt] [PATCH v2] Per-guest configurable user/group for QEMU processes
by Marcelo Cerri 19 Jul '12

19 Jul '12

This is a v2 patch series that updates the libvirt's security driver mechanism to support per-guest configurable user and group for QEMU processes running together with other security drivers, such as SELinux and AppArmor. Comments and feedbacks are welcome.

4 14

[libvirt] Unable to startVM in Power PC
by B Veera-B37207 19 Jul '12

19 Jul '12

Hi, Here is my xml file <domain type='qemu' xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'> <name>Test</name> <uuid>aaec5748-56a9-e2fe-655c-c08ca3a4c097</uuid> <memory unit='KiB'>65536</memory> <currentMemory unit='KiB'>65536</currentMemory> <vcpu placement='static'>1</vcpu> <os> <type arch='i686' machine='ppce500v2'>hvm</type> <kernel>/boot/uImage-p2020rdb.bin</kernel> <initrd>/home/root/guest.rootfs.ext2.gz</initrd> <cmdline>root=/dev/ram rw console=ttyS0,115200</cmdline> </os> <features> <acpi/> </features> <clock offset='utc'/> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> <on_crash>destroy</on_crash> <devices> <emulator>/usr/bin/qemu-system-ppc</emulator> <interface type='ethernet'> <mac address='52:54:00:dd:fa:40'/> <script path='/home/root/qemu-ifup'/> <model type='virtio'/> </interface> <serial type='tcp'> <source mode='bind' host='' service='4444'/> <protocol type='raw'/> <target port='0'/> </serial> <console type='tcp'> <source mode='bind' host='' service='4444'/> <protocol type='raw'/> <target type='serial' port='0'/> </console> <memballoon model='virtio'/> </devices> <qemu:commandline> <qemu:arg value='200M'/> <qemu:arg value='-mem-path'/> <qemu:arg value='/var/lib/hugetlbfs/pagesize-4MB'/> <qemu:arg value='-dtb'/> <qemu:arg value='/usr/share/qemu/ppce500v2.dtb'/> </qemu:commandline> </domain> While starting VM I am getting following error root@p2020rdb:~# virsh start Test error: Failed to start domain Test error: Unable to read from monitor: Connection reset by peer ############################# Test.log Log file ############ ################ LC_ALL=C PATH=/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin HOME=/home/root USER=root LOGNAME=root /usr/bin/qemu-system-ppc -name Test -S -M ppce500v2 -m 256 -smp 1,sockets=1,cores=1,threads=1 -uuid aaec5748-56a9-e2fe-655c-c08ca3a4c097 -nographic -nodefconfig -nodefaults -chardev socket,id=charmonitor,path=/usr/local/var/lib/libvirt/qemu/Test.monitor,server,nowait -mon chardev=charmonitor,id=monitor,mode=control -rtc base=utc -no-shutdown -kernel /boot/uImage-p2020rdb.bin -initrd /home/root/guest.rootfs.ext2.gz -append root=/dev/ram rw console=ttyS0,115200 -device piix3-usb-uhci,id=usb,bus=pci,addr=0x1.0x2 -netdev tap,script=/home/root/qemu-ifup,id=hostnet0 -device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:dd:fa:40,bus=pci,addr=0x3 -chardev socket,id=charserial0,host=,port=4444,server,nowait -device isa-serial,chardev=charserial0,id=serial0 -device virtio-balloon-pci,id=balloon0,bus=pci,addr=0x4 -mem-path /var/lib/hugetlbfs/pagesize-4MB -dtb /usr/share/qemu/ppce500v2.dtb Domain id=24 is tainted: high-privileges Domain id=24 is tainted: custom-argv Domain id=24 is tainted: shell-scripts qemu-system-ppc: -device piix3-usb-uhci,id=usb,bus=pci,addr=0x1.0x2: Bus 'pci' not found 2012-07-19 09:06:25.215+0000: shutting down Please help me regarding this issue Regards, Veera.

1 0

[libvirt] [PATCH 00/16] Misc fixes and refactoring of LXC driver
by Daniel P. Berrange 19 Jul '12

19 Jul '12

The first 7 patches in this series are a set of misc fixes I identified while working on the LXC driver code. The remaining 9 patches heavily re-arrange, re-factor and re-name the LXC driver code. The intent is to make the code layout closer in style to the QEMU driver, to facilitate its future growth in size & complexity

3 33

[libvirt] [PATCH libvirt-glib] gobject: add GVir.DomainXMLFlags binding
by Marc-André Lureau 19 Jul '12

19 Jul '12

--- libvirt-gobject/libvirt-gobject-domain.c | 2 +- libvirt-gobject/libvirt-gobject-domain.h | 14 ++++++++++++++ libvirt-gobject/libvirt-gobject.sym | 5 +++++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/libvirt-gobject/libvirt-gobject-domain.c b/libvirt-gobject/libvirt-gobject-domain.c index e14190c..ba8e12b 100644 --- a/libvirt-gobject/libvirt-gobject-domain.c +++ b/libvirt-gobject/libvirt-gobject-domain.c @@ -709,7 +709,7 @@ gboolean gvir_domain_save_to_file_finish(GVirDomain *dom, /** * gvir_domain_get_config: * @dom: the domain - * @flags: the flags + * @flags: the %GVirDomainXMLFlags flags * * Returns: (transfer full): the config. The returned object should be * unreffed with g_object_unref() when no longer needed. diff --git a/libvirt-gobject/libvirt-gobject-domain.h b/libvirt-gobject/libvirt-gobject-domain.h index 8f17799..70e7e37 100644 --- a/libvirt-gobject/libvirt-gobject-domain.h +++ b/libvirt-gobject/libvirt-gobject-domain.h @@ -102,6 +102,20 @@ typedef enum { GVIR_DOMAIN_DELETE_SNAPSHOTS_METADATA = VIR_DOMAIN_UNDEFINE_SNAPSHOTS_METADATA, } GVirDomainDeleteFlags; +/** + * GVirDomainXMLFlags: + * @GVIR_DOMAIN_XML_NONE: No flags + * @GVIR_DOMAIN_XML_SECURE: Dump security sensitive information too + * @GVIR_DOMAIN_XML_INACTIVE: Dump inactive domain information + * @GVIR_DOMAIN_XML_UPDATE_CPU: Update guest CPU requirements according to host CPU + */ +typedef enum { + GVIR_DOMAIN_XML_NONE = 0, + GVIR_DOMAIN_XML_SECURE = VIR_DOMAIN_XML_SECURE, + GVIR_DOMAIN_XML_INACTIVE = VIR_DOMAIN_XML_INACTIVE, + GVIR_DOMAIN_XML_UPDATE_CPU = VIR_DOMAIN_XML_UPDATE_CPU, +} GVirDomainXMLFlags; + typedef struct _GVirDomainInfo GVirDomainInfo; struct _GVirDomainInfo { diff --git a/libvirt-gobject/libvirt-gobject.sym b/libvirt-gobject/libvirt-gobject.sym index 60478d1..cc602d3 100644 --- a/libvirt-gobject/libvirt-gobject.sym +++ b/libvirt-gobject/libvirt-gobject.sym @@ -175,4 +175,9 @@ LIBVIRT_GOBJECT_0.0.9 { gvir_domain_start_finish; } LIBVIRT_GOBJECT_0.0.8; +LIBVIRT_GOBJECT_0.1.1 { + global: + gvir_domain_xml_flags_get_type; +} LIBVIRT_GOBJECT_0.0.9; + # .... define new API here using predicted next version number .... -- 1.7.10.4

2 1

[libvirt] Libvirt on power pc
by B Veera-B37207 19 Jul '12

19 Jul '12

Hi, Using command line I am able to bring up VM Here is the command: "qemu-system-ppc -enable-kvm -m 512M -mem-path /var/lib/hugetlbfs/pagesize-4MB -nographic -M ppce500v2 -kernel /boot/uImage-p2020rdb.bin -initrd ./guest.rootfs.ext2.gz -append "root=/dev/ram rw console=ttyS0,115200" -serial tcp::4444,server,telnet -dtb /usr/share/qemu/ppce500v2.dtb -net nic,model=virtio -net tap,script=/home/root/qemu-ifup" Can anybody let me know the libvirt xml format for above command. Regards, Veera.

2 1

[libvirt] [PATCH] rpc: remove trailing carriage return character in error string
by Guannan Ren 19 Jul '12

19 Jul '12

If the error message string ends with '\r\n', it is not enough to remove '\n' only which leads to messed string. Example, after three time incorrect password input, virsh command virsh -c qemu://remoteserver/system will report error like: : Connection reset by peerey,gssapi-keyex,gssapi-with-mic,password). it should be: Permission denied (publickey,gssapi-keyex,gssapi-with-mic,password). : Connection reset by peer The terminal interprets '\r' as "move the cursor back to the start of the current line", so we have to remove the character if it exists. --- src/rpc/virnetsocket.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c index 08dfbb0..8385d88 100644 --- a/src/rpc/virnetsocket.c +++ b/src/rpc/virnetsocket.c @@ -985,8 +985,14 @@ reread: virFileReadLimFD(sock->errfd, 1024, &errout) >= 0 && errout != NULL) { size_t elen = strlen(errout); - if (elen && errout[elen-1] == '\n') + if (elen && errout[elen-1] == '\n') { errout[elen-1] = '\0'; + + /* remove trailing '\r' if it exists */ + if (elen-1 && errout[elen-2] == '\r') { + errout[elen-2] = '\0'; + } + } } if (ret < 0) { -- 1.7.7.5

2 4

[libvirt] [PATCH] po: avoid spurious double spaces in messages
by Eric Blake 19 Jul '12

19 Jul '12

Noticed during the recent error cleanups. * src/network/bridge_driver.c (networkStartRadvd): Fix spacing. * src/openvz/openvz_conf.c (openvzReadMemConf): Likewise. * src/qemu/qemu_command.c (qemuNetworkIfaceConnect): Likewise. * src/qemu/qemu_hotplug.c (qemuDomainDetachNetDevice): Likewise. * src/qemu/qemu_process.c (qemuProcessStop): Likewise. * src/security/virt-aa-helper.c (vah_add_file): Likewise. --- Pushing under the trivial rule. src/network/bridge_driver.c | 2 +- src/openvz/openvz_conf.c | 2 +- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_hotplug.c | 2 +- src/qemu/qemu_process.c | 2 +- src/security/virt-aa-helper.c | 8 ++++---- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index 9b1964b..5bf1412 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -850,7 +850,7 @@ networkStartRadvd(virNetworkObjPtr network) prefix = virNetworkIpDefPrefix(ipdef); if (prefix < 0) { networkReportError(VIR_ERR_INTERNAL_ERROR, - _("bridge '%s' has an invalid prefix"), + _("bridge '%s' has an invalid prefix"), network->def->bridge); goto cleanup; } diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c index bc54012..57479d4 100644 --- a/src/openvz/openvz_conf.c +++ b/src/openvz/openvz_conf.c @@ -511,7 +511,7 @@ openvzReadMemConf(virDomainDefPtr def, int veid) ret = openvzParseBarrierLimit(temp, &barrier, NULL); if (ret < 0) { openvzError(VIR_ERR_INTERNAL_ERROR, - _("Could not parse barrier of '%s' " + _("Could not parse barrier of '%s' " "from config for container %d"), param, veid); goto error; } diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 09215af..4013740 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -265,7 +265,7 @@ qemuNetworkIfaceConnect(virDomainDefPtr def, if (driver->macFilter) { if ((err = networkAllowMacOnPort(driver, net->ifname, &net->mac))) { virReportSystemError(err, - _("failed to add ebtables rule to allow MAC address on '%s'"), + _("failed to add ebtables rule to allow MAC address on '%s'"), net->ifname); } } diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 09c8c97..5a9a6f7 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -2293,7 +2293,7 @@ qemuDomainDetachNetDevice(struct qemud_driver *driver, detach->ifname, &detach->mac))) { virReportSystemError(errno, - _("failed to remove ebtables rule on '%s'"), + _("failed to remove ebtables rule on '%s'"), detach->ifname); } } diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c index d8169e8..b260a20 100644 --- a/src/qemu/qemu_process.c +++ b/src/qemu/qemu_process.c @@ -4029,7 +4029,7 @@ void qemuProcessStop(struct qemud_driver *driver, if ((errno = networkDisallowMacOnPort(driver, net->ifname, &net->mac))) { virReportSystemError(errno, - _("failed to remove ebtables rule to allow MAC address on '%s'"), + _("failed to remove ebtables rule to allow MAC address on '%s'"), net->ifname); } } diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c index 7b41d38..056362c 100644 --- a/src/security/virt-aa-helper.c +++ b/src/security/virt-aa-helper.c @@ -2,7 +2,7 @@ /* * virt-aa-helper: wrapper program used by AppArmor security driver. * - * Copyright (C) 2010-2011 Red Hat, Inc. + * Copyright (C) 2010-2012 Red Hat, Inc. * Copyright (C) 2009-2011 Canonical Ltd. * * See COPYING.LIB for the License of this software @@ -762,14 +762,14 @@ vah_add_file(virBufferPtr buf, const char *path, const char *perms) */ if (STRNEQLEN(path, "/", 1)) { vah_warning(path); - vah_warning(_(" skipped non-absolute path")); + vah_warning(_("skipped non-absolute path")); return 0; } if (virFileExists(path)) { if ((tmp = realpath(path, NULL)) == NULL) { vah_error(NULL, 0, path); - vah_error(NULL, 0, _(" could not find realpath for disk")); + vah_error(NULL, 0, _("could not find realpath for disk")); return rc; } } else @@ -783,7 +783,7 @@ vah_add_file(virBufferPtr buf, const char *path, const char *perms) if (rc != 0) { if (rc > 0) { vah_error(NULL, 0, path); - vah_error(NULL, 0, _(" skipped restricted file")); + vah_error(NULL, 0, _("skipped restricted file")); } goto clean; } -- 1.7.10.4

1 0

[libvirt] [PATCH] esx: Fix esxVI_String_Deserialize
by Matthias Bolte 19 Jul '12

19 Jul '12

It was broken since forever as it expected a libxml2 XML_ELEMENT_NODE containing a XML_TEXT_NODE instead of just a XML_TEXT_NODE. This problem was not discovered for so long because esxVI_String_Deserialize was not used until now. Reported by Ata Bohra --- src/esx/esx_vi_types.c | 23 +++++++++++++++++++---- 1 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/esx/esx_vi_types.c b/src/esx/esx_vi_types.c index bcc310f..844fb65 100644 --- a/src/esx/esx_vi_types.c +++ b/src/esx/esx_vi_types.c @@ -1227,11 +1227,26 @@ esxVI_String_SerializeValue(const char *value, const char *element, return 0; } -/* esxVI_String_Deserialize */ -ESX_VI__TEMPLATE__DESERIALIZE(String, +int +esxVI_String_Deserialize(xmlNodePtr node, esxVI_String **string) { - ESX_VI__TEMPLATE__PROPERTY__DESERIALIZE_VALUE(String, value) -}) + if (string == NULL || *string != NULL) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", _("Invalid argument")); + return -1; + } + + if (esxVI_String_Alloc(string) < 0 || + esxVI_String_DeserializeValue(node, &(*string)->value) < 0) { + goto failure; + } + + return 0; + + failure: + esxVI_String_Free(string); + + return -1; +} /* esxVI_String_DeserializeList */ ESX_VI__TEMPLATE__LIST__DESERIALIZE(String) -- 1.7.4.1

2 2

[libvirt] [PATCH] nodeinfo: deal with offline cpus in a node
by Eric Blake 19 Jul '12

19 Jul '12

Commit 80533ca forgot to think about offline cpus. When a node cpu is offline, then its topology/ subdirectory is not present, leading to spurious error messages leaked to the user such as: libvir: error : cannot open /home/dummy/libvirt/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/node0/cpu7/topology/physical_package_id: No such file or directory Fix that, as well as test it; the test data is gathered from a machine with one NUMA node, hyperthreading, and with 2 of the 8 cpus offline. * src/nodeinfo.c (virNodeParseNode): Don't parse topology of offline cpus. * tests/nodeinfotest.c (mymain): Run new test. * tests/nodeinfodata/linux-nodeinfo-sysfs-test-6*: New data. --- Offline cpus are an annoying corner case :) src/nodeinfo.c | 6 + .../linux-nodeinfo-sysfs-test-6-cpu-x86-output.txt | 1 + .../linux-nodeinfo-sysfs-test-6-x86.cpuinfo | 150 ++++++++++++++++++++ .../cpu/cpu0/topology/core_id | 1 + .../cpu/cpu0/topology/physical_package_id | 1 + .../cpu/cpu0/topology/thread_siblings | 1 + .../linux-nodeinfo-sysfs-test-6/cpu/cpu1/online | 1 + .../cpu/cpu1/topology/core_id | 1 + .../cpu/cpu1/topology/physical_package_id | 1 + .../cpu/cpu1/topology/thread_siblings | 1 + .../linux-nodeinfo-sysfs-test-6/cpu/cpu2/online | 1 + .../cpu/cpu2/topology/core_id | 1 + .../cpu/cpu2/topology/physical_package_id | 1 + .../cpu/cpu2/topology/thread_siblings | 1 + .../linux-nodeinfo-sysfs-test-6/cpu/cpu3/online | 1 + .../cpu/cpu3/topology/core_id | 1 + .../cpu/cpu3/topology/physical_package_id | 1 + .../cpu/cpu3/topology/thread_siblings | 1 + .../linux-nodeinfo-sysfs-test-6/cpu/cpu4/online | 1 + .../cpu/cpu4/topology/core_id | 1 + .../cpu/cpu4/topology/physical_package_id | 1 + .../cpu/cpu4/topology/thread_siblings | 1 + .../linux-nodeinfo-sysfs-test-6/cpu/cpu5/online | 1 + .../linux-nodeinfo-sysfs-test-6/cpu/cpu6/online | 1 + .../cpu/cpu6/topology/core_id | 1 + .../cpu/cpu6/topology/physical_package_id | 1 + .../cpu/cpu6/topology/thread_siblings | 1 + .../linux-nodeinfo-sysfs-test-6/cpu/cpu7/online | 1 + .../linux-nodeinfo-sysfs-test-6/node/node0/cpu0 | 1 + .../linux-nodeinfo-sysfs-test-6/node/node0/cpu1 | 1 + .../linux-nodeinfo-sysfs-test-6/node/node0/cpu2 | 1 + .../linux-nodeinfo-sysfs-test-6/node/node0/cpu3 | 1 + .../linux-nodeinfo-sysfs-test-6/node/node0/cpu4 | 1 + .../linux-nodeinfo-sysfs-test-6/node/node0/cpu5 | 1 + .../linux-nodeinfo-sysfs-test-6/node/node0/cpu6 | 1 + .../linux-nodeinfo-sysfs-test-6/node/node0/cpu7 | 1 + .../linux-nodeinfo-sysfs-test-6/node/node0/meminfo | 29 ++++ .../linux-nodeinfo-sysfs-test-6/node/online | Bin 0 -> 3 bytes .../linux-nodeinfo-sysfs-test-6/node/possible | Bin 0 -> 3 bytes tests/nodeinfotest.c | 1 + 40 files changed, 220 insertions(+) create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-6-cpu-x86-output.txt create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-6-x86.cpuinfo create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu0/topology/core_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu0/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu0/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu1/online create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu1/topology/core_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu1/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu1/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu2/online create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu2/topology/core_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu2/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu2/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu3/online create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu3/topology/core_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu3/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu3/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu4/online create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu4/topology/core_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu4/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu4/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu5/online create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu6/online create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu6/topology/core_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu6/topology/physical_package_id create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu6/topology/thread_siblings create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu7/online create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/node0/cpu0 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/node0/cpu1 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/node0/cpu2 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/node0/cpu3 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/node0/cpu4 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/node0/cpu5 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/node0/cpu6 create mode 120000 tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/node0/cpu7 create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/node0/meminfo create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/online create mode 100644 tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/possible diff --git a/src/nodeinfo.c b/src/nodeinfo.c index a892e7a..052b006 100644 --- a/src/nodeinfo.c +++ b/src/nodeinfo.c @@ -225,6 +225,12 @@ virNodeParseNode(const char *node, int *sockets, int *cores, int *threads) if (sscanf(cpudirent->d_name, "cpu%u", &cpu) != 1) continue; + if ((online = virNodeGetCpuValue(node, cpu, "online", true)) < 0) + goto cleanup; + + if (!online) + continue; + /* Parse socket */ sock = virNodeParseSocket(node, cpu); CPU_SET(sock, &sock_map); diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6-cpu-x86-output.txt b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6-cpu-x86-output.txt new file mode 100644 index 0000000..7ffcb8e --- /dev/null +++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6-cpu-x86-output.txt @@ -0,0 +1 @@ +CPUs: 6/8, MHz: 1596, Nodes: 1, Sockets: 1, Cores: 4, Threads: 2 diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6-x86.cpuinfo b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6-x86.cpuinfo new file mode 100644 index 0000000..61838dd --- /dev/null +++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6-x86.cpuinfo @@ -0,0 +1,150 @@ +processor : 0 +vendor_id : GenuineIntel +cpu family : 6 +model : 44 +model name : Intel(R) Xeon(R) CPU E5640 @ 2.67GHz +stepping : 2 +cpu MHz : 1596.000 +cache size : 12288 KB +physical id : 0 +siblings : 6 +core id : 0 +cpu cores : 4 +apicid : 0 +initial apicid : 0 +fpu : yes +fpu_exception : yes +cpuid level : 11 +wp : yes +flags : fpu vme de pse tsc msr pae mce cx8 apic mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good xtopology nonstop_tsc aperfmperf pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm dca sse4_1 sse4_2 popcnt aes lahf_lm ida arat epb dts tpr_shadow vnmi flexpriority ept vpid +bogomips : 5333.90 +clflush size : 64 +cache_alignment : 64 +address sizes : 40 bits physical, 48 bits virtual +power management: + +processor : 1 +vendor_id : GenuineIntel +cpu family : 6 +model : 44 +model name : Intel(R) Xeon(R) CPU E5640 @ 2.67GHz +stepping : 2 +cpu MHz : 1596.000 +cache size : 12288 KB +physical id : 0 +siblings : 6 +core id : 1 +cpu cores : 4 +apicid : 2 +initial apicid : 2 +fpu : yes +fpu_exception : yes +cpuid level : 11 +wp : yes +flags : fpu vme de pse tsc msr pae mce cx8 apic mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good xtopology nonstop_tsc aperfmperf pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm dca sse4_1 sse4_2 popcnt aes lahf_lm ida arat epb dts tpr_shadow vnmi flexpriority ept vpid +bogomips : 5333.90 +clflush size : 64 +cache_alignment : 64 +address sizes : 40 bits physical, 48 bits virtual +power management: + +processor : 2 +vendor_id : GenuineIntel +cpu family : 6 +model : 44 +model name : Intel(R) Xeon(R) CPU E5640 @ 2.67GHz +stepping : 2 +cpu MHz : 1596.000 +cache size : 12288 KB +physical id : 0 +siblings : 6 +core id : 9 +cpu cores : 4 +apicid : 18 +initial apicid : 18 +fpu : yes +fpu_exception : yes +cpuid level : 11 +wp : yes +flags : fpu vme de pse tsc msr pae mce cx8 apic mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good xtopology nonstop_tsc aperfmperf pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm dca sse4_1 sse4_2 popcnt aes lahf_lm ida arat epb dts tpr_shadow vnmi flexpriority ept vpid +bogomips : 5333.90 +clflush size : 64 +cache_alignment : 64 +address sizes : 40 bits physical, 48 bits virtual +power management: + +processor : 3 +vendor_id : GenuineIntel +cpu family : 6 +model : 44 +model name : Intel(R) Xeon(R) CPU E5640 @ 2.67GHz +stepping : 2 +cpu MHz : 1596.000 +cache size : 12288 KB +physical id : 0 +siblings : 6 +core id : 10 +cpu cores : 4 +apicid : 20 +initial apicid : 20 +fpu : yes +fpu_exception : yes +cpuid level : 11 +wp : yes +flags : fpu vme de pse tsc msr pae mce cx8 apic mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good xtopology nonstop_tsc aperfmperf pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm dca sse4_1 sse4_2 popcnt aes lahf_lm ida arat epb dts tpr_shadow vnmi flexpriority ept vpid +bogomips : 5333.90 +clflush size : 64 +cache_alignment : 64 +address sizes : 40 bits physical, 48 bits virtual +power management: + +processor : 4 +vendor_id : GenuineIntel +cpu family : 6 +model : 44 +model name : Intel(R) Xeon(R) CPU E5640 @ 2.67GHz +stepping : 2 +cpu MHz : 1596.000 +cache size : 12288 KB +physical id : 0 +siblings : 6 +core id : 0 +cpu cores : 4 +apicid : 1 +initial apicid : 1 +fpu : yes +fpu_exception : yes +cpuid level : 11 +wp : yes +flags : fpu vme de pse tsc msr pae mce cx8 apic mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good xtopology nonstop_tsc aperfmperf pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm dca sse4_1 sse4_2 popcnt aes lahf_lm ida arat epb dts tpr_shadow vnmi flexpriority ept vpid +bogomips : 5333.90 +clflush size : 64 +cache_alignment : 64 +address sizes : 40 bits physical, 48 bits virtual +power management: + +processor : 6 +vendor_id : GenuineIntel +cpu family : 6 +model : 44 +model name : Intel(R) Xeon(R) CPU E5640 @ 2.67GHz +stepping : 2 +cpu MHz : 1596.000 +cache size : 12288 KB +physical id : 0 +siblings : 6 +core id : 9 +cpu cores : 4 +apicid : 19 +initial apicid : 19 +fpu : yes +fpu_exception : yes +cpuid level : 11 +wp : yes +flags : fpu vme de pse tsc msr pae mce cx8 apic mtrr pge mca cmov pat pse36 clflush dts acpi mmx fxsr sse sse2 ss ht tm pbe syscall nx pdpe1gb rdtscp lm constant_tsc arch_perfmon pebs bts rep_good xtopology nonstop_tsc aperfmperf pni pclmulqdq dtes64 monitor ds_cpl vmx smx est tm2 ssse3 cx16 xtpr pdcm dca sse4_1 sse4_2 popcnt aes lahf_lm ida arat epb dts tpr_shadow vnmi flexpriority ept vpid +bogomips : 5333.90 +clflush size : 64 +cache_alignment : 64 +address sizes : 40 bits physical, 48 bits virtual +power management: + diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu0/topology/core_id b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu0/topology/core_id new file mode 100644 index 0000000..573541a --- /dev/null +++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu0/topology/core_id @@ -0,0 +1 @@ +0 diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu0/topology/physical_package_id b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu0/topology/physical_package_id new file mode 100644 index 0000000..573541a --- /dev/null +++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu0/topology/physical_package_id @@ -0,0 +1 @@ +0 diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu0/topology/thread_siblings b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu0/topology/thread_siblings new file mode 100644 index 0000000..b4de394 --- /dev/null +++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu0/topology/thread_siblings @@ -0,0 +1 @@ +11 diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu1/online b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu1/online new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu1/online @@ -0,0 +1 @@ +1 diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu1/topology/core_id b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu1/topology/core_id new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu1/topology/core_id @@ -0,0 +1 @@ +1 diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu1/topology/physical_package_id b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu1/topology/physical_package_id new file mode 100644 index 0000000..573541a --- /dev/null +++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu1/topology/physical_package_id @@ -0,0 +1 @@ +0 diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu1/topology/thread_siblings b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu1/topology/thread_siblings new file mode 100644 index 0000000..9e22bcb --- /dev/null +++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu1/topology/thread_siblings @@ -0,0 +1 @@ +02 diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu2/online b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu2/online new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu2/online @@ -0,0 +1 @@ +1 diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu2/topology/core_id b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu2/topology/core_id new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu2/topology/core_id @@ -0,0 +1 @@ +9 diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu2/topology/physical_package_id b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu2/topology/physical_package_id new file mode 100644 index 0000000..573541a --- /dev/null +++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu2/topology/physical_package_id @@ -0,0 +1 @@ +0 diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu2/topology/thread_siblings b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu2/topology/thread_siblings new file mode 100644 index 0000000..c739b42 --- /dev/null +++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu2/topology/thread_siblings @@ -0,0 +1 @@ +44 diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu3/online b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu3/online new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu3/online @@ -0,0 +1 @@ +1 diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu3/topology/core_id b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu3/topology/core_id new file mode 100644 index 0000000..f599e28 --- /dev/null +++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu3/topology/core_id @@ -0,0 +1 @@ +10 diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu3/topology/physical_package_id b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu3/topology/physical_package_id new file mode 100644 index 0000000..573541a --- /dev/null +++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu3/topology/physical_package_id @@ -0,0 +1 @@ +0 diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu3/topology/thread_siblings b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu3/topology/thread_siblings new file mode 100644 index 0000000..adb9de8 --- /dev/null +++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu3/topology/thread_siblings @@ -0,0 +1 @@ +08 diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu4/online b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu4/online new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu4/online @@ -0,0 +1 @@ +1 diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu4/topology/core_id b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu4/topology/core_id new file mode 100644 index 0000000..573541a --- /dev/null +++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu4/topology/core_id @@ -0,0 +1 @@ +0 diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu4/topology/physical_package_id b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu4/topology/physical_package_id new file mode 100644 index 0000000..573541a --- /dev/null +++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu4/topology/physical_package_id @@ -0,0 +1 @@ +0 diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu4/topology/thread_siblings b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu4/topology/thread_siblings new file mode 100644 index 0000000..b4de394 --- /dev/null +++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu4/topology/thread_siblings @@ -0,0 +1 @@ +11 diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu5/online b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu5/online new file mode 100644 index 0000000..573541a --- /dev/null +++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu5/online @@ -0,0 +1 @@ +0 diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu6/online b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu6/online new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu6/online @@ -0,0 +1 @@ +1 diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu6/topology/core_id b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu6/topology/core_id new file mode 100644 index 0000000..ec63514 --- /dev/null +++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu6/topology/core_id @@ -0,0 +1 @@ +9 diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu6/topology/physical_package_id b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu6/topology/physical_package_id new file mode 100644 index 0000000..573541a --- /dev/null +++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu6/topology/physical_package_id @@ -0,0 +1 @@ +0 diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu6/topology/thread_siblings b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu6/topology/thread_siblings new file mode 100644 index 0000000..c739b42 --- /dev/null +++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu6/topology/thread_siblings @@ -0,0 +1 @@ +44 diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu7/online b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu7/online new file mode 100644 index 0000000..573541a --- /dev/null +++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/cpu/cpu7/online @@ -0,0 +1 @@ +0 diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/node0/cpu0 b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/node0/cpu0 new file mode 120000 index 0000000..c841bea --- /dev/null +++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/node0/cpu0 @@ -0,0 +1 @@ +../../cpu/cpu0 \ No newline at end of file diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/node0/cpu1 b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/node0/cpu1 new file mode 120000 index 0000000..5f45362 --- /dev/null +++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/node0/cpu1 @@ -0,0 +1 @@ +../../cpu/cpu1 \ No newline at end of file diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/node0/cpu2 b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/node0/cpu2 new file mode 120000 index 0000000..2dcca33 --- /dev/null +++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/node0/cpu2 @@ -0,0 +1 @@ +../../cpu/cpu2 \ No newline at end of file diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/node0/cpu3 b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/node0/cpu3 new file mode 120000 index 0000000..c7690e5 --- /dev/null +++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/node0/cpu3 @@ -0,0 +1 @@ +../../cpu/cpu3 \ No newline at end of file diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/node0/cpu4 b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/node0/cpu4 new file mode 120000 index 0000000..9e77a64 --- /dev/null +++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/node0/cpu4 @@ -0,0 +1 @@ +../../cpu/cpu4 \ No newline at end of file diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/node0/cpu5 b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/node0/cpu5 new file mode 120000 index 0000000..cc07c3b --- /dev/null +++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/node0/cpu5 @@ -0,0 +1 @@ +../../cpu/cpu5 \ No newline at end of file diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/node0/cpu6 b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/node0/cpu6 new file mode 120000 index 0000000..2e75763 --- /dev/null +++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/node0/cpu6 @@ -0,0 +1 @@ +../../cpu/cpu6 \ No newline at end of file diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/node0/cpu7 b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/node0/cpu7 new file mode 120000 index 0000000..09e3f79 --- /dev/null +++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/node0/cpu7 @@ -0,0 +1 @@ +../../cpu/cpu7 \ No newline at end of file diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/node0/meminfo b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/node0/meminfo new file mode 100644 index 0000000..8122d41 --- /dev/null +++ b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/node0/meminfo @@ -0,0 +1,29 @@ + +Node 0 MemTotal: 8379620 kB +Node 0 MemFree: 2971308 kB +Node 0 MemUsed: 5408312 kB +Node 0 Active: 3795016 kB +Node 0 Inactive: 869528 kB +Node 0 Active(anon): 3081132 kB +Node 0 Inactive(anon): 13352 kB +Node 0 Active(file): 713884 kB +Node 0 Inactive(file): 856176 kB +Node 0 Unevictable: 48324 kB +Node 0 Mlocked: 13580 kB +Node 0 Dirty: 84 kB +Node 0 Writeback: 0 kB +Node 0 FilePages: 1585776 kB +Node 0 Mapped: 134048 kB +Node 0 AnonPages: 866116 kB +Node 0 Shmem: 13512 kB +Node 0 KernelStack: 3904 kB +Node 0 PageTables: 40664 kB +Node 0 NFS_Unstable: 0 kB +Node 0 Bounce: 0 kB +Node 0 WritebackTmp: 0 kB +Node 0 Slab: 244404 kB +Node 0 SReclaimable: 161784 kB +Node 0 SUnreclaim: 82620 kB +Node 0 HugePages_Total: 0 +Node 0 HugePages_Free: 0 +Node 0 HugePages_Surp: 0 diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/online b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/online new file mode 100644 index 0000000000000000000000000000000000000000..c1da2e294b3f3646e368cc0056986632de06e2cc GIT binary patch literal 3 KcmXruVgLXDrvN(u literal 0 HcmV?d00001 diff --git a/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/possible b/tests/nodeinfodata/linux-nodeinfo-sysfs-test-6/node/possible new file mode 100644 index 0000000000000000000000000000000000000000..c1da2e294b3f3646e368cc0056986632de06e2cc GIT binary patch literal 3 KcmXruVgLXDrvN(u literal 0 HcmV?d00001 diff --git a/tests/nodeinfotest.c b/tests/nodeinfotest.c index 346af58..851acd0 100644 --- a/tests/nodeinfotest.c +++ b/tests/nodeinfotest.c @@ -130,6 +130,7 @@ mymain(void) "nodeinfo-sysfs-test-3", "nodeinfo-sysfs-test-4", "nodeinfo-sysfs-test-5", + "nodeinfo-sysfs-test-6", # endif }; -- 1.7.10.4

2 2

[libvirt] [PATCH] build: fix compilation without struct ifreq
by Eric Blake 19 Jul '12

19 Jul '12

Detected on Cygwin. Broken in commit 387117ad. * src/util/virnetdev.c (virNetDevValidateConfig): Fix prototype. --- Pushing under the build-breaker rule. src/util/virnetdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c index cd44bf4..4fd9b00 100644 --- a/src/util/virnetdev.c +++ b/src/util/virnetdev.c @@ -927,7 +927,7 @@ int virNetDevValidateConfig(const char *ifname, } #else /* ! HAVE_STRUCT_IFREQ */ int virNetDevValidateConfig(const char *ifname ATTRIBUTE_UNUSED, - const unsigned char *macaddr ATTRIBUTE_UNUSED, + const virMacAddrPtr macaddr ATTRIBUTE_UNUSED, int ifindex ATTRIBUTE_UNUSED) { virReportSystemError(ENOSYS, "%s", -- 1.7.10.4

1 0

[libvirt] Linker error in gnulib test-binary-io.c
by Matthias Bolte 18 Jul '12

18 Jul '12

I get the following error on Ubuntu 11.04 with current libvirt git HEAD: $ make check [...] CC test-binary-io.o test-binary-io.c: In function 'main': test-binary-io.c:54:7: warning: implicit declaration of function 'set_binary_mode' CCLD test-binary-io test-binary-io.o: In function `main': [...]/test-binary-io.c:54: undefined reference to `set_binary_mode' collect2: ld returned 1 exit status -- Matthias Bolte http://photron.blogspot.com

2 2

[libvirt] [PATCH v3] esx: Extend esxVI_CURL_Download for partial downloads
by Matthias Bolte 18 Jul '12

18 Jul '12

Also ensure that the virBuffer used to store the downloaded data does not overflow. --- v3: - Fix virBuffer limit checks. v2: - Ensure that the used virBuffer dos not overflow. src/esx/esx_driver.c | 2 +- src/esx/esx_vi.c | 62 +++++++++++++++++++++++++++++++++++++++++++------ src/esx/esx_vi.h | 3 +- 3 files changed, 57 insertions(+), 10 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index db2144c..95b9286 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -2802,7 +2802,7 @@ esxDomainGetXMLDesc(virDomainPtr domain, unsigned int flags) url = virBufferContentAndReset(&buffer); - if (esxVI_CURL_Download(priv->primary->curl, url, &vmx) < 0) { + if (esxVI_CURL_Download(priv->primary->curl, url, &vmx, 0, NULL) < 0) { goto cleanup; } diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index 48718b6..0df973c 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -116,9 +116,9 @@ ESX_VI__TEMPLATE__FREE(CURL, }) static size_t -esxVI_CURL_ReadString(char *data, size_t size, size_t nmemb, void *ptrptr) +esxVI_CURL_ReadString(char *data, size_t size, size_t nmemb, void *userdata) { - const char *content = *(const char **)ptrptr; + const char *content = *(const char **)userdata; size_t available = 0; size_t requested = size * nmemb; @@ -138,16 +138,28 @@ esxVI_CURL_ReadString(char *data, size_t size, size_t nmemb, void *ptrptr) memcpy(data, content, requested); - *(const char **)ptrptr = content + requested; + *(const char **)userdata = content + requested; return requested; } static size_t -esxVI_CURL_WriteBuffer(char *data, size_t size, size_t nmemb, void *buffer) +esxVI_CURL_WriteBuffer(char *data, size_t size, size_t nmemb, void *userdata) { + virBufferPtr buffer = userdata; + if (buffer != NULL) { - virBufferAdd((virBufferPtr) buffer, data, size * nmemb); + /* + * Using a virBuffer to store the download data limits the downloadable + * size. This is no problem as esxVI_CURL_Download and esxVI_CURL_Perform + * are meant to download small things such as VMX files, VMDK metadata + * files and SOAP responses. + */ + if (size * nmemb > INT32_MAX / 2 - virBufferUse(buffer)) { + return 0; + } + + virBufferAdd(buffer, data, size * nmemb); return size * nmemb; } @@ -160,7 +172,7 @@ esxVI_CURL_WriteBuffer(char *data, size_t size, size_t nmemb, void *buffer) #if ESX_VI__CURL__ENABLE_DEBUG_OUTPUT static int esxVI_CURL_Debug(CURL *curl ATTRIBUTE_UNUSED, curl_infotype type, - char *info, size_t size, void *data ATTRIBUTE_UNUSED) + char *info, size_t size, void *userdata ATTRIBUTE_UNUSED) { char *buffer = NULL; @@ -355,8 +367,10 @@ esxVI_CURL_Connect(esxVI_CURL *curl, esxUtil_ParsedUri *parsedUri) } int -esxVI_CURL_Download(esxVI_CURL *curl, const char *url, char **content) +esxVI_CURL_Download(esxVI_CURL *curl, const char *url, char **content, + unsigned long long offset, unsigned long long *length) { + char *range = NULL; virBuffer buffer = VIR_BUFFER_INITIALIZER; int responseCode = 0; @@ -365,9 +379,33 @@ esxVI_CURL_Download(esxVI_CURL *curl, const char *url, char **content) return -1; } + if (length != NULL && *length > 0) { + /* + * Using a virBuffer to store the download data limits the downloadable + * size. This is no problem as esxVI_CURL_Download is meant to download + * small things such as VMX of VMDK metadata files. + */ + if (*length > INT32_MAX / 2) { + ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", + _("Download length it too large")); + return -1; + } + + if (virAsprintf(&range, "%llu-%llu", offset, offset + *length - 1) < 0) { + virReportOOMError(); + goto cleanup; + } + } else if (offset > 0) { + if (virAsprintf(&range, "%llu-", offset) < 0) { + virReportOOMError(); + goto cleanup; + } + } + virMutexLock(&curl->lock); curl_easy_setopt(curl->handle, CURLOPT_URL, url); + curl_easy_setopt(curl->handle, CURLOPT_RANGE, range); curl_easy_setopt(curl->handle, CURLOPT_WRITEDATA, &buffer); curl_easy_setopt(curl->handle, CURLOPT_UPLOAD, 0); curl_easy_setopt(curl->handle, CURLOPT_HTTPGET, 1); @@ -378,7 +416,7 @@ esxVI_CURL_Download(esxVI_CURL *curl, const char *url, char **content) if (responseCode < 0) { goto cleanup; - } else if (responseCode != 200) { + } else if (responseCode != 200 && responseCode != 206) { ESX_VI_ERROR(VIR_ERR_INTERNAL_ERROR, _("HTTP response code %d for download from '%s'"), responseCode, url); @@ -390,9 +428,15 @@ esxVI_CURL_Download(esxVI_CURL *curl, const char *url, char **content) goto cleanup; } + if (length != NULL) { + *length = virBufferUse(&buffer); + } + *content = virBufferContentAndReset(&buffer); cleanup: + VIR_FREE(range); + if (*content == NULL) { virBufferFreeAndReset(&buffer); return -1; @@ -414,6 +458,7 @@ esxVI_CURL_Upload(esxVI_CURL *curl, const char *url, const char *content) virMutexLock(&curl->lock); curl_easy_setopt(curl->handle, CURLOPT_URL, url); + curl_easy_setopt(curl->handle, CURLOPT_RANGE, NULL); curl_easy_setopt(curl->handle, CURLOPT_READDATA, &content); curl_easy_setopt(curl->handle, CURLOPT_UPLOAD, 1); curl_easy_setopt(curl->handle, CURLOPT_INFILESIZE, strlen(content)); @@ -1231,6 +1276,7 @@ esxVI_Context_Execute(esxVI_Context *ctx, const char *methodName, virMutexLock(&ctx->curl->lock); curl_easy_setopt(ctx->curl->handle, CURLOPT_URL, ctx->url); + curl_easy_setopt(ctx->curl->handle, CURLOPT_RANGE, NULL); curl_easy_setopt(ctx->curl->handle, CURLOPT_WRITEDATA, &buffer); curl_easy_setopt(ctx->curl->handle, CURLOPT_UPLOAD, 0); curl_easy_setopt(ctx->curl->handle, CURLOPT_POSTFIELDS, request); diff --git a/src/esx/esx_vi.h b/src/esx/esx_vi.h index 9560bd2..49b7ca2 100644 --- a/src/esx/esx_vi.h +++ b/src/esx/esx_vi.h @@ -167,7 +167,8 @@ struct _esxVI_CURL { int esxVI_CURL_Alloc(esxVI_CURL **curl); void esxVI_CURL_Free(esxVI_CURL **curl); int esxVI_CURL_Connect(esxVI_CURL *curl, esxUtil_ParsedUri *parsedUri); -int esxVI_CURL_Download(esxVI_CURL *curl, const char *url, char **content); +int esxVI_CURL_Download(esxVI_CURL *curl, const char *url, char **content, + unsigned long long offset, unsigned long long *length); int esxVI_CURL_Upload(esxVI_CURL *curl, const char *url, const char *content); -- 1.7.4.1

2 2

[libvirt] [PATCH 00/13] Remove many custom error reporting macros
by Daniel P. Berrange 18 Jul '12

18 Jul '12

2 31

[libvirt] We need this patch to mount all tmpfs file systems with the correct context.
by Daniel J Walsh 18 Jul '12

18 Jul '12

-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Basically within a Secure Linux Container (virt-sandbox) we want all content that the process within the container can write to be labeled the same. We are labeling the physical disk correctly but when we create "RAM" based file systems libvirt is not labeling them, and they are defaulting to tmpfs_t, which will will not allow the processes to write. This patch labels the RAM based file systems correctly. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iEYEARECAAYFAlAFiTwACgkQrlYvE4MpobPA1ACghFq3nxmNmHP/WEq1vSwjtoin VFoAnAlxgPISuIPiAPSFUL0CjiiSXDzw =xFCU -----END PGP SIGNATURE-----

3 7