The following changes since commit 3e08b2b9cb64bff2b73fa9128c0e49bfcde0dd40:

Merge remote-tracking branch 'remotes/philmd-gitlab/tags/edk2-next-20200121' into staging (2020-01-21 15:29:25 +0000)

https://github.com/rth7680/qemu.git tags/pull-tcg-20200121

for you to fetch changes up to 75fa376cdab5e5db2c7fdd107358e16f95503ac6:

scripts/git.orderfile: Display decodetree before C source (2020-01-21 15:26:09 -1000)

Remove another limit to NB_MMU_MODES.

Fix compilation using uclibc.

Fix defaulting of -accel parameters.

Tidy cputlb basic routines.

Adjust git.orderfile for decodetree.

Carlos Santos (1):

util/cacheinfo: fix crash when compiling with uClibc

Philippe Mathieu-Daudé (1):

scripts/git.orderfile: Display decodetree before C source

Richard Henderson (14):

cputlb: Handle NB_MMU_MODES > TARGET_PAGE_BITS_MIN

vl: Remove unused variable in configure_accelerators

vl: Reduce scope of variables in configure_accelerators

vl: Remove useless test in configure_accelerators

vl: Only choose enabled accelerators in configure_accelerators

cputlb: Merge tlb_table_flush_by_mmuidx into tlb_flush_one_mmuidx_locked

cputlb: Make tlb_n_entries private to cputlb.c

cputlb: Pass CPUTLBDescFast to tlb_n_entries and sizeof_tlb

cputlb: Hoist tlb portions in tlb_mmu_resize_locked

cputlb: Hoist tlb portions in tlb_flush_one_mmuidx_locked

cputlb: Split out tlb_mmu_flush_locked

cputlb: Partially merge tlb_dyn_init into tlb_init

cputlb: Initialize tlbs as flushed

cputlb: Hoist timestamp outside of loops over tlbs

include/exec/cpu_ldst.h | 5 -

accel/tcg/cputlb.c | 287 +++++++++++++++++++++++++++++++++---------------

util/cacheinfo.c | 10 +-

vl.c | 27 +++--

scripts/git.orderfile | 3 +

5 files changed, 223 insertions(+), 109 deletions(-)

From: Philippe Mathieu-Daudé <philmd@redhat.com>

Message-Id: <20191230082856.30556-1-philmd@redhat.com>

scripts/git.orderfile | 3 +++

1 file changed, 3 insertions(+)

diff --git a/scripts/git.orderfile b/scripts/git.orderfile

--- a/scripts/git.orderfile

+++ b/scripts/git.orderfile

@@ -XXX,XX +XXX,XX @@ qga/*.json

# headers

*.h

+# decoding tree specification

+*.decode

+

# code

*.c

2.20.1

By choosing "tcg:kvm" when kvm is not enabled, we generate

an incorrect warning: "invalid accelerator kvm".

vl.c | 21 +++++++++++++--------

1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/vl.c b/vl.c

--- a/vl.c

+++ b/vl.c

@@ -XXX,XX +XXX,XX @@ static void configure_accelerators(const char *progname)

if (accel == NULL) {

/* Select the default accelerator */

- if (!accel_find("tcg") && !accel_find("kvm")) {

- error_report("No accelerator selected and"

- " no default accelerator available");

- exit(1);

- } else {

- int pnlen = strlen(progname);

- if (pnlen >= 3 && g_str_equal(&progname[pnlen - 3], "kvm")) {

+ bool have_tcg = accel_find("tcg");

+ bool have_kvm = accel_find("kvm");

+ if (have_tcg && have_kvm) {

+ if (g_str_has_suffix(progname, "kvm")) {

/* If the program name ends with "kvm", we prefer KVM */

accel = "kvm:tcg";

} else {

accel = "tcg:kvm";

}

+ } else if (have_kvm) {

+ accel = "kvm";

+ } else if (have_tcg) {

+ accel = "tcg";

+ } else {

+ error_report("No accelerator selected and"

+ " no default accelerator available");

+ exit(1);

-

accel_list = g_strsplit(accel, ":", 0);

for (tmp = accel_list; *tmp; tmp++) {

2.20.1

There's little point in leaving these data structures half initialized,

and relying on a flush to be done during reset.

Reviewed-by: Alistair Francis <alistair.francis@wdc.com>

accel/tcg/cputlb.c | 5 +++--

1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c

--- a/accel/tcg/cputlb.c

+++ b/accel/tcg/cputlb.c

@@ -XXX,XX +XXX,XX @@ static void tlb_mmu_init(CPUTLBDesc *desc, CPUTLBDescFast *fast, int64_t now)

fast->mask = (n_entries - 1) << CPU_TLB_ENTRY_BITS;

fast->table = g_new(CPUTLBEntry, n_entries);

desc->iotlb = g_new(CPUIOTLBEntry, n_entries);

+ tlb_mmu_flush_locked(desc, fast);

static inline void tlb_n_used_entries_inc(CPUArchState *env, uintptr_t mmu_idx)

@@ -XXX,XX +XXX,XX @@ void tlb_init(CPUState *cpu)

qemu_spin_init(&env_tlb(env)->c.lock);

- /* Ensure that cpu_reset performs a full flush. */

- env_tlb(env)->c.dirty = ALL_MMUIDX_BITS;

+ /* All tlbs are initialized flushed. */

+ env_tlb(env)->c.dirty = 0;

for (i = 0; i < NB_MMU_MODES; i++) {

tlb_mmu_init(&env_tlb(env)->d[i], &env_tlb(env)->f[i], now);

2.20.1

The result of g_strsplit is never NULL.

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Reviewed by: Aleksandar Markovic <amarkovic@wavecomp.com>

vl.c | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vl.c b/vl.c

index XXXXXXX..XXXXXXX 100644

--- a/vl.c

+++ b/vl.c

@@ -XXX,XX +XXX,XX @@ static void configure_accelerators(const char *progname)

accel_list = g_strsplit(accel, ":", 0);

- for (tmp = accel_list; tmp && *tmp; tmp++) {

+ for (tmp = accel_list; *tmp; tmp++) {

/*

* Filter invalid accelerators here, to prevent obscenities

* such as "-machine accel=tcg,,thread=single".