Commit 9bd641b1 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/ehabkost/tags/python-next-pull-request' into staging 



Python queue, 2019-01-17

Fixes:
* Actually test different Python versions on Travis CI
* Fix qemu.py error message when qemu dies from signal

Cleanups:
* Track Python version on config-host.mak
* Remove fixed crashes from scripts/device-crash-test
* Acceptance tests: Linux initrd checking test
* Fix utf-8 mangling at scripts/replay-dump.py
* Remove unused python imports from multiple scripts

# gpg: Signature made Thu 17 Jan 2019 20:16:41 GMT
# gpg:                using RSA key 2807936F984DC5A6
# gpg: Good signature from "Eduardo Habkost <ehabkost@redhat.com>"
# Primary key fingerprint: 5A32 2FD5 ABC4 D3DB ACCF  D1AA 2807 936F 984D C5A6

* remotes/ehabkost/tags/python-next-pull-request:
  scripts/replay-dump.py: fix utf-8 mangling
  qemu.py: Fix error message when qemu dies from signal
  Acceptance tests: add Linux initrd checking test
  check-help: visual and content improvements
  Travis CI: make specified Python versions usable on jobs
  check-venv: use recorded Python version
  configure: keep track of Python version
  scripts: Remove unused python imports
  scripts/device-crash-test: Remove known crashes

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 51c1c135 49ebe9b1

.travis.yml

+3 −1
Original line number Diff line number Diff line
@@ -175,12 +175,14 @@ matrix: 
    # Python builds

    - env:

        - CONFIG="--target-list=x86_64-softmmu"

      language: python

      python:

        - "3.0"

        - "3.4"





    - env:

        - CONFIG="--target-list=x86_64-softmmu"

      language: python

      python:

        - "3.6"

configure

+5 −1
Original line number Diff line number Diff line
@@ -1797,6 +1797,9 @@ if ! $python -c 'import sys; sys.exit(sys.version_info < (2,7))'; then 
      "Use --python=/path/to/python to specify a supported Python."

fi



# Preserve python version since some functionality is dependent on it

python_version=$($python -V 2>&1 | sed -e 's/Python\ //')



# Suppress writing compiled files

python="$python -B"
@@ -6010,7 +6013,7 @@ echo "LDFLAGS $LDFLAGS" 
echo "QEMU_LDFLAGS      $QEMU_LDFLAGS"

echo "make              $make"

echo "install           $install"

echo "python            $python"

echo "python            $python ($python_version)"

if test "$slirp" = "yes" ; then

    echo "smbd              $smbd"

fi
@@ -6959,6 +6962,7 @@ echo "INSTALL_DATA=$install -c -m 0644" >> $config_host_mak 
echo "INSTALL_PROG=$install -c -m 0755" >> $config_host_mak

echo "INSTALL_LIB=$install -c -m 0644" >> $config_host_mak

echo "PYTHON=$python" >> $config_host_mak

echo "PYTHON_VERSION=$python_version" >> $config_host_mak

echo "CC=$cc" >> $config_host_mak

if $iasl -h > /dev/null 2>&1; then

  echo "IASL=$iasl" >> $config_host_mak

scripts/analyse-locks-simpletrace.py

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 
#



from __future__ import print_function

import os

import simpletrace

import argparse

import numpy as np

scripts/analyze-migration.py

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import json 
import os

import argparse

import collections

import pprint



def mkdir_p(path):

    try:

scripts/device-crash-test

+0 −16
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ check for crashes and unexpected errors. 
from __future__ import print_function



import sys

import os

import glob

import logging

import traceback
@@ -181,21 +180,6 @@ ERROR_WHITELIST = [ 
    # other exitcode=1 failures not listed above will just generate INFO messages:

    {'exitcode':1, 'loglevel':logging.INFO},



    # KNOWN CRASHES:

    # Known crashes will generate error messages, but won't be fatal.

    # Those entries must be removed once we fix the crashes.

    {'exitcode':-6, 'log':r"Device 'serial0' is in use", 'loglevel':logging.ERROR},

    {'exitcode':-6, 'log':r"qemu_net_client_setup: Assertion `!peer->peer' failed", 'loglevel':logging.ERROR},

    {'exitcode':-6, 'log':r'RAMBlock "[\w.-]+" already registered', 'loglevel':logging.ERROR},

    {'exitcode':-6, 'log':r"find_ram_offset: Assertion `size != 0' failed.", 'loglevel':logging.ERROR},

    {'exitcode':-6, 'log':r"add_cpreg_to_hashtable: code should not be reached", 'loglevel':logging.ERROR},

    {'exitcode':-6, 'log':r"qemu_alloc_display: Assertion `surface->image != NULL' failed", 'loglevel':logging.ERROR},

    {'exitcode':-6, 'log':r"Unexpected error in error_set_from_qdev_prop_error", 'loglevel':logging.ERROR},

    {'exitcode':-6, 'log':r"Object .* is not an instance of type spapr-machine", 'loglevel':logging.ERROR},

    {'exitcode':-6, 'log':r"Object .* is not an instance of type generic-pc-machine", 'loglevel':logging.ERROR},

    {'exitcode':-6, 'log':r"Object .* is not an instance of type e500-ccsr", 'loglevel':logging.ERROR},

    {'exitcode':-6, 'log':r"vmstate_register_with_alias_id: Assertion `!se->compat \|\| se->instance_id == 0' failed", 'loglevel':logging.ERROR},



    # everything else (including SIGABRT and SIGSEGV) will be a fatal error:

    {'exitcode':None, 'fatal':True, 'loglevel':logging.FATAL},

]