From nobody Sat Feb 7 12:13:15 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=libvir-list-bounces@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 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=1602708277; cv=none; d=zohomail.com; s=zohoarc; b=j3rp0ouLSEr5d6L/6jpeol4FCQ/tI3/uvOC6WYa6VeS2WbkU14NTHiMfaa4aOPF2lbiR1Okq8t7ZV5zVSGtkMtfVegyGEKMHp9Avzm4/kIjxd8oY8LnVTMdR9KOWmV+DHNv6yM2NzGxTbV/Vz/tKyiee+hfSBbVMZh5IYTeHZKA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602708277; 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=3yeB72eEiVqaxuxck0VC0dkQTMUdssZ6GuxaiVC1nKw=; b=Js7cafi1e5nHcQSncDoeUNQilKF5n2NFvAAILGodBUHhwRu+vzSMgssQ+Tv7PHqhGmW/gw0CxmP/ART0qrDDl28QHyXx7T4QqhKSFKbUODPCL/fiJ8gJEhnd3yAxuuiuzadbAsI2TIDD2U70nnxFHIyWmWlU7GKDzHwGy9gx9Xw= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 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-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1602708277122642.1936433640085; Wed, 14 Oct 2020 13:44:37 -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-406-Z2ZTdM-gNiWXsjmE7pNCWA-1; Wed, 14 Oct 2020 16:44:33 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 75B8057058; Wed, 14 Oct 2020 20:44:28 +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 54F4660C07; Wed, 14 Oct 2020 20:44:28 +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 2162358135; Wed, 14 Oct 2020 20:44:28 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 09EKhnaK028788 for ; Wed, 14 Oct 2020 16:43:49 -0400 Received: by smtp.corp.redhat.com (Postfix) id E5E3E151125; Wed, 14 Oct 2020 20:43:48 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast05.extmail.prod.ext.rdu2.redhat.com [10.11.55.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E01BC1711DD for ; Wed, 14 Oct 2020 20:43:46 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) (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 81765805F53 for ; Wed, 14 Oct 2020 20:43:46 +0000 (UTC) Received: from mail-io1-f67.google.com (mail-io1-f67.google.com [209.85.166.67]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-166-UOgcDzIqNfmhONTRF9WYjg-1; Wed, 14 Oct 2020 16:43:44 -0400 Received: by mail-io1-f67.google.com with SMTP id k21so929034ioa.9 for ; Wed, 14 Oct 2020 13:43:43 -0700 (PDT) Received: from rekt.ibmuc.com ([2804:431:c7c6:5a9b:54fc:df2a:8a5e:989b]) by smtp.gmail.com with ESMTPSA id i4sm492202ilc.27.2020.10.14.13.43.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Oct 2020 13:43:42 -0700 (PDT) X-MC-Unique: Z2ZTdM-gNiWXsjmE7pNCWA-1 X-MC-Unique: UOgcDzIqNfmhONTRF9WYjg-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=3yeB72eEiVqaxuxck0VC0dkQTMUdssZ6GuxaiVC1nKw=; b=LOWOrN2OO0dQRZzbeaC3RbiQCGNw82jZd6+18Lg43xr6Yg83VhedMO2ZS4TzaSMY2j dDqOtU3+1HenLBId52adtiRTNJqwT04KoI85VPfQ8DwajtU3J1+NPWONfK2Kk6NbhCDJ D8DCE53fdq0UUZoX7zqLQgc8W+g2mr25xNbSsdKNhIwiBIXjNf8cNux/eHzqIHmJzPx3 gHtXdxHiIXVWk1ChMPhayO+Le6TDZyzkXestdsPM9DiAc25p6f711fiUWV4AyuPz3vcC y7ZH/2bIBkCTJyVnX/BnwQK9D/rA7lbGe1mHP8Gg11j5dELTmZn8B0XQzeO7y3SzeQ+s D/xw== X-Gm-Message-State: AOAM530D7N/UXgHKj8PXQYl6z6yHB156H7NnbUnIPZF2UkhjR1jMNIY/ AY4qUvefxtT4ijQfdZKe7wD2W6Zz1XM= X-Google-Smtp-Source: ABdhPJy+/zBc1kWbXqjBbhEFYHvzXT1qoZkW+E9D5kbUmjJPaF234/mKyj37qu0yfwMwSJ/g6A/ATw== X-Received: by 2002:a5e:8b0b:: with SMTP id g11mr994948iok.140.1602708223069; Wed, 14 Oct 2020 13:43:43 -0700 (PDT) From: Daniel Henrique Barboza To: libvir-list@redhat.com Subject: [PATCH v1 14/24] qemu_command.c: move RNG backend validation to qemu_validate.c Date: Wed, 14 Oct 2020 17:42:57 -0300 Message-Id: <20201014204307.631746-15-danielhb413@gmail.com> In-Reply-To: <20201014204307.631746-1-danielhb413@gmail.com> References: <20201014204307.631746-1-danielhb413@gmail.com> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-loop: libvir-list@redhat.com Cc: Daniel Henrique Barboza 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.12 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 Content-Type: text/plain; charset="utf-8" Signed-off-by: Daniel Henrique Barboza --- src/qemu/qemu_command.c | 28 ++-------------------------- src/qemu/qemu_command.h | 1 - src/qemu/qemu_hotplug.c | 2 +- src/qemu/qemu_validate.c | 38 ++++++++++++++++++++++++++++++++++++-- tests/qemuxml2xmltest.c | 9 ++++++--- 5 files changed, 45 insertions(+), 33 deletions(-) diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 29bfa665c4..f350800ff0 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -5342,7 +5342,6 @@ qemuBuildRNGBackendChrdevStr(virLogManagerPtr logMana= ger, =20 int qemuBuildRNGBackendProps(virDomainRNGDefPtr rng, - virQEMUCapsPtr qemuCaps, virJSONValuePtr *props) { g_autofree char *objAlias =3D NULL; @@ -5352,13 +5351,6 @@ qemuBuildRNGBackendProps(virDomainRNGDefPtr rng, =20 switch ((virDomainRNGBackend) rng->backend) { case VIR_DOMAIN_RNG_BACKEND_RANDOM: - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_RNG_RANDOM)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("this qemu doesn't support the rng-random " - "backend")); - return -1; - } - if (qemuMonitorCreateObjectProps(props, "rng-random", objAlias, "s:filename", rng->source.file, NULL) < 0) @@ -5367,13 +5359,6 @@ qemuBuildRNGBackendProps(virDomainRNGDefPtr rng, break; =20 case VIR_DOMAIN_RNG_BACKEND_EGD: - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_RNG_EGD)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("this qemu doesn't support the rng-egd " - "backend")); - return -1; - } - if (!(charBackendAlias =3D qemuAliasChardevFromDevAlias(rng->info.= alias))) return -1; =20 @@ -5385,13 +5370,6 @@ qemuBuildRNGBackendProps(virDomainRNGDefPtr rng, break; =20 case VIR_DOMAIN_RNG_BACKEND_BUILTIN: - if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_RNG_BUILTIN)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("this qemu doesn't support the rng-builtin " - "backend")); - return -1; - } - if (qemuMonitorCreateObjectProps(props, "rng-builtin", objAlias, NULL) < 0) return -1; @@ -5399,9 +5377,7 @@ qemuBuildRNGBackendProps(virDomainRNGDefPtr rng, break; =20 case VIR_DOMAIN_RNG_BACKEND_LAST: - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("unknown rng-random backend")); - return -1; + break; } =20 return 0; @@ -5478,7 +5454,7 @@ qemuBuildRNGCommandLine(virLogManagerPtr logManager, if (chardev) virCommandAddArgList(cmd, "-chardev", chardev, NULL); =20 - if (qemuBuildRNGBackendProps(rng, qemuCaps, &props) < 0) + if (qemuBuildRNGBackendProps(rng, &props) < 0) return -1; =20 rc =3D virQEMUBuildObjectCommandlineFromJSON(&buf, props); diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h index 8a30f2852c..12014b1451 100644 --- a/src/qemu/qemu_command.h +++ b/src/qemu/qemu_command.h @@ -167,7 +167,6 @@ char *qemuBuildRNGDevStr(const virDomainDef *def, virDomainRNGDefPtr dev, virQEMUCapsPtr qemuCaps); int qemuBuildRNGBackendProps(virDomainRNGDefPtr rng, - virQEMUCapsPtr qemuCaps, virJSONValuePtr *props); =20 /* Current, best practice */ diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c index 79fc8baa5c..fdb3801af0 100644 --- a/src/qemu/qemu_hotplug.c +++ b/src/qemu/qemu_hotplug.c @@ -2264,7 +2264,7 @@ qemuDomainAttachRNGDevice(virQEMUDriverPtr driver, if (!(devstr =3D qemuBuildRNGDevStr(vm->def, rng, priv->qemuCaps))) goto cleanup; =20 - if (qemuBuildRNGBackendProps(rng, priv->qemuCaps, &props) < 0) + if (qemuBuildRNGBackendProps(rng, &props) < 0) goto cleanup; =20 if (!(charAlias =3D qemuAliasChardevFromDevAlias(rng->info.alias))) diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 1895ad857b..c97b4770b8 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -1646,9 +1646,43 @@ static int qemuValidateDomainRNGDef(const virDomainRNGDef *def, virQEMUCapsPtr qemuCaps) { - if (def->backend =3D=3D VIR_DOMAIN_RNG_BACKEND_EGD && - qemuValidateDomainChrSourceDef(def->source.chardev, qemuCaps) < 0) + switch ((virDomainRNGBackend) def->backend) { + case VIR_DOMAIN_RNG_BACKEND_RANDOM: + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_RNG_RANDOM)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("this qemu doesn't support the rng-random " + "backend")); + return -1; + } + break; + + case VIR_DOMAIN_RNG_BACKEND_EGD: + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_RNG_EGD)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("this qemu doesn't support the rng-egd " + "backend")); + return -1; + } + + if (qemuValidateDomainChrSourceDef(def->source.chardev, qemuCaps) = < 0) + return -1; + + break; + + case VIR_DOMAIN_RNG_BACKEND_BUILTIN: + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_RNG_BUILTIN)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("this qemu doesn't support the rng-builtin " + "backend")); + return -1; + } + break; + + case VIR_DOMAIN_RNG_BACKEND_LAST: + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", + _("unknown rng-random backend")); return -1; + } =20 if (qemuValidateDomainVirtioOptions(def->virtio, qemuCaps) < 0) return -1; diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c index a9037101de..2213dc8615 100644 --- a/tests/qemuxml2xmltest.c +++ b/tests/qemuxml2xmltest.c @@ -682,9 +682,11 @@ mymain(void) DO_TEST_CAPS_ARCH_LATEST("disk-arm-virtio-sd", "aarch64"); =20 DO_TEST("virtio-rng-random", - QEMU_CAPS_DEVICE_VIRTIO_RNG); + QEMU_CAPS_DEVICE_VIRTIO_RNG, + QEMU_CAPS_OBJECT_RNG_RANDOM); DO_TEST("virtio-rng-egd", - QEMU_CAPS_DEVICE_VIRTIO_RNG); + QEMU_CAPS_DEVICE_VIRTIO_RNG, + QEMU_CAPS_OBJECT_RNG_EGD); DO_TEST_CAPS_LATEST("virtio-rng-builtin"); =20 DO_TEST("pseries-nvram", @@ -1124,7 +1126,8 @@ mymain(void) DO_TEST_CAPS_LATEST("disk-network-http"); =20 DO_TEST("chardev-label", - QEMU_CAPS_DEVICE_VIRTIO_RNG); + QEMU_CAPS_DEVICE_VIRTIO_RNG, + QEMU_CAPS_OBJECT_RNG_EGD); =20 DO_TEST("cpu-numa1", NONE); DO_TEST("cpu-numa2", NONE); --=20 2.26.2