From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59383) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aBf9l-0002dV-Hb for qemu-devel@nongnu.org; Wed, 23 Dec 2015 03:52:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aBf9h-0000Sp-GF for qemu-devel@nongnu.org; Wed, 23 Dec 2015 03:52:25 -0500 Received: from [59.151.112.132] (port=55449 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aBf9g-0000Pp-Qz for qemu-devel@nongnu.org; Wed, 23 Dec 2015 03:52:21 -0500 References: <1450695600-24635-1-git-send-email-caoj.fnst@cn.fujitsu.com> From: Cao jin Message-ID: <567A6008.9040403@cn.fujitsu.com> Date: Wed, 23 Dec 2015 16:49:12 +0800 MIME-Version: 1.0 In-Reply-To: <1450695600-24635-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 1/2] igd-passthrough-i440FX: convert to realize() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: mst@redhat.com Cc: armbru@redhat.com, qemu-devel@nongnu.org, ehabkost@redhat.com Hi mst, Ping Or do I need to cc this to qemu-trivial? On 12/21/2015 07:00 PM, Cao jin wrote: > Signed-off-by: Cao jin > --- > hw/pci-host/piix.c | 32 +++++++++++++++++--------------- > 1 file changed, 17 insertions(+), 15 deletions(-) > > diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c > index 715208b..bc0fc59 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 void host_pci_config_read(int pos, int len, uint32_t val, Error **errp) > { > char path[PATH_MAX]; > int config_fd; > @@ -769,50 +769,52 @@ static int host_pci_config_read(int pos, int len, uint32_t val) > /* Access real host bridge. */ > int rc = snprintf(path, size, "/sys/bus/pci/devices/%04x:%02x:%02x.%d/%s", > 0, 0, 0, 0, "config"); > - int ret = 0; > > if (rc >= size || rc < 0) { > - return -ENODEV; > + error_setg_errno(errp, errno, "snprintf err"); > + return; > } > > config_fd = open(path, O_RDWR); > if (config_fd < 0) { > - return -ENODEV; > + error_setg_errno(errp, errno, "open err"); > + return; > } > > if (lseek(config_fd, pos, SEEK_SET) != pos) { > - ret = -errno; > + error_setg_errno(errp, errno, "lseek err"); > goto out; > } > + > do { > rc = read(config_fd, (uint8_t *)&val, len); > } while (rc < 0 && (errno == EINTR || errno == EAGAIN)); > if (rc != len) { > - ret = -errno; > + error_setg_errno(errp, errno, "read err"); > } > + > out: > close(config_fd); > - return ret; > } > > -static int igd_pt_i440fx_initfn(struct PCIDevice *pci_dev) > +static void igd_pt_i440fx_realize(struct PCIDevice *pci_dev, Error **errp) > { > uint32_t val = 0; > - int rc, i, num; > + int i, num; > int pos, len; > + Error *local_err = NULL; > > num = ARRAY_SIZE(igd_host_bridge_infos); > 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); > - if (rc) { > - return -ENODEV; > + host_pci_config_read(pos, len, val, &local_err); > + if (local_err) { > + error_propagate(errp, local_err); > + return; > } > pci_default_write_config(pci_dev, pos, val, len); > } > - > - return 0; > } > > static void igd_passthrough_i440fx_class_init(ObjectClass *klass, void *data) > @@ -820,7 +822,7 @@ static void igd_passthrough_i440fx_class_init(ObjectClass *klass, void *data) > DeviceClass *dc = DEVICE_CLASS(klass); > PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); > > - k->init = igd_pt_i440fx_initfn; > + k->realize = igd_pt_i440fx_realize; > dc->desc = "IGD Passthrough Host bridge"; > } > > -- Yours Sincerely, Cao Jin