From nobody Sat Nov 23 02:36:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1681913293; cv=none; d=zohomail.com; s=zohoarc; b=NeUQAd7ugYUUAcwWB0DBJw+xVrQEAikHs6D/mOoayUlbma4fR64irtyXOvtdT7OUy277EW6YaN5TFmqsMcwYG4g54a+SyOo4qiI5fUqHpCs7P9ZSVtCNN9FHbdp2prxokteDf26NoOnmszpLerVZ7rNKh0gL3Yaa/MW/6lTY5gk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1681913293; 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=x63ejPo5eEV/LFwBYNB8PUp1QKUkYvvsx6eVCDTVym8=; b=RkK3H+EJaQPhX0kJZFKd6RIZlahx2hHiSA+YqcQ2FMRO+LTZOgaAacIStcVQHaV8LcDojVf2iPWmVZQorQBxFiynhHnI79Y4cEYipEP/dK2j87tq9VWe0Okn6etok6at/QWxufb+F9u1J0O7LeppjiZzP+Dn4ZLgoIS3aRYI5s8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1681913293334985.3901089158325; Wed, 19 Apr 2023 07:08:13 -0700 (PDT) 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-627-xIfvzC7FP0OYGMHozuHpWw-1; Wed, 19 Apr 2023 10:08:06 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B49731C0896E; Wed, 19 Apr 2023 14:08:01 +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 A0F01637A2; Wed, 19 Apr 2023 14:08:01 +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 68C4E19465B1; Wed, 19 Apr 2023 14:08:01 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 85DC019465A0 for ; Wed, 19 Apr 2023 14:07:21 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 68A642166B34; Wed, 19 Apr 2023 14:07:21 +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 614422166B33 for ; Wed, 19 Apr 2023 14:07:21 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.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 426E43C10230 for ; Wed, 19 Apr 2023 14:07:21 +0000 (UTC) Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-413-bCTTV5HcMaKEEQ0Hx_XWLA-1; Wed, 19 Apr 2023 10:07:20 -0400 Received: by mail-pf1-f199.google.com with SMTP id d2e1a72fcca58-63b5cc55538so2136058b3a.1 for ; Wed, 19 Apr 2023 07:07:19 -0700 (PDT) Received: from wheatley.localdomain (nat-pool-brq-u.redhat.com. [213.175.37.12]) by smtp.gmail.com with ESMTPSA id k5-20020a170902e90500b001a64a335e42sm11498584pld.160.2023.04.19.07.07.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Apr 2023 07:07:18 -0700 (PDT) Received: from wheatley.. (wheatley.k8r.cz [127.0.0.1]) by wheatley.localdomain (Postfix) with ESMTP id AB718FB3864B for ; Wed, 19 Apr 2023 16:07:13 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1681913292; 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=x63ejPo5eEV/LFwBYNB8PUp1QKUkYvvsx6eVCDTVym8=; b=MYzPVLC4UBeeeEQVbWufhgOSbLz3XYtWBh5eYfWS6zlOflzP+zQEcV36QiZKw6XBQqTJ7r apm9rvYKUqkPwD2sJx0G8c7syA3OWXG2T32qbJFgTZj3uh1yJE32/HUkP3pXbP4GiH9Np3 xsikky34ljMdx6jl1k5LmXKicSuTLHI= X-MC-Unique: xIfvzC7FP0OYGMHozuHpWw-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: bCTTV5HcMaKEEQ0Hx_XWLA-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681913239; x=1684505239; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=x63ejPo5eEV/LFwBYNB8PUp1QKUkYvvsx6eVCDTVym8=; b=cuQRog05W2h66IsxZ9QvHI8NK203AvSLsqrK4DFeSqQ2U9gAj7TaVztDOU+dz6Wavg eD3r3pdg9OxyRi5aIGA8ZAW/m5rRikbIbiqdMR/FWRuzJyRgTUDNJL25S3Wj8baY8AmL fURwPDYFom1Wvn/OxBtHUmwuWJlqtP1iTQa0mmdmErXT1kYJmxYnyon+i3iX36h1Q1yr HM5ExLMdbiiolZa9VrtIo1U9zEc6ogN7pVMq41j6mZ4bO1ytQ3EiMOGR6g+h5nDIWnam 7vNRuOPKHiUK08gdiXbMHdgabanxftNWT+pkRhFGQFhYKqaNk0MnzBLIS3UteXA6r+JO t5Dw== X-Gm-Message-State: AAQBX9fDellBmAODxfuC2yAlKgGleBOCO41cHA0hnuHqm2uPGSJW/7XY feMFM7Whc8ixDxxchb2RL8YWsUlKKecXFCGns9WUsKk6MccrgyBKqi73WHWZ7HK4ivg3KM1GgWq kpOvHsBQysuwriowZgsurqNCZ/vyxGDv0Vf7CRrH+5yphy4dAW8TQ1/257qbXdk9w5ve9KtRZNs 53rq7baw== X-Received: by 2002:a17:902:fb86:b0:1a5:f36:ae09 with SMTP id lg6-20020a170902fb8600b001a50f36ae09mr4678954plb.7.1681913239014; Wed, 19 Apr 2023 07:07:19 -0700 (PDT) X-Google-Smtp-Source: AKy350ZGzdRKxO9zaE5ekqU80kghw6Jt67HGVil4PhuC9b/b3Ax/HnU/II+CvkuDsoGfeN6L9DgIrw== X-Received: by 2002:a17:902:fb86:b0:1a5:f36:ae09 with SMTP id lg6-20020a170902fb8600b001a50f36ae09mr4678935plb.7.1681913238579; Wed, 19 Apr 2023 07:07:18 -0700 (PDT) From: Martin Kletzander To: libvir-list@redhat.com Subject: [PATCH 1/7] conf: Add missing empty lines before virDomainWatchdogDefParseXML Date: Wed, 19 Apr 2023 16:07:04 +0200 Message-Id: <1f4c72316a53a9fcc1b60ef013edf8498867b10d.1681913144.git.mkletzan@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 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: 1681913294289100003 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Martin Kletzander Reviewed-by: J=C3=A1n Tomko Reviewed-by: Michal Privoznik --- src/conf/domain_conf.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b03a3ff011b4..5c0b837697a0 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -12058,6 +12058,8 @@ virDomainAudioDefParseXML(virDomainXMLOption *xmlop= t G_GNUC_UNUSED, virDomainAudioDefFree(def); return NULL; } + + static virDomainWatchdogDef * virDomainWatchdogDefParseXML(virDomainXMLOption *xmlopt, xmlNodePtr node, --=20 2.40.0 From nobody Sat Nov 23 02:36:47 2024 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=1681913456; cv=none; d=zohomail.com; s=zohoarc; b=XCVNL7ZKxvSRutO1SnfgdzM0lMSUOvTusODwA74NeaTEOVwyYfm5vtu+EVOnJZeQmhoOVcmLYNkd4LgB+7AuihJ/pjwE5rbF1n/6W/Yvjfy88x15gkbHOhPu4g4GyG71z28FFPY0lCoRxqxnmUySLsMvd7ljaXNXq5Dw0D23OzI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1681913456; 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=qZUs+ysfGK55PpFl0wW920rt5dCzI52o9RjzpKHYU1A=; b=WnMJvUX0bu7nx7kf3ng4wMNh1hXfJwsR8T0YUlixzpHzYaM04QjnrwcyllstybUZMsME6tlTeLhLpswrkiwngxeIFzzRnUn1PLSkX+KMhLRxyjr5E9SMqJdf+IbHKaqafz8kQXHJ67ntw8IuP+v+0SG1XsCI6G7esWrCThS3tFc= 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= (p=none dis=none) Return-Path: 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 168191345624463.321411696792325; Wed, 19 Apr 2023 07:10:56 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-14-GYBxPxx4N4SiGud5ag766Q-1; Wed, 19 Apr 2023 10:10:50 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 82526185A794; Wed, 19 Apr 2023 14:10:46 +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 4A4022026D16; Wed, 19 Apr 2023 14:10:46 +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 265A319465B2; Wed, 19 Apr 2023 14:10:46 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 672BB19465B2 for ; Wed, 19 Apr 2023 14:07:22 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 4A263492B04; Wed, 19 Apr 2023 14:07:22 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast03.extmail.prod.ext.rdu2.redhat.com [10.11.55.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4320F492B05 for ; Wed, 19 Apr 2023 14:07:22 +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 288CE87A387 for ; Wed, 19 Apr 2023 14:07:22 +0000 (UTC) Received: from mail-pg1-f198.google.com (mail-pg1-f198.google.com [209.85.215.198]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-424-86DqIwAxPICiGlw1sw4AQg-1; Wed, 19 Apr 2023 10:07:20 -0400 Received: by mail-pg1-f198.google.com with SMTP id 41be03b00d2f7-51b121871ecso1760052a12.3 for ; Wed, 19 Apr 2023 07:07:20 -0700 (PDT) Received: from wheatley.localdomain (nat-pool-brq-u.redhat.com. [213.175.37.12]) by smtp.gmail.com with ESMTPSA id m17-20020a17090b069100b0023f685f7914sm1441714pjz.49.2023.04.19.07.07.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Apr 2023 07:07:18 -0700 (PDT) Received: from wheatley.. (wheatley.k8r.cz [127.0.0.1]) by wheatley.localdomain (Postfix) with ESMTP id B7482FB3864C for ; Wed, 19 Apr 2023 16:07:13 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1681913455; 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=qZUs+ysfGK55PpFl0wW920rt5dCzI52o9RjzpKHYU1A=; b=Rnwa/+UQRK7jQWzZiz5XChT6DTGIoqrSle1eYedSDBimrjfc44o9zxMv7XLZt7dkx4zdtP sPaFzTIcprrOm3GwDCH4hii2dABlcvTko85uTheUj4Rj+gHdgO4r2fbGVg5LLQO0Iawvy2 YYUKZzpRVqTbcMPss5W62h4D7pgepGk= X-MC-Unique: GYBxPxx4N4SiGud5ag766Q-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: 86DqIwAxPICiGlw1sw4AQg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681913239; x=1684505239; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qZUs+ysfGK55PpFl0wW920rt5dCzI52o9RjzpKHYU1A=; b=cXHIKfcuF1oQv8xjG05sBx6xOiwoZsOIQAjx14Ue2rKRyB12yqRxYSMcQWAAiI3QbA o7ED6LaUsW6RgutjOFqEVaMp+d9TJuwmsLMvKB3Bvp6wcMClCJGoTKjaWUpNTINWItDt avGfkbpp2FP011WLCkRAQIb6B/vniOjIQ86soxG8pzo73WN2Hm5czLsJBUrj5lV3SBWy isBvGpcQea0gx56ZXHGNHguM93pl4aX1bTiJS3LV/aohdgiEWebP1IhQbXVSwh/EkDqB BebVjTG+1+r+ORXCjKEi4uWNU7gIsQVGHTL3OmJi+44YHKbPbh7BQeZZakeQ4n2JPSqe A1Yg== X-Gm-Message-State: AAQBX9fIzo0VPO+l2ugUZOi1b9jw7VI9+rOi4TyzHJ5Es4KcL7RC85Sh OV56dBXXDW17G5obmUWM9Ql12rxX4XfvexL7lHu1nqoioNt7itiRatHNl/QYsLc4zzupEbhv8FI l1Jz4mhpVznsEWWsajRtGjW2t7nEyt5DKdG6cmNWFJBEA9zOjDmL/N0FkoB8Ye0Lj4FExZrqdR8 11fgQWmA== X-Received: by 2002:a17:90b:392:b0:247:601c:20fa with SMTP id ga18-20020a17090b039200b00247601c20famr3070583pjb.5.1681913239478; Wed, 19 Apr 2023 07:07:19 -0700 (PDT) X-Google-Smtp-Source: AKy350boV/+syYi6WM9I8e8OY3GnuIVo1CNGC6M+LD0xJVtORfGUBUbPgY3sizoXq9Kb7e7XEA/RZw== X-Received: by 2002:a17:90b:392:b0:247:601c:20fa with SMTP id ga18-20020a17090b039200b00247601c20famr3070563pjb.5.1681913239155; Wed, 19 Apr 2023 07:07:19 -0700 (PDT) From: Martin Kletzander To: libvir-list@redhat.com Subject: [PATCH 2/7] qemu: Fix grammar and quoting in watchdog error message on hotplug Date: Wed, 19 Apr 2023 16:07:05 +0200 Message-Id: <329568793f6a7e1abf5c5e111b4e16eb1f3d3b18.1681913144.git.mkletzan@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 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: 1681913457809100003 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Martin Kletzander Reviewed-by: Michal Privoznik --- src/qemu/qemu_hotplug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 5072798cb73d..53a0874556a1 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -2929,7 +2929,7 @@ qemuDomainAttachWatchdog(virDomainObj *vm, =20 if (watchdog->model !=3D VIR_DOMAIN_WATCHDOG_MODEL_I6300ESB) { virReportError(VIR_ERR_OPERATION_UNSUPPORTED, - _("hotplug of watchdog of model %1$s is not support= ed"), + _("hotplug of watchdog model '%1$s' is not supporte= d"), virDomainWatchdogModelTypeToString(watchdog->model)= ); goto cleanup; } --=20 2.40.0 From nobody Sat Nov 23 02:36:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1681913455; cv=none; d=zohomail.com; s=zohoarc; b=BuVcSlhk2rJ4Xdl1AJvTZW1njkIXohhDpq5SIn0W++g1p0/DU9Ss8OCAEZ5YsSmwnudsTbcNjpff7/RYojgkZOKhNcpXH/6khZVlJrzvVueswlYcCgb9kpUmEw1spOkhkQVM6UwrduJqe8MLQ7Yl7ifOWXiN9bEYaoUJ6mrxv64= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1681913455; 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=ba1iiy/WYLSfJC3/MPMc3KfxLLWCaxdBd6lofvdb2o4=; b=l4Jnf4T6hxqOJOGofet+9ySoHnCtNr74gXX7IqqFg8RGVhD6amjU+ZP5ORr5d3v87SyESdABnihFBLGDGgmohVWR30cq6iJLwPBi0xgJKuYU0+epvjRCzyVeY3JfcYd0kMJE3Di/C3d0FbxzOSNWfYY95WVpH+J9HTrykIaSW8I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 168191345545963.94626334183761; Wed, 19 Apr 2023 07:10:55 -0700 (PDT) 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-211-RE7EDzyCNpucvfQEkfGqRg-1; Wed, 19 Apr 2023 10:10:51 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1703629AA3BF; Wed, 19 Apr 2023 14:10:48 +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 F2F962026D3C; Wed, 19 Apr 2023 14:10:47 +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 DC32819465B1; Wed, 19 Apr 2023 14:10:47 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id CC7BF19465A0 for ; Wed, 19 Apr 2023 14:07:21 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id BEC4940C201F; Wed, 19 Apr 2023 14:07:21 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast01.extmail.prod.ext.rdu2.redhat.com [10.11.55.17]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B7E8040C2064 for ; Wed, 19 Apr 2023 14:07:21 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9CDCD85A5A3 for ; Wed, 19 Apr 2023 14:07:21 +0000 (UTC) Received: from mail-pf1-f197.google.com (mail-pf1-f197.google.com [209.85.210.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-392-nwj76RlrPuSh981yb2gR4A-1; Wed, 19 Apr 2023 10:07:20 -0400 Received: by mail-pf1-f197.google.com with SMTP id d2e1a72fcca58-63b62529864so2871331b3a.2 for ; Wed, 19 Apr 2023 07:07:19 -0700 (PDT) Received: from wheatley.localdomain (nat-pool-brq-u.redhat.com. [213.175.37.12]) by smtp.gmail.com with ESMTPSA id r11-20020a65498b000000b004e28be19d1csm10549661pgs.32.2023.04.19.07.07.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Apr 2023 07:07:18 -0700 (PDT) Received: from wheatley.. (wheatley.k8r.cz [127.0.0.1]) by wheatley.localdomain (Postfix) with ESMTP id C3DCDFB3864D for ; Wed, 19 Apr 2023 16:07:13 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1681913454; 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=ba1iiy/WYLSfJC3/MPMc3KfxLLWCaxdBd6lofvdb2o4=; b=UD+uIYzDmexztfssUINmOaB6M4i+LEBfFA3LVEIMavgUy1/qE5ghst++0tHy4T3eVK18N3 EEgcr5xV/RUF4IyHoIzgrxRtVF8q0AY4Q8xucYZXWFl9fBgwvF7BmXD4InsfJWajw013RD ODJzSoUMX2KNCV9TuPFSLxUqSbamfF4= X-MC-Unique: RE7EDzyCNpucvfQEkfGqRg-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: nwj76RlrPuSh981yb2gR4A-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681913239; x=1684505239; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ba1iiy/WYLSfJC3/MPMc3KfxLLWCaxdBd6lofvdb2o4=; b=O41ICnHOukfGpF3pWIE+zUyLGloBzSTlquIDQ6ZsCQV+LP7vzjJ20eL0lzReeUFDgo MSM1W2Ht6kosfUEykW46tFvWRZLy4JIoFptDETPwCeNlShtXczx4BXdOIfoDj4DXuf6L x8kEy26V/4eh/kN3Jb+/G5RMAPf2189Nlex4VYCquhoySjDtYF3o1AOFAEfuyANbzoW8 wE0LlOER5G/1cL00CVGKbxM3BWoGfuY7GpWsspIXLk0wuPgcLN1AFb5jV86s5UbDxe0r ROp/1dLhghYsBBZsyGz7EcTzZaUSKp4PQiZ/QoTalajnE/txAW2HAb1+BRXTyKUNU7Px HkGw== X-Gm-Message-State: AAQBX9d0GUtdBgtHXjCJHTL4iyLIdmiV8z8Ie+ZazM31KONVDEV1GkYd ZQk2iSmoNih3t06+Z7prOtYUhZIZnXSuwLRp+KUtbYhOOgbVonszi0KjcDF4siYgXQLxDFsx+us GBdR+lIj/yAVuGoLsTa9c9DRXHOJ6sZKdim+Z0KnE++FXyIG0ZyEGgSh5lyjDW/OHi0UPbjTHog BCisATkA== X-Received: by 2002:a05:6a00:2303:b0:63a:fae3:9890 with SMTP id h3-20020a056a00230300b0063afae39890mr4251373pfh.24.1681913239157; Wed, 19 Apr 2023 07:07:19 -0700 (PDT) X-Google-Smtp-Source: AKy350Y20MbbBOsvOpSwY/ZyIu3ltFYb5p2EexXOQJ1OU9Y7+r4ttOMWGsEvJDGVdAfYSY/NdDYZcQ== X-Received: by 2002:a05:6a00:2303:b0:63a:fae3:9890 with SMTP id h3-20020a056a00230300b0063afae39890mr4251349pfh.24.1681913238864; Wed, 19 Apr 2023 07:07:18 -0700 (PDT) From: Martin Kletzander To: libvir-list@redhat.com Subject: [PATCH 3/7] qemu: Forbid device attach of existing platform watchdog Date: Wed, 19 Apr 2023 16:07:06 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 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: 1681913456582100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Martin Kletzander Reviewed-by: Michal Privoznik --- src/qemu/qemu_driver.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 28e470e4a27e..523a83682ceb 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -7315,6 +7315,19 @@ qemuDomainAttachDeviceConfig(virDomainDef *vmdef, return -1; } =20 + if (dev->data.watchdog->model !=3D VIR_DOMAIN_WATCHDOG_MODEL_I6300= ESB) { + size_t i; + + for (i =3D 0; i < vmdef->nwatchdogs; i++) { + if (vmdef->watchdogs[i]->model =3D=3D dev->data.watchdog->= model) { + virReportError(VIR_ERR_OPERATION_INVALID, + _("domain can only have one watchdog wi= th model '%1$s'"), + virDomainWatchdogModelTypeToString(vmde= f->watchdogs[i]->model)); + return -1; + } + } + } + VIR_APPEND_ELEMENT(vmdef->watchdogs, vmdef->nwatchdogs, dev->data.= watchdog); break; =20 --=20 2.40.0 From nobody Sat Nov 23 02:36:47 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) client-ip=170.10.129.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1681914282; cv=none; d=zohomail.com; s=zohoarc; b=H0ELFM06nnNrDJ7xUImXeYdr8TFTE8jM5yvp7TCDOBo+Go7+zwJ9OEKk5fz2KL50P8IIp1nSsqNM89Yp17dmPtmJ1HoSPB7KFI3163J6grxOEvlBDKwYm3R1IutDF5+FRcBu5iqWMNez91pklqc9cvupRD/8NO5hd0sCT9cvfrU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1681914282; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=GrQVv18w8cXwVd0z0GWaavnbO1QxQSkvYw8xoKkgLfk=; b=F01OCl2V4kxjCBBtaDmvWzR4oMDvV+jU+CM64D1c7FWH2rP5TEpB/ZRPWZBWr1CiilVuptgptLxqKj1WOMRGZDqfvwdQcLbnWITxFCwfF1fxdLnQcf+NtZ/6lTZFU+185kS3SAB9GJQnek7ygZwAjK7puZC2qdUkVas4Vo5lZfs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.zohomail.com with SMTPS id 1681914282484739.6623194770018; Wed, 19 Apr 2023 07:24:42 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-439-KmwwRJiMNm20C_8wc6cjiQ-1; Wed, 19 Apr 2023 10:24:39 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 258898678AD; Wed, 19 Apr 2023 14:24:16 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id A3DF82166B35; Wed, 19 Apr 2023 14:24:14 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 64ECE1946A4F; Wed, 19 Apr 2023 14:24:14 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 9E47819465B1 for ; Wed, 19 Apr 2023 14:07:21 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 73BCB400DC9; Wed, 19 Apr 2023 14:07:21 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast03.extmail.prod.ext.rdu2.redhat.com [10.11.55.19]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6C9B2492C3E for ; Wed, 19 Apr 2023 14:07:21 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 500C3811E7B for ; Wed, 19 Apr 2023 14:07:21 +0000 (UTC) Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-522-1hoqA-4LNHSVy1svs8lZbw-1; Wed, 19 Apr 2023 10:07:20 -0400 Received: by mail-pf1-f200.google.com with SMTP id d2e1a72fcca58-63b27afef94so3046832b3a.1 for ; Wed, 19 Apr 2023 07:07:19 -0700 (PDT) Received: from wheatley.localdomain (nat-pool-brq-u.redhat.com. [213.175.37.12]) by smtp.gmail.com with ESMTPSA id m25-20020aa78a19000000b0063d375ca0c3sm3247601pfa.32.2023.04.19.07.07.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Apr 2023 07:07:18 -0700 (PDT) Received: from wheatley.. (wheatley.k8r.cz [127.0.0.1]) by wheatley.localdomain (Postfix) with ESMTP id CF936FB3864E for ; Wed, 19 Apr 2023 16:07:13 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1681914281; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=GrQVv18w8cXwVd0z0GWaavnbO1QxQSkvYw8xoKkgLfk=; b=OtDhRhi+4lzpEuufFgl7ccrbVGy7s6PljKy81UVcUkkwfv+wA4gkTOnicCnvExrHLZ6PY5 3ZqlSb4Mt17FHhGks+Rcn2IZlpv+49R+4bCWbpzCyoWbLLOgyEWepollLOJmRAGIE1xwMw MAfaxqjYTTeFULhn1KNoRY9giQyyRs0= X-MC-Unique: KmwwRJiMNm20C_8wc6cjiQ-1 X-Original-To: libvir-list@listman.corp.redhat.com X-MC-Unique: 1hoqA-4LNHSVy1svs8lZbw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681913239; x=1684505239; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GrQVv18w8cXwVd0z0GWaavnbO1QxQSkvYw8xoKkgLfk=; b=D2kUPDLMsie99WuReeUuINFb2hd/BWSh4gfBZ3JxjDgIYF+ZH/DV0/2+SRq1kA4Ef9 K/KYWwMHMIG3h6bvDA6BkXnr5W6oD3i32yEY4OvTb36m4GaYaeGmNXPptdGv+uM/wgJx spJhB55fGrS2pzUS4OUF8qzCfmcvv13PFAOBYR62JtwLAUxLkeKYJ3KIGXV2S/1HDbQX a6GsujY15AqVzh/9XHolzRtHNl2gAnzfJlTqUiN6dFqKeH/4nkaOGE8n/8YNnLKN5WAN iilZcC0DjP65tcDqz7cFl1pW95/zQ5Tors/Iho/m9AdZ9tCnFMrChf461rXsENA5zqjs QH4A== X-Gm-Message-State: AAQBX9eAjI3bdW6MhW2iFfRj/b6wW1kImV2hIwO6v+sQ+UCOkoQveUoT oEeP/OdJuivNUpqkvFbzb7MS9vra8ZeWcG7y9+/x8vNrL6DkOwFuW2u54uuofmdOuYOTljnh1ZA SCVaBiLCtN88wPk5QpoGze5pShmR3G/Z3bA3DWnNQeKXWZj0vINet4A1ha1qPW+HU4/zXqH14eS rodysEpg== X-Received: by 2002:a05:6a00:1255:b0:637:aea0:b23d with SMTP id u21-20020a056a00125500b00637aea0b23dmr4567812pfi.10.1681913239077; Wed, 19 Apr 2023 07:07:19 -0700 (PDT) X-Google-Smtp-Source: AKy350ZbDFZPAwg1km71boAkY2gShmV3cOiDCI5W2buuOjUVohOg8Nd0a6yfZ4CLY935iR/euIAAgw== X-Received: by 2002:a05:6a00:1255:b0:637:aea0:b23d with SMTP id u21-20020a056a00125500b00637aea0b23dmr4567784pfi.10.1681913238719; Wed, 19 Apr 2023 07:07:18 -0700 (PDT) From: Martin Kletzander To: libvir-list@redhat.com Subject: [PATCH 4/7] qemu: Forbid ib700 watchdogs for non-i440fx machine types Date: Wed, 19 Apr 2023 16:07:07 +0200 Message-Id: <738b0f38cbd6100606e1b081ced20845b257284e.1681913144.git.mkletzan@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libvir-list-bounces@redhat.com Sender: "libvir-list" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1681914284441100001 Content-Type: text/plain; charset="utf-8"; x-default="true" We can launch qemu with it, but it will not work since it's not even probed by the kernel at the mapped address with different machine types since they are expected to be connected to ISA and not even its newer LPC counterpart found on q35. And it does not exist on non-x86 architectures. Signed-off-by: Martin Kletzander Reviewed-by: Michal Privoznik --- src/qemu/qemu_validate.c | 7 +++++++ .../watchdog-q35-multiple.x86_64-latest.args | 4 ++-- tests/qemuxml2argvdata/watchdog-q35-multiple.xml | 2 +- .../watchdog-q35-multiple.x86_64-latest.xml | 4 +++- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index b8d5e9bd74e9..6ebd2ba0101f 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -2320,6 +2320,13 @@ qemuValidateDomainWatchdogDef(const virDomainWatchdo= gDef *dev, break; =20 case VIR_DOMAIN_WATCHDOG_MODEL_IB700: + if (!qemuDomainIsI440FX(def)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("%1$s model of watchdog cannot be used with t= his machine type"), + virDomainWatchdogModelTypeToString(dev->model)); + return -1; + } + if (dev->info.type !=3D VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("%1$s model of watchdog does not support conf= iguring the address"), diff --git a/tests/qemuxml2argvdata/watchdog-q35-multiple.x86_64-latest.arg= s b/tests/qemuxml2argvdata/watchdog-q35-multiple.x86_64-latest.args index 655d206421b6..4c14a9552088 100644 --- a/tests/qemuxml2argvdata/watchdog-q35-multiple.x86_64-latest.args +++ b/tests/qemuxml2argvdata/watchdog-q35-multiple.x86_64-latest.args @@ -31,8 +31,8 @@ XDG_CONFIG_HOME=3D/var/lib/libvirt/qemu/domain--1-QEMUGue= st1/.config \ -device '{"driver":"pcie-root-port","port":9,"chassis":3,"id":"pci.3","bus= ":"pcie.0","addr":"0x1.0x1"}' \ -device '{"driver":"piix3-usb-uhci","id":"usb","bus":"pci.2","addr":"0x1"}= ' \ -audiodev '{"id":"audio1","driver":"none"}' \ --device '{"driver":"ib700","id":"watchdog0"}' \ --device '{"driver":"i6300esb","id":"watchdog1","bus":"pci.2","addr":"0x2"}= ' \ +-device '{"driver":"i6300esb","id":"watchdog0","bus":"pci.2","addr":"0x2"}= ' \ +-device '{"driver":"i6300esb","id":"watchdog1","bus":"pci.2","addr":"0x3"}= ' \ -global ICH9-LPC.noreboot=3Doff \ -watchdog-action poweroff \ -sandbox on,obsolete=3Ddeny,elevateprivileges=3Ddeny,spawn=3Ddeny,resource= control=3Ddeny \ diff --git a/tests/qemuxml2argvdata/watchdog-q35-multiple.xml b/tests/qemux= ml2argvdata/watchdog-q35-multiple.xml index af0cb169f0d9..1ed3aff41482 100644 --- a/tests/qemuxml2argvdata/watchdog-q35-multiple.xml +++ b/tests/qemuxml2argvdata/watchdog-q35-multiple.xml @@ -18,7 +18,7 @@ - + diff --git a/tests/qemuxml2xmloutdata/watchdog-q35-multiple.x86_64-latest.x= ml b/tests/qemuxml2xmloutdata/watchdog-q35-multiple.x86_64-latest.xml index 7e60c6e6517d..1ea084854ee6 100644 --- a/tests/qemuxml2xmloutdata/watchdog-q35-multiple.x86_64-latest.xml +++ b/tests/qemuxml2xmloutdata/watchdog-q35-multiple.x86_64-latest.xml @@ -41,10 +41,12 @@