qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 55a01c: crypto: Always initialize splitkeylen


From: Richard Henderson
Subject: [Qemu-commits] [qemu/qemu] 55a01c: crypto: Always initialize splitkeylen
Date: Wed, 26 Jul 2023 09:22:06 -0700

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 55a01cab83b608bae6345b7e0e2fbecc142c1b2f
      
https://github.com/qemu/qemu/commit/55a01cab83b608bae6345b7e0e2fbecc142c1b2f
  Author: Akihiko Odaki <akihiko.odaki@daynix.com>
  Date:   2023-07-25 (Tue, 25 Jul 2023)

  Changed paths:
    M crypto/block-luks.c

  Log Message:
  -----------
  crypto: Always initialize splitkeylen

When _FORTIFY_SOURCE=2, glibc version is 2.35, and GCC version is
12.1.0, the compiler complains as follows:

In file included from /usr/include/string.h:535,
                 from /home/alarm/q/var/qemu/include/qemu/osdep.h:99,
                 from ../crypto/block-luks.c:21:
In function 'memset',
    inlined from 'qcrypto_block_luks_store_key' at ../crypto/block-luks.c:843:9:
/usr/include/bits/string_fortified.h:59:10: error: 'splitkeylen' may be used 
uninitialized [-Werror=maybe-uninitialized]
   59 |   return __builtin___memset_chk (__dest, __ch, __len,
      |          ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   60 |                                  __glibc_objsize0 (__dest));
      |                                  ~~~~~~~~~~~~~~~~~~~~~~~~~~
../crypto/block-luks.c: In function 'qcrypto_block_luks_store_key':
../crypto/block-luks.c:699:12: note: 'splitkeylen' was declared here
  699 |     size_t splitkeylen;
      |            ^~~~~~~~~~~

It seems the compiler cannot see that splitkeylen will not be used
when splitkey is NULL. Suppress the warning by initializing splitkeylen
even when splitkey stays NULL.

Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>


  Commit: 0e6b20b9656174e815751cf8b21f5e326148bb99
      
https://github.com/qemu/qemu/commit/0e6b20b9656174e815751cf8b21f5e326148bb99
  Author: Hongren (Zenithal) Zheng <i@zenithal.me>
  Date:   2023-07-25 (Tue, 25 Jul 2023)

  Changed paths:
    M hw/usb/canokey.c
    M hw/usb/canokey.h

  Log Message:
  -----------
  hw/usb/canokey: change license to GPLv2+

Apache license is considered by some to be not compatible
with GPLv2+. Since QEMU as combined work is GPLv2-only,
these two files should be made compatible.

