diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-11-23 13:15:02 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-11-23 13:15:02 +0000 |
| commit | 1b89975d420c4c6c2967730ea20f0fd0ce211c1f (patch) | |
| tree | 75aa511bfd83bc8c34529d7d49ef5c1107454f7a /hw/ppc | |
| parent | 2fe47fce7860a1f1212f6b309fcc1c3163c532de (diff) | |
| parent | 6dd836f5d32b989e18c6dda655a26f4d73a52f6a (diff) | |
| download | qemu-1b89975d420c4c6c2967730ea20f0fd0ce211c1f.zip qemu-1b89975d420c4c6c2967730ea20f0fd0ce211c1f.tar.gz qemu-1b89975d420c4c6c2967730ea20f0fd0ce211c1f.tar.bz2 | |
Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.11-20171122' into staging
ppc patch queue 2017-11-22
Several more fixes to merge for qemu-2.11.
# gpg: Signature made Wed 22 Nov 2017 04:29:57 GMT
# gpg: using RSA key 0x6C38CACA20D9B392
# gpg: Good signature from "David Gibson <david@gibson.dropbear.id.au>"
# gpg: aka "David Gibson (Red Hat) <dgibson@redhat.com>"
# gpg: aka "David Gibson (ozlabs.org) <dgibson@ozlabs.org>"
# gpg: aka "David Gibson (kernel.org) <dwg@kernel.org>"
# Primary key fingerprint: 75F4 6586 AE61 A66C C44E 87DC 6C38 CACA 20D9 B392
* remotes/dgibson/tags/ppc-for-2.11-20171122:
ppc: fix VTB migration
spapr: Implement bug in spapr-vty device to be compatible with PowerVM
hw/ppc/spapr: Fix virtio-scsi bootindex handling for LUNs >= 256
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/ppc')
| -rw-r--r-- | hw/ppc/spapr.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 6285f72..4d0a84f 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2663,6 +2663,10 @@ static char *spapr_get_fw_dev_path(FWPathProvider *p, BusState *bus, * swap 0100 or 10 << or 20 << ( target lun-id -- srplun ) */ unsigned id = 0x1000000 | (d->id << 16) | d->lun; + if (d->lun >= 256) { + /* Use the LUN "flat space addressing method" */ + id |= 0x4000; + } return g_strdup_printf("%s@%"PRIX64, qdev_fw_name(dev), (uint64_t)id << 32); } else if (usb) { |