1. Patchew
  2. Libvirt
  3. View series

[PATCH] qemu_validate: Only allow none address for watchdog ib700

Han Han posted 1 patch 3 years, 8 months ago
Test syntax-check failed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/libvirt tags/patchew/20200821101910.3934699-1-hhan@redhat.com
There is a newer version of this series
src/qemu/qemu_validate.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
[PATCH] qemu_validate: Only allow none address for watchdog ib700
Posted by Han Han 3 years, 8 months ago 
Since QEMU 1.5.3, the ib700 watchdog device has no options for address,
and not address in device tree:

$ /usr/libexec/qemu-kvm -version
QEMU emulator version 1.5.3 (qemu-kvm-1.5.3-175.el7), Copyright (c) 2003-2008 Fabrice Bellard
$ /usr/libexec/qemu-kvm -device ib700,\?
$ virsh qemu-monitor-command seabios --hmp info qtree|grep ib700 -A 2
        dev: ib700, id "watchdog0"
        dev: isa-serial, id "serial0"
          index = 0

So only allow it to use none address.

https://bugzilla.redhat.com/show_bug.cgi?id=1509908

Signed-off-by: Han Han <hhan@redhat.com>
---
 src/qemu/qemu_validate.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
index 488f258d00..0e5ca81ab4 100644
--- a/src/qemu/qemu_validate.c
+++ b/src/qemu/qemu_validate.c
@@ -1637,8 +1637,7 @@ qemuValidateDomainWatchdogDef(const virDomainWatchdogDef *dev,
         break;
 
     case VIR_DOMAIN_WATCHDOG_MODEL_IB700:
-        if (dev->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE &&
-            dev->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_ISA) {
+        if (dev->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) {
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                            _("%s model of watchdog can go only on ISA bus"),
                            virDomainWatchdogModelTypeToString(dev->model));
-- 
2.27.0
Re: [PATCH] qemu_validate: Only allow none address for watchdog ib700
Posted by Daniel Henrique Barboza 3 years, 7 months ago 

On 8/21/20 7:19 AM, Han Han wrote:
> Since QEMU 1.5.3, the ib700 watchdog device has no options for address,
> and not address in device tree:
> 
> $ /usr/libexec/qemu-kvm -version
> QEMU emulator version 1.5.3 (qemu-kvm-1.5.3-175.el7), Copyright (c) 2003-2008 Fabrice Bellard
> $ /usr/libexec/qemu-kvm -device ib700,\?
> $ virsh qemu-monitor-command seabios --hmp info qtree|grep ib700 -A 2
>          dev: ib700, id "watchdog0"
>          dev: isa-serial, id "serial0"
>            index = 0
> 
> So only allow it to use none address.
> 
> https://bugzilla.redhat.com/show_bug.cgi?id=1509908

I'm not able to open this bug :/

> 
> Signed-off-by: Han Han <hhan@redhat.com>
> ---

Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>

>   src/qemu/qemu_validate.c | 3 +--
>   1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
> index 488f258d00..0e5ca81ab4 100644
> --- a/src/qemu/qemu_validate.c
> +++ b/src/qemu/qemu_validate.c
> @@ -1637,8 +1637,7 @@ qemuValidateDomainWatchdogDef(const virDomainWatchdogDef *dev,
>           break;
>   
>       case VIR_DOMAIN_WATCHDOG_MODEL_IB700:
> -        if (dev->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE &&
> -            dev->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_ISA) {
> +        if (dev->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) {
>               virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
>                              _("%s model of watchdog can go only on ISA bus"),
>                              virDomainWatchdogModelTypeToString(dev->model));
>
Re: [PATCH] qemu_validate: Only allow none address for watchdog ib700
Posted by Ján Tomko 3 years, 7 months ago 
On a Monday in 2020, Daniel Henrique Barboza wrote:
>
>
>On 8/21/20 7:19 AM, Han Han wrote:
>>Since QEMU 1.5.3, the ib700 watchdog device has no options for address,
>>and not address in device tree:
>>
>>$ /usr/libexec/qemu-kvm -version
>>QEMU emulator version 1.5.3 (qemu-kvm-1.5.3-175.el7), Copyright (c) 2003-2008 Fabrice Bellard
>>$ /usr/libexec/qemu-kvm -device ib700,\?
>>$ virsh qemu-monitor-command seabios --hmp info qtree|grep ib700 -A 2
>>         dev: ib700, id "watchdog0"
>>         dev: isa-serial, id "serial0"
>>           index = 0
>>
>>So only allow it to use none address.
>>
>>https://bugzilla.redhat.com/show_bug.cgi?id=1509908
>
>I'm not able to open this bug :/
>

Fixed.

>>
>>Signed-off-by: Han Han <hhan@redhat.com>

Fixes: 8a54cc1d08a333283c9cfc3fd7788be2642ca71a

>>---
>
>Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
>
>>  src/qemu/qemu_validate.c | 3 +--
>>  1 file changed, 1 insertion(+), 2 deletions(-)
>>
>>diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
>>index 488f258d00..0e5ca81ab4 100644
>>--- a/src/qemu/qemu_validate.c
>>+++ b/src/qemu/qemu_validate.c
>>@@ -1637,8 +1637,7 @@ qemuValidateDomainWatchdogDef(const virDomainWatchdogDef *dev,
>>          break;
>>      case VIR_DOMAIN_WATCHDOG_MODEL_IB700:
>>-        if (dev->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE &&
>>-            dev->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_ISA) {
>>+        if (dev->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) {
>>              virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
>>                             _("%s model of watchdog can go only on ISA bus"),

This error message would be then misleading.

"'%s' model of watchdog does not support configuring the address"

Jano

>>                             virDomainWatchdogModelTypeToString(dev->model));
>>
>
Re: [PATCH] qemu_validate: Only allow none address for watchdog ib700
Posted by Han Han 3 years, 7 months ago 
On Mon, Aug 31, 2020 at 9:48 PM Ján Tomko <jtomko@redhat.com> wrote:

> On a Monday in 2020, Daniel Henrique Barboza wrote:
> >
> >
> >On 8/21/20 7:19 AM, Han Han wrote:
> >>Since QEMU 1.5.3, the ib700 watchdog device has no options for address,
> >>and not address in device tree:
> >>
> >>$ /usr/libexec/qemu-kvm -version
> >>QEMU emulator version 1.5.3 (qemu-kvm-1.5.3-175.el7), Copyright (c)
> 2003-2008 Fabrice Bellard
> >>$ /usr/libexec/qemu-kvm -device ib700,\?
> >>$ virsh qemu-monitor-command seabios --hmp info qtree|grep ib700 -A 2
> >>         dev: ib700, id "watchdog0"
> >>         dev: isa-serial, id "serial0"
> >>           index = 0
> >>
> >>So only allow it to use none address.
> >>
> >>https://bugzilla.redhat.com/show_bug.cgi?id=1509908
> >
> >I'm not able to open this bug :/
> >
>
> Fixed.
>
> >>
> >>Signed-off-by: Han Han <hhan@redhat.com>
>
> Fixes: 8a54cc1d08a333283c9cfc3fd7788be2642ca71a
>
> >>---
> >
> >Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
> >
> >>  src/qemu/qemu_validate.c | 3 +--
> >>  1 file changed, 1 insertion(+), 2 deletions(-)
> >>
> >>diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
> >>index 488f258d00..0e5ca81ab4 100644
> >>--- a/src/qemu/qemu_validate.c
> >>+++ b/src/qemu/qemu_validate.c
> >>@@ -1637,8 +1637,7 @@ qemuValidateDomainWatchdogDef(const
> virDomainWatchdogDef *dev,
> >>          break;
> >>      case VIR_DOMAIN_WATCHDOG_MODEL_IB700:
> >>-        if (dev->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE &&
> >>-            dev->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_ISA) {
> >>+        if (dev->info.type != VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) {
> >>              virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
> >>                             _("%s model of watchdog can go only on ISA
> bus"),
>
> This error message would be then misleading.
>
> Thanks for your suggestions. I will update it in v2

> "'%s' model of watchdog does not support configuring the address"
>
> Jano
>
> >>
>  virDomainWatchdogModelTypeToString(dev->model));
> >>
> >
>


-- 
Best regards,
-----------------------------------
Han Han
Senior Quality Engineer
Redhat.

Email: hhan@redhat.com
Phone: +861065339333

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.