From mboxrd@z Thu Jan  1 00:00:00 1970
From: "Michael S. Tsirkin" <mst@redhat.com>
Subject: [PULL 07/25] pci: Add pci_dev_bus_num() helper
Date: Thu, 21 Dec 2017 16:28:38 +0200
Message-ID: <1513866427-27125-8-git-send-email-mst@redhat.com>
References: <1513866427-27125-1-git-send-email-mst@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: base64
Return-path: <xen-devel-bounces@lists.xenproject.org>
Received: from all-amaz-eas1.inumbo.com ([34.197.232.57])
 by lists.xenproject.org with esmtp (Exim 4.84_2)
 (envelope-from <srs0=ojdq=dr=redhat.com=mst@srs-us1.protection.inumbo.net>)
 id 1eS1qC-0000Cj-Fm
 for xen-devel@lists.xenproject.org; Thu, 21 Dec 2017 14:28:56 +0000
Content-Disposition: inline
In-Reply-To: <1513866427-27125-1-git-send-email-mst@redhat.com>
List-Unsubscribe: <https://lists.xenproject.org/mailman/options/xen-devel>,
 <mailto:xen-devel-request@lists.xenproject.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xenproject.org>
List-Help: <mailto:xen-devel-request@lists.xenproject.org?subject=help>
List-Subscribe: <https://lists.xenproject.org/mailman/listinfo/xen-devel>,
 <mailto:xen-devel-request@lists.xenproject.org?subject=subscribe>
Errors-To: xen-devel-bounces@lists.xenproject.org
Sender: "Xen-devel" <xen-devel-bounces@lists.xenproject.org>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>, Hannes Reinecke <hare@suse.com>, Stefano Stabellini <sstabellini@kernel.org>, xen-devel@lists.xenproject.org, qemu-block@nongnu.org, Cornelia Huck <cohuck@redhat.com>, Alexander Graf <agraf@suse.de>, Peter Xu <peterx@redhat.com>, Christian Borntraeger <borntraeger@de.ibm.com>, qemu-s390x@nongnu.org, Anthony Perard <anthony.perard@citrix.com>, Marcel Apfelbaum <marcel@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, Richard Henderson <rth@twiddle.net>, David Gibson <david@gibson.dropbear.id.au>
List-Id: xen-devel@lists.xenproject.org

