From: Daniel P. Berrangé <berrange@redhat.com>
Date: Fri, 17 Jan 2020 11:17:49 +0000 (+0000)
Subject: src: conditionalize use of S_ISSOCK macro
X-Git-Tag: v6.1.0-rc1~332
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ec271bada5f87eccf49a01a1121a0066c77a91d;p=thirdparty%2Flibvirt.git

src: conditionalize use of S_ISSOCK macro

The S_ISSOCK macro is not available on Windows platforms.

Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c
index 4074397b30..ceda85c243 100644
--- a/src/libvirt-domain.c
+++ b/src/libvirt-domain.c
@@ -10584,12 +10584,14 @@ virDomainOpenGraphics(virDomainPtr dom,
         goto error;
     }
 
+#ifndef WIN32
     if (!S_ISSOCK(sb.st_mode)) {
         virReportInvalidArg(fd,
                             _("fd %d must be a socket"),
                             fd);
         goto error;
     }
+#endif /* !WIN32 */
 
     virCheckReadOnlyGoto(dom->conn->flags, error);
 
diff --git a/src/security/security_manager.c b/src/security/security_manager.c
index f229d94570..fe9def7fb9 100644
--- a/src/security/security_manager.c
+++ b/src/security/security_manager.c
@@ -1340,11 +1340,13 @@ virSecurityManagerMetadataLock(virSecurityManagerPtr mgr G_GNUC_UNUSED,
         }
 
         if ((fd = open(p, O_RDWR)) < 0) {
+#ifndef WIN32
             if (S_ISSOCK(sb.st_mode)) {
                 /* Sockets can be opened only if there exists the
                  * other side that listens. */
                 continue;
             }
+#endif /* !WIN32 */
 
             virReportSystemError(errno,
                                  _("unable to open %s"),