[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 02/59] igd-passthrough: fix use of host_pci_config
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL v2 02/59] igd-passthrough: fix use of host_pci_config_read |
Date: |
Sat, 9 Jan 2016 23:39:19 +0200 |
From: Cao jin <address@hidden>
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 <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/pci-host/piix.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c
index 715208b..924f0fa 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;
}
--
MST
- [Qemu-devel] [PULL v2 00/59] acpi dsdt rework, misc fixes, Michael S. Tsirkin, 2016/01/09
- [Qemu-devel] [PULL v2 01/59] nvdimm: fix header pointer in nvdimm_build_nfit(), Michael S. Tsirkin, 2016/01/09
- [Qemu-devel] [PULL v2 02/59] igd-passthrough: fix use of host_pci_config_read,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL v2 03/59] hw/i386: fill in the CENTURY field of the FADT (FACP) ACPI table, Michael S. Tsirkin, 2016/01/09
- [Qemu-devel] [PULL v2 04/59] tests: acpi: print ASL diff in verbose mode, Michael S. Tsirkin, 2016/01/09
- [Qemu-devel] [PULL v2 05/59] pc: acpi: memhp: prepare context in SSDT for moving memhp DSDT code, Michael S. Tsirkin, 2016/01/09
- [Qemu-devel] [PULL v2 06/59] pc: acpi: memhp: move MHPD._STA method into SSDT, Michael S. Tsirkin, 2016/01/09
- [Qemu-devel] [PULL v2 07/59] pc: acpi: memhp: move MHPD.MLCK mutex into SSDT, Michael S. Tsirkin, 2016/01/09
- [Qemu-devel] [PULL v2 09/59] pc: acpi: memhp: move MHPD.MRST method into SSDT, Michael S. Tsirkin, 2016/01/09
- [Qemu-devel] [PULL v2 08/59] pc: acpi: memhp: move MHPD.MSCN method into SSDT, Michael S. Tsirkin, 2016/01/09
- [Qemu-devel] [PULL v2 10/59] pc: acpi: memhp: move MHPD.MPXM method into SSDT, Michael S. Tsirkin, 2016/01/09
- [Qemu-devel] [PULL v2 12/59] pc: acpi: memhp: move MHPD.MEJ0 method into SSDT, Michael S. Tsirkin, 2016/01/09
- [Qemu-devel] [PULL v2 11/59] pc: acpi: memhp: move MHPD.MOST method into SSDT, Michael S. Tsirkin, 2016/01/09