Merge branch 'master' into next

We had a bunch of pull requests that were generated incorrectly
against master, and were pushed, since it is way too easy to
miss that fact when pressing the nice little green buttons that
github offers. So we have to do this to avoid non ff updates to
next and even more confusion.
Signed-off-by: NLucas Meneghel Rodrigues <lmr@redhat.com>

qemu/tests/cfg/qemu_cpu.cfg

@@ -215,6 +215,10 @@
                     # -enable-nesting:
                     cpu.amd.qemu64, cpu.amd.cpu64_rhel5, cpu.amd.cpu64_rhel6, cpu.amd.phenom, cpu.amd.Opteron_G1, cpu.amd.Opteron_G2, cpu.amd.Opteron_G3, cpu.amd.Opteron_G4, cpu.amd.Opteron_G5:
                         cpu_model_flags += ",-svm"
+                        #FIXED BUG: QEMU reported SVM feature information even
+                        # when SVM was disabled. Now it is all zeroes:
+                        machine.rhel.rhel600, machine.rhel.rhel610, machine.rhel.rhel620, machine.rhel.rhel630, machine.rhel.rhel640:
+                            ignore_cpuid_leaves += " 0x8000000a"
 
                     kvm:
                         # KVM doesn't support the "monitor" flag, so we have
@@ -226,6 +230,7 @@
                     # CPU vendor:
                     kvm:
                         ignore_cpuid_leaves += " 0,0,ebx 0,0,ecx 0,0,edx"
+                        ignore_cpuid_leaves += " 0x80000000,0,ebx 0x80000000,0,ecx 0x80000000,0,edx"
 
                     #KNOWN BUG: Processor Extended State leaf depends on host,
                     # currently:

qemu/tests/ipi_x2apic.py

@@ -58,7 +58,8 @@ def run_ipi_x2apic(test, params, env):
         x2apic_check_string = params.get("x2apic_check_string").split(",")
         for check_string in x2apic_check_string:
             if check_string.strip() not in x2apic_output:
-                raise error.TestFail("%s is not displayed in output" % str)
+                msg = "%s is not displayed in output" % check_string
+                raise error.TestFail(msg)
 
     file_link = os.path.join(test.virtdir, "scripts/pipetest.c")
     vm.copy_files_to(file_link, "/tmp/pipetest.c")

qemu/tests/multi_nic_stress.py

@@ -238,7 +238,7 @@ def launch_client(sessions, servers, server_ctl, clients,
     counts = 5
     for server in servers:
         if not re.findall("TEST.*to %s" % server, str(result_info)):
-            raise error.TestError("Nerperf stress on nic % failed" % server)
+            raise error.TestError("Nerperf stress on nic %s failed" % server)
         logging.info("Network stress on %s successfully" % server)
 
         status, output = utils_test.ping(server, counts,