The following changes since commit 61fee7f45955cd0bf9b79be9fa9c7ebabb5e6a85:

Merge remote-tracking branch 'remotes/philmd-gitlab/tags/acceptance-testing-20200622' into staging (2020-06-22 20:50:10 +0100)

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

for you to fetch changes up to 539533b85fbd269f777bed931de8ccae1dd837e9:

arm/virt: Add memory hot remove support (2020-06-23 11:39:48 +0100)

* util/oslib-posix : qemu_init_exec_dir implementation for Mac

* target/arm: Last parts of neon decodetree conversion

* hw/arm/virt: Add 5.0 HW compat props

* hw/watchdog/cmsdk-apb-watchdog: Add trace event for lock status

* mps2: Add CMSDK APB watchdog, FPGAIO block, S2I devices and I2C devices

* mps2: Add some unimplemented-device stubs for audio and GPIO

* mps2-tz: Use the ARM SBCon two-wire serial bus interface

* target/arm: Check supported KVM features globally (not per vCPU)

* tests/qtest/arm-cpu-features: Add feature setting tests

* arm/virt: Add memory hot remove support

Andrew Jones (2):

hw/arm/virt: Add 5.0 HW compat props

tests/qtest/arm-cpu-features: Add feature setting tests

David CARLIER (1):

util/oslib-posix : qemu_init_exec_dir implementation for Mac

Peter Maydell (23):

target/arm: Convert Neon 2-reg-misc VREV64 to decodetree

target/arm: Convert Neon 2-reg-misc pairwise ops to decodetree

target/arm: Convert VZIP, VUZP to decodetree

target/arm: Convert Neon narrowing moves to decodetree

target/arm: Convert Neon 2-reg-misc VSHLL to decodetree

target/arm: Convert Neon VCVT f16/f32 insns to decodetree

target/arm: Convert vectorised 2-reg-misc Neon ops to decodetree

target/arm: Convert Neon 2-reg-misc crypto operations to decodetree

target/arm: Rename NeonGenOneOpFn to NeonGenOne64OpFn

target/arm: Fix capitalization in NeonGenTwo{Single, Double}OPFn typedefs

target/arm: Make gen_swap_half() take separate src and dest

target/arm: Convert Neon 2-reg-misc VREV32 and VREV16 to decodetree

target/arm: Convert remaining simple 2-reg-misc Neon ops

target/arm: Convert Neon VQABS, VQNEG to decodetree

target/arm: Convert simple fp Neon 2-reg-misc insns

target/arm: Convert Neon 2-reg-misc fp-compare-with-zero insns to decodetree

target/arm: Convert Neon 2-reg-misc VRINT insns to decodetree

target/arm: Convert Neon 2-reg-misc VCVT insns to decodetree

target/arm: Convert Neon VSWP to decodetree

target/arm: Convert Neon VTRN to decodetree

target/arm: Move some functions used only in translate-neon.inc.c to that file

target/arm: Remove unnecessary gen_io_end() calls

target/arm: Remove dead code relating to SABA and UABA

Philippe Mathieu-Daudé (15):

hw/watchdog/cmsdk-apb-watchdog: Add trace event for lock status

hw/i2c/versatile_i2c: Add definitions for register addresses

hw/i2c/versatile_i2c: Add SCL/SDA definitions

hw/i2c: Add header for ARM SBCon two-wire serial bus interface

hw/arm: Use TYPE_VERSATILE_I2C instead of hardcoded string

hw/arm/mps2: Document CMSDK/FPGA APB subsystem sections

hw/arm/mps2: Rename CMSDK AHB peripheral region

hw/arm/mps2: Add CMSDK APB watchdog device

hw/arm/mps2: Add CMSDK AHB GPIO peripherals as unimplemented devices

hw/arm/mps2: Map the FPGA I/O block

hw/arm/mps2: Add SPI devices

hw/arm/mps2: Add I2C devices

hw/arm/mps2: Add audio I2S interface as unimplemented device

hw/arm/mps2-tz: Use the ARM SBCon two-wire serial bus interface

target/arm: Check supported KVM features globally (not per vCPU)

Shameer Kolothum (1):

arm/virt: Add memory hot remove support

Since commit ba3e7926691ed3 it has been unnecessary for target code

to call gen_io_end() after an IO instruction in icount mode; it is

sufficient to call gen_io_start() before it and to force the end of

the TB.

Many now-unnecessary calls to gen_io_end() were removed in commit

