/* 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
*
* 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <config.h>
int64_t rv;
char *out, *err;
const char *argv[] = {
- "/sbin/blockdev",
+ "blockdev",
switc,
NULL,
NULL,
};
char buf[64];
- IS_DEVICE (device, -1);
-
if (extraarg > 0) {
snprintf (buf, sizeof buf, "%d", extraarg);
argv[2] = buf;
if (prints) {
if (sscanf (out, "%" SCNi64, &rv) != 1) {
- reply_with_error ("%s: expected output, but got nothing");
+ reply_with_error ("%s: expected output, but got nothing", argv[0]);
free (out);
+ free (err);
return -1;
}
}
free (out);
+ free (err);
return rv;
}
do_blockdev_setbsz (const char *device, int blocksize)
{
if (blocksize <= 0 /* || blocksize >= what? */) {
- reply_with_error ("blockdev_setbsz: blocksize must be > 0");
+ reply_with_error ("blocksize must be > 0");
return -1;
}
return (int) call_blockdev (device, "--setbsz", blocksize, 0);