diff --git a/src/conf/virdomainobjlist.c b/src/conf/virdomainobjlist.c
index 0bd833257da8de8e5ab174859b2c75bc83d85db9..bb5807d00b426ea4fab1b1adf995275f07e444ba 100644
--- a/src/conf/virdomainobjlist.c
+++ b/src/conf/virdomainobjlist.c
@@ -497,8 +497,7 @@ virDomainObjListLoadConfig(virDomainObjList *doms,
     if ((autostartLink = virDomainConfigFile(autostartDir, name)) == NULL)
         return NULL;
 
-    if ((autostart = virFileLinkPointsTo(autostartLink, configFile)) < 0)
-        return NULL;
+    autostart = virFileLinkPointsTo(autostartLink, configFile);
 
     if (!(dom = virDomainObjListAddLocked(doms, &def, xmlopt, 0, &oldDef)))
         return NULL;
diff --git a/src/conf/virnetworkobj.c b/src/conf/virnetworkobj.c
index 20ee8eb58abc0d7c08f767ec754763583ecc0aa0..d5aa121e201d194635f07290ad130112af51ddee 100644
--- a/src/conf/virnetworkobj.c
+++ b/src/conf/virnetworkobj.c
@@ -945,8 +945,7 @@ virNetworkLoadConfig(virNetworkObjList *nets,
     if ((autostartLink = virNetworkConfigFile(autostartDir, name)) == NULL)
         return NULL;
 
-    if ((autostart = virFileLinkPointsTo(autostartLink, configFile)) < 0)
-        return NULL;
+    autostart = virFileLinkPointsTo(autostartLink, configFile);
 
     if (!(def = virNetworkDefParse(NULL, configFile, xmlopt, false)))
         return NULL;
diff --git a/src/util/virfile.c b/src/util/virfile.c
index 007b6cf51293234eb9f2da7d02cc1247cdfce855..f3108e99cf6bbd459a5416cda605a3ff93b541ba 100644
--- a/src/util/virfile.c
+++ b/src/util/virfile.c
@@ -1697,7 +1697,7 @@ virFileWriteStr(const char *path, const char *str, mode_t mode)
 /* Return nonzero if checkLink and checkDest
  * refer to the same file.  Otherwise, return 0.
  */
-int
+bool
 virFileLinkPointsTo(const char *checkLink,
                     const char *checkDest)
 {
diff --git a/src/util/virfile.h b/src/util/virfile.h
index 286401e0f58a5a6c3791f0f04d27240cce71279f..56fe309bce68a86f7bc9d8793f3b7ea08ab423fa 100644
--- a/src/util/virfile.h
+++ b/src/util/virfile.h
@@ -176,8 +176,8 @@ int virFileReadBufQuiet(const char *file, char *buf, int len)
 int virFileWriteStr(const char *path, const char *str, mode_t mode)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) G_GNUC_WARN_UNUSED_RESULT;
 
-int virFileLinkPointsTo(const char *checkLink,
-                        const char *checkDest)
+bool virFileLinkPointsTo(const char *checkLink,
+                         const char *checkDest)
     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
 int virFileRelLinkPointsTo(const char *directory,
                            const char *checkLink,
diff --git a/tests/cputest.c b/tests/cputest.c
index b3253e31166d813f69f23563bcf8e63c92cac5fd..93cd0e12a794f693deefd535d69145513d5a68a5 100644
--- a/tests/cputest.c
+++ b/tests/cputest.c
@@ -993,10 +993,6 @@ mymain(void)
 #if WITH_QEMU
 # define DO_TEST_JSON(arch, host, json) \
     do { \
-        if (json == JSON_MODELS) { \
-            DO_TEST(arch, cpuTestGuestCPUID, host, host, \
-                    NULL, NULL, 0, NULL, 0, 0); \
-        } \
         if (json != JSON_NONE) { \
             DO_TEST(arch, cpuTestJSONCPUID, host, host, \
                     NULL, NULL, 0, NULL, json, 0); \