Last lot of target-arm changes to squeeze in before rc1:

* various minor Arm bug fixes

* David Carlier's Haiku build portability fixes

* Wentong Wu's fixes for icount handling in the nios2 target

The following changes since commit 00ce6c36b35e0eb8cc5d68a28f288a6335848813:

Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2020-07-13' into staging (2020-07-13 13:01:30 +0100)

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

for you to fetch changes up to 756f739b1682bf131994ec96dad7fbdf8b54493a:

hw/arm/aspeed: Do not create and attach empty SD cards by default (2020-07-13 14:36:12 +0100)

* hw/arm/bcm2836: Remove unused 'cpu_type' field

* target/arm: Fix mtedesc for do_mem_zpz

* Add the ability to change the FEC PHY MDIO device number on i.MX25/i.MX6/i.MX7

* target/arm: Don't do raw writes for PMINTENCLR

* virtio-iommu: Fix coverity issue in virtio_iommu_handle_command()

* build: Fix various issues with building on Haiku

* target/nios2: fix wrctl behaviour when using icount

* hw/arm/tosa: Encapsulate misc GPIO handling in a device

* hw/arm/palm.c: Encapsulate misc GPIO handling in a device

* hw/arm/aspeed: Do not create and attach empty SD cards by default

Aaron Lindsay (1):

target/arm: Don't do raw writes for PMINTENCLR

David CARLIER (8):

build: Enable BSD symbols for Haiku

util/qemu-openpty.c: Don't assume pty.h is glibc-only

build: Check that mlockall() exists

osdep.h: Always include <sys/signal.h> if it exists

osdep.h: For Haiku, define SIGIO as equivalent to SIGPOLL

bswap.h: Include <endian.h> on Haiku for bswap operations

util/compatfd.c: Only include <sys/syscall.h> if CONFIG_SIGNALFD

util/oslib-posix.c: Implement qemu_init_exec_dir() for Haiku

Eric Auger (1):

virtio-iommu: Fix coverity issue in virtio_iommu_handle_command()

Gerd Hoffmann (1):

util/drm: make portable by avoiding struct dirent d_type

Jean-Christophe Dubois (3):

Add the ability to change the FEC PHY MDIO device number on i.MX25 processor

Add the ability to change the FEC PHY MDIO device number on i.MX6 processor

Add the ability to change the FEC PHY MDIO devices numbers on i.MX7 processor

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

The 'cpu_type' has been moved from BCM283XState to BCM283XClass

in commit 210f47840d, but we forgot to remove the old variable.

Do it now.

include/hw/arm/bcm2836.h | 1 -

1 file changed, 1 deletion(-)

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

- char *cpu_type;

struct {

2.20.1

From: Jean-Christophe Dubois <jcd@tribudubois.net>

Signed-off-by: Jean-Christophe Dubois <jcd@tribudubois.net>

Message-id: 9f8923ecd974160ae8f634c275b1100c2cbe66d7.1593806826.git.jcd@tribudubois.net

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

[PMM: updated for object_property_set_uint() argument reordering]

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

---

include/hw/arm/fsl-imx25.h | 1 +

hw/arm/fsl-imx25.c | 7 +++++++

2 files changed, 8 insertions(+)

diff --git a/include/hw/arm/fsl-imx25.h b/include/hw/arm/fsl-imx25.h

--- a/include/hw/arm/fsl-imx25.h

+++ b/include/hw/arm/fsl-imx25.h

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

MemoryRegion rom[2];

MemoryRegion iram;

MemoryRegion iram_alias;

+ uint32_t phy_num;

} FslIMX25State;

