1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
|
--- libenv/sysinfo.c.orig 2016-07-28 21:25:33 UTC
+++ libenv/sysinfo.c
@@ -168,15 +168,16 @@ static int MiscOS(EvalContext *ctx);
static void OpenVZ_Detect(EvalContext *ctx);
-#ifdef XEN_CPUID_SUPPORT
-static void Xen_Cpuid(uint32_t idx, uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx);
-static int Xen_Hv_Check(void);
-#endif
static bool ReadLine(const char *filename, char *buf, int bufsize);
static FILE *ReadFirstLine(const char *filename, char *buf, int bufsize);
#endif
+#ifdef XEN_CPUID_SUPPORT
+static void Xen_Cpuid(uint32_t idx, uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx);
+static bool Xen_Hv_Check(void);
+#endif
+
static void GetCPUInfo(EvalContext *ctx);
static const char *const CLASSATTRIBUTES[][3] =
@@ -1146,14 +1147,6 @@ static void OSClasses(EvalContext *ctx)
OpenVZ_Detect(ctx);
}
-#ifdef XEN_CPUID_SUPPORT
- else if (Xen_Hv_Check())
- {
- Log(LOG_LEVEL_VERBOSE, "This appears to be a xen hv system.");
- EvalContextClassPutHard(ctx, "xen", "inventory,attribute_name=Virtual host,source=agent");
- EvalContextClassPutHard(ctx, "xen_domu_hv", "source=agent");
- }
-#endif
#else
@@ -1195,6 +1188,15 @@ static void OSClasses(EvalContext *ctx)
#endif
+#ifdef XEN_CPUID_SUPPORT
+ if (Xen_Hv_Check())
+ {
+ Log(LOG_LEVEL_VERBOSE, "This appears to be a xen hv system.");
+ EvalContextClassPutHard(ctx, "xen", "inventory,attribute_name=Virtual host,source=agent");
+ EvalContextClassPutHard(ctx, "xen_domu_hv", "source=agent");
+ }
+#endif
+
GetCPUInfo(ctx);
#ifdef __CYGWIN__
@@ -2518,49 +2520,6 @@ static void OpenVZ_Detect(EvalContext *c
/******************************************************************/
-#ifdef XEN_CPUID_SUPPORT
-
-/* borrowed from Xen source/tools/libxc/xc_cpuid_x86.c */
-
-static void Xen_Cpuid(uint32_t idx, uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx)
-{
- asm(
- /* %ebx register need to be saved before usage and restored thereafter
- * for PIC-compliant code on i386 */
-# ifdef __i386__
- "push %%ebx; cpuid; mov %%ebx,%1; pop %%ebx"
-# else
- "push %%rbx; cpuid; mov %%ebx,%1; pop %%rbx"
-# endif
- : "=a"(*eax), "=r"(*ebx), "=c"(*ecx), "=d"(*edx):"0"(idx), "2"(0));
-}
-
-/******************************************************************/
-
-static int Xen_Hv_Check(void)
-{
- uint32_t eax;
- union
- {
- uint32_t u[3];
- char s[13];
- } sig = {{0}};
-
- Xen_Cpuid(0x40000000, &eax, &sig.u[0], &sig.u[1], &sig.u[2]);
-
- if (strcmp("XenVMMXenVMM", sig.s) || (eax < 0x40000002))
- {
- return 0;
- }
-
- Xen_Cpuid(0x40000001, &eax, &sig.u[0], &sig.u[1], &sig.u[2]);
- return 1;
-}
-
-#endif
-
-/******************************************************************/
-
static bool ReadLine(const char *filename, char *buf, int bufsize)
{
FILE *fp = ReadFirstLine(filename, buf, bufsize);
@@ -2597,6 +2556,48 @@ static FILE *ReadFirstLine(const char *f
}
#endif /* __linux__ */
+/******************************************************************/
+
+#ifdef XEN_CPUID_SUPPORT
+
+/* borrowed from Xen source/tools/libxc/xc_cpuid_x86.c */
+
+static void Xen_Cpuid(uint32_t idx, uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx)
+{
+ asm(
+ /* %ebx register need to be saved before usage and restored thereafter
+ * for PIC-compliant code on i386 */
+# ifdef __i386__
+ "push %%ebx; cpuid; mov %%ebx,%1; pop %%ebx"
+# else
+ "push %%rbx; cpuid; mov %%ebx,%1; pop %%rbx"
+# endif
+ : "=a"(*eax), "=r"(*ebx), "=c"(*ecx), "=d"(*edx):"0"(idx), "2"(0));
+}
+
+/******************************************************************/
+
+static bool Xen_Hv_Check(void)
+{
+ uint32_t eax, base;
+ union
+ {
+ uint32_t u[3];
+ char s[13];
+ } sig = {{0}};
+
+ for (base = 0x40000000; base < 0x40010000; base += 0x100)
+ {
+ Xen_Cpuid(base, &eax, &sig.u[0], &sig.u[1], &sig.u[2]);
+ if (strcmp("XenVMMXenVMM", sig.s) == 0 && eax >= (base + 2))
+ return true;
+ }
+
+ return false;
+}
+#endif /* XEN_CPUID_SUPPORT */
+
+
static void GetCPUInfo(EvalContext *ctx)
{
#if defined(MINGW) || defined(NT)
|
