VOL FEATURE

26 files changed, 364 insertions, 202 deletions

diff --git a/tools/src/h5format_convert/CMakeLists.txt b/tools/src/h5format_convert/CMakeLists.txt
index 62f269b..79a1316 100644
--- a/tools/src/h5format_convert/CMakeLists.txt
+++ b/tools/src/h5format_convert/CMakeLists.txt
@@ -34,4 +34,4 @@ if (HDF5_EXPORTED_TARGETS)
           ${HDF5_EXPORTED_TARGETS}
       RUNTIME DESTINATION ${HDF5_INSTALL_BIN_DIR} COMPONENT toolsapplications
   )
-endif ()
\ No newline at end of file
+endif ()
diff --git a/tools/src/h5jam/h5jam.c b/tools/src/h5jam/h5jam.c
index 4f3e7a4..8222e06 100644
--- a/tools/src/h5jam/h5jam.c
+++ b/tools/src/h5jam/h5jam.c
@@ -230,7 +230,7 @@ main (int argc, const char *argv[])
         leave (EXIT_FAILURE);
     }
 
-    testval = H5Fis_hdf5 (ub_file);
+    testval = H5Fis_accessible(ub_file, H5P_DEFAULT);
 
     if (testval > 0) {
         error_msg("-u <user_file> cannot be HDF5 file, but it appears to be an HDF5 file.\n");
@@ -244,7 +244,7 @@ main (int argc, const char *argv[])
         leave (EXIT_FAILURE);
     }
 
-    testval = H5Fis_hdf5 (input_file);
+    testval = H5Fis_accessible(input_file, H5P_DEFAULT);
 
     if (testval <= 0) {
         error_msg("Input HDF5 file \"%s\" is not HDF5 format.\n", input_file);
diff --git a/tools/src/h5jam/h5unjam.c b/tools/src/h5jam/h5unjam.c
index ffe2aca..aa893f9 100644
--- a/tools/src/h5jam/h5unjam.c
+++ b/tools/src/h5jam/h5unjam.c
@@ -229,7 +229,7 @@ main(int argc, const char *argv[])
         goto done;
     }
 
-    testval = H5Fis_hdf5(input_file);
+    testval = H5Fis_accessible(input_file, H5P_DEFAULT);
 
     if (testval <= 0) {
         error_msg("Input HDF5 file \"%s\" is not HDF\n", input_file);
diff --git a/tools/src/h5stat/h5stat.c b/tools/src/h5stat/h5stat.c
index dc1dc4a..8109b93 100644
--- a/tools/src/h5stat/h5stat.c
+++ b/tools/src/h5stat/h5stat.c
@@ -74,7 +74,7 @@ typedef struct iter_t {
     ohdr_info_t group_ohdr_info;        /* Object header information for groups */
 
     hsize_t  max_attrs;                 /* Maximum attributes from a group */
-    unsigned long *num_small_attrs;        /* Size of small attributes tracked */
+    unsigned long *num_small_attrs;    	/* Size of small attributes tracked */
     unsigned attr_nbins;                /* Number of bins for attribute counts */
     unsigned long *attr_bins;           /* Pointer to array of bins for attribute counts */
 
@@ -257,7 +257,7 @@ leave(int ret)
 }
 
 
-
+
 /*-------------------------------------------------------------------------
  * Function: usage
  *
@@ -297,7 +297,7 @@ static void usage(const char *prog)
      HDfprintf(stdout, "     --enable-error-stack  Prints messages from the HDF5 error stack as they occur\n");
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function: ceil_log10
  *
@@ -324,7 +324,7 @@ ceil_log10(unsigned long x)
     return ret;
 } /* ceil_log10() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function: attribute_stats
  *
@@ -374,7 +374,7 @@ attribute_stats(iter_t *iter, const H5O_info_t *oi)
      return 0;
 } /* end attribute_stats() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function: group_stats
  *
@@ -456,7 +456,7 @@ done:
     return ret_value;
 } /* end group_stats() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function: dataset_stats
  *
@@ -648,7 +648,7 @@ done:
      return ret_value;
 }  /* end dataset_stats() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function: datatype_stats
  *
@@ -680,7 +680,7 @@ done:
      return ret_value;
 }  /* end datatype_stats() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function: obj_stats
  *
@@ -736,7 +736,7 @@ done:
     return ret_value;
 } /* end obj_stats() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function: lnk_stats
  *
@@ -834,7 +834,7 @@ freespace_stats(hid_t fid, iter_t *iter)
     return 0;
 } /* end freespace_stats() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function: hand_free
  *
@@ -863,7 +863,7 @@ hand_free(struct handler_t *hand)
     } /* end if */
 } /* end hand_free() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function: parse_command_line
  *
@@ -1041,7 +1041,7 @@ error:
     return -1;
 }
 
-
+
 /*-------------------------------------------------------------------------
  * Function: iter_free
  *
@@ -1106,7 +1106,7 @@ iter_free(iter_t *iter)
     } /* end if */
 } /* end iter_free() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function: print_file_info
  *
@@ -1138,7 +1138,7 @@ print_file_info(const iter_t *iter)
     return 0;
 } /* print_file_info() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function: print_file_metadata
  *
@@ -1198,7 +1198,7 @@ print_file_metadata(const iter_t *iter)
     return 0;
 } /* print_file_metadata() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function: print_group_info
  *
@@ -1255,7 +1255,7 @@ print_group_info(const iter_t *iter)
     return 0;
 } /* print_group_info() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function: print_group_metadata
  *
@@ -1282,7 +1282,7 @@ print_group_metadata(const iter_t *iter)
     return 0;
 } /* print_group_metadata() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function: print_dataset_info
  *
@@ -1369,7 +1369,7 @@ print_dataset_info(const iter_t *iter)
     return 0;
 } /* print_dataset_info() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function: print_dataset_metadata
  *
@@ -1398,7 +1398,7 @@ print_dset_metadata(const iter_t *iter)
     return 0;
 } /* print_dset_metadata() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function: print_dset_dtype_meta
  *
@@ -1439,7 +1439,7 @@ print_dset_dtype_meta(const iter_t *iter)
     return 0;
 } /* print_dset_dtype_meta() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function: print_attr_info
  *
@@ -1488,7 +1488,7 @@ print_attr_info(const iter_t *iter)
     return 0;
 } /* print_attr_info() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function: print_freespace_info
  *
@@ -1538,7 +1538,7 @@ print_freespace_info(const iter_t *iter)
     return 0;
 } /* print_freespace_info() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function: print_storage_summary
  *
@@ -1602,7 +1602,7 @@ print_storage_summary(const iter_t *iter)
     return 0;
 } /* print_storage_summary() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function: print_file_statistics
  *
@@ -1649,7 +1649,7 @@ print_file_statistics(const iter_t *iter)
     if(display_summary)         print_storage_summary(iter);
 } /* print_file_statistics() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function: print_object_statistics
  *
@@ -1672,7 +1672,7 @@ print_object_statistics(const char *name)
     printf("Object name %s\n", name);
 } /* print_object_statistics() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function: print_statistics
  *
@@ -1698,7 +1698,7 @@ print_statistics(const char *name, const iter_t *iter)
         print_file_statistics(iter);
 } /* print_statistics() */
 
