mbox

[PULL,00/26] Migration 20240104 patches

Message ID 20240104043213.431566-1-peterx@redhat.com
State New
Headers show

Pull-request

https://gitlab.com/peterx/qemu.git tags/migration-20240104-pull-request

Message

Peter Xu Jan. 4, 2024, 4:31 a.m. UTC
From: Peter Xu <peterx@redhat.com>

The following changes since commit 7425b6277f12e82952cede1f531bfc689bf77fb1:

  Merge tag 'tracing-pull-request' of https://gitlab.com/stefanha/qemu into staging (2023-12-27 05:15:32 -0500)

are available in the Git repository at:

  https://gitlab.com/peterx/qemu.git tags/migration-20240104-pull-request

for you to fetch changes up to b12635ff08ab2e5a6a955c6866ef4525fb3deb5d:

  migration: fix coverity migrate_mode finding (2024-01-04 09:52:42 +0800)

----------------------------------------------------------------
migration 1st pull for 9.0

- We lost Juan and Leo in the maintainers file
- Steven's suspend state fix
- Steven's fix for coverity on migrate_mode
- Avihai's migration cleanup series

----------------------------------------------------------------

Avihai Horon (11):
  migration: Remove migrate_max_downtime() declaration
  migration: Remove nulling of hostname in migrate_init()
  migration: Refactor migration_incoming_setup()
  migration: Remove errp parameter in migration_fd_process_incoming()
  migration/multifd: Fix error message in multifd_recv_initial_packet()
  migration/multifd: Simplify multifd_channel_connect() if else
    statement
  migration/multifd: Fix leaking of Error in TLS error flow
  migration/multifd: Remove error_setg() in
    migration_ioc_process_incoming()
  migration: Fix migration_channel_read_peek() error path
  migration: Remove unnecessary usage of local Error
  migration/multifd: Remove unnecessary usage of local Error

Juan Quintela (1):
  MAINTAINERS: Leaving Migration

Leonardo Bras (1):
  MAINTAINERS: Remove myself as reviewer from Live Migration

Steve Sistare (13):
  cpus: vm_was_suspended
  cpus: stop vm in suspended runstate
  cpus: check running not RUN_STATE_RUNNING
  cpus: vm_resume
  migration: propagate suspended runstate
  migration: preserve suspended runstate
  migration: preserve suspended for snapshot
  migration: preserve suspended for bg_migration
  tests/qtest: migration events
  tests/qtest: option to suspend during migration
  tests/qtest: precopy migration with suspend
  tests/qtest: postcopy migration with suspend
  migration: fix coverity migrate_mode finding

 MAINTAINERS                          |   5 -
 qapi/misc.json                       |  11 +-
 qapi/run-state.json                  |   6 +-
 include/migration/snapshot.h         |   7 ++
 include/sysemu/runstate.h            |  20 +++
 migration/migration.h                |   4 +-
 tests/migration/i386/a-b-bootblock.h |  26 ++--
 tests/qtest/migration-helpers.h      |  11 +-
 backends/tpm/tpm_emulator.c          |   2 +-
 hw/usb/hcd-ehci.c                    |   2 +-
 hw/usb/redirect.c                    |   2 +-
 hw/xen/xen-hvm-common.c              |   2 +-
 migration/channel.c                  |   9 +-
 migration/global_state.c             |  47 ++++---
 migration/migration-hmp-cmds.c       |   8 +-
 migration/migration.c                |  42 ++-----
 migration/multifd.c                  |  27 ++--
 migration/options.c                  |   4 +-
 migration/rdma.c                     |   6 +-
 migration/savevm.c                   |  23 ++--
 system/cpus.c                        |  47 +++++--
 system/runstate.c                    |   9 ++
 system/vl.c                          |   2 +
 tests/qtest/migration-helpers.c      |  25 ++--
 tests/qtest/migration-test.c         | 181 +++++++++++++++++++--------
 .mailmap                             |   1 +
 tests/migration/i386/Makefile        |   5 +-
 tests/migration/i386/a-b-bootblock.S |  50 +++++++-
 28 files changed, 385 insertions(+), 199 deletions(-)

