build - Minor build issues

* Bring test/debug/vnodeinfo.c up-to-date.

* Adjust test/vkernel/Makefile to properly copy the kernel from the new
  boot location ($root/boot/kernel/kernel).

diff --git a/test/debug/vnodeinfo.c b/test/debug/vnodeinfo.c
index 0b4ca2f..bf9222c 100644 (file)
--- a/test/debug/vnodeinfo.c
+++ b/test/debug/vnodeinfo.c
@@ -353,10 +353,10 @@ dumpbufs(kvm_t *kd, void *bufp, const char *id)
                id, bufp,
                buf.b_bio1.bio_offset,
                buf.b_bio2.bio_offset);
-       printf(" q=%d lck=%d/%d flags=%08x dep=%p",
+       printf(" q=%d lck=%d/%d flags=%08x refs=%d dep=%p",
                buf.b_qindex, buf.b_lock.lk_sharecount,
                buf.b_lock.lk_exclusivecount,
-               buf.b_flags, buf.b_dep.lh_first);
+               buf.b_flags, buf.b_refs, buf.b_dep.lh_first);
        printf("\n");
 
        if (buf.b_rbnode.rbe_left)

diff --git a/test/vkernel/Makefile b/test/vkernel/Makefile
index 978bb0d..07a03a5 100644 (file)
--- a/test/vkernel/Makefile
+++ b/test/vkernel/Makefile
@@ -138,7 +138,7 @@ reinstallkernel: mount
        cd ${SRCDIR} && \
            make -j 4 DESTDIR=${VKDIR}/root KERNCONF=${USEKERNEL} \
                 NO_MODULES= installkernel
-       cp ${VKDIR}/root/boot/kernel ${VKDIR}/vkernel
+       cp ${VKDIR}/root/boot/kernel/kernel ${VKDIR}/vkernel
 
 sysloader: mount
        cp /boot/loader ${VKDIR}/root/boot/loader