@@ -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) * 512 : size;
return exp;
}
@@ -17,7 +17,7 @@
*/
#include "qemu-common.h"
-#include "block_int.h"
+#include "block.h"
#include "nbd.h"
#include <stdarg.h>
@@ -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) * 512;
if (partition != -1) {
ret = find_partition(bs, partition, &dev_offset, &fd_size);
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- nbd.c | 3 +-- qemu-nbd.c | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-)