[vdsm/f18] update to vdsm-4.10.3-1
Federico Simoncelli
fsimonce at fedoraproject.org
Thu Dec 27 13:33:58 UTC 2012
commit b75e16e87b1c2759cdff051437fac87fb95a5142
Author: Federico Simoncelli <fsimonce at redhat.com>
Date: Thu Dec 27 14:32:52 2012 +0100
update to vdsm-4.10.3-1
- api: Report CPU thread info in getVdsCapabilities
- schema: Missing comment for new VmDeviceType
- schema: Fix schema for VM.updateDevice
Signed-off-by: Federico Simoncelli <fsimonce at redhat.com>
0001-schema-Fix-schema-for-VM.updateDevice.patch | 65 ++++++++++++++++++++
...hema-Missing-comment-for-new-VmDeviceType.patch | 36 +++++++++++
...ort-CPU-thread-info-in-getVdsCapabilities.patch | 53 ++++++++++++++++
vdsm.spec | 18 +++++-
4 files changed, 171 insertions(+), 1 deletions(-)
---
diff --git a/0001-schema-Fix-schema-for-VM.updateDevice.patch b/0001-schema-Fix-schema-for-VM.updateDevice.patch
new file mode 100644
index 0000000..59cd4bc
--- /dev/null
+++ b/0001-schema-Fix-schema-for-VM.updateDevice.patch
@@ -0,0 +1,65 @@
+From 844f10a9aafd55018e9966a61dece726d3e62511 Mon Sep 17 00:00:00 2001
+From: Adam Litke <agl at us.ibm.com>
+Date: Wed, 12 Dec 2012 13:52:19 -0600
+Subject: [PATCH 1/3] schema: Fix schema for VM.updateDevice
+
+Another recent update broke the schema file. I'll take the blame for this one
+since I approved the change :) Some missing and/or malformed data in comments
+was causing the process-schema script to fail. Another reason for validating
+the schema during the build.
+
+Change-Id: If88596050ace9511bcc7be65ee46645359e30532
+Signed-off-by: Adam Litke <agl at us.ibm.com>
+Reviewed-on: http://gerrit.ovirt.org/10012
+Reviewed-by: Saggi Mizrahi <smizrahi at redhat.com>
+Tested-by: Saggi Mizrahi <smizrahi at redhat.com>
+Reviewed-on: http://gerrit.ovirt.org/10019
+Reviewed-by: Dan Kenigsberg <danken at redhat.com>
+Tested-by: Antoni Segura Puimedon <asegurap at redhat.com>
+---
+ vdsm_api/vdsmapi-schema.json | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/vdsm_api/vdsmapi-schema.json b/vdsm_api/vdsmapi-schema.json
+index 9772e18..487e69a 100644
+--- a/vdsm_api/vdsmapi-schema.json
++++ b/vdsm_api/vdsmapi-schema.json
+@@ -4894,10 +4894,12 @@
+ ##
+ # @vmUpdateDeviceParams:
+ #
++# A discriminated record of update parameters for a VM device.
++#
+ # @deviceType: The VM device type to update. For example 'interface' for
+ # network devices or 'disk' for disk storage devices.
+ #
+-# Since 4.10.3
++# Since: 4.10.3
+ ##
+ {'type': 'vmUpdateDeviceParams',
+ 'data': {'deviceType': 'VmDeviceType'},
+@@ -4924,11 +4926,11 @@
+ # by alias. If omitted, it keeps the current mirroring
+ # configuration.
+ #
+-# Since 4.10.3
++# Since: 4.10.3
+ ##
+ {'type': 'vmUpdateInterfaceDeviceParams',
+ 'data': {'*network': 'str', '*linkActive': 'bool',
+- 'alias': 'str', '*portMirroring': '[str]'}}
++ 'alias': 'str', '*portMirroring': ['str']}}
+
+ ##
+ # @VM.updateDevice:
+@@ -4943,7 +4945,6 @@
+ # The VM definition, as updated
+ #
+ # Since: 4.10.3
+-#
+ ##
+ {'command': {'class': 'VM', 'name': 'updateDevice'},
+ 'data': {'vmId': 'UUID', 'params': 'vmUpdateDeviceParams'},
+--
+1.7.11.7
+
diff --git a/0002-schema-Missing-comment-for-new-VmDeviceType.patch b/0002-schema-Missing-comment-for-new-VmDeviceType.patch
new file mode 100644
index 0000000..d44579b
--- /dev/null
+++ b/0002-schema-Missing-comment-for-new-VmDeviceType.patch
@@ -0,0 +1,36 @@
+From 244713456b87d4ea1873c98cbaae52bffd3ce1ee Mon Sep 17 00:00:00 2001
+From: Adam Litke <agl at us.ibm.com>
+Date: Wed, 12 Dec 2012 14:11:16 -0600
+Subject: [PATCH 2/3] schema: Missing comment for new VmDeviceType
+
+When adding a new 'console' VmDeviceType, the submitter forgot to include
+documentation in the comment block. This caused process-schema.py to fail.
+
+Change-Id: Icd7db71a4cd1a2addd31815a73dcd5c1cda7af4f
+Signed-off-by: Adam Litke <agl at us.ibm.com>
+Reviewed-on: http://gerrit.ovirt.org/10013
+Reviewed-by: Saggi Mizrahi <smizrahi at redhat.com>
+Tested-by: Saggi Mizrahi <smizrahi at redhat.com>
+Reviewed-on: http://gerrit.ovirt.org/10020
+Reviewed-by: Dan Kenigsberg <danken at redhat.com>
+Tested-by: Dan Kenigsberg <danken at redhat.com>
+---
+ vdsm_api/vdsmapi-schema.json | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/vdsm_api/vdsmapi-schema.json b/vdsm_api/vdsmapi-schema.json
+index 487e69a..58dd6e2 100644
+--- a/vdsm_api/vdsmapi-schema.json
++++ b/vdsm_api/vdsmapi-schema.json
+@@ -1681,6 +1681,8 @@
+ #
+ # @channel: A host-guest communication channel
+ #
++# @console: A console device
++#
+ # Since: 4.10.0
+ ##
+ {'enum': 'VmDeviceType',
+--
+1.7.11.7
+
diff --git a/0003-api-Report-CPU-thread-info-in-getVdsCapabilities.patch b/0003-api-Report-CPU-thread-info-in-getVdsCapabilities.patch
new file mode 100644
index 0000000..e502d73
--- /dev/null
+++ b/0003-api-Report-CPU-thread-info-in-getVdsCapabilities.patch
@@ -0,0 +1,53 @@
+From b8c1c973d9767859d144042531f7a5ae76fce389 Mon Sep 17 00:00:00 2001
+From: Greg Padgett <gpadgett at redhat.com>
+Date: Thu, 20 Dec 2012 09:43:29 -0500
+Subject: [PATCH 3/3] api: Report CPU thread info in getVdsCapabilities
+
+Report CPU thread info in getVdsCapabilities
+
+Change-Id: I11f1e139a3f3d5bd18032713694bdebf9ab8c1d7
+Signed-off-by: Greg Padgett <gpadgett at redhat.com>
+Reviewed-on: http://gerrit.ovirt.org/10300
+Reviewed-by: Federico Simoncelli <fsimonce at redhat.com>
+---
+ vdsm/caps.py | 1 +
+ vdsm_api/vdsmapi-schema.json | 4 +++-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/vdsm/caps.py b/vdsm/caps.py
+index 0438fb4..6749227 100644
+--- a/vdsm/caps.py
++++ b/vdsm/caps.py
+@@ -261,6 +261,7 @@ def get():
+ else:
+ caps['cpuCores'] = str(cpuTopology.cores())
+
++ caps['cpuThreads'] = str(cpuTopology.threads())
+ caps['cpuSockets'] = str(cpuTopology.sockets())
+ caps['cpuSpeed'] = cpuInfo.mhz()
+ if config.getboolean('vars', 'fake_kvm_support'):
+diff --git a/vdsm_api/vdsmapi-schema.json b/vdsm_api/vdsmapi-schema.json
+index 58dd6e2..c72ec4b 100644
+--- a/vdsm_api/vdsmapi-schema.json
++++ b/vdsm_api/vdsmapi-schema.json
+@@ -848,6 +848,8 @@
+ #
+ # @kvmEnabled: KVM is enabled on the host
+ #
++# @cpuThreads: The number of CPU threads present
++#
+ # @cpuCores: The number of CPU cores present
+ #
+ # @cpuSockets: The numbet of CPU sockets
+@@ -909,7 +911,7 @@
+ # the current API truncates @software_version to 'x.y'.
+ ##
+ {'type': 'VdsmCapabilities',
+- 'data': {'kvmEnabled': 'bool', 'cpuCores': 'uint',
++ 'data': {'kvmEnabled': 'bool', 'cpuThreads': 'uint', 'cpuCores': 'uint',
+ 'cpuSockets': 'uint', 'cpuSpeed': 'float', 'cpuModel': 'str',
+ 'cpuFlags': 'str', 'version_name': 'str', 'software_version': 'str',
+ 'software_revision': 'str', 'supportedENGINEs': ['str'],
+--
+1.7.11.7
+
diff --git a/vdsm.spec b/vdsm.spec
index dc0a536..8ca58f8 100644
--- a/vdsm.spec
+++ b/vdsm.spec
@@ -32,7 +32,7 @@
Name: %{vdsm_name}
Version: 4.10.3
-Release: 1%{?vdsm_relvtag}%{?dist}%{?extra_release}
+Release: 2%{?vdsm_relvtag}%{?dist}%{?extra_release}
Summary: Virtual Desktop Server Manager
Group: Applications/System
@@ -47,6 +47,11 @@ Url: http://www.ovirt.org/wiki/Vdsm
# make VERSION={version}-{vdsm_release} dist
Source0: %{vdsm_name}-%{version}%{?vdsm_relttag}.tar.gz
+# ovirt-3.2 patches
+Patch0: 0001-schema-Fix-schema-for-VM.updateDevice.patch
+Patch1: 0002-schema-Missing-comment-for-new-VmDeviceType.patch
+Patch2: 0003-api-Report-CPU-thread-info-in-getVdsCapabilities.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python
@@ -421,6 +426,12 @@ Gluster plugin enables VDSM to serve Gluster functionalities.
%prep
%setup -q
+
+# ovirt-3.2 patches
+%patch0 -p1 -b .patch0
+%patch1 -p1 -b .patch1
+%patch2 -p1 -b .patch2
+
%if 0%{?rhel} == 6
sed -i '/ su /d' vdsm/vdsm-logrotate.conf.in
%endif
@@ -1013,6 +1024,11 @@ exit 0
%{_datadir}/%{vdsm_name}/gluster/hostname.py*
%changelog
+* Thu Dec 27 2012 Federico Simoncelli <fsimonce at redhat.com> 4.10.3-2
+- api: Report CPU thread info in getVdsCapabilities
+- schema: Missing comment for new VmDeviceType
+- schema: Fix schema for VM.updateDevice
+
* Wed Dec 12 2012 Federico Simoncelli <fsimonce at redhat.com> 4.10.3-1
- vdsm-4.10.3
More information about the scm-commits
mailing list