Commit 026aaf47 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, 2018-03-12

# gpg: Signature made Mon 12 Mar 2018 22:10:36 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:
  device-crash-test: Use 'python' binary
  qmp.py: Encode json data before sending
  qemu.py: Use items() instead of iteritems()
  device-crash-test: New known crashes

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 59667bb1 006cc558

scripts/device-crash-test

+5 −1
Original line number Diff line number Diff line 
#!/usr/bin/env python2.7

#!/usr/bin/env python

#

#  Copyright (c) 2017 Red Hat Inc

#
@@ -217,11 +217,15 @@ ERROR_WHITELIST = [ 
    {'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},

    {'exitcode':-6, 'device':'isa-fdc', 'loglevel':logging.ERROR, 'expected':True},

    {'exitcode':-11, 'device':'gus', 'loglevel':logging.ERROR, 'expected':True},

    {'exitcode':-11, 'device':'isa-serial', 'loglevel':logging.ERROR, 'expected':True},

    {'exitcode':-11, 'device':'sb16', 'loglevel':logging.ERROR, 'expected':True},

    {'exitcode':-11, 'device':'cs4231a', 'loglevel':logging.ERROR, 'expected':True},

    {'exitcode':-11, 'machine':'isapc', 'device':'.*-iommu', 'loglevel':logging.ERROR, 'expected':True},

    {'exitcode':-11, 'device':'mioe3680_pci', 'loglevel':logging.ERROR, 'expected':True},

    {'exitcode':-11, 'device':'pcm3680_pci', 'loglevel':logging.ERROR, 'expected':True},

    {'exitcode':-11, 'device':'kvaser_pci', 'loglevel':logging.ERROR, 'expected':True},



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

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

scripts/qemu.py

+1 −1
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ class QEMUMachine(object): 
    def qmp(self, cmd, conv_keys=True, **args):

        '''Invoke a QMP command and return the response dict'''

        qmp_args = dict()

        for key, value in args.iteritems():

        for key, value in args.items():

            if conv_keys:

                qmp_args[key.replace('_', '-')] = value

            else:

scripts/qmp/qmp.py

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ class QEMUMonitorProtocol(object): 
        """

        self.logger.debug(">>> %s", qmp_cmd)

        try:

            self.__sock.sendall(json.dumps(qmp_cmd))

            self.__sock.sendall(json.dumps(qmp_cmd).encode('utf-8'))

        except socket.error as err:

            if err[0] == errno.EPIPE:

                return