| Message ID | 1443793405-15190-1-git-send-email-mst@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Fri, Oct 02, 2015 at 04:45:36PM +0300, Michael S. Tsirkin wrote: > From: Greg Kurz <gkurz@linux.vnet.ibm.com> > > In a cross-endian setup, the virtio-9p device has state in @device_endian. It > must be migrated. This patch just adds the minimal support to live migrate > generic virtio subsections where @device_endian is handled. > > Please note that this is unrelated to the fact that we block migration when > the 9p share is mounted in the guest. It fixes the case where we want to > migrate an unactive 9p device (not mounted in the guest) to a QEMU with > different endianness: the migration currently succeeds but leaves the device > in an inconsistent state that causes mount to hang until we reboot the guest. > > Signed-off-by: Greg Kurz <gkurz@linux.vnet.ibm.com> > Reviewed-by: Michael S. Tsirkin <mst@redhat.com> > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> I rebased and dropped this at Greg's request. > --- > hw/9pfs/virtio-9p-device.c | 11 +++++++++++ > 1 file changed, 11 insertions(+) > > diff --git a/hw/9pfs/virtio-9p-device.c b/hw/9pfs/virtio-9p-device.c > index 93a407c..e3abcfa 100644 > --- a/hw/9pfs/virtio-9p-device.c > +++ b/hw/9pfs/virtio-9p-device.c > @@ -43,6 +43,16 @@ static void virtio_9p_get_config(VirtIODevice *vdev, uint8_t *config) > g_free(cfg); > } > > +static void virtio_9p_save(QEMUFile *f, void *opaque) > +{ > + virtio_save(VIRTIO_DEVICE(opaque), f); > +} > + > +static int virtio_9p_load(QEMUFile *f, void *opaque, int version_id) > +{ > + return virtio_load(VIRTIO_DEVICE(opaque), f, version_id); > +} > + > static void virtio_9p_device_realize(DeviceState *dev, Error **errp) > { > VirtIODevice *vdev = VIRTIO_DEVICE(dev); > @@ -130,6 +140,7 @@ static void virtio_9p_device_realize(DeviceState *dev, Error **errp) > } > v9fs_path_free(&path); > > + register_savevm(dev, "virtio-9p", -1, 1, virtio_9p_save, virtio_9p_load, s); > return; > out: > g_free(s->ctx.fs_root); > -- > MST >
On Fri, Oct 02, 2015 at 04:44:58PM +0300, Michael S. Tsirkin wrote: > I expected to also merge memory allocation refactoring > and vhost user migration support, but that appears to > need more work. > > The following changes since commit fa500928ad9da6dd570918e3dfca13c029af07a8: > > Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20150930' into staging (2015-10-01 10:49:38 +0100) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream > > for you to fetch changes up to a9faaa0aa97509cc14adb9f7ce2f3bfcd88066c4: I rebased, dropping 1 patch. new commit 6fdac09370530be0cc6fe9e8d425c0670ba994b1 Sorry about the noise. > vhost-user-test: fix predictable filename on tmpfs (2015-10-02 16:40:58 +0300) > > ---------------------------------------------------------------- > virtio,pc features, fixes > > New features: > guest RAM buffer overrun mitigation > RAM physical address gaps for memory hotplug > (except refactoring which got some review comments) > virtio-9f migration (when unmounted) > > Signed-off-by: Michael S. Tsirkin <mst@redhat.com> > > ---------------------------------------------------------------- > Eduardo Habkost (1): > pc: Add a comment explaining why pc_compat_2_4() doesn't exist > > Greg Kurz (1): > virtio-9p: migrate virtio subsections > > Igor Mammedov (2): > memhp: extend address auto assignment to support gaps > pc: memhp: force gaps between DIMM's GPA > > Jason Wang (3): > virtio: introduce virtqueue_unmap_sg() > virtio: introduce virtqueue_discard() > virtio-net: correctly drop truncated packets > > Michael S. Tsirkin (6): > oslib: rework anonimous RAM allocation > oslib: allocate PROT_NONE pages on top of RAM > exec: allocate PROT_NONE pages on top of RAM > vhost-user: unit test for new messages > vhost-user-test: use tmpfs by default > vhost-user-test: fix predictable filename on tmpfs > > Paolo Bonzini (1): > vhost-user-test: do not reinvent glib-compat.h > > Richard Henderson (1): > virtio: Notice when the system doesn't support MSIx at all > > include/hw/i386/pc.h | 1 + > include/hw/mem/pc-dimm.h | 7 +- > include/hw/virtio/virtio.h | 2 + > exec.c | 42 ++++++++++- > hw/9pfs/virtio-9p-device.c | 11 +++ > hw/i386/pc.c | 5 +- > hw/i386/pc_piix.c | 8 +++ > hw/i386/pc_q35.c | 8 +++ > hw/mem/pc-dimm.c | 15 ++-- > hw/net/virtio-net.c | 8 +-- > hw/ppc/spapr.c | 2 +- > hw/virtio/virtio-pci.c | 17 +++-- > hw/virtio/virtio.c | 21 ++++-- > tests/vhost-user-test.c | 170 ++++++++++++++++----------------------------- > util/oslib-posix.c | 20 ++++-- > 15 files changed, 190 insertions(+), 147 deletions(-) >
On 10/02/2015 08:06 AM, Michael S. Tsirkin wrote: > On Fri, Oct 02, 2015 at 04:44:58PM +0300, Michael S. Tsirkin wrote: >> I expected to also merge memory allocation refactoring >> and vhost user migration support, but that appears to >> need more work. >> > > I rebased, dropping 1 patch. > new commit 6fdac09370530be0cc6fe9e8d425c0670ba994b1 > Sorry about the noise. > >> Michael S. Tsirkin (6): >> oslib: rework anonimous RAM allocation Do you want to also rebase to fix the subject line typo?
On 2 October 2015 at 15:06, Michael S. Tsirkin <mst@redhat.com> wrote: > On Fri, Oct 02, 2015 at 04:44:58PM +0300, Michael S. Tsirkin wrote: >> I expected to also merge memory allocation refactoring >> and vhost user migration support, but that appears to >> need more work. >> >> The following changes since commit fa500928ad9da6dd570918e3dfca13c029af07a8: >> >> Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20150930' into staging (2015-10-01 10:49:38 +0100) >> >> are available in the git repository at: >> >> git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream >> >> for you to fetch changes up to a9faaa0aa97509cc14adb9f7ce2f3bfcd88066c4: > > I rebased, dropping 1 patch. > new commit 6fdac09370530be0cc6fe9e8d425c0670ba994b1 > Sorry about the noise. > >> vhost-user-test: fix predictable filename on tmpfs (2015-10-02 16:40:58 +0300) >> >> ---------------------------------------------------------------- >> virtio,pc features, fixes >> >> New features: >> guest RAM buffer overrun mitigation >> RAM physical address gaps for memory hotplug >> (except refactoring which got some review comments) >> virtio-9f migration (when unmounted) >> >> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> >> Applied, thanks. -- PMM
I expected to also merge memory allocation refactoring and vhost user migration support, but that appears to need more work. The following changes since commit fa500928ad9da6dd570918e3dfca13c029af07a8: Merge remote-tracking branch 'remotes/juanquintela/tags/migration/20150930' into staging (2015-10-01 10:49:38 +0100) are available in the git repository at: git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream for you to fetch changes up to a9faaa0aa97509cc14adb9f7ce2f3bfcd88066c4: vhost-user-test: fix predictable filename on tmpfs (2015-10-02 16:40:58 +0300) ---------------------------------------------------------------- virtio,pc features, fixes New features: guest RAM buffer overrun mitigation RAM physical address gaps for memory hotplug (except refactoring which got some review comments) virtio-9f migration (when unmounted) Signed-off-by: Michael S. Tsirkin <mst@redhat.com> ---------------------------------------------------------------- Eduardo Habkost (1): pc: Add a comment explaining why pc_compat_2_4() doesn't exist Greg Kurz (1): virtio-9p: migrate virtio subsections Igor Mammedov (2): memhp: extend address auto assignment to support gaps pc: memhp: force gaps between DIMM's GPA Jason Wang (3): virtio: introduce virtqueue_unmap_sg() virtio: introduce virtqueue_discard() virtio-net: correctly drop truncated packets Michael S. Tsirkin (6): oslib: rework anonimous RAM allocation oslib: allocate PROT_NONE pages on top of RAM exec: allocate PROT_NONE pages on top of RAM vhost-user: unit test for new messages vhost-user-test: use tmpfs by default vhost-user-test: fix predictable filename on tmpfs Paolo Bonzini (1): vhost-user-test: do not reinvent glib-compat.h Richard Henderson (1): virtio: Notice when the system doesn't support MSIx at all include/hw/i386/pc.h | 1 + include/hw/mem/pc-dimm.h | 7 +- include/hw/virtio/virtio.h | 2 + exec.c | 42 ++++++++++- hw/9pfs/virtio-9p-device.c | 11 +++ hw/i386/pc.c | 5 +- hw/i386/pc_piix.c | 8 +++ hw/i386/pc_q35.c | 8 +++ hw/mem/pc-dimm.c | 15 ++-- hw/net/virtio-net.c | 8 +-- hw/ppc/spapr.c | 2 +- hw/virtio/virtio-pci.c | 17 +++-- hw/virtio/virtio.c | 21 ++++-- tests/vhost-user-test.c | 170 ++++++++++++++++----------------------------- util/oslib-posix.c | 20 ++++-- 15 files changed, 190 insertions(+), 147 deletions(-)