From: Markus Armbruster <armbru@redhat.com>

The loop does two things: map legacy -drive to properties, and collect

all the backends for use after the loop. The next patch will factor

out the former for reuse in hw/arm/virt.c. To make that easier,

rearrange the loop so it does the first thing first, and the second

thing second.

Signed-off-by: Markus Armbruster <armbru@redhat.com>

Reviewed-by: Laszlo Ersek <lersek@redhat.com>

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

Message-id: 20190416091348.26075-2-armbru@redhat.com

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

---

hw/i386/pc_sysfw.c | 24 +++++++++++-------------

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

diff --git a/hw/i386/pc_sysfw.c b/hw/i386/pc_sysfw.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/i386/pc_sysfw.c

+++ b/hw/i386/pc_sysfw.c

@@ -XXX,XX +XXX,XX @@ void pc_system_firmware_init(PCMachineState *pcms,

/* Map legacy -drive if=pflash to machine properties */

for (i = 0; i < ARRAY_SIZE(pcms->flash); i++) {

- pflash_blk[i] = pflash_cfi01_get_blk(pcms->flash[i]);

pflash_drv = drive_get(IF_PFLASH, 0, i);

- if (!pflash_drv) {

- continue;

+ if (pflash_drv) {

+ loc_push_none(&loc);

+ qemu_opts_loc_restore(pflash_drv->opts);

+ if (pflash_cfi01_get_blk(pcms->flash[i])) {

+ error_report("clashes with -machine");

+ exit(1);

+ }

+ qdev_prop_set_drive(DEVICE(pcms->flash[i]), "drive",

+ blk_by_legacy_dinfo(pflash_drv), &error_fatal);

+ loc_pop(&loc);

}

- loc_push_none(&loc);

- qemu_opts_loc_restore(pflash_drv->opts);

- if (pflash_blk[i]) {

- error_report("clashes with -machine");

- exit(1);

- }

- pflash_blk[i] = blk_by_legacy_dinfo(pflash_drv);

- qdev_prop_set_drive(DEVICE(pcms->flash[i]),

- "drive", pflash_blk[i], &error_fatal);

- loc_pop(&loc);

+ pflash_blk[i] = pflash_cfi01_get_blk(pcms->flash[i]);

}

/* Reject gaps */

--

2.20.1

The Raspberry Pi boards have a physical memory map which does

not allow for more than 1GB of RAM. Currently if the user tries

to ask for more then we fail in a confusing way:

$ qemu-system-aarch64 --machine raspi3 -m 8G

Unexpected error in visit_type_uintN() at qapi/qapi-visit-core.c:164:

qemu-system-aarch64: Parameter 'vcram-base' expects uint32_t

Aborted (core dumped)

Catch this earlier and diagnose it with a more friendly message:

$ qemu-system-aarch64 --machine raspi3 -m 8G

qemu-system-aarch64: Requested ram size is too large for this machine: maximum is 1GB

Fixes: https://bugs.launchpad.net/qemu/+bug/1794187

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

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

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>

---

hw/arm/raspi.c | 7 +++++++

1 file changed, 7 insertions(+)

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

index XXXXXXX..XXXXXXX 100644

--- a/hw/arm/raspi.c

+++ b/hw/arm/raspi.c

@@ -XXX,XX +XXX,XX @@

*/

#include "qemu/osdep.h"

+#include "qemu/units.h"

#include "qapi/error.h"

#include "qemu-common.h"

#include "cpu.h"

@@ -XXX,XX +XXX,XX @@ static void raspi_init(MachineState *machine, int version)

BusState *bus;

DeviceState *carddev;

+ if (machine->ram_size > 1 * GiB) {

+ error_report("Requested ram size is too large for this machine: "

+ "maximum is 1GB");

+ exit(1);

+ }

+

object_initialize(&s->soc, sizeof(s->soc),

version == 3 ? TYPE_BCM2837 : TYPE_BCM2836);

object_property_add_child(OBJECT(machine), "soc", OBJECT(&s->soc),

--

2.20.1

From: Joel Stanley <joel@jms.id.au>

We currently use Qemu's default of 128MB. As we know how much ram each

machine ships with, make it easier on users by setting a default.

It can still be overridden with -m on the command line.

Signed-off-by: Joel Stanley <joel@jms.id.au>

Reviewed-by: Andrew Jeffery <andrew@aj.id.au>

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

Message-id: 20190503022958.1394-1-joel@jms.id.au

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

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

---

include/hw/arm/aspeed.h | 1 +

hw/arm/aspeed.c | 8 ++++++++

2 files changed, 9 insertions(+)

diff --git a/include/hw/arm/aspeed.h b/include/hw/arm/aspeed.h

index XXXXXXX..XXXXXXX 100644

--- a/include/hw/arm/aspeed.h

+++ b/include/hw/arm/aspeed.h

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

const char *spi_model;

uint32_t num_cs;

void (*i2c_init)(AspeedBoardState *bmc);

+ uint32_t ram;

} AspeedBoardConfig;

#define TYPE_ASPEED_MACHINE MACHINE_TYPE_NAME("aspeed")

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

index XXXXXXX..XXXXXXX 100644

--- a/hw/arm/aspeed.c

+++ b/hw/arm/aspeed.c

@@ -XXX,XX +XXX,XX @@

#include "sysemu/block-backend.h"

#include "hw/loader.h"

#include "qemu/error-report.h"

+#include "qemu/units.h"

static struct arm_boot_info aspeed_board_binfo = {

.board_id = -1, /* device-tree-only board */

@@ -XXX,XX +XXX,XX @@ static void aspeed_machine_class_init(ObjectClass *oc, void *data)

mc->no_floppy = 1;

mc->no_cdrom = 1;

mc->no_parallel = 1;

+ if (board->ram) {

+ mc->default_ram_size = board->ram;

+ }

amc->board = board;

}

@@ -XXX,XX +XXX,XX @@ static const AspeedBoardConfig aspeed_boards[] = {

.spi_model = "mx25l25635e",

.num_cs = 1,

.i2c_init = palmetto_bmc_i2c_init,

+ .ram = 256 * MiB,

}, {

.name = MACHINE_TYPE_NAME("ast2500-evb"),

.desc = "Aspeed AST2500 EVB (ARM1176)",

@@ -XXX,XX +XXX,XX @@ static const AspeedBoardConfig aspeed_boards[] = {

.spi_model = "mx25l25635e",

.num_cs = 1,

.i2c_init = ast2500_evb_i2c_init,

+ .ram = 512 * MiB,

}, {

.name = MACHINE_TYPE_NAME("romulus-bmc"),

.desc = "OpenPOWER Romulus BMC (ARM1176)",

@@ -XXX,XX +XXX,XX @@ static const AspeedBoardConfig aspeed_boards[] = {

.spi_model = "mx66l1g45g",

.num_cs = 2,

.i2c_init = romulus_bmc_i2c_init,

+ .ram = 512 * MiB,

}, {

.name = MACHINE_TYPE_NAME("witherspoon-bmc"),

.desc = "OpenPOWER Witherspoon BMC (ARM1176)",

@@ -XXX,XX +XXX,XX @@ static const AspeedBoardConfig aspeed_boards[] = {

.spi_model = "mx66l1g45g",

.num_cs = 2,

.i2c_init = witherspoon_bmc_i2c_init,

+ .ram = 512 * MiB,

},

};

--

2.20.1

From: Cao Jiaxi <driver1998@foxmail.com>

gcc_struct is for x86 only, and it generates an warning on ARM64 Clang/MinGW targets.

Signed-off-by: Cao Jiaxi <driver1998@foxmail.com>

Reviewed-by: Thomas Huth <thuth@redhat.com>

Message-id: 20190503003618.10089-1-driver1998@foxmail.com

[PMM: dropped the slirp change as slirp is now a submodule]

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

---

contrib/libvhost-user/libvhost-user.h | 2 +-

include/qemu/compiler.h | 2 +-

scripts/cocci-macro-file.h | 7 ++++++-

3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/contrib/libvhost-user/libvhost-user.h b/contrib/libvhost-user/libvhost-user.h

index XXXXXXX..XXXXXXX 100644

--- a/contrib/libvhost-user/libvhost-user.h

+++ b/contrib/libvhost-user/libvhost-user.h

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

uint16_t queue_size;

} VhostUserInflight;

-#if defined(_WIN32)

+#if defined(_WIN32) && (defined(__x86_64__) || defined(__i386__))

# define VU_PACKED __attribute__((gcc_struct, packed))

#else

# define VU_PACKED __attribute__((packed))

diff --git a/include/qemu/compiler.h b/include/qemu/compiler.h

index XXXXXXX..XXXXXXX 100644

--- a/include/qemu/compiler.h

+++ b/include/qemu/compiler.h

@@ -XXX,XX +XXX,XX @@

#define QEMU_SENTINEL __attribute__((sentinel))

-#if defined(_WIN32)

+#if defined(_WIN32) && (defined(__x86_64__) || defined(__i386__))

# define QEMU_PACKED __attribute__((gcc_struct, packed))

#else

# define QEMU_PACKED __attribute__((packed))

diff --git a/scripts/cocci-macro-file.h b/scripts/cocci-macro-file.h

index XXXXXXX..XXXXXXX 100644

--- a/scripts/cocci-macro-file.h

+++ b/scripts/cocci-macro-file.h

@@ -XXX,XX +XXX,XX @@

#define QEMU_NORETURN __attribute__ ((__noreturn__))

#define QEMU_WARN_UNUSED_RESULT __attribute__((warn_unused_result))

#define QEMU_SENTINEL __attribute__((sentinel))

-#define QEMU_PACKED __attribute__((gcc_struct, packed))

+

+#if defined(_WIN32) && (defined(__x86_64__) || defined(__i386__))

+# define QEMU_PACKED __attribute__((gcc_struct, packed))

+#else

+# define QEMU_PACKED __attribute__((packed))

+#endif

#define cat(x,y) x ## y

#define cat2(x,y) cat(x,y)

--

2.20.1

From: Cao Jiaxi <driver1998@foxmail.com>

The win2qemu[] is supposed to be the conversion table to convert between

STORAGE_BUS_TYPE in Windows SDK and GuestDiskBusType in qga.

But it was incorrectly written that it forces to set a GuestDiskBusType

value to STORAGE_BUS_TYPE, which generates an enum conversion warning in clang.

Suggested-by: Eric Blake <eblake@redhat.com>

Signed-off-by: Cao Jiaxi <driver1998@foxmail.com>

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

Reviewed-by: Thomas Huth <thuth@redhat.com>

Message-id: 20190503003650.10137-1-driver1998@foxmail.com

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

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

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

---

qga/commands-win32.c | 2 +-

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

diff --git a/qga/commands-win32.c b/qga/commands-win32.c

index XXXXXXX..XXXXXXX 100644

--- a/qga/commands-win32.c

+++ b/qga/commands-win32.c

@@ -XXX,XX +XXX,XX @@ void qmp_guest_file_flush(int64_t handle, Error **errp)

#ifdef CONFIG_QGA_NTDDSCSI

-static STORAGE_BUS_TYPE win2qemu[] = {

+static GuestDiskBusType win2qemu[] = {

[BusTypeUnknown] = GUEST_DISK_BUS_TYPE_UNKNOWN,

[BusTypeScsi] = GUEST_DISK_BUS_TYPE_SCSI,

[BusTypeAtapi] = GUEST_DISK_BUS_TYPE_IDE,

--

2.20.1

From: Cao Jiaxi <driver1998@foxmail.com>

Windows ARM64 uses LLP64 model, which breaks current assumptions.

Signed-off-by: Cao Jiaxi <driver1998@foxmail.com>

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

Reviewed-by: Thomas Huth <thuth@redhat.com>

Message-id: 20190503003707.10185-1-driver1998@foxmail.com

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

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

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

---

util/cacheinfo.c | 2 +-

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

diff --git a/util/cacheinfo.c b/util/cacheinfo.c

index XXXXXXX..XXXXXXX 100644

--- a/util/cacheinfo.c

+++ b/util/cacheinfo.c

@@ -XXX,XX +XXX,XX @@ static void sys_cache_info(int *isize, int *dsize)

static void arch_cache_info(int *isize, int *dsize)

{

if (*isize == 0 || *dsize == 0) {

- unsigned long ctr;

+ uint64_t ctr;

/* The real cache geometry is in CCSIDR_EL1/CLIDR_EL1/CSSELR_EL1,

but (at least under Linux) these are marked protected by the

--

2.20.1

From: Cao Jiaxi <driver1998@foxmail.com>

I encountered the following compilation error on mingw:

/mnt/d/qemu/include/qemu/osdep.h:97:9: error: '__USE_MINGW_ANSI_STDIO' macro redefined [-Werror,-Wmacro-redefined]

#define __USE_MINGW_ANSI_STDIO 1

^

/mnt/d/llvm-mingw/aarch64-w64-mingw32/include/_mingw.h:433:9: note: previous definition is here

#define __USE_MINGW_ANSI_STDIO 0 /* was not defined so it should be 0 */

It turns out that __USE_MINGW_ANSI_STDIO must be set before any

system headers are included, not just before stdio.h.

Signed-off-by: Cao Jiaxi <driver1998@foxmail.com>

Reviewed-by: Thomas Huth <thuth@redhat.com>

Reviewed-by: Stefan Weil <sw@weilnetz.de>

Message-id: 20190503003719.10233-1-driver1998@foxmail.com

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

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

---

include/qemu/osdep.h | 10 +++++-----

1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h

index XXXXXXX..XXXXXXX 100644

--- a/include/qemu/osdep.h

+++ b/include/qemu/osdep.h

@@ -XXX,XX +XXX,XX @@ extern int daemon(int, int);

#endif

#endif

+/* enable C99/POSIX format strings (needs mingw32-runtime 3.15 or later) */

+#ifdef __MINGW32__

+#define __USE_MINGW_ANSI_STDIO 1

+#endif

+

#include <stdarg.h>

#include <stddef.h>

#include <stdbool.h>

#include <stdint.h>

#include <sys/types.h>

#include <stdlib.h>

-

-/* enable C99/POSIX format strings (needs mingw32-runtime 3.15 or later) */

-#ifdef __MINGW32__

-#define __USE_MINGW_ANSI_STDIO 1

-#endif

#include <stdio.h>

#include <string.h>

--

2.20.1

Rule R_CQRV says that if two pending interrupts have the same

group priority then ties are broken by looking at the subpriority.

We had a comment describing this but had forgotten to actually

implement the subpriority comparison. Correct the omission.

(The further tie break rules of "lowest exception number" and

"secure before non-secure" are handled implicitly by the order

in which we iterate through the exceptions in the loops.)

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

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

Message-id: 20190430131439.25251-2-peter.maydell@linaro.org

---

hw/intc/armv7m_nvic.c | 9 +++++++--

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