[kvm] -> [qemu]

component/qemu-kvm/buildout.cfg

@@ -13,14 +13,8 @@ extends =
   ../pcre/buildout.cfg
   ../glib/buildout.cfg
 
-# XXX Change all reference to kvm section to qemu section, then
-# use qemu as main name section.
 [qemu]
-<= kvm
-
-[kvm]
 recipe = slapos.recipe.cmmi
-# qemu-kvm and qemu are now the same since 1.3.
 url = https://download.qemu.org/qemu-4.1.1.tar.xz
 md5sum = 53879f792ef2675c6c5e6cbf5cc1ac6c
 configure-options =

software/kvm/buildout.hash.cfg

@@ -15,7 +15,7 @@
 
 [template]
 filename = instance.cfg.in
-md5sum = 092405e2fba77c22d4dc8cefcab677d8
+md5sum = 1edb1e8d7cab32c29504a23fd3046838
 
 [template-kvm]
 filename = instance-kvm.cfg.jinja2

software/kvm/instance.cfg.in

@@ -88,8 +88,8 @@ extra-context =
   raw netcat_bin ${netcat:location}/bin/netcat
   raw python_executable ${buildout:executable}
   raw python_eggs_executable ${buildout:bin-directory}/${python-with-eggs:interpreter}
-  raw qemu_executable_location ${kvm:location}/bin/qemu-system-x86_64
-  raw qemu_img_executable_location ${kvm:location}/bin/qemu-img
+  raw qemu_executable_location ${qemu:location}/bin/qemu-system-x86_64
+  raw qemu_img_executable_location ${qemu:location}/bin/qemu-img
   raw qemu_start_promise_tpl ${template-qemu-ready:location}/${template-qemu-ready:filename}
   raw sixtunnel_executable_location ${6tunnel:location}/bin/6tunnel
   raw template_httpd_cfg ${template-httpd:rendered}
@@ -144,7 +144,7 @@ extensions = jinja2.ext.do
 context =
     key develop_eggs_directory buildout:develop-eggs-directory
     key eggs_directory buildout:eggs-directory
-    raw qemu_location ${kvm:location}
+    key qemu_location qemu:location
     raw template_kvm_import ${template-kvm-import-script:location}/${template-kvm-import-script:filename}
     key pbsready_import_template template-pbsready-import:rendered
     key slapparameter_dict slap-configuration:configuration
@@ -161,7 +161,7 @@ context =
   key slapparameter_dict slap-configuration:configuration
   key eggs_directory buildout:eggs-directory
   key develop_eggs_directory buildout:develop-eggs-directory
-  raw qemu_nbd_executable_location ${kvm:location}/bin/qemu-nbd
+  raw qemu_nbd_executable_location ${qemu:location}/bin/qemu-nbd
   raw dash_executable_location ${dash:location}/bin/dash
   raw onetimeupload_executable_location ${buildout:bin-directory}/onetimeupload
   raw template_monitor ${monitor2-template:rendered}