From patchwork Sat Aug 30 10:00:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gonglei (Arei)" X-Patchwork-Id: 384456 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 5367E1400FA for ; Sat, 30 Aug 2014 20:08:18 +1000 (EST) Received: from localhost ([::1]:45942 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XNfZw-0003wQ-1e for incoming@patchwork.ozlabs.org; Sat, 30 Aug 2014 06:08:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47260) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XNfTV-0008Se-Ko for qemu-devel@nongnu.org; Sat, 30 Aug 2014 06:01:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XNfTP-0002vY-U5 for qemu-devel@nongnu.org; Sat, 30 Aug 2014 06:01:37 -0400 Received: from szxga03-in.huawei.com ([119.145.14.66]:55284) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XNfTP-0002uU-78 for qemu-devel@nongnu.org; Sat, 30 Aug 2014 06:01:31 -0400 Received: from 172.24.2.119 (EHLO szxeml402-hub.china.huawei.com) ([172.24.2.119]) by szxrg03-dlp.huawei.com (MOS 4.4.3-GA FastPath queued) with ESMTP id ATS24808; Sat, 30 Aug 2014 18:01:07 +0800 (CST) Received: from localhost (10.177.19.102) by szxeml402-hub.china.huawei.com (10.82.67.32) with Microsoft SMTP Server id 14.3.158.1; Sat, 30 Aug 2014 18:01:00 +0800 From: To: Date: Sat, 30 Aug 2014 18:00:24 +0800 Message-ID: <1409392827-9372-25-git-send-email-arei.gonglei@huawei.com> X-Mailer: git-send-email 1.7.3.1.msysgit.0 In-Reply-To: <1409392827-9372-1-git-send-email-arei.gonglei@huawei.com> References: <1409392827-9372-1-git-send-email-arei.gonglei@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.177.19.102] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020208.5401A0E4.0007,ss=1,re=0.000,fgs=0, ip=0.0.0.0, so=2013-05-26 15:14:31, dmn=2011-05-27 18:58:46 X-Mirapoint-Loop-Id: f4861e460dd25786b11f0356fd3fa7b1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 119.145.14.66 Cc: chenliang88@huawei.com, weidong.huang@huawei.com, mst@redhat.com, aik@ozlabs.ru, hutao@cn.fujitsu.com, armbru@redhat.com, kraxel@redhat.com, akong@redhat.com, agraf@suse.de, Gonglei , aliguori@amazon.com, ehabkost@redhat.com, luonengjun@huawei.com, peter.huangpeng@huawei.com, hani@linux.com, stefanha@redhat.com, pbonzini@redhat.com, lcapitulino@redhat.com, kwolf@redhat.com, peter.crosthwaite@xilinx.com, imammedo@redhat.com, afaerber@suse.de Subject: [Qemu-devel] [PATCH v6 24/27] scsi: add bootindex to qom property X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Gonglei Add a qom property with the same name 'bootindex', when we remove it form qdev property, things will continue to work just fine, and we can use qom features which are not supported by qdev property. Signed-off-by: Gonglei --- hw/scsi/scsi-disk.c | 29 +++++++++++++++++++++++++++++ hw/scsi/scsi-generic.c | 1 + include/hw/scsi/scsi.h | 1 + 3 files changed, 31 insertions(+) diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index 03d1384..bc2deb9 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -2332,6 +2332,31 @@ static void scsi_disk_realize(SCSIDevice *dev, Error **errp) } } +static void scsi_dev_get_bootindex(Object *obj, Visitor *v, void *opaque, + const char *name, Error **errp) +{ + DeviceState *dev = DEVICE(obj); + SCSIDevice *s = DO_UPCAST(SCSIDevice, qdev, dev); + + get_bootindex(&s->conf.bootindex, v, name, errp); +} + +static void scsi_dev_set_bootindex(Object *obj, Visitor *v, void *opaque, + const char *name, Error **errp) +{ + DeviceState *dev = DEVICE(obj); + SCSIDevice *s = DO_UPCAST(SCSIDevice, qdev, dev); + + set_bootindex(&s->conf.bootindex, v, name, errp); +} + +void scsi_dev_instance_init(Object *obj) +{ + object_property_add(obj, "bootindex", "int", + scsi_dev_get_bootindex, + scsi_dev_set_bootindex, NULL, NULL, NULL); +} + static const SCSIReqOps scsi_disk_emulate_reqops = { .size = sizeof(SCSIDiskReq), .free_req = scsi_free_request, @@ -2645,6 +2670,7 @@ static const TypeInfo scsi_hd_info = { .parent = TYPE_SCSI_DEVICE, .instance_size = sizeof(SCSIDiskState), .class_init = scsi_hd_class_initfn, + .instance_init = scsi_dev_instance_init, }; static Property scsi_cd_properties[] = { @@ -2676,6 +2702,7 @@ static const TypeInfo scsi_cd_info = { .parent = TYPE_SCSI_DEVICE, .instance_size = sizeof(SCSIDiskState), .class_init = scsi_cd_class_initfn, + .instance_init = scsi_dev_instance_init, }; #ifdef __linux__ @@ -2706,6 +2733,7 @@ static const TypeInfo scsi_block_info = { .parent = TYPE_SCSI_DEVICE, .instance_size = sizeof(SCSIDiskState), .class_init = scsi_block_class_initfn, + .instance_init = scsi_dev_instance_init, }; #endif @@ -2744,6 +2772,7 @@ static const TypeInfo scsi_disk_info = { .parent = TYPE_SCSI_DEVICE, .instance_size = sizeof(SCSIDiskState), .class_init = scsi_disk_class_initfn, + .instance_init = scsi_dev_instance_init, }; static void scsi_disk_register_types(void) diff --git a/hw/scsi/scsi-generic.c b/hw/scsi/scsi-generic.c index db6a80d..34f192b 100644 --- a/hw/scsi/scsi-generic.c +++ b/hw/scsi/scsi-generic.c @@ -514,6 +514,7 @@ static const TypeInfo scsi_generic_info = { .parent = TYPE_SCSI_DEVICE, .instance_size = sizeof(SCSIDevice), .class_init = scsi_generic_class_initfn, + .instance_init = scsi_dev_instance_init, }; static void scsi_generic_register_types(void) diff --git a/include/hw/scsi/scsi.h b/include/hw/scsi/scsi.h index 2e3a8f9..99c1c57 100644 --- a/include/hw/scsi/scsi.h +++ b/include/hw/scsi/scsi.h @@ -270,4 +270,5 @@ SCSIDevice *scsi_device_find(SCSIBus *bus, int channel, int target, int lun); /* scsi-generic.c. */ extern const SCSIReqOps scsi_generic_req_ops; +void scsi_dev_instance_init(Object *obj); #endif