[Xen-changelog] [qemu-xen master] Merge remote-tracking branch 'remotes/ehabkost/tags/x86-and-machine-pull-request' into staging

[patchbot@xxxxxxx]

commit b90da81d9f2d3d974db13bc69f961974741b0e2e
Merge: e80b4b8fb6babce7dcc91ea9ddeecbc351fd4646 
83a00f6095a36de2024d6cca57470c4dedfb85ee
Author:     Peter Maydell <peter.maydell@xxxxxxxxxx>
AuthorDate: Mon Oct 31 19:06:09 2016 +0000
Commit:     Peter Maydell <peter.maydell@xxxxxxxxxx>
CommitDate: Mon Oct 31 19:06:09 2016 +0000

    Merge remote-tracking branch 
'remotes/ehabkost/tags/x86-and-machine-pull-request' into staging
    
    x86 and machine queue, 2016-10-31
    
    # gpg: Signature made Mon 31 Oct 2016 18:29:18 GMT
    # gpg:                using RSA key 0x2807936F984DC5A6
    # gpg: Good signature from "Eduardo Habkost <ehabkost@xxxxxxxxxx>"
    # Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF  D1AA 2807 936F 984D 
C5A6
    
    * remotes/ehabkost/tags/x86-and-machine-pull-request:
      target-i386: Print warning when mixing [+-]foo and foo=(on|off)
      tests: Remove unneeded "-vnc none" option
    
    Signed-off-by: Peter Maydell <peter.maydell@xxxxxxxxxx>

 target-i386/cpu.c             | 24 ++++++++++++++++++++++++
 tests/ide-test.c              |  1 -
 tests/ipmi-bt-test.c          |  2 +-
 tests/ipmi-kcs-test.c         |  2 +-
 tests/test-x86-cpuid-compat.c | 28 +++++++++++++++++++++++-----
 5 files changed, 49 insertions(+), 8 deletions(-)
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
https://lists.xenproject.org/xen-changelog