From patchwork Thu Sep 10 10:29:18 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Stabellini X-Patchwork-Id: 516228 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 7214F14010F for ; Thu, 10 Sep 2015 20:31:38 +1000 (AEST) Received: from localhost ([::1]:48329 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZZz8i-00081G-2V for incoming@patchwork.ozlabs.org; Thu, 10 Sep 2015 06:31:36 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34240) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZZz8S-0007js-Eo for qemu-devel@nongnu.org; Thu, 10 Sep 2015 06:31:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZZz8P-00038A-8y for qemu-devel@nongnu.org; Thu, 10 Sep 2015 06:31:20 -0400 Received: from smtp.citrix.com ([66.165.176.89]:60702) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZZz8P-00037w-5E for qemu-devel@nongnu.org; Thu, 10 Sep 2015 06:31:17 -0400 X-IronPort-AV: E=Sophos;i="5.17,504,1437436800"; d="scan'208";a="299123830" Date: Thu, 10 Sep 2015 11:29:18 +0100 From: Stefano Stabellini X-X-Sender: sstabellini@kaball.uk.xensource.com To: Stefano Stabellini In-Reply-To: Message-ID: References: <55F0DB30.6070607@intel.com> <55F14E20.6070805@intel.com> User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 X-DLP: MIA2 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 66.165.176.89 Cc: "Chen, Tiejun" , "xen-devel@lists.xensource.com Devel" , mst@redhat.com, QEMU Developers , Peter Maydell Subject: Re: [Qemu-devel] [PULL 0/19] xen-2015-09-08-tag X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org CC Michael On Thu, 10 Sep 2015, Stefano Stabellini wrote: > On Thu, 10 Sep 2015, Chen, Tiejun wrote: > > > xen-host-pci-device.c is only compiled if CONFIG_XEN_PCI_PASSTHROUGH > > > was set by configure. That won't be the case on OSX or Windows, where > > > the Xen headers don't exist. > > > > > > > Okay. This actually shouldn't be enabled on Windows so what about this? > > I think it would be nicer to replace the pread than introducing ifdefs. Something like: Reviewed-by: Michael S. Tsirkin --- Replace pread with read to avoid build breakages on Windows Signed-off-by: Stefano Stabellini diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c index 58a33fb..9a40429 100644 --- a/hw/pci-host/piix.c +++ b/hw/pci-host/piix.c @@ -774,8 +774,11 @@ static int host_pci_config_read(int pos, int len, uint32_t val) return -ENODEV; } + if (lseek(config_fd, pos, SEEK_SET) != pos) { + return -errno; + } do { - rc = pread(config_fd, (uint8_t *)&val, len, pos); + rc = read(config_fd, (uint8_t *)&val, len); } while (rc < 0 && (errno == EINTR || errno == EAGAIN)); if (rc != len) { return -errno;