From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:47340) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RU0D6-0008D0-Jk for qemu-devel@nongnu.org; Fri, 25 Nov 2011 13:09:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RU0D5-0005kr-FT for qemu-devel@nongnu.org; Fri, 25 Nov 2011 13:09:16 -0500 Received: from mx1.redhat.com ([209.132.183.28]:11336) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RU0D4-0005ke-UC for qemu-devel@nongnu.org; Fri, 25 Nov 2011 13:09:15 -0500 From: Kevin Wolf Date: Fri, 25 Nov 2011 19:12:07 +0100 Message-Id: <1322244735-12516-5-git-send-email-kwolf@redhat.com> In-Reply-To: <1322244735-12516-1-git-send-email-kwolf@redhat.com> References: <1322244735-12516-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 04/12] scsi-generic: add as boot device List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Paolo Bonzini There is no reason why a scsi-generic device cannot boot if it has the right type, and indeed it provides already a bootindex property. So register those devices too. Signed-off-by: Paolo Bonzini Signed-off-by: Kevin Wolf --- hw/scsi-generic.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/hw/scsi-generic.c b/hw/scsi-generic.c index 9594cc1..e62044f 100644 --- a/hw/scsi-generic.c +++ b/hw/scsi-generic.c @@ -413,6 +413,10 @@ static int scsi_generic_initfn(SCSIDevice *s) /* define device state */ s->type = scsiid.scsi_type; DPRINTF("device type %d\n", s->type); + if (s->type == TYPE_DISK || s->type == TYPE_ROM) { + add_boot_device_path(s->conf.bootindex, &s->qdev, NULL); + } + switch (s->type) { case TYPE_TAPE: s->blocksize = get_stream_blocksize(s->conf.bs); @@ -459,6 +463,7 @@ static SCSIRequest *scsi_new_request(SCSIDevice *d, uint32_t tag, uint32_t lun, static SCSIDeviceInfo scsi_generic_info = { .qdev.name = "scsi-generic", + .qdev.fw_name = "disk", .qdev.desc = "pass through generic scsi device (/dev/sg*)", .qdev.size = sizeof(SCSIDevice), .qdev.reset = scsi_generic_reset, -- 1.7.6.4