Reported-by: "Daniel P. Berrangé" <berrange@redhat.com>
Link: https://lore.kernel.org/qemu-devel/ZEpKXncC%2Fe6FKRe9@redhat.com/
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Acked-By: canokeys.org (http://canokeys.org) <contact@canokeys.org>
Acked-by: YuanYang Meng <mkfssion@mkfssion.com>
Signed-off-by: Hongren (Zenithal) Zheng <i@zenithal.me>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>


  Commit: 788fa680419854db44205ec6e74602b5f91ee98d
      
https://github.com/qemu/qemu/commit/788fa680419854db44205ec6e74602b5f91ee98d
  Author: Fabiano Rosas <farosas@suse.de>
  Date:   2023-07-26 (Wed, 26 Jul 2023)

  Changed paths:
    M migration/migration.c
    M migration/multifd.c
    M migration/threadinfo.c
    M migration/threadinfo.h

  Log Message:
  -----------
  migration/multifd: Rename threadinfo.c functions

We're about to add more functions to this file so make it use the same
coding style as the rest of the code.

Signed-off-by: Fabiano Rosas <farosas@suse.de>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Peter Xu <peterx@redhat.com>
Message-Id: <20230607161306.31425-2-farosas@suse.de>
Signed-off-by: Juan Quintela <quintela@redhat.com>


  Commit: 01ec0f3a9211cf4af88706188865b15ad53f7d76
      
https://github.com/qemu/qemu/commit/01ec0f3a9211cf4af88706188865b15ad53f7d76
  Author: Fabiano Rosas <farosas@suse.de>
  Date:   2023-07-26 (Wed, 26 Jul 2023)

  Changed paths:
    M migration/threadinfo.c
    M migration/threadinfo.h

  Log Message:
  -----------
  migration/multifd: Protect accesses to migration_threads

This doubly linked list is common for all the multifd and migration
threads so we need to avoid concurrent access.

Add a mutex to protect the data from concurrent access. This fixes a
crash when removing two MigrationThread objects from the list at the
same time during cleanup of multifd threads.

Fixes: 671326201d ("migration: Introduce interface query-migrationthreads")
Signed-off-by: Fabiano Rosas <farosas@suse.de>
Reviewed-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Message-Id: <20230607161306.31425-3-farosas@suse.de>
Signed-off-by: Juan Quintela <quintela@redhat.com>


  Commit: 140e5a7632beb2adbc72066ca2d7146a7bdb2ec5
      
https://github.com/qemu/qemu/commit/140e5a7632beb2adbc72066ca2d7146a7bdb2ec5
  Author: Hyman Huang(黄勇) <yong.huang@smartx.com>
  Date:   2023-07-26 (Wed, 26 Jul 2023)

  Changed paths:
    M softmmu/dirtylimit.c

  Log Message:
  -----------
  softmmu/dirtylimit: Add parameter check for hmp "set_vcpu_dirty_limit"

dirty_rate paraemter of hmp command "set_vcpu_dirty_limit" is invalid
if less than 0, so add parameter check for it.

Note that this patch also delete the unsolicited help message and
clean up the code.

Signed-off-by: Hyman Huang(黄勇) <yong.huang@smartx.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Message-Id: <168618975839.6361.17407633874747688653-1@git.sr.ht>
Signed-off-by: Juan Quintela <quintela@redhat.com>


  Commit: 4d8078571906932c496ddeda541fb4b026fd12f5
      
https://github.com/qemu/qemu/commit/4d8078571906932c496ddeda541fb4b026fd12f5
  Author: Hyman Huang(黄勇) <yong.huang@smartx.com>
  Date:   2023-07-26 (Wed, 26 Jul 2023)

  Changed paths:
    M migration/migration-hmp-cmds.c
    M migration/options.c
    M qapi/migration.json

  Log Message:
  -----------
  qapi/migration: Introduce x-vcpu-dirty-limit-period parameter

Introduce "x-vcpu-dirty-limit-period" migration experimental
parameter, which is in the range of 1 to 1000ms and used to
make dirtyrate calculation period configurable.

Currently with the "x-vcpu-dirty-limit-period" varies, the
total time of live migration changes, test results show the
optimal value of "x-vcpu-dirty-limit-period" ranges from
500ms to 1000 ms. "x-vcpu-dirty-limit-period" should be made
stable once it proves best value can not be determined with
developer's experiments.

Signed-off-by: Hyman Huang(黄勇) <yong.huang@smartx.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Message-Id: <168618975839.6361.17407633874747688653-2@git.sr.ht>
Signed-off-by: Juan Quintela <quintela@redhat.com>


  Commit: 09f9ec99133ab5735b57486323d9c592630c9fc1
      
https://github.com/qemu/qemu/commit/09f9ec99133ab5735b57486323d9c592630c9fc1
  Author: Hyman Huang(黄勇) <yong.huang@smartx.com>
  Date:   2023-07-26 (Wed, 26 Jul 2023)

  Changed paths:
    M migration/migration-hmp-cmds.c
    M migration/options.c
    M qapi/migration.json

  Log Message:
  -----------
  qapi/migration: Introduce vcpu-dirty-limit parameters

Introduce "vcpu-dirty-limit" migration parameter used
to limit dirty page rate during live migration.

"vcpu-dirty-limit" and "x-vcpu-dirty-limit-period" are
two dirty-limit-related migration parameters, which can
be set before and during live migration by qmp
migrate-set-parameters.

This two parameters are used to help implement the dirty
page rate limit algo of migration.

Signed-off-by: Hyman Huang(黄勇) <yong.huang@smartx.com>
Acked-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Message-Id: <168618975839.6361.17407633874747688653-3@git.sr.ht>
Signed-off-by: Juan Quintela <quintela@redhat.com>


  Commit: dc62395557b29312a9c2f9a1e0beece2557c3078
      
https://github.com/qemu/qemu/commit/dc62395557b29312a9c2f9a1e0beece2557c3078
  Author: Hyman Huang(黄勇) <yong.huang@smartx.com>
  Date:   2023-07-26 (Wed, 26 Jul 2023)

  Changed paths:
    M migration/options.c
    M migration/options.h
    M qapi/migration.json
    M softmmu/dirtylimit.c

  Log Message:
  -----------
  migration: Introduce dirty-limit capability

Introduce migration dirty-limit capability, which can
be turned on before live migration and limit dirty
page rate durty live migration.

Introduce migrate_dirty_limit function to help check
if dirty-limit capability enabled during live migration.

Meanwhile, refactor vcpu_dirty_rate_stat_collect
so that period can be configured instead of hardcoded.

dirty-limit capability is kind of like auto-converge
but using dirty limit instead of traditional cpu-throttle
to throttle guest down. To enable this feature, turn on
the dirty-limit capability before live migration using
migrate-set-capabilities, and set the parameters
"x-vcpu-dirty-limit-period", "vcpu-dirty-limit" suitably
to speed up convergence.

Signed-off-by: Hyman Huang(黄勇) <yong.huang@smartx.com>
Acked-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Message-Id: <168618975839.6361.17407633874747688653-4@git.sr.ht>
Signed-off-by: Juan Quintela <quintela@redhat.com>


  Commit: bb9993c6725ac13098058f873efb06880ce46c32
      
https://github.com/qemu/qemu/commit/bb9993c6725ac13098058f873efb06880ce46c32
  Author: Hyman Huang(黄勇) <yong.huang@smartx.com>
  Date:   2023-07-26 (Wed, 26 Jul 2023)

  Changed paths:
    M migration/ram.c

  Log Message:
  -----------
  migration: Refactor auto-converge capability logic

Check if block migration is running before throttling
guest down in auto-converge way.

Note that this modification is kind of like code clean,
because block migration does not depend on auto-converge
capability, so the order of checks can be adjusted.

Signed-off-by: Hyman Huang(黄勇) <yong.huang@smartx.com>
Acked-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Message-Id: <168618975839.6361.17407633874747688653-5@git.sr.ht>
Signed-off-by: Juan Quintela <quintela@redhat.com>


  Commit: 310ad5625e107568a0204ec1e1623e267fad3a9a
      
https://github.com/qemu/qemu/commit/310ad5625e107568a0204ec1e1623e267fad3a9a
  Author: Hyman Huang(黄勇) <yong.huang@smartx.com>
  Date:   2023-07-26 (Wed, 26 Jul 2023)

  Changed paths:
    M migration/ram.c

  Log Message:
  -----------
  migration: Put the detection logic before auto-converge checking

This commit is prepared for the implementation of dirty-limit
convergence algo.

The detection logic of throttling condition can apply to both
auto-converge and dirty-limit algo, putting it's position
before the checking logic for auto-converge feature.

Signed-off-by: Hyman Huang(黄勇) <yong.huang@smartx.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Message-ID: <168733225273.5845.15871826788879741674-6@git.sr.ht>
Signed-off-by: Juan Quintela <quintela@redhat.com>


  Commit: acac51ba246ad1046c69de9e0b1a7e8523e2de99
      
https://github.com/qemu/qemu/commit/acac51ba246ad1046c69de9e0b1a7e8523e2de99
  Author: Hyman Huang(黄勇) <yong.huang@smartx.com>
  Date:   2023-07-26 (Wed, 26 Jul 2023)

  Changed paths:
    M migration/migration.c
    M migration/ram.c
    M migration/trace-events
    M softmmu/dirtylimit.c

  Log Message:
  -----------
  migration: Implement dirty-limit convergence algo

Implement dirty-limit convergence algo for live migration,
which is kind of like auto-converge algo but using dirty-limit
instead of cpu throttle to make migration convergent.

Enable dirty page limit if dirty_rate_high_cnt greater than 2
when dirty-limit capability enabled, Disable dirty-limit if
migration be canceled.

Note that "set_vcpu_dirty_limit", "cancel_vcpu_dirty_limit"
commands are not allowed during dirty-limit live migration.

Signed-off-by: Hyman Huang(黄勇) <yong.huang@smartx.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Message-ID: <168733225273.5845.15871826788879741674-7@git.sr.ht>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>


  Commit: 15699cf5422aa7577ebe1a936aca4d589446b952
      
https://github.com/qemu/qemu/commit/15699cf5422aa7577ebe1a936aca4d589446b952
  Author: Hyman Huang(黄勇) <yong.huang@smartx.com>
  Date:   2023-07-26 (Wed, 26 Jul 2023)

  Changed paths:
    M include/sysemu/dirtylimit.h
    M migration/migration-hmp-cmds.c
    M migration/migration.c
    M qapi/migration.json
    M softmmu/dirtylimit.c

  Log Message:
  -----------
  migration: Extend query-migrate to provide dirty page limit info

Extend query-migrate to provide throttle time and estimated
ring full time with dirty-limit capability enabled, through which
we can observe if dirty limit take effect during live migration.

Signed-off-by: Hyman Huang(黄勇) <yong.huang@smartx.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Message-ID: <168733225273.5845.15871826788879741674-8@git.sr.ht>
Signed-off-by: Juan Quintela <quintela@redhat.com>


  Commit: e3131dc76a7368395f40d96f77c372e9f5676dc8
      
https://github.com/qemu/qemu/commit/e3131dc76a7368395f40d96f77c372e9f5676dc8
  Author: Juan Quintela <quintela@redhat.com>
  Date:   2023-07-26 (Wed, 26 Jul 2023)

  Changed paths:
    M tests/qtest/migration-test.c

  Log Message:
  -----------
  migration-test: Be consistent for ppc

It makes no sense that we don't have the same configuration on both sides.

Reviewed-by: Laurent Vivier <lvivier@redhat.com>
Message-ID: <20230608224943.3877-2-quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>


  Commit: 42e52a8a7746d6f627cb391280f18dbbc72a16e5
      
https://github.com/qemu/qemu/commit/42e52a8a7746d6f627cb391280f18dbbc72a16e5
  Author: Juan Quintela <quintela@redhat.com>
  Date:   2023-07-26 (Wed, 26 Jul 2023)

  Changed paths:
    M tests/qtest/migration-test.c

  Log Message:
  -----------
  migration-test: Make machine_opts regular with other options

Reviewed-by: Peter Xu <peterx@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-ID: <20230608224943.3877-5-quintela@redhat.com>


  Commit: 832c732c5d30e4f8f5d9d4137a0c2ab4df429b98
      
https://github.com/qemu/qemu/commit/832c732c5d30e4f8f5d9d4137a0c2ab4df429b98
  Author: Juan Quintela <quintela@redhat.com>
  Date:   2023-07-26 (Wed, 26 Jul 2023)

  Changed paths:
    M tests/qtest/migration-test.c

  Log Message:
  -----------
  migration-test: Create arch_opts

This will contain the options needed for both source and target.

Reviewed-by: Peter Xu <peterx@redhat.com>
Message-ID: <20230608224943.3877-6-quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>


  Commit: bc28a6111dc982386403c60de8df10a96f4d4f99
      
https://github.com/qemu/qemu/commit/bc28a6111dc982386403c60de8df10a96f4d4f99
  Author: Juan Quintela <quintela@redhat.com>
  Date:   2023-07-26 (Wed, 26 Jul 2023)

  Changed paths:
    M tests/qtest/migration-test.c

  Log Message:
  -----------
  migration-test: machine_opts is really arch specific

And it needs to be in both source and target, so put it on arch_opts.

Reviewed-by: Peter Xu <peterx@redhat.com>
Message-ID: <20230608224943.3877-7-quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>


  Commit: 7b24d326348e1672e63e2e325c90c2bf7711e5f6
      
https://github.com/qemu/qemu/commit/7b24d326348e1672e63e2e325c90c2bf7711e5f6
  Author: Juan Quintela <quintela@redhat.com>
  Date:   2023-07-26 (Wed, 26 Jul 2023)

  Changed paths:
    M docs/about/deprecated.rst
    M qapi/migration.json

  Log Message:
  -----------
  migration: skipped field is really obsolete.

Has return zero for more than 10 years.

Specifically we introduced the field in 1.5.0

commit f1c72795af573b24a7da5eb52375c9aba8a37972
Author: Peter Lieven <pl@kamp.de>
Date:   Tue Mar 26 10:58:37 2013 +0100

    migration: do not sent zero pages in bulk stage

    during bulk stage of ram migration if a page is a
    zero page do not send it at all.
    the memory at the destination reads as zero anyway.

    even if there is an madvise with QEMU_MADV_DONTNEED
    at the target upon receipt of a zero page I have observed
    that the target starts swapping if the memory is overcommitted.
    it seems that the pages are dropped asynchronously.

    this patch also updates QMP to return the number of
    skipped pages in MigrationStats.

but removed its usage in 1.5.3

commit 9ef051e5536b6368a1076046ec6c4ec4ac12b5c6
Author: Peter Lieven <pl@kamp.de>
Date:   Mon Jun 10 12:14:19 2013 +0200

    Revert "migration: do not sent zero pages in bulk stage"

    Not sending zero pages breaks migration if a page is zero
    at the source but not at the destination. This can e.g. happen
    if different BIOS versions are used at source and destination.
    It has also been reported that migration on pseries is completely
    broken with this patch.

    This effectively reverts commit f1c72795af573b24a7da5eb52375c9aba8a37972.

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-ID: <20230612193344.3796-2-quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>


  Commit: f014880ab973a09e56e1b7fa100a201fe9f45966
      
https://github.com/qemu/qemu/commit/f014880ab973a09e56e1b7fa100a201fe9f45966
  Author: Peter Xu <peterx@redhat.com>
  Date:   2023-07-26 (Wed, 26 Jul 2023)

  Changed paths:
    M docs/devel/migration.rst

  Log Message:
  -----------
  docs/migration: Update postcopy bits

We have postcopy recovery but not reflected in the document, do an update
for that.

Add a very small section on postcopy preempt.

Touch up the pagemap section, dropping the unsent map because it's already
been dropped in the source code in commit 1e7cf8c323 ("migration/postcopy:
unsentmap is not necessary for postcopy").

Touch up the postcopy section to remove "network connection" failures as
downside, because now it's not fatal and can be recovered.  Suggested by
Laszlo.

Acked-by: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Message-ID: <20230706115611.371048-1-peterx@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>


  Commit: 908927db28eafb404ec4c3a50249ddb52bd4afde
      
https://github.com/qemu/qemu/commit/908927db28eafb404ec4c3a50249ddb52bd4afde
  Author: Tejus GK <tejus.gk@nutanix.com>
  Date:   2023-07-26 (Wed, 26 Jul 2023)

  Changed paths:
    M migration/migration.c

  Log Message:
  -----------
  migration: Update error description whenever migration fails

There are places in migration.c where the migration is marked failed with
MIGRATION_STATUS_FAILED, but the failure reason is never updated. Hence
libvirt doesn't know why the migration failed when it queries for it.

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Tejus GK <tejus.gk@nutanix.com>
Message-ID: <20230621130940.178659-2-tejus.gk@nutanix.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>


  Commit: 82137e6c8c517e70fe93e262975eaaac5c911635
      
https://github.com/qemu/qemu/commit/82137e6c8c517e70fe93e262975eaaac5c911635
  Author: Wei Wang <wei.w.wang@intel.com>
  Date:   2023-07-26 (Wed, 26 Jul 2023)

  Changed paths:
    M migration/options.c

  Log Message:
  -----------
  migration: enforce multifd and postcopy preempt to be set before incoming

qemu_start_incoming_migration needs to check the number of multifd
channels or postcopy ram channels to configure the backlog parameter (i.e.
the maximum length to which the queue of pending connections for sockfd
may grow) of listen(). So enforce the usage of postcopy-preempt and
multifd as below:
- need to use "-incoming defer" on the destination; and
- set_capability and set_parameter need to be done before migrate_incoming

Otherwise, disable the use of the features and report error messages to
remind users to adjust the commands.

Signed-off-by: Wei Wang <wei.w.wang@intel.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Message-ID: <20230606101910.20456-2-wei.w.wang@intel.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>
Acked-by: Juan Quintela <quintela@redhat.com>


  Commit: 06c48d6b37c598787fa60421ca15e8876c2fa402
      
https://github.com/qemu/qemu/commit/06c48d6b37c598787fa60421ca15e8876c2fa402
  Author: Wei Wang <wei.w.wang@intel.com>
  Date:   2023-07-26 (Wed, 26 Jul 2023)

  Changed paths:
    M tests/qtest/migration-test.c

  Log Message:
  -----------
  qtest/migration-tests.c: use "-incoming defer" for postcopy tests

The Postcopy preempt capability is expected to be set before incoming
starts, so change the postcopy tests to start with deferred incoming and
call migrate-incoming after the cap has been set.

Why the existing tests (without this patch) didn't fail?
There could be two reasons:
1) "backlog" specifies the number of pending connections. As long as the
   server accepts the connections faster than the clients side connecting,
   connection will succeed. For the preempt test, it uses only 2 channels,
   so very likely to not have pending connections.
2) per my tests (on kernel 6.2), the number of pending connections allowed
   is actually "backlog + 1", which is 2 in this case.
