| Message ID | 20210204095834.345749-1-stefanha@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, 4 Feb 2021 at 09:58, Stefan Hajnoczi <stefanha@redhat.com> wrote: > > The following changes since commit 77f3804ab7ed94b471a14acb260e5aeacf26193f: > > Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (2021-02-02 16:47:51 +0000) > > are available in the Git repository at: > > https://gitlab.com/stefanha/qemu.git tags/block-pull-request > > for you to fetch changes up to 026362226f1ff6a1168524a326bbd6347ad40e85: > > docs: fix Parallels Image "dirty bitmap" section (2021-02-03 16:48:21 +0000) > > ---------------------------------------------------------------- > Pull request > > The pull request includes Multi-Process QEMU, GitLab repo URL updates, and even > a block layer patch to fix the Parallels Image format specification! > > ---------------------------------------------------------------- This has merge conflicts: Auto-merging util/oslib-posix.c CONFLICT (content): Merge conflict in util/oslib-posix.c Auto-merging util/mmap-alloc.c CONFLICT (content): Merge conflict in util/mmap-alloc.c Auto-merging softmmu/physmem.c CONFLICT (content): Merge conflict in softmmu/physmem.c Auto-merging softmmu/memory.c CONFLICT (content): Merge conflict in softmmu/memory.c Auto-merging include/qemu/mmap-alloc.h Auto-merging include/exec/ram_addr.h CONFLICT (content): Merge conflict in include/exec/ram_addr.h Auto-merging include/exec/memory.h Auto-merging hw/Kconfig Automatic merge failed; fix conflicts and then commit the result. Can you rebase and resend, please? thanks -- PMM
On Thu, Feb 04, 2021 at 10:02:25AM +0000, Peter Maydell wrote: > On Thu, 4 Feb 2021 at 09:58, Stefan Hajnoczi <stefanha@redhat.com> wrote: > > > > The following changes since commit 77f3804ab7ed94b471a14acb260e5aeacf26193f: > > > > Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (2021-02-02 16:47:51 +0000) > > > > are available in the Git repository at: > > > > https://gitlab.com/stefanha/qemu.git tags/block-pull-request > > > > for you to fetch changes up to 026362226f1ff6a1168524a326bbd6347ad40e85: > > > > docs: fix Parallels Image "dirty bitmap" section (2021-02-03 16:48:21 +0000) > > > > ---------------------------------------------------------------- > > Pull request > > > > The pull request includes Multi-Process QEMU, GitLab repo URL updates, and even > > a block layer patch to fix the Parallels Image format specification! > > > > ---------------------------------------------------------------- > > This has merge conflicts: > > Auto-merging util/oslib-posix.c > CONFLICT (content): Merge conflict in util/oslib-posix.c > Auto-merging util/mmap-alloc.c > CONFLICT (content): Merge conflict in util/mmap-alloc.c > Auto-merging softmmu/physmem.c > CONFLICT (content): Merge conflict in softmmu/physmem.c > Auto-merging softmmu/memory.c > CONFLICT (content): Merge conflict in softmmu/memory.c > Auto-merging include/qemu/mmap-alloc.h > Auto-merging include/exec/ram_addr.h > CONFLICT (content): Merge conflict in include/exec/ram_addr.h > Auto-merging include/exec/memory.h > Auto-merging hw/Kconfig > Automatic merge failed; fix conflicts and then commit the result. > > Can you rebase and resend, please? Will resend. Thanks! Stefan
The following changes since commit 77f3804ab7ed94b471a14acb260e5aeacf26193f: Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (2021-02-02 16:47:51 +0000) are available in the Git repository at: https://gitlab.com/stefanha/qemu.git tags/block-pull-request for you to fetch changes up to 026362226f1ff6a1168524a326bbd6347ad40e85: docs: fix Parallels Image "dirty bitmap" section (2021-02-03 16:48:21 +0000) ---------------------------------------------------------------- Pull request The pull request includes Multi-Process QEMU, GitLab repo URL updates, and even a block layer patch to fix the Parallels Image format specification! ---------------------------------------------------------------- Denis V. Lunev (1): docs: fix Parallels Image "dirty bitmap" section Elena Ufimtseva (8): multi-process: add configure and usage information io: add qio_channel_writev_full_all helper io: add qio_channel_readv_full_all_eof & qio_channel_readv_full_all helpers multi-process: define MPQemuMsg format and transmission functions multi-process: introduce proxy object multi-process: add proxy communication functions multi-process: Forward PCI config space acceses to the remote process multi-process: perform device reset in the remote process Jagannathan Raman (11): memory: alloc RAM from file at offset multi-process: Add config option for multi-process QEMU multi-process: setup PCI host bridge for remote device multi-process: setup a machine object for remote device process multi-process: Initialize message handler in remote device multi-process: Associate fd of a PCIDevice with its object multi-process: setup memory manager for remote device multi-process: PCI BAR read/write handling for proxy & remote endpoints multi-process: Synchronize remote memory multi-process: create IOHUB object to handle irq multi-process: Retrieve PCI info from remote process John G Johnson (1): multi-process: add the concept description to docs/devel/qemu-multiprocess Stefan Hajnoczi (6): .github: point Repo Lockdown bot to GitLab repo gitmodules: use GitLab repos instead of qemu.org gitlab-ci: remove redundant GitLab repo URL command docs: update README to use GitLab repo URLs pc-bios: update mirror URLs to GitLab get_maintainer: update repo URL to GitLab MAINTAINERS | 24 + README.rst | 4 +- docs/devel/index.rst | 1 + docs/devel/multi-process.rst | 966 ++++++++++++++++++++++ docs/system/index.rst | 1 + docs/system/multi-process.rst | 64 ++ docs/interop/parallels.txt | 2 +- configure | 10 + meson.build | 5 +- hw/remote/trace.h | 1 + include/exec/memory.h | 2 + include/exec/ram_addr.h | 2 +- include/hw/pci-host/remote.h | 30 + include/hw/pci/pci_ids.h | 3 + include/hw/remote/iohub.h | 42 + include/hw/remote/machine.h | 38 + include/hw/remote/memory.h | 19 + include/hw/remote/mpqemu-link.h | 99 +++ include/hw/remote/proxy-memory-listener.h | 28 + include/hw/remote/proxy.h | 48 ++ include/io/channel.h | 78 ++ include/qemu/mmap-alloc.h | 4 +- include/sysemu/iothread.h | 6 + backends/hostmem-memfd.c | 2 +- hw/misc/ivshmem.c | 3 +- hw/pci-host/remote.c | 75 ++ hw/remote/iohub.c | 119 +++ hw/remote/machine.c | 80 ++ hw/remote/memory.c | 65 ++ hw/remote/message.c | 230 ++++++ hw/remote/mpqemu-link.c | 267 ++++++ hw/remote/proxy-memory-listener.c | 227 +++++ hw/remote/proxy.c | 379 +++++++++ hw/remote/remote-obj.c | 203 +++++ io/channel.c | 116 ++- iothread.c | 6 + softmmu/memory.c | 3 +- softmmu/physmem.c | 11 +- util/mmap-alloc.c | 7 +- util/oslib-posix.c | 2 +- .github/lockdown.yml | 8 +- .gitlab-ci.yml | 1 - .gitmodules | 44 +- Kconfig.host | 4 + hw/Kconfig | 1 + hw/meson.build | 1 + hw/pci-host/Kconfig | 3 + hw/pci-host/meson.build | 1 + hw/remote/Kconfig | 4 + hw/remote/meson.build | 13 + hw/remote/trace-events | 4 + pc-bios/README | 4 +- scripts/get_maintainer.pl | 2 +- 53 files changed, 3294 insertions(+), 68 deletions(-) create mode 100644 docs/devel/multi-process.rst create mode 100644 docs/system/multi-process.rst create mode 100644 hw/remote/trace.h create mode 100644 include/hw/pci-host/remote.h create mode 100644 include/hw/remote/iohub.h create mode 100644 include/hw/remote/machine.h create mode 100644 include/hw/remote/memory.h create mode 100644 include/hw/remote/mpqemu-link.h create mode 100644 include/hw/remote/proxy-memory-listener.h create mode 100644 include/hw/remote/proxy.h create mode 100644 hw/pci-host/remote.c create mode 100644 hw/remote/iohub.c create mode 100644 hw/remote/machine.c create mode 100644 hw/remote/memory.c create mode 100644 hw/remote/message.c create mode 100644 hw/remote/mpqemu-link.c create mode 100644 hw/remote/proxy-memory-listener.c create mode 100644 hw/remote/proxy.c create mode 100644 hw/remote/remote-obj.c create mode 100644 hw/remote/Kconfig create mode 100644 hw/remote/meson.build create mode 100644 hw/remote/trace-events