summaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorPeter Maydell2017-07-13 17:15:52 +0200
committerPeter Maydell2017-07-13 17:15:52 +0200
commitaa5a704756fe933d0c87c02657e4406866d36c1d (patch)
treeba9e59449c4e0b11b5832bcf3c48ba69fa669b9b /target
parentMerge remote-tracking branch 'remotes/maxreitz/tags/pull-block-2017-07-11' in... (diff)
parentinclude/hw/ptimer.h: Add documentation comments (diff)
downloadqemu-aa5a704756fe933d0c87c02657e4406866d36c1d.tar.gz
qemu-aa5a704756fe933d0c87c02657e4406866d36c1d.tar.xz
qemu-aa5a704756fe933d0c87c02657e4406866d36c1d.zip
Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-fetch' into staging
trivial patches for 2017-07-12 # gpg: Signature made Wed 12 Jul 2017 14:58:43 BST # gpg: using RSA key 0x701B4F6B1A693E59 # gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>" # gpg: aka "Michael Tokarev <mjt@corpit.ru>" # gpg: aka "Michael Tokarev <mjt@debian.org>" # Primary key fingerprint: 6EE1 95D1 886E 8FFB 810D 4324 457C E0A0 8044 65C5 # Subkey fingerprint: 7B73 BAD6 8BE7 A2C2 8931 4B22 701B 4F6B 1A69 3E59 * remotes/mjt/tags/trivial-patches-fetch: include/hw/ptimer.h: Add documentation comments hxtool: remove dead -q option qga-win32: Fix memory leak of device information set hw/core: fix missing return value in load_image_targphys_as() elf-loader: warn about invalid endianness configure: Handle having no c++ compiler in FORTIFY_SOURCE check hw/pci: define msi_nonbroken in pci-stub hw/misc: add missing includes configure: Fix build with pkg-config and --static --enable-sdl util/qemu-sockets: Drop unused helper socket_address_to_string() target/xtensa: gdbstub: drop dead return statement Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target')
-rw-r--r--target/xtensa/gdbstub.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/target/xtensa/gdbstub.c b/target/xtensa/gdbstub.c
index da131ae8cc..d78a1b437d 100644
--- a/target/xtensa/gdbstub.c
+++ b/target/xtensa/gdbstub.c
@@ -72,7 +72,6 @@ int xtensa_cpu_gdb_read_register(CPUState *cs, uint8_t *mem_buf, int n)
__func__, n, reg->type);
memset(mem_buf, 0, reg->size);
return reg->size;
- return 0;
}
}