Commit 5c65b1f1 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20200713' into staging 



target-arm queue:
 * 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

# gpg: Signature made Mon 13 Jul 2020 15:08:16 BST
# gpg:                using RSA key E1A5C593CD419DE28E8315CF3C2525ED14360CDE
# gpg:                issuer "peter.maydell@linaro.org"
# gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>" [ultimate]
# gpg:                 aka "Peter Maydell <pmaydell@gmail.com>" [ultimate]
# gpg:                 aka "Peter Maydell <pmaydell@chiark.greenend.org.uk>" [ultimate]
# Primary key fingerprint: E1A5 C593 CD41 9DE2 8E83  15CF 3C25 25ED 1436 0CDE

* remotes/pmaydell/tags/pull-target-arm-20200713: (25 commits)
  hw/arm/aspeed: Do not create and attach empty SD cards by default
  hw/arm/palm.c: Encapsulate misc GPIO handling in a device
  hw/arm/palm.c: Detabify
  hw/arm/tosa: Encapsulate misc GPIO handling in a device
  hw/arm/tosa.c: Detabify
  hw/nios2: exit to main CPU loop only when unmasking interrupts
  target/nios2: Use gen_io_start around wrctl instruction
  target/nios2: in line the semantics of DISAS_UPDATE with other targets
  target/nios2: add DISAS_NORETURN case for nothing more to generate
  util/drm: make portable by avoiding struct dirent d_type
  util/oslib-posix.c: Implement qemu_init_exec_dir() for Haiku
  util/compatfd.c: Only include <sys/syscall.h> if CONFIG_SIGNALFD
  bswap.h: Include <endian.h> on Haiku for bswap operations
  osdep.h: For Haiku, define SIGIO as equivalent to SIGPOLL
  osdep.h: Always include <sys/signal.h> if it exists
  build: Check that mlockall() exists
  util/qemu-openpty.c: Don't assume pty.h is glibc-only
  build: Enable BSD symbols for Haiku
  virtio-iommu: Fix coverity issue in virtio_iommu_handle_command()
  target/arm: Don't do raw writes for PMINTENCLR
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 00ce6c36 756f739b

configure

+36 −2
Original line number Diff line number Diff line
@@ -904,8 +904,8 @@ SunOS) 
;;

Haiku)

  haiku="yes"

  QEMU_CFLAGS="-DB_USE_POSITIVE_POSIX_ERRORS $QEMU_CFLAGS"

  LIBS="-lposix_error_mapper -lnetwork $LIBS"

  QEMU_CFLAGS="-DB_USE_POSITIVE_POSIX_ERRORS -DBSD_SOURCE $QEMU_CFLAGS"

  LIBS="-lposix_error_mapper -lnetwork -lbsd $LIBS"

;;

Linux)

  audio_drv_list="try-pa oss"
@@ -2402,6 +2402,24 @@ else 
  l2tpv3=no

fi



if check_include "pty.h" ; then

  pty_h=yes

else

  pty_h=no

fi



cat > $TMPC <<EOF

#include <sys/mman.h>

int main(int argc, char *argv[]) {

    return mlockall(MCL_FUTURE);

}

EOF

if compile_prog "" "" ; then

  have_mlockall=yes

else

  have_mlockall=no

fi



#########################################

# vhost interdependencies and host support
@@ -3226,6 +3244,13 @@ if check_include "libdrm/drm.h" ; then 
    have_drm_h=yes

fi



#########################################

# sys/signal.h check

have_sys_signal_h=no

if check_include "sys/signal.h" ; then

  have_sys_signal_h=yes

fi



##########################################

# VTE probe
@@ -7415,6 +7440,9 @@ fi 
if test "$have_openpty" = "yes" ; then

    echo "HAVE_OPENPTY=y" >> $config_host_mak

fi

if test "$have_sys_signal_h" = "yes" ; then

    echo "HAVE_SYS_SIGNAL_H=y" >> $config_host_mak

fi



# Work around a system header bug with some kernel/XFS header

# versions where they both try to define 'struct fsxattr':
@@ -7893,6 +7921,12 @@ fi 
if test "$sheepdog" = "yes" ; then

  echo "CONFIG_SHEEPDOG=y" >> $config_host_mak

fi

if test "$pty_h" = "yes" ; then

  echo "HAVE_PTY_H=y" >> $config_host_mak

fi

if test "$have_mlockall" = "yes" ; then

  echo "HAVE_MLOCKALL=y" >> $config_host_mak

fi

if test "$fuzzing" = "yes" ; then

  if test "$have_fuzzer" = "yes"; then

    FUZZ_LDFLAGS=" -fsanitize=address,fuzzer"

hw/arm/aspeed.c

+5 −4
Original line number Diff line number Diff line
@@ -246,11 +246,12 @@ static void sdhci_attach_drive(SDHCIState *sdhci, DriveInfo *dinfo) 
{

        DeviceState *card;



        if (!dinfo) {

            return;

        }

        card = qdev_new(TYPE_SD_CARD);

        if (dinfo) {

        qdev_prop_set_drive_err(card, "drive", blk_by_legacy_dinfo(dinfo),

                                &error_fatal);

        }

        qdev_realize_and_unref(card,

                               qdev_get_child_bus(DEVICE(sdhci), "sd-bus"),

                               &error_fatal);

hw/arm/fsl-imx25.c

+7 −0
Original line number Diff line number Diff line
@@ -171,6 +171,7 @@ 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)) {
@@ -315,10 +316,16 @@ 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)

{

    DeviceClass *dc = DEVICE_CLASS(oc);



    device_class_set_props(dc, fsl_imx25_properties);

    dc->realize = fsl_imx25_realize;

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

    /*

hw/arm/fsl-imx6.c

+7 −0
Original line number Diff line number Diff line
@@ -377,6 +377,7 @@ 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;
@@ -449,10 +450,16 @@ 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 */

hw/arm/fsl-imx7.c

+9 −0
Original line number Diff line number Diff line
@@ -363,6 +363,8 @@ static void fsl_imx7_realize(DeviceState *dev, Error **errp) 
            FSL_IMX7_ENET2_ADDR,

        };



        object_property_set_uint(OBJECT(&s->eth[i]), "phy-num",

                                 s->phy_num[i], &error_abort);

        object_property_set_uint(OBJECT(&s->eth[i]), "tx-ring-num",

                                 FSL_IMX7_ETH_NUM_TX_RINGS, &error_abort);

        qdev_set_nic_properties(DEVICE(&s->eth[i]), &nd_table[i]);
@@ -550,10 +552,17 @@ static void fsl_imx7_realize(DeviceState *dev, Error **errp) 
                                FSL_IMX7_PCIE_PHY_SIZE);

}



static Property fsl_imx7_properties[] = {

    DEFINE_PROP_UINT32("fec1-phy-num", FslIMX7State, phy_num[0], 0),

    DEFINE_PROP_UINT32("fec2-phy-num", FslIMX7State, phy_num[1], 1),

    DEFINE_PROP_END_OF_LIST(),

};



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

{

    DeviceClass *dc = DEVICE_CLASS(oc);



    device_class_set_props(dc, fsl_imx7_properties);

    dc->realize = fsl_imx7_realize;



    /* Reason: Uses serial_hds and nd_table in realize() directly */