[Qemu-commits] [qemu/qemu] b4bda1: target-i386: Allow execute from user mode when SME...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: b4bda1ae57a20a7ce7cb0077946fc33d6d6fd6c5
      
https://github.com/qemu/qemu/commit/b4bda1ae57a20a7ce7cb0077946fc33d6d6fd6c5
  Author: Ricky Zhou <address@hidden>
  Date:   2014-07-15 (Tue, 15 Jul 2014)

  Changed paths:
    M target-i386/helper.c

  Log Message:
  -----------
  target-i386: Allow execute from user mode when SMEP is enabled.

Previously, execute would be disabled for all pages with SMEP enabled,
regardless of what mode the access took place in.

Signed-off-by: Ricky Zhou <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: f52b7687825ae7b998ce790cd6028ff760b20b4c
      
https://github.com/qemu/qemu/commit/f52b7687825ae7b998ce790cd6028ff760b20b4c
  Author: Paolo Bonzini <address@hidden>
  Date:   2014-07-18 (Fri, 18 Jul 2014)

  Changed paths:
    M tests/Makefile
    A tests/wdt_ib700-test.c

  Log Message:
  -----------
  qtest: new test for wdt_ib700

Since the "pause" watchdog action had a regression and it went
unnoticed for a while, let's add a test for it.

Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: f9e13f8fd87710063f9fa0feaf7de0348b32612a
      
https://github.com/qemu/qemu/commit/f9e13f8fd87710063f9fa0feaf7de0348b32612a
  Author: Andreas Färber <address@hidden>
  Date:   2014-07-18 (Fri, 18 Jul 2014)

  Changed paths:
    M util/module.c

  Log Message:
  -----------
  module: Simplify module_load()

The file path is not used for error reporting, so we can free it
directly after use.

Reviewed-by: Fam Zheng <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: bb2eb1892d36e5c9fa1695924434313e3acbb1c0
      
https://github.com/qemu/qemu/commit/bb2eb1892d36e5c9fa1695924434313e3acbb1c0
  Author: Andreas Färber <address@hidden>
  Date:   2014-07-18 (Fri, 18 Jul 2014)

  Changed paths:
    M util/module.c

  Log Message:
  -----------
  module: Don't complain when a module is absent

The current implementation depends on a configure-time generated list of
block modules. When any of them is absent, module_load() emits a warning.

This is suboptimal because extracting code to modules was mainly done to
allow separate packaging of modules with intrusive dependencies. Absence
of optional packages then leads to absence of modules and an error
message, which users may recognize as new and report as error.

Cc: Paolo Bonzini <address@hidden>
Cc: Michael Tokarev <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 108e4c3871e0d0cd185ccffef5e932961f92dd63
      
https://github.com/qemu/qemu/commit/108e4c3871e0d0cd185ccffef5e932961f92dd63
  Author: Paolo Bonzini <address@hidden>
  Date:   2014-07-18 (Fri, 18 Jul 2014)

  Changed paths:
    M hw/i386/kvm/clock.c

  Log Message:
  -----------
  Revert "kvmclock: Ensure proper env->tsc value for kvmclock_current_nsec 
calculation"

This reverts commit 9b1786829aefb83f37a8f3135e3ea91c56001b56.

This patch fixed a hang introduced by commit a096b3a (kvmclock: Ensure
time in migration never goes backward, 2014-05-16), but it causes
a regression in migration whose cause is not quite clear.

Because of this, I'm choosing to revert both patches.  This trades a
2.1 regression for a bug that's been there forever.

Cc: address@hidden
Cc: address@hidden
Cc: address@hidden
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: fa666c10f2f3e15685ff88abd3bc433ddce012d6
      
https://github.com/qemu/qemu/commit/fa666c10f2f3e15685ff88abd3bc433ddce012d6
  Author: Paolo Bonzini <address@hidden>
  Date:   2014-07-18 (Fri, 18 Jul 2014)

  Changed paths:
    M hw/i386/kvm/clock.c

  Log Message:
  -----------
  Revert "kvmclock: Ensure time in migration never goes backward"

This reverts commit a096b3a6732f846ec57dc28b47ee9435aa0609bf.

This patch caused a hang that was fixed by commit 9b17868 (kvmclock:
Ensure proper env->tsc value for kvmclock_current_nsec calculation,
2014-06-03), and we just had to revert that commit.  Drop this one
too.

Cc: address@hidden
Cc: address@hidden
Cc: address@hidden
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 50a2c45da92383138e0d3f22952f3813814e18b3
      
https://github.com/qemu/qemu/commit/50a2c45da92383138e0d3f22952f3813814e18b3
  Author: Peter Maydell <address@hidden>
  Date:   2014-07-18 (Fri, 18 Jul 2014)

  Changed paths:
    M hw/i386/kvm/clock.c
    M target-i386/helper.c
    M tests/Makefile
    A tests/wdt_ib700-test.c
    M util/module.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging

Andreas's fixes to --enable-modules, two 2.1 regression fixes, and a
new qtest.  Michael sent a pull request of his own, so I dropped
the vhost changes.

# gpg: Signature made Fri 18 Jul 2014 14:30:34 BST using RSA key ID 9B4D86F2
# gpg: Can't check signature: public key not found

* remotes/bonzini/tags/for-upstream:
  Revert "kvmclock: Ensure time in migration never goes backward"
  Revert "kvmclock: Ensure proper env->tsc value for kvmclock_current_nsec 
calculation"
  module: Don't complain when a module is absent
  module: Simplify module_load()
  qtest: new test for wdt_ib700
  target-i386: Allow execute from user mode when SMEP is enabled.

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/e0097ea371a6...50a2c45da923