qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Kevin Wolf <kwolf@redhat.com>
To: anthony@codemonkey.ws
Cc: kwolf@redhat.com, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH 04/12] scsi-generic: add as boot device
Date: Fri, 25 Nov 2011 19:12:07 +0100	[thread overview]
Message-ID: <1322244735-12516-5-git-send-email-kwolf@redhat.com> (raw)
In-Reply-To: <1322244735-12516-1-git-send-email-kwolf@redhat.com>

From: Paolo Bonzini <pbonzini@redhat.com>

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 <pbonzini@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 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

  parent reply	other threads:[~2011-11-25 18:09 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-11-25 18:12 [Qemu-devel] [PULL 00/12] Block patches for 1.0 Kevin Wolf
2011-11-25 18:12 ` [Qemu-devel] [PATCH 01/12] virtio-blk: fix cross-endian config space Kevin Wolf
2011-11-25 18:12 ` [Qemu-devel] [PATCH 02/12] usb-msd: do not register twice in the boot order Kevin Wolf
2011-11-25 18:12 ` [Qemu-devel] [PATCH 03/12] scsi: fix fw path Kevin Wolf
2011-11-25 18:12 ` Kevin Wolf [this message]
2011-11-25 18:12 ` [Qemu-devel] [PATCH 05/12] sheepdog: Avoid deadlock in error path Kevin Wolf
2011-11-25 18:12 ` [Qemu-devel] [PATCH 06/12] qcow: Add migration blocker Kevin Wolf
2011-11-25 18:12 ` [Qemu-devel] [PATCH 07/12] vdi: " Kevin Wolf
2011-11-25 18:12 ` [Qemu-devel] [PATCH 08/12] vmdk: " Kevin Wolf
2011-11-25 18:12 ` [Qemu-devel] [PATCH 09/12] vpc: " Kevin Wolf
2011-11-25 18:12 ` [Qemu-devel] [PATCH 10/12] vvfat: " Kevin Wolf
2011-11-25 18:12 ` [Qemu-devel] [PATCH 11/12] vdi: Fix memory leak Kevin Wolf
2011-11-25 18:12 ` [Qemu-devel] [PATCH 12/12] vpc: Add missing error handling in alloc_block Kevin Wolf
2011-11-28 22:33 ` [Qemu-devel] [PULL 00/12] Block patches for 1.0 Anthony Liguori

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1322244735-12516-5-git-send-email-kwolf@redhat.com \
    --to=kwolf@redhat.com \
    --cc=anthony@codemonkey.ws \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).