diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-11-28 13:19:30 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-11-28 13:19:30 -0600 |
| commit | 264ac41ca171c53eead7e037bc78babb3f0f1bc3 (patch) | |
| tree | 13c45eaec41265317b1ad159aa2394c4b21c8f77 | |
| parent | e6451fd372bbac8123414a88ed6d3296b66d4b5d (diff) | |
| parent | f3313d23a061648c99609a4c127ed13c820f831d (diff) | |
| download | focaccia-qemu-264ac41ca171c53eead7e037bc78babb3f0f1bc3.tar.gz focaccia-qemu-264ac41ca171c53eead7e037bc78babb3f0f1bc3.zip | |
Merge remote-tracking branch 'bonzini/nbd-next' into staging
* bonzini/nbd-next: nbd-server-add: Fix the default for 'writable' nbd: fix use of two uninitialized bytes when connecting to a named export Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
| -rw-r--r-- | blockdev-nbd.c | 2 | ||||
| -rw-r--r-- | nbd.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/blockdev-nbd.c b/blockdev-nbd.c index d1721a3e26..6b26bbf8c5 100644 --- a/blockdev-nbd.c +++ b/blockdev-nbd.c @@ -99,7 +99,7 @@ void qmp_nbd_server_add(const char *device, bool has_writable, bool writable, } if (!has_writable) { - writable = true; + writable = false; } if (bdrv_is_read_only(bs)) { writable = false; diff --git a/nbd.c b/nbd.c index 97a5914e0f..01976e8e33 100644 --- a/nbd.c +++ b/nbd.c @@ -397,6 +397,7 @@ static int nbd_send_negotiate(NBDClient *client) rc = -EINVAL; TRACE("Beginning negotiation."); + memset(buf, 0, sizeof(buf)); memcpy(buf, "NBDMAGIC", 8); if (client->exp) { assert ((client->exp->nbdflags & ~65535) == 0); @@ -406,7 +407,6 @@ static int nbd_send_negotiate(NBDClient *client) } else { cpu_to_be64w((uint64_t*)(buf + 8), NBD_OPTS_MAGIC); } - memset(buf + 28, 0, 124); if (client->exp) { if (write_sync(csock, buf, sizeof(buf)) != sizeof(buf)) { |