diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-02-12 10:53:37 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-02-12 10:53:37 +0000 |
| commit | 0b5e750bea635b167eb03d86c3d9a09bbd43bc06 (patch) | |
| tree | 4b786242c9cbba6c1aca588b08b20a1abfba3dc8 /scripts | |
| parent | d85e60e993808d69287dd5e3734642421e23ec45 (diff) | |
| parent | 9a6719d572e99a4e79f589d0b73f7475b86f982d (diff) | |
| download | qemu-0b5e750bea635b167eb03d86c3d9a09bbd43bc06.zip qemu-0b5e750bea635b167eb03d86c3d9a09bbd43bc06.tar.gz qemu-0b5e750bea635b167eb03d86c3d9a09bbd43bc06.tar.bz2 | |
Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging
Pull request
# gpg: Signature made Tue 12 Feb 2019 03:58:58 GMT
# gpg: using RSA key 9CA4ABB381AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>" [full]
# gpg: aka "Stefan Hajnoczi <stefanha@gmail.com>" [full]
# Primary key fingerprint: 8695 A8BF D3F9 7CDA AC35 775A 9CA4 ABB3 81AB 73C8
* remotes/stefanha/tags/block-pull-request:
virtio-blk: cleanup using VirtIOBlock *s and VirtIODevice *vdev
qemugdb/coroutine: fix arch_prctl has unknown return type
iothread: fix iothread hang when stop too soon
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/qemugdb/coroutine.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/qemugdb/coroutine.py b/scripts/qemugdb/coroutine.py index ab69979..81f811a 100644 --- a/scripts/qemugdb/coroutine.py +++ b/scripts/qemugdb/coroutine.py @@ -22,7 +22,7 @@ def get_fs_base(): pthread_self().''' # %rsp - 120 is scratch space according to the SystemV ABI old = gdb.parse_and_eval('*(uint64_t*)($rsp - 120)') - gdb.execute('call arch_prctl(0x1003, $rsp - 120)', False, True) + gdb.execute('call (int)arch_prctl(0x1003, $rsp - 120)', False, True) fs_base = gdb.parse_and_eval('*(uint64_t*)($rsp - 120)') gdb.execute('set *(uint64_t*)($rsp - 120) = %s' % old, False, True) return fs_base |