* [Qemu-devel] [PULL 0/4] Python queue, 2018-10-03
@ 2018-10-04 2:19 Eduardo Habkost
2018-10-04 2:19 ` [Qemu-devel] [PULL 1/4] device-crash-test: No need for sys.path hack Eduardo Habkost
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Eduardo Habkost @ 2018-10-04 2:19 UTC (permalink / raw)
To: Peter Maydell, qemu-devel; +Cc: Eduardo Habkost, Cleber Rosa
The following changes since commit dafd95053611aa14dda40266857608d12ddce658:
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (2018-10-02 18:27:18 +0100)
are available in the Git repository at:
git://github.com/ehabkost/qemu.git tags/python-next-pull-request
for you to fetch changes up to cd0c3da730bc8369f0b6c1c6bf81babd9851060d:
scripts/device-crash-test: Remove entries for serial devices (2018-10-03 23:08:51 -0300)
----------------------------------------------------------------
Python queue, 2018-10-03
* Remove fixed serial device errors from device-crash-test
* Remove unnecessary Python 2.6 compatibility code
----------------------------------------------------------------
Eduardo Habkost (3):
device-crash-test: No need for sys.path hack
Revert "docker.py: Python 2.6 argparse compatibility"
Revert "tests: migration/guestperf Python 2.6 argparse compatibility"
Thomas Huth (1):
scripts/device-crash-test: Remove entries for serial devices
scripts/device-crash-test | 6 ------
tests/docker/docker.py | 4 +---
tests/migration/guestperf/shell.py | 8 +++-----
3 files changed, 4 insertions(+), 14 deletions(-)
--
2.18.0.rc1.1.g3f1ff2140
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Qemu-devel] [PULL 1/4] device-crash-test: No need for sys.path hack
2018-10-04 2:19 [Qemu-devel] [PULL 0/4] Python queue, 2018-10-03 Eduardo Habkost
@ 2018-10-04 2:19 ` Eduardo Habkost
2018-10-04 2:19 ` [Qemu-devel] [PULL 2/4] Revert "docker.py: Python 2.6 argparse compatibility" Eduardo Habkost
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Eduardo Habkost @ 2018-10-04 2:19 UTC (permalink / raw)
To: Peter Maydell, qemu-devel; +Cc: Eduardo Habkost, Cleber Rosa
The device-crash-test script is already inside the 'scripts'
directory, there's no need to add the directory manually to
sys.path.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20180618225131.13113-2-ehabkost@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
scripts/device-crash-test | 1 -
1 file changed, 1 deletion(-)
diff --git a/scripts/device-crash-test b/scripts/device-crash-test
index 7045594bd4..da0bc5edd0 100755
--- a/scripts/device-crash-test
+++ b/scripts/device-crash-test
@@ -35,7 +35,6 @@ import random
import argparse
from itertools import chain
-sys.path.append(os.path.join(os.path.dirname(__file__), '..', 'scripts'))
from qemu import QEMUMachine
logger = logging.getLogger('device-crash-test')
--
2.18.0.rc1.1.g3f1ff2140
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Qemu-devel] [PULL 2/4] Revert "docker.py: Python 2.6 argparse compatibility"
2018-10-04 2:19 [Qemu-devel] [PULL 0/4] Python queue, 2018-10-03 Eduardo Habkost
2018-10-04 2:19 ` [Qemu-devel] [PULL 1/4] device-crash-test: No need for sys.path hack Eduardo Habkost
@ 2018-10-04 2:19 ` Eduardo Habkost
2018-10-04 2:19 ` [Qemu-devel] [PULL 3/4] Revert "tests: migration/guestperf " Eduardo Habkost
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Eduardo Habkost @ 2018-10-04 2:19 UTC (permalink / raw)
To: Peter Maydell, qemu-devel; +Cc: Eduardo Habkost, Cleber Rosa
This reverts commit c2d3189667409561772e8c1e5615c5166cd8aa2c.
scripts/argparse.py was removed from the tree, so we don't need
this hack anymore.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20180618225131.13113-3-ehabkost@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
tests/docker/docker.py | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/tests/docker/docker.py b/tests/docker/docker.py
index d3006d4dae..44d5f7493b 100755
--- a/tests/docker/docker.py
+++ b/tests/docker/docker.py
@@ -14,14 +14,12 @@
from __future__ import print_function
import os
import sys
-sys.path.append(os.path.join(os.path.dirname(__file__),
- '..', '..', 'scripts'))
-import argparse
import subprocess
import json
import hashlib
import atexit
import uuid
+import argparse
import tempfile
import re
import signal
--
2.18.0.rc1.1.g3f1ff2140
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Qemu-devel] [PULL 3/4] Revert "tests: migration/guestperf Python 2.6 argparse compatibility"
2018-10-04 2:19 [Qemu-devel] [PULL 0/4] Python queue, 2018-10-03 Eduardo Habkost
2018-10-04 2:19 ` [Qemu-devel] [PULL 1/4] device-crash-test: No need for sys.path hack Eduardo Habkost
2018-10-04 2:19 ` [Qemu-devel] [PULL 2/4] Revert "docker.py: Python 2.6 argparse compatibility" Eduardo Habkost
@ 2018-10-04 2:19 ` Eduardo Habkost
2018-10-04 2:19 ` [Qemu-devel] [PULL 4/4] scripts/device-crash-test: Remove entries for serial devices Eduardo Habkost
2018-10-05 13:52 ` [Qemu-devel] [PULL 0/4] Python queue, 2018-10-03 Peter Maydell
4 siblings, 0 replies; 6+ messages in thread
From: Eduardo Habkost @ 2018-10-04 2:19 UTC (permalink / raw)
To: Peter Maydell, qemu-devel; +Cc: Eduardo Habkost, Cleber Rosa
This reverts commit 0ea47d0f36112f0f38661e2e430edf32737c7f43.
scripts/argparse.py was removed from the tree, so we don't
need this hack anymore.
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20180618225131.13113-4-ehabkost@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
tests/migration/guestperf/shell.py | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/tests/migration/guestperf/shell.py b/tests/migration/guestperf/shell.py
index a6b8cec1e0..61d2abbaad 100644
--- a/tests/migration/guestperf/shell.py
+++ b/tests/migration/guestperf/shell.py
@@ -19,14 +19,12 @@ from __future__ import print_function
#
-import os
-import os.path
-import sys
-sys.path.append(os.path.join(os.path.dirname(__file__),
- '..', '..', '..', 'scripts'))
import argparse
import fnmatch
+import os
+import os.path
import platform
+import sys
import logging
from guestperf.hardware import Hardware
--
2.18.0.rc1.1.g3f1ff2140
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Qemu-devel] [PULL 4/4] scripts/device-crash-test: Remove entries for serial devices
2018-10-04 2:19 [Qemu-devel] [PULL 0/4] Python queue, 2018-10-03 Eduardo Habkost
` (2 preceding siblings ...)
2018-10-04 2:19 ` [Qemu-devel] [PULL 3/4] Revert "tests: migration/guestperf " Eduardo Habkost
@ 2018-10-04 2:19 ` Eduardo Habkost
2018-10-05 13:52 ` [Qemu-devel] [PULL 0/4] Python queue, 2018-10-03 Peter Maydell
4 siblings, 0 replies; 6+ messages in thread
From: Eduardo Habkost @ 2018-10-04 2:19 UTC (permalink / raw)
To: Peter Maydell, qemu-devel; +Cc: Eduardo Habkost, Cleber Rosa, Thomas Huth
From: Thomas Huth <thuth@redhat.com>
The problem with the various serial devices has been fixed a while
ago in commit 47c4f85a0c27888e12af827471cfef87deb49821 ("hw/char/serial:
Allow disconnected chardevs") already, so we can remove these entries
from the "ignore" list in the device-crash-test script now.
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-Id: <1538403190-27146-1-git-send-email-thuth@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
scripts/device-crash-test | 5 -----
1 file changed, 5 deletions(-)
diff --git a/scripts/device-crash-test b/scripts/device-crash-test
index da0bc5edd0..930200b034 100755
--- a/scripts/device-crash-test
+++ b/scripts/device-crash-test
@@ -98,7 +98,6 @@ ERROR_WHITELIST = [
{'device':'isa-ipmi-bt', 'expected':True}, # IPMI device requires a bmc attribute to be set
{'device':'isa-ipmi-kcs', 'expected':True}, # IPMI device requires a bmc attribute to be set
{'device':'isa-parallel', 'expected':True}, # Can't create serial device, empty char device
- {'device':'isa-serial', 'expected':True}, # Can't create serial device, empty char device
{'device':'ivshmem', 'expected':True}, # You must specify either 'shm' or 'chardev'
{'device':'ivshmem-doorbell', 'expected':True}, # You must specify a 'chardev'
{'device':'ivshmem-plain', 'expected':True}, # You must specify a 'memdev'
@@ -109,9 +108,6 @@ ERROR_WHITELIST = [
{'device':'pc-dimm', 'expected':True}, # 'memdev' property is not set
{'device':'pci-bridge', 'expected':True}, # Bridge chassis not specified. Each bridge is required to be assigned a unique chassis id > 0.
{'device':'pci-bridge-seat', 'expected':True}, # Bridge chassis not specified. Each bridge is required to be assigned a unique chassis id > 0.
- {'device':'pci-serial', 'expected':True}, # Can't create serial device, empty char device
- {'device':'pci-serial-2x', 'expected':True}, # Can't create serial device, empty char device
- {'device':'pci-serial-4x', 'expected':True}, # Can't create serial device, empty char device
{'device':'pxa2xx-dma', 'expected':True}, # channels value invalid
{'device':'pxb', 'expected':True}, # Bridge chassis not specified. Each bridge is required to be assigned a unique chassis id > 0.
{'device':'scsi-block', 'expected':True}, # drive property not set
@@ -217,7 +213,6 @@ 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':-11, 'device':'isa-serial', 'loglevel':logging.ERROR, 'expected':True},
# everything else (including SIGABRT and SIGSEGV) will be a fatal error:
{'exitcode':None, 'fatal':True, 'loglevel':logging.FATAL},
--
2.18.0.rc1.1.g3f1ff2140
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PULL 0/4] Python queue, 2018-10-03
2018-10-04 2:19 [Qemu-devel] [PULL 0/4] Python queue, 2018-10-03 Eduardo Habkost
` (3 preceding siblings ...)
2018-10-04 2:19 ` [Qemu-devel] [PULL 4/4] scripts/device-crash-test: Remove entries for serial devices Eduardo Habkost
@ 2018-10-05 13:52 ` Peter Maydell
4 siblings, 0 replies; 6+ messages in thread
From: Peter Maydell @ 2018-10-05 13:52 UTC (permalink / raw)
To: Eduardo Habkost; +Cc: QEMU Developers, Cleber Rosa
On 4 October 2018 at 03:19, Eduardo Habkost <ehabkost@redhat.com> wrote:
> The following changes since commit dafd95053611aa14dda40266857608d12ddce658:
>
> Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (2018-10-02 18:27:18 +0100)
>
> are available in the Git repository at:
>
> git://github.com/ehabkost/qemu.git tags/python-next-pull-request
>
> for you to fetch changes up to cd0c3da730bc8369f0b6c1c6bf81babd9851060d:
>
> scripts/device-crash-test: Remove entries for serial devices (2018-10-03 23:08:51 -0300)
>
> ----------------------------------------------------------------
> Python queue, 2018-10-03
>
> * Remove fixed serial device errors from device-crash-test
> * Remove unnecessary Python 2.6 compatibility code
>
> ----------------------------------------------------------------
Applied, thanks.
-- PMM
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-10-05 13:52 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-10-04 2:19 [Qemu-devel] [PULL 0/4] Python queue, 2018-10-03 Eduardo Habkost
2018-10-04 2:19 ` [Qemu-devel] [PULL 1/4] device-crash-test: No need for sys.path hack Eduardo Habkost
2018-10-04 2:19 ` [Qemu-devel] [PULL 2/4] Revert "docker.py: Python 2.6 argparse compatibility" Eduardo Habkost
2018-10-04 2:19 ` [Qemu-devel] [PULL 3/4] Revert "tests: migration/guestperf " Eduardo Habkost
2018-10-04 2:19 ` [Qemu-devel] [PULL 4/4] scripts/device-crash-test: Remove entries for serial devices Eduardo Habkost
2018-10-05 13:52 ` [Qemu-devel] [PULL 0/4] Python queue, 2018-10-03 Peter Maydell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.