Comments

Peter Maydell Jan. 5, 2024, 4:08 p.m. UTC | #1
On Thu, 4 Jan 2024 at 04:33, <peterx@redhat.com> wrote:
>
> From: Peter Xu <peterx@redhat.com>
>
> The following changes since commit 7425b6277f12e82952cede1f531bfc689bf77fb1:
>
>   Merge tag 'tracing-pull-request' of https://gitlab.com/stefanha/qemu into staging (2023-12-27 05:15:32 -0500)
>
> are available in the Git repository at:
>
>   https://gitlab.com/peterx/qemu.git tags/migration-20240104-pull-request
>
> for you to fetch changes up to b12635ff08ab2e5a6a955c6866ef4525fb3deb5d:
>
>   migration: fix coverity migrate_mode finding (2024-01-04 09:52:42 +0800)
>
> ----------------------------------------------------------------
> migration 1st pull for 9.0
>
> - We lost Juan and Leo in the maintainers file
> - Steven's suspend state fix
> - Steven's fix for coverity on migrate_mode
> - Avihai's migration cleanup series
>
> ----------------------------------------------------------------

I notice that your gpg key doesn't seem to be signed by anybody
else; you might look at whether it's easy to get it signed
by somebody else (eg some of your redhat colleagues).

Applied, thanks.

Please update the changelog at https://wiki.qemu.org/ChangeLog/9.0
for any user-visible changes.

-- PMM
Peter Xu Jan. 7, 2024, 12:33 p.m. UTC | #2
On Fri, Jan 05, 2024 at 04:08:40PM +0000, Peter Maydell wrote:
> I notice that your gpg key doesn't seem to be signed by anybody
> else; you might look at whether it's easy to get it signed
> by somebody else (eg some of your redhat colleagues).

Hmm, I think I have signed with at least Juan and Stefan.  Which is the key
server we normally use?  Maybe I missed some steps there?

Thanks,
Stefan Hajnoczi Jan. 7, 2024, 12:41 p.m. UTC | #3
On Sun, 7 Jan 2024 at 07:34, Peter Xu <peterx@redhat.com> wrote:
>
> On Fri, Jan 05, 2024 at 04:08:40PM +0000, Peter Maydell wrote:
> > I notice that your gpg key doesn't seem to be signed by anybody
> > else; you might look at whether it's easy to get it signed
> > by somebody else (eg some of your redhat colleagues).
>
> Hmm, I think I have signed with at least Juan and Stefan.  Which is the key
> server we normally use?  Maybe I missed some steps there?

Yes, Peter's key is signed by me:

$ gpg --list-signatures 3B5FCCCDF3ABD706
pub   ed25519/0x3B5FCCCDF3ABD706 2023-10-03 [SC]
      Key fingerprint = B918 4DC2 0CC4 57DA CF7D  D1A9 3B5F CCCD F3AB D706
uid                   [  full  ] Peter Xu <xzpeter@gmail.com>
sig 3        0x3B5FCCCDF3ABD706 2023-10-03  [self-signature]
sig          0x9CA4ABB381AB73C8 2023-10-10  Stefan Hajnoczi
<stefanha@redhat.com>
uid                   [  full  ] Peter Xu <peterx@redhat.com>
sig 3        0x3B5FCCCDF3ABD706 2023-10-03  [self-signature]
sig          0x9CA4ABB381AB73C8 2023-10-10  Stefan Hajnoczi
<stefanha@redhat.com>
sub   cv25519/0xD5261EB1CB0C6E45 2023-10-03 [E]
sig          0x3B5FCCCDF3ABD706 2023-10-03  [self-signature]

I have pushed to the keyservers again in case I forget.

