From: Yi Min Zhao <zyimin@linux.vnet.ibm.com>
Date: Mon, 13 Jun 2016 11:28:38 +0000 (+0800)
Subject: s390x/pci: write fid in CLP_QUERY_PCI_FN
X-Git-Tag: v2.7.0-rc0~46^2~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=67aad508decdbbce59faa27072daae0d1d31b1ad;p=thirdparty%2Fqemu.git

s390x/pci: write fid in CLP_QUERY_PCI_FN

We forgot to write the fid; fix that.

Signed-off-by: Yi Min Zhao <zyimin@linux.vnet.ibm.com>
Acked-by: Pierre Morel <pmorel@linux.vnet.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
---

diff --git a/hw/s390x/s390-pci-inst.c b/hw/s390x/s390-pci-inst.c
index 479375f65d5..2cd7d1486a1 100644
--- a/hw/s390x/s390-pci-inst.c
+++ b/hw/s390x/s390-pci-inst.c
@@ -256,6 +256,7 @@ int clp_service_call(S390CPU *cpu, uint8_t r2)
 
         stq_p(&resquery->sdma, ZPCI_SDMA_ADDR);
         stq_p(&resquery->edma, ZPCI_EDMA_ADDR);
+        stl_p(&resquery->fid, pbdev->fid);
         stw_p(&resquery->pchid, 0);
         stw_p(&resquery->ug, 1);
         stl_p(&resquery->uid, pbdev->fid);