Arik Hadas has submitted this change and it was merged. Change subject: core: prevent duplicate virtio-serial device ...................................................................... core: prevent duplicate virtio-serial device In 3.6 the virtio-serial device becomes managed device. However, it can still be reported as unmanaged if the VM was started in pre 3.6 version and was running during the upgrade and its ID will be different than the one stored in the database. This patch suggests to look for virtio-serial devices not only by their ID but by their type as well. That way, when we get unamanged virtio-serial reported by VDSM, we will be able to correlate it to the managed device and it will prevent adding it again. This solution assumes that only one virtio-serial device is defined for each VM. Change-Id: I3546332024b6ee7667340f031c6c225e1ee67ead Bug-Url: https://bugzilla.redhat.com/1308885 Signed-off-by: Arik Hadas <ahadas@redhat.com> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/VmDeviceCommonUtils.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/monitoring/VmDevicesMonitoring.java 2 files changed, 24 insertions(+), 2 deletions(-) Approvals: Shahar Havivi: Looks good to me, approved Jenkins CI: Passed CI tests Shmuel Leib Melamud: Looks good to me, but someone else must approve Arik Hadas: Verified -- To view, visit https://gerrit.ovirt.org/54145 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3546332024b6ee7667340f031c6c225e1ee67ead Gerrit-PatchSet: 4 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Arik Hadas <ahadas@redhat.com> Gerrit-Reviewer: Arik Hadas <ahadas@redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Shahar Havivi <shavivi@redhat.com> Gerrit-Reviewer: Shmuel Leib Melamud <smelamud@redhat.com> Gerrit-Reviewer: gerrit-hooks <automation@ovirt.org>