From d4433f32116dc597f895e62cde3572b400c3ee96 Mon Sep 17 00:00:00 2001 From: Gonglei Date: Thu, 29 Jan 2015 15:08:52 +0800 Subject: [PATCH] vhost-scsi: add bootindex property Signed-off-by: Gonglei Acked-by: Michael S. Tsirkin Signed-off-by: Paolo Bonzini --- hw/scsi/vhost-scsi.c | 9 +++++++++ hw/virtio/virtio-pci.c | 2 ++ include/hw/virtio/vhost-scsi.h | 1 + 3 files changed, 12 insertions(+) diff --git a/hw/scsi/vhost-scsi.c b/hw/scsi/vhost-scsi.c index dcb2bc5a6e..9c4f613864 100644 --- a/hw/scsi/vhost-scsi.c +++ b/hw/scsi/vhost-scsi.c @@ -290,11 +290,20 @@ static void vhost_scsi_class_init(ObjectClass *klass, void *data) vdc->set_status = vhost_scsi_set_status; } +static void vhost_scsi_instance_init(Object *obj) +{ + VHostSCSI *dev = VHOST_SCSI(obj); + + device_add_bootindex_property(obj, &dev->bootindex, "bootindex", NULL, + DEVICE(dev), NULL); +} + static const TypeInfo vhost_scsi_info = { .name = TYPE_VHOST_SCSI, .parent = TYPE_VIRTIO_SCSI_COMMON, .instance_size = sizeof(VHostSCSI), .class_init = vhost_scsi_class_init, + .instance_init = vhost_scsi_instance_init, }; static void virtio_register_types(void) diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c index dde1d73b56..604cb5b749 100644 --- a/hw/virtio/virtio-pci.c +++ b/hw/virtio/virtio-pci.c @@ -1238,6 +1238,8 @@ static void vhost_scsi_pci_instance_init(Object *obj) virtio_instance_init_common(obj, &dev->vdev, sizeof(dev->vdev), TYPE_VHOST_SCSI); + object_property_add_alias(obj, "bootindex", OBJECT(&dev->vdev), + "bootindex", &error_abort); } static const TypeInfo vhost_scsi_pci_info = { diff --git a/include/hw/virtio/vhost-scsi.h b/include/hw/virtio/vhost-scsi.h index 85cc031281..ed50289b77 100644 --- a/include/hw/virtio/vhost-scsi.h +++ b/include/hw/virtio/vhost-scsi.h @@ -60,6 +60,7 @@ typedef struct VHostSCSI { Error *migration_blocker; struct vhost_dev dev; + int32_t bootindex; } VHostSCSI; #define DEFINE_VHOST_SCSI_PROPERTIES(_state, _conf_field) \