From patchwork Wed Jun 18 16:24:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amos Kong X-Patchwork-Id: 361645 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id B5442140084 for ; Thu, 19 Jun 2014 02:40:33 +1000 (EST) Received: from localhost ([::1]:59139 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxIuV-0005vv-Md for incoming@patchwork.ozlabs.org; Wed, 18 Jun 2014 12:40:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37467) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxIfC-000142-Nd for qemu-devel@nongnu.org; Wed, 18 Jun 2014 12:24:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WxIf5-00023B-82 for qemu-devel@nongnu.org; Wed, 18 Jun 2014 12:24:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:14621) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxIf5-000233-0Y for qemu-devel@nongnu.org; Wed, 18 Jun 2014 12:24:35 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s5IGOUdY022395 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 18 Jun 2014 12:24:30 -0400 Received: from z.redhat.com (vpn1-114-59.nay.redhat.com [10.66.114.59]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s5IGOERK032681; Wed, 18 Jun 2014 12:24:27 -0400 From: Amos Kong To: qemu-devel@nongnu.org Date: Thu, 19 Jun 2014 00:24:13 +0800 Message-Id: <1403108653-26765-5-git-send-email-akong@redhat.com> In-Reply-To: <1403108653-26765-1-git-send-email-akong@redhat.com> References: <1403108653-26765-1-git-send-email-akong@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, stefanha@gmail.com, arei.gonglei@huawei.com, afaerber@suse.de, pbonzini@redhat.com Subject: [Qemu-devel] [PATCH v5 4/4] virtio-blk-test.c: add hotplug subtest X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This patch adds a new subtest, it hotplugs 29 * 8 = 232 virtio-blk devices to guest, and try to hot-unplug them. Note: the hot-unplug can't work without cooperation of guest OS. Signed-off-by: Amos Kong --- tests/virtio-blk-test.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) diff --git a/tests/virtio-blk-test.c b/tests/virtio-blk-test.c index 0fdec01..77817ca 100644 --- a/tests/virtio-blk-test.c +++ b/tests/virtio-blk-test.c @@ -7,11 +7,78 @@ * See the COPYING file in the top-level directory. */ +#include #include #include #include "libqtest.h" #include "qemu/osdep.h" + +/* start with no network/block device, slots 3 to 0x1f are free */ +#define MIN_PCI_SLOT 3 +#define MAX_PCI_SLOT 0x1f +#define MAX_PCI_FUNC 7 + +static void test_blk_hotplug(void) +{ + QDict *response; + int i, j; + char drive_id[10]; + char device_id[10]; + char addr[10]; + + qtest_start("-net none"); + + for (i = MIN_PCI_SLOT; i <= MAX_PCI_SLOT; i++) { + for (j = MAX_PCI_FUNC; j >= 0; j--) { + sprintf(drive_id, "drv-%x.%x", i, j); + response = qmp("{ 'execute': 'blockdev-add'," + " 'arguments': {" + " 'options': {" + " 'driver': 'file'," + " 'filename': '/dev/null'," + " 'id': %s" + "} } }", drive_id); + g_assert(response); + g_assert(!qdict_haskey(response, "error")); + QDECREF(response); + + sprintf(device_id, "dev-%x.%x", i, j); + sprintf(addr, "0x%x.%x", i, j); + response = qmp("{'execute': 'device_add'," + " 'arguments': {" + " 'driver': 'virtio-blk-pci'," + " 'drive': %s," + " 'id': %s," + " 'addr': %s," + " 'multifunction': 'on'" + "} }", drive_id, device_id, addr); + g_assert(response); + g_assert(!qdict_haskey(response, "error")); + QDECREF(response); + } + } + + /* hot-unplug doesn't work without cooperation of guest OS */ + for (i = MIN_PCI_SLOT; i <= MAX_PCI_SLOT; i++) { + for (j = MAX_PCI_FUNC; j >= 0; j--) { + if (j == MAX_PCI_FUNC) { + qmp_exec_hmp_cmd("", "drive_del drv-%x.%x", i, 0); + } + sprintf(device_id, "dev-%x.%x", i, j); + response = qmp("{'execute': 'device_del'," + " 'arguments': {" + " 'id': %s" + "} }", device_id); + g_assert(response); + g_assert(!qdict_haskey(response, "error")); + QDECREF(response); + } + } + + qtest_end(); +} + /* Tests only initialization */ static void virtblk_init(void) { @@ -26,6 +93,7 @@ int main(int argc, char **argv) g_test_init(&argc, &argv, NULL); qtest_add_func("/virtio/blk/pci/init", virtblk_init); + qtest_add_func("/virtio/blk/pci/hotplug", test_blk_hotplug); ret = g_test_run();