From nobody Mon Feb 9 11:12:06 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1681914282; cv=none; d=zohomail.com; s=zohoarc; b=H0ELFM06nnNrDJ7xUImXeYdr8TFTE8jM5yvp7TCDOBo+Go7+zwJ9OEKk5fz2KL50P8IIp1nSsqNM89Yp17dmPtmJ1HoSPB7KFI3163J6grxOEvlBDKwYm3R1IutDF5+FRcBu5iqWMNez91pklqc9cvupRD/8NO5hd0sCT9cvfrU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1681914282; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=GrQVv18w8cXwVd0z0GWaavnbO1QxQSkvYw8xoKkgLfk=; b=F01OCl2V4kxjCBBtaDmvWzR4oMDvV+jU+CM64D1c7FWH2rP5TEpB/ZRPWZBWr1CiilVuptgptLxqKj1WOMRGZDqfvwdQcLbnWITxFCwfF1fxdLnQcf+NtZ/6lTZFU+185kS3SAB9GJQnek7ygZwAjK7puZC2qdUkVas4Vo5lZfs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1681914282484739.6623194770018; Wed, 19 Apr 2023 07:24:42 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-439-KmwwRJiMNm20C_8wc6cjiQ-1; Wed, 19 Apr 2023 10:24:39 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 258898678AD; Wed, 19 Apr 2023 14:24:16 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id A3DF82166B35; Wed, 19 Apr 2023 14:24:14 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 64ECE1946A4F; Wed, 19 Apr 2023 14:24:14 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 9E47819465B1 for ; Wed, 19 Apr 2023 14:07:21 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 73BCB400DC9; Wed, 19 Apr 2023 14:07:21 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast03.extmail.prod.ext.rdu2.redhat.com [10.11.55.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6C9B2492C3E for ; Wed, 19 Apr 2023 14:07:21 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 500C3811E7B for ; Wed, 19 Apr 2023 14:07:21 +0000 (UTC) Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-522-1hoqA-4LNHSVy1svs8lZbw-1; Wed, 19 Apr 2023 10:07:20 -0400 Received: by mail-pf1-f200.google.com with SMTP id d2e1a72fcca58-63b27afef94so3046832b3a.1 for ; Wed, 19 Apr 2023 07:07:19 -0700 (PDT) Received: from wheatley.localdomain (nat-pool-brq-u.redhat.com. [213.175.37.12]) by smtp.gmail.com with ESMTPSA id m25-20020aa78a19000000b0063d375ca0c3sm3247601pfa.32.2023.04.19.07.07.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Apr 2023 07:07:18 -0700 (PDT) Received: from wheatley.. (wheatley.k8r.cz [127.0.0.1]) by wheatley.localdomain (Postfix) with ESMTP id CF936FB3864E for ; Wed, 19 Apr 2023 16:07:13 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1681914281; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=GrQVv18w8cXwVd0z0GWaavnbO1QxQSkvYw8xoKkgLfk=; b=OtDhRhi+4lzpEuufFgl7ccrbVGy7s6PljKy81UVcUkkwfv+wA4gkTOnicCnvExrHLZ6PY5 3ZqlSb4Mt17FHhGks+Rcn2IZlpv+49R+4bCWbpzCyoWbLLOgyEWepollLOJmRAGIE1xwMw MAfaxqjYTTeFULhn1KNoRY9giQyyRs0= X-MC-Unique: KmwwRJiMNm20C_8wc6cjiQ-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: 1hoqA-4LNHSVy1svs8lZbw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681913239; x=1684505239; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GrQVv18w8cXwVd0z0GWaavnbO1QxQSkvYw8xoKkgLfk=; b=D2kUPDLMsie99WuReeUuINFb2hd/BWSh4gfBZ3JxjDgIYF+ZH/DV0/2+SRq1kA4Ef9 K/KYWwMHMIG3h6bvDA6BkXnr5W6oD3i32yEY4OvTb36m4GaYaeGmNXPptdGv+uM/wgJx spJhB55fGrS2pzUS4OUF8qzCfmcvv13PFAOBYR62JtwLAUxLkeKYJ3KIGXV2S/1HDbQX a6GsujY15AqVzh/9XHolzRtHNl2gAnzfJlTqUiN6dFqKeH/4nkaOGE8n/8YNnLKN5WAN iilZcC0DjP65tcDqz7cFl1pW95/zQ5Tors/Iho/m9AdZ9tCnFMrChf461rXsENA5zqjs QH4A== X-Gm-Message-State: AAQBX9eAjI3bdW6MhW2iFfRj/b6wW1kImV2hIwO6v+sQ+UCOkoQveUoT oEeP/OdJuivNUpqkvFbzb7MS9vra8ZeWcG7y9+/x8vNrL6DkOwFuW2u54uuofmdOuYOTljnh1ZA SCVaBiLCtN88wPk5QpoGze5pShmR3G/Z3bA3DWnNQeKXWZj0vINet4A1ha1qPW+HU4/zXqH14eS rodysEpg== X-Received: by 2002:a05:6a00:1255:b0:637:aea0:b23d with SMTP id u21-20020a056a00125500b00637aea0b23dmr4567812pfi.10.1681913239077; Wed, 19 Apr 2023 07:07:19 -0700 (PDT) X-Google-Smtp-Source: AKy350ZbDFZPAwg1km71boAkY2gShmV3cOiDCI5W2buuOjUVohOg8Nd0a6yfZ4CLY935iR/euIAAgw== X-Received: by 2002:a05:6a00:1255:b0:637:aea0:b23d with SMTP id u21-20020a056a00125500b00637aea0b23dmr4567784pfi.10.1681913238719; Wed, 19 Apr 2023 07:07:18 -0700 (PDT) From: Martin Kletzander To: libvir-list@redhat.com Subject: [PATCH 4/7] qemu: Forbid ib700 watchdogs for non-i440fx machine types Date: Wed, 19 Apr 2023 16:07:07 +0200 Message-Id: <738b0f38cbd6100606e1b081ced20845b257284e.1681913144.git.mkletzan@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1681914284441100001 Content-Type: text/plain; charset="utf-8"; x-default="true" We can launch qemu with it, but it will not work since it's not even probed by the kernel at the mapped address with different machine types since they are expected to be connected to ISA and not even its newer LPC counterpart found on q35. And it does not exist on non-x86 architectures. Signed-off-by: Martin Kletzander --- src/qemu/qemu_validate.c | 7 +++++++ .../watchdog-q35-multiple.x86_64-latest.args | 4 ++-- tests/qemuxml2argvdata/watchdog-q35-multiple.xml | 2 +- .../watchdog-q35-multiple.x86_64-latest.xml | 4 +++- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index b8d5e9bd74e9..6ebd2ba0101f 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -2320,6 +2320,13 @@ qemuValidateDomainWatchdogDef(const virDomainWatchdo= gDef *dev, break; =20 case VIR_DOMAIN_WATCHDOG_MODEL_IB700: + if (!qemuDomainIsI440FX(def)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("%1$s model of watchdog cannot be used with t= his machine type"), + virDomainWatchdogModelTypeToString(dev->model)); + return -1; + } + if (dev->info.type !=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("%1$s model of watchdog does not support conf= iguring the address"), diff --git a/tests/qemuxml2argvdata/watchdog-q35-multiple.x86_64-latest.arg= s b/tests/qemuxml2argvdata/watchdog-q35-multiple.x86_64-latest.args index 655d206421b6..4c14a9552088 100644 --- a/tests/qemuxml2argvdata/watchdog-q35-multiple.x86_64-latest.args +++ b/tests/qemuxml2argvdata/watchdog-q35-multiple.x86_64-latest.args @@ -31,8 +31,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"pcie-root-port","port":9,"chassis":3,"id":"pci.3","bus= ":"pcie.0","addr":"0x1.0x1"}' \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.2","addr":"0x1"}= ' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"ib700","id":"watchdog0"}' \ --device '{"driver":"i6300esb","id":"watchdog1","bus":"pci.2","addr":"0x2"}= ' \ +-device '{"driver":"i6300esb","id":"watchdog0","bus":"pci.2","addr":"0x2"}= ' \ +-device '{"driver":"i6300esb","id":"watchdog1","bus":"pci.2","addr":"0x3"}= ' \ -global ICH9-LPC.noreboot=3Doff \ -watchdog-action poweroff \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/watchdog-q35-multiple.xml b/tests/qemux= ml2argvdata/watchdog-q35-multiple.xml index af0cb169f0d9..1ed3aff41482 100644 --- a/tests/qemuxml2argvdata/watchdog-q35-multiple.xml +++ b/tests/qemuxml2argvdata/watchdog-q35-multiple.xml @@ -18,7 +18,7 @@ - + diff --git a/tests/qemuxml2xmloutdata/watchdog-q35-multiple.x86_64-latest.x= ml b/tests/qemuxml2xmloutdata/watchdog-q35-multiple.x86_64-latest.xml index 7e60c6e6517d..1ea084854ee6 100644 --- a/tests/qemuxml2xmloutdata/watchdog-q35-multiple.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/watchdog-q35-multiple.x86_64-latest.xml @@ -41,10 +41,12 @@