diff options
| author | Cao jin | 2016-01-02 09:02:20 +0100 |
|---|---|---|
| committer | Michael S. Tsirkin | 2016-01-08 15:01:37 +0100 |
| commit | 349a3b1cc9023f67f8fa336cb3c4a8f21a4aaaf3 (patch) | |
| tree | e84d49b85d5cc2071367b5bd4f29ccfd867fe080 | |
| parent | nvdimm: fix header pointer in nvdimm_build_nfit() (diff) | |
| download | qemu-349a3b1cc9023f67f8fa336cb3c4a8f21a4aaaf3.tar.gz qemu-349a3b1cc9023f67f8fa336cb3c4a8f21a4aaaf3.tar.xz qemu-349a3b1cc9023f67f8fa336cb3c4a8f21a4aaaf3.zip | |
igd-passthrough: fix use of host_pci_config_read
Fix the bug introduced by 595a4f07: function host_pci_config_read() should be
pass-by-reference, not value.
This probably means this function never worked for anyone.
Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
| -rw-r--r-- | hw/pci-host/piix.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c index 715208b22a..924f0fa82b 100644 --- a/hw/pci-host/piix.c +++ b/hw/pci-host/piix.c @@ -761,7 +761,7 @@ static const IGDHostInfo igd_host_bridge_infos[] = { {0xa8, 4}, /* SNB: base of GTT stolen memory */ }; -static int host_pci_config_read(int pos, int len, uint32_t val) +static int host_pci_config_read(int pos, int len, uint32_t *val) { char path[PATH_MAX]; int config_fd; @@ -784,12 +784,14 @@ static int host_pci_config_read(int pos, int len, uint32_t val) ret = -errno; goto out; } + do { - rc = read(config_fd, (uint8_t *)&val, len); + rc = read(config_fd, (uint8_t *)val, len); } while (rc < 0 && (errno == EINTR || errno == EAGAIN)); if (rc != len) { ret = -errno; } + out: close(config_fd); return ret; @@ -805,7 +807,7 @@ static int igd_pt_i440fx_initfn(struct PCIDevice *pci_dev) for (i = 0; i < num; i++) { pos = igd_host_bridge_infos[i].offset; len = igd_host_bridge_infos[i].len; - rc = host_pci_config_read(pos, len, val); + rc = host_pci_config_read(pos, len, &val); if (rc) { return -ENODEV; } |