On 29.5.2013 15:30, Paolo Bonzini wrote:
Il 29/05/2013 14:12, Pavel Hrdina ha scritto:
This patch adds a new SCSI_DISK_F_MONITOR_NOT_REMOVABLE feature. By this
feature we can set that the scsi-block (scsi pass-through) device will still
be removable from the guest side, but from monitor it cannot be removed.
Signed-off-by: Pavel Hrdina <phrd...@redhat.com>
---
hw/scsi/scsi-disk.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c
index c8d2a99..190c3ad 100644
--- a/hw/scsi/scsi-disk.c
+++ b/hw/scsi/scsi-disk.c
@@ -61,8 +61,9 @@ typedef struct SCSIDiskReq {
BlockAcctCookie acct;
} SCSIDiskReq;
-#define SCSI_DISK_F_REMOVABLE 0
-#define SCSI_DISK_F_DPOFUA 1
+#define SCSI_DISK_F_REMOVABLE 0
+#define SCSI_DISK_F_DPOFUA 1
+#define SCSI_DISK_F_MONITOR_NOT_REMOVABLE 2
struct SCSIDiskState
{
@@ -2107,7 +2108,8 @@ static int scsi_initfn(SCSIDevice *dev)
return -1;
}
- if (s->features & (1 << SCSI_DISK_F_REMOVABLE)) {
+ if ((s->features & (1 << SCSI_DISK_F_REMOVABLE)) &&
+ !(s->features & (1 << SCSI_DISK_F_MONITOR_NOT_REMOVABLE))) {
bdrv_set_dev_ops(s->qdev.conf.bs, &scsi_disk_removable_block_ops, s);
} else {
bdrv_set_dev_ops(s->qdev.conf.bs, &scsi_disk_block_ops, s);
@@ -2463,6 +2465,8 @@ static const TypeInfo scsi_cd_info = {
static Property scsi_block_properties[] = {
DEFINE_PROP_DRIVE("drive", SCSIDiskState, qdev.conf.bs),
DEFINE_PROP_INT32("bootindex", SCSIDiskState, qdev.conf.bootindex, -1),
+ DEFINE_PROP_BIT("monitor_not_removable", SCSIDiskState, features,
+ SCSI_DISK_F_MONITOR_NOT_REMOVABLE, true),
DEFINE_PROP_END_OF_LIST(),
};
Kevin convinced me offlist to take this patch, but I'll still ask for
two changes:
1) rename the feature bit to SCSI_DISK_F_NO_REMOVABLE_DEVOPS
2) set the feature in scsi_block_initfn instead of using a bit, because
the user should not be able to toggle this.
Thanks!
Paolo
I've red that list and OK, I'll update that patch.
Pavel
