diff mbox series

[kvm-unit-tests] arm: Replace the obsolete qemu script

Message ID 20230301071737.43760-1-shahuang@redhat.com (mailing list archive)
State New, archived
Headers show
Series [kvm-unit-tests] arm: Replace the obsolete qemu script | expand

Commit Message

Shaoqin Huang March 1, 2023, 7:17 a.m. UTC
The qemu script used to detect the testdev is obsoleted, replace it
with the modern way to detect if testdev exists.

Signed-off-by: Shaoqin Huang <shahuang@redhat.com>
---
 arm/run | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Andrew Jones March 1, 2023, 12:50 p.m. UTC | #1
On Wed, Mar 01, 2023 at 02:17:37AM -0500, Shaoqin Huang wrote:
> The qemu script used to detect the testdev is obsoleted, replace it
> with the modern way to detect if testdev exists.

Hi Shaoqin,

Can you please point out the oldest QEMU version for which the modern
way works?

> 
> Signed-off-by: Shaoqin Huang <shahuang@redhat.com>
> ---
>  arm/run | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/arm/run b/arm/run
> index 1284891..9800cfb 100755
> --- a/arm/run
> +++ b/arm/run
> @@ -59,8 +59,7 @@ if ! $qemu $M -device '?' 2>&1 | grep virtconsole > /dev/null; then
>  	exit 2
>  fi
>  
> -if $qemu $M -chardev testdev,id=id -initrd . 2>&1 \
> -		| grep backend > /dev/null; then
> +if ! $qemu $M -chardev '?' 2>&1 | grep testdev > /dev/null; then
                              ^ This shouldn't be necessary. afaict,
			        only stdio is used

We can change the 'grep testdev >/dev/null' to 'grep -q testdev'

>  	echo "$qemu doesn't support chr-testdev. Exiting."
>  	exit 2
>  fi
> -- 
> 2.39.1
> 

Thanks,
drew
Shaoqin Huang March 2, 2023, 2:45 a.m. UTC | #2
On 3/1/23 20:50, Andrew Jones wrote:
> On Wed, Mar 01, 2023 at 02:17:37AM -0500, Shaoqin Huang wrote:
>> The qemu script used to detect the testdev is obsoleted, replace it
>> with the modern way to detect if testdev exists.
> 
> Hi Shaoqin,
> 
> Can you please point out the oldest QEMU version for which the modern
> way works?

Hi drew,

This way was introduced by 517b3d4016 (chardev: Add 'help' option to 
print all available chardev backend types). Which the QEMU verison is 
v2.7.50.

> 
>>
>> Signed-off-by: Shaoqin Huang <shahuang@redhat.com>
>> ---
>>   arm/run | 3 +--
>>   1 file changed, 1 insertion(+), 2 deletions(-)
>>
>> diff --git a/arm/run b/arm/run
>> index 1284891..9800cfb 100755
>> --- a/arm/run
>> +++ b/arm/run
>> @@ -59,8 +59,7 @@ if ! $qemu $M -device '?' 2>&1 | grep virtconsole > /dev/null; then
>>   	exit 2
>>   fi
>>   
>> -if $qemu $M -chardev testdev,id=id -initrd . 2>&1 \
>> -		| grep backend > /dev/null; then
>> +if ! $qemu $M -chardev '?' 2>&1 | grep testdev > /dev/null; then
>                                ^ This shouldn't be necessary. afaict,
> 			        only stdio is used
> 
> We can change the 'grep testdev >/dev/null' to 'grep -q testdev'

Thanks for advice. I will change it.

> 
>>   	echo "$qemu doesn't support chr-testdev. Exiting."
>>   	exit 2
>>   fi
>> -- 
>> 2.39.1
>>
> 
> Thanks,
> drew
>
Shaoqin Huang March 2, 2023, 10:09 a.m. UTC | #3
Hi drew,

On 3/1/23 20:50, Andrew Jones wrote:
> On Wed, Mar 01, 2023 at 02:17:37AM -0500, Shaoqin Huang wrote:
>> The qemu script used to detect the testdev is obsoleted, replace it
>> with the modern way to detect if testdev exists.
> 
> Hi Shaoqin,
> 
> Can you please point out the oldest QEMU version for which the modern
> way works?
> 
>>
>> Signed-off-by: Shaoqin Huang <shahuang@redhat.com>
>> ---
>>   arm/run | 3 +--
>>   1 file changed, 1 insertion(+), 2 deletions(-)
>>
>> diff --git a/arm/run b/arm/run
>> index 1284891..9800cfb 100755
>> --- a/arm/run
>> +++ b/arm/run
>> @@ -59,8 +59,7 @@ if ! $qemu $M -device '?' 2>&1 | grep virtconsole > /dev/null; then
>>   	exit 2
>>   fi
>>   
>> -if $qemu $M -chardev testdev,id=id -initrd . 2>&1 \
>> -		| grep backend > /dev/null; then
>> +if ! $qemu $M -chardev '?' 2>&1 | grep testdev > /dev/null; then
>                                ^ This shouldn't be necessary. afaict,
> 			        only stdio is used
> 
> We can change the 'grep testdev >/dev/null' to 'grep -q testdev'
> 

This just remind me if we could also change

if ! $qemu $M -device '?' 2>&1 | grep virtconsole > /dev/null; then

to

if ! $qemu $M -device '?' | grep -q virtconsole; then

And all other place like that.

Thanks,

