OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

block/ssh: Propagate errors through connect_to_ssh() 

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Markus Armbruster 2014-05-16 11:00:15 +02:00 committed by Stefan Hajnoczi
parent 4618e658e6
commit 5f0c39e598
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
block/ssh.c
View File

@ -506,10 +506,9 @@ static int authenticate(BDRVSSHState *s, const char *user, Error **errp)
} }
static int connect_to_ssh(BDRVSSHState *s, QDict *options, static int connect_to_ssh(BDRVSSHState *s, QDict *options,
int ssh_flags, int creat_mode) int ssh_flags, int creat_mode, Error **errp)
{ {
int r, ret; int r, ret;
Error *err = NULL;
const char *host, *user, *path, *host_key_check; const char *host, *user, *path, *host_key_check;
int port; int port;
@ -528,6 +527,7 @@ static int connect_to_ssh(BDRVSSHState *s, QDict *options,
} else { } else {
user = g_get_user_name(); user = g_get_user_name();
if (!user) { if (!user) {
error_setg_errno(errp, errno, "Can't get user name");
ret = -errno; ret = -errno;
goto err; goto err;
} }
@ -544,11 +544,9 @@ static int connect_to_ssh(BDRVSSHState *s, QDict *options,
s->hostport = g_strdup_printf("%s:%d", host, port); s->hostport = g_strdup_printf("%s:%d", host, port);
/* Open the socket and connect. */ /* Open the socket and connect. */
s->sock = inet_connect(s->hostport, &err); s->sock = inet_connect(s->hostport, errp);
if (err != NULL) { if (s->sock < 0) {
ret = -errno; ret = -errno;
qerror_report_err(err);
error_free(err);
goto err; goto err;
} }
@ -556,7 +554,7 @@ static int connect_to_ssh(BDRVSSHState *s, QDict *options,
s->session = libssh2_session_init(); s->session = libssh2_session_init();
if (!s->session) { if (!s->session) {
ret = -EINVAL; ret = -EINVAL;
session_error_report(s, "failed to initialize libssh2 session"); session_error_setg(errp, s, "failed to initialize libssh2 session");
goto err; goto err;
} }
@ -567,30 +565,26 @@ static int connect_to_ssh(BDRVSSHState *s, QDict *options,
r = libssh2_session_handshake(s->session, s->sock); r = libssh2_session_handshake(s->session, s->sock);
if (r != 0) { if (r != 0) {
ret = -EINVAL; ret = -EINVAL;
session_error_report(s, "failed to establish SSH session"); session_error_setg(errp, s, "failed to establish SSH session");
goto err; goto err;
} }
/* Check the remote host's key against known_hosts. */ /* Check the remote host's key against known_hosts. */
ret = check_host_key(s, host, port, host_key_check, &err); ret = check_host_key(s, host, port, host_key_check, errp);
if (ret < 0) { if (ret < 0) {
qerror_report_err(err);
error_free(err);
goto err; goto err;
} }
/* Authenticate. */ /* Authenticate. */
ret = authenticate(s, user, &err); ret = authenticate(s, user, errp);
if (ret < 0) { if (ret < 0) {
qerror_report_err(err);
error_free(err);
goto err; goto err;
} }
/* Start SFTP. */ /* Start SFTP. */
s->sftp = libssh2_sftp_init(s->session); s->sftp = libssh2_sftp_init(s->session);
if (!s->sftp) { if (!s->sftp) {
session_error_report(s, "failed to initialize sftp handle"); session_error_setg(errp, s, "failed to initialize sftp handle");
ret = -EINVAL; ret = -EINVAL;
goto err; goto err;
} }
@ -645,6 +639,7 @@ static int connect_to_ssh(BDRVSSHState *s, QDict *options,
static int ssh_file_open(BlockDriverState *bs, QDict *options, int bdrv_flags, static int ssh_file_open(BlockDriverState *bs, QDict *options, int bdrv_flags,
Error **errp) Error **errp)
{ {
Error *local_err = NULL;
BDRVSSHState *s = bs->opaque; BDRVSSHState *s = bs->opaque;
int ret; int ret;
int ssh_flags; int ssh_flags;
@ -657,8 +652,10 @@ static int ssh_file_open(BlockDriverState *bs, QDict *options, int bdrv_flags,
} }
/* Start up SSH. */ /* Start up SSH. */
ret = connect_to_ssh(s, options, ssh_flags, 0); ret = connect_to_ssh(s, options, ssh_flags, 0, &local_err);
if (ret < 0) { if (ret < 0) {
qerror_report_err(local_err);
error_free(local_err);
goto err; goto err;
} }
@ -718,8 +715,11 @@ static int ssh_create(const char *filename, QEMUOptionParameter *options,
r = connect_to_ssh(&s, uri_options, r = connect_to_ssh(&s, uri_options,
LIBSSH2_FXF_READ|LIBSSH2_FXF_WRITE| LIBSSH2_FXF_READ|LIBSSH2_FXF_WRITE|
LIBSSH2_FXF_CREAT|LIBSSH2_FXF_TRUNC, 0644); LIBSSH2_FXF_CREAT|LIBSSH2_FXF_TRUNC,
0644, &local_err);
if (r < 0) { if (r < 0) {
qerror_report_err(local_err);
error_free(local_err);
ret = r; ret = r;
goto out; goto out;
} }