Stefan
Peter Maydell Jan. 7, 2024, 3:23 p.m. UTC | #4
On Sun, 7 Jan 2024 at 12:41, Stefan Hajnoczi <stefanha@gmail.com> wrote:
>
> On Sun, 7 Jan 2024 at 07:34, Peter Xu <peterx@redhat.com> wrote:
> >
> > On Fri, Jan 05, 2024 at 04:08:40PM +0000, Peter Maydell wrote:
> > > I notice that your gpg key doesn't seem to be signed by anybody
> > > else; you might look at whether it's easy to get it signed
> > > by somebody else (eg some of your redhat colleagues).
> >
> > Hmm, I think I have signed with at least Juan and Stefan.  Which is the key
> > server we normally use?  Maybe I missed some steps there?
>
> Yes, Peter's key is signed by me:
>
> $ gpg --list-signatures 3B5FCCCDF3ABD706
> pub   ed25519/0x3B5FCCCDF3ABD706 2023-10-03 [SC]
>       Key fingerprint = B918 4DC2 0CC4 57DA CF7D  D1A9 3B5F CCCD F3AB D706
> uid                   [  full  ] Peter Xu <xzpeter@gmail.com>
> sig 3        0x3B5FCCCDF3ABD706 2023-10-03  [self-signature]
> sig          0x9CA4ABB381AB73C8 2023-10-10  Stefan Hajnoczi
> <stefanha@redhat.com>
> uid                   [  full  ] Peter Xu <peterx@redhat.com>
> sig 3        0x3B5FCCCDF3ABD706 2023-10-03  [self-signature]
> sig          0x9CA4ABB381AB73C8 2023-10-10  Stefan Hajnoczi
> <stefanha@redhat.com>
> sub   cv25519/0xD5261EB1CB0C6E45 2023-10-03 [E]
> sig          0x3B5FCCCDF3ABD706 2023-10-03  [self-signature]
>
> I have pushed to the keyservers again in case I forget.

Thanks. Which keyservers did you use? I think these days the
keyserver infrastructure is unfortunately fragmented; I
probably didn't try refreshing from the right keyserver.

-- PMM
Stefan Hajnoczi Jan. 7, 2024, 4:28 p.m. UTC | #5
On Sun, 7 Jan 2024 at 10:23, Peter Maydell <peter.maydell@linaro.org> wrote:
>
> On Sun, 7 Jan 2024 at 12:41, Stefan Hajnoczi <stefanha@gmail.com> wrote:
> >
> > On Sun, 7 Jan 2024 at 07:34, Peter Xu <peterx@redhat.com> wrote:
> > >
> > > On Fri, Jan 05, 2024 at 04:08:40PM +0000, Peter Maydell wrote:
> > > > I notice that your gpg key doesn't seem to be signed by anybody
> > > > else; you might look at whether it's easy to get it signed
> > > > by somebody else (eg some of your redhat colleagues).
> > >
> > > Hmm, I think I have signed with at least Juan and Stefan.  Which is the key
> > > server we normally use?  Maybe I missed some steps there?
> >
> > Yes, Peter's key is signed by me:
> >
> > $ gpg --list-signatures 3B5FCCCDF3ABD706
> > pub   ed25519/0x3B5FCCCDF3ABD706 2023-10-03 [SC]
> >       Key fingerprint = B918 4DC2 0CC4 57DA CF7D  D1A9 3B5F CCCD F3AB D706
> > uid                   [  full  ] Peter Xu <xzpeter@gmail.com>
> > sig 3        0x3B5FCCCDF3ABD706 2023-10-03  [self-signature]
> > sig          0x9CA4ABB381AB73C8 2023-10-10  Stefan Hajnoczi
> > <stefanha@redhat.com>
> > uid                   [  full  ] Peter Xu <peterx@redhat.com>
> > sig 3        0x3B5FCCCDF3ABD706 2023-10-03  [self-signature]
> > sig          0x9CA4ABB381AB73C8 2023-10-10  Stefan Hajnoczi
> > <stefanha@redhat.com>
> > sub   cv25519/0xD5261EB1CB0C6E45 2023-10-03 [E]
> > sig          0x3B5FCCCDF3ABD706 2023-10-03  [self-signature]
> >
> > I have pushed to the keyservers again in case I forget.
>
> Thanks. Which keyservers did you use? I think these days the
> keyserver infrastructure is unfortunately fragmented; I
> probably didn't try refreshing from the right keyserver.

