From nobody Sat May 11 08:15:28 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=1650029420; cv=none; d=zohomail.com; s=zohoarc; b=AqhJLTywPcLHlyLvHXjblsT2iQe82aCCv6L3N0RiL9xusXa7sqxDQgo5aqQkfaj7hc4tMZg1id8Ep25kT1f03uZtdXcDMLLaxcq+UlatmG6ctGbhR9CHiqifhBDBdkc8D6HmLR8R8cOrzTLqIM5m5R53K24kG0FJ6l4+9i3bAsw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1650029420; 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=tj8cQEUiePgCFRvPmtxnNTEK8dqi3P8vjkte4qmeFJM=; b=hVFS7bxznnpiD/7IBgfxBU0jPej7C2pLUd5/8JPsxKQ0b51RZNsGkqYZ7KHI7/qHECSDorWWZb8FJn0z493YTlEZPFupKanGyjUqInT7FVpNwKrinyscZhkZ0DgpuD2Zm9byBkrZ+Ig3o0j8fH2OL8fGee7XK9qI69tQbKzuqG4= 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 1650029420442369.8691320514008; Fri, 15 Apr 2022 06:30:20 -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-562-GHuQ6LzGP8CT5pb6QZ13Aw-1; Fri, 15 Apr 2022 09:30:15 -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 97E9E1014A70; Fri, 15 Apr 2022 13:30:12 +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 2731C40D0199; Fri, 15 Apr 2022 13:30: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 8EBB6194034C; Fri, 15 Apr 2022 13:30:10 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 61BA619451EF for ; Fri, 15 Apr 2022 13:30:09 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 53ECD145B978; Fri, 15 Apr 2022 13:30:09 +0000 (UTC) Received: from harajuku.usersys.redhat.com.homenet.telecomitalia.it (unknown [10.40.192.7]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D9AE41458315 for ; Fri, 15 Apr 2022 13:30:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1650029419; 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=tj8cQEUiePgCFRvPmtxnNTEK8dqi3P8vjkte4qmeFJM=; b=JzVcOxBhPHnxrLs/4dZayukd7iMwuneVH/f0P7I7hPfw7unMj56Hz4ZTePT5fpdhP3QJQY z1l4bwSdpayXJWXxqSZFVt8NLaMNxTPCt+uc+sIA3O/WpYlaTFHDkjp0ahvuhRxzfACx6R GJSDF33PxR0sxye4A2kmPUhqJZD77sk= X-MC-Unique: GHuQ6LzGP8CT5pb6QZ13Aw-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 1/7] tests: Drop pseries-machine-max-cpu-compat Date: Fri, 15 Apr 2022 15:30:00 +0200 Message-Id: <20220415133006.519142-2-abologna@redhat.com> In-Reply-To: <20220415133006.519142-1-abologna@redhat.com> References: <20220415133006.519142-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 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 2.84 on 10.11.54.1 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com 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: 1650029421189100004 Content-Type: text/plain; charset="utf-8"; x-default="true" This was supposed to test the behavior when QEMU_CAPS_MACHINE_PSERIES_MAX_CPU_COMPAT is present, but these days that's always the case and pseries-cpu-compat already provides all the coverage we need. Signed-off-by: Andrea Bolognani Reviewed-by: Peter Krempa --- .../pseries-machine-max-cpu-compat.args | 29 ------------------- .../pseries-machine-max-cpu-compat.xml | 17 ----------- tests/qemuxml2argvtest.c | 4 --- 3 files changed, 50 deletions(-) delete mode 100644 tests/qemuxml2argvdata/pseries-machine-max-cpu-compat.a= rgs delete mode 100644 tests/qemuxml2argvdata/pseries-machine-max-cpu-compat.x= ml diff --git a/tests/qemuxml2argvdata/pseries-machine-max-cpu-compat.args b/t= ests/qemuxml2argvdata/pseries-machine-max-cpu-compat.args deleted file mode 100644 index d47dffd0e4..0000000000 --- a/tests/qemuxml2argvdata/pseries-machine-max-cpu-compat.args +++ /dev/null @@ -1,29 +0,0 @@ -LC_ALL=3DC \ -PATH=3D/bin \ -HOME=3D/tmp/lib/domain--1-QEMUGuest1 \ -USER=3Dtest \ -LOGNAME=3Dtest \ -XDG_DATA_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.local/share \ -XDG_CACHE_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.cache \ -XDG_CONFIG_HOME=3D/tmp/lib/domain--1-QEMUGuest1/.config \ -QEMU_AUDIO_DRV=3Dnone \ -/usr/bin/qemu-system-ppc64 \ --name guest=3DQEMUGuest1,debug-threads=3Don \ --S \ --object secret,id=3DmasterKey0,format=3Draw,file=3D/tmp/lib/domain--1-QEMU= Guest1/master-key.aes \ --machine pseries,usb=3Doff,dump-guest-core=3Doff,max-cpu-compat=3Dpower7 \ --accel kvm \ --cpu host \ --m 256 \ --overcommit mem-lock=3Doff \ --smp 4,sockets=3D4,cores=3D1,threads=3D1 \ --uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \ --display none \ --no-user-config \ --nodefaults \ --chardev socket,id=3Dcharmonitor,fd=3D1729,server=3Don,wait=3Doff \ --mon chardev=3Dcharmonitor,id=3Dmonitor,mode=3Dcontrol \ --rtc base=3Dutc \ --no-shutdown \ --boot strict=3Don \ --msg timestamp=3Don diff --git a/tests/qemuxml2argvdata/pseries-machine-max-cpu-compat.xml b/te= sts/qemuxml2argvdata/pseries-machine-max-cpu-compat.xml deleted file mode 100644 index ad2647370d..0000000000 --- a/tests/qemuxml2argvdata/pseries-machine-max-cpu-compat.xml +++ /dev/null @@ -1,17 +0,0 @@ - - QEMUGuest1 - c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219100 - 4 - - hvm - - - power7 - - - /usr/bin/qemu-system-ppc64 - - - - diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index ed41b7a7a2..e5379b45d6 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2194,10 +2194,6 @@ mymain(void) DO_TEST("pseries-cpu-compat", QEMU_CAPS_KVM, QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, QEMU_CAPS_DEVICE_SPAPR_VTY); - DO_TEST("pseries-machine-max-cpu-compat", - QEMU_CAPS_KVM, - QEMU_CAPS_MACHINE_PSERIES_MAX_CPU_COMPAT, - QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE); DO_TEST("pseries-cpu-le", QEMU_CAPS_KVM, QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, QEMU_CAPS_DEVICE_SPAPR_VTY); --=20 2.35.1 From nobody Sat May 11 08:15:28 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=1650029422; cv=none; d=zohomail.com; s=zohoarc; b=M4t2PKYM+cyaMV9DhovpV/2wyrDw/EPV3qFZwh2hOFp9AHmJyBiIGdFWUttHrjzgaEsy3jUXsWG/Iy81vpn9oxnb3C3Eh7hhG2b7JCakeio7nfigAxu9dunjnn8fS2imbTH8jDt8bRHoiKskVjwuINKRlDLThnjQxhsk4XanziE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1650029422; 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=JKHS9kn+CSvPCoCbGN2jpr4xN3q6gohB4CB+h1Ow1wg=; b=juqX/B+syO7nA7t16i1gimToeE9IIEDzGm0iaMXR5Chh/h9kf3Hu3XPQffPEMj99CDrXSv6abFbyyg8XvfZVh0Q4Y+R8JlhyUkW/CgIKUiHm+TeBkZLhVE25rnto23hzDsLqJ1U4I3AKSrp7rXrPW+WrDtHrW557goammpnzcbk= 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 1650029422415897.6517421970026; Fri, 15 Apr 2022 06:30:22 -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-556-ud7VTrfuPz2wElC-f9qGEQ-1; Fri, 15 Apr 2022 09:30:15 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 203E33838C9F; Fri, 15 Apr 2022 13:30:12 +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 CAC5543E783; Fri, 15 Apr 2022 13:30: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 E840E194037E; Fri, 15 Apr 2022 13:30:10 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 451BE19451EF for ; Fri, 15 Apr 2022 13:30:10 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 175DE1458315; Fri, 15 Apr 2022 13:30:10 +0000 (UTC) Received: from harajuku.usersys.redhat.com.homenet.telecomitalia.it (unknown [10.40.192.7]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9CDB4145B984 for ; Fri, 15 Apr 2022 13:30:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1650029421; 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=JKHS9kn+CSvPCoCbGN2jpr4xN3q6gohB4CB+h1Ow1wg=; b=JbVdQFezLu6bufXsYup0Srb3dXBvKwF9hi5q12X1fOD9H+7nX0kjwDcRUd6UYaB+2knuqG lb6ehdGEiOOmqXVTSqPfYIhjkssWbuZqJ3r+NHvj8rxOb293CnpIHPO2XxWkq2SxhCzKfL KXDYYJkcaTwMW1nI/sspZIlqbpfbZXs= X-MC-Unique: ud7VTrfuPz2wElC-f9qGEQ-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 2/7] qemu: Assume QEMU_CAPS_MACHINE_PSERIES_MAX_CPU_COMPAT Date: Fri, 15 Apr 2022 15:30:01 +0200 Message-Id: <20220415133006.519142-3-abologna@redhat.com> In-Reply-To: <20220415133006.519142-1-abologna@redhat.com> References: <20220415133006.519142-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 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 2.85 on 10.11.54.9 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com 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: 1650029423196100008 Content-Type: text/plain; charset="utf-8"; x-default="true" All QEMU versions we support have this feature. Signed-off-by: Andrea Bolognani Reviewed-by: Peter Krempa --- src/qemu/qemu_command.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index bb45954108..3746f02ff0 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -6542,11 +6542,6 @@ qemuBuildCpuModelArgStr(virQEMUDriver *driver, */ if (ARCH_IS_PPC64(def->os.arch)) { virBufferAddLit(buf, "host"); - if (cpu->model && - !(qemuDomainIsPSeries(def) && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_MACHINE_PSERIES_MAX_C= PU_COMPAT))) { - virBufferAsprintf(buf, ",compat=3D%s", cpu->model); - } } else { virReportError(VIR_ERR_INTERNAL_ERROR, _("unexpected host-model CPU for %s architectur= e"), @@ -7118,8 +7113,7 @@ qemuBuildMachineCommandLine(virCommand *cmd, =20 if (cpu && cpu->model && cpu->mode =3D=3D VIR_CPU_MODE_HOST_MODEL && - qemuDomainIsPSeries(def) && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_MACHINE_PSERIES_MAX_CPU_COMPAT)= ) { + qemuDomainIsPSeries(def)) { virBufferAsprintf(&buf, ",max-cpu-compat=3D%s", cpu->model); } =20 --=20 2.35.1 From nobody Sat May 11 08:15:28 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=1650029429; cv=none; d=zohomail.com; s=zohoarc; b=OIU7OOG6TF34S7H4WVcl/e+JPCb/3OrO+9mxeqJooEQGDBRxTwAT5m+KGmVokpZtXV1JP+YoRkuWKloekc4vBk9dXPA/56nyidyhZr7E+CVDtr3iiQ3/EoCwYk1TtN6pSwEyICRetJahzP3nqper03N24VBx49u6zkLuC1sXDu4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1650029429; 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=CQdVM9Nj0B230a4xHx5lJThlnh3qSHlF8JzkAmseSIs=; b=JSgwPDAuJe0jy/pebTNTSMGGQIPZB5aJdGfgsPsC/Uj5IpfUuBKlKDmVmpvZebhdFqotXCxP7T9Yb9HCdcbC00bgw4RIBi4OUdH9U4d1m4mjK9qYiyFEncnNEg8qtP7BL+yj0tiISlekNFLnAVpG/aNIeWVGQ4Y1zltlv+DeKdU= 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 1650029429363752.5369117505744; Fri, 15 Apr 2022 06:30:29 -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-428-PGTrPyHQPwOlurBgA_9V_Q-1; Fri, 15 Apr 2022 09:30:16 -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 EF95F3838C97; Fri, 15 Apr 2022 13:30:12 +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 D41B040D0197; Fri, 15 Apr 2022 13:30: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 D6B9A194034E; Fri, 15 Apr 2022 13:30:11 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id E174F194037B for ; Fri, 15 Apr 2022 13:30:10 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id CD64D145BA55; Fri, 15 Apr 2022 13:30:10 +0000 (UTC) Received: from harajuku.usersys.redhat.com.homenet.telecomitalia.it (unknown [10.40.192.7]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 603B21458315 for ; Fri, 15 Apr 2022 13:30:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1650029427; 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=CQdVM9Nj0B230a4xHx5lJThlnh3qSHlF8JzkAmseSIs=; b=TI1imruvWqkIwresW0Wvyo8Q0+AqiLFFtIYEWe/y8o7kmZ48WbCLB6BDSEf9QNeQP5zqBw xiWZO+nkuqK0VQ0V8YMypbeLQOC86YyEIqWOQCH78CLHlozWJAjrdyg5wquouZ6PrGA1C7 BYptcPSedwAKqOpXGxISJEsmMLmAdMc= X-MC-Unique: PGTrPyHQPwOlurBgA_9V_Q-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 3/7] qemu: Stop setting QEMU_CAPS_MACHINE_PSERIES_MAX_CPU_COMPAT Date: Fri, 15 Apr 2022 15:30:02 +0200 Message-Id: <20220415133006.519142-4-abologna@redhat.com> In-Reply-To: <20220415133006.519142-1-abologna@redhat.com> References: <20220415133006.519142-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 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 2.84 on 10.11.54.1 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com 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: 1650029431233100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Andrea Bolognani Reviewed-by: Peter Krempa --- src/qemu/qemu_capabilities.c | 1 - tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 - 8 files changed, 8 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index faf868e076..91832131c1 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -5174,7 +5174,6 @@ virQEMUCapsInitQMPBasicArch(virQEMUCaps *qemuCaps) case VIR_ARCH_PPC64: case VIR_ARCH_PPC64LE: virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT); - virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_PSERIES_MAX_CPU_COMPAT); break; =20 case VIR_ARCH_S390: diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_3.1.0.ppc64.xml index 5b6c1510a7..52c4ee4dab 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml @@ -97,7 +97,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_4.0.0.ppc64.xml index f60aeb5f40..5b5d38e16b 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml @@ -103,7 +103,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_4.2.0.ppc64.xml index 99d1c79dd4..a8dac97115 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml @@ -103,7 +103,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_5.0.0.ppc64.xml index 2dd66410d1..429b40b06c 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml @@ -105,7 +105,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_5.2.0.ppc64.xml index 1c3121714d..aae45c495a 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml @@ -103,7 +103,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_6.2.0.ppc64.xml index bec10e00e0..b3e6a05a07 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml @@ -103,7 +103,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_7.0.0.ppc64.xml index 5a502392df..d44d8999b8 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml @@ -109,7 +109,6 @@ - --=20 2.35.1 From nobody Sat May 11 08:15:28 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=1650029420; cv=none; d=zohomail.com; s=zohoarc; b=ES55QDr+BV3sx88kCE689fBB0DcrA1GaOYvoQVe4zY24CWBXkpCBDPNHX7eUYrnET9Cpzy9lxde4zdJdqXbJuK1ErmJM/AnBcB/SsNapFamM1pnKGHhnE3mGi6r5LVBgi2AAQ1CMjifjM15+GvjH6B+cRekINCRf26LtBdp9u/o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1650029420; 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=uQzF4YgwATEnW3jRQe+2F98KdUNxL8++ylcxtcA3Fzs=; b=EYeu5rkD6VNX+QRrfl8cIpddV+MMtfPWTLAXS4gZs8PcrySmaLBI/X8pB5hUCPGrbFaZSBHFD8xmdJ7aFFNPHJPMVfiSPAfNXdr5J2taLTqzYIxm8w1HAY2EkoLBRV2W2PihK/73ZgGz1KxR88MYy5oFdWL9lPSwjgAcYap3p78= 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 1650029420095357.8977633954587; Fri, 15 Apr 2022 06:30:20 -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-68-ffj8JJcNMVOIuNy4rVGHcA-1; Fri, 15 Apr 2022 09:30:17 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9ADE81014A63; Fri, 15 Apr 2022 13:30:14 +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 87C6D145B978; Fri, 15 Apr 2022 13:30: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 36A01194034C; Fri, 15 Apr 2022 13:30:14 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id DD5C4194034F for ; Fri, 15 Apr 2022 13:30:11 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id CC655145B98A; Fri, 15 Apr 2022 13:30:11 +0000 (UTC) Received: from harajuku.usersys.redhat.com.homenet.telecomitalia.it (unknown [10.40.192.7]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 22856145BA57 for ; Fri, 15 Apr 2022 13:30:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1650029419; 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=uQzF4YgwATEnW3jRQe+2F98KdUNxL8++ylcxtcA3Fzs=; b=bP63Ok2bdiuROOUCvstjTPi8qp//o7mFVhZ+32ikI5/f33KyI2vWctURsuhxxuyawRXKm4 +9AgmsaT+mNjk7PSeWe+m0e5SEUNeD2RmunuN5tDIeWgTo4nVI+8PsiWOe2gce5l7xmwMU XgTINphQd1V6q7KWbraMrcXpvgP775k= X-MC-Unique: ffj8JJcNMVOIuNy4rVGHcA-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 4/7] qemu: Retire QEMU_CAPS_MACHINE_PSERIES_MAX_CPU_COMPAT Date: Fri, 15 Apr 2022 15:30:03 +0200 Message-Id: <20220415133006.519142-5-abologna@redhat.com> In-Reply-To: <20220415133006.519142-1-abologna@redhat.com> References: <20220415133006.519142-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 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 2.85 on 10.11.54.7 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com 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: 1650030323756100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Andrea Bolognani Reviewed-by: Peter Krempa --- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_capabilities.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 91832131c1..222e5c539f 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -461,7 +461,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "iscsi.password-secret", /* X_QEMU_CAPS_ISCSI_PASSWORD_SECRE= T */ "isa-serial", /* QEMU_CAPS_DEVICE_ISA_SERIAL */ "pl011", /* QEMU_CAPS_DEVICE_PL011 */ - "machine.pseries.max-cpu-compat", /* QEMU_CAPS_MACHINE_PSERI= ES_MAX_CPU_COMPAT */ + "machine.pseries.max-cpu-compat", /* X_QEMU_CAPS_MACHINE_PSE= RIES_MAX_CPU_COMPAT */ =20 /* 280 */ "dump-completed", /* QEMU_CAPS_DUMP_COMPLETED */ diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index b7bf47c51e..0d1e0e4b4a 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -436,7 +436,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ X_QEMU_CAPS_ISCSI_PASSWORD_SECRET, /* -drive file.driver=3Discsi,...,p= assword-secret=3D */ QEMU_CAPS_DEVICE_ISA_SERIAL, /* -device isa-serial */ QEMU_CAPS_DEVICE_PL011, /* -device pl011 (not user-instantiable) */ - QEMU_CAPS_MACHINE_PSERIES_MAX_CPU_COMPAT, /* -machine pseries,max-cpu-= compat=3D */ + X_QEMU_CAPS_MACHINE_PSERIES_MAX_CPU_COMPAT, /* -machine pseries,max-cp= u-compat=3D */ =20 /* 280 */ QEMU_CAPS_DUMP_COMPLETED, /* DUMP_COMPLETED event */ --=20 2.35.1 From nobody Sat May 11 08:15:28 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=1650029513; cv=none; d=zohomail.com; s=zohoarc; b=bzLaxxSfdjgMr9GpVvPrCfy+RteUCiQzxkvk4FPj5zh4OGy+3czR4wth+uxvK0Hoihn/f4mGXW3gu5FQvwU89DDxFm1XBv2XQViPlKDrWpHgDw/+53s95/50CxhRSZpOGU9ldvIk0xQQqNFp9yqVzZyZEsnnstlw7e7cB7tLb8o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1650029513; 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=WfItukivE3zXRapurY5fnwXErnn1Gx8RM3j2VFJ0xvU=; b=XpfSAH9mktMjRc7Sf6Rr49N8T+AzvLraoYGCYDBixLgAzTtFq/w0SEEyn8+5LRrm9oxyDjnVK/Xk9XIli5xp44Y+u5nOinawH551+xpS9fMzMN7lUp3h5GTXs7ReRz7RjEUzFg27YbUHIJbGsvyxHV8eSR2AGClkXnhHFpvoP6U= 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 1650029513939690.6051402542533; Fri, 15 Apr 2022 06:31:53 -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-662-4TaUyBYWOJGjqPnZg2dd7A-1; Fri, 15 Apr 2022 09:30:20 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9039D86B8A1; Fri, 15 Apr 2022 13:30:15 +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 7C447C44CDC; Fri, 15 Apr 2022 13:30:15 +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 9B93C193F6E8; Fri, 15 Apr 2022 13:30:14 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id C5999194034C for ; Fri, 15 Apr 2022 13:30:12 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 96A201458315; Fri, 15 Apr 2022 13:30:12 +0000 (UTC) Received: from harajuku.usersys.redhat.com.homenet.telecomitalia.it (unknown [10.40.192.7]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 26689145B97B for ; Fri, 15 Apr 2022 13:30:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1650029513; 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=WfItukivE3zXRapurY5fnwXErnn1Gx8RM3j2VFJ0xvU=; b=Za3ftNEzS4CMNlB7Vx/kb3XUWySpE3Ojo1NOxtuk8yO9QAHSQLHjNvQdFxmCY7CLrjX7fI iL7+3z+lAiyYwn/Mh3p4IGCb0Rk34mu+oG2y5ozdYVgmvBCkUV5cAONzrRLIDXpncXmnI+ RT0C7zed+qAzwjknh69rYg5YkbFE2Bc= X-MC-Unique: 4TaUyBYWOJGjqPnZg2dd7A-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 5/7] qemu: Assume QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT Date: Fri, 15 Apr 2022 15:30:04 +0200 Message-Id: <20220415133006.519142-6-abologna@redhat.com> In-Reply-To: <20220415133006.519142-1-abologna@redhat.com> References: <20220415133006.519142-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 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 2.85 on 10.11.54.8 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com 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: 1650029515666100001 Content-Type: text/plain; charset="utf-8"; x-default="true" All QEMU versions we support have this feature. Signed-off-by: Andrea Bolognani Reviewed-by: Peter Krempa --- src/qemu/qemu_validate.c | 8 -------- tests/qemuxml2argvtest.c | 18 +++++------------- tests/qemuxml2xmltest.c | 1 - 3 files changed, 5 insertions(+), 22 deletions(-) diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 96f5427678..b576efe375 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -62,14 +62,6 @@ qemuValidateDomainDefPSeriesFeature(const virDomainDef *= def, break; =20 if (def->hpt_resizing !=3D VIR_DOMAIN_HPT_RESIZING_NONE) { - if (!virQEMUCapsGet(qemuCaps, - QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("HTP resizing is not supported by this " - "QEMU binary")); - return -1; - } - str =3D virDomainHPTResizingTypeToString(def->hpt_resizing); if (!str) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index e5379b45d6..41fd032f19 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2267,8 +2267,7 @@ mymain(void) QEMU_CAPS_MACHINE_PSERIES_CAP_CCF_ASSIST, QEMU_CAPS_MACHINE_PSERIES_CAP_CFPC, QEMU_CAPS_MACHINE_PSERIES_CAP_SBBC, - QEMU_CAPS_MACHINE_PSERIES_CAP_IBS, - QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT); + QEMU_CAPS_MACHINE_PSERIES_CAP_IBS); =20 /* parse error: no QEMU_CAPS_MACHINE_PSERIES_CAP_HPT_MAX_PAGE_SIZE */ DO_TEST_PARSE_ERROR("pseries-features-hpt-pagesize", @@ -2278,8 +2277,7 @@ mymain(void) QEMU_CAPS_MACHINE_PSERIES_CAP_CCF_ASSIST, QEMU_CAPS_MACHINE_PSERIES_CAP_CFPC, QEMU_CAPS_MACHINE_PSERIES_CAP_SBBC, - QEMU_CAPS_MACHINE_PSERIES_CAP_IBS, - QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT); + QEMU_CAPS_MACHINE_PSERIES_CAP_IBS); =20 /* parse error: no QEMU_CAPS_MACHINE_PSERIES_CAP_HTM */ DO_TEST_PARSE_ERROR("pseries-features-htm", @@ -2289,8 +2287,7 @@ mymain(void) QEMU_CAPS_MACHINE_PSERIES_CAP_CCF_ASSIST, QEMU_CAPS_MACHINE_PSERIES_CAP_CFPC, QEMU_CAPS_MACHINE_PSERIES_CAP_SBBC, - QEMU_CAPS_MACHINE_PSERIES_CAP_IBS, - QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT); + QEMU_CAPS_MACHINE_PSERIES_CAP_IBS); =20 /* parse error: no QEMU_CAPS_MACHINE_PSERIES_CAP_NESTED_HV */ DO_TEST_PARSE_ERROR("pseries-features-nested-hv", @@ -2300,8 +2297,7 @@ mymain(void) QEMU_CAPS_MACHINE_PSERIES_CAP_CCF_ASSIST, QEMU_CAPS_MACHINE_PSERIES_CAP_CFPC, QEMU_CAPS_MACHINE_PSERIES_CAP_SBBC, - QEMU_CAPS_MACHINE_PSERIES_CAP_IBS, - QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT); + QEMU_CAPS_MACHINE_PSERIES_CAP_IBS); =20 /* parse error: no QEMU_CAPS_MACHINE_PSERIES_CAP_CCF_ASSIST */ DO_TEST_PARSE_ERROR("pseries-features-ccf", @@ -2311,13 +2307,11 @@ mymain(void) QEMU_CAPS_MACHINE_PSERIES_CAP_NESTED_HV, QEMU_CAPS_MACHINE_PSERIES_CAP_CFPC, QEMU_CAPS_MACHINE_PSERIES_CAP_SBBC, - QEMU_CAPS_MACHINE_PSERIES_CAP_IBS, - QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT); + QEMU_CAPS_MACHINE_PSERIES_CAP_IBS); =20 /* parse error: no QEMU_CAPS_MACHINE_PSERIES_CFPC */ DO_TEST_PARSE_ERROR("pseries-features-cfpc", QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, - QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT, QEMU_CAPS_MACHINE_PSERIES_CAP_HPT_MAX_PAGE_SIZE, QEMU_CAPS_MACHINE_PSERIES_CAP_HTM, QEMU_CAPS_MACHINE_PSERIES_CAP_NESTED_HV, @@ -2328,7 +2322,6 @@ mymain(void) /* parse error: no QEMU_CAPS_MACHINE_PSERIES_SBBC */ DO_TEST_PARSE_ERROR("pseries-features-sbbc", QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, - QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT, QEMU_CAPS_MACHINE_PSERIES_CAP_HPT_MAX_PAGE_SIZE, QEMU_CAPS_MACHINE_PSERIES_CAP_HTM, QEMU_CAPS_MACHINE_PSERIES_CAP_NESTED_HV, @@ -2339,7 +2332,6 @@ mymain(void) /* parse error: no QEMU_CAPS_MACHINE_PSERIES_IBS */ DO_TEST_PARSE_ERROR("pseries-features-ibs", QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE, - QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT, QEMU_CAPS_MACHINE_PSERIES_CAP_HPT_MAX_PAGE_SIZE, QEMU_CAPS_MACHINE_PSERIES_CAP_HTM, QEMU_CAPS_MACHINE_PSERIES_CAP_NESTED_HV, diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 4d2b2ad784..16d2269423 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -711,7 +711,6 @@ mymain(void) QEMU_CAPS_MACHINE_PSERIES_CAP_HTM, QEMU_CAPS_MACHINE_PSERIES_CAP_NESTED_HV, QEMU_CAPS_MACHINE_PSERIES_CAP_CCF_ASSIST, - QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT, QEMU_CAPS_MACHINE_PSERIES_CAP_CFPC, QEMU_CAPS_MACHINE_PSERIES_CAP_SBBC, QEMU_CAPS_MACHINE_PSERIES_CAP_IBS); --=20 2.35.1 From nobody Sat May 11 08:15:28 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=1650029421; cv=none; d=zohomail.com; s=zohoarc; b=M222Ri4nZp+GzWmqXKGOuaaP/L1nWWw41U2Y6RSWcBrNmwybrR0K+uh+NHnabgxHbM+8L2q/Y4ihwB1xxT/lzXjgZL83/zSUCx+gNck5XIGq52J3OZgHvJEjyuL61sJtMLuXgvGdOxlVVeiYHBAA2QVceXNztHSNZZ8VWPc7R5k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1650029421; 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=aNqFGY0aIHnW2+uPGT5wvoHsk53Z6jhSSr94uou3sc8=; b=KdegIb1HJbMA5yEvm4NwwGVpuFYLJ4IwVBTjGBYi8nKvlOosZBJCek9IZgKrDtFLhcYkCWESwPL9izm9LXWdMl+exBae4giRYlQ34D2ng+twzS2RX0/dZZ+mWe7iUrekpi+dg9WDT9IbZcdKAlnT+ot0tlhCG2XM14VwNKzAAlk= 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 1650029421120697.7561775522031; Fri, 15 Apr 2022 06:30:21 -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-472-JFuE7QJOMU6IBogrsvO97Q-1; Fri, 15 Apr 2022 09:30:18 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9E300801E80; Fri, 15 Apr 2022 13:30:14 +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 87BD943E78C; Fri, 15 Apr 2022 13:30: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 45C9A1940353; Fri, 15 Apr 2022 13:30:14 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 79BB119451EF for ; Fri, 15 Apr 2022 13:30:13 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 5C9A3145BA47; Fri, 15 Apr 2022 13:30:13 +0000 (UTC) Received: from harajuku.usersys.redhat.com.homenet.telecomitalia.it (unknown [10.40.192.7]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E0F0C145B984 for ; Fri, 15 Apr 2022 13:30:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1650029420; 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=aNqFGY0aIHnW2+uPGT5wvoHsk53Z6jhSSr94uou3sc8=; b=cWTluzHr7mpmdy4U7F15Ieis/KNhZwUbrzMuNiuOqyA+zVdOCJdDlp6VHtrRSf0hZsML7d 4O5rhLkH0jm9uxAtECB+FxsV6nyS7AwZrOUKbyE3+hF3DiN2va4cOx7HG+c/p2t4z+TJFf VpFgF5oW2PgnScv2m6f8PVJkkr+AZTM= X-MC-Unique: JFuE7QJOMU6IBogrsvO97Q-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 6/7] qemu: Stop setting QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT Date: Fri, 15 Apr 2022 15:30:05 +0200 Message-Id: <20220415133006.519142-7-abologna@redhat.com> In-Reply-To: <20220415133006.519142-1-abologna@redhat.com> References: <20220415133006.519142-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 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 2.85 on 10.11.54.9 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com 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: 1650029423195100007 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Andrea Bolognani Reviewed-by: Peter Krempa --- src/qemu/qemu_capabilities.c | 7 ++----- tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 - 8 files changed, 2 insertions(+), 12 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 222e5c539f..ebae08c9cf 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -5171,11 +5171,6 @@ virQEMUCapsInitQMPBasicArch(virQEMUCaps *qemuCaps) virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACH_VIRT_GIC_VERSION); break; =20 - case VIR_ARCH_PPC64: - case VIR_ARCH_PPC64LE: - virQEMUCapsSet(qemuCaps, QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT); - break; - case VIR_ARCH_S390: case VIR_ARCH_S390X: virQEMUCapsSet(qemuCaps, QEMU_CAPS_AES_KEY_WRAP); @@ -5209,6 +5204,8 @@ virQEMUCapsInitQMPBasicArch(virQEMUCaps *qemuCaps) case VIR_ARCH_PARISC: case VIR_ARCH_PARISC64: case VIR_ARCH_PPCLE: + case VIR_ARCH_PPC64: + case VIR_ARCH_PPC64LE: case VIR_ARCH_UNICORE32: case VIR_ARCH_XTENSA: case VIR_ARCH_XTENSAEB: diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_3.1.0.ppc64.xml index 52c4ee4dab..23116d61f7 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml @@ -93,7 +93,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_4.0.0.ppc64.xml index 5b5d38e16b..a84adc2610 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml @@ -99,7 +99,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_4.2.0.ppc64.xml index a8dac97115..10f5a9e2c5 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml @@ -99,7 +99,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_5.0.0.ppc64.xml index 429b40b06c..f2f3558fdc 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml @@ -101,7 +101,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_5.2.0.ppc64.xml index aae45c495a..b949f88b5a 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml @@ -99,7 +99,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_6.2.0.ppc64.xml index b3e6a05a07..9c9d9aa08e 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml @@ -99,7 +99,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_7.0.0.ppc64.xml index d44d8999b8..1ddca7d767 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml @@ -105,7 +105,6 @@ - --=20 2.35.1 From nobody Sat May 11 08:15:28 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=1650029425; cv=none; d=zohomail.com; s=zohoarc; b=migPMalguIqfacwimBZW3d4TWKMkSeQjdH84VrmAdQcmGdXFweMWNCZg0JkvacSU/tBrb7Lh6S7RbKE8Ywjqi2S8JRXHI9KYQ01rWJwhbvaPhfGQCFiuPfQdaSoEDR55V9y/qsa/48AZtkh+d7uYKaYGhEfCxzIeN0HrMl+rrq8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1650029425; 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=n35R4wSp+Brz489TBITRH7nx5bWmGGY7ePSIb/taQjo=; b=fsOqWcj8Ktb4ZI1Lt8yGdEkW1ZS9oNno+WegUZ10HNpsvVnjz+f2Tbg9xj8K1TrzuHdyaUTIFkVQEQDMKQd346KmEgeOR7e4TJoCfPGRaN5iZPs0VARDkSi29vG/sgLOPlMRKPdcmU2hZMME1vo/i7fw6kmKDQAetLjMNbaXcXE= 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 1650029425489304.6091672996189; Fri, 15 Apr 2022 06:30:25 -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-121-B1BmTzUKPia498ZM2GqW4w-1; Fri, 15 Apr 2022 09:30:19 -0400 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4CF143838CAD; Fri, 15 Apr 2022 13:30:16 +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 3888843E78F; Fri, 15 Apr 2022 13:30:16 +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 AF4D61940353; Fri, 15 Apr 2022 13:30:15 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 3136419451EF for ; Fri, 15 Apr 2022 13:30:14 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 22AF2145BA55; Fri, 15 Apr 2022 13:30:14 +0000 (UTC) Received: from harajuku.usersys.redhat.com.homenet.telecomitalia.it (unknown [10.40.192.7]) by smtp.corp.redhat.com (Postfix) with ESMTPS id A7493145BA47 for ; Fri, 15 Apr 2022 13:30:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1650029424; 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=n35R4wSp+Brz489TBITRH7nx5bWmGGY7ePSIb/taQjo=; b=VGEg7Dgq2P2H7QqB0/Kj1JFWoZv0Zs2Nax6FCwraA3QmMomWkyKHtrqPJiKQyUHp9GToXx trfYUkL/UD+D8PdGj5XnrgrSvJl07HdAb5tyz8MMt5oJosyhqWt+S7qpcIvG9DvDcvVbxO dEKBYxhGUM2dKjCIUNX3ZB3RhA238/8= X-MC-Unique: B1BmTzUKPia498ZM2GqW4w-1 X-Original-To: libvir-list@listman.corp.redhat.com From: Andrea Bolognani To: libvir-list@redhat.com Subject: [libvirt PATCH 7/7] qemu: Retire QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT Date: Fri, 15 Apr 2022 15:30:06 +0200 Message-Id: <20220415133006.519142-8-abologna@redhat.com> In-Reply-To: <20220415133006.519142-1-abologna@redhat.com> References: <20220415133006.519142-1-abologna@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 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 2.85 on 10.11.54.9 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=libvir-list-bounces@redhat.com 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: 1650029427212100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Andrea Bolognani Reviewed-by: Peter Krempa --- src/qemu/qemu_capabilities.c | 2 +- src/qemu/qemu_capabilities.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index ebae08c9cf..b91db851bb 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -450,7 +450,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "virtio-blk.num-queues", /* QEMU_CAPS_VIRTIO_BLK_NUM_QUEUES = */ =20 /* 270 */ - "machine.pseries.resize-hpt", /* QEMU_CAPS_MACHINE_PSERIES_R= ESIZE_HPT */ + "machine.pseries.resize-hpt", /* X_QEMU_CAPS_MACHINE_PSERIES= _RESIZE_HPT */ "vmcoreinfo", /* QEMU_CAPS_DEVICE_VMCOREINFO */ "spapr-vty", /* QEMU_CAPS_DEVICE_SPAPR_VTY */ "sclplmconsole", /* QEMU_CAPS_DEVICE_SCLPLMCONSOLE */ diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 0d1e0e4b4a..9b240e47fb 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -425,7 +425,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ QEMU_CAPS_VIRTIO_BLK_NUM_QUEUES, /* virtio-blk-*.num-queues */ =20 /* 270 */ - QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT, /* -machine pseries,resize-hpt */ + X_QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT, /* -machine pseries,resize-hpt= */ QEMU_CAPS_DEVICE_VMCOREINFO, /* -device vmcoreinfo */ QEMU_CAPS_DEVICE_SPAPR_VTY, /* -device spapr-vty */ QEMU_CAPS_DEVICE_SCLPLMCONSOLE, /* -device sclplmconsole */ --=20 2.35.1