diff mbox series

[v3,05/15] iotests: update snapshot test for new output format

Message ID 159903457617.28509.2649326029575134141.stgit@pasha-ThinkPad-X280
State New
Headers show
Series Reverse debugging | expand

Commit Message

Pavel Dovgalyuk Sept. 2, 2020, 8:16 a.m. UTC 
From: Pavel Dovgalyuk <pavel.dovgaluk@gmail.com>

This patch updates iotests that verify qemu monitor output.
New output format for snapshot listing include ICOUNT column.

Signed-off-by: Pavel Dovgalyuk <Pavel.Dovgalyuk@ispras.ru>
---
 tests/qemu-iotests/267.out |   48 ++++++++++++++++++++++----------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

Comments

Alex Bennée Sept. 7, 2020, 3:26 p.m. UTC | #1 
Pavel Dovgalyuk <pavel.dovgalyuk@ispras.ru> writes:

> From: Pavel Dovgalyuk <pavel.dovgaluk@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.Dovgalyuk@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
Pavel Dovgalyuk Sept. 7, 2020, 3:41 p.m. UTC | #2 
On 07.09.2020 18:26, Alex Bennée wrote:
> 
> Pavel Dovgalyuk <pavel.dovgalyuk@ispras.ru> writes:
> 
>> From: Pavel Dovgalyuk <pavel.dovgaluk@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

And what about -monitor stdio instead of -serial mon:stdio?

> 
> although technically the C-a shouldn't be a character that ever makes it
> to the guest.
> 
>>
>> Signed-off-by: Pavel Dovgalyuk <Pavel.Dovgalyuk@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 Sept. 7, 2020, 4 p.m. UTC | #3 
Pavel Dovgalyuk <pavel.dovgalyuk@ispras.ru> writes:

> On 07.09.2020 18:26, Alex Bennée wrote:
>> 
>> Pavel Dovgalyuk <pavel.dovgalyuk@ispras.ru> writes:
>> 
>>> From: Pavel Dovgalyuk <pavel.dovgaluk@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
>
> And what about -monitor stdio instead of -serial mon:stdio?

Well I switched to:

  -monitor telnet:127.0.0.1:4444

and controlled that way. I appreciate having a multiplexed
serial/monitor is a tricky edge case but I'm curious as to why it broke.


>
>> 
>> although technically the C-a shouldn't be a character that ever makes it
>> to the guest.
>> 
>>>
>>> Signed-off-by: Pavel Dovgalyuk <Pavel.Dovgalyuk@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
>> 
>>
Pavel Dovgalyuk Sept. 7, 2020, 4:05 p.m. UTC | #4 
On 07.09.2020 19:00, Alex Bennée wrote:
> 
> Pavel Dovgalyuk <pavel.dovgalyuk@ispras.ru> writes:
> 
>> On 07.09.2020 18:26, Alex Bennée wrote:
>>>
>>> Pavel Dovgalyuk <pavel.dovgalyuk@ispras.ru> writes:
>>>
>>>> From: Pavel Dovgalyuk <pavel.dovgaluk@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
>>
>> And what about -monitor stdio instead of -serial mon:stdio?
> 
> Well I switched to:
> 
>    -monitor telnet:127.0.0.1:4444
> 
> and controlled that way. I appreciate having a multiplexed
> serial/monitor is a tricky edge case but I'm curious as to why it broke.

Serial port interaction is recorded and replayed.
Therefore configuration of the serial ports should match in 
record/replay command lines.

> 
> 
>>
>>>
>>> although technically the C-a shouldn't be a character that ever makes it
>>> to the guest.
>>>
>>>>
>>>> Signed-off-by: Pavel Dovgalyuk <Pavel.Dovgalyuk@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
>>>
>>>
> 
>
Eric Blake Sept. 8, 2020, 1:10 p.m. UTC | #5 
On 9/2/20 3:16 AM, Pavel Dovgalyuk wrote:
> From: Pavel Dovgalyuk <pavel.dovgaluk@gmail.com>
> 
> This patch updates iotests that verify qemu monitor output.
> New output format for snapshot listing include ICOUNT column.
> 
> Signed-off-by: Pavel Dovgalyuk <Pavel.Dovgalyuk@ispras.ru>
> ---
>   tests/qemu-iotests/267.out |   48 ++++++++++++++++++++++----------------------
>   1 file changed, 24 insertions(+), 24 deletions(-)

This should be squashed with the patch that altered the format, to 
reduce the chance of git bisect landing on a patch where iotests have a 
known failure.
diff mbox series

Patch

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