From nobody Thu Apr 25 14:23:48 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; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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=1619087654; cv=none; d=zohomail.com; s=zohoarc; b=Czdu+LcUBDvY7PQSDQK/3MhxiP4Hec/JlPXv/Co4ZL49s0IeqCRkgSpGdvHIxjQzwoneO2jiCfgZUkMHk1WIQqAUW4ceNHquq/m0MHUudIOWFFcgD+fQ0R7dQ1DE37WdLAkFraFMnNtfB98p2lrpgNrYofLzus6rZkjvbL2kYdM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619087654; 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=gACVcTDMrNT3kPoV41rVTcUIyn0tQKKv1d/tNVxO6qs=; b=PA9dbVTqcV+icWp/MofVaPfuttSRme5/8h7BhdcVSgQqiV34hwMDOTHkTLmmOTUeQxLuKs1xOHrZpO43tdXRNh0MDK/lbW2QQk/0tdKhP6dTAiizul9Z3SdfrKs5TqyXyWwqivulkqNhNoqYbD5VPLQH//4OWiNi7cZejFhLhIw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= 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 1619087654044525.6913143079213; Thu, 22 Apr 2021 03:34:14 -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-465-lwA8L6mqNXKXW3FbaTxJSw-1; Thu, 22 Apr 2021 06:33:32 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 6D30283DD2D; Thu, 22 Apr 2021 10:33:26 +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 502EE669EB; Thu, 22 Apr 2021 10:33:26 +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 8FA641806D1D; Thu, 22 Apr 2021 10:33:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 13MAX3cI009739 for ; Thu, 22 Apr 2021 06:33:03 -0400 Received: by smtp.corp.redhat.com (Postfix) id 292F4100F49F; Thu, 22 Apr 2021 10:33:03 +0000 (UTC) Received: from work.redhat.com (ovpn-114-56.ams2.redhat.com [10.36.114.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7135910016FE; Thu, 22 Apr 2021 10:33:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619087653; 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=gACVcTDMrNT3kPoV41rVTcUIyn0tQKKv1d/tNVxO6qs=; b=fycZVzwH1Z9gwjeQBCEYSfkHecJafmE/vouFB7xZHO0HOT8NLATl465U1ZvtpfydQaHaoz MeSHwAFxkNhSAY/mnuYSjoQRuC/cQwd/ANvaFTtCHsMB2mz5iCJ96EdL+iKkoXz2hJWHdf sogJu3rQoWZEsjG+z+0O1q6Z1+CxYqI= X-MC-Unique: lwA8L6mqNXKXW3FbaTxJSw-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 01/10] virDomainDiskDef: Change type of cachemode to virDomainDiskCache Date: Thu, 22 Apr 2021 12:32:48 +0200 Message-Id: <20210422103257.119508-2-twiederh@redhat.com> In-Reply-To: <20210422103257.119508-1-twiederh@redhat.com> References: <20210422103257.119508-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake 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.15 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) Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake Reviewed-by: Michal Privoznik --- src/conf/domain_conf.c | 14 +++++++++----- src/conf/domain_conf.h | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 720d56cf69..33c6412642 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8964,11 +8964,15 @@ virDomainDiskDefDriverParseXML(virDomainDiskDef *de= f, =20 def->driverName =3D virXMLPropString(cur, "name"); =20 - if ((tmp =3D virXMLPropString(cur, "cache")) && - (def->cachemode =3D virDomainDiskCacheTypeFromString(tmp)) < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown disk cache mode '%s'"), tmp); - return -1; + if ((tmp =3D virXMLPropString(cur, "cache"))) { + int cachemode; + + if ((cachemode =3D virDomainDiskCacheTypeFromString(tmp)) < 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown disk cache mode '%s'"), tmp); + return -1; + } + def->cachemode =3D cachemode; } VIR_FREE(tmp); =20 diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index fab7a0208e..3675e26eb0 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -566,7 +566,7 @@ struct _virDomainDiskDef { char *wwn; char *vendor; char *product; - int cachemode; /* enum virDomainDiskCache */ + virDomainDiskCache cachemode; int error_policy; /* enum virDomainDiskErrorPolicy */ int rerror_policy; /* enum virDomainDiskErrorPolicy */ int iomode; /* enum virDomainDiskIo */ --=20 2.26.3 From nobody Thu Apr 25 14:23:48 2024 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=1619087599; cv=none; d=zohomail.com; s=zohoarc; b=QCxhmsaC6krd7fhVmahQMBYD7ur6KnNSVhrGjH4dd32Kd4yqTBUr2GOXWhuMxCIgMeDgFh7AubmGodQ3ybX3J0yS0rlQpFEOnHnyeI+GhVi78UN4rbdgBs7xyVe7wzcPqRkaJn8tq4Va8uve6oJE5Fe5zoUvMREKF1hwF7xvFYo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619087599; 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=vXoBa42VWHlq57Lpg4Jw9hEwpZ3f4xlfFsMclyFoW5I=; b=Q5gd0kJ8BaNfJWmlHrmhG2p0Bq2P54dUAkqsQRSthPDe6raH8s8T4uZpLgc1pPm4WFqLM252zmaBhRmoAJKsygyxA8N/JuycDQLL6wBRs948vafYdm0Th5yRKFt5QdwcWFscOwgX0vaIKB7VU+Iqp47Yhzqid0hY3Fj6j2lRFe0= 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) header.from= 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 1619087599070645.025612991543; Thu, 22 Apr 2021 03:33:19 -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-432-RYYreBudPm2QuzIRUy4x8g-1; Thu, 22 Apr 2021 06:33:15 -0400 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 4BB7B814338; Thu, 22 Apr 2021 10:33:11 +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 CF39610016FE; Thu, 22 Apr 2021 10:33:09 +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 C5D3144A57; Thu, 22 Apr 2021 10:33:05 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 13MAX42L009747 for ; Thu, 22 Apr 2021 06:33:04 -0400 Received: by smtp.corp.redhat.com (Postfix) id 3964D100F49F; Thu, 22 Apr 2021 10:33:04 +0000 (UTC) Received: from work.redhat.com (ovpn-114-56.ams2.redhat.com [10.36.114.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7AAAA10016FE; Thu, 22 Apr 2021 10:33:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619087597; 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=vXoBa42VWHlq57Lpg4Jw9hEwpZ3f4xlfFsMclyFoW5I=; b=DHWoOJaZcf+tl62srDI4uP+0OAAedRfqURzxCmr9sET3AyzYukScFvq/U9ERxzSttS6e1r YClW/8VJK7inA4aLfs2xpk3d5gaW63AThHIefSgIjlswDL2ojfUOqcaXIwrk8ZCQC8wPsM syIEttt9cIVJp1lxLGdyEMYTXQp5LRk= X-MC-Unique: RYYreBudPm2QuzIRUy4x8g-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 02/10] virDomainDiskDef: Change type of error_policy to virDomainDiskErrorPolicy Date: Thu, 22 Apr 2021 12:32:49 +0200 Message-Id: <20210422103257.119508-3-twiederh@redhat.com> In-Reply-To: <20210422103257.119508-1-twiederh@redhat.com> References: <20210422103257.119508-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake 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 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) Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake Reviewed-by: Michal Privoznik --- src/conf/domain_conf.c | 14 +++++++++----- src/conf/domain_conf.h | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 33c6412642..4a0358831b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8976,11 +8976,15 @@ virDomainDiskDefDriverParseXML(virDomainDiskDef *de= f, } VIR_FREE(tmp); =20 - if ((tmp =3D virXMLPropString(cur, "error_policy")) && - (def->error_policy =3D virDomainDiskErrorPolicyTypeFromString(tmp)= ) <=3D 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown disk error policy '%s'"), tmp); - return -1; + if ((tmp =3D virXMLPropString(cur, "error_policy"))) { + int error_policy; + + if ((error_policy =3D virDomainDiskErrorPolicyTypeFromString(tmp))= <=3D 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown disk error policy '%s'"), tmp); + return -1; + } + def->error_policy =3D error_policy; } VIR_FREE(tmp); =20 diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 3675e26eb0..cacb9d0430 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -567,7 +567,7 @@ struct _virDomainDiskDef { char *vendor; char *product; virDomainDiskCache cachemode; - int error_policy; /* enum virDomainDiskErrorPolicy */ + virDomainDiskErrorPolicy error_policy; int rerror_policy; /* enum virDomainDiskErrorPolicy */ int iomode; /* enum virDomainDiskIo */ virTristateSwitch ioeventfd; --=20 2.26.3 From nobody Thu Apr 25 14:23:48 2024 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=1619087599; cv=none; d=zohomail.com; s=zohoarc; b=bvgAURvRYqImWAdmCEADgdhD+Ud+B9kbtcsBYw1mIPv9I5xy0cExcq/ehNbwmnX+PjljTOfQXXIMSrpZYAFjAkI/PmSrS/YfNrwtKtFLt7v5hEslFFhPxtQzjLhhoOCfSJw013xsRjcNVNT7WCevwT8jquFXbP/T8M6ua43m0z0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619087599; 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=qVLl4flBESRtslKaYsHVN1i3cb0NumEjQCTG5Mblrn4=; b=A69CQSRAWm7TUIOOGbnO5sGFZE9Q4qTLiilC/lfqeIWWoivSn8PldyCL8YdrDfW3mmpD5qLIvWnVAKbQtKW/T6hg//nWciauXa+zK0hmKxLk68hxXJnA1jpHsHgXurt+3iIAhklxrs4y1ARjcw1uGhyAfoStubcFWrPHXCuxX8U= 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) header.from= 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 1619087599520592.1120389274928; Thu, 22 Apr 2021 03:33:19 -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-506-8DFMm0sAPg2B41Szi99Cmw-1; Thu, 22 Apr 2021 06:33:16 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C4DAD81431F; Thu, 22 Apr 2021 10:33:10 +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 50C765D9C6; Thu, 22 Apr 2021 10:33:10 +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 8B34644A58; Thu, 22 Apr 2021 10:33:08 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 13MAX571009754 for ; Thu, 22 Apr 2021 06:33:05 -0400 Received: by smtp.corp.redhat.com (Postfix) id 4668C10023AC; Thu, 22 Apr 2021 10:33:05 +0000 (UTC) Received: from work.redhat.com (ovpn-114-56.ams2.redhat.com [10.36.114.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8C9A810016FE; Thu, 22 Apr 2021 10:33:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619087598; 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=qVLl4flBESRtslKaYsHVN1i3cb0NumEjQCTG5Mblrn4=; b=C/2AeCAckJsbpI+3KrUic/7o1q4J4gtRupZctqHl7lg3/RooD0ptXD66vHFWMsxCaRR4S2 b4MQK6J5Rztc2ggPO+RhLNqLcYz3UPFRAbf7LOOFS9zOSdq2qNagSEYqE8BPrJbGenXXQc A2bNxMar5kHWZdEVlfpKTtqRiKI7ycw= X-MC-Unique: 8DFMm0sAPg2B41Szi99Cmw-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 03/10] virDomainDiskDef: Change type of rerror_policy to virDomainDiskErrorPolicy Date: Thu, 22 Apr 2021 12:32:50 +0200 Message-Id: <20210422103257.119508-4-twiederh@redhat.com> In-Reply-To: <20210422103257.119508-1-twiederh@redhat.com> References: <20210422103257.119508-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake 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.14 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) Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake Reviewed-by: Michal Privoznik --- src/conf/domain_conf.c | 16 ++++++++++------ src/conf/domain_conf.h | 2 +- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 4a0358831b..0b12ec61f9 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8988,12 +8988,16 @@ virDomainDiskDefDriverParseXML(virDomainDiskDef *de= f, } VIR_FREE(tmp); =20 - if ((tmp =3D virXMLPropString(cur, "rerror_policy")) && - (((def->rerror_policy =3D virDomainDiskErrorPolicyTypeFromString(t= mp)) <=3D 0) || - (def->rerror_policy =3D=3D VIR_DOMAIN_DISK_ERROR_POLICY_ENOSPACE)= )) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown disk read error policy '%s'"), tmp); - return -1; + if ((tmp =3D virXMLPropString(cur, "rerror_policy"))) { + int rerror_policy; + + if (((rerror_policy =3D virDomainDiskErrorPolicyTypeFromString(tmp= )) <=3D 0) || + (rerror_policy =3D=3D VIR_DOMAIN_DISK_ERROR_POLICY_ENOSPACE)) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown disk read error policy '%s'"), tmp); + return -1; + } + def->rerror_policy =3D rerror_policy; } VIR_FREE(tmp); =20 diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index cacb9d0430..d808f5b260 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -568,7 +568,7 @@ struct _virDomainDiskDef { char *product; virDomainDiskCache cachemode; virDomainDiskErrorPolicy error_policy; - int rerror_policy; /* enum virDomainDiskErrorPolicy */ + virDomainDiskErrorPolicy rerror_policy; int iomode; /* enum virDomainDiskIo */ virTristateSwitch ioeventfd; virTristateSwitch event_idx; --=20 2.26.3 From nobody Thu Apr 25 14:23:48 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; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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=1619087719; cv=none; d=zohomail.com; s=zohoarc; b=Vl33mORA90cEqf3bg6uasoeuFQWIqcI4NHK+cSNRnYBA/fyUe5a2urz61fzkCFIRBHgJ1ap53IAsZlPwfkltouZy8LSwEDCgrpZ3T6KzfUq+BV+ps/EalbezYzToaNDNLwTmlfrolnz9ufMWnHocPQ/M9QX8Z7uawTbmPOkNE5w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619087719; 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=nuOxLNe2DC6x9KxihJlsj6dpZEwSzC5L20Ur1UpCfKY=; b=ABmjcfHmL+BN2xVlJzUZ0Bi5jnjPk1IPdWloSf6xUT/RfrEK73TVkc1vAsR5i0eNWLOwhuekpKIyLtQZOktGmq1uWqtJhH5fdtTkpcVqBorWzE92wtpEg7hTXp82UKDTQnbFbogH9TQFK/xcYarwyphPfsYOrXBGc2QrOcZSK7A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= 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 1619087719053406.49208644399687; Thu, 22 Apr 2021 03:35:19 -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-43-THABxpJGOb6LVCMxQZc_Lw-1; Thu, 22 Apr 2021 06:33:31 -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 3FE8F19251AB; Thu, 22 Apr 2021 10:33:26 +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 E9F9960938; Thu, 22 Apr 2021 10:33:25 +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 9480F1806D1F; Thu, 22 Apr 2021 10:33:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 13MAX6An009768 for ; Thu, 22 Apr 2021 06:33:06 -0400 Received: by smtp.corp.redhat.com (Postfix) id 5383910023AC; Thu, 22 Apr 2021 10:33:06 +0000 (UTC) Received: from work.redhat.com (ovpn-114-56.ams2.redhat.com [10.36.114.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9EFE310016FE; Thu, 22 Apr 2021 10:33:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619087718; 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=nuOxLNe2DC6x9KxihJlsj6dpZEwSzC5L20Ur1UpCfKY=; b=iNIzvhv6l6YiRMLjBxax5OE4OahrjB1p9nv9U/dr7GTsWkvcYsrIIGPNHaaEtRcyF9Mp7j kcVpGT5CLh8QIkZDCjv15Gdew2Sw9XUdWsZQ0TuwXONF2BjGmslbCspSrvqqbQZLm4RX1i v+OvRAj3D/U8PGTw6hQKwuLqJnfeFtk= X-MC-Unique: THABxpJGOb6LVCMxQZc_Lw-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 04/10] virDomainDiskDef: Change type of iomode to virDomainDiskInfo Date: Thu, 22 Apr 2021 12:32:51 +0200 Message-Id: <20210422103257.119508-5-twiederh@redhat.com> In-Reply-To: <20210422103257.119508-1-twiederh@redhat.com> References: <20210422103257.119508-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake 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) Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake Reviewed-by: Michal Privoznik --- src/conf/domain_conf.c | 14 +++++++++----- src/conf/domain_conf.h | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 0b12ec61f9..72664bd72b 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -9001,11 +9001,15 @@ virDomainDiskDefDriverParseXML(virDomainDiskDef *de= f, } VIR_FREE(tmp); =20 - if ((tmp =3D virXMLPropString(cur, "io")) && - (def->iomode =3D virDomainDiskIoTypeFromString(tmp)) <=3D 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown disk io mode '%s'"), tmp); - return -1; + if ((tmp =3D virXMLPropString(cur, "io"))) { + int iomode; + + if ((iomode =3D virDomainDiskIoTypeFromString(tmp)) <=3D 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown disk io mode '%s'"), tmp); + return -1; + } + def->iomode =3D iomode; } VIR_FREE(tmp); =20 diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index d808f5b260..3402b3f85a 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -569,7 +569,7 @@ struct _virDomainDiskDef { virDomainDiskCache cachemode; virDomainDiskErrorPolicy error_policy; virDomainDiskErrorPolicy rerror_policy; - int iomode; /* enum virDomainDiskIo */ + virDomainDiskIo iomode; virTristateSwitch ioeventfd; virTristateSwitch event_idx; virTristateSwitch copy_on_read; --=20 2.26.3 From nobody Thu Apr 25 14:23:48 2024 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=1619087614; cv=none; d=zohomail.com; s=zohoarc; b=AsaHSSs58B07yjqpxwrRngq78GqogwVfhBS4n4eDcXg0KMpjVLOqxcqH+RQr02f9jj374uibrWbCHi5oMEYVYywHpaIi+SBsa8gc01uByelHTi/rCdnp9r0btT0aCcjCM7G04qaFB3wXHlBBXcjb4+Kd/6G95Oe4vP+DfUYRK34= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619087614; 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=sWwYaLfUuJ+NCWxwqyIPDh00ewTvTcQb+BGEYIKY8sY=; b=mL2L/FW6g1xRiRNEzPRHpi/kO6c2KDeLWbmr8bzoKOyKogJjChZrDHjRpU8nAmiYW80fOHCbgQn3aayaerwiF6KR92o2zTYsxm2VJx/5vBFwN7fmjDDzkA5GRy1DOP91AniwNqQuLAcKnL/6PRTf0vHI98s5I+Ma55871TZMqLs= 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) header.from= 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 1619087613998509.0339393553803; Thu, 22 Apr 2021 03:33: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-244-h24yBCiMNJ-RSGj1vXsl3Q-1; Thu, 22 Apr 2021 06:33:30 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 4D38510C40D4; Thu, 22 Apr 2021 10:33:26 +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 C326163623; Thu, 22 Apr 2021 10:33:25 +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 91E211806D1E; Thu, 22 Apr 2021 10:33:25 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 13MAX79f009775 for ; Thu, 22 Apr 2021 06:33:07 -0400 Received: by smtp.corp.redhat.com (Postfix) id 6D7A3100F49F; Thu, 22 Apr 2021 10:33:07 +0000 (UTC) Received: from work.redhat.com (ovpn-114-56.ams2.redhat.com [10.36.114.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id A994810016FE; Thu, 22 Apr 2021 10:33:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619087612; 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=sWwYaLfUuJ+NCWxwqyIPDh00ewTvTcQb+BGEYIKY8sY=; b=Dy530GqW0gYarNe5OCWQNXJ89jvKqaK++zP2SxxuILyKansKs9LNTAxr/WttwhxeF16AJR zUcwNqMBtt6QZwTSKFaAtw9+faisQbB7Ztf8Cok52YNAgaeUFaaaVRkGRnrn90UncQEp2e 13sTRjh/V5y7kMOTVOoDjwBDV6gy/CE= X-MC-Unique: h24yBCiMNJ-RSGj1vXsl3Q-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 05/10] virDomainDiskDef: Change type of discard to virDomainDiskDiscard Date: Thu, 22 Apr 2021 12:32:52 +0200 Message-Id: <20210422103257.119508-6-twiederh@redhat.com> In-Reply-To: <20210422103257.119508-1-twiederh@redhat.com> References: <20210422103257.119508-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake 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.15 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) Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake Reviewed-by: Michal Privoznik --- src/conf/domain_conf.c | 14 +++++++++----- src/conf/domain_conf.h | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 72664bd72b..9a4252099e 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -9046,11 +9046,15 @@ virDomainDiskDefDriverParseXML(virDomainDiskDef *de= f, } VIR_FREE(tmp); =20 - if ((tmp =3D virXMLPropString(cur, "discard")) && - (def->discard =3D virDomainDiskDiscardTypeFromString(tmp)) <=3D 0)= { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown disk discard mode '%s'"), tmp); - return -1; + if ((tmp =3D virXMLPropString(cur, "discard"))) { + int discard; + + if ((discard =3D virDomainDiskDiscardTypeFromString(tmp)) <=3D 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown disk discard mode '%s'"), tmp); + return -1; + } + def->discard =3D discard; } VIR_FREE(tmp); =20 diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 3402b3f85a..eb4991a312 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -579,7 +579,7 @@ struct _virDomainDiskDef { virDomainDeviceInfo info; virTristateBool rawio; virDomainDeviceSGIO sgio; - int discard; /* enum virDomainDiskDiscard */ + virDomainDiskDiscard discard; unsigned int iothread; /* unused =3D 0, > 0 specific thread # */ int detect_zeroes; /* enum virDomainDiskDetectZeroes */ char *domain_name; /* backend domain name */ --=20 2.26.3 From nobody Thu Apr 25 14:23:48 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; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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=1619087778; cv=none; d=zohomail.com; s=zohoarc; b=OlHAqkyK6twxfXduWxI7BqLlGXzMfBtJITtN0sY1NxUR3Vp3g0Kp5qjeZ0onW2nFpUaCUxoJIqrH2WW95PvPEwUOVOK+xWdplDy1ouVaFKsmDz4DaStfPKfBg6KAr67uaIkQrV7AAnjEv6XpUBATMt9+1VE/UkfHzXbfdVXJpyk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619087778; 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=iWPVq6vSr1ZIJSfOXxP1jP7uZWMi+bjmEMjvQ/iyB+M=; b=DFzTsKRJmwcLkytIZelzE2j3Lwnc4egMko7YqGvgPuuVcQviKsf2wjCxJie7RkV2BMY2X4AQr/MRgfQqOLCH0cz70j3dGJ7axvLB7vRkWheAqwpWsCgOM92OzXdIOdJ7HHjmpNSvwkiwAA03jKS/JqimQv578FDSYV1btDNe5Gc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= 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 1619087778531221.37999295268912; Thu, 22 Apr 2021 03:36:18 -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-524-pBl10GYEMluOP7NLzA_8Vg-1; Thu, 22 Apr 2021 06:33:35 -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 AA00519251B2; Thu, 22 Apr 2021 10:33:30 +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 874E4610F1; Thu, 22 Apr 2021 10:33:30 +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 52DA944A67; Thu, 22 Apr 2021 10:33:30 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 13MAX8bC009781 for ; Thu, 22 Apr 2021 06:33:08 -0400 Received: by smtp.corp.redhat.com (Postfix) id 7CA9B10023AC; Thu, 22 Apr 2021 10:33:08 +0000 (UTC) Received: from work.redhat.com (ovpn-114-56.ams2.redhat.com [10.36.114.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id C24D310016FE; Thu, 22 Apr 2021 10:33:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619087777; 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=iWPVq6vSr1ZIJSfOXxP1jP7uZWMi+bjmEMjvQ/iyB+M=; b=K8ANZ4qilhyq96Z9uxjhI7508FOeVOg+a0aht2mbas+bCLUYiPpy714ZD7Wm1ntCds9oGT hdZ1GTT4pk0/wH5WvH1TOCFyRD3V0Bv2E0WFCBUF1k/uQVXWU8KumdoNbLLnWpA75EFSqN jc7CVzF/0P1MMQAU7EFie5UkjCDSrec= X-MC-Unique: pBl10GYEMluOP7NLzA_8Vg-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 06/10] virDomainDiskDef: Change type of detect_zeroes to virDomainDiskDetectZeroes Date: Thu, 22 Apr 2021 12:32:53 +0200 Message-Id: <20210422103257.119508-7-twiederh@redhat.com> In-Reply-To: <20210422103257.119508-1-twiederh@redhat.com> References: <20210422103257.119508-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake 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 X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake Reviewed-by: Michal Privoznik --- src/conf/domain_conf.c | 14 +++++++++----- src/conf/domain_conf.h | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 9a4252099e..60f961c2b9 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -9083,11 +9083,15 @@ virDomainDiskDefDriverParseXML(virDomainDiskDef *de= f, VIR_FREE(tmp); } =20 - if ((tmp =3D virXMLPropString(cur, "detect_zeroes")) && - (def->detect_zeroes =3D virDomainDiskDetectZeroesTypeFromString(tm= p)) <=3D 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown driver detect_zeroes value '%s'"), tmp); - return -1; + if ((tmp =3D virXMLPropString(cur, "detect_zeroes"))) { + int detect_zeroes; + + if ((detect_zeroes =3D virDomainDiskDetectZeroesTypeFromString(tmp= )) <=3D 0) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("unknown driver detect_zeroes value '%s'"), t= mp); + return -1; + } + def->detect_zeroes =3D detect_zeroes; } VIR_FREE(tmp); =20 diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index eb4991a312..a7cad31896 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -581,7 +581,7 @@ struct _virDomainDiskDef { virDomainDeviceSGIO sgio; virDomainDiskDiscard discard; unsigned int iothread; /* unused =3D 0, > 0 specific thread # */ - int detect_zeroes; /* enum virDomainDiskDetectZeroes */ + virDomainDiskDetectZeroes detect_zeroes; char *domain_name; /* backend domain name */ unsigned int queues; virDomainDiskModel model; --=20 2.26.3 From nobody Thu Apr 25 14:23:48 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; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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=1619087624; cv=none; d=zohomail.com; s=zohoarc; b=KYPgnqlWfHVi4qugqLcIRuduvwJOJg5TnbCuNTY3E4Y7ddkq8ORWJvHuZ/h+HxaCT7qGRekiNBcevr6EsS2g/VkzEOjPsbZq0kQD3xLI8iPnZPcq9/hwpVRFsoCThPnrAj71clw+U1A1ifdScGPznyOHsH/BJeBSsbbmGXQeGNU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619087624; 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=EJb/xXZGbp30mKn3oalTeXq7LsIazx+cmFQ47nowGN8=; b=GpK4RuwloPRz4V+NC2gH5T8jLq4y4nAddxanXB9XvKlw9TKvuffBjbrhQw8rl9eI0C9S05RDlmKyDTyWiemsSVnfcygS7/sum0UqMyBifSsORiVZOrDNmgoeOmtqguguX2+cdtKtPzh3MsalZFZjLL/7PwPN5YZu1M74MYw2esw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= 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 1619087624407840.6684877385876; Thu, 22 Apr 2021 03:33:44 -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-233-MlI58idDMe-31hNcPc9bQg-1; Thu, 22 Apr 2021 06:33:35 -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 327DC343B8; Thu, 22 Apr 2021 10:33:29 +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 1048C50449; Thu, 22 Apr 2021 10:33:29 +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 CA0B544A62; Thu, 22 Apr 2021 10:33:28 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 13MAX9vB009788 for ; Thu, 22 Apr 2021 06:33:09 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8C06210023AC; Thu, 22 Apr 2021 10:33:09 +0000 (UTC) Received: from work.redhat.com (ovpn-114-56.ams2.redhat.com [10.36.114.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id D1E6210016FE; Thu, 22 Apr 2021 10:33:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619087623; 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=EJb/xXZGbp30mKn3oalTeXq7LsIazx+cmFQ47nowGN8=; b=Yb10PaC7+YKezQDhBpdSaCcxuX/L0S86MUUtVCVfnSttmhkLXWOeXmhbm7LevnBpdLtWI4 o5X41PWiAirkaZSIp0yB330njf96ICtigDXmsz2htHv9s2h4tiF5gHiG28XiPGzMlBRZ7h be5mM+h5thSBadkos1hadCb0Kz32jlk= X-MC-Unique: MlI58idDMe-31hNcPc9bQg-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 07/10] virDomainDiskDefDriverParseXML: Use virXMLProp* Date: Thu, 22 Apr 2021 12:32:54 +0200 Message-Id: <20210422103257.119508-8-twiederh@redhat.com> In-Reply-To: <20210422103257.119508-1-twiederh@redhat.com> References: <20210422103257.119508-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake 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 X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake Reviewed-by: Michal Privoznik --- src/conf/domain_conf.c | 150 +++++++++++------------------------------ 1 file changed, 39 insertions(+), 111 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 60f961c2b9..1bbf907596 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -8964,109 +8964,51 @@ virDomainDiskDefDriverParseXML(virDomainDiskDef *d= ef, =20 def->driverName =3D virXMLPropString(cur, "name"); =20 - if ((tmp =3D virXMLPropString(cur, "cache"))) { - int cachemode; - - if ((cachemode =3D virDomainDiskCacheTypeFromString(tmp)) < 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown disk cache mode '%s'"), tmp); - return -1; - } - def->cachemode =3D cachemode; - } - VIR_FREE(tmp); - - if ((tmp =3D virXMLPropString(cur, "error_policy"))) { - int error_policy; - - if ((error_policy =3D virDomainDiskErrorPolicyTypeFromString(tmp))= <=3D 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown disk error policy '%s'"), tmp); - return -1; - } - def->error_policy =3D error_policy; - } - VIR_FREE(tmp); - - if ((tmp =3D virXMLPropString(cur, "rerror_policy"))) { - int rerror_policy; + if (virXMLPropEnum(cur, "cache", virDomainDiskCacheTypeFromString, + VIR_XML_PROP_NONE, &def->cachemode) < 0) + return -1; =20 - if (((rerror_policy =3D virDomainDiskErrorPolicyTypeFromString(tmp= )) <=3D 0) || - (rerror_policy =3D=3D VIR_DOMAIN_DISK_ERROR_POLICY_ENOSPACE)) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown disk read error policy '%s'"), tmp); - return -1; - } - def->rerror_policy =3D rerror_policy; - } - VIR_FREE(tmp); + if (virXMLPropEnum(cur, "error_policy", + virDomainDiskErrorPolicyTypeFromString, + VIR_XML_PROP_NONZERO, &def->error_policy) < 0) + return -1; =20 - if ((tmp =3D virXMLPropString(cur, "io"))) { - int iomode; + if (virXMLPropEnum(cur, "rerror_policy", + virDomainDiskErrorPolicyTypeFromString, + VIR_XML_PROP_NONZERO, &def->rerror_policy) < 0) + return -1; =20 - if ((iomode =3D virDomainDiskIoTypeFromString(tmp)) <=3D 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown disk io mode '%s'"), tmp); - return -1; - } - def->iomode =3D iomode; + if (def->rerror_policy =3D=3D VIR_DOMAIN_DISK_ERROR_POLICY_ENOSPACE) { + virReportError(VIR_ERR_CONFIG_UNSUPPORTED, + _("Invalid disk read error policy: '%s'"), + virDomainDiskErrorPolicyTypeToString(def->rerror_po= licy)); + return -1; } - VIR_FREE(tmp); =20 - if ((tmp =3D virXMLPropString(cur, "ioeventfd"))) { - int value; - if ((value =3D virTristateSwitchTypeFromString(tmp)) <=3D 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown disk ioeventfd mode '%s'"), tmp); - return -1; - } - def->ioeventfd =3D value; - } - VIR_FREE(tmp); + if (virXMLPropEnum(cur, "io", virDomainDiskIoTypeFromString, + VIR_XML_PROP_NONZERO, &def->iomode) < 0) + return -1; =20 - if ((tmp =3D virXMLPropString(cur, "event_idx"))) { - int value; - if ((value =3D virTristateSwitchTypeFromString(tmp)) <=3D 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown disk event_idx mode '%s'"), tmp); - return -1; - } - def->event_idx =3D value; - } - VIR_FREE(tmp); + if (virXMLPropTristateSwitch(cur, "ioeventfd", VIR_XML_PROP_NONE, + &def->ioeventfd) < 0) + return -1; =20 - if ((tmp =3D virXMLPropString(cur, "copy_on_read"))) { - int value; - if ((value =3D virTristateSwitchTypeFromString(tmp)) <=3D 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown disk copy_on_read mode '%s'"), tmp); - return -1; - } - def->copy_on_read =3D value; - } - VIR_FREE(tmp); + if (virXMLPropTristateSwitch(cur, "event_idx", VIR_XML_PROP_NONE, + &def->event_idx) < 0) + return -1; =20 - if ((tmp =3D virXMLPropString(cur, "discard"))) { - int discard; + if (virXMLPropTristateSwitch(cur, "copy_on_read", VIR_XML_PROP_NONE, + &def->copy_on_read) < 0) + return -1; =20 - if ((discard =3D virDomainDiskDiscardTypeFromString(tmp)) <=3D 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown disk discard mode '%s'"), tmp); - return -1; - } - def->discard =3D discard; - } - VIR_FREE(tmp); + if (virXMLPropEnum(cur, "discard", virDomainDiskDiscardTypeFromString, + VIR_XML_PROP_NONZERO, &def->discard) < 0) + return -1; =20 - if ((tmp =3D virXMLPropString(cur, "iothread")) && - (virStrToLong_uip(tmp, NULL, 10, &def->iothread) < 0 || - def->iothread =3D=3D 0)) { - virReportError(VIR_ERR_XML_ERROR, - _("Invalid iothread attribute in disk driver elemen= t: %s"), - tmp); + if (virXMLPropUInt(cur, "iothread", 10, + VIR_XML_PROP_NONE | VIR_XML_PROP_NONZERO, + &def->iothread) < 0) return -1; - } - VIR_FREE(tmp); =20 if ((tmp =3D virXMLPropString(cur, "type"))) { if (STREQ(tmp, "aio")) { @@ -9079,29 +9021,15 @@ virDomainDiskDefDriverParseXML(virDomainDiskDef *de= f, return -1; } } - - VIR_FREE(tmp); } =20 - if ((tmp =3D virXMLPropString(cur, "detect_zeroes"))) { - int detect_zeroes; - - if ((detect_zeroes =3D virDomainDiskDetectZeroesTypeFromString(tmp= )) <=3D 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown driver detect_zeroes value '%s'"), t= mp); - return -1; - } - def->detect_zeroes =3D detect_zeroes; - } - VIR_FREE(tmp); + if (virXMLPropEnum(cur, "detect_zeroes", + virDomainDiskDetectZeroesTypeFromString, + VIR_XML_PROP_NONZERO, &def->detect_zeroes) < 0) + return -1; =20 - if ((tmp =3D virXMLPropString(cur, "queues")) && - virStrToLong_uip(tmp, NULL, 10, &def->queues) < 0) { - virReportError(VIR_ERR_XML_ERROR, - _("'queues' attribute must be positive number: %s"), - tmp); + if (virXMLPropUInt(cur, "queues", 10, VIR_XML_PROP_NONE, &def->queues)= < 0) return -1; - } =20 if (virParseScaledValue("./metadata_cache/max_size", NULL, ctxt, --=20 2.26.3 From nobody Thu Apr 25 14:23:48 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; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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=1619087767; cv=none; d=zohomail.com; s=zohoarc; b=hxTnzdUXYSj+139b9MwSVaUYeSufV3I0L9oIdqDfyVdQmiz9QPhCRmpuxGykVk30ONa1kjvdGDLWyjhOG+A6tM4uVQNH2dN29ALnNHaJqnW3o1Jd1JD5+OQiMq+8ARTPcn1qFcGAdzgCUQdAbZ1En2BLnfEhLYHk2EJbtRvUXPw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619087767; 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=tEtkz00AZbVeMGYND6O3kxyTXibioJ0j/ErLk/2yMTk=; b=HAK4+z0Tt7uQEqgcwUvAezdFaJ3Z3z18zjR/7MoK4P8iaw+CKaEW1T6NXj+ZyVFoKl1DnA6yUvO5pir5dtrm3rpvFt2soOAaqVeODxczeM0D+nMlrRqRrWwMIbqUDY/KZctHVZT3ExcURCq2h3VJeuqAGutYOHSM5PNjt3e3/pA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= 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 1619087767557441.8728966316694; Thu, 22 Apr 2021 03:36:07 -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-561-ppvWnj4wMoORnXrfxEtH_A-1; Thu, 22 Apr 2021 06:33:35 -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 E03B6107ACED; Thu, 22 Apr 2021 10:33: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 BE5E660C5F; Thu, 22 Apr 2021 10:33: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 82B7844A60; Thu, 22 Apr 2021 10:33:28 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 13MAXAw8009802 for ; Thu, 22 Apr 2021 06:33:10 -0400 Received: by smtp.corp.redhat.com (Postfix) id 982E010190A7; Thu, 22 Apr 2021 10:33:10 +0000 (UTC) Received: from work.redhat.com (ovpn-114-56.ams2.redhat.com [10.36.114.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id DED7110023AC; Thu, 22 Apr 2021 10:33:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619087766; 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=tEtkz00AZbVeMGYND6O3kxyTXibioJ0j/ErLk/2yMTk=; b=eDaWiRZ321/fib63rA1ydYuhB2gqI9IzrE24WaLY2q2irOqe8NLZCQuBtBuO58nJ1btfEv mL8cYe+K5LLKP2jzLm3pimDvxQ5FalCnTnCBnV4DPht+nXKQ35PvaSittSe3MXe/LRVixy 4BCk+xQBqLhj61ztRlTdsXyrAguyjCs= X-MC-Unique: ppvWnj4wMoORnXrfxEtH_A-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 08/10] domain_conf: Introduce function virDomainChrSouceModeTypeFromString Date: Thu, 22 Apr 2021 12:32:55 +0200 Message-Id: <20210422103257.119508-9-twiederh@redhat.com> In-Reply-To: <20210422103257.119508-1-twiederh@redhat.com> References: <20210422103257.119508-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake 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 X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Preparatory step to remove virDomainChrSourceDefParseMode. Signed-off-by: Tim Wiederhake Reviewed-by: Michal Privoznik --- src/conf/domain_conf.c | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 1bbf907596..cdc32e52dd 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -11455,6 +11455,20 @@ typedef enum { } virDomainChrSourceModeType; =20 =20 +static int +virDomainChrSourceModeTypeFromString(const char *str) +{ + if (!str) + return -1; + + if (STREQ(str, "connect")) + return VIR_DOMAIN_CHR_SOURCE_MODE_CONNECT; + if (STREQ(str, "bind")) + return VIR_DOMAIN_CHR_SOURCE_MODE_BIND; + + return -1; +} + /** * virDomainChrSourceDefParseMode: * @source: XML dom node @@ -11466,16 +11480,18 @@ static int virDomainChrSourceDefParseMode(xmlNodePtr source) { g_autofree char *mode =3D virXMLPropString(source, "mode"); + int result; =20 - if (!mode || STREQ(mode, "connect")) { + if (!mode) return VIR_DOMAIN_CHR_SOURCE_MODE_CONNECT; - } else if (STREQ(mode, "bind")) { - return VIR_DOMAIN_CHR_SOURCE_MODE_BIND; + + if ((result =3D virDomainChrSourceModeTypeFromString(mode)) < 0) { + virReportError(VIR_ERR_INTERNAL_ERROR, + _("Unknown source mode '%s'"), mode); + return -1; } =20 - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown source mode '%s'"), mode); - return -1; + return result; } =20 =20 --=20 2.26.3 From nobody Thu Apr 25 14:23:48 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; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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=1619087632; cv=none; d=zohomail.com; s=zohoarc; b=TMkl8eU1QEaS8tJWd8bPC2CmqhuWfMFytRFWgs8hRO3BG1GfleFLTd4tYxxvHuYmnylrQPg3ZS7+1xOzfJ9mOj+z+HEeM1LLgARl2TUp/ftSBe5JwvlBVI3um1Out2sUNYNLQxOAPveBSEq9gukRoqfR+hZxAVqpw8yVS0/GMvs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619087632; 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=mehM3AK12VaREpdcU7qEi9VzkWWrLgJ8B0o83ETaEzQ=; b=KRr3RpEcWta+XeoHWLFFYnsQdqkyhmV40eUdHy3ST60f5CIUryJDvXYVhi5NWU5zxf4TLI3ZChJ1FLulI60EpuP0XB3KqP744nHB3TZbQsuiJOmKWNWrHFcLz/tKVDGzFGSY2mZA/HSi7WfqCR23/gfAXj8tKPSxagriGrVcCNU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= 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 1619087632863795.618077279312; Thu, 22 Apr 2021 03:33:52 -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-375-ITZYR7DLOlGqoQvx97S9XA-1; Thu, 22 Apr 2021 06:33:39 -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 CEA2719251A7; Thu, 22 Apr 2021 10:33:31 +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 AFAFF5044F; Thu, 22 Apr 2021 10:33:31 +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 7D91C1806D1B; Thu, 22 Apr 2021 10:33:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 13MAXBeo009813 for ; Thu, 22 Apr 2021 06:33:11 -0400 Received: by smtp.corp.redhat.com (Postfix) id A5DB010016FE; Thu, 22 Apr 2021 10:33:11 +0000 (UTC) Received: from work.redhat.com (ovpn-114-56.ams2.redhat.com [10.36.114.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id EFB63100F49F; Thu, 22 Apr 2021 10:33:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619087631; 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=mehM3AK12VaREpdcU7qEi9VzkWWrLgJ8B0o83ETaEzQ=; b=Z0MoAXx32BqSZq0bfhJej/XE3dFwDBOYxiO5xWRYvrf+75f5iTRu2MrdXFgO7xMnf83wF9 atLvuc3pMMexy941jsgc456nhB9pAtRt8pLVRx2YTuQ6wHZXom4XAWWqGeLoXDdMTskMAj FdBdqznTFxFwNCqOCblkVPw3zYBhPFA= X-MC-Unique: ITZYR7DLOlGqoQvx97S9XA-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 09/10] domain_conf: Remove function virDomainChrSourceDefParseMode Date: Thu, 22 Apr 2021 12:32:56 +0200 Message-Id: <20210422103257.119508-10-twiederh@redhat.com> In-Reply-To: <20210422103257.119508-1-twiederh@redhat.com> References: <20210422103257.119508-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake 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 X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake Reviewed-by: Michal Privoznik --- src/conf/domain_conf.c | 40 +++++++++------------------------------- 1 file changed, 9 insertions(+), 31 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index cdc32e52dd..447fc7dfcb 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -11469,31 +11469,6 @@ virDomainChrSourceModeTypeFromString(const char *s= tr) return -1; } =20 -/** - * virDomainChrSourceDefParseMode: - * @source: XML dom node - * - * Returns: -1 in case of error, - * virDomainChrSourceModeType in case of success - */ -static int -virDomainChrSourceDefParseMode(xmlNodePtr source) -{ - g_autofree char *mode =3D virXMLPropString(source, "mode"); - int result; - - if (!mode) - return VIR_DOMAIN_CHR_SOURCE_MODE_CONNECT; - - if ((result =3D virDomainChrSourceModeTypeFromString(mode)) < 0) { - virReportError(VIR_ERR_INTERNAL_ERROR, - _("Unknown source mode '%s'"), mode); - return -1; - } - - return result; -} - =20 static int virDomainChrSourceDefParseTCP(virDomainChrSourceDef *def, @@ -11501,11 +11476,12 @@ virDomainChrSourceDefParseTCP(virDomainChrSourceD= ef *def, xmlXPathContextPtr ctxt, unsigned int flags) { - int mode; + virDomainChrSourceModeType mode =3D VIR_DOMAIN_CHR_SOURCE_MODE_CONNECT; int tmpVal; g_autofree char *tmp =3D NULL; =20 - if ((mode =3D virDomainChrSourceDefParseMode(source)) < 0) + if (virXMLPropEnum(source, "mode", virDomainChrSourceModeTypeFromStrin= g, + VIR_XML_PROP_NONE, &mode) < 0) return -1; =20 def->data.tcp.listen =3D mode =3D=3D VIR_DOMAIN_CHR_SOURCE_MODE_BIND; @@ -11549,9 +11525,10 @@ static int virDomainChrSourceDefParseUDP(virDomainChrSourceDef *def, xmlNodePtr source) { - int mode; + virDomainChrSourceModeType mode =3D VIR_DOMAIN_CHR_SOURCE_MODE_CONNECT; =20 - if ((mode =3D virDomainChrSourceDefParseMode(source)) < 0) + if (virXMLPropEnum(source, "mode", virDomainChrSourceModeTypeFromStrin= g, + VIR_XML_PROP_NONE, &mode) < 0) return -1; =20 if (mode =3D=3D VIR_DOMAIN_CHR_SOURCE_MODE_CONNECT && @@ -11573,9 +11550,10 @@ virDomainChrSourceDefParseUnix(virDomainChrSourceD= ef *def, xmlNodePtr source, xmlXPathContextPtr ctxt) { - int mode; + virDomainChrSourceModeType mode =3D VIR_DOMAIN_CHR_SOURCE_MODE_CONNECT; =20 - if ((mode =3D virDomainChrSourceDefParseMode(source)) < 0) + if (virXMLPropEnum(source, "mode", virDomainChrSourceModeTypeFromStrin= g, + VIR_XML_PROP_NONE, &mode) < 0) return -1; =20 def->data.nix.listen =3D mode =3D=3D VIR_DOMAIN_CHR_SOURCE_MODE_BIND; --=20 2.26.3 From nobody Thu Apr 25 14:23:48 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; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.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=1619087622; cv=none; d=zohomail.com; s=zohoarc; b=kyXxLuyplRmxNRTRNFCz7FwBJ268MWpmrzpgy/NXnlfG1P/ZaY04k6/W4Wzej+GfIv/MJMlNhk/BmOqwHdhG0hjxXN8s8RbkgFqLqaQ0k09f+/et7EabFPDT1INc0vFdAWGHKdsbRGnYqr+EdHBMAhtT6XS4Oab/syZImxswpUQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619087622; 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=Ujv2RZslQr498p/TAE7HZA8KJakMm/BURm/dMB+RYas=; b=RmjZa9iNfcY7B3wBr7+V/pSrIDCSuDvTg79k3DUkPBG0BLFrJJnlE+eVvKoC///aAq/4Po8qN19YqeyqRqINdCm9iedBgo00Ejal6vEBmYTXzWX33hY+I8BawolIcgPTlbuo+vpFTXt666b7jxJramSolXTJwVy+ambN/a64jXo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= 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 1619087622842854.1973785868533; Thu, 22 Apr 2021 03:33:42 -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-17-2Q81POToM0aTF2cW90-MfA-1; Thu, 22 Apr 2021 06:33:39 -0400 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 1DC4719251B0; Thu, 22 Apr 2021 10:33:32 +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 E83F1100F49F; Thu, 22 Apr 2021 10:33:31 +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 B751C180B654; Thu, 22 Apr 2021 10:33:31 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 13MAXCBN009823 for ; Thu, 22 Apr 2021 06:33:12 -0400 Received: by smtp.corp.redhat.com (Postfix) id AEBEC10016FE; Thu, 22 Apr 2021 10:33:12 +0000 (UTC) Received: from work.redhat.com (ovpn-114-56.ams2.redhat.com [10.36.114.56]) by smtp.corp.redhat.com (Postfix) with ESMTP id 03FE510023AC; Thu, 22 Apr 2021 10:33:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619087621; 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=Ujv2RZslQr498p/TAE7HZA8KJakMm/BURm/dMB+RYas=; b=X9kI5HN6dQMUDeFNEhk3ZPFA9/K07fvV2M77+ny1IGyFmX/+8XKUwQ/1xsa3ZteoPox+Hi CCSCwBIWVUFDHtHGXzy6h87MeB7Q4U637qfgCrvXPy2qQwjbeD0D9DDk/PzcCSVznhvW4H sq1nHE7NyyHaXM2ieQ0vk/NGNh8B0mM= X-MC-Unique: 2Q81POToM0aTF2cW90-MfA-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 10/10] virDomainChrSourceDefParseTCP: Use virXMLProp* Date: Thu, 22 Apr 2021 12:32:57 +0200 Message-Id: <20210422103257.119508-11-twiederh@redhat.com> In-Reply-To: <20210422103257.119508-1-twiederh@redhat.com> References: <20210422103257.119508-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com Cc: Tim Wiederhake 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 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) Content-Type: text/plain; charset="utf-8" Signed-off-by: Tim Wiederhake Reviewed-by: Michal Privoznik --- src/conf/domain_conf.c | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 447fc7dfcb..24c0943d62 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -11477,8 +11477,6 @@ virDomainChrSourceDefParseTCP(virDomainChrSourceDef= *def, unsigned int flags) { virDomainChrSourceModeType mode =3D VIR_DOMAIN_CHR_SOURCE_MODE_CONNECT; - int tmpVal; - g_autofree char *tmp =3D NULL; =20 if (virXMLPropEnum(source, "mode", virDomainChrSourceModeTypeFromStrin= g, VIR_XML_PROP_NONE, &mode) < 0) @@ -11488,26 +11486,16 @@ virDomainChrSourceDefParseTCP(virDomainChrSourceD= ef *def, def->data.tcp.host =3D virXMLPropString(source, "host"); def->data.tcp.service =3D virXMLPropString(source, "service"); =20 - if ((tmp =3D virXMLPropString(source, "tls"))) { - int value; - if ((value =3D virTristateBoolTypeFromString(tmp)) <=3D 0) { - virReportError(VIR_ERR_XML_ERROR, - _("unknown chardev 'tls' setting '%s'"), - tmp); - return -1; - } - def->data.tcp.haveTLS =3D value; - VIR_FREE(tmp); - } + if (virXMLPropTristateBool(source, "tls", VIR_XML_PROP_NONE, + &def->data.tcp.haveTLS) < 0) + return -1; =20 - if ((flags & VIR_DOMAIN_DEF_PARSE_STATUS) && - (tmp =3D virXMLPropString(source, "tlsFromConfig"))) { - if (virStrToLong_i(tmp, NULL, 10, &tmpVal) < 0) { - virReportError(VIR_ERR_XML_ERROR, - _("Invalid tlsFromConfig value: %s"), - tmp); + if (flags & VIR_DOMAIN_DEF_PARSE_STATUS) { + int tmpVal; + + if (virXMLPropInt(source, "tlsFromConfig", 10, VIR_XML_PROP_NONE, + &tmpVal) < 0) return -1; - } def->data.tcp.tlsFromConfig =3D !!tmpVal; } =20 --=20 2.26.3