-
+
 /*-------------------------------------------------------------------------
  * Function: main
  *
@@ -1780,15 +1780,15 @@ main(int argc, const char *argv[])
             iter.free_hdr = finfo.free.meta_size;
         } /* end else */
 
-    iter.num_small_groups = (unsigned long *)HDcalloc((size_t)sgroups_threshold, sizeof(unsigned long));
-    iter.num_small_attrs = (unsigned long *)HDcalloc((size_t)(sattrs_threshold+1), sizeof(unsigned long));
-    iter.small_dset_dims = (unsigned long *)HDcalloc((size_t)sdsets_threshold, sizeof(unsigned long));
+        iter.num_small_groups = (unsigned long *)HDcalloc((size_t)sgroups_threshold, sizeof(unsigned long));
+        iter.num_small_attrs = (unsigned long *)HDcalloc((size_t)(sattrs_threshold+1), sizeof(unsigned long));
+        iter.small_dset_dims = (unsigned long *)HDcalloc((size_t)sdsets_threshold, sizeof(unsigned long));
 
-    if(iter.num_small_groups == NULL || iter.num_small_attrs == NULL || iter.small_dset_dims == NULL) {
-        error_msg("Unable to allocate memory for tracking small groups/datasets/attributes\n");
-            h5tools_setstatus(EXIT_FAILURE);
-        goto done;
-    }
+        if(iter.num_small_groups == NULL || iter.num_small_attrs == NULL || iter.small_dset_dims == NULL) {
+            error_msg("Unable to allocate memory for tracking small groups/datasets/attributes\n");
+                h5tools_setstatus(EXIT_FAILURE);
+            goto done;
+        }
 
         if((fcpl = H5Fget_create_plist(fid)) < 0)
             warn_msg("Unable to retrieve file creation property\n");
diff --git a/tools/test/h5dump/errfiles/filter_fail.err b/tools/test/h5dump/errfiles/filter_fail.err
index a785ea7..6c936b7 100644
--- a/tools/test/h5dump/errfiles/filter_fail.err
+++ b/tools/test/h5dump/errfiles/filter_fail.err
@@ -2,19 +2,25 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Dread(): can't read data
     major: Dataset
     minor: Read failed
-  #001: (file name) line (number) in H5D__read(): can't read data
+  #001: (file name) line (number) in H5VL_dataset_read(): read failed
+    major: Virtual Object Layer
+    minor: Read failed
+  #002: (file name) line (number) in H5VL_native_dataset_read(): can't read data
+    major: Dataset
+    minor: Read failed
+  #003: (file name) line (number) in H5D__read(): can't read data
     major: Dataset
     minor: Read failed
-  #002: (file name) line (number) in H5D__chunk_read(): unable to read raw data chunk
+  #004: (file name) line (number) in H5D__chunk_read(): unable to read raw data chunk
     major: Low-level I/O
     minor: Read failed
-  #003: (file name) line (number) in H5D__chunk_lock(): data pipeline read failed
+  #005: (file name) line (number) in H5D__chunk_lock(): data pipeline read failed
     major: Dataset
     minor: Filter operation failed
-  #004: (file name) line (number) in H5Z_pipeline(): required filter 'filter_fail_test' is not registered
+  #006: (file name) line (number) in H5Z_pipeline(): required filter 'filter_fail_test' is not registered
     major: Data filters
     minor: Read failed
-  #005: (file name) line (number) in H5PL_load(): filter plugins disabled
+  #007: (file name) line (number) in H5PL_load(): filter plugins disabled
     major: Plugin for dynamically loaded library
     minor: Unable to load metadata into cache
 h5dump error: unable to print data
diff --git a/tools/test/h5dump/errfiles/tall-1.err b/tools/test/h5dump/errfiles/tall-1.err
index f4c2d91..64d5aca 100644
--- a/tools/test/h5dump/errfiles/tall-1.err
+++ b/tools/test/h5dump/errfiles/tall-1.err
@@ -2,27 +2,33 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Oopen(): unable to open object
     major: Object header
     minor: Can't open object
-  #001: (file name) line (number) in H5O_open_name(): object not found
+  #001: (file name) line (number) in H5VL_object_open(): open failed
+    major: Virtual Object Layer
+    minor: Can't open object
+  #002: (file name) line (number) in H5VL_native_object_open(): unable to open object by name
+    major: Object header
+    minor: Can't open object
+  #003: (file name) line (number) in H5O_open_name(): object not found
     major: Object header
     minor: Object not found
-  #002: (file name) line (number) in H5G_loc_find(): can't find object
+  #004: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #003: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #005: (file name) line (number) in H5G_traverse(): internal path traversal failed
     major: Symbol table
     minor: Object not found
-  #004: (file name) line (number) in H5G__traverse_real(): special link traversal failed
+  #006: (file name) line (number) in H5G__traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #005: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
+  #007: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
     major: Links
     minor: Link traversal failure
-  #006: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
+  #008: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
     major: Symbol table
     minor: Unable to find atom information (already closed?)
-  #007: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'somefile'
+  #009: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'somefile'
     major: Links
     minor: Unable to open file
-  #008: (file name) line (number) in H5F_prefix_open_file(): unable to open file, file name = 'somefile', temp_file_name = 'somefile'
-    major: File accessibilty
+  #010: (file name) line (number) in H5F_prefix_open_file(): unable to open file, file name = 'somefile', temp_file_name = 'somefile'
+    major: File accessibility
     minor: Unable to open file
diff --git a/tools/test/h5dump/errfiles/tall-2A.err b/tools/test/h5dump/errfiles/tall-2A.err
index f4c2d91..64d5aca 100644
--- a/tools/test/h5dump/errfiles/tall-2A.err
+++ b/tools/test/h5dump/errfiles/tall-2A.err
@@ -2,27 +2,33 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Oopen(): unable to open object
     major: Object header
     minor: Can't open object