/**

diff --git a/hw/arm/fsl-imx25.c b/hw/arm/fsl-imx25.c

--- a/hw/arm/fsl-imx25.c

+++ b/hw/arm/fsl-imx25.c

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

epit_table[i].irq));

}

+ object_property_set_uint(OBJECT(&s->fec), "phy-num", s->phy_num, &err);

qdev_set_nic_properties(DEVICE(&s->fec), &nd_table[0]);

if (!sysbus_realize(SYS_BUS_DEVICE(&s->fec), errp)) {

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

&s->iram_alias);

}

+static Property fsl_imx25_properties[] = {

+ DEFINE_PROP_UINT32("fec-phy-num", FslIMX25State, phy_num, 0),

+ DEFINE_PROP_END_OF_LIST(),

static void fsl_imx25_class_init(ObjectClass *oc, void *data)

+ device_class_set_props(dc, fsl_imx25_properties);

dc->realize = fsl_imx25_realize;

dc->desc = "i.MX25 SOC";

/*

2.20.1

From: Jean-Christophe Dubois <jcd@tribudubois.net>

Signed-off-by: Jean-Christophe Dubois <jcd@tribudubois.net>

Message-id: 05a64e83eb1c0c865ac077b22c599425c024c02c.1593806826.git.jcd@tribudubois.net

include/hw/arm/fsl-imx6.h | 1 +

hw/arm/fsl-imx6.c | 7 +++++++

2 files changed, 8 insertions(+)

MemoryRegion caam;

MemoryRegion ocram;

MemoryRegion ocram_alias;

+ uint32_t phy_num;

} FslIMX6State;

diff --git a/hw/arm/fsl-imx6.c b/hw/arm/fsl-imx6.c

--- a/hw/arm/fsl-imx6.c

+++ b/hw/arm/fsl-imx6.c

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

spi_table[i].irq));

}

+ object_property_set_uint(OBJECT(&s->eth), "phy-num", s->phy_num, &err);

qdev_set_nic_properties(DEVICE(&s->eth), &nd_table[0]);

if (!sysbus_realize(SYS_BUS_DEVICE(&s->eth), errp)) {

return;

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

&s->ocram_alias);

}

+static Property fsl_imx6_properties[] = {

+ DEFINE_PROP_UINT32("fec-phy-num", FslIMX6State, phy_num, 0),

+ DEFINE_PROP_END_OF_LIST(),

+};

+

static void fsl_imx6_class_init(ObjectClass *oc, void *data)

DeviceClass *dc = DEVICE_CLASS(oc);

+ device_class_set_props(dc, fsl_imx6_properties);

dc->realize = fsl_imx6_realize;

dc->desc = "i.MX6 SOC";

/* Reason: Uses serial_hd() in the realize() function */

2.20.1

From: Gerd Hoffmann <kraxel@redhat.com>

Given this isn't perforance critical at all lets avoid the non-portable

d_type and use fstat instead to check whenever the file is a chardev.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

Reported-by: David Carlier <devnexen@gmail.com>

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

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

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

Message-id: 20200703145614.16684-10-peter.maydell@linaro.org

Message-id: 20200701180302.14821-1-kraxel@redhat.com

[PMM: fixed comment style; tweaked subject line]

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

util/drm.c | 19 ++++++++++++++-----

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

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

--- a/util/drm.c

+++ b/util/drm.c

@@ -XXX,XX +XXX,XX @@ int qemu_drm_rendernode_open(const char *rendernode)

{

DIR *dir;

struct dirent *e;

- int r, fd;

+ struct stat st;

+ int r, fd, ret;

char *p;

if (rendernode) {

@@ -XXX,XX +XXX,XX @@ int qemu_drm_rendernode_open(const char *rendernode)

fd = -1;

while ((e = readdir(dir))) {

- if (e->d_type != DT_CHR) {

- continue;

- }

-

if (strncmp(e->d_name, "renderD", 7)) {

continue;

}

@@ -XXX,XX +XXX,XX @@ int qemu_drm_rendernode_open(const char *rendernode)

g_free(p);

continue;

}

+ /*

+ * prefer fstat() over checking e->d_type == DT_CHR for

+ * portability reasons

+ */

+ ret = fstat(r, &st);

+ if (ret < 0 || (st.st_mode & S_IFMT) != S_IFCHR) {

+ close(r);

+ g_free(p);

+ continue;

fd = r;

g_free(p);

break;

2.20.1

From: Wentong Wu <wentong.wu@intel.com>

Add DISAS_NORETURN case for nothing more to generate because at runtime

execution will never return from some helper call. And at the same time

replace DISAS_UPDATE in t_gen_helper_raise_exception and gen_exception

with the newly added DISAS_NORETURN.

Signed-off-by: Wentong Wu <wentong.wu@intel.com>

Message-id: 20200710233433.19729-1-wentong.wu@intel.com