These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / staging / unisys / visorbus / vmcallinterface.h

diff --git a/kernel/drivers/staging/unisys/common-spar/include/vmcallinterface.h b/kernel/drivers/staging/unisys/visorbus/vmcallinterface.h
similarity index 56%
rename from kernel/drivers/staging/unisys/common-spar/include/vmcallinterface.h
rename to kernel/drivers/staging/unisys/visorbus/vmcallinterface.h
index 59a7459..c8d8483 100644 (file)
--- a/kernel/drivers/staging/unisys/common-spar/include/vmcallinterface.h
+++ b/kernel/drivers/staging/unisys/visorbus/vmcallinterface.h
@@ -1,10 +1,9 @@
-/* Copyright (C) 2010 - 2013 UNISYS CORPORATION
+/* Copyright (C) 2010 - 2015 UNISYS CORPORATION
  * All rights reserved.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -47,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
@@ -85,29 +76,12 @@ enum vmcall_monitor_interface_method_tuple { /* VMCALL identification tuples  */
     /* The following uses VMCALL_POST_CODE_LOGEVENT interface but is currently
      * not used much */
 #define ISSUE_IO_VMCALL_POSTCODE_SEVERITY(postcode, severity)          \
-do {                                                                   \
        ISSUE_IO_EXTENDED_VMCALL(VMCALL_POST_CODE_LOGEVENT, severity,   \
-                                MDS_APPOS, postcode);                  \
-} while (0)
+                                MDS_APPOS, postcode)
 #endif
 
 /* Structures for IO VMCALLs */
 
-/* ///////////// BEGIN PRAGMA PACK PUSH 1 ///////////////////////// */
-/* ///////////// ONLY STRUCT TYPE SHOULD BE BELOW */
-#pragma pack(push, 1)
-struct phys_info {
-       u64 pi_pfn;
-       u16 pi_off;
-       u16 pi_len;
-};
-
-#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_CONTROLVM_ADDR interface */
 struct vmcall_io_controlvm_addr_params {
            /* The Guest-relative physical address of the ControlVm channel.
@@ -117,47 +91,6 @@ struct vmcall_io_controlvm_addr_params {
            * in with the appropriate address. */
        u32 channel_bytes;      /* contents provided by this VMCALL (OUT) */
        u8 unused[4];           /* Unused Bytes in the 64-Bit Aligned Struct */
-};
-
-#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) */
-};
+} __packed;
 
 #endif /* __IOMONINTF_H__ */