git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add Opensuse and zypper detection support
[libguestfs.git]
/
daemon
/
blockdev.c
diff --git
a/daemon/blockdev.c
b/daemon/blockdev.c
index
1b0185a
..
1afb4b8
100644
(file)
--- a/
daemon/blockdev.c
+++ b/
daemon/blockdev.c
@@
-1,5
+1,5
@@
/* libguestfs - the guestfsd daemon
/* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009 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
@@
-32,13
+32,13
@@
* we centralize it in one call.
*/
static int64_t
* we centralize it in one call.
*/
static int64_t
-call_blockdev (c
har *device,
char *switc, int extraarg, int prints)
+call_blockdev (c
onst char *device, const
char *switc, int extraarg, int prints)
{
int r;
int64_t rv;
char *out, *err;
const char *argv[] = {
{
int r;
int64_t rv;
char *out, *err;
const char *argv[] = {
- "
/sbin/
blockdev",
+ "blockdev",
switc,
NULL,
NULL,
switc,
NULL,
NULL,
@@
-46,8
+46,6
@@
call_blockdev (char *device, char *switc, int extraarg, int prints)
};
char buf[64];
};
char buf[64];
- IS_DEVICE (device, -1);
-
if (extraarg > 0) {
snprintf (buf, sizeof buf, "%d", extraarg);
argv[2] = buf;
if (extraarg > 0) {
snprintf (buf, sizeof buf, "%d", extraarg);
argv[2] = buf;
@@
-70,75
+68,77
@@
call_blockdev (char *device, char *switc, int extraarg, int prints)
if (sscanf (out, "%" SCNi64, &rv) != 1) {
reply_with_error ("%s: expected output, but got nothing", argv[0]);
free (out);
if (sscanf (out, "%" SCNi64, &rv) != 1) {
reply_with_error ("%s: expected output, but got nothing", argv[0]);
free (out);
+ free (err);
return -1;
}
}
free (out);
return -1;
}
}
free (out);
+ free (err);
return rv;
}
int
return rv;
}
int
-do_blockdev_setro (char *device)
+do_blockdev_setro (c
onst c
har *device)
{
return (int) call_blockdev (device, "--setro", 0, 0);
}
int
{
return (int) call_blockdev (device, "--setro", 0, 0);
}
int
-do_blockdev_setrw (char *device)
+do_blockdev_setrw (c
onst c
har *device)
{
return (int) call_blockdev (device, "--setrw", 0, 0);
}
int
{
return (int) call_blockdev (device, "--setrw", 0, 0);
}
int
-do_blockdev_getro (char *device)
+do_blockdev_getro (c
onst c
har *device)
{
return (int) call_blockdev (device, "--getro", 0, 1);
}
int
{
return (int) call_blockdev (device, "--getro", 0, 1);
}
int
-do_blockdev_getss (char *device)
+do_blockdev_getss (c
onst c
har *device)
{
return (int) call_blockdev (device, "--getss", 0, 1);
}
int
{
return (int) call_blockdev (device, "--getss", 0, 1);
}
int
-do_blockdev_getbsz (char *device)
+do_blockdev_getbsz (c
onst c
har *device)
{
return (int) call_blockdev (device, "--getbsz", 0, 1);
}
int
{
return (int) call_blockdev (device, "--getbsz", 0, 1);
}
int
-do_blockdev_setbsz (char *device, int blocksize)
+do_blockdev_setbsz (c
onst c
har *device, int blocksize)
{
if (blocksize <= 0 /* || blocksize >= what? */) {
{
if (blocksize <= 0 /* || blocksize >= what? */) {
- reply_with_error ("block
dev_setbsz: block
size must be > 0");
+ reply_with_error ("blocksize must be > 0");
return -1;
}
return (int) call_blockdev (device, "--setbsz", blocksize, 0);
}
int64_t
return -1;
}
return (int) call_blockdev (device, "--setbsz", blocksize, 0);
}
int64_t
-do_blockdev_getsz (char *device)
+do_blockdev_getsz (c
onst c
har *device)
{
return call_blockdev (device, "--getsz", 0, 1);
}
int64_t
{
return call_blockdev (device, "--getsz", 0, 1);
}
int64_t
-do_blockdev_getsize64 (char *device)
+do_blockdev_getsize64 (c
onst c
har *device)
{
return call_blockdev (device, "--getsize64", 0, 1);
}
int
{
return call_blockdev (device, "--getsize64", 0, 1);
}
int
-do_blockdev_flushbufs (char *device)
+do_blockdev_flushbufs (c
onst c
har *device)
{
return call_blockdev (device, "--flushbufs", 0, 0);
}
int
{
return call_blockdev (device, "--flushbufs", 0, 0);
}
int
-do_blockdev_rereadpt (char *device)
+do_blockdev_rereadpt (c
onst c
har *device)
{
return call_blockdev (device, "--rereadpt", 0, 0);
}
{
return call_blockdev (device, "--rereadpt", 0, 0);
}