From nobody Thu May 16 06:35:35 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=1618573985; cv=none; d=zohomail.com; s=zohoarc; b=DTwnEA7uJQz6oCLX6SmpRbFRsRIyzRb0BstqFRqsmN7K2xqnNox6deQne46Y5HKAqfGqS7RbY/aXGHxiXGvr/OIq8tXlK+bbAb1erxzl4VUkyNDNRuAgQEsIwy0cjiB0vZwqF6eGQWyXAouP/sG9z8lwwkkV4vpLRtn2gEiNwxE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618573985; h=Content-Type:Content-Transfer-Encoding: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=zkrZnVuyJRxMQH/3kfwMSZfYv6MWkpHjycZ+FblE4sQ=; b=AUDzzewuPwmyW5Wl8c+FIeKBxgR7ZOQ591bkvOTCl3ppIHFuz7u+F4azO47pyHHGwU8SC06bA3QlkaywBApdM7eucGhxasg2KstlVzR0Cf0zwmeLqn6LijFxdfl4MjR8h4Bu8bpbLLLYLW7WnhunFnqgvGJmt63DWOElQf5XVG8= 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 1618573985515899.7719322819813; Fri, 16 Apr 2021 04:53:05 -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-334-yDbHKrxYNtuC0HZGc-0VoQ-1; Fri, 16 Apr 2021 07:53:02 -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 81EF6107ACCD; Fri, 16 Apr 2021 11:52:57 +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 5EC535C257; Fri, 16 Apr 2021 11:52:57 +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 227D61806D18; Fri, 16 Apr 2021 11:52:57 +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 13GBoGEN017376 for ; Fri, 16 Apr 2021 07:50:16 -0400 Received: by smtp.corp.redhat.com (Postfix) id 8246B107D5C1; Fri, 16 Apr 2021 11:50:16 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id D0F1F10074FC for ; Fri, 16 Apr 2021 11:50:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1618573984; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=zkrZnVuyJRxMQH/3kfwMSZfYv6MWkpHjycZ+FblE4sQ=; b=GnW8eTnKVBOKqqNqtdmrERahC4UdJBm1kMDfS6FBkKmn6wVY50iih1X2CjrGcY+Go8EZ3/ zcnR42dcc6w7w7I+x0fk4z/7Ecye1GgpfvjBmVfmpzJkRbdtLq8RZ+kQyuRpFKDAC1i+2f NQhMw8h7F4b80H0PQSB/nfgonNjUlvQ= X-MC-Unique: yDbHKrxYNtuC0HZGc-0VoQ-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 1/2] conf: domain: Convert virDomainDiskDef's 'tray_status' to virDomainDiskTray Date: Fri, 16 Apr 2021 13:50:09 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.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-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Use the appropriate type for the variable and refactor the XML parser to parse it correctly using virXMLPropEnum. Signed-off-by: Peter Krempa Reviewed-by: Tim Wiederhake --- src/conf/domain_conf.c | 13 +++---------- src/conf/domain_conf.h | 2 +- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 858ef5db9d..0128c9d480 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -9344,7 +9344,6 @@ virDomainDiskDefParseXML(virDomainXMLOption *xmlopt, g_autofree char *bus =3D NULL; g_autofree char *serial =3D NULL; g_autofree char *startupPolicy =3D NULL; - g_autofree char *tray =3D NULL; g_autofree char *removable =3D NULL; g_autofree char *logical_block_size =3D NULL; g_autofree char *physical_block_size =3D NULL; @@ -9415,7 +9414,9 @@ virDomainDiskDefParseXML(virDomainXMLOption *xmlopt, virXMLNodeNameEqual(cur, "target")) { target =3D virXMLPropString(cur, "dev"); bus =3D virXMLPropString(cur, "bus"); - tray =3D virXMLPropString(cur, "tray"); + if (virXMLPropEnum(cur, "tray", virDomainDiskTrayTypeFromStrin= g, + VIR_XML_PROP_OPTIONAL, &def->tray_status) <= 0) + return NULL; removable =3D virXMLPropString(cur, "removable"); rotation_rate =3D virXMLPropString(cur, "rotation_rate"); @@ -9634,14 +9635,6 @@ virDomainDiskDefParseXML(virDomainXMLOption *xmlopt, } } - if (tray) { - if ((def->tray_status =3D virDomainDiskTrayTypeFromString(tray)) <= 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown disk tray status '%s'"), tray); - return NULL; - } - } - if (removable) { if ((def->removable =3D virTristateSwitchTypeFromString(removable)= ) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index f610e78e3a..2f8ef74020 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -537,7 +537,7 @@ struct _virDomainDiskDef { int device; /* enum virDomainDiskDevice */ int bus; /* enum virDomainDiskBus */ char *dst; - int tray_status; /* enum virDomainDiskTray */ + virDomainDiskTray tray_status; int removable; /* enum virTristateSwitch */ unsigned int rotation_rate; --=20 2.30.2 From nobody Thu May 16 06:35:35 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=1618573944; cv=none; d=zohomail.com; s=zohoarc; b=GRWU8tRVfKns6xH4J81otXHfiWCN51HUKIR2f/2Spt2RagdxxqAMXM9dvzTLJUpra1hhYkPDshnln7ONdRGEOjt42sKZT+aEdDgHJ85HOuGm9BqWLMihnxuq9USVgIPJJBA2Wo1A1XaNrMavQqDyHgxZHidCU9aIOUO+e69q9xg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618573944; h=Content-Type:Content-Transfer-Encoding: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=LEjXMLYuFD147t3O/wOYWmKpGz/P9EcnK8YnDApj8Kk=; b=XnHv/2JESibotQb1i+zlUO5rm8cyVnn6Wu7R3pnwvaZkGKdVnakFc2sljOIIUIVoXfGCa08YX+m7cX2MfbcT4yLW5LoIuUTTbqpnjz6BrC8xpPLENeHgS5B0k+RP7TEV354179LryR4O+yJXhQ72srYM+I1yB9ZtAr09eymOfL0= 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 1618573944829639.4495180638735; Fri, 16 Apr 2021 04:52:24 -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-60-4DIVCIB6Pg61hAr_Ekp1Hg-1; Fri, 16 Apr 2021 07:52:21 -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 669988030A1; Fri, 16 Apr 2021 11:52:16 +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 111A06294D; Fri, 16 Apr 2021 11:52:16 +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 2699C44A5B; Fri, 16 Apr 2021 11:52:13 +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 13GBoHRJ017384 for ; Fri, 16 Apr 2021 07:50:17 -0400 Received: by smtp.corp.redhat.com (Postfix) id A4CB0107D5C2; Fri, 16 Apr 2021 11:50:17 +0000 (UTC) Received: from speedmetal.lan (unknown [10.40.208.33]) by smtp.corp.redhat.com (Postfix) with ESMTP id EDFDB107D5C1 for ; Fri, 16 Apr 2021 11:50:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1618573943; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=LEjXMLYuFD147t3O/wOYWmKpGz/P9EcnK8YnDApj8Kk=; b=YhYBEoRCF8pz/AVMHakf7d1Zdq46JKkokDI1teWo6khVR3m9puXS3iqZ2MQHbhob2qowxq 0zBbDY9mPPuT1u7cbZsoYqrVB46aOwfUuwxYwQwdf8cjR9B8ZrWtvChiQ/tqTLp/ENLm6J E7AmU8Q7h1ptos/UcDHJhc3FJQRB5v8= X-MC-Unique: 4DIVCIB6Pg61hAr_Ekp1Hg-1 From: Peter Krempa To: libvir-list@redhat.com Subject: [PATCH 2/2] conf: domain: Convert virDomainDiskDef's 'startupPolicy' to virDomainStartupPolicy Date: Fri, 16 Apr 2021 13:50:10 +0200 Message-Id: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-loop: libvir-list@redhat.com X-BeenThere: libvir-list@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: Development discussions about the libvirt library & tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.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" Use the appropriate type for the variable and refactor the XML parser to parse it correctly using virXMLPropEnum. Signed-off-by: Peter Krempa Reviewed-by: Tim Wiederhake --- src/conf/domain_conf.c | 18 ++++-------------- src/conf/domain_conf.h | 2 +- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index 0128c9d480..0bb58ccb5f 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -9343,7 +9343,6 @@ virDomainDiskDefParseXML(virDomainXMLOption *xmlopt, g_autofree char *target =3D NULL; g_autofree char *bus =3D NULL; g_autofree char *serial =3D NULL; - g_autofree char *startupPolicy =3D NULL; g_autofree char *removable =3D NULL; g_autofree char *logical_block_size =3D NULL; g_autofree char *physical_block_size =3D NULL; @@ -9401,7 +9400,10 @@ virDomainDiskDefParseXML(virDomainXMLOption *xmlopt, source =3D true; - startupPolicy =3D virXMLPropString(cur, "startupPolicy"); + if (virXMLPropEnum(cur, "startupPolicy", + virDomainStartupPolicyTypeFromString, + VIR_XML_PROP_OPTIONAL, &def->startupPolicy)= < 0) + return NULL; if (!(flags & VIR_DOMAIN_DEF_PARSE_INACTIVE) && (tmp =3D virXMLPropString(cur, "index")) && @@ -9655,18 +9657,6 @@ virDomainDiskDefParseXML(virDomainXMLOption *xmlopt, return NULL; } - if (startupPolicy) { - int val; - - if ((val =3D virDomainStartupPolicyTypeFromString(startupPolicy)) = <=3D 0) { - virReportError(VIR_ERR_CONFIG_UNSUPPORTED, - _("unknown startupPolicy value '%s'"), - startupPolicy); - return NULL; - } - def->startupPolicy =3D val; - } - def->dst =3D g_steal_pointer(&target); if (authdef) { /* If we've already parsed and found an child, diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 2f8ef74020..99ab2a96d9 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -573,7 +573,7 @@ struct _virDomainDiskDef { virTristateSwitch event_idx; virTristateSwitch copy_on_read; int snapshot; /* virDomainSnapshotLocation, snapshot_conf.h */ - int startupPolicy; /* enum virDomainStartupPolicy */ + virDomainStartupPolicy startupPolicy; bool transient; virDomainDeviceInfo info; int rawio; /* enum virTristateBool */ --=20 2.30.2