SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixes for xhci and modular builds.

Browse Source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABCgAGBQJfFvV5AAoJEEy22O7T6HE4AvsQAKiPiFrhDKfGxnlb5p9eo4QZ
 y3OYmQiYoy3V+9zHpJhhIKPh/oDOxKanGTH3gjhU/25uJC/fsLcPm8T9nQCZG+j4
 XG/nY1SJM0YPpZfHEVitEzYM2dYvsmhynOBS8Hqbi07SVUs0XnpgtdKwjeasoLsG
 R7hOX7vpsA/pf5hcgWe5cHsWiQwR09SBrzRa8OVwQFyEFtYnkIxjjDT//cmb37Ca
 kCm2LZt7qaDY1UUV47LdD5Slw7sC3cUx4+8kwllhiKsqzSiy/r80Gjia59lrRCGz
 cifmJx504rDVVdEnxQlhizk04XYtG+HlKYGx/9H3HKLKpsntyz88rwziQeIwj29T
 78xeT0H0/+y4CHQiBZDVeNINH7jw5uvYKDUZjRT7SFT0Yz3OZ/tTIuWdaXatap2s
 ONdGdsNvtkjx+eb47xpZp+mLPOm0Rht60f+4dWSsPWR2jpbJZyKrQ1dfh1zjifEi
 5UEV3BdcaVvLfqMBe6uYquOfUH+Z7B5VjbBo8N7/5IPKjqW8veBSWcQNicZ5r9/P
 UeFKUC6ODXQTr8JUpSHPIiMAc1z+QaQQyEVtk87xJxTJD7rGlVnT1oJrIebnmZJq
 /kDTcdZpiOuM/hHvbaer914YG20GibIxCoG/mqqcUp6zNUTKhsSgiUEObxq6MHyL
 V2dQPbnH7GT7bB85mDTR
 =+Bpn
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Peter Maydell 2020-07-21 17:36:14 +01:00
commit a418695e1b
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hw/display/qxl.c
View File

@ -1762,7 +1762,16 @@ async_common:
qxl_set_mode(d, val, 0); qxl_set_mode(d, val, 0);
break; break;
case QXL_IO_LOG: 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) { 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 */ /* We cannot trust the guest to NUL terminate d->ram->log_buf */
char *log_buf = g_strndup((const char *)d->ram->log_buf, char *log_buf = g_strndup((const char *)d->ram->log_buf,
sizeof(d->ram->log_buf)); sizeof(d->ram->log_buf));

4
hw/usb/hcd-xhci.c
View File

@ -3184,7 +3184,7 @@ static const MemoryRegionOps xhci_oper_ops = {
.read = xhci_oper_read, .read = xhci_oper_read,
.write = xhci_oper_write, .write = xhci_oper_write,
.valid.min_access_size = 4, .valid.min_access_size = 4,
.valid.max_access_size = 4, .valid.max_access_size = sizeof(dma_addr_t),
.endianness = DEVICE_LITTLE_ENDIAN, .endianness = DEVICE_LITTLE_ENDIAN,
}; };
@ -3200,7 +3200,7 @@ static const MemoryRegionOps xhci_runtime_ops = {
.read = xhci_runtime_read, .read = xhci_runtime_read,
.write = xhci_runtime_write, .write = xhci_runtime_write,
.valid.min_access_size = 4, .valid.min_access_size = 4,
.valid.max_access_size = 4, .valid.max_access_size = sizeof(dma_addr_t),
.endianness = DEVICE_LITTLE_ENDIAN, .endianness = DEVICE_LITTLE_ENDIAN,
}; };

3
util/module.c
View File

@ -275,6 +275,9 @@ void module_load_qom_one(const char *type)
{ {
int i; int i;
if (!type) {
return;
}
if (module_loaded_qom_all) { if (module_loaded_qom_all) {
return; return;
} }