External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-08 12:41:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

conf: add privateData to virDomainVideoDef

Browse Source 
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Cole Robinson <crobinso@redhat.com>
This commit is contained in:
Marc-André Lureau 2019-09-23 14:44:35 +04:00 committed by Cole Robinson
parent 019db0d944
commit 3dbf3941ad
3 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/conf/domain_conf.c
View File

@ -2820,13 +2820,19 @@ void virDomainShmemDefFree(virDomainShmemDefPtr def)
virDomainVideoDefPtr virDomainVideoDefPtr
virDomainVideoDefNew(void) virDomainVideoDefNew(virDomainXMLOptionPtr xmlopt)
{ {
virDomainVideoDefPtr def; virDomainVideoDefPtr def;
if (VIR_ALLOC(def) < 0) if (VIR_ALLOC(def) < 0)
return NULL; return NULL;
if (xmlopt && xmlopt->privateData.videoNew &&
!(def->privateData = xmlopt->privateData.videoNew())) {
VIR_FREE(def);
return NULL;
}
def->heads = 1; def->heads = 1;
return def; return def;
} }
@ -2858,6 +2864,7 @@ void virDomainVideoDefFree(virDomainVideoDefPtr def)
return; return;
virDomainVideoDefClear(def); virDomainVideoDefClear(def);
virObjectUnref(def->privateData);
VIR_FREE(def); VIR_FREE(def);
} }
@ -5681,7 +5688,8 @@ virDomainDefPostParseVideo(virDomainDefPtr def,
static int static int
virDomainDefPostParseCommon(virDomainDefPtr def, virDomainDefPostParseCommon(virDomainDefPtr def,
struct virDomainDefPostParseDeviceIteratorData *data) struct virDomainDefPostParseDeviceIteratorData *data,
virDomainXMLOptionPtr xmlopt)
{ {
size_t i; size_t i;
@ -5716,7 +5724,7 @@ virDomainDefPostParseCommon(virDomainDefPtr def,
if (virDomainDefPostParseTimer(def) < 0) if (virDomainDefPostParseTimer(def) < 0)
return -1; return -1;
if (virDomainDefAddImplicitDevices(def) < 0) if (virDomainDefAddImplicitDevices(def, xmlopt) < 0)
return -1; return -1;
if (virDomainDefPostParseVideo(def, data) < 0) if (virDomainDefPostParseVideo(def, data) < 0)
@ -5842,7 +5850,7 @@ virDomainDefPostParse(virDomainDefPtr def,
if (virDomainDefPostParseCheckFailure(def, parseFlags, ret) < 0) if (virDomainDefPostParseCheckFailure(def, parseFlags, ret) < 0)
goto cleanup; goto cleanup;
if ((ret = virDomainDefPostParseCommon(def, &data)) < 0) if ((ret = virDomainDefPostParseCommon(def, &data, xmlopt)) < 0)
goto cleanup; goto cleanup;
if (xmlopt->config.assignAddressesCallback) { if (xmlopt->config.assignAddressesCallback) {
@ -15451,7 +15459,7 @@ virDomainVideoDefParseXML(virDomainXMLOptionPtr xmlopt,
VIR_AUTOFREE(char *) vgamem = NULL; VIR_AUTOFREE(char *) vgamem = NULL;
VIR_AUTOFREE(char *) primary = NULL; VIR_AUTOFREE(char *) primary = NULL;
if (!(def = virDomainVideoDefNew())) if (!(def = virDomainVideoDefNew(xmlopt)))
return NULL; return NULL;
ctxt->node = node; ctxt->node = node;
@ -23743,7 +23751,7 @@ virDomainDefAddImplicitControllers(virDomainDefPtr def)
} }
static int static int
virDomainDefAddImplicitVideo(virDomainDefPtr def) virDomainDefAddImplicitVideo(virDomainDefPtr def, virDomainXMLOptionPtr xmlopt)
{ {
int ret = -1; int ret = -1;
virDomainVideoDefPtr video = NULL; virDomainVideoDefPtr video = NULL;
@ -23753,7 +23761,7 @@ virDomainDefAddImplicitVideo(virDomainDefPtr def)
if (def->ngraphics == 0 || def->nvideos > 0) if (def->ngraphics == 0 || def->nvideos > 0)
return 0; return 0;
if (!(video = virDomainVideoDefNew())) if (!(video = virDomainVideoDefNew(xmlopt)))
goto cleanup; goto cleanup;
video->type = virDomainVideoDefaultType(def); video->type = virDomainVideoDefaultType(def);
if (VIR_APPEND_ELEMENT(def->videos, def->nvideos, video) < 0) if (VIR_APPEND_ELEMENT(def->videos, def->nvideos, video) < 0)
@ -23766,7 +23774,7 @@ virDomainDefAddImplicitVideo(virDomainDefPtr def)
} }
int int
virDomainDefAddImplicitDevices(virDomainDefPtr def) virDomainDefAddImplicitDevices(virDomainDefPtr def, virDomainXMLOptionPtr xmlopt)
{ {
if (virDomainDefAddConsoleCompat(def) < 0) if (virDomainDefAddConsoleCompat(def) < 0)
return -1; return -1;
@ -23774,7 +23782,7 @@ virDomainDefAddImplicitDevices(virDomainDefPtr def)
if (virDomainDefAddImplicitControllers(def) < 0) if (virDomainDefAddImplicitControllers(def) < 0)
return -1; return -1;
if (virDomainDefAddImplicitVideo(def) < 0) if (virDomainDefAddImplicitVideo(def, xmlopt) < 0)
return -1; return -1;
return 0; return 0;

8
src/conf/domain_conf.h
View File

@ -1427,6 +1427,8 @@ struct _virDomainVideoDriverDef {
}; };
struct _virDomainVideoDef { struct _virDomainVideoDef {
virObjectPtr privateData;
int type; /* enum virDomainVideoType */ int type; /* enum virDomainVideoType */
unsigned int ram; /* kibibytes (multiples of 1024) */ unsigned int ram; /* kibibytes (multiples of 1024) */
unsigned int vram; /* kibibytes (multiples of 1024) */ unsigned int vram; /* kibibytes (multiples of 1024) */
@ -2729,6 +2731,7 @@ struct _virDomainXMLPrivateDataCallbacks {
virDomainXMLPrivateDataNewFunc vsockNew; virDomainXMLPrivateDataNewFunc vsockNew;
virDomainXMLPrivateDataNewFunc graphicsNew; virDomainXMLPrivateDataNewFunc graphicsNew;
virDomainXMLPrivateDataNewFunc networkNew; virDomainXMLPrivateDataNewFunc networkNew;
virDomainXMLPrivateDataNewFunc videoNew;
virDomainXMLPrivateDataFormatFunc format; virDomainXMLPrivateDataFormatFunc format;
virDomainXMLPrivateDataParseFunc parse; virDomainXMLPrivateDataParseFunc parse;
/* following function shall return a pointer which will be used as the /* 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 virDomainMemballoonDefFree(virDomainMemballoonDefPtr def);
void virDomainNVRAMDefFree(virDomainNVRAMDefPtr def); void virDomainNVRAMDefFree(virDomainNVRAMDefPtr def);
void virDomainWatchdogDefFree(virDomainWatchdogDefPtr def); void virDomainWatchdogDefFree(virDomainWatchdogDefPtr def);
virDomainVideoDefPtr virDomainVideoDefNew(void); virDomainVideoDefPtr virDomainVideoDefNew(virDomainXMLOptionPtr xmlopt);
void virDomainVideoDefFree(virDomainVideoDefPtr def); void virDomainVideoDefFree(virDomainVideoDefPtr def);
void virDomainVideoDefClear(virDomainVideoDefPtr def); void virDomainVideoDefClear(virDomainVideoDefPtr def);
virDomainHostdevDefPtr virDomainHostdevDefNew(void); virDomainHostdevDefPtr virDomainHostdevDefNew(void);
@ -3063,7 +3066,8 @@ bool virDomainDefCheckABIStabilityFlags(virDomainDefPtr src,
virDomainXMLOptionPtr xmlopt, virDomainXMLOptionPtr xmlopt,
unsigned int flags); unsigned int flags);
int virDomainDefAddImplicitDevices(virDomainDefPtr def); int virDomainDefAddImplicitDevices(virDomainDefPtr def,
virDomainXMLOptionPtr xmlopt);
virDomainIOThreadIDDefPtr virDomainIOThreadIDFind(const virDomainDef *def, virDomainIOThreadIDDefPtr virDomainIOThreadIDFind(const virDomainDef *def,
unsigned int iothread_id); unsigned int iothread_id);

2
src/vz/vz_sdk.c
View File

@ -1928,7 +1928,7 @@ prlsdkLoadDomain(vzDriverPtr driver,
if (prlsdkGetDomainState(dom, sdkdom, &domainState) < 0) if (prlsdkGetDomainState(dom, sdkdom, &domainState) < 0)
goto error; goto error;
if (!IS_CT(def) && virDomainDefAddImplicitDevices(def) < 0) if (!IS_CT(def) && virDomainDefAddImplicitDevices(def, driver->xmlopt) < 0)
goto error; goto error;
if (def->ngraphics > 0) { if (def->ngraphics > 0) {