That said, the implementation of socket_start_incoming_migration_internal
expects "migrate defer" to be used, and for safety, change the test to
work with the expected usage.

Signed-off-by: Wei Wang <wei.w.wang@intel.com>
Reviewed-by: Peter Xu <peterx@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Message-ID: <20230606101910.20456-3-wei.w.wang@intel.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>


  Commit: fc95c63b603221b3bdedc544a39030fbea3f47a4
      
https://github.com/qemu/qemu/commit/fc95c63b603221b3bdedc544a39030fbea3f47a4
  Author: Juan Quintela <quintela@redhat.com>
  Date:   2023-07-26 (Wed, 26 Jul 2023)

  Changed paths:
    M migration/qemu-file.c
    M migration/qemu-file.h
    M migration/savevm.c
    M migration/vmstate.c

  Log Message:
  -----------
  qemu-file: Rename qemu_file_transferred_ fast -> noflush

Fast don't say much.  Noflush indicates more clearly that it is like
qemu_file_transferred but without the flush.

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20230530183941.7223-2-quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>


  Commit: cf786549ce6e8d775fbc8ebe06759d59fc709f08
      
https://github.com/qemu/qemu/commit/cf786549ce6e8d775fbc8ebe06759d59fc709f08
  Author: Juan Quintela <quintela@redhat.com>
  Date:   2023-07-26 (Wed, 26 Jul 2023)

  Changed paths:
    M migration/savevm.c

  Log Message:
  -----------
  migration: Change qemu_file_transferred to noflush