9e9b10c6491153b, but some were missed or accidentally added later.

Remove unneeded calls from the arm target:

* the call in the handling of exception-return-via-LDM is

unnecessary, and the code is already forcing end-of-TB

* the call in the VFP access check code is more complicated:

we weren't ending the TB, so we need to add the code to

force that by setting DISAS_UPDATE

* the doc comment for ARM_CP_IO doesn't need to mention

gen_io_end() any more

target/arm/cpu.h | 2 +-

target/arm/translate-vfp.inc.c | 7 +++----

target/arm/translate.c | 3 ---

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

@@ -XXX,XX +XXX,XX @@ static inline uint64_t cpreg_to_kvm_id(uint32_t cpregid)

* migration or KVM state synchronization. (Typically this is for "registers"

* which are actually used as instructions for cache maintenance and so on.)

* IO indicates that this register does I/O and therefore its accesses

- * need to be surrounded by gen_io_start()/gen_io_end(). In particular,

+ * need to be marked with gen_io_start() and also end the TB. In particular,

* registers which implement clocks or timers require this.

* RAISES_EXC is for when the read or write hook might raise an exception;

* the generated code will synchronize the CPU state before calling the hook

diff --git a/target/arm/translate-vfp.inc.c b/target/arm/translate-vfp.inc.c

index XXXXXXX..XXXXXXX 100644

--- a/target/arm/translate-vfp.inc.c

+++ b/target/arm/translate-vfp.inc.c

@@ -XXX,XX +XXX,XX @@ static bool full_vfp_access_check(DisasContext *s, bool ignore_vfp_enabled)

if (s->v7m_lspact) {

/*

* Lazy state saving affects external memory and also the NVIC,

- * so we must mark it as an IO operation for icount.

+ * so we must mark it as an IO operation for icount (and cause

+ * this to be the last insn in the TB).

*/

if (tb_cflags(s->base.tb) & CF_USE_ICOUNT) {

+ s->base.is_jmp = DISAS_UPDATE;

gen_io_start();

}

gen_helper_v7m_preserve_fp_state(cpu_env);

- if (tb_cflags(s->base.tb) & CF_USE_ICOUNT) {

- gen_io_end();

- }

/*

* If the preserve_fp_state helper doesn't throw an exception

* then it will clear LSPACT; we don't need to repeat this for

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

index XXXXXXX..XXXXXXX 100644

--- a/target/arm/translate.c

+++ b/target/arm/translate.c

@@ -XXX,XX +XXX,XX @@ static bool do_ldm(DisasContext *s, arg_ldst_block *a, int min_n)

gen_io_start();

}

gen_helper_cpsr_write_eret(cpu_env, tmp);

- if (tb_cflags(s->base.tb) & CF_USE_ICOUNT) {

- gen_io_end();

- }

tcg_temp_free_i32(tmp);

/* Must exit loop to check un-masked IRQs */

s->base.is_jmp = DISAS_EXIT;

2.20.1

From: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>

This adds support for memory(pc-dimm) hot remove on arm/virt that

uses acpi ged device.

NVDIMM hot removal is not yet supported.

Signed-off-by: Shameer Kolothum <shameerali.kolothum.thodi@huawei.com>

Message-id: 20200622124157.20360-1-shameerali.kolothum.thodi@huawei.com

Reviewed-by: Eric Auger <eric.auger@redhat.com>

Tested-by: Eric Auger <eric.auger@redhat.com>

hw/acpi/generic_event_device.c | 29 ++++++++++++++++

hw/arm/virt.c | 62 ++++++++++++++++++++++++++++++++--

2 files changed, 89 insertions(+), 2 deletions(-)

diff --git a/hw/acpi/generic_event_device.c b/hw/acpi/generic_event_device.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/acpi/generic_event_device.c

+++ b/hw/acpi/generic_event_device.c

@@ -XXX,XX +XXX,XX @@ static void acpi_ged_device_plug_cb(HotplugHandler *hotplug_dev,

+static void acpi_ged_unplug_request_cb(HotplugHandler *hotplug_dev,

+ DeviceState *dev, Error **errp)

+{

+ AcpiGedState *s = ACPI_GED(hotplug_dev);

+

+ if ((object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM) &&

+ !(object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM)))) {

+ acpi_memory_unplug_request_cb(hotplug_dev, &s->memhp_state, dev, errp);

+ } else {

+ error_setg(errp, "acpi: device unplug request for unsupported device"

+ " type: %s", object_get_typename(OBJECT(dev)));

+ }

+}

