diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2016-09-28 16:37:20 +0400 |
|---|---|---|
| committer | Michael Tokarev <mjt@tls.msk.ru> | 2016-10-08 11:25:29 +0300 |
| commit | efee678d6df6ea2f531425e38825883008b3c1a0 (patch) | |
| tree | 14d8d64d74f5fbd2aac22e3b2be32d7ecf5db460 | |
| parent | b16c129daf0fed91febbb88de23dae8271c8898a (diff) | |
| download | focaccia-qemu-efee678d6df6ea2f531425e38825883008b3c1a0.tar.gz focaccia-qemu-efee678d6df6ea2f531425e38825883008b3c1a0.zip | |
exec: remove unused compacted argument
Since commit b35ba30f8f when it was introduced, phys_page_compact() takes an unused compacted argument. ubsan complains about it when launching qemu-x86_64 without arguments: qemu/exec.c:310:5: runtime error: variable length array bound evaluates to non-positive value 0 Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
| -rw-r--r-- | exec.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/exec.c b/exec.c index c8389f93c3..374c364dff 100644 --- a/exec.c +++ b/exec.c @@ -255,7 +255,7 @@ static void phys_page_set(AddressSpaceDispatch *d, /* Compact a non leaf page entry. Simply detect that the entry has a single child, * and update our entry so we can skip it and go directly to the destination. */ -static void phys_page_compact(PhysPageEntry *lp, Node *nodes, unsigned long *compacted) +static void phys_page_compact(PhysPageEntry *lp, Node *nodes) { unsigned valid_ptr = P_L2_SIZE; int valid = 0; @@ -275,7 +275,7 @@ static void phys_page_compact(PhysPageEntry *lp, Node *nodes, unsigned long *com valid_ptr = i; valid++; if (p[i].skip) { - phys_page_compact(&p[i], nodes, compacted); + phys_page_compact(&p[i], nodes); } } @@ -307,10 +307,8 @@ static void phys_page_compact(PhysPageEntry *lp, Node *nodes, unsigned long *com static void phys_page_compact_all(AddressSpaceDispatch *d, int nodes_nb) { - DECLARE_BITMAP(compacted, nodes_nb); - if (d->phys_map.skip) { - phys_page_compact(&d->phys_map, d->map.nodes, compacted); + phys_page_compact(&d->phys_map, d->map.nodes); } } |