428c149b0b
Add three new qdev properties to export block topology information to the guest. This is needed to get optimal I/O alignment for RAID arrays or SSDs. The options are: - physical_block_size to specify the physical block size of the device, this is going to increase from 512 bytes to 4096 kilobytes for many modern storage devices - min_io_size to specify the minimal I/O size without performance impact, this is typically set to the RAID chunk size for arrays. - opt_io_size to specify the optimal sustained I/O size, this is typically the RAID stripe width for arrays. I decided to not auto-probe these values from blkid which might easily be possible as I don't know how to deal with these issues on migration. Note that we specificly only set the physical_block_size, and not the logial one which is the unit all I/O is described in. The reason for that is that IDE does not support increasing the logical block size and at last for now I want to stick to one meachnisms in queue and allow for easy switching of transports for a given backing image which would not be possible if scsi and virtio use real 4k sectors, while ide only uses the physical block exponent. To make this more common for the different block drivers introduce a new BlockConf structure holding all common block properties and a DEFINE_BLOCK_PROPERTIES macro to add them all together, mirroring what is done for network drivers. Also switch over all block drivers to use it, except for the floppy driver which has weird driveA/driveB properties and probably won't require any advanced block options ever. Example usage for a virtio device with 4k physical block size and 8k optimal I/O size: -drive file=scratch.img,media=disk,cache=none,id=scratch \ -device virtio-blk-pci,drive=scratch,physical_block_size=4096,opt_io_size=8192 aliguori: updated patch to take into account BLOCK events Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
124 lines
3.3 KiB
C
124 lines
3.3 KiB
C
/*
|
|
* ide bus support for qdev.
|
|
*
|
|
* Copyright (c) 2009 Gerd Hoffmann <kraxel@redhat.com>
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
#include <hw/hw.h>
|
|
#include "sysemu.h"
|
|
#include "dma.h"
|
|
|
|
#include <hw/ide/internal.h>
|
|
|
|
/* --------------------------------- */
|
|
|
|
static struct BusInfo ide_bus_info = {
|
|
.name = "IDE",
|
|
.size = sizeof(IDEBus),
|
|
};
|
|
|
|
void ide_bus_new(IDEBus *idebus, DeviceState *dev)
|
|
{
|
|
qbus_create_inplace(&idebus->qbus, &ide_bus_info, dev, NULL);
|
|
}
|
|
|
|
static int ide_qdev_init(DeviceState *qdev, DeviceInfo *base)
|
|
{
|
|
IDEDevice *dev = DO_UPCAST(IDEDevice, qdev, qdev);
|
|
IDEDeviceInfo *info = DO_UPCAST(IDEDeviceInfo, qdev, base);
|
|
IDEBus *bus = DO_UPCAST(IDEBus, qbus, qdev->parent_bus);
|
|
|
|
if (!dev->conf.dinfo) {
|
|
fprintf(stderr, "%s: no drive specified\n", qdev->info->name);
|
|
goto err;
|
|
}
|
|
if (dev->unit == -1) {
|
|
dev->unit = bus->master ? 1 : 0;
|
|
}
|
|
switch (dev->unit) {
|
|
case 0:
|
|
if (bus->master) {
|
|
fprintf(stderr, "ide: tried to assign master twice\n");
|
|
goto err;
|
|
}
|
|
bus->master = dev;
|
|
break;
|
|
case 1:
|
|
if (bus->slave) {
|
|
fprintf(stderr, "ide: tried to assign slave twice\n");
|
|
goto err;
|
|
}
|
|
bus->slave = dev;
|
|
break;
|
|
default:
|
|
goto err;
|
|
}
|
|
return info->init(dev);
|
|
|
|
err:
|
|
return -1;
|
|
}
|
|
|
|
static void ide_qdev_register(IDEDeviceInfo *info)
|
|
{
|
|
info->qdev.init = ide_qdev_init;
|
|
info->qdev.bus_info = &ide_bus_info;
|
|
qdev_register(&info->qdev);
|
|
}
|
|
|
|
IDEDevice *ide_create_drive(IDEBus *bus, int unit, DriveInfo *drive)
|
|
{
|
|
DeviceState *dev;
|
|
|
|
dev = qdev_create(&bus->qbus, "ide-drive");
|
|
qdev_prop_set_uint32(dev, "unit", unit);
|
|
qdev_prop_set_drive(dev, "drive", drive);
|
|
if (qdev_init(dev) < 0)
|
|
return NULL;
|
|
return DO_UPCAST(IDEDevice, qdev, dev);
|
|
}
|
|
|
|
/* --------------------------------- */
|
|
|
|
typedef struct IDEDrive {
|
|
IDEDevice dev;
|
|
} IDEDrive;
|
|
|
|
static int ide_drive_initfn(IDEDevice *dev)
|
|
{
|
|
IDEBus *bus = DO_UPCAST(IDEBus, qbus, dev->qdev.parent_bus);
|
|
ide_init_drive(bus->ifs + dev->unit, dev->conf.dinfo, &dev->conf,
|
|
dev->version);
|
|
return 0;
|
|
}
|
|
|
|
static IDEDeviceInfo ide_drive_info = {
|
|
.qdev.name = "ide-drive",
|
|
.qdev.size = sizeof(IDEDrive),
|
|
.init = ide_drive_initfn,
|
|
.qdev.props = (Property[]) {
|
|
DEFINE_PROP_UINT32("unit", IDEDrive, dev.unit, -1),
|
|
DEFINE_BLOCK_PROPERTIES(IDEDrive, dev.conf),
|
|
DEFINE_PROP_STRING("ver", IDEDrive, dev.version),
|
|
DEFINE_PROP_END_OF_LIST(),
|
|
}
|
|
};
|
|
|
|
static void ide_drive_register(void)
|
|
{
|
|
ide_qdev_register(&ide_drive_info);
|
|
}
|
|
device_init(ide_drive_register);
|