Changeset 20542 in vbox for trunk

Timestamp:

Jun 13, 2009 9:44:57 PM (15 years ago)

Author:

vboxsync

Message:

root/Makefile.kmk,includes: regenerated .mac files adding VBox/param.h to the fun.

Location:

trunk

Files:

• Makefile.kmk (modified) (1 diff)
• include/VBox/err.mac (modified) (6 diffs)
• include/VBox/param.h (modified) (1 diff)
• include/VBox/param.mac (added)
• include/VBox/various.sed (added)
• include/VBox/x86.h (modified) (2 diffs)
• include/VBox/x86.mac (modified) (2 diffs)
• include/iprt/err.mac (modified) (2 diffs)

trunk/Makefile.kmk

@@ -815 +815 @@
 #
 incs:
-        $(SED) -f include/VBox/err.sed --output include/VBox/err.mac include/VBox/err.h
+        $(SED) -f include/VBox/err.sed     --output include/VBox/err.mac   include/VBox/err.h
         $(APPEND) include/VBox/err.mac '%include "iprt/err.mac"'
-        $(SED) -f include/VBox/err.sed --output include/iprt/err.mac include/iprt/err.h
-        $(SED) \
-                -e '/__VBox_x86_h__/d' \
-                -e '/#define/!d' \
-                -e '/\\$$/d' \
-                -e 's/#define/%define/' \
-                -e 's/\([0-9a-fA-F][0-9a-fA-F]*\)U$$/\1/' \
-                -e 's/\([0-9a-fA-F][0-9a-fA-F]*\)U[[:space:]]/\1 /' \
-                -e 's/[[:space:]]\/\*\*<.*$$//' \
-                --output include/VBox/x86.mac \
-                include/VBox/x86.h
+        $(SED) -f include/VBox/err.sed     --output include/iprt/err.mac   include/iprt/err.h
+        $(SED) -f include/VBox/various.sed --output include/VBox/x86.mac   include/VBox/x86.h
+        $(SED) -f include/VBox/various.sed --output include/VBox/param.mac include/VBox/param.h
 
 

trunk/include/VBox/err.mac

@@ -18 +18 @@
 %define VERR_INVALID_VMCPU_HANDLE    (-1017)
 %define VERR_INVALID_CPU_ID    (-1018)
+%define VERR_TOO_MANY_CPUS    (-1019)
 %define VINF_EM_FIRST    1100
 %define VINF_EM_TERMINATE    1100
@@ -39 +40 @@
 %define VINF_EM_RESCHEDULE    1118
 %define VINF_EM_RESCHEDULE_PARAV    1119
-%define VINF_EM_LAST    1119
+%define VINF_EM_WAIT_SIPI    1120
+%define VINF_EM_LAST    1120
 %define VINF_EM_RAW_GUEST_TRAP    1121
 %define VINF_EM_RAW_INTERRUPT    1122
@@ -63 +65 @@
 %define VERR_EM_INTERNAL_ERROR    (-1149)
 %define VINF_EM_PENDING_REQUEST    (-1150)
+%define VINF_EM_RAW_EMULATE_DBG_STEP    1151
 %define VERR_DBGF_NOT_ATTACHED    (-1200)
 %define VERR_DBGF_ALREADY_ATTACHED    (-1201)
@@ -229 +232 @@
 %define VERR_REM_VIRTUAL_CPU_ERROR    (-2301)
 %define VINF_REM_INTERRUPED_FF    2302
-%define VERR_REM_FLUSHED_PAGES_OVERFLOW    (-2303)
 %define VERR_REM_TOO_MANY_TRAPS    (-2304)
 %define VERR_REM_NO_MORE_BP_SLOTS    (-2305)
@@ -421 +423 @@
 %define VERR_GVM_TOO_MANY_VMS    (-3900)
 %define VINF_GVM_NOT_BLOCKED    3901
-%define VINF_GVM_YIELDED    3902
+%define VINF_GVM_NOT_BUSY_IN_GC    3902
+%define VINF_GVM_YIELDED    3903
 %define VERR_VMX_INVALID_VMCS_FIELD    (-4000)
 %define VERR_VMX_INVALID_VMCS_PTR    (-4001)
@@ -458 +461 @@
 %define VERR_WEB_UNSUPPORTED_INTERFACE    (-4304)
 %define VINF_PARAV_SWITCH_TO_HOST    4400
+%define VINF_VHWA_CMD_PENDING    4500
 %include "iprt/err.mac"

trunk/include/VBox/param.h

@@ -1 +1 @@
 /** @file
  * VirtualBox Parameter Definitions.
+ *
+ * param.mac is generated from this file by running 'kmk incs' in the root.
  */
 
 /*
- * Copyright (C) 2006-2007 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2009 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as

trunk/include/VBox/x86.h

@@ -1 +1 @@
 /** @file
  * X86 (and AMD64) Structures and Definitions.
+ *
+ * x86.mac is generated from this file by running 'kmk incs' in the root.
  */
 
 /*
- * Copyright (C) 2006-2007 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2009 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -26 +28 @@
  * Clara, CA 95054 USA or visit http://www.sun.com if you need
  * additional information or have any questions.
- */
-
-/*
- * x86.mac is generated from this file using:
- *      sed -e '/__VBox_x86_h__/d' -e '/#define/!d' -e 's/#define/%define/' include/VBox/x86.h
  */
 

trunk/include/VBox/x86.mac

@@ -1 @@
-%define ___VBox_x86_h
 %define X86_EFL_CF          RT_BIT(0)
 %define X86_EFL_PF          RT_BIT(2)
@@ -390 +389 @@
 %define X86_PML4_SHIFT              39
 %define X86_PML4_MASK               0x1ff
+%define X86DESC_BASE(desc) \
+%define X86DESC_LIMIT(desc) \
+%define X86DESC64_BASE(desc) \
 %define X86_SEL_TYPE_CODE                   8
 %define X86_SEL_TYPE_MEMORY                 RT_BIT(4)

trunk/include/iprt/err.mac

@@ -130 +130 @@
 %define VERR_FILE_AIO_COMPLETED    (-131)
 %define VERR_FILE_AIO_BUSY    (-132)
+%define VERR_FILE_AIO_LIMIT_EXCEEDED    (-133)
+%define VERR_FILE_AIO_CANCELED    (-134)
+%define VERR_FILE_AIO_NOT_SUBMITTED    (-135)
+%define VERR_FILE_AIO_NOT_PREPARED    (-136)
+%define VERR_FILE_AIO_INSUFFICIENT_RESSOURCES    (-137)
 %define VERR_DISK_IO_ERROR    (-150)
 %define VERR_INVALID_DRIVE    (-151)
@@ -285 +290 @@
 %define VERR_CACHE_FULL    (-850)
 %define VERR_CACHE_EMPTY    (-851)
+%define VERR_S3_ACCESS_DENIED    (-875)
+%define VERR_S3_NOT_FOUND    (-876)
+%define VERR_S3_BUCKET_ALREADY_EXISTS    (-877)
+%define VERR_S3_BUCKET_NOT_EMPTY    (-878)
+%define VERR_S3_CANCELED    (-879)