Target-arm queue...

The following changes since commit 735286a4f88255e1463d42ce28d8d14181fd32d4:

Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20170613' into staging (2017-06-13 13:51:29 +0100)

are available in the git repository at:

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

for you to fetch changes up to 252a7a6a968c279a4636a86b0559ba3a930a90b5:

hw/intc/arm_gicv3_its: Allow save/restore (2017-06-13 14:57:01 +0100)

* vITS: Support save/restore

* timer/aspeed: Fix timer enablement when reload is not set

* aspped: add temperature sensor device

* timer.h: Provide better monotonic time on ARM hosts

* exynos4210: various cleanups

* exynos4210: support system poweroff

Cédric Le Goater (3):

hw/misc: add a TMP42{1, 2, 3} device model

aspeed: add a temp sensor device on I2C bus 3

timer/aspeed: fix timer enablement when a reload is not set

Eric Auger (4):

kvm-all: Pass an error object to kvm_device_access

hw/intc/arm_gicv3_its: Implement state save/restore

hw/intc/arm_gicv3_kvm: Implement pending table save

hw/intc/arm_gicv3_its: Allow save/restore

Krzysztof Kozlowski (9):

hw/intc/exynos4210_gic: Use more meaningful name for local variable

hw/timer/exynos4210_mct: Fix checkpatch style errors

hw/timer/exynos4210_mct: Cleanup indentation and empty new lines

hw/timer/exynos4210_mct: Remove unused defines

hw/arm/exynos: Move DRAM initialization next boards

hw/arm/exynos: Declare local variables in some order

hw/arm/exynos: Use type define instead of hard-coded a9mpcore_priv string

hw/intc/exynos4210_gic: Constify array of combiner interrupts

hw/misc/exynos4210_pmu: Add support for system poweroff

Pranith Kumar (1):

timer.h: Provide better monotonic time

hw/misc/Makefile.objs | 1 +

include/hw/arm/exynos4210.h | 5 +-

include/hw/intc/arm_gicv3_its_common.h | 8 +

include/migration/vmstate.h | 2 +

include/qemu/timer.h | 5 +-

include/sysemu/kvm.h | 11 +-

hw/arm/aspeed.c | 9 +

hw/arm/exynos4210.c | 27 +--

hw/arm/exynos4_boards.c | 50 +++-

hw/intc/arm_gic_kvm.c | 9 +-

hw/intc/arm_gicv3_common.c | 1 +

hw/intc/arm_gicv3_its_common.c | 12 +-

hw/intc/arm_gicv3_its_kvm.c | 131 +++++++++--

hw/intc/arm_gicv3_kvm.c | 48 +++-

hw/intc/exynos4210_gic.c | 14 +-

hw/misc/exynos4210_pmu.c | 20 +-

hw/misc/tmp421.c | 402 +++++++++++++++++++++++++++++++++

hw/timer/aspeed_timer.c | 37 ++-

hw/timer/exynos4210_mct.c | 50 ++--

kvm-all.c | 14 +-

default-configs/arm-softmmu.mak | 1 +

21 files changed, 741 insertions(+), 116 deletions(-)

create mode 100644 hw/misc/tmp421.c

From: Krzysztof Kozlowski <krzk@kernel.org>

Use a define for a9mpcore_priv device type name instead of hard-coded

string.

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>

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

hw/arm/exynos4210.c | 3 ++-

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

--- a/hw/arm/exynos4210.c

+++ b/hw/arm/exynos4210.c

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

#include "qemu-common.h"

#include "qemu/log.h"

#include "cpu.h"

+#include "hw/cpu/a9mpcore.h"

#include "hw/boards.h"

#include "sysemu/sysemu.h"

#include "hw/sysbus.h"

@@ -XXX,XX +XXX,XX @@ Exynos4210State *exynos4210_init(MemoryRegion *system_mem)

}

/* Private memory region and Internal GIC */

- dev = qdev_create(NULL, "a9mpcore_priv");

+ dev = qdev_create(NULL, TYPE_A9MPCORE_PRIV);

qdev_prop_set_uint32(dev, "num-cpu", EXYNOS4210_NCPUS);

