From nobody Mon Feb  9 19:52:13 2026
Delivered-To: importer@patchew.org
Received-SPF: pass (zohomail.com: domain of redhat.com designates
 170.10.133.124 as permitted sender) client-ip=170.10.133.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.133.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=1674485954; cv=none;
	d=zohomail.com; s=zohoarc;
	b=C6Dy0LoXh8iGuIBOYmkbwecsSBM+//3k7YTnY3a6uPYL4uYP4CmCajFLmzXmoo0sDpw+mD/K/3EvzZ/bqP3CWFeg2wjiZlgRE9h9bpJwtjvN0nmLGieZjqEN7a/wz7p+KVRUVO8kudpbkVVDBHsAdOESMIGsyxyKZcov8qZ7l/s=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
 s=zohoarc;
	t=1674485954;
 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=iflAPhnj+9GrY213Co2cZAFiimZsYh0qk60xXllR76g=;
	b=SuaRIW7mj82YNYHM9hrnYZlyrl0g2MLRFukaOtP8NpO25qf1MMDh8u8g0jTGgf30H6lczJIn9BkGAKzzt8fQqJIYBvY8wY9T9MqB3+XfuMr1HlUHTAUI2sBkM18h7Rc6Gmn06ID7p2HcvPm7zG/dlbw4DGblVSnqrV6HvZUJxfQ=
ARC-Authentication-Results: i=1; mx.zohomail.com;
	dkim=pass;
	spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as
 permitted sender)  smtp.mailfrom=libvir-list-bounces@redhat.com;
	dmarc=pass header.from=<mkletzan@redhat.com> (p=none dis=none)
Return-Path: <libvir-list-bounces@redhat.com>
Received: from us-smtp-delivery-124.mimecast.com
 (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.zohomail.com
	with SMTPS id 1674485954123306.98985958813296;
 Mon, 23 Jan 2023 06:59:14 -0800 (PST)
Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com
 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS
 (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id
 us-mta-518-oNAJtxb2M9-JnofG12JfQg-1; Mon, 23 Jan 2023 09:58:14 -0500
Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com
 [10.11.54.1])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mimecast-mx02.redhat.com (Postfix) with ESMTPS id AC0CE3813F2B;
	Mon, 23 Jan 2023 14:58:11 +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 8FDC240C2004;
	Mon, 23 Jan 2023 14:58:11 +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 7EE59194658C;
	Mon, 23 Jan 2023 14:58:11 +0000 (UTC)
Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com
 [10.11.54.4])
 by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with
 ESMTP id BD1A11946589 for <libvir-list@listman.corp.redhat.com>;
 Mon, 23 Jan 2023 14:58:09 +0000 (UTC)
Received: by smtp.corp.redhat.com (Postfix)
 id AD50A2026D2A; Mon, 23 Jan 2023 14:58:09 +0000 (UTC)
Received: from mimecast-mx02.redhat.com
 (mimecast07.extmail.prod.ext.rdu2.redhat.com [10.11.55.23])
 by smtp.corp.redhat.com (Postfix) with ESMTPS id A4BD02026D2B
 for <libvir-list@redhat.com>; Mon, 23 Jan 2023 14:58:09 +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 7D6423C31DED
 for <libvir-list@redhat.com>; Mon, 23 Jan 2023 14:58:09 +0000 (UTC)
Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com
 [209.85.208.69]) by relay.mimecast.com with ESMTP with STARTTLS
 (version=TLSv1.3, cipher=TLS_AES_128_GCM_SHA256) id
 us-mta-190-g8zz7PKRMCOrDCipuLkXIA-1; Mon, 23 Jan 2023 09:58:02 -0500
Received: by mail-ed1-f69.google.com with SMTP id
 b15-20020a056402350f00b0049e42713e2bso8572201edd.0
 for <libvir-list@redhat.com>; Mon, 23 Jan 2023 06:58:02 -0800 (PST)
Received: from wheatley.localdomain (nat-pool-brq-t.redhat.com.
 [213.175.37.10]) by smtp.gmail.com with ESMTPSA id
 ks1-20020a170906f84100b00877696c016csm7517496ejb.146.2023.01.23.06.57.58
 for <libvir-list@redhat.com>
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Mon, 23 Jan 2023 06:57:59 -0800 (PST)
Received: from wheatley.redhat.com (wheatley.k8r.cz [127.0.0.1])
 by wheatley.localdomain (Postfix) with ESMTP id B7A23D1AD9C2
 for <libvir-list@redhat.com>; Mon, 23 Jan 2023 15:57:57 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
	s=mimecast20190719; t=1674485953;
	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=iflAPhnj+9GrY213Co2cZAFiimZsYh0qk60xXllR76g=;
	b=YYE2jIxPX9QegALPqQ+eCbzv8sn5IxQxQJ2q3qvenvPuiqSe3GbHw4yBAe1grorRPy7M3B
	DQqOxuPps9AGq+J9u3tH5F/7KQvOnjhtxb3sbr2gsLnGJKhV6Cz28KyvmAG9HrkWaneJ87
	ujZzN2vcGjx89B2tzPZb1YfE53vtdnM=
X-MC-Unique: oNAJtxb2M9-JnofG12JfQg-1
X-Original-To: libvir-list@listman.corp.redhat.com
X-MC-Unique: g8zz7PKRMCOrDCipuLkXIA-1
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20210112;
 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=iflAPhnj+9GrY213Co2cZAFiimZsYh0qk60xXllR76g=;
 b=4eifwmz1Sg+jM5JJJd75EMniAP6ReeolfA1lt6BiMzSaBYCNDDn7oRJbjAn2HQPIJ7
 031E97rPc75GidZa0fh4Kp9wj6jpPSUmI0RmhlEUZpTJHCYY54wBcMkZFbxR2WQDeS1T
 nzST4oIr+oDkhXeCRi2VEQ29ERV4hfahIwsfyWdEP50F+4oGe1l/gF6WOnwdthUAnuJ4
 UfucZThfIM1UKcKgw+SRtvPl4Gc81mwTO6tQR01HLrMVuVRX5KlrVEKMtz+l+Xge2iDo
 H1YwxUaqO/bulp5PXgwO+pR3k+Dsjm0+aCz/9sg6gw/BnhOE3KaB076H6jE+61bs81yH
 3low==
X-Gm-Message-State: AFqh2koQ3mWmjKlpO9m7DPPOw5vlkASzZS+04tBxdzCl2pBUWXnNlVpb
 OWcBY12rlakhIXABmBkOjmDWqj37E5VgtPbLAcc7PIHHTqRD7sPsMrnWRT63wrw4cpesaDp5GM8
 tl9sD1uhs4cqVr7gJL7rqgwDE3gg7E38dNoxzuPgd16tqQwav9WkAcMQRtLD7ux0381t2vPA=
X-Received: by 2002:a17:906:cd1f:b0:84d:4a2b:73b9 with SMTP id
 oz31-20020a170906cd1f00b0084d4a2b73b9mr26691704ejb.59.1674485881310;
 Mon, 23 Jan 2023 06:58:01 -0800 (PST)
X-Google-Smtp-Source: 
 AMrXdXvxCjGWYo3EcuWpxr90qkWMtr7p+K8s+slOLunekIXjGRJtdgOGmR8g3ejq5Gkbqiern/WmJA==
X-Received: by 2002:a17:906:cd1f:b0:84d:4a2b:73b9 with SMTP id
 oz31-20020a170906cd1f00b0084d4a2b73b9mr26691652ejb.59.1674485880312;
 Mon, 23 Jan 2023 06:58:00 -0800 (PST)
From: Martin Kletzander <mkletzan@redhat.com>
To: libvir-list@redhat.com
Subject: [PATCH 5/7] qemu: Add implicit watchdog for q35 machine types
Date: Mon, 23 Jan 2023 15:57:54 +0100
Message-Id: 
 <dee8ee726ba7078fc285a38e6b5a1025706223eb.1674485749.git.mkletzan@redhat.com>
In-Reply-To: <cover.1674485748.git.mkletzan@redhat.com>
References: <cover.1674485748.git.mkletzan@redhat.com>
MIME-Version: 1.0
X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4
X-BeenThere: libvir-list@redhat.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Development discussions about the libvirt library & tools
 <libvir-list.redhat.com>
List-Unsubscribe: <https://listman.redhat.com/mailman/options/libvir-list>,
 <mailto:libvir-list-request@redhat.com?subject=unsubscribe>
List-Archive: <http://listman.redhat.com/archives/libvir-list/>
List-Post: <mailto:libvir-list@redhat.com>
List-Help: <mailto:libvir-list-request@redhat.com?subject=help>
List-Subscribe: <https://listman.redhat.com/mailman/listinfo/libvir-list>,
 <mailto:libvir-list-request@redhat.com?subject=subscribe>
Errors-To: libvir-list-bounces@redhat.com
Sender: "libvir-list" <libvir-list-bounces@redhat.com>
X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1
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: 1674485954846100001
Content-Type: text/plain; charset="utf-8"; x-default="true"

