virtio-blk: Turn drive serial into a qdev property
It needs to be a qdev property, because it belongs to the drive's guest part. Precedence: commita0fef654
and6ced55a5
. Bonus: info qtree now shows the serial number. Signed-off-by: Markus Armbruster <armbru@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
parent
343f85685c
commit
a8686a9b2b
|
@ -128,7 +128,8 @@ static int s390_virtio_blk_init(VirtIOS390Device *dev)
|
||||||
{
|
{
|
||||||
VirtIODevice *vdev;
|
VirtIODevice *vdev;
|
||||||
|
|
||||||
vdev = virtio_blk_init((DeviceState *)dev, &dev->block);
|
vdev = virtio_blk_init((DeviceState *)dev, &dev->block,
|
||||||
|
&dev->block_serial);
|
||||||
if (!vdev) {
|
if (!vdev) {
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
@ -355,6 +356,7 @@ static VirtIOS390DeviceInfo s390_virtio_blk = {
|
||||||
.qdev.size = sizeof(VirtIOS390Device),
|
.qdev.size = sizeof(VirtIOS390Device),
|
||||||
.qdev.props = (Property[]) {
|
.qdev.props = (Property[]) {
|
||||||
DEFINE_BLOCK_PROPERTIES(VirtIOS390Device, block),
|
DEFINE_BLOCK_PROPERTIES(VirtIOS390Device, block),
|
||||||
|
DEFINE_PROP_STRING("serial", VirtIOS390Device, block_serial),
|
||||||
DEFINE_PROP_END_OF_LIST(),
|
DEFINE_PROP_END_OF_LIST(),
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
|
@ -42,6 +42,7 @@ typedef struct VirtIOS390Device {
|
||||||
uint8_t feat_len;
|
uint8_t feat_len;
|
||||||
VirtIODevice *vdev;
|
VirtIODevice *vdev;
|
||||||
BlockConf block;
|
BlockConf block;
|
||||||
|
char *block_serial;
|
||||||
NICConf nic;
|
NICConf nic;
|
||||||
uint32_t host_features;
|
uint32_t host_features;
|
||||||
virtio_serial_conf serial;
|
virtio_serial_conf serial;
|
||||||
|
|
|
@ -28,8 +28,8 @@ typedef struct VirtIOBlock
|
||||||
void *rq;
|
void *rq;
|
||||||
QEMUBH *bh;
|
QEMUBH *bh;
|
||||||
BlockConf *conf;
|
BlockConf *conf;
|
||||||
|
char *serial;
|
||||||
unsigned short sector_mask;
|
unsigned short sector_mask;
|
||||||
char sn[BLOCK_SERIAL_STRLEN];
|
|
||||||
DeviceState *qdev;
|
DeviceState *qdev;
|
||||||
} VirtIOBlock;
|
} VirtIOBlock;
|
||||||
|
|
||||||
|
@ -362,8 +362,13 @@ static void virtio_blk_handle_request(VirtIOBlockReq *req,
|
||||||
} else if (type & VIRTIO_BLK_T_GET_ID) {
|
} else if (type & VIRTIO_BLK_T_GET_ID) {
|
||||||
VirtIOBlock *s = req->dev;
|
VirtIOBlock *s = req->dev;
|
||||||
|
|
||||||
memcpy(req->elem.in_sg[0].iov_base, s->sn,
|
/*
|
||||||
MIN(req->elem.in_sg[0].iov_len, sizeof(s->sn)));
|
* NB: per existing s/n string convention the string is
|
||||||
|
* terminated by '\0' only when shorter than buffer.
|
||||||
|
*/
|
||||||
|
strncpy(req->elem.in_sg[0].iov_base,
|
||||||
|
s->serial ? s->serial : "",
|
||||||
|
MIN(req->elem.in_sg[0].iov_len, VIRTIO_BLK_ID_BYTES));
|
||||||
virtio_blk_req_complete(req, VIRTIO_BLK_S_OK);
|
virtio_blk_req_complete(req, VIRTIO_BLK_S_OK);
|
||||||
} else if (type & VIRTIO_BLK_T_OUT) {
|
} else if (type & VIRTIO_BLK_T_OUT) {
|
||||||
qemu_iovec_init_external(&req->qiov, &req->elem.out_sg[1],
|
qemu_iovec_init_external(&req->qiov, &req->elem.out_sg[1],
|
||||||
|
@ -531,7 +536,8 @@ static void virtio_blk_change_cb(void *opaque, int reason)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
VirtIODevice *virtio_blk_init(DeviceState *dev, BlockConf *conf)
|
VirtIODevice *virtio_blk_init(DeviceState *dev, BlockConf *conf,
|
||||||
|
char **serial)
|
||||||
{
|
{
|
||||||
VirtIOBlock *s;
|
VirtIOBlock *s;
|
||||||
int cylinders, heads, secs;
|
int cylinders, heads, secs;
|
||||||
|
@ -547,6 +553,14 @@ VirtIODevice *virtio_blk_init(DeviceState *dev, BlockConf *conf)
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!*serial) {
|
||||||
|
/* try to fall back to value set with legacy -drive serial=... */
|
||||||
|
dinfo = drive_get_by_blockdev(conf->bs);
|
||||||
|
if (*dinfo->serial) {
|
||||||
|
*serial = strdup(dinfo->serial);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
s = (VirtIOBlock *)virtio_common_init("virtio-blk", VIRTIO_ID_BLOCK,
|
s = (VirtIOBlock *)virtio_common_init("virtio-blk", VIRTIO_ID_BLOCK,
|
||||||
sizeof(struct virtio_blk_config),
|
sizeof(struct virtio_blk_config),
|
||||||
sizeof(VirtIOBlock));
|
sizeof(VirtIOBlock));
|
||||||
|
@ -556,16 +570,11 @@ VirtIODevice *virtio_blk_init(DeviceState *dev, BlockConf *conf)
|
||||||
s->vdev.reset = virtio_blk_reset;
|
s->vdev.reset = virtio_blk_reset;
|
||||||
s->bs = conf->bs;
|
s->bs = conf->bs;
|
||||||
s->conf = conf;
|
s->conf = conf;
|
||||||
|
s->serial = *serial;
|
||||||
s->rq = NULL;
|
s->rq = NULL;
|
||||||
s->sector_mask = (s->conf->logical_block_size / BDRV_SECTOR_SIZE) - 1;
|
s->sector_mask = (s->conf->logical_block_size / BDRV_SECTOR_SIZE) - 1;
|
||||||
bdrv_guess_geometry(s->bs, &cylinders, &heads, &secs);
|
bdrv_guess_geometry(s->bs, &cylinders, &heads, &secs);
|
||||||
|
|
||||||
/* NB: per existing s/n string convention the string is terminated
|
|
||||||
* by '\0' only when less than sizeof (s->sn)
|
|
||||||
*/
|
|
||||||
dinfo = drive_get_by_blockdev(s->bs);
|
|
||||||
strncpy(s->sn, dinfo->serial, sizeof (s->sn));
|
|
||||||
|
|
||||||
s->vq = virtio_add_queue(&s->vdev, 128, virtio_blk_handle_output);
|
s->vq = virtio_add_queue(&s->vdev, 128, virtio_blk_handle_output);
|
||||||
|
|
||||||
qemu_add_vm_change_state_handler(virtio_blk_dma_restart_cb, s);
|
qemu_add_vm_change_state_handler(virtio_blk_dma_restart_cb, s);
|
||||||
|
|
|
@ -34,6 +34,8 @@
|
||||||
#define VIRTIO_BLK_F_WCACHE 9 /* write cache enabled */
|
#define VIRTIO_BLK_F_WCACHE 9 /* write cache enabled */
|
||||||
#define VIRTIO_BLK_F_TOPOLOGY 10 /* Topology information is available */
|
#define VIRTIO_BLK_F_TOPOLOGY 10 /* Topology information is available */
|
||||||
|
|
||||||
|
#define VIRTIO_BLK_ID_BYTES 20 /* ID string length */
|
||||||
|
|
||||||
struct virtio_blk_config
|
struct virtio_blk_config
|
||||||
{
|
{
|
||||||
uint64_t capacity;
|
uint64_t capacity;
|
||||||
|
|
|
@ -700,7 +700,8 @@ static int virtio_blk_init_pci(PCIDevice *pci_dev)
|
||||||
proxy->class_code != PCI_CLASS_STORAGE_OTHER)
|
proxy->class_code != PCI_CLASS_STORAGE_OTHER)
|
||||||
proxy->class_code = PCI_CLASS_STORAGE_SCSI;
|
proxy->class_code = PCI_CLASS_STORAGE_SCSI;
|
||||||
|
|
||||||
vdev = virtio_blk_init(&pci_dev->qdev, &proxy->block);
|
vdev = virtio_blk_init(&pci_dev->qdev, &proxy->block,
|
||||||
|
&proxy->block_serial);
|
||||||
if (!vdev) {
|
if (!vdev) {
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
@ -805,6 +806,7 @@ static PCIDeviceInfo virtio_info[] = {
|
||||||
.qdev.props = (Property[]) {
|
.qdev.props = (Property[]) {
|
||||||
DEFINE_PROP_HEX32("class", VirtIOPCIProxy, class_code, 0),
|
DEFINE_PROP_HEX32("class", VirtIOPCIProxy, class_code, 0),
|
||||||
DEFINE_BLOCK_PROPERTIES(VirtIOPCIProxy, block),
|
DEFINE_BLOCK_PROPERTIES(VirtIOPCIProxy, block),
|
||||||
|
DEFINE_PROP_STRING("serial", VirtIOPCIProxy, block_serial),
|
||||||
DEFINE_PROP_BIT("ioeventfd", VirtIOPCIProxy, flags,
|
DEFINE_PROP_BIT("ioeventfd", VirtIOPCIProxy, flags,
|
||||||
VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT, true),
|
VIRTIO_PCI_FLAG_USE_IOEVENTFD_BIT, true),
|
||||||
DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors, 2),
|
DEFINE_PROP_UINT32("vectors", VirtIOPCIProxy, nvectors, 2),
|
||||||
|
|
|
@ -26,6 +26,7 @@ typedef struct {
|
||||||
uint32_t class_code;
|
uint32_t class_code;
|
||||||
uint32_t nvectors;
|
uint32_t nvectors;
|
||||||
BlockConf block;
|
BlockConf block;
|
||||||
|
char *block_serial;
|
||||||
NICConf nic;
|
NICConf nic;
|
||||||
uint32_t host_features;
|
uint32_t host_features;
|
||||||
#ifdef CONFIG_LINUX
|
#ifdef CONFIG_LINUX
|
||||||
|
|
|
@ -197,7 +197,8 @@ void virtio_bind_device(VirtIODevice *vdev, const VirtIOBindings *binding,
|
||||||
void *opaque);
|
void *opaque);
|
||||||
|
|
||||||
/* Base devices. */
|
/* Base devices. */
|
||||||
VirtIODevice *virtio_blk_init(DeviceState *dev, BlockConf *conf);
|
VirtIODevice *virtio_blk_init(DeviceState *dev, BlockConf *conf,
|
||||||
|
char **serial);
|
||||||
struct virtio_net_conf;
|
struct virtio_net_conf;
|
||||||
VirtIODevice *virtio_net_init(DeviceState *dev, NICConf *conf,
|
VirtIODevice *virtio_net_init(DeviceState *dev, NICConf *conf,
|
||||||
struct virtio_net_conf *net);
|
struct virtio_net_conf *net);
|
||||||
|
|
Loading…
Reference in New Issue