I ran gpg --send-key again and it said hkps://keyserver.ubuntu.com.

Stefan
Peter Xu Jan. 8, 2024, 2:10 a.m. UTC | #6
On Sun, Jan 07, 2024 at 11:28:25AM -0500, Stefan Hajnoczi wrote:
> On Sun, 7 Jan 2024 at 10:23, Peter Maydell <peter.maydell@linaro.org> wrote:
> >
> > On Sun, 7 Jan 2024 at 12:41, Stefan Hajnoczi <stefanha@gmail.com> wrote:
> > >
> > > On Sun, 7 Jan 2024 at 07:34, Peter Xu <peterx@redhat.com> wrote:
> > > >
> > > > On Fri, Jan 05, 2024 at 04:08:40PM +0000, Peter Maydell wrote:
> > > > > I notice that your gpg key doesn't seem to be signed by anybody
> > > > > else; you might look at whether it's easy to get it signed
> > > > > by somebody else (eg some of your redhat colleagues).
> > > >
> > > > Hmm, I think I have signed with at least Juan and Stefan.  Which is the key
> > > > server we normally use?  Maybe I missed some steps there?
> > >
> > > Yes, Peter's key is signed by me:
> > >
> > > $ gpg --list-signatures 3B5FCCCDF3ABD706
> > > pub   ed25519/0x3B5FCCCDF3ABD706 2023-10-03 [SC]
> > >       Key fingerprint = B918 4DC2 0CC4 57DA CF7D  D1A9 3B5F CCCD F3AB D706
> > > uid                   [  full  ] Peter Xu <xzpeter@gmail.com>
> > > sig 3        0x3B5FCCCDF3ABD706 2023-10-03  [self-signature]
> > > sig          0x9CA4ABB381AB73C8 2023-10-10  Stefan Hajnoczi
> > > <stefanha@redhat.com>
> > > uid                   [  full  ] Peter Xu <peterx@redhat.com>
> > > sig 3        0x3B5FCCCDF3ABD706 2023-10-03  [self-signature]
> > > sig          0x9CA4ABB381AB73C8 2023-10-10  Stefan Hajnoczi
> > > <stefanha@redhat.com>
> > > sub   cv25519/0xD5261EB1CB0C6E45 2023-10-03 [E]
> > > sig          0x3B5FCCCDF3ABD706 2023-10-03  [self-signature]
> > >
> > > I have pushed to the keyservers again in case I forget.
> >
> > Thanks. Which keyservers did you use? I think these days the
> > keyserver infrastructure is unfortunately fragmented; I
> > probably didn't try refreshing from the right keyserver.
> 
> I ran gpg --send-key again and it said hkps://keyserver.ubuntu.com.

Thanks Stefan.  Indeed I can only see Stefan's sig there on the key server:

https://keyserver.ubuntu.com/pks/lookup?search=3b5fcccdf3abd706&fingerprint=on&op=index

I am guessing Juan forgot to do a "gpg --send-keys 3B5FCCCDF3ABD706". I'll
also try to ask maybe one or two more people to exchange keys.  Maybe
that'll also help.

