block: New bdrv_set_buffer_alignment()
Device models should be able to set it without an unclean include of block_int.h. Signed-off-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
parent
fb0c61a5a5
commit
7b6f9300d5
6
block.c
6
block.c
|
@ -480,7 +480,6 @@ static int bdrv_open_common(BlockDriverState *bs, const char *filename,
|
||||||
bs->encrypted = 0;
|
bs->encrypted = 0;
|
||||||
bs->valid_key = 0;
|
bs->valid_key = 0;
|
||||||
bs->open_flags = flags;
|
bs->open_flags = flags;
|
||||||
/* buffer_alignment defaulted to 512, drivers can change this value */
|
|
||||||
bs->buffer_alignment = 512;
|
bs->buffer_alignment = 512;
|
||||||
|
|
||||||
pstrcpy(bs->filename, sizeof(bs->filename), filename);
|
pstrcpy(bs->filename, sizeof(bs->filename), filename);
|
||||||
|
@ -3115,7 +3114,10 @@ BlockDriverAIOCB *bdrv_aio_ioctl(BlockDriverState *bs,
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void bdrv_set_buffer_alignment(BlockDriverState *bs, int align)
|
||||||
|
{
|
||||||
|
bs->buffer_alignment = align;
|
||||||
|
}
|
||||||
|
|
||||||
void *qemu_blockalign(BlockDriverState *bs, size_t size)
|
void *qemu_blockalign(BlockDriverState *bs, size_t size)
|
||||||
{
|
{
|
||||||
|
|
1
block.h
1
block.h
|
@ -269,6 +269,7 @@ int bdrv_img_create(const char *filename, const char *fmt,
|
||||||
const char *base_filename, const char *base_fmt,
|
const char *base_filename, const char *base_fmt,
|
||||||
char *options, uint64_t img_size, int flags);
|
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);
|
void *qemu_blockalign(BlockDriverState *bs, size_t size);
|
||||||
|
|
||||||
#define BDRV_SECTORS_PER_DIRTY_CHUNK 2048
|
#define BDRV_SECTORS_PER_DIRTY_CHUNK 2048
|
||||||
|
|
|
@ -1847,7 +1847,7 @@ int ide_init_drive(IDEState *s, BlockDriverState *bs, IDEDriveKind kind,
|
||||||
s->smart_selftest_count = 0;
|
s->smart_selftest_count = 0;
|
||||||
if (kind == IDE_CD) {
|
if (kind == IDE_CD) {
|
||||||
bdrv_set_dev_ops(bs, &ide_cd_block_ops, s);
|
bdrv_set_dev_ops(bs, &ide_cd_block_ops, s);
|
||||||
bs->buffer_alignment = 2048;
|
bdrv_set_buffer_alignment(bs, 2048);
|
||||||
} else {
|
} else {
|
||||||
if (!bdrv_is_inserted(s->bs)) {
|
if (!bdrv_is_inserted(s->bs)) {
|
||||||
error_report("Device needs media, but drive is empty");
|
error_report("Device needs media, but drive is empty");
|
||||||
|
|
|
@ -1236,7 +1236,7 @@ static int scsi_initfn(SCSIDevice *dev, uint8_t scsi_type)
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
s->cluster_size = s->qdev.blocksize / 512;
|
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 = scsi_type;
|
s->qdev.type = scsi_type;
|
||||||
qemu_add_vm_change_state_handler(scsi_dma_restart_cb, s);
|
qemu_add_vm_change_state_handler(scsi_dma_restart_cb, s);
|
||||||
|
|
|
@ -15,7 +15,6 @@
|
||||||
#include "qemu-error.h"
|
#include "qemu-error.h"
|
||||||
#include "trace.h"
|
#include "trace.h"
|
||||||
#include "blockdev.h"
|
#include "blockdev.h"
|
||||||
#include "block_int.h"
|
|
||||||
#include "virtio-blk.h"
|
#include "virtio-blk.h"
|
||||||
#ifdef __linux__
|
#ifdef __linux__
|
||||||
# include <scsi/sg.h>
|
# include <scsi/sg.h>
|
||||||
|
@ -601,7 +600,7 @@ VirtIODevice *virtio_blk_init(DeviceState *dev, BlockConf *conf,
|
||||||
register_savevm(dev, "virtio-blk", virtio_blk_id++, 2,
|
register_savevm(dev, "virtio-blk", virtio_blk_id++, 2,
|
||||||
virtio_blk_save, virtio_blk_load, s);
|
virtio_blk_save, virtio_blk_load, s);
|
||||||
bdrv_set_dev_ops(s->bs, &virtio_block_ops, 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, "/disk@0,0");
|
add_boot_device_path(conf->bootindex, dev, "/disk@0,0");
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue