diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2013-02-08 14:06:14 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2013-02-22 21:29:44 +0100 |
| commit | 215e47b9ea2cd7926333b7dc683024aa00e0c386 (patch) | |
| tree | d1ae0848fbdfc0ef88ac9d87abc23171fde3d6cb /hw/ide/qdev.c | |
| parent | ded9d2d5e247dc4d141c01bc8dc99d6ec832f9e8 (diff) | |
| download | qemu-215e47b9ea2cd7926333b7dc683024aa00e0c386.zip qemu-215e47b9ea2cd7926333b7dc683024aa00e0c386.tar.gz qemu-215e47b9ea2cd7926333b7dc683024aa00e0c386.tar.bz2 | |
blockdev: enable discard by default
Because discard is now a host parameter, we can always fake it as enabled
in the guest. This is an extension of the current choice to ignore
"not supported" errors from the host when discard_granularity is set
to nonzero.
The default granularity is set to the logical block size or 4k, whichever
is largest, because cluster sizes below 4k are rarely used and 4K is a
typical block size for files.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'hw/ide/qdev.c')
| -rw-r--r-- | hw/ide/qdev.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c index c436b38..fd06da7 100644 --- a/hw/ide/qdev.c +++ b/hw/ide/qdev.c @@ -143,7 +143,10 @@ static int ide_dev_initfn(IDEDevice *dev, IDEDriveKind kind) IDEBus *bus = DO_UPCAST(IDEBus, qbus, dev->qdev.parent_bus); IDEState *s = bus->ifs + dev->unit; - if (dev->conf.discard_granularity && dev->conf.discard_granularity != 512) { + if (dev->conf.discard_granularity == -1) { + dev->conf.discard_granularity = 512; + } else if (dev->conf.discard_granularity && + dev->conf.discard_granularity != 512) { error_report("discard_granularity must be 512 for ide"); return -1; } |