- Devel - libvirt List Archives

[libvirt] [PATCH 0/4] more enum cleanups
by Eric Blake 17 May '14

17 May '14

Inspired by the cleanups contributed by Julio Faracco, I did some more cleanups of my own. My end goal is to turn on a syntax-check rule that forbids 'enum vir' (since we should always be declaring 'typedef enum { ... } vir...;'), but there's still a lot of violations in the code base, even after this series. Eric Blake (4): vbox: fix stale comment about vdi storage type maint: use enum typedef for virstorageencryption.h maint: shorten 'TypeType' function names maint: prefer enum over int for virstoragefile structs src/conf/domain_conf.c | 14 +++++++------- src/conf/domain_conf.h | 2 +- src/conf/secret_conf.c | 8 ++++---- src/conf/secret_conf.h | 4 ++-- src/conf/storage_conf.c | 14 +++++++------- src/conf/storage_conf.h | 6 +++--- src/libvirt_private.syms | 10 +++++----- src/lxc/lxc_controller.c | 2 +- src/qemu/qemu_command.c | 8 ++++++++ src/qemu/qemu_driver.c | 8 ++++---- src/storage/storage_backend_disk.c | 2 +- src/util/virstorageencryption.c | 6 +++--- src/util/virstorageencryption.h | 10 +++++----- src/util/virstoragefile.h | 19 ++++++++++--------- src/vbox/vbox_tmpl.c | 15 ++++----------- tools/virsh-secret.c | 4 ++-- 16 files changed, 67 insertions(+), 65 deletions(-) -- 1.9.0

3 8

[libvirt] [PATCH] maint: fix typos related to disk name resolution
by Eric Blake 17 May '14

17 May '14