The iTCO watchdog is part of the q35 machine type since its inception, we j=
ust
did not add it implicitly.

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=3D2137346

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
---
 src/qemu/qemu_domain.c                        | 44 +++++++++++++++++++
 .../qemustatusxml2xmldata/vcpus-multi-in.xml  |  1 +
 tests/qemuxml2argvdata/autoindex.args         |  2 +
 .../boot-floppy-q35.x86_64-latest.args        |  2 +
 tests/qemuxml2argvdata/boot-floppy-q35.xml    |  1 +
 tests/qemuxml2argvdata/cpu-host-model.args    |  2 +
 .../cpu-host-model.x86_64-4.2.0.args          |  2 +
 .../cpu-host-model.x86_64-5.0.0.args          |  2 +
 .../cpu-host-model.x86_64-5.1.0.args          |  2 +
 .../cpu-host-model.x86_64-5.2.0.args          |  2 +
 .../cpu-host-model.x86_64-6.0.0.args          |  2 +
 .../cpu-host-model.x86_64-6.1.0.args          |  2 +
 .../cpu-host-model.x86_64-latest.args         |  2 +
 .../disk-floppy-q35.x86_64-latest.args        |  2 +
 ...are-auto-bios-stateless.x86_64-latest.args |  2 +
 .../firmware-auto-bios.x86_64-latest.args     |  2 +
 ...-auto-efi-enrolled-keys.x86_64-latest.args |  2 +
 ...-auto-efi-loader-secure.x86_64-latest.args |  2 +
 ...to-efi-no-enrolled-keys.x86_64-latest.args |  2 +
 ...are-auto-efi-no-secboot.x86_64-latest.args |  2 +
 ...firmware-auto-efi-nvram.x86_64-latest.args |  2 +
 ...rmware-auto-efi-secboot.x86_64-latest.args |  2 +
 ...ware-auto-efi-stateless.x86_64-latest.args |  2 +
 .../firmware-auto-efi.x86_64-latest.args      |  2 +
 .../firmware-manual-efi-acpi-q35.args         |  2 +
 .../firmware-manual-efi-secure.args           |  2 +
 .../firmware-manual-noefi-acpi-q35.args       |  2 +
 .../firmware-manual-noefi-noacpi-q35.args     |  2 +
 ...dev-scsi-vhost-scsi-pcie.x86_64-4.2.0.args |  2 +
 ...ev-scsi-vhost-scsi-pcie.x86_64-latest.args |  2 +
 .../hvf-x86_64-q35-headless.args              |  2 +
 .../intel-iommu-aw-bits.x86_64-latest.args    |  2 +
 .../qemuxml2argvdata/intel-iommu-aw-bits.xml  |  1 +
 ...ntel-iommu-caching-mode.x86_64-latest.args |  2 +
 .../intel-iommu-caching-mode.xml              |  1 +
 ...ntel-iommu-device-iotlb.x86_64-latest.args |  2 +
 .../intel-iommu-device-iotlb.xml              |  1 +
 .../intel-iommu-eim.x86_64-latest.args        |  2 +
 tests/qemuxml2argvdata/intel-iommu-eim.xml    |  1 +
 .../intel-iommu.x86_64-latest.args            |  2 +
 tests/qemuxml2argvdata/intel-iommu.xml        |  1 +
 ...othreads-ids-pool-sizes.x86_64-latest.args |  2 +
 .../iothreads-ids-pool-sizes.xml              |  1 +
 .../machine-smm-off.x86_64-latest.args        |  2 +
 .../machine-smm-on.x86_64-latest.args         |  2 +
 tests/qemuxml2argvdata/pcie-expander-bus.args |  2 +
 .../pcie-root-port-model-generic.args         |  2 +
 .../pcie-root-port-model-ioh3420.args         |  2 +
 ...cie-root-port-nohotplug.x86_64-latest.args |  2 +
 tests/qemuxml2argvdata/pcie-root-port.args    |  2 +
 tests/qemuxml2argvdata/pcie-root.args         |  2 +
 .../pcie-switch-downstream-port.args          |  2 +
 .../pcie-switch-upstream-port.args            |  2 +
 tests/qemuxml2argvdata/pcihole64-q35.args     |  2 +
 ...q35-default-devices-only.x86_64-4.2.0.args |  2 +
 ...35-default-devices-only.x86_64-latest.args |  2 +
 .../q35-multifunction.x86_64-4.2.0.args       |  2 +
 .../q35-multifunction.x86_64-latest.args      |  2 +
 .../q35-pci-force-address.args                |  2 +
 .../q35-pcie-autoadd.x86_64-4.2.0.args        |  2 +
 .../q35-pcie-autoadd.x86_64-latest.args       |  2 +
 .../q35-pcie.x86_64-4.2.0.args                |  2 +
 .../q35-pcie.x86_64-latest.args               |  2 +
 .../q35-pm-disable-fallback.args              |  2 +
 tests/qemuxml2argvdata/q35-pm-disable.args    |  2 +
 tests/qemuxml2argvdata/q35-usb2-multi.args    |  2 +
 tests/qemuxml2argvdata/q35-usb2-reorder.args  |  2 +
 tests/qemuxml2argvdata/q35-usb2.args          |  2 +
 .../q35-virt-manager-basic.x86_64-4.2.0.args  |  2 +
 .../q35-virt-manager-basic.x86_64-latest.args |  2 +
 tests/qemuxml2argvdata/q35.args               |  2 +
 .../sgx-epc.x86_64-7.0.0.args                 |  2 +
 tests/qemuxml2argvdata/sgx-epc.xml            |  1 +
 .../tseg-explicit-size.x86_64-latest.args     |  2 +
 .../usb-controller-default-q35.args           |  2 +
 .../usb-controller-explicit-q35.args          |  2 +
 .../user-aliases2.x86_64-latest.args          |  2 +
 .../vcpu-placement-static.args                |  2 +
 .../vcpu-placement-static.xml                 |  1 +
 ...vhost-user-fs-hugepages.x86_64-latest.args |  2 +
 .../vhost-user-fs-hugepages.xml               |  1 +
 .../virtio-iommu-x86_64.x86_64-latest.args    |  2 +
 ...virtio-non-transitional.x86_64-latest.args |  2 +
 .../virtio-transitional.x86_64-latest.args    |  2 +
 .../watchdog-q35-multiple.x86_64-latest.args  |  1 +
 ...default-cpu-kvm-q35-4.2.x86_64-latest.args |  2 +
 ...efault-cpu-tcg-features.x86_64-latest.args |  2 +
 .../x86_64-default-cpu-tcg-features.xml       |  1 +
 ...default-cpu-tcg-q35-4.2.x86_64-latest.args |  2 +
 .../x86_64-q35-graphics.x86_64-latest.args    |  2 +
 .../x86_64-q35-headless.x86_64-latest.args    |  2 +
 tests/qemuxml2xmloutdata/autoindex.xml        |  1 +
 ...ware-auto-bios-stateless.x86_64-latest.xml |  1 +
 .../firmware-auto-bios.x86_64-latest.xml      |  1 +
 ...e-auto-efi-enrolled-keys.x86_64-latest.xml |  1 +
 ...e-auto-efi-loader-secure.x86_64-latest.xml |  1 +
 ...uto-efi-no-enrolled-keys.x86_64-latest.xml |  1 +
 ...ware-auto-efi-no-secboot.x86_64-latest.xml |  1 +
 .../firmware-auto-efi-nvram.x86_64-latest.xml |  1 +
 ...irmware-auto-efi-secboot.x86_64-latest.xml |  1 +
 .../firmware-auto-efi.x86_64-latest.xml       |  1 +
 ...dev-scsi-vhost-scsi-pcie.x86_64-latest.xml |  1 +
 .../hvf-x86_64-q35-headless.xml               |  1 +
 .../machine-smm-off.x86_64-latest.xml         |  1 +
 .../machine-smm-on.x86_64-latest.xml          |  1 +
 .../net-isolated-port.x86_64-latest.xml       |  1 +
 .../qemuxml2xmloutdata/pcie-expander-bus.xml  |  1 +
 .../pcie-root-port-model-generic.xml          |  1 +
 .../pcie-root-port-model-ioh3420.xml          |  1 +
 ...pcie-root-port-nohotplug.x86_64-latest.xml |  1 +
 tests/qemuxml2xmloutdata/pcie-root-port.xml   |  1 +
 tests/qemuxml2xmloutdata/pcie-root.xml        |  1 +
 .../pcie-switch-downstream-port.xml           |  1 +
 .../pcie-switch-upstream-port.xml             |  1 +
 tests/qemuxml2xmloutdata/pcihole64-q35.xml    |  1 +
 ...q35-default-devices-only.x86_64-latest.xml |  1 +
 .../q35-multifunction.x86_64-latest.xml       |  1 +
 .../q35-pci-force-address.xml                 |  1 +
 .../q35-pcie-autoadd.x86_64-latest.xml        |  1 +
 .../q35-pcie.x86_64-latest.xml                |  1 +
 tests/qemuxml2xmloutdata/q35-usb2-multi.xml   |  1 +
 tests/qemuxml2xmloutdata/q35-usb2-reorder.xml |  1 +
 tests/qemuxml2xmloutdata/q35-usb2.xml         |  1 +
 .../q35-virt-manager-basic.x86_64-latest.xml  |  1 +
 tests/qemuxml2xmloutdata/q35.xml              |  1 +
 .../tseg-explicit-size.x86_64-latest.xml      |  1 +
 .../usb-controller-default-q35.xml            |  1 +
 .../usb-controller-explicit-q35.xml           |  1 +
 .../virtio-iommu-x86_64.x86_64-latest.xml     |  1 +
 .../virtio-non-transitional.x86_64-latest.xml |  1 +
 .../virtio-transitional.x86_64-latest.xml     |  1 +
 .../watchdog-q35-multiple.x86_64-latest.xml   |  1 +
 ...-default-cpu-kvm-q35-4.2.x86_64-latest.xml |  1 +
 ...-default-cpu-tcg-q35-4.2.x86_64-latest.xml |  1 +
 .../x86_64-q35-graphics.x86_64-latest.xml     |  1 +
 .../x86_64-q35-headless.x86_64-latest.xml     |  1 +
 136 files changed, 256 insertions(+)

diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 2eb5653254e1..af9d6a9e6258 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -3996,6 +3996,7 @@ qemuDomainDefAddDefaultDevices(virQEMUDriver *driver,
     bool addDefaultUSBKBD =3D false;
     bool addDefaultUSBMouse =3D false;
     bool addPanicDevice =3D false;
+    bool addITCOWatchdog =3D false;
=20
     /* add implicit input devices */
     if (qemuDomainDefAddImplicitInputDevice(def) < 0)
@@ -4012,6 +4013,7 @@ qemuDomainDefAddDefaultDevices(virQEMUDriver *driver,
         if (qemuDomainIsQ35(def)) {
             addPCIeRoot =3D true;
             addImplicitSATA =3D true;
+            addITCOWatchdog =3D true;
=20
             /* Prefer adding a USB3 controller if supported, fall back
              * to USB2 if there is no USB3 available, and if that's
@@ -4231,6 +4233,27 @@ qemuDomainDefAddDefaultDevices(virQEMUDriver *driver,
         }
     }
=20
+    if (addITCOWatchdog) {
+        size_t i =3D 0;
+
+        for (i =3D 0; i < def->nwatchdogs; i++) {
+            if (def->watchdogs[i]->model =3D=3D VIR_DOMAIN_WATCHDOG_MODEL_=
ITCO)
+                break;
+        }
+
+        if (i =3D=3D def->nwatchdogs) {
+            virDomainWatchdogDef *watchdog =3D g_new0(virDomainWatchdogDef=
, 1);
+
+            watchdog->model =3D VIR_DOMAIN_WATCHDOG_MODEL_ITCO;
+            if (def->nwatchdogs)
+                watchdog->action =3D def->watchdogs[0]->action;
+            else
+                watchdog->action =3D VIR_DOMAIN_WATCHDOG_ACTION_RESET;
+
+            VIR_APPEND_ELEMENT(def->watchdogs, def->nwatchdogs, watchdog);
+        }
+    }
+
     if (qemuDomainDefAddDefaultAudioBackend(driver, def) < 0)
         return -1;
=20
@@ -6469,6 +6492,27 @@ qemuDomainDefFormatBufInternal(virQEMUDriver *driver,
          */
         if (qemuDomainDefClearDefaultAudioBackend(driver, def) < 0)
             return -1;
+
+        /* Old libvirt did not know about the iTCO watchdog in q35 machine
+         * types, but nevertheless it was always present.  Remove it if it=
 has
+         * the default action set. */
+        if (qemuDomainIsQ35(def)) {
+            virDomainWatchdogDef *watchdog =3D NULL;
+
+            for (i =3D 0; i < def->nwatchdogs; i++) {
+                if (def->watchdogs[i]->model =3D=3D VIR_DOMAIN_WATCHDOG_MO=
DEL_ITCO)
+                    break;
+            }
+
+            if (i < def->nwatchdogs) {
+                watchdog =3D def->watchdogs[i];
+
+                if (watchdog->action =3D=3D VIR_DOMAIN_WATCHDOG_ACTION_RES=
ET) {
+                    VIR_DELETE_ELEMENT(def->watchdogs, i, def->nwatchdogs);
+                    virDomainWatchdogDefFree(watchdog);
+                }
+            }
+        }
     }
=20
  format:
diff --git a/tests/qemustatusxml2xmldata/vcpus-multi-in.xml b/tests/qemusta=
tusxml2xmldata/vcpus-multi-in.xml
index e71d6a83c70b..648eafc64c0c 100644
--- a/tests/qemustatusxml2xmldata/vcpus-multi-in.xml
+++ b/tests/qemustatusxml2xmldata/vcpus-multi-in.xml
@@ -338,6 +338,7 @@
       <input type=3D'mouse' bus=3D'ps2'/>
       <input type=3D'keyboard' bus=3D'ps2'/>
       <audio id=3D'1' type=3D'none'/>
+      <watchdog model=3D'itco' action=3D'reset'/>
       <memballoon model=3D'none'/>
       <iommu model=3D'intel'>
         <driver intremap=3D'on' eim=3D'on'/>
diff --git a/tests/qemuxml2argvdata/autoindex.args b/tests/qemuxml2argvdata=
/autoindex.args
index a80f49c46167..26965b328b4e 100644
--- a/tests/qemuxml2argvdata/autoindex.args
+++ b/tests/qemuxml2argvdata/autoindex.args
@@ -58,4 +58,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-q35-test/.config \
 -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw=
","file":"libvirt-1-storage"}' \
 -device ide-hd,bus=3Dide.0,drive=3Dlibvirt-1-format,id=3Dsata0-0-0,bootind=
ex=3D1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/boot-floppy-q35.x86_64-latest.args b/te=
sts/qemuxml2argvdata/boot-floppy-q35.x86_64-latest.args
index 7f34c7a96526..db55573402e1 100644
--- a/tests/qemuxml2argvdata/boot-floppy-q35.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/boot-floppy-q35.x86_64-latest.args
@@ -35,5 +35,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \
 -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw=
","file":"libvirt-1-storage"}' \
 -device '{"driver":"floppy","unit":0,"drive":"libvirt-1-format","id":"fdc0=
-0-0"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/boot-floppy-q35.xml b/tests/qemuxml2arg=
vdata/boot-floppy-q35.xml
index 0604cd155b2e..384993c79f3b 100644
--- a/tests/qemuxml2argvdata/boot-floppy-q35.xml
+++ b/tests/qemuxml2argvdata/boot-floppy-q35.xml
@@ -28,6 +28,7 @@
     <input type=3D'mouse' bus=3D'ps2'/>
     <input type=3D'keyboard' bus=3D'ps2'/>
     <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
     <memballoon model=3D'none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2argvdata/cpu-host-model.args b/tests/qemuxml2arg=
vdata/cpu-host-model.args
index 5360947e3d8f..6ac535b189c1 100644
--- a/tests/qemuxml2argvdata/cpu-host-model.args
+++ b/tests/qemuxml2argvdata/cpu-host-model.args
@@ -34,5 +34,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \
 -device ich9-usb-uhci2,masterbus=3Dusb.0,firstport=3D2,bus=3Dpcie.0,addr=
=3D0x1d.0x1 \
 -device ich9-usb-uhci3,masterbus=3Dusb.0,firstport=3D4,bus=3Dpcie.0,addr=
=3D0x1d.0x2 \
 -audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x1 \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-4.2.0.args b/test=
s/qemuxml2argvdata/cpu-host-model.x86_64-4.2.0.args
index 4b2b55be6239..dfa66e5e91c4 100644
--- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-4.2.0.args
+++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-4.2.0.args
@@ -31,6 +31,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \
 -device pcie-root-port,port=3D10,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr=
=3D0x1.0x2 \
 -device qemu-xhci,id=3Dusb,bus=3Dpci.1,addr=3D0x0 \
 -audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x0 \
 -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.0.0.args b/test=
s/qemuxml2argvdata/cpu-host-model.x86_64-5.0.0.args
index 2ea818cc1356..d7c26657dd6c 100644
--- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.0.0.args
+++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.0.0.args
@@ -31,6 +31,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \
 -device pcie-root-port,port=3D10,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr=
=3D0x1.0x2 \
 -device qemu-xhci,id=3Dusb,bus=3Dpci.1,addr=3D0x0 \
 -audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x0 \
 -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.1.0.args b/test=
s/qemuxml2argvdata/cpu-host-model.x86_64-5.1.0.args
index c6e2f345b80a..4b57cf34d207 100644
--- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.1.0.args
+++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.1.0.args
@@ -31,6 +31,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \
 -device pcie-root-port,port=3D10,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr=
=3D0x1.0x2 \
 -device qemu-xhci,id=3Dusb,bus=3Dpci.1,addr=3D0x0 \
 -audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x0 \
 -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.2.0.args b/test=
s/qemuxml2argvdata/cpu-host-model.x86_64-5.2.0.args
index 5bb6545e628c..58b80f7a02ee 100644
--- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.2.0.args
+++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-5.2.0.args
@@ -32,6 +32,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \
 -device pcie-root-port,port=3D10,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr=
=3D0x1.0x2 \
 -device qemu-xhci,id=3Dusb,bus=3Dpci.1,addr=3D0x0 \
 -audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x0 \
 -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-6.0.0.args b/test=
s/qemuxml2argvdata/cpu-host-model.x86_64-6.0.0.args
index 57ae8a19d8ea..3fb471b46662 100644
--- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-6.0.0.args
+++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-6.0.0.args
@@ -32,6 +32,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \
 -device pcie-root-port,port=3D10,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr=
=3D0x1.0x2 \
 -device qemu-xhci,id=3Dusb,bus=3Dpci.1,addr=3D0x0 \
 -audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x0 \
 -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-6.1.0.args b/test=
s/qemuxml2argvdata/cpu-host-model.x86_64-6.1.0.args
index baf095502757..7b1667ab08c5 100644
--- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-6.1.0.args
+++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-6.1.0.args
@@ -32,6 +32,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \
 -device pcie-root-port,port=3D10,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr=
=3D0x1.0x2 \
 -device qemu-xhci,id=3Dusb,bus=3Dpci.1,addr=3D0x0 \
 -audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x0 \
 -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-latest.args b/tes=
ts/qemuxml2argvdata/cpu-host-model.x86_64-latest.args
index 2610e65d16d2..9ca4d23edc87 100644
--- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/cpu-host-model.x86_64-latest.args
@@ -32,6 +32,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \
 -device '{"driver":"pcie-root-port","port":10,"chassis":3,"id":"pci.3","bu=
s":"pcie.0","addr":"0x1.0x2"}' \
 -device '{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.2","add=
r":"0x0"}' \
 -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/disk-floppy-q35.x86_64-latest.args b/te=
sts/qemuxml2argvdata/disk-floppy-q35.x86_64-latest.args
index 810cc0796d8e..a8da3c53d4b4 100644
--- a/tests/qemuxml2argvdata/disk-floppy-q35.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/disk-floppy-q35.x86_64-latest.args
@@ -38,5 +38,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \
 -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco=
w2","file":"libvirt-1-storage"}' \
 -device '{"driver":"floppy","unit":1,"drive":"libvirt-1-format","id":"fdc0=
-0-1"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/firmware-auto-bios-stateless.x86_64-lat=
est.args b/tests/qemuxml2argvdata/firmware-auto-bios-stateless.x86_64-lates=
t.args
index 1d45a8cfbaab..8bef5a34f8d5 100644
--- a/tests/qemuxml2argvdata/firmware-auto-bios-stateless.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/firmware-auto-bios-stateless.x86_64-latest.args
@@ -28,5 +28,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \
 -no-shutdown \
 -boot strict=3Don \
 -audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/firmware-auto-bios.x86_64-latest.args b=
/tests/qemuxml2argvdata/firmware-auto-bios.x86_64-latest.args
index 1d45a8cfbaab..8bef5a34f8d5 100644
--- a/tests/qemuxml2argvdata/firmware-auto-bios.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/firmware-auto-bios.x86_64-latest.args
@@ -28,5 +28,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \
 -no-shutdown \
 -boot strict=3Don \
 -audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-enrolled-keys.x86_64-=
latest.args b/tests/qemuxml2argvdata/firmware-auto-efi-enrolled-keys.x86_64=
-latest.args
index 0b0246496355..966697d86006 100644
--- a/tests/qemuxml2argvdata/firmware-auto-efi-enrolled-keys.x86_64-latest.=
args
+++ b/tests/qemuxml2argvdata/firmware-auto-efi-enrolled-keys.x86_64-latest.=
args
@@ -32,5 +32,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \
 -no-shutdown \
 -boot strict=3Don \
 -audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-loader-secure.x86_64-=
latest.args b/tests/qemuxml2argvdata/firmware-auto-efi-loader-secure.x86_64=
-latest.args
index 0b0246496355..966697d86006 100644
--- a/tests/qemuxml2argvdata/firmware-auto-efi-loader-secure.x86_64-latest.=
args
+++ b/tests/qemuxml2argvdata/firmware-auto-efi-loader-secure.x86_64-latest.=
args
@@ -32,5 +32,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \
 -no-shutdown \
 -boot strict=3Don \
 -audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-no-enrolled-keys.x86_=
64-latest.args b/tests/qemuxml2argvdata/firmware-auto-efi-no-enrolled-keys.=
x86_64-latest.args
index a1ef95ee0350..b02460dbc6b9 100644
--- a/tests/qemuxml2argvdata/firmware-auto-efi-no-enrolled-keys.x86_64-late=
st.args
+++ b/tests/qemuxml2argvdata/firmware-auto-efi-no-enrolled-keys.x86_64-late=
st.args
@@ -31,5 +31,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \
 -no-shutdown \
 -boot strict=3Don \
 -audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-no-secboot.x86_64-lat=
est.args b/tests/qemuxml2argvdata/firmware-auto-efi-no-secboot.x86_64-lates=
t.args
index a1ef95ee0350..b02460dbc6b9 100644
--- a/tests/qemuxml2argvdata/firmware-auto-efi-no-secboot.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/firmware-auto-efi-no-secboot.x86_64-latest.args
@@ -31,5 +31,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \
 -no-shutdown \
 -boot strict=3Don \
 -audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-nvram.x86_64-latest.a=
rgs b/tests/qemuxml2argvdata/firmware-auto-efi-nvram.x86_64-latest.args
index 3659889bf31a..0c131b529d8d 100644
--- a/tests/qemuxml2argvdata/firmware-auto-efi-nvram.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/firmware-auto-efi-nvram.x86_64-latest.args
@@ -32,5 +32,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \
 -no-shutdown \
 -boot strict=3Don \
 -audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-secboot.x86_64-latest=
.args b/tests/qemuxml2argvdata/firmware-auto-efi-secboot.x86_64-latest.args
index 0b0246496355..966697d86006 100644
--- a/tests/qemuxml2argvdata/firmware-auto-efi-secboot.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/firmware-auto-efi-secboot.x86_64-latest.args
@@ -32,5 +32,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \
 -no-shutdown \
 -boot strict=3Don \
 -audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-stateless.x86_64-late=
st.args b/tests/qemuxml2argvdata/firmware-auto-efi-stateless.x86_64-latest.=
args
index b79c141b18bb..c89612d7bfff 100644
--- a/tests/qemuxml2argvdata/firmware-auto-efi-stateless.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/firmware-auto-efi-stateless.x86_64-latest.args
@@ -29,5 +29,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \
 -no-shutdown \
 -boot strict=3Don \
 -audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/firmware-auto-efi.x86_64-latest.args b/=
tests/qemuxml2argvdata/firmware-auto-efi.x86_64-latest.args
index 0b0246496355..966697d86006 100644
--- a/tests/qemuxml2argvdata/firmware-auto-efi.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/firmware-auto-efi.x86_64-latest.args
@@ -32,5 +32,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-fedora/.config \
 -no-shutdown \
 -boot strict=3Don \
 -audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.args b/tes=
ts/qemuxml2argvdata/firmware-manual-efi-acpi-q35.args
index 08280c18ead6..641b7482ef91 100644
--- a/tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.args
+++ b/tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.args
@@ -29,4 +29,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \
 -no-shutdown \
 -boot strict=3Don \
 -audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-secure.args b/tests=
/qemuxml2argvdata/firmware-manual-efi-secure.args
index 996acbb24453..7a879c3822f3 100644
--- a/tests/qemuxml2argvdata/firmware-manual-efi-secure.args
+++ b/tests/qemuxml2argvdata/firmware-manual-efi-secure.args
@@ -30,4 +30,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test-bios/.config \
 -no-shutdown \
 -boot strict=3Don \
 -audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/firmware-manual-noefi-acpi-q35.args b/t=
ests/qemuxml2argvdata/firmware-manual-noefi-acpi-q35.args
index b1c54a66e38d..814396d3fc10 100644
--- a/tests/qemuxml2argvdata/firmware-manual-noefi-acpi-q35.args
+++ b/tests/qemuxml2argvdata/firmware-manual-noefi-acpi-q35.args
@@ -25,4 +25,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \
 -no-shutdown \
 -boot strict=3Don \
 -audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-q35.args b=
/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-q35.args
index d0c35d1ef7ac..4eff029173a3 100644
--- a/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-q35.args
+++ b/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-q35.args
@@ -26,4 +26,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \
 -no-acpi \
 -boot strict=3Don \
 -audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.x86_64-4.2=
.0.args b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.x86_64-4.2.0.=
args
index 992d8ec90547..2e4d6fb88918 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.x86_64-4.2.0.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.x86_64-4.2.0.args
@@ -29,6 +29,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.config \
 -device pcie-root-port,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multif=
unction=3Don,addr=3D0x1 \
 -device pcie-root-port,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr=
=3D0x1.0x1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -device vhost-scsi-pci,wwpn=3Dnaa.5123456789abcde0,vhostfd=3D3,id=3Dhostde=
v0,bus=3Dpci.1,addr=3D0x0 \
 -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.x86_64-lat=
est.args b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.x86_64-lates=
t.args
index 98b5e9b0ad5f..6e7f4d093d6b 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.x86_64-latest.args
@@ -30,6 +30,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest2/.config \
 -device '{"driver":"pcie-root-port","port":8,"chassis":1,"id":"pci.1","bus=
":"pcie.0","multifunction":true,"addr":"0x1"}' \
 -device '{"driver":"pcie-root-port","port":9,"chassis":2,"id":"pci.2","bus=
":"pcie.0","addr":"0x1.0x1"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -device '{"driver":"vhost-scsi-pci","wwpn":"naa.5123456789abcde0","vhostfd=
":"3","id":"hostdev0","bus":"pci.1","addr":"0x0"}' \
 -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/hvf-x86_64-q35-headless.args b/tests/qe=
muxml2argvdata/hvf-x86_64-q35-headless.args
index 8272c0792b35..06fbcbb15b40 100644
--- a/tests/qemuxml2argvdata/hvf-x86_64-q35-headless.args
+++ b/tests/qemuxml2argvdata/hvf-x86_64-q35-headless.args
@@ -42,6 +42,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-test/.config \
 -chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \
 -device virtserialport,bus=3Dvirtio-serial0.0,nr=3D1,chardev=3Dcharchannel=
0,id=3Dchannel0,name=3Dorg.qemu.guest_agent.0 \
 -audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.4,addr=3D0x0 \
 -object rng-random,id=3Dobjrng0,filename=3D/dev/urandom \
 -device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,bus=3Dpci.5,addr=3D0x0 \
diff --git a/tests/qemuxml2argvdata/intel-iommu-aw-bits.x86_64-latest.args =
b/tests/qemuxml2argvdata/intel-iommu-aw-bits.x86_64-latest.args
index 417b5fb9dc5c..bb946e93ebac 100644
--- a/tests/qemuxml2argvdata/intel-iommu-aw-bits.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/intel-iommu-aw-bits.x86_64-latest.args
@@ -29,5 +29,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \
 -boot strict=3Don \
 -device '{"driver":"intel-iommu","id":"iommu0","intremap":"on","aw-bits":4=
8}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/intel-iommu-aw-bits.xml b/tests/qemuxml=
2argvdata/intel-iommu-aw-bits.xml
index b4eb81ff5dec..f5b111f6fe99 100644
--- a/tests/qemuxml2argvdata/intel-iommu-aw-bits.xml
+++ b/tests/qemuxml2argvdata/intel-iommu-aw-bits.xml
@@ -28,6 +28,7 @@
     <input type=3D'mouse' bus=3D'ps2'/>
     <input type=3D'keyboard' bus=3D'ps2'/>
     <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
     <memballoon model=3D'none'/>
     <iommu model=3D'intel'>
       <driver intremap=3D'on' aw_bits=3D'48'/>
diff --git a/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.=
args b/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.args
index bfcfc35e2856..5c093808757e 100644
--- a/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.args
@@ -29,5 +29,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \
 -boot strict=3Don \
 -device '{"driver":"intel-iommu","id":"iommu0","intremap":"on","caching-mo=
de":true}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/intel-iommu-caching-mode.xml b/tests/qe=
muxml2argvdata/intel-iommu-caching-mode.xml
index 4aa4bacf5b85..4c1112a19c10 100644
--- a/tests/qemuxml2argvdata/intel-iommu-caching-mode.xml
+++ b/tests/qemuxml2argvdata/intel-iommu-caching-mode.xml
@@ -28,6 +28,7 @@
     <input type=3D'mouse' bus=3D'ps2'/>
     <input type=3D'keyboard' bus=3D'ps2'/>
     <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
     <memballoon model=3D'none'/>
     <iommu model=3D'intel'>
       <driver intremap=3D'on' caching_mode=3D'on'/>
diff --git a/tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.=
args b/tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.args
index 95cd9d26ef5b..d32eca924768 100644
--- a/tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.args
@@ -29,5 +29,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \
 -boot strict=3Don \
 -device '{"driver":"intel-iommu","id":"iommu0","intremap":"on","device-iot=
lb":true}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/intel-iommu-device-iotlb.xml b/tests/qe=
muxml2argvdata/intel-iommu-device-iotlb.xml
index e106737e6ad7..f646c70f0af1 100644
--- a/tests/qemuxml2argvdata/intel-iommu-device-iotlb.xml
+++ b/tests/qemuxml2argvdata/intel-iommu-device-iotlb.xml
@@ -28,6 +28,7 @@
     <input type=3D'mouse' bus=3D'ps2'/>
     <input type=3D'keyboard' bus=3D'ps2'/>
     <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
     <memballoon model=3D'none'/>
     <iommu model=3D'intel'>
       <driver intremap=3D'on' iotlb=3D'on'/>
diff --git a/tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args b/te=
sts/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args
index 12113a280013..a8a65fecf765 100644
--- a/tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args
@@ -29,5 +29,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \
 -boot strict=3Don \
 -device '{"driver":"intel-iommu","id":"iommu0","intremap":"on","eim":"on"}=
' \
 -audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/intel-iommu-eim.xml b/tests/qemuxml2arg=
vdata/intel-iommu-eim.xml
index c4942e4c79b0..1caa0ceb60d9 100644
--- a/tests/qemuxml2argvdata/intel-iommu-eim.xml
+++ b/tests/qemuxml2argvdata/intel-iommu-eim.xml
@@ -28,6 +28,7 @@
     <input type=3D'mouse' bus=3D'ps2'/>
     <input type=3D'keyboard' bus=3D'ps2'/>
     <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
     <memballoon model=3D'none'/>
     <iommu model=3D'intel'>
       <driver intremap=3D'on' eim=3D'on'/>
diff --git a/tests/qemuxml2argvdata/intel-iommu.x86_64-latest.args b/tests/=
qemuxml2argvdata/intel-iommu.x86_64-latest.args
index c99efd229ba4..9ab96cd437c5 100644
--- a/tests/qemuxml2argvdata/intel-iommu.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/intel-iommu.x86_64-latest.args
@@ -29,5 +29,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \
 -boot strict=3Don \
 -device '{"driver":"intel-iommu","id":"iommu0"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/intel-iommu.xml b/tests/qemuxml2argvdat=
a/intel-iommu.xml
index 8badf6c9709a..04c8685bbfa7 100644
--- a/tests/qemuxml2argvdata/intel-iommu.xml
+++ b/tests/qemuxml2argvdata/intel-iommu.xml
@@ -25,6 +25,7 @@
     <input type=3D'mouse' bus=3D'ps2'/>
     <input type=3D'keyboard' bus=3D'ps2'/>
     <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
     <memballoon model=3D'none'/>
     <iommu model=3D'intel'/>
   </devices>
diff --git a/tests/qemuxml2argvdata/iothreads-ids-pool-sizes.x86_64-latest.=
args b/tests/qemuxml2argvdata/iothreads-ids-pool-sizes.x86_64-latest.args
index 12747b51f0f4..5429dedb4bc3 100644
--- a/tests/qemuxml2argvdata/iothreads-ids-pool-sizes.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/iothreads-ids-pool-sizes.x86_64-latest.args
@@ -41,5 +41,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \
 -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw=
","file":"libvirt-1-storage"}' \
 -device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x0","drive":"li=
bvirt-1-format","id":"virtio-disk0","bootindex":1}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/iothreads-ids-pool-sizes.xml b/tests/qe=
muxml2argvdata/iothreads-ids-pool-sizes.xml
index 4cebdfada918..284cded0b6d1 100644
--- a/tests/qemuxml2argvdata/iothreads-ids-pool-sizes.xml
+++ b/tests/qemuxml2argvdata/iothreads-ids-pool-sizes.xml
@@ -57,6 +57,7 @@
     <input type=3D'mouse' bus=3D'ps2'/>
     <input type=3D'keyboard' bus=3D'ps2'/>
     <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
     <memballoon model=3D'none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2argvdata/machine-smm-off.x86_64-latest.args b/te=
sts/qemuxml2argvdata/machine-smm-off.x86_64-latest.args
index 46f6a4a70c81..92df830698c8 100644
--- a/tests/qemuxml2argvdata/machine-smm-off.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/machine-smm-off.x86_64-latest.args
@@ -28,5 +28,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=3Don \
 -audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/machine-smm-on.x86_64-latest.args b/tes=
ts/qemuxml2argvdata/machine-smm-on.x86_64-latest.args
index 6fde3755231a..e8f956c0d153 100644
--- a/tests/qemuxml2argvdata/machine-smm-on.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/machine-smm-on.x86_64-latest.args
@@ -28,5 +28,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \
 -no-acpi \
 -boot strict=3Don \
 -audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/pcie-expander-bus.args b/tests/qemuxml2=
argvdata/pcie-expander-bus.args
index 7db64d7969f0..d12d1d67b40b 100644
--- a/tests/qemuxml2argvdata/pcie-expander-bus.args
+++ b/tests/qemuxml2argvdata/pcie-expander-bus.args
@@ -130,4 +130,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-pcie-expander-bus-=
te/.config \
 -netdev user,id=3Dhostnet31 \
 -device e1000,netdev=3Dhostnet31,id=3Dnet31,mac=3D52:54:00:7e:6d:c9,bus=3D=
pci.35,addr=3D0x0 \
 -audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/pcie-root-port-model-generic.args b/tes=
ts/qemuxml2argvdata/pcie-root-port-model-generic.args
index 62c0bf982e34..9dc7e5720854 100644
--- a/tests/qemuxml2argvdata/pcie-root-port-model-generic.args
+++ b/tests/qemuxml2argvdata/pcie-root-port-model-generic.args
@@ -29,4 +29,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \
 -device pcie-root-port,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr=
=3D0x1.0x1 \
 -device ioh3420,port=3D10,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr=3D0x1.0=
x2 \
 -audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args b/tes=
ts/qemuxml2argvdata/pcie-root-port-model-ioh3420.args
index 0247c87166bd..a0c5269eee03 100644
--- a/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args
+++ b/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args
@@ -28,4 +28,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \
 -device ioh3420,port=3D8,chassis=3D1,id=3Dpci.1,bus=3Dpcie.0,multifunction=
=3Don,addr=3D0x1 \
 -device ioh3420,port=3D9,chassis=3D2,id=3Dpci.2,bus=3Dpcie.0,addr=3D0x1.0x=
1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/pcie-root-port-nohotplug.x86_64-latest.=
args b/tests/qemuxml2argvdata/pcie-root-port-nohotplug.x86_64-latest.args
index 1e0a42a8ed7b..a82996da7d73 100644
--- a/tests/qemuxml2argvdata/pcie-root-port-nohotplug.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/pcie-root-port-nohotplug.x86_64-latest.args
@@ -37,5 +37,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \
 -device '{"driver":"xio3130-downstream","port":39,"chassis":30,"id":"pci.8=
","bus":"pci.4","addr":"0x3"}' \
 -device '{"driver":"qemu-xhci","id":"usb","bus":"pci.2","addr":"0x0"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/pcie-root-port.args b/tests/qemuxml2arg=
vdata/pcie-root-port.args
index 7ae8645b17ad..c548d18c934f 100644
--- a/tests/qemuxml2argvdata/pcie-root-port.args
+++ b/tests/qemuxml2argvdata/pcie-root-port.args
@@ -32,4 +32,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-q35-test/.config \
 -device ide-hd,bus=3Dide.0,drive=3Dlibvirt-1-format,id=3Dsata0-0-0,bootind=
ex=3D1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device qxl-vga,id=3Dvideo0,max_outputs=3D1,ram_size=3D67108864,vram_size=
=3D33554432,bus=3Dpcie.0,addr=3D0x1 \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/pcie-root.args b/tests/qemuxml2argvdata=
/pcie-root.args
index 06a31506f839..3d75adce4e22 100644
--- a/tests/qemuxml2argvdata/pcie-root.args
+++ b/tests/qemuxml2argvdata/pcie-root.args
@@ -26,4 +26,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-q35-test/.config \
 -no-acpi \
 -boot strict=3Don \
 -audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/pcie-switch-downstream-port.args b/test=
s/qemuxml2argvdata/pcie-switch-downstream-port.args
index 63769ed0cff6..3668cd98403b 100644
--- a/tests/qemuxml2argvdata/pcie-switch-downstream-port.args
+++ b/tests/qemuxml2argvdata/pcie-switch-downstream-port.args
@@ -40,4 +40,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-q35-test/.config \
 -device ide-hd,bus=3Dide.0,drive=3Dlibvirt-1-format,id=3Dsata0-0-0,bootind=
ex=3D1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device qxl-vga,id=3Dvideo0,max_outputs=3D1,ram_size=3D67108864,vram_size=
=3D33554432,bus=3Dpcie.0,addr=3D0x1 \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/pcie-switch-upstream-port.args b/tests/=
qemuxml2argvdata/pcie-switch-upstream-port.args
index a260479b4442..a77ad08769c2 100644
--- a/tests/qemuxml2argvdata/pcie-switch-upstream-port.args
+++ b/tests/qemuxml2argvdata/pcie-switch-upstream-port.args
@@ -34,4 +34,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-q35-test/.config \
 -device ide-hd,bus=3Dide.0,drive=3Dlibvirt-1-format,id=3Dsata0-0-0,bootind=
ex=3D1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device qxl-vga,id=3Dvideo0,max_outputs=3D1,ram_size=3D67108864,vram_size=
=3D33554432,bus=3Dpcie.0,addr=3D0x1 \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/pcihole64-q35.args b/tests/qemuxml2argv=
data/pcihole64-q35.args
index e5114936ea83..a62345895d9b 100644
--- a/tests/qemuxml2argvdata/pcihole64-q35.args
+++ b/tests/qemuxml2argvdata/pcihole64-q35.args
@@ -31,4 +31,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-q35-test/.config \
 -device ide-hd,bus=3Dide.0,drive=3Dlibvirt-1-format,id=3Dsata0-0-0,bootind=
ex=3D1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device qxl-vga,id=3Dvideo0,max_outputs=3D1,ram_size=3D67108864,vram_size=
=3D33554432,bus=3Dpcie.0,addr=3D0x1 \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/q35-default-devices-only.x86_64-4.2.0.a=
rgs b/tests/qemuxml2argvdata/q35-default-devices-only.x86_64-4.2.0.args
index a4de318a050d..ed8d4c431a3a 100644
--- a/tests/qemuxml2argvdata/q35-default-devices-only.x86_64-4.2.0.args
+++ b/tests/qemuxml2argvdata/q35-default-devices-only.x86_64-4.2.0.args
@@ -31,6 +31,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-q35-test/.config \
 -device pcie-root-port,port=3D10,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr=
=3D0x1.0x2 \
 -device qemu-xhci,id=3Dusb,bus=3Dpci.1,addr=3D0x0 \
 -audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x0 \
 -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/q35-default-devices-only.x86_64-latest.=
args b/tests/qemuxml2argvdata/q35-default-devices-only.x86_64-latest.args
index ce5b2a216e68..f6c06805ff6a 100644
--- a/tests/qemuxml2argvdata/q35-default-devices-only.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/q35-default-devices-only.x86_64-latest.args
@@ -32,6 +32,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-q35-test/.config \
 -device '{"driver":"pcie-root-port","port":10,"chassis":3,"id":"pci.3","bu=
s":"pcie.0","addr":"0x1.0x2"}' \
 -device '{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.2","add=
r":"0x0"}' \
 -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/q35-multifunction.x86_64-4.2.0.args b/t=
ests/qemuxml2argvdata/q35-multifunction.x86_64-4.2.0.args
index 287268d1c8e7..6f8ae929e1d5 100644
--- a/tests/qemuxml2argvdata/q35-multifunction.x86_64-4.2.0.args
+++ b/tests/qemuxml2argvdata/q35-multifunction.x86_64-4.2.0.args
@@ -46,6 +46,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-q35-test/.config \
 -device pcie-root-port,port=3D21,chassis=3D18,id=3Dpci.18,bus=3Dpcie.0,add=
r=3D0x2.0x5 \
 -device qemu-xhci,id=3Dusb,bus=3Dpci.1,addr=3D0x0 \
 -audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x0 \
 -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/q35-multifunction.x86_64-latest.args b/=
tests/qemuxml2argvdata/q35-multifunction.x86_64-latest.args
index 298f7ed13d14..f2c549cbb4a3 100644
--- a/tests/qemuxml2argvdata/q35-multifunction.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/q35-multifunction.x86_64-latest.args
@@ -47,6 +47,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-q35-test/.config \
 -device '{"driver":"pcie-root-port","port":21,"chassis":18,"id":"pci.18","=
bus":"pcie.0","addr":"0x2.0x5"}' \
 -device '{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.2","add=
r":"0x0"}' \
 -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/q35-pci-force-address.args b/tests/qemu=
xml2argvdata/q35-pci-force-address.args
index 7f2b2ef0686d..7867e7798d7f 100644
--- a/tests/qemuxml2argvdata/q35-pci-force-address.args
+++ b/tests/qemuxml2argvdata/q35-pci-force-address.args
@@ -33,4 +33,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-q35-test/.config \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device intel-hda,id=3Dsound0,bus=3Dpci.3,addr=3D0x0 \
 -device hda-duplex,id=3Dsound0-codec0,bus=3Dsound0.0,cad=3D0,audiodev=3Dau=
dio1 \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/q35-pcie-autoadd.x86_64-4.2.0.args b/te=
sts/qemuxml2argvdata/q35-pcie-autoadd.x86_64-4.2.0.args
index 787cbfa51106..f093ec4330b1 100644
--- a/tests/qemuxml2argvdata/q35-pcie-autoadd.x86_64-4.2.0.args
+++ b/tests/qemuxml2argvdata/q35-pcie-autoadd.x86_64-4.2.0.args
@@ -58,6 +58,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-q35-test/.config \
 -device virtio-tablet-pci,id=3Dinput3,bus=3Dpci.13,addr=3D0x0 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-vga,id=3Dvideo0,max_outputs=3D1,bus=3Dpcie.0,addr=3D0x1 \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.8,addr=3D0x0 \
 -object rng-random,id=3Dobjrng0,filename=3D/dev/urandom \
 -device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,max-bytes=3D123,period=3D12=
34,bus=3Dpci.9,addr=3D0x0 \
diff --git a/tests/qemuxml2argvdata/q35-pcie-autoadd.x86_64-latest.args b/t=
ests/qemuxml2argvdata/q35-pcie-autoadd.x86_64-latest.args
index fcb9e9e43f07..79fd054654e4 100644
--- a/tests/qemuxml2argvdata/q35-pcie-autoadd.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/q35-pcie-autoadd.x86_64-latest.args
@@ -59,6 +59,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-q35-test/.config \
 -device '{"driver":"virtio-tablet-pci","id":"input3","bus":"pci.13","addr"=
:"0x0"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device '{"driver":"virtio-vga","id":"video0","max_outputs":1,"bus":"pcie.=
0","addr":"0x1"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.8","add=
r":"0x0"}' \
 -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"=
}' \
 -device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","max-bytes=
