From nobody Mon Sep 16 19:39:13 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=1693923895; cv=none; d=zohomail.com; s=zohoarc; b=R2ahlcdqXZ7LVY3FJJKMzFYI56PZDT4WNveevLo3SIjicClT1nUfaIiFR62b1P4UqRSk6b9u1x3ua/atMirkbKmz9vWCwECsl4Gw93OtL85hSXD9/0AbMievE3Recf+78OtJjUfx1XdCqm2CzVIVB7bv2EtWMeDvZ2nucSDYejY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1693923895; 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=HAKq5R4O1HJ0nLs3kOgY1HYeOEOhxup5QGvO93CDyuM=; b=NIPpRbpOvRZbA5xtWfA5fqJ9SKOjC5R6H9ZACTx+9Ua9lwfF+8IsNmpoERSj49Lm7oW7CFGb0mlBu8YCBMoN/VpbsiTntPHO6HzOuOy6a//BGJSf7xVVzzGxG56zvjxXsTu/lQ7jna0k7ULm5Ocxj1C8evAcipv3nuv5rXNDHxE= 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 1693923895034195.73870210468317; Tue, 5 Sep 2023 07:24:55 -0700 (PDT) Received: from mimecast-mx02.redhat.com (mx-ext.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-511-d0hLPoewPMy95Otb8euZdA-1; Tue, 05 Sep 2023 10:24:42 -0400 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 B5E18381495B; Tue, 5 Sep 2023 14:24:26 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6325040F2D29; Tue, 5 Sep 2023 14:24:26 +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 38D3A1946595; Tue, 5 Sep 2023 14:24:26 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 4867E1946589 for ; Tue, 5 Sep 2023 14:24:25 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 39C3010CD6A8; Tue, 5 Sep 2023 14:24:25 +0000 (UTC) Received: from speedmetal.lan (unknown [10.45.242.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id 216C61121318 for ; Tue, 5 Sep 2023 14:24:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1693923894; 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=HAKq5R4O1HJ0nLs3kOgY1HYeOEOhxup5QGvO93CDyuM=; b=EAgNdTyYTk/r7qadFD8a52siWelBLKjs/azjkRX5p96NMIH+HKu7BKYlumVW7wnh5FpJQw a7XjazNGrm2d63fFSSXuk6R43ByUB++EpztRyx6D/AyP4mF/TI05f32GR9kjo/2kO+wJ8T y9NjZvW5lJrinJxW3Wkwp+TYa7zkStI= X-MC-Unique: d0hLPoewPMy95Otb8euZdA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 02/51] qemu: capabilities: Retire QEMU_CAPS_ICH9_DISABLE_S* and QEMU_CAPS_ICH9_DISABLE_S* capabilities Date: Tue, 5 Sep 2023 16:23:29 +0200 Message-ID: <86cd101bda918e4ff8cdc5b99851f78bf2902374.1693923601.git.pkrempa@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 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.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: 1693923895972100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa --- src/qemu/qemu_capabilities.c | 12 ++++-------- src/qemu/qemu_capabilities.h | 8 ++++---- tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml | 4 ---- tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml | 4 ---- tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml | 4 ---- tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml | 4 ---- tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml | 4 ---- tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml | 4 ---- tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml | 2 -- tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml | 4 ---- tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml | 2 -- tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml | 4 ---- tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml | 2 -- tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml | 4 ---- tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml | 2 -- tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml | 4 ---- tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml | 4 ---- tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml | 4 ---- tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml | 4 ---- 19 files changed, 8 insertions(+), 72 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index ea4e248349..b52e25a072 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -208,8 +208,8 @@ VIR_ENUM_IMPL(virQEMUCaps, /* 100 */ "virtio-scsi-pci", /* QEMU_CAPS_VIRTIO_SCSI */ "blockio", /* X_QEMU_CAPS_BLOCKIO */ - "disable-s3", /* QEMU_CAPS_PIIX_DISABLE_S3 */ - "disable-s4", /* QEMU_CAPS_PIIX_DISABLE_S4 */ + "disable-s3", /* X_QEMU_CAPS_PIIX_DISABLE_S3 */ + "disable-s4", /* X_QEMU_CAPS_PIIX_DISABLE_S4 */ "usb-redir.filter", /* QEMU_CAPS_USB_REDIR_FILTER */ /* 105 */ @@ -354,8 +354,8 @@ VIR_ENUM_IMPL(virQEMUCaps, /* 205 */ "chardev-file-append", /* X_QEMU_CAPS_CHARDEV_FILE_APPEND */ - "ich9-disable-s3", /* QEMU_CAPS_ICH9_DISABLE_S3 */ - "ich9-disable-s4", /* QEMU_CAPS_ICH9_DISABLE_S4 */ + "ich9-disable-s3", /* X_QEMU_CAPS_ICH9_DISABLE_S3 */ + "ich9-disable-s4", /* X_QEMU_CAPS_ICH9_DISABLE_S4 */ "vserport-change-event", /* X_QEMU_CAPS_VSERPORT_CHANGE */ "virtio-balloon-pci.deflate-on-oom", /* QEMU_CAPS_VIRTIO_BAL= LOON_AUTODEFLATE */ @@ -1457,8 +1457,6 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCaps= DevicePropsIDEDrive[] =3D { }; static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsPiix4PM[] = =3D { - { "disable_s3", QEMU_CAPS_PIIX_DISABLE_S3, NULL }, - { "disable_s4", QEMU_CAPS_PIIX_DISABLE_S4, NULL }, { "acpi-root-pci-hotplug", QEMU_CAPS_PIIX4_ACPI_ROOT_PCI_HOTPLUG, NULL= }, }; @@ -1493,8 +1491,6 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCaps= DevicePropsVirtioGpu[] =3D { }; static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsICH9[] =3D= { - { "disable_s3", QEMU_CAPS_ICH9_DISABLE_S3, NULL }, - { "disable_s4", QEMU_CAPS_ICH9_DISABLE_S4, NULL }, }; static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsIntelIOMMU= [] =3D { diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index ba289ba6b9..642a4762b3 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -186,8 +186,8 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ /* 100 */ QEMU_CAPS_VIRTIO_SCSI, /* -device virtio-scsi-* */ X_QEMU_CAPS_BLOCKIO, /* -device ...logical_block_size & co */ - QEMU_CAPS_PIIX_DISABLE_S3, /* -M pc S3 BIOS Advertisement on/off */ - QEMU_CAPS_PIIX_DISABLE_S4, /* -M pc S4 BIOS Advertisement on/off */ + X_QEMU_CAPS_PIIX_DISABLE_S3, /* -M pc S3 BIOS Advertisement on/off */ + X_QEMU_CAPS_PIIX_DISABLE_S4, /* -M pc S4 BIOS Advertisement on/off */ QEMU_CAPS_USB_REDIR_FILTER, /* usb-redir.filter */ /* 105 */ @@ -332,8 +332,8 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ /* 205 */ X_QEMU_CAPS_CHARDEV_FILE_APPEND, /* -chardev file,append=3Don|off */ - QEMU_CAPS_ICH9_DISABLE_S3, /* -M q35 S3 BIOS Advertisement on/off */ - QEMU_CAPS_ICH9_DISABLE_S4, /* -M q35 S4 BIOS Advertisement on/off */ + X_QEMU_CAPS_ICH9_DISABLE_S3, /* -M q35 S3 BIOS Advertisement on/off */ + X_QEMU_CAPS_ICH9_DISABLE_S4, /* -M q35 S4 BIOS Advertisement on/off */ X_QEMU_CAPS_VSERPORT_CHANGE, /* VSERPORT_CHANGE event */ QEMU_CAPS_VIRTIO_BALLOON_AUTODEFLATE, /* virtio-balloon-{device,pci,cc= w}. * deflate-on-oom */ diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_4.2.0_x86_64.xml index bf920a74c4..3c197af464 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml @@ -25,8 +25,6 @@ - - @@ -72,8 +70,6 @@ - - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.0.0_x86_64.xml index 8fa4148232..dc107952ca 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml @@ -25,8 +25,6 @@ - - @@ -72,8 +70,6 @@ - - diff --git a/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.1.0_x86_64.xml index c0f3444d85..ddd3b560ab 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml @@ -25,8 +25,6 @@ - - @@ -72,8 +70,6 @@ - - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_5.2.0_x86_64.xml index 6bd531a825..7162ca6a18 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml @@ -25,8 +25,6 @@ - - @@ -72,8 +70,6 @@ - - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.0.0_x86_64.xml index 4223eb1a2e..77890694ad 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml @@ -24,8 +24,6 @@ - - @@ -71,8 +69,6 @@ - - diff --git a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.1.0_x86_64.xml index cacfd6969f..563c337b23 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml @@ -24,8 +24,6 @@ - - @@ -70,8 +68,6 @@ - - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml b/tests/qemuca= pabilitiesdata/caps_6.2.0_ppc64.xml index 914cda2048..b18d0509c2 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml @@ -20,8 +20,6 @@ - - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_6.2.0_x86_64.xml index 4792691285..a33911ff3c 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml @@ -24,8 +24,6 @@ - - @@ -70,8 +68,6 @@ - - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml b/tests/qemuca= pabilitiesdata/caps_7.0.0_ppc64.xml index 748b897f70..6f29b29632 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml @@ -24,8 +24,6 @@ - - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.0.0_x86_64.xml index 8d026d540d..ce16662d6b 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml @@ -24,8 +24,6 @@ - - @@ -70,8 +68,6 @@ - - diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml b/tests/qemuca= pabilitiesdata/caps_7.1.0_ppc64.xml index 310b8f9d75..67d9b23e79 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml @@ -23,8 +23,6 @@ - - diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.1.0_x86_64.xml index 07e8c57f27..56422fbdf8 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml @@ -24,8 +24,6 @@ - - @@ -70,8 +68,6 @@ - - diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml b/tests/qemucapa= bilitiesdata/caps_7.2.0_ppc.xml index b8d4d4888c..e5df1832b7 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml @@ -24,8 +24,6 @@ - - diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml b/tests/q= emucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml index 928270d287..69e35c7133 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml @@ -23,8 +23,6 @@ - - @@ -69,8 +67,6 @@ - - diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_7.2.0_x86_64.xml index a889c1b034..b2fd5794cc 100644 --- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml @@ -24,8 +24,6 @@ - - @@ -70,8 +68,6 @@ - - diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_8.0.0_x86_64.xml index 6d105e78a9..3613dfd4cc 100644 --- a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml @@ -24,8 +24,6 @@ - - @@ -70,8 +68,6 @@ - - diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml b/tests/qemuc= apabilitiesdata/caps_8.1.0_x86_64.xml index adcf594138..965ba37c7f 100644 --- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml @@ -24,8 +24,6 @@ - - @@ -70,8 +68,6 @@ - - --=20 2.41.0