clearlinux/kvmtool
2
0
Fork 0
mirror of https://github.com/clearlinux/kvmtool.git synced 2026-10-04 07:48:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't assume mode is always OCI.

Browse Source 
Signed-off-by: James Hunt <james.o.hunt@intel.com>
This commit is contained in:
James Hunt
2015-10-21 15:52:38 +01:00
parent 031bcab564
commit c7e291feb6
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
oci/oci.c
+12 -7
View File
@@ -1120,6 +1120,7 @@ static int oci_read_config_file(struct kvm *kvm, enum oci_file_type file_type)
static int oci_read_config_files(struct kvm *kvm)
{
int count = 0;
int expected = 2;
if (kvm->cfg.oci_config_path) {
int ret;
@@ -1144,8 +1145,13 @@ static int oci_read_config_files(struct kvm *kvm)
}
}
if (count && count != 2) {
return pr_err("Expected 2 OCI config files, got %d", count);
if (count) {
if (count != expected) {
return pr_err("Expected %d OCI config files, got %d",
expected, count);
}
kvm->cfg.oci_mode = true;
}
return 0;
@@ -1232,6 +1238,10 @@ int kvm_oci_setup(struct kvm *kvm)
{
int ret;
ret = oci_read_config_files(kvm);
if (ret < 0 || !kvm->cfg.oci_mode)
return ret;
/* Required for:
*
* - creating directories below KVM_OCI_RUNTIME_DIR_PREFIX.
@@ -1243,11 +1253,6 @@ int kvm_oci_setup(struct kvm *kvm)
if (!kvm->cfg.guest_name)
return pr_err("OCI mandates a name");
ret = oci_read_config_files(kvm);
if (ret < 0)
return ret;
kvm->cfg.oci_mode = true;
if (! kvm->cfg.console)
kvm->cfg.console = "virtio";