From nobody Mon Feb 9 03:14:02 2026 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=1632151926; cv=none; d=zohomail.com; s=zohoarc; b=Ofx8lMuWfgcu4ky/qXXbo4mG5VUbXdngYAObQTPqBmWtI07DIEXrYPIgMt/pyXiGrKWdtwdP4924Q2pgqD5ztdwHAYGG+WmkeCfwNCSqQ1pCAyI3jHCpvKLqhugACbagzvqrqEG7TPpZr0S/yTIiIPEvjUh1BciELkdPBjH2xrY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1632151926; 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=Wnfz95W8G1lbNbMKCw1A0Ne0HIjUk0RcxFOe+KQa+pA=; b=Pr4tJJty+hyf7n47QKz8+WKMiyhg/p5JA2hy/P9OUzA9Kyiqi9MIQacQoJIqto203LKFRg7XhxK4ugV4WrKHzLSjUUFfcGaguXI4XVR70HQ/1+tcsafcrIpki6Lop9LM6hou4X4WLorhdm9Y8L4FUCwJLODaRmpw4qFXnG8TLm4= 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 1632151926630520.8445939588709; Mon, 20 Sep 2021 08:32:06 -0700 (PDT) Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-79-dvvEfmJlMsGFK48Tk795bA-1; Mon, 20 Sep 2021 11:31:09 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C83A883DB27; Mon, 20 Sep 2021 15:31:03 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AA35C60938; Mon, 20 Sep 2021 15:31:03 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 5272D4EA38; Mon, 20 Sep 2021 15:31:03 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 18KFV2Gn017676 for ; Mon, 20 Sep 2021 11:31:02 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3CB3D60C5F; Mon, 20 Sep 2021 15:31:02 +0000 (UTC) Received: from speedmetal.redhat.com (unknown [10.40.208.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id 95F5D60C4A for ; Mon, 20 Sep 2021 15:30:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1632151925; 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=Wnfz95W8G1lbNbMKCw1A0Ne0HIjUk0RcxFOe+KQa+pA=; b=eHuaBw7ca1+T+OMCg/GcrcEQ1I+VAHriqwO1o/GyC3ZsExPQoy0+swDiwIiZbZUsPo08/t dSA26/uhxj4QKzCeNTgEsEA5meYSGw7v8fQS34WA3j2FYLAxmFieKoP4gO+0yv0I6k0v3P UNprptvDZ7uNsRxc6oi29AqUVMby5LU= X-MC-Unique: dvvEfmJlMsGFK48Tk795bA-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 09/14] qemu: Always assume QEMU_CAPS_MEM_MERGE Date: Mon, 20 Sep 2021 17:29:31 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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: 1632151927612100001 Content-Type: text/plain; charset="utf-8" Supported since qemu commit 8490fc78e7 ("add -machine mem-merge=3Don|off option") released in qemu-v1.3.0 and can't be compiled out. Assume that it's present and remove the validation code. Signed-off-by: Peter Krempa --- src/qemu/qemu_validate.c | 7 ------- tests/qemuxml2argvtest.c | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index eb985956e4..c4b7269589 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -757,13 +757,6 @@ qemuValidateDomainDefMemory(const virDomainDef *def, return -1; } - if (mem->nosharepages && !virQEMUCapsGet(qemuCaps, QEMU_CAPS_MEM_MERGE= )) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("disable shared memory is not available " - "with this QEMU binary")); - return -1; - } - return 0; } diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 1cbbf9bd24..77e384f67c 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1291,7 +1291,7 @@ mymain(void) QEMU_CAPS_OBJECT_MEMORY_FILE); DO_TEST_CAPS_LATEST("hugepages-memaccess3"); DO_TEST_CAPS_LATEST("hugepages-nvdimm"); - DO_TEST("nosharepages", QEMU_CAPS_MEM_MERGE); + DO_TEST_NOCAPS("nosharepages"); DO_TEST_NOCAPS("disk-cdrom"); DO_TEST_CAPS_VER("disk-cdrom", "2.12.0"); DO_TEST_CAPS_LATEST("disk-cdrom"); --=20 2.31.1