summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorMax Reitz <mreitz@redhat.com>2015-02-25 13:08:25 -0500
committerPaolo Bonzini <pbonzini@redhat.com>2015-03-18 12:07:01 +0100
commit3f4726596dafd2e27485e51f4cc4a2363f48d4a3 (patch)
tree5e4ca6984fa89f47467cd38b93fa6398a735f747 /block
parentac97393dc7c4761af6104fb8fca5f600899f687b (diff)
downloadhqemu-3f4726596dafd2e27485e51f4cc4a2363f48d4a3.zip
hqemu-3f4726596dafd2e27485e51f4cc4a2363f48d4a3.tar.gz
nbd: Set block size to BDRV_SECTOR_SIZE
Signed-off-by: Max Reitz <mreitz@redhat.com> Message-Id: <1424887718-10800-13-git-send-email-mreitz@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'block')
-rw-r--r--block/nbd-client.c3
-rw-r--r--block/nbd-client.h1
2 files changed, 1 insertions, 3 deletions
diff --git a/block/nbd-client.c b/block/nbd-client.c
index 259f5a3..e1bb919 100644
--- a/block/nbd-client.c
+++ b/block/nbd-client.c
@@ -386,8 +386,7 @@ int nbd_client_init(BlockDriverState *bs, int sock, const char *export,
logout("session init %s\n", export);
qemu_set_block(sock);
ret = nbd_receive_negotiate(sock, export,
- &client->nbdflags, &client->size,
- &client->blocksize, errp);
+ &client->nbdflags, &client->size, errp);
if (ret < 0) {
logout("Failed to negotiate with the NBD server\n");
closesocket(sock);
diff --git a/block/nbd-client.h b/block/nbd-client.h
index fa4ff42..e841340 100644
--- a/block/nbd-client.h
+++ b/block/nbd-client.h
@@ -20,7 +20,6 @@ typedef struct NbdClientSession {
int sock;
uint32_t nbdflags;
off_t size;
- size_t blocksize;
CoMutex send_mutex;
CoMutex free_sema;
OpenPOWER on IntegriCloud