From 93f078d173e7a0e27165a17ba3419bd0c4d9ae49 Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Wed, 17 May 2017 11:48:14 +0200 Subject: [PATCH 1/5] F #3053: Add support for virtio-scsi controller --- src/vmm/LibVirtDriverKVM.cc | 58 +++++++++++++++++++++++++++++-------- 1 file changed, 46 insertions(+), 12 deletions(-) diff --git a/src/vmm/LibVirtDriverKVM.cc b/src/vmm/LibVirtDriverKVM.cc index 64c4cf9f77..118bdc03e8 100644 --- a/src/vmm/LibVirtDriverKVM.cc +++ b/src/vmm/LibVirtDriverKVM.cc @@ -203,19 +203,23 @@ 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; + bool virtio_scsi = 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_found = -1; + int virtio_scsi_queues_found = -1; string hyperv_options = ""; @@ -1148,6 +1152,7 @@ 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_found = features->vector_value("VIRTIO_SCSI", virtio_scsi); } if ( pae_found != 0 ) @@ -1180,6 +1185,11 @@ int LibVirtDriver::deployment_description_kvm( get_default("FEATURES", "GUEST_AGENT", guest_agent); } + if ( virtio_scsi_found != 0 ) + { + get_default("FEATURES", "VIRTIO_SCSI", virtio_scsi); + } + if ( acpi || pae || apic || hyperv ) { file << "\t" << endl; @@ -1226,6 +1236,30 @@ int LibVirtDriver::deployment_description_kvm( << "\t" << endl; } + if ( virtio_scsi ) + { + virtio_scsi_queues_found = features->vector_value( + "VIRTIO_SCSI_QUEUES", virtio_scsi_queues); + + if ( virtio_scsi_queues_found != 0 ) + { + get_default("FEATURES", "VIRTIO_SCSI_QUEUES", virtio_scsi_queues); + } + + file << "\t" << endl + << "\t\t" + << endl; + + if ( virtio_scsi_queues > 0 ) + { + file << "\t\t\t" + << endl; + } + + file << "\t\t" << endl + << "\t" << endl; + } + // ------------------------------------------------------------------------ // Raw KVM attributes // ------------------------------------------------------------------------ From 8e3706fef7a44ed0b131b2daa9208ae77041a29b Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Wed, 17 May 2017 12:01:55 +0200 Subject: [PATCH 2/5] F #3053: add virtio_scsi to defaults file --- src/vmm_mad/exec/vmm_exec_kvm.conf | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/vmm_mad/exec/vmm_exec_kvm.conf b/src/vmm_mad/exec/vmm_exec_kvm.conf index 5ae6f17942..b0f1e2d83f 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, 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 = "no", VIRTIO_SCSI_QUEUES = "0" ] DISK = [ driver = "raw" , cache = "none"] From 05511e5c598a716d744d1efd8d33d086e9e1b581 Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Wed, 17 May 2017 12:56:20 +0200 Subject: [PATCH 3/5] F #3053: add virtio-scsi controller when queues are specified --- src/vmm/LibVirtDriverKVM.cc | 25 ++++++------------------- src/vmm_mad/exec/vmm_exec_kvm.conf | 4 ++-- 2 files changed, 8 insertions(+), 21 deletions(-) diff --git a/src/vmm/LibVirtDriverKVM.cc b/src/vmm/LibVirtDriverKVM.cc index 118bdc03e8..1404a5c688 100644 --- a/src/vmm/LibVirtDriverKVM.cc +++ b/src/vmm/LibVirtDriverKVM.cc @@ -209,7 +209,6 @@ int LibVirtDriver::deployment_description_kvm( bool hyperv = false; bool localtime = false; bool guest_agent = false; - bool virtio_scsi = false; int virtio_scsi_queues = 0; int pae_found = -1; @@ -218,7 +217,6 @@ int LibVirtDriver::deployment_description_kvm( int hyperv_found = -1; int localtime_found = -1; int guest_agent_found = -1; - int virtio_scsi_found = -1; int virtio_scsi_queues_found = -1; string hyperv_options = ""; @@ -1152,7 +1150,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_found = features->vector_value("VIRTIO_SCSI", virtio_scsi); + virtio_scsi_queues_found = + features->vector_value("VIRTIO_SCSI_QUEUES", virtio_scsi_queues); } if ( pae_found != 0 ) @@ -1185,9 +1184,9 @@ int LibVirtDriver::deployment_description_kvm( get_default("FEATURES", "GUEST_AGENT", guest_agent); } - if ( virtio_scsi_found != 0 ) + if ( virtio_scsi_queues_found != 0 ) { - get_default("FEATURES", "VIRTIO_SCSI", virtio_scsi); + get_default("FEATURES", "VIRTIO_SCSI_QUEUES", virtio_scsi_queues); } if ( acpi || pae || apic || hyperv ) @@ -1236,25 +1235,13 @@ int LibVirtDriver::deployment_description_kvm( << "\t" << endl; } - if ( virtio_scsi ) + if ( virtio_scsi_queues > 0 ) { - virtio_scsi_queues_found = features->vector_value( - "VIRTIO_SCSI_QUEUES", virtio_scsi_queues); - - if ( virtio_scsi_queues_found != 0 ) - { - get_default("FEATURES", "VIRTIO_SCSI_QUEUES", virtio_scsi_queues); - } - file << "\t" << endl << "\t\t" << endl; - if ( virtio_scsi_queues > 0 ) - { - file << "\t\t\t" - << endl; - } + file << "\t\t\t" << endl; file << "\t\t" << endl << "\t" << endl; diff --git a/src/vmm_mad/exec/vmm_exec_kvm.conf b/src/vmm_mad/exec/vmm_exec_kvm.conf index b0f1e2d83f..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, virtio_scsi, virtio_scsi_queues] +# - 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 @@ -33,7 +33,7 @@ OS = [ arch = "x86_64" ] FEATURES = [ PAE = "no", ACPI = "yes", APIC = "no", HYPERV = "no", GUEST_AGENT = "no", - VIRTIO_SCSI = "no", VIRTIO_SCSI_QUEUES = "0" ] + VIRTIO_SCSI_QUEUES = "0" ] DISK = [ driver = "raw" , cache = "none"] From e164fde85f4459add2e8007ebcf15da5d045d514 Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Wed, 17 May 2017 15:24:57 +0200 Subject: [PATCH 4/5] F #3053: add explicit address to scsi drives By default scsi drives increase the unit part of the address. This causes problems in linux as the devices are not created in order. Setting the target forces the order to be maintained. https://bugzilla.redhat.com/show_bug.cgi?id=1200049 --- src/vmm/LibVirtDriverKVM.cc | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/vmm/LibVirtDriverKVM.cc b/src/vmm/LibVirtDriverKVM.cc index 1404a5c688..92fe50faf7 100644 --- a/src/vmm/LibVirtDriverKVM.cc +++ b/src/vmm/LibVirtDriverKVM.cc @@ -801,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; } From 41b608d057e31e66ad4f78ef10ec53fd38944cb3 Mon Sep 17 00:00:00 2001 From: abelCoronado93 Date: Wed, 17 May 2017 15:54:30 +0200 Subject: [PATCH 5/5] F #3053 Added virtio-scsi Queues input in OS Booting (update VM Template) --- .../create/wizard-tabs/os/html.hbs | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) 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 @@ +
+
+ +
+