From nobody Fri May 17 03:39:48 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=1660920350; cv=none; d=zohomail.com; s=zohoarc; b=dMYMGvwVS/jMxC12hQTcJ8jWv4lDAPXVymNug2Xs2+uuNDIkYoHYHf2y+YmxqCIWh/P3pGDX6a58WOU9DN5i8s/DjTlYIe7/glj8SnG2Z4scSJJQJ5pqPqTeyv00LDAz6zroAbUHKyP28uFguy28yIRY0JjnBL86NLxX90qE7x4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1660920350; 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=/isPf2vycnTY++FtmPEfq2cXMH7BeSewPjQA+f6Yh7Q=; b=YuK6Tg5uLCwmXRAmyZI9tII0RL7uk/UFS83CqeH3iLcoL2JnJevmbkXy+fgdoy7cLgV212Mb02x4w4Sk8AJYdsOkGyMCwlY+w7diRgFZtpZ2FTl3dyKvPQs8O+gwLBYQEv3AY2Y8T1c345l5GR2bl734Xac9EEMncBm3mOjoB7M= 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 1660920350330554.9723892328407; Fri, 19 Aug 2022 07:45:50 -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-241-7V2ReYcMMP2h-Yl9wwdW7Q-1; Fri, 19 Aug 2022 10:45:45 -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 ADA451019C9C; Fri, 19 Aug 2022 14:45:42 +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 9BC39C15BBD; Fri, 19 Aug 2022 14:45:42 +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 AC71B1953556; Fri, 19 Aug 2022 14:45:38 +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 63626194F4BC for ; Fri, 19 Aug 2022 14:45:37 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 5312C400DFA6; Fri, 19 Aug 2022 14:45:37 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id F344840CF8EE for ; Fri, 19 Aug 2022 14:45:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1660920349; 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=/isPf2vycnTY++FtmPEfq2cXMH7BeSewPjQA+f6Yh7Q=; b=fXEQcHXMuwY5+vlQ4XPcKczdpr/cVmzWRqa90UfZ7b9/3NLs5hYKSSNrePsHPrRjw4rp2I 2uuNxkSfAWV5YHjSMwIogBgGvBzNAwIGvHj+42NSsiQ8TPf77kZzpzZii/YKNGEExo7CBN q2bdfXy/GCFVexqC+bmPtbOeMr3gPus= X-MC-Unique: 7V2ReYcMMP2h-Yl9wwdW7Q-1 X-Original-To: libvir-list@listman.corp.redhat.com From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 1/6] qemu: always assume QEMU_CAPS_DUMP_GUEST_MEMORY Date: Fri, 19 Aug 2022 16:45:30 +0200 Message-Id: <22f311166c2496ab4f04595ebca3dea01fb1520a.1660920294.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 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 2.85 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1660920352206100003 Introduced back in 2012 by QEMU commit: commit 783e9b4826b95e53e33c42db6b4bd7d89bdff147 introduce a new monitor command 'dump-guest-memory' to dump guest's m= emory Released in QEMU 1.2.0 Signed-off-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/qemu/qemu_driver.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 637a748c85..707f4cc1bb 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -3052,12 +3052,6 @@ qemuDumpToFd(virQEMUDriver *driver, bool detach =3D false; int ret =3D -1; =20 - if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DUMP_GUEST_MEMORY)) { - virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s", - _("dump-guest-memory is not supported")); - return -1; - } - detach =3D virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_DUMP_COMPLETED); =20 if (qemuSecuritySetImageFDLabel(driver->securityManager, vm->def, fd) = < 0) --=20 2.37.1 From nobody Fri May 17 03:39:48 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=1660920350; cv=none; d=zohomail.com; s=zohoarc; b=Xento0sti9iUOWkLkGPOdI0efJBI0QWQXyiYflQfGmQhpdG0DVk3g6sijJ6DCYn1HD+niuAV5lyS5RLT6GGnGEHqytDkEjv6C5jpR4uujTeiA7OlCDt2E1dbYXIznWp6KdS/IU3bDNyrHzuhk7/EMVlWZfpKKrfMVHtOP0z5Wi8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1660920350; 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=hKsyjwFRF7ghXVo6Ld/WC9lBC9EGz1jixCIv0oQujJk=; b=inpIYup0fHBlawjistI0rdnszjWE7r4V65k6ZzJrwfPWlEfAR700ANua185ITIfXrzjnnprsOr27yT6/6jJbl4W1Xp84Me/gagvkHnhuIKvqi8HxN3e/CXV/CKIjyrp6wwzbaX1XlSDyy0ryhEDahImU/eleIolPRD1H/VnBcAA= 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 1660920350551420.24334816310113; Fri, 19 Aug 2022 07:45:50 -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-642-2V7qmB01PNO8KZcI_eGLhg-1; Fri, 19 Aug 2022 10:45:45 -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 AAAB5824062; Fri, 19 Aug 2022 14:45:43 +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 9503D404C6E3; Fri, 19 Aug 2022 14:45:43 +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 68D891953564; Fri, 19 Aug 2022 14:45:39 +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 10C2D194F841 for ; Fri, 19 Aug 2022 14:45:38 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 0609F40CFD0B; Fri, 19 Aug 2022 14:45:38 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8AC2340CFD0A for ; Fri, 19 Aug 2022 14:45:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1660920349; 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=hKsyjwFRF7ghXVo6Ld/WC9lBC9EGz1jixCIv0oQujJk=; b=iqqg9K1WWhgz0pa31NCwqVHzhF/0gpfQl8DPPYfWduLzRE3XDS2DAe4Rq5tL942h5Ex0n2 owy8VL6XNDqHdqD6/iHjjzq2sRUmzG3mujR5UH9U5z5Z8K98csEcOGsuvS4rEIWtFGQNkK a7ddQaCdzaBChpZMVIV7Rhc/UD93RQc= X-MC-Unique: 2V7qmB01PNO8KZcI_eGLhg-1 X-Original-To: libvir-list@listman.corp.redhat.com From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 2/6] qemu: retire QEMU_CAPS_DUMP_GUEST_MEMORY Date: Fri, 19 Aug 2022 16:45:31 +0200 Message-Id: <30cdfbc2aa8772b0dd2e0bfd6720574d79107e57.1660920294.git.jtomko@redhat.com> In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 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 2.84 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1660920352231100004 Signed-off-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/qemu/qemu_capabilities.c | 3 +-- src/qemu/qemu_capabilities.h | 2 +- tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 - 28 files changed, 2 insertions(+), 29 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index f7986ef938..d1d740d0b2 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -196,7 +196,7 @@ VIR_ENUM_IMPL(virQEMUCaps, "ide-cd", /* X_QEMU_CAPS_IDE_CD */ "no-user-config", /* X_QEMU_CAPS_NO_USER_CONFIG */ "hda-micro", /* QEMU_CAPS_HDA_MICRO */ - "dump-guest-memory", /* QEMU_CAPS_DUMP_GUEST_MEMORY */ + "dump-guest-memory", /* X_QEMU_CAPS_DUMP_GUEST_MEMORY */ =20 /* 95 */ "nec-usb-xhci", /* QEMU_CAPS_NEC_USB_XHCI */ @@ -1205,7 +1205,6 @@ struct virQEMUCapsStringFlags { =20 =20 struct virQEMUCapsStringFlags virQEMUCapsCommands[] =3D { - { "dump-guest-memory", QEMU_CAPS_DUMP_GUEST_MEMORY }, { "query-spice", QEMU_CAPS_SPICE }, { "query-vnc", QEMU_CAPS_VNC }, { "nbd-server-start", QEMU_CAPS_NBD_SERVER }, diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index cccb3659aa..440561d496 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -174,7 +174,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for = syntax-check */ X_QEMU_CAPS_IDE_CD, /* -device ide-cd */ X_QEMU_CAPS_NO_USER_CONFIG, /* -no-user-config */ QEMU_CAPS_HDA_MICRO, /* -device hda-micro */ - QEMU_CAPS_DUMP_GUEST_MEMORY, /* dump-guest-memory command */ + X_QEMU_CAPS_DUMP_GUEST_MEMORY, /* dump-guest-memory command */ =20 /* 95 */ QEMU_CAPS_NEC_USB_XHCI, /* -device nec-usb-xhci */ diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_4.2.0.aarch64.xml index de3ef449fe..5e95d09e10 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml @@ -19,7 +19,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_4.2.0.ppc64.xml index 173023c704..85a89af2ac 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml @@ -18,7 +18,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_4.2.0.s390x.xml index 141d82857f..69fe7d3447 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml @@ -9,7 +9,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemuc= apabilitiesdata/caps_4.2.0.x86_64.xml index 04c3b206f7..35bdba931d 100644 --- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml @@ -24,7 +24,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_5.0.0.aarch64.xml index 9d876a3408..58a65d247a 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml @@ -19,7 +19,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_5.0.0.ppc64.xml index b1353f23eb..a22bff9f1e 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml @@ -18,7 +18,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemu= capabilitiesdata/caps_5.0.0.riscv64.xml index 92e51a478a..6d537abbdd 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml @@ -21,7 +21,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 70843813bc..e35ba8111f 100644 --- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml @@ -24,7 +24,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemuca= pabilitiesdata/caps_5.1.0.sparc.xml index 7c2a77e7c5..dabf2f505f 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml @@ -8,7 +8,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 c427737724..f16ed680df 100644 --- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml @@ -24,7 +24,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_5.2.0.aarch64.xml index b3099f138a..e48bf28996 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml @@ -19,7 +19,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_5.2.0.ppc64.xml index cab644c543..9dc12389f0 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml @@ -18,7 +18,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemu= capabilitiesdata/caps_5.2.0.riscv64.xml index 5b86d9bfc6..bb5c298277 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml @@ -21,7 +21,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_5.2.0.s390x.xml index e491de1c71..ac861cf914 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml @@ -9,7 +9,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 5fe99a7e79..84dab41317 100644 --- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml @@ -24,7 +24,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_6.0.0.aarch64.xml index 5a43616888..1c4825330b 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml @@ -18,7 +18,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemuca= pabilitiesdata/caps_6.0.0.s390x.xml index a6fcfed213..8210fe7406 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml @@ -9,7 +9,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 b96c8c2d2b..9a43c0dc60 100644 --- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml @@ -23,7 +23,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 35bd9b6327..6c657f6f16 100644 --- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml @@ -23,7 +23,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_6.2.0.aarch64.xml index 663b94b1ff..b4a9a12d6e 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml @@ -22,7 +22,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_6.2.0.ppc64.xml index 2468780a51..3d18388695 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml @@ -17,7 +17,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 e3f9ee47bd..09f012875d 100644 --- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml @@ -23,7 +23,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml b/tests/qemu= capabilitiesdata/caps_7.0.0.aarch64.xml index 5ca77807ef..c3a626f3b1 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml @@ -22,7 +22,6 @@ - diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml b/tests/qemuca= pabilitiesdata/caps_7.0.0.ppc64.xml index cd41a08fa9..df835b8fa5 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml @@ -21,7 +21,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 86fe88b878..f444d70827 100644 --- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml @@ -23,7 +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 7f17b2360a..6c8b54b3cc 100644 --- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml @@ -23,7 +23,6 @@ - --=20 2.37.1 From nobody Fri May 17 03:39:48 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=1660920434; cv=none; d=zohomail.com; s=zohoarc; b=dqGXd9Bv+gy0DSG5CCk63vsdvQHKkkOVHf052rNIaFak73LYzvOFN8oPMY+k8i/sQdOrYzWWqJEac6zOQj0Um9y94/iAwI4DzwvMMjFEPLQtBSVMY7d7M3qqy8iNmyusjIJ4umoYS39yZcIVHD2ZsnP/x0tMXdM9I6ZWRnEl/RM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1660920434; 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=6afEku3JHSQJy3izahyA82r9/R4IQmmAIrEMSt6vHog=; b=ZhHc/lmrGt3Bkw7hcNTLp0Uvwej9DpTA8jbFpr1bzi2aIfK7I0tFnRs02qb/tAq7HwBvOtflHNUM6zCMEr7+66KdH7Vw9qSHubia9M/f+kSlfSRgr4r953HTlc8MVBI77lz8wIx8mnwWSe97RiYcRWr5CDVruhcX9+bbMlJ3CrI= 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 1660920434495299.73703715901695; Fri, 19 Aug 2022 07:47:14 -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-39-8rSqzGK-O0uZlCAKf0Sk-Q-1; Fri, 19 Aug 2022 10:45:49 -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 B30EC38035A4; Fri, 19 Aug 2022 14:45:44 +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 9721CC15D4F; Fri, 19 Aug 2022 14:45:44 +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 A348A1953570; Fri, 19 Aug 2022 14:45:39 +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 9B48F194F4B3 for ; Fri, 19 Aug 2022 14:45:38 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 90EFB40CFD0D; Fri, 19 Aug 2022 14:45:38 +0000 (UTC) Received: from hjs.redhat.com (unknown [10.43.2.85]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3CBF640CFD0A for ; Fri, 19 Aug 2022 14:45:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1660920433; 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=6afEku3JHSQJy3izahyA82r9/R4IQmmAIrEMSt6vHog=; b=cmgC+ZEf5NQNQb8aUvmu/nxQ8y5/a2OyO/pedmV1As4cCq0roZ9/TzK+LP76yyFvaQx07e jADIRIPozpJCwfH0uKXofe56K5picNLb8V6bwq4HEaMPm2rIk8Nn2gGy1CrNmceGkskIwv lSwM40PFFJ9/9xpAsiy7rtdRSS/GvFk= X-MC-Unique: 8rSqzGK-O0uZlCAKf0Sk-Q-1 X-Original-To: libvir-list@listman.corp.redhat.com From: =?UTF-8?q?J=C3=A1n=20Tomko?= To: libvir-list@redhat.com Subject: [libvirt PATCH 3/6] qemu: always assume QEMU_CAPS_*_HOLE64_SIZE Date: Fri, 19 Aug 2022 16:45:32 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 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 2.85 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1660920434872100001 Introduced back in 2013 by QEMU commit: commit 398489018183d613306ab022653552247d93919f pc: limit 64 bit hole to 2G by default Released in 1.6.0 Signed-off-by: J=C3=A1n Tomko Reviewed-by: Peter Krempa --- src/qemu/qemu_validate.c | 14 ---------- tests/qemuxml2argvdata/pcihole64-none.err | 1 - tests/qemuxml2argvdata/pcihole64-none.xml | 25 ----------------- tests/qemuxml2argvtest.c | 6 ++--- tests/qemuxml2xmloutdata/pcihole64-none.xml | 30 --------------------- tests/qemuxml2xmltest.c | 8 +++--- 6 files changed, 5 insertions(+), 79 deletions(-) delete mode 100644 tests/qemuxml2argvdata/pcihole64-none.err delete mode 100644 tests/qemuxml2argvdata/pcihole64-none.xml delete mode 100644 tests/qemuxml2xmloutdata/pcihole64-none.xml diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 41765bba37..703d9776a9 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -3984,13 +3984,6 @@ qemuValidateDomainDeviceDefControllerPCI(const virDo= mainControllerDef *cont, "supported for machine '%s'"), def->os.ma= chine); return -1; } - - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_I440FX_PCI_HOLE64_SIZE= )) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("64-bit PCI hole size setting is not supp= orted " - "with this QEMU binary")); - return -1; - } } break; =20 @@ -4002,13 +3995,6 @@ qemuValidateDomainDeviceDefControllerPCI(const virDo= mainControllerDef *cont, "supported for machine '%s'"), def->os.ma= chine); return -1; } - - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_Q35_PCI_HOLE64_SIZE)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("64-bit PCI hole size setting is not supp= orted " - "with this QEMU binary")); - return -1; - } } break; =20 diff --git a/tests/qemuxml2argvdata/pcihole64-none.err b/tests/qemuxml2argv= data/pcihole64-none.err deleted file mode 100644 index 049065a763..0000000000 --- a/tests/qemuxml2argvdata/pcihole64-none.err +++ /dev/null @@ -1 +0,0 @@ -unsupported configuration: 64-bit PCI hole size setting is not supported w= ith this QEMU binary diff --git a/tests/qemuxml2argvdata/pcihole64-none.xml b/tests/qemuxml2argv= data/pcihole64-none.xml deleted file mode 100644 index e924747418..0000000000 --- a/tests/qemuxml2argvdata/pcihole64-none.xml +++ /dev/null @@ -1,25 +0,0 @@ - - foo - c84fc647-6198-4ff9-bf81-d65a1f8f5ec0 - 2097152 - 2097152 - 2 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-x86_64 - - 0 - - - - - - - diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 8933e373f7..639443b8a8 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2796,13 +2796,11 @@ mymain(void) DO_TEST("hotplug-base", QEMU_CAPS_KVM, QEMU_CAPS_VIRTIO_SCSI); =20 - DO_TEST("pcihole64", QEMU_CAPS_I440FX_PCI_HOLE64_SIZE); - DO_TEST_PARSE_ERROR_NOCAPS("pcihole64-none"); + DO_TEST_NOCAPS("pcihole64"); DO_TEST("pcihole64-q35", QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI, - QEMU_CAPS_DEVICE_QXL, - QEMU_CAPS_Q35_PCI_HOLE64_SIZE); + QEMU_CAPS_DEVICE_QXL); =20 DO_TEST_NOCAPS("arm-vexpressa9-nodevs"); DO_TEST_NOCAPS("arm-vexpressa9-basic"); diff --git a/tests/qemuxml2xmloutdata/pcihole64-none.xml b/tests/qemuxml2xm= loutdata/pcihole64-none.xml deleted file mode 100644 index c4b12510bf..0000000000 --- a/tests/qemuxml2xmloutdata/pcihole64-none.xml +++ /dev/null @@ -1,30 +0,0 @@ - - foo - c84fc647-6198-4ff9-bf81-d65a1f8f5ec0 - 2097152 - 2097152 - 2 - - hvm - - - - destroy - restart - destroy - - /usr/bin/qemu-system-x86_64 - - 0 - - -
- - - -