diff --git a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/os/html.hbs b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/os/html.hbs index e21aaf307c..898995cde7 100644 --- a/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/os/html.hbs +++ b/src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/os/html.hbs @@ -224,6 +224,33 @@ +
+
+ +
+
diff --git a/src/vmm/LibVirtDriverKVM.cc b/src/vmm/LibVirtDriverKVM.cc index 64c4cf9f77..92fe50faf7 100644 --- a/src/vmm/LibVirtDriverKVM.cc +++ b/src/vmm/LibVirtDriverKVM.cc @@ -203,19 +203,21 @@ int LibVirtDriver::deployment_description_kvm( const VectorAttribute * features; - bool pae = false; - bool acpi = false; - bool apic = false; - bool hyperv = false; - bool localtime = false; - bool guest_agent = false; + bool pae = false; + bool acpi = false; + bool apic = false; + bool hyperv = false; + bool localtime = false; + bool guest_agent = false; + int virtio_scsi_queues = 0; - int pae_found = -1; - int acpi_found = -1; - int apic_found = -1; - int hyperv_found = -1; - int localtime_found = -1; - int guest_agent_found = -1; + int pae_found = -1; + int acpi_found = -1; + int apic_found = -1; + int hyperv_found = -1; + int localtime_found = -1; + int guest_agent_found = -1; + int virtio_scsi_queues_found = -1; string hyperv_options = ""; @@ -799,6 +801,19 @@ int LibVirtDriver::deployment_description_kvm( file << "\t\t\t" << endl; } + // ---- SCSI target ---- + + if ( target[0] == 's' && target[1] == 'd' ) + { + int target_number = target[2] - 'a'; + + if ( target_number >= 0 && target_number < 256 ) + { + file << "\t\t\t
" << endl; + } + } + file << "\t\t" << endl; } @@ -1148,6 +1163,8 @@ int LibVirtDriver::deployment_description_kvm( hyperv_found = features->vector_value("HYPERV", hyperv); localtime_found = features->vector_value("LOCALTIME", localtime); guest_agent_found = features->vector_value("GUEST_AGENT", guest_agent); + virtio_scsi_queues_found = + features->vector_value("VIRTIO_SCSI_QUEUES", virtio_scsi_queues); } if ( pae_found != 0 ) @@ -1180,6 +1197,11 @@ int LibVirtDriver::deployment_description_kvm( get_default("FEATURES", "GUEST_AGENT", guest_agent); } + if ( virtio_scsi_queues_found != 0 ) + { + get_default("FEATURES", "VIRTIO_SCSI_QUEUES", virtio_scsi_queues); + } + if ( acpi || pae || apic || hyperv ) { file << "\t" << endl; @@ -1226,6 +1248,18 @@ int LibVirtDriver::deployment_description_kvm( << "\t" << endl; } + if ( virtio_scsi_queues > 0 ) + { + file << "\t" << endl + << "\t\t" + << endl; + + file << "\t\t\t" << endl; + + file << "\t\t" << endl + << "\t" << endl; + } + // ------------------------------------------------------------------------ // Raw KVM attributes // ------------------------------------------------------------------------ diff --git a/src/vmm_mad/exec/vmm_exec_kvm.conf b/src/vmm_mad/exec/vmm_exec_kvm.conf index 5ae6f17942..f457b369bb 100644 --- a/src/vmm_mad/exec/vmm_exec_kvm.conf +++ b/src/vmm_mad/exec/vmm_exec_kvm.conf @@ -20,7 +20,7 @@ # - emulator # - os [kernel,initrd,boot,root,kernel_cmd,arch,machine] # - vcpu -# - features [acpi, pae, apic, hyperv, localtime, guest_agent] +# - features [acpi, pae, apic, hyperv, localtime, guest_agent, virtio_scsi_queues] # - disk [driver, cache, io, discard, total_bytes_sec, total_iops_sec, read_bytes_sec, write_bytes_sec, read_iops_sec, write_iops_sec] # - nic [filter, model] # - raw @@ -32,7 +32,8 @@ #VCPU = 1 OS = [ arch = "x86_64" ] -FEATURES = [ PAE = "no", ACPI = "yes", APIC = "no", HYPERV = "no", GUEST_AGENT = "no" ] +FEATURES = [ PAE = "no", ACPI = "yes", APIC = "no", HYPERV = "no", GUEST_AGENT = "no", + VIRTIO_SCSI_QUEUES = "0" ] DISK = [ driver = "raw" , cache = "none"]