diff options
| author | Gonglei <arei.gonglei@huawei.com> | 2014-10-07 16:00:36 +0800 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2014-10-15 10:46:01 +0200 |
| commit | d749e10c4f97a0239180215c6d7d18712361a430 (patch) | |
| tree | 9772a48a6a203f4e21ab1ad2166f6473bfd053d1 /hw/scsi | |
| parent | d2b186f96d19c1f8a6b7e528ff32c24096d5b204 (diff) | |
bootindex: move calling add_boot_device_patch to bootindex setter function
On this way, we can assure the new bootindex take effect
during vm rebooting.
Signed-off-by: Gonglei <arei.gonglei@huawei.com>
Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'hw/scsi')
| -rw-r--r-- | hw/scsi/scsi-disk.c | 1 | ||||
| -rw-r--r-- | hw/scsi/scsi-generic.c | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index 9cd3445fe9..ae9e08dd13 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -2269,7 +2269,6 @@ static void scsi_realize(SCSIDevice *dev, Error **errp) bdrv_set_guest_block_size(s->qdev.conf.bs, s->qdev.blocksize); bdrv_iostatus_enable(s->qdev.conf.bs); - add_boot_device_path(s->qdev.conf.bootindex, &dev->qdev, NULL); } static void scsi_hd_realize(SCSIDevice *dev, Error **errp) diff --git a/hw/scsi/scsi-generic.c b/hw/scsi/scsi-generic.c index 03b980c44d..84a1d5bfe3 100644 --- a/hw/scsi/scsi-generic.c +++ b/hw/scsi/scsi-generic.c @@ -413,9 +413,6 @@ static void scsi_generic_realize(SCSIDevice *s, Error **errp) /* 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: |