Handful of bug fixes to sneak in before rc3.

The following changes since commit c985266ea5b50e46e07b3568c1346e10064205c9:

Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20190726' into staging (2019-07-26 13:52:06 +0100)

https://git.linaro.org/people/pmaydell/qemu-arm.git tags/pull-target-arm-20190726

for you to fetch changes up to 67505c114e6acc26f3a1a2b74833c61b6a34ff95:

hw/arm/boot: Further improve initrd positioning code (2019-07-26 16:17:56 +0100)

* Fix broken migration on pl330 device

* Fix broken migration on stellaris-input device

* Add type checks to vmstate varry macros to avoid this class of bugs

* hw/arm/boot: Fix some remaining cases where we would put the

initrd on top of the kernel image

Damien Hedde (1):

pl330: fix vmstate description

Peter Maydell (4):

stellaris_input: Fix vmstate description of buttons field

vmstate.h: Type check VMSTATE_STRUCT_VARRAY macros

hw/arm/boot: Rename elf_{low, high}_addr to image_{low, high}_addr

hw/arm/boot: Further improve initrd positioning code

include/migration/vmstate.h | 30 ++++++++++++++++++++++++------

hw/arm/boot.c | 37 +++++++++++++++++++++++++++----------

hw/dma/pl330.c | 17 +++++++++--------

hw/input/stellaris_input.c | 10 ++++++----

4 files changed, 66 insertions(+), 28 deletions(-)

In commit e6b2b20d9735d4ef we made the boot loader code try to avoid

putting the initrd on top of the kernel. However the expression used

to calculate the start of the initrd:

info->initrd_start = info->loader_start +

MAX(MIN(info->ram_size / 2, 128 * 1024 * 1024), kernel_size);

incorrectly uses 'kernel_size' as the offset within RAM of the

highest address to avoid. This is incorrect because the kernel

doesn't start at address 0, but slightly higher than that. This

means that we can still incorrectly end up overlaying the initrd on

the kernel in some cases, for example:

* The kernel's image_size is 0x0a7a8000

* The kernel was loaded at 0x40080000

* The end of the kernel is 0x4A828000

* The DTB was loaded at 0x4a800000

To get this right we need to track the actual highest address used

by the kernel and use that rather than kernel_size. We already

set image_low_addr and image_high_addr for ELF images; set them

also for the various other image types we support, and then use

image_high_addr as the lowest allowed address for the initrd.

(We don't use image_low_addr, but we set it for consistency

with the existing code path for ELF files.)

Fixes: e6b2b20d9735d4ef

Reported-by: Mark Rutland <mark.rutland@arm.com>

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

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

Tested-by: Mark Rutland <mark.rutland@arm.com>

Message-id: 20190722151804.25467-3-peter.maydell@linaro.org

---

hw/arm/boot.c | 19 +++++++++++++++++--

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

diff --git a/hw/arm/boot.c b/hw/arm/boot.c

--- a/hw/arm/boot.c

+++ b/hw/arm/boot.c

