diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2016-11-14 15:42:22 +0000 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2016-11-14 15:42:23 +0000 |
| commit | a77beb0fcbf419aa1e8e32b7df3609664f74c928 (patch) | |
| tree | 79de90ce98315d2338f1b57254195c10277f1966 /block/ssh.c | |
| parent | 736986fad31cd0f25cec89138a566f6938935a29 (diff) | |
| parent | ff569b9424d1e6c7144dbe7d76ea50f5c11d4a1c (diff) | |
Merge remote-tracking branch 'kwolf/tags/for-upstream' into staging
Block layer patches for 2.8.0-rc0
# gpg: Signature made Fri 11 Nov 2016 03:46:12 PM GMT
# gpg: using RSA key 0x7F09B272C88F2FD6
# gpg: Good signature from "Kevin Wolf <kwolf@redhat.com>"
# Primary key fingerprint: DC3D EB15 9A9A F95D 3D74 56FE 7F09 B272 C88F 2FD6
* kwolf/tags/for-upstream:
raw-posix: Rename 'raw_s' to 'rs'
iotests: Always use -machine accel=qtest
iotests: Skip test 162 if there is no SSH support
block: Emit modules in bdrv_iterate_format()
block: Fix bdrv_iterate_format() sorting
nfs: Fix memory leak in nfs_file_create()
qcow2: Remove stale FIXME comment
raw_bsd: don't check size alignment when only offset is set
raw_bsd: move check to prevent overflow
hmp: Make block_stream set an explicit job ID
block/ssh: Code cleanup for unused parameter
block/nbd: Fix the leaked visitor
Message-id: 1478883311-24052-1-git-send-email-kwolf@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'block/ssh.c')
| -rw-r--r-- | block/ssh.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/block/ssh.c b/block/ssh.c index ca071c569c..15ed2818c5 100644 --- a/block/ssh.c +++ b/block/ssh.c @@ -582,8 +582,7 @@ static bool ssh_process_legacy_socket_options(QDict *output_opts, return true; } -static InetSocketAddress *ssh_config(BDRVSSHState *s, QDict *options, - Error **errp) +static InetSocketAddress *ssh_config(QDict *options, Error **errp) { InetSocketAddress *inet = NULL; QDict *addr = NULL; @@ -661,7 +660,7 @@ static int connect_to_ssh(BDRVSSHState *s, QDict *options, } /* Pop the config into our state object, Exit if invalid */ - s->inet = ssh_config(s, options, errp); + s->inet = ssh_config(options, errp); if (!s->inet) { ret = -EINVAL; goto err; |