From nobody Sat May 4 20:34:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.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 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 162886341338678.35172872043609; Fri, 13 Aug 2021 07:03:33 -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-385-upDM7z2UPTWIlImaveEGYA-1; Fri, 13 Aug 2021 10:03:30 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id F228A1008061; Fri, 13 Aug 2021 14:03:24 +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 AB5C55FC23; Fri, 13 Aug 2021 14:03:23 +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 EE9B74BB7C; Fri, 13 Aug 2021 14:03:22 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 17DE3Lhk027130 for ; Fri, 13 Aug 2021 10:03:22 -0400 Received: by smtp.corp.redhat.com (Postfix) id D9B9420C1655; Fri, 13 Aug 2021 14:03:21 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast04.extmail.prod.ext.rdu2.redhat.com [10.11.55.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D50DD20C1648 for ; Fri, 13 Aug 2021 14:03:18 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E6569100B8CF for ; Fri, 13 Aug 2021 14:03:17 +0000 (UTC) Received: from mo4-p00-ob.smtp.rzone.de (mo4-p00-ob.smtp.rzone.de [81.169.146.219]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-192-bBCynMl3NNGLUYBebGpplw-1; Fri, 13 Aug 2021 10:03:16 -0400 Received: from sender by smtp.strato.de (RZmta 47.31.0 AUTH) with ESMTPSA id 50780dx7DE3DYh0 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Fri, 13 Aug 2021 16:03:13 +0200 (CEST) X-MC-Unique: upDM7z2UPTWIlImaveEGYA-1 X-MC-Unique: bBCynMl3NNGLUYBebGpplw-1 X-RZG-AUTH: ":P2EQZWCpfu+qG7CngxMFH1J+3q8wa/QXkBR9MXjAuzpIG0mv9coXAgth/Vb1F8stQtZtrd85TkPdCcwE/8Sb0gYpmAVb" X-RZG-CLASS-ID: mo00 From: Olaf Hering To: libvir-list@redhat.com Subject: [PATCH v2] libxl: remove conditionals from discard configuration Date: Fri, 13 Aug 2021 16:03:11 +0200 Message-Id: <20210813140311.18665-1-olaf@aepfle.de> 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.78 on 10.11.54.4 X-loop: libvir-list@redhat.com Cc: Olaf Hering 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.16 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-ZM-MESSAGEID: 1628863414093100001 Content-Type: text/plain; charset="utf-8" LIBXL_HAVE_LIBXL_DEVICE_DISK_DISCARD_ENABLE exists since Xen 4.5.0 Signed-off-by: Olaf Hering Reviewed-by: Jim Fehlig --- src/libxl/libxl_conf.c | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/src/libxl/libxl_conf.c b/src/libxl/libxl_conf.c index 56cb9abd5d..9f0739e1fa 100644 --- a/src/libxl/libxl_conf.c +++ b/src/libxl/libxl_conf.c @@ -923,13 +923,12 @@ libxlMakeVnumaList(virDomainDef *def, return ret; } =20 -static int -libxlDiskSetDiscard(libxl_device_disk *x_disk, int discard) +static void +libxlDiskSetDiscard(libxl_device_disk *x_disk, virDomainDiskDiscard discar= d) { if (!x_disk->readwrite) - return 0; -#if defined(LIBXL_HAVE_LIBXL_DEVICE_DISK_DISCARD_ENABLE) - switch ((virDomainDiskDiscard)discard) { + return; + switch (discard) { case VIR_DOMAIN_DISK_DISCARD_DEFAULT: case VIR_DOMAIN_DISK_DISCARD_LAST: break; @@ -940,15 +939,6 @@ libxlDiskSetDiscard(libxl_device_disk *x_disk, int dis= card) libxl_defbool_set(&x_disk->discard_enable, false); break; } - return 0; -#else - if (discard =3D=3D VIR_DOMAIN_DISK_DISCARD_DEFAULT) - return 0; - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", - _("This version of libxenlight does not support " - "disk 'discard' option passing")); - return -1; -#endif } =20 static char * @@ -1189,8 +1179,7 @@ libxlMakeDisk(virDomainDiskDef *l_disk, libxl_device_= disk *x_disk) x_disk->removable =3D 1; x_disk->readwrite =3D !l_disk->src->readonly; x_disk->is_cdrom =3D l_disk->device =3D=3D VIR_DOMAIN_DISK_DEVICE_CDRO= M ? 1 : 0; - if (libxlDiskSetDiscard(x_disk, l_disk->discard) < 0) - return -1; + libxlDiskSetDiscard(x_disk, l_disk->discard); /* An empty CDROM must have the empty format, otherwise libxl fails. */ if (x_disk->is_cdrom && !x_disk->pdev_path) x_disk->format =3D LIBXL_DISK_FORMAT_EMPTY;