From f3245d63a0df51184fdf12f483436329ef322d35 Mon Sep 17 00:00:00 2001 From: "Emilio G. Cota" Date: Fri, 13 Oct 2017 17:30:20 -0400 Subject: futex: add missing header guards MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The header file was introduced by fbcc3e5 ("qemu-thread: optimize QemuLockCnt with futexes on Linux", 2017-01-16) without header guards. Add them. Signed-off-by: Emilio G. Cota Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Michael Tokarev --- include/qemu/futex.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'include') diff --git a/include/qemu/futex.h b/include/qemu/futex.h index bb7dc9e..91ae889 100644 --- a/include/qemu/futex.h +++ b/include/qemu/futex.h @@ -11,6 +11,9 @@ * */ +#ifndef QEMU_FUTEX_H +#define QEMU_FUTEX_H + #include #include @@ -34,3 +37,5 @@ static inline void qemu_futex_wait(void *f, unsigned val) } } } + +#endif /* QEMU_FUTEX_H */ -- cgit v1.1 From 69fa4f9568b18b9b1726a3e51a0bc48478798ad4 Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Thu, 12 Oct 2017 14:17:47 +0100 Subject: include/hw/or-irq.h: Drop unused in_irqs field The struct OrIRQState has an unused member field in_irqs. This is a legacy of earlier versions of the patch; the code that used it was dropped from the final version of the code that went into master, but we forgot to delete the no-longer-used struct field. Do so now. Signed-off-by: Peter Maydell Reviewed-by: Alistair Francis Signed-off-by: Michael Tokarev --- include/hw/or-irq.h | 1 - 1 file changed, 1 deletion(-) (limited to 'include') diff --git a/include/hw/or-irq.h b/include/hw/or-irq.h index d400a81..fd900fc 100644 --- a/include/hw/or-irq.h +++ b/include/hw/or-irq.h @@ -38,7 +38,6 @@ struct OrIRQState { DeviceState parent_obj; qemu_irq out_irq; - qemu_irq *in_irqs; bool levels[MAX_OR_LINES]; uint16_t num_lines; }; -- cgit v1.1