-  #001: (file name) line (number) in H5O_open_name(): object not found
+  #001: (file name) line (number) in H5VL_object_open(): open failed
+    major: Virtual Object Layer
+    minor: Can't open object
+  #002: (file name) line (number) in H5VL_native_object_open(): unable to open object by name
+    major: Object header
+    minor: Can't open object
+  #003: (file name) line (number) in H5O_open_name(): object not found
     major: Object header
     minor: Object not found
-  #002: (file name) line (number) in H5G_loc_find(): can't find object
+  #004: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #003: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #005: (file name) line (number) in H5G_traverse(): internal path traversal failed
     major: Symbol table
     minor: Object not found
-  #004: (file name) line (number) in H5G__traverse_real(): special link traversal failed
+  #006: (file name) line (number) in H5G__traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #005: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
+  #007: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
     major: Links
     minor: Link traversal failure
-  #006: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
+  #008: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
     major: Symbol table
     minor: Unable to find atom information (already closed?)
-  #007: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'somefile'
+  #009: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'somefile'
     major: Links
     minor: Unable to open file
-  #008: (file name) line (number) in H5F_prefix_open_file(): unable to open file, file name = 'somefile', temp_file_name = 'somefile'
-    major: File accessibilty
+  #010: (file name) line (number) in H5F_prefix_open_file(): unable to open file, file name = 'somefile', temp_file_name = 'somefile'
+    major: File accessibility
     minor: Unable to open file
diff --git a/tools/test/h5dump/errfiles/tall-2A0.err b/tools/test/h5dump/errfiles/tall-2A0.err
index f4c2d91..64d5aca 100644
--- a/tools/test/h5dump/errfiles/tall-2A0.err
+++ b/tools/test/h5dump/errfiles/tall-2A0.err
@@ -2,27 +2,33 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Oopen(): unable to open object
     major: Object header
     minor: Can't open object
-  #001: (file name) line (number) in H5O_open_name(): object not found
+  #001: (file name) line (number) in H5VL_object_open(): open failed
+    major: Virtual Object Layer
+    minor: Can't open object
+  #002: (file name) line (number) in H5VL_native_object_open(): unable to open object by name
+    major: Object header
+    minor: Can't open object
+  #003: (file name) line (number) in H5O_open_name(): object not found
     major: Object header
     minor: Object not found
-  #002: (file name) line (number) in H5G_loc_find(): can't find object
+  #004: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #003: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #005: (file name) line (number) in H5G_traverse(): internal path traversal failed
     major: Symbol table
     minor: Object not found
-  #004: (file name) line (number) in H5G__traverse_real(): special link traversal failed
+  #006: (file name) line (number) in H5G__traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #005: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
+  #007: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
     major: Links
     minor: Link traversal failure
-  #006: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
+  #008: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
     major: Symbol table
     minor: Unable to find atom information (already closed?)
-  #007: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'somefile'
+  #009: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'somefile'
     major: Links
     minor: Unable to open file
-  #008: (file name) line (number) in H5F_prefix_open_file(): unable to open file, file name = 'somefile', temp_file_name = 'somefile'
-    major: File accessibilty
+  #010: (file name) line (number) in H5F_prefix_open_file(): unable to open file, file name = 'somefile', temp_file_name = 'somefile'
+    major: File accessibility
     minor: Unable to open file
diff --git a/tools/test/h5dump/errfiles/tall-2B.err b/tools/test/h5dump/errfiles/tall-2B.err
index f4c2d91..64d5aca 100644
--- a/tools/test/h5dump/errfiles/tall-2B.err
+++ b/tools/test/h5dump/errfiles/tall-2B.err
@@ -2,27 +2,33 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Oopen(): unable to open object
     major: Object header
     minor: Can't open object
-  #001: (file name) line (number) in H5O_open_name(): object not found
+  #001: (file name) line (number) in H5VL_object_open(): open failed
+    major: Virtual Object Layer
+    minor: Can't open object
+  #002: (file name) line (number) in H5VL_native_object_open(): unable to open object by name
+    major: Object header
+    minor: Can't open object
+  #003: (file name) line (number) in H5O_open_name(): object not found
     major: Object header
     minor: Object not found
-  #002: (file name) line (number) in H5G_loc_find(): can't find object
+  #004: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #003: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #005: (file name) line (number) in H5G_traverse(): internal path traversal failed
     major: Symbol table
     minor: Object not found
-  #004: (file name) line (number) in H5G__traverse_real(): special link traversal failed
+  #006: (file name) line (number) in H5G__traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #005: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
+  #007: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
     major: Links
     minor: Link traversal failure
-  #006: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
+  #008: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
     major: Symbol table
     minor: Unable to find atom information (already closed?)
-  #007: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'somefile'
+  #009: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'somefile'
     major: Links
     minor: Unable to open file
-  #008: (file name) line (number) in H5F_prefix_open_file(): unable to open file, file name = 'somefile', temp_file_name = 'somefile'
-    major: File accessibilty
+  #010: (file name) line (number) in H5F_prefix_open_file(): unable to open file, file name = 'somefile', temp_file_name = 'somefile'
+    major: File accessibility
     minor: Unable to open file
diff --git a/tools/test/h5dump/errfiles/tarray1_big.err b/tools/test/h5dump/errfiles/tarray1_big.err
index be77711..b2cc6b7 100644
--- a/tools/test/h5dump/errfiles/tarray1_big.err
+++ b/tools/test/h5dump/errfiles/tarray1_big.err
@@ -2,21 +2,39 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Rdereference2(): unable to dereference object
     major: References
     minor: Can't open object
-  #001: (file name) line (number) in H5R__dereference(): Undefined reference pointer
+  #001: (file name) line (number) in H5VL_object_open(): open failed
+    major: Virtual Object Layer
+    minor: Can't open object
+  #002: (file name) line (number) in H5VL_native_object_open(): unable to dereference object
+    major: References
+    minor: Can't open object
+  #003: (file name) line (number) in H5R__dereference(): Undefined reference pointer
     major: Invalid arguments to routine
     minor: Bad value
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Rdereference2(): unable to dereference object
     major: References
     minor: Can't open object
-  #001: (file name) line (number) in H5R__dereference(): Undefined reference pointer
+  #001: (file name) line (number) in H5VL_object_open(): open failed
+    major: Virtual Object Layer
+    minor: Can't open object
+  #002: (file name) line (number) in H5VL_native_object_open(): unable to dereference object
+    major: References
+    minor: Can't open object
+  #003: (file name) line (number) in H5R__dereference(): Undefined reference pointer
     major: Invalid arguments to routine
     minor: Bad value
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Rdereference2(): unable to dereference object
     major: References
     minor: Can't open object
