mirror of
https://github.com/qemu/qemu.git
synced 2025-10-31 12:07:31 +00:00
82cab70bd8
Leaving interpolation into JSON to qmp() is more robust than building QMP input manually, as explained in the commit before previous. qtest_qmp_device_add() and its wrappers interpolate into JSON as follows: * qtest_qmp_device_add() interpolates members into a JSON object. * So do its wrappers qpci_plug_device_test() and usb_test_hotplug(). * usb_test_hotplug() additionally interpolates strings and numbers into JSON strings. Clean them up: * Have qtest_qmp_device_add() take its extra device properties as arguments for qdict_from_jsonf_nofail() instead of a string containing JSON members. * Drop qpci_plug_device_test(), use qtest_qmp_device_add() directly. * Change usb_test_hotplug() parameter @port to string, to avoid interpolation. Interpolate @hcd_id separately. Bonus: gets rid of a non-literal format string. A step towards compile-time format string checking without triggering -Wformat-nonliteral. Cc: Thomas Huth <thuth@redhat.com> Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Message-Id: <20180806065344.7103-15-armbru@redhat.com>
65 lines
1.5 KiB
C
65 lines
1.5 KiB
C
/*
|
|
* QTest testcase for USB xHCI controller
|
|
*
|
|
* Copyright (c) 2014 HUAWEI TECHNOLOGIES CO., LTD.
|
|
*
|
|
* This work is licensed under the terms of the GNU GPL, version 2 or later.
|
|
* See the COPYING file in the top-level directory.
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include "libqtest.h"
|
|
#include "libqos/usb.h"
|
|
|
|
|
|
static void test_xhci_init(void)
|
|
{
|
|
}
|
|
|
|
static void test_xhci_hotplug(void)
|
|
{
|
|
usb_test_hotplug("xhci", "1", NULL);
|
|
}
|
|
|
|
static void test_usb_uas_hotplug(void)
|
|
{
|
|
qtest_qmp_device_add("usb-uas", "uas", "{}");
|
|
qtest_qmp_device_add("scsi-hd", "scsihd", "{'drive': 'drive0'}");
|
|
|
|
/* TODO:
|
|
UAS HBA driver in libqos, to check that
|
|
added disk is visible after BUS rescan
|
|
*/
|
|
|
|
qtest_qmp_device_del("scsihd");
|
|
qtest_qmp_device_del("uas");
|
|
}
|
|
|
|
static void test_usb_ccid_hotplug(void)
|
|
{
|
|
qtest_qmp_device_add("usb-ccid", "ccid", "{}");
|
|
qtest_qmp_device_del("ccid");
|
|
/* check the device can be added again */
|
|
qtest_qmp_device_add("usb-ccid", "ccid", "{}");
|
|
qtest_qmp_device_del("ccid");
|
|
}
|
|
|
|
int main(int argc, char **argv)
|
|
{
|
|
int ret;
|
|
|
|
g_test_init(&argc, &argv, NULL);
|
|
|
|
qtest_add_func("/xhci/pci/init", test_xhci_init);
|
|
qtest_add_func("/xhci/pci/hotplug", test_xhci_hotplug);
|
|
qtest_add_func("/xhci/pci/hotplug/usb-uas", test_usb_uas_hotplug);
|
|
qtest_add_func("/xhci/pci/hotplug/usb-ccid", test_usb_ccid_hotplug);
|
|
|
|
qtest_start("-device nec-usb-xhci,id=xhci"
|
|
" -drive id=drive0,if=none,file=null-co://,format=raw");
|
|
ret = g_test_run();
|
|
qtest_end();
|
|
|
|
return ret;
|
|
}
|