RnJvbTogRGF2aWQgR2lic29uIDxkYXZpZEBnaWJzb24uZHJvcGJlYXIuaWQuYXU+CgpBIGZhaXIg
cHJvcG9ydGlvbiBvZiB0aGUgdXNlcnMgb2YgcGNpX2J1c19udW0oKSB3YW50IHRvIGdldCB0aGUg
YnVzCm51bWJlciBvbiBhIHNwZWNpZmljIGRldmljZSwgc28gZmlyc3QgaGF2ZSB0byBsb29rIHVw
IHRoZSBidXMgZnJvbSB0aGUKZGV2aWNlIHRoZW4gY2FsbCBpdC4gIFRoaXMgYWRkcyBhIGhlbHBl
ciB0byBkbyB0aGF0IChzaW5jZSB3ZSdyZSBnb2luZwp0byBtYWtlIGxvb2tpbmcgdXAgdGhlIGJ1
cyBzbGlnaHRseSBtb3JlIHZlcmJvc2UpLgoKU2lnbmVkLW9mZi1ieTogRGF2aWQgR2lic29uIDxk
YXZpZEBnaWJzb24uZHJvcGJlYXIuaWQuYXU+ClJldmlld2VkLWJ5OiBNaWNoYWVsIFMuIFRzaXJr
aW4gPG1zdEByZWRoYXQuY29tPgpTaWduZWQtb2ZmLWJ5OiBNaWNoYWVsIFMuIFRzaXJraW4gPG1z
dEByZWRoYXQuY29tPgpSZXZpZXdlZC1ieTogTWFyY2VsIEFwZmVsYmF1bSA8bWFyY2VsQHJlZGhh
dC5jb20+ClJldmlld2VkLWJ5OiBQZXRlciBYdSA8cGV0ZXJ4QHJlZGhhdC5jb20+Ci0tLQogaW5j
bHVkZS9ody9wY2kvcGNpLmggICAgICAgIHwgNSArKysrKwogaW5jbHVkZS9ody94ZW4veGVuX2Nv
bW1vbi5oIHwgOCArKysrLS0tLQogaHcvcGNpL3BjaWVfYWVyLmMgICAgICAgICAgIHwgMiArLQog
aHcvczM5MHgvczM5MC1wY2ktYnVzLmMgICAgIHwgMiArLQogaHcvc2NzaS9tZWdhc2FzLmMgICAg
ICAgICAgIHwgMiArLQogaHcvc2NzaS9tcHRzYXMuYyAgICAgICAgICAgIHwgMiArLQogaHcveGVu
L3hlbl9wdC5jICAgICAgICAgICAgIHwgNiArKystLS0KIDcgZmlsZXMgY2hhbmdlZCwgMTYgaW5z
ZXJ0aW9ucygrKSwgMTEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvaW5jbHVkZS9ody9wY2kv
cGNpLmggYi9pbmNsdWRlL2h3L3BjaS9wY2kuaAppbmRleCA4NzBlYmNmLi5lNDUxMjM1IDEwMDY0
NAotLS0gYS9pbmNsdWRlL2h3L3BjaS9wY2kuaAorKysgYi9pbmNsdWRlL2h3L3BjaS9wY2kuaApA
QCAtNDM2LDYgKzQzNiwxMSBAQCBQQ0lEZXZpY2UgKnBjaV9uaWNfaW5pdF9ub2ZhaWwoTklDSW5m
byAqbmQsIFBDSUJ1cyAqcm9vdGJ1cywKIFBDSURldmljZSAqcGNpX3ZnYV9pbml0KFBDSUJ1cyAq
YnVzKTsKIAogaW50IHBjaV9idXNfbnVtKFBDSUJ1cyAqcyk7CitzdGF0aWMgaW5saW5lIGludCBw
Y2lfZGV2X2J1c19udW0oY29uc3QgUENJRGV2aWNlICpkZXYpCit7CisgICAgcmV0dXJuIHBjaV9i
dXNfbnVtKGRldi0+YnVzKTsKK30KKwogaW50IHBjaV9idXNfbnVtYV9ub2RlKFBDSUJ1cyAqYnVz
KTsKIHZvaWQgcGNpX2Zvcl9lYWNoX2RldmljZShQQ0lCdXMgKmJ1cywgaW50IGJ1c19udW0sCiAg
ICAgICAgICAgICAgICAgICAgICAgICAgdm9pZCAoKmZuKShQQ0lCdXMgKmJ1cywgUENJRGV2aWNl
ICpkLCB2b2lkICpvcGFxdWUpLApkaWZmIC0tZ2l0IGEvaW5jbHVkZS9ody94ZW4veGVuX2NvbW1v
bi5oIGIvaW5jbHVkZS9ody94ZW4veGVuX2NvbW1vbi5oCmluZGV4IDg2YzdmMjYuLjY0YTk3OGUg
MTAwNjQ0Ci0tLSBhL2luY2x1ZGUvaHcveGVuL3hlbl9jb21tb24uaAorKysgYi9pbmNsdWRlL2h3
L3hlbi94ZW5fY29tbW9uLmgKQEAgLTU0MiwxMCArNTQyLDEwIEBAIHN0YXRpYyBpbmxpbmUgdm9p
ZCB4ZW5fbWFwX3BjaWRldihkb21pZF90IGRvbSwKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAot
ICAgIHRyYWNlX3hlbl9tYXBfcGNpZGV2KGlvc2VydmlkLCBwY2lfYnVzX251bShwY2lfZGV2LT5i
dXMpLAorICAgIHRyYWNlX3hlbl9tYXBfcGNpZGV2KGlvc2VydmlkLCBwY2lfZGV2X2J1c19udW0o
cGNpX2RldiksCiAgICAgICAgICAgICAgICAgICAgICAgICAgUENJX1NMT1QocGNpX2Rldi0+ZGV2
Zm4pLCBQQ0lfRlVOQyhwY2lfZGV2LT5kZXZmbikpOwogICAgIHhlbmRldmljZW1vZGVsX21hcF9w
Y2lkZXZfdG9faW9yZXFfc2VydmVyKHhlbl9kbW9kLCBkb20sIGlvc2VydmlkLCAwLAotICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBjaV9idXNfbnVtKHBjaV9k
ZXYtPmJ1cyksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
cGNpX2Rldl9idXNfbnVtKHBjaV9kZXYpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgIFBDSV9TTE9UKHBjaV9kZXYtPmRldmZuKSwKICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBQQ0lfRlVOQyhwY2lfZGV2LT5kZXZmbikp
OwogfQpAQCAtNTU4LDEwICs1NTgsMTAgQEAgc3RhdGljIGlubGluZSB2b2lkIHhlbl91bm1hcF9w
Y2lkZXYoZG9taWRfdCBkb20sCiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICB0cmFjZV94
ZW5fdW5tYXBfcGNpZGV2KGlvc2VydmlkLCBwY2lfYnVzX251bShwY2lfZGV2LT5idXMpLAorICAg
IHRyYWNlX3hlbl91bm1hcF9wY2lkZXYoaW9zZXJ2aWQsIHBjaV9kZXZfYnVzX251bShwY2lfZGV2
KSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgIFBDSV9TTE9UKHBjaV9kZXYtPmRldmZuKSwg
UENJX0ZVTkMocGNpX2Rldi0+ZGV2Zm4pKTsKICAgICB4ZW5kZXZpY2Vtb2RlbF91bm1hcF9wY2lk
ZXZfZnJvbV9pb3JlcV9zZXJ2ZXIoeGVuX2Rtb2QsIGRvbSwgaW9zZXJ2aWQsIDAsCi0gICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBjaV9idXNfbnVtKHBj
aV9kZXYtPmJ1cyksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgIHBjaV9kZXZfYnVzX251bShwY2lfZGV2KSwKICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgUENJX1NMT1QocGNpX2Rldi0+ZGV2Zm4pLAogICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBQQ0lfRlVOQyhw
Y2lfZGV2LT5kZXZmbikpOwogfQpkaWZmIC0tZ2l0IGEvaHcvcGNpL3BjaWVfYWVyLmMgYi9ody9w
Y2kvcGNpZV9hZXIuYwppbmRleCA5NzIwMDc0Li4yMWY4OTZhIDEwMDY0NAotLS0gYS9ody9wY2kv
cGNpZV9hZXIuYworKysgYi9ody9wY2kvcGNpZV9hZXIuYwpAQCAtMTAyNSw3ICsxMDI1LDcgQEAg
c3RhdGljIGludCBkb19wY2llX2Flcl9pbmplY3RfZXJyb3IoTW9uaXRvciAqbW9uLAogICAgIH0K
ICAgICBkZXRhaWxzLT5pZCA9IGlkOwogICAgIGRldGFpbHMtPnJvb3RfYnVzID0gcGNpX3Jvb3Rf
YnVzX3BhdGgoZGV2KTsKLSAgICBkZXRhaWxzLT5idXMgPSBwY2lfYnVzX251bShkZXYtPmJ1cyk7
CisgICAgZGV0YWlscy0+YnVzID0gcGNpX2Rldl9idXNfbnVtKGRldik7CiAgICAgZGV0YWlscy0+
ZGV2Zm4gPSBkZXYtPmRldmZuOwogCiAgICAgcmV0dXJuIDA7CmRpZmYgLS1naXQgYS9ody9zMzkw
eC9zMzkwLXBjaS1idXMuYyBiL2h3L3MzOTB4L3MzOTAtcGNpLWJ1cy5jCmluZGV4IDM0NzMyOWQu
LmY2NGFkNTkgMTAwNjQ0Ci0tLSBhL2h3L3MzOTB4L3MzOTAtcGNpLWJ1cy5jCisrKyBiL2h3L3Mz
OTB4L3MzOTAtcGNpLWJ1cy5jCkBAIC02OTIsNyArNjkyLDcgQEAgc3RhdGljIHZvaWQgczM5MF9w
Y2lob3N0X2hvdF9wbHVnKEhvdHBsdWdIYW5kbGVyICpob3RwbHVnX2RldiwKICAgICAgICAgICAg
IC8qIEluIHRoZSBjYXNlIHRoZSBQQ0kgZGV2aWNlIGRvZXMgbm90IGRlZmluZSBhbiBpZCAqLwog
ICAgICAgICAgICAgLyogd2UgZ2VuZXJhdGUgb25lIGJhc2VkIG9uIHRoZSBQQ0kgYWRkcmVzcyAg
ICAgICAgICovCiAgICAgICAgICAgICBkZXYtPmlkID0gZ19zdHJkdXBfcHJpbnRmKCJhdXRvXyUw
Mng6JTAyeC4lMDF4IiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcGNp
X2J1c19udW0ocGRldi0+YnVzKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgcGNpX2Rldl9idXNfbnVtKHBkZXYpLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICBQQ0lfU0xPVChwZGV2LT5kZXZmbiksCiAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgICAgIFBDSV9GVU5DKHBkZXYtPmRldmZuKSk7CiAgICAgICAgIH0KZGlmZiAtLWdp
dCBhL2h3L3Njc2kvbWVnYXNhcy5jIGIvaHcvc2NzaS9tZWdhc2FzLmMKaW5kZXggZDVlYWU2Mi4u
M2UzOGU5ZSAxMDA2NDQKLS0tIGEvaHcvc2NzaS9tZWdhc2FzLmMKKysrIGIvaHcvc2NzaS9tZWdh
c2FzLmMKQEAgLTIzNzIsNyArMjM3Miw3IEBAIHN0YXRpYyB2b2lkIG1lZ2FzYXNfc2NzaV9yZWFs
aXplKFBDSURldmljZSAqZGV2LCBFcnJvciAqKmVycnApCiAgICAgaWYgKCFzLT5zYXNfYWRkcikg
ewogICAgICAgICBzLT5zYXNfYWRkciA9ICgoTkFBX0xPQ0FMTFlfQVNTSUdORURfSUQgPDwgMjQp
IHwKICAgICAgICAgICAgICAgICAgICAgICAgSUVFRV9DT01QQU5ZX0xPQ0FMTFlfQVNTSUdORUQp
IDw8IDM2OwotICAgICAgICBzLT5zYXNfYWRkciB8PSAocGNpX2J1c19udW0oZGV2LT5idXMpIDw8
IDE2KTsKKyAgICAgICAgcy0+c2FzX2FkZHIgfD0gKHBjaV9kZXZfYnVzX251bShkZXYpIDw8IDE2
KTsKICAgICAgICAgcy0+c2FzX2FkZHIgfD0gKFBDSV9TTE9UKGRldi0+ZGV2Zm4pIDw8IDgpOwog
ICAgICAgICBzLT5zYXNfYWRkciB8PSBQQ0lfRlVOQyhkZXYtPmRldmZuKTsKICAgICB9CmRpZmYg
LS1naXQgYS9ody9zY3NpL21wdHNhcy5jIGIvaHcvc2NzaS9tcHRzYXMuYwppbmRleCBmNmRiMWIw
Li4zZjA2MWYzIDEwMDY0NAotLS0gYS9ody9zY3NpL21wdHNhcy5jCisrKyBiL2h3L3Njc2kvbXB0
c2FzLmMKQEAgLTEzMTIsNyArMTMxMiw3IEBAIHN0YXRpYyB2b2lkIG1wdHNhc19zY3NpX3JlYWxp
emUoUENJRGV2aWNlICpkZXYsIEVycm9yICoqZXJycCkKICAgICBpZiAoIXMtPnNhc19hZGRyKSB7
CiAgICAgICAgIHMtPnNhc19hZGRyID0gKChOQUFfTE9DQUxMWV9BU1NJR05FRF9JRCA8PCAyNCkg
fAogICAgICAgICAgICAgICAgICAgICAgICBJRUVFX0NPTVBBTllfTE9DQUxMWV9BU1NJR05FRCkg
PDwgMzY7Ci0gICAgICAgIHMtPnNhc19hZGRyIHw9IChwY2lfYnVzX251bShkZXYtPmJ1cykgPDwg
MTYpOworICAgICAgICBzLT5zYXNfYWRkciB8PSAocGNpX2Rldl9idXNfbnVtKGRldikgPDwgMTYp
OwogICAgICAgICBzLT5zYXNfYWRkciB8PSAoUENJX1NMT1QoZGV2LT5kZXZmbikgPDwgOCk7CiAg
ICAgICAgIHMtPnNhc19hZGRyIHw9IFBDSV9GVU5DKGRldi0+ZGV2Zm4pOwogICAgIH0KZGlmZiAt
LWdpdCBhL2h3L3hlbi94ZW5fcHQuYyBiL2h3L3hlbi94ZW5fcHQuYwppbmRleCA5YmJhNzE3Li42
MjM2ZjBjIDEwMDY0NAotLS0gYS9ody94ZW4veGVuX3B0LmMKKysrIGIvaHcveGVuL3hlbl9wdC5j
CkBAIC03Myw3ICs3Myw3IEBAIHZvaWQgeGVuX3B0X2xvZyhjb25zdCBQQ0lEZXZpY2UgKmQsIGNv
bnN0IGNoYXIgKmYsIC4uLikKIAogICAgIHZhX3N0YXJ0KGFwLCBmKTsKICAgICBpZiAoZCkgewot
ICAgICAgICBmcHJpbnRmKHN0ZGVyciwgIlslMDJ4OiUwMnguJWRdICIsIHBjaV9idXNfbnVtKGQt
PmJ1cyksCisgICAgICAgIGZwcmludGYoc3RkZXJyLCAiWyUwMng6JTAyeC4lZF0gIiwgcGNpX2Rl
dl9idXNfbnVtKGQpLAogICAgICAgICAgICAgICAgIFBDSV9TTE9UKGQtPmRldmZuKSwgUENJX0ZV
TkMoZC0+ZGV2Zm4pKTsKICAgICB9CiAgICAgdmZwcmludGYoc3RkZXJyLCBmLCBhcCk7CkBAIC03
MTEsNyArNzExLDcgQEAgc3RhdGljIHZvaWQgeGVuX3B0X2Rlc3Ryb3koUENJRGV2aWNlICpkKSB7
CiAgICAgICAgIGludHggPSB4ZW5fcHRfcGNpX2ludHgocyk7CiAgICAgICAgIHJjID0geGNfZG9t
YWluX3VuYmluZF9wdF9pcnEoeGVuX3hjLCB4ZW5fZG9taWQsIG1hY2hpbmVfaXJxLAogICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFBUX0lSUV9UWVBFX1BDSSwKLSAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwY2lfYnVzX251bShkLT5idXMpLAorICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBjaV9kZXZfYnVzX251bShkKSwKICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBQQ0lfU0xPVChzLT5kZXYuZGV2Zm4pLAog
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGludHgsCiAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgMCAvKiBpc2FfaXJxICovKTsKQEAgLTg2Nyw3ICs4Njcs
NyBAQCBzdGF0aWMgdm9pZCB4ZW5fcHRfcmVhbGl6ZShQQ0lEZXZpY2UgKmQsIEVycm9yICoqZXJy
cCkKICAgICAgICAgdWludDhfdCBlX2ludHggPSB4ZW5fcHRfcGNpX2ludHgocyk7CiAKICAgICAg
ICAgcmMgPSB4Y19kb21haW5fYmluZF9wdF9wY2lfaXJxKHhlbl94YywgeGVuX2RvbWlkLCBtYWNo
aW5lX2lycSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBjaV9idXNf
bnVtKGQtPmJ1cyksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwY2lf
ZGV2X2J1c19udW0oZCksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBQ
Q0lfU0xPVChkLT5kZXZmbiksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICBlX2ludHgpOwogICAgICAgICBpZiAocmMgPCAwKSB7Ci0tIApNU1QKCgpfX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0
Clhlbi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9yZwpodHRwczovL2xpc3RzLnhlbnByb2plY3Qu
b3JnL21haWxtYW4vbGlzdGluZm8veGVuLWRldmVs