scsi: do not call send_command directly

[qemu.git] / qemu-io.c

diff --git a/qemu-io.c b/qemu-io.c
index 65dee13731365fab711446c5e0bc64c83e077bc4..4470e49bc88481ebd304df558b716b2893752d82 100644 (file)
--- a/qemu-io.c
+++ b/qemu-io.c
@@ -1131,8 +1131,10 @@ aio_read_f(int argc, char **argv)
                case 'P':
                        ctx->Pflag = 1;
                        ctx->pattern = parse_pattern(optarg);
-                       if (ctx->pattern < 0)
+                       if (ctx->pattern < 0) {
+                                free(ctx);
                                return 0;
+                        }
                        break;
                case 'q':
                        ctx->qflag = 1;
@@ -1463,7 +1465,7 @@ discard_f(int argc, char **argv)
        }
 
        gettimeofday(&t1, NULL);
-       ret = bdrv_discard(bs, offset, count);
+       ret = bdrv_discard(bs, offset >> BDRV_SECTOR_BITS, count >> BDRV_SECTOR_BITS);
        gettimeofday(&t2, NULL);
 
        if (ret < 0) {