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

[Daniel Henrique Barboza]

On 9/1/20 11:15 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.
> 
> Fixes: 8a54cc1d08a333283c9cfc3fd7788be2642ca71a
> Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1509908
> 
> Signed-off-by: Han Han <hhan at redhat.com>
> ---

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

>   src/qemu/qemu_validate.c | 5 ++---
>   1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
> index 488f258d00..402f81a3cd 100644
> --- a/src/qemu/qemu_validate.c
> +++ b/src/qemu/qemu_validate.c
> @@ -1637,10 +1637,9 @@ 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"),
> +                           _("%s model of watchdog does not support configuring the address"),
>                              virDomainWatchdogModelTypeToString(dev->model));
>               return -1;
>           }
>