Branch: refs/heads/master Home: https://github.com/qemu/qemu Commit: a1771070e7b892a0bdea81b4a1ec7fcca0af21f5 https://github.com/qemu/qemu/commit/a1771070e7b892a0bdea81b4a1ec7fcca0af21f5 Author: Dr. David Alan Gilbert <dgilb...@redhat.com> Date: 2016-10-13 (Thu, 13 Oct 2016)
Changed paths: M migration/vmstate.c Log Message: ----------- migration: report an error giving the failed field When a field fails to load (typically due to a limit check, or a call to a get/put) report the device and field to give an indication of the cause. Signed-off-by: Dr. David Alan Gilbert <dgilb...@redhat.com> Reviewed-by: John Snow <js...@redhat.com> Reviewed-by: Juan Quintela <quint...@redhat.com> Signed-off-by: Juan Quintela <quint...@redhat.com> Commit: 49228e17edc3f9a7cef6061daffdcc3a33d8023d https://github.com/qemu/qemu/commit/49228e17edc3f9a7cef6061daffdcc3a33d8023d Author: Dr. David Alan Gilbert <dgilb...@redhat.com> Date: 2016-10-13 (Thu, 13 Oct 2016) Changed paths: M migration/vmstate.c Log Message: ----------- migration: Report values for comparisons Report the values when a comparison fails; together with the previous patch that prints the device and field names this should give a good idea of why loading the migration failed. Signed-off-by: Dr. David Alan Gilbert <dgilb...@redhat.com> Reviewed-by: John Snow <js...@redhat.com> Reviewed-by: Juan Quintela <quint...@redhat.com> Signed-off-by: Juan Quintela <quint...@redhat.com> Commit: 12c67ffb1fe34ff72a55fa440243c0dfcf22f89b https://github.com/qemu/qemu/commit/12c67ffb1fe34ff72a55fa440243c0dfcf22f89b Author: Dr. David Alan Gilbert <dgilb...@redhat.com> Date: 2016-10-13 (Thu, 13 Oct 2016) Changed paths: M migration/rdma.c Log Message: ----------- migration/rdma: Pass qemu_file errors across link If we fail for some reason (e.g. a mismatched RAMBlock) and it's set the qemu_file error flag, pass that error back to the peer so it can clean up rather than waiting for some higher level progress. Signed-off-by: Dr. David Alan Gilbert <dgilb...@redhat.com> Reviewed-by: Michael R. Hines <mich...@hinespot.com> Reviewed-by: Juan Quintela <quint...@redhat.com> Signed-off-by: Juan Quintela <quint...@redhat.com> Commit: ccb783c3124b66fed6b11aa7a1cd1939a2268287 https://github.com/qemu/qemu/commit/ccb783c3124b66fed6b11aa7a1cd1939a2268287 Author: Dr. David Alan Gilbert <dgilb...@redhat.com> Date: 2016-10-13 (Thu, 13 Oct 2016) Changed paths: M migration/savevm.c Log Message: ----------- migration: Make failed migration load set file error If an error occurs in a section load, set the file error flag so that the transport can get notified to do a cleanup. Signed-off-by: Dr. David Alan Gilbert <dgilb...@redhat.com> Reviewed-by: Michael R. Hines <mich...@hinespot.com> Reviewed-by: Juan Quintela <quint...@redhat.com> Signed-off-by: Juan Quintela <quint...@redhat.com> Commit: cd5ea070645682893312d67dba6d4dd0b1a80739 https://github.com/qemu/qemu/commit/cd5ea070645682893312d67dba6d4dd0b1a80739 Author: Dr. David Alan Gilbert <dgilb...@redhat.com> Date: 2016-10-13 (Thu, 13 Oct 2016) Changed paths: M migration/rdma.c Log Message: ----------- migration/rdma: Don't flag an error when we've been told about one If the other side tells us there's been an error and we fail the migration, we don't need to signal that failure to the other side because it already knew. Signed-off-by: Dr. David Alan Gilbert <dgilb...@redhat.com> Reviewed-by: Michael R. Hines <mich...@hinespot.com> Reviewed-by: Juan Quintela <quint...@redhat.com> Signed-off-by: Juan Quintela <quint...@redhat.com> Commit: bb2b777cf9a2862fe31a40256659ff49ae3d2006 https://github.com/qemu/qemu/commit/bb2b777cf9a2862fe31a40256659ff49ae3d2006 Author: Eric Blake <ebl...@redhat.com> Date: 2016-10-13 (Thu, 13 Oct 2016) Changed paths: M hmp.c Log Message: ----------- migrate: Fix cpu-throttle-increment regression in HMP Commit 69ef1f3 accidentally broke migrate_set_parameter's ability to set the cpu-throttle-increment to anything other than the default, because it forgot to parse the user's string into an integer. CC: qemu-sta...@nongnu.org Signed-off-by: Eric Blake <ebl...@redhat.com> Reviewed-by: Marc-André Lureau <marcandre.lur...@redhat.com> Reviewed-by: Juan Quintela <quint...@redhat.com> Signed-off-by: Juan Quintela <quint...@redhat.com> Commit: de63ab61241b44598cdfd30060ef23d46d368f9d https://github.com/qemu/qemu/commit/de63ab61241b44598cdfd30060ef23d46d368f9d Author: Eric Blake <ebl...@redhat.com> Date: 2016-10-13 (Thu, 13 Oct 2016) Changed paths: M hmp.c M migration/migration.c M qapi-schema.json Log Message: ----------- migrate: Share common MigrationParameters struct It is rather verbose, and slightly error-prone, to repeat the same set of parameters for input (migrate-set-parameters) as for output (query-migrate-parameters), where the only difference is whether the members are optional. We can just document that the optional members will always be present on output, and then share a common struct between both commands. The next patch can then reduce the amount of code needed on input. Also, we made a mistake in qemu 2.7 of returning an empty string during 'query-migrate-parameters' when there is no TLS, rather than omitting TLS details entirely. Technically, this change risks breaking any 2.7 client that is hard-coded to expect the parameter's existence; on the other hand, clients that are portable to 2.6 already must be prepared for those members to not be present. And this gets rid of yet one more place where the QMP output visitor is silently converting a NULL string into "" (which is a hack I ultimately want to kill off). Signed-off-by: Eric Blake <ebl...@redhat.com> Reviewed-by: Marc-André Lureau <marcandre.lur...@redhat.com> Reviewed-by: Juan Quintela <quint...@redhat.com> Signed-off-by: Juan Quintela <quint...@redhat.com> Commit: 7f375e0446bb3ce1cbb93b3e145452ec42bb2041 https://github.com/qemu/qemu/commit/7f375e0446bb3ce1cbb93b3e145452ec42bb2041 Author: Eric Blake <ebl...@redhat.com> Date: 2016-10-13 (Thu, 13 Oct 2016) Changed paths: M hmp.c M migration/migration.c M qapi-schema.json Log Message: ----------- migrate: Use boxed qapi for migrate-set-parameters Now that QAPI makes it easy to pass a struct around, we don't have to declare as many parameters or local variables. Signed-off-by: Eric Blake <ebl...@redhat.com> Reviewed-by: Marc-André Lureau <marcandre.lur...@redhat.com> Reviewed-by: Juan Quintela <quint...@redhat.com> Signed-off-by: Juan Quintela <quint...@redhat.com> Commit: 091ecc8b69bd735383e171828d4e8ed5e34c2a3b https://github.com/qemu/qemu/commit/091ecc8b69bd735383e171828d4e8ed5e34c2a3b Author: Ashijeet Acharya <ashijeetacha...@gmail.com> Date: 2016-10-13 (Thu, 13 Oct 2016) Changed paths: M migration/migration.c Log Message: ----------- migrate: Fix bounds check for migration parameters in migration.c This patch fixes the out-of-bounds check of migration parameters in qmp_migrate_set_parameters() for cpu-throttle-initial and cpu-throttle-increment by adding a return statement for both as they were broken since their introduction in 2.5 via commit 1626fee. Due to the missing return statements, parameters were getting set to out-of-bounds values despite the error. Signed-off-by: Ashijeet Acharya <ashijeetacha...@gmail.com> Reviewed-by: Eric Blake <ebl...@redhat.com> Reviewed-by: Amit Shah <amit.s...@redhat.com> Reviewed-by: Juan Quintela <quint...@redhat.com> Signed-off-by: Juan Quintela <quint...@redhat.com> Commit: 2ebeaec012b4e5695612774c44f14c61ab46c72c https://github.com/qemu/qemu/commit/2ebeaec012b4e5695612774c44f14c61ab46c72c Author: Dr. David Alan Gilbert <dgilb...@redhat.com> Date: 2016-10-13 (Thu, 13 Oct 2016) Changed paths: M migration/ram.c Log Message: ----------- Postcopy vs xbzrle: Don't send xbzrle pages once in postcopy [for 2.8] xbzrle relies on reading pages that have already been sent to the destination and then applying the modifications; we can't do that in postcopy because the destination may well have modified the page already or the page has been discarded. I already didn't allow reception of xbzrle pages, but I forgot to add the test to stop them being sent. Enabling both xbzrle and postcopy can make some sense; if you think that your migration might finish if you have xbzrle, then when it doesn't complete you flick over to postcopy and stop xbzrle'ing. This corresponds to RH bug: https://bugzilla.redhat.com/show_bug.cgi?id=1368422 Symptom is: Unknown combination of migration flags: 0x60 (postcopy mode) (either 0x60 or 0x40) Signed-off-by: Dr. David Alan Gilbert <dgilb...@redhat.com> Reviewed-by: Juan Quintela <quint...@redhat.com> Signed-off-by: Juan Quintela <quint...@redhat.com> Commit: 863e9621c51a7544f1a2ae78387749145adaf450 https://github.com/qemu/qemu/commit/863e9621c51a7544f1a2ae78387749145adaf450 Author: Dr. David Alan Gilbert <dgilb...@redhat.com> Date: 2016-10-13 (Thu, 13 Oct 2016) Changed paths: M exec.c M include/exec/cpu-common.h M include/exec/ram_addr.h Log Message: ----------- RAMBlocks: Store page size Store the page size in each RAMBlock, we need it later. Signed-off-by: Dr. David Alan Gilbert <dgilb...@redhat.com> Reviewed-by: Juan Quintela <quint...@redhat.com> Signed-off-by: Juan Quintela <quint...@redhat.com> Commit: 5cf0f48d2aa860877c992030854540ba82dfe8fa https://github.com/qemu/qemu/commit/5cf0f48d2aa860877c992030854540ba82dfe8fa Author: Dr. David Alan Gilbert <dgilb...@redhat.com> Date: 2016-10-13 (Thu, 13 Oct 2016) Changed paths: M migration/postcopy-ram.c Log Message: ----------- migration/postcopy: Explicitly disallow huge pages At the moment postcopy will fail as soon as qemu tries to register userfault on the RAMBlock pages that are backed by hugepages. However, the kernel is going to get userfault support for hugepage at some point, and we've not got the rest of the QEMU code to support it yet, so fail neatly with an error like: Postcopy doesn't support hugetlbfs yet (/objects/mem1) Signed-off-by: Dr. David Alan Gilbert <dgilb...@redhat.com> Reviewed-by: Juan Quintela <quint...@redhat.com> Signed-off-by: Juan Quintela <quint...@redhat.com> Commit: 9308ae54858a86f2955e0b45f74d6e1f9c38820b https://github.com/qemu/qemu/commit/9308ae54858a86f2955e0b45f74d6e1f9c38820b Author: Dr. David Alan Gilbert <dgilb...@redhat.com> Date: 2016-10-13 (Thu, 13 Oct 2016) Changed paths: M migration/socket.c Log Message: ----------- migration: Fix seg with missing port The command : migrate tcp:localhost: currently segs; fix it so it now says: error parsing address 'localhost:' and the same for -incoming. Signed-off-by: Dr. David Alan Gilbert <dgilb...@redhat.com> Reviewed-by: Daniel P. Berrange <berra...@redhat.com> Reviewed-by: Juan Quintela <quint...@redhat.com> Signed-off-by: Juan Quintela <quint...@redhat.com> Commit: 2ff30257974e19ebe2a97baad32ac29c06da5fb9 https://github.com/qemu/qemu/commit/2ff30257974e19ebe2a97baad32ac29c06da5fb9 Author: Ashijeet Acharya <ashijeetacha...@gmail.com> Date: 2016-10-13 (Thu, 13 Oct 2016) Changed paths: M docs/qmp-commands.txt M hmp.c M include/migration/migration.h M migration/migration.c M qapi-schema.json Log Message: ----------- migrate: move max-bandwidth and downtime-limit to migrate_set_parameter Mark the old commands 'migrate_set_speed' and 'migrate_set_downtime' as deprecated. Move max-bandwidth and downtime-limit into migrate-set-parameters for setting maximum migration speed and expected downtime limit parameters respectively. Change downtime units to milliseconds (only for new-command) and set its upper bound limit to 2000 seconds. Update the query part in both hmp and qmp qemu control interfaces. Signed-off-by: Ashijeet Acharya <ashijeetacha...@gmail.com> Reviewed-by: Eric Blake <ebl...@redhat.com> Reviewed-by: Juan Quintela <quint...@redhat.com> Signed-off-by: Juan Quintela <quint...@redhat.com> Commit: 7c2b0f65cc2b6b14ad797549b8bde13aa97f6ba2 https://github.com/qemu/qemu/commit/7c2b0f65cc2b6b14ad797549b8bde13aa97f6ba2 Author: Cao jin <caoj.f...@cn.fujitsu.com> Date: 2016-10-13 (Thu, 13 Oct 2016) Changed paths: M docs/xbzrle.txt Log Message: ----------- docs/xbzrle: correction 1. Default cache size is 64MB. 2. Semantics correction. Signed-off-by: Cao jin <caoj.f...@cn.fujitsu.com> Reviewed-by: Juan Quintela <quint...@redhat.com> Signed-off-by: Juan Quintela <quint...@redhat.com> Commit: 4378caf59edf6df796b9ad3174e5703fd25a781c https://github.com/qemu/qemu/commit/4378caf59edf6df796b9ad3174e5703fd25a781c Author: Peter Maydell <peter.mayd...@linaro.org> Date: 2016-10-17 (Mon, 17 Oct 2016) Changed paths: M docs/qmp-commands.txt M docs/xbzrle.txt M exec.c M hmp.c M include/exec/cpu-common.h M include/exec/ram_addr.h M include/migration/migration.h M migration/migration.c M migration/postcopy-ram.c M migration/ram.c M migration/rdma.c M migration/savevm.c M migration/socket.c M migration/vmstate.c M qapi-schema.json Log Message: ----------- Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20161014' into staging migration/next for 20161014 # gpg: Signature made Fri 14 Oct 2016 16:24:13 BST # gpg: using RSA key 0xF487EF185872D723 # gpg: Good signature from "Juan Quintela <quint...@redhat.com>" # gpg: aka "Juan Quintela <quint...@trasno.org>" # Primary key fingerprint: 1899 FF8E DEBF 58CC EE03 4B82 F487 EF18 5872 D723 * remotes/juanquintela/tags/migration/20161014: docs/xbzrle: correction migrate: move max-bandwidth and downtime-limit to migrate_set_parameter migration: Fix seg with missing port migration/postcopy: Explicitly disallow huge pages RAMBlocks: Store page size Postcopy vs xbzrle: Don't send xbzrle pages once in postcopy [for 2.8] migrate: Fix bounds check for migration parameters in migration.c migrate: Use boxed qapi for migrate-set-parameters migrate: Share common MigrationParameters struct migrate: Fix cpu-throttle-increment regression in HMP migration/rdma: Don't flag an error when we've been told about one migration: Make failed migration load set file error migration/rdma: Pass qemu_file errors across link migration: Report values for comparisons migration: report an error giving the failed field Signed-off-by: Peter Maydell <peter.mayd...@linaro.org> Compare: https://github.com/qemu/qemu/compare/6aa5a3679449...4378caf59edf