Avoid symbol clash with win32 headers and node device APIs

diff --git a/ChangeLog b/ChangeLog
index e2f115ec3c424d8ceb447e9f88f3df96308ff6cd..581be1b39ab0cf37598c30366e5cc223cf36268d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Nov 25 10:36:40 GMT 2008 Daniel P. Berrange <berrange@redhat.com>
+
+       * src/node_device_conf.c, src/node_device_conf.h,
+       src/node_device_devkit.c, src/node_device_hal.c: Change
+       'interface' to 'ifname' in struct to avoid clash with
+       symbols in MinGW/Win32 headers
+
 Tue Nov 25 11:29:19 +0100 2008 Jim Meyering <meyering@redhat.com>
 
        * src/virterror.c (virReportErrorHelper): Sync doc to code.
@@ -6,20 +13,20 @@ Tue Nov 25 11:29:19 +0100 2008 Jim Meyering <meyering@redhat.com>
        * src/libvirt.c (virStateActive, virStateCleanup, virStateReload):
        (virStateActive): Add per-function comments.
 
-Mon Nov 24 19:32:40 GMT 2008 Dnaiel P. Berrange <berrange@redhat.com>
+Mon Nov 24 19:32:40 GMT 2008 Daniel P. Berrange <berrange@redhat.com>
 
        * src/openvz_conf.c, src/openvz_conf.h, src/openvz_driver.c:
        Default vCPUs to equal host pCPU count if not set in config
        (patch from Evgeniy Sokolov)
 
-Mon Nov 24 19:27:40 GMT 2008 Dnaiel P. Berrange <berrange@redhat.com>
+Mon Nov 24 19:27:40 GMT 2008 Daniel P. Berrange <berrange@redhat.com>
 
        * examples/domain-events/events-python/event-test.py,
        python/libvir.c, python/libvir.py, python/libvirt_wrap.h,
        python/types.c, python/virConnect.py: Fixes to python
        bindings for changes in public event API (David Lively)
 
-Mon Nov 24 19:22:40 GMT 2008 Dnaiel P. Berrange <berrange@redhat.com>
+Mon Nov 24 19:22:40 GMT 2008 Daniel P. Berrange <berrange@redhat.com>
 
        * tests/Makefile.am, tests/sexpr2xmltest.c,
        tests/testutilsxen.c, tests/xencapstest.c,
@@ -28,7 +35,7 @@ Mon Nov 24 19:22:40 GMT 2008 Dnaiel P. Berrange <berrange@redhat.com>
        WITH_XEN conditionals from source, since the entire build
        is disabled in Makefile.am
 
-Mon Nov 24 16:49:40 GMT 2008 Dnaiel P. Berrange <berrange@redhat.com>
+Mon Nov 24 16:49:40 GMT 2008 Daniel P. Berrange <berrange@redhat.com>
 
        * autobuild.sh: Disable UML driver on mingw32 biuld
 

diff --git a/src/node_device_conf.c b/src/node_device_conf.c
index 6e0c19fdb9e55dea70e06532ffa7d9d7f8e010e6..96ef388d379d32e2e5dce36d688901b55f7dfdb8 100644 (file)
--- a/src/node_device_conf.c
+++ b/src/node_device_conf.c
@@ -269,7 +269,7 @@ char *virNodeDeviceDefFormat(virConnectPtr conn,
             break;
         case VIR_NODE_DEV_CAP_NET:
             virBufferVSprintf(&buf, "    <interface>%s</interface>\n",
-                              data->net.interface);
+                              data->net.ifname);
             if (data->net.address)
                 virBufferVSprintf(&buf, "    <address>%s</address>\n",
                                   data->net.address);
@@ -374,7 +374,7 @@ void virNodeDevCapsDefFree(virNodeDevCapsDefPtr caps)
         VIR_FREE(data->usb_if.description);
         break;
     case VIR_NODE_DEV_CAP_NET:
-        VIR_FREE(data->net.interface);
+        VIR_FREE(data->net.ifname);
         VIR_FREE(data->net.address);
         break;
     case VIR_NODE_DEV_CAP_SCSI_HOST:

diff --git a/src/node_device_conf.h b/src/node_device_conf.h
index a2cd844c0c21ce483b10644595e9abcb0973f2d8..ad3c8935b557224418c9708b5629f4deaae15962 100644 (file)
--- a/src/node_device_conf.h
+++ b/src/node_device_conf.h
@@ -102,7 +102,7 @@ struct _virNodeDevCapsDef {
         } usb_if;
         struct {
             char *address;
-            char *interface;
+            char *ifname;
             enum virNodeDevNetCapType subtype;  /* LAST -> no subtype */
         } net;
         struct {

diff --git a/src/node_device_devkit.c b/src/node_device_devkit.c
index 846df8c7209cc4acf5518224437d6e54029f1b3a..a31902d219b083584660ee72c80e002bdfc9e093 100644 (file)
--- a/src/node_device_devkit.c
+++ b/src/node_device_devkit.c
@@ -118,14 +118,14 @@ static int gather_net_cap(DevkitDevice *dkdev,
                           union _virNodeDevCapData *d)
 {
     const char *sysfs_path = devkit_device_get_native_path(dkdev);
-    const char *interface;
+    const char *ifname;
 
     if (sysfs_path == NULL)
         return -1;
-    interface = strrchr(sysfs_path, '/');
-    if (!interface || !*interface || !*(++interface))
+    ifname = strrchr(sysfs_path, '/');
+    if (!ifname || !*ifname || !*(++ifname))
         return -1;
-    if ((d->net.interface = strdup(interface)) == NULL)
+    if ((d->net.ifname = strdup(ifname)) == NULL)
         return -1;
 
     d->net.subtype = VIR_NODE_DEV_CAP_NET_LAST;

diff --git a/src/node_device_hal.c b/src/node_device_hal.c
index 6bca284b361c4225e187239268cea6009c645f8d..4d7d3c715799d1181c840a2cc33ac21fd72876c8 100644 (file)
--- a/src/node_device_hal.c
+++ b/src/node_device_hal.c
@@ -196,7 +196,7 @@ static int gather_net_cap(LibHalContext *ctx, const char *udi,
                           union _virNodeDevCapData *d)
 {
     unsigned long long dummy;
-    (void)get_str_prop(ctx, udi, "net.interface", &d->net.interface);
+    (void)get_str_prop(ctx, udi, "net.interface", &d->net.ifname);
     (void)get_str_prop(ctx, udi, "net.address", &d->net.address);
     if (get_uint64_prop(ctx, udi, "net.80203.mac_address",
                         &dummy) == 0)