← Back to branch summary

~ubuntu-branches/ubuntu/hardy/kvm/hardy-backports

« back to all changes in this revision

Viewing changes to qemu/hw/esp.c

  • Committer: Bazaar Package Importer
  • Author(s): Soren Hansen
  • Date: 2008-01-03 10:39:25 UTC
  • mfrom: (1.1.16 upstream)
  • Revision ID: james.westby@ubuntu.com-20080103103925-8480u7sq2646hvbh
Tags: 1:59+dfsg-0ubuntu1
* New upstream release
* Build with alsa support (cherry pick from 57+dfsg-2)

Show diffs side-by-side

added added

removed removed

Lines of Context:
qemu/hw/esp.c
615
615
    }
616
616
    DPRINTF("Attaching block device %d\n", id);
617
617
    /* Command queueing is not implemented.  */
618
 
    s->scsi_dev[id] = scsi_disk_init(bd, 0, esp_command_complete, s);
 
618
    s->scsi_dev[id] = scsi_generic_init(bd, 0, esp_command_complete, s);
 
619
    if (s->scsi_dev[id] == NULL)
 
620
        s->scsi_dev[id] = scsi_disk_init(bd, 0, esp_command_complete, s);
619
621
}
620
622
 
621
623
void *esp_init(target_phys_addr_t espaddr,