mirror of
https://github.com/qemu/qemu.git
synced 2025-10-26 12:03:40 +00:00
2f3913f4b2
vdpa:
shadow vq vlan support
net migration with cvq
cxl:
support emulating 4 HDM decoders
serial number extended capability
virtio:
hared dma-buf
Fixes, cleanups all over the place.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
-----BEGIN PGP SIGNATURE-----
iQFDBAABCAAtFiEEXQn9CHHI+FuUyooNKB8NuNKNVGkFAmUd4/YPHG1zdEByZWRo
YXQuY29tAAoJECgfDbjSjVRpyM8H/02cRbJcQOjYt7j68zPW6GaDXxBI/UmdWDyG
15LZZbGNOPjyjNd3Vz1M7stQ5rhoKcgo/RdI+0E60a78svgW5JvpXoXR3pksc3Dx
v28B/akXwHUErYFSZQ+2VHNc8OhCd0v2ehxZxbwPEAYIOAj3hcCIVoPGXTnKJmAJ
imr5hjH0wZUc0+xdsmn8Vfdv5NTzpwfVObbGiMZejeJsaoh0y6Rt8RANBMY67KQD
S7/HPlVuDYf/y43t4ZEHNYuV9RaCdZZYlLWwV1scdKaYcofgmtJOKbOdCjHRXgj+
004Afb3rggIoCfnCzOFzhGx+MLDtLjvEn2N4oLEWCLi+k/3huaA=
=GAvH
-----END PGP SIGNATURE-----
Merge tag 'for_upstream' of https://git.kernel.org/pub/scm/virt/kvm/mst/qemu into staging
virtio,pci: features, cleanups
vdpa:
shadow vq vlan support
net migration with cvq
cxl:
support emulating 4 HDM decoders
serial number extended capability
virtio:
hared dma-buf
Fixes, cleanups all over the place.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
* tag 'for_upstream' of https://git.kernel.org/pub/scm/virt/kvm/mst/qemu: (53 commits)
libvhost-user: handle shared_object msg
vhost-user: add shared_object msg
hw/display: introduce virtio-dmabuf
util/uuid: add a hash function
virtio: remove unused next argument from virtqueue_split_read_next_desc()
virtio: remove unnecessary thread fence while reading next descriptor
virtio: use shadow_avail_idx while checking number of heads
libvhost-user.c: add assertion to vu_message_read_default
pcie_sriov: unregister_vfs(): fix error path
hw/i386/pc: improve physical address space bound check for 32-bit x86 systems
amd_iommu: Fix APIC address check
vdpa net: follow VirtIO initialization properly at cvq isolation probing
vdpa net: stop probing if cannot set features
vdpa net: fix error message setting virtio status
hw/pci-bridge/cxl-upstream: Add serial number extended capability support
hw/cxl: Support 4 HDM decoders at all levels of topology
hw/cxl: Fix and use same calculation for HDM decoder block size everywhere
hw/cxl: Add utility functions decoder interleave ways and target count.
hw/cxl: Push cxl_decoder_count_enc() and cxl_decode_ig() into .c
vdpa net: zero vhost_vdpa iova_tree pointer at cleanup
...
Conflicts:
hw/core/machine.c
Context conflict with commit
|
||
|---|---|---|
| .. | ||
| acpi-vga-stub.c | ||
| acpi-vga.c | ||
| artist.c | ||
| ati_2d.c | ||
| ati_dbg.c | ||
| ati_int.h | ||
| ati_regs.h | ||
| ati.c | ||
| bcm2835_fb.c | ||
| blizzard.c | ||
| bochs-display.c | ||
| cg3.c | ||
| cirrus_vga_internal.h | ||
| cirrus_vga_isa.c | ||
| cirrus_vga_rop2.h | ||
| cirrus_vga_rop.h | ||
| cirrus_vga.c | ||
| dpcd.c | ||
| edid-generate.c | ||
| edid-region.c | ||
| exynos4210_fimd.c | ||
| framebuffer.c | ||
| framebuffer.h | ||
| g364fb.c | ||
| i2c-ddc.c | ||
| jazz_led.c | ||
| Kconfig | ||
| macfb.c | ||
| meson.build | ||
| next-fb.c | ||
| omap_dss.c | ||
| omap_lcdc.c | ||
| pl110_template.h | ||
| pl110.c | ||
| pxa2xx_lcd.c | ||
| qxl-logger.c | ||
| qxl-render.c | ||
| qxl.c | ||
| qxl.h | ||
| ramfb-standalone.c | ||
| ramfb.c | ||
| sii9022.c | ||
| sm501.c | ||
| ssd0303.c | ||
| ssd0323.c | ||
| tc6393xb.c | ||
| tcx.c | ||
| trace-events | ||
| trace.h | ||
| vga_int.h | ||
| vga_regs.h | ||
| vga-access.h | ||
| vga-helpers.h | ||
| vga-isa.c | ||
| vga-mmio.c | ||
| vga-pci.c | ||
| vga.c | ||
| vhost-user-gpu-pci.c | ||
| vhost-user-gpu.c | ||
| vhost-user-vga.c | ||
| virtio-dmabuf.c | ||
| virtio-gpu-base.c | ||
| virtio-gpu-gl.c | ||
| virtio-gpu-pci-gl.c | ||
| virtio-gpu-pci.c | ||
| virtio-gpu-udmabuf-stubs.c | ||
| virtio-gpu-udmabuf.c | ||
| virtio-gpu-virgl.c | ||
| virtio-gpu.c | ||
| virtio-vga-gl.c | ||
| virtio-vga.c | ||
| virtio-vga.h | ||
| vmware_vga.c | ||
| xenfb.c | ||
| xlnx_dp.c | ||