>>   	echo "$qemu doesn't support chr-testdev. Exiting."
>>   	exit 2
>>   fi
>> -- 
>> 2.39.1
>>
> 
> Thanks,
> drew
>
Andrew Jones March 2, 2023, 11:52 a.m. UTC | #4
On Thu, Mar 02, 2023 at 06:09:36PM +0800, Shaoqin Huang wrote:
> Hi drew,
> 
> On 3/1/23 20:50, Andrew Jones wrote:
> > On Wed, Mar 01, 2023 at 02:17:37AM -0500, Shaoqin Huang wrote:
> > > The qemu script used to detect the testdev is obsoleted, replace it
> > > with the modern way to detect if testdev exists.
> > 
> > Hi Shaoqin,
> > 
> > Can you please point out the oldest QEMU version for which the modern
> > way works?
> > 
> > > 
> > > Signed-off-by: Shaoqin Huang <shahuang@redhat.com>
> > > ---
> > >   arm/run | 3 +--
> > >   1 file changed, 1 insertion(+), 2 deletions(-)
> > > 
> > > diff --git a/arm/run b/arm/run
> > > index 1284891..9800cfb 100755
> > > --- a/arm/run
> > > +++ b/arm/run
> > > @@ -59,8 +59,7 @@ if ! $qemu $M -device '?' 2>&1 | grep virtconsole > /dev/null; then
> > >   	exit 2
> > >   fi
> > > -if $qemu $M -chardev testdev,id=id -initrd . 2>&1 \
> > > -		| grep backend > /dev/null; then
> > > +if ! $qemu $M -chardev '?' 2>&1 | grep testdev > /dev/null; then
> >                                ^ This shouldn't be necessary. afaict,
> > 			        only stdio is used
> > 
> > We can change the 'grep testdev >/dev/null' to 'grep -q testdev'
> > 
> 
> This just remind me if we could also change
> 
> if ! $qemu $M -device '?' 2>&1 | grep virtconsole > /dev/null; then
> 
> to
> 
> if ! $qemu $M -device '?' | grep -q virtconsole; then
> 
> And all other place like that.

Yup.

Also, unrelated, but can you change your patch prefix to

  kvm-unit-tests PATCH

as suggested in the README? My filters are looking for 'PATCH'.

Thanks,
drew

> 
> Thanks,
> 
> > >   	echo "$qemu doesn't support chr-testdev. Exiting."
> > >   	exit 2
> > >   fi
> > > -- 
> > > 2.39.1
> > > 
> > 
> > Thanks,
> > drew
> > 
> 
> -- 
> Shaoqin
>
Shaoqin Huang March 2, 2023, 12:12 p.m. UTC | #5
On 3/2/23 19:52, Andrew Jones wrote:
> On Thu, Mar 02, 2023 at 06:09:36PM +0800, Shaoqin Huang wrote:
>> Hi drew,
>>
>> On 3/1/23 20:50, Andrew Jones wrote:
>>> On Wed, Mar 01, 2023 at 02:17:37AM -0500, Shaoqin Huang wrote:
>>>> The qemu script used to detect the testdev is obsoleted, replace it
>>>> with the modern way to detect if testdev exists.
>>>
>>> Hi Shaoqin,
>>>
>>> Can you please point out the oldest QEMU version for which the modern
>>> way works?
>>>
>>>>
>>>> Signed-off-by: Shaoqin Huang <shahuang@redhat.com>
>>>> ---
>>>>    arm/run | 3 +--
>>>>    1 file changed, 1 insertion(+), 2 deletions(-)
>>>>
>>>> diff --git a/arm/run b/arm/run
>>>> index 1284891..9800cfb 100755
>>>> --- a/arm/run
>>>> +++ b/arm/run
>>>> @@ -59,8 +59,7 @@ if ! $qemu $M -device '?' 2>&1 | grep virtconsole > /dev/null; then
>>>>    	exit 2
>>>>    fi
>>>> -if $qemu $M -chardev testdev,id=id -initrd . 2>&1 \
>>>> -		| grep backend > /dev/null; then
>>>> +if ! $qemu $M -chardev '?' 2>&1 | grep testdev > /dev/null; then
>>>                                 ^ This shouldn't be necessary. afaict,
>>> 			        only stdio is used
>>>
>>> We can change the 'grep testdev >/dev/null' to 'grep -q testdev'
>>>
>>
>> This just remind me if we could also change
>>
>> if ! $qemu $M -device '?' 2>&1 | grep virtconsole > /dev/null; then
>>
>> to
>>
>> if ! $qemu $M -device '?' | grep -q virtconsole; then
>>
>> And all other place like that.
> 
> Yup.
> 
> Also, unrelated, but can you change your patch prefix to
> 
>    kvm-unit-tests PATCH
> 
> as suggested in the README? My filters are looking for 'PATCH'.
> 

Hi drew,

My bad. Has update it.

Thanks,
Shaoqin

> Thanks,
> drew
> 
>>
>> Thanks,
>>
>>>>    	echo "$qemu doesn't support chr-testdev. Exiting."
>>>>    	exit 2
>>>>    fi
>>>> -- 
>>>> 2.39.1
>>>>
>>>
>>> Thanks,
>>> drew
>>>
>>
>> -- 
>> Shaoqin
>>
>
diff mbox series

Patch

diff --git a/arm/run b/arm/run
index 1284891..9800cfb 100755
--- a/arm/run
+++ b/arm/run
@@ -59,8 +59,7 @@  if ! $qemu $M -device '?' 2>&1 | grep virtconsole > /dev/null; then
 	exit 2
 fi
 
-if $qemu $M -chardev testdev,id=id -initrd . 2>&1 \
-		| grep backend > /dev/null; then
+if ! $qemu $M -chardev '?' 2>&1 | grep testdev > /dev/null; then
 	echo "$qemu doesn't support chr-testdev. Exiting."
 	exit 2
 fi