)]}'
{"/COMMIT_MSG":[{"author":{"_account_id":15334,"name":"Stephen Finucane","display_name":"stephenfin","email":"stephenfin@redhat.com","username":"sfinucan"},"change_message_id":"81379e68cff690ec69ddb220608326638fb28e2e","unresolved":false,"context_lines":[{"line_number":18,"context_line":""},{"line_number":19,"context_line":"[1] https://specs.openstack.org/openstack/nova-specs/specs/train/implemented/amd-sev-libvirt-support.html#proposed-change"},{"line_number":20,"context_line":""},{"line_number":21,"context_line":"NOTE(lyarwood): Conflicts caused by I5c84f3c9b4137c84c36bb4e755ffad9c0e9f8a2b"},{"line_number":22,"context_line":"and Ic509d3f342a49dbd53dceac9ddcfc838ec165d6d not being present in"},{"line_number":23,"context_line":"stable/ussuri."},{"line_number":24,"context_line":""}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"e13bce3b_6836a42d","line":21,"updated":"2021-06-16 10:05:46.000000000","message":"(\"Remove compatibility check from migrate_data\")","commit_id":"4c38a3c2d5194dbddc94339f3992dc5b70a52556"},{"author":{"_account_id":15334,"name":"Stephen Finucane","display_name":"stephenfin","email":"stephenfin@redhat.com","username":"sfinucan"},"change_message_id":"81379e68cff690ec69ddb220608326638fb28e2e","unresolved":false,"context_lines":[{"line_number":19,"context_line":"[1] https://specs.openstack.org/openstack/nova-specs/specs/train/implemented/amd-sev-libvirt-support.html#proposed-change"},{"line_number":20,"context_line":""},{"line_number":21,"context_line":"NOTE(lyarwood): Conflicts caused by I5c84f3c9b4137c84c36bb4e755ffad9c0e9f8a2b"},{"line_number":22,"context_line":"and Ic509d3f342a49dbd53dceac9ddcfc838ec165d6d not being present in"},{"line_number":23,"context_line":"stable/ussuri."},{"line_number":24,"context_line":""},{"line_number":25,"context_line":"Conflicts:"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"3944ce5b_c7c96c01","line":22,"range":{"start_line":22,"start_character":4,"end_line":22,"end_character":45},"updated":"2021-06-16 10:05:46.000000000","message":"(\"libvirt: Remove unused host parameters\")","commit_id":"4c38a3c2d5194dbddc94339f3992dc5b70a52556"},{"author":{"_account_id":15334,"name":"Stephen Finucane","display_name":"stephenfin","email":"stephenfin@redhat.com","username":"sfinucan"},"change_message_id":"81379e68cff690ec69ddb220608326638fb28e2e","unresolved":false,"context_lines":[{"line_number":20,"context_line":""},{"line_number":21,"context_line":"NOTE(lyarwood): Conflicts caused by I5c84f3c9b4137c84c36bb4e755ffad9c0e9f8a2b"},{"line_number":22,"context_line":"and Ic509d3f342a49dbd53dceac9ddcfc838ec165d6d not being present in"},{"line_number":23,"context_line":"stable/ussuri."},{"line_number":24,"context_line":""},{"line_number":25,"context_line":"Conflicts:"},{"line_number":26,"context_line":"  nova/tests/unit/virt/libvirt/test_driver.py"}],"source_content_type":"text/x-gerrit-commit-message","patch_set":1,"id":"e045d217_932a6fe9","line":23,"updated":"2021-06-16 10:05:46.000000000","message":"I was going to say we could arguably bring back the latter patch to reduce the merge conflict area, but we actually can\u0027t since that depends on some other larger cleanup patches.","commit_id":"4c38a3c2d5194dbddc94339f3992dc5b70a52556"}],"nova/tests/unit/virt/libvirt/test_driver.py":[{"author":{"_account_id":15334,"name":"Stephen Finucane","display_name":"stephenfin","email":"stephenfin@redhat.com","username":"sfinucan"},"change_message_id":"81379e68cff690ec69ddb220608326638fb28e2e","unresolved":false,"context_lines":[{"line_number":11670,"context_line":"                guest,"},{"line_number":11671,"context_line":"                objects.LibvirtLiveMigrateData(bdms\u003d[bdmi]),"},{"line_number":11672,"context_line":"                drvr._get_volume_config"},{"line_number":11673,"context_line":"            )"},{"line_number":11674,"context_line":"            parser \u003d etree.XMLParser(remove_blank_text\u003dTrue)"},{"line_number":11675,"context_line":"            config \u003d etree.fromstring(config, parser)"},{"line_number":11676,"context_line":"            target_xml \u003d etree.fromstring(target_xml, parser)"}],"source_content_type":"text/x-python","patch_set":1,"id":"f75e1190_bb45bc59","line":11673,"updated":"2021-06-16 10:05:46.000000000","message":"Here\u0027s our first merge conflict. That\u0027s caused by [1]. The rest of the merge conflicts are pretty much the same (addition of \u0027serial_listen_addr\u0027 and \u0027serial_listen_ports\u0027 kwargs to \u0027objects.LibvirtLiveMigrateData\u0027 object constructors\n\n[1] https://review.opendev.org/c/openstack/nova/+/729949/3/nova/tests/unit/virt/libvirt/test_driver.py#11523","commit_id":"4c38a3c2d5194dbddc94339f3992dc5b70a52556"}],"nova/virt/libvirt/driver.py":[{"author":{"_account_id":15334,"name":"Stephen Finucane","display_name":"stephenfin","email":"stephenfin@redhat.com","username":"sfinucan"},"change_message_id":"81379e68cff690ec69ddb220608326638fb28e2e","unresolved":false,"context_lines":[{"line_number":2201,"context_line":"        cfg \u003d self.vif_driver.get_config(instance, vif, image_meta,"},{"line_number":2202,"context_line":"                                         instance.flavor,"},{"line_number":2203,"context_line":"                                         CONF.libvirt.virt_type,"},{"line_number":2204,"context_line":"                                         self._host)"},{"line_number":2205,"context_line":""},{"line_number":2206,"context_line":"        if self._sev_enabled(instance.flavor, image_meta):"},{"line_number":2207,"context_line":"            designer.set_driver_iommu_for_device(cfg)"}],"source_content_type":"text/x-python","patch_set":1,"id":"1de7d4f8_fd8545af","line":2204,"updated":"2021-06-16 10:05:46.000000000","message":"This is the cause of the merge conflict here. [1] removed the \u0027self._host\u0027 argument\n\n[1] https://review.opendev.org/c/openstack/nova/+/732725","commit_id":"4c38a3c2d5194dbddc94339f3992dc5b70a52556"}],"nova/virt/libvirt/migration.py":[{"author":{"_account_id":15334,"name":"Stephen Finucane","display_name":"stephenfin","email":"stephenfin@redhat.com","username":"sfinucan"},"change_message_id":"81379e68cff690ec69ddb220608326638fb28e2e","unresolved":false,"context_lines":[{"line_number":77,"context_line":"    ports \u003d []"},{"line_number":78,"context_line":"    if migrate_data.obj_attr_is_set(\u0027serial_listen_ports\u0027):"},{"line_number":79,"context_line":"        ports \u003d migrate_data.serial_listen_ports"},{"line_number":80,"context_line":"    return ports"},{"line_number":81,"context_line":""},{"line_number":82,"context_line":""},{"line_number":83,"context_line":"def get_updated_guest_xml(instance, guest, migrate_data, get_volume_config,"}],"source_content_type":"text/x-python","patch_set":1,"id":"75262bb6_1b0adab9","line":80,"updated":"2021-06-16 10:05:46.000000000","message":"These are gone in stable/victoria due to [1] but persist here, hence a small conflict\n\n[1] https://review.opendev.org/c/openstack/nova/+/729949","commit_id":"4c38a3c2d5194dbddc94339f3992dc5b70a52556"}]}