* [Qemu-devel] [PATCH v11 0/5] Update tests/qemu-iotests failing cases for the s390 platform
@ 2015-07-03 7:28 Bo Tu
2015-07-03 7:28 ` [Qemu-devel] [PATCH v11 1/5] qemu-iotests: qemu machine type support Bo Tu
` (6 more replies)
0 siblings, 7 replies; 10+ messages in thread
From: Bo Tu @ 2015-07-03 7:28 UTC (permalink / raw)
To: kwolf; +Cc: silbe, mreitz, mimu, qemu-devel, armbru
v11.
1. Add Reviewed-by of Sascha
2. Refine code change in common.config in order to be easier to read and be shorter
3. Add more comments in patch description
4. Combine the fix for 041 and 055 in one patch since they address the same issue
5. Remove the fix for 051 since it fails now
6. checkpatch.pl reports invaid UTF-8 error for 130 patch, because 130.out contains
some non-text data.
v10.
1. Add Reviewed-by statements for test 049
2. Removed the backslash in qemu-option.c
3. Please apply the series if there are no further objections
v9.
1.Fix issue of line over 80 characters for test 049
2.Add Reviewed-by statements for test 051,130
v8.
1.Modify error message in qemu-option.c when image size is invalid
2.Remove Reviewed-by statements if any functional changes in a new patch version
for test 049,051,130
3.Change patch subject for test 130
4.Add id definition for a drive which will work for all platforms in test 130
5.Disable virtio-scsi-pci for non-PCI systems in test 051
v7.
1. Add a pc specific output file for test 130.
2. A new variable device_id is defined in test 130 to support multiplatform.
3. Update the output file for test 051 based on it's current output.
4. change util/qemu-option.c and test case 049, generate error message
when image size is a negtive value or exceeds the maximum of uint64
v6.
1. Change the filter name from _filter_s390 to _filter_orphan.
2. Update the output file for tese case 081 because no default floopy and cd-rom.
v5:
1. Add a pc specific output file for test 051.
2. Add a filter to test case 051 to filter s390 specific warnings.
3. Check whether the machine type is pc or not rather than check whether the machine type
is s390.
4. When using a machine specific reference file if the default machine has an alias then
use the alias as the output file name otherwise use the default machine name as the output
file name.
v4:
1. Generate all patches based on the latest master branch.
2. Rearrange patches
v3:
1. Fix a typo in v2.
v2:
1. Drop the patches for test 039 for it has been fixed in upstream.
2. Integrate patches for test 071, 067 and 087.
3. Keep the other patches.
v1:
1. updated the test suite to be default-machine-type-aware, from the previous platform-aware
2. created a new patch "qemu-iotests: run qemu with -nodefaults" to counterpart the impact from the commit:
c88930a6866e74953e931ae749781e98e486e5c8
qemu-char: Permit only a single "stdio" character device
When more than one is used, the terminal settings aren't restored
correctly on exit. Fixable. However, such usage makes no sense,
because the users race for input, so outlaw it instead.
If you want to connect multiple things to stdio, use the mux
chardev.
3. updated all the checking of platform name to the current machine name
Bo Tu (5):
qemu-iotests: qemu machine type support
qemu-iotests: disable default qemu devices for cross-platform
compatibility
qemu-iotests: s390x: fix test 041 and 055
qemu-iotests: s390x: fix test 049, reject negative sizes in QemuOpts
qemu-iotests: s390x: fix test 130
tests/qemu-iotests/041 | 6 +
tests/qemu-iotests/049.out | 10 +-
tests/qemu-iotests/055 | 9 ++
tests/qemu-iotests/067 | 8 +-
tests/qemu-iotests/067.out | 266 +--------------------------------------
tests/qemu-iotests/071.out | 4 -
tests/qemu-iotests/081.out | 2 -
tests/qemu-iotests/087.out | 12 --
tests/qemu-iotests/130 | 8 +-
tests/qemu-iotests/130.out | 4 +-
tests/qemu-iotests/check | 5 +
tests/qemu-iotests/common | 1 +
tests/qemu-iotests/common.config | 11 +-
tests/qemu-iotests/common.qemu | 2 +-
tests/qemu-iotests/iotests.py | 1 +
util/qemu-option.c | 5 +
16 files changed, 53 insertions(+), 301 deletions(-)
--
2.3.0
^ permalink raw reply [flat|nested] 10+ messages in thread
* [Qemu-devel] [PATCH v11 1/5] qemu-iotests: qemu machine type support
2015-07-03 7:28 [Qemu-devel] [PATCH v11 0/5] Update tests/qemu-iotests failing cases for the s390 platform Bo Tu
@ 2015-07-03 7:28 ` Bo Tu
2015-07-03 7:28 ` [Qemu-devel] [PATCH v11 2/5] qemu-iotests: disable default qemu devices for cross-platform compatibility Bo Tu
` (5 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Bo Tu @ 2015-07-03 7:28 UTC (permalink / raw)
To: kwolf; +Cc: silbe, mreitz, mimu, qemu-devel, armbru
This patch adds qemu machine type support to the io test suite.
Based on the qemu default machine type and alias of the default machine
type the reference output file can now vary from the default to a
machine specific output file if necessary. When using a machine specific
reference file if the default machine has an alias then use the alias as the output
file name otherwise use the default machine name as the output file name.
Reviewed-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Michael Mueller <mimu@linux.vnet.ibm.com>
Reviewed-by: Sascha Silbe <silbe@linux.vnet.ibm.com>
Signed-off-by: Xiao Guang Chen <chenxg@linux.vnet.ibm.com>
---
tests/qemu-iotests/check | 5 +++++
tests/qemu-iotests/common.config | 11 ++++++++++-
tests/qemu-iotests/iotests.py | 1 +
3 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check
index 1fa6319..6d58203 100755
--- a/tests/qemu-iotests/check
+++ b/tests/qemu-iotests/check
@@ -330,6 +330,11 @@ do
fi
reference="$source_iotests/$seq.out"
+ reference_machine="$source_iotests/$seq.$QEMU_DEFAULT_MACHINE.out"
+ if [ -f "$reference_machine" ]; then
+ reference="$reference_machine"
+ fi
+
if [ "$CACHEMODE" = "none" ]; then
[ -f "$source_iotests/$seq.out.nocache" ] && reference="$source_iotests/$seq.out.nocache"
fi
diff --git a/tests/qemu-iotests/common.config b/tests/qemu-iotests/common.config
index a1973ad..e0bf896 100644
--- a/tests/qemu-iotests/common.config
+++ b/tests/qemu-iotests/common.config
@@ -103,10 +103,19 @@ if [ -z "$QEMU_NBD_PROG" ]; then
export QEMU_NBD_PROG="`set_prog_path qemu-nbd`"
fi
-export QEMU=$QEMU_PROG
+export QEMU="$QEMU_PROG $QEMU_OPTIONS"
export QEMU_IMG=$QEMU_IMG_PROG
export QEMU_IO="$QEMU_IO_PROG $QEMU_IO_OPTIONS"
export QEMU_NBD=$QEMU_NBD_PROG
+default_machine=$($QEMU -machine \? | awk '/(default)/{print $1}')
+default_alias_machine=$($QEMU -machine \? |\
+ awk -v var_default_machine="$default_machine"\)\
+ '{if ($(NF-2)=="(alias"&&$(NF-1)=="of"&&$(NF)==var_default_machine){print $1}}')
+if [ ! -z "$default_alias_machine" ]; then
+ default_machine="$default_alias_machine"
+fi
+
+export QEMU_DEFAULT_MACHINE="$default_machine"
[ -f /etc/qemu-iotest.config ] && . /etc/qemu-iotest.config
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index 04a294d..7b65469 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -42,6 +42,7 @@ imgproto = os.environ.get('IMGPROTO', 'file')
test_dir = os.environ.get('TEST_DIR', '/var/tmp')
output_dir = os.environ.get('OUTPUT_DIR', '.')
cachemode = os.environ.get('CACHEMODE')
+qemu_default_machine = os.environ.get('QEMU_DEFAULT_MACHINE')
socket_scm_helper = os.environ.get('SOCKET_SCM_HELPER', 'socket_scm_helper')
--
2.3.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Qemu-devel] [PATCH v11 2/5] qemu-iotests: disable default qemu devices for cross-platform compatibility
2015-07-03 7:28 [Qemu-devel] [PATCH v11 0/5] Update tests/qemu-iotests failing cases for the s390 platform Bo Tu
2015-07-03 7:28 ` [Qemu-devel] [PATCH v11 1/5] qemu-iotests: qemu machine type support Bo Tu
@ 2015-07-03 7:28 ` Bo Tu
2015-07-03 7:28 ` [Qemu-devel] [PATCH v11 3/5] qemu-iotests: s390x: fix test 041 and 055 Bo Tu
` (4 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Bo Tu @ 2015-07-03 7:28 UTC (permalink / raw)
To: kwolf; +Cc: silbe, mreitz, mimu, qemu-devel, armbru
This patch fixes an io test suite issue that was introduced with the
commit c88930a6866e74953e931ae749781e98e486e5c8 'qemu-char: Permit only
a single "stdio" character device'. The option supresses the creation of
default devices such as the floopy and cdrom. Output files for test case
067, 071, 081 and 087 need to be updated to accommodate this change.
Use virtio-blk instead of virtio-blk-pci as the device driver for test
case 067. For virtio-blk-pci is the same with virtio-blk as device
driver but other platform such as s390 may not recognize the virtio-blk-pci.
The default devices differ across machines. As the qemu output often
contains these devices (or events for them, like opening a CD tray on
reset), the reference output currently is rather machine-specific.
All existing qemu tests explicitly configure the devices they're working
with, so just pass -nodefaults to qemu by default to disable the default
devices. Update the reference outputs accordingly.
Reviewed-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Michael Mueller <mimu@linux.vnet.ibm.com>
Reviewed-by: Sascha Silbe <silbe@linux.vnet.ibm.com>
Signed-off-by: Xiao Guang Chen <chenxg@linux.vnet.ibm.com>
---
tests/qemu-iotests/067 | 8 +-
tests/qemu-iotests/067.out | 266 +----------------------------------------
tests/qemu-iotests/071.out | 4 -
tests/qemu-iotests/081.out | 2 -
tests/qemu-iotests/087.out | 12 --
tests/qemu-iotests/common | 1 +
tests/qemu-iotests/common.qemu | 2 +-
7 files changed, 7 insertions(+), 288 deletions(-)
diff --git a/tests/qemu-iotests/067 b/tests/qemu-iotests/067
index 83eefa3..3e9a053 100755
--- a/tests/qemu-iotests/067
+++ b/tests/qemu-iotests/067
@@ -59,7 +59,7 @@ echo
echo === -drive/-device and device_del ===
echo
-run_qemu -drive file=$TEST_IMG,format=$IMGFMT,if=none,id=disk -device virtio-blk-pci,drive=disk,id=virtio0 <<EOF
+run_qemu -drive file=$TEST_IMG,format=$IMGFMT,if=none,id=disk -device virtio-blk,drive=disk,id=virtio0 <<EOF
{ "execute": "qmp_capabilities" }
{ "execute": "query-block" }
{ "execute": "device_del", "arguments": { "id": "virtio0" } }
@@ -76,7 +76,7 @@ run_qemu -drive file=$TEST_IMG,format=$IMGFMT,if=none,id=disk <<EOF
{ "execute": "qmp_capabilities" }
{ "execute": "query-block" }
{ "execute": "device_add",
- "arguments": { "driver": "virtio-blk-pci", "drive": "disk",
+ "arguments": { "driver": "virtio-blk", "drive": "disk",
"id": "virtio0" } }
{ "execute": "device_del", "arguments": { "id": "virtio0" } }
{ "execute": "system_reset" }
@@ -94,7 +94,7 @@ run_qemu <<EOF
"arguments": { "command-line": "drive_add 0 file=$TEST_IMG,format=$IMGFMT,if=none,id=disk" } }
{ "execute": "query-block" }
{ "execute": "device_add",
- "arguments": { "driver": "virtio-blk-pci", "drive": "disk",
+ "arguments": { "driver": "virtio-blk", "drive": "disk",
"id": "virtio0" } }
{ "execute": "device_del", "arguments": { "id": "virtio0" } }
{ "execute": "system_reset" }
@@ -122,7 +122,7 @@ run_qemu <<EOF
}
{ "execute": "query-block" }
{ "execute": "device_add",
- "arguments": { "driver": "virtio-blk-pci", "drive": "disk",
+ "arguments": { "driver": "virtio-blk", "drive": "disk",
"id": "virtio0" } }
{ "execute": "device_del", "arguments": { "id": "virtio0" } }
{ "execute": "system_reset" }
diff --git a/tests/qemu-iotests/067.out b/tests/qemu-iotests/067.out
index 6ff41bc..5fbc881 100644
--- a/tests/qemu-iotests/067.out
+++ b/tests/qemu-iotests/067.out
@@ -3,7 +3,7 @@ Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
=== -drive/-device and device_del ===
-Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,if=none,id=disk -device virtio-blk-pci,drive=disk,id=virtio0
+Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,if=none,id=disk -device virtio-blk,drive=disk,id=virtio0
{
QMP_VERSION
}
@@ -57,28 +57,6 @@ Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,if=none,id=disk -device virti
"encryption_key_missing": false
},
"type": "unknown"
- },
- {
- "io-status": "ok",
- "device": "ide1-cd0",
- "locked": false,
- "removable": true,
- "tray_open": false,
- "type": "unknown"
- },
- {
- "device": "floppy0",
- "locked": false,
- "removable": true,
- "tray_open": false,
- "type": "unknown"
- },
- {
- "device": "sd0",
- "locked": false,
- "removable": true,
- "tray_open": false,
- "type": "unknown"
}
]
}
@@ -120,28 +98,6 @@ Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,if=none,id=disk -device virti
}
{
"return": [
- {
- "io-status": "ok",
- "device": "ide1-cd0",
- "locked": false,
- "removable": true,
- "tray_open": false,
- "type": "unknown"
- },
- {
- "device": "floppy0",
- "locked": false,
- "removable": true,
- "tray_open": false,
- "type": "unknown"
- },
- {
- "device": "sd0",
- "locked": false,
- "removable": true,
- "tray_open": false,
- "type": "unknown"
- }
]
}
{
@@ -155,28 +111,6 @@ Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,if=none,id=disk -device virti
},
"event": "SHUTDOWN"
}
-{
- "timestamp": {
- "seconds": TIMESTAMP,
- "microseconds": TIMESTAMP
- },
- "event": "DEVICE_TRAY_MOVED",
- "data": {
- "device": "ide1-cd0",
- "tray-open": true
- }
-}
-{
- "timestamp": {
- "seconds": TIMESTAMP,
- "microseconds": TIMESTAMP
- },
- "event": "DEVICE_TRAY_MOVED",
- "data": {
- "device": "floppy0",
- "tray-open": true
- }
-}
=== -drive/device_add and device_del ===
@@ -235,28 +169,6 @@ Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,if=none,id=disk
},
"tray_open": false,
"type": "unknown"
- },
- {
- "io-status": "ok",
- "device": "ide1-cd0",
- "locked": false,
- "removable": true,
- "tray_open": false,
- "type": "unknown"
- },
- {
- "device": "floppy0",
- "locked": false,
- "removable": true,
- "tray_open": false,
- "type": "unknown"
- },
- {
- "device": "sd0",
- "locked": false,
- "removable": true,
- "tray_open": false,
- "type": "unknown"
}
]
}
@@ -302,28 +214,6 @@ Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,if=none,id=disk
}
{
"return": [
- {
- "io-status": "ok",
- "device": "ide1-cd0",
- "locked": false,
- "removable": true,
- "tray_open": false,
- "type": "unknown"
- },
- {
- "device": "floppy0",
- "locked": false,
- "removable": true,
- "tray_open": false,
- "type": "unknown"
- },
- {
- "device": "sd0",
- "locked": false,
- "removable": true,
- "tray_open": false,
- "type": "unknown"
- }
]
}
{
@@ -337,28 +227,6 @@ Testing: -drive file=TEST_DIR/t.qcow2,format=qcow2,if=none,id=disk
},
"event": "SHUTDOWN"
}
-{
- "timestamp": {
- "seconds": TIMESTAMP,
- "microseconds": TIMESTAMP
- },
- "event": "DEVICE_TRAY_MOVED",
- "data": {
- "device": "ide1-cd0",
- "tray-open": true
- }
-}
-{
- "timestamp": {
- "seconds": TIMESTAMP,
- "microseconds": TIMESTAMP
- },
- "event": "DEVICE_TRAY_MOVED",
- "data": {
- "device": "floppy0",
- "tray-open": true
- }
-}
=== drive_add/device_add and device_del ===
@@ -377,28 +245,6 @@ Testing:
{
"return": [
{
- "io-status": "ok",
- "device": "ide1-cd0",
- "locked": false,
- "removable": true,
- "tray_open": false,
- "type": "unknown"
- },
- {
- "device": "floppy0",
- "locked": false,
- "removable": true,
- "tray_open": false,
- "type": "unknown"
- },
- {
- "device": "sd0",
- "locked": false,
- "removable": true,
- "tray_open": false,
- "type": "unknown"
- },
- {
"device": "disk",
"locked": false,
"removable": true,
@@ -487,28 +333,6 @@ Testing:
}
{
"return": [
- {
- "io-status": "ok",
- "device": "ide1-cd0",
- "locked": false,
- "removable": true,
- "tray_open": false,
- "type": "unknown"
- },
- {
- "device": "floppy0",
- "locked": false,
- "removable": true,
- "tray_open": false,
- "type": "unknown"
- },
- {
- "device": "sd0",
- "locked": false,
- "removable": true,
- "tray_open": false,
- "type": "unknown"
- }
]
}
{
@@ -522,28 +346,6 @@ Testing:
},
"event": "SHUTDOWN"
}
-{
- "timestamp": {
- "seconds": TIMESTAMP,
- "microseconds": TIMESTAMP
- },
- "event": "DEVICE_TRAY_MOVED",
- "data": {
- "device": "ide1-cd0",
- "tray-open": true
- }
-}
-{
- "timestamp": {
- "seconds": TIMESTAMP,
- "microseconds": TIMESTAMP
- },
- "event": "DEVICE_TRAY_MOVED",
- "data": {
- "device": "floppy0",
- "tray-open": true
- }
-}
=== blockdev_add/device_add and device_del ===
@@ -563,28 +365,6 @@ Testing:
{
"return": [
{
- "io-status": "ok",
- "device": "ide1-cd0",
- "locked": false,
- "removable": true,
- "tray_open": false,
- "type": "unknown"
- },
- {
- "device": "floppy0",
- "locked": false,
- "removable": true,
- "tray_open": false,
- "type": "unknown"
- },
- {
- "device": "sd0",
- "locked": false,
- "removable": true,
- "tray_open": false,
- "type": "unknown"
- },
- {
"device": "disk",
"locked": false,
"removable": true,
@@ -675,28 +455,6 @@ Testing:
"return": [
{
"io-status": "ok",
- "device": "ide1-cd0",
- "locked": false,
- "removable": true,
- "tray_open": false,
- "type": "unknown"
- },
- {
- "device": "floppy0",
- "locked": false,
- "removable": true,
- "tray_open": false,
- "type": "unknown"
- },
- {
- "device": "sd0",
- "locked": false,
- "removable": true,
- "tray_open": false,
- "type": "unknown"
- },
- {
- "io-status": "ok",
"device": "disk",
"locked": false,
"removable": true,
@@ -754,27 +512,5 @@ Testing:
},
"event": "SHUTDOWN"
}
-{
- "timestamp": {
- "seconds": TIMESTAMP,
- "microseconds": TIMESTAMP
- },
- "event": "DEVICE_TRAY_MOVED",
- "data": {
- "device": "ide1-cd0",
- "tray-open": true
- }
-}
-{
- "timestamp": {
- "seconds": TIMESTAMP,
- "microseconds": TIMESTAMP
- },
- "event": "DEVICE_TRAY_MOVED",
- "data": {
- "device": "floppy0",
- "tray-open": true
- }
-}
*** done
diff --git a/tests/qemu-iotests/071.out b/tests/qemu-iotests/071.out
index 9205ce2..8d2095a 100644
--- a/tests/qemu-iotests/071.out
+++ b/tests/qemu-iotests/071.out
@@ -50,8 +50,6 @@ read failed: Input/output error
{"return": ""}
{"return": {}}
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN"}
-{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "DEVICE_TRAY_MOVED", "data": {"device": "ide1-cd0", "tray-open": true}}
-{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "DEVICE_TRAY_MOVED", "data": {"device": "floppy0", "tray-open": true}}
QEMU_PROG: Failed to flush the L2 table cache: Input/output error
QEMU_PROG: Failed to flush the refcount block cache: Input/output error
@@ -90,8 +88,6 @@ read failed: Input/output error
{"return": ""}
{"return": {}}
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN"}
-{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "DEVICE_TRAY_MOVED", "data": {"device": "ide1-cd0", "tray-open": true}}
-{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "DEVICE_TRAY_MOVED", "data": {"device": "floppy0", "tray-open": true}}
QEMU_PROG: Failed to flush the L2 table cache: Input/output error
QEMU_PROG: Failed to flush the refcount block cache: Input/output error
diff --git a/tests/qemu-iotests/081.out b/tests/qemu-iotests/081.out
index 9f57d9d..692c4a4 100644
--- a/tests/qemu-iotests/081.out
+++ b/tests/qemu-iotests/081.out
@@ -36,8 +36,6 @@ read 10485760/10485760 bytes at offset 0
{"return": ""}
{"return": {}}
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN"}
-{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "DEVICE_TRAY_MOVED", "data": {"device": "ide1-cd0", "tray-open": true}}
-{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "DEVICE_TRAY_MOVED", "data": {"device": "floppy0", "tray-open": true}}
== using quorum rewrite corrupted mode ==
diff --git a/tests/qemu-iotests/087.out b/tests/qemu-iotests/087.out
index c71bb3a..c509a40 100644
--- a/tests/qemu-iotests/087.out
+++ b/tests/qemu-iotests/087.out
@@ -9,8 +9,6 @@ QMP_VERSION
{"error": {"class": "GenericError", "desc": "Block device needs an ID"}}
{"return": {}}
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN"}
-{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "DEVICE_TRAY_MOVED", "data": {"device": "ide1-cd0", "tray-open": true}}
-{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "DEVICE_TRAY_MOVED", "data": {"device": "floppy0", "tray-open": true}}
=== Duplicate ID ===
@@ -26,8 +24,6 @@ QMP_VERSION
{"error": {"class": "GenericError", "desc": "node-name=disk3 is conflicting with a device id"}}
{"return": {}}
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN"}
-{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "DEVICE_TRAY_MOVED", "data": {"device": "ide1-cd0", "tray-open": true}}
-{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "DEVICE_TRAY_MOVED", "data": {"device": "floppy0", "tray-open": true}}
=== aio=native without O_DIRECT ===
@@ -38,8 +34,6 @@ QMP_VERSION
{"error": {"class": "GenericError", "desc": "aio=native requires cache.direct=true"}}
{"return": {}}
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN"}
-{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "DEVICE_TRAY_MOVED", "data": {"device": "ide1-cd0", "tray-open": true}}
-{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "DEVICE_TRAY_MOVED", "data": {"device": "floppy0", "tray-open": true}}
=== Encrypted image ===
@@ -60,8 +54,6 @@ You can use 'qemu-img convert' to convert your image to an unencrypted one.
{"error": {"class": "GenericError", "desc": "blockdev-add doesn't support encrypted devices"}}
{"return": {}}
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN"}
-{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "DEVICE_TRAY_MOVED", "data": {"device": "ide1-cd0", "tray-open": true}}
-{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "DEVICE_TRAY_MOVED", "data": {"device": "floppy0", "tray-open": true}}
Testing:
QMP_VERSION
@@ -72,8 +64,6 @@ You can use 'qemu-img convert' to convert your image to an unencrypted one.
{"error": {"class": "GenericError", "desc": "Guest must be stopped for opening of encrypted image"}}
{"return": {}}
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN"}
-{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "DEVICE_TRAY_MOVED", "data": {"device": "ide1-cd0", "tray-open": true}}
-{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "DEVICE_TRAY_MOVED", "data": {"device": "floppy0", "tray-open": true}}
=== Missing driver ===
@@ -91,7 +81,5 @@ QMP_VERSION
{"error": {"class": "GenericError", "desc": "Invalid parameter type for 'driver', expected: string"}}
{"return": {}}
{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "SHUTDOWN"}
-{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "DEVICE_TRAY_MOVED", "data": {"device": "ide1-cd0", "tray-open": true}}
-{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event": "DEVICE_TRAY_MOVED", "data": {"device": "floppy0", "tray-open": true}}
*** done
diff --git a/tests/qemu-iotests/common b/tests/qemu-iotests/common
index 1030aaf..25c351b 100644
--- a/tests/qemu-iotests/common
+++ b/tests/qemu-iotests/common
@@ -52,6 +52,7 @@ export IMGOPTS=""
export CACHEMODE="writeback"
export QEMU_IO_OPTIONS=""
export CACHEMODE_IS_DEFAULT=true
+export QEMU_OPTIONS="-nodefaults"
for r
do
diff --git a/tests/qemu-iotests/common.qemu b/tests/qemu-iotests/common.qemu
index 4e1996c..e3faa53 100644
--- a/tests/qemu-iotests/common.qemu
+++ b/tests/qemu-iotests/common.qemu
@@ -153,7 +153,7 @@ function _launch_qemu()
mkfifo "${fifo_out}"
mkfifo "${fifo_in}"
- "${QEMU}" -nographic -serial none ${comm} -machine accel=qtest "${@}" \
+ ${QEMU} -nographic -serial none ${comm} -machine accel=qtest "${@}" \
>"${fifo_out}" \
2>&1 \
<"${fifo_in}" &
--
2.3.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Qemu-devel] [PATCH v11 3/5] qemu-iotests: s390x: fix test 041 and 055
2015-07-03 7:28 [Qemu-devel] [PATCH v11 0/5] Update tests/qemu-iotests failing cases for the s390 platform Bo Tu
2015-07-03 7:28 ` [Qemu-devel] [PATCH v11 1/5] qemu-iotests: qemu machine type support Bo Tu
2015-07-03 7:28 ` [Qemu-devel] [PATCH v11 2/5] qemu-iotests: disable default qemu devices for cross-platform compatibility Bo Tu
@ 2015-07-03 7:28 ` Bo Tu
2015-07-03 7:28 ` [Qemu-devel] [PATCH v11 4/5] qemu-iotests: s390x: fix test 049, reject negative sizes in QemuOpts Bo Tu
` (3 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Bo Tu @ 2015-07-03 7:28 UTC (permalink / raw)
To: kwolf; +Cc: silbe, mreitz, mimu, qemu-devel, armbru
There is no 'ide-cd' device defined on non-pc platform, so
test_medium_not_found() test should be skipped.
Reviewed-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Michael Mueller <mimu@linux.vnet.ibm.com>
Reviewed-by: Sascha Silbe <silbe@linux.vnet.ibm.com>
Signed-off-by: Xiao Guang Chen <chenxg@linux.vnet.ibm.com>
---
tests/qemu-iotests/041 | 6 ++++++
tests/qemu-iotests/055 | 9 +++++++++
2 files changed, 15 insertions(+)
diff --git a/tests/qemu-iotests/041 b/tests/qemu-iotests/041
index 59a8f73..c6abe3c 100755
--- a/tests/qemu-iotests/041
+++ b/tests/qemu-iotests/041
@@ -197,6 +197,9 @@ class TestSingleDrive(ImageMirroringTestCase):
'target image does not match source after mirroring')
def test_medium_not_found(self):
+ if iotests.qemu_default_machine != 'pc':
+ return
+
result = self.vm.qmp('drive-mirror', device='ide1-cd0', sync='full',
target=target_img)
self.assert_qmp(result, 'error/class', 'GenericError')
@@ -867,6 +870,9 @@ class TestRepairQuorum(ImageMirroringTestCase):
if not self.has_quorum():
return
+ if iotests.qemu_default_machine != 'pc':
+ return
+
result = self.vm.qmp('drive-mirror', device='ide1-cd0', sync='full',
node_name='repair0',
replaces='img1',
diff --git a/tests/qemu-iotests/055 b/tests/qemu-iotests/055
index 017a609..e6e0ac4 100755
--- a/tests/qemu-iotests/055
+++ b/tests/qemu-iotests/055
@@ -104,11 +104,17 @@ class TestSingleDrive(iotests.QMPTestCase):
self.do_test_pause('blockdev-backup', 'drive1', blockdev_target_img)
def test_medium_not_found(self):
+ if iotests.qemu_default_machine != 'pc':
+ return
+
result = self.vm.qmp('drive-backup', device='ide1-cd0',
target=target_img, sync='full')
self.assert_qmp(result, 'error/class', 'GenericError')
def test_medium_not_found_blockdev_backup(self):
+ if iotests.qemu_default_machine != 'pc':
+ return
+
result = self.vm.qmp('blockdev-backup', device='ide1-cd0',
target='drive1', sync='full')
self.assert_qmp(result, 'error/class', 'GenericError')
@@ -323,6 +329,9 @@ class TestSingleTransaction(iotests.QMPTestCase):
self.do_test_pause('blockdev-backup', 'drive1', blockdev_target_img)
def do_test_medium_not_found(self, cmd, target):
+ if iotests.qemu_default_machine != 'pc':
+ return
+
result = self.vm.qmp('transaction', actions=[{
'type': cmd,
'data': { 'device': 'ide1-cd0',
--
2.3.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Qemu-devel] [PATCH v11 4/5] qemu-iotests: s390x: fix test 049, reject negative sizes in QemuOpts
2015-07-03 7:28 [Qemu-devel] [PATCH v11 0/5] Update tests/qemu-iotests failing cases for the s390 platform Bo Tu
` (2 preceding siblings ...)
2015-07-03 7:28 ` [Qemu-devel] [PATCH v11 3/5] qemu-iotests: s390x: fix test 041 and 055 Bo Tu
@ 2015-07-03 7:28 ` Bo Tu
2015-07-03 7:28 ` [Qemu-devel] [PATCH v11 5/5] qemu-iotests: s390x: fix test 130 Bo Tu
` (2 subsequent siblings)
6 siblings, 0 replies; 10+ messages in thread
From: Bo Tu @ 2015-07-03 7:28 UTC (permalink / raw)
To: kwolf; +Cc: silbe, mreitz, mimu, qemu-devel, armbru
when creating an image qemu-img enable us specifying the size of the
image using -o size=xx options. But when we specify an invalid size
such as a negtive size then different platform gives different result.
parse_option_size() function in util/qemu-option.c will be called to
parse the size, a cast was called in the function to cast the input
(saved as a double in the function) size to an unsigned int64 value,
when the input is a negtive value or exceeds the maximum of uint64, then
the result is undefined.
According to C99 6.3.1.4, the result of converting a floating point
number to an integer that cannot represent the (integer part of) number
is undefined. And sure enough the results are different on x86 and
s390.
C99 Language spec 6.3.1.4 Real floating and integers:
the result of this assignment/cast is undefined if the float is not
in the open interval (-1, U<type>_MAX+1).
Reviewed-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Sascha Silbe <silbe@linux.vnet.ibm.com>
Signed-off-by: Bo Tu <tubo@linux.vnet.ibm.com>
---
tests/qemu-iotests/049.out | 10 ++++------
util/qemu-option.c | 5 +++++
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/tests/qemu-iotests/049.out b/tests/qemu-iotests/049.out
index 9f93666..8884543 100644
--- a/tests/qemu-iotests/049.out
+++ b/tests/qemu-iotests/049.out
@@ -95,17 +95,15 @@ qemu-img create -f qcow2 TEST_DIR/t.qcow2 -- -1024
qemu-img: Image size must be less than 8 EiB!
qemu-img create -f qcow2 -o size=-1024 TEST_DIR/t.qcow2
-qemu-img: qcow2 doesn't support shrinking images yet
-qemu-img: TEST_DIR/t.qcow2: Could not resize image: Operation not supported
-Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=-1024 encryption=off cluster_size=65536 lazy_refcounts=off refcount_bits=16
+qemu-img: Parameter 'size' expects a non-negative number below 2^64
+qemu-img: TEST_DIR/t.qcow2: Invalid options for file format 'qcow2'
qemu-img create -f qcow2 TEST_DIR/t.qcow2 -- -1k
qemu-img: Image size must be less than 8 EiB!
qemu-img create -f qcow2 -o size=-1k TEST_DIR/t.qcow2
-qemu-img: qcow2 doesn't support shrinking images yet
-qemu-img: TEST_DIR/t.qcow2: Could not resize image: Operation not supported
-Formatting 'TEST_DIR/t.qcow2', fmt=qcow2 size=-1024 encryption=off cluster_size=65536 lazy_refcounts=off refcount_bits=16
+qemu-img: Parameter 'size' expects a non-negative number below 2^64
+qemu-img: TEST_DIR/t.qcow2: Invalid options for file format 'qcow2'
qemu-img create -f qcow2 TEST_DIR/t.qcow2 -- 1kilobyte
qemu-img: Invalid image size specified! You may use k, M, G, T, P or E suffixes for
diff --git a/util/qemu-option.c b/util/qemu-option.c
index efe9d27..efd6f02 100644
--- a/util/qemu-option.c
+++ b/util/qemu-option.c
@@ -180,6 +180,11 @@ void parse_option_size(const char *name, const char *value,
if (value != NULL) {
sizef = strtod(value, &postfix);
+ if (sizef < 0 || sizef > UINT64_MAX) {
+ error_setg(errp, QERR_INVALID_PARAMETER_VALUE, name,
+ "a non-negative number below 2^64");
+ return;
+ }
switch (*postfix) {
case 'T':
sizef *= 1024;
--
2.3.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [Qemu-devel] [PATCH v11 5/5] qemu-iotests: s390x: fix test 130
2015-07-03 7:28 [Qemu-devel] [PATCH v11 0/5] Update tests/qemu-iotests failing cases for the s390 platform Bo Tu
` (3 preceding siblings ...)
2015-07-03 7:28 ` [Qemu-devel] [PATCH v11 4/5] qemu-iotests: s390x: fix test 049, reject negative sizes in QemuOpts Bo Tu
@ 2015-07-03 7:28 ` Bo Tu
2015-08-13 11:06 ` [Qemu-devel] [PATCH v11 0/5] Update tests/qemu-iotests failing cases for the s390 platform tu bo
2015-08-13 13:28 ` Kevin Wolf
6 siblings, 0 replies; 10+ messages in thread
From: Bo Tu @ 2015-07-03 7:28 UTC (permalink / raw)
To: kwolf; +Cc: silbe, mreitz, mimu, qemu-devel, armbru
The default device id of hard disk on the s390 platform is "virtio0"
which differs to the "ide0-hd0" for the x86 platform. Setting id in
the drive definition, ie:"qemu -drive id=testdisk", will be the same
on all platforms.
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Bo Tu <tubo@linux.vnet.ibm.com>
---
tests/qemu-iotests/130 | 8 ++++----
tests/qemu-iotests/130.out | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/tests/qemu-iotests/130 b/tests/qemu-iotests/130
index bc26247..9209992 100755
--- a/tests/qemu-iotests/130
+++ b/tests/qemu-iotests/130
@@ -59,8 +59,8 @@ echo
# bdrv_make_empty() involves a header update for qcow2
# Test that a backing file isn't written
-_launch_qemu -drive file="$TEST_IMG",backing.file.filename="$TEST_IMG.base"
-_send_qemu_cmd $QEMU_HANDLE "commit ide0-hd0" "(qemu)"
+_launch_qemu -drive id=testdisk,file="$TEST_IMG",backing.file.filename="$TEST_IMG.base"
+_send_qemu_cmd $QEMU_HANDLE "commit testdisk" "(qemu)"
_send_qemu_cmd $QEMU_HANDLE '' '(qemu)'
_cleanup_qemu
_img_info | _filter_img_info
@@ -68,8 +68,8 @@ _img_info | _filter_img_info
# Make sure that if there was a backing file that was just overridden on the
# command line, that backing file is retained, with the right format
_make_test_img -F raw -b "$TEST_IMG.orig" 64M
-_launch_qemu -drive file="$TEST_IMG",backing.file.filename="$TEST_IMG.base",backing.driver=$IMGFMT
-_send_qemu_cmd $QEMU_HANDLE "commit ide0-hd0" "(qemu)"
+_launch_qemu -drive id=testdisk,file="$TEST_IMG",backing.file.filename="$TEST_IMG.base",backing.driver=$IMGFMT
+_send_qemu_cmd $QEMU_HANDLE "commit testdisk" "(qemu)"
_send_qemu_cmd $QEMU_HANDLE '' '(qemu)'
_cleanup_qemu
_img_info | _filter_img_info
diff --git a/tests/qemu-iotests/130.out b/tests/qemu-iotests/130.out
index ea68b5d..9ec9d2a 100644
--- a/tests/qemu-iotests/130.out
+++ b/tests/qemu-iotests/130.out
@@ -9,14 +9,14 @@ virtual size: 64M (67108864 bytes)
=== HMP commit ===
QEMU X.Y.Z monitor - type 'help' for more information
-(qemu) c^[[K^[[Dco^[[K^[[D^[[Dcom^[[K^[[D^[[D^[[Dcomm^[[K^[[D^[[D^[[D^[[Dcommi^[[K^[[D^[[D^[[D^[[D^[[Dcommit^[[K^[[D^[[D^[[D^[[D^[[D^[[Dcommit ^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit i^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit id^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit ide^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit ide0^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit ide0-^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit ide0-h^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit ide0-hd^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit ide0-hd0^[[K
+(qemu) c^[[K^[[Dco^[[K^[[D^[[Dcom^[[K^[[D^[[D^[[Dcomm^[[K^[[D^[[D^[[D^[[Dcommi^[[K^[[D^[[D^[[D^[[D^[[Dcommit^[[K^[[D^[[D^[[D^[[D^[[D^[[Dcommit ^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit t^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit te^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit tes^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit test^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit testd^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit testdi^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit testdis^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit testdisk^[[K
(qemu)
image: TEST_DIR/t.IMGFMT
file format: IMGFMT
virtual size: 64M (67108864 bytes)
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 backing_file='TEST_DIR/t.IMGFMT.orig' backing_fmt='raw'
QEMU X.Y.Z monitor - type 'help' for more information
-(qemu) c^[[K^[[Dco^[[K^[[D^[[Dcom^[[K^[[D^[[D^[[Dcomm^[[K^[[D^[[D^[[D^[[Dcommi^[[K^[[D^[[D^[[D^[[D^[[Dcommit^[[K^[[D^[[D^[[D^[[D^[[D^[[Dcommit ^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit i^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit id^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit ide^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit ide0^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit ide0-^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit ide0-h^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit ide0-hd^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit ide0-hd0^[[K
+(qemu) c^[[K^[[Dco^[[K^[[D^[[Dcom^[[K^[[D^[[D^[[Dcomm^[[K^[[D^[[D^[[D^[[Dcommi^[[K^[[D^[[D^[[D^[[D^[[Dcommit^[[K^[[D^[[D^[[D^[[D^[[D^[[Dcommit ^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit t^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit te^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit tes^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit test^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit testd^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit testdi^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit testdis^[[K^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[D^[[Dcommit testdisk^[[K
(qemu)
image: TEST_DIR/t.IMGFMT
file format: IMGFMT
--
2.3.0
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [Qemu-devel] [PATCH v11 0/5] Update tests/qemu-iotests failing cases for the s390 platform
2015-07-03 7:28 [Qemu-devel] [PATCH v11 0/5] Update tests/qemu-iotests failing cases for the s390 platform Bo Tu
` (4 preceding siblings ...)
2015-07-03 7:28 ` [Qemu-devel] [PATCH v11 5/5] qemu-iotests: s390x: fix test 130 Bo Tu
@ 2015-08-13 11:06 ` tu bo
2015-08-13 13:28 ` Kevin Wolf
6 siblings, 0 replies; 10+ messages in thread
From: tu bo @ 2015-08-13 11:06 UTC (permalink / raw)
To: kwolf; +Cc: qemu-devel, armbru, mreitz, mimu, silbe
Max replied that ignoring the UTF-8 error for 130 patch reported by
checkpatch.pl is fine.
Could you please apply the series if there are no further objections.
thanks
On 07/03/2015 03:28 PM, Bo Tu wrote:
> v11.
> 1. Add Reviewed-by of Sascha
> 2. Refine code change in common.config in order to be easier to read and be shorter
> 3. Add more comments in patch description
> 4. Combine the fix for 041 and 055 in one patch since they address the same issue
> 5. Remove the fix for 051 since it fails now
> 6. checkpatch.pl reports invaid UTF-8 error for 130 patch, because 130.out contains
> some non-text data.
>
> v10.
> 1. Add Reviewed-by statements for test 049
> 2. Removed the backslash in qemu-option.c
> 3. Please apply the series if there are no further objections
>
> v9.
> 1.Fix issue of line over 80 characters for test 049
> 2.Add Reviewed-by statements for test 051,130
>
> v8.
> 1.Modify error message in qemu-option.c when image size is invalid
> 2.Remove Reviewed-by statements if any functional changes in a new patch version
> for test 049,051,130
> 3.Change patch subject for test 130
> 4.Add id definition for a drive which will work for all platforms in test 130
> 5.Disable virtio-scsi-pci for non-PCI systems in test 051
>
> v7.
> 1. Add a pc specific output file for test 130.
> 2. A new variable device_id is defined in test 130 to support multiplatform.
> 3. Update the output file for test 051 based on it's current output.
> 4. change util/qemu-option.c and test case 049, generate error message
> when image size is a negtive value or exceeds the maximum of uint64
>
> v6.
> 1. Change the filter name from _filter_s390 to _filter_orphan.
> 2. Update the output file for tese case 081 because no default floopy and cd-rom.
>
> v5:
> 1. Add a pc specific output file for test 051.
> 2. Add a filter to test case 051 to filter s390 specific warnings.
> 3. Check whether the machine type is pc or not rather than check whether the machine type
> is s390.
> 4. When using a machine specific reference file if the default machine has an alias then
> use the alias as the output file name otherwise use the default machine name as the output
> file name.
>
> v4:
> 1. Generate all patches based on the latest master branch.
> 2. Rearrange patches
>
> v3:
> 1. Fix a typo in v2.
>
> v2:
> 1. Drop the patches for test 039 for it has been fixed in upstream.
> 2. Integrate patches for test 071, 067 and 087.
> 3. Keep the other patches.
>
> v1:
> 1. updated the test suite to be default-machine-type-aware, from the previous platform-aware
> 2. created a new patch "qemu-iotests: run qemu with -nodefaults" to counterpart the impact from the commit:
> c88930a6866e74953e931ae749781e98e486e5c8
> qemu-char: Permit only a single "stdio" character device
>
> When more than one is used, the terminal settings aren't restored
> correctly on exit. Fixable. However, such usage makes no sense,
> because the users race for input, so outlaw it instead.
>
> If you want to connect multiple things to stdio, use the mux
> chardev.
> 3. updated all the checking of platform name to the current machine name
>
> Bo Tu (5):
> qemu-iotests: qemu machine type support
> qemu-iotests: disable default qemu devices for cross-platform
> compatibility
> qemu-iotests: s390x: fix test 041 and 055
> qemu-iotests: s390x: fix test 049, reject negative sizes in QemuOpts
> qemu-iotests: s390x: fix test 130
>
> tests/qemu-iotests/041 | 6 +
> tests/qemu-iotests/049.out | 10 +-
> tests/qemu-iotests/055 | 9 ++
> tests/qemu-iotests/067 | 8 +-
> tests/qemu-iotests/067.out | 266 +--------------------------------------
> tests/qemu-iotests/071.out | 4 -
> tests/qemu-iotests/081.out | 2 -
> tests/qemu-iotests/087.out | 12 --
> tests/qemu-iotests/130 | 8 +-
> tests/qemu-iotests/130.out | 4 +-
> tests/qemu-iotests/check | 5 +
> tests/qemu-iotests/common | 1 +
> tests/qemu-iotests/common.config | 11 +-
> tests/qemu-iotests/common.qemu | 2 +-
> tests/qemu-iotests/iotests.py | 1 +
> util/qemu-option.c | 5 +
> 16 files changed, 53 insertions(+), 301 deletions(-)
>
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Qemu-devel] [PATCH v11 0/5] Update tests/qemu-iotests failing cases for the s390 platform
2015-07-03 7:28 [Qemu-devel] [PATCH v11 0/5] Update tests/qemu-iotests failing cases for the s390 platform Bo Tu
` (5 preceding siblings ...)
2015-08-13 11:06 ` [Qemu-devel] [PATCH v11 0/5] Update tests/qemu-iotests failing cases for the s390 platform tu bo
@ 2015-08-13 13:28 ` Kevin Wolf
2015-09-03 8:56 ` Sascha Silbe
6 siblings, 1 reply; 10+ messages in thread
From: Kevin Wolf @ 2015-08-13 13:28 UTC (permalink / raw)
To: Bo Tu; +Cc: silbe, mreitz, mimu, qemu-devel, armbru
Am 03.07.2015 um 09:28 hat Bo Tu geschrieben:
> Bo Tu (5):
> qemu-iotests: qemu machine type support
> qemu-iotests: disable default qemu devices for cross-platform
> compatibility
> qemu-iotests: s390x: fix test 041 and 055
> qemu-iotests: s390x: fix test 049, reject negative sizes in QemuOpts
> qemu-iotests: s390x: fix test 130
Thanks, applied to the block branch.
Kevin
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Qemu-devel] [PATCH v11 0/5] Update tests/qemu-iotests failing cases for the s390 platform
2015-08-13 13:28 ` Kevin Wolf
@ 2015-09-03 8:56 ` Sascha Silbe
2015-09-03 10:44 ` Kevin Wolf
0 siblings, 1 reply; 10+ messages in thread
From: Sascha Silbe @ 2015-09-03 8:56 UTC (permalink / raw)
To: Kevin Wolf, Bo Tu; +Cc: qemu-devel, armbru, mimu, mreitz
Dear Kevin,
Kevin Wolf <kwolf@redhat.com> writes:
> Am 03.07.2015 um 09:28 hat Bo Tu geschrieben:
>> Bo Tu (5):
>> qemu-iotests: qemu machine type support
>> qemu-iotests: disable default qemu devices for cross-platform
>> compatibility
>> qemu-iotests: s390x: fix test 041 and 055
>> qemu-iotests: s390x: fix test 049, reject negative sizes in QemuOpts
>> qemu-iotests: s390x: fix test 130
>
> Thanks, applied to the block branch.
I don't see them in master yet. Is there anything else missing before
you're going to send your next pull request?
Sascha
--
Softwareentwicklung Sascha Silbe, Niederhofenstraße 5/1, 71229 Leonberg
https://se-silbe.de/
USt-IdNr. DE281696641
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [Qemu-devel] [PATCH v11 0/5] Update tests/qemu-iotests failing cases for the s390 platform
2015-09-03 8:56 ` Sascha Silbe
@ 2015-09-03 10:44 ` Kevin Wolf
0 siblings, 0 replies; 10+ messages in thread
From: Kevin Wolf @ 2015-09-03 10:44 UTC (permalink / raw)
To: Sascha Silbe; +Cc: qemu-devel, Bo Tu, mimu, armbru, mreitz
Am 03.09.2015 um 10:56 hat Sascha Silbe geschrieben:
> Kevin Wolf <kwolf@redhat.com> writes:
>
> > Am 03.07.2015 um 09:28 hat Bo Tu geschrieben:
> >> Bo Tu (5):
> >> qemu-iotests: qemu machine type support
> >> qemu-iotests: disable default qemu devices for cross-platform
> >> compatibility
> >> qemu-iotests: s390x: fix test 041 and 055
> >> qemu-iotests: s390x: fix test 049, reject negative sizes in QemuOpts
> >> qemu-iotests: s390x: fix test 130
> >
> > Thanks, applied to the block branch.
>
> I don't see them in master yet. Is there anything else missing before
> you're going to send your next pull request?
Just the usual delay around KVM Forum. We should be back to normal soon.
Kevin
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2015-09-03 10:44 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-07-03 7:28 [Qemu-devel] [PATCH v11 0/5] Update tests/qemu-iotests failing cases for the s390 platform Bo Tu
2015-07-03 7:28 ` [Qemu-devel] [PATCH v11 1/5] qemu-iotests: qemu machine type support Bo Tu
2015-07-03 7:28 ` [Qemu-devel] [PATCH v11 2/5] qemu-iotests: disable default qemu devices for cross-platform compatibility Bo Tu
2015-07-03 7:28 ` [Qemu-devel] [PATCH v11 3/5] qemu-iotests: s390x: fix test 041 and 055 Bo Tu
2015-07-03 7:28 ` [Qemu-devel] [PATCH v11 4/5] qemu-iotests: s390x: fix test 049, reject negative sizes in QemuOpts Bo Tu
2015-07-03 7:28 ` [Qemu-devel] [PATCH v11 5/5] qemu-iotests: s390x: fix test 130 Bo Tu
2015-08-13 11:06 ` [Qemu-devel] [PATCH v11 0/5] Update tests/qemu-iotests failing cases for the s390 platform tu bo
2015-08-13 13:28 ` Kevin Wolf
2015-09-03 8:56 ` Sascha Silbe
2015-09-03 10:44 ` Kevin Wolf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).