diff options
| author | Anthony Liguori | 2011-08-05 00:15:22 +0200 |
|---|---|---|
| committer | Anthony Liguori | 2011-08-05 00:15:22 +0200 |
| commit | 81e34a2401f7ffd519bb7f093e833cb48734169f (patch) | |
| tree | 146a7b6eebbee1367453fde501d4462ac6d9f8b4 /hw/vhost.c | |
| parent | Merge remote-tracking branch 'alon/pull-libcacard.data' into staging (diff) | |
| parent | vhost: remove an incorrect assert (diff) | |
| download | qemu-81e34a2401f7ffd519bb7f093e833cb48734169f.tar.gz qemu-81e34a2401f7ffd519bb7f093e833cb48734169f.tar.xz qemu-81e34a2401f7ffd519bb7f093e833cb48734169f.zip | |
Merge remote-tracking branch 'mst/for_anthony' into staging
Diffstat (limited to 'hw/vhost.c')
| -rw-r--r-- | hw/vhost.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/hw/vhost.c b/hw/vhost.c index c3d88214fe..19e72555c4 100644 --- a/hw/vhost.c +++ b/hw/vhost.c @@ -120,7 +120,6 @@ static void vhost_dev_unassign_memory(struct vhost_dev *dev, if (start_addr <= reg->guest_phys_addr && memlast >= reglast) { --dev->mem->nregions; --to; - assert(to >= 0); ++overlap_middle; continue; } |