git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New API: debug-upload (not a formal part of the API/ABI).
[libguestfs.git]
/
tools
/
virt-df
diff --git
a/tools/virt-df
b/tools/virt-df
index
78eb25c
..
17aed4a
100755
(executable)
--- a/
tools/virt-df
+++ b/
tools/virt-df
@@
-23,11
+23,13
@@
use Sys::Guestfs;
use Sys::Guestfs::Lib qw(open_guest get_partitions resolve_windows_path
inspect_all_partitions inspect_partition
inspect_operating_systems mount_operating_system inspect_in_detail);
use Sys::Guestfs::Lib qw(open_guest get_partitions resolve_windows_path
inspect_all_partitions inspect_partition
inspect_operating_systems mount_operating_system inspect_in_detail);
+
use Pod::Usage;
use Getopt::Long;
use Data::Dumper;
use Pod::Usage;
use Getopt::Long;
use Data::Dumper;
-use File::Temp qw/tempdir/;
use XML::Writer;
use XML::Writer;
+use POSIX qw(ceil);
+
use Locale::TextDomain 'libguestfs';
=encoding utf8
use Locale::TextDomain 'libguestfs';
=encoding utf8
@@
-107,8
+109,8
@@
my $csv;
=item B<--csv>
=item B<--csv>
-Write out the results in CSV format (comma-separated values). This
-
format
can be imported easily into databases and spreadsheets, but
+Write out the results in CSV format (comma-separated values). This
format
+can be imported easily into databases and spreadsheets, but
read L</NOTE ABOUT CSV FORMAT> below.
=cut
read L</NOTE ABOUT CSV FORMAT> below.
=cut
@@
-160,12
+162,16
@@
if (@ARGV == 0) {
my @doms = $conn->list_defined_domains ();
push @doms, $conn->list_domains ();
my @doms = $conn->list_defined_domains ();
push @doms, $conn->list_domains ();
+ # https://bugzilla.redhat.com/show_bug.cgi?id=538041
+ @doms = grep { $_->get_id () != 0 } @doms;
+
my @domnames = map { $_->get_name () } @doms;
if (@domnames) {
print_title ();
foreach (@domnames) {
my @domnames = map { $_->get_name () } @doms;
if (@domnames) {
print_title ();
foreach (@domnames) {
- do_df ($_);
+ eval { do_df ($_); };
+ warn $@ if $@;
}
}
} else {
}
}
} else {
@@
-227,9
+233,7
@@
sub print_stat
push @cols, ($blocks-$bfree)*$factor; # total 1K blocks used
push @cols, $bavail*$factor; # total 1K blocks available
push @cols, ($blocks-$bfree)*$factor; # total 1K blocks used
push @cols, $bavail*$factor; # total 1K blocks available
- # XXX %used column comes out different from the native 'df'
- # program. Need to check how 'df' calculates this.
- push @cols, 100.0 - 100.0 * $bavail / $blocks;
+ push @cols, 100.0 - 100.0 * $bfree / $blocks;
if ($human) {
$cols[2] = human_size ($cols[2]);
if ($human) {
$cols[2] = human_size ($cols[2]);
@@
-245,9
+249,7
@@
sub print_stat
push @cols, $files-$ffree;
push @cols, $ffree;
push @cols, $files-$ffree;
push @cols, $ffree;
- # XXX %used column comes out different from the native 'df'
- # program. Need to check how 'df' calculates this.
- push @cols, 100.0 - 100.0 * $favail / $files;
+ push @cols, 100.0 - 100.0 * $ffree / $files;
}
print_cols (@cols);
}
print_cols (@cols);
@@
-289,7
+291,10
@@
sub print_cols
printf ("%-36s", $label);
print "\n"," "x36 if length ($label) > 36;
printf ("%-36s", $label);
print "\n"," "x36 if length ($label) > 36;
- my $percent = sprintf "%3.1f%%", $_[5];
+ # Use 'ceil' on the percentage in order to emulate
+ # what df itself does.
+ my $percent = sprintf "%3d%%", ceil($_[5]);
+
printf ("%10s %10s %10s %5s\n", $_[2], $_[3], $_[4], $percent);
} else {
printf ("\"%s\",\"%s\",%d,%d,%d,%.1f%%\n", @_);
printf ("%10s %10s %10s %5s\n", $_[2], $_[3], $_[4], $percent);
} else {
printf ("\"%s\",\"%s\",%d,%d,%d,%.1f%%\n", @_);
@@
-345,11
+350,11
@@
L<http://libguestfs.org/>.
=head1 AUTHOR
=head1 AUTHOR
-Richard W.M. Jones L<http://
et
.redhat.com/~rjones/>
+Richard W.M. Jones L<http://
people
.redhat.com/~rjones/>
=head1 COPYRIGHT
=head1 COPYRIGHT
-Copyright (C) 2009 Red Hat Inc.
+Copyright (C) 2009
-2010
Red Hat Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by