-  #001: (file name) line (number) in H5R__dereference(): Undefined reference pointer
+  #001: (file name) line (number) in H5VL_object_open(): open failed
+    major: Virtual Object Layer
+    minor: Can't open object
+  #002: (file name) line (number) in H5VL_native_object_open(): unable to dereference object
+    major: References
+    minor: Can't open object
+  #003: (file name) line (number) in H5R__dereference(): Undefined reference pointer
     major: Invalid arguments to routine
     minor: Bad value
 H5tools-DIAG: Error detected in HDF5:tools (version (number)) thread (IDs):
diff --git a/tools/test/h5dump/errfiles/tattr-3.err b/tools/test/h5dump/errfiles/tattr-3.err
index a6aae76..3190c3d 100644
--- a/tools/test/h5dump/errfiles/tattr-3.err
+++ b/tools/test/h5dump/errfiles/tattr-3.err
@@ -2,10 +2,16 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Aopen(): unable to open attribute: 'attr'
     major: Attribute
     minor: Can't open object
-  #001: (file name) line (number) in H5A__open(): unable to load attribute info from object header for attribute: 'attr'
+  #001: (file name) line (number) in H5VL_attr_open(): attribute open failed
+    major: Virtual Object Layer
+    minor: Can't open object
+  #002: (file name) line (number) in H5VL_native_attr_open(): unable to open attribute: 'attr'
+    major: Attribute
+    minor: Can't open object
+  #003: (file name) line (number) in H5A__open(): unable to load attribute info from object header for attribute: 'attr'
     major: Attribute
     minor: Can't open object
-  #002: (file name) line (number) in H5O__attr_open_by_name(): can't locate attribute: 'attr'
+  #004: (file name) line (number) in H5O__attr_open_by_name(): can't locate attribute: 'attr'
     major: Attribute
     minor: Object not found
 h5dump error: unable to open attribute "attr"
diff --git a/tools/test/h5dump/errfiles/tattrregR.err b/tools/test/h5dump/errfiles/tattrregR.err
index d84d5ec..d89b053 100644
--- a/tools/test/h5dump/errfiles/tattrregR.err
+++ b/tools/test/h5dump/errfiles/tattrregR.err
@@ -2,14 +2,26 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Rdereference2(): unable to dereference object
     major: References
     minor: Can't open object
-  #001: (file name) line (number) in H5R__dereference(): Undefined reference pointer
+  #001: (file name) line (number) in H5VL_object_open(): open failed
+    major: Virtual Object Layer
+    minor: Can't open object
+  #002: (file name) line (number) in H5VL_native_object_open(): unable to dereference object
+    major: References
+    minor: Can't open object
+  #003: (file name) line (number) in H5R__dereference(): Undefined reference pointer
     major: Invalid arguments to routine
     minor: Bad value
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Rdereference2(): unable to dereference object
     major: References
     minor: Can't open object
-  #001: (file name) line (number) in H5R__dereference(): Undefined reference pointer
+  #001: (file name) line (number) in H5VL_object_open(): open failed
+    major: Virtual Object Layer
+    minor: Can't open object
+  #002: (file name) line (number) in H5VL_native_object_open(): unable to dereference object
+    major: References
+    minor: Can't open object
+  #003: (file name) line (number) in H5R__dereference(): Undefined reference pointer
     major: Invalid arguments to routine
     minor: Bad value
 H5tools-DIAG: Error detected in HDF5:tools (version (number)) thread (IDs):
diff --git a/tools/test/h5dump/errfiles/tcomp-3.err b/tools/test/h5dump/errfiles/tcomp-3.err
index e41e97a..3462761 100644
--- a/tools/test/h5dump/errfiles/tcomp-3.err
+++ b/tools/test/h5dump/errfiles/tcomp-3.err
@@ -2,18 +2,24 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Topen2(): unable to open named datatype
     major: Datatype
     minor: Can't open object
-  #001: (file name) line (number) in H5T__open_name(): not found
+  #001: (file name) line (number) in H5VL_datatype_open(): open failed
+    major: Virtual Object Layer
+    minor: Can't open object
+  #002: (file name) line (number) in H5VL_native_datatype_open(): unable to open named datatype
+    major: Datatype
+    minor: Can't open object
+  #003: (file name) line (number) in H5T__open_name(): not found
     major: Datatype
     minor: Object not found
-  #002: (file name) line (number) in H5G_loc_find(): can't find object
+  #004: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #003: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #005: (file name) line (number) in H5G_traverse(): internal path traversal failed
     major: Symbol table
     minor: Object not found
-  #004: (file name) line (number) in H5G__traverse_real(): traversal operator failed
+  #006: (file name) line (number) in H5G__traverse_real(): traversal operator failed
     major: Symbol table
     minor: Callback failed
-  #005: (file name) line (number) in H5G__loc_find_cb(): object '#6632' doesn't exist
+  #007: (file name) line (number) in H5G__loc_find_cb(): object '#6632' doesn't exist
     major: Symbol table
     minor: Object not found
diff --git a/tools/test/h5dump/errfiles/tdataregR.err b/tools/test/h5dump/errfiles/tdataregR.err
index d84d5ec..d89b053 100644
--- a/tools/test/h5dump/errfiles/tdataregR.err
+++ b/tools/test/h5dump/errfiles/tdataregR.err
@@ -2,14 +2,26 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Rdereference2(): unable to dereference object
     major: References
     minor: Can't open object
-  #001: (file name) line (number) in H5R__dereference(): Undefined reference pointer
+  #001: (file name) line (number) in H5VL_object_open(): open failed
+    major: Virtual Object Layer
+    minor: Can't open object
+  #002: (file name) line (number) in H5VL_native_object_open(): unable to dereference object
+    major: References
+    minor: Can't open object
+  #003: (file name) line (number) in H5R__dereference(): Undefined reference pointer
     major: Invalid arguments to routine
     minor: Bad value
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Rdereference2(): unable to dereference object
     major: References
     minor: Can't open object
-  #001: (file name) line (number) in H5R__dereference(): Undefined reference pointer
+  #001: (file name) line (number) in H5VL_object_open(): open failed
+    major: Virtual Object Layer
+    minor: Can't open object
+  #002: (file name) line (number) in H5VL_native_object_open(): unable to dereference object
+    major: References
+    minor: Can't open object
+  #003: (file name) line (number) in H5R__dereference(): Undefined reference pointer
     major: Invalid arguments to routine
     minor: Bad value
 H5tools-DIAG: Error detected in HDF5:tools (version (number)) thread (IDs):
