From ebe994c74dd0cd66a26da2120c26450dba83a131 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Wed, 22 Feb 2012 14:12:38 +0100 Subject: [PATCH 082/109] scsi-generic: add as boot device RH-Author: Paolo Bonzini Message-id: <1329919979-20948-82-git-send-email-pbonzini@redhat.com> Patchwork-id: 37561 O-Subject: [RHEL 6.3 qemu-kvm PATCH v2 081/102] scsi-generic: add as boot device Bugzilla: 782029 RH-Acked-by: Laszlo Ersek RH-Acked-by: Orit Wasserman RH-Acked-by: Gerd Hoffmann 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 (cherry picked from 28b77657cfb44cdcc379997340701d73432b9007) --- hw/scsi-generic.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) Signed-off-by: Michal Novotny --- 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 e5a41d8..d5da2bc 100644 --- a/hw/scsi-generic.c +++ b/hw/scsi-generic.c @@ -419,6 +419,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); @@ -465,6 +469,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.7.6