提交 eb2952c0 编写于 作者: D Daniel P. Berrangé

vz: pass virDomainXMLOptionPtr to virDomainVideoDefNew

The virDomainVideoDefNew requires the xml options to be
provided since

  commit 3dbf3941
  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: NDaniel P. Berrangé <berrange@redhat.com>
上级 10be7f3c
......@@ -544,7 +544,8 @@ prlsdkGetDomainState(virDomainObjPtr dom, PRL_HANDLE sdkdom, VIRTUAL_MACHINE_STA
}
static int
prlsdkAddDomainVideoInfoCt(virDomainDefPtr def)
prlsdkAddDomainVideoInfoCt(virDomainDefPtr def,
virDomainXMLOptionPtr xmlopt)
{
virDomainVideoDefPtr video = NULL;
int ret = -1;
......@@ -552,7 +553,7 @@ prlsdkAddDomainVideoInfoCt(virDomainDefPtr def)
if (def->ngraphics == 0)
return 0;
if (!(video = virDomainVideoDefNew()))
if (!(video = virDomainVideoDefNew(xmlopt)))
goto cleanup;
video->type = VIR_DOMAIN_VIDEO_TYPE_PARALLELS;
......@@ -1288,10 +1289,13 @@ prlsdkAddSerialInfo(PRL_HANDLE sdkdom,
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 (prlsdkAddDomainVideoInfoCt(def) < 0)
if (prlsdkAddDomainVideoInfoCt(def, xmlopt) < 0)
goto error;
} else {
if (prlsdkAddDomainVideoInfoVm(sdkdom, def) < 0)
......@@ -1890,7 +1894,7 @@ prlsdkLoadDomain(vzDriverPtr driver,
goto error;
/* depends on prlsdkAddVNCInfo */
if (prlsdkAddDomainHardware(driver, sdkdom, def) < 0)
if (prlsdkAddDomainHardware(driver, sdkdom, def, driver->xmlopt) < 0)
goto error;
/* depends on prlsdkAddDomainHardware */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册