diff options
| author | rn@wyvis.research.intel-research.net <rn@wyvis.research.intel-research.net> | 2003-03-14 15:58:24 +0000 |
|---|---|---|
| committer | rn@wyvis.research.intel-research.net <rn@wyvis.research.intel-research.net> | 2003-03-14 15:58:24 +0000 |
| commit | 0ec37682a14624a0f5097be9ea1fec77453dc8c1 (patch) | |
| tree | bab97e72ada703fd5a1d9c774d3d0451d6ceade7 /xen/drivers/scsi/sd.c | |
| parent | d9812e47d9c20b15dbb920cc451eff1c7b88e81c (diff) | |
| parent | f9e443afb85c3843c8abd0760ee4a77b0aceeeed (diff) | |
| download | xen-0ec37682a14624a0f5097be9ea1fec77453dc8c1.tar.gz xen-0ec37682a14624a0f5097be9ea1fec77453dc8c1.tar.bz2 xen-0ec37682a14624a0f5097be9ea1fec77453dc8c1.zip | |
bitkeeper revision 1.126 (3e71fc20anCOs2KFyD3-AMyHjdJQfg)
resolve merge conflicts manually
Diffstat (limited to 'xen/drivers/scsi/sd.c')
| -rw-r--r-- | xen/drivers/scsi/sd.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/xen/drivers/scsi/sd.c b/xen/drivers/scsi/sd.c index a2a245fddc..88e7ce814a 100644 --- a/xen/drivers/scsi/sd.c +++ b/xen/drivers/scsi/sd.c @@ -1320,17 +1320,21 @@ void scsi_probe_devices(xen_disk_info_t *xdi) Scsi_Disk *sd; int i; xen_disk_info_t *xen_xdi = map_domain_mem(virt_to_phys(xdi)); + unsigned long capacity, device; for ( sd = rscsi_disks, i = 0; i < sd_template.dev_max; i++, sd++ ) { if ( sd->device == NULL ) continue; - xen_xdi->disks[xen_xdi->count].device = MK_SCSI_XENDEV(i); - xen_xdi->disks[xen_xdi->count].capacity = sd->capacity; + device = MK_SCSI_XENDEV(i); + capacity = sd->capacity; + + xen_xdi->disks[xen_xdi->count].device = device; + xen_xdi->disks[xen_xdi->count].capacity = capacity; xen_xdi->count++; printk("Disk %d: SCSI-XENO capacity %dkB (%dMB)\n", - xen_xdi->count, sd->capacity>>1, sd->capacity>>11); + xen_xdi->count, capacity>>1, capacity>>11); } unmap_domain_mem(xen_xdi); |