From nobody Mon Sep 16 19:46:13 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=1678135639; cv=none; d=zohomail.com; s=zohoarc; b=DUcIElcwL1QWpbFd6GmfLaJ3znZkT4zYa95sNe1nyff5mhrJletmAqkFst8kJhmlPZrioyo2h3EsqvYbZYvSDTFLPu12S+w4zAGD3FIfwX7LO+9UWFnVBoqBwWHhWsIsgrE654PYZwDP6hHLEHWrXiZaDOX5EX2S+OvBzyBEuJM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678135639; 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=M+7fekjKaYXKKPY095VxjA7Y8jkbpmmxemgk8LCy/Is=; b=ek0uli4RoNSy+j/6HYdQxiYAmPXP74pr1cs3Azfl0d8P3g9UvlPPVWy0DjBWl6K64GhvNqtxBlt6pj2hWE9JBzRbR//8Z268Pe8yMWwsQxtxjfMX3wTD0O/2hTBLi5+QnG2fnaoYKBGE2+WVqLC1O/8Q63i4SmysKzlOF7Fd/54= 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 1678135639540633.3975072018693; Mon, 6 Mar 2023 12:47:19 -0800 (PST) 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-44-WLwwAnH-PiK-nQ15uaSM6w-1; Mon, 06 Mar 2023 15:47:16 -0500 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 510108588E1; Mon, 6 Mar 2023 20:47: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 3E6FA492B00; Mon, 6 Mar 2023 20:47: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 0E8BF194658F; Mon, 6 Mar 2023 20:47:11 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 56E0A19465A2 for ; Mon, 6 Mar 2023 20:47:09 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 3D642175AD; Mon, 6 Mar 2023 20:47:09 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7211B51FF for ; Mon, 6 Mar 2023 20:47:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678135638; 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=M+7fekjKaYXKKPY095VxjA7Y8jkbpmmxemgk8LCy/Is=; b=EgGWat+PBMJrqx1iE9z/uB+PUsX6JAK3e6z7JnfyEBB0niLiaMkpQsy+0x9rCYnZ/N5rMY 60h8Jcz0X305OJaFmI4d5ujhOXt+31HZATs2lH3xI2qa284bZVvyux6S7Ig6ZmsEZnsqz3 DPF0IMOkH7zk4sXsP6aamKZBFLwpSTQ= X-MC-Unique: WLwwAnH-PiK-nQ15uaSM6w-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 12/15] qemu: capabilities: Retire QEMU_CAPS_AES_KEY_WRAP and QEMU_CAPS_DEA_KEY_WRAP Date: Mon, 6 Mar 2023 21:46:40 +0100 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 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.10 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: 1678135641094100003 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa --- src/qemu/qemu_capabilities.c | 6 ++---- src/qemu/qemu_capabilities.h | 4 ++-- tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 2 -- tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 2 -- tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 2 -- 5 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 9777f5b112..50c303d98f 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -322,10 +322,10 @@ VIR_ENUM_IMPL(virQEMUCaps, "qxl-vga.vgamem_mb", /* X_QEMU_CAPS_QXL_VGA_VGAMEM */ "pc-dimm", /* QEMU_CAPS_DEVICE_PC_DIMM */ "machine-vmport-opt", /* QEMU_CAPS_MACHINE_VMPORT_OPT */ - "aes-key-wrap", /* QEMU_CAPS_AES_KEY_WRAP */ + "aes-key-wrap", /* X_QEMU_CAPS_AES_KEY_WRAP */ /* 185 */ - "dea-key-wrap", /* QEMU_CAPS_DEA_KEY_WRAP */ + "dea-key-wrap", /* X_QEMU_CAPS_DEA_KEY_WRAP */ "pci-serial", /* QEMU_CAPS_DEVICE_PCI_SERIAL */ "aarch64-off", /* X_QEMU_CAPS_CPU_AARCH64_OFF */ "vhost-user-multiqueue", /* X_QEMU_CAPS_VHOSTUSER_MULTIQUEUE= */ @@ -5475,8 +5475,6 @@ virQEMUCapsInitQMPBasicArch(virQEMUCaps *qemuCaps) switch (qemuCaps->arch) { case VIR_ARCH_S390: case VIR_ARCH_S390X: - virQEMUCapsSet(qemuCaps, QEMU_CAPS_AES_KEY_WRAP); - virQEMUCapsSet(qemuCaps, QEMU_CAPS_DEA_KEY_WRAP); virQEMUCapsSet(qemuCaps, QEMU_CAPS_LOADPARM); break; diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 7f4884fc93..fa068dcbff 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -300,10 +300,10 @@ typedef enum { /* virQEMUCapsFlags grouping marker fo= r syntax-check */ X_QEMU_CAPS_QXL_VGA_VGAMEM, /* -device qxl-vga.vgamem_mb */ QEMU_CAPS_DEVICE_PC_DIMM, /* pc-dimm device */ QEMU_CAPS_MACHINE_VMPORT_OPT, /* -machine xxx,vmport=3Don/off/auto */ - QEMU_CAPS_AES_KEY_WRAP, /* -machine aes_key_wrap */ + X_QEMU_CAPS_AES_KEY_WRAP, /* -machine aes_key_wrap */ /* 185 */ - QEMU_CAPS_DEA_KEY_WRAP, /* -machine dea_key_wrap */ + X_QEMU_CAPS_DEA_KEY_WRAP, /* -machine dea_key_wrap */ QEMU_CAPS_DEVICE_PCI_SERIAL, /* -device pci-serial */ X_QEMU_CAPS_CPU_AARCH64_OFF, /* -cpu ...,aarch64=3Doff */ X_QEMU_CAPS_VHOSTUSER_MULTIQUEUE, /* vhost-user with -netdev queues=3D= */ diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_4.2.0.s390x.xml index cd13201c68..c3fd0e4ce3 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -23,8 +23,6 @@ - - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_5.2.0.s390x.xml index ac51cd4c1a..0a74ec9f2c 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml @@ -22,8 +22,6 @@ - - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_6.0.0.s390x.xml index af03684556..ee9516734a 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml @@ -22,8 +22,6 @@ - - --=20 2.39.2