openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Cao jin 2016-01-02 16:02:20 +08:00 committed by Michael S. Tsirkin
parent c8e6c93857
commit 349a3b1cc9
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/pci-host/piix.c
View File

@ -761,7 +761,7 @@ static const IGDHostInfo igd_host_bridge_infos[] = {
{0xa8, 4}, /* SNB: base of GTT stolen memory */ {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]; char path[PATH_MAX];
int config_fd; int config_fd;
@ -784,12 +784,14 @@ static int host_pci_config_read(int pos, int len, uint32_t val)
ret = -errno; ret = -errno;
goto out; goto out;
} }
do { do {
rc = read(config_fd, (uint8_t *)&val, len); rc = read(config_fd, (uint8_t *)val, len);
} while (rc < 0 && (errno == EINTR || errno == EAGAIN)); } while (rc < 0 && (errno == EINTR || errno == EAGAIN));
if (rc != len) { if (rc != len) {
ret = -errno; ret = -errno;
} }
out: out:
close(config_fd); close(config_fd);
return ret; return ret;
@ -805,7 +807,7 @@ static int igd_pt_i440fx_initfn(struct PCIDevice *pci_dev)
for (i = 0; i < num; i++) { for (i = 0; i < num; i++) {
pos = igd_host_bridge_infos[i].offset; pos = igd_host_bridge_infos[i].offset;
len = igd_host_bridge_infos[i].len; 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) { if (rc) {
return -ENODEV; return -ENODEV;
} }