From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59406) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T6LNL-0005KQ-ME for qemu-devel@nongnu.org; Tue, 28 Aug 2012 08:58:40 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1T6LNJ-0001HG-4L for qemu-devel@nongnu.org; Tue, 28 Aug 2012 08:58:35 -0400 Received: from mail-yx0-f173.google.com ([209.85.213.173]:38717) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1T6LNI-0001Fg-Vs for qemu-devel@nongnu.org; Tue, 28 Aug 2012 08:58:33 -0400 Received: by mail-yx0-f173.google.com with SMTP id m4so1071981yen.4 for ; Tue, 28 Aug 2012 05:58:32 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 28 Aug 2012 14:52:18 +0200 Message-Id: <1346158339-14431-4-git-send-email-pbonzini@redhat.com> In-Reply-To: <1346158339-14431-1-git-send-email-pbonzini@redhat.com> References: <1346158339-14431-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH for 1.2 3/4] scsi: more fixes to properties for passthrough devices List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aliguori@us.ibm.com Commit 0384783 (scsi-block: remove properties that are not relevant for passthrough, 2012-07-09) removed one property that should have been left there, "bootindex". It also did not touch scsi-generic, while it should have. Fix both problems. Reported-by: Alexandre DERUMIER Signed-off-by: Paolo Bonzini --- hw/scsi-disk.c | 1 + hw/scsi-generic.c | 3 ++- 2 file modificati, 3 inserzioni(+). 1 rimozione(-) diff --git a/hw/scsi-disk.c b/hw/scsi-disk.c index 409f760..21b862d 100644 --- a/hw/scsi-disk.c +++ b/hw/scsi-disk.c @@ -2421,6 +2421,7 @@ static TypeInfo scsi_cd_info = { #ifdef __linux__ static Property scsi_block_properties[] = { DEFINE_PROP_DRIVE("drive", SCSIDiskState, qdev.conf.bs), + DEFINE_PROP_INT32("bootindex", SCSIDiskState, qdev.conf.bootindex, -1), DEFINE_PROP_END_OF_LIST(), }; diff --git a/hw/scsi-generic.c b/hw/scsi-generic.c index 8d51060..a5eb663 100644 --- a/hw/scsi-generic.c +++ b/hw/scsi-generic.c @@ -479,7 +479,8 @@ static SCSIRequest *scsi_new_request(SCSIDevice *d, uint32_t tag, uint32_t lun, } static Property scsi_generic_properties[] = { - DEFINE_BLOCK_PROPERTIES(SCSIDevice, conf), + DEFINE_PROP_DRIVE("drive", SCSIDevice, conf.bs), + DEFINE_PROP_INT32("bootindex", SCSIDevice, conf.bootindex, -1), DEFINE_PROP_END_OF_LIST(), }; -- 1.7.11.2