* GNU General Public License for more details.
*
* 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include <qemu-common.h>
#include <netinet/tcp.h>
#include <arpa/inet.h>
#include <signal.h>
+#include <libgen.h>
#define SOCKET_PATH "/var/lock/qemu-nbd-%s"
uint8_t data[512];
int i;
int ext_partnum = 4;
+ int ret;
- if (bdrv_read(bs, 0, data, 1))
- errx(EINVAL, "error while reading");
+ if ((ret = bdrv_read(bs, 0, data, 1)) < 0) {
+ errno = -ret;
+ err(EXIT_FAILURE, "error while reading");
+ }
if (data[510] != 0x55 || data[511] != 0xaa) {
errno = -EINVAL;
uint8_t data1[512];
int j;
- if (bdrv_read(bs, mbr[i].start_sector_abs, data1, 1))
- errx(EINVAL, "error while reading");
+ if ((ret = bdrv_read(bs, mbr[i].start_sector_abs, data1, 1)) < 0) {
+ errno = -ret;
+ err(EXIT_FAILURE, "error while reading");
+ }
for (j = 0; j < 4; j++) {
read_partition(&data1[446 + 16 * j], &ext[j]);
char sockpath[128];
const char *sopt = "hVb:o:p:rsnP:c:dvk:e:t";
struct option lopt[] = {
- { "help", 0, 0, 'h' },
- { "version", 0, 0, 'V' },
- { "bind", 1, 0, 'b' },
- { "port", 1, 0, 'p' },
- { "socket", 1, 0, 'k' },
- { "offset", 1, 0, 'o' },
- { "read-only", 0, 0, 'r' },
- { "partition", 1, 0, 'P' },
- { "connect", 1, 0, 'c' },
- { "disconnect", 0, 0, 'd' },
- { "snapshot", 0, 0, 's' },
- { "nocache", 0, 0, 'n' },
- { "shared", 1, 0, 'e' },
- { "persistent", 0, 0, 't' },
- { "verbose", 0, 0, 'v' },
- { NULL, 0, 0, 0 }
+ { "help", 0, NULL, 'h' },
+ { "version", 0, NULL, 'V' },
+ { "bind", 1, NULL, 'b' },
+ { "port", 1, NULL, 'p' },
+ { "socket", 1, NULL, 'k' },
+ { "offset", 1, NULL, 'o' },
+ { "read-only", 0, NULL, 'r' },
+ { "partition", 1, NULL, 'P' },
+ { "connect", 1, NULL, 'c' },
+ { "disconnect", 0, NULL, 'd' },
+ { "snapshot", 0, NULL, 's' },
+ { "nocache", 0, NULL, 'n' },
+ { "shared", 1, NULL, 'e' },
+ { "persistent", 0, NULL, 't' },
+ { "verbose", 0, NULL, 'v' },
+ { NULL, 0, NULL, 0 }
};
int ch;
int opt_ind = 0;
int li;
char *end;
- int flags = 0;
+ int flags = BDRV_O_RDWR;
int partition = -1;
int ret;
int shared = 1;
int nb_fds = 0;
int max_fd;
int persistent = 0;
+ uint32_t nbdflags;
while ((ch = getopt_long(argc, argv, sopt, lopt, &opt_ind)) != -1) {
switch (ch) {
case 'p':
li = strtol(optarg, &end, 0);
if (*end) {
- errx(EINVAL, "Invalid port `%s'", optarg);
+ errx(EXIT_FAILURE, "Invalid port `%s'", optarg);
}
if (li < 1 || li > 65535) {
- errx(EINVAL, "Port out of range `%s'", optarg);
+ errx(EXIT_FAILURE, "Port out of range `%s'", optarg);
}
port = (uint16_t)li;
break;
case 'o':
dev_offset = strtoll (optarg, &end, 0);
if (*end) {
- errx(EINVAL, "Invalid offset `%s'", optarg);
+ errx(EXIT_FAILURE, "Invalid offset `%s'", optarg);
}
if (dev_offset < 0) {
- errx(EINVAL, "Offset must be positive `%s'", optarg);
+ errx(EXIT_FAILURE, "Offset must be positive `%s'", optarg);
}
break;
case 'r':
readonly = true;
+ flags &= ~BDRV_O_RDWR;
break;
case 'P':
partition = strtol(optarg, &end, 0);
if (*end)
- errx(EINVAL, "Invalid partition `%s'", optarg);
+ errx(EXIT_FAILURE, "Invalid partition `%s'", optarg);
if (partition < 1 || partition > 8)
- errx(EINVAL, "Invalid partition %d", partition);
+ errx(EXIT_FAILURE, "Invalid partition %d", partition);
break;
case 'k':
socket = optarg;
if (socket[0] != '/')
- errx(EINVAL, "socket path must be absolute\n");
+ errx(EXIT_FAILURE, "socket path must be absolute\n");
break;
case 'd':
disconnect = true;
case 'e':
shared = strtol(optarg, &end, 0);
if (*end) {
- errx(EINVAL, "Invalid shared device number '%s'", optarg);
+ errx(EXIT_FAILURE, "Invalid shared device number '%s'", optarg);
}
if (shared < 1) {
- errx(EINVAL, "Shared device number must be greater than 0\n");
+ errx(EXIT_FAILURE, "Shared device number must be greater than 0\n");
}
break;
case 't':
exit(0);
break;
case '?':
- errx(EINVAL, "Try `%s --help' for more information.",
+ errx(EXIT_FAILURE, "Try `%s --help' for more information.",
argv[0]);
}
}
if ((argc - optind) != 1) {
- errx(EINVAL, "Invalid number of argument.\n"
+ errx(EXIT_FAILURE, "Invalid number of argument.\n"
"Try `%s --help' for more information.",
argv[0]);
}
if (disconnect) {
fd = open(argv[optind], O_RDWR);
if (fd == -1)
- errx(errno, "Cannot open %s", argv[optind]);
+ err(EXIT_FAILURE, "Cannot open %s", argv[optind]);
nbd_disconnect(fd);
if (bs == NULL)
return 1;
- if (bdrv_open(bs, argv[optind], flags) == -1)
- return 1;
+ if ((ret = bdrv_open(bs, argv[optind], flags, NULL)) < 0) {
+ errno = -ret;
+ err(EXIT_FAILURE, "Failed to bdrv_open '%s'", argv[optind]);
+ }
fd_size = bs->total_sectors * 512;
if (partition != -1 &&
find_partition(bs, partition, &dev_offset, &fd_size))
- errx(errno, "Could not find partition %d", partition);
+ err(EXIT_FAILURE, "Could not find partition %d", partition);
if (device) {
pid_t pid;
int sock;
- if (!verbose)
- daemon(0, 0); /* detach client and server */
+ /* want to fail before daemonizing */
+ if (access(device, R_OK|W_OK) == -1) {
+ err(EXIT_FAILURE, "Could not access '%s'", device);
+ }
+
+ if (!verbose) {
+ /* detach client and server */
+ if (daemon(0, 0) == -1) {
+ err(EXIT_FAILURE, "Failed to daemonize");
+ }
+ }
if (socket == NULL) {
- sprintf(sockpath, SOCKET_PATH, basename(device));
+ snprintf(sockpath, sizeof(sockpath), SOCKET_PATH,
+ basename(device));
socket = sockpath;
}
do {
sock = unix_socket_outgoing(socket);
if (sock == -1) {
- if (errno != ENOENT && errno != ECONNREFUSED)
+ if (errno != ENOENT && errno != ECONNREFUSED) {
+ ret = 1;
goto out;
+ }
sleep(1); /* wait children */
}
} while (sock == -1);
goto out;
}
- ret = nbd_receive_negotiate(sock, &size, &blocksize);
+ ret = nbd_receive_negotiate(sock, NULL, &nbdflags,
+ &size, &blocksize);
if (ret == -1) {
ret = 1;
goto out;
show_parts(device);
- nbd_client(fd, sock);
+ ret = nbd_client(fd);
+ if (ret) {
+ ret = 1;
+ }
close(fd);
out:
kill(pid, SIGTERM);
data = qemu_memalign(512, NBD_BUFFER_SIZE);
if (data == NULL)
- errx(ENOMEM, "Cannot allocate data buffer");
+ errx(EXIT_FAILURE, "Cannot allocate data buffer");
do {
}
}
} while (persistent || nb_fds > 1);
- qemu_free(data);
+ qemu_vfree(data);
close(sharing_fds[0]);
bdrv_close(bs);
projects / qemu.git / blobdiff