diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-09-11 12:07:29 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-09-11 12:07:29 +0100 |
| commit | ba9cef7b6e487a5a8969db81d09b8eec8a2b50c6 (patch) | |
| tree | 5d864537d44177d855b5af77934e860b0d484ec5 /target-microblaze | |
| parent | 7b9c09f7d486647784c605739d69b708a7249c9b (diff) | |
| parent | af5b83d7d5297f8bdfd3353a420c120c4fd5adfd (diff) | |
| download | qemu-ba9cef7b6e487a5a8969db81d09b8eec8a2b50c6.tar.gz qemu-ba9cef7b6e487a5a8969db81d09b8eec8a2b50c6.tar.bz2 qemu-ba9cef7b6e487a5a8969db81d09b8eec8a2b50c6.zip | |
Merge remote-tracking branch 'remotes/mjt/tags/pull-trivial-patches-2015-09-11' into staging
trivial patches for 2015-09-11
# gpg: Signature made Fri 11 Sep 2015 12:02:43 BST using RSA key ID A4C3D7DB
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
# gpg: aka "Michael Tokarev <mjt@corpit.ru>"
# gpg: aka "Michael Tokarev <mjt@debian.org>"
* remotes/mjt/tags/pull-trivial-patches-2015-09-11: (26 commits)
virtio-vga: enable for i386
hw/arm/spitz: Remove meaningless blank Property
hw/gpio/zaurus: Remove meaningless blank Property
hw/virtio/virtio-pci: Remove meaningless blank Property
hw/s390x/s390-virtio-bus: Remove meaningless blank Property
typofixes - v4
qapi-schema: remove legacy<> from doc
disas/microblaze: Remove unused code
help: dd missing newline
Target-ppc: Remove unnecessary variable
baum: Fix build with debugging enabled
linux-user: Fix warnings caused by missing 'static' attribute
opts: produce valid command line in qemu_opts_print
docs: fix a qga/qapi-schema.json comment
trivial: remove trailing newline from error_report
maint: avoid useless "if (foo) free(foo)" pattern
maint: avoid useless "if (foo) free(foo)" pattern
maint: remove unused include for strings.h
maint: remove unused include for signal.h
maint: remove unused include for dirent.h
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target-microblaze')
| -rw-r--r-- | target-microblaze/op_helper.c | 1 | ||||
| -rw-r--r-- | target-microblaze/translate.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/target-microblaze/op_helper.c b/target-microblaze/op_helper.c index d2b3624512..092c4b594d 100644 --- a/target-microblaze/op_helper.c +++ b/target-microblaze/op_helper.c @@ -18,7 +18,6 @@ * License along with this library; if not, see <http://www.gnu.org/licenses/>. */ -#include <assert.h> #include "cpu.h" #include "exec/helper-proto.h" #include "qemu/host-utils.h" diff --git a/target-microblaze/translate.c b/target-microblaze/translate.c index d4d9a8aab8..c33b16c1b5 100644 --- a/target-microblaze/translate.c +++ b/target-microblaze/translate.c @@ -1012,7 +1012,7 @@ static void dec_load(DisasContext *dc) tcg_temp_free(v); if (ex) { /* lwx */ - /* no support for for AXI exclusive so always clear C */ + /* no support for AXI exclusive so always clear C */ write_carryi(dc, 0); } |