[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 18/26] exec: remove unused compacted argument
From: |
Michael Tokarev |
Subject: |
[Qemu-devel] [PULL 18/26] exec: remove unused compacted argument |
Date: |
Sat, 8 Oct 2016 11:58:04 +0300 |
From: Marc-André Lureau <address@hidden>
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 <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
exec.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/exec.c b/exec.c
index c8389f9..374c364 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);
}
}
--
2.1.4
- [Qemu-devel] [PULL 23/26] char: fix missing return in error path for chardev TLS init, (continued)
- [Qemu-devel] [PULL 23/26] char: fix missing return in error path for chardev TLS init, Michael Tokarev, 2016/10/08
- [Qemu-devel] [PULL 22/26] CODING_STYLE: Fix a typo ("have" vs. "has"), Michael Tokarev, 2016/10/08
- [Qemu-devel] [PULL 05/26] MAINTAINERS: Add some more files to the HMP section, Michael Tokarev, 2016/10/08
- [Qemu-devel] [PULL 02/26] bt-hci-csr: drop unused argument, Michael Tokarev, 2016/10/08
- [Qemu-devel] [PULL 07/26] MAINTAINERS: Add some SPARC machine related files, Michael Tokarev, 2016/10/08
- [Qemu-devel] [PULL 20/26] build-sys: fix find-in-path, Michael Tokarev, 2016/10/08
- [Qemu-devel] [PULL 12/26] MAINTAINERS: Add usermode related config files, Michael Tokarev, 2016/10/08
- [Qemu-devel] [PULL 04/26] MAINTAINERS: Add files to the Moxie section., Michael Tokarev, 2016/10/08
- [Qemu-devel] [PULL 06/26] MAINTAINERS: Add include/hw/audio/ to audio section, Michael Tokarev, 2016/10/08
- [Qemu-devel] [PULL 15/26] maint: Add module_block.h to .gitignore, Michael Tokarev, 2016/10/08
- [Qemu-devel] [PULL 18/26] exec: remove unused compacted argument,
Michael Tokarev <=
- [Qemu-devel] [PULL 25/26] virtio: rename the bar index field name in VirtIOPCIProxy, Michael Tokarev, 2016/10/08
- [Qemu-devel] [PULL 24/26] linux-user: include <poll.h> instead of <sys/poll.h>, Michael Tokarev, 2016/10/08
- [Qemu-devel] [PULL 08/26] MAINTAINERS: Add some more files to the virtio section, Michael Tokarev, 2016/10/08
- [Qemu-devel] [PULL 01/26] qemu-options.hx: fix -chardev ringbuf typos, Michael Tokarev, 2016/10/08
- Re: [Qemu-devel] [PULL 00/26] Trivial patches for 2016-10-08, Peter Maydell, 2016/10/10