diff --git a/tools/test/h5dump/errfiles/tdset-2.err b/tools/test/h5dump/errfiles/tdset-2.err
index e61966f..b2a60cd 100644
--- a/tools/test/h5dump/errfiles/tdset-2.err
+++ b/tools/test/h5dump/errfiles/tdset-2.err
@@ -2,35 +2,47 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Dopen2(): unable to open dataset
     major: Dataset
     minor: Can't open object
-  #001: (file name) line (number) in H5D__open_name(): not found
+  #001: (file name) line (number) in H5VL_dataset_open(): dataset open failed
+    major: Virtual Object Layer
+    minor: Can't open object
+  #002: (file name) line (number) in H5VL_native_dataset_open(): unable to open dataset
+    major: Dataset
+    minor: Can't open object
+  #003: (file name) line (number) in H5D__open_name(): not found
     major: Dataset
     minor: Object not found
-  #002: (file name) line (number) in H5G_loc_find(): can't find object
+  #004: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #003: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #005: (file name) line (number) in H5G_traverse(): internal path traversal failed
     major: Symbol table
     minor: Object not found
-  #004: (file name) line (number) in H5G__traverse_real(): traversal operator failed
+  #006: (file name) line (number) in H5G__traverse_real(): traversal operator failed
     major: Symbol table
     minor: Callback failed
-  #005: (file name) line (number) in H5G__loc_find_cb(): object 'dset3' doesn't exist
+  #007: (file name) line (number) in H5G__loc_find_cb(): object 'dset3' doesn't exist
     major: Symbol table
     minor: Object not found
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Lget_info(): unable to get link info
     major: Links
     minor: Can't get value
-  #001: (file name) line (number) in H5L_get_info(): name doesn't exist
+  #001: (file name) line (number) in H5VL_link_get(): get failed
+    major: Virtual Object Layer
+    minor: Can't get value
+  #002: (file name) line (number) in H5VL_native_link_get(): unable to get link info
+    major: Links
+    minor: Object not found
+  #003: (file name) line (number) in H5L_get_info(): name doesn't exist
     major: Links
     minor: Object already exists
-  #002: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #004: (file name) line (number) in H5G_traverse(): internal path traversal failed
     major: Symbol table
     minor: Object not found
-  #003: (file name) line (number) in H5G__traverse_real(): traversal operator failed
+  #005: (file name) line (number) in H5G__traverse_real(): traversal operator failed
     major: Symbol table
     minor: Callback failed
-  #004: (file name) line (number) in H5L__get_info_cb(): name doesn't exist
+  #006: (file name) line (number) in H5L__get_info_cb(): name doesn't exist
     major: Links
     minor: Object not found
 h5dump error: unable to get link info from "dset3"
diff --git a/tools/test/h5dump/errfiles/textlink.err b/tools/test/h5dump/errfiles/textlink.err
index 4a5f545..f516638 100644
--- a/tools/test/h5dump/errfiles/textlink.err
+++ b/tools/test/h5dump/errfiles/textlink.err
@@ -2,55 +2,67 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Oopen(): unable to open object
     major: Object header
     minor: Can't open object
-  #001: (file name) line (number) in H5O_open_name(): object not found
+  #001: (file name) line (number) in H5VL_object_open(): open failed
+    major: Virtual Object Layer
+    minor: Can't open object
+  #002: (file name) line (number) in H5VL_native_object_open(): unable to open object by name
+    major: Object header
+    minor: Can't open object
+  #003: (file name) line (number) in H5O_open_name(): object not found
     major: Object header
     minor: Object not found
-  #002: (file name) line (number) in H5G_loc_find(): can't find object
+  #004: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #003: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #005: (file name) line (number) in H5G_traverse(): internal path traversal failed
     major: Symbol table
     minor: Object not found
-  #004: (file name) line (number) in H5G__traverse_real(): special link traversal failed
+  #006: (file name) line (number) in H5G__traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #005: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
+  #007: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
     major: Links
     minor: Link traversal failure
-  #006: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
+  #008: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
     major: Symbol table
     minor: Unable to find atom information (already closed?)
-  #007: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'filename'
+  #009: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'filename'
     major: Links
     minor: Unable to open file
-  #008: (file name) line (number) in H5F_prefix_open_file(): unable to open file, file name = 'filename', temp_file_name = 'filename'
-    major: File accessibilty
+  #010: (file name) line (number) in H5F_prefix_open_file(): unable to open file, file name = 'filename', temp_file_name = 'filename'
+    major: File accessibility
     minor: Unable to open file
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Oopen(): unable to open object
     major: Object header
     minor: Can't open object
-  #001: (file name) line (number) in H5O_open_name(): object not found
+  #001: (file name) line (number) in H5VL_object_open(): open failed
+    major: Virtual Object Layer
+    minor: Can't open object
+  #002: (file name) line (number) in H5VL_native_object_open(): unable to open object by name
+    major: Object header
+    minor: Can't open object
+  #003: (file name) line (number) in H5O_open_name(): object not found
     major: Object header
     minor: Object not found
-  #002: (file name) line (number) in H5G_loc_find(): can't find object
+  #004: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #003: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #005: (file name) line (number) in H5G_traverse(): internal path traversal failed
     major: Symbol table
     minor: Object not found
-  #004: (file name) line (number) in H5G__traverse_real(): special link traversal failed
+  #006: (file name) line (number) in H5G__traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #005: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
+  #007: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
     major: Links
     minor: Link traversal failure
-  #006: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
+  #008: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
     major: Symbol table
     minor: Unable to find atom information (already closed?)
-  #007: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'anotherfile'
+  #009: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'anotherfile'
     major: Links
     minor: Unable to open file
-  #008: (file name) line (number) in H5F_prefix_open_file(): unable to open file, file name = 'anotherfile', temp_file_name = 'anotherfile'
-    major: File accessibilty
+  #010: (file name) line (number) in H5F_prefix_open_file(): unable to open file, file name = 'anotherfile', temp_file_name = 'anotherfile'
+    major: File accessibility
     minor: Unable to open file
diff --git a/tools/test/h5dump/errfiles/textlinkfar.err b/tools/test/h5dump/errfiles/textlinkfar.err
index 1f9241a..ba06406 100644
--- a/tools/test/h5dump/errfiles/textlinkfar.err
+++ b/tools/test/h5dump/errfiles/textlinkfar.err
@@ -2,49 +2,55 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Oopen(): unable to open object
     major: Object header
     minor: Can't open object
-  #001: (file name) line (number) in H5O_open_name(): object not found
+  #001: (file name) line (number) in H5VL_object_open(): open failed
+    major: Virtual Object Layer
+    minor: Can't open object
+  #002: (file name) line (number) in H5VL_native_object_open(): unable to open object by name
+    major: Object header
+    minor: Can't open object
+  #003: (file name) line (number) in H5O_open_name(): object not found
     major: Object header
     minor: Object not found
