Failed in applying to current master (
apply log)
docs/devel/rust.rst | 3 +-
hw/char/diva-gsp.c | 6 +-
hw/char/serial-pci-multi.c | 7 +-
hw/char/serial-pci.c | 10 +--
monitor/qmp.c | 3 +-
target/i386/emulate/x86_decode.c | 17 ++--
target/i386/hvf/hvf.c | 1 +
target/i386/tcg/translate.c | 33 +++++---
target/i386/tcg/emit.c.inc | 4 +-
rust/Cargo.toml | 7 ++
rust/hw/char/pl011/Cargo.toml | 11 +--
rust/hw/timer/hpet/Cargo.toml | 9 ++-
rust/hw/timer/hpet/src/hpet.rs | 146 ++++++++++++++++++++++++++++++++++-
rust/qemu-api-macros/Cargo.toml | 11 +--
rust/qemu-api/Cargo.toml | 15 ++--
rust/qemu-api/src/assertions.rs | 25 +++---
rust/qemu-api/src/timer.rs | 2 +
rust/qemu-api/src/vmstate.rs | 83 +++++++++++---------
rust/qemu-api/tests/vmstate_tests.rs | 41 ++++++++--
19 files changed, 307 insertions(+), 127 deletions(-)