From nobody Tue Apr 16 22:39:05 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=1619192394; cv=none; d=zohomail.com; s=zohoarc; b=dttBN8ESZRwmoJo7KavinzgGtBuPeCopekvg8i12/c4E90QhkLGwLd8mzIT6l2LFrZ7a+jrcXHwdsQIxSHumPzN8Ke9U6cBL8BCt0OIkX2oDaqz74T/FO1BL7cjbghlGnrhszNglt+lMGzEulsUNudFGlNMTCkr5HJ0xV6pHp/Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1619192394; 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=kPQBZs0Cwa9Uy4uLw1asvzg04f9cAmEq3WJWxuXLoHk=; b=j2XSK1jjeRO0UYiFKNpydJjVMt9Nh1AzVReLxcOZ796vNKoSYnAGAIk11NKciueoWpQMwmEk2ttgW4McG0YvIFoKIkQRH8aGJKI8IGJD2KDJdsMUEmOC5MgTIrjerw54NJ64ZTOoeDbXajh0cQx/tPlohU9qSifhLov7bJM9ap8= 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 1619192394053229.7843879778983; Fri, 23 Apr 2021 08:39:54 -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-252-OyCPQIWyPqyILR3Ot8alrQ-1; Fri, 23 Apr 2021 11:39:50 -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 C5410343AE; Fri, 23 Apr 2021 15:39:45 +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 A95B96090F; Fri, 23 Apr 2021 15:39:45 +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 743B81806D1E; Fri, 23 Apr 2021 15:39:45 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id 13NFdYKZ004239 for ; Fri, 23 Apr 2021 11:39:34 -0400 Received: by smtp.corp.redhat.com (Postfix) id A0A9B60613; Fri, 23 Apr 2021 15:39:34 +0000 (UTC) Received: from work.redhat.com (ovpn-115-30.ams2.redhat.com [10.36.115.30]) by smtp.corp.redhat.com (Postfix) with ESMTP id DC71D60854; Fri, 23 Apr 2021 15:39:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1619192393; 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=kPQBZs0Cwa9Uy4uLw1asvzg04f9cAmEq3WJWxuXLoHk=; b=CNLEkr88gIqKHEdM9n8BCN2InSXjrS68S9fp3kjVG5YhQETEuTgjLHyKS3ydkB2M8Ddwa8 0aOxou9dxRzApBW4QYQBNWTHGhb0LzTwTfJTWm+KwB+bsYGrI1Ceorjj3fHvsvVh0rFxnJ 0R3jrGXBIcopteppGu0rlT+m0YpayDQ= X-MC-Unique: OyCPQIWyPqyILR3Ot8alrQ-1 From: Tim Wiederhake To: libvir-list@redhat.com Subject: [libvirt PATCH 05/10] virDomainSoundDef: Change type of model to virDomainSoundModel Date: Fri, 23 Apr 2021 17:39:18 +0200 Message-Id: <20210423153923.339223-6-twiederh@redhat.com> In-Reply-To: <20210423153923.339223-1-twiederh@redhat.com> References: <20210423153923.339223-1-twiederh@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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 --- src/conf/domain_conf.c | 4 +++- src/conf/domain_conf.h | 2 +- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_domain_address.c | 2 +- src/qemu/qemu_validate.c | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index f599d1afe7..50ddb293ed 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -13174,17 +13174,19 @@ virDomainSoundDefParseXML(virDomainXMLOption *xml= opt, virDomainSoundDef *def; VIR_XPATH_NODE_AUTORESTORE(ctxt) g_autofree char *model =3D NULL; + int modelval; xmlNodePtr audioNode; =20 def =3D g_new0(virDomainSoundDef, 1); ctxt->node =3D node; =20 model =3D virXMLPropString(node, "model"); - if ((def->model =3D virDomainSoundModelTypeFromString(model)) < 0) { + if ((modelval =3D virDomainSoundModelTypeFromString(model)) < 0) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("unknown sound model '%s'"), model); goto error; } + def->model =3D modelval; =20 if (virDomainSoundModelSupportsCodecs(def)) { int ncodecs; diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 4838687edf..ede80ac322 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1449,7 +1449,7 @@ struct _virDomainSoundCodecDef { }; =20 struct _virDomainSoundDef { - int model; + virDomainSoundModel model; virDomainDeviceInfo info; =20 size_t ncodecs; diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index be93182092..d7f1c715b6 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -4133,7 +4133,7 @@ qemuBuildSoundDevStr(const virDomainDef *def, const char *model =3D NULL; =20 /* Hack for devices with different names in QEMU and libvirt */ - switch ((virDomainSoundModel) sound->model) { + switch (sound->model) { case VIR_DOMAIN_SOUND_MODEL_ES1370: model =3D "ES1370"; break; diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c index a73f30ddcb..e66efb3d1f 100644 --- a/src/qemu/qemu_domain_address.c +++ b/src/qemu/qemu_domain_address.c @@ -759,7 +759,7 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDevic= eDef *dev, } =20 case VIR_DOMAIN_DEVICE_SOUND: - switch ((virDomainSoundModel) dev->data.sound->model) { + switch (dev->data.sound->model) { case VIR_DOMAIN_SOUND_MODEL_ES1370: case VIR_DOMAIN_SOUND_MODEL_AC97: case VIR_DOMAIN_SOUND_MODEL_ICH6: diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c index 255d653118..774426bceb 100644 --- a/src/qemu/qemu_validate.c +++ b/src/qemu/qemu_validate.c @@ -4385,7 +4385,7 @@ qemuValidateDomainDeviceDefSound(virDomainSoundDef *s= ound, { size_t i; =20 - switch ((virDomainSoundModel) sound->model) { + switch (sound->model) { case VIR_DOMAIN_SOUND_MODEL_USB: if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_USB_AUDIO)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s", --=20 2.26.3