qdev_init_nofail(dev);

busdev = SYS_BUS_DEVICE(dev);

2.7.4

From: Eric Auger <eric.auger@redhat.com>

In some circumstances, we don't want to abort if the

kvm_device_access fails. This will be the case during ITS

migration, in case the ITS table save/restore fails because

the guest did not program the vITS correctly. So let's pass an

error object to the function and return the ioctl value. New

callers will be able to make a decision upon this returned

value.

Existing callers pass &error_abort which will cause the

function to abort on failure.

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

Reviewed-by: Juan Quintela <quintela@redhat.com>

Reviewed-by: Peter Xu <peterx@redhat.com>

Message-id: 1497023553-18411-2-git-send-email-eric.auger@redhat.com

[PMM: wrapped long line]

include/sysemu/kvm.h | 11 +++++++----

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

hw/intc/arm_gicv3_its_kvm.c | 2 +-

hw/intc/arm_gicv3_kvm.c | 14 +++++++-------

kvm-all.c | 14 ++++++++------

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

diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h

index XXXXXXX..XXXXXXX 100644

--- a/include/sysemu/kvm.h

+++ b/include/sysemu/kvm.h

@@ -XXX,XX +XXX,XX @@ int kvm_device_check_attr(int fd, uint32_t group, uint64_t attr);

* @attr: the attribute of that group to set or get

* @val: pointer to a storage area for the value

* @write: true for set and false for get operation

+ * @errp: error object handle

*

- * This function is not allowed to fail. Use kvm_device_check_attr()

- * in order to check for the availability of optional attributes.

+ * Returns: 0 on success

+ * < 0 on error

+ * Use kvm_device_check_attr() in order to check for the availability

+ * of optional attributes.

*/

-void kvm_device_access(int fd, int group, uint64_t attr,

- void *val, bool write);

+int kvm_device_access(int fd, int group, uint64_t attr,

+ void *val, bool write, Error **errp);

/**

* kvm_create_device - create a KVM device for the device control API

diff --git a/hw/intc/arm_gic_kvm.c b/hw/intc/arm_gic_kvm.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/intc/arm_gic_kvm.c

+++ b/hw/intc/arm_gic_kvm.c

@@ -XXX,XX +XXX,XX @@ static void kvm_gicd_access(GICState *s, int offset, int cpu,

uint32_t *val, bool write)

kvm_device_access(s->dev_fd, KVM_DEV_ARM_VGIC_GRP_DIST_REGS,

- KVM_VGIC_ATTR(offset, cpu), val, write);

+ KVM_VGIC_ATTR(offset, cpu), val, write, &error_abort);

static void kvm_gicc_access(GICState *s, int offset, int cpu,

uint32_t *val, bool write)

kvm_device_access(s->dev_fd, KVM_DEV_ARM_VGIC_GRP_CPU_REGS,

- KVM_VGIC_ATTR(offset, cpu), val, write);

+ KVM_VGIC_ATTR(offset, cpu), val, write, &error_abort);

#define for_each_irq_reg(_ctr, _max_irq, _field_width) \

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

if (kvm_device_check_attr(s->dev_fd, KVM_DEV_ARM_VGIC_GRP_NR_IRQS, 0)) {

uint32_t numirqs = s->num_irq;

kvm_device_access(s->dev_fd, KVM_DEV_ARM_VGIC_GRP_NR_IRQS, 0,

- &numirqs, true);

+ &numirqs, true, &error_abort);

}

/* Tell the kernel to complete VGIC initialization now */

