提交 5af63c9a 编写于 作者: P Peter Krempa

conf: Fix type for @liveStatus in virDomainObjListLoadAllConfigs

Use bool instead of an int.
上级 3d899b99
...@@ -1294,7 +1294,7 @@ bhyveStateInitialize(bool privileged, ...@@ -1294,7 +1294,7 @@ bhyveStateInitialize(bool privileged,
if (virDomainObjListLoadAllConfigs(bhyve_driver->domains, if (virDomainObjListLoadAllConfigs(bhyve_driver->domains,
BHYVE_STATE_DIR, BHYVE_STATE_DIR,
NULL, 1, NULL, true,
bhyve_driver->caps, bhyve_driver->caps,
bhyve_driver->xmlopt, bhyve_driver->xmlopt,
NULL, NULL) < 0) NULL, NULL) < 0)
...@@ -1302,7 +1302,7 @@ bhyveStateInitialize(bool privileged, ...@@ -1302,7 +1302,7 @@ bhyveStateInitialize(bool privileged,
if (virDomainObjListLoadAllConfigs(bhyve_driver->domains, if (virDomainObjListLoadAllConfigs(bhyve_driver->domains,
BHYVE_CONFIG_DIR, BHYVE_CONFIG_DIR,
BHYVE_AUTOSTART_DIR, 0, BHYVE_AUTOSTART_DIR, false,
bhyve_driver->caps, bhyve_driver->caps,
bhyve_driver->xmlopt, bhyve_driver->xmlopt,
NULL, NULL) < 0) NULL, NULL) < 0)
......
...@@ -559,7 +559,7 @@ int ...@@ -559,7 +559,7 @@ int
virDomainObjListLoadAllConfigs(virDomainObjListPtr doms, virDomainObjListLoadAllConfigs(virDomainObjListPtr doms,
const char *configDir, const char *configDir,
const char *autostartDir, const char *autostartDir,
int liveStatus, bool liveStatus,
virCapsPtr caps, virCapsPtr caps,
virDomainXMLOptionPtr xmlopt, virDomainXMLOptionPtr xmlopt,
virDomainLoadConfigNotify notify, virDomainLoadConfigNotify notify,
......
...@@ -72,7 +72,7 @@ void virDomainObjListRemoveLocked(virDomainObjListPtr doms, ...@@ -72,7 +72,7 @@ void virDomainObjListRemoveLocked(virDomainObjListPtr doms,
int virDomainObjListLoadAllConfigs(virDomainObjListPtr doms, int virDomainObjListLoadAllConfigs(virDomainObjListPtr doms,
const char *configDir, const char *configDir,
const char *autostartDir, const char *autostartDir,
int liveStatus, bool liveStatus,
virCapsPtr caps, virCapsPtr caps,
virDomainXMLOptionPtr xmlopt, virDomainXMLOptionPtr xmlopt,
virDomainLoadConfigNotify notify, virDomainLoadConfigNotify notify,
......
...@@ -763,7 +763,7 @@ libxlStateInitialize(bool privileged, ...@@ -763,7 +763,7 @@ libxlStateInitialize(bool privileged,
if (virDomainObjListLoadAllConfigs(libxl_driver->domains, if (virDomainObjListLoadAllConfigs(libxl_driver->domains,
cfg->stateDir, cfg->stateDir,
cfg->autostartDir, cfg->autostartDir,
1, true,
cfg->caps, cfg->caps,
libxl_driver->xmlopt, libxl_driver->xmlopt,
NULL, NULL) < 0) NULL, NULL) < 0)
...@@ -775,7 +775,7 @@ libxlStateInitialize(bool privileged, ...@@ -775,7 +775,7 @@ libxlStateInitialize(bool privileged,
if (virDomainObjListLoadAllConfigs(libxl_driver->domains, if (virDomainObjListLoadAllConfigs(libxl_driver->domains,
cfg->configDir, cfg->configDir,
cfg->autostartDir, cfg->autostartDir,
0, false,
cfg->caps, cfg->caps,
libxl_driver->xmlopt, libxl_driver->xmlopt,
NULL, NULL) < 0) NULL, NULL) < 0)
...@@ -815,7 +815,7 @@ libxlStateReload(void) ...@@ -815,7 +815,7 @@ libxlStateReload(void)
virDomainObjListLoadAllConfigs(libxl_driver->domains, virDomainObjListLoadAllConfigs(libxl_driver->domains,
cfg->configDir, cfg->configDir,
cfg->autostartDir, cfg->autostartDir,
1, true,
cfg->caps, cfg->caps,
libxl_driver->xmlopt, libxl_driver->xmlopt,
NULL, libxl_driver); NULL, libxl_driver);
......
...@@ -1679,7 +1679,7 @@ static int lxcStateInitialize(bool privileged, ...@@ -1679,7 +1679,7 @@ static int lxcStateInitialize(bool privileged,
/* Get all the running persistent or transient configs first */ /* Get all the running persistent or transient configs first */
if (virDomainObjListLoadAllConfigs(lxc_driver->domains, if (virDomainObjListLoadAllConfigs(lxc_driver->domains,
cfg->stateDir, cfg->stateDir,
NULL, 1, NULL, true,
caps, caps,
lxc_driver->xmlopt, lxc_driver->xmlopt,
NULL, NULL) < 0) NULL, NULL) < 0)
...@@ -1690,7 +1690,7 @@ static int lxcStateInitialize(bool privileged, ...@@ -1690,7 +1690,7 @@ static int lxcStateInitialize(bool privileged,
/* Then inactive persistent configs */ /* Then inactive persistent configs */
if (virDomainObjListLoadAllConfigs(lxc_driver->domains, if (virDomainObjListLoadAllConfigs(lxc_driver->domains,
cfg->configDir, cfg->configDir,
cfg->autostartDir, 0, cfg->autostartDir, false,
caps, caps,
lxc_driver->xmlopt, lxc_driver->xmlopt,
NULL, NULL) < 0) NULL, NULL) < 0)
...@@ -1755,7 +1755,7 @@ lxcStateReload(void) ...@@ -1755,7 +1755,7 @@ lxcStateReload(void)
virDomainObjListLoadAllConfigs(lxc_driver->domains, virDomainObjListLoadAllConfigs(lxc_driver->domains,
cfg->configDir, cfg->configDir,
cfg->autostartDir, 0, cfg->autostartDir, false,
caps, caps,
lxc_driver->xmlopt, lxc_driver->xmlopt,
lxcNotifyLoadDomain, lxc_driver); lxcNotifyLoadDomain, lxc_driver);
......
...@@ -911,7 +911,7 @@ qemuStateInitialize(bool privileged, ...@@ -911,7 +911,7 @@ qemuStateInitialize(bool privileged,
/* Get all the running persistent or transient configs first */ /* Get all the running persistent or transient configs first */
if (virDomainObjListLoadAllConfigs(qemu_driver->domains, if (virDomainObjListLoadAllConfigs(qemu_driver->domains,
cfg->stateDir, cfg->stateDir,
NULL, 1, NULL, true,
qemu_driver->caps, qemu_driver->caps,
qemu_driver->xmlopt, qemu_driver->xmlopt,
NULL, NULL) < 0) NULL, NULL) < 0)
...@@ -933,7 +933,7 @@ qemuStateInitialize(bool privileged, ...@@ -933,7 +933,7 @@ qemuStateInitialize(bool privileged,
/* Then inactive persistent configs */ /* Then inactive persistent configs */
if (virDomainObjListLoadAllConfigs(qemu_driver->domains, if (virDomainObjListLoadAllConfigs(qemu_driver->domains,
cfg->configDir, cfg->configDir,
cfg->autostartDir, 0, cfg->autostartDir, false,
qemu_driver->caps, qemu_driver->caps,
qemu_driver->xmlopt, qemu_driver->xmlopt,
NULL, NULL) < 0) NULL, NULL) < 0)
...@@ -1015,7 +1015,7 @@ qemuStateReload(void) ...@@ -1015,7 +1015,7 @@ qemuStateReload(void)
cfg = virQEMUDriverGetConfig(qemu_driver); cfg = virQEMUDriverGetConfig(qemu_driver);
virDomainObjListLoadAllConfigs(qemu_driver->domains, virDomainObjListLoadAllConfigs(qemu_driver->domains,
cfg->configDir, cfg->configDir,
cfg->autostartDir, 0, cfg->autostartDir, false,
caps, qemu_driver->xmlopt, caps, qemu_driver->xmlopt,
qemuNotifyLoadDomain, qemu_driver); qemuNotifyLoadDomain, qemu_driver);
cleanup: cleanup:
......
...@@ -566,7 +566,7 @@ umlStateInitialize(bool privileged, ...@@ -566,7 +566,7 @@ umlStateInitialize(bool privileged,
if (virDomainObjListLoadAllConfigs(uml_driver->domains, if (virDomainObjListLoadAllConfigs(uml_driver->domains,
uml_driver->configDir, uml_driver->configDir,
uml_driver->autostartDir, 0, uml_driver->autostartDir, false,
uml_driver->caps, uml_driver->caps,
uml_driver->xmlopt, uml_driver->xmlopt,
NULL, NULL) < 0) NULL, NULL) < 0)
...@@ -634,7 +634,7 @@ umlStateReload(void) ...@@ -634,7 +634,7 @@ umlStateReload(void)
umlDriverLock(uml_driver); umlDriverLock(uml_driver);
virDomainObjListLoadAllConfigs(uml_driver->domains, virDomainObjListLoadAllConfigs(uml_driver->domains,
uml_driver->configDir, uml_driver->configDir,
uml_driver->autostartDir, 0, uml_driver->autostartDir, false,
uml_driver->caps, uml_driver->caps,
uml_driver->xmlopt, uml_driver->xmlopt,
umlNotifyLoadDomain, uml_driver); umlNotifyLoadDomain, uml_driver);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册