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
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
|
commit 4f271849224b5a5b3ca93c78e4b5ca8aee350bc6
Author: Jonas Eriksson <jonas.eriksson@enea.com>
Date: Wed Mar 26 17:29:36 2014 +0100
cpuflags: Avoid building on test target
The cpuflags-test utility is built with different compiler flags
depending on the callee, meaning that pre-building is tricky. By
separating the builds from each other using a suffix based on the
extra flags, we can pre-build multiple versions of the application.
Signed-off-by: Jonas Eriksson <jonas.eriksson@enea.com>
Upstream-Status: Pending
diff --git a/provider/cpuflags.py b/provider/cpuflags.py
index 70255cf..ea2031c 100644
--- a/provider/cpuflags.py
+++ b/provider/cpuflags.py
@@ -2,6 +2,7 @@
Shared code for tests that make use of cpuflags
"""
import os
+import md5
from virttest import data_dir
@@ -12,19 +13,36 @@ def install_cpuflags_util_on_vm(test, vm, dst_dir, extra_flags=None):
:param vm: virtual machine.
:param dst_dir: Installation path.
:param extra_flags: Extraflags for gcc compiler.
+ :return: The full path to the cpu_flags command built with the supplied
+ extra_flags
"""
if not extra_flags:
extra_flags = ""
- cpuflags_src = data_dir.get_deps_dir("cpu_flags")
+ # The suffix is the first 8 chars of the hex representation of the md5sum
+ # of the extra flags
+ extra_flags_hash = md5.new()
+ extra_flags_hash.update(extra_flags)
+ suffix = (extra_flags_hash.hexdigest())[:8]
+
cpuflags_dst = os.path.join(dst_dir, "cpu_flags")
+ cpuflags_cmd = os.path.join(dst_dir, "cpuflags-test-%s" % suffix)
session = vm.wait_for_login()
- session.cmd("rm -rf %s" %
- (cpuflags_dst))
- session.cmd("sync")
- vm.copy_files_to(cpuflags_src, dst_dir)
- session.cmd("sync")
- session.cmd("cd %s; cd src; make EXTRA_FLAGS='%s';" %
- (cpuflags_dst, extra_flags))
- session.cmd("sync")
+
+ if session.cmd_status("test -x '%s'" % cpuflags_cmd):
+ cpuflags_cmd = os.path.join(cpuflags_dst, "cpuflags-test-%s" % suffix)
+ if session.cmd_status("test -x '%s'" % cpuflags_cmd):
+ cpuflags_src = os.path.join(data_dir.get_deps_dir(), "cpu_flags")
+
+ session.cmd("rm -rf %s" % (cpuflags_dst))
+ session.cmd("mkdir -p %s" % (dst_dir))
+ session.cmd("sync")
+ vm.copy_files_to(cpuflags_src, dst_dir)
+ session.cmd("sync")
+ session.cmd("make -C %s EXTRA_FLAGS='%s';" %
+ (cpuflags_dst, extra_flags))
+ session.cmd("sync")
+
session.close()
+
+ return cpuflags_cmd
diff --git a/deps/cpu_flags/src/.gitignore b/deps/cpu_flags/src/.gitignore
new file mode 100644
index 0000000..1d04e1f
--- /dev/null
+++ b/qemu/deps/cpu_flags/src/.gitignore
@@ -0,0 +1,2 @@
+build-*/
+cpuflags-test-*
diff --git a/deps/cpu_flags/src/Makefile b/deps/cpu_flags/src/Makefile
index 1513649..3be1920 100644
--- a/deps/cpu_flags/src/Makefile
+++ b/deps/cpu_flags/src/Makefile
@@ -45,63 +45,77 @@ CC=gcc
LIBS=-lgomp
-.PHONY: default all cpuflags-test clean
+# Use the first 8 characters of the md5sum of the extra flags as suffix
+SUFFIX=$(shell echo -n '$(EXTRA_FLAGS)' | md5sum | cut -c 1-8)
+BUILDDIR=build-$(SUFFIX)
+BUILDDIR_IND=build-$(SUFFIX)/.created
-default:cpuflags-test
+.PHONY: default all clean suffix
-all:cpuflags-test
+default: cpuflags-test-$(SUFFIX)
-cpuflags-test: avx.o fma4.o xop.o sse4a.o sse4.o ssse3.o sse3.o aes.o pclmul.o rdrand.o stress.o stressmem.o
- $(CC) $(CFLAGS) $(LIBS) cpuflags-test.c -o cpuflags-test \
- aes.o \
- pclmul.o \
- rdrand.o \
- avx.o \
- fma4.o \
- xop.o \
- sse4a.o \
- sse4.o \
- ssse3.o \
- sse3.o \
- stress.o \
- stressmem.o \
+all: cpuflags-test-$(SUFFIX)
-aes.o: aes.c tests.h
- $(CC) $(CFLAGSAES) $(LIBS) -c aes.c
+suffix:
+ @echo $(SUFFIX)
-pclmul.o: pclmul.c tests.h
- $(CC) $(CFLAGSPCLMUL) $(LIBS) -c pclmul.c
+# The timestamp of builddir will be updated as we write files, so let the
+# creation of .o files depend on a file (builddir indicator) inside builddir to
+# make sure that builddir is created.
+$(BUILDDIR_IND):
+ $(MKDIR) $(BUILDDIR)
+ touch $(BUILDDIR_IND)
-rdrand.o: rdrand.c tests.h
- $(CC) $(CFLAGSRDRAND) $(LIBS) -c rdrand.c
+cpuflags-test-$(SUFFIX): cpuflags-test.c \
+ $(BUILDDIR)/avx.o \
+ $(BUILDDIR)/fma4.o \
+ $(BUILDDIR)/xop.o \
+ $(BUILDDIR)/sse4a.o \
+ $(BUILDDIR)/sse4.o \
+ $(BUILDDIR)/ssse3.o \
+ $(BUILDDIR)/sse3.o \
+ $(BUILDDIR)/aes.o \
+ $(BUILDDIR)/pclmul.o \
+ $(BUILDDIR)/rdrand.o \
+ $(BUILDDIR)/stress.o \
+ $(BUILDDIR)/stressmem.o
+ $(CC) $(CFLAGS) $^ $(LIBS) -o $@
-fma4.o: fma4.c tests.h
- $(CC) $(CFLAGSFMA4) $(LIBS) -c fma4.c
+$(BUILDDIR)/aes.o: aes.c tests.h $(BUILDDIR_IND)
+ $(CC) -o $@ $(CFLAGSAES) $(LIBS) -c aes.c
-xop.o: xop.c tests.h
- $(CC) $(CFLAGSXOP) $(LIBS) -c xop.c
+$(BUILDDIR)/pclmul.o: pclmul.c tests.h $(BUILDDIR_IND)
+ $(CC) -o $@ $(CFLAGSPCLMUL) $(LIBS) -c pclmul.c
-avx.o: avx.c tests.h
- $(CC) $(CFLAGSAVX) $(LIBS) -c avx.c
+$(BUILDDIR)/rdrand.o: rdrand.c tests.h $(BUILDDIR_IND)
+ $(CC) -o $@ $(CFLAGSRDRAND) $(LIBS) -c rdrand.c
-sse4a.o: sse4a.c tests.h
- $(CC) $(CFLAGSSSE4A) $(LIBS) -c sse4a.c
+$(BUILDDIR)/fma4.o: fma4.c tests.h $(BUILDDIR_IND)
+ $(CC) -o $@ $(CFLAGSFMA4) $(LIBS) -c fma4.c
-sse4.o: sse4.c tests.h
- $(CC) $(CFLAGSSSE4) $(LIBS) -c sse4.c
+$(BUILDDIR)/xop.o: xop.c tests.h $(BUILDDIR_IND)
+ $(CC) -o $@ $(CFLAGSXOP) $(LIBS) -c xop.c
-ssse3.o: ssse3.c tests.h
- $(CC) $(CFLAGSSSSE3) $(LIBS) -c ssse3.c
+$(BUILDDIR)/avx.o: avx.c tests.h $(BUILDDIR_IND)
+ $(CC) -o $@ $(CFLAGSAVX) $(LIBS) -c avx.c
-sse3.o: sse3.c tests.h
- $(CC) $(CFLAGSSSE3) $(LIBS) -c sse3.c
+$(BUILDDIR)/sse4a.o: sse4a.c tests.h $(BUILDDIR_IND)
+ $(CC) -o $@ $(CFLAGSSSE4A) $(LIBS) -c sse4a.c
-stress.o: stress.c tests.h
- $(CC) $(CFLAGSSTRESS) $(LIBS) -c stress.c
+$(BUILDDIR)/sse4.o: sse4.c tests.h $(BUILDDIR_IND)
+ $(CC) -o $@ $(CFLAGSSSE4) $(LIBS) -c sse4.c
-stressmem.o: stressmem.c tests.h
- $(CC) $(CFLAGSSTRESS) $(LIBS) -c stressmem.c
+$(BUILDDIR)/ssse3.o: ssse3.c tests.h $(BUILDDIR_IND)
+ $(CC) -o $@ $(CFLAGSSSSE3) $(LIBS) -c ssse3.c
+$(BUILDDIR)/sse3.o: sse3.c tests.h $(BUILDDIR_IND)
+ $(CC) -o $@ $(CFLAGSSSE3) $(LIBS) -c sse3.c
+
+$(BUILDDIR)/stress.o: stress.c tests.h $(BUILDDIR_IND)
+ $(CC) -o $@ $(CFLAGSSTRESS) $(LIBS) -c stress.c
+
+$(BUILDDIR)/stressmem.o: stressmem.c tests.h $(BUILDDIR_IND)
+ $(CC) -o $@ $(CFLAGSSTRESS) $(LIBS) -c stressmem.c
ARCHIVE= cpuflags-test
@@ -110,5 +124,7 @@ tar: clean
clean:
rm -f *~
- rm -f *.o
- rm -f cpuflags-test
+ rm -f build-*/*.o
+ rm -f cpuflags-test-*
+ rm -f build-*/.created
+ rmdir build-* || true
diff --git a/qemu/tests/cpuflags.py b/qemu/tests/cpuflags.py
index 75a03bb..cab4f5a 100644
--- a/qemu/tests/cpuflags.py
+++ b/qemu/tests/cpuflags.py
@@ -24,8 +24,8 @@ def run(test, params, env):
utils_misc.Flag.aliases = utils_misc.kvm_map_flags_aliases
qemu_binary = utils_misc.get_qemu_binary(params)
- cpuflags_src = os.path.join(data_dir.get_deps_dir("cpu_flags"), "src")
- cpuflags_def = os.path.join(data_dir.get_deps_dir("cpu_flags"),
+ cpuflags_src = os.path.join(qemudir, "deps", "cpu_flags", "src")
+ cpuflags_def = os.path.join(qemudir, "deps", "cpu_flags",
"cpu_map.xml")
smp = int(params.get("smp", 1))
@@ -188,9 +188,12 @@ def run(test, params, env):
"""
p = ParseCpuFlags()
cpus = p.parse_file(cpuflags_def)
+ flags = None
for arch in cpus.values():
if cpumodel in arch.keys():
flags = arch[cpumodel]
+ if not flags:
+ raise NameError, "Could not resolve flags for cpumodel '%s'" % cpumodel
return set(map(utils_misc.Flag, flags))
get_guest_host_cpuflags_BAD = get_guest_host_cpuflags_1350
@@ -253,7 +256,9 @@ def run(test, params, env):
output = utils.run(cmd).stdout
cpu_re = re.compile(r"x86\s+\[?(\w+)\]?")
- return cpu_re.findall(output)
+ cpus = cpu_re.findall(output)
+
+ return [c for c in cpus if not c == 'host']
get_cpu_models_BAD = get_cpu_models_1350
@@ -432,16 +437,16 @@ def run(test, params, env):
Run stress on vm for timeout time.
"""
ret = False
- install_path = "/tmp"
- cpuflags.install_cpuflags_util_on_vm(test, vm, install_path)
- flags = check_cpuflags_work(vm, install_path, guest_flags)
+ install_path = params.get("cpuflags_install_path", "/tmp")
+ cpuflags_cmd = cpuflags.install_cpuflags_util_on_vm(test, vm, install_path)
+ flags = check_cpuflags_work(vm, cpuflags_cmd, guest_flags)
dd_session = vm.wait_for_login()
stress_session = vm.wait_for_login()
dd_session.sendline("dd if=/dev/[svh]da of=/tmp/stressblock"
" bs=10MB count=100 &")
try:
- stress_session.cmd("%s/cpuflags-test --stress %s%s" %
- (os.path.join(install_path, "cpu_flags"), smp,
+ stress_session.cmd("%s --stress %s%s" %
+ (cpuflags_cmd, smp,
utils_misc.kvm_flags_to_stresstests(flags[0])),
timeout=timeout)
except aexpect.ShellTimeoutError:
@@ -613,10 +618,10 @@ def run(test, params, env):
"on guest: %s", str(not_enable_flags))
logging.info("Check main instruction sets.")
- install_path = "/tmp"
- cpuflags.install_cpuflags_util_on_vm(test, self.vm, install_path)
+ install_path = params.get("cpuflags_install_path", "/tmp")
+ cpuflags_cmd = cpuflags.install_cpuflags_util_on_vm(test, vm, install_path)
- Flags = check_cpuflags_work(self.vm, install_path,
+ Flags = check_cpuflags_work(self.vm, cpuflags_cmd,
flags.all_possible_guest_flags)
logging.info("Woking CPU flags: %s", str(Flags[0]))
logging.info("Not working CPU flags: %s", str(Flags[1]))
@@ -814,18 +819,17 @@ def run(test, params, env):
(self.vm, _) = start_guest_with_cpuflags(cpuf_model, smp)
- install_path = "/tmp"
- cpuflags.install_cpuflags_util_on_vm(test, self.vm, install_path)
- flags = check_cpuflags_work(self.vm, install_path,
+ install_path = params.get("cpuflags_install_path", "/tmp")
+ cpuflags_cmd = cpuflags.install_cpuflags_util_on_vm(test, self.vm, install_path)
+ flags = check_cpuflags_work(self.vm, cpuflags_cmd,
flags.guest_flags)
dd_session = self.vm.wait_for_login()
stress_session = self.vm.wait_for_login()
dd_session.sendline("nohup dd if=/dev/[svh]da of=/tmp/"
"stressblock bs=10MB count=100 &")
- cmd = ("nohup %s/cpuflags-test --stress %s%s &" %
- (os.path.join(install_path, "cpu_flags"), smp,
- utils_misc.kvm_flags_to_stresstests(flags[0])))
+ cmd = "nohup %s --stress %s%s &" % (cpuflags_cmd, smp,
+ utils_misc.kvm_flags_to_stresstests(flags[0]))
stress_session.sendline(cmd)
time.sleep(5)
@@ -915,7 +919,7 @@ def run(test, params, env):
for fdel in flags.host_unsupported_flags:
cpuf_model += ",-" + str(fdel)
- install_path = "/tmp"
+ install_path = params.get("cpuflags_install_path", "/tmp")
class testMultihostMigration(utils_test.qemu.MultihostMigration):
@@ -931,9 +935,10 @@ def run(test, params, env):
vm = env.get_vm("vm1")
session = vm.wait_for_login(timeout=self.login_timeout)
- cpuflags.install_cpuflags_util_on_vm(test, vm, install_path)
+ cpuflags_cmd = cpuflags.install_cpuflags_util_on_vm(test, vm, install_path)
+ mig_data.params.update([('cpuflags_cmd', cpuflags_cmd)])
- Flags = check_cpuflags_work(vm, install_path,
+ Flags = check_cpuflags_work(vm, cpuflags_cmd,
flags.all_possible_guest_flags)
logging.info("Woking CPU flags: %s", str(Flags[0]))
logging.info("Not working CPU flags: %s",
@@ -946,9 +951,8 @@ def run(test, params, env):
session.sendline("nohup dd if=/dev/[svh]da of=/tmp/"
"stressblock bs=10MB count=100 &")
- cmd = ("nohup %s/cpuflags-test --stress %s%s &" %
- (os.path.join(install_path, "cpu_flags"),
- smp,
+ cmd = ("nohup %s --stress %s%s &" %
+ (cpuflags_cmd, smp,
utils_misc.kvm_flags_to_stresstests(Flags[0] &
flags.guest_flags)))
logging.debug("Guest_flags: %s",
@@ -971,7 +975,8 @@ def run(test, params, env):
" should be active after"
" migration and it's not.")
- Flags = check_cpuflags_work(vm, install_path,
+ cpuflags_cmd = mig_data.params.get('cpuflags_cmd')
+ Flags = check_cpuflags_work(vm, cpuflags_cmd,
flags.all_possible_guest_flags)
logging.info("Woking CPU flags: %s",
str(Flags[0]))
@@ -1017,7 +1022,7 @@ def run(test, params, env):
disable_cpus = map(lambda cpu: int(cpu),
params.get("disable_cpus", "").split())
- install_path = "/tmp"
+ install_path = params.get("cpuflags_install_path", "/tmp")
class testMultihostMigration(utils_test.qemu.MultihostMigration):
@@ -1060,9 +1065,10 @@ def run(test, params, env):
vm = env.get_vm("vm1")
session = vm.wait_for_login(timeout=self.login_timeout)
- cpuflags.install_cpuflags_util_on_vm(test, vm, install_path)
+ cpuflags_cmd = cpuflags.install_cpuflags_util_on_vm(test, vm, install_path)
+ mig_data.params.update([('cpuflags_cmd', cpuflags_cmd)])
- Flags = check_cpuflags_work(vm, install_path,
+ Flags = check_cpuflags_work(vm, cpuflags_cmd,
flags.all_possible_guest_flags)
logging.info("Woking CPU flags: %s", str(Flags[0]))
logging.info("Not working CPU flags: %s",
@@ -1103,7 +1109,8 @@ def run(test, params, env):
"disabled on dsthost:%s" %
(disable_cpus, not_disabled))
- Flags = check_cpuflags_work(vm, install_path,
+ cpuflags_cmd = mig_data.params.get('cpuflags_cmd')
+ Flags = check_cpuflags_work(vm, cpuflags_cmd,
flags.all_possible_guest_flags)
logging.info("Woking CPU flags: %s",
str(Flags[0]))
diff --git a/qemu/tests/migration_multi_host_cancel.py b/qemu/tests/migration_multi_host_cancel.py
index 89765dd..a4ed11b 100644
--- a/qemu/tests/migration_multi_host_cancel.py
+++ b/qemu/tests/migration_multi_host_cancel.py
@@ -64,13 +64,12 @@ def run(test, params, env):
vm = mig_data.vms[0]
session = vm.wait_for_login(timeout=self.login_timeout)
- cpuflags.install_cpuflags_util_on_vm(test, vm,
+ cpuflags_cmd = cpuflags.install_cpuflags_util_on_vm(test, vm,
self.install_path,
extra_flags="-msse3 -msse2")
- cmd = ("%s/cpuflags-test --stressmem %d,%d %%" %
- (os.path.join(self.install_path, "cpu_flags"),
- self.vm_mem * 10, self.vm_mem / 2))
+ cmd = ("%s --stressmem %d,%d %%" %
+ (cpuflags_cmd, self.vm_mem * 10, self.vm_mem / 2))
logging.debug("Sending command: %s" % (cmd))
session.sendline(cmd)
diff --git a/qemu/tests/migration_multi_host_downtime_and_speed.py b/qemu/tests/migration_multi_host_downtime_and_speed.py
index 4a06b69..549d1fd 100644
--- a/qemu/tests/migration_multi_host_downtime_and_speed.py
+++ b/qemu/tests/migration_multi_host_downtime_and_speed.py
@@ -164,13 +164,12 @@ def run(test, params, env):
vm = mig_data.vms[0]
session = vm.wait_for_login(timeout=self.login_timeout)
- cpuflags.install_cpuflags_util_on_vm(test, vm,
+ cpuflags_cmd = cpuflags.install_cpuflags_util_on_vm(test, vm,
self.install_path,
extra_flags="-msse3 -msse2")
- cmd = ("nohup %s/cpuflags-test --stressmem %d,%d &" %
- (os.path.join(self.install_path, "cpu_flags"),
- self.vm_mem * 100, self.vm_mem / 2))
+ cmd = ("nohup %s --stressmem %d,%d &" %
+ (cpuflags_cmd, self.vm_mem * 100, self.vm_mem / 2))
logging.debug("Sending command: %s" % (cmd))
session.sendline(cmd)
time.sleep(3)
diff --git a/qemu/tests/migration_multi_host_firewall_block.py b/qemu/tests/migration_multi_host_firewall_block.py
index 3db1dc5..dc70a6b 100644
--- a/qemu/tests/migration_multi_host_firewall_block.py
+++ b/qemu/tests/migration_multi_host_firewall_block.py
@@ -175,13 +175,12 @@ def run(test, params, env):
vm = mig_data.vms[0]
session = vm.wait_for_login(timeout=self.login_timeout)
- cpuflags.install_cpuflags_util_on_vm(test, vm,
+ cpuflags_cmd = cpuflags.install_cpuflags_util_on_vm(test, vm,
self.install_path,
extra_flags="-msse3 -msse2")
- cmd = ("nohup %s/cpuflags-test --stressmem %d,%d &" %
- (os.path.join(self.install_path, "cpu_flags"),
- self.vm_mem * 100, self.vm_mem / 2))
+ cmd = ("nohup %s --stressmem %d,%d &" %
+ (cpuflags_cmd, self.vm_mem * 100, self.vm_mem / 2))
logging.debug("Sending command: %s" % (cmd))
session.sendline(cmd)
time.sleep(3)
diff --git a/qemu/tests/migration_multi_host_ping_pong.py b/qemu/tests/migration_multi_host_ping_pong.py
index 7f7b64e..c6d0d3c 100644
--- a/qemu/tests/migration_multi_host_ping_pong.py
+++ b/qemu/tests/migration_multi_host_ping_pong.py
@@ -155,15 +155,14 @@ def run(test, params, env):
vm = mig_data.vms[0]
session = vm.wait_for_login(timeout=self.login_timeout)
- cpuflags.install_cpuflags_util_on_vm(test, vm,
+ cpuflags_cmd = cpuflags.install_cpuflags_util_on_vm(test, vm,
self.install_path,
extra_flags="-msse3 -msse2")
cmd = ("nohup %s/cpuflags-test --stressmem %d,32"
" > %s &" %
- (os.path.join(self.install_path, "cpu_flags"),
- self.stress_memory,
- self.cpuflags_test_out))
+ (cpuflags_cmd, self.stress_memory,
+ self.cpuflags_test_out))
logging.debug("Sending command: %s" % (cmd))
session.sendline(cmd)
if session.cmd_status("killall -s 0 cpuflags-test") != 0:
diff --git a/qemu/tests/migration_multi_host_with_speed_measurement.py b/qemu/tests/migration_multi_host_with_speed_measurement.py
index e845b90..dbddbf4 100644
--- a/qemu/tests/migration_multi_host_with_speed_measurement.py
+++ b/qemu/tests/migration_multi_host_with_speed_measurement.py
@@ -128,12 +128,11 @@ def run(test, params, env):
vm = mig_data.vms[0]
session = vm.wait_for_login(timeout=self.login_timeout)
- cpuflags.install_cpuflags_util_on_vm(test, vm, install_path,
+ cpuflags_cmd = cpuflags.install_cpuflags_util_on_vm(test, vm, install_path,
extra_flags="-msse3 -msse2")
- cmd = ("%s/cpuflags-test --stressmem %d,%d" %
- (os.path.join(install_path, "cpu_flags"),
- vm_mem * 4, vm_mem / 2))
+ cmd = ("%s --stressmem %d,%d" %
+ (cpuflags_cmd, vm_mem * 4, vm_mem / 2))
logging.debug("Sending command: %s" % (cmd))
session.sendline(cmd)
diff --git a/qemu/tests/migration_with_speed_measurement.py b/qemu/tests/migration_with_speed_measurement.py
index 47c4231..a88d648 100644
--- a/qemu/tests/migration_with_speed_measurement.py
+++ b/qemu/tests/migration_with_speed_measurement.py
@@ -82,14 +82,13 @@ def run(test, params, env):
try:
# Reboot the VM in the background
- cpuflags.install_cpuflags_util_on_vm(test, vm, install_path,
+ cpuflags_cmd = cpuflags.install_cpuflags_util_on_vm(test, vm, install_path,
extra_flags="-msse3 -msse2")
vm.monitor.migrate_set_speed(mig_speed)
- cmd = ("%s/cpuflags-test --stressmem %d,%d" %
- (os.path.join(install_path, "cpu_flags"),
- vm_mem * 4, vm_mem / 2))
+ cmd = ("%s --stressmem %d,%d" %
+ (cpuflags_cmd, vm_mem * 4, vm_mem / 2))
logging.debug("Sending command: %s" % (cmd))
session.sendline(cmd)
|
