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

[Ján Tomko]

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 <h...@redhat.com>

Fixes: 8a54cc1d08a333283c9cfc3fd7788be2642ca71a

---

Reviewed-by: Daniel Henrique Barboza <danielhb...@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));

signature.asc
Description: PGP signature