if (kvm_device_check_attr(s->dev_fd, KVM_DEV_ARM_VGIC_GRP_CTRL,

KVM_DEV_ARM_VGIC_CTRL_INIT)) {

kvm_device_access(s->dev_fd, KVM_DEV_ARM_VGIC_GRP_CTRL,

- KVM_DEV_ARM_VGIC_CTRL_INIT, NULL, true);

+ KVM_DEV_ARM_VGIC_CTRL_INIT, NULL, true,

+ &error_abort);

}

} else if (ret != -ENODEV && ret != -ENOTSUP) {

error_setg_errno(errp, -ret, "error creating in-kernel VGIC");

diff --git a/hw/intc/arm_gicv3_its_kvm.c b/hw/intc/arm_gicv3_its_kvm.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/intc/arm_gicv3_its_kvm.c

+++ b/hw/intc/arm_gicv3_its_kvm.c

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

/* explicit init of the ITS */

kvm_device_access(s->dev_fd, KVM_DEV_ARM_VGIC_GRP_CTRL,

- KVM_DEV_ARM_VGIC_CTRL_INIT, NULL, true);

+ KVM_DEV_ARM_VGIC_CTRL_INIT, NULL, true, &error_abort);

/* register the base address */

kvm_arm_register_device(&s->iomem_its_cntrl, -1, KVM_DEV_ARM_VGIC_GRP_ADDR,

diff --git a/hw/intc/arm_gicv3_kvm.c b/hw/intc/arm_gicv3_kvm.c

index XXXXXXX..XXXXXXX 100644

--- a/hw/intc/arm_gicv3_kvm.c

+++ b/hw/intc/arm_gicv3_kvm.c

@@ -XXX,XX +XXX,XX @@ static inline void kvm_gicd_access(GICv3State *s, int offset,

{

kvm_device_access(s->dev_fd, KVM_DEV_ARM_VGIC_GRP_DIST_REGS,

KVM_VGIC_ATTR(offset, 0),

- val, write);

+ val, write, &error_abort);

}

static inline void kvm_gicr_access(GICv3State *s, int offset, int cpu,

@@ -XXX,XX +XXX,XX @@ static inline void kvm_gicr_access(GICv3State *s, int offset, int cpu,

{

kvm_device_access(s->dev_fd, KVM_DEV_ARM_VGIC_GRP_REDIST_REGS,

KVM_VGIC_ATTR(offset, s->cpu[cpu].gicr_typer),

- val, write);

+ val, write, &error_abort);

}

static inline void kvm_gicc_access(GICv3State *s, uint64_t reg, int cpu,

@@ -XXX,XX +XXX,XX @@ static inline void kvm_gicc_access(GICv3State *s, uint64_t reg, int cpu,

{

kvm_device_access(s->dev_fd, KVM_DEV_ARM_VGIC_GRP_CPU_SYSREGS,

KVM_VGIC_ATTR(reg, s->cpu[cpu].gicr_typer),

- val, write);

+ val, write, &error_abort);

}

static inline void kvm_gic_line_level_access(GICv3State *s, int irq, int cpu,

@@ -XXX,XX +XXX,XX @@ static inline void kvm_gic_line_level_access(GICv3State *s, int irq, int cpu,

KVM_VGIC_ATTR(irq, s->cpu[cpu].gicr_typer) |

(VGIC_LEVEL_INFO_LINE_LEVEL <<

KVM_DEV_ARM_VGIC_LINE_LEVEL_INFO_SHIFT),

- val, write);

+ val, write, &error_abort);

}

/* Loop through each distributor IRQ related register; since bits

@@ -XXX,XX +XXX,XX @@ static void arm_gicv3_icc_reset(CPUARMState *env, const ARMCPRegInfo *ri)

/* Initialize to actual HW supported configuration */

kvm_device_access(s->dev_fd, KVM_DEV_ARM_VGIC_GRP_CPU_SYSREGS,

KVM_VGIC_ATTR(ICC_CTLR_EL1, cpu->mp_affinity),

- &c->icc_ctlr_el1[GICV3_NS], false);

+ &c->icc_ctlr_el1[GICV3_NS], false, &error_abort);

c->icc_ctlr_el1[GICV3_S] = c->icc_ctlr_el1[GICV3_NS];

}

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

}

kvm_device_access(s->dev_fd, KVM_DEV_ARM_VGIC_GRP_NR_IRQS,

- 0, &s->num_irq, true);

+ 0, &s->num_irq, true, &error_abort);

/* Tell the kernel to complete VGIC initialization now */

kvm_device_access(s->dev_fd, KVM_DEV_ARM_VGIC_GRP_CTRL,

- KVM_DEV_ARM_VGIC_CTRL_INIT, NULL, true);

