diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2010-09-08 14:26:57 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-09-08 14:26:57 -0500 |
| commit | a380f85ac9b71927e7c6187a284156822621b232 (patch) | |
| tree | bc837d155b4d558b71ad196c561f9e71c10136d0 /qemu-nbd.c | |
| parent | d56c99bb200cf29e95124694e0713de16c303845 (diff) | |
| parent | af8f6daa1e086399a1ad2fe93b923a7a272b8e77 (diff) | |
| download | qemu-a380f85ac9b71927e7c6187a284156822621b232.tar.gz qemu-a380f85ac9b71927e7c6187a284156822621b232.tar.bz2 qemu-a380f85ac9b71927e7c6187a284156822621b232.zip | |
Merge remote branch 'kwolf/for-anthony' into staging
Diffstat (limited to 'qemu-nbd.c')
| -rw-r--r-- | qemu-nbd.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/qemu-nbd.c b/qemu-nbd.c index 67ce50b62b..91b569f8e6 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -230,6 +230,7 @@ int main(int argc, char **argv) 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) { @@ -398,7 +399,8 @@ int main(int argc, char **argv) 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; |