* [Qemu-devel] [PATCH 01/12] arm: fix location of some include files
2013-04-11 16:10 [Qemu-devel] [PATCH 00/12] directory reorganization, " Paolo Bonzini
@ 2013-04-11 16:10 ` Paolo Bonzini
0 siblings, 0 replies; 23+ messages in thread
From: Paolo Bonzini @ 2013-04-11 16:10 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, mst
From: Peter Maydell <peter.maydell@linaro.org>
The recent rearrangement of include files had some minor errors:
devices.h is not ARM specific and should not be in arm/
arm.h should be in arm/
Move these two headers to correct this.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
hw/alpha/typhoon.c | 2 +-
hw/arm/armv7m.c | 2 +-
hw/arm/boot.c | 2 +-
hw/arm/collie.c | 4 ++--
hw/arm/exynos4210.c | 2 +-
hw/arm/exynos4_boards.c | 2 +-
hw/arm/gumstix.c | 2 +-
hw/arm/highbank.c | 4 ++--
hw/arm/integratorcp.c | 4 ++--
hw/arm/kzm.c | 4 ++--
hw/arm/mainstone.c | 4 ++--
hw/arm/musicpal.c | 4 ++--
hw/arm/nseries.c | 4 ++--
hw/arm/omap1.c | 2 +-
hw/arm/omap2.c | 2 +-
hw/arm/omap_sx1.c | 2 +-
hw/arm/palm.c | 4 ++--
hw/arm/pic_cpu.c | 2 +-
hw/arm/realview.c | 4 ++--
hw/arm/spitz.c | 4 ++--
hw/arm/stellaris.c | 4 ++--
hw/arm/strongarm.c | 2 +-
hw/arm/tosa.c | 4 ++--
hw/arm/versatilepb.c | 4 ++--
hw/arm/vexpress.c | 4 ++--
hw/arm/xilinx_zynq.c | 2 +-
hw/arm/z2.c | 4 ++--
hw/block/m25p80.c | 2 +-
hw/display/blizzard.c | 2 +-
hw/display/sm501.c | 2 +-
hw/display/tc6393xb.c | 2 +-
hw/input/stellaris_input.c | 2 +-
hw/input/tsc2005.c | 2 +-
hw/input/tsc210x.c | 2 +-
hw/intc/armv7m_nvic.c | 2 +-
hw/lm32/lm32_boards.c | 2 +-
hw/lm32/milkymist.c | 2 +-
hw/microblaze/petalogix_ml605_mmu.c | 2 +-
hw/microblaze/petalogix_s3adsp1800_mmu.c | 2 +-
hw/misc/cbus.c | 2 +-
hw/net/lan9118.c | 2 +-
hw/net/smc91c111.c | 2 +-
hw/ppc/virtex_ml507.c | 2 +-
hw/sh4/r2d.c | 2 +-
hw/timer/tusb6010.c | 2 +-
include/hw/{ => arm}/arm.h | 0
include/hw/{arm => }/devices.h | 0
target-arm/arm-semi.c | 2 +-
target-arm/kvm.c | 2 +-
49 files changed, 62 insertions(+), 62 deletions(-)
rename include/hw/{ => arm}/arm.h (100%)
rename include/hw/{arm => }/devices.h (100%)
diff --git a/hw/alpha/typhoon.c b/hw/alpha/typhoon.c
index faec8dc..68420f4 100644
--- a/hw/alpha/typhoon.c
+++ b/hw/alpha/typhoon.c
@@ -9,7 +9,7 @@
#include "cpu.h"
#include "exec/exec-all.h"
#include "hw/hw.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "sysemu/sysemu.h"
#include "alpha_sys.h"
#include "exec/address-spaces.h"
diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c
index a4bdd5f..2ae3576 100644
--- a/hw/arm/armv7m.c
+++ b/hw/arm/armv7m.c
@@ -8,7 +8,7 @@
*/
#include "hw/sysbus.h"
-#include "hw/arm.h"
+#include "hw/arm/arm.h"
#include "hw/loader.h"
#include "elf.h"
diff --git a/hw/arm/boot.c b/hw/arm/boot.c
index c79c590..e9c0945 100644
--- a/hw/arm/boot.c
+++ b/hw/arm/boot.c
@@ -9,7 +9,7 @@
#include "config.h"
#include "hw/hw.h"
-#include "hw/arm.h"
+#include "hw/arm/arm.h"
#include "sysemu/sysemu.h"
#include "hw/boards.h"
#include "hw/loader.h"
diff --git a/hw/arm/collie.c b/hw/arm/collie.c
index 5420bb4..a19857a 100644
--- a/hw/arm/collie.c
+++ b/hw/arm/collie.c
@@ -11,9 +11,9 @@
#include "hw/hw.h"
#include "hw/sysbus.h"
#include "hw/boards.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "strongarm.h"
-#include "hw/arm.h"
+#include "hw/arm/arm.h"
#include "hw/block/flash.h"
#include "sysemu/blockdev.h"
#include "exec/address-spaces.h"
diff --git a/hw/arm/exynos4210.c b/hw/arm/exynos4210.c
index 78b8b74..c8101d3 100644
--- a/hw/arm/exynos4210.c
+++ b/hw/arm/exynos4210.c
@@ -24,7 +24,7 @@
#include "hw/boards.h"
#include "sysemu/sysemu.h"
#include "hw/sysbus.h"
-#include "hw/arm.h"
+#include "hw/arm/arm.h"
#include "hw/loader.h"
#include "hw/arm/exynos4210.h"
#include "hw/usb/hcd-ehci.h"
diff --git a/hw/arm/exynos4_boards.c b/hw/arm/exynos4_boards.c
index ba14a1f..74f110b 100644
--- a/hw/arm/exynos4_boards.c
+++ b/hw/arm/exynos4_boards.c
@@ -24,7 +24,7 @@
#include "sysemu/sysemu.h"
#include "hw/sysbus.h"
#include "net/net.h"
-#include "hw/arm.h"
+#include "hw/arm/arm.h"
#include "exec/address-spaces.h"
#include "hw/arm/exynos4210.h"
#include "hw/boards.h"
diff --git a/hw/arm/gumstix.c b/hw/arm/gumstix.c
index 4d800c9..b8cab10 100644
--- a/hw/arm/gumstix.c
+++ b/hw/arm/gumstix.c
@@ -38,7 +38,7 @@
#include "hw/arm/pxa.h"
#include "net/net.h"
#include "hw/block/flash.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "hw/boards.h"
#include "sysemu/blockdev.h"
#include "exec/address-spaces.h"
diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c
index 58f73c1..0fd9465 100644
--- a/hw/arm/highbank.c
+++ b/hw/arm/highbank.c
@@ -18,8 +18,8 @@
*/
#include "hw/sysbus.h"
-#include "hw/arm.h"
-#include "hw/arm/devices.h"
+#include "hw/arm/arm.h"
+#include "hw/devices.h"
#include "hw/loader.h"
#include "net/net.h"
#include "sysemu/sysemu.h"
diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c
index 8d0fb75..cca2971 100644
--- a/hw/arm/integratorcp.c
+++ b/hw/arm/integratorcp.c
@@ -8,9 +8,9 @@
*/
#include "hw/sysbus.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "hw/boards.h"
-#include "hw/arm.h"
+#include "hw/arm/arm.h"
#include "net/net.h"
#include "exec/address-spaces.h"
#include "sysemu/sysemu.h"
diff --git a/hw/arm/kzm.c b/hw/arm/kzm.c
index 46264cd..cf90f5d 100644
--- a/hw/arm/kzm.c
+++ b/hw/arm/kzm.c
@@ -16,8 +16,8 @@
#include "hw/sysbus.h"
#include "exec/address-spaces.h"
#include "hw/hw.h"
-#include "hw/arm.h"
-#include "hw/arm/devices.h"
+#include "hw/arm/arm.h"
+#include "hw/devices.h"
#include "net/net.h"
#include "sysemu/sysemu.h"
#include "hw/boards.h"
diff --git a/hw/arm/mainstone.c b/hw/arm/mainstone.c
index b78e6f0..260e314 100644
--- a/hw/arm/mainstone.c
+++ b/hw/arm/mainstone.c
@@ -13,9 +13,9 @@
*/
#include "hw/hw.h"
#include "hw/arm/pxa.h"
-#include "hw/arm.h"
+#include "hw/arm/arm.h"
#include "net/net.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "hw/boards.h"
#include "hw/block/flash.h"
#include "sysemu/blockdev.h"
diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c
index 97b1340..d2247fa 100644
--- a/hw/arm/musicpal.c
+++ b/hw/arm/musicpal.c
@@ -10,8 +10,8 @@
*/
#include "hw/sysbus.h"
-#include "hw/arm.h"
-#include "hw/arm/devices.h"
+#include "hw/arm/arm.h"
+#include "hw/devices.h"
#include "net/net.h"
#include "sysemu/sysemu.h"
#include "hw/boards.h"
diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c
index ba8dc3e..4976438 100644
--- a/hw/arm/nseries.c
+++ b/hw/arm/nseries.c
@@ -21,12 +21,12 @@
#include "qemu-common.h"
#include "sysemu/sysemu.h"
#include "hw/arm/omap.h"
-#include "hw/arm.h"
+#include "hw/arm/arm.h"
#include "hw/irq.h"
#include "ui/console.h"
#include "hw/boards.h"
#include "hw/i2c/i2c.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "hw/block/flash.h"
#include "hw/hw.h"
#include "hw/bt.h"
diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c
index 17caa61..f59f0f2 100644
--- a/hw/arm/omap1.c
+++ b/hw/arm/omap1.c
@@ -17,7 +17,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "hw/hw.h"
-#include "hw/arm.h"
+#include "hw/arm/arm.h"
#include "hw/arm/omap.h"
#include "sysemu/sysemu.h"
#include "hw/arm/soc_dma.h"
diff --git a/hw/arm/omap2.c b/hw/arm/omap2.c
index 010c483..a4b4146 100644
--- a/hw/arm/omap2.c
+++ b/hw/arm/omap2.c
@@ -20,7 +20,7 @@
#include "sysemu/blockdev.h"
#include "hw/hw.h"
-#include "hw/arm.h"
+#include "hw/arm/arm.h"
#include "hw/arm/omap.h"
#include "sysemu/sysemu.h"
#include "qemu/timer.h"
diff --git a/hw/arm/omap_sx1.c b/hw/arm/omap_sx1.c
index aa85602..e421ece 100644
--- a/hw/arm/omap_sx1.c
+++ b/hw/arm/omap_sx1.c
@@ -29,7 +29,7 @@
#include "ui/console.h"
#include "hw/arm/omap.h"
#include "hw/boards.h"
-#include "hw/arm.h"
+#include "hw/arm/arm.h"
#include "hw/block/flash.h"
#include "sysemu/blockdev.h"
#include "exec/address-spaces.h"
diff --git a/hw/arm/palm.c b/hw/arm/palm.c
index 0bc11ae..b13d810 100644
--- a/hw/arm/palm.c
+++ b/hw/arm/palm.c
@@ -22,8 +22,8 @@
#include "ui/console.h"
#include "hw/arm/omap.h"
#include "hw/boards.h"
-#include "hw/arm.h"
-#include "hw/arm/devices.h"
+#include "hw/arm/arm.h"
+#include "hw/devices.h"
#include "hw/loader.h"
#include "exec/address-spaces.h"
diff --git a/hw/arm/pic_cpu.c b/hw/arm/pic_cpu.c
index 787767f..875280a 100644
--- a/hw/arm/pic_cpu.c
+++ b/hw/arm/pic_cpu.c
@@ -8,7 +8,7 @@
*/
#include "hw/hw.h"
-#include "hw/arm.h"
+#include "hw/arm/arm.h"
#include "sysemu/kvm.h"
/* Input 0 is IRQ and input 1 is FIQ. */
diff --git a/hw/arm/realview.c b/hw/arm/realview.c
index afd52d3..feabfc5 100644
--- a/hw/arm/realview.c
+++ b/hw/arm/realview.c
@@ -8,9 +8,9 @@
*/
#include "hw/sysbus.h"
-#include "hw/arm.h"
+#include "hw/arm/arm.h"
#include "hw/arm/primecell.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "hw/pci/pci.h"
#include "net/net.h"
#include "sysemu/sysemu.h"
diff --git a/hw/arm/spitz.c b/hw/arm/spitz.c
index fa434dc..c42668a 100644
--- a/hw/arm/spitz.c
+++ b/hw/arm/spitz.c
@@ -12,14 +12,14 @@
#include "hw/hw.h"
#include "hw/arm/pxa.h"
-#include "hw/arm.h"
+#include "hw/arm/arm.h"
#include "sysemu/sysemu.h"
#include "hw/pcmcia.h"
#include "hw/i2c/i2c.h"
#include "hw/ssi.h"
#include "hw/block/flash.h"
#include "qemu/timer.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "hw/arm/sharpsl.h"
#include "ui/console.h"
#include "block/block.h"
diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c
index 952087c..2b61e3c 100644
--- a/hw/arm/stellaris.c
+++ b/hw/arm/stellaris.c
@@ -9,8 +9,8 @@
#include "hw/sysbus.h"
#include "hw/ssi.h"
-#include "hw/arm.h"
-#include "hw/arm/devices.h"
+#include "hw/arm/arm.h"
+#include "hw/devices.h"
#include "qemu/timer.h"
#include "hw/i2c/i2c.h"
#include "net/net.h"
diff --git a/hw/arm/strongarm.c b/hw/arm/strongarm.c
index 5873a3c..75a813e 100644
--- a/hw/arm/strongarm.c
+++ b/hw/arm/strongarm.c
@@ -29,7 +29,7 @@
#include "hw/sysbus.h"
#include "strongarm.h"
#include "qemu/error-report.h"
-#include "hw/arm.h"
+#include "hw/arm/arm.h"
#include "char/char.h"
#include "sysemu/sysemu.h"
#include "hw/ssi.h"
diff --git a/hw/arm/tosa.c b/hw/arm/tosa.c
index c4362d4..47818a5 100644
--- a/hw/arm/tosa.c
+++ b/hw/arm/tosa.c
@@ -13,8 +13,8 @@
#include "hw/hw.h"
#include "hw/arm/pxa.h"
-#include "hw/arm.h"
-#include "hw/arm/devices.h"
+#include "hw/arm/arm.h"
+#include "hw/devices.h"
#include "hw/arm/sharpsl.h"
#include "hw/pcmcia.h"
#include "block/block.h"
diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c
index d9be604..25c665a 100644
--- a/hw/arm/versatilepb.c
+++ b/hw/arm/versatilepb.c
@@ -8,8 +8,8 @@
*/
#include "hw/sysbus.h"
-#include "hw/arm.h"
-#include "hw/arm/devices.h"
+#include "hw/arm/arm.h"
+#include "hw/devices.h"
#include "net/net.h"
#include "sysemu/sysemu.h"
#include "hw/pci/pci.h"
diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c
index 96e0985..a077c62 100644
--- a/hw/arm/vexpress.c
+++ b/hw/arm/vexpress.c
@@ -22,9 +22,9 @@
*/
#include "hw/sysbus.h"
-#include "hw/arm.h"
+#include "hw/arm/arm.h"
#include "hw/arm/primecell.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "net/net.h"
#include "sysemu/sysemu.h"
#include "hw/boards.h"
diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c
index 8d65f79..41505c3 100644
--- a/hw/arm/xilinx_zynq.c
+++ b/hw/arm/xilinx_zynq.c
@@ -16,7 +16,7 @@
*/
#include "hw/sysbus.h"
-#include "hw/arm.h"
+#include "hw/arm/arm.h"
#include "net/net.h"
#include "exec/address-spaces.h"
#include "sysemu/sysemu.h"
diff --git a/hw/arm/z2.c b/hw/arm/z2.c
index 3e27208..07a127b 100644
--- a/hw/arm/z2.c
+++ b/hw/arm/z2.c
@@ -13,8 +13,8 @@
#include "hw/hw.h"
#include "hw/arm/pxa.h"
-#include "hw/arm.h"
-#include "hw/arm/devices.h"
+#include "hw/arm/arm.h"
+#include "hw/devices.h"
#include "hw/i2c/i2c.h"
#include "hw/ssi.h"
#include "hw/boards.h"
diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c
index cd560e3..55e9d0d 100644
--- a/hw/block/m25p80.c
+++ b/hw/block/m25p80.c
@@ -24,7 +24,7 @@
#include "hw/hw.h"
#include "sysemu/blockdev.h"
#include "hw/ssi.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#ifdef M25P80_ERR_DEBUG
#define DB_PRINT(...) do { \
diff --git a/hw/display/blizzard.c b/hw/display/blizzard.c
index 175c5cd..de7ccf8 100644
--- a/hw/display/blizzard.c
+++ b/hw/display/blizzard.c
@@ -20,7 +20,7 @@
#include "qemu-common.h"
#include "ui/console.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "vga_int.h"
#include "ui/pixel_ops.h"
diff --git a/hw/display/sm501.c b/hw/display/sm501.c
index 6b660ac..9878df4 100644
--- a/hw/display/sm501.c
+++ b/hw/display/sm501.c
@@ -26,7 +26,7 @@
#include "hw/hw.h"
#include "hw/char/serial.h"
#include "ui/console.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "hw/sysbus.h"
#include "hw/qdev-addr.h"
#include "qemu/range.h"
diff --git a/hw/display/tc6393xb.c b/hw/display/tc6393xb.c
index e252ce9..178a21f 100644
--- a/hw/display/tc6393xb.c
+++ b/hw/display/tc6393xb.c
@@ -11,7 +11,7 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
#include "hw/hw.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "hw/block/flash.h"
#include "ui/console.h"
#include "ui/pixel_ops.h"
diff --git a/hw/input/stellaris_input.c b/hw/input/stellaris_input.c
index f83fc3f..4e40792 100644
--- a/hw/input/stellaris_input.c
+++ b/hw/input/stellaris_input.c
@@ -7,7 +7,7 @@
* This code is licensed under the GPL.
*/
#include "hw/hw.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "ui/console.h"
typedef struct {
diff --git a/hw/input/tsc2005.c b/hw/input/tsc2005.c
index 34ee1fb..a771cd5 100644
--- a/hw/input/tsc2005.c
+++ b/hw/input/tsc2005.c
@@ -21,7 +21,7 @@
#include "hw/hw.h"
#include "qemu/timer.h"
#include "ui/console.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#define TSC_CUT_RESOLUTION(value, p) ((value) >> (16 - (p ? 12 : 10)))
diff --git a/hw/input/tsc210x.c b/hw/input/tsc210x.c
index e6c217c..9b854e7 100644
--- a/hw/input/tsc210x.c
+++ b/hw/input/tsc210x.c
@@ -24,7 +24,7 @@
#include "qemu/timer.h"
#include "ui/console.h"
#include "hw/arm/omap.h" /* For I2SCodec and uWireSlave */
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#define TSC_DATA_REGISTERS_PAGE 0x0
#define TSC_CONTROL_REGISTERS_PAGE 0x1
diff --git a/hw/intc/armv7m_nvic.c b/hw/intc/armv7m_nvic.c
index 566b4bf..8eae4fc 100644
--- a/hw/intc/armv7m_nvic.c
+++ b/hw/intc/armv7m_nvic.c
@@ -12,7 +12,7 @@
#include "hw/sysbus.h"
#include "qemu/timer.h"
-#include "hw/arm.h"
+#include "hw/arm/arm.h"
#include "exec/address-spaces.h"
#include "gic_internal.h"
diff --git a/hw/lm32/lm32_boards.c b/hw/lm32/lm32_boards.c
index 6555a97..1ca9498 100644
--- a/hw/lm32/lm32_boards.c
+++ b/hw/lm32/lm32_boards.c
@@ -20,7 +20,7 @@
#include "hw/sysbus.h"
#include "hw/hw.h"
#include "hw/block/flash.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "hw/boards.h"
#include "hw/loader.h"
#include "sysemu/blockdev.h"
diff --git a/hw/lm32/milkymist.c b/hw/lm32/milkymist.c
index d02ca0c..cca9374 100644
--- a/hw/lm32/milkymist.c
+++ b/hw/lm32/milkymist.c
@@ -21,7 +21,7 @@
#include "hw/hw.h"
#include "hw/block/flash.h"
#include "sysemu/sysemu.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "hw/boards.h"
#include "hw/loader.h"
#include "elf.h"
diff --git a/hw/microblaze/petalogix_ml605_mmu.c b/hw/microblaze/petalogix_ml605_mmu.c
index f61818b..ae7ff44 100644
--- a/hw/microblaze/petalogix_ml605_mmu.c
+++ b/hw/microblaze/petalogix_ml605_mmu.c
@@ -30,7 +30,7 @@
#include "net/net.h"
#include "hw/block/flash.h"
#include "sysemu/sysemu.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "hw/boards.h"
#include "hw/xilinx.h"
#include "sysemu/blockdev.h"
diff --git a/hw/microblaze/petalogix_s3adsp1800_mmu.c b/hw/microblaze/petalogix_s3adsp1800_mmu.c
index eedd60e..7c258f0 100644
--- a/hw/microblaze/petalogix_s3adsp1800_mmu.c
+++ b/hw/microblaze/petalogix_s3adsp1800_mmu.c
@@ -28,7 +28,7 @@
#include "net/net.h"
#include "hw/block/flash.h"
#include "sysemu/sysemu.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "hw/boards.h"
#include "hw/xilinx.h"
#include "sysemu/blockdev.h"
diff --git a/hw/misc/cbus.c b/hw/misc/cbus.c
index 3d9027f..29b467b 100644
--- a/hw/misc/cbus.c
+++ b/hw/misc/cbus.c
@@ -22,7 +22,7 @@
#include "qemu-common.h"
#include "hw/irq.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "sysemu/sysemu.h"
//#define DEBUG
diff --git a/hw/net/lan9118.c b/hw/net/lan9118.c
index 04cf267..403fb86 100644
--- a/hw/net/lan9118.c
+++ b/hw/net/lan9118.c
@@ -12,7 +12,7 @@
#include "hw/sysbus.h"
#include "net/net.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "sysemu/sysemu.h"
#include "hw/ptimer.h"
/* For crc32 */
diff --git a/hw/net/smc91c111.c b/hw/net/smc91c111.c
index f659256..c2feae6 100644
--- a/hw/net/smc91c111.c
+++ b/hw/net/smc91c111.c
@@ -9,7 +9,7 @@
#include "hw/sysbus.h"
#include "net/net.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
/* For crc32 */
#include <zlib.h>
diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c
index 92b4394..6728ba7 100644
--- a/hw/ppc/virtex_ml507.c
+++ b/hw/ppc/virtex_ml507.c
@@ -27,7 +27,7 @@
#include "hw/char/serial.h"
#include "hw/block/flash.h"
#include "sysemu/sysemu.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "hw/boards.h"
#include "sysemu/device_tree.h"
#include "hw/loader.h"
diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c
index 256a58c..4986dae 100644
--- a/hw/sh4/r2d.c
+++ b/hw/sh4/r2d.c
@@ -26,7 +26,7 @@
#include "hw/sysbus.h"
#include "hw/hw.h"
#include "hw/sh4/sh.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "sysemu/sysemu.h"
#include "hw/boards.h"
#include "hw/pci/pci.h"
diff --git a/hw/timer/tusb6010.c b/hw/timer/tusb6010.c
index 533938a..50edc06 100644
--- a/hw/timer/tusb6010.c
+++ b/hw/timer/tusb6010.c
@@ -23,7 +23,7 @@
#include "hw/usb.h"
#include "hw/arm/omap.h"
#include "hw/irq.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "hw/sysbus.h"
typedef struct TUSBState {
diff --git a/include/hw/arm.h b/include/hw/arm/arm.h
similarity index 100%
rename from include/hw/arm.h
rename to include/hw/arm/arm.h
diff --git a/include/hw/arm/devices.h b/include/hw/devices.h
similarity index 100%
rename from include/hw/arm/devices.h
rename to include/hw/devices.h
diff --git a/target-arm/arm-semi.c b/target-arm/arm-semi.c
index 77718c4..f0637a4 100644
--- a/target-arm/arm-semi.c
+++ b/target-arm/arm-semi.c
@@ -34,7 +34,7 @@
#else
#include "qemu-common.h"
#include "exec/gdbstub.h"
-#include "hw/arm.h"
+#include "hw/arm/arm.h"
#endif
#define TARGET_SYS_OPEN 0x01
diff --git a/target-arm/kvm.c b/target-arm/kvm.c
index 6bfb103..d8acace 100644
--- a/target-arm/kvm.c
+++ b/target-arm/kvm.c
@@ -21,7 +21,7 @@
#include "sysemu/kvm.h"
#include "kvm_arm.h"
#include "cpu.h"
-#include "hw/arm.h"
+#include "hw/arm/arm.h"
const KVMCapabilityInfo kvm_arch_required_capabilities[] = {
KVM_CAP_LAST_INFO
--
1.8.1.4
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [Qemu-devel] [PULL 00/12] directory reorganization, fixes and final part
@ 2013-04-15 13:19 Paolo Bonzini
2013-04-15 13:19 ` [Qemu-devel] [PATCH 01/12] arm: fix location of some include files Paolo Bonzini
` (13 more replies)
0 siblings, 14 replies; 23+ messages in thread
From: Paolo Bonzini @ 2013-04-15 13:19 UTC (permalink / raw)
To: qemu-devel
Anthony,
The following changes since commit e2ec3f976803b360c70d9ae2ba13852fa5d11665:
qjson: to_json() case QTYPE_QSTRING is buggy, rewrite (2013-04-13 19:40:25 +0000)
are available in the git repository at:
git://github.com/bonzini/qemu.git hw-dirs
for you to fetch changes up to 4355deaaff63d715115fdf1359bfbb7cbc374662:
exec: remove useless declarations from memory-internal.h (2013-04-15 15:17:31 +0200)
----------------------------------------------------------------
Hu Tao (1):
Fix failure to create q35 machine
Jan Kiszka (1):
Add linux-headers to QEMU_INCLUDES
Michael S. Tsirkin (2):
acpi: move declarations from pc.h to acpi.h
acpi.h: make it self contained
Paolo Bonzini (6):
configure: fix TPM logic
tpm: reorganize headers and split hardware part
sysemu: avoid proliferation of include/ subdirectories
include: avoid useless includes of exec/ headers
memory: move core typedefs to qemu/typedefs.h
exec: remove useless declarations from memory-internal.h
Peter Maydell (1):
arm: fix location of some include files
Stefan Weil (1):
hw: Add lost ARM core again
Makefile.objs | 2 +-
arch_init.c | 2 +-
backends/baum.c | 2 +-
backends/msmouse.c | 2 +-
backends/rng-egd.c | 4 +-
backends/rng-random.c | 4 +-
backends/rng.c | 2 +-
backends/tpm.c | 40 ++++++++++++++-
bt-host.c | 2 +-
bt-vhci.c | 2 +-
configure | 29 +++++++----
default-configs/arm-softmmu.mak | 2 +-
default-configs/i386-softmmu.mak | 5 +-
default-configs/x86_64-softmmu.mak | 5 +-
dump.c | 6 ++-
gdbstub.c | 2 +-
hmp.c | 2 +-
hw/Makefile.objs | 1 +
hw/alpha/typhoon.c | 3 +-
hw/arm/armv7m.c | 2 +-
hw/arm/boot.c | 2 +-
hw/arm/collie.c | 4 +-
hw/arm/exynos4210.c | 2 +-
hw/arm/exynos4_boards.c | 2 +-
hw/arm/gumstix.c | 2 +-
hw/arm/highbank.c | 4 +-
hw/arm/integratorcp.c | 4 +-
hw/arm/kzm.c | 4 +-
hw/arm/mainstone.c | 4 +-
hw/arm/musicpal.c | 4 +-
hw/arm/nseries.c | 4 +-
hw/arm/omap1.c | 2 +-
hw/arm/omap2.c | 4 +-
hw/arm/omap_sx1.c | 2 +-
hw/arm/palm.c | 4 +-
hw/arm/pic_cpu.c | 2 +-
hw/arm/pxa2xx.c | 2 +-
hw/arm/realview.c | 4 +-
hw/arm/spitz.c | 4 +-
hw/arm/stellaris.c | 4 +-
hw/arm/strongarm.c | 4 +-
hw/arm/tosa.c | 4 +-
hw/arm/versatilepb.c | 4 +-
hw/arm/vexpress.c | 4 +-
hw/arm/xilinx_zynq.c | 2 +-
hw/arm/z2.c | 4 +-
hw/block/m25p80.c | 2 +-
hw/bt/core.c | 2 +-
hw/bt/hci-csr.c | 4 +-
hw/bt/hci.c | 2 +-
hw/char/cadence_uart.c | 2 +-
hw/char/debugcon.c | 2 +-
hw/char/escc.c | 2 +-
hw/char/etraxfs_ser.c | 2 +-
hw/char/exynos4210_uart.c | 2 +-
hw/char/grlib_apbuart.c | 2 +-
hw/char/imx_serial.c | 2 +-
hw/char/ipoctal232.c | 2 +-
hw/char/lm32_juart.c | 2 +-
hw/char/lm32_uart.c | 2 +-
hw/char/mcf_uart.c | 2 +-
hw/char/milkymist-uart.c | 2 +-
hw/char/omap_uart.c | 2 +-
hw/char/parallel.c | 2 +-
hw/char/pl011.c | 2 +-
hw/char/sclpconsole.c | 2 +-
hw/char/serial.c | 2 +-
hw/char/sh_serial.c | 2 +-
hw/char/spapr_vty.c | 2 +-
hw/char/virtio-console.c | 2 +-
hw/char/xen_console.c | 2 +-
hw/char/xilinx_uartlite.c | 2 +-
hw/core/qdev-properties-system.c | 2 +-
hw/core/qdev-properties.c | 2 +-
hw/display/blizzard.c | 2 +-
hw/display/sm501.c | 2 +-
hw/display/tc6393xb.c | 2 +-
hw/display/xenfb.c | 2 +-
hw/i386/pc.c | 1 +
hw/i386/pc_piix.c | 1 +
hw/ide/ahci.c | 1 -
hw/ide/internal.h | 1 -
hw/input/stellaris_input.c | 2 +-
hw/input/tsc2005.c | 2 +-
hw/input/tsc210x.c | 2 +-
hw/intc/armv7m_nvic.c | 2 +-
hw/isa/pc87312.c | 2 +-
hw/lm32/lm32_boards.c | 2 +-
hw/lm32/milkymist.c | 2 +-
hw/microblaze/petalogix_ml605_mmu.c | 2 +-
hw/microblaze/petalogix_s3adsp1800_mmu.c | 2 +-
hw/mips/mips_fulong2e.c | 2 +-
hw/mips/mips_malta.c | 2 +-
hw/misc/cbus.c | 2 +-
hw/misc/ivshmem.c | 2 +-
hw/net/lan9118.c | 2 +-
hw/net/smc91c111.c | 2 +-
hw/net/vmxnet_tx_pkt.c | 2 +-
hw/net/xgmac.c | 2 +-
hw/ppc/spapr_events.c | 2 +-
hw/ppc/spapr_rtas.c | 2 +-
hw/ppc/virtex_ml507.c | 2 +-
hw/sh4/r2d.c | 2 +-
hw/sparc/leon3.c | 2 +-
hw/timer/tusb6010.c | 2 +-
{tpm => hw/tpm}/Makefile.objs | 4 --
{tpm => hw/tpm}/tpm_int.h | 37 +-------------
{tpm => hw/tpm}/tpm_passthrough.c | 22 ++++++--
{tpm => hw/tpm}/tpm_tis.c | 4 +-
{tpm => hw/tpm}/tpm_tis.h | 5 --
hw/usb/ccid-card-emulated.c | 2 +-
hw/usb/ccid-card-passthru.c | 2 +-
hw/usb/dev-bluetooth.c | 2 +-
hw/usb/dev-serial.c | 2 +-
hw/usb/libhw.c | 2 +-
hw/usb/redirect.c | 2 +-
hw/virtio/virtio-rng.c | 2 +-
hw/xen/xen_backend.c | 2 +-
hw/xtensa/xtensa_lx60.c | 2 +-
include/exec/memory-internal.h | 6 ---
include/exec/memory.h | 5 --
include/hw/acpi/acpi.h | 13 +++++
include/hw/{ => arm}/arm.h | 0
include/hw/{arm => }/devices.h | 0
include/hw/i386/pc.h | 8 ---
include/hw/virtio/virtio-rng.h | 4 +-
include/qemu/typedefs.h | 4 ++
include/{bt => sysemu}/bt.h | 0
include/{char => sysemu}/char.h | 0
include/{qemu => sysemu}/rng-random.h | 0
include/{qemu => sysemu}/rng.h | 0
include/{tpm => sysemu}/tpm.h | 2 -
include/{backends/tpm.h => sysemu/tpm_backend.h} | 42 +++++++++++++++-
.../sysemu/tpm_backend_int.h | 0
kvm-stub.c | 1 -
monitor.c | 4 +-
net/slirp.c | 2 +-
qemu-char.c | 2 +-
qmp.c | 2 +-
qtest.c | 2 +-
slirp/slirp.c | 2 +-
spice-qemu-char.c | 2 +-
target-arm/arm-semi.c | 2 +-
target-arm/kvm.c | 2 +-
target-ppc/kvm_ppc.h | 2 -
tpm/tpm.c => tpm.c | 21 ++------
tpm/tpm_backend.c | 58 ----------------------
translate-all.c | 5 +-
ui/console.c | 2 +-
ui/gtk.c | 2 +-
util/event_notifier-posix.c | 2 +-
vl.c | 6 +--
xen-all.c | 2 +-
153 files changed, 297 insertions(+), 319 deletions(-)
rename {tpm => hw/tpm}/Makefile.objs (55%)
rename {tpm => hw/tpm}/tpm_int.h (50%)
rename {tpm => hw/tpm}/tpm_passthrough.c (96%)
rename {tpm => hw/tpm}/tpm_tis.c (99%)
rename {tpm => hw/tpm}/tpm_tis.h (96%)
rename include/hw/{ => arm}/arm.h (100%)
rename include/hw/{arm => }/devices.h (100%)
rename include/{bt => sysemu}/bt.h (100%)
rename include/{char => sysemu}/char.h (100%)
rename include/{qemu => sysemu}/rng-random.h (100%)
rename include/{qemu => sysemu}/rng.h (100%)
rename include/{tpm => sysemu}/tpm.h (82%)
rename include/{backends/tpm.h => sysemu/tpm_backend.h} (77%)
rename tpm/tpm_backend.h => include/sysemu/tpm_backend_int.h (100%)
rename tpm/tpm.c => tpm.c (93%)
delete mode 100644 tpm/tpm_backend.c
--
1.8.1.4
^ permalink raw reply [flat|nested] 23+ messages in thread
* [Qemu-devel] [PATCH 01/12] arm: fix location of some include files
2013-04-15 13:19 [Qemu-devel] [PULL 00/12] directory reorganization, fixes and final part Paolo Bonzini
@ 2013-04-15 13:19 ` Paolo Bonzini
2013-04-15 13:19 ` [Qemu-devel] [PATCH 02/12] Add linux-headers to QEMU_INCLUDES Paolo Bonzini
` (12 subsequent siblings)
13 siblings, 0 replies; 23+ messages in thread
From: Paolo Bonzini @ 2013-04-15 13:19 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Maydell
From: Peter Maydell <peter.maydell@linaro.org>
The recent rearrangement of include files had some minor errors:
devices.h is not ARM specific and should not be in arm/
arm.h should be in arm/
Move these two headers to correct this.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
hw/alpha/typhoon.c | 2 +-
hw/arm/armv7m.c | 2 +-
hw/arm/boot.c | 2 +-
hw/arm/collie.c | 4 ++--
hw/arm/exynos4210.c | 2 +-
hw/arm/exynos4_boards.c | 2 +-
hw/arm/gumstix.c | 2 +-
hw/arm/highbank.c | 4 ++--
hw/arm/integratorcp.c | 4 ++--
hw/arm/kzm.c | 4 ++--
hw/arm/mainstone.c | 4 ++--
hw/arm/musicpal.c | 4 ++--
hw/arm/nseries.c | 4 ++--
hw/arm/omap1.c | 2 +-
hw/arm/omap2.c | 2 +-
hw/arm/omap_sx1.c | 2 +-
hw/arm/palm.c | 4 ++--
hw/arm/pic_cpu.c | 2 +-
hw/arm/realview.c | 4 ++--
hw/arm/spitz.c | 4 ++--
hw/arm/stellaris.c | 4 ++--
hw/arm/strongarm.c | 2 +-
hw/arm/tosa.c | 4 ++--
hw/arm/versatilepb.c | 4 ++--
hw/arm/vexpress.c | 4 ++--
hw/arm/xilinx_zynq.c | 2 +-
hw/arm/z2.c | 4 ++--
hw/block/m25p80.c | 2 +-
hw/display/blizzard.c | 2 +-
hw/display/sm501.c | 2 +-
hw/display/tc6393xb.c | 2 +-
hw/input/stellaris_input.c | 2 +-
hw/input/tsc2005.c | 2 +-
hw/input/tsc210x.c | 2 +-
hw/intc/armv7m_nvic.c | 2 +-
hw/lm32/lm32_boards.c | 2 +-
hw/lm32/milkymist.c | 2 +-
hw/microblaze/petalogix_ml605_mmu.c | 2 +-
hw/microblaze/petalogix_s3adsp1800_mmu.c | 2 +-
hw/misc/cbus.c | 2 +-
hw/net/lan9118.c | 2 +-
hw/net/smc91c111.c | 2 +-
hw/ppc/virtex_ml507.c | 2 +-
hw/sh4/r2d.c | 2 +-
hw/timer/tusb6010.c | 2 +-
include/hw/{ => arm}/arm.h | 0
include/hw/{arm => }/devices.h | 0
target-arm/arm-semi.c | 2 +-
target-arm/kvm.c | 2 +-
49 files changed, 62 insertions(+), 62 deletions(-)
rename include/hw/{ => arm}/arm.h (100%)
rename include/hw/{arm => }/devices.h (100%)
diff --git a/hw/alpha/typhoon.c b/hw/alpha/typhoon.c
index faec8dc..68420f4 100644
--- a/hw/alpha/typhoon.c
+++ b/hw/alpha/typhoon.c
@@ -9,7 +9,7 @@
#include "cpu.h"
#include "exec/exec-all.h"
#include "hw/hw.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "sysemu/sysemu.h"
#include "alpha_sys.h"
#include "exec/address-spaces.h"
diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c
index a4bdd5f..2ae3576 100644
--- a/hw/arm/armv7m.c
+++ b/hw/arm/armv7m.c
@@ -8,7 +8,7 @@
*/
#include "hw/sysbus.h"
-#include "hw/arm.h"
+#include "hw/arm/arm.h"
#include "hw/loader.h"
#include "elf.h"
diff --git a/hw/arm/boot.c b/hw/arm/boot.c
index c79c590..e9c0945 100644
--- a/hw/arm/boot.c
+++ b/hw/arm/boot.c
@@ -9,7 +9,7 @@
#include "config.h"
#include "hw/hw.h"
-#include "hw/arm.h"
+#include "hw/arm/arm.h"
#include "sysemu/sysemu.h"
#include "hw/boards.h"
#include "hw/loader.h"
diff --git a/hw/arm/collie.c b/hw/arm/collie.c
index 5420bb4..a19857a 100644
--- a/hw/arm/collie.c
+++ b/hw/arm/collie.c
@@ -11,9 +11,9 @@
#include "hw/hw.h"
#include "hw/sysbus.h"
#include "hw/boards.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "strongarm.h"
-#include "hw/arm.h"
+#include "hw/arm/arm.h"
#include "hw/block/flash.h"
#include "sysemu/blockdev.h"
#include "exec/address-spaces.h"
diff --git a/hw/arm/exynos4210.c b/hw/arm/exynos4210.c
index 78b8b74..c8101d3 100644
--- a/hw/arm/exynos4210.c
+++ b/hw/arm/exynos4210.c
@@ -24,7 +24,7 @@
#include "hw/boards.h"
#include "sysemu/sysemu.h"
#include "hw/sysbus.h"
-#include "hw/arm.h"
+#include "hw/arm/arm.h"
#include "hw/loader.h"
#include "hw/arm/exynos4210.h"
#include "hw/usb/hcd-ehci.h"
diff --git a/hw/arm/exynos4_boards.c b/hw/arm/exynos4_boards.c
index ba14a1f..74f110b 100644
--- a/hw/arm/exynos4_boards.c
+++ b/hw/arm/exynos4_boards.c
@@ -24,7 +24,7 @@
#include "sysemu/sysemu.h"
#include "hw/sysbus.h"
#include "net/net.h"
-#include "hw/arm.h"
+#include "hw/arm/arm.h"
#include "exec/address-spaces.h"
#include "hw/arm/exynos4210.h"
#include "hw/boards.h"
diff --git a/hw/arm/gumstix.c b/hw/arm/gumstix.c
index 4d800c9..b8cab10 100644
--- a/hw/arm/gumstix.c
+++ b/hw/arm/gumstix.c
@@ -38,7 +38,7 @@
#include "hw/arm/pxa.h"
#include "net/net.h"
#include "hw/block/flash.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "hw/boards.h"
#include "sysemu/blockdev.h"
#include "exec/address-spaces.h"
diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c
index 58f73c1..0fd9465 100644
--- a/hw/arm/highbank.c
+++ b/hw/arm/highbank.c
@@ -18,8 +18,8 @@
*/
#include "hw/sysbus.h"
-#include "hw/arm.h"
-#include "hw/arm/devices.h"
+#include "hw/arm/arm.h"
+#include "hw/devices.h"
#include "hw/loader.h"
#include "net/net.h"
#include "sysemu/sysemu.h"
diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c
index 8d0fb75..cca2971 100644
--- a/hw/arm/integratorcp.c
+++ b/hw/arm/integratorcp.c
@@ -8,9 +8,9 @@
*/
#include "hw/sysbus.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "hw/boards.h"
-#include "hw/arm.h"
+#include "hw/arm/arm.h"
#include "net/net.h"
#include "exec/address-spaces.h"
#include "sysemu/sysemu.h"
diff --git a/hw/arm/kzm.c b/hw/arm/kzm.c
index 46264cd..cf90f5d 100644
--- a/hw/arm/kzm.c
+++ b/hw/arm/kzm.c
@@ -16,8 +16,8 @@
#include "hw/sysbus.h"
#include "exec/address-spaces.h"
#include "hw/hw.h"
-#include "hw/arm.h"
-#include "hw/arm/devices.h"
+#include "hw/arm/arm.h"
+#include "hw/devices.h"
#include "net/net.h"
#include "sysemu/sysemu.h"
#include "hw/boards.h"
diff --git a/hw/arm/mainstone.c b/hw/arm/mainstone.c
index b78e6f0..260e314 100644
--- a/hw/arm/mainstone.c
+++ b/hw/arm/mainstone.c
@@ -13,9 +13,9 @@
*/
#include "hw/hw.h"
#include "hw/arm/pxa.h"
-#include "hw/arm.h"
+#include "hw/arm/arm.h"
#include "net/net.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "hw/boards.h"
#include "hw/block/flash.h"
#include "sysemu/blockdev.h"
diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c
index 97b1340..d2247fa 100644
--- a/hw/arm/musicpal.c
+++ b/hw/arm/musicpal.c
@@ -10,8 +10,8 @@
*/
#include "hw/sysbus.h"
-#include "hw/arm.h"
-#include "hw/arm/devices.h"
+#include "hw/arm/arm.h"
+#include "hw/devices.h"
#include "net/net.h"
#include "sysemu/sysemu.h"
#include "hw/boards.h"
diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c
index ba8dc3e..4976438 100644
--- a/hw/arm/nseries.c
+++ b/hw/arm/nseries.c
@@ -21,12 +21,12 @@
#include "qemu-common.h"
#include "sysemu/sysemu.h"
#include "hw/arm/omap.h"
-#include "hw/arm.h"
+#include "hw/arm/arm.h"
#include "hw/irq.h"
#include "ui/console.h"
#include "hw/boards.h"
#include "hw/i2c/i2c.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "hw/block/flash.h"
#include "hw/hw.h"
#include "hw/bt.h"
diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c
index 17caa61..f59f0f2 100644
--- a/hw/arm/omap1.c
+++ b/hw/arm/omap1.c
@@ -17,7 +17,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "hw/hw.h"
-#include "hw/arm.h"
+#include "hw/arm/arm.h"
#include "hw/arm/omap.h"
#include "sysemu/sysemu.h"
#include "hw/arm/soc_dma.h"
diff --git a/hw/arm/omap2.c b/hw/arm/omap2.c
index 010c483..a4b4146 100644
--- a/hw/arm/omap2.c
+++ b/hw/arm/omap2.c
@@ -20,7 +20,7 @@
#include "sysemu/blockdev.h"
#include "hw/hw.h"
-#include "hw/arm.h"
+#include "hw/arm/arm.h"
#include "hw/arm/omap.h"
#include "sysemu/sysemu.h"
#include "qemu/timer.h"
diff --git a/hw/arm/omap_sx1.c b/hw/arm/omap_sx1.c
index aa85602..e421ece 100644
--- a/hw/arm/omap_sx1.c
+++ b/hw/arm/omap_sx1.c
@@ -29,7 +29,7 @@
#include "ui/console.h"
#include "hw/arm/omap.h"
#include "hw/boards.h"
-#include "hw/arm.h"
+#include "hw/arm/arm.h"
#include "hw/block/flash.h"
#include "sysemu/blockdev.h"
#include "exec/address-spaces.h"
diff --git a/hw/arm/palm.c b/hw/arm/palm.c
index 0bc11ae..b13d810 100644
--- a/hw/arm/palm.c
+++ b/hw/arm/palm.c
@@ -22,8 +22,8 @@
#include "ui/console.h"
#include "hw/arm/omap.h"
#include "hw/boards.h"
-#include "hw/arm.h"
-#include "hw/arm/devices.h"
+#include "hw/arm/arm.h"
+#include "hw/devices.h"
#include "hw/loader.h"
#include "exec/address-spaces.h"
diff --git a/hw/arm/pic_cpu.c b/hw/arm/pic_cpu.c
index 787767f..875280a 100644
--- a/hw/arm/pic_cpu.c
+++ b/hw/arm/pic_cpu.c
@@ -8,7 +8,7 @@
*/
#include "hw/hw.h"
-#include "hw/arm.h"
+#include "hw/arm/arm.h"
#include "sysemu/kvm.h"
/* Input 0 is IRQ and input 1 is FIQ. */
diff --git a/hw/arm/realview.c b/hw/arm/realview.c
index afd52d3..feabfc5 100644
--- a/hw/arm/realview.c
+++ b/hw/arm/realview.c
@@ -8,9 +8,9 @@
*/
#include "hw/sysbus.h"
-#include "hw/arm.h"
+#include "hw/arm/arm.h"
#include "hw/arm/primecell.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "hw/pci/pci.h"
#include "net/net.h"
#include "sysemu/sysemu.h"
diff --git a/hw/arm/spitz.c b/hw/arm/spitz.c
index fa434dc..c42668a 100644
--- a/hw/arm/spitz.c
+++ b/hw/arm/spitz.c
@@ -12,14 +12,14 @@
#include "hw/hw.h"
#include "hw/arm/pxa.h"
-#include "hw/arm.h"
+#include "hw/arm/arm.h"
#include "sysemu/sysemu.h"
#include "hw/pcmcia.h"
#include "hw/i2c/i2c.h"
#include "hw/ssi.h"
#include "hw/block/flash.h"
#include "qemu/timer.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "hw/arm/sharpsl.h"
#include "ui/console.h"
#include "block/block.h"
diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c
index 952087c..2b61e3c 100644
--- a/hw/arm/stellaris.c
+++ b/hw/arm/stellaris.c
@@ -9,8 +9,8 @@
#include "hw/sysbus.h"
#include "hw/ssi.h"
-#include "hw/arm.h"
-#include "hw/arm/devices.h"
+#include "hw/arm/arm.h"
+#include "hw/devices.h"
#include "qemu/timer.h"
#include "hw/i2c/i2c.h"
#include "net/net.h"
diff --git a/hw/arm/strongarm.c b/hw/arm/strongarm.c
index 5873a3c..75a813e 100644
--- a/hw/arm/strongarm.c
+++ b/hw/arm/strongarm.c
@@ -29,7 +29,7 @@
#include "hw/sysbus.h"
#include "strongarm.h"
#include "qemu/error-report.h"
-#include "hw/arm.h"
+#include "hw/arm/arm.h"
#include "char/char.h"
#include "sysemu/sysemu.h"
#include "hw/ssi.h"
diff --git a/hw/arm/tosa.c b/hw/arm/tosa.c
index c4362d4..47818a5 100644
--- a/hw/arm/tosa.c
+++ b/hw/arm/tosa.c
@@ -13,8 +13,8 @@
#include "hw/hw.h"
#include "hw/arm/pxa.h"
-#include "hw/arm.h"
-#include "hw/arm/devices.h"
+#include "hw/arm/arm.h"
+#include "hw/devices.h"
#include "hw/arm/sharpsl.h"
#include "hw/pcmcia.h"
#include "block/block.h"
diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c
index d9be604..25c665a 100644
--- a/hw/arm/versatilepb.c
+++ b/hw/arm/versatilepb.c
@@ -8,8 +8,8 @@
*/
#include "hw/sysbus.h"
-#include "hw/arm.h"
-#include "hw/arm/devices.h"
+#include "hw/arm/arm.h"
+#include "hw/devices.h"
#include "net/net.h"
#include "sysemu/sysemu.h"
#include "hw/pci/pci.h"
diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c
index 96e0985..a077c62 100644
--- a/hw/arm/vexpress.c
+++ b/hw/arm/vexpress.c
@@ -22,9 +22,9 @@
*/
#include "hw/sysbus.h"
-#include "hw/arm.h"
+#include "hw/arm/arm.h"
#include "hw/arm/primecell.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "net/net.h"
#include "sysemu/sysemu.h"
#include "hw/boards.h"
diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c
index 8d65f79..41505c3 100644
--- a/hw/arm/xilinx_zynq.c
+++ b/hw/arm/xilinx_zynq.c
@@ -16,7 +16,7 @@
*/
#include "hw/sysbus.h"
-#include "hw/arm.h"
+#include "hw/arm/arm.h"
#include "net/net.h"
#include "exec/address-spaces.h"
#include "sysemu/sysemu.h"
diff --git a/hw/arm/z2.c b/hw/arm/z2.c
index 3e27208..07a127b 100644
--- a/hw/arm/z2.c
+++ b/hw/arm/z2.c
@@ -13,8 +13,8 @@
#include "hw/hw.h"
#include "hw/arm/pxa.h"
-#include "hw/arm.h"
-#include "hw/arm/devices.h"
+#include "hw/arm/arm.h"
+#include "hw/devices.h"
#include "hw/i2c/i2c.h"
#include "hw/ssi.h"
#include "hw/boards.h"
diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c
index cd560e3..55e9d0d 100644
--- a/hw/block/m25p80.c
+++ b/hw/block/m25p80.c
@@ -24,7 +24,7 @@
#include "hw/hw.h"
#include "sysemu/blockdev.h"
#include "hw/ssi.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#ifdef M25P80_ERR_DEBUG
#define DB_PRINT(...) do { \
diff --git a/hw/display/blizzard.c b/hw/display/blizzard.c
index 175c5cd..de7ccf8 100644
--- a/hw/display/blizzard.c
+++ b/hw/display/blizzard.c
@@ -20,7 +20,7 @@
#include "qemu-common.h"
#include "ui/console.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "vga_int.h"
#include "ui/pixel_ops.h"
diff --git a/hw/display/sm501.c b/hw/display/sm501.c
index 6b660ac..9878df4 100644
--- a/hw/display/sm501.c
+++ b/hw/display/sm501.c
@@ -26,7 +26,7 @@
#include "hw/hw.h"
#include "hw/char/serial.h"
#include "ui/console.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "hw/sysbus.h"
#include "hw/qdev-addr.h"
#include "qemu/range.h"
diff --git a/hw/display/tc6393xb.c b/hw/display/tc6393xb.c
index e252ce9..178a21f 100644
--- a/hw/display/tc6393xb.c
+++ b/hw/display/tc6393xb.c
@@ -11,7 +11,7 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
#include "hw/hw.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "hw/block/flash.h"
#include "ui/console.h"
#include "ui/pixel_ops.h"
diff --git a/hw/input/stellaris_input.c b/hw/input/stellaris_input.c
index f83fc3f..4e40792 100644
--- a/hw/input/stellaris_input.c
+++ b/hw/input/stellaris_input.c
@@ -7,7 +7,7 @@
* This code is licensed under the GPL.
*/
#include "hw/hw.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "ui/console.h"
typedef struct {
diff --git a/hw/input/tsc2005.c b/hw/input/tsc2005.c
index 34ee1fb..a771cd5 100644
--- a/hw/input/tsc2005.c
+++ b/hw/input/tsc2005.c
@@ -21,7 +21,7 @@
#include "hw/hw.h"
#include "qemu/timer.h"
#include "ui/console.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#define TSC_CUT_RESOLUTION(value, p) ((value) >> (16 - (p ? 12 : 10)))
diff --git a/hw/input/tsc210x.c b/hw/input/tsc210x.c
index e6c217c..9b854e7 100644
--- a/hw/input/tsc210x.c
+++ b/hw/input/tsc210x.c
@@ -24,7 +24,7 @@
#include "qemu/timer.h"
#include "ui/console.h"
#include "hw/arm/omap.h" /* For I2SCodec and uWireSlave */
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#define TSC_DATA_REGISTERS_PAGE 0x0
#define TSC_CONTROL_REGISTERS_PAGE 0x1
diff --git a/hw/intc/armv7m_nvic.c b/hw/intc/armv7m_nvic.c
index 67dbe68..25fa43c 100644
--- a/hw/intc/armv7m_nvic.c
+++ b/hw/intc/armv7m_nvic.c
@@ -12,7 +12,7 @@
#include "hw/sysbus.h"
#include "qemu/timer.h"
-#include "hw/arm.h"
+#include "hw/arm/arm.h"
#include "exec/address-spaces.h"
#include "gic_internal.h"
diff --git a/hw/lm32/lm32_boards.c b/hw/lm32/lm32_boards.c
index 6555a97..1ca9498 100644
--- a/hw/lm32/lm32_boards.c
+++ b/hw/lm32/lm32_boards.c
@@ -20,7 +20,7 @@
#include "hw/sysbus.h"
#include "hw/hw.h"
#include "hw/block/flash.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "hw/boards.h"
#include "hw/loader.h"
#include "sysemu/blockdev.h"
diff --git a/hw/lm32/milkymist.c b/hw/lm32/milkymist.c
index d02ca0c..cca9374 100644
--- a/hw/lm32/milkymist.c
+++ b/hw/lm32/milkymist.c
@@ -21,7 +21,7 @@
#include "hw/hw.h"
#include "hw/block/flash.h"
#include "sysemu/sysemu.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "hw/boards.h"
#include "hw/loader.h"
#include "elf.h"
diff --git a/hw/microblaze/petalogix_ml605_mmu.c b/hw/microblaze/petalogix_ml605_mmu.c
index f61818b..ae7ff44 100644
--- a/hw/microblaze/petalogix_ml605_mmu.c
+++ b/hw/microblaze/petalogix_ml605_mmu.c
@@ -30,7 +30,7 @@
#include "net/net.h"
#include "hw/block/flash.h"
#include "sysemu/sysemu.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "hw/boards.h"
#include "hw/xilinx.h"
#include "sysemu/blockdev.h"
diff --git a/hw/microblaze/petalogix_s3adsp1800_mmu.c b/hw/microblaze/petalogix_s3adsp1800_mmu.c
index eedd60e..7c258f0 100644
--- a/hw/microblaze/petalogix_s3adsp1800_mmu.c
+++ b/hw/microblaze/petalogix_s3adsp1800_mmu.c
@@ -28,7 +28,7 @@
#include "net/net.h"
#include "hw/block/flash.h"
#include "sysemu/sysemu.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "hw/boards.h"
#include "hw/xilinx.h"
#include "sysemu/blockdev.h"
diff --git a/hw/misc/cbus.c b/hw/misc/cbus.c
index 3d9027f..29b467b 100644
--- a/hw/misc/cbus.c
+++ b/hw/misc/cbus.c
@@ -22,7 +22,7 @@
#include "qemu-common.h"
#include "hw/irq.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "sysemu/sysemu.h"
//#define DEBUG
diff --git a/hw/net/lan9118.c b/hw/net/lan9118.c
index 04cf267..403fb86 100644
--- a/hw/net/lan9118.c
+++ b/hw/net/lan9118.c
@@ -12,7 +12,7 @@
#include "hw/sysbus.h"
#include "net/net.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "sysemu/sysemu.h"
#include "hw/ptimer.h"
/* For crc32 */
diff --git a/hw/net/smc91c111.c b/hw/net/smc91c111.c
index f659256..c2feae6 100644
--- a/hw/net/smc91c111.c
+++ b/hw/net/smc91c111.c
@@ -9,7 +9,7 @@
#include "hw/sysbus.h"
#include "net/net.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
/* For crc32 */
#include <zlib.h>
diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c
index 92b4394..6728ba7 100644
--- a/hw/ppc/virtex_ml507.c
+++ b/hw/ppc/virtex_ml507.c
@@ -27,7 +27,7 @@
#include "hw/char/serial.h"
#include "hw/block/flash.h"
#include "sysemu/sysemu.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "hw/boards.h"
#include "sysemu/device_tree.h"
#include "hw/loader.h"
diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c
index fe82bd6..3e4818e 100644
--- a/hw/sh4/r2d.c
+++ b/hw/sh4/r2d.c
@@ -26,7 +26,7 @@
#include "hw/sysbus.h"
#include "hw/hw.h"
#include "hw/sh4/sh.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "sysemu/sysemu.h"
#include "hw/boards.h"
#include "hw/pci/pci.h"
diff --git a/hw/timer/tusb6010.c b/hw/timer/tusb6010.c
index 533938a..50edc06 100644
--- a/hw/timer/tusb6010.c
+++ b/hw/timer/tusb6010.c
@@ -23,7 +23,7 @@
#include "hw/usb.h"
#include "hw/arm/omap.h"
#include "hw/irq.h"
-#include "hw/arm/devices.h"
+#include "hw/devices.h"
#include "hw/sysbus.h"
typedef struct TUSBState {
diff --git a/include/hw/arm.h b/include/hw/arm/arm.h
similarity index 100%
rename from include/hw/arm.h
rename to include/hw/arm/arm.h
diff --git a/include/hw/arm/devices.h b/include/hw/devices.h
similarity index 100%
rename from include/hw/arm/devices.h
rename to include/hw/devices.h
diff --git a/target-arm/arm-semi.c b/target-arm/arm-semi.c
index 77718c4..f0637a4 100644
--- a/target-arm/arm-semi.c
+++ b/target-arm/arm-semi.c
@@ -34,7 +34,7 @@
#else
#include "qemu-common.h"
#include "exec/gdbstub.h"
-#include "hw/arm.h"
+#include "hw/arm/arm.h"
#endif
#define TARGET_SYS_OPEN 0x01
diff --git a/target-arm/kvm.c b/target-arm/kvm.c
index 6bfb103..d8acace 100644
--- a/target-arm/kvm.c
+++ b/target-arm/kvm.c
@@ -21,7 +21,7 @@
#include "sysemu/kvm.h"
#include "kvm_arm.h"
#include "cpu.h"
-#include "hw/arm.h"
+#include "hw/arm/arm.h"
const KVMCapabilityInfo kvm_arch_required_capabilities[] = {
KVM_CAP_LAST_INFO
--
1.8.1.4
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [Qemu-devel] [PATCH 02/12] Add linux-headers to QEMU_INCLUDES
2013-04-15 13:19 [Qemu-devel] [PULL 00/12] directory reorganization, fixes and final part Paolo Bonzini
2013-04-15 13:19 ` [Qemu-devel] [PATCH 01/12] arm: fix location of some include files Paolo Bonzini
@ 2013-04-15 13:19 ` Paolo Bonzini
2013-04-15 13:19 ` [Qemu-devel] [PATCH 03/12] Fix failure to create q35 machine Paolo Bonzini
` (11 subsequent siblings)
13 siblings, 0 replies; 23+ messages in thread
From: Paolo Bonzini @ 2013-04-15 13:19 UTC (permalink / raw)
To: qemu-devel; +Cc: Jan Kiszka
From: Jan Kiszka <jan.kiszka@siemens.com>
virtio/dataplane/vring.c requires the Linux headers and is built for all
targets. So we need to add the corresponding include to QEMU_INCLUDES to
avoid that outdated distribution headers are used.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/configure b/configure
index 73df181..258c82a 100755
--- a/configure
+++ b/configure
@@ -544,6 +544,7 @@ Haiku)
if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then
audio_possible_drivers="$audio_possible_drivers fmod"
fi
+ QEMU_INCLUDES="-I\$(SRC_PATH)/linux-headers $QEMU_INCLUDES"
;;
esac
@@ -4227,10 +4228,6 @@ else
fi
includes="-I\$(SRC_PATH)/tcg $includes"
-if test "$linux" = "yes" ; then
- includes="-I\$(SRC_PATH)/linux-headers $includes"
-fi
-
for i in $ARCH $TARGET_BASE_ARCH ; do
case "$i" in
alpha)
--
1.8.1.4
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [Qemu-devel] [PATCH 03/12] Fix failure to create q35 machine
2013-04-15 13:19 [Qemu-devel] [PULL 00/12] directory reorganization, fixes and final part Paolo Bonzini
2013-04-15 13:19 ` [Qemu-devel] [PATCH 01/12] arm: fix location of some include files Paolo Bonzini
2013-04-15 13:19 ` [Qemu-devel] [PATCH 02/12] Add linux-headers to QEMU_INCLUDES Paolo Bonzini
@ 2013-04-15 13:19 ` Paolo Bonzini
2013-04-15 13:19 ` [Qemu-devel] [PATCH 04/12] hw: Add lost ARM core again Paolo Bonzini
` (10 subsequent siblings)
13 siblings, 0 replies; 23+ messages in thread
From: Paolo Bonzini @ 2013-04-15 13:19 UTC (permalink / raw)
To: qemu-devel; +Cc: Hu Tao
From: Hu Tao <hutao@cn.fujitsu.com>
This is a regression introduced by c0907c9e6417c. How to reproduce:
$ qemu-system-x86_64 -nodefaults -vnc :0 -M q35
qemu-system-x86_64: Unknown device 'q35-pcihost' for default sysbus
Aborted (core dumped)
Tested-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Hu Tao <hutao@cn.fujitsu.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
default-configs/i386-softmmu.mak | 2 +-
default-configs/x86_64-softmmu.mak | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak
index 4ac0694..6d9d364 100644
--- a/default-configs/i386-softmmu.mak
+++ b/default-configs/i386-softmmu.mak
@@ -42,6 +42,6 @@ CONFIG_ISA_TESTDEV=y
CONFIG_VMPORT=y
CONFIG_SGA=y
CONFIG_LPC_ICH9=y
-CONFIG_Q35=y
+CONFIG_PCI_Q35=y
CONFIG_APIC=y
CONFIG_IOAPIC=y
diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak
index bf4091c..3b06310 100644
--- a/default-configs/x86_64-softmmu.mak
+++ b/default-configs/x86_64-softmmu.mak
@@ -42,6 +42,6 @@ CONFIG_ISA_TESTDEV=y
CONFIG_VMPORT=y
CONFIG_SGA=y
CONFIG_LPC_ICH9=y
-CONFIG_Q35=y
+CONFIG_PCI_Q35=y
CONFIG_APIC=y
CONFIG_IOAPIC=y
--
1.8.1.4
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [Qemu-devel] [PATCH 04/12] hw: Add lost ARM core again
2013-04-15 13:19 [Qemu-devel] [PULL 00/12] directory reorganization, fixes and final part Paolo Bonzini
` (2 preceding siblings ...)
2013-04-15 13:19 ` [Qemu-devel] [PATCH 03/12] Fix failure to create q35 machine Paolo Bonzini
@ 2013-04-15 13:19 ` Paolo Bonzini
2013-04-15 13:19 ` [Qemu-devel] [PATCH 05/12] acpi: move declarations from pc.h to acpi.h Paolo Bonzini
` (9 subsequent siblings)
13 siblings, 0 replies; 23+ messages in thread
From: Paolo Bonzini @ 2013-04-15 13:19 UTC (permalink / raw)
To: qemu-devel; +Cc: Stefan Weil
From: Stefan Weil <sw@weilnetz.de>
Commit 0434e30afb6175212389811e0b28b948eb3c1e40 accidentally removed
the compilation of arm11mpcore.c.
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
default-configs/arm-softmmu.mak | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 31725a9..27cbe3d 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -34,8 +34,8 @@ CONFIG_PFLASH_CFI02=y
CONFIG_MICRODRIVE=y
CONFIG_USB_MUSB=y
-CONFIG_ARM5MPCORE=y
CONFIG_ARM9MPCORE=y
+CONFIG_ARM11MPCORE=y
CONFIG_ARM15MPCORE=y
CONFIG_ARM_GIC=y
--
1.8.1.4
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [Qemu-devel] [PATCH 05/12] acpi: move declarations from pc.h to acpi.h
2013-04-15 13:19 [Qemu-devel] [PULL 00/12] directory reorganization, fixes and final part Paolo Bonzini
` (3 preceding siblings ...)
2013-04-15 13:19 ` [Qemu-devel] [PATCH 04/12] hw: Add lost ARM core again Paolo Bonzini
@ 2013-04-15 13:19 ` Paolo Bonzini
2013-04-15 13:19 ` [Qemu-devel] [PATCH 06/12] acpi.h: make it self contained Paolo Bonzini
` (8 subsequent siblings)
13 siblings, 0 replies; 23+ messages in thread
From: Paolo Bonzini @ 2013-04-15 13:19 UTC (permalink / raw)
To: qemu-devel; +Cc: Michael S. Tsirkin
From: "Michael S. Tsirkin" <mst@redhat.com>
Functions defined in acpi/ should be declared in
acpi.h
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
arch_init.c | 1 +
hw/i386/pc.c | 1 +
hw/i386/pc_piix.c | 1 +
include/hw/acpi/acpi.h | 7 +++++++
include/hw/i386/pc.h | 8 --------
5 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/arch_init.c b/arch_init.c
index 769ce77..fba0889 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -49,6 +49,7 @@
#include "qmp-commands.h"
#include "trace.h"
#include "exec/cpu-all.h"
+#include "hw/acpi/acpi.h"
#ifdef DEBUG_ARCH_INIT
#define DPRINTF(fmt, ...) \
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 8d75b34..0d6e72b 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -52,6 +52,7 @@
#include "sysemu/arch_init.h"
#include "qemu/bitmap.h"
#include "qemu/config-file.h"
+#include "hw/acpi/acpi.h"
/* debug PC/ISA interrupts */
//#define DEBUG_IRQ
diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index cff8013..943758a 100644
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -43,6 +43,7 @@
#include "hw/xen/xen.h"
#include "exec/memory.h"
#include "exec/address-spaces.h"
+#include "hw/acpi/acpi.h"
#include "cpu.h"
#ifdef CONFIG_XEN
# include <xen/hvm/hvm_info_table.h>
diff --git a/include/hw/acpi/acpi.h b/include/hw/acpi/acpi.h
index e18ef28..4cd52c1 100644
--- a/include/hw/acpi/acpi.h
+++ b/include/hw/acpi/acpi.h
@@ -154,4 +154,11 @@ void acpi_gpe_reset(ACPIREGS *ar);
void acpi_gpe_ioport_writeb(ACPIREGS *ar, uint32_t addr, uint32_t val);
uint32_t acpi_gpe_ioport_readb(ACPIREGS *ar, uint32_t addr);
+/* acpi.c */
+extern int acpi_enabled;
+extern char unsigned *acpi_tables;
+extern size_t acpi_tables_len;
+
+void acpi_table_add(const QemuOpts *opts, Error **errp);
+
#endif /* !QEMU_HW_ACPI_H */
diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h
index 5d40914..9bcc819 100644
--- a/include/hw/i386/pc.h
+++ b/include/hw/i386/pc.h
@@ -107,14 +107,6 @@ void cpu_smm_register(cpu_set_smm_t callback, void *arg);
void ioapic_init_gsi(GSIState *gsi_state, const char *parent_name);
-/* acpi.c */
-extern int acpi_enabled;
-extern char unsigned *acpi_tables;
-extern size_t acpi_tables_len;
-
-void acpi_bios_init(void);
-void acpi_table_add(const QemuOpts *opts, Error **errp);
-
/* acpi_piix.c */
i2c_bus *piix4_pm_init(PCIBus *bus, int devfn, uint32_t smb_io_base,
--
1.8.1.4
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [Qemu-devel] [PATCH 06/12] acpi.h: make it self contained
2013-04-15 13:19 [Qemu-devel] [PULL 00/12] directory reorganization, fixes and final part Paolo Bonzini
` (4 preceding siblings ...)
2013-04-15 13:19 ` [Qemu-devel] [PATCH 05/12] acpi: move declarations from pc.h to acpi.h Paolo Bonzini
@ 2013-04-15 13:19 ` Paolo Bonzini
2013-04-15 13:19 ` [Qemu-devel] [PATCH 07/12] configure: fix TPM logic Paolo Bonzini
` (7 subsequent siblings)
13 siblings, 0 replies; 23+ messages in thread
From: Paolo Bonzini @ 2013-04-15 13:19 UTC (permalink / raw)
To: qemu-devel; +Cc: Michael S. Tsirkin
From: "Michael S. Tsirkin" <mst@redhat.com>
Headers shouldn't assume another header is included,
pull in everything necessary.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
include/hw/acpi/acpi.h | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/include/hw/acpi/acpi.h b/include/hw/acpi/acpi.h
index 4cd52c1..635be7b 100644
--- a/include/hw/acpi/acpi.h
+++ b/include/hw/acpi/acpi.h
@@ -19,6 +19,12 @@
* <http://www.gnu.org/licenses/>.
*/
+#include "qapi/error.h"
+#include "qemu/typedefs.h"
+#include "qemu/notify.h"
+#include "qemu/option.h"
+#include "exec/memory.h"
+
/* from linux include/acpi/actype.h */
/* Default ACPI register widths */
--
1.8.1.4
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [Qemu-devel] [PATCH 07/12] configure: fix TPM logic
2013-04-15 13:19 [Qemu-devel] [PULL 00/12] directory reorganization, fixes and final part Paolo Bonzini
` (5 preceding siblings ...)
2013-04-15 13:19 ` [Qemu-devel] [PATCH 06/12] acpi.h: make it self contained Paolo Bonzini
@ 2013-04-15 13:19 ` Paolo Bonzini
2013-04-15 16:02 ` Laszlo Ersek
` (2 more replies)
2013-04-15 13:19 ` [Qemu-devel] [PATCH 08/12] tpm: reorganize headers and split hardware part Paolo Bonzini
` (6 subsequent siblings)
13 siblings, 3 replies; 23+ messages in thread
From: Paolo Bonzini @ 2013-04-15 13:19 UTC (permalink / raw)
To: qemu-devel
A non-native i386 or x86_64 emulator should not have TPM passthrough
support, since the TPM is only present for those hosts.
Reviewed-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 24 ++++++++++++++++++------
default-configs/i386-softmmu.mak | 3 +--
default-configs/x86_64-softmmu.mak | 3 +--
tpm/Makefile.objs | 4 +---
4 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/configure b/configure
index 258c82a..1c1e369 100755
--- a/configure
+++ b/configure
@@ -2337,6 +2337,15 @@ EOF
fi
##########################################
+# TPM passthrough is only on x86 Linux
+
+if test "$targetos" = Linux && test "$cpu" = i386 -o "$cpu" = x86_64; then
+ tpm_passthrough=$tpm
+else
+ tpm_passthrough=no
+fi
+
+##########################################
# adjust virtio-blk-data-plane based on linux-aio
if test "$virtio_blk_data_plane" = "yes" -a \
@@ -3436,6 +3445,7 @@ echo "virtio-blk-data-plane $virtio_blk_data_plane"
echo "gcov $gcov_tool"
echo "gcov enabled $gcov"
echo "TPM support $tpm"
+echo "TPM passthrough $tpm_passthrough"
if test "$sdl_too_old" = "yes"; then
echo "-> Your SDL version is too old - please upgrade to have SDL support"
@@ -3811,6 +3821,14 @@ bsd)
;;
esac
+# TPM passthrough support?
+if test "$tpm" = "yes"; then
+ echo 'CONFIG_TPM=$(CONFIG_SOFTMMU)' >> $config_host_mak
+ if test "$tpm_passthrough" = "yes"; then
+ echo "CONFIG_TPM_PASSTHROUGH=y" >> $config_host_mak
+ fi
+fi
+
# use default implementation for tracing backend-specific routines
trace_default=yes
echo "TRACE_BACKEND=$trace_backend" >> $config_host_mak
@@ -4338,12 +4356,6 @@ if test "$gprof" = "yes" ; then
fi
fi
-if test "$tpm" = "yes"; then
- if test "$target_softmmu" = "yes" ; then
- echo "CONFIG_TPM=y" >> $config_host_mak
- fi
-fi
-
if test "$ARCH" = "tci"; then
linker_script=""
else
diff --git a/default-configs/i386-softmmu.mak b/default-configs/i386-softmmu.mak
index 6d9d364..368a776 100644
--- a/default-configs/i386-softmmu.mak
+++ b/default-configs/i386-softmmu.mak
@@ -27,8 +27,7 @@ CONFIG_HPET=y
CONFIG_APPLESMC=y
CONFIG_I8259=y
CONFIG_PFLASH_CFI01=y
-CONFIG_TPM_TIS=y
-CONFIG_TPM_PASSTHROUGH=y
+CONFIG_TPM_TIS=$(CONFIG_TPM)
CONFIG_PCI_HOTPLUG=y
CONFIG_MC146818RTC=y
CONFIG_PAM=y
diff --git a/default-configs/x86_64-softmmu.mak b/default-configs/x86_64-softmmu.mak
index 3b06310..2711b83 100644
--- a/default-configs/x86_64-softmmu.mak
+++ b/default-configs/x86_64-softmmu.mak
@@ -27,8 +27,7 @@ CONFIG_HPET=y
CONFIG_APPLESMC=y
CONFIG_I8259=y
CONFIG_PFLASH_CFI01=y
-CONFIG_TPM_TIS=y
-CONFIG_TPM_PASSTHROUGH=y
+CONFIG_TPM_TIS=$(CONFIG_TPM)
CONFIG_PCI_HOTPLUG=y
CONFIG_MC146818RTC=y
CONFIG_PAM=y
diff --git a/tpm/Makefile.objs b/tpm/Makefile.objs
index 8676824..366e4a7 100644
--- a/tpm/Makefile.objs
+++ b/tpm/Makefile.objs
@@ -1,6 +1,4 @@
common-obj-y = tpm.o
-ifeq ($(CONFIG_TPM),y)
-common-obj-y += tpm_backend.o
+common-obj-$(CONFIG_TPM) += tpm_backend.o
common-obj-$(CONFIG_TPM_TIS) += tpm_tis.o
common-obj-$(CONFIG_TPM_PASSTHROUGH) += tpm_passthrough.o
-endif
--
1.8.1.4
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [Qemu-devel] [PATCH 08/12] tpm: reorganize headers and split hardware part
2013-04-15 13:19 [Qemu-devel] [PULL 00/12] directory reorganization, fixes and final part Paolo Bonzini
` (6 preceding siblings ...)
2013-04-15 13:19 ` [Qemu-devel] [PATCH 07/12] configure: fix TPM logic Paolo Bonzini
@ 2013-04-15 13:19 ` Paolo Bonzini
2013-04-15 16:19 ` Laszlo Ersek
2013-04-15 13:19 ` [Qemu-devel] [PATCH 09/12] sysemu: avoid proliferation of include/ subdirectories Paolo Bonzini
` (5 subsequent siblings)
13 siblings, 1 reply; 23+ messages in thread
From: Paolo Bonzini @ 2013-04-15 13:19 UTC (permalink / raw)
To: qemu-devel
The TPM subsystem does not have a full front-end/back-end separation.
The sole available backend, tpm_passthrough, depends on the data
structures of the sole available frontend, tpm_tis.
However, we can at least try to split the user interface (tpm.c) from the
implementation (hw/tpm). The patches makes tpm.c not include tpm_int.h,
which is shared between tpm_tis.c and tpm_passthrough.c; instead it
moves more stuff to tpm_backend.h.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile.objs | 2 +-
backends/tpm.c | 38 +++++++++++++-
hw/Makefile.objs | 1 +
{tpm => hw/tpm}/Makefile.objs | 2 -
{tpm => hw/tpm}/tpm_int.h | 37 +-------------
{tpm => hw/tpm}/tpm_passthrough.c | 20 +++++++-
{tpm => hw/tpm}/tpm_tis.c | 2 +-
{tpm => hw/tpm}/tpm_tis.h | 5 --
include/backends/tpm.h | 42 +++++++++++++++-
include/{tpm => sysemu}/tpm.h | 2 -
.../sysemu/tpm_backend_int.h | 0
monitor.c | 2 +-
tpm/tpm.c => tpm.c | 19 +------
tpm/tpm_backend.c | 58 ----------------------
vl.c | 2 +-
15 files changed, 104 insertions(+), 128 deletions(-)
rename {tpm => hw/tpm}/Makefile.objs (61%)
rename {tpm => hw/tpm}/tpm_int.h (50%)
rename {tpm => hw/tpm}/tpm_passthrough.c (96%)
rename {tpm => hw/tpm}/tpm_tis.c (99%)
rename {tpm => hw/tpm}/tpm_tis.h (96%)
rename include/{tpm => sysemu}/tpm.h (82%)
rename tpm/tpm_backend.h => include/sysemu/tpm_backend_int.h (100%)
rename tpm/tpm.c => tpm.c (93%)
delete mode 100644 tpm/tpm_backend.c
diff --git a/Makefile.objs b/Makefile.objs
index e568c01..a473348 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -65,7 +65,7 @@ common-obj-y += bt-host.o bt-vhci.o
common-obj-y += dma-helpers.o
common-obj-y += vl.o
-common-obj-y += tpm/
+common-obj-y += tpm.o
common-obj-$(CONFIG_SLIRP) += slirp/
diff --git a/backends/tpm.c b/backends/tpm.c
index 28148c2..0580108 100644
--- a/backends/tpm.c
+++ b/backends/tpm.c
@@ -13,8 +13,10 @@
*/
#include "backends/tpm.h"
-#include "tpm/tpm_int.h"
#include "qapi/qmp/qerror.h"
+#include "sysemu/tpm.h"
+#include "qemu/thread.h"
+#include "sysemu/tpm_backend_int.h"
enum TpmType tpm_backend_get_type(TPMBackend *s)
{
@@ -137,6 +139,40 @@ static void tpm_backend_instance_init(Object *obj)
NULL);
}
+void tpm_backend_thread_deliver_request(TPMBackendThread *tbt)
+{
+ g_thread_pool_push(tbt->pool, (gpointer)TPM_BACKEND_CMD_PROCESS_CMD, NULL);
+}
+
+void tpm_backend_thread_create(TPMBackendThread *tbt,
+ GFunc func, gpointer user_data)
+{
+ if (!tbt->pool) {
+ tbt->pool = g_thread_pool_new(func, user_data, 1, TRUE, NULL);
+ g_thread_pool_push(tbt->pool, (gpointer)TPM_BACKEND_CMD_INIT, NULL);
+ }
+}
+
+void tpm_backend_thread_end(TPMBackendThread *tbt)
+{
+ if (tbt->pool) {
+ g_thread_pool_push(tbt->pool, (gpointer)TPM_BACKEND_CMD_END, NULL);
+ g_thread_pool_free(tbt->pool, FALSE, TRUE);
+ tbt->pool = NULL;
+ }
+}
+
+void tpm_backend_thread_tpm_reset(TPMBackendThread *tbt,
+ GFunc func, gpointer user_data)
+{
+ if (!tbt->pool) {
+ tpm_backend_thread_create(tbt, func, user_data);
+ } else {
+ g_thread_pool_push(tbt->pool, (gpointer)TPM_BACKEND_CMD_TPM_RESET,
+ NULL);
+ }
+}
+
static const TypeInfo tpm_backend_info = {
.name = TYPE_TPM_BACKEND,
.parent = TYPE_OBJECT,
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index 1cb86fa..b7a1613 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -22,6 +22,7 @@ devices-dirs-$(CONFIG_SOFTMMU) += scsi/
devices-dirs-$(CONFIG_SOFTMMU) += sd/
devices-dirs-$(CONFIG_SOFTMMU) += ssi/
devices-dirs-$(CONFIG_SOFTMMU) += timer/
+devices-dirs-$(CONFIG_TPM) += tpm/
devices-dirs-$(CONFIG_SOFTMMU) += usb/
devices-dirs-$(CONFIG_SOFTMMU) += virtio/
devices-dirs-$(CONFIG_SOFTMMU) += watchdog/
diff --git a/tpm/Makefile.objs b/hw/tpm/Makefile.objs
similarity index 61%
rename from tpm/Makefile.objs
rename to hw/tpm/Makefile.objs
index 366e4a7..99f5983 100644
--- a/tpm/Makefile.objs
+++ b/hw/tpm/Makefile.objs
@@ -1,4 +1,2 @@
-common-obj-y = tpm.o
-common-obj-$(CONFIG_TPM) += tpm_backend.o
common-obj-$(CONFIG_TPM_TIS) += tpm_tis.o
common-obj-$(CONFIG_TPM_PASSTHROUGH) += tpm_passthrough.o
diff --git a/tpm/tpm_int.h b/hw/tpm/tpm_int.h
similarity index 50%
rename from tpm/tpm_int.h
rename to hw/tpm/tpm_int.h
index 340bfd5..08f87cb 100644
--- a/tpm/tpm_int.h
+++ b/hw/tpm/tpm_int.h
@@ -13,7 +13,7 @@
#define TPM_TPM_INT_H
#include "exec/memory.h"
-#include "tpm/tpm_tis.h"
+#include "tpm_tis.h"
/* overall state of the TPM interface */
struct TPMState {
@@ -33,32 +33,6 @@ struct TPMState {
#define TPM(obj) OBJECT_CHECK(TPMState, (obj), TYPE_TPM_TIS)
-struct TPMDriverOps {
- enum TpmType type;
- /* get a descriptive text of the backend to display to the user */
- const char *(*desc)(void);
-
- TPMBackend *(*create)(QemuOpts *opts, const char *id);
- void (*destroy)(TPMBackend *t);
-
- /* initialize the backend */
- int (*init)(TPMBackend *t, TPMState *s, TPMRecvDataCB *datacb);
- /* start up the TPM on the backend */
- int (*startup_tpm)(TPMBackend *t);
- /* returns true if nothing will ever answer TPM requests */
- bool (*had_startup_error)(TPMBackend *t);
-
- size_t (*realloc_buffer)(TPMSizedBuffer *sb);
-
- void (*deliver_request)(TPMBackend *t);
-
- void (*reset)(TPMBackend *t);
-
- void (*cancel_cmd)(TPMBackend *t);
-
- bool (*get_tpm_established_flag)(TPMBackend *t);
-};
-
struct tpm_req_hdr {
uint16_t tag;
uint32_t len;
@@ -83,13 +57,4 @@ struct tpm_resp_hdr {
#define TPM_ORD_GetTicks 0xf1
-TPMBackend *qemu_find_tpm(const char *id);
-int tpm_register_model(enum TpmModel model);
-int tpm_register_driver(const TPMDriverOps *tdo);
-void tpm_display_backend_drivers(void);
-const TPMDriverOps *tpm_get_backend_driver(const char *type);
-void tpm_write_fatal_error_response(uint8_t *out, uint32_t out_len);
-
-extern const TPMDriverOps tpm_passthrough_driver;
-
#endif /* TPM_TPM_INT_H */
diff --git a/tpm/tpm_passthrough.c b/hw/tpm/tpm_passthrough.c
similarity index 96%
rename from tpm/tpm_passthrough.c
rename to hw/tpm/tpm_passthrough.c
index 1fdd66d..5781277 100644
--- a/tpm/tpm_passthrough.c
+++ b/hw/tpm/tpm_passthrough.c
@@ -31,8 +31,8 @@
#include "tpm_int.h"
#include "hw/hw.h"
#include "hw/i386/pc.h"
+#include "sysemu/tpm_backend_int.h"
#include "tpm_tis.h"
-#include "tpm_backend.h"
/* #define DEBUG_TPM */
@@ -48,6 +48,8 @@
#define TPM_PASSTHROUGH(obj) \
OBJECT_CHECK(TPMPassthruState, (obj), TYPE_TPM_PASSTHROUGH)
+static const TPMDriverOps tpm_passthrough_driver;
+
/* data structures */
typedef struct TPMPassthruThreadParams {
TPMState *tpm_state;
@@ -96,6 +98,20 @@ static uint32_t tpm_passthrough_get_size_from_buffer(const uint8_t *buf)
return be32_to_cpu(resp->len);
}
+/*
+ * Write an error message in the given output buffer.
+ */
+static void tpm_write_fatal_error_response(uint8_t *out, uint32_t out_len)
+{
+ if (out_len >= sizeof(struct tpm_resp_hdr)) {
+ struct tpm_resp_hdr *resp = (struct tpm_resp_hdr *)out;
+
+ resp->tag = cpu_to_be16(TPM_TAG_RSP_COMMAND);
+ resp->len = cpu_to_be32(sizeof(struct tpm_resp_hdr));
+ resp->errcode = cpu_to_be32(TPM_FAIL);
+ }
+}
+
static int tpm_passthrough_unix_tx_bufs(TPMPassthruState *tpm_pt,
const uint8_t *in, uint32_t in_len,
uint8_t *out, uint32_t out_len)
@@ -512,7 +528,7 @@ static void tpm_passthrough_destroy(TPMBackend *tb)
g_free(tpm_pt->tpm_dev);
}
-const TPMDriverOps tpm_passthrough_driver = {
+static const TPMDriverOps tpm_passthrough_driver = {
.type = TPM_TYPE_PASSTHROUGH,
.desc = tpm_passthrough_create_desc,
.create = tpm_passthrough_create,
diff --git a/tpm/tpm_tis.c b/hw/tpm/tpm_tis.c
similarity index 99%
rename from tpm/tpm_tis.c
rename to hw/tpm/tpm_tis.c
index f0a45846..faa3cec 100644
--- a/tpm/tpm_tis.c
+++ b/hw/tpm/tpm_tis.c
@@ -26,7 +26,7 @@
#include "hw/hw.h"
#include "hw/i386/pc.h"
#include "hw/pci/pci_ids.h"
-#include "tpm/tpm_tis.h"
+#include "tpm_tis.h"
#include "qemu-common.h"
/*#define DEBUG_TIS */
diff --git a/tpm/tpm_tis.h b/hw/tpm/tpm_tis.h
similarity index 96%
rename from tpm/tpm_tis.h
rename to hw/tpm/tpm_tis.h
index 1be4ddc..916152a 100644
--- a/tpm/tpm_tis.h
+++ b/hw/tpm/tpm_tis.h
@@ -35,11 +35,6 @@
#define TYPE_TPM_TIS "tpm-tis"
-struct TPMSizedBuffer {
- uint32_t size;
- uint8_t *buffer;
-};
-
typedef enum {
TPM_TIS_STATE_IDLE = 0,
TPM_TIS_STATE_READY,
diff --git a/include/backends/tpm.h b/include/backends/tpm.h
index 9e93cc5..a96b110 100644
--- a/include/backends/tpm.h
+++ b/include/backends/tpm.h
@@ -18,7 +18,7 @@
#include "qapi/error.h"
#include "qapi-types.h"
#include "qemu/option.h"
-#include "tpm/tpm.h"
+#include "sysemu/tpm.h"
#define TYPE_TPM_BACKEND "tpm-backend"
#define TPM_BACKEND(obj) \
@@ -30,6 +30,7 @@
typedef struct TPMBackendClass TPMBackendClass;
typedef struct TPMBackend TPMBackend;
+typedef struct TPMState TPMState;
typedef struct TPMDriverOps TPMDriverOps;
@@ -56,6 +57,39 @@ struct TPMBackend {
QLIST_ENTRY(TPMBackend) list;
};
+typedef void (TPMRecvDataCB)(TPMState *, uint8_t locty);
+
+typedef struct TPMSizedBuffer {
+ uint32_t size;
+ uint8_t *buffer;
+} TPMSizedBuffer;
+
+struct TPMDriverOps {
+ enum TpmType type;
+ /* get a descriptive text of the backend to display to the user */
+ const char *(*desc)(void);
+
+ TPMBackend *(*create)(QemuOpts *opts, const char *id);
+ void (*destroy)(TPMBackend *t);
+
+ /* initialize the backend */
+ int (*init)(TPMBackend *t, TPMState *s, TPMRecvDataCB *datacb);
+ /* start up the TPM on the backend */
+ int (*startup_tpm)(TPMBackend *t);
+ /* returns true if nothing will ever answer TPM requests */
+ bool (*had_startup_error)(TPMBackend *t);
+
+ size_t (*realloc_buffer)(TPMSizedBuffer *sb);
+
+ void (*deliver_request)(TPMBackend *t);
+
+ void (*reset)(TPMBackend *t);
+
+ void (*cancel_cmd)(TPMBackend *t);
+
+ bool (*get_tpm_established_flag)(TPMBackend *t);
+};
+
/**
* tpm_backend_get_type:
@@ -167,4 +201,10 @@ bool tpm_backend_get_tpm_established_flag(TPMBackend *s);
*/
void tpm_backend_open(TPMBackend *s, Error **errp);
+TPMBackend *qemu_find_tpm(const char *id);
+
+const TPMDriverOps *tpm_get_backend_driver(const char *type);
+int tpm_register_model(enum TpmModel model);
+int tpm_register_driver(const TPMDriverOps *tdo);
+
#endif
diff --git a/include/tpm/tpm.h b/include/sysemu/tpm.h
similarity index 82%
rename from include/tpm/tpm.h
rename to include/sysemu/tpm.h
index 2d457c4..13febdd 100644
--- a/include/tpm/tpm.h
+++ b/include/sysemu/tpm.h
@@ -15,8 +15,6 @@
#include "qemu/option.h"
typedef struct TPMState TPMState;
-typedef struct TPMSizedBuffer TPMSizedBuffer;
-typedef void (TPMRecvDataCB)(TPMState *, uint8_t locty);
int tpm_config_parse(QemuOptsList *opts_list, const char *optarg);
int tpm_init(void);
diff --git a/tpm/tpm_backend.h b/include/sysemu/tpm_backend_int.h
similarity index 100%
rename from tpm/tpm_backend.h
rename to include/sysemu/tpm_backend_int.h
diff --git a/monitor.c b/monitor.c
index c897e80..e605822 100644
--- a/monitor.c
+++ b/monitor.c
@@ -47,7 +47,7 @@
#include "migration/migration.h"
#include "sysemu/kvm.h"
#include "qemu/acl.h"
-#include "tpm/tpm.h"
+#include "sysemu/tpm.h"
#include "qapi/qmp/qint.h"
#include "qapi/qmp/qfloat.h"
#include "qapi/qmp/qlist.h"
diff --git a/tpm/tpm.c b/tpm.c
similarity index 93%
rename from tpm/tpm.c
rename to tpm.c
index 1f4ac8d..1e94314 100644
--- a/tpm/tpm.c
+++ b/tpm.c
@@ -16,8 +16,7 @@
#include "monitor/monitor.h"
#include "qapi/qmp/qerror.h"
#include "backends/tpm.h"
-#include "tpm_int.h"
-#include "tpm/tpm.h"
+#include "sysemu/tpm.h"
#include "qemu/config-file.h"
#include "qmp-commands.h"
@@ -62,20 +61,6 @@ static bool tpm_model_is_registered(enum TpmModel model)
return false;
}
-/*
- * Write an error message in the given output buffer.
- */
-void tpm_write_fatal_error_response(uint8_t *out, uint32_t out_len)
-{
- if (out_len >= sizeof(struct tpm_resp_hdr)) {
- struct tpm_resp_hdr *resp = (struct tpm_resp_hdr *)out;
-
- resp->tag = cpu_to_be16(TPM_TAG_RSP_COMMAND);
- resp->len = cpu_to_be32(sizeof(struct tpm_resp_hdr));
- resp->errcode = cpu_to_be32(TPM_FAIL);
- }
-}
-
const TPMDriverOps *tpm_get_backend_driver(const char *type)
{
int i;
@@ -109,7 +94,7 @@ int tpm_register_driver(const TPMDriverOps *tdo)
* Walk the list of available TPM backend drivers and display them on the
* screen.
*/
-void tpm_display_backend_drivers(void)
+static void tpm_display_backend_drivers(void)
{
int i;
diff --git a/tpm/tpm_backend.c b/tpm/tpm_backend.c
deleted file mode 100644
index 4144ef7..0000000
--- a/tpm/tpm_backend.c
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * common TPM backend driver functions
- *
- * Copyright (c) 2012-2013 IBM Corporation
- * Authors:
- * Stefan Berger <stefanb@us.ibm.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, see <http://www.gnu.org/licenses/>
- */
-
-#include "tpm/tpm.h"
-#include "qemu/thread.h"
-#include "tpm_backend.h"
-
-void tpm_backend_thread_deliver_request(TPMBackendThread *tbt)
-{
- g_thread_pool_push(tbt->pool, (gpointer)TPM_BACKEND_CMD_PROCESS_CMD, NULL);
-}
-
-void tpm_backend_thread_create(TPMBackendThread *tbt,
- GFunc func, gpointer user_data)
-{
- if (!tbt->pool) {
- tbt->pool = g_thread_pool_new(func, user_data, 1, TRUE, NULL);
- g_thread_pool_push(tbt->pool, (gpointer)TPM_BACKEND_CMD_INIT, NULL);
- }
-}
-
-void tpm_backend_thread_end(TPMBackendThread *tbt)
-{
- if (tbt->pool) {
- g_thread_pool_push(tbt->pool, (gpointer)TPM_BACKEND_CMD_END, NULL);
- g_thread_pool_free(tbt->pool, FALSE, TRUE);
- tbt->pool = NULL;
- }
-}
-
-void tpm_backend_thread_tpm_reset(TPMBackendThread *tbt,
- GFunc func, gpointer user_data)
-{
- if (!tbt->pool) {
- tpm_backend_thread_create(tbt, func, user_data);
- } else {
- g_thread_pool_push(tbt->pool, (gpointer)TPM_BACKEND_CMD_TPM_RESET,
- NULL);
- }
-}
diff --git a/vl.c b/vl.c
index d694a90..ce7bed7 100644
--- a/vl.c
+++ b/vl.c
@@ -139,7 +139,7 @@ int main(int argc, char **argv)
#include "sysemu/blockdev.h"
#include "hw/block/block.h"
#include "migration/block.h"
-#include "tpm/tpm.h"
+#include "sysemu/tpm.h"
#include "sysemu/dma.h"
#include "audio/audio.h"
#include "migration/migration.h"
--
1.8.1.4
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [Qemu-devel] [PATCH 09/12] sysemu: avoid proliferation of include/ subdirectories
2013-04-15 13:19 [Qemu-devel] [PULL 00/12] directory reorganization, fixes and final part Paolo Bonzini
` (7 preceding siblings ...)
2013-04-15 13:19 ` [Qemu-devel] [PATCH 08/12] tpm: reorganize headers and split hardware part Paolo Bonzini
@ 2013-04-15 13:19 ` Paolo Bonzini
2013-04-15 13:19 ` [Qemu-devel] [PATCH 10/12] include: avoid useless includes of exec/ headers Paolo Bonzini
` (4 subsequent siblings)
13 siblings, 0 replies; 23+ messages in thread
From: Paolo Bonzini @ 2013-04-15 13:19 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
backends/baum.c | 2 +-
backends/msmouse.c | 2 +-
backends/rng-egd.c | 4 ++--
backends/rng-random.c | 4 ++--
backends/rng.c | 2 +-
backends/tpm.c | 2 +-
bt-host.c | 2 +-
bt-vhci.c | 2 +-
gdbstub.c | 2 +-
hmp.c | 2 +-
hw/arm/omap2.c | 2 +-
hw/arm/pxa2xx.c | 2 +-
hw/arm/strongarm.c | 2 +-
hw/bt/core.c | 2 +-
hw/bt/hci-csr.c | 4 ++--
hw/bt/hci.c | 2 +-
hw/char/cadence_uart.c | 2 +-
hw/char/debugcon.c | 2 +-
hw/char/escc.c | 2 +-
hw/char/etraxfs_ser.c | 2 +-
hw/char/exynos4210_uart.c | 2 +-
hw/char/grlib_apbuart.c | 2 +-
hw/char/imx_serial.c | 2 +-
hw/char/ipoctal232.c | 2 +-
hw/char/lm32_juart.c | 2 +-
hw/char/lm32_uart.c | 2 +-
hw/char/mcf_uart.c | 2 +-
hw/char/milkymist-uart.c | 2 +-
hw/char/omap_uart.c | 2 +-
hw/char/parallel.c | 2 +-
hw/char/pl011.c | 2 +-
hw/char/sclpconsole.c | 2 +-
hw/char/serial.c | 2 +-
hw/char/sh_serial.c | 2 +-
hw/char/spapr_vty.c | 2 +-
hw/char/virtio-console.c | 2 +-
hw/char/xen_console.c | 2 +-
hw/char/xilinx_uartlite.c | 2 +-
hw/core/qdev-properties-system.c | 2 +-
hw/core/qdev-properties.c | 2 +-
hw/display/xenfb.c | 2 +-
hw/isa/pc87312.c | 2 +-
hw/mips/mips_fulong2e.c | 2 +-
hw/mips/mips_malta.c | 2 +-
hw/misc/ivshmem.c | 2 +-
hw/net/xgmac.c | 2 +-
hw/ppc/spapr_events.c | 2 +-
hw/ppc/spapr_rtas.c | 2 +-
hw/sparc/leon3.c | 2 +-
hw/tpm/tpm_passthrough.c | 2 +-
hw/tpm/tpm_tis.c | 2 +-
hw/usb/ccid-card-emulated.c | 2 +-
hw/usb/ccid-card-passthru.c | 2 +-
hw/usb/dev-bluetooth.c | 2 +-
hw/usb/dev-serial.c | 2 +-
hw/usb/redirect.c | 2 +-
hw/virtio/virtio-rng.c | 2 +-
hw/xen/xen_backend.c | 2 +-
hw/xtensa/xtensa_lx60.c | 2 +-
include/hw/virtio/virtio-rng.h | 4 ++--
include/{bt => sysemu}/bt.h | 0
include/{char => sysemu}/char.h | 0
include/{qemu => sysemu}/rng-random.h | 0
include/{qemu => sysemu}/rng.h | 0
include/{backends/tpm.h => sysemu/tpm_backend.h} | 0
monitor.c | 2 +-
net/slirp.c | 2 +-
qemu-char.c | 2 +-
qmp.c | 2 +-
qtest.c | 2 +-
slirp/slirp.c | 2 +-
spice-qemu-char.c | 2 +-
tpm.c | 2 +-
ui/console.c | 2 +-
ui/gtk.c | 2 +-
util/event_notifier-posix.c | 2 +-
vl.c | 4 ++--
xen-all.c | 2 +-
78 files changed, 78 insertions(+), 78 deletions(-)
rename include/{bt => sysemu}/bt.h (100%)
rename include/{char => sysemu}/char.h (100%)
rename include/{qemu => sysemu}/rng-random.h (100%)
rename include/{qemu => sysemu}/rng.h (100%)
rename include/{backends/tpm.h => sysemu/tpm_backend.h} (100%)
diff --git a/backends/baum.c b/backends/baum.c
index ea9ffe8..4cba79f 100644
--- a/backends/baum.c
+++ b/backends/baum.c
@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
#include "qemu-common.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "qemu/timer.h"
#include "hw/usb.h"
#include <brlapi.h>
diff --git a/backends/msmouse.c b/backends/msmouse.c
index 61052fe..0ac05a0 100644
--- a/backends/msmouse.c
+++ b/backends/msmouse.c
@@ -23,7 +23,7 @@
*/
#include <stdlib.h>
#include "qemu-common.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "ui/console.h"
#define MSMOUSE_LO6(n) ((n) & 0x3f)
diff --git a/backends/rng-egd.c b/backends/rng-egd.c
index cc6f5ee..9e5a536 100644
--- a/backends/rng-egd.c
+++ b/backends/rng-egd.c
@@ -10,8 +10,8 @@
* See the COPYING file in the top-level directory.
*/
-#include "qemu/rng.h"
-#include "char/char.h"
+#include "sysemu/rng.h"
+#include "sysemu/char.h"
#include "qapi/qmp/qerror.h"
#include "hw/qdev.h" /* just for DEFINE_PROP_CHR */
diff --git a/backends/rng-random.c b/backends/rng-random.c
index acd20af..d5761f2 100644
--- a/backends/rng-random.c
+++ b/backends/rng-random.c
@@ -10,8 +10,8 @@
* See the COPYING file in the top-level directory.
*/
-#include "qemu/rng-random.h"
-#include "qemu/rng.h"
+#include "sysemu/rng-random.h"
+#include "sysemu/rng.h"
#include "qapi/qmp/qerror.h"
#include "qemu/main-loop.h"
diff --git a/backends/rng.c b/backends/rng.c
index 3d33898..85cb83f 100644
--- a/backends/rng.c
+++ b/backends/rng.c
@@ -10,7 +10,7 @@
* See the COPYING file in the top-level directory.
*/
-#include "qemu/rng.h"
+#include "sysemu/rng.h"
#include "qapi/qmp/qerror.h"
void rng_backend_request_entropy(RngBackend *s, size_t size,
diff --git a/backends/tpm.c b/backends/tpm.c
index 0580108..b735801 100644
--- a/backends/tpm.c
+++ b/backends/tpm.c
@@ -12,7 +12,7 @@
* Based on backends/rng.c by Anthony Liguori
*/
-#include "backends/tpm.h"
+#include "sysemu/tpm_backend.h"
#include "qapi/qmp/qerror.h"
#include "sysemu/tpm.h"
#include "qemu/thread.h"
diff --git a/bt-host.c b/bt-host.c
index 2da3c32..49205bf 100644
--- a/bt-host.c
+++ b/bt-host.c
@@ -18,7 +18,7 @@
*/
#include "qemu-common.h"
-#include "bt/bt.h"
+#include "sysemu/bt.h"
#include "qemu/main-loop.h"
#ifndef _WIN32
diff --git a/bt-vhci.c b/bt-vhci.c
index a6a7ab0..e267c8a 100644
--- a/bt-vhci.c
+++ b/bt-vhci.c
@@ -18,7 +18,7 @@
*/
#include "qemu-common.h"
-#include "bt/bt.h"
+#include "sysemu/bt.h"
#include "hw/bt.h"
#include "qemu/main-loop.h"
diff --git a/gdbstub.c b/gdbstub.c
index 22ab12c..e80e1d3 100644
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -30,7 +30,7 @@
#include "qemu.h"
#else
#include "monitor/monitor.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "sysemu/sysemu.h"
#include "exec/gdbstub.h"
#endif
diff --git a/hmp.c b/hmp.c
index dbe9b90..1675e77 100644
--- a/hmp.c
+++ b/hmp.c
@@ -15,7 +15,7 @@
#include "hmp.h"
#include "net/net.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "qemu/option.h"
#include "qemu/timer.h"
#include "qmp-commands.h"
diff --git a/hw/arm/omap2.c b/hw/arm/omap2.c
index a4b4146..2ff4371 100644
--- a/hw/arm/omap2.c
+++ b/hw/arm/omap2.c
@@ -24,7 +24,7 @@
#include "hw/arm/omap.h"
#include "sysemu/sysemu.h"
#include "qemu/timer.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "hw/block/flash.h"
#include "hw/arm/soc_dma.h"
#include "hw/sysbus.h"
diff --git a/hw/arm/pxa2xx.c b/hw/arm/pxa2xx.c
index bbecc77..24b03a0 100644
--- a/hw/arm/pxa2xx.c
+++ b/hw/arm/pxa2xx.c
@@ -13,7 +13,7 @@
#include "hw/char/serial.h"
#include "hw/i2c/i2c.h"
#include "hw/ssi.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "sysemu/blockdev.h"
static struct {
diff --git a/hw/arm/strongarm.c b/hw/arm/strongarm.c
index 75a813e..4d49306 100644
--- a/hw/arm/strongarm.c
+++ b/hw/arm/strongarm.c
@@ -30,7 +30,7 @@
#include "strongarm.h"
#include "qemu/error-report.h"
#include "hw/arm/arm.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "sysemu/sysemu.h"
#include "hw/ssi.h"
diff --git a/hw/bt/core.c b/hw/bt/core.c
index 24ef4de..49012e0 100644
--- a/hw/bt/core.c
+++ b/hw/bt/core.c
@@ -18,7 +18,7 @@
*/
#include "qemu-common.h"
-#include "bt/bt.h"
+#include "sysemu/bt.h"
#include "hw/bt.h"
/* Slave implementations can ignore this */
diff --git a/hw/bt/hci-csr.c b/hw/bt/hci-csr.c
index 55c819b..16a25cb 100644
--- a/hw/bt/hci-csr.c
+++ b/hw/bt/hci-csr.c
@@ -19,10 +19,10 @@
*/
#include "qemu-common.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "qemu/timer.h"
#include "hw/irq.h"
-#include "bt/bt.h"
+#include "sysemu/bt.h"
#include "hw/bt.h"
struct csrhci_s {
diff --git a/hw/bt/hci.c b/hw/bt/hci.c
index a76edea..b53cd5d 100644
--- a/hw/bt/hci.c
+++ b/hw/bt/hci.c
@@ -21,7 +21,7 @@
#include "qemu-common.h"
#include "qemu/timer.h"
#include "hw/usb.h"
-#include "bt/bt.h"
+#include "sysemu/bt.h"
#include "hw/bt.h"
struct bt_hci_s {
diff --git a/hw/char/cadence_uart.c b/hw/char/cadence_uart.c
index 421ec99..c2a7834 100644
--- a/hw/char/cadence_uart.c
+++ b/hw/char/cadence_uart.c
@@ -17,7 +17,7 @@
*/
#include "hw/sysbus.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "qemu/timer.h"
#ifdef CADENCE_UART_ERR_DEBUG
diff --git a/hw/char/debugcon.c b/hw/char/debugcon.c
index 0588eeb..02c9577 100644
--- a/hw/char/debugcon.c
+++ b/hw/char/debugcon.c
@@ -25,7 +25,7 @@
*/
#include "hw/hw.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "hw/isa/isa.h"
#include "hw/i386/pc.h"
diff --git a/hw/char/escc.c b/hw/char/escc.c
index 067b055..c2cb07f 100644
--- a/hw/char/escc.c
+++ b/hw/char/escc.c
@@ -25,7 +25,7 @@
#include "hw/hw.h"
#include "hw/sysbus.h"
#include "hw/char/escc.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "ui/console.h"
#include "trace.h"
diff --git a/hw/char/etraxfs_ser.c b/hw/char/etraxfs_ser.c
index b7499d7..11820f5 100644
--- a/hw/char/etraxfs_ser.c
+++ b/hw/char/etraxfs_ser.c
@@ -23,7 +23,7 @@
*/
#include "hw/sysbus.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "qemu/log.h"
#define D(x)
diff --git a/hw/char/exynos4210_uart.c b/hw/char/exynos4210_uart.c
index 8b4e72c..5751816 100644
--- a/hw/char/exynos4210_uart.c
+++ b/hw/char/exynos4210_uart.c
@@ -21,7 +21,7 @@
#include "hw/sysbus.h"
#include "sysemu/sysemu.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "hw/arm/exynos4210.h"
diff --git a/hw/char/grlib_apbuart.c b/hw/char/grlib_apbuart.c
index 62f7990..a64453f 100644
--- a/hw/char/grlib_apbuart.c
+++ b/hw/char/grlib_apbuart.c
@@ -23,7 +23,7 @@
*/
#include "hw/sysbus.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "trace.h"
diff --git a/hw/char/imx_serial.c b/hw/char/imx_serial.c
index d7ec209..2a2c230 100644
--- a/hw/char/imx_serial.c
+++ b/hw/char/imx_serial.c
@@ -20,7 +20,7 @@
#include "hw/hw.h"
#include "hw/sysbus.h"
#include "sysemu/sysemu.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "hw/arm/imx.h"
//#define DEBUG_SERIAL 1
diff --git a/hw/char/ipoctal232.c b/hw/char/ipoctal232.c
index fcd0af3..c9698a6 100644
--- a/hw/char/ipoctal232.c
+++ b/hw/char/ipoctal232.c
@@ -10,7 +10,7 @@
#include "ipack.h"
#include "qemu/bitops.h"
-#include "char/char.h"
+#include "sysemu/char.h"
/* #define DEBUG_IPOCTAL */
diff --git a/hw/char/lm32_juart.c b/hw/char/lm32_juart.c
index 93f0d15..839f3eb 100644
--- a/hw/char/lm32_juart.c
+++ b/hw/char/lm32_juart.c
@@ -20,7 +20,7 @@
#include "hw/hw.h"
#include "hw/sysbus.h"
#include "trace.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "hw/lm32/lm32_juart.h"
diff --git a/hw/char/lm32_uart.c b/hw/char/lm32_uart.c
index 32bc37a..99721ab 100644
--- a/hw/char/lm32_uart.c
+++ b/hw/char/lm32_uart.c
@@ -25,7 +25,7 @@
#include "hw/hw.h"
#include "hw/sysbus.h"
#include "trace.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "qemu/error-report.h"
enum {
diff --git a/hw/char/mcf_uart.c b/hw/char/mcf_uart.c
index 6724b1b..3ec4705 100644
--- a/hw/char/mcf_uart.c
+++ b/hw/char/mcf_uart.c
@@ -7,7 +7,7 @@
*/
#include "hw/hw.h"
#include "hw/m68k/mcf.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "exec/address-spaces.h"
typedef struct {
diff --git a/hw/char/milkymist-uart.c b/hw/char/milkymist-uart.c
index f3bdf69..cbc7d73 100644
--- a/hw/char/milkymist-uart.c
+++ b/hw/char/milkymist-uart.c
@@ -24,7 +24,7 @@
#include "hw/hw.h"
#include "hw/sysbus.h"
#include "trace.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "qemu/error-report.h"
enum {
diff --git a/hw/char/omap_uart.c b/hw/char/omap_uart.c
index 26c1426..5bb36ed 100644
--- a/hw/char/omap_uart.c
+++ b/hw/char/omap_uart.c
@@ -17,7 +17,7 @@
* You should have received a copy of the GNU General Public License along
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#include "char/char.h"
+#include "sysemu/char.h"
#include "hw/hw.h"
#include "hw/arm/omap.h"
#include "hw/char/serial.h"
diff --git a/hw/char/parallel.c b/hw/char/parallel.c
index 863a6fb..b5e867f 100644
--- a/hw/char/parallel.c
+++ b/hw/char/parallel.c
@@ -23,7 +23,7 @@
* THE SOFTWARE.
*/
#include "hw/hw.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "hw/isa/isa.h"
#include "hw/i386/pc.h"
#include "sysemu/sysemu.h"
diff --git a/hw/char/pl011.c b/hw/char/pl011.c
index 332d5b9..7079ef6 100644
--- a/hw/char/pl011.c
+++ b/hw/char/pl011.c
@@ -8,7 +8,7 @@
*/
#include "hw/sysbus.h"
-#include "char/char.h"
+#include "sysemu/char.h"
typedef struct {
SysBusDevice busdev;
diff --git a/hw/char/sclpconsole.c b/hw/char/sclpconsole.c
index 42ed54c..bcc7893 100644
--- a/hw/char/sclpconsole.c
+++ b/hw/char/sclpconsole.c
@@ -18,7 +18,7 @@
#include "hw/s390x/sclp.h"
#include "hw/s390x/event-facility.h"
-#include "char/char.h"
+#include "sysemu/char.h"
typedef struct ASCIIConsoleData {
EventBufferHeader ebh;
diff --git a/hw/char/serial.c b/hw/char/serial.c
index 1151bf1..66b6348 100644
--- a/hw/char/serial.c
+++ b/hw/char/serial.c
@@ -24,7 +24,7 @@
*/
#include "hw/char/serial.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "qemu/timer.h"
#include "exec/address-spaces.h"
diff --git a/hw/char/sh_serial.c b/hw/char/sh_serial.c
index 450c7d8..b328643 100644
--- a/hw/char/sh_serial.c
+++ b/hw/char/sh_serial.c
@@ -26,7 +26,7 @@
*/
#include "hw/hw.h"
#include "hw/sh4/sh.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "exec/address-spaces.h"
//#define DEBUG_SERIAL
diff --git a/hw/char/spapr_vty.c b/hw/char/spapr_vty.c
index 9df018a..afcec1f 100644
--- a/hw/char/spapr_vty.c
+++ b/hw/char/spapr_vty.c
@@ -1,5 +1,5 @@
#include "hw/qdev.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "hw/ppc/spapr.h"
#include "hw/ppc/spapr_vio.h"
diff --git a/hw/char/virtio-console.c b/hw/char/virtio-console.c
index 31f672c..5035030 100644
--- a/hw/char/virtio-console.c
+++ b/hw/char/virtio-console.c
@@ -10,7 +10,7 @@
* the COPYING file in the top-level directory.
*/
-#include "char/char.h"
+#include "sysemu/char.h"
#include "qemu/error-report.h"
#include "trace.h"
#include "hw/virtio/virtio-serial.h"
diff --git a/hw/char/xen_console.c b/hw/char/xen_console.c
index efc3232..eb7f450 100644
--- a/hw/char/xen_console.c
+++ b/hw/char/xen_console.c
@@ -30,7 +30,7 @@
#include <sys/mman.h>
#include "hw/hw.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "hw/xen/xen_backend.h"
#include <xen/io/console.h>
diff --git a/hw/char/xilinx_uartlite.c b/hw/char/xilinx_uartlite.c
index 079f4d4..3f7e989 100644
--- a/hw/char/xilinx_uartlite.c
+++ b/hw/char/xilinx_uartlite.c
@@ -23,7 +23,7 @@
*/
#include "hw/sysbus.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#define DUART(x)
diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-system.c
index 8c2e152..0eada32 100644
--- a/hw/core/qdev-properties-system.c
+++ b/hw/core/qdev-properties-system.c
@@ -17,7 +17,7 @@
#include "hw/block/block.h"
#include "net/hub.h"
#include "qapi/visitor.h"
-#include "char/char.h"
+#include "sysemu/char.h"
static void get_pointer(Object *obj, Visitor *v, Property *prop,
const char *(*print)(void *ptr),
diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
index 9a0872d..ddde18e 100644
--- a/hw/core/qdev-properties.c
+++ b/hw/core/qdev-properties.c
@@ -5,7 +5,7 @@
#include "hw/block/block.h"
#include "net/hub.h"
#include "qapi/visitor.h"
-#include "char/char.h"
+#include "sysemu/char.h"
void qdev_prop_set_after_realize(DeviceState *dev, const char *name,
Error **errp)
diff --git a/hw/display/xenfb.c b/hw/display/xenfb.c
index 8e42661..e371569 100644
--- a/hw/display/xenfb.c
+++ b/hw/display/xenfb.c
@@ -37,7 +37,7 @@
#include "hw/hw.h"
#include "ui/console.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "hw/xen/xen_backend.h"
#include <xen/event_channel.h>
diff --git a/hw/isa/pc87312.c b/hw/isa/pc87312.c
index 9f5e185..82f7c80 100644
--- a/hw/isa/pc87312.c
+++ b/hw/isa/pc87312.c
@@ -27,7 +27,7 @@
#include "qemu/error-report.h"
#include "sysemu/blockdev.h"
#include "sysemu/sysemu.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "trace.h"
diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c
index 3cf27fa..1aac93a 100644
--- a/hw/mips/mips_fulong2e.c
+++ b/hw/mips/mips_fulong2e.c
@@ -30,7 +30,7 @@
#include "hw/mips/mips.h"
#include "hw/mips/cpudevs.h"
#include "hw/pci/pci.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "sysemu/sysemu.h"
#include "audio/audio.h"
#include "qemu/log.h"
diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c
index a3e936b..86f42b2 100644
--- a/hw/mips/mips_malta.c
+++ b/hw/mips/mips_malta.c
@@ -34,7 +34,7 @@
#include "hw/mips/mips.h"
#include "hw/mips/cpudevs.h"
#include "hw/pci/pci.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "sysemu/sysemu.h"
#include "sysemu/arch_init.h"
#include "hw/boards.h"
diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c
index f92ce19..a19a6d6 100644
--- a/hw/misc/ivshmem.c
+++ b/hw/misc/ivshmem.c
@@ -24,7 +24,7 @@
#include "migration/migration.h"
#include "qapi/qmp/qerror.h"
#include "qemu/event_notifier.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include <sys/mman.h>
#include <sys/types.h>
diff --git a/hw/net/xgmac.c b/hw/net/xgmac.c
index 5275f48..1d9074a 100644
--- a/hw/net/xgmac.c
+++ b/hw/net/xgmac.c
@@ -25,7 +25,7 @@
*/
#include "hw/sysbus.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "qemu/log.h"
#include "net/net.h"
#include "net/checksum.h"
diff --git a/hw/ppc/spapr_events.c b/hw/ppc/spapr_events.c
index ff87ac3..c0d7e62 100644
--- a/hw/ppc/spapr_events.c
+++ b/hw/ppc/spapr_events.c
@@ -26,7 +26,7 @@
*/
#include "cpu.h"
#include "sysemu/sysemu.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "hw/qdev.h"
#include "sysemu/device_tree.h"
diff --git a/hw/ppc/spapr_rtas.c b/hw/ppc/spapr_rtas.c
index b71b59c..8ecaa5f 100644
--- a/hw/ppc/spapr_rtas.c
+++ b/hw/ppc/spapr_rtas.c
@@ -26,7 +26,7 @@
*/
#include "cpu.h"
#include "sysemu/sysemu.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "hw/qdev.h"
#include "sysemu/device_tree.h"
diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c
index 3b27d40..78c77ef 100644
--- a/hw/sparc/leon3.c
+++ b/hw/sparc/leon3.c
@@ -24,7 +24,7 @@
#include "hw/hw.h"
#include "qemu/timer.h"
#include "hw/ptimer.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "sysemu/sysemu.h"
#include "hw/boards.h"
#include "hw/loader.h"
diff --git a/hw/tpm/tpm_passthrough.c b/hw/tpm/tpm_passthrough.c
index 5781277..416b9b6 100644
--- a/hw/tpm/tpm_passthrough.c
+++ b/hw/tpm/tpm_passthrough.c
@@ -27,7 +27,7 @@
#include "qemu-common.h"
#include "qapi/error.h"
#include "qemu/sockets.h"
-#include "backends/tpm.h"
+#include "sysemu/tpm_backend.h"
#include "tpm_int.h"
#include "hw/hw.h"
#include "hw/i386/pc.h"
diff --git a/hw/tpm/tpm_tis.c b/hw/tpm/tpm_tis.c
index faa3cec..d4d8152 100644
--- a/hw/tpm/tpm_tis.c
+++ b/hw/tpm/tpm_tis.c
@@ -19,7 +19,7 @@
* specification.
*/
-#include "backends/tpm.h"
+#include "sysemu/tpm_backend.h"
#include "tpm_int.h"
#include "block/block.h"
#include "exec/address-spaces.h"
diff --git a/hw/usb/ccid-card-emulated.c b/hw/usb/ccid-card-emulated.c
index 29dcd7a..d534c94 100644
--- a/hw/usb/ccid-card-emulated.c
+++ b/hw/usb/ccid-card-emulated.c
@@ -32,7 +32,7 @@
#include <vcard_emul.h>
#include "qemu/thread.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "monitor/monitor.h"
#include "ccid.h"
diff --git a/hw/usb/ccid-card-passthru.c b/hw/usb/ccid-card-passthru.c
index 5e017ae..71a45f6 100644
--- a/hw/usb/ccid-card-passthru.c
+++ b/hw/usb/ccid-card-passthru.c
@@ -8,7 +8,7 @@
* See the COPYING file in the top-level directory.
*/
-#include "char/char.h"
+#include "sysemu/char.h"
#include "qemu/sockets.h"
#include "monitor/monitor.h"
#include "ccid.h"
diff --git a/hw/usb/dev-bluetooth.c b/hw/usb/dev-bluetooth.c
index 0f8aa48..68cc1d4 100644
--- a/hw/usb/dev-bluetooth.c
+++ b/hw/usb/dev-bluetooth.c
@@ -21,7 +21,7 @@
#include "qemu-common.h"
#include "hw/usb.h"
#include "hw/usb/desc.h"
-#include "bt/bt.h"
+#include "sysemu/bt.h"
#include "hw/bt.h"
struct USBBtState {
diff --git a/hw/usb/dev-serial.c b/hw/usb/dev-serial.c
index 7c314dc..dd0a608 100644
--- a/hw/usb/dev-serial.c
+++ b/hw/usb/dev-serial.c
@@ -12,7 +12,7 @@
#include "qemu/error-report.h"
#include "hw/usb.h"
#include "hw/usb/desc.h"
-#include "char/char.h"
+#include "sysemu/char.h"
//#define DEBUG_Serial
diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c
index 0ddb081..a594e95 100644
--- a/hw/usb/redirect.c
+++ b/hw/usb/redirect.c
@@ -30,7 +30,7 @@
#include "monitor/monitor.h"
#include "sysemu/sysemu.h"
#include "qemu/iov.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include <dirent.h>
#include <sys/ioctl.h>
diff --git a/hw/virtio/virtio-rng.c b/hw/virtio/virtio-rng.c
index 6079b2a..fcc223a 100644
--- a/hw/virtio/virtio-rng.c
+++ b/hw/virtio/virtio-rng.c
@@ -14,7 +14,7 @@
#include "qapi/qmp/qerror.h"
#include "hw/virtio/virtio.h"
#include "hw/virtio/virtio-rng.h"
-#include "qemu/rng.h"
+#include "sysemu/rng.h"
static bool is_guest_ready(VirtIORNG *vrng)
{
diff --git a/hw/xen/xen_backend.c b/hw/xen/xen_backend.c
index 2a8c9f5..d82ce5d 100644
--- a/hw/xen/xen_backend.c
+++ b/hw/xen/xen_backend.c
@@ -35,7 +35,7 @@
#include <sys/signal.h>
#include "hw/hw.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "qemu/log.h"
#include "hw/xen/xen_backend.h"
diff --git a/hw/xtensa/xtensa_lx60.c b/hw/xtensa/xtensa_lx60.c
index 2682eda..650dd31 100644
--- a/hw/xtensa/xtensa_lx60.c
+++ b/hw/xtensa/xtensa_lx60.c
@@ -36,7 +36,7 @@
#include "hw/sysbus.h"
#include "hw/block/flash.h"
#include "sysemu/blockdev.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "xtensa_bootparam.h"
typedef struct LxBoardDesc {
diff --git a/include/hw/virtio/virtio-rng.h b/include/hw/virtio/virtio-rng.h
index 3711c97..c9cadc2 100644
--- a/include/hw/virtio/virtio-rng.h
+++ b/include/hw/virtio/virtio-rng.h
@@ -12,8 +12,8 @@
#ifndef _QEMU_VIRTIO_RNG_H
#define _QEMU_VIRTIO_RNG_H
-#include "qemu/rng.h"
-#include "qemu/rng-random.h"
+#include "sysemu/rng.h"
+#include "sysemu/rng-random.h"
/* The Virtio ID for the virtio rng device */
#define VIRTIO_ID_RNG 4
diff --git a/include/bt/bt.h b/include/sysemu/bt.h
similarity index 100%
rename from include/bt/bt.h
rename to include/sysemu/bt.h
diff --git a/include/char/char.h b/include/sysemu/char.h
similarity index 100%
rename from include/char/char.h
rename to include/sysemu/char.h
diff --git a/include/qemu/rng-random.h b/include/sysemu/rng-random.h
similarity index 100%
rename from include/qemu/rng-random.h
rename to include/sysemu/rng-random.h
diff --git a/include/qemu/rng.h b/include/sysemu/rng.h
similarity index 100%
rename from include/qemu/rng.h
rename to include/sysemu/rng.h
diff --git a/include/backends/tpm.h b/include/sysemu/tpm_backend.h
similarity index 100%
rename from include/backends/tpm.h
rename to include/sysemu/tpm_backend.h
diff --git a/monitor.c b/monitor.c
index e605822..2909ca1 100644
--- a/monitor.c
+++ b/monitor.c
@@ -33,7 +33,7 @@
#include "exec/gdbstub.h"
#include "net/net.h"
#include "net/slirp.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "ui/qemu-spice.h"
#include "sysemu/sysemu.h"
#include "monitor/monitor.h"
diff --git a/net/slirp.c b/net/slirp.c
index eabfee6..b3f35d5 100644
--- a/net/slirp.c
+++ b/net/slirp.c
@@ -35,7 +35,7 @@
#include "monitor/monitor.h"
#include "qemu/sockets.h"
#include "slirp/libslirp.h"
-#include "char/char.h"
+#include "sysemu/char.h"
static int get_str_sep(char *buf, int buf_size, const char **pp, int sep)
{
diff --git a/qemu-char.c b/qemu-char.c
index eae17fc..14707ea 100644
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -26,7 +26,7 @@
#include "ui/console.h"
#include "sysemu/sysemu.h"
#include "qemu/timer.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "hw/usb.h"
#include "qmp-commands.h"
diff --git a/qmp.c b/qmp.c
index 55b056b..ed6c7ef 100644
--- a/qmp.c
+++ b/qmp.c
@@ -16,7 +16,7 @@
#include "qemu-common.h"
#include "sysemu/sysemu.h"
#include "qmp-commands.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "ui/qemu-spice.h"
#include "ui/vnc.h"
#include "sysemu/kvm.h"
diff --git a/qtest.c b/qtest.c
index b03b68a..3bba3e5 100644
--- a/qtest.c
+++ b/qtest.c
@@ -13,7 +13,7 @@
#include "sysemu/qtest.h"
#include "hw/qdev.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "exec/ioport.h"
#include "exec/memory.h"
#include "hw/irq.h"
diff --git a/slirp/slirp.c b/slirp/slirp.c
index bd9b7cb..80b28ea 100644
--- a/slirp/slirp.c
+++ b/slirp/slirp.c
@@ -23,7 +23,7 @@
*/
#include "qemu-common.h"
#include "qemu/timer.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "slirp.h"
#include "hw/hw.h"
diff --git a/spice-qemu-char.c b/spice-qemu-char.c
index 535f955..c9403de 100644
--- a/spice-qemu-char.c
+++ b/spice-qemu-char.c
@@ -1,7 +1,7 @@
#include "config-host.h"
#include "trace.h"
#include "ui/qemu-spice.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include <spice.h>
#include <spice-experimental.h>
#include <spice/protocol.h>
diff --git a/tpm.c b/tpm.c
index 1e94314..c91da43 100644
--- a/tpm.c
+++ b/tpm.c
@@ -15,7 +15,7 @@
#include "monitor/monitor.h"
#include "qapi/qmp/qerror.h"
-#include "backends/tpm.h"
+#include "sysemu/tpm_backend.h"
#include "sysemu/tpm.h"
#include "qemu/config-file.h"
#include "qmp-commands.h"
diff --git a/ui/console.c b/ui/console.c
index e84ba8b..0ed4211 100644
--- a/ui/console.c
+++ b/ui/console.c
@@ -25,7 +25,7 @@
#include "ui/console.h"
#include "qemu/timer.h"
#include "qmp-commands.h"
-#include "char/char.h"
+#include "sysemu/char.h"
//#define DEBUG_CONSOLE
#define DEFAULT_BACKSCROLL 512
diff --git a/ui/gtk.c b/ui/gtk.c
index 1a6bee6..1e105e2 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -62,7 +62,7 @@
#include "qmp-commands.h"
#include "x_keymap.h"
#include "keymaps.h"
-#include "char/char.h"
+#include "sysemu/char.h"
//#define DEBUG_GTK
diff --git a/util/event_notifier-posix.c b/util/event_notifier-posix.c
index 713d756..8442c6e 100644
--- a/util/event_notifier-posix.c
+++ b/util/event_notifier-posix.c
@@ -12,7 +12,7 @@
#include "qemu-common.h"
#include "qemu/event_notifier.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "qemu/main-loop.h"
#ifdef CONFIG_EVENTFD
diff --git a/vl.c b/vl.c
index ce7bed7..cdadad0 100644
--- a/vl.c
+++ b/vl.c
@@ -126,7 +126,7 @@ int main(int argc, char **argv)
#include "hw/qdev.h"
#include "hw/loader.h"
#include "monitor/qdev.h"
-#include "bt/bt.h"
+#include "sysemu/bt.h"
#include "net/net.h"
#include "net/slirp.h"
#include "monitor/monitor.h"
@@ -134,7 +134,7 @@ int main(int argc, char **argv)
#include "sysemu/sysemu.h"
#include "exec/gdbstub.h"
#include "qemu/timer.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "qemu/cache-utils.h"
#include "sysemu/blockdev.h"
#include "hw/block/block.h"
diff --git a/xen-all.c b/xen-all.c
index 31f28fc..539a154 100644
--- a/xen-all.c
+++ b/xen-all.c
@@ -16,7 +16,7 @@
#include "hw/xen/xen_backend.h"
#include "qmp-commands.h"
-#include "char/char.h"
+#include "sysemu/char.h"
#include "qemu/range.h"
#include "sysemu/xen-mapcache.h"
#include "trace.h"
--
1.8.1.4
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [Qemu-devel] [PATCH 10/12] include: avoid useless includes of exec/ headers
2013-04-15 13:19 [Qemu-devel] [PULL 00/12] directory reorganization, fixes and final part Paolo Bonzini
` (8 preceding siblings ...)
2013-04-15 13:19 ` [Qemu-devel] [PATCH 09/12] sysemu: avoid proliferation of include/ subdirectories Paolo Bonzini
@ 2013-04-15 13:19 ` Paolo Bonzini
2013-04-15 13:19 ` [Qemu-devel] [PATCH 11/12] memory: move core typedefs to qemu/typedefs.h Paolo Bonzini
` (3 subsequent siblings)
13 siblings, 0 replies; 23+ messages in thread
From: Paolo Bonzini @ 2013-04-15 13:19 UTC (permalink / raw)
To: qemu-devel
Headers in include/exec/ are for the deepest innards of QEMU,
they should almost never be included directly.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
arch_init.c | 1 -
dump.c | 6 +++++-
hw/alpha/typhoon.c | 1 -
hw/ide/ahci.c | 1 -
hw/ide/internal.h | 1 -
hw/net/vmxnet_tx_pkt.c | 2 +-
hw/usb/libhw.c | 2 +-
kvm-stub.c | 1 -
translate-all.c | 5 ++---
9 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/arch_init.c b/arch_init.c
index fba0889..92de1bd 100644
--- a/arch_init.c
+++ b/arch_init.c
@@ -40,7 +40,6 @@
#include "hw/audio/audio.h"
#include "sysemu/kvm.h"
#include "migration/migration.h"
-#include "exec/gdbstub.h"
#include "hw/i386/smbios.h"
#include "exec/address-spaces.h"
#include "hw/audio/pcspk.h"
diff --git a/dump.c b/dump.c
index a25f509..b34f143 100644
--- a/dump.c
+++ b/dump.c
@@ -23,7 +23,6 @@
#include "sysemu/memory_mapping.h"
#include "qapi/error.h"
#include "qmp-commands.h"
-#include "exec/gdbstub.h"
static uint16_t cpu_convert_to_target16(uint16_t val, int endian)
{
@@ -268,6 +267,11 @@ static int write_elf64_note(DumpState *s)
return 0;
}
+static inline int cpu_index(CPUState *cpu)
+{
+ return cpu->cpu_index + 1;
+}
+
static int write_elf64_notes(DumpState *s)
{
CPUArchState *env;
diff --git a/hw/alpha/typhoon.c b/hw/alpha/typhoon.c
index 68420f4..1ead187 100644
--- a/hw/alpha/typhoon.c
+++ b/hw/alpha/typhoon.c
@@ -7,7 +7,6 @@
*/
#include "cpu.h"
-#include "exec/exec-all.h"
#include "hw/hw.h"
#include "hw/devices.h"
#include "sysemu/sysemu.h"
diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index d0ae8af..3405583 100644
--- a/hw/ide/ahci.c
+++ b/hw/ide/ahci.c
@@ -29,7 +29,6 @@
#include "monitor/monitor.h"
#include "sysemu/dma.h"
-#include "exec/cpu-common.h"
#include "internal.h"
#include <hw/ide/pci.h>
#include <hw/ide/ahci.h>
diff --git a/hw/ide/internal.h b/hw/ide/internal.h
index 2c89b50..0efb2da 100644
--- a/hw/ide/internal.h
+++ b/hw/ide/internal.h
@@ -8,7 +8,6 @@
*/
#include <hw/ide.h>
#include <hw/isa/isa.h>
-#include "exec/iorange.h"
#include "sysemu/dma.h"
#include "sysemu/sysemu.h"
#include "hw/block/block.h"
diff --git a/hw/net/vmxnet_tx_pkt.c b/hw/net/vmxnet_tx_pkt.c
index b1e795b..fc01e4d 100644
--- a/hw/net/vmxnet_tx_pkt.c
+++ b/hw/net/vmxnet_tx_pkt.c
@@ -15,6 +15,7 @@
*
*/
+#include "hw/hw.h"
#include "vmxnet_tx_pkt.h"
#include "net/eth.h"
#include "qemu-common.h"
@@ -22,7 +23,6 @@
#include "net/checksum.h"
#include "net/tap.h"
#include "net/net.h"
-#include "exec/cpu-common.h"
enum {
VMXNET_TX_PKT_VHDR_FRAG = 0,
diff --git a/hw/usb/libhw.c b/hw/usb/libhw.c
index 75f022f..d2d4b51 100644
--- a/hw/usb/libhw.c
+++ b/hw/usb/libhw.c
@@ -20,7 +20,7 @@
* THE SOFTWARE.
*/
#include "qemu-common.h"
-#include "exec/cpu-common.h"
+#include "hw/hw.h"
#include "hw/usb.h"
#include "sysemu/dma.h"
diff --git a/kvm-stub.c b/kvm-stub.c
index 760aadc..f6137d3 100644
--- a/kvm-stub.c
+++ b/kvm-stub.c
@@ -14,7 +14,6 @@
#include "hw/hw.h"
#include "hw/pci/msi.h"
#include "cpu.h"
-#include "exec/gdbstub.h"
#include "sysemu/kvm.h"
KVMState *kvm_state;
diff --git a/translate-all.c b/translate-all.c
index a98c646..08dd038 100644
--- a/translate-all.c
+++ b/translate-all.c
@@ -35,9 +35,6 @@
#include "cpu.h"
#include "disas/disas.h"
#include "tcg.h"
-#include "qemu/timer.h"
-#include "exec/memory.h"
-#include "exec/address-spaces.h"
#if defined(CONFIG_USER_ONLY)
#include "qemu.h"
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
@@ -55,6 +52,8 @@
#include <libutil.h>
#endif
#endif
+#else
+#include "exec/address-spaces.h"
#endif
#include "exec/cputlb.h"
--
1.8.1.4
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [Qemu-devel] [PATCH 11/12] memory: move core typedefs to qemu/typedefs.h
2013-04-15 13:19 [Qemu-devel] [PULL 00/12] directory reorganization, fixes and final part Paolo Bonzini
` (9 preceding siblings ...)
2013-04-15 13:19 ` [Qemu-devel] [PATCH 10/12] include: avoid useless includes of exec/ headers Paolo Bonzini
@ 2013-04-15 13:19 ` Paolo Bonzini
2013-04-15 13:19 ` [Qemu-devel] [PATCH 12/12] exec: remove useless declarations from memory-internal.h Paolo Bonzini
` (2 subsequent siblings)
13 siblings, 0 replies; 23+ messages in thread
From: Paolo Bonzini @ 2013-04-15 13:19 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
include/exec/memory.h | 5 -----
include/qemu/typedefs.h | 4 ++++
target-ppc/kvm_ppc.h | 2 --
3 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/include/exec/memory.h b/include/exec/memory.h
index 2322732..9e88320 100644
--- a/include/exec/memory.h
+++ b/include/exec/memory.h
@@ -27,7 +27,6 @@
#include "qemu/int128.h"
typedef struct MemoryRegionOps MemoryRegionOps;
-typedef struct MemoryRegion MemoryRegion;
typedef struct MemoryRegionPortio MemoryRegionPortio;
typedef struct MemoryRegionMmio MemoryRegionMmio;
@@ -157,8 +156,6 @@ struct MemoryRegionPortio {
#define PORTIO_END_OF_LIST() { }
-typedef struct AddressSpace AddressSpace;
-
/**
* AddressSpace: describes a mapping of addresses to #MemoryRegion objects
*/
@@ -173,8 +170,6 @@ struct AddressSpace {
QTAILQ_ENTRY(AddressSpace) address_spaces_link;
};
-typedef struct MemoryRegionSection MemoryRegionSection;
-
/**
* MemoryRegionSection: describes a fragment of a #MemoryRegion
*
diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h
index fd532a2..93aae81 100644
--- a/include/qemu/typedefs.h
+++ b/include/qemu/typedefs.h
@@ -18,6 +18,10 @@ typedef struct DeviceState DeviceState;
typedef struct BusState BusState;
typedef struct BusClass BusClass;
+typedef struct AddressSpace AddressSpace;
+typedef struct MemoryRegion MemoryRegion;
+typedef struct MemoryRegionSection MemoryRegionSection;
+
typedef struct NICInfo NICInfo;
typedef struct HCIInfo HCIInfo;
typedef struct AudioState AudioState;
diff --git a/target-ppc/kvm_ppc.h b/target-ppc/kvm_ppc.h
index c30b006..6bcc5cc 100644
--- a/target-ppc/kvm_ppc.h
+++ b/target-ppc/kvm_ppc.h
@@ -9,8 +9,6 @@
#ifndef __KVM_PPC_H__
#define __KVM_PPC_H__
-#include "exec/memory.h"
-
#define TYPE_HOST_POWERPC_CPU "host-" TYPE_POWERPC_CPU
void kvmppc_init(void);
--
1.8.1.4
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [Qemu-devel] [PATCH 12/12] exec: remove useless declarations from memory-internal.h
2013-04-15 13:19 [Qemu-devel] [PULL 00/12] directory reorganization, fixes and final part Paolo Bonzini
` (10 preceding siblings ...)
2013-04-15 13:19 ` [Qemu-devel] [PATCH 11/12] memory: move core typedefs to qemu/typedefs.h Paolo Bonzini
@ 2013-04-15 13:19 ` Paolo Bonzini
2013-04-15 16:20 ` [Qemu-devel] [PULL 00/12] directory reorganization, fixes and final part Paolo Bonzini
2013-04-15 21:10 ` Anthony Liguori
13 siblings, 0 replies; 23+ messages in thread
From: Paolo Bonzini @ 2013-04-15 13:19 UTC (permalink / raw)
To: qemu-devel
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
include/exec/memory-internal.h | 6 ------
1 file changed, 6 deletions(-)
diff --git a/include/exec/memory-internal.h b/include/exec/memory-internal.h
index 977467b..1b156fd 100644
--- a/include/exec/memory-internal.h
+++ b/include/exec/memory-internal.h
@@ -49,12 +49,6 @@ ram_addr_t qemu_ram_alloc(ram_addr_t size, MemoryRegion *mr);
void qemu_ram_free(ram_addr_t addr);
void qemu_ram_free_from_ptr(ram_addr_t addr);
-struct MemoryRegion;
-struct MemoryRegionSection;
-
-void qemu_register_coalesced_mmio(hwaddr addr, ram_addr_t size);
-void qemu_unregister_coalesced_mmio(hwaddr addr, ram_addr_t size);
-
#define VGA_DIRTY_FLAG 0x01
#define CODE_DIRTY_FLAG 0x02
#define MIGRATION_DIRTY_FLAG 0x08
--
1.8.1.4
^ permalink raw reply related [flat|nested] 23+ messages in thread
* Re: [Qemu-devel] [PATCH 07/12] configure: fix TPM logic
2013-04-15 13:19 ` [Qemu-devel] [PATCH 07/12] configure: fix TPM logic Paolo Bonzini
@ 2013-04-15 16:02 ` Laszlo Ersek
2013-04-15 16:09 ` Peter Maydell
2013-04-16 8:28 ` Markus Armbruster
2 siblings, 0 replies; 23+ messages in thread
From: Laszlo Ersek @ 2013-04-15 16:02 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: qemu-devel
On 04/15/13 15:19, Paolo Bonzini wrote:
> diff --git a/configure b/configure
> index 258c82a..1c1e369 100755
> --- a/configure
> +++ b/configure
> @@ -3436,6 +3445,7 @@ echo "virtio-blk-data-plane $virtio_blk_data_plane"
> echo "gcov $gcov_tool"
> echo "gcov enabled $gcov"
> echo "TPM support $tpm"
> +echo "TPM passthrough $tpm_passthrough"
>
> if test "$sdl_too_old" = "yes"; then
> echo "-> Your SDL version is too old - please upgrade to have SDL support"
(tiny merge conflict with 0a12ec87)
diff --cc configure
index a97bf31,1c1e369..0000000
--- a/configure
+++ b/configure
@@@ -3503,7 -3445,7 +3513,8 @@@ echo "virtio-blk-data-plane $virtio_blk
echo "gcov $gcov_tool"
echo "gcov enabled $gcov"
echo "TPM support $tpm"
+ echo "TPM passthrough $tpm_passthrough"
+echo "libssh2 support $libssh2"
if test "$sdl_too_old" = "yes"; then
echo "-> Your SDL version is too old - please upgrade to have SDL support"
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [Qemu-devel] [PATCH 07/12] configure: fix TPM logic
2013-04-15 13:19 ` [Qemu-devel] [PATCH 07/12] configure: fix TPM logic Paolo Bonzini
2013-04-15 16:02 ` Laszlo Ersek
@ 2013-04-15 16:09 ` Peter Maydell
2013-04-15 16:14 ` Paolo Bonzini
2013-04-16 8:28 ` Markus Armbruster
2 siblings, 1 reply; 23+ messages in thread
From: Peter Maydell @ 2013-04-15 16:09 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: qemu-devel
On 15 April 2013 14:19, Paolo Bonzini <pbonzini@redhat.com> wrote:
> +if test "$targetos" = Linux && test "$cpu" = i386 -o "$cpu" = x86_64; then
test -o is deprecated by POSIX; better to use
if test ... && ( test ... || test ... ); then
in new code.
thanks
-- PMM
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [Qemu-devel] [PATCH 07/12] configure: fix TPM logic
2013-04-15 16:09 ` Peter Maydell
@ 2013-04-15 16:14 ` Paolo Bonzini
2013-04-15 16:21 ` Peter Maydell
0 siblings, 1 reply; 23+ messages in thread
From: Paolo Bonzini @ 2013-04-15 16:14 UTC (permalink / raw)
To: Peter Maydell; +Cc: qemu-devel
Il 15/04/2013 18:09, Peter Maydell ha scritto:
>> > +if test "$targetos" = Linux && test "$cpu" = i386 -o "$cpu" = x86_64; then
> test -o is deprecated by POSIX; better to use
> if test ... && ( test ... || test ... ); then
>
> in new code.
True, on the other hand "(.*test" has no match at all in configure; and
since we know that $cpu does not begin with a dash, it is portable in
practice.
I would agree with you, but it looks like convention trumps the
suggested practice.
Paolo
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [Qemu-devel] [PATCH 08/12] tpm: reorganize headers and split hardware part
2013-04-15 13:19 ` [Qemu-devel] [PATCH 08/12] tpm: reorganize headers and split hardware part Paolo Bonzini
@ 2013-04-15 16:19 ` Laszlo Ersek
0 siblings, 0 replies; 23+ messages in thread
From: Laszlo Ersek @ 2013-04-15 16:19 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: Anthony Liguori, qemu-devel
On 04/15/13 15:19, Paolo Bonzini wrote:
> diff --git a/include/backends/tpm.h b/include/backends/tpm.h
> index 9e93cc5..a96b110 100644
> --- a/include/backends/tpm.h
> +++ b/include/backends/tpm.h
> @@ -18,7 +18,7 @@
> #include "qapi/error.h"
> #include "qapi-types.h"
> #include "qemu/option.h"
> -#include "tpm/tpm.h"
> +#include "sysemu/tpm.h"
>
> #define TYPE_TPM_BACKEND "tpm-backend"
> #define TPM_BACKEND(obj) \
> @@ -30,6 +30,7 @@
>
> typedef struct TPMBackendClass TPMBackendClass;
> typedef struct TPMBackend TPMBackend;
> +typedef struct TPMState TPMState;
>
> typedef struct TPMDriverOps TPMDriverOps;
>
This breaks the build for me:
include/sysemu/tpm_backend.h:33: error: redefinition of typedef 'TPMState'
include/sysemu/tpm.h:17: note: previous declaration of 'TPMState' was here
The prev decl. is from 8f0605cc.
"include/sysemu/tpm.h" seems like a "more common" header, so suggesting
to drop the typedef from the backend. Anyway the x86_64 default config
build completes that way.
Thanks,
Laszlo
diff --git a/include/sysemu/tpm_backend.h b/include/sysemu/tpm_backend.h
index a96b110..4667874 100644
--- a/include/sysemu/tpm_backend.h
+++ b/include/sysemu/tpm_backend.h
@@ -30,7 +30,6 @@
typedef struct TPMBackendClass TPMBackendClass;
typedef struct TPMBackend TPMBackend;
-typedef struct TPMState TPMState;
typedef struct TPMDriverOps TPMDriverOps;
^ permalink raw reply related [flat|nested] 23+ messages in thread
* Re: [Qemu-devel] [PULL 00/12] directory reorganization, fixes and final part
2013-04-15 13:19 [Qemu-devel] [PULL 00/12] directory reorganization, fixes and final part Paolo Bonzini
` (11 preceding siblings ...)
2013-04-15 13:19 ` [Qemu-devel] [PATCH 12/12] exec: remove useless declarations from memory-internal.h Paolo Bonzini
@ 2013-04-15 16:20 ` Paolo Bonzini
2013-04-15 21:10 ` Anthony Liguori
13 siblings, 0 replies; 23+ messages in thread
From: Paolo Bonzini @ 2013-04-15 16:20 UTC (permalink / raw)
To: qemu-devel; +Cc: Laszlo Ersek
Il 15/04/2013 15:19, Paolo Bonzini ha scritto:
> Anthony,
>
> The following changes since commit e2ec3f976803b360c70d9ae2ba13852fa5d11665:
>
> qjson: to_json() case QTYPE_QSTRING is buggy, rewrite (2013-04-13 19:40:25 +0000)
>
> are available in the git repository at:
>
> git://github.com/bonzini/qemu.git hw-dirs
>
> for you to fetch changes up to 4355deaaff63d715115fdf1359bfbb7cbc374662:
>
> exec: remove useless declarations from memory-internal.h (2013-04-15 15:17:31 +0200)
Pushed c72dd2d04bd28f7ec6b073316270258684ba5fc3 to the same, diff:
diff --git a/include/sysemu/tpm_backend.h b/include/sysemu/tpm_backend.h
index a96b110..4667874 100644
--- a/include/sysemu/tpm_backend.h
+++ b/include/sysemu/tpm_backend.h
@@ -30,7 +30,6 @@
typedef struct TPMBackendClass TPMBackendClass;
typedef struct TPMBackend TPMBackend;
-typedef struct TPMState TPMState;
typedef struct TPMDriverOps TPMDriverOps;
The error was not present with GCC 4.7.2.
Paolo
> ----------------------------------------------------------------
> Hu Tao (1):
> Fix failure to create q35 machine
>
> Jan Kiszka (1):
> Add linux-headers to QEMU_INCLUDES
>
> Michael S. Tsirkin (2):
> acpi: move declarations from pc.h to acpi.h
> acpi.h: make it self contained
>
> Paolo Bonzini (6):
> configure: fix TPM logic
> tpm: reorganize headers and split hardware part
> sysemu: avoid proliferation of include/ subdirectories
> include: avoid useless includes of exec/ headers
> memory: move core typedefs to qemu/typedefs.h
> exec: remove useless declarations from memory-internal.h
>
> Peter Maydell (1):
> arm: fix location of some include files
>
> Stefan Weil (1):
> hw: Add lost ARM core again
>
> Makefile.objs | 2 +-
> arch_init.c | 2 +-
> backends/baum.c | 2 +-
> backends/msmouse.c | 2 +-
> backends/rng-egd.c | 4 +-
> backends/rng-random.c | 4 +-
> backends/rng.c | 2 +-
> backends/tpm.c | 40 ++++++++++++++-
> bt-host.c | 2 +-
> bt-vhci.c | 2 +-
> configure | 29 +++++++----
> default-configs/arm-softmmu.mak | 2 +-
> default-configs/i386-softmmu.mak | 5 +-
> default-configs/x86_64-softmmu.mak | 5 +-
> dump.c | 6 ++-
> gdbstub.c | 2 +-
> hmp.c | 2 +-
> hw/Makefile.objs | 1 +
> hw/alpha/typhoon.c | 3 +-
> hw/arm/armv7m.c | 2 +-
> hw/arm/boot.c | 2 +-
> hw/arm/collie.c | 4 +-
> hw/arm/exynos4210.c | 2 +-
> hw/arm/exynos4_boards.c | 2 +-
> hw/arm/gumstix.c | 2 +-
> hw/arm/highbank.c | 4 +-
> hw/arm/integratorcp.c | 4 +-
> hw/arm/kzm.c | 4 +-
> hw/arm/mainstone.c | 4 +-
> hw/arm/musicpal.c | 4 +-
> hw/arm/nseries.c | 4 +-
> hw/arm/omap1.c | 2 +-
> hw/arm/omap2.c | 4 +-
> hw/arm/omap_sx1.c | 2 +-
> hw/arm/palm.c | 4 +-
> hw/arm/pic_cpu.c | 2 +-
> hw/arm/pxa2xx.c | 2 +-
> hw/arm/realview.c | 4 +-
> hw/arm/spitz.c | 4 +-
> hw/arm/stellaris.c | 4 +-
> hw/arm/strongarm.c | 4 +-
> hw/arm/tosa.c | 4 +-
> hw/arm/versatilepb.c | 4 +-
> hw/arm/vexpress.c | 4 +-
> hw/arm/xilinx_zynq.c | 2 +-
> hw/arm/z2.c | 4 +-
> hw/block/m25p80.c | 2 +-
> hw/bt/core.c | 2 +-
> hw/bt/hci-csr.c | 4 +-
> hw/bt/hci.c | 2 +-
> hw/char/cadence_uart.c | 2 +-
> hw/char/debugcon.c | 2 +-
> hw/char/escc.c | 2 +-
> hw/char/etraxfs_ser.c | 2 +-
> hw/char/exynos4210_uart.c | 2 +-
> hw/char/grlib_apbuart.c | 2 +-
> hw/char/imx_serial.c | 2 +-
> hw/char/ipoctal232.c | 2 +-
> hw/char/lm32_juart.c | 2 +-
> hw/char/lm32_uart.c | 2 +-
> hw/char/mcf_uart.c | 2 +-
> hw/char/milkymist-uart.c | 2 +-
> hw/char/omap_uart.c | 2 +-
> hw/char/parallel.c | 2 +-
> hw/char/pl011.c | 2 +-
> hw/char/sclpconsole.c | 2 +-
> hw/char/serial.c | 2 +-
> hw/char/sh_serial.c | 2 +-
> hw/char/spapr_vty.c | 2 +-
> hw/char/virtio-console.c | 2 +-
> hw/char/xen_console.c | 2 +-
> hw/char/xilinx_uartlite.c | 2 +-
> hw/core/qdev-properties-system.c | 2 +-
> hw/core/qdev-properties.c | 2 +-
> hw/display/blizzard.c | 2 +-
> hw/display/sm501.c | 2 +-
> hw/display/tc6393xb.c | 2 +-
> hw/display/xenfb.c | 2 +-
> hw/i386/pc.c | 1 +
> hw/i386/pc_piix.c | 1 +
> hw/ide/ahci.c | 1 -
> hw/ide/internal.h | 1 -
> hw/input/stellaris_input.c | 2 +-
> hw/input/tsc2005.c | 2 +-
> hw/input/tsc210x.c | 2 +-
> hw/intc/armv7m_nvic.c | 2 +-
> hw/isa/pc87312.c | 2 +-
> hw/lm32/lm32_boards.c | 2 +-
> hw/lm32/milkymist.c | 2 +-
> hw/microblaze/petalogix_ml605_mmu.c | 2 +-
> hw/microblaze/petalogix_s3adsp1800_mmu.c | 2 +-
> hw/mips/mips_fulong2e.c | 2 +-
> hw/mips/mips_malta.c | 2 +-
> hw/misc/cbus.c | 2 +-
> hw/misc/ivshmem.c | 2 +-
> hw/net/lan9118.c | 2 +-
> hw/net/smc91c111.c | 2 +-
> hw/net/vmxnet_tx_pkt.c | 2 +-
> hw/net/xgmac.c | 2 +-
> hw/ppc/spapr_events.c | 2 +-
> hw/ppc/spapr_rtas.c | 2 +-
> hw/ppc/virtex_ml507.c | 2 +-
> hw/sh4/r2d.c | 2 +-
> hw/sparc/leon3.c | 2 +-
> hw/timer/tusb6010.c | 2 +-
> {tpm => hw/tpm}/Makefile.objs | 4 --
> {tpm => hw/tpm}/tpm_int.h | 37 +-------------
> {tpm => hw/tpm}/tpm_passthrough.c | 22 ++++++--
> {tpm => hw/tpm}/tpm_tis.c | 4 +-
> {tpm => hw/tpm}/tpm_tis.h | 5 --
> hw/usb/ccid-card-emulated.c | 2 +-
> hw/usb/ccid-card-passthru.c | 2 +-
> hw/usb/dev-bluetooth.c | 2 +-
> hw/usb/dev-serial.c | 2 +-
> hw/usb/libhw.c | 2 +-
> hw/usb/redirect.c | 2 +-
> hw/virtio/virtio-rng.c | 2 +-
> hw/xen/xen_backend.c | 2 +-
> hw/xtensa/xtensa_lx60.c | 2 +-
> include/exec/memory-internal.h | 6 ---
> include/exec/memory.h | 5 --
> include/hw/acpi/acpi.h | 13 +++++
> include/hw/{ => arm}/arm.h | 0
> include/hw/{arm => }/devices.h | 0
> include/hw/i386/pc.h | 8 ---
> include/hw/virtio/virtio-rng.h | 4 +-
> include/qemu/typedefs.h | 4 ++
> include/{bt => sysemu}/bt.h | 0
> include/{char => sysemu}/char.h | 0
> include/{qemu => sysemu}/rng-random.h | 0
> include/{qemu => sysemu}/rng.h | 0
> include/{tpm => sysemu}/tpm.h | 2 -
> include/{backends/tpm.h => sysemu/tpm_backend.h} | 42 +++++++++++++++-
> .../sysemu/tpm_backend_int.h | 0
> kvm-stub.c | 1 -
> monitor.c | 4 +-
> net/slirp.c | 2 +-
> qemu-char.c | 2 +-
> qmp.c | 2 +-
> qtest.c | 2 +-
> slirp/slirp.c | 2 +-
> spice-qemu-char.c | 2 +-
> target-arm/arm-semi.c | 2 +-
> target-arm/kvm.c | 2 +-
> target-ppc/kvm_ppc.h | 2 -
> tpm/tpm.c => tpm.c | 21 ++------
> tpm/tpm_backend.c | 58 ----------------------
> translate-all.c | 5 +-
> ui/console.c | 2 +-
> ui/gtk.c | 2 +-
> util/event_notifier-posix.c | 2 +-
> vl.c | 6 +--
> xen-all.c | 2 +-
> 153 files changed, 297 insertions(+), 319 deletions(-)
> rename {tpm => hw/tpm}/Makefile.objs (55%)
> rename {tpm => hw/tpm}/tpm_int.h (50%)
> rename {tpm => hw/tpm}/tpm_passthrough.c (96%)
> rename {tpm => hw/tpm}/tpm_tis.c (99%)
> rename {tpm => hw/tpm}/tpm_tis.h (96%)
> rename include/hw/{ => arm}/arm.h (100%)
> rename include/hw/{arm => }/devices.h (100%)
> rename include/{bt => sysemu}/bt.h (100%)
> rename include/{char => sysemu}/char.h (100%)
> rename include/{qemu => sysemu}/rng-random.h (100%)
> rename include/{qemu => sysemu}/rng.h (100%)
> rename include/{tpm => sysemu}/tpm.h (82%)
> rename include/{backends/tpm.h => sysemu/tpm_backend.h} (77%)
> rename tpm/tpm_backend.h => include/sysemu/tpm_backend_int.h (100%)
> rename tpm/tpm.c => tpm.c (93%)
> delete mode 100644 tpm/tpm_backend.c
>
^ permalink raw reply related [flat|nested] 23+ messages in thread
* Re: [Qemu-devel] [PATCH 07/12] configure: fix TPM logic
2013-04-15 16:14 ` Paolo Bonzini
@ 2013-04-15 16:21 ` Peter Maydell
0 siblings, 0 replies; 23+ messages in thread
From: Peter Maydell @ 2013-04-15 16:21 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: qemu-devel
On 15 April 2013 17:14, Paolo Bonzini <pbonzini@redhat.com> wrote:
> Il 15/04/2013 18:09, Peter Maydell ha scritto:
>>> > +if test "$targetos" = Linux && test "$cpu" = i386 -o "$cpu" = x86_64; then
>> test -o is deprecated by POSIX; better to use
>> if test ... && ( test ... || test ... ); then
>>
>> in new code.
>
> True, on the other hand "(.*test" has no match at all in configure; and
> since we know that $cpu does not begin with a dash, it is portable in
> practice.
>
> I would agree with you, but it looks like convention trumps the
> suggested practice.
I've been consistently saying this in code review for
all new shell code for some time now. You just happen
to have the first example of X && (Y || Z); most
of configure's conditionals are not that complex.
-- PMM
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [Qemu-devel] [PULL 00/12] directory reorganization, fixes and final part
2013-04-15 13:19 [Qemu-devel] [PULL 00/12] directory reorganization, fixes and final part Paolo Bonzini
` (12 preceding siblings ...)
2013-04-15 16:20 ` [Qemu-devel] [PULL 00/12] directory reorganization, fixes and final part Paolo Bonzini
@ 2013-04-15 21:10 ` Anthony Liguori
13 siblings, 0 replies; 23+ messages in thread
From: Anthony Liguori @ 2013-04-15 21:10 UTC (permalink / raw)
To: Paolo Bonzini, qemu-devel; +Cc: Laszlo Ersek
Pulled. Thanks.
Regards,
Anthony Liguori
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [Qemu-devel] [PATCH 07/12] configure: fix TPM logic
2013-04-15 13:19 ` [Qemu-devel] [PATCH 07/12] configure: fix TPM logic Paolo Bonzini
2013-04-15 16:02 ` Laszlo Ersek
2013-04-15 16:09 ` Peter Maydell
@ 2013-04-16 8:28 ` Markus Armbruster
2013-04-16 8:42 ` Paolo Bonzini
2 siblings, 1 reply; 23+ messages in thread
From: Markus Armbruster @ 2013-04-16 8:28 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: qemu-devel
Paolo Bonzini <pbonzini@redhat.com> writes:
> A non-native i386 or x86_64 emulator should not have TPM passthrough
> support, since the TPM is only present for those hosts.
>
> Reviewed-by: Andreas Färber <afaerber@suse.de>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Breaks the build for me:
make: Entering directory `/work/armbru/qemu/bld-x86'
make[1]: *** No rule to make target `../tpm/tpm_tis.o', needed by `qemu-system-x86_64'.
make[1]: Target `all' not remade because of errors.
make: *** [subdir-x86_64-softmmu] Error 2
make: Target `all' not remade because of errors.
make: Leaving directory `/work/armbru/qemu/bld-x86'
Workaround: drop --enable-tpm.
^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [Qemu-devel] [PATCH 07/12] configure: fix TPM logic
2013-04-16 8:28 ` Markus Armbruster
@ 2013-04-16 8:42 ` Paolo Bonzini
0 siblings, 0 replies; 23+ messages in thread
From: Paolo Bonzini @ 2013-04-16 8:42 UTC (permalink / raw)
To: Markus Armbruster; +Cc: qemu-devel
Il 16/04/2013 10:28, Markus Armbruster ha scritto:
> Breaks the build for me:
>
> make: Entering directory `/work/armbru/qemu/bld-x86'
> make[1]: *** No rule to make target `../tpm/tpm_tis.o', needed by `qemu-system-x86_64'.
> make[1]: Target `all' not remade because of errors.
> make: *** [subdir-x86_64-softmmu] Error 2
> make: Target `all' not remade because of errors.
> make: Leaving directory `/work/armbru/qemu/bld-x86'
>
> Workaround: drop --enable-tpm.
I had a stale .o in my build directory. Sending patch, BTW why isn't
TPM enabled by default?
Paolo
^ permalink raw reply [flat|nested] 23+ messages in thread
end of thread, other threads:[~2013-04-16 8:42 UTC | newest]
Thread overview: 23+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-15 13:19 [Qemu-devel] [PULL 00/12] directory reorganization, fixes and final part Paolo Bonzini
2013-04-15 13:19 ` [Qemu-devel] [PATCH 01/12] arm: fix location of some include files Paolo Bonzini
2013-04-15 13:19 ` [Qemu-devel] [PATCH 02/12] Add linux-headers to QEMU_INCLUDES Paolo Bonzini
2013-04-15 13:19 ` [Qemu-devel] [PATCH 03/12] Fix failure to create q35 machine Paolo Bonzini
2013-04-15 13:19 ` [Qemu-devel] [PATCH 04/12] hw: Add lost ARM core again Paolo Bonzini
2013-04-15 13:19 ` [Qemu-devel] [PATCH 05/12] acpi: move declarations from pc.h to acpi.h Paolo Bonzini
2013-04-15 13:19 ` [Qemu-devel] [PATCH 06/12] acpi.h: make it self contained Paolo Bonzini
2013-04-15 13:19 ` [Qemu-devel] [PATCH 07/12] configure: fix TPM logic Paolo Bonzini
2013-04-15 16:02 ` Laszlo Ersek
2013-04-15 16:09 ` Peter Maydell
2013-04-15 16:14 ` Paolo Bonzini
2013-04-15 16:21 ` Peter Maydell
2013-04-16 8:28 ` Markus Armbruster
2013-04-16 8:42 ` Paolo Bonzini
2013-04-15 13:19 ` [Qemu-devel] [PATCH 08/12] tpm: reorganize headers and split hardware part Paolo Bonzini
2013-04-15 16:19 ` Laszlo Ersek
2013-04-15 13:19 ` [Qemu-devel] [PATCH 09/12] sysemu: avoid proliferation of include/ subdirectories Paolo Bonzini
2013-04-15 13:19 ` [Qemu-devel] [PATCH 10/12] include: avoid useless includes of exec/ headers Paolo Bonzini
2013-04-15 13:19 ` [Qemu-devel] [PATCH 11/12] memory: move core typedefs to qemu/typedefs.h Paolo Bonzini
2013-04-15 13:19 ` [Qemu-devel] [PATCH 12/12] exec: remove useless declarations from memory-internal.h Paolo Bonzini
2013-04-15 16:20 ` [Qemu-devel] [PULL 00/12] directory reorganization, fixes and final part Paolo Bonzini
2013-04-15 21:10 ` Anthony Liguori
-- strict thread matches above, loose matches on Subject: below --
2013-04-11 16:10 [Qemu-devel] [PATCH 00/12] directory reorganization, " Paolo Bonzini
2013-04-11 16:10 ` [Qemu-devel] [PATCH 01/12] arm: fix location of some include files Paolo Bonzini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).