We do a qemu_fclose() just after that, that also does a qemu_fflush(),
so remove one qemu_fflush().

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-ID: <20230530183941.7223-3-quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>


  Commit: 9ccf83f486277a00be85646b305af6683ef3b8ed
      
https://github.com/qemu/qemu/commit/9ccf83f486277a00be85646b305af6683ef3b8ed
  Author: Juan Quintela <quintela@redhat.com>
  Date:   2023-07-26 (Wed, 26 Jul 2023)

  Changed paths:
    M migration/qemu-file.c
    M migration/qemu-file.h

  Log Message:
  -----------
  qemu_file: Make qemu_file_is_writable() static

It is not used outside of qemu_file, and it shouldn't.

Signed-off-by: Juan Quintela <quintela@redhat.com>
Message-ID: <20230530183941.7223-19-quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>


  Commit: 8c5ee0bfb86eae89c5480dc616bb9d2234ac1fd6
      
https://github.com/qemu/qemu/commit/8c5ee0bfb86eae89c5480dc616bb9d2234ac1fd6
  Author: Juan Quintela <quintela@redhat.com>
  Date:   2023-07-26 (Wed, 26 Jul 2023)

  Changed paths:
    M migration/qemu-file.c

  Log Message:
  -----------
  qemu-file: Simplify qemu_file_shutdown()

