[Pkg-libvirt-commits] [libguestfs] 34/146: daemon: blockdev: Allow extraarg to be 0.

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to branch master
in repository libguestfs.

commit 31698dbc4339191cac01f882392eeae65fbc7245
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Tue Nov 25 14:31:42 2014 +0000

    daemon: blockdev: Allow extraarg to be 0.
    
    No change, since extraarg is not actually used.
    
    (cherry picked from commit dbdfa79d91f23d6fa12217961cf2633fc560eadb)
---
 daemon/blockdev.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/daemon/blockdev.c b/daemon/blockdev.c
index 8a7b1a8..2f240a9 100644
--- a/daemon/blockdev.c
+++ b/daemon/blockdev.c
@@ -62,7 +62,7 @@ call_blockdev (const char *device, const char *switc, int extraarg, int prints)
    */
   udev_settle ();
 
-  if (extraarg > 0) {
+  if (extraarg >= 0) {
     snprintf (buf, sizeof buf, "%d", extraarg);
     argv[2] = buf;
     argv[3] = device;
@@ -91,31 +91,31 @@ call_blockdev (const char *device, const char *switc, int extraarg, int prints)
 int
 do_blockdev_setro (const char *device)
 {
-  return (int) call_blockdev (device, "--setro", 0, 0);
+  return (int) call_blockdev (device, "--setro", -1, 0);
 }
 
 int
 do_blockdev_setrw (const char *device)
 {
-  return (int) call_blockdev (device, "--setrw", 0, 0);
+  return (int) call_blockdev (device, "--setrw", -1, 0);
 }
 
 int
 do_blockdev_getro (const char *device)
 {
-  return (int) call_blockdev (device, "--getro", 0, 1);
+  return (int) call_blockdev (device, "--getro", -1, 1);
 }
 
 int
 do_blockdev_getss (const char *device)
 {
-  return (int) call_blockdev (device, "--getss", 0, 1);
+  return (int) call_blockdev (device, "--getss", -1, 1);
 }
 
 int
 do_blockdev_getbsz (const char *device)
 {
-  return (int) call_blockdev (device, "--getbsz", 0, 1);
+  return (int) call_blockdev (device, "--getbsz", -1, 1);
 }
 
 int
@@ -128,23 +128,23 @@ do_blockdev_setbsz (const char *device, int blocksize)
 int64_t
 do_blockdev_getsz (const char *device)
 {
-  return call_blockdev (device, "--getsz", 0, 1);
+  return call_blockdev (device, "--getsz", -1, 1);
 }
 
 int64_t
 do_blockdev_getsize64 (const char *device)
 {
-  return call_blockdev (device, "--getsize64", 0, 1);
+  return call_blockdev (device, "--getsize64", -1, 1);
 }
 
 int
 do_blockdev_flushbufs (const char *device)
 {
-  return call_blockdev (device, "--flushbufs", 0, 0);
+  return call_blockdev (device, "--flushbufs", -1, 0);
 }
 
 int
 do_blockdev_rereadpt (const char *device)
 {
-  return call_blockdev (device, "--rereadpt", 0, 0);
+  return call_blockdev (device, "--rereadpt", -1, 0);
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git