[qemu-xen master] Merge remote-tracking branch 'remotes/elmarco/tags/slirp-pull-request' into staging

[patchbot@xxxxxxx]

commit b1753831b0e58587db4fdf8219237331269c00c3
Merge: 3461487523b897d324e8d91f3fd20ed55f849544 
9c15f57891af7c2cb3baf2d66a1b1f3f87a665ba
Author:     Peter Maydell <peter.maydell@xxxxxxxxxx>
AuthorDate: Tue Jul 28 19:44:03 2020 +0100
Commit:     Peter Maydell <peter.maydell@xxxxxxxxxx>
CommitDate: Tue Jul 28 19:44:03 2020 +0100

    Merge remote-tracking branch 'remotes/elmarco/tags/slirp-pull-request' into 
staging
    
    slirp: update to latest stable-4.2 branch
    
    # gpg: Signature made Tue 28 Jul 2020 15:30:09 BST
    # gpg:                using RSA key 87A9BD933F87C606D276F62DDAE8E10975969CE5
    # gpg:                issuer "marcandre.lureau@xxxxxxxxxx"
    # gpg: Good signature from "Marc-André Lureau 
<marcandre.lureau@xxxxxxxxxx>" [full]
    # gpg:                 aka "Marc-André Lureau 
<marcandre.lureau@xxxxxxxxx>" [full]
    # Primary key fingerprint: 87A9 BD93 3F87 C606 D276  F62D DAE8 E109 7596 
9CE5
    
    * remotes/elmarco/tags/slirp-pull-request:
      slirp: update to latest stable-4.2 branch
      test-char: abort on serial test error
    
    Signed-off-by: Peter Maydell <peter.maydell@xxxxxxxxxx>

 slirp             | 2 +-
 tests/test-char.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#master