From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [RFC PATCH 12/17] ide/scsi: turn on discard
Date: Thu, 8 Mar 2012 18:15:12 +0100 [thread overview]
Message-ID: <1331226917-6658-13-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1331226917-6658-1-git-send-email-pbonzini@redhat.com>
Turn on discard support in the device models by default, with
compatibility properties for older machine types.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
block.h | 4 +-
hw/pc_piix.c | 224 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 226 insertions(+), 2 deletions(-)
diff --git a/block.h b/block.h
index aa224d3..1a8fd2d 100644
--- a/block.h
+++ b/block.h
@@ -449,9 +449,9 @@ static inline unsigned int get_physical_block_exp(BlockConf *conf)
DEFINE_PROP_UINT32("opt_io_size", _state, _conf.opt_io_size, 0), \
DEFINE_PROP_INT32("bootindex", _state, _conf.bootindex, -1), \
DEFINE_PROP_BIT("discard_zeroes_data", _state, \
- _conf.discard_zeroes_data, 0, false), \
+ _conf.discard_zeroes_data, 0, true), \
DEFINE_PROP_INT32("discard_granularity", _state, \
- _conf.discard_granularity, 0)
+ _conf.discard_granularity, -1)
#endif
diff --git a/hw/pc_piix.c b/hw/pc_piix.c
index 6c5c40f..0356424 100644
--- a/hw/pc_piix.c
+++ b/hw/pc_piix.c
@@ -381,6 +381,38 @@ static QEMUMachine pc_machine_v1_0 = {
.max_cpus = 255,
.compat_props = (GlobalProperty[]) {
{
+ .driver = "ide-drive",
+ .property = "discard_granularity",
+ .value = stringify(0),
+ }, {
+ .driver = "ide-drive",
+ .property = "discard_zeroes_data",
+ .value = "off",
+ }, {
+ .driver = "ide-hd",
+ .property = "discard_granularity",
+ .value = stringify(0),
+ }, {
+ .driver = "ide-hd",
+ .property = "discard_zeroes_data",
+ .value = "off",
+ }, {
+ .driver = "scsi-disk",
+ .property = "discard_granularity",
+ .value = stringify(0),
+ }, {
+ .driver = "scsi-disk",
+ .property = "discard_zeroes_data",
+ .value = "off",
+ }, {
+ .driver = "scsi-hd",
+ .property = "discard_granularity",
+ .value = stringify(0),
+ }, {
+ .driver = "scsi-hd",
+ .property = "discard_zeroes_data",
+ .value = "off",
+ }, {
.driver = "pc-sysfw",
.property = "rom_only",
.value = stringify(1),
@@ -400,6 +432,38 @@ static QEMUMachine pc_machine_v0_15 = {
.max_cpus = 255,
.compat_props = (GlobalProperty[]) {
{
+ .driver = "ide-drive",
+ .property = "discard_granularity",
+ .value = stringify(0),
+ }, {
+ .driver = "ide-drive",
+ .property = "discard_zeroes_data",
+ .value = "off",
+ }, {
+ .driver = "ide-hd",
+ .property = "discard_granularity",
+ .value = stringify(0),
+ }, {
+ .driver = "ide-hd",
+ .property = "discard_zeroes_data",
+ .value = "off",
+ }, {
+ .driver = "scsi-disk",
+ .property = "discard_granularity",
+ .value = stringify(0),
+ }, {
+ .driver = "scsi-disk",
+ .property = "discard_zeroes_data",
+ .value = "off",
+ }, {
+ .driver = "scsi-hd",
+ .property = "discard_granularity",
+ .value = stringify(0),
+ }, {
+ .driver = "scsi-hd",
+ .property = "discard_zeroes_data",
+ .value = "off",
+ }, {
.driver = "pc-sysfw",
.property = "rom_only",
.value = stringify(1),
@@ -419,6 +483,38 @@ static QEMUMachine pc_machine_v0_14 = {
.max_cpus = 255,
.compat_props = (GlobalProperty[]) {
{
+ .driver = "ide-drive",
+ .property = "discard_granularity",
+ .value = stringify(0),
+ }, {
+ .driver = "ide-drive",
+ .property = "discard_zeroes_data",
+ .value = "off",
+ }, {
+ .driver = "ide-hd",
+ .property = "discard_granularity",
+ .value = stringify(0),
+ }, {
+ .driver = "ide-hd",
+ .property = "discard_zeroes_data",
+ .value = "off",
+ }, {
+ .driver = "scsi-disk",
+ .property = "discard_granularity",
+ .value = stringify(0),
+ }, {
+ .driver = "scsi-disk",
+ .property = "discard_zeroes_data",
+ .value = "off",
+ }, {
+ .driver = "scsi-hd",
+ .property = "discard_granularity",
+ .value = stringify(0),
+ }, {
+ .driver = "scsi-hd",
+ .property = "discard_zeroes_data",
+ .value = "off",
+ }, {
.driver = "qxl",
.property = "revision",
.value = stringify(2),
@@ -463,6 +559,38 @@ static QEMUMachine pc_machine_v0_13 = {
.max_cpus = 255,
.compat_props = (GlobalProperty[]) {
{
+ .driver = "ide-drive",
+ .property = "discard_granularity",
+ .value = stringify(0),
+ }, {
+ .driver = "ide-drive",
+ .property = "discard_zeroes_data",
+ .value = "off",
+ }, {
+ .driver = "ide-hd",
+ .property = "discard_granularity",
+ .value = stringify(0),
+ }, {
+ .driver = "ide-hd",
+ .property = "discard_zeroes_data",
+ .value = "off",
+ }, {
+ .driver = "scsi-disk",
+ .property = "discard_granularity",
+ .value = stringify(0),
+ }, {
+ .driver = "scsi-disk",
+ .property = "discard_zeroes_data",
+ .value = "off",
+ }, {
+ .driver = "scsi-hd",
+ .property = "discard_granularity",
+ .value = stringify(0),
+ }, {
+ .driver = "scsi-hd",
+ .property = "discard_zeroes_data",
+ .value = "off",
+ }, {
.driver = "virtio-9p-pci",
.property = "vectors",
.value = stringify(0),
@@ -519,6 +647,38 @@ static QEMUMachine pc_machine_v0_12 = {
.max_cpus = 255,
.compat_props = (GlobalProperty[]) {
{
+ .driver = "ide-drive",
+ .property = "discard_granularity",
+ .value = stringify(0),
+ }, {
+ .driver = "ide-drive",
+ .property = "discard_zeroes_data",
+ .value = "off",
+ }, {
+ .driver = "ide-hd",
+ .property = "discard_granularity",
+ .value = stringify(0),
+ }, {
+ .driver = "ide-hd",
+ .property = "discard_zeroes_data",
+ .value = "off",
+ }, {
+ .driver = "scsi-disk",
+ .property = "discard_granularity",
+ .value = stringify(0),
+ }, {
+ .driver = "scsi-disk",
+ .property = "discard_zeroes_data",
+ .value = "off",
+ }, {
+ .driver = "scsi-hd",
+ .property = "discard_granularity",
+ .value = stringify(0),
+ }, {
+ .driver = "scsi-hd",
+ .property = "discard_zeroes_data",
+ .value = "off",
+ }, {
.driver = "virtio-serial-pci",
.property = "max_ports",
.value = stringify(1),
@@ -579,6 +739,38 @@ static QEMUMachine pc_machine_v0_11 = {
.max_cpus = 255,
.compat_props = (GlobalProperty[]) {
{
+ .driver = "ide-drive",
+ .property = "discard_granularity",
+ .value = stringify(0),
+ }, {
+ .driver = "ide-drive",
+ .property = "discard_zeroes_data",
+ .value = "off",
+ }, {
+ .driver = "ide-hd",
+ .property = "discard_granularity",
+ .value = stringify(0),
+ }, {
+ .driver = "ide-hd",
+ .property = "discard_zeroes_data",
+ .value = "off",
+ }, {
+ .driver = "scsi-disk",
+ .property = "discard_granularity",
+ .value = stringify(0),
+ }, {
+ .driver = "scsi-disk",
+ .property = "discard_zeroes_data",
+ .value = "off",
+ }, {
+ .driver = "scsi-hd",
+ .property = "discard_granularity",
+ .value = stringify(0),
+ }, {
+ .driver = "scsi-hd",
+ .property = "discard_zeroes_data",
+ .value = "off",
+ }, {
.driver = "virtio-blk-pci",
.property = "vectors",
.value = stringify(0),
@@ -647,6 +839,38 @@ static QEMUMachine pc_machine_v0_10 = {
.max_cpus = 255,
.compat_props = (GlobalProperty[]) {
{
+ .driver = "ide-drive",
+ .property = "discard_granularity",
+ .value = stringify(0),
+ }, {
+ .driver = "ide-drive",
+ .property = "discard_zeroes_data",
+ .value = "off",
+ }, {
+ .driver = "ide-hd",
+ .property = "discard_granularity",
+ .value = stringify(0),
+ }, {
+ .driver = "ide-hd",
+ .property = "discard_zeroes_data",
+ .value = "off",
+ }, {
+ .driver = "scsi-disk",
+ .property = "discard_granularity",
+ .value = stringify(0),
+ }, {
+ .driver = "scsi-disk",
+ .property = "discard_zeroes_data",
+ .value = "off",
+ }, {
+ .driver = "scsi-hd",
+ .property = "discard_granularity",
+ .value = stringify(0),
+ }, {
+ .driver = "scsi-hd",
+ .property = "discard_zeroes_data",
+ .value = "off",
+ }, {
.driver = "virtio-blk-pci",
.property = "class",
.value = stringify(PCI_CLASS_STORAGE_OTHER),
--
1.7.7.6
next prev parent reply other threads:[~2012-03-08 17:16 UTC|newest]
Thread overview: 68+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-08 17:15 [Qemu-devel] [RFC PATCH 00/17] Improvements around discard and write zeroes Paolo Bonzini
2012-03-08 17:15 ` [Qemu-devel] [RFC PATCH 01/17] qemu-iotests: add a simple test for write_zeroes Paolo Bonzini
2012-03-08 17:15 ` [Qemu-devel] [RFC PATCH 02/17] qed: make write-zeroes bounce buffer smaller than a single cluster Paolo Bonzini
2012-03-08 17:15 ` [Qemu-devel] [RFC PATCH 03/17] block: add discard properties to BlockDriverInfo Paolo Bonzini
2012-03-09 16:47 ` Kevin Wolf
2012-03-08 17:15 ` [Qemu-devel] [RFC PATCH 04/17] qed: implement bdrv_aio_discard Paolo Bonzini
2012-03-09 16:31 ` Kevin Wolf
2012-03-09 17:53 ` Paolo Bonzini
2012-03-08 17:15 ` [Qemu-devel] [RFC PATCH 05/17] block: pass around qiov for write_zeroes operation Paolo Bonzini
2012-03-08 17:15 ` [Qemu-devel] [RFC PATCH 06/17] block: use bdrv_{co, aio}_discard for write_zeroes operations Paolo Bonzini
2012-03-09 16:37 ` Kevin Wolf
2012-03-09 18:06 ` Paolo Bonzini
2012-03-10 18:02 ` Richard Laager
2012-03-12 12:27 ` Paolo Bonzini
2012-03-12 13:04 ` Kevin Wolf
2012-03-13 19:13 ` Richard Laager
2012-03-14 7:41 ` Paolo Bonzini
2012-03-14 12:01 ` Kevin Wolf
2012-03-14 12:14 ` Paolo Bonzini
2012-03-14 12:37 ` Kevin Wolf
2012-03-14 12:49 ` Paolo Bonzini
2012-03-14 13:04 ` Kevin Wolf
2012-03-24 15:33 ` Christoph Hellwig
2012-03-24 15:30 ` Christoph Hellwig
2012-03-26 19:40 ` Richard Laager
2012-03-27 10:20 ` Kevin Wolf
2012-03-24 15:29 ` Christoph Hellwig
2012-03-26 9:44 ` Daniel P. Berrange
2012-03-26 9:56 ` Christoph Hellwig
2012-03-15 0:42 ` Richard Laager
2012-03-15 9:36 ` Paolo Bonzini
2012-03-16 0:47 ` Richard Laager
2012-03-16 9:34 ` Paolo Bonzini
2012-03-24 15:27 ` Christoph Hellwig
2012-03-26 19:40 ` Richard Laager
2012-03-27 9:08 ` Christoph Hellwig
2012-03-08 17:15 ` [Qemu-devel] [RFC PATCH 07/17] block: make high level discard operation always zero Paolo Bonzini
2012-03-08 17:55 ` Avi Kivity
2012-03-09 16:42 ` Kevin Wolf
2012-03-12 10:42 ` Avi Kivity
2012-03-12 11:04 ` Kevin Wolf
2012-03-12 12:03 ` Avi Kivity
2012-03-08 17:15 ` [Qemu-devel] [RFC PATCH 08/17] block: kill the write zeroes operation Paolo Bonzini
2012-03-08 17:15 ` [Qemu-devel] [RFC PATCH 09/17] ide: issue discard asynchronously but serialize the pieces Paolo Bonzini
2012-03-08 17:15 ` [Qemu-devel] [RFC PATCH 10/17] ide/scsi: add discard_zeroes_data property Paolo Bonzini
2012-03-08 18:13 ` Avi Kivity
2012-03-08 18:14 ` Avi Kivity
2012-03-08 17:15 ` [Qemu-devel] [RFC PATCH 11/17] ide/scsi: prepare for flipping the discard defaults Paolo Bonzini
2012-03-08 17:15 ` Paolo Bonzini [this message]
2012-03-08 18:17 ` [Qemu-devel] [RFC PATCH 12/17] ide/scsi: turn on discard Avi Kivity
2012-03-08 17:15 ` [Qemu-devel] [RFC PATCH 13/17] block: fallback from discard to writes Paolo Bonzini
2012-03-24 15:35 ` Christoph Hellwig
2012-03-08 17:15 ` [Qemu-devel] [RFC PATCH 14/17] block: support FALLOC_FL_PUNCH_HOLE trimming Paolo Bonzini
2012-03-09 8:20 ` Chris Wedgwood
2012-03-09 8:31 ` Paolo Bonzini
2012-03-09 8:35 ` Chris Wedgwood
2012-03-09 8:40 ` Paolo Bonzini
2012-03-09 10:31 ` Stefan Hajnoczi
2012-03-09 10:43 ` Paolo Bonzini
2012-03-09 10:53 ` Stefan Hajnoczi
2012-03-09 10:57 ` Paolo Bonzini
2012-03-09 20:36 ` Richard Laager
2012-03-12 9:34 ` Paolo Bonzini
2012-03-24 15:40 ` Christoph Hellwig
2012-03-08 17:15 ` [Qemu-devel] [RFC PATCH 15/17] raw: add get_info Paolo Bonzini
2012-03-08 17:15 ` [Qemu-devel] [RFC PATCH 16/17] qemu-io: fix the alloc command Paolo Bonzini
2012-03-08 17:15 ` [Qemu-devel] [RFC PATCH 17/17] raw: implement is_allocated Paolo Bonzini
2012-03-24 15:42 ` Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1331226917-6658-13-git-send-email-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).