Merge pull request #564 from hannesm/FreeBSD14

support FreeBSD14 in hvt
Solo5 · Feb 28, 2024 · cc80d3a · cc80d3a
2 parents 3f83367 + e4c38e7
commit cc80d3a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/tenders/hvt/hvt_freebsd_x86_64.c b/tenders/hvt/hvt_freebsd_x86_64.c
@@ -163,6 +163,10 @@ int hvt_vcpu_loop(struct hvt *hvt)
 {
     struct hvt_b *hvb = hvt->b;
     int ret;
+#if __FreeBSD_version >= 1400000
+    struct vm_exit vmexit;
+    hvb->vmrun.vm_exit = &vmexit;
+#endif
 
     while (1) {
         ret = ioctl(hvt->b->vmfd, VM_RUN, &hvb->vmrun);
@@ -178,7 +182,11 @@ int hvt_vcpu_loop(struct hvt *hvt)
         if (handled)
             continue;
 
+#if __FreeBSD_version >= 1400000
+        struct vm_exit *vme = &vmexit;
+#else
         struct vm_exit *vme = &hvb->vmrun.vm_exit;
+#endif
 
         switch (vme->exitcode) {
         case VM_EXITCODE_INOUT: {

diff --git a/tenders/hvt/hvt_main.c b/tenders/hvt/hvt_main.c
@@ -153,13 +153,11 @@ int main(int argc, char **argv)
      * which will be the ELF file to load. Stop if a "terminal" option such as
      * --help is encountered.
      */
-    int argc1 = argc;
     char **argv1 = argv;
     while (*argv1 && *argv1[0] == '-') {
         if (strcmp("--", *argv1) == 0)
         {
             /* Consume and stop option processing */
-            argc1--;
             argv1++;
             break;
         }
@@ -169,7 +167,6 @@ int main(int argc, char **argv)
         else if(strcmp("--version", *argv1) == 0)
             version(prog);
 
-        argc1--;
         argv1++;
     }
     if (*argv1 == NULL) {

diff --git a/tenders/spt/spt_main.c b/tenders/spt/spt_main.c
@@ -146,13 +146,11 @@ int main(int argc, char **argv)
      * which will be the ELF file to load. Stop if a "terminal" option such as
      * --help is encountered.
      */
-    int argc1 = argc;
     char **argv1 = argv;
     while (*argv1 && *argv1[0] == '-') {
         if (strcmp("--", *argv1) == 0)
         {
             /* Consume and stop option processing */
-            argc1--;
             argv1++;
             break;
         }
@@ -162,7 +160,6 @@ int main(int argc, char **argv)
         else if(strcmp("--version", *argv1) == 0)
             version(prog);
 
-        argc1--;
         argv1++;
     }
     if (*argv1 == NULL) {