Branch: refs/heads/master Home: https://github.com/qemu/qemu Commit: e325b49a320b493cc5d69e263751ff716dc458fe https://github.com/qemu/qemu/commit/e325b49a320b493cc5d69e263751ff716dc458fe Author: Michael R. Hines <mrhi...@us.ibm.com> Date: 2014-06-23 (Mon, 23 Jun 2014)
Changed paths: M migration-rdma.c Log Message: ----------- rdma: bug fixes 1. Fix small memory leak in parsing inet address from command line in data_init() 2. Fix ibv_post_send() return value check and pass error code back up correctly. 3. Fix rdma_destroy_qp() segfault after failure to connect to destination. Reported-by: frank.yang...@gmail.com Reported-by: dgilb...@redhat.com Signed-off-by: Michael R. Hines <mrhi...@us.ibm.com> Signed-off-by: Juan Quintela <quint...@redhat.com> Commit: abfd9ce341ec66eb2e63756b9da43f77c054788e https://github.com/qemu/qemu/commit/abfd9ce341ec66eb2e63756b9da43f77c054788e Author: Amit Shah <amit.s...@redhat.com> Date: 2014-06-23 (Mon, 23 Jun 2014) Changed paths: M include/migration/vmstate.h M qemu-options.hx M savevm.c M vl.c Log Message: ----------- migration: dump vmstate info as a json file for static analysis This commit adds a new command, '-dump-vmstate', that takes a filename as an argument. When executed, QEMU will dump the vmstate information for the machine type it's invoked with to the file, and quit. The JSON-format output can then be used to compare the vmstate info for different QEMU versions, specifically to test whether live migration would break due to changes in the vmstate data. A Python script that compares the output of such JSON dumps is included in the following commit. Signed-off-by: Amit Shah <amit.s...@redhat.com> Reviewed-by: Juan Quintela <quint...@redhat.com> Signed-off-by: Juan Quintela <quint...@redhat.com> Commit: 426d1d016a494c978a513afcd03aa000fcbd5b3c https://github.com/qemu/qemu/commit/426d1d016a494c978a513afcd03aa000fcbd5b3c Author: Amit Shah <amit.s...@redhat.com> Date: 2014-06-23 (Mon, 23 Jun 2014) Changed paths: A scripts/vmstate-static-checker.py Log Message: ----------- vmstate-static-checker: script to validate vmstate changes This script compares the vmstate dumps in JSON format as output by QEMU with the -dump-vmstate option. It flags various errors, like version mismatch, sections going away, size mismatches, etc. This script is tolerant of a few changes that do not change the on-wire format, like embedding a few fields within substructs. The script takes -s/--src and -d/--dest parameters, to which filenames are given as arguments. Example: (in a qemu 2.0 tree): ./x86_64-softmmu/qemu-system-x86_64 -dump-vmstate qemu-2.0.json (in a qemu 2.2 tree:) ./x86_64-softmmu/qemu-system-x86_64 -dump-vmstate -M pc-i440fx-2.0 \ qemu-2.2-m2.0.json ./scripts/vmstate-static-checker.py -s qemu-2.0.json -d qemu-2.2-m2.0.json The script also takes a --reverse parameter to switch the src and dest jsons. This is just a shorthand for reversing the src and dest. The --help parameter shows usage information. Signed-off-by: Amit Shah <amit.s...@redhat.com> Signed-off-by: Juan Quintela <quint...@redhat.com> Commit: a10413e4fc96f83ff60b3c57d7b805752a7fc492 https://github.com/qemu/qemu/commit/a10413e4fc96f83ff60b3c57d7b805752a7fc492 Author: Amit Shah <amit.s...@redhat.com> Date: 2014-06-23 (Mon, 23 Jun 2014) Changed paths: A tests/vmstate-static-checker-data/dump1.json A tests/vmstate-static-checker-data/dump2.json Log Message: ----------- tests: vmstate static checker: add dump1 and dump2 files These are stripped-down JSON data as obtained from the -dump-vmstate option. The two files are identical in this commit, and will be modified in the later commits to show what the script does with the data. Signed-off-by: Amit Shah <amit.s...@redhat.com> Acked-by: Juan Quintela <quint...@redhat.com> Signed-off-by: Juan Quintela <quint...@redhat.com> Commit: bc178dc5630a243f95c9d3c2ee2329af09606f41 https://github.com/qemu/qemu/commit/bc178dc5630a243f95c9d3c2ee2329af09606f41 Author: Amit Shah <amit.s...@redhat.com> Date: 2014-06-23 (Mon, 23 Jun 2014) Changed paths: M tests/vmstate-static-checker-data/dump2.json Log Message: ----------- tests: vmstate static checker: incompat machine types This commit modifies the dump2 data to flag incompatibilities in the machine types being compared. Signed-off-by: Amit Shah <amit.s...@redhat.com> Acked-by: Juan Quintela <quint...@redhat.com> Signed-off-by: Juan Quintela <quint...@redhat.com> Commit: a81d3fad87302e482c4a8009c3c7d3eca96527e0 https://github.com/qemu/qemu/commit/a81d3fad87302e482c4a8009c3c7d3eca96527e0 Author: Amit Shah <amit.s...@redhat.com> Date: 2014-06-23 (Mon, 23 Jun 2014) Changed paths: M tests/vmstate-static-checker-data/dump2.json Log Message: ----------- tests: vmstate static checker: add version error in main section Signed-off-by: Amit Shah <amit.s...@redhat.com> Acked-by: Juan Quintela <quint...@redhat.com> Signed-off-by: Juan Quintela <quint...@redhat.com> Commit: 4efa6e1d6473dbd775a5dd7eb976fa11501a94d2 https://github.com/qemu/qemu/commit/4efa6e1d6473dbd775a5dd7eb976fa11501a94d2 Author: Amit Shah <amit.s...@redhat.com> Date: 2014-06-23 (Mon, 23 Jun 2014) Changed paths: M tests/vmstate-static-checker-data/dump2.json Log Message: ----------- tests: vmstate static checker: version mismatch inside a Description Signed-off-by: Amit Shah <amit.s...@redhat.com> Acked-by: Juan Quintela <quint...@redhat.com> Signed-off-by: Juan Quintela <quint...@redhat.com> Commit: 7daa3d76dff720465188867272682a4f8fcf6e82 https://github.com/qemu/qemu/commit/7daa3d76dff720465188867272682a4f8fcf6e82 Author: Amit Shah <amit.s...@redhat.com> Date: 2014-06-23 (Mon, 23 Jun 2014) Changed paths: M tests/vmstate-static-checker-data/dump1.json Log Message: ----------- tests: vmstate static checker: minimum_version_id check Signed-off-by: Amit Shah <amit.s...@redhat.com> Reviewed-by: Juan Quintela <quint...@redhat.com> Signed-off-by: Juan Quintela <quint...@redhat.com> Commit: ab99bdbe33cd108f490d89ba92361c4197c5c56b https://github.com/qemu/qemu/commit/ab99bdbe33cd108f490d89ba92361c4197c5c56b Author: Amit Shah <amit.s...@redhat.com> Date: 2014-06-23 (Mon, 23 Jun 2014) Changed paths: M tests/vmstate-static-checker-data/dump2.json Log Message: ----------- tests: vmstate static checker: remove a section Signed-off-by: Amit Shah <amit.s...@redhat.com> Reviewed-by: Juan Quintela <quint...@redhat.com> Signed-off-by: Juan Quintela <quint...@redhat.com> Commit: 55e8e0e19c169ee83fd23436f348a948adf5d095 https://github.com/qemu/qemu/commit/55e8e0e19c169ee83fd23436f348a948adf5d095 Author: Amit Shah <amit.s...@redhat.com> Date: 2014-06-23 (Mon, 23 Jun 2014) Changed paths: M tests/vmstate-static-checker-data/dump2.json Log Message: ----------- tests: vmstate static checker: remove a field Signed-off-by: Amit Shah <amit.s...@redhat.com> Reviewed-by: Juan Quintela <quint...@redhat.com> Signed-off-by: Juan Quintela <quint...@redhat.com> Commit: fd52ffb9bfa3cb9adc4d7578209ec95eba47b45f https://github.com/qemu/qemu/commit/fd52ffb9bfa3cb9adc4d7578209ec95eba47b45f Author: Amit Shah <amit.s...@redhat.com> Date: 2014-06-23 (Mon, 23 Jun 2014) Changed paths: M tests/vmstate-static-checker-data/dump2.json Log Message: ----------- tests: vmstate static checker: remove last field in a struct Signed-off-by: Amit Shah <amit.s...@redhat.com> Reviewed-by: Juan Quintela <quint...@redhat.com> Signed-off-by: Juan Quintela <quint...@redhat.com> Commit: 1d681c712af592287750fc9ac9f7f75005e7b039 https://github.com/qemu/qemu/commit/1d681c712af592287750fc9ac9f7f75005e7b039 Author: Amit Shah <amit.s...@redhat.com> Date: 2014-06-23 (Mon, 23 Jun 2014) Changed paths: M tests/vmstate-static-checker-data/dump2.json Log Message: ----------- tests: vmstate static checker: change description name Signed-off-by: Amit Shah <amit.s...@redhat.com> Reviewed-by: Juan Quintela <quint...@redhat.com> Signed-off-by: Juan Quintela <quint...@redhat.com> Commit: 083bac3484e335130235ca0369e840a9ee766c4f https://github.com/qemu/qemu/commit/083bac3484e335130235ca0369e840a9ee766c4f Author: Amit Shah <amit.s...@redhat.com> Date: 2014-06-23 (Mon, 23 Jun 2014) Changed paths: M tests/vmstate-static-checker-data/dump2.json Log Message: ----------- tests: vmstate static checker: remove Fields Signed-off-by: Amit Shah <amit.s...@redhat.com> Reviewed-by: Juan Quintela <quint...@redhat.com> Signed-off-by: Juan Quintela <quint...@redhat.com> Commit: ff29b8573f250148a567bfdc0ee7d077aa17b7f6 https://github.com/qemu/qemu/commit/ff29b8573f250148a567bfdc0ee7d077aa17b7f6 Author: Amit Shah <amit.s...@redhat.com> Date: 2014-06-23 (Mon, 23 Jun 2014) Changed paths: M tests/vmstate-static-checker-data/dump2.json Log Message: ----------- tests: vmstate static checker: remove Description Signed-off-by: Amit Shah <amit.s...@redhat.com> Reviewed-by: Juan Quintela <quint...@redhat.com> Signed-off-by: Juan Quintela <quint...@redhat.com> Commit: b5968f0ab399002cae2fddbc24c6a89cee90ebd3 https://github.com/qemu/qemu/commit/b5968f0ab399002cae2fddbc24c6a89cee90ebd3 Author: Amit Shah <amit.s...@redhat.com> Date: 2014-06-23 (Mon, 23 Jun 2014) Changed paths: M tests/vmstate-static-checker-data/dump2.json Log Message: ----------- tests: vmstate static checker: remove Description inside Fields Signed-off-by: Amit Shah <amit.s...@redhat.com> Reviewed-by: Juan Quintela <quint...@redhat.com> Signed-off-by: Juan Quintela <quint...@redhat.com> Commit: aa2a12bb824170a0dae94f0d39bbd3b61add038f https://github.com/qemu/qemu/commit/aa2a12bb824170a0dae94f0d39bbd3b61add038f Author: Amit Shah <amit.s...@redhat.com> Date: 2014-06-23 (Mon, 23 Jun 2014) Changed paths: M tests/vmstate-static-checker-data/dump2.json Log Message: ----------- tests: vmstate static checker: remove a subsection Signed-off-by: Amit Shah <amit.s...@redhat.com> Reviewed-by: Juan Quintela <quint...@redhat.com> Signed-off-by: Juan Quintela <quint...@redhat.com> Commit: c7173a9c182c9092de6be57490132a218c850675 https://github.com/qemu/qemu/commit/c7173a9c182c9092de6be57490132a218c850675 Author: Amit Shah <amit.s...@redhat.com> Date: 2014-06-23 (Mon, 23 Jun 2014) Changed paths: M tests/vmstate-static-checker-data/dump2.json Log Message: ----------- tests: vmstate static checker: remove Subsections Signed-off-by: Amit Shah <amit.s...@redhat.com> Reviewed-by: Juan Quintela <quint...@redhat.com> Signed-off-by: Juan Quintela <quint...@redhat.com> Commit: af3713f6b9eaef52ae0eef2f95c5df1987e8f0a4 https://github.com/qemu/qemu/commit/af3713f6b9eaef52ae0eef2f95c5df1987e8f0a4 Author: Amit Shah <amit.s...@redhat.com> Date: 2014-06-23 (Mon, 23 Jun 2014) Changed paths: M tests/vmstate-static-checker-data/dump2.json Log Message: ----------- tests: vmstate static checker: add substructure for usb-kbd for hid section This shows how the script deals with substructures added to vmstate descriptions that don't change the on-wire format. Signed-off-by: Amit Shah <amit.s...@redhat.com> Reviewed-by: Juan Quintela <quint...@redhat.com> Signed-off-by: Juan Quintela <quint...@redhat.com> Commit: 38ef86b5a68a6553904ee89672417d7a61c5182e https://github.com/qemu/qemu/commit/38ef86b5a68a6553904ee89672417d7a61c5182e Author: Amit Shah <amit.s...@redhat.com> Date: 2014-06-23 (Mon, 23 Jun 2014) Changed paths: M tests/vmstate-static-checker-data/dump2.json Log Message: ----------- tests: vmstate static checker: add size mismatch inside substructure Signed-off-by: Amit Shah <amit.s...@redhat.com> Reviewed-by: Juan Quintela <quint...@redhat.com> Signed-off-by: Juan Quintela <quint...@redhat.com> Commit: 25feab2fc248628df318a09c4da06e972a01247a https://github.com/qemu/qemu/commit/25feab2fc248628df318a09c4da06e972a01247a Author: Juan Quintela <quint...@redhat.com> Date: 2014-06-23 (Mon, 23 Jun 2014) Changed paths: M hw/usb/hcd-ohci.c Log Message: ----------- migration: Remove unneeded minimum_version_id_old Once there, make checkpatch happy. Signed-off-by: Juan Quintela <quint...@redhat.com> Reviewed-by: Dr. David Alan Gilbert <dgilb...@redhat.com> Commit: 13cde50889237a516c76f38a93d7bcac3cf915da https://github.com/qemu/qemu/commit/13cde50889237a516c76f38a93d7bcac3cf915da Author: Juan Quintela <quint...@redhat.com> Date: 2014-06-23 (Mon, 23 Jun 2014) Changed paths: M vmstate.c Log Message: ----------- vmstate: Return error in case of error If there is an error while loading a field, we should stop reading and not continue with the rest of fields. And we should also set an error in qemu_file. Signed-off-by: Juan Quintela <quint...@redhat.com> Reviewed-by: Dr. David Alan Gilbert <dgilb...@redhat.com> Commit: 4ea7df4e5c6b9d8b8a474680d6b1687fc8eacbac https://github.com/qemu/qemu/commit/4ea7df4e5c6b9d8b8a474680d6b1687fc8eacbac Author: Juan Quintela <quint...@redhat.com> Date: 2014-06-23 (Mon, 23 Jun 2014) Changed paths: M tests/test-vmstate.c Log Message: ----------- vmstate: Refactor & increase tests for primitive types This commit refactor the simple tests to test all integer types. We move to hex because it is easier to read values of different types. Signed-off-by: Juan Quintela <quint...@redhat.com> Reviewed-by: Dr. David Alan Gilbert <dgilb...@redhat.com> Commit: 513d80edc15d77b6d85df7dfad750ce95d091b78 https://github.com/qemu/qemu/commit/513d80edc15d77b6d85df7dfad750ce95d091b78 Author: Peter Maydell <peter.mayd...@linaro.org> Date: 2014-06-24 (Tue, 24 Jun 2014) Changed paths: M hw/usb/hcd-ohci.c M include/migration/vmstate.h M migration-rdma.c M qemu-options.hx M savevm.c A scripts/vmstate-static-checker.py M tests/test-vmstate.c A tests/vmstate-static-checker-data/dump1.json A tests/vmstate-static-checker-data/dump2.json M vl.c M vmstate.c Log Message: ----------- Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20140623' into staging migration/next for 20140623 # gpg: Signature made Mon 23 Jun 2014 18:18:57 BST using RSA key ID 5872D723 # gpg: Can't check signature: public key not found * remotes/juanquintela/tags/migration/20140623: (22 commits) vmstate: Refactor & increase tests for primitive types vmstate: Return error in case of error migration: Remove unneeded minimum_version_id_old tests: vmstate static checker: add size mismatch inside substructure tests: vmstate static checker: add substructure for usb-kbd for hid section tests: vmstate static checker: remove Subsections tests: vmstate static checker: remove a subsection tests: vmstate static checker: remove Description inside Fields tests: vmstate static checker: remove Description tests: vmstate static checker: remove Fields tests: vmstate static checker: change description name tests: vmstate static checker: remove last field in a struct tests: vmstate static checker: remove a field tests: vmstate static checker: remove a section tests: vmstate static checker: minimum_version_id check tests: vmstate static checker: version mismatch inside a Description tests: vmstate static checker: add version error in main section tests: vmstate static checker: incompat machine types tests: vmstate static checker: add dump1 and dump2 files vmstate-static-checker: script to validate vmstate changes ... Signed-off-by: Peter Maydell <peter.mayd...@linaro.org> Compare: https://github.com/qemu/qemu/compare/089a39486f2c...513d80edc15d