Reviewed-by: Peter Xu <peterx@redhat.com>
Message-ID: <20230530183941.7223-20-quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>


  Commit: ac6f48e15d09412dcc4e4ac93019b6c97dc26a3c
      
https://github.com/qemu/qemu/commit/ac6f48e15d09412dcc4e4ac93019b6c97dc26a3c
  Author: Juan Quintela <quintela@redhat.com>
  Date:   2023-07-26 (Wed, 26 Jul 2023)

  Changed paths:
    M migration/qemu-file.c
    M migration/qemu-file.h

  Log Message:
  -----------
  qemu-file: Make qemu_file_get_error_obj() static

It was not used outside of qemu_file.c anyways.

Reviewed-by: Peter Xu <peterx@redhat.com>
Message-ID: <20230530183941.7223-21-quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>


  Commit: 697c4c86ab515a728ffb2adc2c3c04b22fa9210f
      
https://github.com/qemu/qemu/commit/697c4c86ab515a728ffb2adc2c3c04b22fa9210f
  Author: Juan Quintela <quintela@redhat.com>
  Date:   2023-07-26 (Wed, 26 Jul 2023)

  Changed paths:
    M migration/qemu-file.c
    M migration/qemu-file.h
    M migration/rdma.c

  Log Message:
  -----------
  migration/rdma: Split qemu_fopen_rdma() into input/output functions

This is how everything else in QEMUFile is structured.
As a bonus they are three less lines of code.

Reviewed-by: Peter Xu <peterx@redhat.com>
Message-ID: <20230530183941.7223-17-quintela@redhat.com>
Signed-off-by: Juan Quintela <quintela@redhat.com>


  Commit: dad3c9565d7347bd61d036f0a1f5e2735be92c9b
      
https://github.com/qemu/qemu/commit/dad3c9565d7347bd61d036f0a1f5e2735be92c9b
  Author: Markus Armbruster <armbru@redhat.com>
  Date:   2023-07-26 (Wed, 26 Jul 2023)

  Changed paths:
    M qapi/block-core.json

  Log Message:
  -----------
  qapi/block-core: Tidy up BlockLatencyHistogramInfo documentation

Documentation for member @bin comes out like

    list of io request counts corresponding to histogram intervals.
    len("bins") = len("boundaries") + 1 For the example above, "bins"
    may be something like [3, 1, 5, 2], and corresponding histogram
    looks like:

Note how the equation and the sentence following it run together.
Replace the equation:

    list of io request counts corresponding to histogram intervals,
    one more element than "boundaries" has.  For the example above,
    "bins" may be something like [3, 1, 5, 2], and corresponding
    histogram looks like:

