@@ -232,7 +232,7 @@ build-tcg-disabled:
- ./check -raw 001 002 003 004 005 008 009 010 011 012 021 025 032 033 048
052 063 077 086 101 104 106 113 148 150 151 152 157 159 160 163
170 171 183 184 192 194 197 208 215 221 222 226 227 236 253 277
- - ./check -qcow2 028 051 056 057 058 065 067 068 082 085 091 095 096 102 122
+ - ./check -qcow2 028 051 056 057 058 065 068 082 085 091 095 096 102 122
124 132 139 142 144 145 151 152 155 157 165 194 196 197 200 202
208 209 215 216 218 222 227 234 246 247 248 250 254 255 257 258
260 261 262 263 264 270 272 273 277 279
deleted file mode 100755
@@ -1,157 +0,0 @@
-#!/usr/bin/env bash
-#
-# Test automatic deletion of BDSes created by -drive/drive_add
-#
-# Copyright (C) 2013 Red Hat, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-
-# creator
-owner=kwolf@redhat.com
-
-seq=`basename $0`
-echo "QA output created by $seq"
-
-status=1 # failure is the default!
-
-# get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-
-_supported_fmt qcow2
-_supported_proto file
-# Because anything other than 16 would change the output of query-block,
-# and external data files would change the output of
-# query-named-block-nodes
-_unsupported_imgopts 'refcount_bits=\([^1]\|.\([^6]\|$\)\)' data_file
-
-do_run_qemu()
-{
- echo Testing: "$@"
- $QEMU -nographic -qmp-pretty stdio -serial none "$@"
- echo
-}
-
-# Remove QMP events from (pretty-printed) output. Doesn't handle
-# nested dicts correctly, but we don't get any of those in this test.
-_filter_qmp_events()
-{
- tr '\n' '\t' | sed -e \
- 's/{\s*"timestamp":\s*{[^}]*},\s*"event":[^,}]*\(,\s*"data":\s*{[^}]*}\)\?\s*}\s*//g' \
- | tr '\t' '\n'
-}
-
-run_qemu()
-{
- do_run_qemu "$@" 2>&1 | _filter_testdir | _filter_qmp | _filter_qemu \
- | _filter_actual_image_size \
- | _filter_generated_node_ids | _filter_qmp_events \
- | _filter_img_info
-}
-
-size=128M
-
-_make_test_img $size
-
-echo
-echo === -drive/-device and device_del ===
-echo
-
-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" } }
-{ "execute": "system_reset" }
-{ "execute": "query-block" }
-{ "execute": "quit" }
-EOF
-
-echo
-echo === -drive/device_add and device_del ===
-echo
-
-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", "drive": "disk",
- "id": "virtio0" } }
-{ "execute": "device_del", "arguments": { "id": "virtio0" } }
-{ "execute": "system_reset" }
-{ "execute": "query-block" }
-{ "execute": "quit" }
-EOF
-
-echo
-echo === drive_add/device_add and device_del ===
-echo
-
-run_qemu <<EOF
-{ "execute": "qmp_capabilities" }
-{ "execute": "human-monitor-command",
- "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", "drive": "disk",
- "id": "virtio0" } }
-{ "execute": "device_del", "arguments": { "id": "virtio0" } }
-{ "execute": "system_reset" }
-{ "execute": "query-block" }
-{ "execute": "quit" }
-EOF
-
-echo
-echo === blockdev_add/device_add and device_del ===
-echo
-
-run_qemu <<EOF
-{ "execute": "qmp_capabilities" }
-{ "execute": "blockdev-add",
- "arguments": {
- "driver": "$IMGFMT",
- "node-name": "disk",
- "file": {
- "driver": "file",
- "filename": "$TEST_IMG"
- }
- }
- }
-{ "execute": "query-named-block-nodes" }
-{ "execute": "device_add",
- "arguments": { "driver": "virtio-blk", "drive": "disk",
- "id": "virtio0" } }
-{ "execute": "device_del", "arguments": { "id": "virtio0" } }
-{ "execute": "system_reset" }
-{ "execute": "query-named-block-nodes" }
-{ "execute": "quit" }
-EOF
-
-echo
-echo === Empty drive with -device and device_del ===
-echo
-
-run_qemu -device virtio-scsi -device scsi-cd,id=cd0 <<EOF
-{ "execute": "qmp_capabilities" }
-{ "execute": "query-block" }
-{ "execute": "device_del", "arguments": { "id": "cd0" } }
-{ "execute": "system_reset" }
-{ "execute": "query-block" }
-{ "execute": "quit" }
-EOF
-
-# success, all done
-echo "*** done"
-rm -f $seq.full
-status=0
deleted file mode 100644
@@ -1,414 +0,0 @@
-QA output created by 067
-Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
-
-=== -drive/-device and device_del ===
-
-Testing: -drive file=TEST_DIR/t.IMGFMT,format=IMGFMT,if=none,id=disk -device virtio-blk,drive=disk,id=virtio0
-{
- QMP_VERSION
-}
-{
- "return": {
- }
-}
-{
- "return": [
- {
- "io-status": "ok",
- "device": "disk",
- "locked": false,
- "removable": false,
- "inserted": {
- "iops_rd": 0,
- "detect_zeroes": "off",
- "image": {
- "virtual-size": 134217728,
- "filename": "TEST_DIR/t.IMGFMT",
- "cluster-size": 65536,
- "format": "IMGFMT",
- "actual-size": SIZE,
- "dirty-flag": false
- },
- "iops_wr": 0,
- "ro": false,
- "node-name": "NODE_NAME",
- "backing_file_depth": 0,
- "drv": "IMGFMT",
- "iops": 0,
- "bps_wr": 0,
- "write_threshold": 0,
- "encrypted": false,
- "bps": 0,
- "bps_rd": 0,
- "cache": {
- "no-flush": false,
- "direct": false,
- "writeback": true
- },
- "file": "TEST_DIR/t.IMGFMT",
- "encryption_key_missing": false
- },
- "qdev": "/machine/peripheral/virtio0/virtio-backend",
- "type": "unknown"
- }
- ]
-}
-{
- "return": {
- }
-}
-{
- "return": {
- }
-}
-{
- "return": [
- ]
-}
-{
- "return": {
- }
-}
-
-=== -drive/device_add and device_del ===
-
-Testing: -drive file=TEST_DIR/t.IMGFMT,format=IMGFMT,if=none,id=disk
-{
- QMP_VERSION
-}
-{
- "return": {
- }
-}
-{
- "return": [
- {
- "device": "disk",
- "locked": false,
- "removable": true,
- "inserted": {
- "iops_rd": 0,
- "detect_zeroes": "off",
- "image": {
- "virtual-size": 134217728,
- "filename": "TEST_DIR/t.IMGFMT",
- "cluster-size": 65536,
- "format": "IMGFMT",
- "actual-size": SIZE,
- "dirty-flag": false
- },
- "iops_wr": 0,
- "ro": false,
- "node-name": "NODE_NAME",
- "backing_file_depth": 0,
- "drv": "IMGFMT",
- "iops": 0,
- "bps_wr": 0,
- "write_threshold": 0,
- "encrypted": false,
- "bps": 0,
- "bps_rd": 0,
- "cache": {
- "no-flush": false,
- "direct": false,
- "writeback": true
- },
- "file": "TEST_DIR/t.IMGFMT",
- "encryption_key_missing": false
- },
- "type": "unknown"
- }
- ]
-}
-{
- "return": {
- }
-}
-{
- "return": {
- }
-}
-{
- "return": {
- }
-}
-{
- "return": [
- ]
-}
-{
- "return": {
- }
-}
-
-=== drive_add/device_add and device_del ===
-
-Testing:
-{
- QMP_VERSION
-}
-{
- "return": {
- }
-}
-{
- "return": "OK\r\n"
-}
-{
- "return": [
- {
- "device": "disk",
- "locked": false,
- "removable": true,
- "inserted": {
- "iops_rd": 0,
- "detect_zeroes": "off",
- "image": {
- "virtual-size": 134217728,
- "filename": "TEST_DIR/t.IMGFMT",
- "cluster-size": 65536,
- "format": "IMGFMT",
- "actual-size": SIZE,
- "dirty-flag": false
- },
- "iops_wr": 0,
- "ro": false,
- "node-name": "NODE_NAME",
- "backing_file_depth": 0,
- "drv": "IMGFMT",
- "iops": 0,
- "bps_wr": 0,
- "write_threshold": 0,
- "encrypted": false,
- "bps": 0,
- "bps_rd": 0,
- "cache": {
- "no-flush": false,
- "direct": false,
- "writeback": true
- },
- "file": "TEST_DIR/t.IMGFMT",
- "encryption_key_missing": false
- },
- "type": "unknown"
- }
- ]
-}
-{
- "return": {
- }
-}
-{
- "return": {
- }
-}
-{
- "return": {
- }
-}
-{
- "return": [
- ]
-}
-{
- "return": {
- }
-}
-
-=== blockdev_add/device_add and device_del ===
-
-Testing:
-{
- QMP_VERSION
-}
-{
- "return": {
- }
-}
-{
- "return": {
- }
-}
-{
- "return": [
- {
- "iops_rd": 0,
- "detect_zeroes": "off",
- "image": {
- "virtual-size": 134217728,
- "filename": "TEST_DIR/t.IMGFMT",
- "cluster-size": 65536,
- "format": "IMGFMT",
- "actual-size": SIZE,
- "dirty-flag": false
- },
- "iops_wr": 0,
- "ro": false,
- "node-name": "disk",
- "backing_file_depth": 0,
- "drv": "IMGFMT",
- "iops": 0,
- "bps_wr": 0,
- "write_threshold": 0,
- "encrypted": false,
- "bps": 0,
- "bps_rd": 0,
- "cache": {
- "no-flush": false,
- "direct": false,
- "writeback": true
- },
- "file": "TEST_DIR/t.IMGFMT",
- "encryption_key_missing": false
- },
- {
- "iops_rd": 0,
- "detect_zeroes": "off",
- "image": {
- "virtual-size": 197120,
- "filename": "TEST_DIR/t.IMGFMT",
- "format": "file",
- "actual-size": SIZE,
- "dirty-flag": false
- },
- "iops_wr": 0,
- "ro": false,
- "node-name": "NODE_NAME",
- "backing_file_depth": 0,
- "drv": "file",
- "iops": 0,
- "bps_wr": 0,
- "write_threshold": 0,
- "encrypted": false,
- "bps": 0,
- "bps_rd": 0,
- "cache": {
- "no-flush": false,
- "direct": false,
- "writeback": true
- },
- "file": "TEST_DIR/t.IMGFMT",
- "encryption_key_missing": false
- }
- ]
-}
-{
- "return": {
- }
-}
-{
- "return": {
- }
-}
-{
- "return": {
- }
-}
-{
- "return": [
- {
- "iops_rd": 0,
- "detect_zeroes": "off",
- "image": {
- "virtual-size": 134217728,
- "filename": "TEST_DIR/t.IMGFMT",
- "cluster-size": 65536,
- "format": "IMGFMT",
- "actual-size": SIZE,
- "dirty-flag": false
- },
- "iops_wr": 0,
- "ro": false,
- "node-name": "disk",
- "backing_file_depth": 0,
- "drv": "IMGFMT",
- "iops": 0,
- "bps_wr": 0,
- "write_threshold": 0,
- "encrypted": false,
- "bps": 0,
- "bps_rd": 0,
- "cache": {
- "no-flush": false,
- "direct": false,
- "writeback": true
- },
- "file": "TEST_DIR/t.IMGFMT",
- "encryption_key_missing": false
- },
- {
- "iops_rd": 0,
- "detect_zeroes": "off",
- "image": {
- "virtual-size": 197120,
- "filename": "TEST_DIR/t.IMGFMT",
- "format": "file",
- "actual-size": SIZE,
- "dirty-flag": false
- },
- "iops_wr": 0,
- "ro": false,
- "node-name": "NODE_NAME",
- "backing_file_depth": 0,
- "drv": "file",
- "iops": 0,
- "bps_wr": 0,
- "write_threshold": 0,
- "encrypted": false,
- "bps": 0,
- "bps_rd": 0,
- "cache": {
- "no-flush": false,
- "direct": false,
- "writeback": true
- },
- "file": "TEST_DIR/t.IMGFMT",
- "encryption_key_missing": false
- }
- ]
-}
-{
- "return": {
- }
-}
-
-=== Empty drive with -device and device_del ===
-
-Testing: -device virtio-scsi -device scsi-cd,id=cd0
-{
- QMP_VERSION
-}
-{
- "return": {
- }
-}
-{
- "return": [
- {
- "io-status": "ok",
- "device": "",
- "locked": false,
- "removable": true,
- "qdev": "cd0",
- "tray_open": false,
- "type": "unknown"
- }
- ]
-}
-{
- "return": {
- }
-}
-{
- "return": {
- }
-}
-{
- "return": [
- ]
-}
-{
- "return": {
- }
-}
-*** done
@@ -88,7 +88,7 @@
064 rw quick
065 rw quick
066 rw auto quick
-067 rw quick
+# 067 was removed, do not reuse
068 rw quick
069 rw auto quick
070 rw quick
@@ -16,21 +16,21 @@
#include "qapi/qmp/qdict.h"
#include "qapi/qmp/qlist.h"
-static bool has_drive(QTestState *qts)
+static bool look_for_drive0(QTestState *qts, const char *command, const char *key)
{
QDict *response;
QList *ret;
QListEntry *entry;
bool found;
- response = qtest_qmp(qts, "{'execute': 'query-block'}");
+ response = qtest_qmp(qts, "{'execute': %s}", command);
g_assert(response && qdict_haskey(response, "return"));
ret = qdict_get_qlist(response, "return");
found = false;
QLIST_FOREACH_ENTRY(ret, entry) {
QDict *entry_dict = qobject_to(QDict, entry->value);
- if (!strcmp(qdict_get_str(entry_dict, "device"), "drive0")) {
+ if (!strcmp(qdict_get_str(entry_dict, key), "drive0")) {
found = true;
break;
}
@@ -40,6 +40,38 @@ static bool has_drive(QTestState *qts)
return found;
}
+static bool has_drive(QTestState *qts)
+{
+ return look_for_drive0(qts, "query-block", "device");
+}
+
+static bool has_blockdev(QTestState *qts)
+{
+ return look_for_drive0(qts, "query-named-block-nodes", "node-name");
+}
+
+static void blockdev_add_with_media(QTestState *qts)
+{
+ QDict *response;
+
+ response = qtest_qmp(qts,
+ "{ 'execute': 'blockdev-add',"
+ " 'arguments': {"
+ " 'driver': 'raw',"
+ " 'node-name': 'drive0',"
+ " 'file': {"
+ " 'driver': 'null-co',"
+ " 'read-zeroes': true"
+ " }"
+ " }"
+ "}");
+
+ g_assert(response);
+ g_assert(qdict_haskey(response, "return"));
+ qobject_unref(response);
+ g_assert(has_blockdev(qts));
+}
+
static void drive_add(QTestState *qts)
{
char *resp = qtest_hmp(qts, "drive_add 0 if=none,id=drive0");
@@ -49,6 +81,17 @@ static void drive_add(QTestState *qts)
g_free(resp);
}
+static void drive_add_with_media(QTestState *qts)
+{
+ char *resp = qtest_hmp(qts,
+ "drive_add 0 if=none,id=drive0,file=null-co://,"
+ "file.read-zeroes=on,format=raw");
+
+ g_assert_cmpstr(resp, ==, "OK\r\n");
+ g_assert(has_drive(qts));
+ g_free(resp);
+}
+
static void drive_del(QTestState *qts)
{
char *resp;
@@ -60,7 +103,43 @@ static void drive_del(QTestState *qts)
g_free(resp);
}
-static void device_del(QTestState *qts)
+/*
+ * qvirtio_get_dev_type:
+ * Returns: the preferred virtio bus/device type for the current architecture.
+ * TODO: delete this
+ */
+static const char *qvirtio_get_dev_type(void)
+{
+ const char *arch = qtest_get_arch();
+
+ if (g_str_equal(arch, "arm") || g_str_equal(arch, "aarch64")) {
+ return "device"; /* for virtio-mmio */
+ } else if (g_str_equal(arch, "s390x")) {
+ return "ccw";
+ } else {
+ return "pci";
+ }
+}
+
+static void device_add(QTestState *qts)
+{
+ QDict *response;
+ char driver[32];
+ snprintf(driver, sizeof(driver), "virtio-blk-%s",
+ qvirtio_get_dev_type());
+
+ response = qtest_qmp(qts, "{'execute': 'device_add',"
+ " 'arguments': {"
+ " 'driver': %s,"
+ " 'drive': 'drive0',"
+ " 'id': 'dev0'"
+ "}}", driver);
+ g_assert(response);
+ g_assert(qdict_haskey(response, "return"));
+ qobject_unref(response);
+}
+
+static void device_del(QTestState *qts, bool and_reset)
{
QDict *response;
@@ -70,6 +149,13 @@ static void device_del(QTestState *qts)
g_assert(qdict_haskey(response, "return"));
qobject_unref(response);
+ if (and_reset) {
+ response = qtest_qmp(qts, "{'execute': 'system_reset' }");
+ g_assert(response);
+ g_assert(qdict_haskey(response, "return"));
+ qobject_unref(response);
+ }
+
qtest_qmp_eventwait(qts, "DEVICE_DELETED");
}
@@ -91,24 +177,6 @@ static void test_drive_without_dev(void)
qtest_quit(qts);
}
-/*
- * qvirtio_get_dev_type:
- * Returns: the preferred virtio bus/device type for the current architecture.
- * TODO: delete this
- */
-static const char *qvirtio_get_dev_type(void)
-{
- const char *arch = qtest_get_arch();
-
- if (g_str_equal(arch, "arm") || g_str_equal(arch, "aarch64")) {
- return "device"; /* for virtio-mmio */
- } else if (g_str_equal(arch, "s390x")) {
- return "ccw";
- } else {
- return "pci";
- }
-}
-
static void test_after_failed_device_add(void)
{
char driver[32];
@@ -158,12 +226,97 @@ static void test_drive_del_device_del(void)
* Doing it in this order takes notoriously tricky special paths
*/
drive_del(qts);
- device_del(qts);
+ device_del(qts, false);
g_assert(!has_drive(qts));
qtest_quit(qts);
}
+static void test_cli_device_del(void)
+{
+ QTestState *qts;
+
+ /*
+ * -drive/-device and device_del. Start with a drive used by a
+ * device that unplugs after reset.
+ */
+ qts = qtest_initf("-drive if=none,id=drive0,file=null-co://,"
+ "file.read-zeroes=on,format=raw"
+ " -device virtio-blk-%s,drive=drive0,id=dev0",
+ qvirtio_get_dev_type());
+
+ device_del(qts, true);
+ g_assert(!has_drive(qts));
+
+ qtest_quit(qts);
+}
+
+static void test_empty_device_del(void)
+{
+ QTestState *qts;
+
+ /* device_del with no drive plugged. */
+ qts = qtest_initf("-device virtio-scsi-%s -device scsi-cd,id=dev0",
+ qvirtio_get_dev_type());
+
+ device_del(qts, false);
+ qtest_quit(qts);
+}
+
+static void test_device_add_and_del(void)
+{
+ QTestState *qts;
+
+ /*
+ * -drive/device_add and device_del. Start with a drive used by a
+ * device that unplugs after reset.
+ */
+ qts = qtest_init("-drive if=none,id=drive0,file=null-co://,"
+ "file.read-zeroes=on,format=raw");
+
+ device_add(qts);
+ device_del(qts, true);
+ g_assert(!has_drive(qts));
+
+ qtest_quit(qts);
+}
+
+static void test_drive_add_device_add_and_del(void)
+{
+ QTestState *qts;
+
+ qts = qtest_init("");
+
+ /*
+ * drive_add/device_add and device_del. The drive is used by a
+ * device that unplugs after reset.
+ */
+ drive_add_with_media(qts);
+ device_add(qts);
+ device_del(qts, true);
+ g_assert(!has_drive(qts));
+
+ qtest_quit(qts);
+}
+
+static void test_blockdev_add_device_add_and_del(void)
+{
+ QTestState *qts;
+
+ qts = qtest_init("");
+
+ /*
+ * blockdev_add/device_add and device_del. The it drive is used by a
+ * device that unplugs after reset, but it doesn't go away.
+ */
+ blockdev_add_with_media(qts);
+ device_add(qts);
+ device_del(qts, true);
+ g_assert(has_blockdev(qts));
+
+ qtest_quit(qts);
+}
+
int main(int argc, char **argv)
{
g_test_init(&argc, &argv, NULL);
@@ -173,8 +326,18 @@ int main(int argc, char **argv)
if (qvirtio_get_dev_type() != NULL) {
qtest_add_func("/drive_del/after_failed_device_add",
test_after_failed_device_add);
- qtest_add_func("/blockdev/drive_del_device_del",
+ qtest_add_func("/drive_del/drive_del_device_del",
test_drive_del_device_del);
+ qtest_add_func("/device_del/drive/cli_device",
+ test_cli_device_del);
+ qtest_add_func("/device_del/drive/device_add",
+ test_device_add_and_del);
+ qtest_add_func("/device_del/drive/drive_add_device_add",
+ test_drive_add_device_add_and_del);
+ qtest_add_func("/device_del/empty",
+ test_empty_device_del);
+ qtest_add_func("/device_del/blockdev",
+ test_blockdev_add_device_add_and_del);
}
return g_test_run();
@@ -111,7 +111,7 @@ qtests_moxie = [ 'boot-serial-test' ]
qtests_ppc = \
(config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : []) + \
(config_all_devices.has_key('CONFIG_M48T59') ? ['m48t59-test'] : []) + \
- ['boot-order-test', 'prom-env-test', 'drive_del-test', 'boot-serial-test'] \
+ ['boot-order-test', 'prom-env-test', 'boot-serial-test'] \
qtests_ppc64 = \
(config_all_devices.has_key('CONFIG_PSERIES') ? ['device-plug-test'] : []) + \
@@ -121,7 +121,7 @@ qtests_ppc64 = \
(config_all_devices.has_key('CONFIG_USB_UHCI') ? ['usb-hcd-uhci-test'] : []) + \
(config_all_devices.has_key('CONFIG_USB_XHCI_NEC') ? ['usb-hcd-xhci-test'] : []) + \
(config_host.has_key('CONFIG_POSIX') ? ['test-filter-mirror'] : []) + \
- qtests_pci + ['migration-test', 'numa-test', 'cpu-plug-test']
+ qtests_pci + ['migration-test', 'numa-test', 'cpu-plug-test', 'drive_del-test']
qtests_sh4 = (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : [])
qtests_sh4eb = (config_all_devices.has_key('CONFIG_ISA_TESTDEV') ? ['endianness-test'] : [])