From: Paul Floyd <pjfloyd@wanadoo.fr>
Date: Sat, 7 May 2022 15:28:08 +0000 (+0200)
Subject: Update FreeBSD struct vki_kinfo_vmentry
X-Git-Tag: VALGRIND_3_20_0~94
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=295ce0e64356a6a1e311a02f97907f55b593565f;p=thirdparty%2Fvalgrind.git

Update FreeBSD struct vki_kinfo_vmentry
---

diff --git a/coregrind/m_aspacemgr/aspacemgr-linux.c b/coregrind/m_aspacemgr/aspacemgr-linux.c
index 9a69f3850f..933d6d9de2 100644
--- a/coregrind/m_aspacemgr/aspacemgr-linux.c
+++ b/coregrind/m_aspacemgr/aspacemgr-linux.c
@@ -3944,7 +3944,7 @@ static void parse_procselfmaps (
        endPlusOne = (UWord)kve->kve_end;
        foffset    = kve->kve_offset;
        filename   = kve->kve_path;
-       dev        = kve->kve_fsid;
+       dev        = kve->kve_fsid_freebsd11;
        ino        = kve->kve_fileid;
        if (filename[0] != '/') {
          filename = NULL;
diff --git a/include/vki/vki-freebsd.h b/include/vki/vki-freebsd.h
index f50598e093..38c5014188 100644
--- a/include/vki/vki-freebsd.h
+++ b/include/vki/vki-freebsd.h
@@ -2126,17 +2126,23 @@ struct vki_kinfo_vmentry {
    int   kve_type;
    ULong kve_start;
    ULong kve_end;
-   Off64T   kve_offset;
+   ULong   kve_offset;
    ULong   kve_fileid;
-   UInt    kve_fsid;
+   UInt    kve_fsid_freebsd11;
    int   kve_flags;
    int   kve_resident;
    int   kve_private_resident;
    int   kve_protection;
    int   kve_ref_count;
    int   kve_shadow_count;
-   int   _kve_pad0;
-   int   kve_ispare[16];
+   int      kve_vn_type;
+   ULong kve_vn_size;
+   UInt kve_vn_rdev_freebsd11;
+   UShort kve_vn_mode;
+   UShort kve_status;
+   ULong kve_vn_fsid;
+   ULong kve_vn_rdev;
+   int      _kve_ispare[8];
    char  kve_path[VKI_PATH_MAX];
 };