Cc: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-ID: <20230720071610.1096458-2-armbru@redhat.com>
[Off by one fixed]


  Commit: e893b9e3b3a6029384253f768cdc06969732e517
      
https://github.com/qemu/qemu/commit/e893b9e3b3a6029384253f768cdc06969732e517
  Author: Markus Armbruster <armbru@redhat.com>
  Date:   2023-07-26 (Wed, 26 Jul 2023)

  Changed paths:
    M qapi/block.json

  Log Message:
  -----------
  qapi/block: Tidy up block-latency-histogram-set documentation

Examples come out like

    Example

       set new histograms for all io types with intervals [0, 10), [10,
       50), [50, 100), [100, +inf):

The sentence "set new histograms ..." starts with a lower case letter.
Capitalize it.  Same for the other examples.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-ID: <20230720071610.1096458-3-armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>


  Commit: a9c72efd6d6d62ac84ae57ca55606747e04e8ba7
      
https://github.com/qemu/qemu/commit/a9c72efd6d6d62ac84ae57ca55606747e04e8ba7
  Author: Markus Armbruster <armbru@redhat.com>
  Date:   2023-07-26 (Wed, 26 Jul 2023)

  Changed paths:
    M qapi/qdev.json

  Log Message:
  -----------
  qapi/qdev: Tidy up device_add documentation

The notes section comes out like this:

    Notes

    Additional arguments depend on the type.

    1. For detailed information about this command, please refer to the
       ‘docs/qdev-device-use.txt’ file.

    2. It’s possible to list device properties by running QEMU with the
       “-device DEVICE,help” command-line argument, where DEVICE is the
       device’s name

The first item isn't numbered.  Fix that:

    1. Additional arguments depend on the type.

    2. For detailed information about this command, please refer to the
       ‘docs/qdev-device-use.txt’ file.

    3. It’s possible to list device properties by running QEMU with the
       “-device DEVICE,help” command-line argument, where DEVICE is the
       device’s name

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-ID: <20230720071610.1096458-4-armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>


  Commit: e27a9d628d7a9d0c31bc48c82937dd73dbbca01a
      
https://github.com/qemu/qemu/commit/e27a9d628d7a9d0c31bc48c82937dd73dbbca01a
  Author: Markus Armbruster <armbru@redhat.com>
  Date:   2023-07-26 (Wed, 26 Jul 2023)

  Changed paths:
    M qapi/trace.json

  Log Message:
  -----------
  qapi/trace: Tidy up trace-event-get-state, -set-state documentation

trace-event-set-state's explanation of how events are selected is
under "Features".  Doesn't belong there.  Simply delete it, as it
feels redundant with documentation of member @name.

trace-event-get-state's explanation is under "Returns".  Tolerable,
but similarly redundant.  Delete it, too.

Cc: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-ID: <20230720071610.1096458-5-armbru@redhat.com>


  Commit: 9e272073e1c41acb3ba1e43b69c7a3f9c26089c2
      
https://github.com/qemu/qemu/commit/9e272073e1c41acb3ba1e43b69c7a3f9c26089c2
  Author: Markus Armbruster <armbru@redhat.com>
  Date:   2023-07-26 (Wed, 26 Jul 2023)

  Changed paths:
    M qapi/block-core.json
    M qapi/block.json
    M qapi/cxl.json
    M qapi/machine-target.json
    M qapi/migration.json
    M qapi/net.json
    M qapi/qom.json
    M qapi/trace.json
    M qapi/ui.json

  Log Message:
  -----------
  qapi: Reformat recent doc comments to conform to current conventions

Since commit a937b6aa739 (qapi: Reformat doc comments to conform to
current conventions), a number of comments not conforming to the
current formatting conventions were added.  No problem, just sweep
the entire documentation once more.

To check the generated documentation does not change, I compared the
generated HTML before and after this commit with "wdiff -3".  Finds no
differences.  Comparing with diff is not useful, as the reflown
paragraphs are visible there.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-ID: <20230720071610.1096458-7-armbru@redhat.com>


  Commit: 5fc7709244cd6222e3912eee41c32ffbda37b82e
      
https://github.com/qemu/qemu/commit/5fc7709244cd6222e3912eee41c32ffbda37b82e
  Author: Richard Henderson <richard.henderson@linaro.org>
  Date:   2023-07-26 (Wed, 26 Jul 2023)

  Changed paths:
    M crypto/block-luks.c
    M hw/usb/canokey.c
    M hw/usb/canokey.h

  Log Message:
  -----------
  Merge tag 'misc-next-pull-request' of https://gitlab.com/berrange/qemu into 
staging

Miscellaneous fixes

 * Switch canokey license from Apache to GPLv2+
 * Fix uninitialized variable in LUKS driver

