From 38ceff0412621a35fa618fb46cd7f0f6ff037c13 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Mon, 12 Mar 2012 16:17:27 +0100 Subject: nbd: do not include block_int.h Signed-off-by: Paolo Bonzini --- nbd.c | 3 +-- qemu-nbd.c | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/nbd.c b/nbd.c index 4c6d7f1..d4dafc6 100644 --- a/nbd.c +++ b/nbd.c @@ -18,7 +18,6 @@ #include "nbd.h" #include "block.h" -#include "block_int.h" #include "qemu-coroutine.h" @@ -703,7 +702,7 @@ NBDExport *nbd_export_new(BlockDriverState *bs, off_t dev_offset, exp->bs = bs; exp->dev_offset = dev_offset; exp->nbdflags = nbdflags; - exp->size = size == -1 ? exp->bs->total_sectors * 512 : size; + exp->size = size == -1 ? bdrv_getlength(bs) : size; return exp; } diff --git a/qemu-nbd.c b/qemu-nbd.c index 6c3f9b5..5a0300e 100644 --- a/qemu-nbd.c +++ b/qemu-nbd.c @@ -17,7 +17,7 @@ */ #include "qemu-common.h" -#include "block_int.h" +#include "block.h" #include "nbd.h" #include @@ -487,7 +487,7 @@ int main(int argc, char **argv) err(EXIT_FAILURE, "Failed to bdrv_open '%s'", argv[optind]); } - fd_size = bs->total_sectors * 512; + fd_size = bdrv_getlength(bs); if (partition != -1) { ret = find_partition(bs, partition, &dev_offset, &fd_size); -- cgit v1.1