scsi-disk: define props in scsi_block_disk to avoid memleaks

scsi_block_realize() use scsi_realize() to init some props, but
these props is not defined in scsi_block_disk_properties, so they will
not be freed.

This patch defines these prop in scsi_block_disk_properties to avoid memleaks.

Signed-off-by: Pan Nengyuan <pannengyuan@huawei.com>
Signed-off-by: Yan Wang <wangyan122@huawei.com>

scsi-disk-define-props-in-scsi_block_disk-to-avoid-m.patch

@@ -0,0 +1,36 @@
+From e026850b32231abb97d7790a04d7c94515bd1081 Mon Sep 17 00:00:00 2001
+From: Pan Nengyuan <pannengyuan@huawei.com>
+Date: Mon, 13 Jan 2020 15:53:32 +0800
+Subject: [PATCH 3/6] scsi-disk: define props in scsi_block_disk to avoid
+ memleaks
+
+scsi_block_realize() use scsi_realize() to init some props, but
+these props is not defined in scsi_block_disk_properties, so they will
+not be freed.
+
+This patch defines these prop in scsi_block_disk_properties to avoid memleaks.
+
+Signed-off-by: Pan Nengyuan <pannengyuan@huawei.com>
+Signed-off-by: Yan Wang <wangyan122@huawei.com>
+---
+ hw/scsi/scsi-disk.c | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c
+index d491417..1d7799d 100644
+--- a/hw/scsi/scsi-disk.c
++++ b/hw/scsi/scsi-disk.c
+@@ -3107,9 +3107,7 @@ static const TypeInfo scsi_cd_info = {
+ 
+ #ifdef __linux__
+ static Property scsi_block_properties[] = {
+-    DEFINE_BLOCK_ERROR_PROPERTIES(SCSIDiskState, qdev.conf),
+-    DEFINE_PROP_DRIVE("drive", SCSIDiskState, qdev.conf.blk),
+-    DEFINE_PROP_BOOL("share-rw", SCSIDiskState, qdev.conf.share_rw, false),
++    DEFINE_SCSI_DISK_PROPERTIES(),
+     DEFINE_PROP_UINT16("rotation_rate", SCSIDiskState, rotation_rate, 0),
+     DEFINE_PROP_UINT64("max_unmap_size", SCSIDiskState, max_unmap_size,
+                        DEFAULT_MAX_UNMAP_SIZE),
+-- 
+1.9.1
+