# -----BEGIN PGP SIGNATURE-----
#
# iQIzBAABCAAdFiEE2vOm/bJrYpEtDo4/vobrtBUQT98FAmS/91MACgkQvobrtBUQ
# T9+WjA/9Gx02s4aZvLJ1gSpzPguIEjwEulVOBCTaxQ1Fuu/5RawWXmFMhQ/iwAbi
# EnbeDpghG+Qk+4DCfQDMq0F8zkozvZOLW8NTZJW66dpV9PSwji39eIpVgvin2GXA
# bGZBz6ZwXoTozplfY8LTzLIGyZNzGNjSO4ND1zsyXq57LXbWXhAdHvsxwi1h1rOc
# FbNMeSPFlwPtCnpQgBDQmRmQ5UzwZiJOCp3zi9njMM/D6AfU/n275QzLvd/3ydBO
# JW4q1IHyDs13g+SCnI4a2rqI7+Uf+Z7h2DfkwhoaGoGuTpZ6llTgM4asjUOFri66
# RzVWz6UK+uCUogq2wgfYJ5jyNwerU8DtyjSW3kxhLcaTTRUGG/+nQu9PV+aPy1xD
# DZWo74KBtiRDFVS1XTLoDd+tNDqzNRdCmWqlc0CWgjUU68b61+GCDnkr+F0rJ59t
# rL1Q+bgKDVnYVxbTVJQs9V6zdeu6o7x94moK2UCAUbGlaCcpkl/sZXqF586dMQAj
# SvaGRYBxMvZvDVeIaINV/sW+vssoSdi7MKaUHAiHydnph/NFzC501bszh7RMyfAd
# 4/PLsm4ezmSFBZ0BS6+zjMBwWEQYiJbl6DDZZI631qSC4G5yOm9TCW2I7ZPNdpRu
# CveFHf8/dREd5o5iE6Vl5mWZF++dOcil64PnevqEv5/wjQcyHJs=
# =+YRm
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue 25 Jul 2023 09:24:51 AM PDT
# gpg:                using RSA key DAF3A6FDB26B62912D0E8E3FBE86EBB415104FDF
# gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>" [full]
# gpg:                 aka "Daniel P. Berrange <berrange@redhat.com>" [full]

* tag 'misc-next-pull-request' of https://gitlab.com/berrange/qemu:
  hw/usb/canokey: change license to GPLv2+
  crypto: Always initialize splitkeylen

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>


  Commit: ec28194b854445dc64bfba9e3830b1ef7b0dd9e5
      
https://github.com/qemu/qemu/commit/ec28194b854445dc64bfba9e3830b1ef7b0dd9e5
  Author: Richard Henderson <richard.henderson@linaro.org>
  Date:   2023-07-26 (Wed, 26 Jul 2023)

  Changed paths:
    M docs/about/deprecated.rst
    M docs/devel/migration.rst
    M include/sysemu/dirtylimit.h
    M migration/migration-hmp-cmds.c
    M migration/migration.c
    M migration/multifd.c
    M migration/options.c
    M migration/options.h
    M migration/qemu-file.c
    M migration/qemu-file.h
    M migration/ram.c
    M migration/rdma.c
    M migration/savevm.c
    M migration/threadinfo.c
    M migration/threadinfo.h
    M migration/trace-events
    M migration/vmstate.c
    M qapi/migration.json
    M softmmu/dirtylimit.c
    M tests/qtest/migration-test.c

  Log Message:
  -----------
  Merge tag 'migration-20230726-pull-request' of 
https://gitlab.com/juan.quintela/qemu into staging

Migration Pull request

Hi

This is the migration PULL request.  It is the same than yesterday with proper 
PULL headers.
It pass CI. It contains:
- Fabiano rosas trheadinfo cleanups
- Hyman Huang dirtylimit changes
- Part of my changes
- Peter Xu documentation
- Tejus updato to migration descriptions
- Wei want improvements for postocpy and multifd setup

Please apply.

Thanks, Juan.

# -----BEGIN PGP SIGNATURE-----
#
# iQIzBAABCAAdFiEEGJn/jt6/WMzuA0uC9IfvGFhy1yMFAmTBCrgACgkQ9IfvGFhy
# 1yPCphAAvZr6HqULECPv/g6gYIiNjl2WQxSgaOnJPnxSV3aaDMl4+rn3GowXbj1a
# V7xQIxxyYR+4BOBPHc1Ey9z2huB6tr5YhzbHhdpOPOfTdGP4LzQogyBCM9elIGbg
# GVnBX4k1yT2bE3qoKkD7FZ8GhQdFTq9NFXg/prAJm5fUnoUVVGhz4YSlWVXcpC19
# XJIAC4QA5LtQYKe9TAlLqECNHeOiMDIFa1QHtrz+52OUWgh8WOvAPtj1CK0pm9Qa
# AsvN8HvKJ2PlCBct7c+E17O/xVihKVciEgu3KXjGHurUipUSD3XCHXOURlS1IrLK
# ShegHFmMQjmS0m9mUy1+2K7DQ+ZcfScqSQCEuEOtTdnzs2him4c6p9VEGyQXa5bc
# PChjihbYmxuz1GwrprtjUGyXgqhjnwGi1yRDl9L3mZc41vfO4m2sHnMZpdJZc+dt
# 5f5oi69cXVmtzSNJqT/4nCa7g5PuaPLg34NdwpbZv7Dt0Hq1yzlkNgUNb9R0XGET
# /BIpIuYYcNdmBUEVebMydndrzY8UDq0KC+e35OADSGkg6B6ZNwYaoungCb2gy6hM
# WCcv+3UATb/oF7HoPmh1+f1MzUZENAdmDtddXOCvWBZQReByKR7eFZLUHR+yBODH
# dVP9zOkPfrm8XVG4fSYhb/4BPK4XhBlibFsxxwOohTttTNHA5ew=
# =J74B
# -----END PGP SIGNATURE-----
# gpg: Signature made Wed 26 Jul 2023 04:59:52 AM PDT
# gpg:                using RSA key 1899FF8EDEBF58CCEE034B82F487EF185872D723
# gpg: Good signature from "Juan Quintela <quintela@redhat.com>" [undefined]
# gpg:                 aka "Juan Quintela <quintela@trasno.org>" [undefined]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 1899 FF8E DEBF 58CC EE03  4B82 F487 EF18 5872 D723

