Comply with make distcheck
by Eduardo Lima (Etrunko)
This is a simple patch series that makes the build pass make distcheck. I tried
(not much) to make the tests at least build, without success. This way I simply
considered them broken and removed from the source tree.
Best regards, Etrunko
12 years, 8 months
[PATCH] [TEST] Fix VSMS 09_procrasd_persist and 11_define_memrasdunits
by Eduardo Lima (Etrunko)
From: Eduardo Lima (Etrunko) <eblima(a)br.ibm.com>
Both tests were failing due to reusing an instance of the class for defining
domains in a loop. The error message was the following:
ERROR - Got CIM error CIM_ERR_FAILED: ResourceSettings Error: VirtualDevice
property must be unique for each DiskResourceAllocationSettingData in a
single guest with return code 1
A recent change in XenKvmLib/vxml.py necessary for the new test
32_modify_cdrom_media.py triggered this bug. To avoid this error we simply
create a new instance of that class in each iteration of the loop.
Signed-off-by: Eduardo Lima (Etrunko) <eblima(a)br.ibm.com>
---
.../09_procrasd_persist.py | 3 ++-
.../11_define_memrasdunits.py | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/09_procrasd_persist.py b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/09_procrasd_persist.py
index 91415dd..a53c5ac 100644
--- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/09_procrasd_persist.py
+++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/09_procrasd_persist.py
@@ -119,11 +119,12 @@ def main():
virt = options.virt
server = options.ip
- cxml = get_class(virt)(test_dom)
+ cxml = None
prasd_cn = get_typed_class(virt, "ProcResourceAllocationSettingData")
dom_define = dom_start = False
try:
for count in range(3):
+ cxml = get_class(virt)(test_dom)
status = setup_guest(server, virt, cxml, prasd_cn)
if status != PASS:
return status
diff --git a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/11_define_memrasdunits.py b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/11_define_memrasdunits.py
index 8c032c2..3f54ff4 100644
--- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/11_define_memrasdunits.py
+++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/11_define_memrasdunits.py
@@ -113,8 +113,7 @@ def check_value(options):
def main():
options = main.options
- cxml = get_class(options.virt)(default_dom)
-
+ cxml = None
status = FAIL
guest_is_undefined = None
@@ -123,6 +122,7 @@ def main():
value = mem_bytes >> shift
+ cxml = get_class(options.virt)(default_dom)
status = try_define(options, units, value, cxml)
if status != PASS:
break
--
1.7.4.4
12 years, 9 months
[PATCH] Fix include path
by Eduardo Lima (Etrunko)
From: Eduardo Lima (Etrunko) <eblima(a)br.ibm.com>
$(top_builddir) is intended to be used for install paths, while $(top_srcdir)
whenever trying to reference source code path.
Signed-off-by: Eduardo Lima (Etrunko) <eblima(a)br.ibm.com>
---
src/Makefile.am | 2 +-
src/Virt_VSMigrationService.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index 53e3c65..e4e8aa1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -29,7 +29,7 @@ noinst_HEADERS = profiles.h svpc_types.h \
XKUADD = $(top_builddir)/libxkutil/libxkutil.la
-CFLAGS += -I$(top_builddir)/libxkutil $(CFLAGS_STRICT)
+CFLAGS += -I$(top_srcdir)/libxkutil $(CFLAGS_STRICT)
AM_LDFLAGS = $(XKUADD) \
-version-info @VERSION_INFO@
diff --git a/src/Virt_VSMigrationService.c b/src/Virt_VSMigrationService.c
index be9bb7c..4f48a68 100644
--- a/src/Virt_VSMigrationService.c
+++ b/src/Virt_VSMigrationService.c
@@ -48,7 +48,7 @@
#include "Virt_ComputerSystem.h"
#include "Virt_VSMigrationSettingData.h"
#include "svpc_types.h"
-#include "libxkutil/infostore.h"
+#include "infostore.h"
#include "config.h"
--
1.7.4.4
12 years, 10 months
Various fixes revealed by Coverity scan report
by Eduardo Lima (Etrunko)
Hi all,
The cool RedHat folks were kind enough to share a recent report generated by
Coverity which exposes a lot of potential errors on libvirt-cim code.
https://bugzilla.redhat.com/show_bug.cgi?id=728245#c8
https://bugzilla.redhat.com/attachment.cgi?id=530435
I went through each one of them and fixed all of them that I considered it
actually make sense to fix. There are a few false positives that were ignored.
The result is this series of patches following.
Finally, I have ran the cimtests with all these applied and they work as
expected.
Best regards,
--
Eduardo de Barros Lima
Software Engineer, Open Virtualization
Linux Technology Center - IBM/Brazil
eblima(a)br.ibm.com
12 years, 10 months
Error doing make install for libvirt-cim
by Deepak Shetty
Hi,
I am getting the following error while doing ' make install' for
libvirt-cim. Can someone pls help provide some pointers on what could be
wrong here ?
....
....
test -z "/home/dpkshetty/usr/lib/cmpi" || /bin/mkdir -p
"/home/dpkshetty/usr/lib/cmpi"
/bin/bash ../libtool --mode=install /usr/bin/install -c
libVirt_ComputerSystem.la libVirt_Device.la libVirt_RASD.la
libVirt_HostSystem.la libVirt_VSSD.la
libVirt_EnabledLogicalElementCapabilities.la libVirt_DevicePool.la
libVirt_RegisteredProfile.la libVirt_VSMigrationCapabilities.la
libVirt_VSMigrationSettingData.la
libVirt_VirtualSystemSnapshotServiceCapabilities.la libVirt_SystemDevice.la
libVirt_ComputerSystemIndication.la
libVirt_ResourceAllocationSettingDataIndication.la libVirt_SwitchService.la
libVirt_ComputerSystemMigrationIndication.la
libVirt_VirtualSystemManagementCapabilities.la
libVirt_AllocationCapabilities.la libVirt_ReferencedProfile.la
libVirt_VirtualSystemSnapshotService.la
libVirt_VirtualSystemManagementService.la
libVirt_ResourcePoolConfigurationService.la
libVirt_ResourcePoolConfigurationCapabilities.la
libVirt_VSMigrationService.la libVirt_ConsoleRedirectionService.la
libVirt_ConsoleRedirectionServiceCapabilities.la
libVirt_KVMRedirectionSAP.la libVirt_SettingsDefineCapabilities.la
libVirt_HostedDependency.la libVirt_ElementConformsToProfile.la
libVirt_HostedResourcePool.la libVirt_ElementCapabilities.la
libVirt_VSSDComponent.la libVirt_SettingsDefineState.la
libVirt_ResourceAllocationFromPool.la libVirt_ElementAllocatedFromPool.la
libVirt_HostedService.la libVirt_ElementSettingData.la
libVirt_ConcreteComponent.la libVirt_ServiceAffectsElement.la
libVirt_HostedAccessPoint.la libVirt_ServiceAccessBySAP.la
libVirt_SAPAvailableForElement.la libVirt_FilterList.la
libVirt_FilterEntry.la libVirt_EntriesInFilterList.la
libVirt_NestedFilterList.la libVirt_HostedFilterList.la
libVirt_AppliedFilterList.la '/home/dpkshetty/usr/lib/cmpi'
*libtool: install: warning: relinking `libVirt_ComputerSystem.la'*
libtool: install: (cd /home/dpkshetty/work/libvirt-cim/libvirt-cim/src;
/bin/bash /home/dpkshetty/work/libvirt-cim/libvirt-cim/libtool --silent
--tag CC --mode=relink gcc -g -O2 -D_FORTIFY_SOURCE=2 -D_GNU_SOURCE
-D_LARGEFILE64_SOURCE -Wall -Wmissing-prototypes -Wmissing-declarations
-Wstrict-prototypes -Wpointer-arith -Wformat=2 -Wformat-security
-Wformat-nonliteral -Wno-format-y2k -Wcast-align -Wno-unused-value
-DLIBVIRT_CIM_CS=\"2714b9a5e842\" -DLIBVIRT_CIM_RV=\"1151\" -I../libxkutil
../libxkutil/libxkutil.la -version-info 5:14:5 -L/home/dpkshetty/usr/lib
-lvirt -ldl -L/home/dpkshetty/usr/lib -lcmpiutil -L/usr/lib/i386-linux-gnu
-luuid -o libVirt_ComputerSystem.la -rpath /home/dpkshetty/usr/lib/cmpi
Virt_ComputerSystem.lo -lVirt_VirtualSystemSnapshotService )
*/usr/bin/ld: cannot find -lVirt_VirtualSystemSnapshotService*
collect2: ld returned 1 exit status
libtool: install: error: relink `libVirt_ComputerSystem.la' with the above
command before installing it
make[2]: *** [install-providerLTLIBRARIES] Error 1
make[2]: Leaving directory
`/home/dpkshetty/work/libvirt-cim/libvirt-cim/src'
make[1]: *** [install-am] Error 2
make[1]: Leaving directory
`/home/dpkshetty/work/libvirt-cim/libvirt-cim/src'
make: *** [install-recursive] Error 1
12 years, 10 months
cimtest errors
by Chip Vincent
FYI -
It's getting close to creating a new release and I'd like to get
libvirt-cim and cimtest in sync. With the latest upstream libvirt-cim
and cimtest, I'm seeing the follow unexpected[1] errors in cimtest:
VirtualSystemManagementService - 09_procrasd_persist.py: FAIL
ERROR - Got CIM error CIM_ERR_FAILED: ResourceSettings Error:
VirtualDevice property must be unique for each
DiskResourceAllocationSettingData in a single guest with return code 1
ERROR - Unable to define procrasd_persist_dom
InvokeMethod(DefineSystem): CIM_ERR_FAILED: ResourceSettings Error:
VirtualDevice property must be unique for each
DiskResourceAllocationSettingData in a single guest
--------------------------------------------------------------------
VirtualSystemManagementService - 11_define_memrasdunits.py: FAIL
ERROR - Got CIM error CIM_ERR_FAILED: ResourceSettings Error:
VirtualDevice property must be unique for each
DiskResourceAllocationSettingData in a single guest with return code 1
ERROR - DefineSystem with (KiloBytes) units failed
InvokeMethod(DefineSystem): CIM_ERR_FAILED: ResourceSettings Error:
VirtualDevice property must be unique for each
DiskResourceAllocationSettingData in a single guest
--------------------------------------------------------------------
VirtualSystemSnapshotService - 03_create_snapshot.py: FAIL
ERROR - Exception: CreateSnapshot failed to return a CIM job inst
ERROR - Failed to remove snapshot file for snapshot_vm
A very quick peek at the code shows this message occurs when one tries
to add a disk device
with the same names as one that already exists. This is a no-no in cim.
I'll dig into the root cause tomorrow and provide an update.
[1] - I see several other typical errors that are either known issues or
side-effects of a non-pristine system. Sadly, cimtest considers the
default RHEL 6.1+ config not pristine and falsely fails due
to some pre-configured pools. I plan to address this soon.
--
Chip Vincent
Open Virtualization
IBM Linux Technology Center
cvincent(a)linux.vnet.ibm.com
12 years, 10 months
[PATCH] Avoid connection to libvirt if previous attempt fails
by Eduardo Lima (Etrunko)
From: Eduardo Lima (Etrunko) <eblima(a)br.ibm.com>
This is a workaround to avoid libvirt flooding error messages in syslog. This
happens often if a client submits queries for CIM_ superclasses, which then will
translate to a query for each registered class. In our case KVM_, LXC_ and XEN_.
Ideally, there should be a way to ask libvirt if a given URI or hypervisor is
enabled/supported. A patch for that feature is on the works, and as soon as it
is integrated to libvirt tree this feature will be updated.
Signed-off-by: Eduardo Lima (Etrunko) <eblima(a)br.ibm.com>
---
libxkutil/misc_util.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 48 insertions(+), 0 deletions(-)
diff --git a/libxkutil/misc_util.c b/libxkutil/misc_util.c
index c2cc204..61893c3 100644
--- a/libxkutil/misc_util.c
+++ b/libxkutil/misc_util.c
@@ -24,6 +24,7 @@
#include <stdio.h>
#include <string.h>
+#include <strings.h>
#include <stdlib.h>
#include <stdbool.h>
#include <stdarg.h>
@@ -53,6 +54,46 @@ static int libvirt_initialized = 0;
#define URI_ENV "HYPURI"
+struct _hypervisor_status_t {
+ const char *name;
+ bool enabled;
+};
+
+typedef struct _hypervisor_status_t hypervisor_status_t;
+
+static hypervisor_status_t hypervisor_list[] = {
+ { "xen", true },
+ { "kvm", true },
+ { "lxc", true },
+ { NULL },
+};
+
+static bool get_hypervisor_enabled(const char *hypervisor)
+{
+ hypervisor_status_t *h;
+
+ for (h = &hypervisor_list[0]; h != NULL; h++) {
+ if (strncasecmp(hypervisor, h->name, strlen(h->name)) == 0) {
+ return h->enabled;
+ }
+ }
+
+ return false;
+}
+
+static void set_hypervisor_disabled(const char *hypervisor)
+{
+ hypervisor_status_t *h;
+
+ for (h = &hypervisor_list[0]; h != NULL; h++) {
+ if (strncasecmp(hypervisor, h->name, strlen(h->name)) == 0) {
+ CU_DEBUG("Setting '%s' hypervisor as DISABLED", h->name);
+ h->enabled = false;
+ return;
+ }
+ }
+}
+
static const char *cn_to_uri(const char *classname)
{
if (STARTS_WITH(classname, "Xen"))
@@ -117,6 +158,9 @@ virConnectPtr connect_by_classname(const CMPIBroker *broker,
return NULL;
}
+ if (!get_hypervisor_enabled(classname))
+ return NULL;
+
CU_DEBUG("Connecting to libvirt with uri `%s'", uri);
pthread_mutex_lock(&libvirt_mutex);
@@ -129,6 +173,10 @@ virConnectPtr connect_by_classname(const CMPIBroker *broker,
pthread_mutex_unlock(&libvirt_mutex);
if (!conn) {
+ virErrorPtr error = virGetLastError();
+ if (error->code == VIR_ERR_NO_CONNECT)
+ set_hypervisor_disabled(classname);
+
CU_DEBUG("Unable to connect to `%s'", uri);
return NULL;
}
--
1.7.4.4
12 years, 10 months
[PATCHv2] [TEST] Fix syntax errors, small tweaks
by Eduardo Lima (Etrunko)
From: Eduardo Lima (Etrunko) <eblima(a)br.ibm.com>
suites/libvirt-cim/cimtest/VirtualSystemManagementService/08_modifyresource.py:
- Unecessary virt param
suites/libvirt-cim/cimtest/VirtualSystemManagementService/31_unset_netrasd.py:
- Undefined symbols XFAIL, SKIP
suites/libvirt-cim/main.py
- options referenced in except block without being defined
Signed-off-by: Eduardo Lima (Etrunko) <eblima(a)br.ibm.com>
---
.../08_modifyresource.py | 8 ++++----
.../31_unset_netrasd.py | 2 +-
suites/libvirt-cim/main.py | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/08_modifyresource.py b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/08_modifyresource.py
index 6661ef3..df58d1f 100644
--- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/08_modifyresource.py
+++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/08_modifyresource.py
@@ -47,7 +47,7 @@ new_mac1 = "11:%s:22:%s:33:%s" % (new_int, new_int, new_int)
new_int += 1
new_mac2 = "11:%s:22:%s:33:%s" % (new_int, new_int, new_int)
-def cleanup_env(ip, virt, cxml):
+def cleanup_env(ip, cxml):
cxml.destroy(ip)
cxml.undefine(ip)
@@ -82,13 +82,13 @@ def main():
ret = cxml.cim_define(options.ip)
if not ret:
logger.error("Failed to define the dom: %s", default_dom)
- cleanup_env(options.ip, options.virt, cxml)
+ cleanup_env(options.ip, cxml)
return FAIL
if case == "start":
ret = cxml.start(options.ip)
if not ret:
logger.error("Failed to start the dom: %s", default_dom)
- cleanup_env(options.ip, options.virt, cxml)
+ cleanup_env(options.ip, cxml)
return FAIL
status = vsms_util.mod_vcpu_res(options.ip, service, cxml, pasd, ncpu,
@@ -114,7 +114,7 @@ def main():
if status != PASS:
break
- cleanup_env(options.ip, options.virt, cxml)
+ cleanup_env(options.ip, cxml)
return status
diff --git a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/31_unset_netrasd.py b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/31_unset_netrasd.py
index 417ad7f..9c78eb8 100755
--- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/31_unset_netrasd.py
+++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/31_unset_netrasd.py
@@ -28,7 +28,7 @@
import sys
import pywbem
-from CimTest.ReturnCodes import PASS, FAIL
+from CimTest.ReturnCodes import PASS, FAIL, XFAIL, SKIP
from CimTest.Globals import logger, CIM_USER, CIM_PASS, CIM_NS
from XenKvmLib.const import do_main
from XenKvmLib.classes import get_typed_class
diff --git a/suites/libvirt-cim/main.py b/suites/libvirt-cim/main.py
index 4e7d621..a4e33e6 100644
--- a/suites/libvirt-cim/main.py
+++ b/suites/libvirt-cim/main.py
@@ -306,8 +306,8 @@ def main(options, args):
if __name__ == '__main__':
ret = -1
+ options, args = parser.parse_args()
try:
- options, args = parser.parse_args()
ret = main(options, args)
except (KeyboardInterrupt, SystemExit):
print "\nKeyboardInterrupt. Cleaning up..."
--
1.7.4.4
12 years, 10 months
[PATCH] [TEST] Fix syntax errors in VSMS/09_procrasd_persist.py
by eblima＠linux.vnet.ibm.com
From: Eduardo Lima (Etrunko) <eblima(a)br.ibm.com>
Traceback (most recent call last):
File "/usr/lib64/python2.7/logging/__init__.py", line 838, in emit
msg = self.format(record)
File "/usr/lib64/python2.7/logging/__init__.py", line 715, in format
return fmt.format(record)
File "/usr/lib64/python2.7/logging/__init__.py", line 464, in format
record.message = record.getMessage()
File "/usr/lib64/python2.7/logging/__init__.py", line 328, in getMessage
msg = msg % self.args
TypeError: %d format: a number is required, not NoneType
Signed-off-by: Eduardo Lima (Etrunko) <eblima(a)br.ibm.com>
---
.../09_procrasd_persist.py | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/09_procrasd_persist.py b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/09_procrasd_persist.py
index cc5b71b..91415dd 100644
--- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/09_procrasd_persist.py
+++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/09_procrasd_persist.py
@@ -91,19 +91,19 @@ def check_proc_sched(server, virt, cn_name):
return FAIL
if proc_rasd["VirtualQuantity"] != nvcpu and virt != 'KVM':
- logger.error("VirtualQuantity is %i, expected %i",
+ logger.error("VirtualQuantity is %s, expected %s",
proc_rasd["VirtualQuantity"], nvcpu)
return FAIL
elif proc_rasd["VirtualQuantity"] != nvcpu and virt == "KVM":
return XFAIL_RC(libvirt_bug)
if proc_rasd["Limit"] != limit:
- logger.error("Limit is %i, expected %i",
+ logger.error("Limit is %s, expected %s",
proc_rasd["Limit"], limit)
return FAIL
if proc_rasd["Weight"] != weight:
- logger.error("Weight is %i, expected %i",
+ logger.error("Weight is %s, expected %s",
proc_rasd["Weight"], weight)
return FAIL
--
1.7.4.4
12 years, 10 months
[PATCH] [TEST] Fix VSMS/32_modify_cdrom_media.py
by eblima＠linux.vnet.ibm.com
From: Eduardo Lima (Etrunko) <eblima(a)br.ibm.com>
This test depended on some modifications in the core classes that resulted in
many other tests failing. This patch fixed this issue by moving the necessary
bits to the testcase itself.
Signed-off-by: Eduardo Lima (Etrunko) <eblima(a)br.ibm.com>
---
.../32_modify_cdrom_media.py | 16 +++++++++++++++-
suites/libvirt-cim/lib/XenKvmLib/vxml.py | 17 +++--------------
2 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/32_modify_cdrom_media.py b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/32_modify_cdrom_media.py
index 9b42831..ff9d034 100755
--- a/suites/libvirt-cim/cimtest/VirtualSystemManagementService/32_modify_cdrom_media.py
+++ b/suites/libvirt-cim/cimtest/VirtualSystemManagementService/32_modify_cdrom_media.py
@@ -32,9 +32,10 @@ import pywbem
from CimTest.ReturnCodes import PASS, FAIL, XFAIL, SKIP
from CimTest.Globals import logger, CIM_USER, CIM_PASS, CIM_NS
-from XenKvmLib.const import do_main, _image_dir
+from XenKvmLib.const import do_main, _image_dir, KVM_default_cdrom_dev
from XenKvmLib.classes import get_typed_class
from XenKvmLib.vxml import get_class
+from XenKvmLib import vsms
supported = ['KVM',]
@@ -49,6 +50,19 @@ class CIMDomain(object):
self.server = server
self.virt = virt
self._domain = get_class(virt)(name)
+
+ # CIM Instance for cdrom
+ dasd = vsms.get_dasd_class(virt)
+ cdrom_dasd = dasd(dev=KVM_default_cdrom_dev, source="",
+ name=name, emu_type=1)
+ self._domain.res_settings.append(str(cdrom_dasd))
+
+ # cdrom XML description
+ devices = self._domain.get_node('/domain/devices')
+ cdrom = self._domain.add_sub_node(devices, 'disk', type='file',
+ device='cdrom')
+ self._domain.add_sub_node(cdrom, 'source', file="")
+ self._domain.add_sub_node(cdrom, 'target', dev=KVM_default_cdrom_dev)
#__init__
def define(self):
diff --git a/suites/libvirt-cim/lib/XenKvmLib/vxml.py b/suites/libvirt-cim/lib/XenKvmLib/vxml.py
index 6790036..15859c1 100644
--- a/suites/libvirt-cim/lib/XenKvmLib/vxml.py
+++ b/suites/libvirt-cim/lib/XenKvmLib/vxml.py
@@ -628,17 +628,13 @@ class VirtCIM:
self.iasd = vsms.get_iasd_class(virt)(name=dom_name,
res_sub_type=irstype,
bus_type=btype)
- if virt == "KVM":
- dasd = vsms.get_dasd_class(virt)
- self.cdrom_dasd = dasd(dev=const.KVM_default_cdrom_dev,
- source="",
- name=dom_name,
- emu_type=1)
+ self.res_settings = []
+
def cim_define(self, ip, ref_conf=None):
service = vsms.get_vsms_class(self.virt)(ip)
sys_settings = str(self.vssd)
- res_settings = []
+ res_settings = self.res_settings
if self.dasd is not None:
res_settings.append(str(self.dasd))
if self.pasd is not None:
@@ -651,10 +647,6 @@ class VirtCIM:
else:
res_settings.append(str(self.nasd))
- # CDROM device
- if self.virt == "KVM":
- res_settings.append(str(self.cdrom_dasd))
-
curr_cim_rev, changeset = get_provider_version(self.virt, ip)
if curr_cim_rev >= vsms_graphics_sup:
if self.gasd is not None:
@@ -952,9 +944,6 @@ class KVMXML(VirtXML, VirtCIM):
self.add_sub_node(disk, 'source', file=disk_img)
self.add_sub_node(disk, 'target', dev=disk_dev)
- cdrom = self.add_sub_node(devices, 'disk', type='file', device='cdrom')
- self.add_sub_node(cdrom, 'source', file="")
- self.add_sub_node(cdrom, 'target', dev=const.KVM_default_cdrom_dev)
self.add_sub_node(devices, 'input', type='mouse', bus='ps2')
self.add_sub_node(devices, 'graphics', type='vnc', port='5900',
--
1.7.4.4
12 years, 10 months