diff mbox series

lib/tst_virt.c: Add fallback when not using Microsoft Hyper-V hypervisor

Message ID 1623297725-3296-1-git-send-email-xuyang2018.jy@fujitsu.com
State Accepted
Headers show
Series lib/tst_virt.c: Add fallback when not using Microsoft Hyper-V hypervisor | expand

Commit Message

Yang Xu \(Fujitsu\) June 10, 2021, 4:02 a.m. UTC
If we don't use Microsoft Hyper-V hypervisorm, getrusage04 will report the
following error:
getrusage04    1  TBROK  :  tst_virt.c:175: invalid virt_type flag: 6
getrusage04    2  TBROK  :  tst_virt.c:175: Remaining cases broken

We should add is_hyperv() function when try_systemd_detect_virt returns -1.
But it is a bit complexd according to systemd-detect-virt implementation[1].
Microsoft Hyper-V hypervisor detection has been introduced since long time ago,
most system should support it.

[1]https://github.com/systemd/systemd/blob/main/src/basic/virt.c

Reported-by: Jinhui Huang <huangjh.jy@cn.fujitsu.com>
Signed-off-by: Yang Xu <xuyang2018.jy@fujitsu.com>
---
 lib/tst_virt.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Krzysztof Kozlowski June 10, 2021, 7:04 a.m. UTC | #1
On 10/06/2021 06:02, Yang Xu wrote:
> If we don't use Microsoft Hyper-V hypervisorm, getrusage04 will report the

s/hypervisorm/hypervisor/

> following error:
> getrusage04    1  TBROK  :  tst_virt.c:175: invalid virt_type flag: 6
> getrusage04    2  TBROK  :  tst_virt.c:175: Remaining cases broken
> 
> We should add is_hyperv() function when try_systemd_detect_virt returns -1.
> But it is a bit complexd according to systemd-detect-virt implementation[1].

s/complexd/complex/

> Microsoft Hyper-V hypervisor detection has been introduced since long time ago,
> most system should support it.
> 
> [1]https://github.com/systemd/systemd/blob/main/src/basic/virt.c
> 
> Reported-by: Jinhui Huang <huangjh.jy@cn.fujitsu.com>
> Signed-off-by: Yang Xu <xuyang2018.jy@fujitsu.com>

Thanks for fixing this.

Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>

Best regards,
Krzysztof

> ---
>  lib/tst_virt.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/lib/tst_virt.c b/lib/tst_virt.c
> index 14c4d526c..d23d7f564 100644
> --- a/lib/tst_virt.c
> +++ b/lib/tst_virt.c
> @@ -166,6 +166,7 @@ int tst_is_virt(int virt_type)
>  	case VIRT_IBMZ_LPAR:
>  	case VIRT_IBMZ_ZVM:
>  		return is_ibmz(virt_type);
> +	case VIRT_HYPERV:
>  	case VIRT_OTHER:
>  		return 0;
>  	}
>
Cyril Hrubis June 10, 2021, 7:22 a.m. UTC | #2
Hi!
> If we don't use Microsoft Hyper-V hypervisorm, getrusage04 will report the
> following error:
> getrusage04    1  TBROK  :  tst_virt.c:175: invalid virt_type flag: 6
> getrusage04    2  TBROK  :  tst_virt.c:175: Remaining cases broken
> 
> We should add is_hyperv() function when try_systemd_detect_virt returns -1.
> But it is a bit complexd according to systemd-detect-virt implementation[1].
> Microsoft Hyper-V hypervisor detection has been introduced since long time ago,
> most system should support it.

Sorry for missing this, Reviewed-by: Cyril Hrubis <chrubis@suse.cz>
Petr Vorel June 10, 2021, 7:57 a.m. UTC | #3
Hi all,

> On 10/06/2021 06:02, Yang Xu wrote:
> > If we don't use Microsoft Hyper-V hypervisorm, getrusage04 will report the

> s/hypervisorm/hypervisor/
+1

> > following error:
> > getrusage04    1  TBROK  :  tst_virt.c:175: invalid virt_type flag: 6
> > getrusage04    2  TBROK  :  tst_virt.c:175: Remaining cases broken

> > We should add is_hyperv() function when try_systemd_detect_virt returns -1.
> > But it is a bit complexd according to systemd-detect-virt implementation[1].

> s/complexd/complex/
+1

Thanks!

Reviewed-by: Petr Vorel <pvorel@suse.cz>

Kind regards,
Petr
Yang Xu \(Fujitsu\) June 10, 2021, 8:12 a.m. UTC | #4
Hi All
Thanks for your review. I have merged this patch with correcting two typos.

Best Regards
Yang Xu
> Hi all,
>
>> On 10/06/2021 06:02, Yang Xu wrote:
>>> If we don't use Microsoft Hyper-V hypervisorm, getrusage04 will report the
>
>> s/hypervisorm/hypervisor/
> +1
>
>>> following error:
>>> getrusage04    1  TBROK  :  tst_virt.c:175: invalid virt_type flag: 6
>>> getrusage04    2  TBROK  :  tst_virt.c:175: Remaining cases broken
>
>>> We should add is_hyperv() function when try_systemd_detect_virt returns -1.
>>> But it is a bit complexd according to systemd-detect-virt implementation[1].
>
>> s/complexd/complex/
> +1
>
> Thanks!
>
> Reviewed-by: Petr Vorel<pvorel@suse.cz>
>
> Kind regards,
> Petr
diff mbox series

Patch

diff --git a/lib/tst_virt.c b/lib/tst_virt.c
index 14c4d526c..d23d7f564 100644
--- a/lib/tst_virt.c
+++ b/lib/tst_virt.c
@@ -166,6 +166,7 @@  int tst_is_virt(int virt_type)
 	case VIRT_IBMZ_LPAR:
 	case VIRT_IBMZ_ZVM:
 		return is_ibmz(virt_type);
+	case VIRT_HYPERV:
 	case VIRT_OTHER:
 		return 0;
 	}