":123,"period":1234,"bus":"pci.9","addr":"0x0"}' \
diff --git a/tests/qemuxml2argvdata/q35-pcie.x86_64-4.2.0.args b/tests/qemu=
xml2argvdata/q35-pcie.x86_64-4.2.0.args
index 15daab14b782..52e6e766f522 100644
--- a/tests/qemuxml2argvdata/q35-pcie.x86_64-4.2.0.args
+++ b/tests/qemuxml2argvdata/q35-pcie.x86_64-4.2.0.args
@@ -59,6 +59,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-q35-test/.config \
 -device virtio-tablet-pci,id=3Dinput3,bus=3Dpci.15,addr=3D0x0 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device virtio-vga,id=3Dvideo0,max_outputs=3D1,bus=3Dpcie.0,addr=3D0x1 \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.10,addr=3D0x0 \
 -object rng-random,id=3Dobjrng0,filename=3D/dev/urandom \
 -device virtio-rng-pci,rng=3Dobjrng0,id=3Drng0,max-bytes=3D123,period=3D12=
34,bus=3Dpci.11,addr=3D0x0 \
diff --git a/tests/qemuxml2argvdata/q35-pcie.x86_64-latest.args b/tests/qem=
uxml2argvdata/q35-pcie.x86_64-latest.args
index 08afee14a406..69b37feb20d0 100644
--- a/tests/qemuxml2argvdata/q35-pcie.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/q35-pcie.x86_64-latest.args
@@ -60,6 +60,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-q35-test/.config \
 -device '{"driver":"virtio-tablet-pci","id":"input3","bus":"pci.15","addr"=
