From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 17 Nov 2020 11:07:00 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2020-11-16' into staging
X-Git-Tag: qemu-xen-4.16.0-rc4~482
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=48aa8f0ac536db3550a35c295ff7de94e4c33739;p=qemu-xen.git

Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2020-11-16' into staging

nbd patches for 2020-11-16

- silence Coverity false positive
- modernize iotests python code related to nbd

# gpg: Signature made Mon 16 Nov 2020 20:58:13 GMT
# gpg:                using RSA key 71C2CC22B1C4602927D2F3AAA7A16B4A2527436A
# gpg: Good signature from "Eric Blake <eblake@redhat.com>" [full]
# gpg:                 aka "Eric Blake (Free Software Programmer) <ebb9@byu.net>" [full]
# gpg:                 aka "[jpeg image of size 6874]" [full]
# Primary key fingerprint: 71C2 CC22 B1C4 6029 27D2  F3AA A7A1 6B4A 2527 436A

* remotes/ericb/tags/pull-nbd-2020-11-16:
  iotests: Replace deprecated ConfigParser.readfp()
  nbd: Silence Coverity false positive

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

48aa8f0ac536db3550a35c295ff7de94e4c33739