diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-07-21 17:36:14 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-07-21 17:36:14 +0100 |
| commit | a418695e1b177da055d477c4e15ce900c01a94fd (patch) | |
| tree | aac4e81d24aa80e8f3c510d30a8686bc2af622f7 | |
| parent | 5252220dbf006969fab377d7ab42c6704d833e8a (diff) | |
| parent | d87350b065128e8156e7aca93e89a1ab9e5fa63d (diff) | |
| download | qemu-a418695e1b177da055d477c4e15ce900c01a94fd.zip qemu-a418695e1b177da055d477c4e15ce900c01a94fd.tar.gz qemu-a418695e1b177da055d477c4e15ce900c01a94fd.tar.bz2 | |
Merge remote-tracking branch 'remotes/kraxel/tags/fixes-20200721-pull-request' into staging
fixes for xhci and modular builds.
# gpg: Signature made Tue 21 Jul 2020 15:02:33 BST
# gpg: using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/fixes-20200721-pull-request:
module: ignore NULL type
qxl: fix modular builds with dtrace
xhci: fix valid.max_access_size to access address registers
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | hw/display/qxl.c | 9 | ||||
| -rw-r--r-- | hw/usb/hcd-xhci.c | 4 | ||||
| -rw-r--r-- | util/module.c | 3 |
3 files changed, 14 insertions, 2 deletions
diff --git a/hw/display/qxl.c b/hw/display/qxl.c index d562711..1187134 100644 --- a/hw/display/qxl.c +++ b/hw/display/qxl.c @@ -1762,7 +1762,16 @@ async_common: qxl_set_mode(d, val, 0); break; case QXL_IO_LOG: +#ifdef CONFIG_MODULES + /* + * FIXME + * trace_event_get_state_backends() does not work for modules, + * it leads to "undefined symbol: qemu_qxl_io_log_semaphore" + */ + if (true) { +#else if (trace_event_get_state_backends(TRACE_QXL_IO_LOG) || d->guestdebug) { +#endif /* We cannot trust the guest to NUL terminate d->ram->log_buf */ char *log_buf = g_strndup((const char *)d->ram->log_buf, sizeof(d->ram->log_buf)); diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c index b330e36..67a18fe 100644 --- a/hw/usb/hcd-xhci.c +++ b/hw/usb/hcd-xhci.c @@ -3184,7 +3184,7 @@ static const MemoryRegionOps xhci_oper_ops = { .read = xhci_oper_read, .write = xhci_oper_write, .valid.min_access_size = 4, - .valid.max_access_size = 4, + .valid.max_access_size = sizeof(dma_addr_t), .endianness = DEVICE_LITTLE_ENDIAN, }; @@ -3200,7 +3200,7 @@ static const MemoryRegionOps xhci_runtime_ops = { .read = xhci_runtime_read, .write = xhci_runtime_write, .valid.min_access_size = 4, - .valid.max_access_size = 4, + .valid.max_access_size = sizeof(dma_addr_t), .endianness = DEVICE_LITTLE_ENDIAN, }; diff --git a/util/module.c b/util/module.c index 90e9bd4..0ab0085 100644 --- a/util/module.c +++ b/util/module.c @@ -275,6 +275,9 @@ void module_load_qom_one(const char *type) { int i; + if (!type) { + return; + } if (module_loaded_qom_all) { return; } |