+

+static void acpi_ged_unplug_cb(HotplugHandler *hotplug_dev,

+ DeviceState *dev, Error **errp)

+{

+ AcpiGedState *s = ACPI_GED(hotplug_dev);

+

+ if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {

+ acpi_memory_unplug_cb(&s->memhp_state, dev, errp);

+ } else {

+ error_setg(errp, "acpi: device unplug for unsupported device"

+ " type: %s", object_get_typename(OBJECT(dev)));

+ }

+}

+

static void acpi_ged_send_event(AcpiDeviceIf *adev, AcpiEventStatusBits ev)

AcpiGedState *s = ACPI_GED(adev);

@@ -XXX,XX +XXX,XX @@ static void acpi_ged_class_init(ObjectClass *class, void *data)

dc->vmsd = &vmstate_acpi_ged;

hc->plug = acpi_ged_device_plug_cb;

+ hc->unplug_request = acpi_ged_unplug_request_cb;

+ hc->unplug = acpi_ged_unplug_cb;

adevc->send_event = acpi_ged_send_event;

}

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

index XXXXXXX..XXXXXXX 100644

--- a/hw/arm/virt.c

+++ b/hw/arm/virt.c

@@ -XXX,XX +XXX,XX @@ static void virt_machine_device_plug_cb(HotplugHandler *hotplug_dev,

}

+static void virt_dimm_unplug_request(HotplugHandler *hotplug_dev,

+ DeviceState *dev, Error **errp)

+{

+ VirtMachineState *vms = VIRT_MACHINE(hotplug_dev);

+ Error *local_err = NULL;

+

+ if (!vms->acpi_dev) {

+ error_setg(&local_err,

+ "memory hotplug is not enabled: missing acpi-ged device");

+ goto out;

+ }

+

+ if (object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM)) {

+ error_setg(&local_err,

+ "nvdimm device hot unplug is not supported yet.");

+ goto out;

+ }

+

+ hotplug_handler_unplug_request(HOTPLUG_HANDLER(vms->acpi_dev), dev,

+ &local_err);

+out:

+ error_propagate(errp, local_err);

+}

+

+static void virt_dimm_unplug(HotplugHandler *hotplug_dev,

+ DeviceState *dev, Error **errp)

+{

+ VirtMachineState *vms = VIRT_MACHINE(hotplug_dev);

+ Error *local_err = NULL;

+

+ hotplug_handler_unplug(HOTPLUG_HANDLER(vms->acpi_dev), dev, &local_err);

+ if (local_err) {

+ goto out;

+ }

+

+ pc_dimm_unplug(PC_DIMM(dev), MACHINE(vms));

+ qdev_unrealize(dev);

+

+out:

+ error_propagate(errp, local_err);

+}

+

static void virt_machine_device_unplug_request_cb(HotplugHandler *hotplug_dev,

DeviceState *dev, Error **errp)

{

- error_setg(errp, "device unplug request for unsupported device"

- " type: %s", object_get_typename(OBJECT(dev)));

+ if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {

+ virt_dimm_unplug_request(hotplug_dev, dev, errp);

+ } else {

+ error_setg(errp, "device unplug request for unsupported device"

+ " type: %s", object_get_typename(OBJECT(dev)));

+ }

+}

+

+static void virt_machine_device_unplug_cb(HotplugHandler *hotplug_dev,

+ DeviceState *dev, Error **errp)

