mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-03-07 17:28:15 +00:00
vz: pass virDomainXMLOptionPtr to virDomainVideoDefNew
The virDomainVideoDefNew requires the xml options to be provided since commit 3dbf3941ad7202ec4426cfe965d8ba97ee8d49df Author: Marc-André Lureau <marcandre.lureau@redhat.com> Date: Mon Sep 23 14:44:35 2019 +0400 conf: add privateData to virDomainVideoDef Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
parent
10be7f3ce0
commit
eb2952c0f5
@ -544,7 +544,8 @@ prlsdkGetDomainState(virDomainObjPtr dom, PRL_HANDLE sdkdom, VIRTUAL_MACHINE_STA
|
|||||||
}
|
}
|
||||||
|
|
||||||
static int
|
static int
|
||||||
prlsdkAddDomainVideoInfoCt(virDomainDefPtr def)
|
prlsdkAddDomainVideoInfoCt(virDomainDefPtr def,
|
||||||
|
virDomainXMLOptionPtr xmlopt)
|
||||||
{
|
{
|
||||||
virDomainVideoDefPtr video = NULL;
|
virDomainVideoDefPtr video = NULL;
|
||||||
int ret = -1;
|
int ret = -1;
|
||||||
@ -552,7 +553,7 @@ prlsdkAddDomainVideoInfoCt(virDomainDefPtr def)
|
|||||||
if (def->ngraphics == 0)
|
if (def->ngraphics == 0)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
if (!(video = virDomainVideoDefNew()))
|
if (!(video = virDomainVideoDefNew(xmlopt)))
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
|
|
||||||
video->type = VIR_DOMAIN_VIDEO_TYPE_PARALLELS;
|
video->type = VIR_DOMAIN_VIDEO_TYPE_PARALLELS;
|
||||||
@ -1288,10 +1289,13 @@ prlsdkAddSerialInfo(PRL_HANDLE sdkdom,
|
|||||||
|
|
||||||
|
|
||||||
static int
|
static int
|
||||||
prlsdkAddDomainHardware(vzDriverPtr driver, PRL_HANDLE sdkdom, virDomainDefPtr def)
|
prlsdkAddDomainHardware(vzDriverPtr driver,
|
||||||
|
PRL_HANDLE sdkdom,
|
||||||
|
virDomainDefPtr def,
|
||||||
|
virDomainXMLOptionPtr xmlopt)
|
||||||
{
|
{
|
||||||
if (IS_CT(def)) {
|
if (IS_CT(def)) {
|
||||||
if (prlsdkAddDomainVideoInfoCt(def) < 0)
|
if (prlsdkAddDomainVideoInfoCt(def, xmlopt) < 0)
|
||||||
goto error;
|
goto error;
|
||||||
} else {
|
} else {
|
||||||
if (prlsdkAddDomainVideoInfoVm(sdkdom, def) < 0)
|
if (prlsdkAddDomainVideoInfoVm(sdkdom, def) < 0)
|
||||||
@ -1890,7 +1894,7 @@ prlsdkLoadDomain(vzDriverPtr driver,
|
|||||||
goto error;
|
goto error;
|
||||||
|
|
||||||
/* depends on prlsdkAddVNCInfo */
|
/* depends on prlsdkAddVNCInfo */
|
||||||
if (prlsdkAddDomainHardware(driver, sdkdom, def) < 0)
|
if (prlsdkAddDomainHardware(driver, sdkdom, def, driver->xmlopt) < 0)
|
||||||
goto error;
|
goto error;
|
||||||
|
|
||||||
/* depends on prlsdkAddDomainHardware */
|
/* depends on prlsdkAddDomainHardware */
|
||||||
|
Loading…
x
Reference in New Issue
Block a user