diff options
| -rw-r--r-- | hw/audio/intel-hda.c | 3 | ||||
| -rw-r--r-- | hw/display/virtio-gpu.c | 1 | ||||
| -rw-r--r-- | pc-bios/bios-256k.bin | bin | 262144 -> 262144 bytes | |||
| -rw-r--r-- | pc-bios/bios.bin | bin | 131072 -> 131072 bytes | |||
| -rw-r--r-- | pc-bios/vgabios-cirrus.bin | bin | 38400 -> 38400 bytes | |||
| -rw-r--r-- | pc-bios/vgabios-qxl.bin | bin | 38912 -> 38912 bytes | |||
| -rw-r--r-- | pc-bios/vgabios-stdvga.bin | bin | 38912 -> 38912 bytes | |||
| -rw-r--r-- | pc-bios/vgabios-virtio.bin | bin | 38912 -> 38912 bytes | |||
| -rw-r--r-- | pc-bios/vgabios-vmware.bin | bin | 38912 -> 38912 bytes | |||
| -rw-r--r-- | pc-bios/vgabios.bin | bin | 38400 -> 38400 bytes | |||
| m--------- | roms/seabios | 0 | ||||
| -rw-r--r-- | scripts/tracetool/backend/simple.py | 3 |
12 files changed, 5 insertions, 2 deletions
diff --git a/hw/audio/intel-hda.c b/hw/audio/intel-hda.c index cd95340cd9..537face94d 100644 --- a/hw/audio/intel-hda.c +++ b/hw/audio/intel-hda.c @@ -416,7 +416,8 @@ static bool intel_hda_xfer(HDACodecDevice *dev, uint32_t stnr, bool output, } left = len; - while (left > 0) { + s = st->bentries; + while (left > 0 && s-- > 0) { copy = left; if (copy > st->bsize - st->lpib) copy = st->bsize - st->lpib; diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c index fa6fd0e53f..60bce94d6b 100644 --- a/hw/display/virtio-gpu.c +++ b/hw/display/virtio-gpu.c @@ -333,6 +333,7 @@ static void virtio_gpu_resource_create_2d(VirtIOGPU *g, qemu_log_mask(LOG_GUEST_ERROR, "%s: host couldn't handle guest format %d\n", __func__, c2d.format); + g_free(res); cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_PARAMETER; return; } diff --git a/pc-bios/bios-256k.bin b/pc-bios/bios-256k.bin Binary files differindex 57fb4d88b1..8dc4838a9b 100644 --- a/pc-bios/bios-256k.bin +++ b/pc-bios/bios-256k.bin diff --git a/pc-bios/bios.bin b/pc-bios/bios.bin Binary files differindex 8a6869ff1b..0b16c546ec 100644 --- a/pc-bios/bios.bin +++ b/pc-bios/bios.bin diff --git a/pc-bios/vgabios-cirrus.bin b/pc-bios/vgabios-cirrus.bin Binary files differindex 3f4bb30fe3..67389ca75b 100644 --- a/pc-bios/vgabios-cirrus.bin +++ b/pc-bios/vgabios-cirrus.bin diff --git a/pc-bios/vgabios-qxl.bin b/pc-bios/vgabios-qxl.bin Binary files differindex 38d31b6b5b..9d3d9b4031 100644 --- a/pc-bios/vgabios-qxl.bin +++ b/pc-bios/vgabios-qxl.bin diff --git a/pc-bios/vgabios-stdvga.bin b/pc-bios/vgabios-stdvga.bin Binary files differindex e469c107a7..6fc42b1289 100644 --- a/pc-bios/vgabios-stdvga.bin +++ b/pc-bios/vgabios-stdvga.bin diff --git a/pc-bios/vgabios-virtio.bin b/pc-bios/vgabios-virtio.bin Binary files differindex d42b02873a..b2e6e5a235 100644 --- a/pc-bios/vgabios-virtio.bin +++ b/pc-bios/vgabios-virtio.bin diff --git a/pc-bios/vgabios-vmware.bin b/pc-bios/vgabios-vmware.bin Binary files differindex 26bc0b704c..eccd87b458 100644 --- a/pc-bios/vgabios-vmware.bin +++ b/pc-bios/vgabios-vmware.bin diff --git a/pc-bios/vgabios.bin b/pc-bios/vgabios.bin Binary files differindex 2d1a7c6c95..450230ab42 100644 --- a/pc-bios/vgabios.bin +++ b/pc-bios/vgabios.bin diff --git a/roms/seabios b/roms/seabios -Subproject e2fc41e24ee0ada60fc511d60b15a41b294538b +Subproject d7adf6044a4c772b497e97272adf97426b34a24 diff --git a/scripts/tracetool/backend/simple.py b/scripts/tracetool/backend/simple.py index 9885e83cd4..85f61028e2 100644 --- a/scripts/tracetool/backend/simple.py +++ b/scripts/tracetool/backend/simple.py @@ -21,7 +21,8 @@ PUBLIC = True def is_string(arg): strtype = ('const char*', 'char*', 'const char *', 'char *') - if arg.lstrip().startswith(strtype): + arg_strip = arg.lstrip() + if arg_strip.startswith(strtype) and arg_strip.count('*') == 1: return True else: return False |