Use lseek+saferead/write for pci.c & dont link to qemu driver for nodedevxml2xmltest

diff --git a/ChangeLog b/ChangeLog
index da7f5b6f95fa90ef4582f23b68cf18fca31c03ed..c2bc0ec9e954728922eadd2c6a85a502aeb47480 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Tue Mar  3 16:55:13 GMT 2009 Daniel P. Berrange <berrange@redhat.com>
+
+       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 <berrange@redhat.com>
 
        Explicitly track static declared vs dynamically generated

diff --git a/src/pci.c b/src/pci.c
index b9c781b46de3244f1e118f4a67be6ee4c76146e1..b197b8efe2501def436c52ea0b2a8d8100bcd714 100644 (file)
--- 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 11ffe76369dbffccc39aa3bb0f2a956775081b39..8b4bd0c771b1454fa6e5960b5ca0bd34a4753226 100644 (file)
--- 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 \