:"0x0"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device '{"driver":"virtio-vga","id":"video0","max_outputs":1,"bus":"pcie.=
0","addr":"0x1"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.10","ad=
dr":"0x0"}' \
 -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"=
}' \
 -device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","max-bytes=
":123,"period":1234,"bus":"pci.11","addr":"0x0"}' \
diff --git a/tests/qemuxml2argvdata/q35-pm-disable-fallback.args b/tests/qe=
muxml2argvdata/q35-pm-disable-fallback.args
index 50eb2fa109a2..f43ace5db098 100644
--- a/tests/qemuxml2argvdata/q35-pm-disable-fallback.args
+++ b/tests/qemuxml2argvdata/q35-pm-disable-fallback.args
@@ -31,5 +31,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-q35/.config \
 -device pci-bridge,chassis_nr=3D2,id=3Dpci.2,bus=3Dpci.1,addr=3D0x0 \
 -device ioh3420,port=3D8,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr=3D0x1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x1 \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/q35-pm-disable.args b/tests/qemuxml2arg=
vdata/q35-pm-disable.args
index 3a6437cf313c..de65dd67f0f1 100644
--- a/tests/qemuxml2argvdata/q35-pm-disable.args
+++ b/tests/qemuxml2argvdata/q35-pm-disable.args
@@ -31,5 +31,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-q35/.config \
 -device pci-bridge,chassis_nr=3D2,id=3Dpci.2,bus=3Dpci.1,addr=3D0x0 \
 -device ioh3420,port=3D8,chassis=3D3,id=3Dpci.3,bus=3Dpcie.0,addr=3D0x1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -device virtio-balloon-pci,id=3Dballoon0,bus=3Dpci.2,addr=3D0x1 \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/q35-usb2-multi.args b/tests/qemuxml2arg=
vdata/q35-usb2-multi.args
index e2a2cbdd190a..95e7ad293857 100644
--- a/tests/qemuxml2argvdata/q35-usb2-multi.args
+++ b/tests/qemuxml2argvdata/q35-usb2-multi.args
@@ -44,4 +44,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-q35-test/.config \
 -device ide-hd,bus=3Dide.0,drive=3Dlibvirt-1-format,id=3Dsata0-0-0,bootind=
ex=3D1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device qxl-vga,id=3Dvideo0,max_outputs=3D1,ram_size=3D67108864,vram_size=
=3D33554432,bus=3Dpcie.0,addr=3D0x1 \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/q35-usb2-reorder.args b/tests/qemuxml2a=
rgvdata/q35-usb2-reorder.args
index 3c7f1e61992c..67b4da11eed3 100644
--- a/tests/qemuxml2argvdata/q35-usb2-reorder.args
+++ b/tests/qemuxml2argvdata/q35-usb2-reorder.args
@@ -44,4 +44,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-q35-test/.config \
 -device ide-hd,bus=3Dide.0,drive=3Dlibvirt-1-format,id=3Dsata0-0-0,bootind=
ex=3D1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device qxl-vga,id=3Dvideo0,max_outputs=3D1,ram_size=3D67108864,vram_size=
=3D33554432,bus=3Dpcie.0,addr=3D0x1 \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/q35-usb2.args b/tests/qemuxml2argvdata/=
q35-usb2.args
index 325bbd31c771..3ec2363f4d75 100644
--- a/tests/qemuxml2argvdata/q35-usb2.args
+++ b/tests/qemuxml2argvdata/q35-usb2.args
@@ -36,4 +36,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-q35-test/.config \
 -device ide-hd,bus=3Dide.0,drive=3Dlibvirt-1-format,id=3Dsata0-0-0,bootind=
ex=3D1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device qxl-vga,id=3Dvideo0,max_outputs=3D1,ram_size=3D67108864,vram_size=
=3D33554432,bus=3Dpcie.0,addr=3D0x1 \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/q35-virt-manager-basic.x86_64-4.2.0.arg=
s b/tests/qemuxml2argvdata/q35-virt-manager-basic.x86_64-4.2.0.args
index 14093a3f80b4..042f965183a5 100644
--- a/tests/qemuxml2argvdata/q35-virt-manager-basic.x86_64-4.2.0.args
+++ b/tests/qemuxml2argvdata/q35-virt-manager-basic.x86_64-4.2.0.args
@@ -53,6 +53,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-virt-manager-basic/.=
config \
 -device qxl-vga,id=3Dvideo0,max_outputs=3D1,ram_size=3D67108864,vram_size=
=3D67108864,vram64_size_mb=3D0,vgamem_mb=3D16,bus=3Dpcie.0,addr=3D0x1 \
 -device ich9-intel-hda,id=3Dsound0,bus=3Dpcie.0,addr=3D0x1b \
 -device hda-duplex,id=3Dsound0-codec0,bus=3Dsound0.0,cad=3D0,audiodev=3Dau=
dio1 \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -chardev spicevmc,id=3Dcharredir0,name=3Dusbredir \
 -device usb-redir,chardev=3Dcharredir0,id=3Dredir0,bus=3Dusb.0,port=3D2 \
 -chardev spicevmc,id=3Dcharredir1,name=3Dusbredir \
diff --git a/tests/qemuxml2argvdata/q35-virt-manager-basic.x86_64-latest.ar=
gs b/tests/qemuxml2argvdata/q35-virt-manager-basic.x86_64-latest.args
index 8446abdb6e67..de4443c4abd5 100644
--- a/tests/qemuxml2argvdata/q35-virt-manager-basic.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/q35-virt-manager-basic.x86_64-latest.args
@@ -53,6 +53,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-virt-manager-basic/.=
config \
 -device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":6710=
8864,"vram_size":67108864,"vram64_size_mb":0,"vgamem_mb":16,"bus":"pcie.0",=
"addr":"0x1"}' \
 -device '{"driver":"ich9-intel-hda","id":"sound0","bus":"pcie.0","addr":"0=
x1b"}' \
 -device '{"driver":"hda-duplex","id":"sound0-codec0","bus":"sound0.0","cad=
":0,"audiodev":"audio1"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -chardev spicevmc,id=3Dcharredir0,name=3Dusbredir \
 -device '{"driver":"usb-redir","chardev":"charredir0","id":"redir0","bus":=
"usb.0","port":"2"}' \
 -chardev spicevmc,id=3Dcharredir1,name=3Dusbredir \
diff --git a/tests/qemuxml2argvdata/q35.args b/tests/qemuxml2argvdata/q35.a=
rgs
index cd76c36cfac6..88d5455752c6 100644
--- a/tests/qemuxml2argvdata/q35.args
+++ b/tests/qemuxml2argvdata/q35.args
@@ -34,4 +34,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-q35-test/.config \
 -device ide-hd,bus=3Dide.0,drive=3Dlibvirt-1-format,id=3Dsata0-0-0,bootind=
ex=3D1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device qxl-vga,id=3Dvideo0,max_outputs=3D1,ram_size=3D67108864,vram_size=
=3D33554432,bus=3Dpcie.0,addr=3D0x1 \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/sgx-epc.x86_64-7.0.0.args b/tests/qemux=
ml2argvdata/sgx-epc.x86_64-7.0.0.args
index e5d29afabd9c..dc07d75bf14f 100644
--- a/tests/qemuxml2argvdata/sgx-epc.x86_64-7.0.0.args
+++ b/tests/qemuxml2argvdata/sgx-epc.x86_64-7.0.0.args
@@ -35,6 +35,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \
 -object '{"qom-type":"memory-backend-epc","id":"memepc0","prealloc":true,"=
size":67108864,"host-nodes":[0,1],"policy":"bind"}' \
 -object '{"qom-type":"memory-backend-epc","id":"memepc1","prealloc":true,"=
size":16777216,"host-nodes":[0,1],"policy":"bind"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.1","add=
r":"0x0"}' \
 -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/sgx-epc.xml b/tests/qemuxml2argvdata/sg=
x-epc.xml
index f6cbc67a5102..ba4cc560fd14 100644
--- a/tests/qemuxml2argvdata/sgx-epc.xml
+++ b/tests/qemuxml2argvdata/sgx-epc.xml
@@ -40,6 +40,7 @@
     <input type=3D'mouse' bus=3D'ps2'/>
     <input type=3D'keyboard' bus=3D'ps2'/>
     <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
     <memballoon model=3D'virtio'>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args b=
