diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-06-12 14:14:42 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-06-12 14:14:42 +0100 |
| commit | 2a8469aaabdc86c369bf4aeb77f87de7361f464b (patch) | |
| tree | d8ed3bc0abeb328d50bd303c6617f5a800ea8385 /scripts | |
| parent | 475df9d809b1f3a7ebe8b15abd208216591f0143 (diff) | |
| parent | 11cde1c81093a33c46c7a4039bf750bb61551087 (diff) | |
| download | qemu-2a8469aaabdc86c369bf4aeb77f87de7361f464b.zip qemu-2a8469aaabdc86c369bf4aeb77f87de7361f464b.tar.gz qemu-2a8469aaabdc86c369bf4aeb77f87de7361f464b.tar.bz2 | |
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
# gpg: Signature made Wed 07 Jun 2017 19:06:51 BST
# gpg: using RSA key 0x9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>"
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8
* remotes/stefanha/tags/block-pull-request:
configure: split c and cxx extra flags
coroutine-lock: do not touch coroutine after another one has been entered
.gdbinit: load QEMU sub-commands when gdb starts
coccinelle: fix typo in comment
oslib: strip trailing '\n' from error_setg() string argument
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/coccinelle/return_directly.cocci | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/coccinelle/return_directly.cocci b/scripts/coccinelle/return_directly.cocci index 48680f2..4cf50e7 100644 --- a/scripts/coccinelle/return_directly.cocci +++ b/scripts/coccinelle/return_directly.cocci @@ -1,4 +1,4 @@ -// replace 'R = X; return R;' with 'return R;' +// replace 'R = X; return R;' with 'return X;' @@ identifier VAR; expression E; |