From nobody Mon Sep 16 19:44:49 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=1678135699; cv=none; d=zohomail.com; s=zohoarc; b=ICYUtwxj+TugonpLgd9ZtmbqgNlsfLh78OkQApl8aRow+FF2Me6jMeUlTpwhTVx6HODokUG8NpRqvszKP6m+DkHQVh+qBk4dHvZEYmvei1PAy8ixNz1zpj/o653IOJPAuPoFadBqUgOfvoe5J2gln6GBKME4M+j8BF7Nny9vW6g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1678135699; 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=GfcRfLhjVFhgoT8Rz8agTDZEIzOG3FVxew7S4xKPj5w=; b=X8+ydDS53tG0EFakgu5lrjHh8Lkk6WDz7MnwOSRgwj2DAkU6KrUgVkc9Kq12zZLKOAqbIFO7w459JESgZtofOPgupO0wsAweIisLtkFXM0AzqKhh7zGhMKV98RSNSH1NT7Z47yDwVUaHxmevRRkADQtPYTa9qeBNwpT3R2q3+a8= 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 1678135699076189.38869368014286; Mon, 6 Mar 2023 12:48: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-502-AtFSH63TPjGDhaMF4sPbpw-1; Mon, 06 Mar 2023 15:47:22 -0500 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 E2FA1801CFB; Mon, 6 Mar 2023 20:47:12 +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 CAC102026D2C; Mon, 6 Mar 2023 20:47:12 +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 94FA119465B5; Mon, 6 Mar 2023 20:47:12 +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 72283194658F for ; Mon, 6 Mar 2023 20:47:11 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 63C8344108; Mon, 6 Mar 2023 20:47:11 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.45.242.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id C50E851FF for ; Mon, 6 Mar 2023 20:47:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678135698; 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=GfcRfLhjVFhgoT8Rz8agTDZEIzOG3FVxew7S4xKPj5w=; b=BmZ5DkDliysSkzF1luHNvpCthHNmg6qnYPd5GLP/t4PtktKvRBY7NGsw8sOK7BpNwDp4Cm djiHccJHnBplMMYYq42cym1GOavHV2ayD4BBqZCJsPN+SA8pwF46QFGX/i9Vvavk9tAC+w GtVx0/izZihHV83b8GIAuKzsfYnkZGU= X-MC-Unique: AtFSH63TPjGDhaMF4sPbpw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 14/15] qemu: capabilities: Retire QEMU_CAPS_LOADPARM Date: Mon, 6 Mar 2023 21:46:42 +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.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: 1678135699589100001 Content-Type: text/plain; charset="utf-8" Signed-off-by: Peter Krempa --- src/qemu/qemu_capabilities.c | 5 +---- src/qemu/qemu_capabilities.h | 2 +- tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - 5 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 50c303d98f..76fb739fbc 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -431,7 +431,7 @@ VIR_ENUM_IMPL(virQEMUCaps, /* 260 */ "virtio.ats", /* X_QEMU_CAPS_VIRTIO_PCI_ATS */ - "loadparm", /* QEMU_CAPS_LOADPARM */ + "loadparm", /* X_QEMU_CAPS_LOADPARM */ "spapr-pci-host-bridge", /* QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_= BRIDGE */ "spapr-pci-host-bridge.numa_node", /* QEMU_CAPS_SPAPR_PCI_HO= ST_BRIDGE_NUMA_NODE */ "vnc-multi-servers", /* X_QEMU_CAPS_VNC_MULTI_SERVERS */ @@ -5475,9 +5475,6 @@ virQEMUCapsInitQMPBasicArch(virQEMUCaps *qemuCaps) switch (qemuCaps->arch) { case VIR_ARCH_S390: case VIR_ARCH_S390X: - virQEMUCapsSet(qemuCaps, QEMU_CAPS_LOADPARM); - break; - case VIR_ARCH_AARCH64: case VIR_ARCH_I686: case VIR_ARCH_X86_64: diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index fa068dcbff..dfa0b806de 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -410,7 +410,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ /* 260 */ X_QEMU_CAPS_VIRTIO_PCI_ATS, /* virtio-*-pci.ats */ - QEMU_CAPS_LOADPARM, /* -machine loadparm */ + X_QEMU_CAPS_LOADPARM, /* -machine loadparm */ QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, /* -device spapr-pci-host-brid= ge */ QEMU_CAPS_SPAPR_PCI_HOST_BRIDGE_NUMA_NODE, /* spapr-pci-host-bridge.nu= ma_node=3D */ X_QEMU_CAPS_VNC_MULTI_SERVERS, /* -vnc vnc=3Dunix:/path */ diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_4.2.0.s390x.xml index c3fd0e4ce3..08d0993ba3 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -35,7 +35,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_5.2.0.s390x.xml index 0a74ec9f2c..3ec0bd4c32 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml @@ -34,7 +34,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_6.0.0.s390x.xml index ee9516734a..89420c1e9b 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml @@ -34,7 +34,6 @@ - --=20 2.39.2