mirror of
https://github.com/qemu/qemu.git
synced 2025-10-31 04:06:46 +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>
40 lines
736 B
C
40 lines
736 B
C
/*
|
|
* QTest testcase for USB OHCI 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_ohci_init(void)
|
|
{
|
|
|
|
}
|
|
|
|
static void test_ohci_hotplug(void)
|
|
{
|
|
usb_test_hotplug("ohci", "1", NULL);
|
|
}
|
|
|
|
int main(int argc, char **argv)
|
|
{
|
|
int ret;
|
|
|
|
g_test_init(&argc, &argv, NULL);
|
|
|
|
qtest_add_func("/ohci/pci/init", test_ohci_init);
|
|
qtest_add_func("/ohci/pci/hotplug", test_ohci_hotplug);
|
|
|
|
qtest_start("-device pci-ohci,id=ohci");
|
|
ret = g_test_run();
|
|
qtest_end();
|
|
|
|
return ret;
|
|
}
|