diff options
author | Markus Armbruster <armbru@redhat.com> | 2016-03-15 19:34:54 +0100 |
---|---|---|
committer | Markus Armbruster <armbru@redhat.com> | 2016-03-21 21:29:03 +0100 |
commit | 62a830b688a93419baa89061b6b5faf8b5e10808 (patch) | |
tree | 546264772d3bb4ca39b61aa14f13eac1d44eb016 /hw/misc | |
parent | 13fd2cb68953ac066116d444415f9d5ec7ce1200 (diff) | |
download | qemu-62a830b688a93419baa89061b6b5faf8b5e10808.zip qemu-62a830b688a93419baa89061b6b5faf8b5e10808.tar.gz qemu-62a830b688a93419baa89061b6b5faf8b5e10808.tar.bz2 |
ivshmem: Require master to have ID zero
Migration with ivshmem needs to be carefully orchestrated to work.
Exactly one peer (the "master") migrates to the destination, all other
peers need to unplug (and disconnect), migrate, plug back (and
reconnect). This is sort of documented in qemu-doc.
If peers connect on the destination before migration completes, the
shared memory can get messed up. This isn't documented anywhere. Fix
that in qemu-doc.
To avoid messing up register IVPosition on migration, the server must
assign the same ID on source and destination. ivshmem-spec.txt leaves
ID assignment unspecified, however.
Amend ivshmem-spec.txt to require the first client to receive ID zero.
The example ivshmem-server complies: it always assigns the first
unused ID.
For a bit of additional safety, enforce ID zero for the master. This
does nothing when we're not using a server, because the ID is zero for
all peers then.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <1458066895-20632-40-git-send-email-armbru@redhat.com>
Diffstat (limited to 'hw/misc')
-rw-r--r-- | hw/misc/ivshmem.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c index 4552060..132387f 100644 --- a/hw/misc/ivshmem.c +++ b/hw/misc/ivshmem.c @@ -887,6 +887,12 @@ static void ivshmem_common_realize(PCIDevice *dev, Error **errp) return; } + if (s->master == ON_OFF_AUTO_ON && s->vm_id != 0) { + error_setg(errp, + "master must connect to the server before any peers"); + return; + } + qemu_chr_add_handlers(s->server_chr, ivshmem_can_receive, ivshmem_read, NULL, s); |