[Libvirt-cim] [PATCH] (#2) VirtualDevice default value for a cdrom template rasd changed from hda to hdc
# HG changeset patch
# User Richard Maciel <rmaciel(a)linux.vnet.ibm.com>
# Date 1249448730 10800
# Node ID 23c0707da946c185f4387a13276b0c9fbf084da2
# Parent bdf6eda6765f09c27f7306cd8c074ca5acda38a6
(#2) VirtualDevice default value for a cdrom template rasd changed from hda to hdc
#2:
Fixed patch submission date
Signed-off-by: Richard Maciel <rmaciel(a)linux.vnet.ibm.com>
diff -r bdf6eda6765f -r 23c0707da946 src/Virt_SettingsDefineCapabilities.c
--- a/src/Virt_SettingsDefineCapabilities.c Thu Jul 30 15:59:26 2009 -0700
+++ b/src/Virt_SettingsDefineCapabilities.c Wed Aug 05 02:05:30 2009 -0300
@@ -782,13 +782,6 @@
CMPIInstance *inst;
CMPIStatus s = {CMPI_RC_OK, NULL};
- if (type == DOMAIN_LXC) {
- dev = "/lxc_mnt/tmp";
- }
- else {
- dev = "hda";
- }
-
inst = sdc_rasd_inst(&s, ref, CIM_RES_TYPE_DISK, DEVICE_RASD);
if ((inst == NULL) || (s.rc != CMPI_RC_OK))
goto out;
@@ -798,12 +791,11 @@
(CMPIValue *)"MegaBytes", CMPI_chars);
CMSetProperty(inst, "Address", (CMPIValue *)disk_path, CMPI_chars);
- if (type == DOMAIN_LXC)
+ if (type == DOMAIN_LXC) {
+ dev = "/lxc_mnt/tmp";
CMSetProperty(inst, "MountPoint", (CMPIValue *)dev,
CMPI_chars);
- else {
- if (emu_type == 0)
- CMSetProperty(inst, "VirtualQuantity",
- (CMPIValue *)&disk_size, CMPI_uint64);
+ } else {
+ dev = "hda";
if (type == DOMAIN_XENPV) {
dev = "xvda";
@@ -813,6 +805,13 @@
CMSetProperty(inst, "Caption",
(CMPIValue *)"FV disk", CMPI_chars);
}
+
+ if (emu_type == 0) {
+ CMSetProperty(inst, "VirtualQuantity",
+ (CMPIValue *)&disk_size, CMPI_uint64);
+ } else if (emu_type == 1) {
+ dev = "hdc";
+ }
CMSetProperty(inst, "VirtualDevice",
(CMPIValue *)dev, CMPI_chars);