Upvert gfxstream and qemu and related crates.
Bug: b/314191022
Change-Id: I5954af6254a19868583ca3aa2719e88710f30559
diff --git a/qemu/manifest.xml b/qemu/manifest.xml
index f7a6e94..3e2cd7c 100644
--- a/qemu/manifest.xml
+++ b/qemu/manifest.xml
@@ -8,13 +8,13 @@
<project path="qemu/prebuilts/cmake" name="platform/prebuilts/cmake/linux-x86" revision="001ed46e3703c78cbc3838adfe4c14ba279f9ff7" clone-depth="1" />
<project path="qemu/prebuilts/gcc" name="platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8" revision="f7b0d5b0ee369864d5ac3e96ae24ec9e2b6a52da" clone-depth="1" />
<project path="qemu/prebuilts/ninja" name="platform/prebuilts/ninja/linux-x86" revision="8a10824f74fe0e22af9bf314a837f5b70e2bb67f" clone-depth="1" />
- <project path="qemu/prebuilts/rust" name="platform/prebuilts/rust" revision="420a45125a091ddc1bd09b4c6fb39306fdc0c5b5" clone-depth="1" />
+ <project path="qemu/prebuilts/rust" name="platform/prebuilts/rust" revision="ed6633c7a96144bebd982e15da76295d7d6e2de9" clone-depth="1" />
<project path="qemu/third_party/aemu" name="platform/hardware/google/aemu" revision="d6e6b99ba6ec2b6b2502aa46dcb57d6b0fa53787" />
<project path="qemu/third_party/bzip2" name="platform/external/bzip2" revision="af971b5524a392944a8fd1423b1860f3ab2919ec" />
- <project path="qemu/third_party/crosvm" name="platform/external/crosvm" revision="12c3453642890709e86e47dff39a60bc312f81e3" />
+ <project path="qemu/third_party/crosvm" name="platform/external/crosvm" revision="f1829e78f44a10d182c0c33cbe582c3a7247cc35" />
<project path="qemu/third_party/egl" name="platform/external/egl-registry" revision="9ab603608d6b165f79f17eee9ee1ced861625893" />
<project path="qemu/third_party/flatbuffers" name="platform/external/flatbuffers" revision="baf9b3a15e291a0c76850a50f994c5947c3f5e5e" />
- <project path="qemu/third_party/gfxstream" name="platform/hardware/google/gfxstream" revision="ea8f75f109f79a281627c3dd928df6a44600ab24" />
+ <project path="qemu/third_party/gfxstream" name="platform/hardware/google/gfxstream" revision="f2ee1247e262efc89d8baeacbce5e4e732d16ffc" />
<project path="qemu/third_party/glib" name="platform/external/bluetooth/glib" revision="180713772f4e7bcdddf2c793f2f34a498184ed15" />
<project path="qemu/third_party/glib/subprojects/gvdb" name="platform/external/gvdb" revision="0854af0fdb6d527a8d1999835ac2c5059976c210" />
<project path="qemu/third_party/googletest" name="platform/external/googletest" revision="276e32ec333e05bff6dc7d20218a8d9152623222" />
@@ -29,15 +29,15 @@
<project path="qemu/third_party/pixman" name="platform/external/pixman" revision="37216a32839f59e8dcaa4c3951b3fcfc3f07852c" />
<project path="qemu/third_party/pkg-config" name="platform/external/pkg-config" revision="d97db4fae4c1cd099b506970b285dc2afd818ea2" />
<project path="qemu/third_party/python" name="platform/prebuilts/python/linux-x86" revision="008e82161a393ca8f7ac80f0683d6650ca03b347" />
- <project path="qemu/third_party/qemu" name="platform/external/qemu" revision="516fffc9933cb21fad41ca8f7bf465d238d4d375" />
+ <project path="qemu/third_party/qemu" name="platform/external/qemu" revision="abf635ddfe3242df907f58967f3c1e6763bbca2d" />
<project path="qemu/third_party/rust/crates/anyhow" name="platform/external/rust/crates/anyhow" revision="bb04cc54d8262ffe33cba59fa600bfbfe7e1d4ef" />
- <project path="qemu/third_party/rust/crates/bitflags" name="platform/external/rust/crates/bitflags" revision="834363264dbcc07e346cdb999432ec6763c1ac09" />
+ <project path="qemu/third_party/rust/crates/bitflags" name="platform/external/rust/crates/bitflags" revision="a28a75e883a06f4d384b555e6a6f9c73bb8e875a" />
<project path="qemu/third_party/rust/crates/byteorder" name="platform/external/rust/crates/byteorder" revision="3717e50a4895f69a726d1489254d9c4ad612c28b" />
<project path="qemu/third_party/rust/crates/cfg-if" name="platform/external/rust/crates/cfg-if" revision="6370d7a0025c7ae60eb5b427fc4d10a3c72e04bb" />
- <project path="qemu/third_party/rust/crates/libc" name="platform/external/rust/crates/libc" revision="db73f80a4493567b524f3cd53fa016a01a51f394" />
+ <project path="qemu/third_party/rust/crates/libc" name="platform/external/rust/crates/libc" revision="e39862cf04bdca7a6dbb67a1843ee90504e13145" />
<project path="qemu/third_party/rust/crates/log" name="platform/external/rust/crates/log" revision="eeec3f50acc9f32074dbfb3751dcf96115c95b8d" />
- <project path="qemu/third_party/rust/crates/memoffset" name="platform/external/rust/crates/memoffset" revision="abfcb00917a1a40c50a50fbc07dde252e538b991" />
- <project path="qemu/third_party/rust/crates/nix" name="platform/external/rust/crates/nix" revision="11ba04ed31a8486a1c5088289cebfb2d0346e770" />
+ <project path="qemu/third_party/rust/crates/memoffset" name="platform/external/rust/crates/memoffset" revision="7020a4bf607d53aad1c7c81e45fa2c51f46b0c02" />
+ <project path="qemu/third_party/rust/crates/nix" name="platform/external/rust/crates/nix" revision="368805870d33a494270a4d171a170c8e5dab4361" />
<project path="qemu/third_party/rust/crates/once_cell" name="platform/external/rust/crates/once_cell" revision="4a9d8e8ee32e8ff0c1fea38c19cc50f33068910e" />
<project path="qemu/third_party/rust/crates/pin-utils" name="platform/external/rust/crates/pin-utils" revision="c8ba00eb24a92081deb6ae0a43aaea058726a996" />
<project path="qemu/third_party/rust/crates/proc-macro2" name="platform/external/rust/crates/proc-macro2" revision="3def4a0b2b2acf4fb092dd4318d17f6674bd8e4c" />
diff --git a/qemu/scripts/rebuild.py b/qemu/scripts/rebuild.py
index 0a4eede..a23bcbd 100755
--- a/qemu/scripts/rebuild.py
+++ b/qemu/scripts/rebuild.py
@@ -415,12 +415,17 @@
@project.task([])
def build_task_for_rust(build: BuildConfig):
log("Install prebuilt rust.")
- src_rust_dir = build.prebuilts_dir / "rust" / "linux-x86" / "1.65.0"
+ src_rust_dir = build.prebuilts_dir / "rust" / "linux-x86" / "1.73.0"
dst_rust_dir = build.install_dir / "usr"
for d in ("bin", "lib", "lib64", "share"):
src_dir = src_rust_dir / d
dst_dir = dst_rust_dir / d
build.copy_dir(src_dir, dst_dir)
+ build.run(
+ ["ln", "-sf", "libc++.so", "libc++.so.1"],
+ sub_build_dir=dst_rust_dir / "lib64",
+ env={},
+ )
@project.task([build_task_for_sysroot])
@@ -883,6 +888,7 @@
build.run(
["ln", "-sf", "librutabaga_gfx_ffi.so", "librutabaga_gfx_ffi.so.0"],
build.install_dir / "usr" / "lib",
+ env={}
)
build.copy_file(
rutabaga_src_dir / "src" / "share" / "rutabaga_gfx_ffi.pc",
diff --git a/qemu/x86_64-linux-gnu/bin/libc++.so.1 b/qemu/x86_64-linux-gnu/bin/libc++.so.1
index b452eae..834fede 100755
--- a/qemu/x86_64-linux-gnu/bin/libc++.so.1
+++ b/qemu/x86_64-linux-gnu/bin/libc++.so.1
Binary files differ
diff --git a/qemu/x86_64-linux-gnu/bin/libgfxstream_backend.so.0 b/qemu/x86_64-linux-gnu/bin/libgfxstream_backend.so.0
index 5e02864..b2f931a 100755
--- a/qemu/x86_64-linux-gnu/bin/libgfxstream_backend.so.0
+++ b/qemu/x86_64-linux-gnu/bin/libgfxstream_backend.so.0
Binary files differ
diff --git a/qemu/x86_64-linux-gnu/bin/librutabaga_gfx_ffi.so.0 b/qemu/x86_64-linux-gnu/bin/librutabaga_gfx_ffi.so.0
index 8d190b0..856d444 100755
--- a/qemu/x86_64-linux-gnu/bin/librutabaga_gfx_ffi.so.0
+++ b/qemu/x86_64-linux-gnu/bin/librutabaga_gfx_ffi.so.0
Binary files differ
diff --git a/qemu/x86_64-linux-gnu/bin/qemu-edid b/qemu/x86_64-linux-gnu/bin/qemu-edid
index 75a5648..d572510 100755
--- a/qemu/x86_64-linux-gnu/bin/qemu-edid
+++ b/qemu/x86_64-linux-gnu/bin/qemu-edid
Binary files differ
diff --git a/qemu/x86_64-linux-gnu/bin/qemu-ga b/qemu/x86_64-linux-gnu/bin/qemu-ga
index 080c1c1..b046612 100755
--- a/qemu/x86_64-linux-gnu/bin/qemu-ga
+++ b/qemu/x86_64-linux-gnu/bin/qemu-ga
Binary files differ
diff --git a/qemu/x86_64-linux-gnu/bin/qemu-img b/qemu/x86_64-linux-gnu/bin/qemu-img
index 937a248..827fc11 100755
--- a/qemu/x86_64-linux-gnu/bin/qemu-img
+++ b/qemu/x86_64-linux-gnu/bin/qemu-img
Binary files differ
diff --git a/qemu/x86_64-linux-gnu/bin/qemu-io b/qemu/x86_64-linux-gnu/bin/qemu-io
index 99780ae..ff448ae 100755
--- a/qemu/x86_64-linux-gnu/bin/qemu-io
+++ b/qemu/x86_64-linux-gnu/bin/qemu-io
Binary files differ
diff --git a/qemu/x86_64-linux-gnu/bin/qemu-nbd b/qemu/x86_64-linux-gnu/bin/qemu-nbd
index 9f7c662..3744827 100755
--- a/qemu/x86_64-linux-gnu/bin/qemu-nbd
+++ b/qemu/x86_64-linux-gnu/bin/qemu-nbd
Binary files differ
diff --git a/qemu/x86_64-linux-gnu/bin/qemu-pr-helper b/qemu/x86_64-linux-gnu/bin/qemu-pr-helper
index b820598..5261990 100755
--- a/qemu/x86_64-linux-gnu/bin/qemu-pr-helper
+++ b/qemu/x86_64-linux-gnu/bin/qemu-pr-helper
Binary files differ
diff --git a/qemu/x86_64-linux-gnu/bin/qemu-storage-daemon b/qemu/x86_64-linux-gnu/bin/qemu-storage-daemon
index 540bd4e..bb1eef7 100755
--- a/qemu/x86_64-linux-gnu/bin/qemu-storage-daemon
+++ b/qemu/x86_64-linux-gnu/bin/qemu-storage-daemon
Binary files differ
diff --git a/qemu/x86_64-linux-gnu/bin/qemu-system-aarch64 b/qemu/x86_64-linux-gnu/bin/qemu-system-aarch64
index c91c993..e795d28 100755
--- a/qemu/x86_64-linux-gnu/bin/qemu-system-aarch64
+++ b/qemu/x86_64-linux-gnu/bin/qemu-system-aarch64
Binary files differ
diff --git a/qemu/x86_64-linux-gnu/bin/qemu-system-riscv64 b/qemu/x86_64-linux-gnu/bin/qemu-system-riscv64
index bf3940e..05af7ff 100755
--- a/qemu/x86_64-linux-gnu/bin/qemu-system-riscv64
+++ b/qemu/x86_64-linux-gnu/bin/qemu-system-riscv64
Binary files differ
diff --git a/qemu/x86_64-linux-gnu/bin/qemu-system-x86_64 b/qemu/x86_64-linux-gnu/bin/qemu-system-x86_64
index f9e0d10..7bdb14f 100755
--- a/qemu/x86_64-linux-gnu/bin/qemu-system-x86_64
+++ b/qemu/x86_64-linux-gnu/bin/qemu-system-x86_64
Binary files differ
diff --git a/qemu/x86_64-linux-gnu/usr/libexec/qemu-bridge-helper b/qemu/x86_64-linux-gnu/usr/libexec/qemu-bridge-helper
index e4a86ea..6fa450e 100755
--- a/qemu/x86_64-linux-gnu/usr/libexec/qemu-bridge-helper
+++ b/qemu/x86_64-linux-gnu/usr/libexec/qemu-bridge-helper
Binary files differ
diff --git a/qemu/x86_64-linux-gnu/usr/libexec/vhost-user-gpu b/qemu/x86_64-linux-gnu/usr/libexec/vhost-user-gpu
index 18401db..97fd6a9 100755
--- a/qemu/x86_64-linux-gnu/usr/libexec/vhost-user-gpu
+++ b/qemu/x86_64-linux-gnu/usr/libexec/vhost-user-gpu
Binary files differ
diff --git a/qemu/x86_64-linux-gnu/usr/share/qemu/bios-256k.bin b/qemu/x86_64-linux-gnu/usr/share/qemu/bios-256k.bin
index 8d1dc0d..48c3707 100644
--- a/qemu/x86_64-linux-gnu/usr/share/qemu/bios-256k.bin
+++ b/qemu/x86_64-linux-gnu/usr/share/qemu/bios-256k.bin
Binary files differ
diff --git a/qemu/x86_64-linux-gnu/usr/share/qemu/bios-microvm.bin b/qemu/x86_64-linux-gnu/usr/share/qemu/bios-microvm.bin
index 1a96d55..c98351e 100644
--- a/qemu/x86_64-linux-gnu/usr/share/qemu/bios-microvm.bin
+++ b/qemu/x86_64-linux-gnu/usr/share/qemu/bios-microvm.bin
Binary files differ
diff --git a/qemu/x86_64-linux-gnu/usr/share/qemu/bios.bin b/qemu/x86_64-linux-gnu/usr/share/qemu/bios.bin
index a4e7fef..7e2d062 100644
--- a/qemu/x86_64-linux-gnu/usr/share/qemu/bios.bin
+++ b/qemu/x86_64-linux-gnu/usr/share/qemu/bios.bin
Binary files differ
diff --git a/qemu/x86_64-linux-gnu/usr/share/qemu/hppa-firmware.img b/qemu/x86_64-linux-gnu/usr/share/qemu/hppa-firmware.img
index e976c0c..ab715f0 100644
--- a/qemu/x86_64-linux-gnu/usr/share/qemu/hppa-firmware.img
+++ b/qemu/x86_64-linux-gnu/usr/share/qemu/hppa-firmware.img
Binary files differ
diff --git a/qemu/x86_64-linux-gnu/usr/share/qemu/trace-events-all b/qemu/x86_64-linux-gnu/usr/share/qemu/trace-events-all
index 08e5aff..b0cc527 100644
--- a/qemu/x86_64-linux-gnu/usr/share/qemu/trace-events-all
+++ b/qemu/x86_64-linux-gnu/usr/share/qemu/trace-events-all
@@ -1056,6 +1056,26 @@
asc_write_reg(int reg, unsigned size, uint64_t value) "reg=0x%03x size=%u value=0x%"PRIx64
asc_write_extreg(const char fifo, int reg, unsigned size, uint64_t value) "fifo %c reg=0x%03x size=%u value=0x%"PRIx64
asc_update_irq(int irq, int a, int b) "set IRQ to %d (A: 0x%x B: 0x%x)"
+
+#virtio-snd.c
+virtio_snd_get_config(void *vdev, uint32_t jacks, uint32_t streams, uint32_t chmaps) "snd %p: get_config jacks=%"PRIu32" streams=%"PRIu32" chmaps=%"PRIu32""
+virtio_snd_set_config(void *vdev, uint32_t jacks, uint32_t new_jacks, uint32_t streams, uint32_t new_streams, uint32_t chmaps, uint32_t new_chmaps) "snd %p: set_config jacks from %"PRIu32"->%"PRIu32", streams from %"PRIu32"->%"PRIu32", chmaps from %"PRIu32"->%"PRIu32
+virtio_snd_get_features(void *vdev, uint64_t features) "snd %p: get_features 0x%"PRIx64
+virtio_snd_vm_state_running(void) "vm state running"
+virtio_snd_vm_state_stopped(void) "vm state stopped"
+virtio_snd_realize(void *snd) "snd %p: realize"
+virtio_snd_unrealize(void *snd) "snd %p: unrealize"
+virtio_snd_handle_pcm_set_params(uint32_t stream) "VIRTIO_SND_PCM_SET_PARAMS called for stream %"PRIu32
+virtio_snd_handle_ctrl(void *vdev, void *vq) "snd %p: handle ctrl event for queue %p"
+virtio_snd_handle_pcm_info(uint32_t stream) "VIRTIO_SND_R_PCM_INFO called for stream %"PRIu32
+virtio_snd_handle_pcm_start_stop(const char *code, uint32_t stream) "%s called for stream %"PRIu32
+virtio_snd_handle_pcm_release(uint32_t stream) "VIRTIO_SND_PCM_RELEASE called for stream %"PRIu32
+virtio_snd_handle_code(uint32_t val, const char *code) "ctrl code msg val = %"PRIu32" == %s"
+virtio_snd_handle_chmap_info(void) "VIRTIO_SND_CHMAP_INFO called"
+virtio_snd_handle_event(void) "event queue callback called"
+virtio_snd_pcm_stream_flush(uint32_t stream) "flushing stream %"PRIu32
+virtio_snd_handle_tx_xfer(void) "tx queue callback called"
+virtio_snd_handle_rx_xfer(void) "rx queue callback called"
# See docs/devel/tracing.rst for syntax documentation.
# fdc.c
@@ -1268,6 +1288,14 @@
# sh_serial.c
sh_serial_read(char *id, unsigned size, uint64_t offs, uint64_t val) " %s size %d offs 0x%02" PRIx64 " -> 0x%02" PRIx64
sh_serial_write(char *id, unsigned size, uint64_t offs, uint64_t val) "%s size %d offs 0x%02" PRIx64 " <- 0x%02" PRIx64
+
+# xen_console.c
+xen_console_connect(unsigned int idx, unsigned int ring_ref, unsigned int port, unsigned int limit) "idx %u ring_ref %u port %u limit %u"
+xen_console_disconnect(unsigned int idx) "idx %u"
+xen_console_unrealize(unsigned int idx) "idx %u"
+xen_console_realize(unsigned int idx, const char *chrdev) "idx %u chrdev %s"
+xen_console_device_create(unsigned int idx) "idx %u"
+xen_console_device_destroy(unsigned int idx) "idx %u"
# See docs/devel/tracing.rst for syntax documentation.
# jazz_led.c
@@ -1511,6 +1539,24 @@
vmbus_open_channel(uint32_t chan_id, uint32_t gpadl_id, uint32_t target_vp) "channel #%d gpadl #%d target vp %d"
vmbus_channel_open(uint32_t chan_id, uint32_t status) "channel #%d status %d"
vmbus_close_channel(uint32_t chan_id) "channel #%d"
+
+# hv-balloon
+hv_balloon_state_change(const char *tostr) "-> %s"
+hv_balloon_incoming_version(uint16_t major, uint16_t minor) "incoming proto version %u.%u"
+hv_balloon_incoming_caps(uint32_t caps) "incoming caps 0x%x"
+hv_balloon_outgoing_unballoon(uint32_t trans_id, uint64_t count, uint64_t start, uint64_t rempages) "posting unballoon %"PRIu32" for %"PRIu64" @ 0x%"PRIx64", remaining %"PRIu64
+hv_balloon_incoming_unballoon(uint32_t trans_id) "incoming unballoon response %"PRIu32
+hv_balloon_outgoing_hot_add(uint32_t trans_id, uint64_t count, uint64_t start) "posting hot add %"PRIu32" for %"PRIu64" @ 0x%"PRIx64
+hv_balloon_incoming_hot_add(uint32_t trans_id, uint32_t result, uint32_t count) "incoming hot add response %"PRIu32", result %"PRIu32", count %"PRIu32
+hv_balloon_outgoing_balloon(uint32_t trans_id, uint64_t count, uint64_t rempages) "posting balloon %"PRIu32" for %"PRIu64", remaining %"PRIu64
+hv_balloon_incoming_balloon(uint32_t trans_id, uint32_t range_count, uint32_t more_pages) "incoming balloon response %"PRIu32", ranges %"PRIu32", more %"PRIu32
+hv_balloon_our_range_add(uint64_t count, uint64_t start) "adding our range %"PRIu64" @ 0x%"PRIx64
+hv_balloon_remove_response(uint64_t count, uint64_t start, unsigned int both) "processing remove response range %"PRIu64" @ 0x%"PRIx64", both %u"
+hv_balloon_remove_response_hole(uint64_t counthole, uint64_t starthole, uint64_t countrange, uint64_t startrange, uint64_t starthpr, unsigned int both) "response range hole %"PRIu64" @ 0x%"PRIx64" from range %"PRIu64" @ 0x%"PRIx64", before our start 0x%"PRIx64", both %u"
+hv_balloon_remove_response_common(uint64_t countcommon, uint64_t startcommon, uint64_t countrange, uint64_t startrange, uint64_t counthpr, uint64_t starthpr, uint64_t removed, unsigned int both) "response common range %"PRIu64" @ 0x%"PRIx64" from range %"PRIu64" @ 0x%"PRIx64" with our %"PRIu64" @ 0x%"PRIx64", removed %"PRIu64", both %u"
+hv_balloon_remove_response_remainder(uint64_t count, uint64_t start, unsigned int both) "remove response remaining range %"PRIu64" @ 0x%"PRIx64", both %u"
+hv_balloon_map_slot(unsigned int idx, unsigned int total_slots, uint64_t offset) "mapping memslot %u / %u @ 0x%"PRIx64
+hv_balloon_unmap_slot(unsigned int idx, unsigned int total_slots, uint64_t offset) "unmapping memslot %u / %u @ 0x%"PRIx64
# See docs/devel/tracing.rst for syntax documentation.
# bitbang_i2c.c
@@ -1528,6 +1574,12 @@
i2c_recv(uint8_t address, uint8_t data) "recv(addr:0x%02x) data:0x%02x"
i2c_ack(void) ""
+# pm_smbus.c
+
+smbus_ioport_readb(uint16_t addr, uint8_t data) "[0x%04" PRIx16 "] -> val=0x%02x"
+smbus_ioport_writeb(uint16_t addr, uint8_t data) "[0x%04" PRIx16 "] <- val=0x%02x"
+smbus_transaction(uint8_t addr, uint8_t prot) "addr=0x%02x prot=0x%02x"
+
# allwinner_i2c.c
allwinner_i2c_read(const char* reg_name, uint64_t offset, uint64_t value) "read %s [0x%" PRIx64 "]: -> 0x%" PRIx64
@@ -1720,6 +1772,8 @@
xenstore_unwatch(const char *path, const char *token) "path %s token %s"
xenstore_reset_watches(void) ""
xenstore_watch_event(const char *path, const char *token) "path %s token %s"
+xen_primary_console_create(void) ""
+xen_primary_console_reset(int port) "port %u"
# See docs/devel/tracing.rst for syntax documentation.
# core.c
@@ -2371,6 +2425,10 @@
imx7_gpr_read(uint64_t offset) "addr 0x%08" PRIx64
imx7_gpr_write(uint64_t offset, uint64_t value) "addr 0x%08" PRIx64 "value 0x%08" PRIx64
+# imx7_snvs.c
+imx7_snvs_read(uint64_t offset, uint32_t value) "addr 0x%08" PRIx64 "value 0x%08" PRIx32
+imx7_snvs_write(uint64_t offset, uint32_t value) "addr 0x%08" PRIx64 "value 0x%08" PRIx32
+
# mos6522.c
mos6522_set_counter(int index, unsigned int val) "T%d.counter=%d"
mos6522_get_next_irq_time(uint16_t latch, int64_t d, int64_t delta) "latch=%d counter=0x%"PRIx64 " delta_next=0x%"PRIx64
@@ -2448,6 +2506,21 @@
iotkit_secctl_ns_read(uint32_t offset, uint64_t data, unsigned size) "IoTKit SecCtl NS regs read: offset 0x%x data 0x%" PRIx64 " size %u"
iotkit_secctl_ns_write(uint32_t offset, uint64_t data, unsigned size) "IoTKit SecCtl NS regs write: offset 0x%x data 0x%" PRIx64 " size %u"
+# imx6_ccm.c
+imx6_analog_get_periph_clk(uint32_t freq) "freq = %u Hz"
+imx6_analog_get_pll2_clk(uint32_t freq) "freq = %u Hz"
+imx6_analog_get_pll2_pfd0_clk(uint32_t freq) "freq = %u Hz"
+imx6_analog_get_pll2_pfd2_clk(uint32_t freq) "freq = %u Hz"
+imx6_analog_read(const char *reg, uint32_t value) "reg[%s] => 0x%" PRIx32
+imx6_analog_write(const char *reg, uint32_t value) "reg[%s] <= 0x%" PRIx32
+imx6_ccm_get_ahb_clk(uint32_t freq) "freq = %u Hz"
+imx6_ccm_get_ipg_clk(uint32_t freq) "freq = %u Hz"
+imx6_ccm_get_per_clk(uint32_t freq) "freq = %u Hz"
+imx6_ccm_get_clock_frequency(unsigned clock, uint32_t freq) "(Clock = %d) = %u"
+imx6_ccm_read(const char *reg, uint32_t value) "reg[%s] => 0x%" PRIx32
+imx6_ccm_reset(void) ""
+imx6_ccm_write(const char *reg, uint32_t value) "reg[%s] <= 0x%" PRIx32
+
# imx6ul_ccm.c
ccm_entry(void) ""
ccm_freq(uint32_t freq) "freq = %d"
@@ -2885,6 +2958,7 @@
igb_core_mdic_read_unhandled(uint32_t addr) "MDIC READ: PHY[%u] UNHANDLED"
igb_core_mdic_write(uint32_t addr, uint32_t data) "MDIC WRITE: PHY[%u] = 0x%x"
igb_core_mdic_write_unhandled(uint32_t addr) "MDIC WRITE: PHY[%u] UNHANDLED"
+igb_core_vf_reset(uint16_t vfn) "VF%d"
igb_link_set_ext_params(bool asd_check, bool speed_select_bypass, bool pfrstd) "Set extended link params: ASD check: %d, Speed select bypass: %d, PF reset done: %d"
@@ -3093,6 +3167,17 @@
dp8393x_receive_not_netcard(void) "packet not for netcard"
dp8393x_receive_packet(int crba) "Receive packet at 0x%"PRIx32
dp8393x_receive_write_status(int crba) "Write status at 0x%"PRIx32
+
+# xen_nic.c
+xen_netdev_realize(int dev, const char *info, const char *peer) "vif%u info '%s' peer '%s'"
+xen_netdev_unrealize(int dev) "vif%u"
+xen_netdev_create(int dev) "vif%u"
+xen_netdev_destroy(int dev) "vif%u"
+xen_netdev_disconnect(int dev) "vif%u"
+xen_netdev_connect(int dev, unsigned int tx, unsigned int rx, int port) "vif%u tx %u rx %u port %u"
+xen_netdev_frontend_changed(const char *dev, int state) "vif%s state %d"
+xen_netdev_tx(int dev, int ref, int off, int len, unsigned int flags, const char *c, const char *d, const char *m, const char *e) "vif%u ref %u off %u len %u flags 0x%x%s%s%s%s"
+xen_netdev_rx(int dev, int idx, int status, int flags) "vif%u idx %d status %d flags 0x%x"
# xlnx-zynqmp-can.c
xlnx_can_update_irq(uint32_t isr, uint32_t ier, uint32_t irq) "ISR: 0x%08x IER: 0x%08x IRQ: 0x%08x"
xlnx_can_reset(uint32_t val) "Resetting controller with value = 0x%08x"
@@ -5032,6 +5117,7 @@
virtqueue_flush(void *vq, unsigned int count) "vq %p count %u"
virtqueue_pop(void *vq, void *elem, unsigned int in_num, unsigned int out_num) "vq %p elem %p in_num %u out_num %u"
virtio_queue_notify(void *vdev, int n, void *vq) "vdev %p n %d vq %p"
+virtio_notify_irqfd_deferred_fn(void *vdev, void *vq) "vdev %p vq %p"
virtio_notify_irqfd(void *vdev, void *vq) "vdev %p vq %p"
virtio_notify(void *vdev, void *vq) "vdev %p vq %p"
virtio_set_status(void *vdev, uint8_t val) "vdev %p val %u"
@@ -5093,6 +5179,7 @@
virtio_iommu_notify_flag_del(const char *name) "del notifier from mr %s"
virtio_iommu_switch_address_space(uint8_t bus, uint8_t slot, uint8_t fn, bool on) "Device %02x:%02x.%x switching address space (iommu enabled=%d)"
virtio_iommu_freeze_granule(uint64_t page_size_mask) "granule set to 0x%"PRIx64
+virtio_iommu_host_resv_regions(const char *name, uint32_t index, uint64_t lob, uint64_t upb) "mr=%s host-resv-reg[%d] = [0x%"PRIx64",0x%"PRIx64"]"
# virtio-mem.c
virtio_mem_send_response(uint16_t type) "type=%" PRIu16
@@ -5132,6 +5219,12 @@
aspeed_wdt_read(uint64_t addr, uint32_t size) "@0x%" PRIx64 " size=%d"
aspeed_wdt_write(uint64_t addr, uint32_t size, uint64_t data) "@0x%" PRIx64 " size=%d value=0x%"PRIx64
+# wdt_imx2.c
+imx2_wdt_read(uint32_t addr, uint16_t data) "[0x%" PRIx32 "] -> 0x%" PRIx16
+imx2_wdt_write(uint32_t addr, uint16_t data) "[0x%" PRIx32 "] <- 0x%" PRIx16
+imx2_wdt_interrupt(void) ""
+imx2_wdt_expired(void) ""
+
# spapr_watchdog.c
spapr_watchdog_start(uint64_t flags, uint64_t num, uint64_t timeout) "Flags 0x%" PRIx64 " num=%" PRId64 " %" PRIu64 "ms"
spapr_watchdog_stop(uint64_t num, uint64_t ret) "num=%" PRIu64 " ret=%" PRId64
@@ -5256,7 +5349,6 @@
loadvm_postcopy_handle_advise(void) ""
loadvm_postcopy_handle_listen(const char *str) "%s"
loadvm_postcopy_handle_run(void) ""
-loadvm_postcopy_handle_run_bh(const char *str) "%s"
loadvm_postcopy_handle_resume(void) ""
loadvm_postcopy_ram_handle_discard(void) ""
loadvm_postcopy_ram_handle_discard_end(void) ""
@@ -5287,6 +5379,9 @@
savevm_state_complete_precopy(void) ""
vmstate_save(const char *idstr, const char *vmsd_name) "%s, %s"
vmstate_load(const char *idstr, const char *vmsd_name) "%s, %s"
+vmstate_downtime_save(const char *type, const char *idstr, uint32_t instance_id, int64_t downtime) "type=%s idstr=%s instance_id=%d downtime=%"PRIi64
+vmstate_downtime_load(const char *type, const char *idstr, uint32_t instance_id, int64_t downtime) "type=%s idstr=%s instance_id=%d downtime=%"PRIi64
+vmstate_downtime_checkpoint(const char *checkpoint) "%s"
postcopy_pause_incoming(void) ""
postcopy_pause_incoming_continued(void) ""
postcopy_page_req_sync(void *host_addr) "sync page req %p"
@@ -5387,8 +5482,6 @@
multifd_set_outgoing_channel(void *ioc, const char *ioctype, const char *hostname) "ioc=%p ioctype=%s hostname=%s"
# migration.c
-await_return_path_close_on_source_close(void) ""
-await_return_path_close_on_source_joining(void) ""
migrate_set_state(const char *new_state) "new state %s"
migrate_fd_cleanup(void) ""
migrate_fd_error(const char *error_desc) "error=%s"
@@ -5405,7 +5498,7 @@
migration_rate_limit_pre(int ms) "%d ms"
migration_rate_limit_post(int urgent) "urgent: %d"
migration_return_path_end_before(void) ""
-migration_return_path_end_after(int rp_error) "%d"
+migration_return_path_end_after(void) ""
migration_thread_after_loop(void) ""
migration_thread_file_err(void) ""
migration_thread_setup_complete(void) ""
@@ -5949,6 +6042,7 @@
disable hppa_tlb_itlba(void *env, void *ent, uint64_t va_b, uint64_t va_e, uint64_t pa) "env=%p ent=%p va_b=0x%lx va_e=0x%lx pa=0x%lx"
disable hppa_tlb_itlbp(void *env, void *ent, int access_id, int u, int pl2, int pl1, int type, int b, int d, int t) "env=%p ent=%p access_id=%x u=%d pl2=%d pl1=%d type=%d b=%d d=%d t=%d"
disable hppa_tlb_ptlb(void *env) "env=%p"
+disable hppa_tlb_ptlb_local(void *env) "env=%p"
disable hppa_tlb_ptlbe(void *env) "env=%p"
disable hppa_tlb_lpa_success(void *env, uint64_t addr, uint64_t phys) "env=%p addr=0x%lx phys=0x%lx"
disable hppa_tlb_lpa_failed(void *env, uint64_t addr) "env=%p addr=0x%lx"
@@ -6193,6 +6287,8 @@
qmp_exit_block_job_dismiss(const char *result, bool succeeded) "%s %d"
qmp_enter_block_job_finalize(const char *json) "%s"
qmp_exit_block_job_finalize(const char *result, bool succeeded) "%s %d"
+qmp_enter_block_job_change(const char *json) "%s"
+qmp_exit_block_job_change(const char *result, bool succeeded) "%s %d"
qmp_enter_blockdev_add(const char *json) "%s"
qmp_exit_blockdev_add(const char *result, bool succeeded) "%s %d"
qmp_enter_blockdev_reopen(const char *json) "%s"
@@ -6347,6 +6443,8 @@
qmp_exit_balloon(const char *result, bool succeeded) "%s %d"
qmp_enter_query_balloon(const char *json) "%s"
qmp_exit_query_balloon(const char *result, bool succeeded) "%s %d"
+qmp_enter_query_hv_balloon_status_report(const char *json) "%s"
+qmp_exit_query_hv_balloon_status_report(const char *result, bool succeeded) "%s %d"
qmp_enter_query_memory_size_summary(const char *json) "%s"
qmp_exit_query_memory_size_summary(const char *result, bool succeeded) "%s %d"
qmp_enter_query_memory_devices(const char *json) "%s"
diff --git a/qemu/x86_64-linux-gnu/usr/share/qemu/vgabios-ati.bin b/qemu/x86_64-linux-gnu/usr/share/qemu/vgabios-ati.bin
index 27b785e..e10cd26 100644
--- a/qemu/x86_64-linux-gnu/usr/share/qemu/vgabios-ati.bin
+++ b/qemu/x86_64-linux-gnu/usr/share/qemu/vgabios-ati.bin
Binary files differ
diff --git a/qemu/x86_64-linux-gnu/usr/share/qemu/vgabios-bochs-display.bin b/qemu/x86_64-linux-gnu/usr/share/qemu/vgabios-bochs-display.bin
index 598a3db..416036d 100644
--- a/qemu/x86_64-linux-gnu/usr/share/qemu/vgabios-bochs-display.bin
+++ b/qemu/x86_64-linux-gnu/usr/share/qemu/vgabios-bochs-display.bin
Binary files differ
diff --git a/qemu/x86_64-linux-gnu/usr/share/qemu/vgabios-cirrus.bin b/qemu/x86_64-linux-gnu/usr/share/qemu/vgabios-cirrus.bin
index 2b02029..4ffaa43 100644
--- a/qemu/x86_64-linux-gnu/usr/share/qemu/vgabios-cirrus.bin
+++ b/qemu/x86_64-linux-gnu/usr/share/qemu/vgabios-cirrus.bin
Binary files differ
diff --git a/qemu/x86_64-linux-gnu/usr/share/qemu/vgabios-qxl.bin b/qemu/x86_64-linux-gnu/usr/share/qemu/vgabios-qxl.bin
index ebd6abe..1b7a383 100644
--- a/qemu/x86_64-linux-gnu/usr/share/qemu/vgabios-qxl.bin
+++ b/qemu/x86_64-linux-gnu/usr/share/qemu/vgabios-qxl.bin
Binary files differ
diff --git a/qemu/x86_64-linux-gnu/usr/share/qemu/vgabios-ramfb.bin b/qemu/x86_64-linux-gnu/usr/share/qemu/vgabios-ramfb.bin
index ab2f20d..dba6cb8 100644
--- a/qemu/x86_64-linux-gnu/usr/share/qemu/vgabios-ramfb.bin
+++ b/qemu/x86_64-linux-gnu/usr/share/qemu/vgabios-ramfb.bin
Binary files differ
diff --git a/qemu/x86_64-linux-gnu/usr/share/qemu/vgabios-stdvga.bin b/qemu/x86_64-linux-gnu/usr/share/qemu/vgabios-stdvga.bin
index 84588dd..0d541c5 100644
--- a/qemu/x86_64-linux-gnu/usr/share/qemu/vgabios-stdvga.bin
+++ b/qemu/x86_64-linux-gnu/usr/share/qemu/vgabios-stdvga.bin
Binary files differ
diff --git a/qemu/x86_64-linux-gnu/usr/share/qemu/vgabios-virtio.bin b/qemu/x86_64-linux-gnu/usr/share/qemu/vgabios-virtio.bin
index 41308e0..2ce3557 100644
--- a/qemu/x86_64-linux-gnu/usr/share/qemu/vgabios-virtio.bin
+++ b/qemu/x86_64-linux-gnu/usr/share/qemu/vgabios-virtio.bin
Binary files differ
diff --git a/qemu/x86_64-linux-gnu/usr/share/qemu/vgabios-vmware.bin b/qemu/x86_64-linux-gnu/usr/share/qemu/vgabios-vmware.bin
index d382d0a..b7cab15 100644
--- a/qemu/x86_64-linux-gnu/usr/share/qemu/vgabios-vmware.bin
+++ b/qemu/x86_64-linux-gnu/usr/share/qemu/vgabios-vmware.bin
Binary files differ
diff --git a/qemu/x86_64-linux-gnu/usr/share/qemu/vgabios.bin b/qemu/x86_64-linux-gnu/usr/share/qemu/vgabios.bin
index 62799d0..ee748f6 100644
--- a/qemu/x86_64-linux-gnu/usr/share/qemu/vgabios.bin
+++ b/qemu/x86_64-linux-gnu/usr/share/qemu/vgabios.bin
Binary files differ
