Change in vdsm[master]: virt: graphics: avoid None in specParams

danken at redhat.com danken at redhat.com
Tue Sep 29 08:08:57 UTC 2015


Dan Kenigsberg has submitted this change and it was merged.

Change subject: virt: graphics: avoid None in specParams
......................................................................


virt: graphics: avoid None in specParams

In commit bbe8a03 we added a check to make sure
we use displayNetwork from global Vm configuration,
in the case the more specific setting was not sent
in the graphics device specParams.

One unfortunate side effect of this change is that
now None may end up in the graphics device specParams,
breaking XML-RPC communications.

We default (end recommend) JSON-RPC, but we still
support XML-RPC, and we use it as default in vdsClient,
so this must be avoided.

This patch reorganize the check to avoid the unwanted
injection of the None value.

Change-Id: I2a651c18c02c207f5497f22f0aad3d2967efd9a4
Backport-To: 3.6
Related-To: https://bugzilla.redhat.com/1261007
Signed-off-by: Francesco Romani <fromani at redhat.com>
Reviewed-on: https://gerrit.ovirt.org/46629
Continuous-Integration: Jenkins CI
Reviewed-by: Martin Polednik <mpolednik at redhat.com>
Reviewed-by: Dan Kenigsberg <danken at redhat.com>
---
M tests/deviceTests.py
M vdsm/virt/vmdevices/graphics.py
2 files changed, 42 insertions(+), 2 deletions(-)

Approvals:
  Jenkins CI: Passed CI tests
  Dan Kenigsberg: Looks good to me, approved
  Francesco Romani: Verified
  Martin Polednik: Looks good to me, but someone else must approve



-- 
To view, visit https://gerrit.ovirt.org/46629
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I2a651c18c02c207f5497f22f0aad3d2967efd9a4
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani <fromani at redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken at redhat.com>
Gerrit-Reviewer: Francesco Romani <fromani at redhat.com>
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Martin Polednik <mpolednik at redhat.com>
Gerrit-Reviewer: automation at ovirt.org


More information about the vdsm-patches mailing list