From nobody Tue Feb 10 02:44:02 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) client-ip=209.132.183.28; envelope-from=libvir-list-bounces@redhat.com; helo=mx1.redhat.com; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 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=1569235635; cv=none; d=zoho.com; s=zohoarc; b=NfAkY+Zp1Bzm4LZ3L1BrrpFsl6l+AuBgFp+CHU5NFWZhZqeifyWSvUTzZbG7/u16ium/ZH0oxNl+naL9jJdnVPcPGqtZhW7ZBnjNAr54z3mWomQtYdWJtJDwThxARzo6l5TCmXtpivZXTRzQggp3/vML8hrhrWkLPkjDbSO3QR0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1569235635; 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:ARC-Authentication-Results; bh=QEcdsUs9hHI7PrCz2RKphNI/zyEkcWMS61Wp5hEJ4ro=; b=CyKeK8HhVfNN5ESzNBGhHL9KmhZUFxFrCt3p/cA6l/i7YoaumkQuLcmbLmdejVzUboJJrjkcJqblFObhvX6fI6juq/cS/njrfuUEA8VZVC4p+gs6Eq3LlWMGKXnCaUdP3ggqrbCBqOc9pNcE/Wx6LkH+9cmQI1BxeAPhCCxa/LQ= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of redhat.com designates 209.132.183.28 as permitted sender) smtp.mailfrom=libvir-list-bounces@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by mx.zohomail.com with SMTPS id 1569235635052248.87782589463393; Mon, 23 Sep 2019 03:47:15 -0700 (PDT) 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 mx1.redhat.com (Postfix) with ESMTPS id C2BEA80F7C; Mon, 23 Sep 2019 10:47:13 +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 8FE83627DF; Mon, 23 Sep 2019 10:47:13 +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 4A6B34EE68; Mon, 23 Sep 2019 10:47:13 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id x8NAl1Jx025952 for ; Mon, 23 Sep 2019 06:47:01 -0400 Received: by smtp.corp.redhat.com (Postfix) id D75F15C559; Mon, 23 Sep 2019 10:47:01 +0000 (UTC) Received: from localhost (ovpn-112-36.ams2.redhat.com [10.36.112.36]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5C19D5C1B5; Mon, 23 Sep 2019 10:46:53 +0000 (UTC) From: marcandre.lureau@redhat.com To: libvir-list@redhat.com Date: Mon, 23 Sep 2019 14:44:35 +0400 Message-Id: <20190923104443.17931-13-marcandre.lureau@redhat.com> In-Reply-To: <20190923104443.17931-1-marcandre.lureau@redhat.com> References: <20190923104443.17931-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-loop: libvir-list@redhat.com Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , jtomko@redhat.com Subject: [libvirt] [PATCH v5 12/20] conf: add privateData to virDomainVideoDef 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: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Sender: libvir-list-bounces@redhat.com Errors-To: libvir-list-bounces@redhat.com X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Mon, 23 Sep 2019 10:47:14 +0000 (UTC) From: Marc-Andr=C3=A9 Lureau Signed-off-by: Marc-Andr=C3=A9 Lureau Reviewed-by: Cole Robinson --- src/conf/domain_conf.c | 26 +++++++++++++++++--------- src/conf/domain_conf.h | 8 ++++++-- src/vz/vz_sdk.c | 2 +- 3 files changed, 24 insertions(+), 12 deletions(-) diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index e7ec9e972d..6dea670257 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -2820,13 +2820,19 @@ void virDomainShmemDefFree(virDomainShmemDefPtr def) =20 =20 virDomainVideoDefPtr -virDomainVideoDefNew(void) +virDomainVideoDefNew(virDomainXMLOptionPtr xmlopt) { virDomainVideoDefPtr def; =20 if (VIR_ALLOC(def) < 0) return NULL; =20 + if (xmlopt && xmlopt->privateData.videoNew && + !(def->privateData =3D xmlopt->privateData.videoNew())) { + VIR_FREE(def); + return NULL; + } + def->heads =3D 1; return def; } @@ -2858,6 +2864,7 @@ void virDomainVideoDefFree(virDomainVideoDefPtr def) return; =20 virDomainVideoDefClear(def); + virObjectUnref(def->privateData); VIR_FREE(def); } =20 @@ -5681,7 +5688,8 @@ virDomainDefPostParseVideo(virDomainDefPtr def, =20 static int virDomainDefPostParseCommon(virDomainDefPtr def, - struct virDomainDefPostParseDeviceIteratorData= *data) + struct virDomainDefPostParseDeviceIteratorData= *data, + virDomainXMLOptionPtr xmlopt) { size_t i; =20 @@ -5716,7 +5724,7 @@ virDomainDefPostParseCommon(virDomainDefPtr def, if (virDomainDefPostParseTimer(def) < 0) return -1; =20 - if (virDomainDefAddImplicitDevices(def) < 0) + if (virDomainDefAddImplicitDevices(def, xmlopt) < 0) return -1; =20 if (virDomainDefPostParseVideo(def, data) < 0) @@ -5842,7 +5850,7 @@ virDomainDefPostParse(virDomainDefPtr def, if (virDomainDefPostParseCheckFailure(def, parseFlags, ret) < 0) goto cleanup; =20 - if ((ret =3D virDomainDefPostParseCommon(def, &data)) < 0) + if ((ret =3D virDomainDefPostParseCommon(def, &data, xmlopt)) < 0) goto cleanup; =20 if (xmlopt->config.assignAddressesCallback) { @@ -15451,7 +15459,7 @@ virDomainVideoDefParseXML(virDomainXMLOptionPtr xml= opt, VIR_AUTOFREE(char *) vgamem =3D NULL; VIR_AUTOFREE(char *) primary =3D NULL; =20 - if (!(def =3D virDomainVideoDefNew())) + if (!(def =3D virDomainVideoDefNew(xmlopt))) return NULL; =20 ctxt->node =3D node; @@ -23743,7 +23751,7 @@ virDomainDefAddImplicitControllers(virDomainDefPtr = def) } =20 static int -virDomainDefAddImplicitVideo(virDomainDefPtr def) +virDomainDefAddImplicitVideo(virDomainDefPtr def, virDomainXMLOptionPtr xm= lopt) { int ret =3D -1; virDomainVideoDefPtr video =3D NULL; @@ -23753,7 +23761,7 @@ virDomainDefAddImplicitVideo(virDomainDefPtr def) if (def->ngraphics =3D=3D 0 || def->nvideos > 0) return 0; =20 - if (!(video =3D virDomainVideoDefNew())) + if (!(video =3D virDomainVideoDefNew(xmlopt))) goto cleanup; video->type =3D virDomainVideoDefaultType(def); if (VIR_APPEND_ELEMENT(def->videos, def->nvideos, video) < 0) @@ -23766,7 +23774,7 @@ virDomainDefAddImplicitVideo(virDomainDefPtr def) } =20 int -virDomainDefAddImplicitDevices(virDomainDefPtr def) +virDomainDefAddImplicitDevices(virDomainDefPtr def, virDomainXMLOptionPtr = xmlopt) { if (virDomainDefAddConsoleCompat(def) < 0) return -1; @@ -23774,7 +23782,7 @@ virDomainDefAddImplicitDevices(virDomainDefPtr def) if (virDomainDefAddImplicitControllers(def) < 0) return -1; =20 - if (virDomainDefAddImplicitVideo(def) < 0) + if (virDomainDefAddImplicitVideo(def, xmlopt) < 0) return -1; =20 return 0; diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 0143efddbe..cff33f6682 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1427,6 +1427,8 @@ struct _virDomainVideoDriverDef { }; =20 struct _virDomainVideoDef { + virObjectPtr privateData; + int type; /* enum virDomainVideoType */ unsigned int ram; /* kibibytes (multiples of 1024) */ unsigned int vram; /* kibibytes (multiples of 1024) */ @@ -2729,6 +2731,7 @@ struct _virDomainXMLPrivateDataCallbacks { virDomainXMLPrivateDataNewFunc vsockNew; virDomainXMLPrivateDataNewFunc graphicsNew; virDomainXMLPrivateDataNewFunc networkNew; + virDomainXMLPrivateDataNewFunc videoNew; virDomainXMLPrivateDataFormatFunc format; virDomainXMLPrivateDataParseFunc parse; /* following function shall return a pointer which will be used as the @@ -2870,7 +2873,7 @@ void virDomainSoundDefFree(virDomainSoundDefPtr def); void virDomainMemballoonDefFree(virDomainMemballoonDefPtr def); void virDomainNVRAMDefFree(virDomainNVRAMDefPtr def); void virDomainWatchdogDefFree(virDomainWatchdogDefPtr def); -virDomainVideoDefPtr virDomainVideoDefNew(void); +virDomainVideoDefPtr virDomainVideoDefNew(virDomainXMLOptionPtr xmlopt); void virDomainVideoDefFree(virDomainVideoDefPtr def); void virDomainVideoDefClear(virDomainVideoDefPtr def); virDomainHostdevDefPtr virDomainHostdevDefNew(void); @@ -3063,7 +3066,8 @@ bool virDomainDefCheckABIStabilityFlags(virDomainDefP= tr src, virDomainXMLOptionPtr xmlopt, unsigned int flags); =20 -int virDomainDefAddImplicitDevices(virDomainDefPtr def); +int virDomainDefAddImplicitDevices(virDomainDefPtr def, + virDomainXMLOptionPtr xmlopt); =20 virDomainIOThreadIDDefPtr virDomainIOThreadIDFind(const virDomainDef *def, unsigned int iothread_id= ); diff --git a/src/vz/vz_sdk.c b/src/vz/vz_sdk.c index c6e3398620..7ac4888ecb 100644 --- a/src/vz/vz_sdk.c +++ b/src/vz/vz_sdk.c @@ -1928,7 +1928,7 @@ prlsdkLoadDomain(vzDriverPtr driver, if (prlsdkGetDomainState(dom, sdkdom, &domainState) < 0) goto error; =20 - if (!IS_CT(def) && virDomainDefAddImplicitDevices(def) < 0) + if (!IS_CT(def) && virDomainDefAddImplicitDevices(def, driver->xmlopt)= < 0) goto error; =20 if (def->ngraphics > 0) { --=20 2.23.0 -- libvir-list mailing list libvir-list@redhat.com https://www.redhat.com/mailman/listinfo/libvir-list