/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args
index 3371199be521..df40b2d28346 100644
--- a/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args
@@ -33,6 +33,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \
 -device '{"driver":"pcie-root-port","port":10,"chassis":3,"id":"pci.3","bu=
s":"pcie.0","addr":"0x1.0x2"}' \
 -device '{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.2","add=
r":"0x0"}' \
 -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/usb-controller-default-q35.args b/tests=
/qemuxml2argvdata/usb-controller-default-q35.args
index f891a3dc776e..a3819c7cf8ea 100644
--- a/tests/qemuxml2argvdata/usb-controller-default-q35.args
+++ b/tests/qemuxml2argvdata/usb-controller-default-q35.args
@@ -27,4 +27,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-q35-test/.config \
 -boot strict=3Don \
 -device piix3-usb-uhci,id=3Dusb,bus=3Dpcie.0,addr=3D0x1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/usb-controller-explicit-q35.args b/test=
s/qemuxml2argvdata/usb-controller-explicit-q35.args
index 5fb4553776bd..08c2939ce81b 100644
--- a/tests/qemuxml2argvdata/usb-controller-explicit-q35.args
+++ b/tests/qemuxml2argvdata/usb-controller-explicit-q35.args
@@ -27,4 +27,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-q35-test/.config \
 -boot strict=3Don \
 -device nec-usb-xhci,id=3Dusb,bus=3Dpcie.0,addr=3D0x1 \
 -audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/user-aliases2.x86_64-latest.args b/test=
s/qemuxml2argvdata/user-aliases2.x86_64-latest.args
index 7f34c7a96526..db55573402e1 100644
--- a/tests/qemuxml2argvdata/user-aliases2.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/user-aliases2.x86_64-latest.args
@@ -35,5 +35,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \
 -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"raw=
","file":"libvirt-1-storage"}' \
 -device '{"driver":"floppy","unit":0,"drive":"libvirt-1-format","id":"fdc0=
-0-0"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/vcpu-placement-static.args b/tests/qemu=
xml2argvdata/vcpu-placement-static.args
index f5b24e1875bb..3502b92d5d56 100644
--- a/tests/qemuxml2argvdata/vcpu-placement-static.args
+++ b/tests/qemuxml2argvdata/vcpu-placement-static.args
@@ -28,4 +28,6 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-dummy2/.config \
 -no-acpi \
 -boot strict=3Don \
 -audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/vcpu-placement-static.xml b/tests/qemux=
ml2argvdata/vcpu-placement-static.xml
index 47b70335e51d..3fd604d496d8 100644
--- a/tests/qemuxml2argvdata/vcpu-placement-static.xml
+++ b/tests/qemuxml2argvdata/vcpu-placement-static.xml
@@ -29,6 +29,7 @@
     <input type=3D'mouse' bus=3D'ps2'/>
     <input type=3D'keyboard' bus=3D'ps2'/>
     <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
     <memballoon model=3D'none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.a=
rgs b/tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.args
index 6ce2aa0b221b..1e65656f581f 100644
--- a/tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.args
@@ -37,5 +37,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \
 -chardev socket,id=3Dchr-vu-fs0,path=3D/tmp/lib/domain--1-guest/fs0-fs.soc=
k \
 -device '{"driver":"vhost-user-fs-pci","id":"fs0","chardev":"chr-vu-fs0","=
tag":"mount_tag","bootindex":2,"bus":"pci.1","addr":"0x0"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/vhost-user-fs-hugepages.xml b/tests/qem=
uxml2argvdata/vhost-user-fs-hugepages.xml
index 018611996d46..d319f2926e7a 100644
--- a/tests/qemuxml2argvdata/vhost-user-fs-hugepages.xml
+++ b/tests/qemuxml2argvdata/vhost-user-fs-hugepages.xml
@@ -72,6 +72,7 @@
     <input type=3D'mouse' bus=3D'ps2'/>
     <input type=3D'keyboard' bus=3D'ps2'/>
     <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
     <memballoon model=3D'none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2argvdata/virtio-iommu-x86_64.x86_64-latest.args =
b/tests/qemuxml2argvdata/virtio-iommu-x86_64.x86_64-latest.args
index 744367c6c099..3a115c87cdbe 100644
--- a/tests/qemuxml2argvdata/virtio-iommu-x86_64.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/virtio-iommu-x86_64.x86_64-latest.args
@@ -28,5 +28,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \
 -boot strict=3Don \
 -device '{"driver":"virtio-iommu","id":"iommu0","bus":"pcie.0","addr":"0x1=
"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.a=
rgs b/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args
index 2eafeca9f3a1..b7ffbd164c03 100644
--- a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args
@@ -47,6 +47,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \
 -netdev '{"type":"user","id":"hostnet0"}' \
 -device '{"driver":"virtio-net-pci-non-transitional","netdev":"hostnet0","=
id":"net0","mac":"00:11:22:33:44:55","bus":"pci.2","addr":"0x0"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -device '{"driver":"vhost-scsi-pci-non-transitional","wwpn":"naa.512345678=
9abcde0","vhostfd":"3","id":"hostdev0","bus":"pci.6","addr":"0x0"}' \
 -device '{"driver":"virtio-balloon-pci-non-transitional","id":"balloon0","=
bus":"pci.7","addr":"0x0"}' \
 -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"=
}' \
diff --git a/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args =
b/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args
index 3cf395952806..ef81180c4815 100644
--- a/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args
@@ -40,6 +40,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \
 -netdev '{"type":"user","id":"hostnet0"}' \
 -device '{"driver":"virtio-net-pci-transitional","netdev":"hostnet0","id":=
"net0","mac":"00:11:22:33:44:55","bus":"pci.2","addr":"0x2"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -device '{"driver":"vhost-scsi-pci-transitional","wwpn":"naa.5123456789abc=
de0","vhostfd":"3","id":"hostdev0","bus":"pci.2","addr":"0x6"}' \
 -device '{"driver":"virtio-balloon-pci-transitional","id":"balloon0","bus"=
:"pci.2","addr":"0x7"}' \
 -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"=
}' \
diff --git a/tests/qemuxml2argvdata/watchdog-q35-multiple.x86_64-latest.arg=
s b/tests/qemuxml2argvdata/watchdog-q35-multiple.x86_64-latest.args
index eccf5a2e119f..d85471cc7408 100644
--- a/tests/qemuxml2argvdata/watchdog-q35-multiple.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/watchdog-q35-multiple.x86_64-latest.args
@@ -34,6 +34,7 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -device '{"driver":"ib700","id":"watchdog0"}' \
 -device '{"driver":"i6300esb","id":"watchdog1","bus":"pci.2","addr":"0x2"}=
' \
+-global ICH9-LPC.noreboot=3Doff \
 -watchdog-action poweroff \
 -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-l=
atest.args b/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-l=
atest.args
index 0368ecc699e3..fa836c862748 100644
--- a/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-latest.a=
rgs
+++ b/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-latest.a=
rgs
@@ -35,6 +35,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \
 -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco=
w2","file":"libvirt-1-storage"}' \
 -device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x0","drive":"li=
bvirt-1-format","id":"virtio-disk0","bootindex":1}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.3","add=
r":"0x0"}' \
 -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-features.x86_64-=
latest.args b/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-features.x86_64=
-latest.args
index c9c71cf4e6b7..303931af2d98 100644
--- a/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-features.x86_64-latest.=
args
+++ b/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-features.x86_64-latest.=
args
@@ -31,6 +31,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \
 -device '{"driver":"pcie-root-port","port":10,"chassis":3,"id":"pci.3","bu=
s":"pcie.0","addr":"0x1.0x2"}' \
 -device '{"driver":"qemu-xhci","id":"usb","bus":"pci.1","addr":"0x0"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.2","add=
r":"0x0"}' \
 -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-features.xml b/t=
ests/qemuxml2argvdata/x86_64-default-cpu-tcg-features.xml
index 808e31752c79..d2364a7f4eea 100644
--- a/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-features.xml
+++ b/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-features.xml
@@ -49,6 +49,7 @@
     <input type=3D'mouse' bus=3D'ps2'/>
     <input type=3D'keyboard' bus=3D'ps2'/>
     <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
     <memballoon model=3D'virtio'>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x00' f=
unction=3D'0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-l=
atest.args b/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-l=
atest.args
index c2eb8066df3e..53588ddb84ba 100644
--- a/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-latest.a=
rgs
+++ b/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-latest.a=
rgs
@@ -35,6 +35,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \
 -blockdev '{"node-name":"libvirt-1-format","read-only":false,"driver":"qco=
w2","file":"libvirt-1-storage"}' \
 -device '{"driver":"virtio-blk-pci","bus":"pci.2","addr":"0x0","drive":"li=
bvirt-1-format","id":"virtio-disk0","bootindex":1}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.3","add=
r":"0x0"}' \
 -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource=
control=3Ddeny \
 -msg timestamp=3Don
diff --git a/tests/qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args =
b/tests/qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args
index db56a837632a..f4e2c4480227 100644
--- a/tests/qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args
@@ -50,6 +50,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \
 -audiodev '{"id":"audio1","driver":"none"}' \
 -vnc 127.0.0.1:0,audiodev=3Daudio1 \
 -device '{"driver":"qxl-vga","id":"video0","max_outputs":1,"ram_size":6710=
8864,"vram_size":67108864,"vram64_size_mb":0,"vgamem_mb":16,"bus":"pcie.0",=
"addr":"0x1"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.5","add=
r":"0x0"}' \
 -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"=
}' \
 -device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","bus":"pci=
.6","addr":"0x0"}' \
diff --git a/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args =
b/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args
index dde31179d364..f2ad2d210e95 100644
--- a/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args
@@ -48,6 +48,8 @@ XDG_CONFIG_HOME=3D/tmp/lib/domain--1-guest/.config \
 -chardev socket,id=3Dcharchannel0,fd=3D1729,server=3Don,wait=3Doff \
 -device '{"driver":"virtserialport","bus":"virtio-serial0.0","nr":1,"chard=
ev":"charchannel0","id":"channel0","name":"org.qemu.guest_agent.0"}' \
 -audiodev '{"id":"audio1","driver":"none"}' \
+-global ICH9-LPC.noreboot=3Doff \
+-watchdog-action reset \
 -device '{"driver":"virtio-balloon-pci","id":"balloon0","bus":"pci.5","add=
