summaryrefslogtreecommitdiffstats
path: root/hw/tricore
diff options
context:
space:
mode:
authorPeter Maydell2019-03-08 17:31:34 +0100
committerPeter Maydell2019-03-08 17:31:34 +0100
commit234afe78281b10a798fb97c584e1b677844aaab8 (patch)
tree566eea97b956f3fe8766396999026092de4f231f /hw/tricore
parentMerge remote-tracking branch 'remotes/rth/tags/pull-hppa-20190307' into staging (diff)
parentcirrus.yml: Add macOS continuous integration task (diff)
downloadqemu-234afe78281b10a798fb97c584e1b677844aaab8.tar.gz
qemu-234afe78281b10a798fb97c584e1b677844aaab8.tar.xz
qemu-234afe78281b10a798fb97c584e1b677844aaab8.zip
Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2019-03-08' into staging
- qtest fixes - Some generic clean-ups by Philippe - macOS CI testing via cirrus-ci.com # gpg: Signature made Fri 08 Mar 2019 08:58:47 GMT # gpg: using RSA key 2ED9D774FE702DB5 # gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full] # gpg: aka "Thomas Huth <thuth@redhat.com>" [full] # gpg: aka "Thomas Huth <huth@tuxfamily.org>" [full] # gpg: aka "Thomas Huth <th.huth@posteo.de>" [unknown] # Primary key fingerprint: 27B8 8847 EEE0 2501 18F3 EAB9 2ED9 D774 FE70 2DB5 * remotes/huth-gitlab/tags/pull-request-2019-03-08: cirrus.yml: Add macOS continuous integration task tests/bios-tables: Improve portability by searching bash in the $PATH vhost-user-test: fix leaks tests: Do not use "\n" in g_test_message() strings hw/devices: Remove unused TC6393XB_RAM definition hw: Remove unused 'hw/devices.h' include tests: Move qdict-test-data.txt to tests/data/qobject/ Signed-off-by: Peter Maydell <peter.maydell@linaro.org> # Conflicts: # tests/vhost-user-test.c
Diffstat (limited to 'hw/tricore')
-rw-r--r--hw/tricore/tricore_testboard.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/hw/tricore/tricore_testboard.c b/hw/tricore/tricore_testboard.c
index 003592af27..b40cc997d0 100644
--- a/hw/tricore/tricore_testboard.c
+++ b/hw/tricore/tricore_testboard.c
@@ -24,7 +24,6 @@
#include "qemu-common.h"
#include "cpu.h"
#include "hw/hw.h"
-#include "hw/devices.h"
#include "net/net.h"
#include "sysemu/sysemu.h"
#include "hw/boards.h"