[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 50/55] block: New bdrv_set_buffer_alignment()
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 50/55] block: New bdrv_set_buffer_alignment() |
Date: |
Wed, 20 Jul 2011 18:24:24 +0200 |
Device models should be able to set it without an unclean include of
block_int.h.
Signed-off-by: Markus Armbruster <address@hidden>
---
block.c | 6 ++++--
block.h | 1 +
hw/ide/core.c | 2 +-
hw/scsi-disk.c | 3 +--
hw/virtio-blk.c | 3 +--
5 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/block.c b/block.c
index 925861f..e9b911b 100644
--- a/block.c
+++ b/block.c
@@ -428,7 +428,6 @@ static int bdrv_open_common(BlockDriverState *bs, const
char *filename,
bs->encrypted = 0;
bs->valid_key = 0;
bs->open_flags = flags;
- /* buffer_alignment defaulted to 512, drivers can change this value */
bs->buffer_alignment = 512;
pstrcpy(bs->filename, sizeof(bs->filename), filename);
@@ -2819,7 +2818,10 @@ BlockDriverAIOCB *bdrv_aio_ioctl(BlockDriverState *bs,
return NULL;
}
-
+void bdrv_set_buffer_alignment(BlockDriverState *bs, int align)
+{
+ bs->buffer_alignment = align;
+}
void *qemu_blockalign(BlockDriverState *bs, size_t size)
{
diff --git a/block.h b/block.h
index 8f52abb..c596b4c 100644
--- a/block.h
+++ b/block.h
@@ -264,6 +264,7 @@ int bdrv_img_create(const char *filename, const char *fmt,
const char *base_filename, const char *base_fmt,
char *options, uint64_t img_size, int flags);
+void bdrv_set_buffer_alignment(BlockDriverState *bs, int align);
void *qemu_blockalign(BlockDriverState *bs, size_t size);
#define BDRV_SECTORS_PER_DIRTY_CHUNK 2048
diff --git a/hw/ide/core.c b/hw/ide/core.c
index 7301108..bfa1162 100644
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -1821,7 +1821,7 @@ int ide_init_drive(IDEState *s, BlockDriverState *bs,
IDEDriveKind kind,
s->smart_selftest_count = 0;
if (kind == IDE_CD) {
bdrv_set_dev_ops(bs, &ide_cd_block_ops, s);
- bs->buffer_alignment = 2048;
+ bdrv_set_buffer_alignment(bs, 2048);
} else {
if (!bdrv_is_inserted(s->bs)) {
error_report("Device needs media, but drive is empty");
diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c
index 9d6968c..1bfdfdd 100644
--- a/hw/scsi-disk.c
+++ b/hw/scsi-disk.c
@@ -37,7 +37,6 @@ do { fprintf(stderr, "scsi-disk: " fmt , ## __VA_ARGS__); }
while (0)
#include "scsi-defs.h"
#include "sysemu.h"
#include "blockdev.h"
-#include "block_int.h"
#define SCSI_DMA_BUF_SIZE 131072
#define SCSI_MAX_INQUIRY_LEN 256
@@ -1336,7 +1335,7 @@ static int scsi_initfn(SCSIDevice *dev, SCSIDriveKind
kind)
s->qdev.blocksize = s->qdev.conf.logical_block_size;
}
s->cluster_size = s->qdev.blocksize / 512;
- s->bs->buffer_alignment = s->qdev.blocksize;
+ bdrv_set_buffer_alignment(s->bs, s->qdev.blocksize);
s->qdev.type = TYPE_DISK;
qemu_add_vm_change_state_handler(scsi_dma_restart_cb, s);
diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c
index a517150..811d709 100644
--- a/hw/virtio-blk.c
+++ b/hw/virtio-blk.c
@@ -15,7 +15,6 @@
#include "qemu-error.h"
#include "trace.h"
#include "blockdev.h"
-#include "block_int.h"
#include "virtio-blk.h"
#ifdef __linux__
# include <scsi/sg.h>
@@ -585,7 +584,7 @@ VirtIODevice *virtio_blk_init(DeviceState *dev, BlockConf
*conf,
register_savevm(dev, "virtio-blk", virtio_blk_id++, 2,
virtio_blk_save, virtio_blk_load, s);
bdrv_set_dev_ops(s->bs, &virtio_block_ops, s);
- s->bs->buffer_alignment = conf->logical_block_size;
+ bdrv_set_buffer_alignment(s->bs, conf->logical_block_size);
add_boot_device_path(conf->bootindex, dev, "/address@hidden,0");
--
1.7.2.3
- [Qemu-devel] [PATCH 02/55] block: Reset device model callbacks on detach, (continued)
- [Qemu-devel] [PATCH 50/55] block: New bdrv_set_buffer_alignment(),
Markus Armbruster <=
- [Qemu-devel] [PATCH 52/55] block: Move BlockDriverAIOCB & friends from block_int.h to block.h, Markus Armbruster, 2011/07/20
- [Qemu-devel] [PATCH 38/55] scsi-disk: Preserve tray state on migration, Markus Armbruster, 2011/07/20
- [Qemu-devel] [PATCH 51/55] block: Reset buffer alignment on detach, Markus Armbruster, 2011/07/20
- [Qemu-devel] [PATCH 37/55] ide/atapi: Preserve tray state on migration, Markus Armbruster, 2011/07/20
- [Qemu-devel] [PATCH 41/55] fdc: Make media change detection more robust, Markus Armbruster, 2011/07/20
- [Qemu-devel] [PATCH 30/55] block: Rename bdrv_set_locked() to bdrv_lock_medium(), Markus Armbruster, 2011/07/20