@@ -XXX,XX +XXX,XX @@ static void arm_setup_direct_kernel_boot(ARMCPU *cpu,

int is_linux = 0;

uint64_t elf_entry;

/* Addresses of first byte used and first byte not used by the image */

- uint64_t image_low_addr, image_high_addr;

+ uint64_t image_low_addr = 0, image_high_addr = 0;

int elf_machine;

hwaddr entry;

static const ARMInsnFixup *primary_loader;

@@ -XXX,XX +XXX,XX @@ static void arm_setup_direct_kernel_boot(ARMCPU *cpu,

uint64_t loadaddr = info->loader_start + KERNEL_NOLOAD_ADDR;

kernel_size = load_uimage_as(info->kernel_filename, &entry, &loadaddr,

&is_linux, NULL, NULL, as);

+ if (kernel_size >= 0) {

+ image_low_addr = loadaddr;

+ image_high_addr = image_low_addr + kernel_size;

+ }

}

if (arm_feature(&cpu->env, ARM_FEATURE_AARCH64) && kernel_size < 0) {

kernel_size = load_aarch64_image(info->kernel_filename,

info->loader_start, &entry, as);

is_linux = 1;

+ if (kernel_size >= 0) {

+ image_low_addr = entry;

+ image_high_addr = image_low_addr + kernel_size;

+ }

} else if (kernel_size < 0) {

/* 32-bit ARM */

entry = info->loader_start + KERNEL_LOAD_ADDR;

kernel_size = load_image_targphys_as(info->kernel_filename, entry,

ram_end - KERNEL_LOAD_ADDR, as);

is_linux = 1;

+ if (kernel_size >= 0) {

+ image_low_addr = entry;

+ image_high_addr = image_low_addr + kernel_size;

+ }

}

if (kernel_size < 0) {

error_report("could not load kernel '%s'", info->kernel_filename);

@@ -XXX,XX +XXX,XX @@ static void arm_setup_direct_kernel_boot(ARMCPU *cpu,

* we might still make a bad choice here.

*/

info->initrd_start = info->loader_start +

- MAX(MIN(info->ram_size / 2, 128 * 1024 * 1024), kernel_size);

+ MIN(info->ram_size / 2, 128 * 1024 * 1024);

+ if (image_high_addr) {

+ info->initrd_start = MAX(info->initrd_start, image_high_addr);

+ }

info->initrd_start = TARGET_PAGE_ALIGN(info->initrd_start);

if (is_linux) {

2.20.1

From: Damien Hedde <damien.hedde@greensocs.com>

Fix the pl330 main and queue vmstate description.

There were missing POINTER flags causing crashes during

incoming migration because:

+ PL330State chan field is a pointer to an array

+ PL330Queue queue field is a pointer to an array

Also bump corresponding vmsd version numbers.

Signed-off-by: Damien Hedde <damien.hedde@greensocs.com>

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

Acked-by: Dr. David Alan Gilbert <dgilbert@redhat.com>

Message-id: 20190724143553.21557-1-damien.hedde@greensocs.com

hw/dma/pl330.c | 17 +++++++++--------

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

diff --git a/hw/dma/pl330.c b/hw/dma/pl330.c

--- a/hw/dma/pl330.c

+++ b/hw/dma/pl330.c

@@ -XXX,XX +XXX,XX @@ typedef struct PL330Queue {

static const VMStateDescription vmstate_pl330_queue = {

.name = "pl330_queue",

- .version_id = 1,

- .minimum_version_id = 1,

+ .version_id = 2,

+ .minimum_version_id = 2,

.fields = (VMStateField[]) {

- VMSTATE_STRUCT_VARRAY_UINT32(queue, PL330Queue, queue_size, 1,

- vmstate_pl330_queue_entry, PL330QueueEntry),

+ VMSTATE_STRUCT_VARRAY_POINTER_UINT32(queue, PL330Queue, queue_size,

+ vmstate_pl330_queue_entry,

+ PL330QueueEntry),

VMSTATE_END_OF_LIST()

}

};

@@ -XXX,XX +XXX,XX @@ struct PL330State {

static const VMStateDescription vmstate_pl330 = {

.name = "pl330",

- .version_id = 1,

- .minimum_version_id = 1,

+ .version_id = 2,

+ .minimum_version_id = 2,

.fields = (VMStateField[]) {

VMSTATE_STRUCT(manager, PL330State, 0, vmstate_pl330_chan, PL330Chan),

- VMSTATE_STRUCT_VARRAY_UINT32(chan, PL330State, num_chnls, 0,

- vmstate_pl330_chan, PL330Chan),

+ VMSTATE_STRUCT_VARRAY_POINTER_UINT32(chan, PL330State, num_chnls,

+ vmstate_pl330_chan, PL330Chan),

VMSTATE_VBUFFER_UINT32(lo_seqn, PL330State, 1, NULL, num_chnls),

VMSTATE_VBUFFER_UINT32(hi_seqn, PL330State, 1, NULL, num_chnls),

VMSTATE_STRUCT(fifo, PL330State, 0, vmstate_pl330_fifo, PL330Fifo),

2.20.1