* tag 'migration-20230726-pull-request' of 
https://gitlab.com/juan.quintela/qemu: (25 commits)
  migration/rdma: Split qemu_fopen_rdma() into input/output functions
  qemu-file: Make qemu_file_get_error_obj() static
  qemu-file: Simplify qemu_file_shutdown()
  qemu_file: Make qemu_file_is_writable() static
  migration: Change qemu_file_transferred to noflush
  qemu-file: Rename qemu_file_transferred_ fast -> noflush
  qtest/migration-tests.c: use "-incoming defer" for postcopy tests
  migration: enforce multifd and postcopy preempt to be set before incoming
  migration: Update error description whenever migration fails
  docs/migration: Update postcopy bits
  migration: skipped field is really obsolete.
  migration-test: machine_opts is really arch specific
  migration-test: Create arch_opts
  migration-test: Make machine_opts regular with other options
  migration-test: Be consistent for ppc
  migration: Extend query-migrate to provide dirty page limit info
  migration: Implement dirty-limit convergence algo
  migration: Put the detection logic before auto-converge checking
  migration: Refactor auto-converge capability logic
  migration: Introduce dirty-limit capability
  ...

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>


  Commit: ccdd31267678db9d80578b5f80bbe94141609ef4
      
https://github.com/qemu/qemu/commit/ccdd31267678db9d80578b5f80bbe94141609ef4
  Author: Richard Henderson <richard.henderson@linaro.org>
  Date:   2023-07-26 (Wed, 26 Jul 2023)

  Changed paths:
    M qapi/block-core.json
    M qapi/block.json
    M qapi/cxl.json
    M qapi/machine-target.json
    M qapi/migration.json
    M qapi/net.json
    M qapi/qdev.json
    M qapi/qom.json
    M qapi/trace.json
    M qapi/ui.json

  Log Message:
  -----------
  Merge tag 'pull-qapi-2023-07-26-v2' of https://repo.or.cz/qemu/armbru into 
staging

QAPI patches patches for 2023-07-26

# -----BEGIN PGP SIGNATURE-----
#
# iQJGBAABCAAwFiEENUvIs9frKmtoZ05fOHC0AOuRhlMFAmTBFvUSHGFybWJydUBy
# ZWRoYXQuY29tAAoJEDhwtADrkYZTML4QAKhHciLnEudtZ6SFSqpOgt80IJnw8a+r
# z1AowVYtgPhlZ8TtQJFXpBtAZtKu8xb/QdFxomm4bdNQnWX6CXCoheF5ZJ9V3Rrz
# A3pA1wt5KTnRif6R9/Rs1dYXEr4cWagg1UNT3g2eOV3fvdDHvJMPOsqK/jWeXuC1
# T94yFMv1bZSLyiLgB7QQNYDZhIWQ06RGU6tZdWaZQReA8N8maXiZN5NnUISK32Rq
# L2X0FtgzyJQ+dLHtbXOw6kIwZdOLNauOM78skZoiZUyFVaH2aDUIg3mnfRw36hN6
# feXGtw68PkTQGexKmonPDljIacfMDApmNBelLwsvB9MTrwVV+hKZPy1ZEwPIFDJ9
# yid63pp2CtQ1TZ3dSjZ1cGbRR+g2NI5X4g1DlcFPAxydMkv9/m5NwQx8OYqVIzqg
# VXeS0++O2BM5+ORjlJxMx3RsyH2O1I8DCfwmifzYSo+3Xg/4nCV3f38czbavjCfJ
# 4T3ooZx0+PRtjlOlfZTkgxV14TMV+XzQr3bsN4wbPdnjnueSE1tyoVGy8MwQ5aXi
# 2oAsjrR8g7iqU6f+6PyRNn5F6D0ge+AYQ7bYS51i3Hyih/y2QUJECpL3XAgOxREb
# /68SEtr4m/GJvmQNdwwwu6e1JFo8LknwMfkfzQAOCK1npAJGsWPmJ6iY7KtWgS8F
# oDwqng/WOhvV
# =mNMX
# -----END PGP SIGNATURE-----
# gpg: Signature made Wed 26 Jul 2023 05:52:05 AM PDT
# gpg:                using RSA key 354BC8B3D7EB2A6B68674E5F3870B400EB918653
# gpg:                issuer "armbru@redhat.com"
# gpg: Good signature from "Markus Armbruster <armbru@redhat.com>" [undefined]
# gpg:                 aka "Markus Armbruster <armbru@pond.sub.org>" [undefined]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 354B C8B3 D7EB 2A6B 6867  4E5F 3870 B400 EB91 8653

* tag 'pull-qapi-2023-07-26-v2' of https://repo.or.cz/qemu/armbru:
  qapi: Reformat recent doc comments to conform to current conventions
  qapi/trace: Tidy up trace-event-get-state, -set-state documentation
  qapi/qdev: Tidy up device_add documentation
  qapi/block: Tidy up block-latency-histogram-set documentation
  qapi/block-core: Tidy up BlockLatencyHistogramInfo documentation

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>


Compare: https://github.com/qemu/qemu/compare/6cb2011fedf8...ccdd31267678



reply via email to

[Prev in Thread] Current Thread [Next in Thread]