diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2015-03-23 15:29:25 +0000 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2015-04-28 15:36:08 +0200 |
| commit | 5863d374a32c98a7adb4c5e49d62de3cdc16d2ea (patch) | |
| tree | 95c62c0765d3d399cea6faaa97add282e6868be5 | |
| parent | ad5f5fdca83cccd1a4c269b1fd8ba2fce8d1ba26 (diff) | |
| download | qemu-5863d374a32c98a7adb4c5e49d62de3cdc16d2ea.tar.gz qemu-5863d374a32c98a7adb4c5e49d62de3cdc16d2ea.tar.bz2 qemu-5863d374a32c98a7adb4c5e49d62de3cdc16d2ea.zip | |
uninorth: convert ffs(3) to ctz32()
It is not clear from the code how a 0 parameter should be handled by the
hardware. Keep the same behavior as ffs(0) - 1 == -1.
Cc: Alexander Graf <agraf@suse.de>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 1427124571-28598-4-git-send-email-stefanha@redhat.com
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
| -rw-r--r-- | hw/pci-host/uninorth.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/hw/pci-host/uninorth.c b/hw/pci-host/uninorth.c index 53f2b59ae8..f0144eb7b0 100644 --- a/hw/pci-host/uninorth.c +++ b/hw/pci-host/uninorth.c @@ -92,7 +92,10 @@ static uint32_t unin_get_config_reg(uint32_t reg, uint32_t addr) uint32_t slot, func; /* Grab CFA0 style values */ - slot = ffs(reg & 0xfffff800) - 1; + slot = ctz32(reg & 0xfffff800); + if (slot == 32) { + slot = -1; /* XXX: should this be 0? */ + } func = (reg >> 8) & 7; /* ... and then convert them to x86 format */ |