Pavel Dovgalyuk <pavel.dovgal...@ispras.ru> writes:
> From: Pavel Dovgalyuk <pavel.dovga...@gmail.com> > > This patch updates iotests that verify qemu monitor output. > New output format for snapshot listing include ICOUNT column. I was curious if the monitor should still function during replay. In my setup: ./qemu-system-aarch64 -cpu cortex-a53 -display none -serial mon:stdio -machine virt -kernel zephyr.elf -net none -icount shift=6,align=off,sleep=off,rr=replay,rrfile=record.out -drive file=record.qcow2,if=none,snapshot,id=rr -s -S *** Booting Zephyr OS build zephyr-v2.3.0-1183-ge5628ad0faf3 *** Hello World! qemu_cortex_a53 qemu-system-aarch64: Missing character write event in the replay log although technically the C-a shouldn't be a character that ever makes it to the guest. > > Signed-off-by: Pavel Dovgalyuk <pavel.dovgal...@ispras.ru> > --- > tests/qemu-iotests/267.out | 48 > ++++++++++++++++++++++---------------------- > 1 file changed, 24 insertions(+), 24 deletions(-) > > diff --git a/tests/qemu-iotests/267.out b/tests/qemu-iotests/267.out > index 215902b3ad..27471ffae8 100644 > --- a/tests/qemu-iotests/267.out > +++ b/tests/qemu-iotests/267.out > @@ -33,8 +33,8 @@ QEMU X.Y.Z monitor - type 'help' for more information > (qemu) savevm snap0 > (qemu) info snapshots > List of snapshots present on all disks: > -ID TAG VM SIZE DATE VM CLOCK > --- snap0 SIZE yyyy-mm-dd hh:mm:ss 00:00:00.000 > +ID TAG VM SIZE DATE VM CLOCK > ICOUNT > +-- snap0 SIZE yyyy-mm-dd hh:mm:ss 00:00:00.000 > > (qemu) loadvm snap0 > (qemu) quit > > @@ -44,8 +44,8 @@ QEMU X.Y.Z monitor - type 'help' for more information > (qemu) savevm snap0 > (qemu) info snapshots > List of snapshots present on all disks: > -ID TAG VM SIZE DATE VM CLOCK > --- snap0 SIZE yyyy-mm-dd hh:mm:ss 00:00:00.000 > +ID TAG VM SIZE DATE VM CLOCK > ICOUNT > +-- snap0 SIZE yyyy-mm-dd hh:mm:ss 00:00:00.000 > > (qemu) loadvm snap0 > (qemu) quit > > @@ -69,8 +69,8 @@ QEMU X.Y.Z monitor - type 'help' for more information > (qemu) savevm snap0 > (qemu) info snapshots > List of snapshots present on all disks: > -ID TAG VM SIZE DATE VM CLOCK > --- snap0 SIZE yyyy-mm-dd hh:mm:ss 00:00:00.000 > +ID TAG VM SIZE DATE VM CLOCK > ICOUNT > +-- snap0 SIZE yyyy-mm-dd hh:mm:ss 00:00:00.000 > > (qemu) loadvm snap0 > (qemu) quit > > @@ -94,8 +94,8 @@ QEMU X.Y.Z monitor - type 'help' for more information > (qemu) savevm snap0 > (qemu) info snapshots > List of snapshots present on all disks: > -ID TAG VM SIZE DATE VM CLOCK > --- snap0 SIZE yyyy-mm-dd hh:mm:ss 00:00:00.000 > +ID TAG VM SIZE DATE VM CLOCK > ICOUNT > +-- snap0 SIZE yyyy-mm-dd hh:mm:ss 00:00:00.000 > > (qemu) loadvm snap0 > (qemu) quit > > @@ -105,8 +105,8 @@ QEMU X.Y.Z monitor - type 'help' for more information > (qemu) savevm snap0 > (qemu) info snapshots > List of snapshots present on all disks: > -ID TAG VM SIZE DATE VM CLOCK > --- snap0 SIZE yyyy-mm-dd hh:mm:ss 00:00:00.000 > +ID TAG VM SIZE DATE VM CLOCK > ICOUNT > +-- snap0 SIZE yyyy-mm-dd hh:mm:ss 00:00:00.000 > > (qemu) loadvm snap0 > (qemu) quit > > @@ -119,8 +119,8 @@ QEMU X.Y.Z monitor - type 'help' for more information > (qemu) savevm snap0 > (qemu) info snapshots > List of snapshots present on all disks: > -ID TAG VM SIZE DATE VM CLOCK > --- snap0 SIZE yyyy-mm-dd hh:mm:ss 00:00:00.000 > +ID TAG VM SIZE DATE VM CLOCK > ICOUNT > +-- snap0 SIZE yyyy-mm-dd hh:mm:ss 00:00:00.000 > > (qemu) loadvm snap0 > (qemu) quit > > @@ -134,8 +134,8 @@ QEMU X.Y.Z monitor - type 'help' for more information > (qemu) savevm snap0 > (qemu) info snapshots > List of snapshots present on all disks: > -ID TAG VM SIZE DATE VM CLOCK > --- snap0 SIZE yyyy-mm-dd hh:mm:ss 00:00:00.000 > +ID TAG VM SIZE DATE VM CLOCK > ICOUNT > +-- snap0 SIZE yyyy-mm-dd hh:mm:ss 00:00:00.000 > > (qemu) loadvm snap0 > (qemu) quit > > @@ -145,15 +145,15 @@ QEMU X.Y.Z monitor - type 'help' for more information > (qemu) savevm snap0 > (qemu) info snapshots > List of snapshots present on all disks: > -ID TAG VM SIZE DATE VM CLOCK > --- snap0 SIZE yyyy-mm-dd hh:mm:ss 00:00:00.000 > +ID TAG VM SIZE DATE VM CLOCK > ICOUNT > +-- snap0 SIZE yyyy-mm-dd hh:mm:ss 00:00:00.000 > > (qemu) loadvm snap0 > (qemu) quit > > Internal snapshots on overlay: > Snapshot list: > -ID TAG VM SIZE DATE VM CLOCK > -1 snap0 SIZE yyyy-mm-dd hh:mm:ss 00:00:00.000 > +ID TAG VM SIZE DATE VM CLOCK > ICOUNT > +1 snap0 SIZE yyyy-mm-dd hh:mm:ss 00:00:00.000 > > Internal snapshots on backing file: > > === -blockdev with NBD server on the backing file === > @@ -166,17 +166,17 @@ QEMU X.Y.Z monitor - type 'help' for more information > (qemu) savevm snap0 > (qemu) info snapshots > List of snapshots present on all disks: > -ID TAG VM SIZE DATE VM CLOCK > --- snap0 SIZE yyyy-mm-dd hh:mm:ss 00:00:00.000 > +ID TAG VM SIZE DATE VM CLOCK > ICOUNT > +-- snap0 SIZE yyyy-mm-dd hh:mm:ss 00:00:00.000 > > (qemu) loadvm snap0 > (qemu) quit > > Internal snapshots on overlay: > Snapshot list: > -ID TAG VM SIZE DATE VM CLOCK > -1 snap0 SIZE yyyy-mm-dd hh:mm:ss 00:00:00.000 > +ID TAG VM SIZE DATE VM CLOCK > ICOUNT > +1 snap0 SIZE yyyy-mm-dd hh:mm:ss 00:00:00.000 > > Internal snapshots on backing file: > Snapshot list: > -ID TAG VM SIZE DATE VM CLOCK > -1 snap0 SIZE yyyy-mm-dd hh:mm:ss 00:00:00.000 > +ID TAG VM SIZE DATE VM CLOCK > ICOUNT > +1 snap0 SIZE yyyy-mm-dd hh:mm:ss 00:00:00.000 > > *** done -- Alex Bennée
