From nobody Sun Feb 8 03:57:58 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.74 as permitted sender) client-ip=63.128.21.74; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-74.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.74 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1585258331; cv=none; d=zohomail.com; s=zohoarc; b=bz6q4iugpWfPwfzv8JhZoo0SPDKvsu/n4Nh0eUb13bZ531Pyz2vXDdbgk7zETGMtLAjzk6LXcRhVRFR4uax4HbEgPrmQNEfMwaSIh6eTm9q00cQtkB7CgscIK/pE8gReIBbXug3b9AnnbbVYfEbM9Lbp/OUxjN7nsi2Kd24nvOs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1585258331; h=Content-Type:Content-Transfer-Encoding:Cc: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=ayV0l62Q8KPQCFmqBo6Sd5H78GrW0wE1PNG+e/zlhYA=; b=SXoZThSGF9FkrsYudkuK3NSsT1wH42j0N5J8F/aNIeXwudWdmSu/U5OtL+uOy9ZG0R9lGPIYYe+vVK5Cvzd2hI3B8QKaBcHQXApb2m744SGAy/mZ6muqBhv53OoxyVqVeuElkjqqpm8mTyYUnIf/ABSKjrtwuRvZCGwgbdCfdDQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.74 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from us-smtp-delivery-74.mimecast.com (us-smtp-delivery-74.mimecast.com [63.128.21.74]) by mx.zohomail.com with SMTPS id 1585258331395213.29170586449402; Thu, 26 Mar 2020 14:32:11 -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-14-RmtrYMGHO6iQt_iDdn9WtA-1; Thu, 26 Mar 2020 17:32:07 -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 1B594107ACCD; Thu, 26 Mar 2020 21:32:01 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B6A0B92F9D; Thu, 26 Mar 2020 21:31:59 +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 779B218089C8; Thu, 26 Mar 2020 21:31:52 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 02QLVjQ1010192 for ; Thu, 26 Mar 2020 17:31:45 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4B453105541B; Thu, 26 Mar 2020 21:31:45 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast02.extmail.prod.ext.rdu2.redhat.com [10.11.55.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 462EF1055419 for ; Thu, 26 Mar 2020 21:31:45 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 239928007B3 for ; Thu, 26 Mar 2020 21:31:45 +0000 (UTC) Received: from mail-qt1-f182.google.com (mail-qt1-f182.google.com [209.85.160.182]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-309-koCEsV4XNcSCVP8_GWeffw-1; Thu, 26 Mar 2020 17:31:42 -0400 Received: by mail-qt1-f182.google.com with SMTP id z24so5655669qtu.4; Thu, 26 Mar 2020 14:31:42 -0700 (PDT) Received: from rekt.redhat.com ([2804:431:c7c6:e1ce:90c:c960:468:c347]) by smtp.gmail.com with ESMTPSA id x37sm2357719qtc.90.2020.03.26.14.31.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Mar 2020 14:31:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1585258330; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=ayV0l62Q8KPQCFmqBo6Sd5H78GrW0wE1PNG+e/zlhYA=; b=Fmefje+x6bIQC+bPrLIbrEJwwYyfbHZ1raq+RfJd3ZUTOKWdpbSQCNb5Q27YQZ1kJJI84H wnHpUJ+Ibf7TKWJtv9NDBIvliESA+HRElBHq8a3TlKmvOokxx1Ul7R91JxZjxKRr0xFiS7 rq5vG+l/iFAu8PmtdgWRicqKHFsv9cM= X-MC-Unique: RmtrYMGHO6iQt_iDdn9WtA-1 X-MC-Unique: koCEsV4XNcSCVP8_GWeffw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Um06ZuyQqtgms0Y1NACqaqelcRysPmcV24Lg0gtw7Qg=; b=q/eI2yITe3IVh9l6utiKTFkc9cHDcRuXBFwc7i55ckMlnbVXT1dM/Nq+RrPgb3sDMj 3k8FbGVY3rXTJ3EIlF3dRLQyTjHcY4f0cXOGQUjaaTEvy0GEhv7XJDwHzGPQzg3UdKJw lE1smmy8XPwVUnLlQ1I0QOmwDgEDURVIUA60tkNM/oUEwoNoo3fVZsHTpGthOdkAkbmw 7b3VvPwQGlf5Y8j7tistTmrzCc4+ukmIPJ/XsiI7bPWBIH8IMDEQ7p/WXw1dNCc1BiRU L/NcNVIX53vrvA3oXPmC9lr7ZuCCk5qMamFEiCbV7kV+YeUV4hEowl0OA1CL7c3aUhyu /iKA== X-Gm-Message-State: ANhLgQ1OIpzY4c3TmUg3dCFtgqvi3toHENz6qbvfNbHW5aWo6lYZ+R0r qG2cqraXdKUvfB1eEX5b2/xVMBX5 X-Google-Smtp-Source: ADFU+vvYJnvxmyPX6q31+cbHR98rx0ltJ7oHChBBv7TjDDVtew0s2Kr7b6Cy58TNETwXImLbGeZFKw== X-Received: by 2002:ac8:18a7:: with SMTP id s36mr6554958qtj.389.1585258300954; Thu, 26 Mar 2020 14:31:40 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Subject: [PATCH 02/15] qemu: move static functions of qemuDomainDefValidate() Date: Thu, 26 Mar 2020 18:31:12 -0300 Message-Id: <20200326213125.2306013-3-danielhb413@gmail.com> In-Reply-To: <20200326213125.2306013-1-danielhb413@gmail.com> References: <20200326213125.2306013-1-danielhb413@gmail.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-MIME-Autoconverted: from quoted-printable to 8bit by lists01.pubmisc.prod.ext.phx2.redhat.com id 02QLVjQ1010192 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza , pkrempa@redhat.com, crobinso@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 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" We're going to move qemuDomainDefValidate() to qemu_validate.c in two steps. First steps is to finish up moving all static functions qemuDomainDefValidate() uses, then in the next patch we can move the function itself. Signed-off-by: Daniel Henrique Barboza --- src/qemu/qemu_domain.c | 394 +-------------------------------------- src/qemu/qemu_validate.c | 381 +++++++++++++++++++++++++++++++++++++ src/qemu/qemu_validate.h | 16 ++ 3 files changed, 404 insertions(+), 387 deletions(-) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index c4f36b000b..413ce4a2dc 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5040,148 +5040,6 @@ qemuDomainDefGetVcpuHotplugGranularity(const virDom= ainDef *def) #define QEMU_MAX_VCPUS_WITHOUT_EIM 255 =20 =20 -static int -qemuDomainDefValidateMemory(const virDomainDef *def, - virQEMUCapsPtr qemuCaps) -{ - const long system_page_size =3D virGetSystemPageSizeKB(); - const virDomainMemtune *mem =3D &def->mem; - - if (mem->nhugepages =3D=3D 0) - return 0; - - if (mem->allocation =3D=3D VIR_DOMAIN_MEMORY_ALLOCATION_ONDEMAND) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("hugepages are not allowed with memory " - "allocation ondemand")); - return -1; - } - - if (mem->source =3D=3D VIR_DOMAIN_MEMORY_SOURCE_ANONYMOUS) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("hugepages are not allowed with anonymous " - "memory source")); - return -1; - } - - if (mem->source =3D=3D VIR_DOMAIN_MEMORY_SOURCE_MEMFD && - !virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_MEMORY_MEMFD_HUGETLB)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("hugepages is not supported with memfd memory sou= rce")); - return -1; - } - - /* We can't guarantee any other mem.access - * if no guest NUMA nodes are defined. */ - if (mem->hugepages[0].size !=3D system_page_size && - virDomainNumaGetNodeCount(def->numa) =3D=3D 0 && - mem->access !=3D VIR_DOMAIN_MEMORY_ACCESS_DEFAULT && - mem->access !=3D VIR_DOMAIN_MEMORY_ACCESS_PRIVATE) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("memory access mode '%s' not supported " - "without guest numa node"), - virDomainMemoryAccessTypeToString(mem->access)); - 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; -} - - -static int -qemuDomainDefValidateNuma(const virDomainDef *def, - virQEMUCapsPtr qemuCaps) -{ - const long system_page_size =3D virGetSystemPageSizeKB(); - size_t ncells =3D virDomainNumaGetNodeCount(def->numa); - size_t i; - bool hasMemoryCap =3D virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_MEMORY= _RAM) || - virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_MEMORY_F= ILE) || - virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_MEMORY_M= EMFD); - - if (virDomainNumatuneHasPerNodeBinding(def->numa) && !hasMemoryCap) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Per-node memory binding is not supported " - "with this QEMU")); - return -1; - } - - if (def->mem.nhugepages && - def->mem.hugepages[0].size !=3D system_page_size && - !virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_MEMORY_FILE)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("huge pages per NUMA node are not " - "supported with this QEMU")); - return -1; - } - - for (i =3D 0; i < ncells; i++) { - g_autofree char * cpumask =3D NULL; - - if (!hasMemoryCap && - virDomainNumaGetNodeMemoryAccessMode(def->numa, i)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Shared memory mapping is not supported " - "with this QEMU")); - return -1; - } - - if (!(cpumask =3D virBitmapFormat(virDomainNumaGetNodeCpumask(def-= >numa, i)))) - return -1; - - if (strchr(cpumask, ',') && - !virQEMUCapsGet(qemuCaps, QEMU_CAPS_NUMA)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("disjoint NUMA cpu ranges are not supported " - "with this QEMU")); - return -1; - } - - } - - if (virDomainNumaNodesDistancesAreBeingSet(def->numa) && - !virQEMUCapsGet(qemuCaps, QEMU_CAPS_NUMA_DIST)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("setting NUMA distances is not " - "supported with this qemu")); - return -1; - } - - return 0; -} - - -static int -qemuDomainValidateCpuCount(const virDomainDef *def, - virQEMUCapsPtr qemuCaps) -{ - unsigned int maxCpus =3D virQEMUCapsGetMachineMaxCpus(qemuCaps, def->v= irtType, - def->os.machine); - - if (virDomainDefGetVcpus(def) =3D=3D 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("Domain requires at least 1 vCPU")); - return -1; - } - - if (maxCpus > 0 && virDomainDefGetVcpusMax(def) > maxCpus) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Maximum CPUs greater than specified machine " - "type limit %u"), maxCpus); - return -1; - } - - return 0; -} - - static int qemuDomainDeviceDefValidateNVRAM(virDomainNVRAMDefPtr nvram, const virDomainDef *def, @@ -5236,244 +5094,6 @@ qemuDomainDeviceDefValidateHub(virDomainHubDefPtr h= ub, } =20 =20 -static int -qemuDomainDefValidateClockTimers(const virDomainDef *def, - virQEMUCapsPtr qemuCaps) -{ - size_t i; - - for (i =3D 0; i < def->clock.ntimers; i++) { - virDomainTimerDefPtr timer =3D def->clock.timers[i]; - - switch ((virDomainTimerNameType)timer->name) { - case VIR_DOMAIN_TIMER_NAME_PLATFORM: - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unsupported timer type (name) '%s'"), - virDomainTimerNameTypeToString(timer->name)); - return -1; - - case VIR_DOMAIN_TIMER_NAME_TSC: - case VIR_DOMAIN_TIMER_NAME_KVMCLOCK: - case VIR_DOMAIN_TIMER_NAME_HYPERVCLOCK: - case VIR_DOMAIN_TIMER_NAME_LAST: - break; - - case VIR_DOMAIN_TIMER_NAME_RTC: - switch (timer->track) { - case -1: /* unspecified - use hypervisor default */ - case VIR_DOMAIN_TIMER_TRACK_GUEST: - case VIR_DOMAIN_TIMER_TRACK_WALL: - break; - case VIR_DOMAIN_TIMER_TRACK_BOOT: - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unsupported rtc timer track '%s'"), - virDomainTimerTrackTypeToString(timer->trac= k)); - return -1; - } - - switch (timer->tickpolicy) { - case -1: - case VIR_DOMAIN_TIMER_TICKPOLICY_DELAY: - /* This is the default - missed ticks delivered when - next scheduled, at normal rate */ - break; - case VIR_DOMAIN_TIMER_TICKPOLICY_CATCHUP: - /* deliver ticks at a faster rate until caught up */ - break; - case VIR_DOMAIN_TIMER_TICKPOLICY_MERGE: - case VIR_DOMAIN_TIMER_TICKPOLICY_DISCARD: - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unsupported rtc timer tickpolicy '%s'"), - virDomainTimerTickpolicyTypeToString( - timer->tickpolicy)); - return -1; - } - break; - - case VIR_DOMAIN_TIMER_NAME_PIT: - switch (timer->tickpolicy) { - case -1: - case VIR_DOMAIN_TIMER_TICKPOLICY_DELAY: - case VIR_DOMAIN_TIMER_TICKPOLICY_DISCARD: - break; - case VIR_DOMAIN_TIMER_TICKPOLICY_CATCHUP: - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM_PIT_TICK_POLIC= Y)) { - /* can't catchup if we don't have kvm-pit */ - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unsupported pit tickpolicy '%s'"), - virDomainTimerTickpolicyTypeToString( - timer->tickpolicy)); - return -1; - } - break; - case VIR_DOMAIN_TIMER_TICKPOLICY_MERGE: - /* no way to support this mode for pit in qemu */ - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unsupported pit tickpolicy '%s'"), - virDomainTimerTickpolicyTypeToString( - timer->tickpolicy)); - return -1; - } - break; - - case VIR_DOMAIN_TIMER_NAME_HPET: - /* no hpet timer available. The only possible action - is to raise an error if present=3D"yes" */ - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_NO_HPET) && - timer->present =3D=3D 1) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - "%s", _("hpet timer is not supported")); - return -1; - } - break; - - case VIR_DOMAIN_TIMER_NAME_ARMVTIMER: - if (def->virtType !=3D VIR_DOMAIN_VIRT_KVM || - !qemuDomainIsARMVirt(def)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Configuring the '%s' timer is not suppor= ted " - "for virtType=3D%s arch=3D%s machine=3D%s= guests"), - virDomainTimerNameTypeToString(timer->name), - virDomainVirtTypeToString(def->virtType), - virArchToString(def->os.arch), - def->os.machine); - return -1; - } - if (timer->present =3D=3D 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("The '%s' timer can't be disabled"), - virDomainTimerNameTypeToString(timer->name)= ); - return -1; - } - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CPU_KVM_NO_ADJVTIME)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("Configuring the '%s' timer is not suppor= ted " - "with this QEMU binary"), - virDomainTimerNameTypeToString(timer->name)= ); - return -1; - } - - switch (timer->tickpolicy) { - case -1: - case VIR_DOMAIN_TIMER_TICKPOLICY_DELAY: - case VIR_DOMAIN_TIMER_TICKPOLICY_DISCARD: - break; - case VIR_DOMAIN_TIMER_TICKPOLICY_CATCHUP: - case VIR_DOMAIN_TIMER_TICKPOLICY_MERGE: - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("The '%s' timer does not support tickpoli= cy '%s'"), - virDomainTimerNameTypeToString(timer->name), - virDomainTimerTickpolicyTypeToString(timer-= >tickpolicy)); - return -1; - } - break; - } - } - - return 0; -} - - -static int -qemuDomainDefValidatePM(const virDomainDef *def, - virQEMUCapsPtr qemuCaps) -{ - bool q35Dom =3D qemuDomainIsQ35(def); - - if (def->pm.s3) { - bool q35ICH9_S3 =3D q35Dom && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_ICH9_DISABLE_= S3); - - if (!q35ICH9_S3 && !virQEMUCapsGet(qemuCaps, QEMU_CAPS_PIIX_DISABL= E_S3)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - "%s", _("setting ACPI S3 not supported")); - return -1; - } - } - - if (def->pm.s4) { - bool q35ICH9_S4 =3D q35Dom && - virQEMUCapsGet(qemuCaps, QEMU_CAPS_ICH9_DISABLE_= S4); - - if (!q35ICH9_S4 && !virQEMUCapsGet(qemuCaps, QEMU_CAPS_PIIX_DISABL= E_S4)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - "%s", _("setting ACPI S4 not supported")); - return -1; - } - } - - return 0; -} - - -static int -qemuDomainDefValidateBoot(const virDomainDef *def, - virQEMUCapsPtr qemuCaps) -{ - if (def->os.bios.rt_set) { - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_REBOOT_TIMEOUT)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("reboot timeout is not supported " - "by this QEMU binary")); - return -1; - } - } - - if (def->os.bm_timeout_set) { - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SPLASH_TIMEOUT)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("splash timeout is not supported " - "by this QEMU binary")); - return -1; - } - } - - return 0; -} - -static int -qemuDomainDefValidateConsole(const virDomainDef *def, - virQEMUCapsPtr qemuCaps) -{ - size_t i; - - /* Explicit console devices */ - for (i =3D 0; i < def->nconsoles; i++) { - virDomainChrDefPtr console =3D def->consoles[i]; - - switch (console->targetType) { - case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SCLP: - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_SCLPCONSOLE)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("sclpconsole is not supported in this QEM= U binary")); - return -1; - } - break; - - case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SCLPLM: - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_SCLPLMCONSOLE))= { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("sclplmconsole is not supported in this Q= EMU binary")); - return -1; - } - break; - - case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_VIRTIO: - case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SERIAL: - break; - - default: - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unsupported console target type %s"), - NULLSTR(virDomainChrConsoleTargetTypeToString(c= onsole->targetType))); - return -1; - } - } - - return 0; -} - - static int qemuSoundCodecTypeToCaps(int type) { @@ -5680,13 +5300,13 @@ qemuDomainDefValidate(const virDomainDef *def, } } =20 - if (qemuDomainDefValidateClockTimers(def, qemuCaps) < 0) + if (qemuValidateDomainDefClockTimers(def, qemuCaps) < 0) return -1; =20 - if (qemuDomainDefValidatePM(def, qemuCaps) < 0) + if (qemuValidateDomainDefPM(def, qemuCaps) < 0) return -1; =20 - if (qemuDomainDefValidateBoot(def, qemuCaps) < 0) + if (qemuValidateDomainDefBoot(def, qemuCaps) < 0) return -1; =20 /* QEMU 2.7 (detected via the availability of query-hotpluggable-cpus) @@ -5726,7 +5346,7 @@ qemuDomainDefValidate(const virDomainDef *def, } } =20 - if (qemuDomainValidateCpuCount(def, qemuCaps) < 0) + if (qemuValidateDomainCpuCount(def, qemuCaps) < 0) return -1; =20 if (ARCH_IS_X86(def->os.arch) && @@ -5757,13 +5377,13 @@ qemuDomainDefValidate(const virDomainDef *def, if (qemuValidateDomainDefFeatures(def, qemuCaps) < 0) return -1; =20 - if (qemuDomainDefValidateMemory(def, qemuCaps) < 0) + if (qemuValidateDomainDefMemory(def, qemuCaps) < 0) return -1; =20 - if (qemuDomainDefValidateNuma(def, qemuCaps) < 0) + if (qemuValidateDomainDefNuma(def, qemuCaps) < 0) return -1; =20 - if (qemuDomainDefValidateConsole(def, qemuCaps) < 0) + if (qemuValidateDomainDefConsole(def, qemuCaps) < 0) return -1; =20 if (cfg->vncTLS && cfg->vncTLSx509secretUUID && diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 8f4c5af582..b2a8c3c0b5 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -22,6 +22,7 @@ =20 #include "qemu_validate.h" #include "qemu_domain.h" +#include "virutil.h" =20 #define VIR_FROM_THIS VIR_FROM_QEMU =20 @@ -308,3 +309,383 @@ qemuValidateDomainDefFeatures(const virDomainDef *def, =20 return 0; } + + +int +qemuValidateDomainDefClockTimers(const virDomainDef *def, + virQEMUCapsPtr qemuCaps) +{ + size_t i; + + for (i =3D 0; i < def->clock.ntimers; i++) { + virDomainTimerDefPtr timer =3D def->clock.timers[i]; + + switch ((virDomainTimerNameType)timer->name) { + case VIR_DOMAIN_TIMER_NAME_PLATFORM: + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unsupported timer type (name) '%s'"), + virDomainTimerNameTypeToString(timer->name)); + return -1; + + case VIR_DOMAIN_TIMER_NAME_TSC: + case VIR_DOMAIN_TIMER_NAME_KVMCLOCK: + case VIR_DOMAIN_TIMER_NAME_HYPERVCLOCK: + case VIR_DOMAIN_TIMER_NAME_LAST: + break; + + case VIR_DOMAIN_TIMER_NAME_RTC: + switch (timer->track) { + case -1: /* unspecified - use hypervisor default */ + case VIR_DOMAIN_TIMER_TRACK_GUEST: + case VIR_DOMAIN_TIMER_TRACK_WALL: + break; + case VIR_DOMAIN_TIMER_TRACK_BOOT: + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unsupported rtc timer track '%s'"), + virDomainTimerTrackTypeToString(timer->trac= k)); + return -1; + } + + switch (timer->tickpolicy) { + case -1: + case VIR_DOMAIN_TIMER_TICKPOLICY_DELAY: + /* This is the default - missed ticks delivered when + next scheduled, at normal rate */ + break; + case VIR_DOMAIN_TIMER_TICKPOLICY_CATCHUP: + /* deliver ticks at a faster rate until caught up */ + break; + case VIR_DOMAIN_TIMER_TICKPOLICY_MERGE: + case VIR_DOMAIN_TIMER_TICKPOLICY_DISCARD: + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unsupported rtc timer tickpolicy '%s'"), + virDomainTimerTickpolicyTypeToString( + timer->tickpolicy)); + return -1; + } + break; + + case VIR_DOMAIN_TIMER_NAME_PIT: + switch (timer->tickpolicy) { + case -1: + case VIR_DOMAIN_TIMER_TICKPOLICY_DELAY: + case VIR_DOMAIN_TIMER_TICKPOLICY_DISCARD: + break; + case VIR_DOMAIN_TIMER_TICKPOLICY_CATCHUP: + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_KVM_PIT_TICK_POLIC= Y)) { + /* can't catchup if we don't have kvm-pit */ + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unsupported pit tickpolicy '%s'"), + virDomainTimerTickpolicyTypeToString( + timer->tickpolicy)); + return -1; + } + break; + case VIR_DOMAIN_TIMER_TICKPOLICY_MERGE: + /* no way to support this mode for pit in qemu */ + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unsupported pit tickpolicy '%s'"), + virDomainTimerTickpolicyTypeToString( + timer->tickpolicy)); + return -1; + } + break; + + case VIR_DOMAIN_TIMER_NAME_HPET: + /* no hpet timer available. The only possible action + is to raise an error if present=3D"yes" */ + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_NO_HPET) && + timer->present =3D=3D 1) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + "%s", _("hpet timer is not supported")); + return -1; + } + break; + + case VIR_DOMAIN_TIMER_NAME_ARMVTIMER: + if (def->virtType !=3D VIR_DOMAIN_VIRT_KVM || + !qemuDomainIsARMVirt(def)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Configuring the '%s' timer is not suppor= ted " + "for virtType=3D%s arch=3D%s machine=3D%s= guests"), + virDomainTimerNameTypeToString(timer->name), + virDomainVirtTypeToString(def->virtType), + virArchToString(def->os.arch), + def->os.machine); + return -1; + } + if (timer->present =3D=3D 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("The '%s' timer can't be disabled"), + virDomainTimerNameTypeToString(timer->name)= ); + return -1; + } + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_CPU_KVM_NO_ADJVTIME)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Configuring the '%s' timer is not suppor= ted " + "with this QEMU binary"), + virDomainTimerNameTypeToString(timer->name)= ); + return -1; + } + + switch (timer->tickpolicy) { + case -1: + case VIR_DOMAIN_TIMER_TICKPOLICY_DELAY: + case VIR_DOMAIN_TIMER_TICKPOLICY_DISCARD: + break; + case VIR_DOMAIN_TIMER_TICKPOLICY_CATCHUP: + case VIR_DOMAIN_TIMER_TICKPOLICY_MERGE: + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("The '%s' timer does not support tickpoli= cy '%s'"), + virDomainTimerNameTypeToString(timer->name), + virDomainTimerTickpolicyTypeToString(timer-= >tickpolicy)); + return -1; + } + break; + } + } + + return 0; +} + + +int +qemuValidateDomainDefPM(const virDomainDef *def, + virQEMUCapsPtr qemuCaps) +{ + bool q35Dom =3D qemuDomainIsQ35(def); + + if (def->pm.s3) { + bool q35ICH9_S3 =3D q35Dom && + virQEMUCapsGet(qemuCaps, QEMU_CAPS_ICH9_DISABLE_= S3); + + if (!q35ICH9_S3 && !virQEMUCapsGet(qemuCaps, QEMU_CAPS_PIIX_DISABL= E_S3)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + "%s", _("setting ACPI S3 not supported")); + return -1; + } + } + + if (def->pm.s4) { + bool q35ICH9_S4 =3D q35Dom && + virQEMUCapsGet(qemuCaps, QEMU_CAPS_ICH9_DISABLE_= S4); + + if (!q35ICH9_S4 && !virQEMUCapsGet(qemuCaps, QEMU_CAPS_PIIX_DISABL= E_S4)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + "%s", _("setting ACPI S4 not supported")); + return -1; + } + } + + return 0; +} + + +int +qemuValidateDomainDefBoot(const virDomainDef *def, + virQEMUCapsPtr qemuCaps) +{ + if (def->os.bios.rt_set) { + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_REBOOT_TIMEOUT)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("reboot timeout is not supported " + "by this QEMU binary")); + return -1; + } + } + + if (def->os.bm_timeout_set) { + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SPLASH_TIMEOUT)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("splash timeout is not supported " + "by this QEMU binary")); + return -1; + } + } + + return 0; +} + + +int +qemuValidateDomainCpuCount(const virDomainDef *def, virQEMUCapsPtr qemuCap= s) +{ + unsigned int maxCpus =3D virQEMUCapsGetMachineMaxCpus(qemuCaps, def->v= irtType, + def->os.machine); + + if (virDomainDefGetVcpus(def) =3D=3D 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Domain requires at least 1 vCPU")); + return -1; + } + + if (maxCpus > 0 && virDomainDefGetVcpusMax(def) > maxCpus) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Maximum CPUs greater than specified machine " + "type limit %u"), maxCpus); + return -1; + } + + return 0; +} + + +int +qemuValidateDomainDefMemory(const virDomainDef *def, + virQEMUCapsPtr qemuCaps) +{ + const long system_page_size =3D virGetSystemPageSizeKB(); + const virDomainMemtune *mem =3D &def->mem; + + if (mem->nhugepages =3D=3D 0) + return 0; + + if (mem->allocation =3D=3D VIR_DOMAIN_MEMORY_ALLOCATION_ONDEMAND) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("hugepages are not allowed with memory " + "allocation ondemand")); + return -1; + } + + if (mem->source =3D=3D VIR_DOMAIN_MEMORY_SOURCE_ANONYMOUS) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("hugepages are not allowed with anonymous " + "memory source")); + return -1; + } + + if (mem->source =3D=3D VIR_DOMAIN_MEMORY_SOURCE_MEMFD && + !virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_MEMORY_MEMFD_HUGETLB)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("hugepages is not supported with memfd memory sou= rce")); + return -1; + } + + /* We can't guarantee any other mem.access + * if no guest NUMA nodes are defined. */ + if (mem->hugepages[0].size !=3D system_page_size && + virDomainNumaGetNodeCount(def->numa) =3D=3D 0 && + mem->access !=3D VIR_DOMAIN_MEMORY_ACCESS_DEFAULT && + mem->access !=3D VIR_DOMAIN_MEMORY_ACCESS_PRIVATE) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("memory access mode '%s' not supported " + "without guest numa node"), + virDomainMemoryAccessTypeToString(mem->access)); + 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; +} + + +int +qemuValidateDomainDefNuma(const virDomainDef *def, + virQEMUCapsPtr qemuCaps) +{ + const long system_page_size =3D virGetSystemPageSizeKB(); + size_t ncells =3D virDomainNumaGetNodeCount(def->numa); + size_t i; + bool hasMemoryCap =3D virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_MEMORY= _RAM) || + virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_MEMORY_F= ILE) || + virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_MEMORY_M= EMFD); + + if (virDomainNumatuneHasPerNodeBinding(def->numa) && !hasMemoryCap) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Per-node memory binding is not supported " + "with this QEMU")); + return -1; + } + + if (def->mem.nhugepages && + def->mem.hugepages[0].size !=3D system_page_size && + !virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_MEMORY_FILE)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("huge pages per NUMA node are not " + "supported with this QEMU")); + return -1; + } + + for (i =3D 0; i < ncells; i++) { + g_autofree char * cpumask =3D NULL; + + if (!hasMemoryCap && + virDomainNumaGetNodeMemoryAccessMode(def->numa, i)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("Shared memory mapping is not supported " + "with this QEMU")); + return -1; + } + + if (!(cpumask =3D virBitmapFormat(virDomainNumaGetNodeCpumask(def-= >numa, i)))) + return -1; + + if (strchr(cpumask, ',') && + !virQEMUCapsGet(qemuCaps, QEMU_CAPS_NUMA)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("disjoint NUMA cpu ranges are not supported " + "with this QEMU")); + return -1; + } + + } + + if (virDomainNumaNodesDistancesAreBeingSet(def->numa) && + !virQEMUCapsGet(qemuCaps, QEMU_CAPS_NUMA_DIST)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("setting NUMA distances is not " + "supported with this qemu")); + return -1; + } + + return 0; +} + + +int +qemuValidateDomainDefConsole(const virDomainDef *def, + virQEMUCapsPtr qemuCaps) +{ + size_t i; + + /* Explicit console devices */ + for (i =3D 0; i < def->nconsoles; i++) { + virDomainChrDefPtr console =3D def->consoles[i]; + + switch (console->targetType) { + case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SCLP: + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_SCLPCONSOLE)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("sclpconsole is not supported in this QEM= U binary")); + return -1; + } + break; + + case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SCLPLM: + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_SCLPLMCONSOLE))= { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("sclplmconsole is not supported in this Q= EMU binary")); + return -1; + } + break; + + case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_VIRTIO: + case VIR_DOMAIN_CHR_CONSOLE_TARGET_TYPE_SERIAL: + break; + + default: + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unsupported console target type %s"), + NULLSTR(virDomainChrConsoleTargetTypeToString(c= onsole->targetType))); + return -1; + } + } + + return 0; +} diff --git a/src/qemu/qemu_validate.h b/src/qemu/qemu_validate.h index ed269f29e4..85d1bc07cb 100644 --- a/src/qemu/qemu_validate.h +++ b/src/qemu/qemu_validate.h @@ -27,3 +27,19 @@ =20 int qemuValidateDomainDefFeatures(const virDomainDef *def, virQEMUCapsPtr qemuCaps); +int qemuValidateDomainDefClockTimers(const virDomainDef *def, + virQEMUCapsPtr qemuCaps); +int qemuValidateDomainDefPM(const virDomainDef *def, + virQEMUCapsPtr qemuCaps); +int qemuValidateDomainDefBoot(const virDomainDef *def, + virQEMUCapsPtr qemuCaps); +int qemuValidateDomainCpuCount(const virDomainDef *def, + virQEMUCapsPtr qemuCaps); +int qemuValidateDomainCpuCount(const virDomainDef *def, + virQEMUCapsPtr qemuCaps); +int qemuValidateDomainDefMemory(const virDomainDef *def, + virQEMUCapsPtr qemuCaps); +int qemuValidateDomainDefNuma(const virDomainDef *def, + virQEMUCapsPtr qemuCaps); +int qemuValidateDomainDefConsole(const virDomainDef *def, + virQEMUCapsPtr qemuCaps); --=20 2.25.1