From: Peter Maydell <peter.maydell@linaro.org>
Date: Tue, 24 Nov 2020 21:08:29 +0000 (+0000)
Subject: Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-for-5.2-pull-request... 
X-Git-Tag: nvme-fixes-for-6.0-pull-request~233
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1a6ab01d3f109154093c11b4bc9a1ca915e6668e;p=qemu-nvme.git

Merge remote-tracking branch 'remotes/ehabkost/tags/machine-next-for-5.2-pull-request' into staging

PCI host devaddr property fix for 5.2

# gpg: Signature made Tue 24 Nov 2020 15:13:52 GMT
# gpg:                using RSA key 5A322FD5ABC4D3DBACCFD1AA2807936F984DC5A6
# gpg:                issuer "ehabkost@redhat.com"
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>" [full]
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF  D1AA 2807 936F 984D C5A6

* remotes/ehabkost/tags/machine-next-for-5.2-pull-request:
  Revert "hw/core/qdev-properties: Use qemu_strtoul() in set_pci_host_devaddr()"

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

1a6ab01d3f109154093c11b4bc9a1ca915e6668e