From: Richard Jones Date: Fri, 12 Feb 2010 12:08:58 +0000 (+0000) Subject: Sys::Guestfs::Lib::open_guest: Remove freeform parameters. X-Git-Tag: 1.0.84~4 X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=33b4b759afe58c959bdc8b904d618aa1d699a240;p=libguestfs.git Sys::Guestfs::Lib::open_guest: Remove freeform parameters. Remove the ability to pass freeform parameters to Sys::Virt->new. We don't use it, it makes the code more complex to modify, and indeed there are no other args that Sys::Virt->new supports so this would never be used. Also change $readwrite to $rw to match parameter name. --- diff --git a/perl/lib/Sys/Guestfs/Lib.pm b/perl/lib/Sys/Guestfs/Lib.pm index 21c9a64..c9a3237 100644 --- a/perl/lib/Sys/Guestfs/Lib.pm +++ b/perl/lib/Sys/Guestfs/Lib.pm @@ -104,8 +104,7 @@ The handle is still in the config state when it is returned, so you have to call C<$g-Elaunch ()>. The optional C
parameter can be added to specify the libvirt -URI. In addition, L lists other parameters which are -passed through to Cnew> unchanged. +URI. The implicit libvirt handle is closed after this function, I you call the function in C context, in which case the @@ -126,7 +125,8 @@ sub open_guest my $first = shift; my %params = @_; - my $readwrite = $params{rw}; + my $rw = $params{rw}; + my $address = $params{address}; my @images = (); if (ref ($first) eq "ARRAY") { @@ -154,12 +154,15 @@ sub open_guest die __"open_guest: too many domains listed on command line" if @images > 1; - $conn = Sys::Virt->new (readonly => 1, @_); + my @libvirt_args = (); + push @libvirt_args, address => $address if defined $address; + + $conn = Sys::Virt->new (readonly => 1, @libvirt_args); die __"open_guest: cannot connect to libvirt" unless $conn; my @doms = $conn->list_defined_domains (); my $isitinactive = 1; - unless ($readwrite) { + unless ($rw) { # In the case where we want read-only access to a domain, # allow the user to specify an active domain too. push @doms, $conn->list_domains (); @@ -199,7 +202,7 @@ sub open_guest # We've now got the list of @images, so feed them to libguestfs. my $g = Sys::Guestfs->new (); foreach (@images) { - if ($readwrite) { + if ($rw) { $g->add_drive ($_); } else { $g->add_drive_ro ($_);