[libvirt] [PATCH 0/2] vz: build fixes for passing qemuCaps down the stack
Pushed as trivial and build breaker. Nikolay Shirokovskiy (2): vz: build fix for passing qemuCaps to virDomainDeviceDefPostParse vz: build fix for passing qemuCaps to virDomainDefParseNode src/vz/vz_driver.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- 1.8.3.1
Missing piece for [1]. [1] b449c2704: qemu: Pass correct qemuCaps to virDomainDeviceDefPostParse Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com> --- src/vz/vz_driver.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index a4f6c39..536a992 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -1509,7 +1509,7 @@ static int vzDomainAttachDeviceFlags(virDomainPtr domain, const char *xml, goto cleanup; dev = virDomainDeviceDefParse(xml, dom->def, driver->caps, - driver->xmlopt, VIR_DOMAIN_XML_INACTIVE); + driver->xmlopt, NULL, VIR_DOMAIN_XML_INACTIVE); if (dev == NULL) goto cleanup; @@ -1565,7 +1565,7 @@ static int vzDomainDetachDeviceFlags(virDomainPtr domain, const char *xml, goto cleanup; dev = virDomainDeviceDefParse(xml, dom->def, driver->caps, - driver->xmlopt, + driver->xmlopt, NULL, VIR_DOMAIN_XML_INACTIVE | VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE); if (dev == NULL) @@ -1657,7 +1657,7 @@ static int vzDomainUpdateDeviceFlags(virDomainPtr domain, goto cleanup; if (!(dev = virDomainDeviceDefParse(xml, dom->def, driver->caps, - driver->xmlopt, + driver->xmlopt, NULL, VIR_DOMAIN_XML_INACTIVE))) goto cleanup; -- 1.8.3.1
Missing piece for [1] [1]: 577a1f98: qemu: Pass correct qemuCaps to virDomainDefParseNode Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com> --- src/vz/vz_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index 536a992..eb3fcf1 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -2609,7 +2609,7 @@ vzDomainSnapshotCreateXML(virDomainPtr domain, parse_flags |= VIR_DOMAIN_SNAPSHOT_PARSE_VALIDATE; if (!(def = virDomainSnapshotDefParseString(xmlDesc, driver->caps, - driver->xmlopt, NULL, + driver->xmlopt, NULL, NULL, parse_flags))) goto cleanup; -- 1.8.3.1
participants (1)
-
Nikolay Shirokovskiy