From: Kamil Rytarowski <n54@gmx.com>

Ensure that C99 macros are defined regardless of the inclusion order of

headers in vixl. This is required at least on NetBSD.

The vixl/globals.h headers defines __STDC_CONSTANT_MACROS and must be

included before other system headers.

This file defines unconditionally the following macros, without altering

the original sources:

- __STDC_CONSTANT_MACROS

- __STDC_LIMIT_MACROS

- __STDC_FORMAT_MACROS

Signed-off-by: Kamil Rytarowski <n54@gmx.com>

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Message-id: 20170514051820.15985-1-n54@gmx.com

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

---

disas/libvixl/Makefile.objs | 3 +++

1 file changed, 3 insertions(+)

diff --git a/disas/libvixl/Makefile.objs b/disas/libvixl/Makefile.objs

index XXXXXXX..XXXXXXX 100644

--- a/disas/libvixl/Makefile.objs

+++ b/disas/libvixl/Makefile.objs

@@ -XXX,XX +XXX,XX @@ libvixl_OBJS = vixl/utils.o \

# The -Wno-sign-compare is needed only for gcc 4.6, which complains about

# some signed-unsigned equality comparisons which later gcc versions do not.

$(addprefix $(obj)/,$(libvixl_OBJS)): QEMU_CFLAGS := -I$(SRC_PATH)/disas/libvixl $(QEMU_CFLAGS) -Wno-sign-compare

+# Ensure that C99 macros are defined regardless of the inclusion order of

+# headers in vixl. This is required at least on NetBSD.

+$(addprefix $(obj)/,$(libvixl_OBJS)): QEMU_CFLAGS += -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -D__STDC_FORMAT_MACROS

common-obj-$(CONFIG_ARM_A64_DIS) += $(libvixl_OBJS)

--

2.7.4

From: Andrew Jones <drjones@redhat.com>

Don't allow load_uboot_image() to proceed when less bytes than

header-size was read.

Signed-off-by: Andrew Jones <drjones@redhat.com>

Message-id: 20170524091315.20284-1-drjones@redhat.com

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

---

hw/core/loader.c | 3 ++-

1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hw/core/loader.c b/hw/core/loader.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/core/loader.c

+++ b/hw/core/loader.c

@@ -XXX,XX +XXX,XX @@ static int load_uboot_image(const char *filename, hwaddr *ep, hwaddr *loadaddr,

return -1;

size = read(fd, hdr, sizeof(uboot_image_header_t));

- if (size < 0)

+ if (size < sizeof(uboot_image_header_t)) {

goto out;

+ }

bswap_uboot_header(hdr);

--

2.7.4

From: Wei Huang <wei@redhat.com>

The PMUv3 driver of linux kernel (in arch/arm64/kernel/perf_event.c)

relies on the PMUVER field of id_aa64dfr0_el1 to decide if PMU support

is present or not. This patch clears the PMUVER field under TCG mode

when vPMU=off. Without it, PMUv3 will init insider guest VMs even

with vPMU=off. This patch also removes a redundant line inside the

if-statement.

Signed-off-by: Wei Huang <wei@redhat.com>

Message-id: 1495123889-32301-1-git-send-email-wei@redhat.com

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

---

target/arm/cpu.c | 2 +-

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

diff --git a/target/arm/cpu.c b/target/arm/cpu.c

index XXXXXXX..XXXXXXX 100644

--- a/target/arm/cpu.c

+++ b/target/arm/cpu.c

@@ -XXX,XX +XXX,XX @@ static void arm_cpu_realizefn(DeviceState *dev, Error **errp)

}

if (!cpu->has_pmu) {

- cpu->has_pmu = false;

unset_feature(env, ARM_FEATURE_PMU);

+ cpu->id_aa64dfr0 &= ~0xf00;

}

if (!arm_feature(env, ARM_FEATURE_EL2)) {

--

2.7.4

When identifying the DFSR format for an alignment fault, use

the mmu index that we are passed, rather than calling cpu_mmu_index()

to get the mmu index for the current CPU state. This doesn't actually

make any difference since the only cases where the current MMU index

differs from the index used for the load are the "unprivileged

load/store" instructions, and in that case the mmu index may

differ but the translation regime is the same (apart from the

"use from Hyp mode" case which is UNPREDICTABLE).

However it's the more logical thing to do.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

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

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Message-id: 1493122030-32191-2-git-send-email-peter.maydell@linaro.org

---

target/arm/op_helper.c | 2 +-

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

diff --git a/target/arm/op_helper.c b/target/arm/op_helper.c

index XXXXXXX..XXXXXXX 100644

--- a/target/arm/op_helper.c

+++ b/target/arm/op_helper.c

@@ -XXX,XX +XXX,XX @@ void arm_cpu_do_unaligned_access(CPUState *cs, vaddr vaddr,

/* the DFSR for an alignment fault depends on whether we're using

* the LPAE long descriptor format, or the short descriptor format

*/

- if (arm_s1_regime_using_lpae_format(env, cpu_mmu_index(env, false))) {

+ if (arm_s1_regime_using_lpae_format(env, mmu_idx)) {

env->exception.fsr = (1 << 9) | 0x21;

} else {

env->exception.fsr = 0x1;

--

2.7.4