b4ba67d9a7
The usual use model for the libqos PCI functions is to map a specific PCI BAR using qpci_iomap() then pass the returned token into IO accessor functions. This, and the fact that iomap() returns a (void *) which actually contains a PCI space address, kind of suggests that the return value from iomap is supposed to be an opaque token. ..except that the callers expect to be able to add offsets to it. Which also assumes the compiler will support pointer arithmetic on a (void *), and treat it as working with byte offsets. To clarify this situation change iomap() and the IO accessors to take a definitely opaque BAR handle (enforced with a wrapper struct) along with an offset within the BAR. This changes both the functions and all the callers. There were a number of places that checked if iomap() returned non-NULL, and or initialized it to NULL before hand. Since iomap() already assert()s if it fails to map the BAR, these tests were mostly pointless and are removed. Signed-off-by: David Gibson <david@gibson.dropbear.id.au> Reviewed-by: Greg Kurz <groug@kaod.org>
68 lines
2.0 KiB
C
68 lines
2.0 KiB
C
/*
|
|
* common code shared by usb tests
|
|
*
|
|
* Copyright (c) 2014 Red Hat, Inc
|
|
*
|
|
* Authors:
|
|
* Gerd Hoffmann <kraxel@redhat.com>
|
|
* John Snow <jsnow@redhat.com>
|
|
* Igor Mammedov <imammedo@redhat.com>
|
|
*
|
|
* 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 "hw/usb/uhci-regs.h"
|
|
#include "libqos/usb.h"
|
|
|
|
void qusb_pci_init_one(QPCIBus *pcibus, struct qhc *hc, uint32_t devfn, int bar)
|
|
{
|
|
hc->dev = qpci_device_find(pcibus, devfn);
|
|
g_assert(hc->dev != NULL);
|
|
qpci_device_enable(hc->dev);
|
|
hc->bar = qpci_iomap(hc->dev, bar, NULL);
|
|
}
|
|
|
|
void uhci_port_test(struct qhc *hc, int port, uint16_t expect)
|
|
{
|
|
uint16_t value = qpci_io_readw(hc->dev, hc->bar, 0x10 + 2 * port);
|
|
uint16_t mask = ~(UHCI_PORT_WRITE_CLEAR | UHCI_PORT_RSVD1);
|
|
|
|
g_assert((value & mask) == (expect & mask));
|
|
}
|
|
|
|
void usb_test_hotplug(const char *hcd_id, const int port,
|
|
void (*port_check)(void))
|
|
{
|
|
QDict *response;
|
|
char *cmd;
|
|
|
|
cmd = g_strdup_printf("{'execute': 'device_add',"
|
|
" 'arguments': {"
|
|
" 'driver': 'usb-tablet',"
|
|
" 'port': '%d',"
|
|
" 'bus': '%s.0',"
|
|
" 'id': 'usbdev%d'"
|
|
"}}", port, hcd_id, port);
|
|
response = qmp(cmd);
|
|
g_free(cmd);
|
|
g_assert(response);
|
|
g_assert(!qdict_haskey(response, "error"));
|
|
QDECREF(response);
|
|
|
|
if (port_check) {
|
|
port_check();
|
|
}
|
|
|
|
cmd = g_strdup_printf("{'execute': 'device_del',"
|
|
" 'arguments': {"
|
|
" 'id': 'usbdev%d'"
|
|
"}}", port);
|
|
response = qmp(cmd);
|
|
g_free(cmd);
|
|
g_assert(response);
|
|
g_assert(qdict_haskey(response, "event"));
|
|
g_assert(!strcmp(qdict_get_str(response, "event"), "DEVICE_DELETED"));
|
|
}
|