staging: unisys: vmcallinterface.h: Cleanup unused fields

With the simplified driver models we have more vmcalls that aren't
supported by linux guests.

Signed-off-by: David Kershner <david.kershner@unisys.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/unisys/visorbus/vmcallinterface.h b/drivers/staging/unisys/visorbus/vmcallinterface.h
index 7abd27a618f8d12f97e646c5d1f7b7ca541c497d..7a18aa8ee4da2b6f56b82b5facab9a7a0db5709e 100644 (file)
--- a/drivers/staging/unisys/visorbus/vmcallinterface.h
+++ b/drivers/staging/unisys/visorbus/vmcallinterface.h
@@ -46,21 +46,13 @@ enum vmcall_monitor_interface_method_tuple { /* VMCALL identification tuples  */
 
        VMCALL_IO_CONTROLVM_ADDR = 0x0501,      /* used by all Guests, not just
                                                 * IO */
-       VMCALL_IO_DIAG_ADDR = 0x0508,
-       VMCALL_IO_VISORSERIAL_ADDR = 0x0509,
        VMCALL_QUERY_GUEST_VIRTUAL_TIME_OFFSET = 0x0708, /* Allow caller to
                                                          * query virtual time
                                                          * offset */
-       VMCALL_CHANNEL_VERSION_MISMATCH = 0x0709,
        VMCALL_POST_CODE_LOGEVENT = 0x070B,     /* LOGEVENT Post Code (RDX) with
                                                 * specified subsystem mask (RCX
                                                 * - monitor_subsystems.h) and
                                                 * severity (RDX) */
-       VMCALL_GENERIC_SURRENDER_QUANTUM_FOREVER = 0x0802, /* Yield the
-                                                           * remainder & all
-                                                           * future quantums of
-                                                           * the caller */
-       VMCALL_MEASUREMENT_DO_NOTHING = 0x0901,
        VMCALL_UPDATE_PHYSICAL_TIME = 0x0a02    /* Allow
                                                 * ULTRA_SERVICE_CAPABILITY_TIME
                                                 * capable guest to make
@@ -107,42 +99,4 @@ struct vmcall_io_controlvm_addr_params {
 #pragma pack(pop)
 /* ///////////// END PRAGMA PACK PUSH 1 /////////////////////////// */
 
-/* ///////////// BEGIN PRAGMA PACK PUSH 1 ///////////////////////// */
-/* ///////////// ONLY STRUCT TYPE SHOULD BE BELOW */
-#pragma pack(push, 1)
-/* Parameters to VMCALL_IO_DIAG_ADDR interface */
-struct vmcall_io_diag_addr_params {
-           /* The Guest-relative physical address of the diagnostic channel.
-           * This VMCall fills this in with the appropriate address. */
-       u64 address;    /* contents provided by this VMCALL (OUT) */
-};
-
-#pragma pack(pop)
-/* ///////////// END PRAGMA PACK PUSH 1 /////////////////////////// */
-
-/* ///////////// BEGIN PRAGMA PACK PUSH 1 ///////////////////////// */
-/* ///////////// ONLY STRUCT TYPE SHOULD BE BELOW */
-#pragma pack(push, 1)
-/* Parameters to VMCALL_IO_VISORSERIAL_ADDR interface */
-struct vmcall_io_visorserial_addr_params {
-           /* The Guest-relative physical address of the serial console
-           * channel.  This VMCall fills this in with the appropriate
-           * address. */
-       u64 address;    /* contents provided by this VMCALL (OUT) */
-};
-
-#pragma pack(pop)
-/* ///////////// END PRAGMA PACK PUSH 1 /////////////////////////// */
-
-/* Parameters to VMCALL_CHANNEL_MISMATCH interface */
-struct vmcall_channel_version_mismatch_params {
-       u8 chname[32];  /* Null terminated string giving name of channel
-                                * (IN) */
-       u8 item_name[32];       /* Null terminated string giving name of
-                                * mismatched item (IN) */
-       u32 line_no;            /* line# where invoked. (IN) */
-       u8 file_name[36];       /* source code where invoked - Null terminated
-                                * string (IN) */
-};
-
 #endif /* __IOMONINTF_H__ */