[PULL,for-2.1,0/6] target-i386, module, qtest patches for 2014-07-18

The following changes since commit 146ae00192ffcbd78f6b11fa78c72d1b3d628d8a:

  Merge remote-tracking branch 'remotes/agraf/tags/signed-ppc-for-upstream' into staging (2014-07-15 15:51:12 +0100)

are available in the git repository at:


  git://github.com/bonzini/qemu.git tags/for-upstream

for you to fetch changes up to d64be1e60d228e558baf677bb40c4732d08c2f17:

  Revert "kvmclock: Ensure time in migration never goes backward" (2014-07-15 21:46:44 +0200)

----------------------------------------------------------------
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.

----------------------------------------------------------------
Andreas Färber (2):
      module: Simplify module_load()
      module: Don't complain when a module is absent

Paolo Bonzini (3):
      qtest: new test for wdt_ib700
      Revert "kvmclock: Ensure proper env->tsc value for kvmclock_current_nsec calculation"
      Revert "kvmclock: Ensure time in migration never goes backward"

Ricky Zhou (1):
      target-i386: Allow execute from user mode when SMEP is enabled.

 hw/i386/kvm/clock.c    |  52 -------------------
 target-i386/helper.c   |   3 +-
 tests/Makefile         |   2 +
 tests/wdt_ib700-test.c | 134 +++++++++++++++++++++++++++++++++++++++++++++++++
 util/module.c          |   9 +---
 5 files changed, 140 insertions(+), 60 deletions(-)
 create mode 100644 tests/wdt_ib700-test.c

On 18 July 2014 10:04, Paolo Bonzini <pbonzini@redhat.com> wrote:
> The following changes since commit 146ae00192ffcbd78f6b11fa78c72d1b3d628d8a:
>
>   Merge remote-tracking branch 'remotes/agraf/tags/signed-ppc-for-upstream' into staging (2014-07-15 15:51:12 +0100)
>
> are available in the git repository at:
>
>
>   git://github.com/bonzini/qemu.git tags/for-upstream
>
> for you to fetch changes up to d64be1e60d228e558baf677bb40c4732d08c2f17:
>
>   Revert "kvmclock: Ensure time in migration never goes backward" (2014-07-15 21:46:44 +0200)
>
> ----------------------------------------------------------------
> 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.

Hi. I'm afraid this fails make check:

ccache gcc -O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -pthread
-I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include
-g   -Wl,--warn-common -Wl,-z,relro -Wl,-z,now -pie -m64 -g
/home/petmay01/linaro/qemu-for-merges/tests/wdt_ib700-test.c
tests/libqtest.o libqemuutil.a libqemustub.a   -o tests/wdt_ib700-test
In file included from
/home/petmay01/linaro/qemu-for-merges/tests/wdt_ib700-test.c:12:0:
/home/petmay01/linaro/qemu-for-merges/tests/libqtest.h:25:28: fatal
error: qapi/qmp/qdict.h: No such file or directory
 #include "qapi/qmp/qdict.h"
                            ^
compilation terminated.
make: *** [tests/wdt_ib700-test] Error 1

thanks
-- PMM

Il 18/07/2014 14:46, Peter Maydell ha scritto:
> On 18 July 2014 10:04, Paolo Bonzini <pbonzini@redhat.com> wrote:
>> The following changes since commit 146ae00192ffcbd78f6b11fa78c72d1b3d628d8a:
>>
>>   Merge remote-tracking branch 'remotes/agraf/tags/signed-ppc-for-upstream' into staging (2014-07-15 15:51:12 +0100)
>>
>> are available in the git repository at:
>>
>>
>>   git://github.com/bonzini/qemu.git tags/for-upstream
>>
>> for you to fetch changes up to d64be1e60d228e558baf677bb40c4732d08c2f17:
>>
>>   Revert "kvmclock: Ensure time in migration never goes backward" (2014-07-15 21:46:44 +0200)
>>
>> ----------------------------------------------------------------
>> 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.
> 
> Hi. I'm afraid this fails make check:
> 
> ccache gcc -O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -pthread
> -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include
> -g   -Wl,--warn-common -Wl,-z,relro -Wl,-z,now -pie -m64 -g
> /home/petmay01/linaro/qemu-for-merges/tests/wdt_ib700-test.c
> tests/libqtest.o libqemuutil.a libqemustub.a   -o tests/wdt_ib700-test
> In file included from
> /home/petmay01/linaro/qemu-for-merges/tests/wdt_ib700-test.c:12:0:
> /home/petmay01/linaro/qemu-for-merges/tests/libqtest.h:25:28: fatal
> error: qapi/qmp/qdict.h: No such file or directory
>  #include "qapi/qmp/qdict.h"

Oops, when I was developing the test I did

make tests/wdt_ib700-test.o
make tests/wdt_ib700-test

but a straight 'make tests/wdt_ib700-test.o' doesn't work because this
line is missing:

tests/wdt_ib700-test$(EXESUF): tests/wdt_ib700-test.o

I'll respin the pull request to also include a clarification of the two
reverts.

Paolo