In a number of APIs, the text implied that a user might have <target dev='xvda'/> - but common convention is to use "vda", not "xvda". For example, virDomainGetDiskErrors was correct, while virDomainBlockStats was confusing. * src/libvirt.c: Make examples consistent. Signed-off-by: Eric Blake <eblake(a)redhat.com> --- Copy and paste is to blame for the size of this patch :) Pushing under the trivial rule. src/libvirt.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/libvirt.c b/src/libvirt.c index ccb7113..19fa18b 100644 --- a/src/libvirt.c +++ b/src/libvirt.c @@ -7850,7 +7850,7 @@ virDomainSetSchedulerParametersFlags(virDomainPtr domain, * devices attached to the domain. * * The @disk parameter is either the device target shorthand (the - * <target dev='...'/> sub-element, such as "xvda"), or (since 0.9.8) + * <target dev='...'/> sub-element, such as "vda"), or (since 0.9.8) * an unambiguous source name of the block device (the <source * file='...'/> sub-element, such as "/path/to/image"). Valid names * can be found by calling virDomainGetXMLDesc() and inspecting @@ -7918,7 +7918,7 @@ virDomainBlockStats(virDomainPtr dom, const char *disk, * devices attached to the domain. * * The @disk parameter is either the device target shorthand (the - * <target dev='...'/> sub-element, such as "xvda"), or (since 0.9.8) + * <target dev='...'/> sub-element, such as "vda"), or (since 0.9.8) * an unambiguous source name of the block device (the <source * file='...'/> sub-element, such as "/path/to/image"). Valid names * can be found by calling virDomainGetXMLDesc() and inspecting @@ -8270,7 +8270,7 @@ virDomainMemoryStats(virDomainPtr dom, virDomainMemoryStatPtr stats, * The @disk parameter is either an unambiguous source name of the * block device (the <source file='...'/> sub-element, such as * "/path/to/image"), or (since 0.9.5) the device target shorthand - * (the <target dev='...'/> sub-element, such as "xvda"). Valid names + * (the <target dev='...'/> sub-element, such as "vda"). Valid names * can be found by calling virDomainGetXMLDesc() and inspecting * elements within //domain/devices/disk. * @@ -8348,7 +8348,7 @@ virDomainBlockPeek(virDomainPtr dom, * The @disk parameter is either an unambiguous source name of the * block device (the <source file='...'/> sub-element, such as * "/path/to/image"), or (since 0.9.5) the device target shorthand - * (the <target dev='...'/> sub-element, such as "xvda"). Valid names + * (the <target dev='...'/> sub-element, such as "vda"). Valid names * can be found by calling virDomainGetXMLDesc() and inspecting * elements within //domain/devices/disk. * @@ -8510,7 +8510,7 @@ virDomainMemoryPeek(virDomainPtr dom, * The @disk parameter is either an unambiguous source name of the * block device (the <source file='...'/> sub-element, such as * "/path/to/image"), or (since 0.9.5) the device target shorthand - * (the <target dev='...'/> sub-element, such as "xvda"). Valid names + * (the <target dev='...'/> sub-element, such as "vda"). Valid names * can be found by calling virDomainGetXMLDesc() and inspecting * elements within //domain/devices/disk. * @@ -19448,7 +19448,7 @@ virDomainOpenChannel(virDomainPtr dom, * The @disk parameter is either an unambiguous source name of the * block device (the <source file='...'/> sub-element, such as * "/path/to/image"), or (since 0.9.5) the device target shorthand - * (the <target dev='...'/> sub-element, such as "xvda"). Valid names + * (the <target dev='...'/> sub-element, such as "vda"). Valid names * can be found by calling virDomainGetXMLDesc() and inspecting * elements within //domain/devices/disk. * @@ -19522,7 +19522,7 @@ virDomainBlockJobAbort(virDomainPtr dom, const char *disk, * The @disk parameter is either an unambiguous source name of the * block device (the <source file='...'/> sub-element, such as * "/path/to/image"), or (since 0.9.5) the device target shorthand - * (the <target dev='...'/> sub-element, such as "xvda"). Valid names + * (the <target dev='...'/> sub-element, such as "vda"). Valid names * can be found by calling virDomainGetXMLDesc() and inspecting * elements within //domain/devices/disk. * @@ -19576,7 +19576,7 @@ virDomainGetBlockJobInfo(virDomainPtr dom, const char *disk, * The @disk parameter is either an unambiguous source name of the * block device (the <source file='...'/> sub-element, such as * "/path/to/image"), or (since 0.9.5) the device target shorthand - * (the <target dev='...'/> sub-element, such as "xvda"). Valid names + * (the <target dev='...'/> sub-element, such as "vda"). Valid names * can be found by calling virDomainGetXMLDesc() and inspecting * elements within //domain/devices/disk. * @@ -19633,7 +19633,7 @@ virDomainBlockJobSetSpeed(virDomainPtr dom, const char *disk, * The @disk parameter is either an unambiguous source name of the * block device (the <source file='...'/> sub-element, such as * "/path/to/image"), or (since 0.9.5) the device target shorthand - * (the <target dev='...'/> sub-element, such as "xvda"). Valid names + * (the <target dev='...'/> sub-element, such as "vda"). Valid names * can be found by calling virDomainGetXMLDesc() and inspecting * elements within //domain/devices/disk. * @@ -19744,7 +19744,7 @@ virDomainBlockPull(virDomainPtr dom, const char *disk, * The @disk parameter is either an unambiguous source name of the * block device (the <source file='...'/> sub-element, such as * "/path/to/image"), or the device target shorthand (the - * <target dev='...'/> sub-element, such as "xvda"). Valid names + * <target dev='...'/> sub-element, such as "vda"). Valid names * can be found by calling virDomainGetXMLDesc() and inspecting * elements within //domain/devices/disk. * @@ -19867,7 +19867,7 @@ virDomainBlockRebase(virDomainPtr dom, const char *disk, * The @disk parameter is either an unambiguous source name of the * block device (the <source file='...'/> sub-element, such as * "/path/to/image"), or the device target shorthand (the - * <target dev='...'/> sub-element, such as "xvda"). Valid names + * <target dev='...'/> sub-element, such as "vda"). Valid names * can be found by calling virDomainGetXMLDesc() and inspecting * elements within //domain/devices/disk. * -- 1.9.0

1 0

[libvirt] [PATCH 0/2] Fix seclabels for chardevs
by Ján Tomko 17 May '14

17 May '14

Ján Tomko (2): Rename virDomainDiskSourceDefFormatSeclabel Fix seclabels for chardevs src/conf/domain_conf.c | 51 ++++++++++------------ .../qemuxml2argv-chardev-label.xml | 40 +++++++++++++++++ tests/qemuxml2xmltest.c | 2 + 3 files changed, 66 insertions(+), 27 deletions(-) create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-chardev-label.xml -- 1.8.3.2

2 8

[libvirt] Quorum block driver libvirt support proposal
by Benoît Canet 17 May '14

17 May '14

Hello list, I want to implement libvirt Quorum support. (https://github.com/qemu/qemu/commit/c88a1de51ab2f26a9a37ffc317249736de8c015c) Quorum is a QEMU RAID like block storage driver. Data are written on n replicas and when a read is done a comparison between the replica read is done. If more than threshold reads are identical the read succeed else it's and error. For example a Quorum with n = 3 and threshold = 2 would be made of three QCOW2 backing chains used as identicals replicas. threshold = 2 means that at least 2 replica must be identical when doing a read. I want to make use of the new backingStore xml element to implement quorum. Proposed Quorum libvirt format: ------------------------------- <disk type='quorum' device='disk'> <driver name='qemu' type='quorum'/> <threshold value=2/> <backingStore type='file'> <format type='qcow2'/> <source file='/var/lib/libvirt/images/file1.qcow2'/> </backingStore> <backingStore type='file'> <format type='qcow2'/> <source file='/var/lib/libvirt/images/file2.qcow2'/> </backingStore> <backingStore type='file'> <format type='qcow2'/> <source file='/var/lib/libvirt/images/file3.qcow2'/> </backingStore> <target dev='vda' bus='virtio'/> </disk> Implementation plan: -------------------- * Add VIR_STORAGE_TYPE_QUORUM * In src/util/virstoragefile.h change _virStorageSource to contain a virStorageSourcePtrPtr backingStores. I think doing it at this level allow to keep a 1-1 mapping with the qemu BlockDriverState hiearchy * Add a int quorum_threshold field to the same structure * Add support for parsing treshold in virDomainDiskDefParseXML * Change virDomainDiskBackingStoreParse to virDomainDiskBackingStoresParse to parse all the backingStore at once an use realloc to grow the backingStores field. * Modify virDomainDiskDefFormat to call virDomainDiskBackingStoreFormat in a loop for saving * hook into qemuBuildDriveStr around line 3442 to create the quorum parameters Do you feel that I am missing something ? Best regards Benoît

4 8

[libvirt] [RFC 0/5] Allow object-add on X86CPU subclasses, for CPU model probing
by Eduardo Habkost 17 May '14

17 May '14

This series allows management code to use object-add on X86CPU subclasses, so it can use it to probe for CPU model information without re-running QEMU. The main use case for this is to allow management code to create CPU objects and query the "feature-words" and "filtered-features" properties on the new objects, to find out which features each CPU model needs, and to do the same using the "host" CPU model to check which features can be enabled in a given host. There's experimental libvirt code to use the new command at: https://github.com/ehabkost/libvirt/tree/work/cpu-feature-word-query The experimental code just create the CPU objects to query for feature information, but doesn't do anything with that data. Eduardo Habkost (5): cpu: Initialize cpu->stopped=true earlier cpu: Don't try to pause CPUs if they are already stopped pc: Don't crash on apic_accept_pic_intr() if CPU has no apic_state target-i386: Make CPU objects user-creatable target-i386: Report QOM class name for CPU definitions cpus.c | 13 ++++++++++--- exec.c | 1 + hw/i386/pc.c | 2 +- qapi-schema.json | 6 +++++- target-i386/cpu.c | 7 +++++++ 5 files changed, 24 insertions(+), 5 deletions(-) -- 1.9.0

5 27

[libvirt] [PATCH] vircgroup: Don't leak keypath if failed to kill process
by Chen Hanxiao 16 May '14

16 May '14

Signed-off-by: Chen Hanxiao <chenhanxiao(a)cn.fujitsu.com> --- src/util/vircgroup.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c index fce380a..c578bd0 100644 --- a/src/util/vircgroup.c +++ b/src/util/vircgroup.c @@ -3370,7 +3370,7 @@ virCgroupKillRecursiveInternal(virCgroupPtr group, int rc; bool killedAny = false; char *keypath = NULL; - DIR *dp; + DIR *dp = NULL; virCgroupPtr subgroup = NULL; struct dirent *ent; int direrr; @@ -3381,7 +3381,7 @@ virCgroupKillRecursiveInternal(virCgroupPtr group, return -1; if ((rc = virCgroupKillInternal(group, signum, pids)) < 0) - return -1; + goto cleanup; if (rc == 1) killedAny = true; @@ -3394,7 +3394,7 @@ virCgroupKillRecursiveInternal(virCgroupPtr group, } virReportSystemError(errno, _("Cannot open %s"), keypath); - return -1; + goto cleanup; } while ((direrr = virDirRead(dp, &ent, keypath)) > 0) { @@ -3429,7 +3429,9 @@ virCgroupKillRecursiveInternal(virCgroupPtr group, cleanup: virCgroupFree(&subgroup); - closedir(dp); + VIR_FREE(keypath); + if (dp) + closedir(dp); return ret; } -- 1.9.0

3 2

[libvirt] [libvirt-python PATCH v2] override: add virDomainFSFreeze and virDomainFSThaw API
by Michal Privoznik 16 May '14

16 May '14

From: Tomoki Sekiyama <tomoki.sekiyama(a)hds.com> Add binding for the new virDomainFSFreeze and virDomainFSThaw functions added in libvirt 1.2.5. These require override since these take a list of mountpoints path string. The methods are named 'fsFreeze' and 'fsThaw'. Signed-off-by: Tomoki Sekiyama <tomoki.sekiyama(a)hds.com> Signed-off-by: Michal Privoznik <mprivozn(a)redhat.com> --- diff to v1: -Eric's and mine review comments worked in generator.py | 3 ++ libvirt-override-virDomain.py | 12 ++++++ libvirt-override.c | 97 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 112 insertions(+) diff --git a/generator.py b/generator.py index 05ec743..e7b4643 100755 --- a/generator.py +++ b/generator.py @@ -517,6 +517,9 @@ skip_function = ( 'virDomainCreateXMLWithFiles', # overridden in virConnect.py 'virDomainCreateWithFiles', # overridden in virDomain.py + 'virDomainFSFreeze', # overridden in virDomain.py + 'virDomainFSThaw', # overridden in virDomain.py + # 'Ref' functions have no use for bindings users. "virConnectRef", "virDomainRef", diff --git a/libvirt-override-virDomain.py b/libvirt-override-virDomain.py index c96cc5e..e61ad00 100644 --- a/libvirt-override-virDomain.py +++ b/libvirt-override-virDomain.py @@ -47,3 +47,15 @@ ret = libvirtmod.virDomainCreateWithFiles(self._o, files, flags) if ret == -1: raise libvirtError ('virDomainCreateWithFiles() failed', dom=self) return ret + + def fsFreeze(self, mountpoints=None, flags=0): + """Freeze specified filesystems within the guest """ + ret = libvirtmod.virDomainFSFreeze(self._o, mountpoints, flags) + if ret == -1: raise libvirtError ('virDomainFSFreeze() failed', dom=self) + return ret + + def fsThaw(self, mountpoints=None, flags=0): + """Thaw specified filesystems within the guest """ + ret = libvirtmod.virDomainFSThaw(self._o, mountpoints, flags) + if ret == -1: raise libvirtError ('virDomainFSThaw() failed', dom=self) + return ret diff --git a/libvirt-override.c b/libvirt-override.c index 3fa9b9b..c4ac223 100644 --- a/libvirt-override.c +++ b/libvirt-override.c @@ -7554,6 +7554,99 @@ cleanup: #endif /* LIBVIR_CHECK_VERSION(1, 1, 1) */ +#if LIBVIR_CHECK_VERSION(1, 2, 5) +static PyObject * +libvirt_virDomainFSFreeze(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { + PyObject *py_retval = NULL; + int c_retval; + virDomainPtr domain; + PyObject *pyobj_domain; + PyObject *pyobj_list; + unsigned int flags; + unsigned int nmountpoints = 0; + char **mountpoints = NULL; + size_t i = 0, j; + + if (!PyArg_ParseTuple(args, (char *)"OOi:virDomainFSFreeze", + &pyobj_domain, &pyobj_list, &flags)) + return NULL; + domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + + if (PyList_Check(pyobj_list)) { + nmountpoints = PyList_Size(pyobj_list); + + if (VIR_ALLOC_N(mountpoints, nmountpoints) < 0) + return PyErr_NoMemory(); + + for (i = 0; i < nmountpoints; i++) { + if (libvirt_charPtrUnwrap(PyList_GetItem(pyobj_list, i), + mountpoints+i) < 0 || + mountpoints[i] == NULL) + goto cleanup; + } + } + + LIBVIRT_BEGIN_ALLOW_THREADS; + c_retval = virDomainFSFreeze(domain, (const char **) mountpoints, + nmountpoints, flags); + LIBVIRT_END_ALLOW_THREADS; + + py_retval = libvirt_intWrap(c_retval); + +cleanup: + for (j = 0 ; j < i ; j++) + VIR_FREE(mountpoints[j]); + VIR_FREE(mountpoints); + return py_retval; +} + + +static PyObject * +libvirt_virDomainFSThaw(PyObject *self ATTRIBUTE_UNUSED, PyObject *args) { + PyObject *py_retval = NULL; + int c_retval; + virDomainPtr domain; + PyObject *pyobj_domain; + PyObject *pyobj_list; + unsigned int flags; + unsigned int nmountpoints = 0; + char **mountpoints = NULL; + size_t i = 0, j; + + if (!PyArg_ParseTuple(args, (char *)"OOi:virDomainFSThaw", + &pyobj_domain, &pyobj_list, &flags)) + return NULL; + domain = (virDomainPtr) PyvirDomain_Get(pyobj_domain); + + if (PyList_Check(pyobj_list)) { + nmountpoints = PyList_Size(pyobj_list); + + if (VIR_ALLOC_N(mountpoints, nmountpoints) < 0) + return PyErr_NoMemory(); + + for (i = 0; i < nmountpoints; i++) { + if (libvirt_charPtrUnwrap(PyList_GetItem(pyobj_list, i), + mountpoints+i) < 0 || + mountpoints[i] == NULL) + goto cleanup; + } + } + + LIBVIRT_BEGIN_ALLOW_THREADS; + c_retval = virDomainFSThaw(domain, (const char **) mountpoints, + nmountpoints, flags); + LIBVIRT_END_ALLOW_THREADS; + + py_retval = libvirt_intWrap(c_retval); + + cleanup: + for (j = 0 ; j < i ; j++) + VIR_FREE(mountpoints[j]); + VIR_FREE(mountpoints); + return py_retval; +} +#endif /* LIBVIR_CHECK_VERSION(1, 2, 5) */ + /************************************************************************ * * * The registration stuff * @@ -7729,6 +7822,10 @@ static PyMethodDef libvirtMethods[] = { {(char *) "virDomainCreateXMLWithFiles", libvirt_virDomainCreateXMLWithFiles, METH_VARARGS, NULL}, {(char *) "virDomainCreateWithFiles", libvirt_virDomainCreateWithFiles, METH_VARARGS, NULL}, #endif /* LIBVIR_CHECK_VERSION(1, 1, 1) */ +#if LIBVIR_CHECK_VERSION(1, 2, 5) + {(char *) "virDomainFSFreeze", libvirt_virDomainFSFreeze, METH_VARARGS, NULL}, + {(char *) "virDomainFSThaw", libvirt_virDomainFSThaw, METH_VARARGS, NULL}, +#endif /* LIBVIR_CHECK_VERSION(1, 2, 5) */ {NULL, NULL, 0, NULL} }; -- 1.9.3

3 2

[libvirt] [PATCHv2 0/2] Honor DAC norelabel attribute
by Michal Privoznik 16 May '14

16 May '14

Version two, this time split into two patches. Michal Privoznik (2): security_dac: Rework to make it more readable security_dac: Honor norelabel attribute src/security/security_dac.c | 355 ++++++++++++++++++++++++++------------------ 1 file changed, 213 insertions(+), 142 deletions(-) -- 1.9.0

3 5

[libvirt] [PATCH 1/3] virutil: Introduce a new macro named CLAMP.
by Dongsheng Yang 16 May '14

16 May '14

This patch introduce a new macro to return a value clamped to a given range. Signed-off-by: Dongsheng Yang <yangds.fnst(a)cn.fujitsu.com> --- src/util/virutil.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/util/virutil.h b/src/util/virutil.h index 2bb74e2..e8536d8 100644 --- a/src/util/virutil.h +++ b/src/util/virutil.h @@ -37,6 +37,12 @@ # ifndef MAX # define MAX(a, b) ((a) > (b) ? (a) : (b)) # endif +# ifndef CLAMP +# define CLAMP(v, min, max) ({ \ + typeof(v) _v = v; \ + _v = _v < min ? min: _v; \ + _v > max ? max: _v; }) +# endif int virSetBlocking(int fd, bool blocking) ATTRIBUTE_RETURN_CHECK; int virSetNonBlock(int fd) ATTRIBUTE_RETURN_CHECK; -- 1.8.2.1

4 17

[libvirt] [PATCH] Hyper-V 2012 R2 support
by vikhyath reddy 16 May '14

16 May '14

Hi, This patch adds support to libvirt to work with Hyper-V 2012 R2. This will however mean that Hyper-V 2008 will no longer be supported. Microsoft supports hyperv 2008 management via windows 7 and hyperv 2012 via windows 8.1 (note that the reverse is not true, that is, win 7 cannot manage hyperv 2012 and win 8.1 cannot manage hyperv 2008). I think they wanted to keep the application code separate, in the sense that one manages the old namespace and the new one manages the new v2 namespace. The difference between the two namespaces is not great either, sadly, both of them have same class names but with different field types (int, string etc.) which have been separated by the namespace root/virtualization vs root/virtualization/v2 For users who wish to use libvirt to manage Hyper-V 2008, using an older version of libvirt <= 1.4.2 should work. Since new Hyper-V 2008 drivers wont be contributed to libvirt anyway, so it is not like the users will be missing on features. And it is more likely that all future contributions to libvirt will be on Hyper-V 2012 R2 and beyond. diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c index aed9307..0253496 100644 --- a/src/hyperv/hyperv_driver.c +++ b/src/hyperv/hyperv_driver.c @@ -893,8 +893,7 @@ hypervDomainGetXMLDesc(virDomainPtr domain, unsigned int flags) if (VIR_STRDUP(def->name, computerSystem->data->ElementName) < 0) goto cleanup; - if (VIR_STRDUP(def->description, virtualSystemSettingData->data->Notes) < 0) - goto cleanup; + // No need to check length of Notes, it is now a dynamic array def->mem.max_balloon = memorySettingData->data->Limit * 1024; /* megabyte to kilobyte */ def->mem.cur_balloon = memorySettingData->data->VirtualQuantity * 1024; /* megabyte to kilobyte */ diff --git a/src/hyperv/hyperv_wmi.c b/src/hyperv/hyperv_wmi.c index 6e6f629..4c9ad34 100644 --- a/src/hyperv/hyperv_wmi.c +++ b/src/hyperv/hyperv_wmi.c @@ -39,7 +39,7 @@ "http://schemas.microsoft.com/wbem/wsman/1/wmi/root/cimv2/*" #define ROOT_VIRTUALIZATION \ - "http://schemas.microsoft.com/wbem/wsman/1/wmi/root/virtualization/*" + "http://schemas.microsoft.com/wbem/wsman/1/wmi/root/virtualization/v2/*" #define VIR_FROM_THIS VIR_FROM_HYPERV diff --git a/src/hyperv/hyperv_wmi_generator.input b/src/hyperv/hyperv_wmi_generator.input index 97f9dff..bb0e8c1 100644 --- a/src/hyperv/hyperv_wmi_generator.input +++ b/src/hyperv/hyperv_wmi_generator.input @@ -20,6 +20,9 @@ # # Based on MSDN Hyper-V WMI Classes: # http://msdn.microsoft.com/en-us/library/cc136986%28v=vs.85%29.aspx +# Hyper-V 2012 version (root/virtualization/v2 namespace): http://msdn.microsoft.com/en-us/library/hh850257(v=vs.85).aspx +# + Currently, Classes {Msvm_MemorySettingData, Msvm_ProcessorSettingData, Msvm_VirtualSystemSettingData} are in v2 namespace +# + Will eventually need to upgrade the remainder of the classes as well. # @@ -97,80 +100,90 @@ end class Msvm_MemorySettingData - string Caption - string Description - string InstanceID - string ElementName - uint16 ResourceType - string OtherResourceType - string ResourceSubType - string PoolID - uint16 ConsumerVisibility - string HostResource[] - string AllocationUnits - uint64 VirtualQuantity - uint64 Reservation - uint64 Limit - uint32 Weight - boolean AutomaticAllocation - boolean AutomaticDeallocation - string Parent - string Connection[] - string Address - uint16 MappingBehavior - boolean IsVirtualized - string DeviceID - string DeviceIDFormat - boolean DynamicMemoryEnabled -# uint32 TargetMemoryBuffer # Available only on Windows Server 2008 R2 SP1 + string InstanceID + string Caption + string Description + string ElementName + uint16 ResourceType + string OtherResourceType + string ResourceSubType + string PoolID + uint16 ConsumerVisibility + string HostResource[] + string AllocationUnits + uint64 VirtualQuantity + uint64 Reservation + uint64 Limit + uint32 Weight + boolean AutomaticAllocation + boolean AutomaticDeallocation + string Parent + string Connection[] + string Address + uint16 MappingBehavior + string AddressOnParent + string VirtualQuantityUnits + boolean DynamicMemoryEnabled + uint32 TargetMemoryBuffer + boolean IsVirtualized + boolean SwapFilesInUse + uint64 MaxMemoryBlocksPerNumaNode end class Msvm_ProcessorSettingData - string Caption - string Description - string InstanceID - string ElementName - uint16 ResourceType - string OtherResourceType - string ResourceSubType - string PoolID - uint16 ConsumerVisibility - string HostResource[] - string AllocationUnits - uint64 VirtualQuantity - uint64 Reservation - uint64 Limit - uint32 Weight - boolean AutomaticAllocation - boolean AutomaticDeallocation - string Parent - string Connection[] - string Address - uint16 MappingBehavior - boolean IsVirtualized - string DeviceID - string DeviceIDFormat - uint16 ProcessorsPerSocket - uint16 SocketCount - boolean ThreadsEnabled - boolean LimitCPUID - boolean LimitProcessorFeatures + string InstanceID + string Caption + string Description + string ElementName + uint16 ResourceType + string OtherResourceType + string ResourceSubType + string PoolID + uint16 ConsumerVisibility + string HostResource[] + string AllocationUnits + uint64 VirtualQuantity + uint64 Reservation + uint64 Limit + uint32 Weight + boolean AutomaticAllocation + boolean AutomaticDeallocation + string Parent + string Connection[] + string Address + uint16 MappingBehavior + string AddressOnParent + string VirtualQuantityUnits + boolean LimitCPUID + boolean LimitProcessorFeatures + uint64 MaxProcessorsPerNumaNode + uint64 MaxNumaNodesPerSocket end class Msvm_VirtualSystemSettingData + string InstanceID string Caption string Description string ElementName - string InstanceID - string SystemName - uint16 SettingType - uint16 VirtualSystemType - string OtherVirtualSystemType - boolean AutoActivate + string VirtualSystemIdentifier + string VirtualSystemType + string Notes[] datetime CreationTime - string Notes + string ConfigurationID + string ConfigurationDataRoot + string ConfigurationFile + string SnapshotDataRoot + string SuspendDataRoot + string SwapFileDataRoot + string LogDataRoot + uint16 AutomaticStartupAction + datetime AutomaticStartupActionDelay + uint16 AutomaticStartupActionSequenceNumber + uint16 AutomaticShutdownAction + uint16 AutomaticRecoveryAction + string RecoveryFile string BIOSGUID string BIOSSerialNumber string BaseBoardSerialNumber @@ -179,8 +192,22 @@ class Msvm_VirtualSystemSettingData boolean BIOSNumLock uint16 BootOrder[] string Parent - uint16 NumaNodeList[] - boolean NumaNodesAreRequired + boolean IsSaved + string AdditionalRecoveryInformation + boolean AllowFullSCSICommandSet + uint32 DebugChannelId + uint16 DebugPortEnabled + uint32 DebugPort + string Version + boolean IncrementalBackupEnabled + boolean VirtualNumaEnabled + boolean AllowReducedFcRedundancy + string VirtualSystemSubType + string BootSourceOrder[] + boolean PauseAfterBootFailure + uint16 NetworkBootPreferredProtocol + boolean SecureBootEnabled + uint64 LowMmioGapSize end diff --git a/src/hyperv/hyperv_wmi_generator.py b/src/hyperv/hyperv_wmi_generator.py index f767d54..af3ce7e 100755 --- a/src/hyperv/hyperv_wmi_generator.py +++ b/src/hyperv/hyperv_wmi_generator.py @@ -71,7 +71,7 @@ class Class: if self.name.startswith("Win32_"): header += " \"http://schemas.microsoft.com/wbem/wsman/1/wmi/root/cimv2/%s\"\n" % self.name else: - header += " \"http://schemas.microsoft.com/wbem/wsman/1/wmi/root/virtualization/%s\"\n" % self.name + header += " \"http://schemas.microsoft.com/wbem/wsman/1/wmi/root/virtualization/v2/%s\"\n" % self.name header += "\n" header += "#define %s_CLASSNAME \\\n" % name_upper

1 0