+{

+ if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) {

+ virt_dimm_unplug(hotplug_dev, dev, errp);

+ } else {

+ error_setg(errp, "virt: device unplug for unsupported device"

+ " type: %s", object_get_typename(OBJECT(dev)));

static HotplugHandler *virt_machine_get_hotplug_handler(MachineState *machine,

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

hc->pre_plug = virt_machine_device_pre_plug_cb;

hc->plug = virt_machine_device_plug_cb;

hc->unplug_request = virt_machine_device_unplug_request_cb;

+ hc->unplug = virt_machine_device_unplug_cb;

mc->numa_mem_supported = true;

mc->nvdimm_supported = true;

mc->auto_enable_numa_with_memhp = true;

2.20.1

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

Since commit d70c996df23f, when enabling the PMU we get:

$ qemu-system-aarch64 -cpu host,pmu=on -M virt,accel=kvm,gic-version=3

Segmentation fault (core dumped)

Thread 1 "qemu-system-aar" received signal SIGSEGV, Segmentation fault.

0x0000aaaaaae356d0 in kvm_ioctl (s=0x0, type=44547) at accel/kvm/kvm-all.c:2588

2588 ret = ioctl(s->fd, type, arg);

(gdb) bt

#0 0x0000aaaaaae356d0 in kvm_ioctl (s=0x0, type=44547) at accel/kvm/kvm-all.c:2588

#1 0x0000aaaaaae31568 in kvm_check_extension (s=0x0, extension=126) at accel/kvm/kvm-all.c:916

#2 0x0000aaaaaafce254 in kvm_arm_pmu_supported (cpu=0xaaaaac214ab0) at target/arm/kvm.c:213

#3 0x0000aaaaaafc0f94 in arm_set_pmu (obj=0xaaaaac214ab0, value=true, errp=0xffffffffe438) at target/arm/cpu.c:1111

#4 0x0000aaaaab5533ac in property_set_bool (obj=0xaaaaac214ab0, v=0xaaaaac223a80, name=0xaaaaac11a970 "pmu", opaque=0xaaaaac222730, errp=0xffffffffe438) at qom/object.c:2170

#5 0x0000aaaaab5512f0 in object_property_set (obj=0xaaaaac214ab0, v=0xaaaaac223a80, name=0xaaaaac11a970 "pmu", errp=0xffffffffe438) at qom/object.c:1328

#6 0x0000aaaaab551e10 in object_property_parse (obj=0xaaaaac214ab0, string=0xaaaaac11b4c0 "on", name=0xaaaaac11a970 "pmu", errp=0xffffffffe438) at qom/object.c:1561

#7 0x0000aaaaab54ee8c in object_apply_global_props (obj=0xaaaaac214ab0, props=0xaaaaac018e20, errp=0xaaaaabd6fd88 <error_fatal>) at qom/object.c:407

#8 0x0000aaaaab1dd5a4 in qdev_prop_set_globals (dev=0xaaaaac214ab0) at hw/core/qdev-properties.c:1218

#9 0x0000aaaaab1d9fac in device_post_init (obj=0xaaaaac214ab0) at hw/core/qdev.c:1050

...

#15 0x0000aaaaab54f310 in object_initialize_with_type (obj=0xaaaaac214ab0, size=52208, type=0xaaaaabe237f0) at qom/object.c:512

#16 0x0000aaaaab54fa24 in object_new_with_type (type=0xaaaaabe237f0) at qom/object.c:687

#17 0x0000aaaaab54fa80 in object_new (typename=0xaaaaabe23970 "host-arm-cpu") at qom/object.c:702

#18 0x0000aaaaaaf04a74 in machvirt_init (machine=0xaaaaac0a8550) at hw/arm/virt.c:1770

#19 0x0000aaaaab1e8720 in machine_run_board_init (machine=0xaaaaac0a8550) at hw/core/machine.c:1138

#20 0x0000aaaaaaf95394 in qemu_init (argc=5, argv=0xffffffffea58, envp=0xffffffffea88) at softmmu/vl.c:4348

#21 0x0000aaaaaada3f74 in main (argc=<optimized out>, argv=<optimized out>, envp=<optimized out>) at softmmu/main.c:48

This is because in frame #2, cpu->kvm_state is still NULL

(the vCPU is not yet realized).

KVM has a hard requirement of all cores supporting the same

feature set. We only need to check if the accelerator supports

a feature, not each vCPU individually.

Fix by removing the 'CPUState *cpu' argument from the

kvm_arm_<FEATURE>_supported() functions.

Fixes: d70c996df23f ('Use CPUState::kvm_state in kvm_arm_pmu_supported')

Reported-by: Haibo Xu <haibo.xu@linaro.org>

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

Acked-by: Paolo Bonzini <pbonzini@redhat.com>

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

Suggested-by: Paolo Bonzini <pbonzini@redhat.com>

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

target/arm/kvm_arm.h | 21 +++++++++------------

target/arm/cpu.c | 2 +-

target/arm/cpu64.c | 10 +++++-----

target/arm/kvm.c | 4 ++--

target/arm/kvm64.c | 14 +++++---------

5 files changed, 22 insertions(+), 29 deletions(-)

@@ -XXX,XX +XXX,XX @@ static void arm_set_pmu(Object *obj, bool value, Error **errp)

ARMCPU *cpu = ARM_CPU(obj);

if (value) {

- if (kvm_enabled() && !kvm_arm_pmu_supported(CPU(cpu))) {

+ if (kvm_enabled() && !kvm_arm_pmu_supported()) {

error_setg(errp, "'pmu' feature not supported by KVM on this host");

return;

}

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

--- a/target/arm/cpu64.c

+++ b/target/arm/cpu64.c

@@ -XXX,XX +XXX,XX @@ void arm_cpu_sve_finalize(ARMCPU *cpu, Error **errp)

/* Collect the set of vector lengths supported by KVM. */

bitmap_zero(kvm_supported, ARM_MAX_VQ);

- if (kvm_enabled() && kvm_arm_sve_supported(CPU(cpu))) {

+ if (kvm_enabled() && kvm_arm_sve_supported()) {

kvm_arm_sve_get_vls(CPU(cpu), kvm_supported);

} else if (kvm_enabled()) {

assert(!cpu_isar_feature(aa64_sve, cpu));

@@ -XXX,XX +XXX,XX @@ static void cpu_max_set_sve_max_vq(Object *obj, Visitor *v, const char *name,

- if (kvm_enabled() && !kvm_arm_sve_supported(CPU(cpu))) {

+ if (kvm_enabled() && !kvm_arm_sve_supported()) {

error_setg(errp, "cannot set sve-max-vq");

error_append_hint(errp, "SVE not supported by KVM on this host\n");

return;

@@ -XXX,XX +XXX,XX @@ static void cpu_arm_set_sve_vq(Object *obj, Visitor *v, const char *name,

return;

}

- if (value && kvm_enabled() && !kvm_arm_sve_supported(CPU(cpu))) {

+ if (value && kvm_enabled() && !kvm_arm_sve_supported()) {

error_setg(errp, "cannot enable %s", name);

error_append_hint(errp, "SVE not supported by KVM on this host\n");

return;

@@ -XXX,XX +XXX,XX @@ static void cpu_arm_set_sve(Object *obj, Visitor *v, const char *name,

return;

}

- if (value && kvm_enabled() && !kvm_arm_sve_supported(CPU(cpu))) {

+ if (value && kvm_enabled() && !kvm_arm_sve_supported()) {

error_setg(errp, "'sve' feature not supported by KVM on this host");

return;

}

@@ -XXX,XX +XXX,XX @@ static void aarch64_cpu_set_aarch64(Object *obj, bool value, Error **errp)

* uniform execution state like do_interrupt.

*/

if (value == false) {

- if (!kvm_enabled() || !kvm_arm_aarch32_supported(CPU(cpu))) {

+ if (!kvm_enabled() || !kvm_arm_aarch32_supported()) {

error_setg(errp, "'aarch64' feature cannot be disabled "

"unless KVM is enabled and 32-bit EL1 "

"is supported");

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

index XXXXXXX..XXXXXXX 100644

--- a/target/arm/kvm.c

+++ b/target/arm/kvm.c

@@ -XXX,XX +XXX,XX @@ void kvm_arm_add_vcpu_properties(Object *obj)

}

}

-bool kvm_arm_pmu_supported(CPUState *cpu)

+bool kvm_arm_pmu_supported(void)

{

- return kvm_check_extension(cpu->kvm_state, KVM_CAP_ARM_PMU_V3);

+ return kvm_check_extension(kvm_state, KVM_CAP_ARM_PMU_V3);

}

int kvm_arm_get_max_vm_ipa_size(MachineState *ms)

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

index XXXXXXX..XXXXXXX 100644

--- a/target/arm/kvm64.c

+++ b/target/arm/kvm64.c

@@ -XXX,XX +XXX,XX @@ bool kvm_arm_get_host_cpu_features(ARMHostCPUFeatures *ahcf)

return true;

}

-bool kvm_arm_aarch32_supported(CPUState *cpu)

+bool kvm_arm_aarch32_supported(void)

{

- KVMState *s = KVM_STATE(current_accel());

-

- return kvm_check_extension(s, KVM_CAP_ARM_EL1_32BIT);

+ return kvm_check_extension(kvm_state, KVM_CAP_ARM_EL1_32BIT);

}

-bool kvm_arm_sve_supported(CPUState *cpu)

+bool kvm_arm_sve_supported(void)

{

- KVMState *s = KVM_STATE(current_accel());

-

- return kvm_check_extension(s, KVM_CAP_ARM_SVE);

+ return kvm_check_extension(kvm_state, KVM_CAP_ARM_SVE);

}

QEMU_BUILD_BUG_ON(KVM_ARM64_SVE_VQ_MIN != 1);

@@ -XXX,XX +XXX,XX @@ int kvm_arch_init_vcpu(CPUState *cs)

env->features &= ~(1ULL << ARM_FEATURE_PMU);

}

if (cpu_isar_feature(aa64_sve, cpu)) {

- assert(kvm_arm_sve_supported(cs));

+ assert(kvm_arm_sve_supported());

cpu->kvm_init_features[0] |= 1 << KVM_ARM_VCPU_SVE;

}

2.20.1

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

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

Message-id: 20200617072539.32686-14-f4bug@amsat.org

hw/arm/mps2.c | 1 +

1 file changed, 1 insertion(+)

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

--- a/hw/arm/mps2.c

+++ b/hw/arm/mps2.c

@@ -XXX,XX +XXX,XX @@ static void mps2_common_init(MachineState *machine)

0x4002a000}; /* Shield1 */

sysbus_create_simple(TYPE_ARM_SBCON_I2C, i2cbase[i], NULL);

2.20.1

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

From 'Application Note AN385', chapter 3.14:

The SMM implements a simple SBCon interface based on I2C.

There are 4 SBCon interfaces on the FPGA APB subsystem.

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

Message-id: 20200617072539.32686-13-f4bug@amsat.org

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

hw/arm/Kconfig | 1 +

2 files changed, 9 insertions(+)

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

--- a/hw/arm/mps2.c

+++ b/hw/arm/mps2.c

#include "hw/misc/mps2-scc.h"

#include "hw/misc/mps2-fpgaio.h"

#include "hw/ssi/pl022.h"

+#include "hw/i2c/arm_sbcon_i2c.h"

#include "hw/net/lan9118.h"

#include "net/net.h"

#include "hw/watchdog/cmsdk-apb-watchdog.h"

@@ -XXX,XX +XXX,XX @@ static void mps2_common_init(MachineState *machine)

qdev_get_gpio_in(orgate_dev, j));

}

}

+ for (i = 0; i < 4; i++) {

+ static const hwaddr i2cbase[] = {0x40022000, /* Touch */

+ 0x40023000, /* Audio */

+ 0x40029000, /* Shield0 */

+ 0x4002a000}; /* Shield1 */

+ sysbus_create_simple(TYPE_ARM_SBCON_I2C, i2cbase[i], NULL);

+ }

/* In hardware this is a LAN9220; the LAN9118 is software compatible

* except that it doesn't support the checksum-offload feature.

diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig

index XXXXXXX..XXXXXXX 100644

--- a/hw/arm/Kconfig

+++ b/hw/arm/Kconfig

@@ -XXX,XX +XXX,XX @@ config MPS2

select SPLIT_IRQ

select UNIMP

select CMSDK_APB_WATCHDOG

+ select VERSATILE_I2C

config FSL_IMX7

bool

2.20.1

From: David CARLIER <devnexen@gmail.com>

From 3025a0ce3fdf7d3559fc35a52c659f635f5c750c Mon Sep 17 00:00:00 2001

From: David Carlier <devnexen@gmail.com>

Date: Tue, 26 May 2020 21:35:27 +0100

Subject: [PATCH] util/oslib-posix : qemu_init_exec_dir implementation for Mac

Using dyld API to get the full path of the current process.

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

Message-id: CA+XhMqxwC10XHVs4Z-JfE0-WLAU3ztDuU9QKVi31mjr59HWCxg@mail.gmail.com

util/oslib-posix.c | 15 +++++++++++++++

1 file changed, 15 insertions(+)

diff --git a/util/oslib-posix.c b/util/oslib-posix.c

--- a/util/oslib-posix.c

+++ b/util/oslib-posix.c

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

#include <lwp.h>

+#ifdef __APPLE__

+#include <mach-o/dyld.h>

+#endif

#include "qemu/mmap-alloc.h"

#ifdef CONFIG_DEBUG_STACK_USAGE

@@ -XXX,XX +XXX,XX @@ void qemu_init_exec_dir(const char *argv0)

p = buf;

}

}

+#elif defined(__APPLE__)

+ {

+ char fpath[PATH_MAX];

+ uint32_t len = sizeof(fpath);

+ if (_NSGetExecutablePath(fpath, &len) == 0) {

+ p = realpath(fpath, buf);

+ if (!p) {

+ return;

+ }

#endif

/* If we don't have any way of figuring out the actual executable

location then try argv[0]. */

2.20.1