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>
86 lines
2 KiB
C
86 lines
2 KiB
C
/*
|
|
* QTest testcase for USB UHCI 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/libqos.h"
|
|
#include "libqos/usb.h"
|
|
#include "libqos/libqos-pc.h"
|
|
#include "libqos/libqos-spapr.h"
|
|
#include "hw/usb/uhci-regs.h"
|
|
|
|
static QOSState *qs;
|
|
|
|
static void test_uhci_init(void)
|
|
{
|
|
}
|
|
|
|
static void test_port(int port)
|
|
{
|
|
struct qhc uhci;
|
|
|
|
g_assert(port > 0);
|
|
qusb_pci_init_one(qs->pcibus, &uhci, QPCI_DEVFN(0x1d, 0), 4);
|
|
uhci_port_test(&uhci, port - 1, UHCI_PORT_CCS);
|
|
uhci_deinit(&uhci);
|
|
}
|
|
|
|
static void test_port_1(void)
|
|
{
|
|
test_port(1);
|
|
}
|
|
|
|
static void test_port_2(void)
|
|
{
|
|
test_port(2);
|
|
}
|
|
|
|
static void test_uhci_hotplug(void)
|
|
{
|
|
usb_test_hotplug("uhci", "2", test_port_2);
|
|
}
|
|
|
|
static void test_usb_storage_hotplug(void)
|
|
{
|
|
qtest_qmp_device_add("usb-storage", "usbdev0", "{'drive': 'drive0'}");
|
|
|
|
qtest_qmp_device_del("usbdev0");
|
|
}
|
|
|
|
int main(int argc, char **argv)
|
|
{
|
|
const char *arch = qtest_get_arch();
|
|
const char *cmd = "-device piix3-usb-uhci,id=uhci,addr=1d.0"
|
|
" -drive id=drive0,if=none,file=null-co://,format=raw"
|
|
" -device usb-tablet,bus=uhci.0,port=1";
|
|
int ret;
|
|
|
|
g_test_init(&argc, &argv, NULL);
|
|
|
|
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);
|
|
|
|
if (strcmp(arch, "i386") == 0 || strcmp(arch, "x86_64") == 0) {
|
|
qs = qtest_pc_boot(cmd);
|
|
} else if (strcmp(arch, "ppc64") == 0) {
|
|
qs = qtest_spapr_boot(cmd);
|
|
} else {
|
|
g_printerr("usb-hcd-uhci-test tests are only "
|
|
"available on x86 or ppc64\n");
|
|
exit(EXIT_FAILURE);
|
|
}
|
|
global_qtest = qs->qts;
|
|
ret = g_test_run();
|
|
qtest_shutdown(qs);
|
|
|
|
return ret;
|
|
}
|