From: "Andreas Färber" <afaerber@suse.de>
To: qemu-devel@nongnu.org
Cc: "Igor Mammedov" <imammedo@redhat.com>,
"Andreas Färber" <afaerber@suse.de>,
"Gerd Hoffmann" <kraxel@redhat.com>
Subject: [Qemu-devel] [PULL 15/47] tests: usb: usb-storage hotplug test
Date: Wed, 15 Oct 2014 05:08:49 +0200 [thread overview]
Message-ID: <1413342561-4754-16-git-send-email-afaerber@suse.de> (raw)
In-Reply-To: <1413342561-4754-1-git-send-email-afaerber@suse.de>
From: Igor Mammedov <imammedo@redhat.com>
usb-storage is different from usual usb devices
in that it uses a child SCSI bus for underlying storage.
This commit verifies that the SCSI bus is hotpluggable, as
hotplug operation wouldn't succeed without it.
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
tests/usb-hcd-uhci-test.c | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
diff --git a/tests/usb-hcd-uhci-test.c b/tests/usb-hcd-uhci-test.c
index da96f98..8cf2c5b 100644
--- a/tests/usb-hcd-uhci-test.c
+++ b/tests/usb-hcd-uhci-test.c
@@ -46,6 +46,35 @@ static void test_uhci_hotplug(void)
usb_test_hotplug("uhci", 2, test_port_2);
}
+static void test_usb_storage_hotplug(void)
+{
+ QDict *response;
+
+ response = qmp("{'execute': 'device_add',"
+ " 'arguments': {"
+ " 'driver': 'usb-storage',"
+ " 'drive': 'drive0',"
+ " 'id': 'usbdev0'"
+ "}}");
+ g_assert(response);
+ g_assert(!qdict_haskey(response, "error"));
+ QDECREF(response);
+
+ response = qmp("{'execute': 'device_del',"
+ " 'arguments': {"
+ " 'id': 'usbdev0'"
+ "}}");
+ g_assert(response);
+ g_assert(!qdict_haskey(response, "error"));
+ QDECREF(response);
+
+ response = qmp("");
+ g_assert(response);
+ g_assert(qdict_haskey(response, "event"));
+ g_assert(!strcmp(qdict_get_str(response, "event"), "DEVICE_DELETED"));
+ QDECREF(response);
+}
+
int main(int argc, char **argv)
{
int ret;
@@ -55,8 +84,10 @@ int main(int argc, char **argv)
qtest_add_func("/uhci/pci/init", test_uhci_init);
qtest_add_func("/uhci/pci/port1", test_port_1);
qtest_add_func("/uhci/pci/hotplug", test_uhci_hotplug);
+ qtest_add_func("/uhci/pci/hotplug/usb-storage", test_usb_storage_hotplug);
qtest_start("-device piix3-usb-uhci,id=uhci,addr=1d.0"
+ " -drive id=drive0,if=none,file=/dev/null"
" -device usb-tablet,bus=uhci.0,port=1");
ret = g_test_run();
qtest_end();
--
1.8.4.5
next prev parent reply other threads:[~2014-10-15 3:09 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-15 3:08 [Qemu-devel] [PULL 00/47] QOM devices patch queue 2014-10-15 Andreas Färber
2014-10-15 3:08 ` [Qemu-devel] [PULL 01/47] qdev: gpio: Don't allow name share between I and O Andreas Färber
2014-10-15 3:08 ` [Qemu-devel] [PULL 02/47] qdev: gpio: Register GPIO inputs as child objects Andreas Färber
2014-10-15 3:08 ` [Qemu-devel] [PULL 03/47] qdev: gpio: Register GPIO outputs as QOM links Andreas Färber
2014-10-15 3:08 ` [Qemu-devel] [PULL 04/47] qom: Add error handler for object_property_print() Andreas Färber
2014-10-15 3:08 ` [Qemu-devel] [PULL 05/47] qom: Add error handler for object alias property Andreas Färber
2014-10-15 3:08 ` [Qemu-devel] [PULL 06/47] tests: virtio-scsi: Check if hot-plug/unplug works Andreas Färber
2014-10-15 3:08 ` [Qemu-devel] [PULL 07/47] tests: virtio-serial: " Andreas Färber
2014-10-15 3:08 ` [Qemu-devel] [PULL 08/47] libqos: Add qpci_plug_device_test() and qpci_unplug_acpi_device_test() Andreas Färber
2014-10-15 3:08 ` [Qemu-devel] [PULL 09/47] tests: virtio-rng: Check if hot-plug/unplug works Andreas Färber
2014-10-15 3:08 ` [Qemu-devel] [PULL 10/47] tests: virtio-net: " Andreas Färber
2014-10-15 3:08 ` [Qemu-devel] [PULL 11/47] tests: virtio-blk: " Andreas Färber
2014-10-15 3:08 ` [Qemu-devel] [PULL 12/47] tests: usb: Move uhci port test code to libqos/usb.c Andreas Färber
2014-10-15 3:08 ` [Qemu-devel] [PULL 13/47] tests: usb: add port test to uhci unit test Andreas Färber
2014-10-15 3:08 ` [Qemu-devel] [PULL 14/47] tests: usb: Generic usb device hotplug Andreas Färber
2014-10-15 3:08 ` Andreas Färber [this message]
2014-10-15 3:08 ` [Qemu-devel] [PULL 16/47] tests: usb: usb-uas hotplug test Andreas Färber
2014-10-15 3:08 ` [Qemu-devel] [PULL 17/47] Access BusState::allow_hotplug using wraper qbus_is_hotpluggable() Andreas Färber
2014-10-15 3:08 ` [Qemu-devel] [PULL 18/47] qdev: do not allow to instantiate non hotpluggable device with device_add Andreas Färber
2014-10-15 3:08 ` [Qemu-devel] [PULL 19/47] qdev: HotplugHandler: Rename unplug callback to unplug_request Andreas Färber
2014-10-15 3:08 ` [Qemu-devel] [PULL 20/47] qdev: HotplugHandler: Provide unplug callback Andreas Färber
2014-10-15 3:08 ` [Qemu-devel] [PULL 21/47] qdev: Add simple/generic unplug callback for HotplugHandler Andreas Färber
2014-10-15 3:08 ` [Qemu-devel] [PULL 22/47] qdev: Add wrapper to set BUS as HotplugHandler Andreas Färber
2014-10-15 3:08 ` [Qemu-devel] [PULL 23/47] qdev: Drop hotplug check from bus_add_child() Andreas Färber
2014-10-15 3:08 ` [Qemu-devel] [PULL 24/47] target-i386: ICC bus: Drop BusState::allow_hotplug Andreas Färber
2014-10-15 3:08 ` [Qemu-devel] [PULL 25/47] virtio-pci: " Andreas Färber
2014-10-15 3:09 ` [Qemu-devel] [PULL 26/47] virtio-serial: Convert to hotplug-handler API Andreas Färber
2014-10-15 3:09 ` [Qemu-devel] [PULL 27/47] virtio-mmio: Drop useless bus->allow_hotplug = 0 Andreas Färber
2014-10-15 3:09 ` [Qemu-devel] [PULL 28/47] s390x: Drop not used allow_hotplug in event-facility Andreas Färber
2014-10-15 3:09 ` [Qemu-devel] [PULL 29/47] s390x: Convert s390-virtio to hotplug handler API Andreas Färber
2014-10-15 3:09 ` [Qemu-devel] [PULL 30/47] s390x: Convert virtio-ccw " Andreas Färber
2014-10-15 3:09 ` [Qemu-devel] [PULL 31/47] scsi: Set SCSI BUS itself as default HotplugHandler Andreas Färber
2014-10-15 3:09 ` [Qemu-devel] [PULL 32/47] scsi: Convert pvscsi HBA to hotplug handler API Andreas Färber
2014-10-15 3:09 ` [Qemu-devel] [PULL 33/47] scsi: Convert virtio-scsi " Andreas Färber
2014-10-15 3:09 ` [Qemu-devel] [PULL 34/47] scsi: Cleanup not used anymore SCSIBusInfo{hotplug, hot_unplug} fields Andreas Färber
2014-10-15 3:09 ` [Qemu-devel] [PULL 35/47] usb-bot: Mark device as non hotpluggable Andreas Färber
2014-10-15 3:09 ` [Qemu-devel] [PULL 36/47] usb-bot: Drop not needed "allow_hotplug = 0" Andreas Färber
2014-10-15 3:09 ` [Qemu-devel] [PULL 37/47] usb-storage: " Andreas Färber
2014-10-15 3:09 ` [Qemu-devel] [PULL 38/47] usb: Convert usb-ccid to hotplug handler API Andreas Färber
2014-10-15 3:09 ` [Qemu-devel] [PULL 39/47] usb: Convert usb devices " Andreas Färber
2014-10-15 3:09 ` [Qemu-devel] [PULL 40/47] qdev: Drop legacy hotplug fields/methods Andreas Färber
2014-10-15 3:09 ` [Qemu-devel] [PULL 41/47] qdev: HotplugHandler: Add support for unplugging BUS-less devices Andreas Färber
2014-10-15 3:09 ` [Qemu-devel] [PULL 42/47] qdev: device_del: Search for to be unplugged device in 'peripheral' container Andreas Färber
2014-10-15 3:09 ` [Qemu-devel] [PULL 43/47] qdev: Add description field in PropertyInfo struct Andreas Färber
2014-10-15 3:09 ` [Qemu-devel] [PULL 44/47] qom: Add description field in ObjectProperty struct Andreas Färber
2014-10-15 3:09 ` [Qemu-devel] [PULL 45/47] qdev: Set the object property's description to the qdev property's Andreas Färber
2014-10-15 3:09 ` [Qemu-devel] [PULL 46/47] qmp: Print descriptions of object properties Andreas Färber
2014-10-15 3:09 ` [Qemu-devel] [PULL 47/47] qdev: Drop legacy_name from qdev properties Andreas Färber
2014-10-15 10:27 ` [Qemu-devel] [PULL 00/47] QOM devices patch queue 2014-10-15 Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1413342561-4754-16-git-send-email-afaerber@suse.de \
--to=afaerber@suse.de \
--cc=imammedo@redhat.com \
--cc=kraxel@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).