+ KVM_DEV_ARM_VGIC_CTRL_INIT, NULL, true, &error_abort);

kvm_arm_register_device(&s->iomem_dist, -1, KVM_DEV_ARM_VGIC_GRP_ADDR,

KVM_VGIC_V3_ADDR_TYPE_DIST, s->dev_fd);

diff --git a/kvm-all.c b/kvm-all.c

index XXXXXXX..XXXXXXX 100644

--- a/kvm-all.c

+++ b/kvm-all.c

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

#include "qemu/option.h"

#include "qemu/config-file.h"

#include "qemu/error-report.h"

+#include "qapi/error.h"

#include "hw/hw.h"

#include "hw/pci/msi.h"

#include "hw/pci/msix.h"

@@ -XXX,XX +XXX,XX @@ int kvm_device_check_attr(int dev_fd, uint32_t group, uint64_t attr)

return kvm_device_ioctl(dev_fd, KVM_HAS_DEVICE_ATTR, &attribute) ? 0 : 1;

}

-void kvm_device_access(int fd, int group, uint64_t attr,

- void *val, bool write)

+int kvm_device_access(int fd, int group, uint64_t attr,

+ void *val, bool write, Error **errp)

{

struct kvm_device_attr kvmattr;

int err;

@@ -XXX,XX +XXX,XX @@ void kvm_device_access(int fd, int group, uint64_t attr,

write ? KVM_SET_DEVICE_ATTR : KVM_GET_DEVICE_ATTR,

&kvmattr);

if (err < 0) {

- error_report("KVM_%s_DEVICE_ATTR failed: %s",

- write ? "SET" : "GET", strerror(-err));

- error_printf("Group %d attr 0x%016" PRIx64 "\n", group, attr);

- abort();

+ error_setg_errno(errp, -err,

+ "KVM_%s_DEVICE_ATTR failed: Group %d "

+ "attr 0x%016" PRIx64,

+ write ? "SET" : "GET", group, attr);

}

+ return err;

}

/* Return 1 on success, 0 on failure */

2.7.4

From: Cédric Le Goater <clg@kaod.org>

When a timer is enabled before a reload value is set, the controller

waits for a reload value to be set before starting decrementing. This

fix tries to cover that case by changing the timer expiry only when

a reload value is valid.

Signed-off-by: Cédric Le Goater <clg@kaod.org>

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

Message-id: 1496739312-32304-1-git-send-email-clg@kaod.org

hw/timer/aspeed_timer.c | 37 +++++++++++++++++++++++++++++--------

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

diff --git a/hw/timer/aspeed_timer.c b/hw/timer/aspeed_timer.c

--- a/hw/timer/aspeed_timer.c

+++ b/hw/timer/aspeed_timer.c

@@ -XXX,XX +XXX,XX @@ static uint64_t calculate_next(struct AspeedTimer *t)

next = seq[1];

} else if (now < seq[2]) {

next = seq[2];

- } else {

+ } else if (t->reload) {

reload_ns = muldiv64(t->reload, NANOSECONDS_PER_SECOND, rate);

t->start = now - ((now - t->start) % reload_ns);

+ } else {

+ /* no reload value, return 0 */

+ break;

}

return next;

}

+static void aspeed_timer_mod(AspeedTimer *t)

+{

+ uint64_t next = calculate_next(t);

+ if (next) {

+ timer_mod(&t->timer, next);

+ }

+}

+

static void aspeed_timer_expire(void *opaque)

{

AspeedTimer *t = opaque;

@@ -XXX,XX +XXX,XX @@ static void aspeed_timer_expire(void *opaque)

qemu_set_irq(t->irq, t->level);

}

- timer_mod(&t->timer, calculate_next(t));

+ aspeed_timer_mod(t);

}

static uint64_t aspeed_timer_get_value(AspeedTimer *t, int reg)

@@ -XXX,XX +XXX,XX @@ static void aspeed_timer_set_value(AspeedTimerCtrlState *s, int timer, int reg,

uint32_t value)