-  #002: (file name) line (number) in H5G_loc_find(): can't find object
+  #004: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #003: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #005: (file name) line (number) in H5G_traverse(): internal path traversal failed
     major: Symbol table
     minor: Object not found
-  #004: (file name) line (number) in H5G__traverse_real(): special link traversal failed
+  #006: (file name) line (number) in H5G__traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #005: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
+  #007: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
     major: Links
     minor: Link traversal failure
-  #006: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
+  #008: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
     major: Symbol table
     minor: Unable to find atom information (already closed?)
-  #007: (file name) line (number) in H5L__extern_traverse(): unable to open object
+  #009: (file name) line (number) in H5L__extern_traverse(): unable to open object
     major: Links
     minor: Can't open object
-  #008: (file name) line (number) in H5O_open_name(): object not found
+  #010: (file name) line (number) in H5O_open_name(): object not found
     major: Object header
     minor: Object not found
-  #009: (file name) line (number) in H5G_loc_find(): can't find object
+  #011: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #010: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #012: (file name) line (number) in H5G_traverse(): internal path traversal failed
     major: Symbol table
     minor: Object not found
-  #011: (file name) line (number) in H5G__traverse_real(): special link traversal failed
+  #013: (file name) line (number) in H5G__traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #012: (file name) line (number) in H5G__traverse_special(): symbolic link traversal failed
+  #014: (file name) line (number) in H5G__traverse_special(): symbolic link traversal failed
     major: Links
     minor: Link traversal failure
-  #013: (file name) line (number) in H5G__traverse_slink(): unable to follow symbolic link
+  #015: (file name) line (number) in H5G__traverse_slink(): unable to follow symbolic link
     major: Symbol table
     minor: Object not found
-  #014: (file name) line (number) in H5G__traverse_real(): traversal operator failed
+  #016: (file name) line (number) in H5G__traverse_real(): traversal operator failed
     major: Symbol table
     minor: Callback failed
-  #015: (file name) line (number) in H5G__traverse_slink_cb(): component not found
+  #017: (file name) line (number) in H5G__traverse_slink_cb(): component not found
     major: Symbol table
     minor: Object not found
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
diff --git a/tools/test/h5dump/errfiles/textlinksrc.err b/tools/test/h5dump/errfiles/textlinksrc.err
index 1f9241a..ba06406 100644
--- a/tools/test/h5dump/errfiles/textlinksrc.err
+++ b/tools/test/h5dump/errfiles/textlinksrc.err
@@ -2,49 +2,55 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Oopen(): unable to open object
     major: Object header
     minor: Can't open object
-  #001: (file name) line (number) in H5O_open_name(): object not found
+  #001: (file name) line (number) in H5VL_object_open(): open failed
+    major: Virtual Object Layer
+    minor: Can't open object
+  #002: (file name) line (number) in H5VL_native_object_open(): unable to open object by name
+    major: Object header
+    minor: Can't open object
+  #003: (file name) line (number) in H5O_open_name(): object not found
     major: Object header
     minor: Object not found
-  #002: (file name) line (number) in H5G_loc_find(): can't find object
+  #004: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #003: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #005: (file name) line (number) in H5G_traverse(): internal path traversal failed
     major: Symbol table
     minor: Object not found
-  #004: (file name) line (number) in H5G__traverse_real(): special link traversal failed
+  #006: (file name) line (number) in H5G__traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #005: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
+  #007: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
     major: Links
     minor: Link traversal failure
-  #006: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
+  #008: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
     major: Symbol table
     minor: Unable to find atom information (already closed?)
-  #007: (file name) line (number) in H5L__extern_traverse(): unable to open object
+  #009: (file name) line (number) in H5L__extern_traverse(): unable to open object
     major: Links
     minor: Can't open object
-  #008: (file name) line (number) in H5O_open_name(): object not found
+  #010: (file name) line (number) in H5O_open_name(): object not found
     major: Object header
     minor: Object not found
-  #009: (file name) line (number) in H5G_loc_find(): can't find object
+  #011: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #010: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #012: (file name) line (number) in H5G_traverse(): internal path traversal failed
     major: Symbol table
     minor: Object not found
-  #011: (file name) line (number) in H5G__traverse_real(): special link traversal failed
+  #013: (file name) line (number) in H5G__traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #012: (file name) line (number) in H5G__traverse_special(): symbolic link traversal failed
+  #014: (file name) line (number) in H5G__traverse_special(): symbolic link traversal failed
     major: Links
     minor: Link traversal failure
-  #013: (file name) line (number) in H5G__traverse_slink(): unable to follow symbolic link
+  #015: (file name) line (number) in H5G__traverse_slink(): unable to follow symbolic link
     major: Symbol table
     minor: Object not found
-  #014: (file name) line (number) in H5G__traverse_real(): traversal operator failed
+  #016: (file name) line (number) in H5G__traverse_real(): traversal operator failed
     major: Symbol table
     minor: Callback failed
-  #015: (file name) line (number) in H5G__traverse_slink_cb(): component not found
+  #017: (file name) line (number) in H5G__traverse_slink_cb(): component not found
     major: Symbol table
     minor: Object not found
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
diff --git a/tools/test/h5dump/errfiles/tgroup-2.err b/tools/test/h5dump/errfiles/tgroup-2.err
index 715f2d2..af220b8 100644
--- a/tools/test/h5dump/errfiles/tgroup-2.err
+++ b/tools/test/h5dump/errfiles/tgroup-2.err
@@ -2,19 +2,25 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Gopen2(): unable to open group
     major: Symbol table
     minor: Can't open object
-  #001: (file name) line (number) in H5G__open_name(): group not found
+  #001: (file name) line (number) in H5VL_group_open(): open failed
+    major: Virtual Object Layer
+    minor: Can't open object
+  #002: (file name) line (number) in H5VL_native_group_open(): unable to open group
+    major: Symbol table
+    minor: Can't open object
+  #003: (file name) line (number) in H5G__open_name(): group not found
     major: Symbol table
     minor: Object not found
-  #002: (file name) line (number) in H5G_loc_find(): can't find object
+  #004: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #003: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #005: (file name) line (number) in H5G_traverse(): internal path traversal failed
     major: Symbol table
     minor: Object not found
-  #004: (file name) line (number) in H5G__traverse_real(): traversal operator failed
+  #006: (file name) line (number) in H5G__traverse_real(): traversal operator failed
     major: Symbol table
     minor: Callback failed
