tjh.dev
+9
-5
arch/x86/include/asm/vmware.h
+9
-5
arch/x86/include/asm/vmware.h
···
4
4
5
5
#include <asm/cpufeatures.h>
6
6
#include <asm/alternative.h>
7
+
#include <linux/stringify.h>
7
8
8
9
/*
9
10
* The hypercall definitions differ in the low word of the %edx argument
···
21
20
*/
22
21
23
22
/* Old port-based version */
24
-
#define VMWARE_HYPERVISOR_PORT "0x5658"
25
-
#define VMWARE_HYPERVISOR_PORT_HB "0x5659"
23
+
#define VMWARE_HYPERVISOR_PORT 0x5658
24
+
#define VMWARE_HYPERVISOR_PORT_HB 0x5659
26
25
27
26
/* Current vmcall / vmmcall version */
28
27
#define VMWARE_HYPERVISOR_HB BIT(0)
···
30
29
31
30
/* The low bandwidth call. The low word of edx is presumed clear. */
32
31
#define VMWARE_HYPERCALL \
33
-
ALTERNATIVE_2("movw $" VMWARE_HYPERVISOR_PORT ", %%dx; inl (%%dx)", \
32
+
ALTERNATIVE_2("movw $" __stringify(VMWARE_HYPERVISOR_PORT) ", %%dx; " \
33
+
"inl (%%dx), %%eax", \
34
34
"vmcall", X86_FEATURE_VMCALL, \
35
35
"vmmcall", X86_FEATURE_VMW_VMMCALL)
36
36
···
40
38
* HB and OUT bits set.
41
39
*/
42
40
#define VMWARE_HYPERCALL_HB_OUT \
43
-
ALTERNATIVE_2("movw $" VMWARE_HYPERVISOR_PORT_HB ", %%dx; rep outsb", \
41
+
ALTERNATIVE_2("movw $" __stringify(VMWARE_HYPERVISOR_PORT_HB) ", %%dx; " \
42
+
"rep outsb", \
44
43
"vmcall", X86_FEATURE_VMCALL, \
45
44
"vmmcall", X86_FEATURE_VMW_VMMCALL)
46
45
···
50
47
* HB bit set.
51
48
*/
52
49
#define VMWARE_HYPERCALL_HB_IN \
53
-
ALTERNATIVE_2("movw $" VMWARE_HYPERVISOR_PORT_HB ", %%dx; rep insb", \
50
+
ALTERNATIVE_2("movw $" __stringify(VMWARE_HYPERVISOR_PORT_HB) ", %%dx; " \
51
+
"rep insb", \
54
52
"vmcall", X86_FEATURE_VMCALL, \
55
53
"vmmcall", X86_FEATURE_VMW_VMMCALL)
56
54
#endif