~ubuntu-branches/ubuntu/saucy/seabios/saucy-proposed

« back to all changes in this revision

Viewing changes to src/virtio-scsi.c

  • Committer: Package Import Robot
  • Author(s): Michael Tokarev
  • Date: 2013-07-08 21:34:44 UTC
  • mfrom: (1.1.7)
  • Revision ID: package-import@ubuntu.com-20130708213444-6ed9q23j39x143lu
Tags: 1.7.3-1
Multi-Arch: allowed

Show diffs side-by-side

added added

removed removed

Lines of Context:
14
14
#include "pci_ids.h" // PCI_DEVICE_ID_VIRTIO_BLK
15
15
#include "pci_regs.h" // PCI_VENDOR_ID
16
16
#include "boot.h" // bootprio_find_scsi_device
17
 
#include "blockcmd.h" // scsi_init_drive
 
17
#include "blockcmd.h" // scsi_drive_setup
18
18
#include "virtio-pci.h"
19
19
#include "virtio-ring.h"
20
20
#include "virtio-scsi.h"
114
114
    vlun->lun = lun;
115
115
 
116
116
    int prio = bootprio_find_scsi_device(pci, target, lun);
117
 
    int ret = scsi_init_drive(&vlun->drive, "virtio-scsi", prio);
 
117
    int ret = scsi_drive_setup(&vlun->drive, "virtio-scsi", prio);
118
118
    if (ret)
119
119
        goto fail;
120
120
    return 0;
167
167
virtio_scsi_setup(void)
168
168
{
169
169
    ASSERT32FLAT();
170
 
    if (! CONFIG_VIRTIO_SCSI || CONFIG_COREBOOT)
 
170
    if (! CONFIG_VIRTIO_SCSI)
171
171
        return;
172
172
 
173
173
    dprintf(3, "init virtio-scsi\n");