-  #005: (file name) line (number) in H5G__loc_find_cb(): object 'y' doesn't exist
+  #007: (file name) line (number) in H5G__loc_find_cb(): object 'y' doesn't exist
     major: Symbol table
     minor: Object not found
 h5dump error: unable to open group "/y"
diff --git a/tools/test/h5dump/errfiles/torderlinks1.err b/tools/test/h5dump/errfiles/torderlinks1.err
index 648906b..1336de5 100644
--- a/tools/test/h5dump/errfiles/torderlinks1.err
+++ b/tools/test/h5dump/errfiles/torderlinks1.err
@@ -2,27 +2,33 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Oopen(): unable to open object
     major: Object header
     minor: Can't open object
-  #001: (file name) line (number) in H5O_open_name(): object not found
+  #001: (file name) line (number) in H5VL_object_open(): open failed
+    major: Virtual Object Layer
+    minor: Can't open object
+  #002: (file name) line (number) in H5VL_native_object_open(): unable to open object by name
+    major: Object header
+    minor: Can't open object
+  #003: (file name) line (number) in H5O_open_name(): object not found
     major: Object header
     minor: Object not found
-  #002: (file name) line (number) in H5G_loc_find(): can't find object
+  #004: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #003: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #005: (file name) line (number) in H5G_traverse(): internal path traversal failed
     major: Symbol table
     minor: Object not found
-  #004: (file name) line (number) in H5G__traverse_real(): special link traversal failed
+  #006: (file name) line (number) in H5G__traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #005: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
+  #007: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
     major: Links
     minor: Link traversal failure
-  #006: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
+  #008: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
     major: Symbol table
     minor: Unable to find atom information (already closed?)
-  #007: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'fname'
+  #009: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'fname'
     major: Links
     minor: Unable to open file
-  #008: (file name) line (number) in H5F_prefix_open_file(): unable to open file, file name = 'fname', temp_file_name = 'fname'
-    major: File accessibilty
+  #010: (file name) line (number) in H5F_prefix_open_file(): unable to open file, file name = 'fname', temp_file_name = 'fname'
+    major: File accessibility
     minor: Unable to open file
diff --git a/tools/test/h5dump/errfiles/torderlinks2.err b/tools/test/h5dump/errfiles/torderlinks2.err
index 648906b..1336de5 100644
--- a/tools/test/h5dump/errfiles/torderlinks2.err
+++ b/tools/test/h5dump/errfiles/torderlinks2.err
@@ -2,27 +2,33 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Oopen(): unable to open object
     major: Object header
     minor: Can't open object
-  #001: (file name) line (number) in H5O_open_name(): object not found
+  #001: (file name) line (number) in H5VL_object_open(): open failed
+    major: Virtual Object Layer
+    minor: Can't open object
+  #002: (file name) line (number) in H5VL_native_object_open(): unable to open object by name
+    major: Object header
+    minor: Can't open object
+  #003: (file name) line (number) in H5O_open_name(): object not found
     major: Object header
     minor: Object not found
-  #002: (file name) line (number) in H5G_loc_find(): can't find object
+  #004: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #003: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #005: (file name) line (number) in H5G_traverse(): internal path traversal failed
     major: Symbol table
     minor: Object not found
-  #004: (file name) line (number) in H5G__traverse_real(): special link traversal failed
+  #006: (file name) line (number) in H5G__traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #005: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
+  #007: (file name) line (number) in H5G__traverse_special(): user-defined link traversal failed
     major: Links
     minor: Link traversal failure
-  #006: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
+  #008: (file name) line (number) in H5G__traverse_ud(): traversal callback returned invalid ID
     major: Symbol table
     minor: Unable to find atom information (already closed?)
-  #007: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'fname'
+  #009: (file name) line (number) in H5L__extern_traverse(): unable to open external file, external link file name = 'fname'
     major: Links
     minor: Unable to open file
-  #008: (file name) line (number) in H5F_prefix_open_file(): unable to open file, file name = 'fname', temp_file_name = 'fname'
-    major: File accessibilty
+  #010: (file name) line (number) in H5F_prefix_open_file(): unable to open file, file name = 'fname', temp_file_name = 'fname'
+    major: File accessibility
     minor: Unable to open file
diff --git a/tools/test/h5dump/errfiles/tperror.err b/tools/test/h5dump/errfiles/tperror.err
index 733b652..4df7265 100644
--- a/tools/test/h5dump/errfiles/tperror.err
+++ b/tools/test/h5dump/errfiles/tperror.err
@@ -2,35 +2,47 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Dopen2(): unable to open dataset
     major: Dataset
     minor: Can't open object
-  #001: (file name) line (number) in H5D__open_name(): not found
+  #001: (file name) line (number) in H5VL_dataset_open(): dataset open failed
+    major: Virtual Object Layer
+    minor: Can't open object
+  #002: (file name) line (number) in H5VL_native_dataset_open(): unable to open dataset
+    major: Dataset
+    minor: Can't open object
+  #003: (file name) line (number) in H5D__open_name(): not found
     major: Dataset
     minor: Object not found
-  #002: (file name) line (number) in H5G_loc_find(): can't find object
+  #004: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #003: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #005: (file name) line (number) in H5G_traverse(): internal path traversal failed
     major: Symbol table
     minor: Object not found
-  #004: (file name) line (number) in H5G__traverse_real(): traversal operator failed
+  #006: (file name) line (number) in H5G__traverse_real(): traversal operator failed
     major: Symbol table
     minor: Callback failed
-  #005: (file name) line (number) in H5G__loc_find_cb(): object 'bogus' doesn't exist
+  #007: (file name) line (number) in H5G__loc_find_cb(): object 'bogus' doesn't exist
     major: Symbol table
     minor: Object not found
 HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Lget_info(): unable to get link info
     major: Links
     minor: Can't get value
-  #001: (file name) line (number) in H5L_get_info(): name doesn't exist
+  #001: (file name) line (number) in H5VL_link_get(): get failed
+    major: Virtual Object Layer
+    minor: Can't get value
+  #002: (file name) line (number) in H5VL_native_link_get(): unable to get link info
+    major: Links
+    minor: Object not found
+  #003: (file name) line (number) in H5L_get_info(): name doesn't exist
     major: Links
     minor: Object already exists
-  #002: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #004: (file name) line (number) in H5G_traverse(): internal path traversal failed
     major: Symbol table
     minor: Object not found
-  #003: (file name) line (number) in H5G__traverse_real(): traversal operator failed
+  #005: (file name) line (number) in H5G__traverse_real(): traversal operator failed
     major: Symbol table
     minor: Callback failed
-  #004: (file name) line (number) in H5L__get_info_cb(): name doesn't exist
+  #006: (file name) line (number) in H5L__get_info_cb(): name doesn't exist
     major: Links
     minor: Object not found
 h5dump error: unable to get link info from "bogus"