{

AspeedTimer *t;

+ uint32_t old_reload;

trace_aspeed_timer_set_value(timer, reg, value);

t = &s->timers[timer];

switch (reg) {

+ case TIMER_REG_RELOAD:

+ old_reload = t->reload;

+ t->reload = value;

+

+ /* If the reload value was not previously set, or zero, and

+ * the current value is valid, try to start the timer if it is

+ * enabled.

+ if (old_reload || !t->reload) {

+ break;

case TIMER_REG_STATUS:

if (timer_enabled(t)) {

uint64_t now = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);

@@ -XXX,XX +XXX,XX @@ static void aspeed_timer_set_value(AspeedTimerCtrlState *s, int timer, int reg,

uint32_t rate = calculate_rate(t);

t->start += muldiv64(delta, NANOSECONDS_PER_SECOND, rate);

- timer_mod(&t->timer, calculate_next(t));

+ aspeed_timer_mod(t);

}

break;

- case TIMER_REG_RELOAD:

- t->reload = value;

- break;

case TIMER_REG_MATCH_FIRST:

case TIMER_REG_MATCH_SECOND:

t->match[reg - 2] = value;

if (timer_enabled(t)) {

- timer_mod(&t->timer, calculate_next(t));

+ aspeed_timer_mod(t);

}

@@ -XXX,XX +XXX,XX @@ static void aspeed_timer_ctrl_enable(AspeedTimer *t, bool enable)

trace_aspeed_timer_ctrl_enable(t->id, enable);

if (enable) {

t->start = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);

- timer_mod(&t->timer, calculate_next(t));

+ aspeed_timer_mod(t);

} else {

timer_del(&t->timer);

}

2.7.4

From: Pranith Kumar <bobby.prani@gmail.com>

Tested and confirmed that the stretch i386 debian qcow2 image on a

raspberry pi 2 works.

Fixes: LP#: 893208 <https://bugs.launchpad.net/qemu/+bug/893208/>

Signed-off-by: Pranith Kumar <bobby.prani@gmail.com>

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

Message-id: 20170418191817.10430-1-bobby.prani@gmail.com

include/qemu/timer.h | 5 ++---

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

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

--- a/include/qemu/timer.h

+++ b/include/qemu/timer.h

@@ -XXX,XX +XXX,XX @@ static inline int64_t cpu_get_host_ticks(void)

/* The host CPU doesn't have an easily accessible cycle counter.

Just return a monotonically increasing value. This will be

totally wrong, but hopefully better than nothing. */

-static inline int64_t cpu_get_host_ticks (void)

+static inline int64_t cpu_get_host_ticks(void)

{

- static int64_t ticks = 0;

- return ticks++;

+ return get_clock();

}

2.7.4

From: Krzysztof Kozlowski <krzk@kernel.org>

On all Exynos-based boards, the system powers down itself by driving

PS_HOLD signal low - eight bit in PS_HOLD_CONTROL register of PMU.

Handle writing to respective PMU register to fix power off failure:

reboot: Power down

Unable to poweroff system

shutdown: 31 output lines suppressed due to ratelimiting

Kernel panic - not syncing: Attempted to kill init! exitcode=0x00000000

CPU: 0 PID: 1 Comm: shutdown Not tainted 4.11.0-rc8 #846

Hardware name: SAMSUNG EXYNOS (Flattened Device Tree)

[<c031050c>] (unwind_backtrace) from [<c030ba6c>] (show_stack+0x10/0x14)

[<c030ba6c>] (show_stack) from [<c05b2800>] (dump_stack+0x88/0x9c)

[<c05b2800>] (dump_stack) from [<c03d3140>] (panic+0xdc/0x268)

[<c03d3140>] (panic) from [<c0343614>] (do_exit+0xa90/0xab4)

[<c0343614>] (do_exit) from [<c035f2dc>] (SyS_reboot+0x164/0x1d0)

[<c035f2dc>] (SyS_reboot) from [<c0307c80>] (ret_fast_syscall+0x0/0x3c)

Additionally the initial value of PS_HOLD has to be changed because

recent Linux kernel (v4.12-rc1) uses regmap cache for this access.

When the register is kept at reset value, the kernel will not issue a

write to it. Usually the bootloader sets the eight bit of PS_HOLD high

so mimic its existence here.

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>

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

hw/misc/exynos4210_pmu.c | 20 +++++++++++++++++++-

1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/hw/misc/exynos4210_pmu.c b/hw/misc/exynos4210_pmu.c

--- a/hw/misc/exynos4210_pmu.c

+++ b/hw/misc/exynos4210_pmu.c

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

#include "qemu/osdep.h"

#include "hw/sysbus.h"

+#include "sysemu/sysemu.h"

#ifndef DEBUG_PMU

#define DEBUG_PMU 0

@@ -XXX,XX +XXX,XX @@ static const Exynos4210PmuReg exynos4210_pmu_regs[] = {

{"PAD_RETENTION_MMCB_OPTION", PAD_RETENTION_MMCB_OPTION, 0x00000000},

{"PAD_RETENTION_EBIA_OPTION", PAD_RETENTION_EBIA_OPTION, 0x00000000},

{"PAD_RETENTION_EBIB_OPTION", PAD_RETENTION_EBIB_OPTION, 0x00000000},

- {"PS_HOLD_CONTROL", PS_HOLD_CONTROL, 0x00005200},

+ /*

+ * PS_HOLD_CONTROL: reset value and manually toggle high the DATA bit.

+ * DATA bit high, set usually by bootloader, keeps system on.

+ */

+ {"PS_HOLD_CONTROL", PS_HOLD_CONTROL, 0x00005200 | BIT(8)},

{"XUSBXTI_CONFIGURATION", XUSBXTI_CONFIGURATION, 0x00000001},

{"XUSBXTI_STATUS", XUSBXTI_STATUS, 0x00000001},

{"XUSBXTI_DURATION", XUSBXTI_DURATION, 0xFFF00000},

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

uint32_t reg[PMU_NUM_OF_REGISTERS];

} Exynos4210PmuState;

+static void exynos4210_pmu_poweroff(void)

+ PRINT_DEBUG("QEMU PMU: PS_HOLD bit down, powering off\n");

+ qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN);

static uint64_t exynos4210_pmu_read(void *opaque, hwaddr offset,

unsigned size)

{

@@ -XXX,XX +XXX,XX @@ static void exynos4210_pmu_write(void *opaque, hwaddr offset,

PRINT_DEBUG_EXTEND("%s <0x%04x> <- 0x%04x\n", reg_p->name,

(uint32_t)offset, (uint32_t)val);

s->reg[i] = val;

+ if ((offset == PS_HOLD_CONTROL) && ((val & BIT(8)) == 0)) {

+ /*

+ * We are interested only in setting data bit

+ * of PS_HOLD_CONTROL register to indicate power off request.

+ */

+ exynos4210_pmu_poweroff();

+ }

return;

}

reg_p++;

2.7.4

From: Krzysztof Kozlowski <krzk@kernel.org>

Bring some more readability by declaring local function variables: first

initialized ones and then the rest (with reversed-christmas-tree order).

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>

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

hw/arm/exynos4210.c | 4 ++--

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

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

--- a/hw/arm/exynos4210.c

+++ b/hw/arm/exynos4210.c

@@ -XXX,XX +XXX,XX @@ static uint64_t exynos4210_calc_affinity(int cpu)

Exynos4210State *exynos4210_init(MemoryRegion *system_mem)

{

- int i, n;

Exynos4210State *s = g_new(Exynos4210State, 1);

qemu_irq gate_irq[EXYNOS4210_NCPUS][EXYNOS4210_IRQ_GATE_NINPUTS];

- DeviceState *dev;

SysBusDevice *busdev;

ObjectClass *cpu_oc;

+ DeviceState *dev;

+ int i, n;

cpu_oc = cpu_class_by_name(TYPE_ARM_CPU, "cortex-a9");

assert(cpu_oc);

2.7.4

From: Krzysztof Kozlowski <krzk@kernel.org>

Remove defines not used anywhere.

Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>

hw/timer/exynos4210_mct.c | 3 ---