Skip to content

Commit

Permalink
igd-passthrough: fix use of host_pci_config_read
Browse files Browse the repository at this point in the history
Fix the bug introduced by 595a4f0: 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>
  • Loading branch information
Cao jin authored and mstsirkin committed Jan 8, 2016
1 parent c8e6c93 commit 349a3b1
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions hw/pci-host/piix.c
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
}
Expand Down

0 comments on commit 349a3b1

Please sign in to comment.