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>
This commit is contained in:
Marc-André Lureau 2016-09-28 16:37:20 +04:00 committed by Michael Tokarev
parent b16c129daf
commit efee678d6d
1 changed files with 3 additions and 5 deletions

8
exec.c
View File

@ -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, /* 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. * 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; unsigned valid_ptr = P_L2_SIZE;
int valid = 0; int valid = 0;
@ -275,7 +275,7 @@ static void phys_page_compact(PhysPageEntry *lp, Node *nodes, unsigned long *com
valid_ptr = i; valid_ptr = i;
valid++; valid++;
if (p[i].skip) { 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) static void phys_page_compact_all(AddressSpaceDispatch *d, int nodes_nb)
{ {
DECLARE_BITMAP(compacted, nodes_nb);
if (d->phys_map.skip) { if (d->phys_map.skip) {
phys_page_compact(&d->phys_map, d->map.nodes, compacted); phys_page_compact(&d->phys_map, d->map.nodes);
} }
} }