Thanks,
Peter Xu Jan. 8, 2024, 2:34 a.m. UTC | #7
On Mon, Jan 08, 2024 at 10:10:24AM +0800, Peter Xu wrote:
> On Sun, Jan 07, 2024 at 11:28:25AM -0500, Stefan Hajnoczi wrote:
> > On Sun, 7 Jan 2024 at 10:23, Peter Maydell <peter.maydell@linaro.org> wrote:
> > >
> > > On Sun, 7 Jan 2024 at 12:41, Stefan Hajnoczi <stefanha@gmail.com> wrote:
> > > >
> > > > On Sun, 7 Jan 2024 at 07:34, Peter Xu <peterx@redhat.com> wrote:
> > > > >
> > > > > On Fri, Jan 05, 2024 at 04:08:40PM +0000, Peter Maydell wrote:
> > > > > > I notice that your gpg key doesn't seem to be signed by anybody
> > > > > > else; you might look at whether it's easy to get it signed
> > > > > > by somebody else (eg some of your redhat colleagues).
> > > > >
> > > > > Hmm, I think I have signed with at least Juan and Stefan.  Which is the key
> > > > > server we normally use?  Maybe I missed some steps there?
> > > >
> > > > Yes, Peter's key is signed by me:
> > > >
> > > > $ gpg --list-signatures 3B5FCCCDF3ABD706
> > > > pub   ed25519/0x3B5FCCCDF3ABD706 2023-10-03 [SC]
> > > >       Key fingerprint = B918 4DC2 0CC4 57DA CF7D  D1A9 3B5F CCCD F3AB D706
> > > > uid                   [  full  ] Peter Xu <xzpeter@gmail.com>
> > > > sig 3        0x3B5FCCCDF3ABD706 2023-10-03  [self-signature]
> > > > sig          0x9CA4ABB381AB73C8 2023-10-10  Stefan Hajnoczi
> > > > <stefanha@redhat.com>
> > > > uid                   [  full  ] Peter Xu <peterx@redhat.com>
> > > > sig 3        0x3B5FCCCDF3ABD706 2023-10-03  [self-signature]
> > > > sig          0x9CA4ABB381AB73C8 2023-10-10  Stefan Hajnoczi
> > > > <stefanha@redhat.com>
> > > > sub   cv25519/0xD5261EB1CB0C6E45 2023-10-03 [E]
> > > > sig          0x3B5FCCCDF3ABD706 2023-10-03  [self-signature]
> > > >
> > > > I have pushed to the keyservers again in case I forget.
> > >
> > > Thanks. Which keyservers did you use? I think these days the
> > > keyserver infrastructure is unfortunately fragmented; I
> > > probably didn't try refreshing from the right keyserver.
> > 
> > I ran gpg --send-key again and it said hkps://keyserver.ubuntu.com.
> 
> Thanks Stefan.  Indeed I can only see Stefan's sig there on the key server:
> 
> https://keyserver.ubuntu.com/pks/lookup?search=3b5fcccdf3abd706&fingerprint=on&op=index
> 
> I am guessing Juan forgot to do a "gpg --send-keys 3B5FCCCDF3ABD706". I'll
> also try to ask maybe one or two more people to exchange keys.  Maybe
> that'll also help.

Besides that, just now I also tried to do a remote --recv-keys on my own
key and I found that indeed the signature from Stefan was not attached.

Then I found this:

https://daniel-lange.com/archives/178-Getting-gpg-to-import-signatures-again.html

So it seems the default behavior of gpg command changed recently that it'll
stop to receive signatures besides the self signature to avoid DoS to the
keyservers.

https://dev.gnupg.org/rG23c978640812d123eaffd4108744bdfcf48f7c93

In short, now we seem to need:

  $ gpg --recv-keys --keyserver-option no-self-sigs-only $KEY_ID

To recover the old behavior to receive signs from others.