r":"0x0"}' \
 -object '{"qom-type":"rng-random","id":"objrng0","filename":"/dev/urandom"=
}' \
 -device '{"driver":"virtio-rng-pci","rng":"objrng0","id":"rng0","bus":"pci=
.6","addr":"0x0"}' \
diff --git a/tests/qemuxml2xmloutdata/autoindex.xml b/tests/qemuxml2xmloutd=
ata/autoindex.xml
index 8f622d56b219..54ad60e804c5 100644
--- a/tests/qemuxml2xmloutdata/autoindex.xml
+++ b/tests/qemuxml2xmloutdata/autoindex.xml
@@ -150,6 +150,7 @@
     <input type=3D'mouse' bus=3D'ps2'/>
     <input type=3D'keyboard' bus=3D'ps2'/>
     <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
     <memballoon model=3D'none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/firmware-auto-bios-stateless.x86_64-l=
atest.xml b/tests/qemuxml2xmloutdata/firmware-auto-bios-stateless.x86_64-la=
test.xml
index f1b5516ce487..7609ded09af9 100644
--- a/tests/qemuxml2xmloutdata/firmware-auto-bios-stateless.x86_64-latest.x=
ml
+++ b/tests/qemuxml2xmloutdata/firmware-auto-bios-stateless.x86_64-latest.x=
ml
@@ -29,6 +29,7 @@
     <input type=3D'mouse' bus=3D'ps2'/>
     <input type=3D'keyboard' bus=3D'ps2'/>
     <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
     <memballoon model=3D'none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/firmware-auto-bios.x86_64-latest.xml =
b/tests/qemuxml2xmloutdata/firmware-auto-bios.x86_64-latest.xml
index 722294089ea3..3c48ff19c69a 100644
--- a/tests/qemuxml2xmloutdata/firmware-auto-bios.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/firmware-auto-bios.x86_64-latest.xml
@@ -28,6 +28,7 @@
     <input type=3D'mouse' bus=3D'ps2'/>
     <input type=3D'keyboard' bus=3D'ps2'/>
     <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
     <memballoon model=3D'none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/firmware-auto-efi-enrolled-keys.x86_6=
4-latest.xml b/tests/qemuxml2xmloutdata/firmware-auto-efi-enrolled-keys.x86=
_64-latest.xml
index 8dcc741c1e1f..e411c0e614d3 100644
--- a/tests/qemuxml2xmloutdata/firmware-auto-efi-enrolled-keys.x86_64-lates=
t.xml
+++ b/tests/qemuxml2xmloutdata/firmware-auto-efi-enrolled-keys.x86_64-lates=
t.xml
@@ -32,6 +32,7 @@
     <input type=3D'mouse' bus=3D'ps2'/>
     <input type=3D'keyboard' bus=3D'ps2'/>
     <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
     <memballoon model=3D'none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/firmware-auto-efi-loader-secure.x86_6=
4-latest.xml b/tests/qemuxml2xmloutdata/firmware-auto-efi-loader-secure.x86=
_64-latest.xml
index 26e30d7f6428..3ba6ec2b862b 100644
--- a/tests/qemuxml2xmloutdata/firmware-auto-efi-loader-secure.x86_64-lates=
t.xml
+++ b/tests/qemuxml2xmloutdata/firmware-auto-efi-loader-secure.x86_64-lates=
t.xml
@@ -29,6 +29,7 @@
     <input type=3D'mouse' bus=3D'ps2'/>
     <input type=3D'keyboard' bus=3D'ps2'/>
     <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
     <memballoon model=3D'none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/firmware-auto-efi-no-enrolled-keys.x8=
6_64-latest.xml b/tests/qemuxml2xmloutdata/firmware-auto-efi-no-enrolled-ke=
ys.x86_64-latest.xml
index e5d307e0b236..58745a4b1a21 100644
--- a/tests/qemuxml2xmloutdata/firmware-auto-efi-no-enrolled-keys.x86_64-la=
test.xml
+++ b/tests/qemuxml2xmloutdata/firmware-auto-efi-no-enrolled-keys.x86_64-la=
test.xml
@@ -31,6 +31,7 @@
     <input type=3D'mouse' bus=3D'ps2'/>
     <input type=3D'keyboard' bus=3D'ps2'/>
     <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
     <memballoon model=3D'none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/firmware-auto-efi-no-secboot.x86_64-l=
atest.xml b/tests/qemuxml2xmloutdata/firmware-auto-efi-no-secboot.x86_64-la=
test.xml
index 1528ebcfe092..7625ef219aed 100644
--- a/tests/qemuxml2xmloutdata/firmware-auto-efi-no-secboot.x86_64-latest.x=
ml
+++ b/tests/qemuxml2xmloutdata/firmware-auto-efi-no-secboot.x86_64-latest.x=
ml
@@ -31,6 +31,7 @@
     <input type=3D'mouse' bus=3D'ps2'/>
     <input type=3D'keyboard' bus=3D'ps2'/>
     <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
     <memballoon model=3D'none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/firmware-auto-efi-nvram.x86_64-latest=
.xml b/tests/qemuxml2xmloutdata/firmware-auto-efi-nvram.x86_64-latest.xml
index abd6ec079de8..f6243bc43a28 100644
--- a/tests/qemuxml2xmloutdata/firmware-auto-efi-nvram.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/firmware-auto-efi-nvram.x86_64-latest.xml
@@ -29,6 +29,7 @@
     <input type=3D'mouse' bus=3D'ps2'/>
     <input type=3D'keyboard' bus=3D'ps2'/>
     <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
     <memballoon model=3D'none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/firmware-auto-efi-secboot.x86_64-late=
st.xml b/tests/qemuxml2xmloutdata/firmware-auto-efi-secboot.x86_64-latest.x=
ml
index ef24e04b615f..1c66ca23a147 100644
--- a/tests/qemuxml2xmloutdata/firmware-auto-efi-secboot.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/firmware-auto-efi-secboot.x86_64-latest.xml
@@ -31,6 +31,7 @@
     <input type=3D'mouse' bus=3D'ps2'/>
     <input type=3D'keyboard' bus=3D'ps2'/>
     <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
     <memballoon model=3D'none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/firmware-auto-efi.x86_64-latest.xml b=
/tests/qemuxml2xmloutdata/firmware-auto-efi.x86_64-latest.xml
index 7e2e40036ea0..b9b119fd2148 100644
--- a/tests/qemuxml2xmloutdata/firmware-auto-efi.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/firmware-auto-efi.x86_64-latest.xml
@@ -28,6 +28,7 @@
     <input type=3D'mouse' bus=3D'ps2'/>
     <input type=3D'keyboard' bus=3D'ps2'/>
     <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
     <memballoon model=3D'none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pcie.x86_64-l=
atest.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pcie.x86_64-la=
test.xml
index 032b4ce03046..5634afddd5b0 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pcie.x86_64-latest.x=
ml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pcie.x86_64-latest.x=
ml
@@ -39,6 +39,7 @@
       <source protocol=3D'vhost' wwpn=3D'naa.5123456789abcde0'/>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x01' slot=3D'0x00' f=
unction=3D'0x0'/>
     </hostdev>
+    <watchdog model=3D'itco' action=3D'reset'/>
     <memballoon model=3D'none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/hvf-x86_64-q35-headless.xml b/tests/q=
emuxml2xmloutdata/hvf-x86_64-q35-headless.xml
index fd2b376b9be5..d8b8422eaf12 100644
--- a/tests/qemuxml2xmloutdata/hvf-x86_64-q35-headless.xml
+++ b/tests/qemuxml2xmloutdata/hvf-x86_64-q35-headless.xml
@@ -86,6 +86,7 @@
     <input type=3D'mouse' bus=3D'ps2'/>
     <input type=3D'keyboard' bus=3D'ps2'/>
     <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
     <memballoon model=3D'virtio'>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x04' slot=3D'0x00' f=
unction=3D'0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/machine-smm-off.x86_64-latest.xml b/t=
ests/qemuxml2xmloutdata/machine-smm-off.x86_64-latest.xml
index 77b0b39750e4..29f295372490 100644
--- a/tests/qemuxml2xmloutdata/machine-smm-off.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/machine-smm-off.x86_64-latest.xml
@@ -28,6 +28,7 @@
     <input type=3D'mouse' bus=3D'ps2'/>
     <input type=3D'keyboard' bus=3D'ps2'/>
     <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
     <memballoon model=3D'none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/machine-smm-on.x86_64-latest.xml b/te=
sts/qemuxml2xmloutdata/machine-smm-on.x86_64-latest.xml
index 7c7df9e06d42..7a6948aa4642 100644
--- a/tests/qemuxml2xmloutdata/machine-smm-on.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/machine-smm-on.x86_64-latest.xml
@@ -28,6 +28,7 @@
     <input type=3D'mouse' bus=3D'ps2'/>
     <input type=3D'keyboard' bus=3D'ps2'/>
     <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
     <memballoon model=3D'none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/net-isolated-port.x86_64-latest.xml b=
/tests/qemuxml2xmloutdata/net-isolated-port.x86_64-latest.xml
index b2eb8516b80c..c3dca579a659 100644
--- a/tests/qemuxml2xmloutdata/net-isolated-port.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/net-isolated-port.x86_64-latest.xml
@@ -59,6 +59,7 @@
       <model type=3D'qxl' ram=3D'65536' vram=3D'32768' vgamem=3D'8192' hea=
ds=3D'1' primary=3D'yes'/>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0'/>
     </video>
+    <watchdog model=3D'itco' action=3D'reset'/>
     <memballoon model=3D'none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/pcie-expander-bus.xml b/tests/qemuxml=
2xmloutdata/pcie-expander-bus.xml
index 45b03a1fb890..bb614096c4f9 100644
--- a/tests/qemuxml2xmloutdata/pcie-expander-bus.xml
+++ b/tests/qemuxml2xmloutdata/pcie-expander-bus.xml
@@ -370,6 +370,7 @@
     <input type=3D'mouse' bus=3D'ps2'/>
     <input type=3D'keyboard' bus=3D'ps2'/>
     <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
     <memballoon model=3D'none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/pcie-root-port-model-generic.xml b/te=
sts/qemuxml2xmloutdata/pcie-root-port-model-generic.xml
index 1e787378d1c9..1d287541cc13 100644
--- a/tests/qemuxml2xmloutdata/pcie-root-port-model-generic.xml
+++ b/tests/qemuxml2xmloutdata/pcie-root-port-model-generic.xml
@@ -36,6 +36,7 @@
     <input type=3D'mouse' bus=3D'ps2'/>
     <input type=3D'keyboard' bus=3D'ps2'/>
     <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
     <memballoon model=3D'none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/pcie-root-port-model-ioh3420.xml b/te=
sts/qemuxml2xmloutdata/pcie-root-port-model-ioh3420.xml
index 9382155e7183..efa33990defe 100644
--- a/tests/qemuxml2xmloutdata/pcie-root-port-model-ioh3420.xml
+++ b/tests/qemuxml2xmloutdata/pcie-root-port-model-ioh3420.xml
@@ -31,6 +31,7 @@
     <input type=3D'mouse' bus=3D'ps2'/>
     <input type=3D'keyboard' bus=3D'ps2'/>
     <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
     <memballoon model=3D'none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/pcie-root-port-nohotplug.x86_64-lates=
t.xml b/tests/qemuxml2xmloutdata/pcie-root-port-nohotplug.x86_64-latest.xml
index 83ae6c91ae93..202003c59a99 100644
--- a/tests/qemuxml2xmloutdata/pcie-root-port-nohotplug.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/pcie-root-port-nohotplug.x86_64-latest.xml
@@ -66,6 +66,7 @@
     <input type=3D'mouse' bus=3D'ps2'/>
     <input type=3D'keyboard' bus=3D'ps2'/>
     <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
     <memballoon model=3D'none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/pcie-root-port.xml b/tests/qemuxml2xm=
loutdata/pcie-root-port.xml
index 45ab6c308012..cb435930320c 100644
--- a/tests/qemuxml2xmloutdata/pcie-root-port.xml
+++ b/tests/qemuxml2xmloutdata/pcie-root-port.xml
@@ -41,6 +41,7 @@
       <model type=3D'qxl' ram=3D'65536' vram=3D'32768' vgamem=3D'8192' hea=
ds=3D'1' primary=3D'yes'/>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0'/>
     </video>
+    <watchdog model=3D'itco' action=3D'reset'/>
     <memballoon model=3D'none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/pcie-root.xml b/tests/qemuxml2xmloutd=
ata/pcie-root.xml
index a17790294701..b0140244fd44 100644
--- a/tests/qemuxml2xmloutdata/pcie-root.xml
+++ b/tests/qemuxml2xmloutdata/pcie-root.xml
@@ -21,6 +21,7 @@
     <input type=3D'mouse' bus=3D'ps2'/>
     <input type=3D'keyboard' bus=3D'ps2'/>
     <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
     <memballoon model=3D'none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/pcie-switch-downstream-port.xml b/tes=
ts/qemuxml2xmloutdata/pcie-switch-downstream-port.xml
index ba63acfe16e8..7902511ef359 100644
--- a/tests/qemuxml2xmloutdata/pcie-switch-downstream-port.xml
+++ b/tests/qemuxml2xmloutdata/pcie-switch-downstream-port.xml
@@ -79,6 +79,7 @@
       <model type=3D'qxl' ram=3D'65536' vram=3D'32768' vgamem=3D'8192' hea=
ds=3D'1' primary=3D'yes'/>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0'/>
     </video>
+    <watchdog model=3D'itco' action=3D'reset'/>
     <memballoon model=3D'none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/pcie-switch-upstream-port.xml b/tests=
/qemuxml2xmloutdata/pcie-switch-upstream-port.xml
index 298db1df5ecc..d0d9d2a5749b 100644
--- a/tests/qemuxml2xmloutdata/pcie-switch-upstream-port.xml
+++ b/tests/qemuxml2xmloutdata/pcie-switch-upstream-port.xml
@@ -49,6 +49,7 @@
       <model type=3D'qxl' ram=3D'65536' vram=3D'32768' vgamem=3D'8192' hea=
ds=3D'1' primary=3D'yes'/>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0'/>
     </video>
+    <watchdog model=3D'itco' action=3D'reset'/>
     <memballoon model=3D'none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/pcihole64-q35.xml b/tests/qemuxml2xml=
outdata/pcihole64-q35.xml
index 5c3947f7f818..b47c5243a27d 100644
--- a/tests/qemuxml2xmloutdata/pcihole64-q35.xml
+++ b/tests/qemuxml2xmloutdata/pcihole64-q35.xml
@@ -33,6 +33,7 @@
       <model type=3D'qxl' ram=3D'65536' vram=3D'32768' vgamem=3D'8192' hea=
ds=3D'1' primary=3D'yes'/>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0'/>
     </video>
+    <watchdog model=3D'itco' action=3D'reset'/>
     <memballoon model=3D'none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/q35-default-devices-only.x86_64-lates=
t.xml b/tests/qemuxml2xmloutdata/q35-default-devices-only.x86_64-latest.xml
index 5540ad11475c..8cb03dcc050e 100644
--- a/tests/qemuxml2xmloutdata/q35-default-devices-only.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/q35-default-devices-only.x86_64-latest.xml
@@ -42,6 +42,7 @@
     <input type=3D'mouse' bus=3D'ps2'/>
     <input type=3D'keyboard' bus=3D'ps2'/>
     <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
     <memballoon model=3D'virtio'>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x00' f=
unction=3D'0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/q35-multifunction.x86_64-latest.xml b=
/tests/qemuxml2xmloutdata/q35-multifunction.x86_64-latest.xml
index e8ea62321a19..10d839dfc9e3 100644
--- a/tests/qemuxml2xmloutdata/q35-multifunction.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/q35-multifunction.x86_64-latest.xml
@@ -117,6 +117,7 @@
     <input type=3D'mouse' bus=3D'ps2'/>
     <input type=3D'keyboard' bus=3D'ps2'/>
     <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
     <memballoon model=3D'virtio'>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x00' f=
unction=3D'0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/q35-pci-force-address.xml b/tests/qem=
uxml2xmloutdata/q35-pci-force-address.xml
index 45df55365e0f..7490e7095a12 100644
--- a/tests/qemuxml2xmloutdata/q35-pci-force-address.xml
+++ b/tests/qemuxml2xmloutdata/q35-pci-force-address.xml
@@ -44,6 +44,7 @@
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x03' slot=3D'0x00' f=
unction=3D'0x0'/>
     </sound>
     <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
     <memballoon model=3D'none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/q35-pcie-autoadd.x86_64-latest.xml b/=
tests/qemuxml2xmloutdata/q35-pcie-autoadd.x86_64-latest.xml
index 30379023543c..c92408d95c4e 100644
--- a/tests/qemuxml2xmloutdata/q35-pcie-autoadd.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/q35-pcie-autoadd.x86_64-latest.xml
@@ -141,6 +141,7 @@
       <model type=3D'virtio' heads=3D'1' primary=3D'yes'/>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0'/>
     </video>
+    <watchdog model=3D'itco' action=3D'reset'/>
     <memballoon model=3D'virtio'>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x08' slot=3D'0x00' f=
unction=3D'0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/q35-pcie.x86_64-latest.xml b/tests/qe=
muxml2xmloutdata/q35-pcie.x86_64-latest.xml
index 72535446f617..0a36e78e02ce 100644
--- a/tests/qemuxml2xmloutdata/q35-pcie.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/q35-pcie.x86_64-latest.xml
@@ -145,6 +145,7 @@
       <model type=3D'virtio' heads=3D'1' primary=3D'yes'/>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0'/>
     </video>
+    <watchdog model=3D'itco' action=3D'reset'/>
     <memballoon model=3D'virtio'>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x0a' slot=3D'0x00' f=
unction=3D'0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/q35-usb2-multi.xml b/tests/qemuxml2xm=
loutdata/q35-usb2-multi.xml
index aadba4102384..019a4d2765e9 100644
--- a/tests/qemuxml2xmloutdata/q35-usb2-multi.xml
+++ b/tests/qemuxml2xmloutdata/q35-usb2-multi.xml
@@ -85,6 +85,7 @@
       <model type=3D'qxl' ram=3D'65536' vram=3D'32768' vgamem=3D'8192' hea=
ds=3D'1' primary=3D'yes'/>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0'/>
     </video>
+    <watchdog model=3D'itco' action=3D'reset'/>
     <memballoon model=3D'none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/q35-usb2-reorder.xml b/tests/qemuxml2=
xmloutdata/q35-usb2-reorder.xml
index 92f07cade50c..2a9342c4d66f 100644
--- a/tests/qemuxml2xmloutdata/q35-usb2-reorder.xml
+++ b/tests/qemuxml2xmloutdata/q35-usb2-reorder.xml
@@ -85,6 +85,7 @@
       <model type=3D'qxl' ram=3D'65536' vram=3D'32768' vgamem=3D'8192' hea=
ds=3D'1' primary=3D'yes'/>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0'/>
     </video>
+    <watchdog model=3D'itco' action=3D'reset'/>
     <memballoon model=3D'none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/q35-usb2.xml b/tests/qemuxml2xmloutda=
ta/q35-usb2.xml
index f5e6442008ee..9e0c3da06344 100644
--- a/tests/qemuxml2xmloutdata/q35-usb2.xml
+++ b/tests/qemuxml2xmloutdata/q35-usb2.xml
@@ -55,6 +55,7 @@
       <model type=3D'qxl' ram=3D'65536' vram=3D'32768' vgamem=3D'8192' hea=
ds=3D'1' primary=3D'yes'/>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0'/>
     </video>
+    <watchdog model=3D'itco' action=3D'reset'/>
     <memballoon model=3D'none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/q35-virt-manager-basic.x86_64-latest.=
xml b/tests/qemuxml2xmloutdata/q35-virt-manager-basic.x86_64-latest.xml
index 62289d48009d..5bb00ceb3823 100644
--- a/tests/qemuxml2xmloutdata/q35-virt-manager-basic.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/q35-virt-manager-basic.x86_64-latest.xml
@@ -120,6 +120,7 @@
     <redirdev bus=3D'usb' type=3D'spicevmc'>
       <address type=3D'usb' bus=3D'0' port=3D'3'/>
     </redirdev>
+    <watchdog model=3D'itco' action=3D'reset'/>
     <memballoon model=3D'virtio'>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x05' slot=3D'0x00' f=
unction=3D'0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/q35.xml b/tests/qemuxml2xmloutdata/q3=
5.xml
index 3a37173da2e3..c7f0e19deb20 100644
--- a/tests/qemuxml2xmloutdata/q35.xml
+++ b/tests/qemuxml2xmloutdata/q35.xml
@@ -46,6 +46,7 @@
       <model type=3D'qxl' ram=3D'65536' vram=3D'32768' vgamem=3D'8192' hea=
ds=3D'1' primary=3D'yes'/>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0'/>
     </video>
+    <watchdog model=3D'itco' action=3D'reset'/>
     <memballoon model=3D'none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/tseg-explicit-size.x86_64-latest.xml =
b/tests/qemuxml2xmloutdata/tseg-explicit-size.x86_64-latest.xml
index 78ffe820cfa1..d0bb47cda8f4 100644
--- a/tests/qemuxml2xmloutdata/tseg-explicit-size.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/tseg-explicit-size.x86_64-latest.xml
@@ -47,6 +47,7 @@
     <input type=3D'mouse' bus=3D'ps2'/>
     <input type=3D'keyboard' bus=3D'ps2'/>
     <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
     <memballoon model=3D'virtio'>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x00' f=
unction=3D'0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/usb-controller-default-q35.xml b/test=
s/qemuxml2xmloutdata/usb-controller-default-q35.xml
index 2122d7ecd9ae..4b307f3b7b34 100644
--- a/tests/qemuxml2xmloutdata/usb-controller-default-q35.xml
+++ b/tests/qemuxml2xmloutdata/usb-controller-default-q35.xml
@@ -24,6 +24,7 @@
     <input type=3D'mouse' bus=3D'ps2'/>
     <input type=3D'keyboard' bus=3D'ps2'/>
     <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
     <memballoon model=3D'none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/usb-controller-explicit-q35.xml b/tes=
ts/qemuxml2xmloutdata/usb-controller-explicit-q35.xml
index 328bcaee9c6e..a64ff769df70 100644
--- a/tests/qemuxml2xmloutdata/usb-controller-explicit-q35.xml
+++ b/tests/qemuxml2xmloutdata/usb-controller-explicit-q35.xml
@@ -24,6 +24,7 @@
     <input type=3D'mouse' bus=3D'ps2'/>
     <input type=3D'keyboard' bus=3D'ps2'/>
     <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
     <memballoon model=3D'none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/virtio-iommu-x86_64.x86_64-latest.xml=
 b/tests/qemuxml2xmloutdata/virtio-iommu-x86_64.x86_64-latest.xml
index ad3a702b0ba5..f458f9a706d4 100644
--- a/tests/qemuxml2xmloutdata/virtio-iommu-x86_64.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/virtio-iommu-x86_64.x86_64-latest.xml
@@ -28,6 +28,7 @@
     <input type=3D'mouse' bus=3D'ps2'/>
     <input type=3D'keyboard' bus=3D'ps2'/>
     <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
     <memballoon model=3D'none'/>
     <iommu model=3D'virtio'>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0'/>
diff --git a/tests/qemuxml2xmloutdata/virtio-non-transitional.x86_64-latest=
.xml b/tests/qemuxml2xmloutdata/virtio-non-transitional.x86_64-latest.xml
index 26f6c6d34e63..1045fe8fc0a1 100644
--- a/tests/qemuxml2xmloutdata/virtio-non-transitional.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/virtio-non-transitional.x86_64-latest.xml
@@ -101,6 +101,7 @@
       <source protocol=3D'vhost' wwpn=3D'naa.5123456789abcde0'/>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x06' slot=3D'0x00' f=
unction=3D'0x0'/>
     </hostdev>
+    <watchdog model=3D'itco' action=3D'reset'/>
     <memballoon model=3D'virtio-non-transitional'>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x07' slot=3D'0x00' f=
unction=3D'0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/virtio-transitional.x86_64-latest.xml=
 b/tests/qemuxml2xmloutdata/virtio-transitional.x86_64-latest.xml
index 8e9ecd8cf34e..0b32684ba8c7 100644
--- a/tests/qemuxml2xmloutdata/virtio-transitional.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/virtio-transitional.x86_64-latest.xml
@@ -65,6 +65,7 @@
       <source protocol=3D'vhost' wwpn=3D'naa.5123456789abcde0'/>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x06' f=
unction=3D'0x0'/>
     </hostdev>
+    <watchdog model=3D'itco' action=3D'reset'/>
     <memballoon model=3D'virtio-transitional'>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x07' f=
unction=3D'0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/watchdog-q35-multiple.x86_64-latest.x=
ml b/tests/qemuxml2xmloutdata/watchdog-q35-multiple.x86_64-latest.xml
index e507576085f7..7e60c6e6517d 100644
--- a/tests/qemuxml2xmloutdata/watchdog-q35-multiple.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/watchdog-q35-multiple.x86_64-latest.xml
@@ -45,6 +45,7 @@
     <watchdog model=3D'i6300esb' action=3D'poweroff'>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x02' slot=3D'0x02' f=
unction=3D'0x0'/>
     </watchdog>
+    <watchdog model=3D'itco' action=3D'poweroff'/>
     <memballoon model=3D'none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/x86_64-default-cpu-kvm-q35-4.2.x86_64=
-latest.xml b/tests/qemuxml2xmloutdata/x86_64-default-cpu-kvm-q35-4.2.x86_6=
4-latest.xml
index 61b9077597da..bf9010ec5770 100644
--- a/tests/qemuxml2xmloutdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-latest=
.xml
+++ b/tests/qemuxml2xmloutdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-latest=
.xml
@@ -57,6 +57,7 @@
     <input type=3D'mouse' bus=3D'ps2'/>
     <input type=3D'keyboard' bus=3D'ps2'/>
     <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
     <memballoon model=3D'virtio'>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x03' slot=3D'0x00' f=
unction=3D'0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/x86_64-default-cpu-tcg-q35-4.2.x86_64=
-latest.xml b/tests/qemuxml2xmloutdata/x86_64-default-cpu-tcg-q35-4.2.x86_6=
4-latest.xml
index 04335f6244e3..a0c1563fbdb1 100644
--- a/tests/qemuxml2xmloutdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-latest=
.xml
+++ b/tests/qemuxml2xmloutdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-latest=
.xml
@@ -57,6 +57,7 @@
     <input type=3D'mouse' bus=3D'ps2'/>
     <input type=3D'keyboard' bus=3D'ps2'/>
     <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
     <memballoon model=3D'virtio'>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x03' slot=3D'0x00' f=
unction=3D'0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/x86_64-q35-graphics.x86_64-latest.xml=
 b/tests/qemuxml2xmloutdata/x86_64-q35-graphics.x86_64-latest.xml
index 02485adb9868..4273cd4b6cfc 100644
--- a/tests/qemuxml2xmloutdata/x86_64-q35-graphics.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/x86_64-q35-graphics.x86_64-latest.xml
@@ -113,6 +113,7 @@
       <model type=3D'qxl' ram=3D'65536' vram=3D'65536' vgamem=3D'16384' he=
ads=3D'1' primary=3D'yes'/>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x00' slot=3D'0x01' f=
unction=3D'0x0'/>
     </video>
+    <watchdog model=3D'itco' action=3D'reset'/>
     <memballoon model=3D'virtio'>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x05' slot=3D'0x00' f=
unction=3D'0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/x86_64-q35-headless.x86_64-latest.xml=
 b/tests/qemuxml2xmloutdata/x86_64-q35-headless.x86_64-latest.xml
index 0eedb748dd13..b3976a85fdf4 100644
--- a/tests/qemuxml2xmloutdata/x86_64-q35-headless.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/x86_64-q35-headless.x86_64-latest.xml
@@ -105,6 +105,7 @@
     <input type=3D'mouse' bus=3D'ps2'/>
     <input type=3D'keyboard' bus=3D'ps2'/>
     <audio id=3D'1' type=3D'none'/>
+    <watchdog model=3D'itco' action=3D'reset'/>
     <memballoon model=3D'virtio'>
       <address type=3D'pci' domain=3D'0x0000' bus=3D'0x05' slot=3D'0x00' f=
unction=3D'0x0'/>
     </memballoon>
--=20
2.39.1