From 3aed67283601b6942551a25881b9663e64a9d5e8 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Tue, 3 Mar 2009 17:00:18 +0000 Subject: [PATCH] Use lseek+saferead/write for pci.c & dont link to qemu driver for nodedevxml2xmltest --- ChangeLog | 8 ++++++++ src/pci.c | 6 ++++-- tests/Makefile.am | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index da7f5b6f95..c2bc0ec9e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Tue Mar 3 16:55:13 GMT 2009 Daniel P. Berrange + + Mingw32 portability fixes + * src/pci.c: Use lseek+read/write instead of pread/pwrite + to avoid mingw compile break + * test/nodedevxml2xmltest.c: Don't link to QEMU driver, since + its not required and breaks build when QEMU is turned off + Tue Mar 3 16:43:13 GMT 2009 Daniel P. Berrange Explicitly track static declared vs dynamically generated diff --git a/src/pci.c b/src/pci.c index b9c781b46d..b197b8efe2 100644 --- a/src/pci.c +++ b/src/pci.c @@ -156,7 +156,8 @@ pciRead(pciDevice *dev, unsigned pos, uint8_t *buf, unsigned buflen) if (pciOpenConfig(dev) < 0) return -1; - if (pread(dev->fd, buf, buflen, pos) < 0) { + if (lseek(dev->fd, pos, SEEK_SET) != pos || + saferead(dev->fd, buf, buflen) != buflen) { char ebuf[1024]; VIR_WARN(_("Failed to read from '%s' : %s"), dev->path, virStrerror(errno, ebuf, sizeof(ebuf))); @@ -195,7 +196,8 @@ pciWrite(pciDevice *dev, unsigned pos, uint8_t *buf, unsigned buflen) if (pciOpenConfig(dev) < 0) return -1; - if (pwrite(dev->fd, buf, buflen, pos) < 0) { + if (lseek(dev->fd, pos, SEEK_SET) != pos || + safewrite(dev->fd, buf, buflen) != buflen) { char ebuf[1024]; VIR_WARN(_("Failed to write to '%s' : %s"), dev->path, virStrerror(errno, ebuf, sizeof(ebuf))); diff --git a/tests/Makefile.am b/tests/Makefile.am index 11ffe76369..8b4bd0c771 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -185,7 +185,7 @@ endif nodedevxml2xmltest_SOURCES = \ nodedevxml2xmltest.c \ testutils.c testutils.h -nodedevxml2xmltest_LDADD = ../src/libvirt_driver_qemu.la $(LDADDS) +nodedevxml2xmltest_LDADD = $(LDADDS) virshtest_SOURCES = \ virshtest.c \ -- GitLab