aboutsummaryrefslogtreecommitdiffstats
path: root/hw
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2012-01-19 12:51:02 -0600
committerAnthony Liguori <aliguori@us.ibm.com>2012-01-19 12:51:02 -0600
commit515689235c4c3d9c3f0406ddcdd21ed8da77062b (patch)
tree6306614d3cda0a27461c2b1beccf1e34f14ccb92 /hw
parenta75e6678fe095147c7343ec9d0e772ae640f0e7a (diff)
parent6b7332eb4013fec6ad294115ab889d77d4463624 (diff)
Merge remote-tracking branch 'spice/spice.v47' into staging
* spice/spice.v47: qxl: Slot sanity check in qxl_phys2virt() is off by one, fix
Diffstat (limited to 'hw')
-rw-r--r--hw/qxl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/qxl.c b/hw/qxl.c
index ac819271b..bdd36f9d0 100644
--- a/hw/qxl.c
+++ b/hw/qxl.c
@@ -1020,7 +1020,7 @@ void *qxl_phys2virt(PCIQXLDevice *qxl, QXLPHYSICAL pqxl, int group_id)
case MEMSLOT_GROUP_HOST:
return (void*)offset;
case MEMSLOT_GROUP_GUEST:
- PANIC_ON(slot > NUM_MEMSLOTS);
+ PANIC_ON(slot >= NUM_MEMSLOTS);
PANIC_ON(!qxl->guest_slots[slot].active);
PANIC_ON(offset < qxl->guest_slots[slot].delta);
offset -= qxl->guest_slots[slot].delta;