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 | aab2e8f79ad253c760787ff3ce4d64967fed0003 (patch) | |
tree | bc837d155b4d558b71ad196c561f9e71c10136d0 /qemu-nbd.c | |
parent | dccbe6fbab47c9a2589f436e0592933b47cbe40b (diff) | |
parent | 7ec5e6a4ca43494949465f9f9f3d9e4c7c620503 (diff) | |
download | hqemu-aab2e8f79ad253c760787ff3ce4d64967fed0003.zip hqemu-aab2e8f79ad253c760787ff3ce4d64967fed0003.tar.gz |
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
@@ -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; |