[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC PATCH 12/17] ide/scsi: turn on discard
|
From: |
Paolo Bonzini |
|
Subject: |
[Qemu-devel] [RFC PATCH 12/17] ide/scsi: turn on discard |
|
Date: |
Thu, 8 Mar 2012 18:15:12 +0100 |
Turn on discard support in the device models by default, with
compatibility properties for older machine types.
Signed-off-by: Paolo Bonzini <address@hidden>
---
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
- Re: [Qemu-devel] [RFC PATCH 06/17] block: use bdrv_{co, aio}_discard for write_zeroes operations, (continued)
[Qemu-devel] [RFC PATCH 04/17] qed: implement bdrv_aio_discard, Paolo Bonzini, 2012/03/08
[Qemu-devel] [RFC PATCH 10/17] ide/scsi: add discard_zeroes_data property, Paolo Bonzini, 2012/03/08
[Qemu-devel] [RFC PATCH 09/17] ide: issue discard asynchronously but serialize the pieces, Paolo Bonzini, 2012/03/08
[Qemu-devel] [RFC PATCH 05/17] block: pass around qiov for write_zeroes operation, Paolo Bonzini, 2012/03/08
[Qemu-devel] [RFC PATCH 12/17] ide/scsi: turn on discard,
Paolo Bonzini <=
[Qemu-devel] [RFC PATCH 01/17] qemu-iotests: add a simple test for write_zeroes, Paolo Bonzini, 2012/03/08
[Qemu-devel] [RFC PATCH 11/17] ide/scsi: prepare for flipping the discard defaults, Paolo Bonzini, 2012/03/08
[Qemu-devel] [RFC PATCH 16/17] qemu-io: fix the alloc command, Paolo Bonzini, 2012/03/08
[Qemu-devel] [RFC PATCH 07/17] block: make high level discard operation always zero, Paolo Bonzini, 2012/03/08