diff --git a/tools/test/h5dump/errfiles/tslink-D.err b/tools/test/h5dump/errfiles/tslink-D.err
index de0705e..ded6719 100644
--- a/tools/test/h5dump/errfiles/tslink-D.err
+++ b/tools/test/h5dump/errfiles/tslink-D.err
@@ -2,27 +2,33 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Dopen2(): unable to open dataset
     major: Dataset
     minor: Can't open object
-  #001: (file name) line (number) in H5D__open_name(): not found
+  #001: (file name) line (number) in H5VL_dataset_open(): dataset open failed
+    major: Virtual Object Layer
+    minor: Can't open object
+  #002: (file name) line (number) in H5VL_native_dataset_open(): unable to open dataset
+    major: Dataset
+    minor: Can't open object
+  #003: (file name) line (number) in H5D__open_name(): not found
     major: Dataset
     minor: Object not found
-  #002: (file name) line (number) in H5G_loc_find(): can't find object
+  #004: (file name) line (number) in H5G_loc_find(): can't find object
     major: Symbol table
     minor: Object not found
-  #003: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #005: (file name) line (number) in H5G_traverse(): internal path traversal failed
     major: Symbol table
     minor: Object not found
-  #004: (file name) line (number) in H5G__traverse_real(): special link traversal failed
+  #006: (file name) line (number) in H5G__traverse_real(): special link traversal failed
     major: Links
     minor: Link traversal failure
-  #005: (file name) line (number) in H5G__traverse_special(): symbolic link traversal failed
+  #007: (file name) line (number) in H5G__traverse_special(): symbolic link traversal failed
     major: Links
     minor: Link traversal failure
-  #006: (file name) line (number) in H5G__traverse_slink(): unable to follow symbolic link
+  #008: (file name) line (number) in H5G__traverse_slink(): unable to follow symbolic link
     major: Symbol table
     minor: Object not found
-  #007: (file name) line (number) in H5G__traverse_real(): traversal operator failed
+  #009: (file name) line (number) in H5G__traverse_real(): traversal operator failed
     major: Symbol table
     minor: Callback failed
-  #008: (file name) line (number) in H5G__traverse_slink_cb(): component not found
+  #010: (file name) line (number) in H5G__traverse_slink_cb(): component not found
     major: Symbol table
     minor: Object not found
diff --git a/tools/test/h5dump/h5dumpgentest.c b/tools/test/h5dump/h5dumpgentest.c
index 4ef63e5..cbbbcfa 100644
--- a/tools/test/h5dump/h5dumpgentest.c
+++ b/tools/test/h5dump/h5dumpgentest.c
@@ -10574,7 +10574,7 @@ static void gent_null_space_group(void)
  *-------------------------------------------------------------------------
  */
 static void
-gent_err_attr_dspace()
+gent_err_attr_dspace(void)
 {
     hid_t fid = -1;         /* File identifier */
     hid_t fcpl = -1;        /* File access property list */
diff --git a/tools/test/h5jam/tellub.c b/tools/test/h5jam/tellub.c
index 667f2d9..26c725d 100644
--- a/tools/test/h5jam/tellub.c
+++ b/tools/test/h5jam/tellub.c
@@ -126,7 +126,7 @@ main (int argc, const char *argv[])
 
     ifname = HDstrdup(argv[opt_ind]);
 
-    testval = H5Fis_hdf5(ifname);
+    testval = H5Fis_accessible(ifname, H5P_DEFAULT);
 
     if(testval <= 0) {
         error_msg("Input HDF5 file is not HDF \"%s\"\n", ifname);
diff --git a/tools/test/h5repack/testfiles/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst b/tools/test/h5repack/testfiles/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst
index 069fb3b..6009723 100644
--- a/tools/test/h5repack/testfiles/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst
+++ b/tools/test/h5repack/testfiles/h5repack_layout.h5-dset2_chunk_20x10-errstk.tst
@@ -2,34 +2,40 @@ HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
   #000: (file name) line (number) in H5Dcreate2(): unable to create dataset
     major: Dataset
     minor: Unable to initialize object
-  #001: (file name) line (number) in H5D__create_named(): unable to create and link to dataset
+  #001: (file name) line (number) in H5VL_dataset_create(): create failed
+    major: Virtual Object Layer
+    minor: Unable to initialize object
+  #002: (file name) line (number) in H5VL_native_dataset_create(): unable to create dataset
+    major: Dataset
+    minor: Unable to initialize object
+  #003: (file name) line (number) in H5D__create_named(): unable to create and link to dataset
     major: Dataset
     minor: Unable to initialize object
-  #002: (file name) line (number) in H5L_link_object(): unable to create new link to object
+  #004: (file name) line (number) in H5L_link_object(): unable to create new link to object
     major: Links
     minor: Unable to initialize object
-  #003: (file name) line (number) in H5L__create_real(): can't insert link
+  #005: (file name) line (number) in H5L__create_real(): can't insert link
     major: Links
     minor: Unable to insert object
-  #004: (file name) line (number) in H5G_traverse(): internal path traversal failed
+  #006: (file name) line (number) in H5G_traverse(): internal path traversal failed
     major: Symbol table
     minor: Object not found
-  #005: (file name) line (number) in H5G__traverse_real(): traversal operator failed
+  #007: (file name) line (number) in H5G__traverse_real(): traversal operator failed
     major: Symbol table
     minor: Callback failed
-  #006: (file name) line (number) in H5L__link_cb(): unable to create object
+  #008: (file name) line (number) in H5L__link_cb(): unable to create object
     major: Links
     minor: Unable to initialize object
-  #007: (file name) line (number) in H5O_obj_create(): unable to open object
+  #009: (file name) line (number) in H5O_obj_create(): unable to open object
     major: Object header
     minor: Can't open object
-  #008: (file name) line (number) in H5O__dset_create(): unable to create dataset
+  #010: (file name) line (number) in H5O__dset_create(): unable to create dataset
     major: Dataset
     minor: Unable to initialize object
-  #009: (file name) line (number) in H5D__create(): unable to construct layout information
+  #011: (file name) line (number) in H5D__create(): unable to construct layout information
     major: Dataset
     minor: Unable to initialize object
-  #010: (file name) line (number) in H5D__chunk_construct(): dimensionality of chunks doesn't match the dataspace
+  #012: (file name) line (number) in H5D__chunk_construct(): dimensionality of chunks doesn't match the dataspace
     major: Dataset
     minor: Bad value
 H5tools-DIAG: Error detected in HDF5:tools (version (number)) thread (IDs):