From nobody Sun Feb 8 10:48:40 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 207.211.31.81 as permitted sender) client-ip=207.211.31.81; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-1.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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=1576629405; cv=none; d=zohomail.com; s=zohoarc; b=hDnvwPnNyHNE6mHxIvVDFOxQwzBotjItuhgxsB0NFn2loyaKssqiM2mpr9CgxPvtpwEENOpOMF/X0Umme72auwD3DtWxcuuLPWlKxSI7gleppB5V9yQrQzZ0hCiloSm8o8F4E4dwPfHYfP5yqLu62U9AvLM3j568SaAl/3BfT74= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576629405; 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=SmLAtDCyoRvLKlXC7wIPxuaWmePl8DIPF94MQC7qsjY=; b=SVngTYeiPW1SmgLNfaQTsMdCCk+Jo87rLfd2GNlCBAh9kYgWGo111QCSYZZH5nTkUBv8wwoMZJ+vkmNN2b10FU7NbqTUvTUYg6V9X/7pXYqlKb55epIpKKA3innXGFSxhnYuFCUhILDVQlXML6XZPKu2kFbpvSAkqb9u5sVdfEA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 207.211.31.81 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-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by mx.zohomail.com with SMTPS id 1576629405594879.0311870839488; Tue, 17 Dec 2019 16:36:45 -0800 (PST) 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-313-WT7ZhSCiOXOy7HkZNujYmw-1; Tue, 17 Dec 2019 19:36:42 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 10207DBBC; Wed, 18 Dec 2019 00:36:37 +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 D491B10016E8; Wed, 18 Dec 2019 00:36:36 +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 8F58B1809567; Wed, 18 Dec 2019 00:36:36 +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 xBI0aMIh013618 for ; Tue, 17 Dec 2019 19:36:22 -0500 Received: by smtp.corp.redhat.com (Postfix) id 638FC10E4D18; Wed, 18 Dec 2019 00:36:22 +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 5E67810E4D15 for ; Wed, 18 Dec 2019 00:36:22 +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 3D21D8F837F for ; Wed, 18 Dec 2019 00:36:22 +0000 (UTC) Received: from mail-qt1-f193.google.com (mail-qt1-f193.google.com [209.85.160.193]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-381-rcssnwIDNJydrRx-SdjpFg-1; Tue, 17 Dec 2019 19:36:18 -0500 Received: by mail-qt1-f193.google.com with SMTP id q20so526639qtp.3; Tue, 17 Dec 2019 16:36:18 -0800 (PST) Received: from rekt.ibmuc.com ([2804:431:c7c6:2f19:a73a:b6c3:c24a:90f3]) by smtp.gmail.com with ESMTPSA id m21sm96138qka.117.2019.12.17.16.36.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Dec 2019 16:36:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576629404; 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=SmLAtDCyoRvLKlXC7wIPxuaWmePl8DIPF94MQC7qsjY=; b=Wfcjbml79riGk0UwHdxdPfcuHiEVNCQlcvO8vNbNIPMQUuO095fYSIFO995LonTO1Dq1Tr K5X85qsG6Evrb4uL2GlYpfHGC0TMBuHdgJJZ7F+41YT4bVXXHOHgphSlIIr5TGnQ9G8seS xydhM2mFKc0i0kyePHpGTxkN5kl6tlQ= 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=epwUSpfqA2Zr5978dwMP1MGENLl9OgxJRE2NTaVAMjo=; b=jZZmh7gFrQYQA3BYX99UUpEisKGRq9iDtsWDwY9hSEtPcP+h1yvnJlwmsTUf0TfM3T j/P9dnzkeTE787Rvj1B6HmXMRCkuq4Mu+vCJQ3s4fV1o8/2T/dyUj+aVbtLB6yMmldwY HA/UKN5Ww2C+j346Ee3KkApOg+Gqj6BTEdsH7UfQjLTfR/+dOLECn8mkR/elL/n35ywz dSzB2CKEuIHlkqTjCj1j70Vy2dROtF3VHhX16+tcCp/kKKHNuhTgduqtVWtz2n+OecT0 +AfZak89EyywYhPn9XXJZ95c2fRNA4yV1KF2PWbjdqWGqI3JYkcsIjU37cUTIofy5tka +RoQ== X-Gm-Message-State: APjAAAU1x+tHfPb4iI0BmXh3A+TG3LkxrvmTOZfhz8/4U1v5DQ4MO5tH 9k21bSrZNtCZDubYPmAz/a2f6N/g X-Google-Smtp-Source: APXvYqxudiOc15iTsb3oYN2ZL17+qHDDnpu6HX2wgy/MPtM3XMuh1ruuy88vHhT4U67rKNB+8HsVfA== X-Received: by 2002:ac8:708f:: with SMTP id y15mr653624qto.185.1576629377762; Tue, 17 Dec 2019 16:36:17 -0800 (PST) From: Daniel Henrique Barboza To: libvir-list@redhat.com Date: Tue, 17 Dec 2019 21:36:03 -0300 Message-Id: <20191218003603.4047144-5-danielhb413@gmail.com> In-Reply-To: <20191218003603.4047144-1-danielhb413@gmail.com> References: <20191218003603.4047144-1-danielhb413@gmail.com> MIME-Version: 1.0 X-MC-Unique: rcssnwIDNJydrRx-SdjpFg-1 X-MC-Unique: WT7ZhSCiOXOy7HkZNujYmw-1 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 xBI0aMIh013618 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza , crobinso@redhat.com Subject: [libvirt] [PATCH v2 4/4] qemu: command: move validation of vmcoreinfo to qemu_domain.c 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.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Move the validation of vmcoreinfo from qemuBuildVMCoreInfoCommandLine() to qemuDomainDefValidateFeatures(), allowing for validation at domain define time. qemuxml2xmltest.c was changed to account for this caps being now validated at this earlier stage. Signed-off-by: Daniel Henrique Barboza --- src/qemu/qemu_command.c | 12 ++---------- src/qemu/qemu_domain.c | 11 ++++++++++- tests/qemuxml2xmltest.c | 2 +- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 67f7caf9c6..44cc647359 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -9217,21 +9217,13 @@ qemuBuildSEVCommandLine(virDomainObjPtr vm, virComm= andPtr cmd, =20 static int qemuBuildVMCoreInfoCommandLine(virCommandPtr cmd, - const virDomainDef *def, - virQEMUCapsPtr qemuCaps) + const virDomainDef *def) { virTristateSwitch vmci =3D def->features[VIR_DOMAIN_FEATURE_VMCOREINFO= ]; =20 if (vmci !=3D VIR_TRISTATE_SWITCH_ON) return 0; =20 - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VMCOREINFO)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("vmcoreinfo is not available " - "with this QEMU binary")); - return -1; - } - virCommandAddArgList(cmd, "-device", "vmcoreinfo", NULL); return 0; } @@ -9933,7 +9925,7 @@ qemuBuildCommandLine(virQEMUDriverPtr driver, if (qemuBuildNVRAMCommandLine(cmd, def) < 0) return NULL; =20 - if (qemuBuildVMCoreInfoCommandLine(cmd, def, qemuCaps) < 0) + if (qemuBuildVMCoreInfoCommandLine(cmd, def) < 0) return NULL; =20 if (qemuBuildSEVCommandLine(vm, cmd, def->sev) < 0) diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c index f6683d11e0..2dbe6f6454 100644 --- a/src/qemu/qemu_domain.c +++ b/src/qemu/qemu_domain.c @@ -5149,6 +5149,16 @@ qemuDomainDefValidateFeatures(const virDomainDef *de= f, } break; =20 + case VIR_DOMAIN_FEATURE_VMCOREINFO: + if (def->features[i] =3D=3D VIR_TRISTATE_SWITCH_ON && + !virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VMCOREINFO)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("vmcoreinfo is not available " + "with this QEMU binary")); + return -1; + } + break; + case VIR_DOMAIN_FEATURE_ACPI: case VIR_DOMAIN_FEATURE_APIC: case VIR_DOMAIN_FEATURE_PAE: @@ -5159,7 +5169,6 @@ qemuDomainDefValidateFeatures(const virDomainDef *def, case VIR_DOMAIN_FEATURE_PVSPINLOCK: case VIR_DOMAIN_FEATURE_CAPABILITIES: case VIR_DOMAIN_FEATURE_PMU: - case VIR_DOMAIN_FEATURE_VMCOREINFO: case VIR_DOMAIN_FEATURE_MSRS: case VIR_DOMAIN_FEATURE_LAST: break; diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index 64321bcb80..5ab00e5552 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -1330,7 +1330,7 @@ mymain(void) DO_TEST("cpu-check-default-none2", NONE); DO_TEST("cpu-check-default-partial", NONE); DO_TEST("cpu-check-default-partial2", NONE); - DO_TEST("vmcoreinfo", NONE); + DO_TEST("vmcoreinfo", QEMU_CAPS_DEVICE_VMCOREINFO); =20 DO_TEST("smartcard-host", QEMU_CAPS_CCID_EMULATED); DO_TEST("smartcard-host-certificates", QEMU_CAPS_CCID_EMULATED); --=20 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list