Thanks,
Peter Maydell Jan. 8, 2024, 3:22 p.m. UTC | #8
On Mon, 8 Jan 2024 at 02:35, Peter Xu <peterx@redhat.com> wrote:
>
> On Mon, Jan 08, 2024 at 10:10:24AM +0800, Peter Xu wrote:
> > On Sun, Jan 07, 2024 at 11:28:25AM -0500, Stefan Hajnoczi wrote:
> > > On Sun, 7 Jan 2024 at 10:23, Peter Maydell <peter.maydell@linaro.org> wrote:
> > > >
> > > > On Sun, 7 Jan 2024 at 12:41, Stefan Hajnoczi <stefanha@gmail.com> wrote:
> > > > >
> > > > > On Sun, 7 Jan 2024 at 07:34, Peter Xu <peterx@redhat.com> wrote:
> > > > > >
> > > > > > On Fri, Jan 05, 2024 at 04:08:40PM +0000, Peter Maydell wrote:
> > > > > > > I notice that your gpg key doesn't seem to be signed by anybody
> > > > > > > else; you might look at whether it's easy to get it signed
> > > > > > > by somebody else (eg some of your redhat colleagues).
> > > > > >
> > > > > > Hmm, I think I have signed with at least Juan and Stefan.  Which is the key
> > > > > > server we normally use?  Maybe I missed some steps there?
> > > > >
> > > > > Yes, Peter's key is signed by me:
> > > > >
> > > > > $ gpg --list-signatures 3B5FCCCDF3ABD706
> > > > > pub   ed25519/0x3B5FCCCDF3ABD706 2023-10-03 [SC]
> > > > >       Key fingerprint = B918 4DC2 0CC4 57DA CF7D  D1A9 3B5F CCCD F3AB D706
> > > > > uid                   [  full  ] Peter Xu <xzpeter@gmail.com>
> > > > > sig 3        0x3B5FCCCDF3ABD706 2023-10-03  [self-signature]
> > > > > sig          0x9CA4ABB381AB73C8 2023-10-10  Stefan Hajnoczi
> > > > > <stefanha@redhat.com>
> > > > > uid                   [  full  ] Peter Xu <peterx@redhat.com>
> > > > > sig 3        0x3B5FCCCDF3ABD706 2023-10-03  [self-signature]
> > > > > sig          0x9CA4ABB381AB73C8 2023-10-10  Stefan Hajnoczi
> > > > > <stefanha@redhat.com>
> > > > > sub   cv25519/0xD5261EB1CB0C6E45 2023-10-03 [E]
> > > > > sig          0x3B5FCCCDF3ABD706 2023-10-03  [self-signature]
> > > > >
> > > > > I have pushed to the keyservers again in case I forget.
> > > >
> > > > Thanks. Which keyservers did you use? I think these days the
> > > > keyserver infrastructure is unfortunately fragmented; I
> > > > probably didn't try refreshing from the right keyserver.
> > >
> > > I ran gpg --send-key again and it said hkps://keyserver.ubuntu.com.
> >
> > Thanks Stefan.  Indeed I can only see Stefan's sig there on the key server:
> >
> > https://keyserver.ubuntu.com/pks/lookup?search=3b5fcccdf3abd706&fingerprint=on&op=index
> >
> > I am guessing Juan forgot to do a "gpg --send-keys 3B5FCCCDF3ABD706". I'll
> > also try to ask maybe one or two more people to exchange keys.  Maybe
> > that'll also help.
>
> Besides that, just now I also tried to do a remote --recv-keys on my own
> key and I found that indeed the signature from Stefan was not attached.
>
> Then I found this:
>
> https://daniel-lange.com/archives/178-Getting-gpg-to-import-signatures-again.html
>
> So it seems the default behavior of gpg command changed recently that it'll
> stop to receive signatures besides the self signature to avoid DoS to the
> keyservers.
>
> https://dev.gnupg.org/rG23c978640812d123eaffd4108744bdfcf48f7c93
>
> In short, now we seem to need:
>
>   $ gpg --recv-keys --keyserver-option no-self-sigs-only $KEY_ID
>
> To recover the old behavior to receive signs from others.

Ah, thank you. Yes, that did the trick and I now can see the
signatures on your key from other people.

-- PMM