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

« back to all changes in this revision

Viewing changes to src/lsi-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:
17
17
#include "pci_ids.h" // PCI_DEVICE_ID_VIRTIO_BLK
18
18
#include "pci_regs.h" // PCI_VENDOR_ID
19
19
#include "boot.h" // bootprio_find_scsi_device
20
 
#include "blockcmd.h" // scsi_init_drive
 
20
#include "blockcmd.h" // scsi_drive_setup
 
21
#include "paravirt.h" // runningOnQEMU
21
22
#include "disk.h"
22
23
 
23
24
#define LSI_REG_DSTAT     0x0c
152
153
                          pci_bdf_to_bus(pci->bdf), pci_bdf_to_dev(pci->bdf),
153
154
                          pci_bdf_to_fn(pci->bdf), target, lun);
154
155
    int prio = bootprio_find_scsi_device(pci, target, lun);
155
 
    int ret = scsi_init_drive(&llun->drive, name, prio);
 
156
    int ret = scsi_drive_setup(&llun->drive, name, prio);
156
157
    free(name);
157
158
    if (ret)
158
159
        goto fail;
197
198
lsi_scsi_setup(void)
198
199
{
199
200
    ASSERT32FLAT();
200
 
    if (!CONFIG_LSI_SCSI)
 
201
    if (!CONFIG_LSI_SCSI || !runningOnQEMU())
201
202
        return;
202
203
 
203
204
    dprintf(3, "init lsi53c895a\n");