From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52219) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aDspG-0004jZ-LX for qemu-devel@nongnu.org; Tue, 29 Dec 2015 06:52:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aDspD-0000Ev-Cs for qemu-devel@nongnu.org; Tue, 29 Dec 2015 06:52:26 -0500 Received: from [59.151.112.132] (port=31692 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aDspD-0000En-0j for qemu-devel@nongnu.org; Tue, 29 Dec 2015 06:52:23 -0500 References: <1451277767-9325-1-git-send-email-caoj.fnst@cn.fujitsu.com> From: Cao jin Message-ID: <5682747E.8080301@cn.fujitsu.com> Date: Tue, 29 Dec 2015 19:54:38 +0800 MIME-Version: 1.0 In-Reply-To: <1451277767-9325-1-git-send-email-caoj.fnst@cn.fujitsu.com> Content-Type: text/plain; charset="windows-1252"; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v2] bugfix: passing reference instead of value List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: tiejun.chen@intel.com, stefano.stabellini@eu.citrix.com, mst@redhat.com CC the code author: Tiejun Chen On 12/28/2015 12:42 PM, Cao jin wrote: > Fix the bug introduced by 595a4f07: Function host_pci_config_read() should be > passed by a reference, not a value, for the later pci_default_write_config(). > And because value in PCI config space are little-endian, use cpu_to_le32() to > ensure it when write config. > > Signed-off-by: Cao jin > --- > Separated from previous "igd-passthru convert to realize" patch. Since these > two don`t have dependency, can send it solely. > > Not test since it is easy to find out if reading carefully, just compiled. > > hw/pci-host/piix.c | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) > > diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c > index 715208b..a9cb983 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,11 +807,11 @@ 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; > } > - pci_default_write_config(pci_dev, pos, val, len); > + pci_default_write_config(pci_dev, pos, cpu_to_le32(val), len); > } > > return 0; > -- Yours Sincerely, Cao Jin