Series comparison

-[Qemu-devel] [PULL 00/12] Block patches
+[PULL 00/27] Block patches
-The following changes since commit bfec359afba088aaacc7d316f43302f28c6e642a:
+The following changes since commit 77f3804ab7ed94b471a14acb260e5aeacf26193f:
-  Merge remote-tracking branch 'remotes/armbru/tags/pull-qdev-2017-04-21' into staging (2017-04-21 11:42:03 +0100)
+  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:
+are available in the Git repository at:
-  git://github.com/codyprime/qemu-kvm-jtc.git tags/block-pull-request
+  https://gitlab.com/stefanha/qemu.git tags/block-pull-request
-for you to fetch changes up to 1507631e438930bc07f776f303af127a9cdb4d41:
+for you to fetch changes up to 026362226f1ff6a1168524a326bbd6347ad40e85:
-  qemu-iotests: _cleanup_qemu must be called on exit (2017-04-21 08:32:44 -0400)
+  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!
 ----------------------------------------------------------------
-Block patches for 2.10
+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
-Ashish Mittal (2):
+Jagannathan Raman (11):
-  block/vxhs.c: Add support for a new block device type called "vxhs"
+  memory: alloc RAM from file at offset
-  block/vxhs.c: Add qemu-iotests for new block device type "vxhs"
+  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
-Jeff Cody (10):
+John G Johnson (1):
-  qemu-iotests: exclude vxhs from image creation via protocol
+  multi-process: add the concept description to
-  block: add bdrv_set_read_only() helper function
+    docs/devel/qemu-multiprocess
   block: do not set BDS read_only if copy_on_read enabled
   block: honor BDRV_O_ALLOW_RDWR when clearing bs->read_only
   block: code movement
   block: introduce bdrv_can_set_read_only()
   block: use bdrv_can_set_read_only() during reopen
   block/rbd - update variable names to more apt names
   block/rbd: Add support for reopen()
   qemu-iotests: _cleanup_qemu must be called on exit
- block.c                          |  56 +++-
+Stefan Hajnoczi (6):
- block/Makefile.objs              |   2 +
+  .github: point Repo Lockdown bot to GitLab repo
- block/bochs.c                    |   5 +-
+  gitmodules: use GitLab repos instead of qemu.org
- block/cloop.c                    |   5 +-
+  gitlab-ci: remove redundant GitLab repo URL command
- block/dmg.c                      |   6 +-
+  docs: update README to use GitLab repo URLs
- block/rbd.c                      |  65 +++--
+  pc-bios: update mirror URLs to GitLab
- block/trace-events               |  17 ++
+  get_maintainer: update repo URL to GitLab
- block/vvfat.c                    |  19 +-
- block/vxhs.c                     | 575 +++++++++++++++++++++++++++++++++++++++
+ MAINTAINERS                               |  24 +
- configure                        |  39 +++
+ README.rst                                |   4 +-
- include/block/block.h            |   2 +
+ docs/devel/index.rst                      |   1 +
- qapi/block-core.json             |  23 +-
+ docs/devel/multi-process.rst              | 966 ++++++++++++++++++++++
- tests/qemu-iotests/017           |   1 +
+ docs/system/index.rst                     |   1 +
- tests/qemu-iotests/020           |   1 +
+ docs/system/multi-process.rst             |  64 ++
- tests/qemu-iotests/028           |   1 +
+ docs/interop/parallels.txt                |   2 +-
- tests/qemu-iotests/029           |   1 +
+ configure                                 |  10 +
- tests/qemu-iotests/073           |   1 +
+ meson.build                               |   5 +-
- tests/qemu-iotests/094           |  11 +-
+ hw/remote/trace.h                         |   1 +
- tests/qemu-iotests/102           |   5 +-
+ include/exec/memory.h                     |   2 +
- tests/qemu-iotests/109           |   1 +
+ include/exec/ram_addr.h                   |   2 +-
- tests/qemu-iotests/114           |   1 +
+ include/hw/pci-host/remote.h              |  30 +
- tests/qemu-iotests/117           |   1 +
+ include/hw/pci/pci_ids.h                  |   3 +
- tests/qemu-iotests/130           |   2 +
+ include/hw/remote/iohub.h                 |  42 +
- tests/qemu-iotests/134           |   1 +
+ include/hw/remote/machine.h               |  38 +
- tests/qemu-iotests/140           |   1 +
+ include/hw/remote/memory.h                |  19 +
- tests/qemu-iotests/141           |   1 +
+ include/hw/remote/mpqemu-link.h           |  99 +++
- tests/qemu-iotests/143           |   1 +
+ include/hw/remote/proxy-memory-listener.h |  28 +
- tests/qemu-iotests/156           |   2 +
+ include/hw/remote/proxy.h                 |  48 ++
- tests/qemu-iotests/158           |   1 +
+ include/io/channel.h                      |  78 ++
- tests/qemu-iotests/common        |   6 +
+ include/qemu/mmap-alloc.h                 |   4 +-
- tests/qemu-iotests/common.config |  13 +
+ include/sysemu/iothread.h                 |   6 +
- tests/qemu-iotests/common.filter |   1 +
+ backends/hostmem-memfd.c                  |   2 +-
- tests/qemu-iotests/common.rc     |  19 ++
+ hw/misc/ivshmem.c                         |   3 +-
-files changed, 844 insertions(+), 42 deletions(-)
+ hw/pci-host/remote.c                      |  75 ++
- create mode 100644 block/vxhs.c
+ 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 +-
 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
 --
-.9.3
+.29.2

-New patch
+[PULL 01/27] .github: point Repo Lockdown bot to GitLab repo
+Use the GitLab repo URL as the main repo location in order to reduce
+load on qemu.org.
+Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
+Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
+Reviewed-by: Thomas Huth <thuth@redhat.com>
+Message-id: 20210111115017.156802-2-stefanha@redhat.com
+Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
+---
+ .github/lockdown.yml | 8 ++++----
+file changed, 4 insertions(+), 4 deletions(-)
+diff --git a/.github/lockdown.yml b/.github/lockdown.yml
+index XXXXXXX..XXXXXXX 100644
+--- a/.github/lockdown.yml
++++ b/.github/lockdown.yml
+@@ -XXX,XX +XXX,XX @@ issues:
+   comment: |
+     Thank you for your interest in the QEMU project.
+-    This repository is a read-only mirror of the project's master
+-    repostories hosted on https://git.qemu.org/git/qemu.git.
++    This repository is a read-only mirror of the project's repostories hosted
++    at https://gitlab.com/qemu-project/qemu.git.
+     The project does not process issues filed on GitHub.
+     The project issues are tracked on Launchpad:
+@@ -XXX,XX +XXX,XX @@ pulls:
+   comment: |
+     Thank you for your interest in the QEMU project.
+-    This repository is a read-only mirror of the project's master
+-    repostories hosted on https://git.qemu.org/git/qemu.git.
++    This repository is a read-only mirror of the project's repostories hosted
++    on https://gitlab.com/qemu-project/qemu.git.
+     The project does not process merge requests filed on GitHub.
+     QEMU welcomes contributions of code (either fixing bugs or adding new
+--
+.29.2

-New patch
+[PULL 02/27] gitmodules: use GitLab repos instead of qemu.org
+qemu.org is running out of bandwidth and the QEMU project is moving
+towards a gating CI on GitLab. Use the GitLab repos instead of qemu.org
+(they will become mirrors).
+Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
+Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
+Reviewed-by: Thomas Huth <thuth@redhat.com>
+Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
+Message-id: 20210111115017.156802-3-stefanha@redhat.com
+Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
+---
+ .gitmodules | 44 ++++++++++++++++++++++----------------------
+file changed, 22 insertions(+), 22 deletions(-)
+diff --git a/.gitmodules b/.gitmodules
+index XXXXXXX..XXXXXXX 100644
+--- a/.gitmodules
++++ b/.gitmodules
+@@ -XXX,XX +XXX,XX @@
+ [submodule "roms/seabios"]
+     path = roms/seabios
+-    url = https://git.qemu.org/git/seabios.git/
++    url = https://gitlab.com/qemu-project/seabios.git/
+ [submodule "roms/SLOF"]
+     path = roms/SLOF
+-    url = https://git.qemu.org/git/SLOF.git
++    url = https://gitlab.com/qemu-project/SLOF.git
+ [submodule "roms/ipxe"]
+     path = roms/ipxe
+-    url = https://git.qemu.org/git/ipxe.git
++    url = https://gitlab.com/qemu-project/ipxe.git
+ [submodule "roms/openbios"]
+     path = roms/openbios
+-    url = https://git.qemu.org/git/openbios.git
++    url = https://gitlab.com/qemu-project/openbios.git
+ [submodule "roms/qemu-palcode"]
+     path = roms/qemu-palcode
+-    url = https://git.qemu.org/git/qemu-palcode.git
++    url = https://gitlab.com/qemu-project/qemu-palcode.git
+ [submodule "roms/sgabios"]
+     path = roms/sgabios
+-    url = https://git.qemu.org/git/sgabios.git
++    url = https://gitlab.com/qemu-project/sgabios.git
+ [submodule "dtc"]
+     path = dtc
+-    url = https://git.qemu.org/git/dtc.git
++    url = https://gitlab.com/qemu-project/dtc.git
+ [submodule "roms/u-boot"]
+     path = roms/u-boot
+-    url = https://git.qemu.org/git/u-boot.git
++    url = https://gitlab.com/qemu-project/u-boot.git
+ [submodule "roms/skiboot"]
+     path = roms/skiboot
+-    url = https://git.qemu.org/git/skiboot.git
++    url = https://gitlab.com/qemu-project/skiboot.git
+ [submodule "roms/QemuMacDrivers"]
+     path = roms/QemuMacDrivers
+-    url = https://git.qemu.org/git/QemuMacDrivers.git
++    url = https://gitlab.com/qemu-project/QemuMacDrivers.git
+ [submodule "ui/keycodemapdb"]
+     path = ui/keycodemapdb
+-    url = https://git.qemu.org/git/keycodemapdb.git
++    url = https://gitlab.com/qemu-project/keycodemapdb.git
+ [submodule "capstone"]
+     path = capstone
+-    url = https://git.qemu.org/git/capstone.git
++    url = https://gitlab.com/qemu-project/capstone.git
+ [submodule "roms/seabios-hppa"]
+     path = roms/seabios-hppa
+-    url = https://git.qemu.org/git/seabios-hppa.git
++    url = https://gitlab.com/qemu-project/seabios-hppa.git
+ [submodule "roms/u-boot-sam460ex"]
+     path = roms/u-boot-sam460ex
+-    url = https://git.qemu.org/git/u-boot-sam460ex.git
++    url = https://gitlab.com/qemu-project/u-boot-sam460ex.git
+ [submodule "tests/fp/berkeley-testfloat-3"]
+     path = tests/fp/berkeley-testfloat-3
+-    url = https://git.qemu.org/git/berkeley-testfloat-3.git
++    url = https://gitlab.com/qemu-project/berkeley-testfloat-3.git
+ [submodule "tests/fp/berkeley-softfloat-3"]
+     path = tests/fp/berkeley-softfloat-3
+-    url = https://git.qemu.org/git/berkeley-softfloat-3.git
++    url = https://gitlab.com/qemu-project/berkeley-softfloat-3.git
+ [submodule "roms/edk2"]
+     path = roms/edk2
+-    url = https://git.qemu.org/git/edk2.git
++    url = https://gitlab.com/qemu-project/edk2.git
+ [submodule "slirp"]
+     path = slirp
+-    url = https://git.qemu.org/git/libslirp.git
++    url = https://gitlab.com/qemu-project/libslirp.git
+ [submodule "roms/opensbi"]
+     path = roms/opensbi
+-    url =     https://git.qemu.org/git/opensbi.git
++    url =     https://gitlab.com/qemu-project/opensbi.git
+ [submodule "roms/qboot"]
+     path = roms/qboot
+-    url = https://git.qemu.org/git/qboot.git
++    url = https://gitlab.com/qemu-project/qboot.git
+ [submodule "meson"]
+     path = meson
+-    url = https://git.qemu.org/git/meson.git
++    url = https://gitlab.com/qemu-project/meson.git
+ [submodule "roms/vbootrom"]
+     path = roms/vbootrom
+-    url = https://git.qemu.org/git/vbootrom.git
++    url = https://gitlab.com/qemu-project/vbootrom.git
+--
+.29.2

-New patch
+[PULL 03/27] gitlab-ci: remove redundant GitLab repo URL command
+It is no longer necessary to point .gitmodules at GitLab repos when
+running in GitLab CI since they are now used all the time.
+Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
+Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
+Reviewed-by: Thomas Huth <thuth@redhat.com>
+Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
+Message-id: 20210111115017.156802-4-stefanha@redhat.com
+Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
+---
+ .gitlab-ci.yml | 1 -
+file changed, 1 deletion(-)
+diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
+index XXXXXXX..XXXXXXX 100644
+--- a/.gitlab-ci.yml
++++ b/.gitlab-ci.yml
+@@ -XXX,XX +XXX,XX @@ include:
+   image: $CI_REGISTRY_IMAGE/qemu/$IMAGE:latest
+   before_script:
+     - JOBS=$(expr $(nproc) + 1)
+-    - sed -i s,git.qemu.org/git,gitlab.com/qemu-project, .gitmodules
+   script:
+     - mkdir build
+     - cd build
+--
+.29.2

-New patch
+[PULL 04/27] docs: update README to use GitLab repo URLs
+qemu.org is running out of bandwidth and the QEMU project is moving
+towards a gating CI on GitLab. Use the GitLab repos instead of qemu.org
+(they will become mirrors).
+Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
+Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
+Reviewed-by: Thomas Huth <thuth@redhat.com>
+Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
+Message-id: 20210111115017.156802-5-stefanha@redhat.com
+Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
+---
+ README.rst | 4 ++--
+file changed, 2 insertions(+), 2 deletions(-)
+diff --git a/README.rst b/README.rst
+index XXXXXXX..XXXXXXX 100644
+--- a/README.rst
++++ b/README.rst
+@@ -XXX,XX +XXX,XX @@ The QEMU source code is maintained under the GIT version control system.
+ .. code-block:: shell
+-   git clone https://git.qemu.org/git/qemu.git
++   git clone https://gitlab.com/qemu-project/qemu.git
+ When submitting patches, one common approach is to use 'git
+ format-patch' and/or 'git send-email' to format & send the mail to the
+@@ -XXX,XX +XXX,XX @@ The QEMU website is also maintained under source control.
+ .. code-block:: shell
+-  git clone https://git.qemu.org/git/qemu-web.git
++  git clone https://gitlab.com/qemu-project/qemu-web.git
+ * `<https://www.qemu.org/2017/02/04/the-new-qemu-website-is-up/>`_
+--
+.29.2

-New patch
+[PULL 05/27] pc-bios: update mirror URLs to GitLab
+qemu.org is running out of bandwidth and the QEMU project is moving
+towards a gating CI on GitLab. Use the GitLab repos instead of qemu.org
+(they will become mirrors).
+Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
+Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
+Reviewed-by: Thomas Huth <thuth@redhat.com>
+Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
+Message-id: 20210111115017.156802-6-stefanha@redhat.com
+Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
+---
+ pc-bios/README | 4 ++--
+file changed, 2 insertions(+), 2 deletions(-)
+diff --git a/pc-bios/README b/pc-bios/README
+index XXXXXXX..XXXXXXX 100644
+--- a/pc-bios/README
++++ b/pc-bios/README
+@@ -XXX,XX +XXX,XX @@
+   legacy x86 software to communicate with an attached serial console as
+   if a video card were attached.  The master sources reside in a subversion
+   repository at http://sgabios.googlecode.com/svn/trunk.  A git mirror is
+-  available at https://git.qemu.org/git/sgabios.git.
++  available at https://gitlab.com/qemu-project/sgabios.git.
+ - The PXE roms come from the iPXE project. Built with BANNER_TIME 0.
+   Sources available at http://ipxe.org.  Vendor:Device ID -> ROM mapping:
+@@ -XXX,XX +XXX,XX @@
+ - The u-boot binary for e500 comes from the upstream denx u-boot project where
+   it was compiled using the qemu-ppce500 target.
+-  A git mirror is available at: https://git.qemu.org/git/u-boot.git
++  A git mirror is available at: https://gitlab.com/qemu-project/u-boot.git
+   The hash used to compile the current version is: 2072e72
+ - Skiboot (https://github.com/open-power/skiboot/) is an OPAL
+--
+.29.2

-New patch
+[PULL 06/27] get_maintainer: update repo URL to GitLab
+qemu.org is running out of bandwidth and the QEMU project is moving
+towards a gating CI on GitLab. Use the GitLab repos instead of qemu.org
+(they will become mirrors).
+Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
+Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
+Reviewed-by: Thomas Huth <thuth@redhat.com>
+Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
+Message-id: 20210111115017.156802-7-stefanha@redhat.com
+Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
+---
+ scripts/get_maintainer.pl | 2 +-
+file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/scripts/get_maintainer.pl b/scripts/get_maintainer.pl
+index XXXXXXX..XXXXXXX 100755
+--- a/scripts/get_maintainer.pl
++++ b/scripts/get_maintainer.pl
+@@ -XXX,XX +XXX,XX @@ sub vcs_exists {
+     warn("$P: No supported VCS found.  Add --nogit to options?\n");
+     warn("Using a git repository produces better results.\n");
+     warn("Try latest git repository using:\n");
+-    warn("git clone https://git.qemu.org/git/qemu.git\n");
++    warn("git clone https://gitlab.com/qemu-project/qemu.git\n");
+     $printed_novcs = 1;
+     }
+     return 0;
+--
+.29.2

-New patch
+[PULL 07/27] multi-process: add the concept description to docs/devel/qemu-multiprocess
+From: John G Johnson <john.g.johnson@oracle.com>
+Signed-off-by: John G Johnson <john.g.johnson@oracle.com>
+Signed-off-by: Elena Ufimtseva <elena.ufimtseva@oracle.com>
+Signed-off-by: Jagannathan Raman <jag.raman@oracle.com>
+Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
+Message-id: 02a68adef99f5df6a380bf8fd7b90948777e411c.1611938319.git.jag.raman@oracle.com
+Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
+---
+ MAINTAINERS                  |   7 +
+ docs/devel/index.rst         |   1 +
+ docs/devel/multi-process.rst | 966 +++++++++++++++++++++++++++++++++++
+files changed, 974 insertions(+)
+ create mode 100644 docs/devel/multi-process.rst
+diff --git a/MAINTAINERS b/MAINTAINERS
+index XXXXXXX..XXXXXXX 100644
+--- a/MAINTAINERS
++++ b/MAINTAINERS
+@@ -XXX,XX +XXX,XX @@ S: Maintained
+ F: hw/semihosting/
+ F: include/hw/semihosting/
++Multi-process QEMU
++M: Elena Ufimtseva <elena.ufimtseva@oracle.com>
++M: Jagannathan Raman <jag.raman@oracle.com>
++M: John G Johnson <john.g.johnson@oracle.com>
++S: Maintained
++F: docs/devel/multi-process.rst
++
+ Build and test automation
+ -------------------------
+ Build and test automation
+diff --git a/docs/devel/index.rst b/docs/devel/index.rst
+index XXXXXXX..XXXXXXX 100644
+--- a/docs/devel/index.rst
++++ b/docs/devel/index.rst
+@@ -XXX,XX +XXX,XX @@ Contents:
+    clocks
+    qom
+    block-coroutine-wrapper
++   multi-process
+diff --git a/docs/devel/multi-process.rst b/docs/devel/multi-process.rst
+new file mode 100644
+index XXXXXXX..XXXXXXX
+--- /dev/null
++++ b/docs/devel/multi-process.rst
+@@ -XXX,XX +XXX,XX @@
++This is the design document for multi-process QEMU. It does not
++necessarily reflect the status of the current implementation, which
++may lack features or be considerably different from what is described
++in this document. This document is still useful as a description of
++the goals and general direction of this feature.
++
++Please refer to the following wiki for latest details:
++https://wiki.qemu.org/Features/MultiProcessQEMU
++
++Multi-process QEMU
++===================
++
++QEMU is often used as the hypervisor for virtual machines running in the
++Oracle cloud. Since one of the advantages of cloud computing is the
++ability to run many VMs from different tenants in the same cloud
++infrastructure, a guest that compromised its hypervisor could
++potentially use the hypervisor's access privileges to access data it is
++not authorized for.
++
++QEMU can be susceptible to security attacks because it is a large,
++monolithic program that provides many features to the VMs it services.
++Many of these features can be configured out of QEMU, but even a reduced
++configuration QEMU has a large amount of code a guest can potentially
++attack. Separating QEMU reduces the attack surface by aiding to
++limit each component in the system to only access the resources that
++it needs to perform its job.
++
++QEMU services
++-------------
++
++QEMU can be broadly described as providing three main services. One is a
++VM control point, where VMs can be created, migrated, re-configured, and
++destroyed. A second is to emulate the CPU instructions within the VM,
++often accelerated by HW virtualization features such as Intel's VT
++extensions. Finally, it provides IO services to the VM by emulating HW
++IO devices, such as disk and network devices.
++
++A multi-process QEMU
++~~~~~~~~~~~~~~~~~~~~
++
++A multi-process QEMU involves separating QEMU services into separate
++host processes. Each of these processes can be given only the privileges
++it needs to provide its service, e.g., a disk service could be given
++access only to the disk images it provides, and not be allowed to
++access other files, or any network devices. An attacker who compromised
++this service would not be able to use this exploit to access files or
++devices beyond what the disk service was given access to.
++
++A QEMU control process would remain, but in multi-process mode, will
++have no direct interfaces to the VM. During VM execution, it would still
++provide the user interface to hot-plug devices or live migrate the VM.
++
++A first step in creating a multi-process QEMU is to separate IO services
++from the main QEMU program, which would continue to provide CPU
++emulation. i.e., the control process would also be the CPU emulation
++process. In a later phase, CPU emulation could be separated from the
++control process.
++
++Separating IO services
++----------------------
++
++Separating IO services into individual host processes is a good place to
++begin for a couple of reasons. One is the sheer number of IO devices QEMU
++can emulate provides a large surface of interfaces which could potentially
++be exploited, and, indeed, have been a source of exploits in the past.
++Another is the modular nature of QEMU device emulation code provides
++interface points where the QEMU functions that perform device emulation
++can be separated from the QEMU functions that manage the emulation of
++guest CPU instructions. The devices emulated in the separate process are
++referred to as remote devices.
++
++QEMU device emulation
++~~~~~~~~~~~~~~~~~~~~~
++
++QEMU uses an object oriented SW architecture for device emulation code.
++Configured objects are all compiled into the QEMU binary, then objects
++are instantiated by name when used by the guest VM. For example, the
++code to emulate a device named "foo" is always present in QEMU, but its
++instantiation code is only run when the device is included in the target
++VM. (e.g., via the QEMU command line as *-device foo*)
++
++The object model is hierarchical, so device emulation code names its
++parent object (such as "pci-device" for a PCI device) and QEMU will
++instantiate a parent object before calling the device's instantiation
++code.
++
++Current separation models
++~~~~~~~~~~~~~~~~~~~~~~~~~
++
++In order to separate the device emulation code from the CPU emulation
++code, the device object code must run in a different process. There are
++a couple of existing QEMU features that can run emulation code
++separately from the main QEMU process. These are examined below.
++
++vhost user model
++^^^^^^^^^^^^^^^^
++
++Virtio guest device drivers can be connected to vhost user applications
++in order to perform their IO operations. This model uses special virtio
++device drivers in the guest and vhost user device objects in QEMU, but
++once the QEMU vhost user code has configured the vhost user application,
++mission-mode IO is performed by the application. The vhost user
++application is a daemon process that can be contacted via a known UNIX
++domain socket.
++
++vhost socket
++''''''''''''
++
++As mentioned above, one of the tasks of the vhost device object within
++QEMU is to contact the vhost application and send it configuration
++information about this device instance. As part of the configuration
++process, the application can also be sent other file descriptors over
++the socket, which then can be used by the vhost user application in
++various ways, some of which are described below.
++
++vhost MMIO store acceleration
++'''''''''''''''''''''''''''''
++
++VMs are often run using HW virtualization features via the KVM kernel
++driver. This driver allows QEMU to accelerate the emulation of guest CPU
++instructions by running the guest in a virtual HW mode. When the guest
++executes instructions that cannot be executed by virtual HW mode,
++execution returns to the KVM driver so it can inform QEMU to emulate the
++instructions in SW.
++
++One of the events that can cause a return to QEMU is when a guest device
++driver accesses an IO location. QEMU then dispatches the memory
++operation to the corresponding QEMU device object. In the case of a
++vhost user device, the memory operation would need to be sent over a
++socket to the vhost application. This path is accelerated by the QEMU
++virtio code by setting up an eventfd file descriptor that the vhost
++application can directly receive MMIO store notifications from the KVM
++driver, instead of needing them to be sent to the QEMU process first.
++
++vhost interrupt acceleration
++''''''''''''''''''''''''''''
++
++Another optimization used by the vhost application is the ability to
++directly inject interrupts into the VM via the KVM driver, again,
++bypassing the need to send the interrupt back to the QEMU process first.
++The QEMU virtio setup code configures the KVM driver with an eventfd
++that triggers the device interrupt in the guest when the eventfd is
++written. This irqfd file descriptor is then passed to the vhost user
++application program.
++
++vhost access to guest memory
++''''''''''''''''''''''''''''
++
++The vhost application is also allowed to directly access guest memory,
++instead of needing to send the data as messages to QEMU. This is also
++done with file descriptors sent to the vhost user application by QEMU.
++These descriptors can be passed to ``mmap()`` by the vhost application
++to map the guest address space into the vhost application.
++
++IOMMUs introduce another level of complexity, since the address given to
++the guest virtio device to DMA to or from is not a guest physical
++address. This case is handled by having vhost code within QEMU register
++as a listener for IOMMU mapping changes. The vhost application maintains
++a cache of IOMMMU translations: sending translation requests back to
++QEMU on cache misses, and in turn receiving flush requests from QEMU
++when mappings are purged.
++
++applicability to device separation
++''''''''''''''''''''''''''''''''''
++
++Much of the vhost model can be re-used by separated device emulation. In
++particular, the ideas of using a socket between QEMU and the device
++emulation application, using a file descriptor to inject interrupts into
++the VM via KVM, and allowing the application to ``mmap()`` the guest
++should be re used.
++
++There are, however, some notable differences between how a vhost
++application works and the needs of separated device emulation. The most
++basic is that vhost uses custom virtio device drivers which always
++trigger IO with MMIO stores. A separated device emulation model must
++work with existing IO device models and guest device drivers. MMIO loads
++break vhost store acceleration since they are synchronous - guest
++progress cannot continue until the load has been emulated. By contrast,
++stores are asynchronous, the guest can continue after the store event
++has been sent to the vhost application.
++
++Another difference is that in the vhost user model, a single daemon can
++support multiple QEMU instances. This is contrary to the security regime
++desired, in which the emulation application should only be allowed to
++access the files or devices the VM it's running on behalf of can access.
++#### qemu-io model
++
++Qemu-io is a test harness used to test changes to the QEMU block backend
++object code. (e.g., the code that implements disk images for disk driver
++emulation) Qemu-io is not a device emulation application per se, but it
++does compile the QEMU block objects into a separate binary from the main
++QEMU one. This could be useful for disk device emulation, since its
++emulation applications will need to include the QEMU block objects.
++
++New separation model based on proxy objects
++-------------------------------------------
++
++A different model based on proxy objects in the QEMU program
++communicating with remote emulation programs could provide separation
++while minimizing the changes needed to the device emulation code. The
++rest of this section is a discussion of how a proxy object model would
++work.
++
++Remote emulation processes
++~~~~~~~~~~~~~~~~~~~~~~~~~~
++
++The remote emulation process will run the QEMU object hierarchy without
++modification. The device emulation objects will be also be based on the
++QEMU code, because for anything but the simplest device, it would not be
++a tractable to re-implement both the object model and the many device
++backends that QEMU has.
++
++The processes will communicate with the QEMU process over UNIX domain
++sockets. The processes can be executed either as standalone processes,
++or be executed by QEMU. In both cases, the host backends the emulation
++processes will provide are specified on its command line, as they would
++be for QEMU. For example:
++
++::
++
++    disk-proc -blockdev driver=file,node-name=file0,filename=disk-file0  \
++    -blockdev driver=qcow2,node-name=drive0,file=file0
++
++would indicate process *disk-proc* uses a qcow2 emulated disk named
++*file0* as its backend.
++
++Emulation processes may emulate more than one guest controller. A common
++configuration might be to put all controllers of the same device class
++(e.g., disk, network, etc.) in a single process, so that all backends of
++the same type can be managed by a single QMP monitor.
++
++communication with QEMU
++^^^^^^^^^^^^^^^^^^^^^^^
++
++The first argument to the remote emulation process will be a Unix domain
++socket that connects with the Proxy object. This is a required argument.
++
++::
++
++    disk-proc <socket number> <backend list>
++
++remote process QMP monitor
++^^^^^^^^^^^^^^^^^^^^^^^^^^
++
++Remote emulation processes can be monitored via QMP, similar to QEMU
++itself. The QMP monitor socket is specified the same as for a QEMU
++process:
++
++::
++
++    disk-proc -qmp unix:/tmp/disk-mon,server
++
++can be monitored over the UNIX socket path */tmp/disk-mon*.
++
++QEMU command line
++~~~~~~~~~~~~~~~~~
++
++Each remote device emulated in a remote process on the host is
++represented as a *-device* of type *pci-proxy-dev*. A socket
++sub-option to this option specifies the Unix socket that connects
++to the remote process. An *id* sub-option is required, and it should
++be the same id as used in the remote process.
++
++::
++
++    qemu-system-x86_64 ... -device pci-proxy-dev,id=lsi0,socket=3
++
++can be used to add a device emulated in a remote process
++
++
++QEMU management of remote processes
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++
++QEMU is not aware of the type of type of the remote PCI device. It is
++a pass through device as far as QEMU is concerned.
++
++communication with emulation process
++^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
++
++primary channel
++'''''''''''''''
++
++The primary channel (referred to as com in the code) is used to bootstrap
++the remote process. It is also used to pass on device-agnostic commands
++like reset.
++
++per-device channels
++'''''''''''''''''''
++
++Each remote device communicates with QEMU using a dedicated communication
++channel. The proxy object sets up this channel using the primary
++channel during its initialization.
++
++QEMU device proxy objects
++~~~~~~~~~~~~~~~~~~~~~~~~~
++
++QEMU has an object model based on sub-classes inherited from the
++"object" super-class. The sub-classes that are of interest here are the
++"device" and "bus" sub-classes whose child sub-classes make up the
++device tree of a QEMU emulated system.
++
++The proxy object model will use device proxy objects to replace the
++device emulation code within the QEMU process. These objects will live
++in the same place in the object and bus hierarchies as the objects they
++replace. i.e., the proxy object for an LSI SCSI controller will be a
++sub-class of the "pci-device" class, and will have the same PCI bus
++parent and the same SCSI bus child objects as the LSI controller object
++it replaces.
++
++It is worth noting that the same proxy object is used to mediate with
++all types of remote PCI devices.
++
++object initialization
++^^^^^^^^^^^^^^^^^^^^^
++
++The Proxy device objects are initialized in the exact same manner in
++which any other QEMU device would be initialized.
++
++In addition, the Proxy objects perform the following two tasks:
++- Parses the "socket" sub option and connects to the remote process
++using this channel
++- Uses the "id" sub-option to connect to the emulated device on the
++separate process
++
++class\_init
++'''''''''''
++
++The ``class_init()`` method of a proxy object will, in general behave
++similarly to the object it replaces, including setting any static
++properties and methods needed by the proxy.
++
++instance\_init / realize
++''''''''''''''''''''''''
++
++The ``instance_init()`` and ``realize()`` functions would only need to
++perform tasks related to being a proxy, such are registering its own
++MMIO handlers, or creating a child bus that other proxy devices can be
++attached to later.
++
++Other tasks will be device-specific. For example, PCI device objects
++will initialize the PCI config space in order to make a valid PCI device
++tree within the QEMU process.
++
++address space registration
++^^^^^^^^^^^^^^^^^^^^^^^^^^
++
++Most devices are driven by guest device driver accesses to IO addresses
++or ports. The QEMU device emulation code uses QEMU's memory region
++function calls (such as ``memory_region_init_io()``) to add callback
++functions that QEMU will invoke when the guest accesses the device's
++areas of the IO address space. When a guest driver does access the
++device, the VM will exit HW virtualization mode and return to QEMU,
++which will then lookup and execute the corresponding callback function.
++
++A proxy object would need to mirror the memory region calls the actual
++device emulator would perform in its initialization code, but with its
++own callbacks. When invoked by QEMU as a result of a guest IO operation,
++they will forward the operation to the device emulation process.
++
++PCI config space
++^^^^^^^^^^^^^^^^
++
++PCI devices also have a configuration space that can be accessed by the
++guest driver. Guest accesses to this space is not handled by the device
++emulation object, but by its PCI parent object. Much of this space is
++read-only, but certain registers (especially BAR and MSI-related ones)
++need to be propagated to the emulation process.
++
++PCI parent proxy
++''''''''''''''''
++
++One way to propagate guest PCI config accesses is to create a
++"pci-device-proxy" class that can serve as the parent of a PCI device
++proxy object. This class's parent would be "pci-device" and it would
++override the PCI parent's ``config_read()`` and ``config_write()``
++methods with ones that forward these operations to the emulation
++program.
++
++interrupt receipt
++^^^^^^^^^^^^^^^^^
++
++A proxy for a device that generates interrupts will need to create a
++socket to receive interrupt indications from the emulation process. An
++incoming interrupt indication would then be sent up to its bus parent to
++be injected into the guest. For example, a PCI device object may use
++``pci_set_irq()``.
++
++live migration
++^^^^^^^^^^^^^^
++
++The proxy will register to save and restore any *vmstate* it needs over
++a live migration event. The device proxy does not need to manage the
++remote device's *vmstate*; that will be handled by the remote process
++proxy (see below).
++
++QEMU remote device operation
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++
++Generic device operations, such as DMA, will be performed by the remote
++process proxy by sending messages to the remote process.
++
++DMA operations
++^^^^^^^^^^^^^^
++
++DMA operations would be handled much like vhost applications do. One of
++the initial messages sent to the emulation process is a guest memory
++table. Each entry in this table consists of a file descriptor and size
++that the emulation process can ``mmap()`` to directly access guest
++memory, similar to ``vhost_user_set_mem_table()``. Note guest memory
++must be backed by file descriptors, such as when QEMU is given the
++*-mem-path* command line option.
++
++IOMMU operations
++^^^^^^^^^^^^^^^^
++
++When the emulated system includes an IOMMU, the remote process proxy in
++QEMU will need to create a socket for IOMMU requests from the emulation
++process. It will handle those requests with an
++``address_space_get_iotlb_entry()`` call. In order to handle IOMMU
++unmaps, the remote process proxy will also register as a listener on the
++device's DMA address space. When an IOMMU memory region is created
++within the DMA address space, an IOMMU notifier for unmaps will be added
++to the memory region that will forward unmaps to the emulation process
++over the IOMMU socket.
++
++device hot-plug via QMP
++^^^^^^^^^^^^^^^^^^^^^^^
++
++An QMP "device\_add" command can add a device emulated by a remote
++process. It will also have "rid" option to the command, just as the
++*-device* command line option does. The remote process may either be one
++started at QEMU startup, or be one added by the "add-process" QMP
++command described above. In either case, the remote process proxy will
++forward the new device's JSON description to the corresponding emulation
++process.
++
++live migration
++^^^^^^^^^^^^^^
++
++The remote process proxy will also register for live migration
++notifications with ``vmstate_register()``. When called to save state,
++the proxy will send the remote process a secondary socket file
++descriptor to save the remote process's device *vmstate* over. The
++incoming byte stream length and data will be saved as the proxy's
++*vmstate*. When the proxy is resumed on its new host, this *vmstate*
++will be extracted, and a secondary socket file descriptor will be sent
++to the new remote process through which it receives the *vmstate* in
++order to restore the devices there.
++
++device emulation in remote process
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++
++The parts of QEMU that the emulation program will need include the
++object model; the memory emulation objects; the device emulation objects
++of the targeted device, and any dependent devices; and, the device's
++backends. It will also need code to setup the machine environment,
++handle requests from the QEMU process, and route machine-level requests
++(such as interrupts or IOMMU mappings) back to the QEMU process.
++
++initialization
++^^^^^^^^^^^^^^
++
++The process initialization sequence will follow the same sequence
++followed by QEMU. It will first initialize the backend objects, then
++device emulation objects. The JSON descriptions sent by the QEMU process
++will drive which objects need to be created.
++
++-  address spaces
++
++Before the device objects are created, the initial address spaces and
++memory regions must be configured with ``memory_map_init()``. This
++creates a RAM memory region object (*system\_memory*) and an IO memory
++region object (*system\_io*).
++
++-  RAM
++
++RAM memory region creation will follow how ``pc_memory_init()`` creates
++them, but must use ``memory_region_init_ram_from_fd()`` instead of
++``memory_region_allocate_system_memory()``. The file descriptors needed
++will be supplied by the guest memory table from above. Those RAM regions
++would then be added to the *system\_memory* memory region with
++``memory_region_add_subregion()``.
++
++-  PCI
++
++IO initialization will be driven by the JSON descriptions sent from the
++QEMU process. For a PCI device, a PCI bus will need to be created with
++``pci_root_bus_new()``, and a PCI memory region will need to be created
++and added to the *system\_memory* memory region with
++``memory_region_add_subregion_overlap()``. The overlap version is
++required for architectures where PCI memory overlaps with RAM memory.
++
++MMIO handling
++^^^^^^^^^^^^^
++
++The device emulation objects will use ``memory_region_init_io()`` to
++install their MMIO handlers, and ``pci_register_bar()`` to associate
++those handlers with a PCI BAR, as they do within QEMU currently.
++
++In order to use ``address_space_rw()`` in the emulation process to
++handle MMIO requests from QEMU, the PCI physical addresses must be the
++same in the QEMU process and the device emulation process. In order to
++accomplish that, guest BAR programming must also be forwarded from QEMU
++to the emulation process.
++
++interrupt injection
++^^^^^^^^^^^^^^^^^^^
++
++When device emulation wants to inject an interrupt into the VM, the
++request climbs the device's bus object hierarchy until the point where a
++bus object knows how to signal the interrupt to the guest. The details
++depend on the type of interrupt being raised.
++
++-  PCI pin interrupts
++
++On x86 systems, there is an emulated IOAPIC object attached to the root
++PCI bus object, and the root PCI object forwards interrupt requests to
++it. The IOAPIC object, in turn, calls the KVM driver to inject the
++corresponding interrupt into the VM. The simplest way to handle this in
++an emulation process would be to setup the root PCI bus driver (via
++``pci_bus_irqs()``) to send a interrupt request back to the QEMU
++process, and have the device proxy object reflect it up the PCI tree
++there.
++
++-  PCI MSI/X interrupts
++
++PCI MSI/X interrupts are implemented in HW as DMA writes to a
++CPU-specific PCI address. In QEMU on x86, a KVM APIC object receives
++these DMA writes, then calls into the KVM driver to inject the interrupt
++into the VM. A simple emulation process implementation would be to send
++the MSI DMA address from QEMU as a message at initialization, then
++install an address space handler at that address which forwards the MSI
++message back to QEMU.
++
++DMA operations
++^^^^^^^^^^^^^^
++
++When a emulation object wants to DMA into or out of guest memory, it
++first must use dma\_memory\_map() to convert the DMA address to a local
++virtual address. The emulation process memory region objects setup above
++will be used to translate the DMA address to a local virtual address the
++device emulation code can access.
++
++IOMMU
++^^^^^
++
++When an IOMMU is in use in QEMU, DMA translation uses IOMMU memory
++regions to translate the DMA address to a guest physical address before
++that physical address can be translated to a local virtual address. The
++emulation process will need similar functionality.
++
++-  IOTLB cache
++
++The emulation process will maintain a cache of recent IOMMU translations
++(the IOTLB). When the translate() callback of an IOMMU memory region is
++invoked, the IOTLB cache will be searched for an entry that will map the
++DMA address to a guest PA. On a cache miss, a message will be sent back
++to QEMU requesting the corresponding translation entry, which be both be
++used to return a guest address and be added to the cache.
++
++-  IOTLB purge
++
++The IOMMU emulation will also need to act on unmap requests from QEMU.
++These happen when the guest IOMMU driver purges an entry from the
++guest's translation table.
++
++live migration
++^^^^^^^^^^^^^^
++
++When a remote process receives a live migration indication from QEMU, it
++will set up a channel using the received file descriptor with
++``qio_channel_socket_new_fd()``. This channel will be used to create a
++*QEMUfile* that can be passed to ``qemu_save_device_state()`` to send
++the process's device state back to QEMU. This method will be reversed on
++restore - the channel will be passed to ``qemu_loadvm_state()`` to
++restore the device state.
++
++Accelerating device emulation
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++
++The messages that are required to be sent between QEMU and the emulation
++process can add considerable latency to IO operations. The optimizations
++described below attempt to ameliorate this effect by allowing the
++emulation process to communicate directly with the kernel KVM driver.
++The KVM file descriptors created would be passed to the emulation process
++via initialization messages, much like the guest memory table is done.
++#### MMIO acceleration
++
++Vhost user applications can receive guest virtio driver stores directly
++from KVM. The issue with the eventfd mechanism used by vhost user is
++that it does not pass any data with the event indication, so it cannot
++handle guest loads or guest stores that carry store data. This concept
++could, however, be expanded to cover more cases.
++
++The expanded idea would require a new type of KVM device:
++*KVM\_DEV\_TYPE\_USER*. This device has two file descriptors: a master
++descriptor that QEMU can use for configuration, and a slave descriptor
++that the emulation process can use to receive MMIO notifications. QEMU
++would create both descriptors using the KVM driver, and pass the slave
++descriptor to the emulation process via an initialization message.
++
++data structures
++^^^^^^^^^^^^^^^
++
++-  guest physical range
++
++The guest physical range structure describes the address range that a
++device will respond to. It includes the base and length of the range, as
++well as which bus the range resides on (e.g., on an x86machine, it can
++specify whether the range refers to memory or IO addresses).
++
++A device can have multiple physical address ranges it responds to (e.g.,
++a PCI device can have multiple BARs), so the structure will also include
++an enumerated identifier to specify which of the device's ranges is
++being referred to.
++
+++--------+----------------------------+
++| Name   | Description                |
+++========+============================+
++| addr   | range base address         |
+++--------+----------------------------+
++| len    | range length               |
+++--------+----------------------------+
++| bus    | addr type (memory or IO)   |
+++--------+----------------------------+
++| id     | range ID (e.g., PCI BAR)   |
+++--------+----------------------------+
++
++-  MMIO request structure
++
++This structure describes an MMIO operation. It includes which guest
++physical range the MMIO was within, the offset within that range, the
++MMIO type (e.g., load or store), and its length and data. It also
++includes a sequence number that can be used to reply to the MMIO, and
++the CPU that issued the MMIO.
++
+++----------+------------------------+
++| Name     | Description            |
+++==========+========================+
++| rid      | range MMIO is within   |
+++----------+------------------------+
++| offset   | offset withing *rid*   |
+++----------+------------------------+
++| type     | e.g., load or store    |
+++----------+------------------------+
++| len      | MMIO length            |
+++----------+------------------------+
++| data     | store data             |
+++----------+------------------------+
++| seq      | sequence ID            |
+++----------+------------------------+
++
++-  MMIO request queues
++
++MMIO request queues are FIFO arrays of MMIO request structures. There
++are two queues: pending queue is for MMIOs that haven't been read by the
++emulation program, and the sent queue is for MMIOs that haven't been
++acknowledged. The main use of the second queue is to validate MMIO
++replies from the emulation program.
++
++-  scoreboard
++
++Each CPU in the VM is emulated in QEMU by a separate thread, so multiple
++MMIOs may be waiting to be consumed by an emulation program and multiple
++threads may be waiting for MMIO replies. The scoreboard would contain a
++wait queue and sequence number for the per-CPU threads, allowing them to
++be individually woken when the MMIO reply is received from the emulation
++program. It also tracks the number of posted MMIO stores to the device
++that haven't been replied to, in order to satisfy the PCI constraint
++that a load to a device will not complete until all previous stores to
++that device have been completed.
++
++-  device shadow memory
++
++Some MMIO loads do not have device side-effects. These MMIOs can be
++completed without sending a MMIO request to the emulation program if the
++emulation program shares a shadow image of the device's memory image
++with the KVM driver.
++
++The emulation program will ask the KVM driver to allocate memory for the
++shadow image, and will then use ``mmap()`` to directly access it. The
++emulation program can control KVM access to the shadow image by sending
++KVM an access map telling it which areas of the image have no
++side-effects (and can be completed immediately), and which require a
++MMIO request to the emulation program. The access map can also inform
++the KVM drive which size accesses are allowed to the image.
++
++master descriptor
++^^^^^^^^^^^^^^^^^
++
++The master descriptor is used by QEMU to configure the new KVM device.
++The descriptor would be returned by the KVM driver when QEMU issues a
++*KVM\_CREATE\_DEVICE* ``ioctl()`` with a *KVM\_DEV\_TYPE\_USER* type.
++
++KVM\_DEV\_TYPE\_USER device ops
++
++
++The *KVM\_DEV\_TYPE\_USER* operations vector will be registered by a
++``kvm_register_device_ops()`` call when the KVM system in initialized by
++``kvm_init()``. These device ops are called by the KVM driver when QEMU
++executes certain ``ioctl()`` operations on its KVM file descriptor. They
++include:
++
++-  create
++
++This routine is called when QEMU issues a *KVM\_CREATE\_DEVICE*
++``ioctl()`` on its per-VM file descriptor. It will allocate and
++initialize a KVM user device specific data structure, and assign the
++*kvm\_device* private field to it.
++
++-  ioctl
++
++This routine is invoked when QEMU issues an ``ioctl()`` on the master
++descriptor. The ``ioctl()`` commands supported are defined by the KVM
++device type. *KVM\_DEV\_TYPE\_USER* ones will need several commands:
++
++*KVM\_DEV\_USER\_SLAVE\_FD* creates the slave file descriptor that will
++be passed to the device emulation program. Only one slave can be created
++by each master descriptor. The file operations performed by this
++descriptor are described below.
++
++The *KVM\_DEV\_USER\_PA\_RANGE* command configures a guest physical
++address range that the slave descriptor will receive MMIO notifications
++for. The range is specified by a guest physical range structure
++argument. For buses that assign addresses to devices dynamically, this
++command can be executed while the guest is running, such as the case
++when a guest changes a device's PCI BAR registers.
++
++*KVM\_DEV\_USER\_PA\_RANGE* will use ``kvm_io_bus_register_dev()`` to
++register *kvm\_io\_device\_ops* callbacks to be invoked when the guest
++performs a MMIO operation within the range. When a range is changed,
++``kvm_io_bus_unregister_dev()`` is used to remove the previous
++instantiation.
++
++*KVM\_DEV\_USER\_TIMEOUT* will configure a timeout value that specifies
++how long KVM will wait for the emulation process to respond to a MMIO
++indication.
++
++-  destroy
++
++This routine is called when the VM instance is destroyed. It will need
++to destroy the slave descriptor; and free any memory allocated by the
++driver, as well as the *kvm\_device* structure itself.
++
++slave descriptor
++^^^^^^^^^^^^^^^^
++
++The slave descriptor will have its own file operations vector, which
++responds to system calls on the descriptor performed by the device
++emulation program.
++
++-  read
++
++A read returns any pending MMIO requests from the KVM driver as MMIO
++request structures. Multiple structures can be returned if there are
++multiple MMIO operations pending. The MMIO requests are moved from the
++pending queue to the sent queue, and if there are threads waiting for
++space in the pending to add new MMIO operations, they will be woken
++here.
++
++-  write
++
++A write also consists of a set of MMIO requests. They are compared to
++the MMIO requests in the sent queue. Matches are removed from the sent
++queue, and any threads waiting for the reply are woken. If a store is
++removed, then the number of posted stores in the per-CPU scoreboard is
++decremented. When the number is zero, and a non side-effect load was
++waiting for posted stores to complete, the load is continued.
++
++-  ioctl
++
++There are several ioctl()s that can be performed on the slave
++descriptor.
++
++A *KVM\_DEV\_USER\_SHADOW\_SIZE* ``ioctl()`` causes the KVM driver to
++allocate memory for the shadow image. This memory can later be
++``mmap()``\ ed by the emulation process to share the emulation's view of
++device memory with the KVM driver.
++
++A *KVM\_DEV\_USER\_SHADOW\_CTRL* ``ioctl()`` controls access to the
++shadow image. It will send the KVM driver a shadow control map, which
++specifies which areas of the image can complete guest loads without
++sending the load request to the emulation program. It will also specify
++the size of load operations that are allowed.
++
++-  poll
++
++An emulation program will use the ``poll()`` call with a *POLLIN* flag
++to determine if there are MMIO requests waiting to be read. It will
++return if the pending MMIO request queue is not empty.
++
++-  mmap
++
++This call allows the emulation program to directly access the shadow
++image allocated by the KVM driver. As device emulation updates device
++memory, changes with no side-effects will be reflected in the shadow,
++and the KVM driver can satisfy guest loads from the shadow image without
++needing to wait for the emulation program.
++
++kvm\_io\_device ops
++^^^^^^^^^^^^^^^^^^^
++
++Each KVM per-CPU thread can handle MMIO operation on behalf of the guest
++VM. KVM will use the MMIO's guest physical address to search for a
++matching *kvm\_io\_device* to see if the MMIO can be handled by the KVM
++driver instead of exiting back to QEMU. If a match is found, the
++corresponding callback will be invoked.
++
++-  read
++
++This callback is invoked when the guest performs a load to the device.
++Loads with side-effects must be handled synchronously, with the KVM
++driver putting the QEMU thread to sleep waiting for the emulation
++process reply before re-starting the guest. Loads that do not have
++side-effects may be optimized by satisfying them from the shadow image,
++if there are no outstanding stores to the device by this CPU. PCI memory
++ordering demands that a load cannot complete before all older stores to
++the same device have been completed.
++
++-  write
++
++Stores can be handled asynchronously unless the pending MMIO request
++queue is full. In this case, the QEMU thread must sleep waiting for
++space in the queue. Stores will increment the number of posted stores in
++the per-CPU scoreboard, in order to implement the PCI ordering
++constraint above.
++
++interrupt acceleration
++^^^^^^^^^^^^^^^^^^^^^^
++
++This performance optimization would work much like a vhost user
++application does, where the QEMU process sets up *eventfds* that cause
++the device's corresponding interrupt to be triggered by the KVM driver.
++These irq file descriptors are sent to the emulation process at
++initialization, and are used when the emulation code raises a device
++interrupt.
++
++intx acceleration
++'''''''''''''''''
++
++Traditional PCI pin interrupts are level based, so, in addition to an
++irq file descriptor, a re-sampling file descriptor needs to be sent to
++the emulation program. This second file descriptor allows multiple
++devices sharing an irq to be notified when the interrupt has been
++acknowledged by the guest, so they can re-trigger the interrupt if their
++device has not de-asserted its interrupt.
++
++intx irq descriptor
++
++
++The irq descriptors are created by the proxy object
++``using event_notifier_init()`` to create the irq and re-sampling
++*eventds*, and ``kvm_vm_ioctl(KVM_IRQFD)`` to bind them to an interrupt.
++The interrupt route can be found with
++``pci_device_route_intx_to_irq()``.
++
++intx routing changes
++
++
++Intx routing can be changed when the guest programs the APIC the device
++pin is connected to. The proxy object in QEMU will use
++``pci_device_set_intx_routing_notifier()`` to be informed of any guest
++changes to the route. This handler will broadly follow the VFIO
++interrupt logic to change the route: de-assigning the existing irq
++descriptor from its route, then assigning it the new route. (see
++``vfio_intx_update()``)
++
++MSI/X acceleration
++''''''''''''''''''
++
++MSI/X interrupts are sent as DMA transactions to the host. The interrupt
++data contains a vector that is programmed by the guest, A device may have
++multiple MSI interrupts associated with it, so multiple irq descriptors
++may need to be sent to the emulation program.
++
++MSI/X irq descriptor
++
++
++This case will also follow the VFIO example. For each MSI/X interrupt,
++an *eventfd* is created, a virtual interrupt is allocated by
++``kvm_irqchip_add_msi_route()``, and the virtual interrupt is bound to
++the eventfd with ``kvm_irqchip_add_irqfd_notifier()``.
++
++MSI/X config space changes
++
++
++The guest may dynamically update several MSI-related tables in the
++device's PCI config space. These include per-MSI interrupt enables and
++vector data. Additionally, MSIX tables exist in device memory space, not
++config space. Much like the BAR case above, the proxy object must look
++at guest config space programming to keep the MSI interrupt state
++consistent between QEMU and the emulation program.
++
++--------------
++
++Disaggregated CPU emulation
++---------------------------
++
++After IO services have been disaggregated, a second phase would be to
++separate a process to handle CPU instruction emulation from the main
++QEMU control function. There are no object separation points for this
++code, so the first task would be to create one.
++
++Host access controls
++--------------------
++
++Separating QEMU relies on the host OS's access restriction mechanisms to
++enforce that the differing processes can only access the objects they
++are entitled to. There are a couple types of mechanisms usually provided
++by general purpose OSs.
++
++Discretionary access control
++~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++
++Discretionary access control allows each user to control who can access
++their files. In Linux, this type of control is usually too coarse for
++QEMU separation, since it only provides three separate access controls:
++one for the same user ID, the second for users IDs with the same group
++ID, and the third for all other user IDs. Each device instance would
++need a separate user ID to provide access control, which is likely to be
++unwieldy for dynamically created VMs.
++
++Mandatory access control
++~~~~~~~~~~~~~~~~~~~~~~~~
++
++Mandatory access control allows the OS to add an additional set of
++controls on top of discretionary access for the OS to control. It also
++adds other attributes to processes and files such as types, roles, and
++categories, and can establish rules for how processes and files can
++interact.
++
++Type enforcement
++^^^^^^^^^^^^^^^^
++
++Type enforcement assigns a *type* attribute to processes and files, and
++allows rules to be written on what operations a process with a given
++type can perform on a file with a given type. QEMU separation could take
++advantage of type enforcement by running the emulation processes with
++different types, both from the main QEMU process, and from the emulation
++processes of different classes of devices.
++
++For example, guest disk images and disk emulation processes could have
++types separate from the main QEMU process and non-disk emulation
++processes, and the type rules could prevent processes other than disk
++emulation ones from accessing guest disk images. Similarly, network
++emulation processes can have a type separate from the main QEMU process
++and non-network emulation process, and only that type can access the
++host tun/tap device used to provide guest networking.
++
++Category enforcement
++^^^^^^^^^^^^^^^^^^^^
++
++Category enforcement assigns a set of numbers within a given range to
++the process or file. The process is granted access to the file if the
++process's set is a superset of the file's set. This enforcement can be
++used to separate multiple instances of devices in the same class.
++
++For example, if there are multiple disk devices provides to a guest,
++each device emulation process could be provisioned with a separate
++category. The different device emulation processes would not be able to
++access each other's backing disk images.
++
++Alternatively, categories could be used in lieu of the type enforcement
++scheme described above. In this scenario, different categories would be
++used to prevent device emulation processes in different classes from
++accessing resources assigned to other classes.
+--
+.29.2

-New patch
+[PULL 08/27] multi-process: add configure and usage information
+From: Elena Ufimtseva <elena.ufimtseva@oracle.com>
+Adds documentation explaining the command-line arguments needed
+to use multi-process.
+Signed-off-by: Elena Ufimtseva <elena.ufimtseva@oracle.com>
+Signed-off-by: Jagannathan Raman <jag.raman@oracle.com>
+Signed-off-by: John G Johnson <john.g.johnson@oracle.com>
+Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
+Message-id: 49f757a84e5dd6fae14b22544897d1124c5fdbad.1611938319.git.jag.raman@oracle.com
+[Move orphan docs/multi-process.rst document into docs/system/ and add
+it to index.rst to prevent Sphinx "document isn't included in any
+toctree" error.
+--Stefan]
+Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
+---
+ MAINTAINERS                   |  1 +
+ docs/system/index.rst         |  1 +
+ docs/system/multi-process.rst | 64 +++++++++++++++++++++++++++++++++++
+files changed, 66 insertions(+)
+ create mode 100644 docs/system/multi-process.rst
+diff --git a/MAINTAINERS b/MAINTAINERS
+index XXXXXXX..XXXXXXX 100644
+--- a/MAINTAINERS
++++ b/MAINTAINERS
+@@ -XXX,XX +XXX,XX @@ M: Jagannathan Raman <jag.raman@oracle.com>
+ M: John G Johnson <john.g.johnson@oracle.com>
+ S: Maintained
+ F: docs/devel/multi-process.rst
++F: docs/system/multi-process.rst
+ Build and test automation
+ -------------------------
+diff --git a/docs/system/index.rst b/docs/system/index.rst
+index XXXXXXX..XXXXXXX 100644
+--- a/docs/system/index.rst
++++ b/docs/system/index.rst
+@@ -XXX,XX +XXX,XX @@ Contents:
+    pr-manager
+    targets
+    security
++   multi-process
+    deprecated
+    removed-features
+    build-platforms
+diff --git a/docs/system/multi-process.rst b/docs/system/multi-process.rst
+new file mode 100644
+index XXXXXXX..XXXXXXX
+--- /dev/null
++++ b/docs/system/multi-process.rst
+@@ -XXX,XX +XXX,XX @@
++Multi-process QEMU
++==================
++
++This document describes how to configure and use multi-process qemu.
++For the design document refer to docs/devel/qemu-multiprocess.
++
++1) Configuration
++----------------
++
++multi-process is enabled by default for targets that enable KVM
++
++
++2) Usage
++--------
++
++Multi-process QEMU requires an orchestrator to launch.
++
++Following is a description of command-line used to launch mpqemu.
++
++* Orchestrator:
++
++  - The Orchestrator creates a unix socketpair
++
++  - It launches the remote process and passes one of the
++    sockets to it via command-line.
++
++  - It then launches QEMU and specifies the other socket as an option
++    to the Proxy device object
++
++* Remote Process:
++
++  - QEMU can enter remote process mode by using the "remote" machine
++    option.
++
++  - The orchestrator creates a "remote-object" with details about
++    the device and the file descriptor for the device
++
++  - The remaining options are no different from how one launches QEMU with
++    devices.
++
++  - Example command-line for the remote process is as follows:
++
++      /usr/bin/qemu-system-x86_64                                        \
++      -machine x-remote                                                  \
++      -device lsi53c895a,id=lsi0                                         \
++      -drive id=drive_image2,file=/build/ol7-nvme-test-1.qcow2           \
++      -device scsi-hd,id=drive2,drive=drive_image2,bus=lsi0.0,scsi-id=0  \
++      -object x-remote-object,id=robj1,devid=lsi1,fd=4,
++
++* QEMU:
++
++  - Since parts of the RAM are shared between QEMU & remote process, a
++    memory-backend-memfd is required to facilitate this, as follows:
++
++    -object memory-backend-memfd,id=mem,size=2G
++
++  - A "x-pci-proxy-dev" device is created for each of the PCI devices emulated
++    in the remote process. A "socket" sub-option specifies the other end of
++    unix channel created by orchestrator. The "id" sub-option must be specified
++    and should be the same as the "id" specified for the remote PCI device
++
++  - Example commandline for QEMU is as follows:
++
++      -device x-pci-proxy-dev,id=lsi0,socket=3
+--
+.29.2

-[Qemu-devel] [PULL 09/12] block: use bdrv_can_set_read_only() during reopen
+[PULL 09/27] memory: alloc RAM from file at offset
-Signed-off-by: Jeff Cody <jcody@redhat.com>
+From: Jagannathan Raman <jag.raman@oracle.com>
 Allow RAM MemoryRegion to be created from an offset in a file, instead
 of allocating at offset of 0 by default. This is needed to synchronize
 RAM between QEMU & remote process.
 Signed-off-by: Jagannathan Raman <jag.raman@oracle.com>
 Signed-off-by: John G Johnson <john.g.johnson@oracle.com>
 Signed-off-by: Elena Ufimtseva <elena.ufimtseva@oracle.com>
 Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
-Reviewed-by: John Snow <jsnow@redhat.com>
+Message-id: 609996697ad8617e3b01df38accc5c208c24d74e.1611938319.git.jag.raman@oracle.com
-Message-id: 00aed7ffdd7be4b9ed9ce1007d50028a72b34ebe.1491597120.git.jcody@redhat.com
+Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
- block.c | 14 ++++++++------
+ include/exec/memory.h     |  2 ++
-file changed, 8 insertions(+), 6 deletions(-)
+ include/exec/ram_addr.h   |  2 +-
+ include/qemu/mmap-alloc.h |  4 +++-
-diff --git a/block.c b/block.c
+ backends/hostmem-memfd.c  |  2 +-
-index XXXXXXX..XXXXXXX 100644
+ hw/misc/ivshmem.c         |  3 ++-
---- a/block.c
+ softmmu/memory.c          |  3 ++-
-+++ b/block.c
+ softmmu/physmem.c         | 11 +++++++----
-@@ -XXX,XX +XXX,XX @@ int bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQueue *queue,
+ util/mmap-alloc.c         |  7 ++++---
-     BlockDriver *drv;
+ util/oslib-posix.c        |  2 +-
-     QemuOpts *opts;
+files changed, 23 insertions(+), 13 deletions(-)
-     const char *value;
-+    bool read_only;
+diff --git a/include/exec/memory.h b/include/exec/memory.h
+index XXXXXXX..XXXXXXX 100644
-     assert(reopen_state != NULL);
+--- a/include/exec/memory.h
-     assert(reopen_state->bs->drv != NULL);
++++ b/include/exec/memory.h
-@@ -XXX,XX +XXX,XX @@ int bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQueue *queue,
+@@ -XXX,XX +XXX,XX @@ void memory_region_init_ram_from_file(MemoryRegion *mr,
-         qdict_put(reopen_state->options, "driver", qstring_from_str(value));
+  * @size: size of the region.
   * @share: %true if memory must be mmaped with the MAP_SHARED flag
   * @fd: the fd to mmap.
 + * @offset: offset within the file referenced by fd
   * @errp: pointer to Error*, to store an error if it happens.
   *
   * Note that this function does not do anything to cause the data in the
@@ -XXX,XX +XXX,XX @@ void memory_region_init_ram_from_fd(MemoryRegion *mr,
                                      uint64_t size,
                                      bool share,
                                      int fd,
 +                                    ram_addr_t offset,
                                      Error **errp);
  #endif
 diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h
 index XXXXXXX..XXXXXXX 100644
 --- a/include/exec/ram_addr.h
 +++ b/include/exec/ram_addr.h
@@ -XXX,XX +XXX,XX @@ RAMBlock *qemu_ram_alloc_from_file(ram_addr_t size, MemoryRegion *mr,
                                     Error **errp);
  RAMBlock *qemu_ram_alloc_from_fd(ram_addr_t size, MemoryRegion *mr,
                                   uint32_t ram_flags, int fd,
 -                                 Error **errp);
 +                                 off_t offset, Error **errp);
  RAMBlock *qemu_ram_alloc_from_ptr(ram_addr_t size, void *host,
                                    MemoryRegion *mr, Error **errp);
 diff --git a/include/qemu/mmap-alloc.h b/include/qemu/mmap-alloc.h
 index XXXXXXX..XXXXXXX 100644
 --- a/include/qemu/mmap-alloc.h
 +++ b/include/qemu/mmap-alloc.h
@@ -XXX,XX +XXX,XX @@ size_t qemu_mempath_getpagesize(const char *mem_path);
   *          otherwise, the alignment in use will be determined by QEMU.
   *  @shared: map has RAM_SHARED flag.
   *  @is_pmem: map has RAM_PMEM flag.
 + *  @map_offset: map starts at offset of map_offset from the start of fd
   *
   * Return:
   *  On success, return a pointer to the mapped area.
@@ -XXX,XX +XXX,XX @@ void *qemu_ram_mmap(int fd,
                      size_t size,
                      size_t align,
                      bool shared,
 -                    bool is_pmem);
 +                    bool is_pmem,
 +                    off_t map_offset);
  void qemu_ram_munmap(int fd, void *ptr, size_t size);
 diff --git a/backends/hostmem-memfd.c b/backends/hostmem-memfd.c
 index XXXXXXX..XXXXXXX 100644
 --- a/backends/hostmem-memfd.c
 +++ b/backends/hostmem-memfd.c
@@ -XXX,XX +XXX,XX @@ memfd_backend_memory_alloc(HostMemoryBackend *backend, Error **errp)
      name = host_memory_backend_get_name(backend);
      memory_region_init_ram_from_fd(&backend->mr, OBJECT(backend),
                                     name, backend->size,
 -                                   backend->share, fd, errp);
 +                                   backend->share, fd, 0, errp);
      g_free(name);
  }
 diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/misc/ivshmem.c
 +++ b/hw/misc/ivshmem.c
@@ -XXX,XX +XXX,XX @@ static void process_msg_shmem(IVShmemState *s, int fd, Error **errp)
      /* mmap the region and map into the BAR2 */
      memory_region_init_ram_from_fd(&s->server_bar2, OBJECT(s),
 -                                   "ivshmem.bar2", size, true, fd, &local_err);
 +                                   "ivshmem.bar2", size, true, fd, 0,
 +                                   &local_err);
      if (local_err) {
          error_propagate(errp, local_err);
          return;
 diff --git a/softmmu/memory.c b/softmmu/memory.c
 index XXXXXXX..XXXXXXX 100644
 --- a/softmmu/memory.c
 +++ b/softmmu/memory.c
@@ -XXX,XX +XXX,XX @@ void memory_region_init_ram_from_fd(MemoryRegion *mr,
                                      uint64_t size,
                                      bool share,
                                      int fd,
 +                                    ram_addr_t offset,
                                      Error **errp)
  {
      Error *err = NULL;
@@ -XXX,XX +XXX,XX @@ void memory_region_init_ram_from_fd(MemoryRegion *mr,
      mr->destructor = memory_region_destructor_ram;
      mr->ram_block = qemu_ram_alloc_from_fd(size, mr,
                                             share ? RAM_SHARED : 0,
 -                                           fd, &err);
 +                                           fd, offset, &err);
      if (err) {
          mr->size = int128_zero();
          object_unparent(OBJECT(mr));
 diff --git a/softmmu/physmem.c b/softmmu/physmem.c
 index XXXXXXX..XXXXXXX 100644
 --- a/softmmu/physmem.c
 +++ b/softmmu/physmem.c
@@ -XXX,XX +XXX,XX @@ static void *file_ram_alloc(RAMBlock *block,
                              ram_addr_t memory,
                              int fd,
                              bool truncate,
 +                            off_t offset,
                              Error **errp)
  {
      void *area;
@@ -XXX,XX +XXX,XX @@ static void *file_ram_alloc(RAMBlock *block,
      }
--    /* if we are to stay read-only, do not allow permission change
+     area = qemu_ram_mmap(fd, memory, block->mr->align,
--     * to r/w */
+-                         block->flags & RAM_SHARED, block->flags & RAM_PMEM);
--    if (!(reopen_state->bs->open_flags & BDRV_O_ALLOW_RDWR) &&
++                         block->flags & RAM_SHARED, block->flags & RAM_PMEM,
--        reopen_state->flags & BDRV_O_RDWR) {
++                         offset);
--        error_setg(errp, "Node '%s' is read only",
+     if (area == MAP_FAILED) {
--                   bdrv_get_device_or_node_name(reopen_state->bs));
+         error_setg_errno(errp, errno,
-+    /* If we are to stay read-only, do not allow permission change
+                          "unable to map backing store for guest RAM");
-+     * to r/w. Attempting to set to r/w may fail if either BDRV_O_ALLOW_RDWR is
+@@ -XXX,XX +XXX,XX @@ static void ram_block_add(RAMBlock *new_block, Error **errp, bool shared)
-+     * not set, or if the BDS still has copy_on_read enabled */
+ #ifdef CONFIG_POSIX
-+    read_only = !(reopen_state->flags & BDRV_O_RDWR);
+ RAMBlock *qemu_ram_alloc_from_fd(ram_addr_t size, MemoryRegion *mr,
-+    ret = bdrv_can_set_read_only(reopen_state->bs, read_only, &local_err);
+                                  uint32_t ram_flags, int fd,
-+    if (local_err) {
+-                                 Error **errp)
-+        error_propagate(errp, local_err);
++                                 off_t offset, Error **errp)
-         goto error;
+ {
      RAMBlock *new_block;
      Error *local_err = NULL;
@@ -XXX,XX +XXX,XX @@ RAMBlock *qemu_ram_alloc_from_fd(ram_addr_t size, MemoryRegion *mr,
      new_block->used_length = size;
      new_block->max_length = size;
      new_block->flags = ram_flags;
 -    new_block->host = file_ram_alloc(new_block, size, fd, !file_size, errp);
 +    new_block->host = file_ram_alloc(new_block, size, fd, !file_size, offset,
 +                                     errp);
      if (!new_block->host) {
          g_free(new_block);
          return NULL;
@@ -XXX,XX +XXX,XX @@ RAMBlock *qemu_ram_alloc_from_file(ram_addr_t size, MemoryRegion *mr,
          return NULL;
      }
+-    block = qemu_ram_alloc_from_fd(size, mr, ram_flags, fd, errp);
++    block = qemu_ram_alloc_from_fd(size, mr, ram_flags, fd, 0, errp);
+     if (!block) {
+         if (created) {
+             unlink(mem_path);
+diff --git a/util/mmap-alloc.c b/util/mmap-alloc.c
+index XXXXXXX..XXXXXXX 100644
+--- a/util/mmap-alloc.c
++++ b/util/mmap-alloc.c
+@@ -XXX,XX +XXX,XX @@ void *qemu_ram_mmap(int fd,
+                     size_t size,
+                     size_t align,
+                     bool shared,
+-                    bool is_pmem)
++                    bool is_pmem,
++                    off_t map_offset)
+ {
+     int flags;
+     int map_sync_flags = 0;
+@@ -XXX,XX +XXX,XX @@ void *qemu_ram_mmap(int fd,
+     offset = QEMU_ALIGN_UP((uintptr_t)guardptr, align) - (uintptr_t)guardptr;
+     ptr = mmap(guardptr + offset, size, PROT_READ | PROT_WRITE,
+-               flags | map_sync_flags, fd, 0);
++               flags | map_sync_flags, fd, map_offset);
+     if (ptr == MAP_FAILED && map_sync_flags) {
+         if (errno == ENOTSUP) {
+@@ -XXX,XX +XXX,XX @@ void *qemu_ram_mmap(int fd,
+          * we will remove these flags to handle compatibility.
+          */
+         ptr = mmap(guardptr + offset, size, PROT_READ | PROT_WRITE,
+-                   flags, fd, 0);
++                   flags, fd, map_offset);
+     }
+     if (ptr == MAP_FAILED) {
+diff --git a/util/oslib-posix.c b/util/oslib-posix.c
+index XXXXXXX..XXXXXXX 100644
+--- a/util/oslib-posix.c
++++ b/util/oslib-posix.c
+@@ -XXX,XX +XXX,XX @@ void *qemu_memalign(size_t alignment, size_t size)
+ void *qemu_anon_ram_alloc(size_t size, uint64_t *alignment, bool shared)
+ {
+     size_t align = QEMU_VMALLOC_ALIGN;
+-    void *ptr = qemu_ram_mmap(-1, size, align, shared, false);
++    void *ptr = qemu_ram_mmap(-1, size, align, shared, false, 0);
+     if (ptr == MAP_FAILED) {
+         return NULL;
 --
-.9.3
+.29.2

-New patch
+[PULL 10/27] multi-process: Add config option for multi-process QEMU
+From: Jagannathan Raman <jag.raman@oracle.com>
+Add configuration options to enable or disable multiprocess QEMU code
+Signed-off-by: John G Johnson <john.g.johnson@oracle.com>
+Signed-off-by: Jagannathan Raman <jag.raman@oracle.com>
+Signed-off-by: Elena Ufimtseva <elena.ufimtseva@oracle.com>
+Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
+Message-id: 6cc37253e35418ebd7b675a31a3df6e3c7a12dc1.1611938319.git.jag.raman@oracle.com
+Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
+---
+ configure         | 10 ++++++++++
+ meson.build       |  4 +++-
+ Kconfig.host      |  4 ++++
+ hw/Kconfig        |  1 +
+ hw/remote/Kconfig |  3 +++
+files changed, 21 insertions(+), 1 deletion(-)
+ create mode 100644 hw/remote/Kconfig
+diff --git a/configure b/configure
+index XXXXXXX..XXXXXXX 100755
+--- a/configure
++++ b/configure
+@@ -XXX,XX +XXX,XX @@ skip_meson=no
+ gettext="auto"
+ fuse="auto"
+ fuse_lseek="auto"
++multiprocess="no"
+ malloc_trim="auto"
+@@ -XXX,XX +XXX,XX @@ Linux)
+   linux="yes"
+   linux_user="yes"
+   vhost_user=${default_feature:-yes}
++  multiprocess=${default_feature:-yes}
+ ;;
+ esac
+@@ -XXX,XX +XXX,XX @@ for opt do
+   ;;
+   --disable-fuse-lseek) fuse_lseek="disabled"
+   ;;
++  --enable-multiprocess) multiprocess="yes"
++  ;;
++  --disable-multiprocess) multiprocess="no"
++  ;;
+   *)
+       echo "ERROR: unknown option $opt"
+       echo "Try '$0 --help' for more information"
+@@ -XXX,XX +XXX,XX @@ disabled with --disable-FEATURE, default is enabled if available
+   libdaxctl       libdaxctl support
+   fuse            FUSE block device export
+   fuse-lseek      SEEK_HOLE/SEEK_DATA support for FUSE exports
++  multiprocess    Multiprocess QEMU support
+ NOTE: The object files are built at the place where configure is launched
+ EOF
+@@ -XXX,XX +XXX,XX @@ fi
+ if test "$have_mlockall" = "yes" ; then
+   echo "HAVE_MLOCKALL=y" >> $config_host_mak
+ fi
++if test "$multiprocess" = "yes" ; then
++  echo "CONFIG_MULTIPROCESS_ALLOWED=y" >> $config_host_mak
++fi
+ if test "$fuzzing" = "yes" ; then
+   # If LIB_FUZZING_ENGINE is set, assume we are running on OSS-Fuzz, and the
+   # needed CFLAGS have already been provided
+diff --git a/meson.build b/meson.build
+index XXXXXXX..XXXXXXX 100644
+--- a/meson.build
++++ b/meson.build
+@@ -XXX,XX +XXX,XX @@ host_kconfig = \
+   ('CONFIG_VHOST_KERNEL' in config_host ? ['CONFIG_VHOST_KERNEL=y'] : []) + \
+   (have_virtfs ? ['CONFIG_VIRTFS=y'] : []) + \
+   ('CONFIG_LINUX' in config_host ? ['CONFIG_LINUX=y'] : []) + \
+-  ('CONFIG_PVRDMA' in config_host ? ['CONFIG_PVRDMA=y'] : [])
++  ('CONFIG_PVRDMA' in config_host ? ['CONFIG_PVRDMA=y'] : []) + \
++  ('CONFIG_MULTIPROCESS_ALLOWED' in config_host ? ['CONFIG_MULTIPROCESS_ALLOWED=y'] : [])
+ ignored = [ 'TARGET_XML_FILES', 'TARGET_ABI_DIR', 'TARGET_ARCH' ]
+@@ -XXX,XX +XXX,XX @@ summary_info += {'libpmem support':   config_host.has_key('CONFIG_LIBPMEM')}
+ summary_info += {'libdaxctl support': config_host.has_key('CONFIG_LIBDAXCTL')}
+ summary_info += {'libudev':           libudev.found()}
+ summary_info += {'FUSE lseek':        fuse_lseek.found()}
++summary_info += {'Multiprocess QEMU': config_host.has_key('CONFIG_MULTIPROCESS_ALLOWED')}
+ summary(summary_info, bool_yn: true, section: 'Dependencies')
+ if not supported_cpus.contains(cpu)
+diff --git a/Kconfig.host b/Kconfig.host
+index XXXXXXX..XXXXXXX 100644
+--- a/Kconfig.host
++++ b/Kconfig.host
+@@ -XXX,XX +XXX,XX @@ config VIRTFS
+ config PVRDMA
+     bool
++
++config MULTIPROCESS_ALLOWED
++    bool
++    imply MULTIPROCESS
+diff --git a/hw/Kconfig b/hw/Kconfig
+index XXXXXXX..XXXXXXX 100644
+--- a/hw/Kconfig
++++ b/hw/Kconfig
+@@ -XXX,XX +XXX,XX @@ source pci-host/Kconfig
+ source pcmcia/Kconfig
+ source pci/Kconfig
+ source rdma/Kconfig
++source remote/Kconfig
+ source rtc/Kconfig
+ source scsi/Kconfig
+ source sd/Kconfig
+diff --git a/hw/remote/Kconfig b/hw/remote/Kconfig
+new file mode 100644
+index XXXXXXX..XXXXXXX
+--- /dev/null
++++ b/hw/remote/Kconfig
+@@ -XXX,XX +XXX,XX @@
++config MULTIPROCESS
++    bool
++    depends on PCI && KVM
+--
+.29.2

-New patch
+[PULL 11/27] multi-process: setup PCI host bridge for remote device
+From: Jagannathan Raman <jag.raman@oracle.com>
+PCI host bridge is setup for the remote device process. It is
+implemented using remote-pcihost object. It is an extension of the PCI
+host bridge setup by QEMU.
+Remote-pcihost configures a PCI bus which could be used by the remote
+PCI device to latch on to.
+Signed-off-by: Jagannathan Raman <jag.raman@oracle.com>
+Signed-off-by: John G Johnson <john.g.johnson@oracle.com>
+Signed-off-by: Elena Ufimtseva <elena.ufimtseva@oracle.com>
+Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
+Message-id: 0871ba857abb2eafacde07e7fe66a3f12415bfb2.1611938319.git.jag.raman@oracle.com
+Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
+---
+ MAINTAINERS                  |  2 +
+ include/hw/pci-host/remote.h | 29 ++++++++++++++
+ hw/pci-host/remote.c         | 75 ++++++++++++++++++++++++++++++++++++
+ hw/pci-host/Kconfig          |  3 ++
+ hw/pci-host/meson.build      |  1 +
+ hw/remote/Kconfig            |  1 +
+files changed, 111 insertions(+)
+ create mode 100644 include/hw/pci-host/remote.h
+ create mode 100644 hw/pci-host/remote.c
+diff --git a/MAINTAINERS b/MAINTAINERS
+index XXXXXXX..XXXXXXX 100644
+--- a/MAINTAINERS
++++ b/MAINTAINERS
+@@ -XXX,XX +XXX,XX @@ M: John G Johnson <john.g.johnson@oracle.com>
+ S: Maintained
+ F: docs/devel/multi-process.rst
+ F: docs/system/multi-process.rst
++F: hw/pci-host/remote.c
++F: include/hw/pci-host/remote.h
+ Build and test automation
+ -------------------------
+diff --git a/include/hw/pci-host/remote.h b/include/hw/pci-host/remote.h
+new file mode 100644
+index XXXXXXX..XXXXXXX
+--- /dev/null
++++ b/include/hw/pci-host/remote.h
+@@ -XXX,XX +XXX,XX @@
++/*
++ * PCI Host for remote device
++ *
++ * Copyright © 2018, 2021 Oracle and/or its affiliates.
++ *
++ * This work is licensed under the terms of the GNU GPL, version 2 or later.
++ * See the COPYING file in the top-level directory.
++ *
++ */
++
++#ifndef REMOTE_PCIHOST_H
++#define REMOTE_PCIHOST_H
++
++#include "exec/memory.h"
++#include "hw/pci/pcie_host.h"
++
++#define TYPE_REMOTE_PCIHOST "remote-pcihost"
++OBJECT_DECLARE_SIMPLE_TYPE(RemotePCIHost, REMOTE_PCIHOST)
++
++struct RemotePCIHost {
++    /*< private >*/
++    PCIExpressHost parent_obj;
++    /*< public >*/
++
++    MemoryRegion *mr_pci_mem;
++    MemoryRegion *mr_sys_io;
++};
++
++#endif
+diff --git a/hw/pci-host/remote.c b/hw/pci-host/remote.c
+new file mode 100644
+index XXXXXXX..XXXXXXX
+--- /dev/null
++++ b/hw/pci-host/remote.c
+@@ -XXX,XX +XXX,XX @@
++/*
++ * Remote PCI host device
++ *
++ * Unlike PCI host devices that model physical hardware, the purpose
++ * of this PCI host is to host multi-process QEMU devices.
++ *
++ * Multi-process QEMU extends the PCI host of a QEMU machine into a
++ * remote process. Any PCI device attached to the remote process is
++ * visible in the QEMU guest. This allows existing QEMU device models
++ * to be reused in the remote process.
++ *
++ * This PCI host is purely a container for PCI devices. It's fake in the
++ * sense that the guest never sees this PCI host and has no way of
++ * accessing it. Its job is just to provide the environment that QEMU
++ * PCI device models need when running in a remote process.
++ *
++ * Copyright © 2018, 2021 Oracle and/or its affiliates.
++ *
++ * This work is licensed under the terms of the GNU GPL, version 2 or later.
++ * See the COPYING file in the top-level directory.
++ *
++ */
++
++#include "qemu/osdep.h"
++#include "qemu-common.h"
++
++#include "hw/pci/pci.h"
++#include "hw/pci/pci_host.h"
++#include "hw/pci/pcie_host.h"
++#include "hw/qdev-properties.h"
++#include "hw/pci-host/remote.h"
++#include "exec/memory.h"
++
++static const char *remote_pcihost_root_bus_path(PCIHostState *host_bridge,
++                                                PCIBus *rootbus)
++{
++    return "0000:00";
++}
++
++static void remote_pcihost_realize(DeviceState *dev, Error **errp)
++{
++    PCIHostState *pci = PCI_HOST_BRIDGE(dev);
++    RemotePCIHost *s = REMOTE_PCIHOST(dev);
++
++    pci->bus = pci_root_bus_new(DEVICE(s), "remote-pci",
++                                s->mr_pci_mem, s->mr_sys_io,
++                                0, TYPE_PCIE_BUS);
++}
++
++static void remote_pcihost_class_init(ObjectClass *klass, void *data)
++{
++    DeviceClass *dc = DEVICE_CLASS(klass);
++    PCIHostBridgeClass *hc = PCI_HOST_BRIDGE_CLASS(klass);
++
++    hc->root_bus_path = remote_pcihost_root_bus_path;
++    dc->realize = remote_pcihost_realize;
++
++    dc->user_creatable = false;
++    set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
++    dc->fw_name = "pci";
++}
++
++static const TypeInfo remote_pcihost_info = {
++    .name = TYPE_REMOTE_PCIHOST,
++    .parent = TYPE_PCIE_HOST_BRIDGE,
++    .instance_size = sizeof(RemotePCIHost),
++    .class_init = remote_pcihost_class_init,
++};
++
++static void remote_pcihost_register(void)
++{
++    type_register_static(&remote_pcihost_info);
++}
++
++type_init(remote_pcihost_register)
+diff --git a/hw/pci-host/Kconfig b/hw/pci-host/Kconfig
+index XXXXXXX..XXXXXXX 100644
+--- a/hw/pci-host/Kconfig
++++ b/hw/pci-host/Kconfig
+@@ -XXX,XX +XXX,XX @@ config PCI_POWERNV
+     select PCI_EXPRESS
+     select MSI_NONBROKEN
+     select PCIE_PORT
++
++config REMOTE_PCIHOST
++    bool
+diff --git a/hw/pci-host/meson.build b/hw/pci-host/meson.build
+index XXXXXXX..XXXXXXX 100644
+--- a/hw/pci-host/meson.build
++++ b/hw/pci-host/meson.build
+@@ -XXX,XX +XXX,XX @@ pci_ss.add(when: 'CONFIG_PCI_EXPRESS_XILINX', if_true: files('xilinx-pcie.c'))
+ pci_ss.add(when: 'CONFIG_PCI_I440FX', if_true: files('i440fx.c'))
+ pci_ss.add(when: 'CONFIG_PCI_SABRE', if_true: files('sabre.c'))
+ pci_ss.add(when: 'CONFIG_XEN_IGD_PASSTHROUGH', if_true: files('xen_igd_pt.c'))
++pci_ss.add(when: 'CONFIG_REMOTE_PCIHOST', if_true: files('remote.c'))
+ # PPC devices
+ pci_ss.add(when: 'CONFIG_PREP_PCI', if_true: files('prep.c'))
+diff --git a/hw/remote/Kconfig b/hw/remote/Kconfig
+index XXXXXXX..XXXXXXX 100644
+--- a/hw/remote/Kconfig
++++ b/hw/remote/Kconfig
+@@ -XXX,XX +XXX,XX @@
+ config MULTIPROCESS
+     bool
+     depends on PCI && KVM
++    select REMOTE_PCIHOST
+--
+.29.2

-New patch
+[PULL 12/27] multi-process: setup a machine object for remote device process
+From: Jagannathan Raman <jag.raman@oracle.com>
+x-remote-machine object sets up various subsystems of the remote
+device process. Instantiate PCI host bridge object and initialize RAM, IO &
+PCI memory regions.
+Signed-off-by: John G Johnson <john.g.johnson@oracle.com>
+Signed-off-by: Jagannathan Raman <jag.raman@oracle.com>
+Signed-off-by: Elena Ufimtseva <elena.ufimtseva@oracle.com>
+Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
+Message-id: c537f38d17f90453ca610c6b70cf3480274e0ba1.1611938319.git.jag.raman@oracle.com
+Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
+---
+ MAINTAINERS                  |  2 ++
+ include/hw/pci-host/remote.h |  1 +
+ include/hw/remote/machine.h  | 27 ++++++++++++++
+ hw/remote/machine.c          | 70 ++++++++++++++++++++++++++++++++++++
+ hw/meson.build               |  1 +
+ hw/remote/meson.build        |  5 +++
+files changed, 106 insertions(+)
+ create mode 100644 include/hw/remote/machine.h
+ create mode 100644 hw/remote/machine.c
+ create mode 100644 hw/remote/meson.build
+diff --git a/MAINTAINERS b/MAINTAINERS
+index XXXXXXX..XXXXXXX 100644
+--- a/MAINTAINERS
++++ b/MAINTAINERS
+@@ -XXX,XX +XXX,XX @@ F: docs/devel/multi-process.rst
+ F: docs/system/multi-process.rst
+ F: hw/pci-host/remote.c
+ F: include/hw/pci-host/remote.h
++F: hw/remote/machine.c
++F: include/hw/remote/machine.h
+ Build and test automation
+ -------------------------
+diff --git a/include/hw/pci-host/remote.h b/include/hw/pci-host/remote.h
+index XXXXXXX..XXXXXXX 100644
+--- a/include/hw/pci-host/remote.h
++++ b/include/hw/pci-host/remote.h
+@@ -XXX,XX +XXX,XX @@ struct RemotePCIHost {
+     MemoryRegion *mr_pci_mem;
+     MemoryRegion *mr_sys_io;
++    MemoryRegion *mr_sys_mem;
+ };
+ #endif
+diff --git a/include/hw/remote/machine.h b/include/hw/remote/machine.h
+new file mode 100644
+index XXXXXXX..XXXXXXX
+--- /dev/null
++++ b/include/hw/remote/machine.h
+@@ -XXX,XX +XXX,XX @@
++/*
++ * Remote machine configuration
++ *
++ * Copyright © 2018, 2021 Oracle and/or its affiliates.
++ *
++ * This work is licensed under the terms of the GNU GPL, version 2 or later.
++ * See the COPYING file in the top-level directory.
++ *
++ */
++
++#ifndef REMOTE_MACHINE_H
++#define REMOTE_MACHINE_H
++
++#include "qom/object.h"
++#include "hw/boards.h"
++#include "hw/pci-host/remote.h"
++
++struct RemoteMachineState {
++    MachineState parent_obj;
++
++    RemotePCIHost *host;
++};
++
++#define TYPE_REMOTE_MACHINE "x-remote-machine"
++OBJECT_DECLARE_SIMPLE_TYPE(RemoteMachineState, REMOTE_MACHINE)
++
++#endif
+diff --git a/hw/remote/machine.c b/hw/remote/machine.c
+new file mode 100644
+index XXXXXXX..XXXXXXX
+--- /dev/null
++++ b/hw/remote/machine.c
+@@ -XXX,XX +XXX,XX @@
++/*
++ * Machine for remote device
++ *
++ *  This machine type is used by the remote device process in multi-process
++ *  QEMU. QEMU device models depend on parent busses, interrupt controllers,
++ *  memory regions, etc. The remote machine type offers this environment so
++ *  that QEMU device models can be used as remote devices.
++ *
++ * Copyright © 2018, 2021 Oracle and/or its affiliates.
++ *
++ * This work is licensed under the terms of the GNU GPL, version 2 or later.
++ * See the COPYING file in the top-level directory.
++ *
++ */
++
++#include "qemu/osdep.h"
++#include "qemu-common.h"
++
++#include "hw/remote/machine.h"
++#include "exec/address-spaces.h"
++#include "exec/memory.h"
++#include "qapi/error.h"
++
++static void remote_machine_init(MachineState *machine)
++{
++    MemoryRegion *system_memory, *system_io, *pci_memory;
++    RemoteMachineState *s = REMOTE_MACHINE(machine);
++    RemotePCIHost *rem_host;
++
++    system_memory = get_system_memory();
++    system_io = get_system_io();
++
++    pci_memory = g_new(MemoryRegion, 1);
++    memory_region_init(pci_memory, NULL, "pci", UINT64_MAX);
++
++    rem_host = REMOTE_PCIHOST(qdev_new(TYPE_REMOTE_PCIHOST));
++
++    rem_host->mr_pci_mem = pci_memory;
++    rem_host->mr_sys_mem = system_memory;
++    rem_host->mr_sys_io = system_io;
++
++    s->host = rem_host;
++
++    object_property_add_child(OBJECT(s), "remote-pcihost", OBJECT(rem_host));
++    memory_region_add_subregion_overlap(system_memory, 0x0, pci_memory, -1);
++
++    qdev_realize(DEVICE(rem_host), sysbus_get_default(), &error_fatal);
++}
++
++static void remote_machine_class_init(ObjectClass *oc, void *data)
++{
++    MachineClass *mc = MACHINE_CLASS(oc);
++
++    mc->init = remote_machine_init;
++    mc->desc = "Experimental remote machine";
++}
++
++static const TypeInfo remote_machine = {
++    .name = TYPE_REMOTE_MACHINE,
++    .parent = TYPE_MACHINE,
++    .instance_size = sizeof(RemoteMachineState),
++    .class_init = remote_machine_class_init,
++};
++
++static void remote_machine_register_types(void)
++{
++    type_register_static(&remote_machine);
++}
++
++type_init(remote_machine_register_types);
+diff --git a/hw/meson.build b/hw/meson.build
+index XXXXXXX..XXXXXXX 100644
+--- a/hw/meson.build
++++ b/hw/meson.build
+@@ -XXX,XX +XXX,XX @@ subdir('moxie')
+ subdir('nios2')
+ subdir('openrisc')
+ subdir('ppc')
++subdir('remote')
+ subdir('riscv')
+ subdir('rx')
+ subdir('s390x')
+diff --git a/hw/remote/meson.build b/hw/remote/meson.build
+new file mode 100644
+index XXXXXXX..XXXXXXX
+--- /dev/null
++++ b/hw/remote/meson.build
+@@ -XXX,XX +XXX,XX @@
++remote_ss = ss.source_set()
++
++remote_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('machine.c'))
++
++softmmu_ss.add_all(when: 'CONFIG_MULTIPROCESS', if_true: remote_ss)
+--
+.29.2

-[Qemu-devel] [PULL 12/12] qemu-iotests: _cleanup_qemu must be called on exit
+[PULL 13/27] io: add qio_channel_writev_full_all helper
-For the tests that use the common.qemu functions for running a QEMU
+From: Elena Ufimtseva <elena.ufimtseva@oracle.com>
 process, _cleanup_qemu must be called in the exit function.
-If it is not, if the qemu process aborts, then not all of the droppings
+Adds qio_channel_writev_full_all() to transmit both data and FDs.
-are cleaned up (e.g. pidfile, fifos).
+Refactors existing code to use this helper.
-This updates those tests that did not have a cleanup in qemu-iotests.
+Signed-off-by: Elena Ufimtseva <elena.ufimtseva@oracle.com>
 Signed-off-by: John G Johnson <john.g.johnson@oracle.com>
 Signed-off-by: Jagannathan Raman <jag.raman@oracle.com>
 Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
 Acked-by: Daniel P. Berrangé <berrange@redhat.com>
 Message-id: 480fbf1fe4152495d60596c9b665124549b426a5.1611938319.git.jag.raman@oracle.com
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
  include/io/channel.h | 25 +++++++++++++++++++++++++
  io/channel.c         | 15 ++++++++++++++-
 files changed, 39 insertions(+), 1 deletion(-)
-(I swapped spaces for tabs in test 102 as well)
+diff --git a/include/io/channel.h b/include/io/channel.h
+index XXXXXXX..XXXXXXX 100644
-Reported-by: Eric Blake <eblake@redhat.com>
+--- a/include/io/channel.h
-Reviewed-by: Eric Blake <eblake@redhat.com>
++++ b/include/io/channel.h
-Signed-off-by: Jeff Cody <jcody@redhat.com>
+@@ -XXX,XX +XXX,XX @@ void qio_channel_set_aio_fd_handler(QIOChannel *ioc,
-Message-id: d59c2f6ad6c1da8b9b3c7f357c94a7122ccfc55a.1492544096.git.jcody@redhat.com
+                                     IOHandler *io_write,
----
+                                     void *opaque);
- tests/qemu-iotests/028 |  1 +
- tests/qemu-iotests/094 | 11 ++++++++---
++/**
- tests/qemu-iotests/102 |  5 +++--
++ * qio_channel_writev_full_all:
- tests/qemu-iotests/109 |  1 +
++ * @ioc: the channel object
- tests/qemu-iotests/117 |  1 +
++ * @iov: the array of memory regions to write data from
- tests/qemu-iotests/130 |  1 +
++ * @niov: the length of the @iov array
- tests/qemu-iotests/140 |  1 +
++ * @fds: an array of file handles to send
- tests/qemu-iotests/141 |  1 +
++ * @nfds: number of file handles in @fds
- tests/qemu-iotests/143 |  1 +
++ * @errp: pointer to a NULL-initialized error object
- tests/qemu-iotests/156 |  1 +
++ *
-files changed, 19 insertions(+), 5 deletions(-)
++ *
++ * Behaves like qio_channel_writev_full but will attempt
-diff --git a/tests/qemu-iotests/028 b/tests/qemu-iotests/028
++ * to send all data passed (file handles and memory regions).
-index XXXXXXX..XXXXXXX 100755
++ * The function will wait for all requested data
---- a/tests/qemu-iotests/028
++ * to be written, yielding from the current coroutine
-+++ b/tests/qemu-iotests/028
++ * if required.
-@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
++ *
++ * Returns: 0 if all bytes were written, or -1 on error
- _cleanup()
++ */
- {
++
-+    _cleanup_qemu
++int qio_channel_writev_full_all(QIOChannel *ioc,
-     rm -f "${TEST_IMG}.copy"
++                                const struct iovec *iov,
-     _cleanup_test_img
++                                size_t niov,
- }
++                                int *fds, size_t nfds,
-diff --git a/tests/qemu-iotests/094 b/tests/qemu-iotests/094
++                                Error **errp);
-index XXXXXXX..XXXXXXX 100755
++
---- a/tests/qemu-iotests/094
+ #endif /* QIO_CHANNEL_H */
-+++ b/tests/qemu-iotests/094
+diff --git a/io/channel.c b/io/channel.c
-@@ -XXX,XX +XXX,XX @@ echo "QA output created by $seq"
+index XXXXXXX..XXXXXXX 100644
- here="$PWD"
+--- a/io/channel.c
- status=1    # failure is the default!
++++ b/io/channel.c
+@@ -XXX,XX +XXX,XX @@ int qio_channel_writev_all(QIOChannel *ioc,
--trap "exit \$status" 0 1 2 3 15
+                            const struct iovec *iov,
-+_cleanup()
+                            size_t niov,
                             Error **errp)
 +{
-+    _cleanup_qemu
++    return qio_channel_writev_full_all(ioc, iov, niov, NULL, 0, errp);
 +    _cleanup_test_img
 +    rm -f "$TEST_DIR/source.$IMGFMT"
 +}
 +
-+trap "_cleanup; exit \$status" 0 1 2 3 15
++int qio_channel_writev_full_all(QIOChannel *ioc,
++                                const struct iovec *iov,
- # get standard environment, filters and checks
++                                size_t niov,
- . ./common.rc
++                                int *fds, size_t nfds,
-@@ -XXX,XX +XXX,XX @@ _send_qemu_cmd $QEMU_HANDLE \
++                                Error **errp)
  wait=1 _cleanup_qemu
 -_cleanup_test_img
 -rm -f "$TEST_DIR/source.$IMGFMT"
  # success, all done
  echo '*** done'
 diff --git a/tests/qemu-iotests/102 b/tests/qemu-iotests/102
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/102
 +++ b/tests/qemu-iotests/102
@@ -XXX,XX +XXX,XX @@ seq=$(basename $0)
  echo "QA output created by $seq"
  here=$PWD
 -status=1    # failure is the default!
 +status=1    # failure is the default!
  _cleanup()
  {
--    _cleanup_test_img
+     int ret = -1;
-+    _cleanup_qemu
+     struct iovec *local_iov = g_new(struct iovec, niov);
-+    _cleanup_test_img
+@@ -XXX,XX +XXX,XX @@ int qio_channel_writev_all(QIOChannel *ioc,
- }
- trap "_cleanup; exit \$status" 0 1 2 3 15
+     while (nlocal_iov > 0) {
+         ssize_t len;
-diff --git a/tests/qemu-iotests/109 b/tests/qemu-iotests/109
+-        len = qio_channel_writev(ioc, local_iov, nlocal_iov, errp);
-index XXXXXXX..XXXXXXX 100755
++        len = qio_channel_writev_full(ioc, local_iov, nlocal_iov, fds, nfds,
---- a/tests/qemu-iotests/109
++                                      errp);
-+++ b/tests/qemu-iotests/109
+         if (len == QIO_CHANNEL_ERR_BLOCK) {
-@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
+             if (qemu_in_coroutine()) {
+                 qio_channel_yield(ioc, G_IO_OUT);
- _cleanup()
+@@ -XXX,XX +XXX,XX @@ int qio_channel_writev_all(QIOChannel *ioc,
- {
+         }
-+    _cleanup_qemu
-     rm -f $TEST_IMG.src
+         iov_discard_front(&local_iov, &nlocal_iov, len);
-     _cleanup_test_img
++
- }
++        fds = NULL;
-diff --git a/tests/qemu-iotests/117 b/tests/qemu-iotests/117
++        nfds = 0;
-index XXXXXXX..XXXXXXX 100755
+     }
---- a/tests/qemu-iotests/117
-+++ b/tests/qemu-iotests/117
+     ret = 0;
@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
  _cleanup()
  {
 +    _cleanup_qemu
      _cleanup_test_img
  }
  trap "_cleanup; exit \$status" 0 1 2 3 15
 diff --git a/tests/qemu-iotests/130 b/tests/qemu-iotests/130
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/130
 +++ b/tests/qemu-iotests/130
@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
  _cleanup()
  {
 +    _cleanup_qemu
      _cleanup_test_img
  }
  trap "_cleanup; exit \$status" 0 1 2 3 15
 diff --git a/tests/qemu-iotests/140 b/tests/qemu-iotests/140
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/140
 +++ b/tests/qemu-iotests/140
@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
  _cleanup()
  {
 +    _cleanup_qemu
      _cleanup_test_img
      rm -f "$TEST_DIR/nbd"
  }
 diff --git a/tests/qemu-iotests/141 b/tests/qemu-iotests/141
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/141
 +++ b/tests/qemu-iotests/141
@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
  _cleanup()
  {
 +    _cleanup_qemu
      _cleanup_test_img
      rm -f "$TEST_DIR/{b,m,o}.$IMGFMT"
  }
 diff --git a/tests/qemu-iotests/143 b/tests/qemu-iotests/143
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/143
 +++ b/tests/qemu-iotests/143
@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
  _cleanup()
  {
 +    _cleanup_qemu
      rm -f "$TEST_DIR/nbd"
  }
  trap "_cleanup; exit \$status" 0 1 2 3 15
 diff --git a/tests/qemu-iotests/156 b/tests/qemu-iotests/156
 index XXXXXXX..XXXXXXX 100755
 --- a/tests/qemu-iotests/156
 +++ b/tests/qemu-iotests/156
@@ -XXX,XX +XXX,XX @@ status=1    # failure is the default!
  _cleanup()
  {
 +    _cleanup_qemu
      rm -f "$TEST_IMG{,.target}{,.backing,.overlay}"
  }
  trap "_cleanup; exit \$status" 0 1 2 3 15
 --
-.9.3
+.29.2

-[Qemu-devel] [PULL 10/12] block/rbd - update variable names to more apt names
+[PULL 14/27] io: add qio_channel_readv_full_all_eof & qio_channel_readv_full_all helpers
-Update 'clientname' to be 'user', which tracks better with both
+From: Elena Ufimtseva <elena.ufimtseva@oracle.com>
-the QAPI and rados variable naming.
+Adds qio_channel_readv_full_all_eof() and qio_channel_readv_full_all()
-Update 'name' to be 'image_name', as it indicates the rbd image.
+to read both data and FDs. Refactors existing code to use these helpers.
-Naming it 'image' would have been ideal, but we are using that for
-the rados_image_t value returned by rbd_open().
+Signed-off-by: Elena Ufimtseva <elena.ufimtseva@oracle.com>
+Signed-off-by: John G Johnson <john.g.johnson@oracle.com>
-Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
+Signed-off-by: Jagannathan Raman <jag.raman@oracle.com>
-Signed-off-by: Jeff Cody <jcody@redhat.com>
+Acked-by: Daniel P. Berrangé <berrange@redhat.com>
-Reviewed-by: John Snow <jsnow@redhat.com>
+Message-id: b059c4cc0fb741e794d644c144cc21372cad877d.1611938319.git.jag.raman@oracle.com
-Message-id: b7ec1fb2e1cf36f9b6911631447a5b0422590b7d.1491597120.git.jcody@redhat.com
+Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
- block/rbd.c | 33 +++++++++++++++++----------------
+ include/io/channel.h |  53 +++++++++++++++++++++++
-file changed, 17 insertions(+), 16 deletions(-)
+ io/channel.c         | 101 ++++++++++++++++++++++++++++++++++---------
+files changed, 134 insertions(+), 20 deletions(-)
-diff --git a/block/rbd.c b/block/rbd.c
 diff --git a/include/io/channel.h b/include/io/channel.h
 index XXXXXXX..XXXXXXX 100644
---- a/block/rbd.c
+--- a/include/io/channel.h
-+++ b/block/rbd.c
++++ b/include/io/channel.h
-@@ -XXX,XX +XXX,XX @@ typedef struct BDRVRBDState {
+@@ -XXX,XX +XXX,XX @@ void qio_channel_set_aio_fd_handler(QIOChannel *ioc,
-     rados_t cluster;
+                                     IOHandler *io_write,
-     rados_ioctx_t io_ctx;
+                                     void *opaque);
-     rbd_image_t image;
--    char *name;
++/**
-+    char *image_name;
++ * qio_channel_readv_full_all_eof:
-     char *snap;
++ * @ioc: the channel object
- } BDRVRBDState;
++ * @iov: the array of memory regions to read data to
++ * @niov: the length of the @iov array
-@@ -XXX,XX +XXX,XX @@ static int qemu_rbd_create(const char *filename, QemuOpts *opts, Error **errp)
++ * @fds: an array of file handles to read
-     int64_t bytes = 0;
++ * @nfds: number of file handles in @fds
-     int64_t objsize;
++ * @errp: pointer to a NULL-initialized error object
-     int obj_order = 0;
++ *
--    const char *pool, *name, *conf, *clientname, *keypairs;
++ *
-+    const char *pool, *image_name, *conf, *user, *keypairs;
++ * Performs same function as qio_channel_readv_all_eof.
-     const char *secretid;
++ * Additionally, attempts to read file descriptors shared
-     rados_t cluster;
++ * over the channel. The function will wait for all
-     rados_ioctx_t io_ctx;
++ * requested data to be read, yielding from the current
-@@ -XXX,XX +XXX,XX @@ static int qemu_rbd_create(const char *filename, QemuOpts *opts, Error **errp)
++ * coroutine if required. data refers to both file
-      */
++ * descriptors and the iovs.
-     pool       = qdict_get_try_str(options, "pool");
++ *
-     conf       = qdict_get_try_str(options, "conf");
++ * Returns: 1 if all bytes were read, 0 if end-of-file
--    clientname = qdict_get_try_str(options, "user");
++ *          occurs without data, or -1 on error
--    name       = qdict_get_try_str(options, "image");
++ */
-+    user       = qdict_get_try_str(options, "user");
++
-+    image_name = qdict_get_try_str(options, "image");
++int qio_channel_readv_full_all_eof(QIOChannel *ioc,
-     keypairs   = qdict_get_try_str(options, "=keyvalue-pairs");
++                                   const struct iovec *iov,
++                                   size_t niov,
--    ret = rados_create(&cluster, clientname);
++                                   int **fds, size_t *nfds,
-+    ret = rados_create(&cluster, user);
++                                   Error **errp);
-     if (ret < 0) {
++
-         error_setg_errno(errp, -ret, "error initializing");
++/**
-         goto exit;
++ * qio_channel_readv_full_all:
-@@ -XXX,XX +XXX,XX @@ static int qemu_rbd_create(const char *filename, QemuOpts *opts, Error **errp)
++ * @ioc: the channel object
-         goto shutdown;
++ * @iov: the array of memory regions to read data to
 + * @niov: the length of the @iov array
 + * @fds: an array of file handles to read
 + * @nfds: number of file handles in @fds
 + * @errp: pointer to a NULL-initialized error object
 + *
 + *
 + * Performs same function as qio_channel_readv_all_eof.
 + * Additionally, attempts to read file descriptors shared
 + * over the channel. The function will wait for all
 + * requested data to be read, yielding from the current
 + * coroutine if required. data refers to both file
 + * descriptors and the iovs.
 + *
 + * Returns: 0 if all bytes were read, or -1 on error
 + */
 +
 +int qio_channel_readv_full_all(QIOChannel *ioc,
 +                               const struct iovec *iov,
 +                               size_t niov,
 +                               int **fds, size_t *nfds,
 +                               Error **errp);
 +
  /**
   * qio_channel_writev_full_all:
   * @ioc: the channel object
 diff --git a/io/channel.c b/io/channel.c
 index XXXXXXX..XXXXXXX 100644
 --- a/io/channel.c
 +++ b/io/channel.c
@@ -XXX,XX +XXX,XX @@ int qio_channel_readv_all_eof(QIOChannel *ioc,
                                const struct iovec *iov,
                                size_t niov,
                                Error **errp)
 +{
 +    return qio_channel_readv_full_all_eof(ioc, iov, niov, NULL, NULL, errp);
 +}
 +
 +int qio_channel_readv_all(QIOChannel *ioc,
 +                          const struct iovec *iov,
 +                          size_t niov,
 +                          Error **errp)
 +{
 +    return qio_channel_readv_full_all(ioc, iov, niov, NULL, NULL, errp);
 +}
 +
 +int qio_channel_readv_full_all_eof(QIOChannel *ioc,
 +                                   const struct iovec *iov,
 +                                   size_t niov,
 +                                   int **fds, size_t *nfds,
 +                                   Error **errp)
  {
      int ret = -1;
      struct iovec *local_iov = g_new(struct iovec, niov);
      struct iovec *local_iov_head = local_iov;
      unsigned int nlocal_iov = niov;
 +    int **local_fds = fds;
 +    size_t *local_nfds = nfds;
      bool partial = false;
 +    if (nfds) {
 +        *nfds = 0;
 +    }
 +
 +    if (fds) {
 +        *fds = NULL;
 +    }
 +
      nlocal_iov = iov_copy(local_iov, nlocal_iov,
                            iov, niov,
 , iov_size(iov, niov));
 -    while (nlocal_iov > 0) {
 +    while ((nlocal_iov > 0) || local_fds) {
          ssize_t len;
 -        len = qio_channel_readv(ioc, local_iov, nlocal_iov, errp);
 +        len = qio_channel_readv_full(ioc, local_iov, nlocal_iov, local_fds,
 +                                     local_nfds, errp);
          if (len == QIO_CHANNEL_ERR_BLOCK) {
              if (qemu_in_coroutine()) {
                  qio_channel_yield(ioc, G_IO_IN);
@@ -XXX,XX +XXX,XX @@ int qio_channel_readv_all_eof(QIOChannel *ioc,
                  qio_channel_wait(ioc, G_IO_IN);
              }
              continue;
 -        } else if (len < 0) {
 -            goto cleanup;
 -        } else if (len == 0) {
 -            if (partial) {
 -                error_setg(errp,
 -                           "Unexpected end-of-file before all bytes were read");
 -            } else {
 +        }
 +
 +        if (len == 0) {
 +            if (local_nfds && *local_nfds) {
 +                /*
 +                 * Got some FDs, but no data yet. This isn't an EOF
 +                 * scenario (yet), so carry on to try to read data
 +                 * on next loop iteration
 +                 */
 +                goto next_iter;
 +            } else if (!partial) {
 +                /* No fds and no data - EOF before any data read */
                  ret = 0;
 +                goto cleanup;
 +            } else {
 +                len = -1;
 +                error_setg(errp,
 +                           "Unexpected end-of-file before all data were read");
 +                /* Fallthrough into len < 0 handling */
 +            }
 +        }
 +
 +        if (len < 0) {
 +            /* Close any FDs we previously received */
 +            if (nfds && fds) {
 +                size_t i;
 +                for (i = 0; i < (*nfds); i++) {
 +                    close((*fds)[i]);
 +                }
 +                g_free(*fds);
 +                *fds = NULL;
 +                *nfds = 0;
              }
              goto cleanup;
          }
 +        if (nlocal_iov) {
 +            iov_discard_front(&local_iov, &nlocal_iov, len);
 +        }
 +
 +next_iter:
          partial = true;
 -        iov_discard_front(&local_iov, &nlocal_iov, len);
 +        local_fds = NULL;
 +        local_nfds = NULL;
      }
--    ret = rbd_create(io_ctx, name, bytes, &obj_order);
+     ret = 1;
-+    ret = rbd_create(io_ctx, image_name, bytes, &obj_order);
+@@ -XXX,XX +XXX,XX @@ int qio_channel_readv_all_eof(QIOChannel *ioc,
-     if (ret < 0) {
+     return ret;
-         error_setg_errno(errp, -ret, "error rbd create");
+ }
 -int qio_channel_readv_all(QIOChannel *ioc,
 -                          const struct iovec *iov,
 -                          size_t niov,
 -                          Error **errp)
 +int qio_channel_readv_full_all(QIOChannel *ioc,
 +                               const struct iovec *iov,
 +                               size_t niov,
 +                               int **fds, size_t *nfds,
 +                               Error **errp)
  {
 -    int ret = qio_channel_readv_all_eof(ioc, iov, niov, errp);
 +    int ret = qio_channel_readv_full_all_eof(ioc, iov, niov, fds, nfds, errp);
      if (ret == 0) {
 -        ret = -1;
 -        error_setg(errp,
 -                   "Unexpected end-of-file before all bytes were read");
 -    } else if (ret == 1) {
 -        ret = 0;
 +        error_prepend(errp,
 +                      "Unexpected end-of-file before all data were read.");
 +        return -1;
      }
-@@ -XXX,XX +XXX,XX @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags,
++    if (ret == 1) {
-                          Error **errp)
++        return 0;
- {
++    }
-     BDRVRBDState *s = bs->opaque;
++
--    const char *pool, *snap, *conf, *clientname, *name, *keypairs;
+     return ret;
 +    const char *pool, *snap, *conf, *user, *image_name, *keypairs;
      const char *secretid;
      QemuOpts *opts;
      Error *local_err = NULL;
@@ -XXX,XX +XXX,XX @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags,
      pool           = qemu_opt_get(opts, "pool");
      conf           = qemu_opt_get(opts, "conf");
      snap           = qemu_opt_get(opts, "snapshot");
 -    clientname     = qemu_opt_get(opts, "user");
 -    name           = qemu_opt_get(opts, "image");
 +    user           = qemu_opt_get(opts, "user");
 +    image_name     = qemu_opt_get(opts, "image");
      keypairs       = qemu_opt_get(opts, "=keyvalue-pairs");
 -    if (!pool || !name) {
 +    if (!pool || !image_name) {
          error_setg(errp, "Parameters 'pool' and 'image' are required");
          r = -EINVAL;
          goto failed_opts;
      }
 -    r = rados_create(&s->cluster, clientname);
 +    r = rados_create(&s->cluster, user);
      if (r < 0) {
          error_setg_errno(errp, -r, "error initializing");
          goto failed_opts;
      }
      s->snap = g_strdup(snap);
 -    s->name = g_strdup(name);
 +    s->image_name = g_strdup(image_name);
      /* try default location when conf=NULL, but ignore failure */
      r = rados_conf_read_file(s->cluster, conf);
@@ -XXX,XX +XXX,XX @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags,
      }
      /* rbd_open is always r/w */
 -    r = rbd_open(s->io_ctx, s->name, &s->image, s->snap);
 +    r = rbd_open(s->io_ctx, s->image_name, &s->image, s->snap);
      if (r < 0) {
 -        error_setg_errno(errp, -r, "error reading header from %s", s->name);
 +        error_setg_errno(errp, -r, "error reading header from %s",
 +                         s->image_name);
          goto failed_open;
      }
@@ -XXX,XX +XXX,XX @@ failed_open:
  failed_shutdown:
      rados_shutdown(s->cluster);
      g_free(s->snap);
 -    g_free(s->name);
 +    g_free(s->image_name);
  failed_opts:
      qemu_opts_del(opts);
      g_free(mon_host);
@@ -XXX,XX +XXX,XX @@ static void qemu_rbd_close(BlockDriverState *bs)
      rbd_close(s->image);
      rados_ioctx_destroy(s->io_ctx);
      g_free(s->snap);
 -    g_free(s->name);
 +    g_free(s->image_name);
      rados_shutdown(s->cluster);
  }
 --
-.9.3
+.29.2

-New patch
+[PULL 15/27] multi-process: define MPQemuMsg format and transmission functions
+From: Elena Ufimtseva <elena.ufimtseva@oracle.com>
+Defines MPQemuMsg, which is the message that is sent to the remote
+process. This message is sent over QIOChannel and is used to
+command the remote process to perform various tasks.
+Define transmission functions used by proxy and by remote.
+Signed-off-by: Jagannathan Raman <jag.raman@oracle.com>
+Signed-off-by: John G Johnson <john.g.johnson@oracle.com>
+Signed-off-by: Elena Ufimtseva <elena.ufimtseva@oracle.com>
+Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
+Message-id: 56ca8bcf95195b2b195b08f6b9565b6d7410bce5.1611938319.git.jag.raman@oracle.com
+Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
+---
+ MAINTAINERS                     |   2 +
+ meson.build                     |   1 +
+ hw/remote/trace.h               |   1 +
+ include/hw/remote/mpqemu-link.h |  63 ++++++++++
+ include/sysemu/iothread.h       |   6 +
+ hw/remote/mpqemu-link.c         | 205 ++++++++++++++++++++++++++++++++
+ iothread.c                      |   6 +
+ hw/remote/meson.build           |   1 +
+ hw/remote/trace-events          |   4 +
+files changed, 289 insertions(+)
+ create mode 100644 hw/remote/trace.h
+ create mode 100644 include/hw/remote/mpqemu-link.h
+ create mode 100644 hw/remote/mpqemu-link.c
+ create mode 100644 hw/remote/trace-events
+diff --git a/MAINTAINERS b/MAINTAINERS
+index XXXXXXX..XXXXXXX 100644
+--- a/MAINTAINERS
++++ b/MAINTAINERS
+@@ -XXX,XX +XXX,XX @@ F: hw/pci-host/remote.c
+ F: include/hw/pci-host/remote.h
+ F: hw/remote/machine.c
+ F: include/hw/remote/machine.h
++F: hw/remote/mpqemu-link.c
++F: include/hw/remote/mpqemu-link.h
+ Build and test automation
+ -------------------------
+diff --git a/meson.build b/meson.build
+index XXXXXXX..XXXXXXX 100644
+--- a/meson.build
++++ b/meson.build
+@@ -XXX,XX +XXX,XX @@ if have_system
+     'net',
+     'softmmu',
+     'ui',
++    'hw/remote',
+   ]
+ endif
+ trace_events_subdirs += [
+diff --git a/hw/remote/trace.h b/hw/remote/trace.h
+new file mode 100644
+index XXXXXXX..XXXXXXX
+--- /dev/null
++++ b/hw/remote/trace.h
+@@ -0,0 +1 @@
++#include "trace/trace-hw_remote.h"
+diff --git a/include/hw/remote/mpqemu-link.h b/include/hw/remote/mpqemu-link.h
+new file mode 100644
+index XXXXXXX..XXXXXXX
+--- /dev/null
++++ b/include/hw/remote/mpqemu-link.h
+@@ -XXX,XX +XXX,XX @@
++/*
++ * Communication channel between QEMU and remote device process
++ *
++ * Copyright © 2018, 2021 Oracle and/or its affiliates.
++ *
++ * This work is licensed under the terms of the GNU GPL, version 2 or later.
++ * See the COPYING file in the top-level directory.
++ *
++ */
++
++#ifndef MPQEMU_LINK_H
++#define MPQEMU_LINK_H
++
++#include "qom/object.h"
++#include "qemu/thread.h"
++#include "io/channel.h"
++
++#define REMOTE_MAX_FDS 8
++
++#define MPQEMU_MSG_HDR_SIZE offsetof(MPQemuMsg, data.u64)
++
++/**
++ * MPQemuCmd:
++ *
++ * MPQemuCmd enum type to specify the command to be executed on the remote
++ * device.
++ *
++ * This uses a private protocol between QEMU and the remote process. vfio-user
++ * protocol would supersede this in the future.
++ *
++ */
++typedef enum {
++    MPQEMU_CMD_MAX,
++} MPQemuCmd;
++
++/**
++ * MPQemuMsg:
++ * @cmd: The remote command
++ * @size: Size of the data to be shared
++ * @data: Structured data
++ * @fds: File descriptors to be shared with remote device
++ *
++ * MPQemuMsg Format of the message sent to the remote device from QEMU.
++ *
++ */
++typedef struct {
++    int cmd;
++    size_t size;
++
++    union {
++        uint64_t u64;
++    } data;
++
++    int fds[REMOTE_MAX_FDS];
++    int num_fds;
++} MPQemuMsg;
++
++bool mpqemu_msg_send(MPQemuMsg *msg, QIOChannel *ioc, Error **errp);
++bool mpqemu_msg_recv(MPQemuMsg *msg, QIOChannel *ioc, Error **errp);
++
++bool mpqemu_msg_valid(MPQemuMsg *msg);
++
++#endif
+diff --git a/include/sysemu/iothread.h b/include/sysemu/iothread.h
+index XXXXXXX..XXXXXXX 100644
+--- a/include/sysemu/iothread.h
++++ b/include/sysemu/iothread.h
+@@ -XXX,XX +XXX,XX @@ IOThread *iothread_create(const char *id, Error **errp);
+ void iothread_stop(IOThread *iothread);
+ void iothread_destroy(IOThread *iothread);
++/*
++ * Returns true if executing withing IOThread context,
++ * false otherwise.
++ */
++bool qemu_in_iothread(void);
++
+ #endif /* IOTHREAD_H */
+diff --git a/hw/remote/mpqemu-link.c b/hw/remote/mpqemu-link.c
+new file mode 100644
+index XXXXXXX..XXXXXXX
+--- /dev/null
++++ b/hw/remote/mpqemu-link.c
+@@ -XXX,XX +XXX,XX @@
++/*
++ * Communication channel between QEMU and remote device process
++ *
++ * Copyright © 2018, 2021 Oracle and/or its affiliates.
++ *
++ * This work is licensed under the terms of the GNU GPL, version 2 or later.
++ * See the COPYING file in the top-level directory.
++ *
++ */
++
++#include "qemu/osdep.h"
++#include "qemu-common.h"
++
++#include "qemu/module.h"
++#include "hw/remote/mpqemu-link.h"
++#include "qapi/error.h"
++#include "qemu/iov.h"
++#include "qemu/error-report.h"
++#include "qemu/main-loop.h"
++#include "io/channel.h"
++#include "sysemu/iothread.h"
++#include "trace.h"
++
++/*
++ * Send message over the ioc QIOChannel.
++ * This function is safe to call from:
++ * - main loop in co-routine context. Will block the main loop if not in
++ *   co-routine context;
++ * - vCPU thread with no co-routine context and if the channel is not part
++ *   of the main loop handling;
++ * - IOThread within co-routine context, outside of co-routine context
++ *   will block IOThread;
++ * Returns true if no errors were encountered, false otherwise.
++ */
++bool mpqemu_msg_send(MPQemuMsg *msg, QIOChannel *ioc, Error **errp)
++{
++    ERRP_GUARD();
++    bool iolock = qemu_mutex_iothread_locked();
++    bool iothread = qemu_in_iothread();
++    struct iovec send[2] = {0};
++    int *fds = NULL;
++    size_t nfds = 0;
++    bool ret = false;
++
++    send[0].iov_base = msg;
++    send[0].iov_len = MPQEMU_MSG_HDR_SIZE;
++
++    send[1].iov_base = (void *)&msg->data;
++    send[1].iov_len = msg->size;
++
++    if (msg->num_fds) {
++        nfds = msg->num_fds;
++        fds = msg->fds;
++    }
++
++    /*
++     * Dont use in IOThread out of co-routine context as
++     * it will block IOThread.
++     */
++    assert(qemu_in_coroutine() || !iothread);
++
++    /*
++     * Skip unlocking/locking iothread lock when the IOThread is running
++     * in co-routine context. Co-routine context is asserted above
++     * for IOThread case.
++     * Also skip lock handling while in a co-routine in the main context.
++     */
++    if (iolock && !iothread && !qemu_in_coroutine()) {
++        qemu_mutex_unlock_iothread();
++    }
++
++    if (!qio_channel_writev_full_all(ioc, send, G_N_ELEMENTS(send),
++                                    fds, nfds, errp)) {
++        ret = true;
++    } else {
++        trace_mpqemu_send_io_error(msg->cmd, msg->size, nfds);
++    }
++
++    if (iolock && !iothread && !qemu_in_coroutine()) {
++        /* See above comment why skip locking here. */
++        qemu_mutex_lock_iothread();
++    }
++
++    return ret;
++}
++
++/*
++ * Read message from the ioc QIOChannel.
++ * This function is safe to call from:
++ * - From main loop in co-routine context. Will block the main loop if not in
++ *   co-routine context;
++ * - From vCPU thread with no co-routine context and if the channel is not part
++ *   of the main loop handling;
++ * - From IOThread within co-routine context, outside of co-routine context
++ *   will block IOThread;
++ */
++static ssize_t mpqemu_read(QIOChannel *ioc, void *buf, size_t len, int **fds,
++                           size_t *nfds, Error **errp)
++{
++    ERRP_GUARD();
++    struct iovec iov = { .iov_base = buf, .iov_len = len };
++    bool iolock = qemu_mutex_iothread_locked();
++    bool iothread = qemu_in_iothread();
++    int ret = -1;
++
++    /*
++     * Dont use in IOThread out of co-routine context as
++     * it will block IOThread.
++     */
++    assert(qemu_in_coroutine() || !iothread);
++
++    if (iolock && !iothread && !qemu_in_coroutine()) {
++        qemu_mutex_unlock_iothread();
++    }
++
++    ret = qio_channel_readv_full_all_eof(ioc, &iov, 1, fds, nfds, errp);
++
++    if (iolock && !iothread && !qemu_in_coroutine()) {
++        qemu_mutex_lock_iothread();
++    }
++
++    return (ret <= 0) ? ret : iov.iov_len;
++}
++
++bool mpqemu_msg_recv(MPQemuMsg *msg, QIOChannel *ioc, Error **errp)
++{
++    ERRP_GUARD();
++    g_autofree int *fds = NULL;
++    size_t nfds = 0;
++    ssize_t len;
++    bool ret = false;
++
++    len = mpqemu_read(ioc, msg, MPQEMU_MSG_HDR_SIZE, &fds, &nfds, errp);
++    if (len <= 0) {
++        goto fail;
++    } else if (len != MPQEMU_MSG_HDR_SIZE) {
++        error_setg(errp, "Message header corrupted");
++        goto fail;
++    }
++
++    if (msg->size > sizeof(msg->data)) {
++        error_setg(errp, "Invalid size for message");
++        goto fail;
++    }
++
++    if (!msg->size) {
++        goto copy_fds;
++    }
++
++    len = mpqemu_read(ioc, &msg->data, msg->size, NULL, NULL, errp);
++    if (len <= 0) {
++        goto fail;
++    }
++    if (len != msg->size) {
++        error_setg(errp, "Unable to read full message");
++        goto fail;
++    }
++
++copy_fds:
++    msg->num_fds = nfds;
++    if (nfds > G_N_ELEMENTS(msg->fds)) {
++        error_setg(errp,
++                   "Overflow error: received %zu fds, more than max of %d fds",
++                   nfds, REMOTE_MAX_FDS);
++        goto fail;
++    }
++    if (nfds) {
++        memcpy(msg->fds, fds, nfds * sizeof(int));
++    }
++
++    ret = true;
++
++fail:
++    if (*errp) {
++        trace_mpqemu_recv_io_error(msg->cmd, msg->size, nfds);
++    }
++    while (*errp && nfds) {
++        close(fds[nfds - 1]);
++        nfds--;
++    }
++
++    return ret;
++}
++
++bool mpqemu_msg_valid(MPQemuMsg *msg)
++{
++    if (msg->cmd >= MPQEMU_CMD_MAX && msg->cmd < 0) {
++        return false;
++    }
++
++    /* Verify FDs. */
++    if (msg->num_fds >= REMOTE_MAX_FDS) {
++        return false;
++    }
++
++    if (msg->num_fds > 0) {
++        for (int i = 0; i < msg->num_fds; i++) {
++            if (fcntl(msg->fds[i], F_GETFL) == -1) {
++                return false;
++            }
++        }
++    }
++
++    return true;
++}
+diff --git a/iothread.c b/iothread.c
+index XXXXXXX..XXXXXXX 100644
+--- a/iothread.c
++++ b/iothread.c
+@@ -XXX,XX +XXX,XX @@ IOThread *iothread_by_id(const char *id)
+ {
+     return IOTHREAD(object_resolve_path_type(id, TYPE_IOTHREAD, NULL));
+ }
++
++bool qemu_in_iothread(void)
++{
++    return qemu_get_current_aio_context() == qemu_get_aio_context() ?
++                    false : true;
++}
+diff --git a/hw/remote/meson.build b/hw/remote/meson.build
+index XXXXXXX..XXXXXXX 100644
+--- a/hw/remote/meson.build
++++ b/hw/remote/meson.build
+@@ -XXX,XX +XXX,XX @@
+ remote_ss = ss.source_set()
+ remote_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('machine.c'))
++remote_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('mpqemu-link.c'))
+ softmmu_ss.add_all(when: 'CONFIG_MULTIPROCESS', if_true: remote_ss)
+diff --git a/hw/remote/trace-events b/hw/remote/trace-events
+new file mode 100644
+index XXXXXXX..XXXXXXX
+--- /dev/null
++++ b/hw/remote/trace-events
+@@ -XXX,XX +XXX,XX @@
++# multi-process trace events
++
++mpqemu_send_io_error(int cmd, int size, int nfds) "send command %d size %d, %d file descriptors to remote process"
++mpqemu_recv_io_error(int cmd, int size, int nfds) "failed to receive %d size %d, %d file descriptors to remote process"
+--
+.29.2

-New patch
+[PULL 16/27] multi-process: Initialize message handler in remote device
+From: Jagannathan Raman <jag.raman@oracle.com>
+Initializes the message handler function in the remote process. It is
+called whenever there's an event pending on QIOChannel that registers
+this function.
+Signed-off-by: Elena Ufimtseva <elena.ufimtseva@oracle.com>
+Signed-off-by: John G Johnson <john.g.johnson@oracle.com>
+Signed-off-by: Jagannathan Raman <jag.raman@oracle.com>
+Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
+Message-id: 99d38d8b93753a6409ac2340e858858cda59ab1b.1611938319.git.jag.raman@oracle.com
+Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
+---
+ MAINTAINERS                 |  1 +
+ include/hw/remote/machine.h |  9 ++++++
+ hw/remote/message.c         | 57 +++++++++++++++++++++++++++++++++++++
+ hw/remote/meson.build       |  1 +
+files changed, 68 insertions(+)
+ create mode 100644 hw/remote/message.c
+diff --git a/MAINTAINERS b/MAINTAINERS
+index XXXXXXX..XXXXXXX 100644
+--- a/MAINTAINERS
++++ b/MAINTAINERS
+@@ -XXX,XX +XXX,XX @@ F: hw/remote/machine.c
+ F: include/hw/remote/machine.h
+ F: hw/remote/mpqemu-link.c
+ F: include/hw/remote/mpqemu-link.h
++F: hw/remote/message.c
+ Build and test automation
+ -------------------------
+diff --git a/include/hw/remote/machine.h b/include/hw/remote/machine.h
+index XXXXXXX..XXXXXXX 100644
+--- a/include/hw/remote/machine.h
++++ b/include/hw/remote/machine.h
+@@ -XXX,XX +XXX,XX @@
+ #include "qom/object.h"
+ #include "hw/boards.h"
+ #include "hw/pci-host/remote.h"
++#include "io/channel.h"
+ struct RemoteMachineState {
+     MachineState parent_obj;
+@@ -XXX,XX +XXX,XX @@ struct RemoteMachineState {
+     RemotePCIHost *host;
+ };
++/* Used to pass to co-routine device and ioc. */
++typedef struct RemoteCommDev {
++    PCIDevice *dev;
++    QIOChannel *ioc;
++} RemoteCommDev;
++
+ #define TYPE_REMOTE_MACHINE "x-remote-machine"
+ OBJECT_DECLARE_SIMPLE_TYPE(RemoteMachineState, REMOTE_MACHINE)
++void coroutine_fn mpqemu_remote_msg_loop_co(void *data);
++
+ #endif
+diff --git a/hw/remote/message.c b/hw/remote/message.c
+new file mode 100644
+index XXXXXXX..XXXXXXX
+--- /dev/null
++++ b/hw/remote/message.c
+@@ -XXX,XX +XXX,XX @@
++/*
++ * Copyright © 2020, 2021 Oracle and/or its affiliates.
++ *
++ * This work is licensed under the terms of the GNU GPL-v2, version 2 or later.
++ *
++ * See the COPYING file in the top-level directory.
++ *
++ */
++
++#include "qemu/osdep.h"
++#include "qemu-common.h"
++
++#include "hw/remote/machine.h"
++#include "io/channel.h"
++#include "hw/remote/mpqemu-link.h"
++#include "qapi/error.h"
++#include "sysemu/runstate.h"
++
++void coroutine_fn mpqemu_remote_msg_loop_co(void *data)
++{
++    g_autofree RemoteCommDev *com = (RemoteCommDev *)data;
++    PCIDevice *pci_dev = NULL;
++    Error *local_err = NULL;
++
++    assert(com->ioc);
++
++    pci_dev = com->dev;
++    for (; !local_err;) {
++        MPQemuMsg msg = {0};
++
++        if (!mpqemu_msg_recv(&msg, com->ioc, &local_err)) {
++            break;
++        }
++
++        if (!mpqemu_msg_valid(&msg)) {
++            error_setg(&local_err, "Received invalid message from proxy"
++                                   "in remote process pid="FMT_pid"",
++                                   getpid());
++            break;
++        }
++
++        switch (msg.cmd) {
++        default:
++            error_setg(&local_err,
++                       "Unknown command (%d) received for device %s"
++                       " (pid="FMT_pid")",
++                       msg.cmd, DEVICE(pci_dev)->id, getpid());
++        }
++    }
++
++    if (local_err) {
++        error_report_err(local_err);
++        qemu_system_shutdown_request(SHUTDOWN_CAUSE_HOST_ERROR);
++    } else {
++        qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN);
++    }
++}
+diff --git a/hw/remote/meson.build b/hw/remote/meson.build
+index XXXXXXX..XXXXXXX 100644
+--- a/hw/remote/meson.build
++++ b/hw/remote/meson.build
+@@ -XXX,XX +XXX,XX @@ remote_ss = ss.source_set()
+ remote_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('machine.c'))
+ remote_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('mpqemu-link.c'))
++remote_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('message.c'))
+ softmmu_ss.add_all(when: 'CONFIG_MULTIPROCESS', if_true: remote_ss)
+--
+.29.2

-New patch
+[PULL 17/27] multi-process: Associate fd of a PCIDevice with its object
+From: Jagannathan Raman <jag.raman@oracle.com>
 Associate the file descriptor for a PCIDevice in remote process with
 DeviceState object.
 Signed-off-by: Elena Ufimtseva <elena.ufimtseva@oracle.com>
 Signed-off-by: John G Johnson <john.g.johnson@oracle.com>
 Signed-off-by: Jagannathan Raman <jag.raman@oracle.com>
 Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
 Message-id: f405a2ed5d7518b87bea7c59cfdf334d67e5ee51.1611938319.git.jag.raman@oracle.com
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
  MAINTAINERS            |   1 +
  hw/remote/remote-obj.c | 203 +++++++++++++++++++++++++++++++++++++++++
  hw/remote/meson.build  |   1 +
 files changed, 205 insertions(+)
  create mode 100644 hw/remote/remote-obj.c
 diff --git a/MAINTAINERS b/MAINTAINERS
 index XXXXXXX..XXXXXXX 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
@@ -XXX,XX +XXX,XX @@ F: include/hw/remote/machine.h
  F: hw/remote/mpqemu-link.c
  F: include/hw/remote/mpqemu-link.h
  F: hw/remote/message.c
 +F: hw/remote/remote-obj.c
  Build and test automation
  -------------------------
 diff --git a/hw/remote/remote-obj.c b/hw/remote/remote-obj.c
 new file mode 100644
 index XXXXXXX..XXXXXXX
 --- /dev/null
 +++ b/hw/remote/remote-obj.c
@@ -XXX,XX +XXX,XX @@
 +/*
 + * Copyright © 2020, 2021 Oracle and/or its affiliates.
 + *
 + * This work is licensed under the terms of the GNU GPL-v2, version 2 or later.
 + *
 + * See the COPYING file in the top-level directory.
 + *
 + */
 +
 +#include "qemu/osdep.h"
 +#include "qemu-common.h"
 +
 +#include "qemu/error-report.h"
 +#include "qemu/notify.h"
 +#include "qom/object_interfaces.h"
 +#include "hw/qdev-core.h"
 +#include "io/channel.h"
 +#include "hw/qdev-core.h"
 +#include "hw/remote/machine.h"
 +#include "io/channel-util.h"
 +#include "qapi/error.h"
 +#include "sysemu/sysemu.h"
 +#include "hw/pci/pci.h"
 +#include "qemu/sockets.h"
 +#include "monitor/monitor.h"
 +
 +#define TYPE_REMOTE_OBJECT "x-remote-object"
 +OBJECT_DECLARE_TYPE(RemoteObject, RemoteObjectClass, REMOTE_OBJECT)
 +
 +struct RemoteObjectClass {
 +    ObjectClass parent_class;
 +
 +    unsigned int nr_devs;
 +    unsigned int max_devs;
 +};
 +
 +struct RemoteObject {
 +    /* private */
 +    Object parent;
 +
 +    Notifier machine_done;
 +
 +    int32_t fd;
 +    char *devid;
 +
 +    QIOChannel *ioc;
 +
 +    DeviceState *dev;
 +    DeviceListener listener;
 +};
 +
 +static void remote_object_set_fd(Object *obj, const char *str, Error **errp)
 +{
 +    RemoteObject *o = REMOTE_OBJECT(obj);
 +    int fd = -1;
 +
 +    fd = monitor_fd_param(monitor_cur(), str, errp);
 +    if (fd == -1) {
 +        error_prepend(errp, "Could not parse remote object fd %s:", str);
 +        return;
 +    }
 +
 +    if (!fd_is_socket(fd)) {
 +        error_setg(errp, "File descriptor '%s' is not a socket", str);
 +        close(fd);
 +        return;
 +    }
 +
 +    o->fd = fd;
 +}
 +
 +static void remote_object_set_devid(Object *obj, const char *str, Error **errp)
 +{
 +    RemoteObject *o = REMOTE_OBJECT(obj);
 +
 +    g_free(o->devid);
 +
 +    o->devid = g_strdup(str);
 +}
 +
 +static void remote_object_unrealize_listener(DeviceListener *listener,
 +                                             DeviceState *dev)
 +{
 +    RemoteObject *o = container_of(listener, RemoteObject, listener);
 +
 +    if (o->dev == dev) {
 +        object_unref(OBJECT(o));
 +    }
 +}
 +
 +static void remote_object_machine_done(Notifier *notifier, void *data)
 +{
 +    RemoteObject *o = container_of(notifier, RemoteObject, machine_done);
 +    DeviceState *dev = NULL;
 +    QIOChannel *ioc = NULL;
 +    Coroutine *co = NULL;
 +    RemoteCommDev *comdev = NULL;
 +    Error *err = NULL;
 +
 +    dev = qdev_find_recursive(sysbus_get_default(), o->devid);
 +    if (!dev || !object_dynamic_cast(OBJECT(dev), TYPE_PCI_DEVICE)) {
 +        error_report("%s is not a PCI device", o->devid);
 +        return;
 +    }
 +
 +    ioc = qio_channel_new_fd(o->fd, &err);
 +    if (!ioc) {
 +        error_report_err(err);
 +        return;
 +    }
 +    qio_channel_set_blocking(ioc, false, NULL);
 +
 +    o->dev = dev;
 +
 +    o->listener.unrealize = remote_object_unrealize_listener;
 +    device_listener_register(&o->listener);
 +
 +    /* co-routine should free this. */
 +    comdev = g_new0(RemoteCommDev, 1);
 +    *comdev = (RemoteCommDev) {
 +        .ioc = ioc,
 +        .dev = PCI_DEVICE(dev),
 +    };
 +
 +    co = qemu_coroutine_create(mpqemu_remote_msg_loop_co, comdev);
 +    qemu_coroutine_enter(co);
 +}
 +
 +static void remote_object_init(Object *obj)
 +{
 +    RemoteObjectClass *k = REMOTE_OBJECT_GET_CLASS(obj);
 +    RemoteObject *o = REMOTE_OBJECT(obj);
 +
 +    if (k->nr_devs >= k->max_devs) {
 +        error_report("Reached maximum number of devices: %u", k->max_devs);
 +        return;
 +    }
 +
 +    o->ioc = NULL;
 +    o->fd = -1;
 +    o->devid = NULL;
 +
 +    k->nr_devs++;
 +
 +    o->machine_done.notify = remote_object_machine_done;
 +    qemu_add_machine_init_done_notifier(&o->machine_done);
 +}
 +
 +static void remote_object_finalize(Object *obj)
 +{
 +    RemoteObjectClass *k = REMOTE_OBJECT_GET_CLASS(obj);
 +    RemoteObject *o = REMOTE_OBJECT(obj);
 +
 +    device_listener_unregister(&o->listener);
 +
 +    if (o->ioc) {
 +        qio_channel_shutdown(o->ioc, QIO_CHANNEL_SHUTDOWN_BOTH, NULL);
 +        qio_channel_close(o->ioc, NULL);
 +    }
 +
 +    object_unref(OBJECT(o->ioc));
 +
 +    k->nr_devs--;
 +    g_free(o->devid);
 +}
 +
 +static void remote_object_class_init(ObjectClass *klass, void *data)
 +{
 +    RemoteObjectClass *k = REMOTE_OBJECT_CLASS(klass);
 +
 +    /*
 +     * Limit number of supported devices to 1. This is done to avoid devices
 +     * from one VM accessing the RAM of another VM. This is done until we
 +     * start using separate address spaces for individual devices.
 +     */
 +    k->max_devs = 1;
 +    k->nr_devs = 0;
 +
 +    object_class_property_add_str(klass, "fd", NULL, remote_object_set_fd);
 +    object_class_property_add_str(klass, "devid", NULL,
 +                                  remote_object_set_devid);
 +}
 +
 +static const TypeInfo remote_object_info = {
 +    .name = TYPE_REMOTE_OBJECT,
 +    .parent = TYPE_OBJECT,
 +    .instance_size = sizeof(RemoteObject),
 +    .instance_init = remote_object_init,
 +    .instance_finalize = remote_object_finalize,
 +    .class_size = sizeof(RemoteObjectClass),
 +    .class_init = remote_object_class_init,
 +    .interfaces = (InterfaceInfo[]) {
 +        { TYPE_USER_CREATABLE },
 +        { }
 +    }
 +};
 +
 +static void register_types(void)
 +{
 +    type_register_static(&remote_object_info);
 +}
 +
 +type_init(register_types);
 diff --git a/hw/remote/meson.build b/hw/remote/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/remote/meson.build
 +++ b/hw/remote/meson.build
@@ -XXX,XX +XXX,XX @@ remote_ss = ss.source_set()
  remote_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('machine.c'))
  remote_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('mpqemu-link.c'))
  remote_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('message.c'))
 +remote_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('remote-obj.c'))
  softmmu_ss.add_all(when: 'CONFIG_MULTIPROCESS', if_true: remote_ss)
 --
 .29.2

-[Qemu-devel] [PULL 06/12] block: honor BDRV_O_ALLOW_RDWR when clearing bs->read_only
+[PULL 18/27] multi-process: setup memory manager for remote device
-The BDRV_O_ALLOW_RDWR flag allows / prohibits the changing of
+From: Jagannathan Raman <jag.raman@oracle.com>
-the BDS 'read_only' state, but there are a few places where it
-is ignored.  In the bdrv_set_read_only() helper, make sure to
+SyncSysMemMsg message format is defined. It is used to send
-honor the flag.
+file descriptors of the RAM regions to remote device.
+RAM on the remote device is configured with a set of file descriptors.
-Signed-off-by: Jeff Cody <jcody@redhat.com>
+Old RAM regions are deleted and new regions, each with an fd, is
 added to the RAM.
 Signed-off-by: Jagannathan Raman <jag.raman@oracle.com>
 Signed-off-by: John G Johnson <john.g.johnson@oracle.com>
 Signed-off-by: Elena Ufimtseva <elena.ufimtseva@oracle.com>
 Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
-Reviewed-by: John Snow <jsnow@redhat.com>
+Message-id: 7d2d1831d812e85f681e7a8ab99e032cf4704689.1611938319.git.jag.raman@oracle.com
-Message-id: be2e5fb2d285cbece2b6d06bed54a6f56520d251.1491597120.git.jcody@redhat.com
+Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
- block.c | 7 +++++++
+ MAINTAINERS                     |  2 +
-file changed, 7 insertions(+)
+ include/hw/remote/memory.h      | 19 ++++++++++
+ include/hw/remote/mpqemu-link.h | 10 +++++
-diff --git a/block.c b/block.c
+ hw/remote/memory.c              | 65 +++++++++++++++++++++++++++++++++
-index XXXXXXX..XXXXXXX 100644
+ hw/remote/mpqemu-link.c         | 11 ++++++
---- a/block.c
+ hw/remote/meson.build           |  2 +
-+++ b/block.c
+files changed, 109 insertions(+)
-@@ -XXX,XX +XXX,XX @@ int bdrv_set_read_only(BlockDriverState *bs, bool read_only, Error **errp)
+ create mode 100644 include/hw/remote/memory.h
-         return -EINVAL;
+ create mode 100644 hw/remote/memory.c
 diff --git a/MAINTAINERS b/MAINTAINERS
 index XXXXXXX..XXXXXXX 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
@@ -XXX,XX +XXX,XX @@ F: hw/remote/mpqemu-link.c
  F: include/hw/remote/mpqemu-link.h
  F: hw/remote/message.c
  F: hw/remote/remote-obj.c
 +F: include/hw/remote/memory.h
 +F: hw/remote/memory.c
  Build and test automation
  -------------------------
 diff --git a/include/hw/remote/memory.h b/include/hw/remote/memory.h
 new file mode 100644
 index XXXXXXX..XXXXXXX
 --- /dev/null
 +++ b/include/hw/remote/memory.h
@@ -XXX,XX +XXX,XX @@
 +/*
 + * Memory manager for remote device
 + *
 + * Copyright © 2018, 2021 Oracle and/or its affiliates.
 + *
 + * This work is licensed under the terms of the GNU GPL, version 2 or later.
 + * See the COPYING file in the top-level directory.
 + *
 + */
 +
 +#ifndef REMOTE_MEMORY_H
 +#define REMOTE_MEMORY_H
 +
 +#include "exec/hwaddr.h"
 +#include "hw/remote/mpqemu-link.h"
 +
 +void remote_sysmem_reconfig(MPQemuMsg *msg, Error **errp);
 +
 +#endif
 diff --git a/include/hw/remote/mpqemu-link.h b/include/hw/remote/mpqemu-link.h
 index XXXXXXX..XXXXXXX 100644
 --- a/include/hw/remote/mpqemu-link.h
 +++ b/include/hw/remote/mpqemu-link.h
@@ -XXX,XX +XXX,XX @@
  #include "qom/object.h"
  #include "qemu/thread.h"
  #include "io/channel.h"
 +#include "exec/hwaddr.h"
  #define REMOTE_MAX_FDS 8
@@ -XXX,XX +XXX,XX @@
   *
   */
  typedef enum {
 +    MPQEMU_CMD_SYNC_SYSMEM,
      MPQEMU_CMD_MAX,
  } MPQemuCmd;
 +typedef struct {
 +    hwaddr gpas[REMOTE_MAX_FDS];
 +    uint64_t sizes[REMOTE_MAX_FDS];
 +    off_t offsets[REMOTE_MAX_FDS];
 +} SyncSysmemMsg;
 +
  /**
   * MPQemuMsg:
   * @cmd: The remote command
@@ -XXX,XX +XXX,XX @@ typedef enum {
   * MPQemuMsg Format of the message sent to the remote device from QEMU.
   *
   */
 +
  typedef struct {
      int cmd;
      size_t size;
      union {
          uint64_t u64;
 +        SyncSysmemMsg sync_sysmem;
      } data;
      int fds[REMOTE_MAX_FDS];
 diff --git a/hw/remote/memory.c b/hw/remote/memory.c
 new file mode 100644
 index XXXXXXX..XXXXXXX
 --- /dev/null
 +++ b/hw/remote/memory.c
@@ -XXX,XX +XXX,XX @@
 +/*
 + * Memory manager for remote device
 + *
 + * Copyright © 2018, 2021 Oracle and/or its affiliates.
 + *
 + * This work is licensed under the terms of the GNU GPL, version 2 or later.
 + * See the COPYING file in the top-level directory.
 + *
 + */
 +
 +#include "qemu/osdep.h"
 +#include "qemu-common.h"
 +
 +#include "hw/remote/memory.h"
 +#include "exec/address-spaces.h"
 +#include "exec/ram_addr.h"
 +#include "qapi/error.h"
 +
 +static void remote_sysmem_reset(void)
 +{
 +    MemoryRegion *sysmem, *subregion, *next;
 +
 +    sysmem = get_system_memory();
 +
 +    QTAILQ_FOREACH_SAFE(subregion, &sysmem->subregions, subregions_link, next) {
 +        if (subregion->ram) {
 +            memory_region_del_subregion(sysmem, subregion);
 +            object_unparent(OBJECT(subregion));
 +        }
 +    }
 +}
 +
 +void remote_sysmem_reconfig(MPQemuMsg *msg, Error **errp)
 +{
 +    ERRP_GUARD();
 +    SyncSysmemMsg *sysmem_info = &msg->data.sync_sysmem;
 +    MemoryRegion *sysmem, *subregion;
 +    static unsigned int suffix;
 +    int region;
 +
 +    sysmem = get_system_memory();
 +
 +    remote_sysmem_reset();
 +
 +    for (region = 0; region < msg->num_fds; region++) {
 +        g_autofree char *name;
 +        subregion = g_new(MemoryRegion, 1);
 +        name = g_strdup_printf("remote-mem-%u", suffix++);
 +        memory_region_init_ram_from_fd(subregion, NULL,
 +                                       name, sysmem_info->sizes[region],
 +                                       true, msg->fds[region],
 +                                       sysmem_info->offsets[region],
 +                                       errp);
 +
 +        if (*errp) {
 +            g_free(subregion);
 +            remote_sysmem_reset();
 +            return;
 +        }
 +
 +        memory_region_add_subregion(sysmem, sysmem_info->gpas[region],
 +                                    subregion);
 +
 +    }
 +}
 diff --git a/hw/remote/mpqemu-link.c b/hw/remote/mpqemu-link.c
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/remote/mpqemu-link.c
 +++ b/hw/remote/mpqemu-link.c
@@ -XXX,XX +XXX,XX @@ bool mpqemu_msg_valid(MPQemuMsg *msg)
          }
      }
-+    /* Do not clear read_only if it is prohibited */
++     /* Verify message specific fields. */
-+    if (!read_only && !(bs->open_flags & BDRV_O_ALLOW_RDWR)) {
++    switch (msg->cmd) {
-+        error_setg(errp, "Node '%s' is read only",
++    case MPQEMU_CMD_SYNC_SYSMEM:
-+                   bdrv_get_device_or_node_name(bs));
++        if (msg->num_fds == 0 || msg->size != sizeof(SyncSysmemMsg)) {
-+        return -EPERM;
++            return false;
 +        }
 +        break;
 +    default:
 +        break;
 +    }
 +
-     bs->read_only = read_only;
+     return true;
      return 0;
  }
+diff --git a/hw/remote/meson.build b/hw/remote/meson.build
+index XXXXXXX..XXXXXXX 100644
+--- a/hw/remote/meson.build
++++ b/hw/remote/meson.build
+@@ -XXX,XX +XXX,XX @@ remote_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('mpqemu-link.c'))
+ remote_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('message.c'))
+ remote_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('remote-obj.c'))
++specific_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('memory.c'))
++
+ softmmu_ss.add_all(when: 'CONFIG_MULTIPROCESS', if_true: remote_ss)
 --
-.9.3
+.29.2

-[Qemu-devel] [PULL 03/12] qemu-iotests: exclude vxhs from image creation via protocol
+[PULL 19/27] multi-process: introduce proxy object
-The protocol VXHS does not support image creation.  Some tests expect
+From: Elena Ufimtseva <elena.ufimtseva@oracle.com>
 to be able to create images through the protocol.  Exclude VXHS from
 these tests.
-Signed-off-by: Jeff Cody <jcody@redhat.com>
+Defines a PCI Device proxy object as a child of TYPE_PCI_DEVICE.
 Signed-off-by: Elena Ufimtseva <elena.ufimtseva@oracle.com>
 Signed-off-by: Jagannathan Raman <jag.raman@oracle.com>
 Signed-off-by: John G Johnson <john.g.johnson@oracle.com>
 Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
 Message-id: b5186ebfedf8e557044d09a768846c59230ad3a7.1611938319.git.jag.raman@oracle.com
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
- tests/qemu-iotests/017 | 1 +
+ MAINTAINERS               |  2 +
- tests/qemu-iotests/020 | 1 +
+ include/hw/remote/proxy.h | 33 +++++++++++++
- tests/qemu-iotests/029 | 1 +
+ hw/remote/proxy.c         | 99 +++++++++++++++++++++++++++++++++++++++
- tests/qemu-iotests/073 | 1 +
+ hw/remote/meson.build     |  1 +
- tests/qemu-iotests/114 | 1 +
+files changed, 135 insertions(+)
- tests/qemu-iotests/130 | 1 +
+ create mode 100644 include/hw/remote/proxy.h
- tests/qemu-iotests/134 | 1 +
+ create mode 100644 hw/remote/proxy.c
  tests/qemu-iotests/156 | 1 +
  tests/qemu-iotests/158 | 1 +
 files changed, 9 insertions(+)
-diff --git a/tests/qemu-iotests/017 b/tests/qemu-iotests/017
+diff --git a/MAINTAINERS b/MAINTAINERS
-index XXXXXXX..XXXXXXX 100755
+index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/017
+--- a/MAINTAINERS
-+++ b/tests/qemu-iotests/017
++++ b/MAINTAINERS
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
+@@ -XXX,XX +XXX,XX @@ F: hw/remote/message.c
- # Any format supporting backing files
+ F: hw/remote/remote-obj.c
- _supported_fmt qcow qcow2 vmdk qed
+ F: include/hw/remote/memory.h
- _supported_proto generic
+ F: hw/remote/memory.c
-+_unsupported_proto vxhs
++F: hw/remote/proxy.c
- _supported_os Linux
++F: include/hw/remote/proxy.h
- _unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
+ Build and test automation
-diff --git a/tests/qemu-iotests/020 b/tests/qemu-iotests/020
+ -------------------------
-index XXXXXXX..XXXXXXX 100755
+diff --git a/include/hw/remote/proxy.h b/include/hw/remote/proxy.h
---- a/tests/qemu-iotests/020
+new file mode 100644
-+++ b/tests/qemu-iotests/020
+index XXXXXXX..XXXXXXX
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
+--- /dev/null
- # Any format supporting backing files
++++ b/include/hw/remote/proxy.h
- _supported_fmt qcow qcow2 vmdk qed
+@@ -XXX,XX +XXX,XX @@
- _supported_proto generic
++/*
-+_unsupported_proto vxhs
++ * Copyright © 2018, 2021 Oracle and/or its affiliates.
- _supported_os Linux
++ *
- _unsupported_imgopts "subformat=monolithicFlat" \
++ * This work is licensed under the terms of the GNU GPL, version 2 or later.
-                      "subformat=twoGbMaxExtentFlat" \
++ * See the COPYING file in the top-level directory.
-diff --git a/tests/qemu-iotests/029 b/tests/qemu-iotests/029
++ *
-index XXXXXXX..XXXXXXX 100755
++ */
---- a/tests/qemu-iotests/029
++
-+++ b/tests/qemu-iotests/029
++#ifndef PROXY_H
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
++#define PROXY_H
- # Any format supporting intenal snapshots
++
- _supported_fmt qcow2
++#include "hw/pci/pci.h"
- _supported_proto generic
++#include "io/channel.h"
-+_unsupported_proto vxhs
++
- _supported_os Linux
++#define TYPE_PCI_PROXY_DEV "x-pci-proxy-dev"
- # Internal snapshots are (currently) impossible with refcount_bits=1
++OBJECT_DECLARE_SIMPLE_TYPE(PCIProxyDev, PCI_PROXY_DEV)
- _unsupported_imgopts 'refcount_bits=1[^0-9]'
++
-diff --git a/tests/qemu-iotests/073 b/tests/qemu-iotests/073
++struct PCIProxyDev {
-index XXXXXXX..XXXXXXX 100755
++    PCIDevice parent_dev;
---- a/tests/qemu-iotests/073
++    char *fd;
-+++ b/tests/qemu-iotests/073
++
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
++    /*
++     * Mutex used to protect the QIOChannel fd from
- _supported_fmt qcow2
++     * the concurrent access by the VCPUs since proxy
- _supported_proto generic
++     * blocks while awaiting for the replies from the
-+_unsupported_proto vxhs
++     * process remote.
- _supported_os Linux
++     */
++    QemuMutex io_mutex;
- CLUSTER_SIZE=64k
++    QIOChannel *ioc;
-diff --git a/tests/qemu-iotests/114 b/tests/qemu-iotests/114
++    Error *migration_blocker;
-index XXXXXXX..XXXXXXX 100755
++};
---- a/tests/qemu-iotests/114
++
-+++ b/tests/qemu-iotests/114
++#endif /* PROXY_H */
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
+diff --git a/hw/remote/proxy.c b/hw/remote/proxy.c
+new file mode 100644
- _supported_fmt qcow2
+index XXXXXXX..XXXXXXX
- _supported_proto generic
+--- /dev/null
-+_unsupported_proto vxhs
++++ b/hw/remote/proxy.c
- _supported_os Linux
+@@ -XXX,XX +XXX,XX @@
++/*
++ * Copyright © 2018, 2021 Oracle and/or its affiliates.
-diff --git a/tests/qemu-iotests/130 b/tests/qemu-iotests/130
++ *
-index XXXXXXX..XXXXXXX 100755
++ * This work is licensed under the terms of the GNU GPL, version 2 or later.
---- a/tests/qemu-iotests/130
++ * See the COPYING file in the top-level directory.
-+++ b/tests/qemu-iotests/130
++ *
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
++ */
++
- _supported_fmt qcow2
++#include "qemu/osdep.h"
- _supported_proto generic
++#include "qemu-common.h"
-+_unsupported_proto vxhs
++
- _supported_os Linux
++#include "hw/remote/proxy.h"
++#include "hw/pci/pci.h"
- qemu_comm_method="monitor"
++#include "qapi/error.h"
-diff --git a/tests/qemu-iotests/134 b/tests/qemu-iotests/134
++#include "io/channel-util.h"
-index XXXXXXX..XXXXXXX 100755
++#include "hw/qdev-properties.h"
---- a/tests/qemu-iotests/134
++#include "monitor/monitor.h"
-+++ b/tests/qemu-iotests/134
++#include "migration/blocker.h"
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
++#include "qemu/sockets.h"
++
- _supported_fmt qcow2
++static void pci_proxy_dev_realize(PCIDevice *device, Error **errp)
- _supported_proto generic
++{
-+_unsupported_proto vxhs
++    ERRP_GUARD();
- _supported_os Linux
++    PCIProxyDev *dev = PCI_PROXY_DEV(device);
++    int fd;
++
-diff --git a/tests/qemu-iotests/156 b/tests/qemu-iotests/156
++    if (!dev->fd) {
-index XXXXXXX..XXXXXXX 100755
++        error_setg(errp, "fd parameter not specified for %s",
---- a/tests/qemu-iotests/156
++                   DEVICE(device)->id);
-+++ b/tests/qemu-iotests/156
++        return;
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
++    }
++
- _supported_fmt qcow2 qed
++    fd = monitor_fd_param(monitor_cur(), dev->fd, errp);
- _supported_proto generic
++    if (fd == -1) {
-+_unsupported_proto vxhs
++        error_prepend(errp, "proxy: unable to parse fd %s: ", dev->fd);
- _supported_os Linux
++        return;
++    }
- # Create source disk
++
-diff --git a/tests/qemu-iotests/158 b/tests/qemu-iotests/158
++    if (!fd_is_socket(fd)) {
-index XXXXXXX..XXXXXXX 100755
++        error_setg(errp, "proxy: fd %d is not a socket", fd);
---- a/tests/qemu-iotests/158
++        close(fd);
-+++ b/tests/qemu-iotests/158
++        return;
-@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
++    }
++
- _supported_fmt qcow2
++    dev->ioc = qio_channel_new_fd(fd, errp);
- _supported_proto generic
++
-+_unsupported_proto vxhs
++    error_setg(&dev->migration_blocker, "%s does not support migration",
- _supported_os Linux
++               TYPE_PCI_PROXY_DEV);
++    migrate_add_blocker(dev->migration_blocker, errp);
 +
 +    qemu_mutex_init(&dev->io_mutex);
 +    qio_channel_set_blocking(dev->ioc, true, NULL);
 +}
 +
 +static void pci_proxy_dev_exit(PCIDevice *pdev)
 +{
 +    PCIProxyDev *dev = PCI_PROXY_DEV(pdev);
 +
 +    if (dev->ioc) {
 +        qio_channel_close(dev->ioc, NULL);
 +    }
 +
 +    migrate_del_blocker(dev->migration_blocker);
 +
 +    error_free(dev->migration_blocker);
 +}
 +
 +static Property proxy_properties[] = {
 +    DEFINE_PROP_STRING("fd", PCIProxyDev, fd),
 +    DEFINE_PROP_END_OF_LIST(),
 +};
 +
 +static void pci_proxy_dev_class_init(ObjectClass *klass, void *data)
 +{
 +    DeviceClass *dc = DEVICE_CLASS(klass);
 +    PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
 +
 +    k->realize = pci_proxy_dev_realize;
 +    k->exit = pci_proxy_dev_exit;
 +    device_class_set_props(dc, proxy_properties);
 +}
 +
 +static const TypeInfo pci_proxy_dev_type_info = {
 +    .name          = TYPE_PCI_PROXY_DEV,
 +    .parent        = TYPE_PCI_DEVICE,
 +    .instance_size = sizeof(PCIProxyDev),
 +    .class_init    = pci_proxy_dev_class_init,
 +    .interfaces = (InterfaceInfo[]) {
 +        { INTERFACE_CONVENTIONAL_PCI_DEVICE },
 +        { },
 +    },
 +};
 +
 +static void pci_proxy_dev_register_types(void)
 +{
 +    type_register_static(&pci_proxy_dev_type_info);
 +}
 +
 +type_init(pci_proxy_dev_register_types)
 diff --git a/hw/remote/meson.build b/hw/remote/meson.build
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/remote/meson.build
 +++ b/hw/remote/meson.build
@@ -XXX,XX +XXX,XX @@ remote_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('machine.c'))
  remote_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('mpqemu-link.c'))
  remote_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('message.c'))
  remote_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('remote-obj.c'))
 +remote_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('proxy.c'))
  specific_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('memory.c'))
 --
-.9.3
+.29.2

-[Qemu-devel] [PULL 11/12] block/rbd: Add support for reopen()
+[PULL 20/27] multi-process: add proxy communication functions
-This adds support for reopen in rbd, for changing between r/w and r/o.
+From: Elena Ufimtseva <elena.ufimtseva@oracle.com>
-Note, that this is only a flag change, but we will block a change from
+Signed-off-by: Elena Ufimtseva <elena.ufimtseva@oracle.com>
-r/o to r/w if we are using an RBD internal snapshot.
+Signed-off-by: Jagannathan Raman <jag.raman@oracle.com>
 Signed-off-by: John G Johnson <john.g.johnson@oracle.com>
 Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
 Message-id: d54edb4176361eed86b903e8f27058363b6c83b3.1611938319.git.jag.raman@oracle.com
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
  include/hw/remote/mpqemu-link.h |  4 ++++
  hw/remote/mpqemu-link.c         | 34 +++++++++++++++++++++++++++++++++
 files changed, 38 insertions(+)
-Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
+diff --git a/include/hw/remote/mpqemu-link.h b/include/hw/remote/mpqemu-link.h
 Signed-off-by: Jeff Cody <jcody@redhat.com>
 Reviewed-by: John Snow <jsnow@redhat.com>
 Message-id: d4e87539167ec6527d44c97b164eabcccf96e4f3.1491597120.git.jcody@redhat.com
 ---
  block/rbd.c | 21 +++++++++++++++++++++
 file changed, 21 insertions(+)
 diff --git a/block/rbd.c b/block/rbd.c
 index XXXXXXX..XXXXXXX 100644
---- a/block/rbd.c
+--- a/include/hw/remote/mpqemu-link.h
-+++ b/block/rbd.c
++++ b/include/hw/remote/mpqemu-link.h
-@@ -XXX,XX +XXX,XX @@ failed_opts:
+@@ -XXX,XX +XXX,XX @@
-     return r;
+ #include "qemu/thread.h"
  #include "io/channel.h"
  #include "exec/hwaddr.h"
 +#include "io/channel-socket.h"
 +#include "hw/remote/proxy.h"
  #define REMOTE_MAX_FDS 8
@@ -XXX,XX +XXX,XX @@ typedef struct {
  bool mpqemu_msg_send(MPQemuMsg *msg, QIOChannel *ioc, Error **errp);
  bool mpqemu_msg_recv(MPQemuMsg *msg, QIOChannel *ioc, Error **errp);
 +uint64_t mpqemu_msg_send_and_await_reply(MPQemuMsg *msg, PCIProxyDev *pdev,
 +                                         Error **errp);
  bool mpqemu_msg_valid(MPQemuMsg *msg);
  #endif
 diff --git a/hw/remote/mpqemu-link.c b/hw/remote/mpqemu-link.c
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/remote/mpqemu-link.c
 +++ b/hw/remote/mpqemu-link.c
@@ -XXX,XX +XXX,XX @@ fail:
      return ret;
  }
++/*
++ * Send msg and wait for a reply with command code RET_MSG.
++ * Returns the message received of size u64 or UINT64_MAX
++ * on error.
++ * Called from VCPU thread in non-coroutine context.
++ * Used by the Proxy object to communicate to remote processes.
++ */
++uint64_t mpqemu_msg_send_and_await_reply(MPQemuMsg *msg, PCIProxyDev *pdev,
++                                         Error **errp)
++{
++    ERRP_GUARD();
++    MPQemuMsg msg_reply = {0};
++    uint64_t ret = UINT64_MAX;
 +
-+/* Since RBD is currently always opened R/W via the API,
++    assert(!qemu_in_coroutine());
 + * we just need to check if we are using a snapshot or not, in
 + * order to determine if we will allow it to be R/W */
 +static int qemu_rbd_reopen_prepare(BDRVReopenState *state,
 +                                   BlockReopenQueue *queue, Error **errp)
 +{
 +    BDRVRBDState *s = state->bs->opaque;
 +    int ret = 0;
 +
-+    if (s->snap && state->flags & BDRV_O_RDWR) {
++    QEMU_LOCK_GUARD(&pdev->io_mutex);
-+        error_setg(errp,
++    if (!mpqemu_msg_send(msg, pdev->ioc, errp)) {
-+                   "Cannot change node '%s' to r/w when using RBD snapshot",
++        return ret;
 +                   bdrv_get_device_or_node_name(state->bs));
 +        ret = -EINVAL;
 +    }
 +
-+    return ret;
++    if (!mpqemu_msg_recv(&msg_reply, pdev->ioc, errp)) {
 +        return ret;
 +    }
 +
 +    if (!mpqemu_msg_valid(&msg_reply)) {
 +        error_setg(errp, "ERROR: Invalid reply received for command %d",
 +                         msg->cmd);
 +        return ret;
 +    }
 +
 +    return msg_reply.data.u64;
 +}
 +
- static void qemu_rbd_close(BlockDriverState *bs)
+ bool mpqemu_msg_valid(MPQemuMsg *msg)
  {
-     BDRVRBDState *s = bs->opaque;
+     if (msg->cmd >= MPQEMU_CMD_MAX && msg->cmd < 0) {
@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_rbd = {
      .bdrv_parse_filename    = qemu_rbd_parse_filename,
      .bdrv_file_open         = qemu_rbd_open,
      .bdrv_close             = qemu_rbd_close,
 +    .bdrv_reopen_prepare    = qemu_rbd_reopen_prepare,
      .bdrv_create            = qemu_rbd_create,
      .bdrv_has_zero_init     = bdrv_has_zero_init_1,
      .bdrv_get_info          = qemu_rbd_getinfo,
 --
-.9.3
+.29.2

-[Qemu-devel] [PULL 04/12] block: add bdrv_set_read_only() helper function
+[PULL 21/27] multi-process: Forward PCI config space acceses to the remote process
-We have a helper wrapper for checking for the BDS read_only flag,
+From: Elena Ufimtseva <elena.ufimtseva@oracle.com>
-add a helper wrapper to set the read_only flag as well.
+The Proxy Object sends the PCI config space accesses as messages
 to the remote process over the communication channel
 Signed-off-by: Elena Ufimtseva <elena.ufimtseva@oracle.com>
 Signed-off-by: Jagannathan Raman <jag.raman@oracle.com>
 Signed-off-by: John G Johnson <john.g.johnson@oracle.com>
 Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
-Signed-off-by: Jeff Cody <jcody@redhat.com>
+Message-id: d3c94f4618813234655356c60e6f0d0362ff42d6.1611938319.git.jag.raman@oracle.com
-Reviewed-by: John Snow <jsnow@redhat.com>
+Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 Message-id: 9b18972d05f5fa2ac16c014f0af98d680553048d.1491597120.git.jcody@redhat.com
 ---
- block.c               | 5 +++++
+ include/hw/remote/mpqemu-link.h | 10 ++++++
- block/bochs.c         | 2 +-
+ hw/remote/message.c             | 60 +++++++++++++++++++++++++++++++++
- block/cloop.c         | 2 +-
+ hw/remote/mpqemu-link.c         |  8 ++++-
- block/dmg.c           | 2 +-
+ hw/remote/proxy.c               | 55 ++++++++++++++++++++++++++++++
- block/rbd.c           | 2 +-
+files changed, 132 insertions(+), 1 deletion(-)
- block/vvfat.c         | 4 ++--
- include/block/block.h | 1 +
+diff --git a/include/hw/remote/mpqemu-link.h b/include/hw/remote/mpqemu-link.h
-files changed, 12 insertions(+), 6 deletions(-)
+index XXXXXXX..XXXXXXX 100644
+--- a/include/hw/remote/mpqemu-link.h
-diff --git a/block.c b/block.c
++++ b/include/hw/remote/mpqemu-link.h
-index XXXXXXX..XXXXXXX 100644
+@@ -XXX,XX +XXX,XX @@
---- a/block.c
+  */
-+++ b/block.c
+ typedef enum {
-@@ -XXX,XX +XXX,XX @@ void path_combine(char *dest, int dest_size,
+     MPQEMU_CMD_SYNC_SYSMEM,
 +    MPQEMU_CMD_RET,
 +    MPQEMU_CMD_PCI_CFGWRITE,
 +    MPQEMU_CMD_PCI_CFGREAD,
      MPQEMU_CMD_MAX,
  } MPQemuCmd;
@@ -XXX,XX +XXX,XX @@ typedef struct {
      off_t offsets[REMOTE_MAX_FDS];
  } SyncSysmemMsg;
 +typedef struct {
 +    uint32_t addr;
 +    uint32_t val;
 +    int len;
 +} PciConfDataMsg;
 +
  /**
   * MPQemuMsg:
   * @cmd: The remote command
@@ -XXX,XX +XXX,XX @@ typedef struct {
      union {
          uint64_t u64;
 +        PciConfDataMsg pci_conf_data;
          SyncSysmemMsg sync_sysmem;
      } data;
 diff --git a/hw/remote/message.c b/hw/remote/message.c
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/remote/message.c
 +++ b/hw/remote/message.c
@@ -XXX,XX +XXX,XX @@
  #include "hw/remote/mpqemu-link.h"
  #include "qapi/error.h"
  #include "sysemu/runstate.h"
 +#include "hw/pci/pci.h"
 +
 +static void process_config_write(QIOChannel *ioc, PCIDevice *dev,
 +                                 MPQemuMsg *msg, Error **errp);
 +static void process_config_read(QIOChannel *ioc, PCIDevice *dev,
 +                                MPQemuMsg *msg, Error **errp);
  void coroutine_fn mpqemu_remote_msg_loop_co(void *data)
  {
@@ -XXX,XX +XXX,XX @@ void coroutine_fn mpqemu_remote_msg_loop_co(void *data)
          }
          switch (msg.cmd) {
 +        case MPQEMU_CMD_PCI_CFGWRITE:
 +            process_config_write(com->ioc, pci_dev, &msg, &local_err);
 +            break;
 +        case MPQEMU_CMD_PCI_CFGREAD:
 +            process_config_read(com->ioc, pci_dev, &msg, &local_err);
 +            break;
          default:
              error_setg(&local_err,
                         "Unknown command (%d) received for device %s"
@@ -XXX,XX +XXX,XX @@ void coroutine_fn mpqemu_remote_msg_loop_co(void *data)
          qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN);
      }
  }
++
-+void bdrv_set_read_only(BlockDriverState *bs, bool read_only)
++static void process_config_write(QIOChannel *ioc, PCIDevice *dev,
-+{
++                                 MPQemuMsg *msg, Error **errp)
-+    bs->read_only = read_only;
++{
-+}
++    ERRP_GUARD();
-+
++    PciConfDataMsg *conf = (PciConfDataMsg *)&msg->data.pci_conf_data;
- void bdrv_get_full_backing_filename_from_filename(const char *backed,
++    MPQemuMsg ret = { 0 };
-                                                   const char *backing,
++
-                                                   char *dest, size_t sz,
++    if ((conf->addr + sizeof(conf->val)) > pci_config_size(dev)) {
-diff --git a/block/bochs.c b/block/bochs.c
++        error_setg(errp, "Bad address for PCI config write, pid "FMT_pid".",
-index XXXXXXX..XXXXXXX 100644
++                   getpid());
---- a/block/bochs.c
++        ret.data.u64 = UINT64_MAX;
-+++ b/block/bochs.c
++    } else {
-@@ -XXX,XX +XXX,XX @@ static int bochs_open(BlockDriverState *bs, QDict *options, int flags,
++        pci_default_write_config(dev, conf->addr, conf->val, conf->len);
-         return -EINVAL;
++    }
 +
 +    ret.cmd = MPQEMU_CMD_RET;
 +    ret.size = sizeof(ret.data.u64);
 +
 +    if (!mpqemu_msg_send(&ret, ioc, NULL)) {
 +        error_prepend(errp, "Error returning code to proxy, pid "FMT_pid": ",
 +                      getpid());
 +    }
 +}
 +
 +static void process_config_read(QIOChannel *ioc, PCIDevice *dev,
 +                                MPQemuMsg *msg, Error **errp)
 +{
 +    ERRP_GUARD();
 +    PciConfDataMsg *conf = (PciConfDataMsg *)&msg->data.pci_conf_data;
 +    MPQemuMsg ret = { 0 };
 +
 +    if ((conf->addr + sizeof(conf->val)) > pci_config_size(dev)) {
 +        error_setg(errp, "Bad address for PCI config read, pid "FMT_pid".",
 +                   getpid());
 +        ret.data.u64 = UINT64_MAX;
 +    } else {
 +        ret.data.u64 = pci_default_read_config(dev, conf->addr, conf->len);
 +    }
 +
 +    ret.cmd = MPQEMU_CMD_RET;
 +    ret.size = sizeof(ret.data.u64);
 +
 +    if (!mpqemu_msg_send(&ret, ioc, NULL)) {
 +        error_prepend(errp, "Error returning code to proxy, pid "FMT_pid": ",
 +                      getpid());
 +    }
 +}
 diff --git a/hw/remote/mpqemu-link.c b/hw/remote/mpqemu-link.c
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/remote/mpqemu-link.c
 +++ b/hw/remote/mpqemu-link.c
@@ -XXX,XX +XXX,XX @@ uint64_t mpqemu_msg_send_and_await_reply(MPQemuMsg *msg, PCIProxyDev *pdev,
          return ret;
      }
--    bs->read_only = true; /* no write support yet */
+-    if (!mpqemu_msg_valid(&msg_reply)) {
-+    bdrv_set_read_only(bs, true); /* no write support yet */
++    if (!mpqemu_msg_valid(&msg_reply) || msg_reply.cmd != MPQEMU_CMD_RET) {
+         error_setg(errp, "ERROR: Invalid reply received for command %d",
-     ret = bdrv_pread(bs->file, 0, &bochs, sizeof(bochs));
+                          msg->cmd);
-     if (ret < 0) {
+         return ret;
-diff --git a/block/cloop.c b/block/cloop.c
+@@ -XXX,XX +XXX,XX @@ bool mpqemu_msg_valid(MPQemuMsg *msg)
-index XXXXXXX..XXXXXXX 100644
+             return false;
---- a/block/cloop.c
+         }
-+++ b/block/cloop.c
+         break;
-@@ -XXX,XX +XXX,XX @@ static int cloop_open(BlockDriverState *bs, QDict *options, int flags,
++    case MPQEMU_CMD_PCI_CFGWRITE:
-         return -EINVAL;
++    case MPQEMU_CMD_PCI_CFGREAD:
 +        if (msg->size != sizeof(PciConfDataMsg)) {
 +            return false;
 +        }
 +        break;
      default:
          break;
      }
+diff --git a/hw/remote/proxy.c b/hw/remote/proxy.c
--    bs->read_only = true;
+index XXXXXXX..XXXXXXX 100644
-+    bdrv_set_read_only(bs, true);
+--- a/hw/remote/proxy.c
++++ b/hw/remote/proxy.c
-     /* read header */
+@@ -XXX,XX +XXX,XX @@
-     ret = bdrv_pread(bs->file, 128, &s->block_size, 4);
+ #include "monitor/monitor.h"
-diff --git a/block/dmg.c b/block/dmg.c
+ #include "migration/blocker.h"
-index XXXXXXX..XXXXXXX 100644
+ #include "qemu/sockets.h"
---- a/block/dmg.c
++#include "hw/remote/mpqemu-link.h"
-+++ b/block/dmg.c
++#include "qemu/error-report.h"
-@@ -XXX,XX +XXX,XX @@ static int dmg_open(BlockDriverState *bs, QDict *options, int flags,
-     }
+ static void pci_proxy_dev_realize(PCIDevice *device, Error **errp)
+ {
-     block_module_load_one("dmg-bz2");
+@@ -XXX,XX +XXX,XX @@ static void pci_proxy_dev_exit(PCIDevice *pdev)
--    bs->read_only = true;
+     error_free(dev->migration_blocker);
-+    bdrv_set_read_only(bs, true);
+ }
-     s->n_chunks = 0;
++static void config_op_send(PCIProxyDev *pdev, uint32_t addr, uint32_t *val,
-     s->offsets = s->lengths = s->sectors = s->sectorcounts = NULL;
++                           int len, unsigned int op)
-diff --git a/block/rbd.c b/block/rbd.c
++{
-index XXXXXXX..XXXXXXX 100644
++    MPQemuMsg msg = { 0 };
---- a/block/rbd.c
++    uint64_t ret = -EINVAL;
-+++ b/block/rbd.c
++    Error *local_err = NULL;
-@@ -XXX,XX +XXX,XX @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags,
++
-         goto failed_open;
++    msg.cmd = op;
-     }
++    msg.data.pci_conf_data.addr = addr;
++    msg.data.pci_conf_data.val = (op == MPQEMU_CMD_PCI_CFGWRITE) ? *val : 0;
--    bs->read_only = (s->snap != NULL);
++    msg.data.pci_conf_data.len = len;
-+    bdrv_set_read_only(bs, (s->snap != NULL));
++    msg.size = sizeof(PciConfDataMsg);
++
-     qemu_opts_del(opts);
++    ret = mpqemu_msg_send_and_await_reply(&msg, pdev, &local_err);
-     return 0;
++    if (local_err) {
-diff --git a/block/vvfat.c b/block/vvfat.c
++        error_report_err(local_err);
-index XXXXXXX..XXXXXXX 100644
++    }
---- a/block/vvfat.c
++
-+++ b/block/vvfat.c
++    if (ret == UINT64_MAX) {
-@@ -XXX,XX +XXX,XX @@ static int vvfat_open(BlockDriverState *bs, QDict *options, int flags,
++        error_report("Failed to perform PCI config %s operation",
-     s->current_cluster=0xffffffff;
++                     (op == MPQEMU_CMD_PCI_CFGREAD) ? "READ" : "WRITE");
++    }
-     /* read only is the default for safety */
++
--    bs->read_only = true;
++    if (op == MPQEMU_CMD_PCI_CFGREAD) {
-+    bdrv_set_read_only(bs, true);
++        *val = (uint32_t)ret;
-     s->qcow = NULL;
++    }
-     s->qcow_filename = NULL;
++}
-     s->fat2 = NULL;
++
-@@ -XXX,XX +XXX,XX @@ static int vvfat_open(BlockDriverState *bs, QDict *options, int flags,
++static uint32_t pci_proxy_read_config(PCIDevice *d, uint32_t addr, int len)
-         if (ret < 0) {
++{
-             goto fail;
++    uint32_t val;
-         }
++
--        bs->read_only = false;
++    config_op_send(PCI_PROXY_DEV(d), addr, &val, len, MPQEMU_CMD_PCI_CFGREAD);
-+        bdrv_set_read_only(bs, false);
++
-     }
++    return val;
++}
-     bs->total_sectors = cyls * heads * secs;
++
-diff --git a/include/block/block.h b/include/block/block.h
++static void pci_proxy_write_config(PCIDevice *d, uint32_t addr, uint32_t val,
-index XXXXXXX..XXXXXXX 100644
++                                   int len)
---- a/include/block/block.h
++{
-+++ b/include/block/block.h
++    /*
-@@ -XXX,XX +XXX,XX @@ int bdrv_is_allocated_above(BlockDriverState *top, BlockDriverState *base,
++     * Some of the functions access the copy of remote device's PCI config
-                             int64_t sector_num, int nb_sectors, int *pnum);
++     * space which is cached in the proxy device. Therefore, maintain
++     * it updated.
- bool bdrv_is_read_only(BlockDriverState *bs);
++     */
-+void bdrv_set_read_only(BlockDriverState *bs, bool read_only);
++    pci_default_write_config(d, addr, val, len);
- bool bdrv_is_sg(BlockDriverState *bs);
++
- bool bdrv_is_inserted(BlockDriverState *bs);
++    config_op_send(PCI_PROXY_DEV(d), addr, &val, len, MPQEMU_CMD_PCI_CFGWRITE);
- int bdrv_media_changed(BlockDriverState *bs);
++}
 +
  static Property proxy_properties[] = {
      DEFINE_PROP_STRING("fd", PCIProxyDev, fd),
      DEFINE_PROP_END_OF_LIST(),
@@ -XXX,XX +XXX,XX @@ static void pci_proxy_dev_class_init(ObjectClass *klass, void *data)
      k->realize = pci_proxy_dev_realize;
      k->exit = pci_proxy_dev_exit;
 +    k->config_read = pci_proxy_read_config;
 +    k->config_write = pci_proxy_write_config;
 +
      device_class_set_props(dc, proxy_properties);
  }
 --
-.9.3
+.29.2

-[Qemu-devel] [PULL 07/12] block: code movement
+[PULL 22/27] multi-process: PCI BAR read/write handling for proxy & remote endpoints
-Move bdrv_is_read_only() up with its friends.
+From: Jagannathan Raman <jag.raman@oracle.com>
 Proxy device object implements handler for PCI BAR writes and reads.
 The handler uses BAR_WRITE/BAR_READ message to communicate to the
 remote process with the BAR address and value to be written/read.
 The remote process implements handler for BAR_WRITE/BAR_READ
 message.
 Signed-off-by: Jagannathan Raman <jag.raman@oracle.com>
 Signed-off-by: Elena Ufimtseva <elena.ufimtseva@oracle.com>
 Signed-off-by: John G Johnson <john.g.johnson@oracle.com>
 Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
-Reviewed-by: John Snow <jsnow@redhat.com>
+Message-id: a8b76714a9688be5552c4c92d089bc9e8a4707ff.1611938319.git.jag.raman@oracle.com
-Signed-off-by: Jeff Cody <jcody@redhat.com>
+Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 Message-id: 73b2399459760c32506f9407efb9dddb3a2789de.1491597120.git.jcody@redhat.com
 ---
- block.c | 10 +++++-----
+ include/hw/remote/mpqemu-link.h | 10 ++++
-file changed, 5 insertions(+), 5 deletions(-)
+ include/hw/remote/proxy.h       |  9 ++++
+ hw/remote/message.c             | 83 +++++++++++++++++++++++++++++++++
-diff --git a/block.c b/block.c
+ hw/remote/mpqemu-link.c         |  6 +++
-index XXXXXXX..XXXXXXX 100644
+ hw/remote/proxy.c               | 60 ++++++++++++++++++++++++
---- a/block.c
+files changed, 168 insertions(+)
-+++ b/block.c
-@@ -XXX,XX +XXX,XX @@ void path_combine(char *dest, int dest_size,
+diff --git a/include/hw/remote/mpqemu-link.h b/include/hw/remote/mpqemu-link.h
 index XXXXXXX..XXXXXXX 100644
 --- a/include/hw/remote/mpqemu-link.h
 +++ b/include/hw/remote/mpqemu-link.h
@@ -XXX,XX +XXX,XX @@ typedef enum {
      MPQEMU_CMD_RET,
      MPQEMU_CMD_PCI_CFGWRITE,
      MPQEMU_CMD_PCI_CFGREAD,
 +    MPQEMU_CMD_BAR_WRITE,
 +    MPQEMU_CMD_BAR_READ,
      MPQEMU_CMD_MAX,
  } MPQemuCmd;
@@ -XXX,XX +XXX,XX @@ typedef struct {
      int len;
  } PciConfDataMsg;
 +typedef struct {
 +    hwaddr addr;
 +    uint64_t val;
 +    unsigned size;
 +    bool memory;
 +} BarAccessMsg;
 +
  /**
   * MPQemuMsg:
   * @cmd: The remote command
@@ -XXX,XX +XXX,XX @@ typedef struct {
          uint64_t u64;
          PciConfDataMsg pci_conf_data;
          SyncSysmemMsg sync_sysmem;
 +        BarAccessMsg bar_access;
      } data;
      int fds[REMOTE_MAX_FDS];
 diff --git a/include/hw/remote/proxy.h b/include/hw/remote/proxy.h
 index XXXXXXX..XXXXXXX 100644
 --- a/include/hw/remote/proxy.h
 +++ b/include/hw/remote/proxy.h
@@ -XXX,XX +XXX,XX @@
  #define TYPE_PCI_PROXY_DEV "x-pci-proxy-dev"
  OBJECT_DECLARE_SIMPLE_TYPE(PCIProxyDev, PCI_PROXY_DEV)
 +typedef struct ProxyMemoryRegion {
 +    PCIProxyDev *dev;
 +    MemoryRegion mr;
 +    bool memory;
 +    bool present;
 +    uint8_t type;
 +} ProxyMemoryRegion;
 +
  struct PCIProxyDev {
      PCIDevice parent_dev;
      char *fd;
@@ -XXX,XX +XXX,XX @@ struct PCIProxyDev {
      QemuMutex io_mutex;
      QIOChannel *ioc;
      Error *migration_blocker;
 +    ProxyMemoryRegion region[PCI_NUM_REGIONS];
  };
  #endif /* PROXY_H */
 diff --git a/hw/remote/message.c b/hw/remote/message.c
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/remote/message.c
 +++ b/hw/remote/message.c
@@ -XXX,XX +XXX,XX @@
  #include "qapi/error.h"
  #include "sysemu/runstate.h"
  #include "hw/pci/pci.h"
 +#include "exec/memattrs.h"
  static void process_config_write(QIOChannel *ioc, PCIDevice *dev,
                                   MPQemuMsg *msg, Error **errp);
  static void process_config_read(QIOChannel *ioc, PCIDevice *dev,
                                  MPQemuMsg *msg, Error **errp);
 +static void process_bar_write(QIOChannel *ioc, MPQemuMsg *msg, Error **errp);
 +static void process_bar_read(QIOChannel *ioc, MPQemuMsg *msg, Error **errp);
  void coroutine_fn mpqemu_remote_msg_loop_co(void *data)
  {
@@ -XXX,XX +XXX,XX @@ void coroutine_fn mpqemu_remote_msg_loop_co(void *data)
          case MPQEMU_CMD_PCI_CFGREAD:
              process_config_read(com->ioc, pci_dev, &msg, &local_err);
              break;
 +        case MPQEMU_CMD_BAR_WRITE:
 +            process_bar_write(com->ioc, &msg, &local_err);
 +            break;
 +        case MPQEMU_CMD_BAR_READ:
 +            process_bar_read(com->ioc, &msg, &local_err);
 +            break;
          default:
              error_setg(&local_err,
                         "Unknown command (%d) received for device %s"
@@ -XXX,XX +XXX,XX @@ static void process_config_read(QIOChannel *ioc, PCIDevice *dev,
                        getpid());
      }
  }
++
-+bool bdrv_is_read_only(BlockDriverState *bs)
++static void process_bar_write(QIOChannel *ioc, MPQemuMsg *msg, Error **errp)
 +{
-+    return bs->read_only;
++    ERRP_GUARD();
-+}
++    BarAccessMsg *bar_access = &msg->data.bar_access;
-+
++    AddressSpace *as =
- int bdrv_set_read_only(BlockDriverState *bs, bool read_only, Error **errp)
++        bar_access->memory ? &address_space_memory : &address_space_io;
- {
++    MPQemuMsg ret = { 0 };
-     /* Do not set read_only if copy_on_read is enabled */
++    MemTxResult res;
-@@ -XXX,XX +XXX,XX @@ void bdrv_get_geometry(BlockDriverState *bs, uint64_t *nb_sectors_ptr)
++    uint64_t val;
-     *nb_sectors_ptr = nb_sectors < 0 ? 0 : nb_sectors;
++
 +    if (!is_power_of_2(bar_access->size) ||
 +       (bar_access->size > sizeof(uint64_t))) {
 +        ret.data.u64 = UINT64_MAX;
 +        goto fail;
 +    }
 +
 +    val = cpu_to_le64(bar_access->val);
 +
 +    res = address_space_rw(as, bar_access->addr, MEMTXATTRS_UNSPECIFIED,
 +                           (void *)&val, bar_access->size, true);
 +
 +    if (res != MEMTX_OK) {
 +        error_setg(errp, "Bad address %"PRIx64" for mem write, pid "FMT_pid".",
 +                   bar_access->addr, getpid());
 +        ret.data.u64 = -1;
 +    }
 +
 +fail:
 +    ret.cmd = MPQEMU_CMD_RET;
 +    ret.size = sizeof(ret.data.u64);
 +
 +    if (!mpqemu_msg_send(&ret, ioc, NULL)) {
 +        error_prepend(errp, "Error returning code to proxy, pid "FMT_pid": ",
 +                      getpid());
 +    }
 +}
 +
 +static void process_bar_read(QIOChannel *ioc, MPQemuMsg *msg, Error **errp)
 +{
 +    ERRP_GUARD();
 +    BarAccessMsg *bar_access = &msg->data.bar_access;
 +    MPQemuMsg ret = { 0 };
 +    AddressSpace *as;
 +    MemTxResult res;
 +    uint64_t val = 0;
 +
 +    as = bar_access->memory ? &address_space_memory : &address_space_io;
 +
 +    if (!is_power_of_2(bar_access->size) ||
 +       (bar_access->size > sizeof(uint64_t))) {
 +        val = UINT64_MAX;
 +        goto fail;
 +    }
 +
 +    res = address_space_rw(as, bar_access->addr, MEMTXATTRS_UNSPECIFIED,
 +                           (void *)&val, bar_access->size, false);
 +
 +    if (res != MEMTX_OK) {
 +        error_setg(errp, "Bad address %"PRIx64" for mem read, pid "FMT_pid".",
 +                   bar_access->addr, getpid());
 +        val = UINT64_MAX;
 +    }
 +
 +fail:
 +    ret.cmd = MPQEMU_CMD_RET;
 +    ret.data.u64 = le64_to_cpu(val);
 +    ret.size = sizeof(ret.data.u64);
 +
 +    if (!mpqemu_msg_send(&ret, ioc, NULL)) {
 +        error_prepend(errp, "Error returning code to proxy, pid "FMT_pid": ",
 +                      getpid());
 +    }
 +}
 diff --git a/hw/remote/mpqemu-link.c b/hw/remote/mpqemu-link.c
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/remote/mpqemu-link.c
 +++ b/hw/remote/mpqemu-link.c
@@ -XXX,XX +XXX,XX @@ bool mpqemu_msg_valid(MPQemuMsg *msg)
              return false;
          }
          break;
 +    case MPQEMU_CMD_BAR_WRITE:
 +    case MPQEMU_CMD_BAR_READ:
 +        if ((msg->size != sizeof(BarAccessMsg)) || (msg->num_fds != 0)) {
 +            return false;
 +        }
 +        break;
      default:
          break;
      }
 diff --git a/hw/remote/proxy.c b/hw/remote/proxy.c
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/remote/proxy.c
 +++ b/hw/remote/proxy.c
@@ -XXX,XX +XXX,XX @@ static void pci_proxy_dev_register_types(void)
  }
--bool bdrv_is_read_only(BlockDriverState *bs)
+ type_init(pci_proxy_dev_register_types)
--{
++
--    return bs->read_only;
++static void send_bar_access_msg(PCIProxyDev *pdev, MemoryRegion *mr,
--}
++                                bool write, hwaddr addr, uint64_t *val,
--
++                                unsigned size, bool memory)
- bool bdrv_is_sg(BlockDriverState *bs)
++{
- {
++    MPQemuMsg msg = { 0 };
-     return bs->sg;
++    long ret = -EINVAL;
 +    Error *local_err = NULL;
 +
 +    msg.size = sizeof(BarAccessMsg);
 +    msg.data.bar_access.addr = mr->addr + addr;
 +    msg.data.bar_access.size = size;
 +    msg.data.bar_access.memory = memory;
 +
 +    if (write) {
 +        msg.cmd = MPQEMU_CMD_BAR_WRITE;
 +        msg.data.bar_access.val = *val;
 +    } else {
 +        msg.cmd = MPQEMU_CMD_BAR_READ;
 +    }
 +
 +    ret = mpqemu_msg_send_and_await_reply(&msg, pdev, &local_err);
 +    if (local_err) {
 +        error_report_err(local_err);
 +    }
 +
 +    if (!write) {
 +        *val = ret;
 +    }
 +}
 +
 +static void proxy_bar_write(void *opaque, hwaddr addr, uint64_t val,
 +                            unsigned size)
 +{
 +    ProxyMemoryRegion *pmr = opaque;
 +
 +    send_bar_access_msg(pmr->dev, &pmr->mr, true, addr, &val, size,
 +                        pmr->memory);
 +}
 +
 +static uint64_t proxy_bar_read(void *opaque, hwaddr addr, unsigned size)
 +{
 +    ProxyMemoryRegion *pmr = opaque;
 +    uint64_t val;
 +
 +    send_bar_access_msg(pmr->dev, &pmr->mr, false, addr, &val, size,
 +                        pmr->memory);
 +
 +    return val;
 +}
 +
 +const MemoryRegionOps proxy_mr_ops = {
 +    .read = proxy_bar_read,
 +    .write = proxy_bar_write,
 +    .endianness = DEVICE_NATIVE_ENDIAN,
 +    .impl = {
 +        .min_access_size = 1,
 +        .max_access_size = 8,
 +    },
 +};
 --
-.9.3
+.29.2

-[Qemu-devel] [PULL 01/12] block/vxhs.c: Add support for a new block device type called "vxhs"
+[PULL 23/27] multi-process: Synchronize remote memory
-From: Ashish Mittal <ashmit602@gmail.com>
+From: Jagannathan Raman <jag.raman@oracle.com>
-Source code for the qnio library that this code loads can be downloaded from:
+Add ProxyMemoryListener object which is used to keep the view of the RAM
-https://github.com/VeritasHyperScale/libqnio.git
+in sync between QEMU and remote process.
 A MemoryListener is registered for system-memory AddressSpace. The
 listener sends SYNC_SYSMEM message to the remote process when memory
 listener commits the changes to memory, the remote process receives
 the message and processes it in the handler for SYNC_SYSMEM message.
-Sample command line using JSON syntax:
+Signed-off-by: Jagannathan Raman <jag.raman@oracle.com>
-./x86_64-softmmu/qemu-system-x86_64 -name instance-00000008 -S -vnc 0.0.0.0:0
+Signed-off-by: John G Johnson <john.g.johnson@oracle.com>
--k en-us -vga cirrus -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5
+Signed-off-by: Elena Ufimtseva <elena.ufimtseva@oracle.com>
--msg timestamp=on
+Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
-'json:{"driver":"vxhs","vdisk-id":"c3e9095a-a5ee-4dce-afeb-2a59fb387410",
+Message-id: 04fe4e6a9ca90d4f11ab6f59be7652f5b086a071.1611938319.git.jag.raman@oracle.com
-"server":{"host":"172.172.17.4","port":"9999"}}'
+Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
  MAINTAINERS                               |   2 +
  include/hw/remote/proxy-memory-listener.h |  28 +++
  include/hw/remote/proxy.h                 |   2 +
  hw/remote/message.c                       |   4 +
  hw/remote/proxy-memory-listener.c         | 227 ++++++++++++++++++++++
  hw/remote/proxy.c                         |   6 +
  hw/remote/meson.build                     |   1 +
 files changed, 270 insertions(+)
  create mode 100644 include/hw/remote/proxy-memory-listener.h
  create mode 100644 hw/remote/proxy-memory-listener.c
-Sample command line using URI syntax:
+diff --git a/MAINTAINERS b/MAINTAINERS
-qemu-img convert -f raw -O raw -n
+index XXXXXXX..XXXXXXX 100644
-/var/lib/nova/instances/_base/0c5eacd5ebea5ed914b6a3e7b18f1ce734c386ad
+--- a/MAINTAINERS
-vxhs://192.168.0.1:9999/c6718f6b-0401-441d-a8c3-1f0064d75ee0
++++ b/MAINTAINERS
+@@ -XXX,XX +XXX,XX @@ F: include/hw/remote/memory.h
-Sample command line using TLS credentials (run in secure mode):
+ F: hw/remote/memory.c
-./qemu-io --object
+ F: hw/remote/proxy.c
-tls-creds-x509,id=tls0,dir=/etc/pki/qemu/vxhs,endpoint=client -c 'read
+ F: include/hw/remote/proxy.h
--v 66000 2.5k' 'json:{"server.host": "127.0.0.1", "server.port": "9999",
++F: hw/remote/proxy-memory-listener.c
-"vdisk-id": "/test.raw", "driver": "vxhs", "tls-creds":"tls0"}'
++F: include/hw/remote/proxy-memory-listener.h
-Signed-off-by: Ashish Mittal <Ashish.Mittal@veritas.com>
+ Build and test automation
-Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
+ -------------------------
-Reviewed-by: Jeff Cody <jcody@redhat.com>
+diff --git a/include/hw/remote/proxy-memory-listener.h b/include/hw/remote/proxy-memory-listener.h
 Signed-off-by: Jeff Cody <jcody@redhat.com>
 Message-id: 1491277689-24949-2-git-send-email-Ashish.Mittal@veritas.com
 ---
  block/Makefile.objs  |   2 +
  block/trace-events   |  17 ++
  block/vxhs.c         | 575 +++++++++++++++++++++++++++++++++++++++++++++++++++
  configure            |  39 ++++
  qapi/block-core.json |  23 ++-
 files changed, 654 insertions(+), 2 deletions(-)
  create mode 100644 block/vxhs.c
 diff --git a/block/Makefile.objs b/block/Makefile.objs
 index XXXXXXX..XXXXXXX 100644
 --- a/block/Makefile.objs
 +++ b/block/Makefile.objs
@@ -XXX,XX +XXX,XX @@ block-obj-$(CONFIG_LIBNFS) += nfs.o
  block-obj-$(CONFIG_CURL) += curl.o
  block-obj-$(CONFIG_RBD) += rbd.o
  block-obj-$(CONFIG_GLUSTERFS) += gluster.o
 +block-obj-$(CONFIG_VXHS) += vxhs.o
  block-obj-$(CONFIG_LIBSSH2) += ssh.o
  block-obj-y += accounting.o dirty-bitmap.o
  block-obj-y += write-threshold.o
@@ -XXX,XX +XXX,XX @@ rbd.o-cflags       := $(RBD_CFLAGS)
  rbd.o-libs         := $(RBD_LIBS)
  gluster.o-cflags   := $(GLUSTERFS_CFLAGS)
  gluster.o-libs     := $(GLUSTERFS_LIBS)
 +vxhs.o-libs        := $(VXHS_LIBS)
  ssh.o-cflags       := $(LIBSSH2_CFLAGS)
  ssh.o-libs         := $(LIBSSH2_LIBS)
  block-obj-$(if $(CONFIG_BZIP2),m,n) += dmg-bz2.o
 diff --git a/block/trace-events b/block/trace-events
 index XXXXXXX..XXXXXXX 100644
 --- a/block/trace-events
 +++ b/block/trace-events
@@ -XXX,XX +XXX,XX @@ qed_aio_write_data(void *s, void *acb, int ret, uint64_t offset, size_t len) "s
  qed_aio_write_prefill(void *s, void *acb, uint64_t start, size_t len, uint64_t offset) "s %p acb %p start %"PRIu64" len %zu offset %"PRIu64
  qed_aio_write_postfill(void *s, void *acb, uint64_t start, size_t len, uint64_t offset) "s %p acb %p start %"PRIu64" len %zu offset %"PRIu64
  qed_aio_write_main(void *s, void *acb, int ret, uint64_t offset, size_t len) "s %p acb %p ret %d offset %"PRIu64" len %zu"
 +
 +# block/vxhs.c
 +vxhs_iio_callback(int error) "ctx is NULL: error %d"
 +vxhs_iio_callback_chnfail(int err, int error) "QNIO channel failed, no i/o %d, %d"
 +vxhs_iio_callback_unknwn(int opcode, int err) "unexpected opcode %d, errno %d"
 +vxhs_aio_rw_invalid(int req) "Invalid I/O request iodir %d"
 +vxhs_aio_rw_ioerr(char *guid, int iodir, uint64_t size, uint64_t off, void *acb, int ret, int err) "IO ERROR (vDisk %s) FOR : Read/Write = %d size = %lu offset = %lu ACB = %p. Error = %d, errno = %d"
 +vxhs_get_vdisk_stat_err(char *guid, int ret, int err) "vDisk (%s) stat ioctl failed, ret = %d, errno = %d"
 +vxhs_get_vdisk_stat(char *vdisk_guid, uint64_t vdisk_size) "vDisk %s stat ioctl returned size %lu"
 +vxhs_complete_aio(void *acb, uint64_t ret) "aio failed acb %p ret %ld"
 +vxhs_parse_uri_filename(const char *filename) "URI passed via bdrv_parse_filename %s"
 +vxhs_open_vdiskid(const char *vdisk_id) "Opening vdisk-id %s"
 +vxhs_open_hostinfo(char *of_vsa_addr, int port) "Adding host %s:%d to BDRVVXHSState"
 +vxhs_open_iio_open(const char *host) "Failed to connect to storage agent on host %s"
 +vxhs_parse_uri_hostinfo(char *host, int port) "Host: IP %s, Port %d"
 +vxhs_close(char *vdisk_guid) "Closing vdisk %s"
 +vxhs_get_creds(const char *cacert, const char *client_key, const char *client_cert) "cacert %s, client_key %s, client_cert %s"
 diff --git a/block/vxhs.c b/block/vxhs.c
 new file mode 100644
 index XXXXXXX..XXXXXXX
 --- /dev/null
-+++ b/block/vxhs.c
++++ b/include/hw/remote/proxy-memory-listener.h
 @@ -XXX,XX +XXX,XX @@
 +/*
-+ * QEMU Block driver for Veritas HyperScale (VxHS)
++ * Copyright © 2018, 2021 Oracle and/or its affiliates.
 + *
 + * Copyright (c) 2017 Veritas Technologies LLC.
 + *
 + * This work is licensed under the terms of the GNU GPL, version 2 or later.
 + * See the COPYING file in the top-level directory.
 + *
 + */
 +
++#ifndef PROXY_MEMORY_LISTENER_H
++#define PROXY_MEMORY_LISTENER_H
++
++#include "exec/memory.h"
++#include "io/channel.h"
++
++typedef struct ProxyMemoryListener {
++    MemoryListener listener;
++
++    int n_mr_sections;
++    MemoryRegionSection *mr_sections;
++
++    QIOChannel *ioc;
++} ProxyMemoryListener;
++
++void proxy_memory_listener_configure(ProxyMemoryListener *proxy_listener,
++                                     QIOChannel *ioc);
++void proxy_memory_listener_deconfigure(ProxyMemoryListener *proxy_listener);
++
++#endif
+diff --git a/include/hw/remote/proxy.h b/include/hw/remote/proxy.h
+index XXXXXXX..XXXXXXX 100644
+--- a/include/hw/remote/proxy.h
++++ b/include/hw/remote/proxy.h
+@@ -XXX,XX +XXX,XX @@
+ #include "hw/pci/pci.h"
+ #include "io/channel.h"
++#include "hw/remote/proxy-memory-listener.h"
+ #define TYPE_PCI_PROXY_DEV "x-pci-proxy-dev"
+ OBJECT_DECLARE_SIMPLE_TYPE(PCIProxyDev, PCI_PROXY_DEV)
+@@ -XXX,XX +XXX,XX @@ struct PCIProxyDev {
+     QemuMutex io_mutex;
+     QIOChannel *ioc;
+     Error *migration_blocker;
++    ProxyMemoryListener proxy_listener;
+     ProxyMemoryRegion region[PCI_NUM_REGIONS];
+ };
+diff --git a/hw/remote/message.c b/hw/remote/message.c
+index XXXXXXX..XXXXXXX 100644
+--- a/hw/remote/message.c
++++ b/hw/remote/message.c
+@@ -XXX,XX +XXX,XX @@
+ #include "sysemu/runstate.h"
+ #include "hw/pci/pci.h"
+ #include "exec/memattrs.h"
++#include "hw/remote/memory.h"
+ static void process_config_write(QIOChannel *ioc, PCIDevice *dev,
+                                  MPQemuMsg *msg, Error **errp);
+@@ -XXX,XX +XXX,XX @@ void coroutine_fn mpqemu_remote_msg_loop_co(void *data)
+         case MPQEMU_CMD_BAR_READ:
+             process_bar_read(com->ioc, &msg, &local_err);
+             break;
++        case MPQEMU_CMD_SYNC_SYSMEM:
++            remote_sysmem_reconfig(&msg, &local_err);
++            break;
+         default:
+             error_setg(&local_err,
+                        "Unknown command (%d) received for device %s"
+diff --git a/hw/remote/proxy-memory-listener.c b/hw/remote/proxy-memory-listener.c
+new file mode 100644
+index XXXXXXX..XXXXXXX
+--- /dev/null
++++ b/hw/remote/proxy-memory-listener.c
+@@ -XXX,XX +XXX,XX @@
++/*
++ * Copyright © 2018, 2021 Oracle and/or its affiliates.
++ *
++ * This work is licensed under the terms of the GNU GPL, version 2 or later.
++ * See the COPYING file in the top-level directory.
++ *
++ */
++
 +#include "qemu/osdep.h"
-+#include <qnio/qnio_api.h>
++#include "qemu-common.h"
-+#include <sys/param.h>
++
-+#include "block/block_int.h"
++#include "qemu/compiler.h"
-+#include "qapi/qmp/qerror.h"
++#include "qemu/int128.h"
-+#include "qapi/qmp/qdict.h"
++#include "qemu/range.h"
-+#include "qapi/qmp/qstring.h"
++#include "exec/memory.h"
-+#include "trace.h"
++#include "exec/cpu-common.h"
-+#include "qemu/uri.h"
++#include "cpu.h"
 +#include "exec/ram_addr.h"
 +#include "exec/address-spaces.h"
 +#include "qapi/error.h"
-+#include "qemu/uuid.h"
++#include "hw/remote/mpqemu-link.h"
-+#include "crypto/tlscredsx509.h"
++#include "hw/remote/proxy-memory-listener.h"
 +
 +#define VXHS_OPT_FILENAME           "filename"
 +#define VXHS_OPT_VDISK_ID           "vdisk-id"
 +#define VXHS_OPT_SERVER             "server"
 +#define VXHS_OPT_HOST               "host"
 +#define VXHS_OPT_PORT               "port"
 +
 +/* Only accessed under QEMU global mutex */
 +static uint32_t vxhs_ref;
 +
 +typedef enum {
 +    VDISK_AIO_READ,
 +    VDISK_AIO_WRITE,
 +} VDISKAIOCmd;
 +
 +/*
-+ * HyperScale AIO callbacks structure
++ * TODO: get_fd_from_hostaddr(), proxy_mrs_can_merge() and
 + * proxy_memory_listener_commit() defined below perform tasks similar to the
 + * functions defined in vhost-user.c. These functions are good candidates
 + * for refactoring.
 + *
 + */
-+typedef struct VXHSAIOCB {
++
-+    BlockAIOCB common;
++static void proxy_memory_listener_reset(MemoryListener *listener)
-+    int err;
++{
-+} VXHSAIOCB;
++    ProxyMemoryListener *proxy_listener = container_of(listener,
-+
++                                                       ProxyMemoryListener,
-+typedef struct VXHSvDiskHostsInfo {
++                                                       listener);
-+    void *dev_handle; /* Device handle */
++    int mrs;
-+    char *host; /* Host name or IP */
++
-+    int port; /* Host's port number */
++    for (mrs = 0; mrs < proxy_listener->n_mr_sections; mrs++) {
-+} VXHSvDiskHostsInfo;
++        memory_region_unref(proxy_listener->mr_sections[mrs].mr);
-+
++    }
-+/*
++
-+ * Structure per vDisk maintained for state
++    g_free(proxy_listener->mr_sections);
-+ */
++    proxy_listener->mr_sections = NULL;
-+typedef struct BDRVVXHSState {
++    proxy_listener->n_mr_sections = 0;
-+    VXHSvDiskHostsInfo vdisk_hostinfo; /* Per host info */
++}
-+    char *vdisk_guid;
++
-+    char *tlscredsid; /* tlscredsid */
++static int get_fd_from_hostaddr(uint64_t host, ram_addr_t *offset)
-+} BDRVVXHSState;
++{
-+
++    MemoryRegion *mr;
-+static void vxhs_complete_aio_bh(void *opaque)
++    ram_addr_t off;
-+{
++
-+    VXHSAIOCB *acb = opaque;
++    /**
-+    BlockCompletionFunc *cb = acb->common.cb;
++     * Assumes that the host address is a valid address as it's
-+    void *cb_opaque = acb->common.opaque;
++     * coming from the MemoryListener system. In the case host
-+    int ret = 0;
++     * address is not valid, the following call would return
-+
++     * the default subregion of "system_memory" region, and
-+    if (acb->err != 0) {
++     * not NULL. So it's not possible to check for NULL here.
-+        trace_vxhs_complete_aio(acb, acb->err);
++     */
-+        ret = (-EIO);
++    mr = memory_region_from_host((void *)(uintptr_t)host, &off);
-+    }
++
-+
++    if (offset) {
-+    qemu_aio_unref(acb);
++        *offset = off;
-+    cb(cb_opaque, ret);
++    }
-+}
++
-+
++    return memory_region_get_fd(mr);
-+/*
++}
-+ * Called from a libqnio thread
++
-+ */
++static bool proxy_mrs_can_merge(uint64_t host, uint64_t prev_host, size_t size)
-+static void vxhs_iio_callback(void *ctx, uint32_t opcode, uint32_t error)
++{
-+{
++    if (((prev_host + size) != host)) {
-+    VXHSAIOCB *acb = NULL;
++        return false;
-+
++    }
-+    switch (opcode) {
++
-+    case IRP_READ_REQUEST:
++    if (get_fd_from_hostaddr(host, NULL) !=
-+    case IRP_WRITE_REQUEST:
++            get_fd_from_hostaddr(prev_host, NULL)) {
-+
++        return false;
-+        /*
++    }
-+         * ctx is VXHSAIOCB*
++
-+         * ctx is NULL if error is QNIOERROR_CHANNEL_HUP
++    return true;
-+         */
++}
-+        if (ctx) {
++
-+            acb = ctx;
++static bool try_merge(ProxyMemoryListener *proxy_listener,
-+        } else {
++                      MemoryRegionSection *section)
-+            trace_vxhs_iio_callback(error);
++{
-+            goto out;
++    uint64_t mrs_size, mrs_gpa, mrs_page;
 +    MemoryRegionSection *prev_sec;
 +    bool merged = false;
 +    uintptr_t mrs_host;
 +    RAMBlock *mrs_rb;
 +
 +    if (!proxy_listener->n_mr_sections) {
 +        return false;
 +    }
 +
 +    mrs_rb = section->mr->ram_block;
 +    mrs_page = (uint64_t)qemu_ram_pagesize(mrs_rb);
 +    mrs_size = int128_get64(section->size);
 +    mrs_gpa = section->offset_within_address_space;
 +    mrs_host = (uintptr_t)memory_region_get_ram_ptr(section->mr) +
 +               section->offset_within_region;
 +
 +    if (get_fd_from_hostaddr(mrs_host, NULL) < 0) {
 +        return true;
 +    }
 +
 +    mrs_host = mrs_host & ~(mrs_page - 1);
 +    mrs_gpa = mrs_gpa & ~(mrs_page - 1);
 +    mrs_size = ROUND_UP(mrs_size, mrs_page);
 +
 +    prev_sec = proxy_listener->mr_sections +
 +               (proxy_listener->n_mr_sections - 1);
 +    uint64_t prev_gpa_start = prev_sec->offset_within_address_space;
 +    uint64_t prev_size = int128_get64(prev_sec->size);
 +    uint64_t prev_gpa_end   = range_get_last(prev_gpa_start, prev_size);
 +    uint64_t prev_host_start =
 +        (uintptr_t)memory_region_get_ram_ptr(prev_sec->mr) +
 +        prev_sec->offset_within_region;
 +    uint64_t prev_host_end = range_get_last(prev_host_start, prev_size);
 +
 +    if (mrs_gpa <= (prev_gpa_end + 1)) {
 +        g_assert(mrs_gpa > prev_gpa_start);
 +
 +        if ((section->mr == prev_sec->mr) &&
 +            proxy_mrs_can_merge(mrs_host, prev_host_start,
 +                                (mrs_gpa - prev_gpa_start))) {
 +            uint64_t max_end = MAX(prev_host_end, mrs_host + mrs_size);
 +            merged = true;
 +            prev_sec->offset_within_address_space =
 +                MIN(prev_gpa_start, mrs_gpa);
 +            prev_sec->offset_within_region =
 +                MIN(prev_host_start, mrs_host) -
 +                (uintptr_t)memory_region_get_ram_ptr(prev_sec->mr);
 +            prev_sec->size = int128_make64(max_end - MIN(prev_host_start,
 +                                                         mrs_host));
 +        }
-+
++    }
-+        if (error) {
++
-+            if (!acb->err) {
++    return merged;
-+                acb->err = error;
++}
-+            }
++
-+            trace_vxhs_iio_callback(error);
++static void proxy_memory_listener_region_addnop(MemoryListener *listener,
-+        }
++                                                MemoryRegionSection *section)
-+
++{
-+        aio_bh_schedule_oneshot(bdrv_get_aio_context(acb->common.bs),
++    ProxyMemoryListener *proxy_listener = container_of(listener,
-+                                vxhs_complete_aio_bh, acb);
++                                                       ProxyMemoryListener,
-+        break;
++                                                       listener);
 +
-+    default:
++    if (!memory_region_is_ram(section->mr) ||
-+        if (error == QNIOERROR_HUP) {
++            memory_region_is_rom(section->mr)) {
 +            /*
 +             * Channel failed, spontaneous notification,
 +             * not in response to I/O
 +             */
 +            trace_vxhs_iio_callback_chnfail(error, errno);
 +        } else {
 +            trace_vxhs_iio_callback_unknwn(opcode, error);
 +        }
 +        break;
 +    }
 +out:
 +    return;
 +}
 +
 +static QemuOptsList runtime_opts = {
 +    .name = "vxhs",
 +    .head = QTAILQ_HEAD_INITIALIZER(runtime_opts.head),
 +    .desc = {
 +        {
 +            .name = VXHS_OPT_FILENAME,
 +            .type = QEMU_OPT_STRING,
 +            .help = "URI to the Veritas HyperScale image",
 +        },
 +        {
 +            .name = VXHS_OPT_VDISK_ID,
 +            .type = QEMU_OPT_STRING,
 +            .help = "UUID of the VxHS vdisk",
 +        },
 +        {
 +            .name = "tls-creds",
 +            .type = QEMU_OPT_STRING,
 +            .help = "ID of the TLS/SSL credentials to use",
 +        },
 +        { /* end of list */ }
 +    },
 +};
 +
 +static QemuOptsList runtime_tcp_opts = {
 +    .name = "vxhs_tcp",
 +    .head = QTAILQ_HEAD_INITIALIZER(runtime_tcp_opts.head),
 +    .desc = {
 +        {
 +            .name = VXHS_OPT_HOST,
 +            .type = QEMU_OPT_STRING,
 +            .help = "host address (ipv4 addresses)",
 +        },
 +        {
 +            .name = VXHS_OPT_PORT,
 +            .type = QEMU_OPT_NUMBER,
 +            .help = "port number on which VxHSD is listening (default 9999)",
 +            .def_value_str = "9999"
 +        },
 +        { /* end of list */ }
 +    },
 +};
 +
 +/*
 + * Parse incoming URI and populate *options with the host
 + * and device information
 + */
 +static int vxhs_parse_uri(const char *filename, QDict *options)
 +{
 +    URI *uri = NULL;
 +    char *port;
 +    int ret = 0;
 +
 +    trace_vxhs_parse_uri_filename(filename);
 +    uri = uri_parse(filename);
 +    if (!uri || !uri->server || !uri->path) {
 +        uri_free(uri);
 +        return -EINVAL;
 +    }
 +
 +    qdict_put(options, VXHS_OPT_SERVER".host", qstring_from_str(uri->server));
 +
 +    if (uri->port) {
 +        port = g_strdup_printf("%d", uri->port);
 +        qdict_put(options, VXHS_OPT_SERVER".port", qstring_from_str(port));
 +        g_free(port);
 +    }
 +
 +    qdict_put(options, "vdisk-id", qstring_from_str(uri->path));
 +
 +    trace_vxhs_parse_uri_hostinfo(uri->server, uri->port);
 +    uri_free(uri);
 +
 +    return ret;
 +}
 +
 +static void vxhs_parse_filename(const char *filename, QDict *options,
 +                                Error **errp)
 +{
 +    if (qdict_haskey(options, "vdisk-id") || qdict_haskey(options, "server")) {
 +        error_setg(errp, "vdisk-id/server and a file name may not be specified "
 +                         "at the same time");
 +        return;
 +    }
 +
-+    if (strstr(filename, "://")) {
++    if (try_merge(proxy_listener, section)) {
 +        int ret = vxhs_parse_uri(filename, options);
 +        if (ret < 0) {
 +            error_setg(errp, "Invalid URI. URI should be of the form "
 +                       "  vxhs://<host_ip>:<port>/<vdisk-id>");
 +        }
 +    }
 +}
 +
 +static int vxhs_init_and_ref(void)
 +{
 +    if (vxhs_ref++ == 0) {
 +        if (iio_init(QNIO_VERSION, vxhs_iio_callback)) {
 +            return -ENODEV;
 +        }
 +    }
 +    return 0;
 +}
 +
 +static void vxhs_unref(void)
 +{
 +    if (--vxhs_ref == 0) {
 +        iio_fini();
 +    }
 +}
 +
 +static void vxhs_get_tls_creds(const char *id, char **cacert,
 +                               char **key, char **cert, Error **errp)
 +{
 +    Object *obj;
 +    QCryptoTLSCreds *creds;
 +    QCryptoTLSCredsX509 *creds_x509;
 +
 +    obj = object_resolve_path_component(
 +        object_get_objects_root(), id);
 +
 +    if (!obj) {
 +        error_setg(errp, "No TLS credentials with id '%s'",
 +                   id);
 +        return;
 +    }
 +
-+    creds_x509 = (QCryptoTLSCredsX509 *)
++    ++proxy_listener->n_mr_sections;
-+        object_dynamic_cast(obj, TYPE_QCRYPTO_TLS_CREDS_X509);
++    proxy_listener->mr_sections = g_renew(MemoryRegionSection,
-+
++                                          proxy_listener->mr_sections,
-+    if (!creds_x509) {
++                                          proxy_listener->n_mr_sections);
-+        error_setg(errp, "Object with id '%s' is not TLS credentials",
++    proxy_listener->mr_sections[proxy_listener->n_mr_sections - 1] = *section;
-+                   id);
++    proxy_listener->mr_sections[proxy_listener->n_mr_sections - 1].fv = NULL;
 +    memory_region_ref(section->mr);
 +}
 +
 +static void proxy_memory_listener_commit(MemoryListener *listener)
 +{
 +    ProxyMemoryListener *proxy_listener = container_of(listener,
 +                                                       ProxyMemoryListener,
 +                                                       listener);
 +    MPQemuMsg msg;
 +    MemoryRegionSection *section;
 +    ram_addr_t offset;
 +    uintptr_t host_addr;
 +    int region;
 +    Error *local_err = NULL;
 +
 +    memset(&msg, 0, sizeof(MPQemuMsg));
 +
 +    msg.cmd = MPQEMU_CMD_SYNC_SYSMEM;
 +    msg.num_fds = proxy_listener->n_mr_sections;
 +    msg.size = sizeof(SyncSysmemMsg);
 +    if (msg.num_fds > REMOTE_MAX_FDS) {
 +        error_report("Number of fds is more than %d", REMOTE_MAX_FDS);
 +        return;
 +    }
 +
-+    creds = &creds_x509->parent_obj;
++    for (region = 0; region < proxy_listener->n_mr_sections; region++) {
-+
++        section = &proxy_listener->mr_sections[region];
-+    if (creds->endpoint != QCRYPTO_TLS_CREDS_ENDPOINT_CLIENT) {
++        msg.data.sync_sysmem.gpas[region] =
-+        error_setg(errp,
++            section->offset_within_address_space;
-+                   "Expecting TLS credentials with a client endpoint");
++        msg.data.sync_sysmem.sizes[region] = int128_get64(section->size);
-+        return;
++        host_addr = (uintptr_t)memory_region_get_ram_ptr(section->mr) +
-+    }
++                    section->offset_within_region;
-+
++        msg.fds[region] = get_fd_from_hostaddr(host_addr, &offset);
-+    /*
++        msg.data.sync_sysmem.offsets[region] = offset;
-+     * Get the cacert, client_cert and client_key file names.
++    }
-+     */
++    if (!mpqemu_msg_send(&msg, proxy_listener->ioc, &local_err)) {
-+    if (!creds->dir) {
++        error_report_err(local_err);
-+        error_setg(errp, "TLS object missing 'dir' property value");
++    }
-+        return;
++}
-+    }
++
-+
++void proxy_memory_listener_deconfigure(ProxyMemoryListener *proxy_listener)
-+    *cacert = g_strdup_printf("%s/%s", creds->dir,
++{
-+                              QCRYPTO_TLS_CREDS_X509_CA_CERT);
++    memory_listener_unregister(&proxy_listener->listener);
-+    *cert = g_strdup_printf("%s/%s", creds->dir,
++
-+                            QCRYPTO_TLS_CREDS_X509_CLIENT_CERT);
++    proxy_memory_listener_reset(&proxy_listener->listener);
-+    *key = g_strdup_printf("%s/%s", creds->dir,
++}
-+                           QCRYPTO_TLS_CREDS_X509_CLIENT_KEY);
++
-+}
++void proxy_memory_listener_configure(ProxyMemoryListener *proxy_listener,
-+
++                                     QIOChannel *ioc)
-+static int vxhs_open(BlockDriverState *bs, QDict *options,
++{
-+                     int bdrv_flags, Error **errp)
++    proxy_listener->n_mr_sections = 0;
-+{
++    proxy_listener->mr_sections = NULL;
-+    BDRVVXHSState *s = bs->opaque;
++
-+    void *dev_handlep;
++    proxy_listener->ioc = ioc;
-+    QDict *backing_options = NULL;
++
-+    QemuOpts *opts = NULL;
++    proxy_listener->listener.begin = proxy_memory_listener_reset;
-+    QemuOpts *tcp_opts = NULL;
++    proxy_listener->listener.commit = proxy_memory_listener_commit;
-+    char *of_vsa_addr = NULL;
++    proxy_listener->listener.region_add = proxy_memory_listener_region_addnop;
-+    Error *local_err = NULL;
++    proxy_listener->listener.region_nop = proxy_memory_listener_region_addnop;
-+    const char *vdisk_id_opt;
++    proxy_listener->listener.priority = 10;
-+    const char *server_host_opt;
++
-+    int ret = 0;
++    memory_listener_register(&proxy_listener->listener,
-+    char *cacert = NULL;
++                             &address_space_memory);
-+    char *client_key = NULL;
++}
-+    char *client_cert = NULL;
+diff --git a/hw/remote/proxy.c b/hw/remote/proxy.c
-+
+index XXXXXXX..XXXXXXX 100644
-+    ret = vxhs_init_and_ref();
+--- a/hw/remote/proxy.c
-+    if (ret < 0) {
++++ b/hw/remote/proxy.c
-+        ret = -EINVAL;
+@@ -XXX,XX +XXX,XX @@
-+        goto out;
+ #include "qemu/sockets.h"
-+    }
+ #include "hw/remote/mpqemu-link.h"
-+
+ #include "qemu/error-report.h"
-+    /* Create opts info from runtime_opts and runtime_tcp_opts list */
++#include "hw/remote/proxy-memory-listener.h"
-+    opts = qemu_opts_create(&runtime_opts, NULL, 0, &error_abort);
++#include "qom/object.h"
-+    tcp_opts = qemu_opts_create(&runtime_tcp_opts, NULL, 0, &error_abort);
-+
+ static void pci_proxy_dev_realize(PCIDevice *device, Error **errp)
-+    qemu_opts_absorb_qdict(opts, options, &local_err);
+ {
-+    if (local_err) {
+@@ -XXX,XX +XXX,XX @@ static void pci_proxy_dev_realize(PCIDevice *device, Error **errp)
-+        ret = -EINVAL;
-+        goto out;
+     qemu_mutex_init(&dev->io_mutex);
-+    }
+     qio_channel_set_blocking(dev->ioc, true, NULL);
 +
-+    /* vdisk-id is the disk UUID */
++    proxy_memory_listener_configure(&dev->proxy_listener, dev->ioc);
-+    vdisk_id_opt = qemu_opt_get(opts, VXHS_OPT_VDISK_ID);
+ }
-+    if (!vdisk_id_opt) {
-+        error_setg(&local_err, QERR_MISSING_PARAMETER, VXHS_OPT_VDISK_ID);
+ static void pci_proxy_dev_exit(PCIDevice *pdev)
-+        ret = -EINVAL;
+@@ -XXX,XX +XXX,XX @@ static void pci_proxy_dev_exit(PCIDevice *pdev)
-+        goto out;
+     migrate_del_blocker(dev->migration_blocker);
-+    }
-+
+     error_free(dev->migration_blocker);
-+    /* vdisk-id may contain a leading '/' */
++
-+    if (strlen(vdisk_id_opt) > UUID_FMT_LEN + 1) {
++    proxy_memory_listener_deconfigure(&dev->proxy_listener);
-+        error_setg(&local_err, "vdisk-id cannot be more than %d characters",
+ }
-+                   UUID_FMT_LEN);
-+        ret = -EINVAL;
+ static void config_op_send(PCIProxyDev *pdev, uint32_t addr, uint32_t *val,
-+        goto out;
+diff --git a/hw/remote/meson.build b/hw/remote/meson.build
-+    }
+index XXXXXXX..XXXXXXX 100644
-+
+--- a/hw/remote/meson.build
-+    s->vdisk_guid = g_strdup(vdisk_id_opt);
++++ b/hw/remote/meson.build
-+    trace_vxhs_open_vdiskid(vdisk_id_opt);
+@@ -XXX,XX +XXX,XX @@ remote_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('remote-obj.c'))
-+
+ remote_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('proxy.c'))
-+    /* get the 'server.' arguments */
-+    qdict_extract_subqdict(options, &backing_options, VXHS_OPT_SERVER".");
+ specific_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('memory.c'))
-+
++specific_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('proxy-memory-listener.c'))
-+    qemu_opts_absorb_qdict(tcp_opts, backing_options, &local_err);
-+    if (local_err != NULL) {
+ softmmu_ss.add_all(when: 'CONFIG_MULTIPROCESS', if_true: remote_ss)
 +        ret = -EINVAL;
 +        goto out;
 +    }
 +
 +    server_host_opt = qemu_opt_get(tcp_opts, VXHS_OPT_HOST);
 +    if (!server_host_opt) {
 +        error_setg(&local_err, QERR_MISSING_PARAMETER,
 +                   VXHS_OPT_SERVER"."VXHS_OPT_HOST);
 +        ret = -EINVAL;
 +        goto out;
 +    }
 +
 +    if (strlen(server_host_opt) > MAXHOSTNAMELEN) {
 +        error_setg(&local_err, "server.host cannot be more than %d characters",
 +                   MAXHOSTNAMELEN);
 +        ret = -EINVAL;
 +        goto out;
 +    }
 +
 +    /* check if we got tls-creds via the --object argument */
 +    s->tlscredsid = g_strdup(qemu_opt_get(opts, "tls-creds"));
 +    if (s->tlscredsid) {
 +        vxhs_get_tls_creds(s->tlscredsid, &cacert, &client_key,
 +                           &client_cert, &local_err);
 +        if (local_err != NULL) {
 +            ret = -EINVAL;
 +            goto out;
 +        }
 +        trace_vxhs_get_creds(cacert, client_key, client_cert);
 +    }
 +
 +    s->vdisk_hostinfo.host = g_strdup(server_host_opt);
 +    s->vdisk_hostinfo.port = g_ascii_strtoll(qemu_opt_get(tcp_opts,
 +                                                          VXHS_OPT_PORT),
 +                                                          NULL, 0);
 +
 +    trace_vxhs_open_hostinfo(s->vdisk_hostinfo.host,
 +                             s->vdisk_hostinfo.port);
 +
 +    of_vsa_addr = g_strdup_printf("of://%s:%d",
 +                                  s->vdisk_hostinfo.host,
 +                                  s->vdisk_hostinfo.port);
 +
 +    /*
 +     * Open qnio channel to storage agent if not opened before
 +     */
 +    dev_handlep = iio_open(of_vsa_addr, s->vdisk_guid, 0,
 +                           cacert, client_key, client_cert);
 +    if (dev_handlep == NULL) {
 +        trace_vxhs_open_iio_open(of_vsa_addr);
 +        ret = -ENODEV;
 +        goto out;
 +    }
 +    s->vdisk_hostinfo.dev_handle = dev_handlep;
 +
 +out:
 +    g_free(of_vsa_addr);
 +    QDECREF(backing_options);
 +    qemu_opts_del(tcp_opts);
 +    qemu_opts_del(opts);
 +    g_free(cacert);
 +    g_free(client_key);
 +    g_free(client_cert);
 +
 +    if (ret < 0) {
 +        vxhs_unref();
 +        error_propagate(errp, local_err);
 +        g_free(s->vdisk_hostinfo.host);
 +        g_free(s->vdisk_guid);
 +        g_free(s->tlscredsid);
 +        s->vdisk_guid = NULL;
 +    }
 +
 +    return ret;
 +}
 +
 +static const AIOCBInfo vxhs_aiocb_info = {
 +    .aiocb_size = sizeof(VXHSAIOCB)
 +};
 +
 +/*
 + * This allocates QEMU-VXHS callback for each IO
 + * and is passed to QNIO. When QNIO completes the work,
 + * it will be passed back through the callback.
 + */
 +static BlockAIOCB *vxhs_aio_rw(BlockDriverState *bs, int64_t sector_num,
 +                               QEMUIOVector *qiov, int nb_sectors,
 +                               BlockCompletionFunc *cb, void *opaque,
 +                               VDISKAIOCmd iodir)
 +{
 +    VXHSAIOCB *acb = NULL;
 +    BDRVVXHSState *s = bs->opaque;
 +    size_t size;
 +    uint64_t offset;
 +    int iio_flags = 0;
 +    int ret = 0;
 +    void *dev_handle = s->vdisk_hostinfo.dev_handle;
 +
 +    offset = sector_num * BDRV_SECTOR_SIZE;
 +    size = nb_sectors * BDRV_SECTOR_SIZE;
 +    acb = qemu_aio_get(&vxhs_aiocb_info, bs, cb, opaque);
 +
 +    /*
 +     * Initialize VXHSAIOCB.
 +     */
 +    acb->err = 0;
 +
 +    iio_flags = IIO_FLAG_ASYNC;
 +
 +    switch (iodir) {
 +    case VDISK_AIO_WRITE:
 +            ret = iio_writev(dev_handle, acb, qiov->iov, qiov->niov,
 +                             offset, (uint64_t)size, iio_flags);
 +            break;
 +    case VDISK_AIO_READ:
 +            ret = iio_readv(dev_handle, acb, qiov->iov, qiov->niov,
 +                            offset, (uint64_t)size, iio_flags);
 +            break;
 +    default:
 +            trace_vxhs_aio_rw_invalid(iodir);
 +            goto errout;
 +    }
 +
 +    if (ret != 0) {
 +        trace_vxhs_aio_rw_ioerr(s->vdisk_guid, iodir, size, offset,
 +                                acb, ret, errno);
 +        goto errout;
 +    }
 +    return &acb->common;
 +
 +errout:
 +    qemu_aio_unref(acb);
 +    return NULL;
 +}
 +
 +static BlockAIOCB *vxhs_aio_readv(BlockDriverState *bs,
 +                                   int64_t sector_num, QEMUIOVector *qiov,
 +                                   int nb_sectors,
 +                                   BlockCompletionFunc *cb, void *opaque)
 +{
 +    return vxhs_aio_rw(bs, sector_num, qiov, nb_sectors, cb,
 +                       opaque, VDISK_AIO_READ);
 +}
 +
 +static BlockAIOCB *vxhs_aio_writev(BlockDriverState *bs,
 +                                   int64_t sector_num, QEMUIOVector *qiov,
 +                                   int nb_sectors,
 +                                   BlockCompletionFunc *cb, void *opaque)
 +{
 +    return vxhs_aio_rw(bs, sector_num, qiov, nb_sectors,
 +                       cb, opaque, VDISK_AIO_WRITE);
 +}
 +
 +static void vxhs_close(BlockDriverState *bs)
 +{
 +    BDRVVXHSState *s = bs->opaque;
 +
 +    trace_vxhs_close(s->vdisk_guid);
 +
 +    g_free(s->vdisk_guid);
 +    s->vdisk_guid = NULL;
 +
 +    /*
 +     * Close vDisk device
 +     */
 +    if (s->vdisk_hostinfo.dev_handle) {
 +        iio_close(s->vdisk_hostinfo.dev_handle);
 +        s->vdisk_hostinfo.dev_handle = NULL;
 +    }
 +
 +    vxhs_unref();
 +
 +    /*
 +     * Free the dynamically allocated host string etc
 +     */
 +    g_free(s->vdisk_hostinfo.host);
 +    g_free(s->tlscredsid);
 +    s->tlscredsid = NULL;
 +    s->vdisk_hostinfo.host = NULL;
 +    s->vdisk_hostinfo.port = 0;
 +}
 +
 +static int64_t vxhs_get_vdisk_stat(BDRVVXHSState *s)
 +{
 +    int64_t vdisk_size = -1;
 +    int ret = 0;
 +    void *dev_handle = s->vdisk_hostinfo.dev_handle;
 +
 +    ret = iio_ioctl(dev_handle, IOR_VDISK_STAT, &vdisk_size, 0);
 +    if (ret < 0) {
 +        trace_vxhs_get_vdisk_stat_err(s->vdisk_guid, ret, errno);
 +        return -EIO;
 +    }
 +
 +    trace_vxhs_get_vdisk_stat(s->vdisk_guid, vdisk_size);
 +    return vdisk_size;
 +}
 +
 +/*
 + * Returns the size of vDisk in bytes. This is required
 + * by QEMU block upper block layer so that it is visible
 + * to guest.
 + */
 +static int64_t vxhs_getlength(BlockDriverState *bs)
 +{
 +    BDRVVXHSState *s = bs->opaque;
 +    int64_t vdisk_size;
 +
 +    vdisk_size = vxhs_get_vdisk_stat(s);
 +    if (vdisk_size < 0) {
 +        return -EIO;
 +    }
 +
 +    return vdisk_size;
 +}
 +
 +static BlockDriver bdrv_vxhs = {
 +    .format_name                  = "vxhs",
 +    .protocol_name                = "vxhs",
 +    .instance_size                = sizeof(BDRVVXHSState),
 +    .bdrv_file_open               = vxhs_open,
 +    .bdrv_parse_filename          = vxhs_parse_filename,
 +    .bdrv_close                   = vxhs_close,
 +    .bdrv_getlength               = vxhs_getlength,
 +    .bdrv_aio_readv               = vxhs_aio_readv,
 +    .bdrv_aio_writev              = vxhs_aio_writev,
 +};
 +
 +static void bdrv_vxhs_init(void)
 +{
 +    bdrv_register(&bdrv_vxhs);
 +}
 +
 +block_init(bdrv_vxhs_init);
 diff --git a/configure b/configure
 index XXXXXXX..XXXXXXX 100755
 --- a/configure
 +++ b/configure
@@ -XXX,XX +XXX,XX @@ numa=""
  tcmalloc="no"
  jemalloc="no"
  replication="yes"
 +vxhs=""
  supported_cpu="no"
  supported_os="no"
@@ -XXX,XX +XXX,XX @@ for opt do
    ;;
    --enable-replication) replication="yes"
    ;;
 +  --disable-vxhs) vxhs="no"
 +  ;;
 +  --enable-vxhs) vxhs="yes"
 +  ;;
    *)
        echo "ERROR: unknown option $opt"
        echo "Try '$0 --help' for more information"
@@ -XXX,XX +XXX,XX @@ disabled with --disable-FEATURE, default is enabled if available:
    xfsctl          xfsctl support
    qom-cast-debug  cast debugging support
    tools           build qemu-io, qemu-nbd and qemu-image tools
 +  vxhs            Veritas HyperScale vDisk backend support
  NOTE: The object files are built at the place where configure is launched
  EOF
@@ -XXX,XX +XXX,XX @@ if compile_prog "" "" ; then
  fi
  ##########################################
 +# Veritas HyperScale block driver VxHS
 +# Check if libvxhs is installed
 +
 +if test "$vxhs" != "no" ; then
 +  cat > $TMPC <<EOF
 +#include <stdint.h>
 +#include <qnio/qnio_api.h>
 +
 +void *vxhs_callback;
 +
 +int main(void) {
 +    iio_init(QNIO_VERSION, vxhs_callback);
 +    return 0;
 +}
 +EOF
 +  vxhs_libs="-lvxhs -lssl"
 +  if compile_prog "" "$vxhs_libs" ; then
 +    vxhs=yes
 +  else
 +    if test "$vxhs" = "yes" ; then
 +      feature_not_found "vxhs block device" "Install libvxhs See github"
 +    fi
 +    vxhs=no
 +  fi
 +fi
 +
 +##########################################
  # End of CC checks
  # After here, no more $cc or $ld runs
@@ -XXX,XX +XXX,XX @@ echo "tcmalloc support  $tcmalloc"
  echo "jemalloc support  $jemalloc"
  echo "avx2 optimization $avx2_opt"
  echo "replication support $replication"
 +echo "VxHS block device $vxhs"
  if test "$sdl_too_old" = "yes"; then
  echo "-> Your SDL version is too old - please upgrade to have SDL support"
@@ -XXX,XX +XXX,XX @@ if test "$pthread_setname_np" = "yes" ; then
    echo "CONFIG_PTHREAD_SETNAME_NP=y" >> $config_host_mak
  fi
 +if test "$vxhs" = "yes" ; then
 +  echo "CONFIG_VXHS=y" >> $config_host_mak
 +  echo "VXHS_LIBS=$vxhs_libs" >> $config_host_mak
 +fi
 +
  if test "$tcg_interpreter" = "yes"; then
    QEMU_INCLUDES="-I\$(SRC_PATH)/tcg/tci $QEMU_INCLUDES"
  elif test "$ARCH" = "sparc64" ; then
 diff --git a/qapi/block-core.json b/qapi/block-core.json
 index XXXXXXX..XXXXXXX 100644
 --- a/qapi/block-core.json
 +++ b/qapi/block-core.json
@@ -XXX,XX +XXX,XX @@
  #
  # Drivers that are supported in block device operations.
  #
 +# @vxhs: Since 2.10
 +#
  # Since: 2.9
  ##
  { 'enum': 'BlockdevDriver',
@@ -XXX,XX +XXX,XX @@
              'host_device', 'http', 'https', 'iscsi', 'luks', 'nbd', 'nfs',
              'null-aio', 'null-co', 'parallels', 'qcow', 'qcow2', 'qed',
              'quorum', 'raw', 'rbd', 'replication', 'sheepdog', 'ssh',
 -            'vdi', 'vhdx', 'vmdk', 'vpc', 'vvfat' ] }
 +            'vdi', 'vhdx', 'vmdk', 'vpc', 'vvfat', 'vxhs' ] }
  ##
  # @BlockdevOptionsFile:
@@ -XXX,XX +XXX,XX @@
    'data': { '*offset': 'int', '*size': 'int' } }
  ##
 +# @BlockdevOptionsVxHS:
 +#
 +# Driver specific block device options for VxHS
 +#
 +# @vdisk-id:    UUID of VxHS volume
 +# @server:      vxhs server IP, port
 +# @tls-creds:   TLS credentials ID
 +#
 +# Since: 2.10
 +##
 +{ 'struct': 'BlockdevOptionsVxHS',
 +  'data': { 'vdisk-id': 'str',
 +            'server': 'InetSocketAddressBase',
 +            '*tls-creds': 'str' } }
 +
 +##
  # @BlockdevOptions:
  #
  # Options for creating a block device.  Many options are available for all
@@ -XXX,XX +XXX,XX @@
        'vhdx':       'BlockdevOptionsGenericFormat',
        'vmdk':       'BlockdevOptionsGenericCOWFormat',
        'vpc':        'BlockdevOptionsGenericFormat',
 -      'vvfat':      'BlockdevOptionsVVFAT'
 +      'vvfat':      'BlockdevOptionsVVFAT',
 +      'vxhs':       'BlockdevOptionsVxHS'
    } }
  ##
 --
-.9.3
+.29.2

-[Qemu-devel] [PULL 02/12] block/vxhs.c: Add qemu-iotests for new block device type "vxhs"
+[PULL 24/27] multi-process: create IOHUB object to handle irq
-From: Ashish Mittal <ashmit602@gmail.com>
+From: Jagannathan Raman <jag.raman@oracle.com>
-These changes use a vxhs test server that is a part of the following
+IOHUB object is added to manage PCI IRQs. It uses KVM_IRQFD
-repository:
+ioctl to create irqfd to injecting PCI interrupts to the guest.
-https://github.com/VeritasHyperScale/libqnio.git
+IOHUB object forwards the irqfd to the remote process. Remote process
 uses this fd to directly send interrupts to the guest, bypassing QEMU.
-Signed-off-by: Ashish Mittal <Ashish.Mittal@veritas.com>
+Signed-off-by: John G Johnson <john.g.johnson@oracle.com>
 Signed-off-by: Jagannathan Raman <jag.raman@oracle.com>
 Signed-off-by: Elena Ufimtseva <elena.ufimtseva@oracle.com>
 Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
-Reviewed-by: Jeff Cody <jcody@redhat.com>
+Message-id: 51d5c3d54e28a68b002e3875c59599c9f5a424a1.1611938319.git.jag.raman@oracle.com
-Signed-off-by: Jeff Cody <jcody@redhat.com>
+Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 Message-id: 1491277689-24949-3-git-send-email-Ashish.Mittal@veritas.com
 ---
- tests/qemu-iotests/common        |  6 ++++++
+ MAINTAINERS                     |   2 +
- tests/qemu-iotests/common.config | 13 +++++++++++++
+ include/hw/pci/pci_ids.h        |   3 +
- tests/qemu-iotests/common.filter |  1 +
+ include/hw/remote/iohub.h       |  42 +++++++++++
- tests/qemu-iotests/common.rc     | 19 +++++++++++++++++++
+ include/hw/remote/machine.h     |   2 +
-files changed, 39 insertions(+)
+ include/hw/remote/mpqemu-link.h |   1 +
  include/hw/remote/proxy.h       |   4 ++
  hw/remote/iohub.c               | 119 ++++++++++++++++++++++++++++++++
  hw/remote/machine.c             |  10 +++
  hw/remote/message.c             |   4 ++
  hw/remote/mpqemu-link.c         |   5 ++
  hw/remote/proxy.c               |  56 +++++++++++++++
  hw/remote/meson.build           |   1 +
 files changed, 249 insertions(+)
  create mode 100644 include/hw/remote/iohub.h
  create mode 100644 hw/remote/iohub.c
-diff --git a/tests/qemu-iotests/common b/tests/qemu-iotests/common
+diff --git a/MAINTAINERS b/MAINTAINERS
 index XXXXXXX..XXXXXXX 100644
---- a/tests/qemu-iotests/common
+--- a/MAINTAINERS
-+++ b/tests/qemu-iotests/common
++++ b/MAINTAINERS
-@@ -XXX,XX +XXX,XX @@ check options
+@@ -XXX,XX +XXX,XX @@ F: hw/remote/proxy.c
-     -ssh                test ssh
+ F: include/hw/remote/proxy.h
-     -nfs                test nfs
+ F: hw/remote/proxy-memory-listener.c
-     -luks               test luks
+ F: include/hw/remote/proxy-memory-listener.h
-+    -vxhs               test vxhs
++F: hw/remote/iohub.c
-     -xdiff              graphical mode diff
++F: include/hw/remote/iohub.h
-     -nocache            use O_DIRECT on backing file
-     -misalign           misalign memory allocations
+ Build and test automation
-@@ -XXX,XX +XXX,XX @@ testlist options
+ -------------------------
-             xpand=false
+diff --git a/include/hw/pci/pci_ids.h b/include/hw/pci/pci_ids.h
-             ;;
+index XXXXXXX..XXXXXXX 100644
+--- a/include/hw/pci/pci_ids.h
-+        -vxhs)
++++ b/include/hw/pci/pci_ids.h
-+            IMGPROTO=vxhs
+@@ -XXX,XX +XXX,XX @@
-+            xpand=false
+ #define PCI_DEVICE_ID_SUN_SIMBA          0x5000
-+            ;;
+ #define PCI_DEVICE_ID_SUN_SABRE          0xa000
-+
-         -ssh)
++#define PCI_VENDOR_ID_ORACLE             0x108e
-             IMGPROTO=ssh
++#define PCI_DEVICE_ID_REMOTE_IOHUB       0xb000
-             xpand=false
++
-diff --git a/tests/qemu-iotests/common.config b/tests/qemu-iotests/common.config
+ #define PCI_VENDOR_ID_CMD                0x1095
-index XXXXXXX..XXXXXXX 100644
+ #define PCI_DEVICE_ID_CMD_646            0x0646
---- a/tests/qemu-iotests/common.config
-+++ b/tests/qemu-iotests/common.config
+diff --git a/include/hw/remote/iohub.h b/include/hw/remote/iohub.h
-@@ -XXX,XX +XXX,XX @@ if [ -z "$QEMU_NBD_PROG" ]; then
+new file mode 100644
-     export QEMU_NBD_PROG="`set_prog_path qemu-nbd`"
+index XXXXXXX..XXXXXXX
- fi
+--- /dev/null
++++ b/include/hw/remote/iohub.h
-+if [ -z "$QEMU_VXHS_PROG" ]; then
+@@ -XXX,XX +XXX,XX @@
-+    export QEMU_VXHS_PROG="`set_prog_path qnio_server`"
++/*
-+fi
++ * IO Hub for remote device
-+
++ *
- _qemu_wrapper()
++ * Copyright © 2018, 2021 Oracle and/or its affiliates.
 + *
 + * This work is licensed under the terms of the GNU GPL, version 2 or later.
 + * See the COPYING file in the top-level directory.
 + *
 + */
 +
 +#ifndef REMOTE_IOHUB_H
 +#define REMOTE_IOHUB_H
 +
 +#include "hw/pci/pci.h"
 +#include "qemu/event_notifier.h"
 +#include "qemu/thread-posix.h"
 +#include "hw/remote/mpqemu-link.h"
 +
 +#define REMOTE_IOHUB_NB_PIRQS    PCI_DEVFN_MAX
 +
 +typedef struct ResampleToken {
 +    void *iohub;
 +    int pirq;
 +} ResampleToken;
 +
 +typedef struct RemoteIOHubState {
 +    PCIDevice d;
 +    EventNotifier irqfds[REMOTE_IOHUB_NB_PIRQS];
 +    EventNotifier resamplefds[REMOTE_IOHUB_NB_PIRQS];
 +    unsigned int irq_level[REMOTE_IOHUB_NB_PIRQS];
 +    ResampleToken token[REMOTE_IOHUB_NB_PIRQS];
 +    QemuMutex irq_level_lock[REMOTE_IOHUB_NB_PIRQS];
 +} RemoteIOHubState;
 +
 +int remote_iohub_map_irq(PCIDevice *pci_dev, int intx);
 +void remote_iohub_set_irq(void *opaque, int pirq, int level);
 +void process_set_irqfd_msg(PCIDevice *pci_dev, MPQemuMsg *msg);
 +
 +void remote_iohub_init(RemoteIOHubState *iohub);
 +void remote_iohub_finalize(RemoteIOHubState *iohub);
 +
 +#endif
 diff --git a/include/hw/remote/machine.h b/include/hw/remote/machine.h
 index XXXXXXX..XXXXXXX 100644
 --- a/include/hw/remote/machine.h
 +++ b/include/hw/remote/machine.h
@@ -XXX,XX +XXX,XX @@
  #include "hw/boards.h"
  #include "hw/pci-host/remote.h"
  #include "io/channel.h"
 +#include "hw/remote/iohub.h"
  struct RemoteMachineState {
      MachineState parent_obj;
      RemotePCIHost *host;
 +    RemoteIOHubState iohub;
  };
  /* Used to pass to co-routine device and ioc. */
 diff --git a/include/hw/remote/mpqemu-link.h b/include/hw/remote/mpqemu-link.h
 index XXXXXXX..XXXXXXX 100644
 --- a/include/hw/remote/mpqemu-link.h
 +++ b/include/hw/remote/mpqemu-link.h
@@ -XXX,XX +XXX,XX @@ typedef enum {
      MPQEMU_CMD_PCI_CFGREAD,
      MPQEMU_CMD_BAR_WRITE,
      MPQEMU_CMD_BAR_READ,
 +    MPQEMU_CMD_SET_IRQFD,
      MPQEMU_CMD_MAX,
  } MPQemuCmd;
 diff --git a/include/hw/remote/proxy.h b/include/hw/remote/proxy.h
 index XXXXXXX..XXXXXXX 100644
 --- a/include/hw/remote/proxy.h
 +++ b/include/hw/remote/proxy.h
@@ -XXX,XX +XXX,XX @@
  #include "hw/pci/pci.h"
  #include "io/channel.h"
  #include "hw/remote/proxy-memory-listener.h"
 +#include "qemu/event_notifier.h"
  #define TYPE_PCI_PROXY_DEV "x-pci-proxy-dev"
  OBJECT_DECLARE_SIMPLE_TYPE(PCIProxyDev, PCI_PROXY_DEV)
@@ -XXX,XX +XXX,XX @@ struct PCIProxyDev {
      QIOChannel *ioc;
      Error *migration_blocker;
      ProxyMemoryListener proxy_listener;
 +    int virq;
 +    EventNotifier intr;
 +    EventNotifier resample;
      ProxyMemoryRegion region[PCI_NUM_REGIONS];
  };
 diff --git a/hw/remote/iohub.c b/hw/remote/iohub.c
 new file mode 100644
 index XXXXXXX..XXXXXXX
 --- /dev/null
 +++ b/hw/remote/iohub.c
@@ -XXX,XX +XXX,XX @@
 +/*
 + * Remote IO Hub
 + *
 + * Copyright © 2018, 2021 Oracle and/or its affiliates.
 + *
 + * This work is licensed under the terms of the GNU GPL, version 2 or later.
 + * See the COPYING file in the top-level directory.
 + *
 + */
 +
 +#include "qemu/osdep.h"
 +#include "qemu-common.h"
 +
 +#include "hw/pci/pci.h"
 +#include "hw/pci/pci_ids.h"
 +#include "hw/pci/pci_bus.h"
 +#include "qemu/thread.h"
 +#include "hw/boards.h"
 +#include "hw/remote/machine.h"
 +#include "hw/remote/iohub.h"
 +#include "qemu/main-loop.h"
 +
 +void remote_iohub_init(RemoteIOHubState *iohub)
 +{
 +    int pirq;
 +
 +    memset(&iohub->irqfds, 0, sizeof(iohub->irqfds));
 +    memset(&iohub->resamplefds, 0, sizeof(iohub->resamplefds));
 +
 +    for (pirq = 0; pirq < REMOTE_IOHUB_NB_PIRQS; pirq++) {
 +        qemu_mutex_init(&iohub->irq_level_lock[pirq]);
 +        iohub->irq_level[pirq] = 0;
 +        event_notifier_init_fd(&iohub->irqfds[pirq], -1);
 +        event_notifier_init_fd(&iohub->resamplefds[pirq], -1);
 +    }
 +}
 +
 +void remote_iohub_finalize(RemoteIOHubState *iohub)
 +{
 +    int pirq;
 +
 +    for (pirq = 0; pirq < REMOTE_IOHUB_NB_PIRQS; pirq++) {
 +        qemu_set_fd_handler(event_notifier_get_fd(&iohub->resamplefds[pirq]),
 +                            NULL, NULL, NULL);
 +        event_notifier_cleanup(&iohub->irqfds[pirq]);
 +        event_notifier_cleanup(&iohub->resamplefds[pirq]);
 +        qemu_mutex_destroy(&iohub->irq_level_lock[pirq]);
 +    }
 +}
 +
 +int remote_iohub_map_irq(PCIDevice *pci_dev, int intx)
 +{
 +    return pci_dev->devfn;
 +}
 +
 +void remote_iohub_set_irq(void *opaque, int pirq, int level)
 +{
 +    RemoteIOHubState *iohub = opaque;
 +
 +    assert(pirq >= 0);
 +    assert(pirq < PCI_DEVFN_MAX);
 +
 +    QEMU_LOCK_GUARD(&iohub->irq_level_lock[pirq]);
 +
 +    if (level) {
 +        if (++iohub->irq_level[pirq] == 1) {
 +            event_notifier_set(&iohub->irqfds[pirq]);
 +        }
 +    } else if (iohub->irq_level[pirq] > 0) {
 +        iohub->irq_level[pirq]--;
 +    }
 +}
 +
 +static void intr_resample_handler(void *opaque)
 +{
 +    ResampleToken *token = opaque;
 +    RemoteIOHubState *iohub = token->iohub;
 +    int pirq, s;
 +
 +    pirq = token->pirq;
 +
 +    s = event_notifier_test_and_clear(&iohub->resamplefds[pirq]);
 +
 +    assert(s >= 0);
 +
 +    QEMU_LOCK_GUARD(&iohub->irq_level_lock[pirq]);
 +
 +    if (iohub->irq_level[pirq]) {
 +        event_notifier_set(&iohub->irqfds[pirq]);
 +    }
 +}
 +
 +void process_set_irqfd_msg(PCIDevice *pci_dev, MPQemuMsg *msg)
 +{
 +    RemoteMachineState *machine = REMOTE_MACHINE(current_machine);
 +    RemoteIOHubState *iohub = &machine->iohub;
 +    int pirq, intx;
 +
 +    intx = pci_get_byte(pci_dev->config + PCI_INTERRUPT_PIN) - 1;
 +
 +    pirq = remote_iohub_map_irq(pci_dev, intx);
 +
 +    if (event_notifier_get_fd(&iohub->irqfds[pirq]) != -1) {
 +        qemu_set_fd_handler(event_notifier_get_fd(&iohub->resamplefds[pirq]),
 +                            NULL, NULL, NULL);
 +        event_notifier_cleanup(&iohub->irqfds[pirq]);
 +        event_notifier_cleanup(&iohub->resamplefds[pirq]);
 +        memset(&iohub->token[pirq], 0, sizeof(ResampleToken));
 +    }
 +
 +    event_notifier_init_fd(&iohub->irqfds[pirq], msg->fds[0]);
 +    event_notifier_init_fd(&iohub->resamplefds[pirq], msg->fds[1]);
 +
 +    iohub->token[pirq].iohub = iohub;
 +    iohub->token[pirq].pirq = pirq;
 +
 +    qemu_set_fd_handler(msg->fds[1], intr_resample_handler, NULL,
 +                        &iohub->token[pirq]);
 +}
 diff --git a/hw/remote/machine.c b/hw/remote/machine.c
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/remote/machine.c
 +++ b/hw/remote/machine.c
@@ -XXX,XX +XXX,XX @@
  #include "exec/address-spaces.h"
  #include "exec/memory.h"
  #include "qapi/error.h"
 +#include "hw/pci/pci_host.h"
 +#include "hw/remote/iohub.h"
  static void remote_machine_init(MachineState *machine)
  {
-     (
+     MemoryRegion *system_memory, *system_io, *pci_memory;
-@@ -XXX,XX +XXX,XX @@ _qemu_nbd_wrapper()
+     RemoteMachineState *s = REMOTE_MACHINE(machine);
-     )
+     RemotePCIHost *rem_host;
 +    PCIHostState *pci_host;
      system_memory = get_system_memory();
      system_io = get_system_io();
@@ -XXX,XX +XXX,XX @@ static void remote_machine_init(MachineState *machine)
      memory_region_add_subregion_overlap(system_memory, 0x0, pci_memory, -1);
      qdev_realize(DEVICE(rem_host), sysbus_get_default(), &error_fatal);
 +
 +    pci_host = PCI_HOST_BRIDGE(rem_host);
 +
 +    remote_iohub_init(&s->iohub);
 +
 +    pci_bus_irqs(pci_host->bus, remote_iohub_set_irq, remote_iohub_map_irq,
 +                 &s->iohub, REMOTE_IOHUB_NB_PIRQS);
  }
-+_qemu_vxhs_wrapper()
+ static void remote_machine_class_init(ObjectClass *oc, void *data)
-+{
+diff --git a/hw/remote/message.c b/hw/remote/message.c
-+    (
+index XXXXXXX..XXXXXXX 100644
-+        echo $BASHPID > "${TEST_DIR}/qemu-vxhs.pid"
+--- a/hw/remote/message.c
-+        exec "$QEMU_VXHS_PROG" $QEMU_VXHS_OPTIONS "$@"
++++ b/hw/remote/message.c
-+    )
+@@ -XXX,XX +XXX,XX @@
-+}
+ #include "hw/pci/pci.h"
-+
+ #include "exec/memattrs.h"
- export QEMU=_qemu_wrapper
+ #include "hw/remote/memory.h"
- export QEMU_IMG=_qemu_img_wrapper
++#include "hw/remote/iohub.h"
- export QEMU_IO=_qemu_io_wrapper
- export QEMU_NBD=_qemu_nbd_wrapper
+ static void process_config_write(QIOChannel *ioc, PCIDevice *dev,
-+export QEMU_VXHS=_qemu_vxhs_wrapper
+                                  MPQemuMsg *msg, Error **errp);
+@@ -XXX,XX +XXX,XX @@ void coroutine_fn mpqemu_remote_msg_loop_co(void *data)
- QEMU_IMG_EXTRA_ARGS=
+         case MPQEMU_CMD_SYNC_SYSMEM:
- if [ "$IMGOPTSSYNTAX" = "true" ]; then
+             remote_sysmem_reconfig(&msg, &local_err);
-diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter
+             break;
-index XXXXXXX..XXXXXXX 100644
++        case MPQEMU_CMD_SET_IRQFD:
---- a/tests/qemu-iotests/common.filter
++            process_set_irqfd_msg(pci_dev, &msg);
-+++ b/tests/qemu-iotests/common.filter
++            break;
-@@ -XXX,XX +XXX,XX @@ _filter_img_info()
+         default:
-         -e "s#$TEST_DIR#TEST_DIR#g" \
+             error_setg(&local_err,
-         -e "s#$IMGFMT#IMGFMT#g" \
+                        "Unknown command (%d) received for device %s"
-         -e 's#nbd://127.0.0.1:10810$#TEST_DIR/t.IMGFMT#g' \
+diff --git a/hw/remote/mpqemu-link.c b/hw/remote/mpqemu-link.c
-+        -e 's#json.*vdisk-id.*vxhs"}}#TEST_DIR/t.IMGFMT#' \
+index XXXXXXX..XXXXXXX 100644
-         -e "/encrypted: yes/d" \
+--- a/hw/remote/mpqemu-link.c
-         -e "/cluster_size: [0-9]\\+/d" \
++++ b/hw/remote/mpqemu-link.c
-         -e "/table_size: [0-9]\\+/d" \
+@@ -XXX,XX +XXX,XX @@ bool mpqemu_msg_valid(MPQemuMsg *msg)
-diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
+             return false;
-index XXXXXXX..XXXXXXX 100644
+         }
---- a/tests/qemu-iotests/common.rc
+         break;
-+++ b/tests/qemu-iotests/common.rc
++    case MPQEMU_CMD_SET_IRQFD:
-@@ -XXX,XX +XXX,XX @@ else
++        if (msg->size || (msg->num_fds != 2)) {
-     elif [ "$IMGPROTO" = "nfs" ]; then
++            return false;
-         TEST_DIR="nfs://127.0.0.1/$TEST_DIR"
++        }
-         TEST_IMG=$TEST_DIR/t.$IMGFMT
++        break;
-+    elif [ "$IMGPROTO" = "vxhs" ]; then
+     default:
-+        TEST_IMG_FILE=$TEST_DIR/t.$IMGFMT
+         break;
-+        TEST_IMG="vxhs://127.0.0.1:9999/t.$IMGFMT"
+     }
-     else
+diff --git a/hw/remote/proxy.c b/hw/remote/proxy.c
-         TEST_IMG=$IMGPROTO:$TEST_DIR/t.$IMGFMT
+index XXXXXXX..XXXXXXX 100644
-     fi
+--- a/hw/remote/proxy.c
-@@ -XXX,XX +XXX,XX @@ _make_test_img()
++++ b/hw/remote/proxy.c
-         eval "$QEMU_NBD -v -t -b 127.0.0.1 -p 10810 -f $IMGFMT  $TEST_IMG_FILE >/dev/null &"
+@@ -XXX,XX +XXX,XX @@
-         sleep 1 # FIXME: qemu-nbd needs to be listening before we continue
+ #include "qemu/error-report.h"
-     fi
+ #include "hw/remote/proxy-memory-listener.h"
-+
+ #include "qom/object.h"
-+    # Start QNIO server on image directory for vxhs protocol
++#include "qemu/event_notifier.h"
-+    if [ $IMGPROTO = "vxhs" ]; then
++#include "sysemu/kvm.h"
-+        eval "$QEMU_VXHS -d  $TEST_DIR > /dev/null &"
++#include "util/event_notifier-posix.c"
-+        sleep 1 # Wait for server to come up.
++
-+    fi
++static void proxy_intx_update(PCIDevice *pci_dev)
 +{
 +    PCIProxyDev *dev = PCI_PROXY_DEV(pci_dev);
 +    PCIINTxRoute route;
 +    int pin = pci_get_byte(pci_dev->config + PCI_INTERRUPT_PIN) - 1;
 +
 +    if (dev->virq != -1) {
 +        kvm_irqchip_remove_irqfd_notifier_gsi(kvm_state, &dev->intr, dev->virq);
 +        dev->virq = -1;
 +    }
 +
 +    route = pci_device_route_intx_to_irq(pci_dev, pin);
 +
 +    dev->virq = route.irq;
 +
 +    if (dev->virq != -1) {
 +        kvm_irqchip_add_irqfd_notifier_gsi(kvm_state, &dev->intr,
 +                                           &dev->resample, dev->virq);
 +    }
 +}
 +
 +static void setup_irqfd(PCIProxyDev *dev)
 +{
 +    PCIDevice *pci_dev = PCI_DEVICE(dev);
 +    MPQemuMsg msg;
 +    Error *local_err = NULL;
 +
 +    event_notifier_init(&dev->intr, 0);
 +    event_notifier_init(&dev->resample, 0);
 +
 +    memset(&msg, 0, sizeof(MPQemuMsg));
 +    msg.cmd = MPQEMU_CMD_SET_IRQFD;
 +    msg.num_fds = 2;
 +    msg.fds[0] = event_notifier_get_fd(&dev->intr);
 +    msg.fds[1] = event_notifier_get_fd(&dev->resample);
 +    msg.size = 0;
 +
 +    if (!mpqemu_msg_send(&msg, dev->ioc, &local_err)) {
 +        error_report_err(local_err);
 +    }
 +
 +    dev->virq = -1;
 +
 +    proxy_intx_update(pci_dev);
 +
 +    pci_device_set_intx_routing_notifier(pci_dev, proxy_intx_update);
 +}
  static void pci_proxy_dev_realize(PCIDevice *device, Error **errp)
  {
@@ -XXX,XX +XXX,XX @@ static void pci_proxy_dev_realize(PCIDevice *device, Error **errp)
      qio_channel_set_blocking(dev->ioc, true, NULL);
      proxy_memory_listener_configure(&dev->proxy_listener, dev->ioc);
 +
 +    setup_irqfd(dev);
  }
- _rm_test_img()
+ static void pci_proxy_dev_exit(PCIDevice *pdev)
-@@ -XXX,XX +XXX,XX @@ _cleanup_test_img()
+@@ -XXX,XX +XXX,XX @@ static void pci_proxy_dev_exit(PCIDevice *pdev)
-             fi
+     error_free(dev->migration_blocker);
-             rm -f "$TEST_IMG_FILE"
-             ;;
+     proxy_memory_listener_deconfigure(&dev->proxy_listener);
-+        vxhs)
++
-+            if [ -f "${TEST_DIR}/qemu-vxhs.pid" ]; then
++    event_notifier_cleanup(&dev->intr);
-+                local QEMU_VXHS_PID
++    event_notifier_cleanup(&dev->resample);
-+                read QEMU_VXHS_PID < "${TEST_DIR}/qemu-vxhs.pid"
+ }
-+                kill ${QEMU_VXHS_PID} >/dev/null 2>&1
-+                rm -f "${TEST_DIR}/qemu-vxhs.pid"
+ static void config_op_send(PCIProxyDev *pdev, uint32_t addr, uint32_t *val,
-+            fi
+diff --git a/hw/remote/meson.build b/hw/remote/meson.build
-+            rm -f "$TEST_IMG_FILE"
+index XXXXXXX..XXXXXXX 100644
-+            ;;
+--- a/hw/remote/meson.build
-+
++++ b/hw/remote/meson.build
-         file)
+@@ -XXX,XX +XXX,XX @@ remote_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('mpqemu-link.c'))
-             _rm_test_img "$TEST_DIR/t.$IMGFMT"
+ remote_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('message.c'))
-             _rm_test_img "$TEST_DIR/t.$IMGFMT.orig"
+ remote_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('remote-obj.c'))
  remote_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('proxy.c'))
 +remote_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('iohub.c'))
  specific_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('memory.c'))
  specific_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('proxy-memory-listener.c'))
 --
-.9.3
+.29.2

-[Qemu-devel] [PULL 08/12] block: introduce bdrv_can_set_read_only()
+[PULL 25/27] multi-process: Retrieve PCI info from remote process
-Introduce check function for setting read_only flags.  Will return < 0 on
+From: Jagannathan Raman <jag.raman@oracle.com>
 error, with appropriate Error value set.  Does not alter any flags.
-Signed-off-by: Jeff Cody <jcody@redhat.com>
+Retrieve PCI configuration info about the remote device and
 configure the Proxy PCI object based on the returned information
 Signed-off-by: Elena Ufimtseva <elena.ufimtseva@oracle.com>
 Signed-off-by: John G Johnson <john.g.johnson@oracle.com>
 Signed-off-by: Jagannathan Raman <jag.raman@oracle.com>
 Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
-Reviewed-by: John Snow <jsnow@redhat.com>
+Message-id: 85ee367bbb993aa23699b44cfedd83b4ea6d5221.1611938319.git.jag.raman@oracle.com
-Message-id: e2bba34ac3bc76a0c42adc390413f358ae0566e8.1491597120.git.jcody@redhat.com
+Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
- block.c               | 14 +++++++++++++-
+ hw/remote/proxy.c | 84 +++++++++++++++++++++++++++++++++++++++++++++++
- include/block/block.h |  1 +
+file changed, 84 insertions(+)
 files changed, 14 insertions(+), 1 deletion(-)
-diff --git a/block.c b/block.c
+diff --git a/hw/remote/proxy.c b/hw/remote/proxy.c
 index XXXXXXX..XXXXXXX 100644
---- a/block.c
+--- a/hw/remote/proxy.c
-+++ b/block.c
++++ b/hw/remote/proxy.c
-@@ -XXX,XX +XXX,XX @@ bool bdrv_is_read_only(BlockDriverState *bs)
+@@ -XXX,XX +XXX,XX @@
-     return bs->read_only;
+ #include "sysemu/kvm.h"
  #include "util/event_notifier-posix.c"
 +static void probe_pci_info(PCIDevice *dev, Error **errp);
 +
  static void proxy_intx_update(PCIDevice *pci_dev)
  {
      PCIProxyDev *dev = PCI_PROXY_DEV(pci_dev);
@@ -XXX,XX +XXX,XX @@ static void pci_proxy_dev_realize(PCIDevice *device, Error **errp)
  {
      ERRP_GUARD();
      PCIProxyDev *dev = PCI_PROXY_DEV(device);
 +    uint8_t *pci_conf = device->config;
      int fd;
      if (!dev->fd) {
@@ -XXX,XX +XXX,XX @@ static void pci_proxy_dev_realize(PCIDevice *device, Error **errp)
      qemu_mutex_init(&dev->io_mutex);
      qio_channel_set_blocking(dev->ioc, true, NULL);
 +    pci_conf[PCI_LATENCY_TIMER] = 0xff;
 +    pci_conf[PCI_INTERRUPT_PIN] = 0x01;
 +
      proxy_memory_listener_configure(&dev->proxy_listener, dev->ioc);
      setup_irqfd(dev);
 +
 +    probe_pci_info(PCI_DEVICE(dev), errp);
  }
--int bdrv_set_read_only(BlockDriverState *bs, bool read_only, Error **errp)
+ static void pci_proxy_dev_exit(PCIDevice *pdev)
-+int bdrv_can_set_read_only(BlockDriverState *bs, bool read_only, Error **errp)
+@@ -XXX,XX +XXX,XX @@ const MemoryRegionOps proxy_mr_ops = {
- {
+         .max_access_size = 8,
-     /* Do not set read_only if copy_on_read is enabled */
+     },
-     if (bs->copy_on_read && read_only) {
+ };
@@ -XXX,XX +XXX,XX @@ int bdrv_set_read_only(BlockDriverState *bs, bool read_only, Error **errp)
          return -EPERM;
      }
 +    return 0;
 +}
 +
-+int bdrv_set_read_only(BlockDriverState *bs, bool read_only, Error **errp)
++static void probe_pci_info(PCIDevice *dev, Error **errp)
 +{
-+    int ret = 0;
++    PCIDeviceClass *pc = PCI_DEVICE_GET_CLASS(dev);
 +    uint32_t orig_val, new_val, base_class, val;
 +    PCIProxyDev *pdev = PCI_PROXY_DEV(dev);
 +    DeviceClass *dc = DEVICE_CLASS(pc);
 +    uint8_t type;
 +    int i, size;
 +
-+    ret = bdrv_can_set_read_only(bs, read_only, errp);
++    config_op_send(pdev, PCI_VENDOR_ID, &val, 2, MPQEMU_CMD_PCI_CFGREAD);
-+    if (ret < 0) {
++    pc->vendor_id = (uint16_t)val;
-+        return ret;
++
 +    config_op_send(pdev, PCI_DEVICE_ID, &val, 2, MPQEMU_CMD_PCI_CFGREAD);
 +    pc->device_id = (uint16_t)val;
 +
 +    config_op_send(pdev, PCI_CLASS_DEVICE, &val, 2, MPQEMU_CMD_PCI_CFGREAD);
 +    pc->class_id = (uint16_t)val;
 +
 +    config_op_send(pdev, PCI_SUBSYSTEM_ID, &val, 2, MPQEMU_CMD_PCI_CFGREAD);
 +    pc->subsystem_id = (uint16_t)val;
 +
 +    base_class = pc->class_id >> 4;
 +    switch (base_class) {
 +    case PCI_BASE_CLASS_BRIDGE:
 +        set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
 +        break;
 +    case PCI_BASE_CLASS_STORAGE:
 +        set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
 +        break;
 +    case PCI_BASE_CLASS_NETWORK:
 +        set_bit(DEVICE_CATEGORY_NETWORK, dc->categories);
 +        break;
 +    case PCI_BASE_CLASS_INPUT:
 +        set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
 +        break;
 +    case PCI_BASE_CLASS_DISPLAY:
 +        set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories);
 +        break;
 +    case PCI_BASE_CLASS_PROCESSOR:
 +        set_bit(DEVICE_CATEGORY_CPU, dc->categories);
 +        break;
 +    default:
 +        set_bit(DEVICE_CATEGORY_MISC, dc->categories);
 +        break;
 +    }
 +
-     bs->read_only = read_only;
++    for (i = 0; i < PCI_NUM_REGIONS; i++) {
-     return 0;
++        config_op_send(pdev, PCI_BASE_ADDRESS_0 + (4 * i), &orig_val, 4,
- }
++                       MPQEMU_CMD_PCI_CFGREAD);
-diff --git a/include/block/block.h b/include/block/block.h
++        new_val = 0xffffffff;
-index XXXXXXX..XXXXXXX 100644
++        config_op_send(pdev, PCI_BASE_ADDRESS_0 + (4 * i), &new_val, 4,
---- a/include/block/block.h
++                       MPQEMU_CMD_PCI_CFGWRITE);
-+++ b/include/block/block.h
++        config_op_send(pdev, PCI_BASE_ADDRESS_0 + (4 * i), &new_val, 4,
-@@ -XXX,XX +XXX,XX @@ int bdrv_is_allocated_above(BlockDriverState *top, BlockDriverState *base,
++                       MPQEMU_CMD_PCI_CFGREAD);
-                             int64_t sector_num, int nb_sectors, int *pnum);
++        size = (~(new_val & 0xFFFFFFF0)) + 1;
++        config_op_send(pdev, PCI_BASE_ADDRESS_0 + (4 * i), &orig_val, 4,
- bool bdrv_is_read_only(BlockDriverState *bs);
++                       MPQEMU_CMD_PCI_CFGWRITE);
-+int bdrv_can_set_read_only(BlockDriverState *bs, bool read_only, Error **errp);
++        type = (new_val & 0x1) ?
- int bdrv_set_read_only(BlockDriverState *bs, bool read_only, Error **errp);
++                   PCI_BASE_ADDRESS_SPACE_IO : PCI_BASE_ADDRESS_SPACE_MEMORY;
- bool bdrv_is_sg(BlockDriverState *bs);
++
- bool bdrv_is_inserted(BlockDriverState *bs);
++        if (size) {
 +            g_autofree char *name;
 +            pdev->region[i].dev = pdev;
 +            pdev->region[i].present = true;
 +            if (type == PCI_BASE_ADDRESS_SPACE_MEMORY) {
 +                pdev->region[i].memory = true;
 +            }
 +            name = g_strdup_printf("bar-region-%d", i);
 +            memory_region_init_io(&pdev->region[i].mr, OBJECT(pdev),
 +                                  &proxy_mr_ops, &pdev->region[i],
 +                                  name, size);
 +            pci_register_bar(dev, i, type, &pdev->region[i].mr);
 +        }
 +    }
 +}
 --
-.9.3
+.29.2

-[Qemu-devel] [PULL 05/12] block: do not set BDS read_only if copy_on_read enabled
+[PULL 26/27] multi-process: perform device reset in the remote process
-A few block drivers will set the BDS read_only flag from their
+From: Elena Ufimtseva <elena.ufimtseva@oracle.com>
 .bdrv_open() function.  This means the bs->read_only flag could
 be set after we enable copy_on_read, as the BDRV_O_COPY_ON_READ
 flag check occurs prior to the call to bdrv->bdrv_open().
-This adds an error return to bdrv_set_read_only(), and an error will be
+Perform device reset in the remote process when QEMU performs
-return if we try to set the BDS to read_only while copy_on_read is
+device reset. This is required to reset the internal state
-enabled.
+(like registers, etc...) of emulated devices
-This patch also changes the behavior of vvfat.  Before, vvfat could
+Signed-off-by: Elena Ufimtseva <elena.ufimtseva@oracle.com>
-override the drive 'readonly' flag with its own, internal 'rw' flag.
+Signed-off-by: John G Johnson <john.g.johnson@oracle.com>
 Signed-off-by: Jagannathan Raman <jag.raman@oracle.com>
 Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
 Message-id: 7cb220a51f565dc0817bd76e2f540e89c2d2b850.1611938319.git.jag.raman@oracle.com
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
  include/hw/remote/mpqemu-link.h |  1 +
  hw/remote/message.c             | 22 ++++++++++++++++++++++
  hw/remote/proxy.c               | 19 +++++++++++++++++++
 files changed, 42 insertions(+)
-For instance, this -drive parameter would result in a writable image:
+diff --git a/include/hw/remote/mpqemu-link.h b/include/hw/remote/mpqemu-link.h
 "-drive format=vvfat,dir=/tmp/vvfat,rw,if=virtio,readonly=on"
 This is not correct.  Now, attempting to use the above -drive parameter
 will result in an error (i.e., 'rw' is incompatible with 'readonly=on').
 Signed-off-by: Jeff Cody <jcody@redhat.com>
 Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
 Reviewed-by: John Snow <jsnow@redhat.com>
 Message-id: 0c5b4c1cc2c651471b131f21376dfd5ea24d2196.1491597120.git.jcody@redhat.com
 ---
  block.c               | 10 +++++++++-
  block/bochs.c         |  5 ++++-
  block/cloop.c         |  5 ++++-
  block/dmg.c           |  6 +++++-
  block/rbd.c           | 11 ++++++++++-
  block/vvfat.c         | 19 +++++++++++++++----
  include/block/block.h |  2 +-
 files changed, 48 insertions(+), 10 deletions(-)
 diff --git a/block.c b/block.c
 index XXXXXXX..XXXXXXX 100644
---- a/block.c
+--- a/include/hw/remote/mpqemu-link.h
-+++ b/block.c
++++ b/include/hw/remote/mpqemu-link.h
-@@ -XXX,XX +XXX,XX @@ void path_combine(char *dest, int dest_size,
+@@ -XXX,XX +XXX,XX @@ typedef enum {
      MPQEMU_CMD_BAR_WRITE,
      MPQEMU_CMD_BAR_READ,
      MPQEMU_CMD_SET_IRQFD,
 +    MPQEMU_CMD_DEVICE_RESET,
      MPQEMU_CMD_MAX,
  } MPQemuCmd;
 diff --git a/hw/remote/message.c b/hw/remote/message.c
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/remote/message.c
 +++ b/hw/remote/message.c
@@ -XXX,XX +XXX,XX @@
  #include "exec/memattrs.h"
  #include "hw/remote/memory.h"
  #include "hw/remote/iohub.h"
 +#include "sysemu/reset.h"
  static void process_config_write(QIOChannel *ioc, PCIDevice *dev,
                                   MPQemuMsg *msg, Error **errp);
@@ -XXX,XX +XXX,XX @@ static void process_config_read(QIOChannel *ioc, PCIDevice *dev,
                                  MPQemuMsg *msg, Error **errp);
  static void process_bar_write(QIOChannel *ioc, MPQemuMsg *msg, Error **errp);
  static void process_bar_read(QIOChannel *ioc, MPQemuMsg *msg, Error **errp);
 +static void process_device_reset_msg(QIOChannel *ioc, PCIDevice *dev,
 +                                     Error **errp);
  void coroutine_fn mpqemu_remote_msg_loop_co(void *data)
  {
@@ -XXX,XX +XXX,XX @@ void coroutine_fn mpqemu_remote_msg_loop_co(void *data)
          case MPQEMU_CMD_SET_IRQFD:
              process_set_irqfd_msg(pci_dev, &msg);
              break;
 +        case MPQEMU_CMD_DEVICE_RESET:
 +            process_device_reset_msg(com->ioc, pci_dev, &local_err);
 +            break;
          default:
              error_setg(&local_err,
                         "Unknown command (%d) received for device %s"
@@ -XXX,XX +XXX,XX @@ fail:
                        getpid());
      }
  }
++
--void bdrv_set_read_only(BlockDriverState *bs, bool read_only)
++static void process_device_reset_msg(QIOChannel *ioc, PCIDevice *dev,
-+int bdrv_set_read_only(BlockDriverState *bs, bool read_only, Error **errp)
++                                     Error **errp)
- {
++{
-+    /* Do not set read_only if copy_on_read is enabled */
++    DeviceClass *dc = DEVICE_GET_CLASS(dev);
-+    if (bs->copy_on_read && read_only) {
++    DeviceState *s = DEVICE(dev);
-+        error_setg(errp, "Can't set node '%s' to r/o with copy-on-read enabled",
++    MPQemuMsg ret = { 0 };
-+                   bdrv_get_device_or_node_name(bs));
++
-+        return -EINVAL;
++    if (dc->reset) {
 +        dc->reset(s);
 +    }
 +
-     bs->read_only = read_only;
++    ret.cmd = MPQEMU_CMD_RET;
-+    return 0;
++
 +    mpqemu_msg_send(&ret, ioc, errp);
 +}
 diff --git a/hw/remote/proxy.c b/hw/remote/proxy.c
 index XXXXXXX..XXXXXXX 100644
 --- a/hw/remote/proxy.c
 +++ b/hw/remote/proxy.c
@@ -XXX,XX +XXX,XX @@
  #include "util/event_notifier-posix.c"
  static void probe_pci_info(PCIDevice *dev, Error **errp);
 +static void proxy_device_reset(DeviceState *dev);
  static void proxy_intx_update(PCIDevice *pci_dev)
  {
@@ -XXX,XX +XXX,XX @@ static void pci_proxy_dev_class_init(ObjectClass *klass, void *data)
      k->config_read = pci_proxy_read_config;
      k->config_write = pci_proxy_write_config;
 +    dc->reset = proxy_device_reset;
 +
      device_class_set_props(dc, proxy_properties);
  }
- void bdrv_get_full_backing_filename_from_filename(const char *backed,
+@@ -XXX,XX +XXX,XX @@ static void probe_pci_info(PCIDevice *dev, Error **errp)
-diff --git a/block/bochs.c b/block/bochs.c
+         }
 index XXXXXXX..XXXXXXX 100644
 --- a/block/bochs.c
 +++ b/block/bochs.c
@@ -XXX,XX +XXX,XX @@ static int bochs_open(BlockDriverState *bs, QDict *options, int flags,
          return -EINVAL;
      }
+ }
--    bdrv_set_read_only(bs, true); /* no write support yet */
++
-+    ret = bdrv_set_read_only(bs, true, errp); /* no write support yet */
++static void proxy_device_reset(DeviceState *dev)
-+    if (ret < 0) {
++{
-+        return ret;
++    PCIProxyDev *pdev = PCI_PROXY_DEV(dev);
-+    }
++    MPQemuMsg msg = { 0 };
++    Error *local_err = NULL;
-     ret = bdrv_pread(bs->file, 0, &bochs, sizeof(bochs));
++
-     if (ret < 0) {
++    msg.cmd = MPQEMU_CMD_DEVICE_RESET;
-diff --git a/block/cloop.c b/block/cloop.c
++    msg.size = 0;
-index XXXXXXX..XXXXXXX 100644
++
---- a/block/cloop.c
++    mpqemu_msg_send_and_await_reply(&msg, pdev, &local_err);
-+++ b/block/cloop.c
++    if (local_err) {
-@@ -XXX,XX +XXX,XX @@ static int cloop_open(BlockDriverState *bs, QDict *options, int flags,
++        error_report_err(local_err);
          return -EINVAL;
      }
 -    bdrv_set_read_only(bs, true);
 +    ret = bdrv_set_read_only(bs, true, errp);
 +    if (ret < 0) {
 +        return ret;
 +    }
      /* read header */
      ret = bdrv_pread(bs->file, 128, &s->block_size, 4);
 diff --git a/block/dmg.c b/block/dmg.c
 index XXXXXXX..XXXXXXX 100644
 --- a/block/dmg.c
 +++ b/block/dmg.c
@@ -XXX,XX +XXX,XX @@ static int dmg_open(BlockDriverState *bs, QDict *options, int flags,
          return -EINVAL;
      }
 +    ret = bdrv_set_read_only(bs, true, errp);
 +    if (ret < 0) {
 +        return ret;
 +    }
 +
-     block_module_load_one("dmg-bz2");
++}
 -    bdrv_set_read_only(bs, true);
      s->n_chunks = 0;
      s->offsets = s->lengths = s->sectors = s->sectorcounts = NULL;
 diff --git a/block/rbd.c b/block/rbd.c
 index XXXXXXX..XXXXXXX 100644
 --- a/block/rbd.c
 +++ b/block/rbd.c
@@ -XXX,XX +XXX,XX @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags,
          goto failed_shutdown;
      }
 +    /* rbd_open is always r/w */
      r = rbd_open(s->io_ctx, s->name, &s->image, s->snap);
      if (r < 0) {
          error_setg_errno(errp, -r, "error reading header from %s", s->name);
          goto failed_open;
      }
 -    bdrv_set_read_only(bs, (s->snap != NULL));
 +    /* If we are using an rbd snapshot, we must be r/o, otherwise
 +     * leave as-is */
 +    if (s->snap != NULL) {
 +        r = bdrv_set_read_only(bs, true, &local_err);
 +        if (r < 0) {
 +            error_propagate(errp, local_err);
 +            goto failed_open;
 +        }
 +    }
      qemu_opts_del(opts);
      return 0;
 diff --git a/block/vvfat.c b/block/vvfat.c
 index XXXXXXX..XXXXXXX 100644
 --- a/block/vvfat.c
 +++ b/block/vvfat.c
@@ -XXX,XX +XXX,XX @@ static int vvfat_open(BlockDriverState *bs, QDict *options, int flags,
      s->current_cluster=0xffffffff;
 -    /* read only is the default for safety */
 -    bdrv_set_read_only(bs, true);
      s->qcow = NULL;
      s->qcow_filename = NULL;
      s->fat2 = NULL;
@@ -XXX,XX +XXX,XX @@ static int vvfat_open(BlockDriverState *bs, QDict *options, int flags,
      s->sector_count = cyls * heads * secs - (s->first_sectors_number - 1);
      if (qemu_opt_get_bool(opts, "rw", false)) {
 -        ret = enable_write_target(bs, errp);
 +        if (!bdrv_is_read_only(bs)) {
 +            ret = enable_write_target(bs, errp);
 +            if (ret < 0) {
 +                goto fail;
 +            }
 +        } else {
 +            ret = -EPERM;
 +            error_setg(errp,
 +                       "Unable to set VVFAT to 'rw' when drive is read-only");
 +            goto fail;
 +        }
 +    } else  {
 +        /* read only is the default for safety */
 +        ret = bdrv_set_read_only(bs, true, &local_err);
          if (ret < 0) {
 +            error_propagate(errp, local_err);
              goto fail;
          }
 -        bdrv_set_read_only(bs, false);
      }
      bs->total_sectors = cyls * heads * secs;
 diff --git a/include/block/block.h b/include/block/block.h
 index XXXXXXX..XXXXXXX 100644
 --- a/include/block/block.h
 +++ b/include/block/block.h
@@ -XXX,XX +XXX,XX @@ int bdrv_is_allocated_above(BlockDriverState *top, BlockDriverState *base,
                              int64_t sector_num, int nb_sectors, int *pnum);
  bool bdrv_is_read_only(BlockDriverState *bs);
 -void bdrv_set_read_only(BlockDriverState *bs, bool read_only);
 +int bdrv_set_read_only(BlockDriverState *bs, bool read_only, Error **errp);
  bool bdrv_is_sg(BlockDriverState *bs);
  bool bdrv_is_inserted(BlockDriverState *bs);
  int bdrv_media_changed(BlockDriverState *bs);
 --
-.9.3
+.29.2

-New patch
+[PULL 27/27] docs: fix Parallels Image "dirty bitmap" section
+From: "Denis V. Lunev" <den@openvz.org>
+Original specification says that l1 table size if 64 * l1_size, which
+is obviously wrong. The size of the l1 entry is 64 _bits_, not bytes.
+Thus 64 is to be replaces with 8 as specification says about bytes.
+There is also minor tweak, field name is renamed from l1 to l1_table,
+which matches with the later text.
+Signed-off-by: Denis V. Lunev <den@openvz.org>
+Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+Message-id: 20210128171313.2210947-1-den@openvz.org
+CC: Stefan Hajnoczi <stefanha@redhat.com>
+CC: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+[Replace the original commit message "docs: fix mistake in dirty bitmap
+feature description" as suggested by Eric Blake.
+--Stefan]
+Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
+---
+ docs/interop/parallels.txt | 2 +-
+file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/docs/interop/parallels.txt b/docs/interop/parallels.txt
+index XXXXXXX..XXXXXXX 100644
+--- a/docs/interop/parallels.txt
++++ b/docs/interop/parallels.txt
+@@ -XXX,XX +XXX,XX @@ of its data area are:
+- 31:    l1_size
+               The number of entries in the L1 table of the bitmap.
+-  variable:   l1 (64 * l1_size bytes)
++  variable:   l1_table (8 * l1_size bytes)
+               L1 offset table (in bytes)
+ A dirty bitmap is stored using a one-level structure for the mapping to host
+--
+.29.2

The following changes since commit bfec359afba088aaacc7d316f43302f28c6e642a:

Merge remote-tracking branch 'remotes/armbru/tags/pull-qdev-2017-04-21' into staging (2017-04-21 11:42:03 +0100)

are available in the git repository at:

git://github.com/codyprime/qemu-kvm-jtc.git tags/block-pull-request

for you to fetch changes up to 1507631e438930bc07f776f303af127a9cdb4d41:

qemu-iotests: _cleanup_qemu must be called on exit (2017-04-21 08:32:44 -0400)

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

Block patches for 2.10

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

Ashish Mittal (2):
  block/vxhs.c: Add support for a new block device type called "vxhs"
  block/vxhs.c: Add qemu-iotests for new block device type "vxhs"

Jeff Cody (10):
  qemu-iotests: exclude vxhs from image creation via protocol
  block: add bdrv_set_read_only() helper function
  block: do not set BDS read_only if copy_on_read enabled
  block: honor BDRV_O_ALLOW_RDWR when clearing bs->read_only
  block: code movement
  block: introduce bdrv_can_set_read_only()
  block: use bdrv_can_set_read_only() during reopen
  block/rbd - update variable names to more apt names
  block/rbd: Add support for reopen()
  qemu-iotests: _cleanup_qemu must be called on exit

-- 
2.9.3

From: Ashish Mittal <ashmit602@gmail.com>

Source code for the qnio library that this code loads can be downloaded from:
https://github.com/VeritasHyperScale/libqnio.git

Sample command line using JSON syntax:
./x86_64-softmmu/qemu-system-x86_64 -name instance-00000008 -S -vnc 0.0.0.0:0
-k en-us -vga cirrus -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5
-msg timestamp=on
'json:{"driver":"vxhs","vdisk-id":"c3e9095a-a5ee-4dce-afeb-2a59fb387410",
"server":{"host":"172.172.17.4","port":"9999"}}'

Sample command line using URI syntax:
qemu-img convert -f raw -O raw -n
/var/lib/nova/instances/_base/0c5eacd5ebea5ed914b6a3e7b18f1ce734c386ad
vxhs://192.168.0.1:9999/c6718f6b-0401-441d-a8c3-1f0064d75ee0

Sample command line using TLS credentials (run in secure mode):
./qemu-io --object
tls-creds-x509,id=tls0,dir=/etc/pki/qemu/vxhs,endpoint=client -c 'read
-v 66000 2.5k' 'json:{"server.host": "127.0.0.1", "server.port": "9999",
"vdisk-id": "/test.raw", "driver": "vxhs", "tls-creds":"tls0"}'

Signed-off-by: Ashish Mittal <Ashish.Mittal@veritas.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Jeff Cody <jcody@redhat.com>
Signed-off-by: Jeff Cody <jcody@redhat.com>
Message-id: 1491277689-24949-2-git-send-email-Ashish.Mittal@veritas.com
---
 block/Makefile.objs  |   2 +
 block/trace-events   |  17 ++
 block/vxhs.c         | 575 +++++++++++++++++++++++++++++++++++++++++++++++++++
 configure            |  39 ++++
 qapi/block-core.json |  23 ++-
 5 files changed, 654 insertions(+), 2 deletions(-)
 create mode 100644 block/vxhs.c

diff --git a/block/Makefile.objs b/block/Makefile.objs
index XXXXXXX..XXXXXXX 100644
--- a/block/Makefile.objs
+++ b/block/Makefile.objs
@@ -XXX,XX +XXX,XX @@ block-obj-$(CONFIG_LIBNFS) += nfs.o
 block-obj-$(CONFIG_CURL) += curl.o
 block-obj-$(CONFIG_RBD) += rbd.o
 block-obj-$(CONFIG_GLUSTERFS) += gluster.o
+block-obj-$(CONFIG_VXHS) += vxhs.o
 block-obj-$(CONFIG_LIBSSH2) += ssh.o
 block-obj-y += accounting.o dirty-bitmap.o
 block-obj-y += write-threshold.o
@@ -XXX,XX +XXX,XX @@ rbd.o-cflags       := $(RBD_CFLAGS)
 rbd.o-libs         := $(RBD_LIBS)
 gluster.o-cflags   := $(GLUSTERFS_CFLAGS)
 gluster.o-libs     := $(GLUSTERFS_LIBS)
+vxhs.o-libs        := $(VXHS_LIBS)
 ssh.o-cflags       := $(LIBSSH2_CFLAGS)
 ssh.o-libs         := $(LIBSSH2_LIBS)
 block-obj-$(if $(CONFIG_BZIP2),m,n) += dmg-bz2.o
diff --git a/block/trace-events b/block/trace-events
index XXXXXXX..XXXXXXX 100644
--- a/block/trace-events
+++ b/block/trace-events
@@ -XXX,XX +XXX,XX @@ qed_aio_write_data(void *s, void *acb, int ret, uint64_t offset, size_t len) "s
 qed_aio_write_prefill(void *s, void *acb, uint64_t start, size_t len, uint64_t offset) "s %p acb %p start %"PRIu64" len %zu offset %"PRIu64
 qed_aio_write_postfill(void *s, void *acb, uint64_t start, size_t len, uint64_t offset) "s %p acb %p start %"PRIu64" len %zu offset %"PRIu64
 qed_aio_write_main(void *s, void *acb, int ret, uint64_t offset, size_t len) "s %p acb %p ret %d offset %"PRIu64" len %zu"
+
+# block/vxhs.c
+vxhs_iio_callback(int error) "ctx is NULL: error %d"
+vxhs_iio_callback_chnfail(int err, int error) "QNIO channel failed, no i/o %d, %d"
+vxhs_iio_callback_unknwn(int opcode, int err) "unexpected opcode %d, errno %d"
+vxhs_aio_rw_invalid(int req) "Invalid I/O request iodir %d"
+vxhs_aio_rw_ioerr(char *guid, int iodir, uint64_t size, uint64_t off, void *acb, int ret, int err) "IO ERROR (vDisk %s) FOR : Read/Write = %d size = %lu offset = %lu ACB = %p. Error = %d, errno = %d"
+vxhs_get_vdisk_stat_err(char *guid, int ret, int err) "vDisk (%s) stat ioctl failed, ret = %d, errno = %d"
+vxhs_get_vdisk_stat(char *vdisk_guid, uint64_t vdisk_size) "vDisk %s stat ioctl returned size %lu"
+vxhs_complete_aio(void *acb, uint64_t ret) "aio failed acb %p ret %ld"
+vxhs_parse_uri_filename(const char *filename) "URI passed via bdrv_parse_filename %s"
+vxhs_open_vdiskid(const char *vdisk_id) "Opening vdisk-id %s"
+vxhs_open_hostinfo(char *of_vsa_addr, int port) "Adding host %s:%d to BDRVVXHSState"
+vxhs_open_iio_open(const char *host) "Failed to connect to storage agent on host %s"
+vxhs_parse_uri_hostinfo(char *host, int port) "Host: IP %s, Port %d"
+vxhs_close(char *vdisk_guid) "Closing vdisk %s"
+vxhs_get_creds(const char *cacert, const char *client_key, const char *client_cert) "cacert %s, client_key %s, client_cert %s"
diff --git a/block/vxhs.c b/block/vxhs.c
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/block/vxhs.c
@@ -XXX,XX +XXX,XX @@
+/*
+ * QEMU Block driver for Veritas HyperScale (VxHS)
+ *
+ * Copyright (c) 2017 Veritas Technologies LLC.
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ *
+ */
+
+#include "qemu/osdep.h"
+#include <qnio/qnio_api.h>
+#include <sys/param.h>
+#include "block/block_int.h"
+#include "qapi/qmp/qerror.h"
+#include "qapi/qmp/qdict.h"
+#include "qapi/qmp/qstring.h"
+#include "trace.h"
+#include "qemu/uri.h"
+#include "qapi/error.h"
+#include "qemu/uuid.h"
+#include "crypto/tlscredsx509.h"
+
+#define VXHS_OPT_FILENAME           "filename"
+#define VXHS_OPT_VDISK_ID           "vdisk-id"
+#define VXHS_OPT_SERVER             "server"
+#define VXHS_OPT_HOST               "host"
+#define VXHS_OPT_PORT               "port"
+
+/* Only accessed under QEMU global mutex */
+static uint32_t vxhs_ref;
+
+typedef enum {
+    VDISK_AIO_READ,
+    VDISK_AIO_WRITE,
+} VDISKAIOCmd;
+
+/*
+ * HyperScale AIO callbacks structure
+ */
+typedef struct VXHSAIOCB {
+    BlockAIOCB common;
+    int err;
+} VXHSAIOCB;
+
+typedef struct VXHSvDiskHostsInfo {
+    void *dev_handle; /* Device handle */
+    char *host; /* Host name or IP */
+    int port; /* Host's port number */
+} VXHSvDiskHostsInfo;
+
+/*
+ * Structure per vDisk maintained for state
+ */
+typedef struct BDRVVXHSState {
+    VXHSvDiskHostsInfo vdisk_hostinfo; /* Per host info */
+    char *vdisk_guid;
+    char *tlscredsid; /* tlscredsid */
+} BDRVVXHSState;
+
+static void vxhs_complete_aio_bh(void *opaque)
+{
+    VXHSAIOCB *acb = opaque;
+    BlockCompletionFunc *cb = acb->common.cb;
+    void *cb_opaque = acb->common.opaque;
+    int ret = 0;
+
+    if (acb->err != 0) {
+        trace_vxhs_complete_aio(acb, acb->err);
+        ret = (-EIO);
+    }
+
+    qemu_aio_unref(acb);
+    cb(cb_opaque, ret);
+}
+
+/*
+ * Called from a libqnio thread
+ */
+static void vxhs_iio_callback(void *ctx, uint32_t opcode, uint32_t error)
+{
+    VXHSAIOCB *acb = NULL;
+
+    switch (opcode) {
+    case IRP_READ_REQUEST:
+    case IRP_WRITE_REQUEST:
+
+        /*
+         * ctx is VXHSAIOCB*
+         * ctx is NULL if error is QNIOERROR_CHANNEL_HUP
+         */
+        if (ctx) {
+            acb = ctx;
+        } else {
+            trace_vxhs_iio_callback(error);
+            goto out;
+        }
+
+        if (error) {
+            if (!acb->err) {
+                acb->err = error;
+            }
+            trace_vxhs_iio_callback(error);
+        }
+
+        aio_bh_schedule_oneshot(bdrv_get_aio_context(acb->common.bs),
+                                vxhs_complete_aio_bh, acb);
+        break;
+
+    default:
+        if (error == QNIOERROR_HUP) {
+            /*
+             * Channel failed, spontaneous notification,
+             * not in response to I/O
+             */
+            trace_vxhs_iio_callback_chnfail(error, errno);
+        } else {
+            trace_vxhs_iio_callback_unknwn(opcode, error);
+        }
+        break;
+    }
+out:
+    return;
+}
+
+static QemuOptsList runtime_opts = {
+    .name = "vxhs",
+    .head = QTAILQ_HEAD_INITIALIZER(runtime_opts.head),
+    .desc = {
+        {
+            .name = VXHS_OPT_FILENAME,
+            .type = QEMU_OPT_STRING,
+            .help = "URI to the Veritas HyperScale image",
+        },
+        {
+            .name = VXHS_OPT_VDISK_ID,
+            .type = QEMU_OPT_STRING,
+            .help = "UUID of the VxHS vdisk",
+        },
+        {
+            .name = "tls-creds",
+            .type = QEMU_OPT_STRING,
+            .help = "ID of the TLS/SSL credentials to use",
+        },
+        { /* end of list */ }
+    },
+};
+
+static QemuOptsList runtime_tcp_opts = {
+    .name = "vxhs_tcp",
+    .head = QTAILQ_HEAD_INITIALIZER(runtime_tcp_opts.head),
+    .desc = {
+        {
+            .name = VXHS_OPT_HOST,
+            .type = QEMU_OPT_STRING,
+            .help = "host address (ipv4 addresses)",
+        },
+        {
+            .name = VXHS_OPT_PORT,
+            .type = QEMU_OPT_NUMBER,
+            .help = "port number on which VxHSD is listening (default 9999)",
+            .def_value_str = "9999"
+        },
+        { /* end of list */ }
+    },
+};
+
+/*
+ * Parse incoming URI and populate *options with the host
+ * and device information
+ */
+static int vxhs_parse_uri(const char *filename, QDict *options)
+{
+    URI *uri = NULL;
+    char *port;
+    int ret = 0;
+
+    trace_vxhs_parse_uri_filename(filename);
+    uri = uri_parse(filename);
+    if (!uri || !uri->server || !uri->path) {
+        uri_free(uri);
+        return -EINVAL;
+    }
+
+    qdict_put(options, VXHS_OPT_SERVER".host", qstring_from_str(uri->server));
+
+    if (uri->port) {
+        port = g_strdup_printf("%d", uri->port);
+        qdict_put(options, VXHS_OPT_SERVER".port", qstring_from_str(port));
+        g_free(port);
+    }
+
+    qdict_put(options, "vdisk-id", qstring_from_str(uri->path));
+
+    trace_vxhs_parse_uri_hostinfo(uri->server, uri->port);
+    uri_free(uri);
+
+    return ret;
+}
+
+static void vxhs_parse_filename(const char *filename, QDict *options,
+                                Error **errp)
+{
+    if (qdict_haskey(options, "vdisk-id") || qdict_haskey(options, "server")) {
+        error_setg(errp, "vdisk-id/server and a file name may not be specified "
+                         "at the same time");
+        return;
+    }
+
+    if (strstr(filename, "://")) {
+        int ret = vxhs_parse_uri(filename, options);
+        if (ret < 0) {
+            error_setg(errp, "Invalid URI. URI should be of the form "
+                       "  vxhs://<host_ip>:<port>/<vdisk-id>");
+        }
+    }
+}
+
+static int vxhs_init_and_ref(void)
+{
+    if (vxhs_ref++ == 0) {
+        if (iio_init(QNIO_VERSION, vxhs_iio_callback)) {
+            return -ENODEV;
+        }
+    }
+    return 0;
+}
+
+static void vxhs_unref(void)
+{
+    if (--vxhs_ref == 0) {
+        iio_fini();
+    }
+}
+
+static void vxhs_get_tls_creds(const char *id, char **cacert,
+                               char **key, char **cert, Error **errp)
+{
+    Object *obj;
+    QCryptoTLSCreds *creds;
+    QCryptoTLSCredsX509 *creds_x509;
+
+    obj = object_resolve_path_component(
+        object_get_objects_root(), id);
+
+    if (!obj) {
+        error_setg(errp, "No TLS credentials with id '%s'",
+                   id);
+        return;
+    }
+
+    creds_x509 = (QCryptoTLSCredsX509 *)
+        object_dynamic_cast(obj, TYPE_QCRYPTO_TLS_CREDS_X509);
+
+    if (!creds_x509) {
+        error_setg(errp, "Object with id '%s' is not TLS credentials",
+                   id);
+        return;
+    }
+
+    creds = &creds_x509->parent_obj;
+
+    if (creds->endpoint != QCRYPTO_TLS_CREDS_ENDPOINT_CLIENT) {
+        error_setg(errp,
+                   "Expecting TLS credentials with a client endpoint");
+        return;
+    }
+
+    /*
+     * Get the cacert, client_cert and client_key file names.
+     */
+    if (!creds->dir) {
+        error_setg(errp, "TLS object missing 'dir' property value");
+        return;
+    }
+
+    *cacert = g_strdup_printf("%s/%s", creds->dir,
+                              QCRYPTO_TLS_CREDS_X509_CA_CERT);
+    *cert = g_strdup_printf("%s/%s", creds->dir,
+                            QCRYPTO_TLS_CREDS_X509_CLIENT_CERT);
+    *key = g_strdup_printf("%s/%s", creds->dir,
+                           QCRYPTO_TLS_CREDS_X509_CLIENT_KEY);
+}
+
+static int vxhs_open(BlockDriverState *bs, QDict *options,
+                     int bdrv_flags, Error **errp)
+{
+    BDRVVXHSState *s = bs->opaque;
+    void *dev_handlep;
+    QDict *backing_options = NULL;
+    QemuOpts *opts = NULL;
+    QemuOpts *tcp_opts = NULL;
+    char *of_vsa_addr = NULL;
+    Error *local_err = NULL;
+    const char *vdisk_id_opt;
+    const char *server_host_opt;
+    int ret = 0;
+    char *cacert = NULL;
+    char *client_key = NULL;
+    char *client_cert = NULL;
+
+    ret = vxhs_init_and_ref();
+    if (ret < 0) {
+        ret = -EINVAL;
+        goto out;
+    }
+
+    /* Create opts info from runtime_opts and runtime_tcp_opts list */
+    opts = qemu_opts_create(&runtime_opts, NULL, 0, &error_abort);
+    tcp_opts = qemu_opts_create(&runtime_tcp_opts, NULL, 0, &error_abort);
+
+    qemu_opts_absorb_qdict(opts, options, &local_err);
+    if (local_err) {
+        ret = -EINVAL;
+        goto out;
+    }
+
+    /* vdisk-id is the disk UUID */
+    vdisk_id_opt = qemu_opt_get(opts, VXHS_OPT_VDISK_ID);
+    if (!vdisk_id_opt) {
+        error_setg(&local_err, QERR_MISSING_PARAMETER, VXHS_OPT_VDISK_ID);
+        ret = -EINVAL;
+        goto out;
+    }
+
+    /* vdisk-id may contain a leading '/' */
+    if (strlen(vdisk_id_opt) > UUID_FMT_LEN + 1) {
+        error_setg(&local_err, "vdisk-id cannot be more than %d characters",
+                   UUID_FMT_LEN);
+        ret = -EINVAL;
+        goto out;
+    }
+
+    s->vdisk_guid = g_strdup(vdisk_id_opt);
+    trace_vxhs_open_vdiskid(vdisk_id_opt);
+
+    /* get the 'server.' arguments */
+    qdict_extract_subqdict(options, &backing_options, VXHS_OPT_SERVER".");
+
+    qemu_opts_absorb_qdict(tcp_opts, backing_options, &local_err);
+    if (local_err != NULL) {
+        ret = -EINVAL;
+        goto out;
+    }
+
+    server_host_opt = qemu_opt_get(tcp_opts, VXHS_OPT_HOST);
+    if (!server_host_opt) {
+        error_setg(&local_err, QERR_MISSING_PARAMETER,
+                   VXHS_OPT_SERVER"."VXHS_OPT_HOST);
+        ret = -EINVAL;
+        goto out;
+    }
+
+    if (strlen(server_host_opt) > MAXHOSTNAMELEN) {
+        error_setg(&local_err, "server.host cannot be more than %d characters",
+                   MAXHOSTNAMELEN);
+        ret = -EINVAL;
+        goto out;
+    }
+
+    /* check if we got tls-creds via the --object argument */
+    s->tlscredsid = g_strdup(qemu_opt_get(opts, "tls-creds"));
+    if (s->tlscredsid) {
+        vxhs_get_tls_creds(s->tlscredsid, &cacert, &client_key,
+                           &client_cert, &local_err);
+        if (local_err != NULL) {
+            ret = -EINVAL;
+            goto out;
+        }
+        trace_vxhs_get_creds(cacert, client_key, client_cert);
+    }
+
+    s->vdisk_hostinfo.host = g_strdup(server_host_opt);
+    s->vdisk_hostinfo.port = g_ascii_strtoll(qemu_opt_get(tcp_opts,
+                                                          VXHS_OPT_PORT),
+                                                          NULL, 0);
+
+    trace_vxhs_open_hostinfo(s->vdisk_hostinfo.host,
+                             s->vdisk_hostinfo.port);
+
+    of_vsa_addr = g_strdup_printf("of://%s:%d",
+                                  s->vdisk_hostinfo.host,
+                                  s->vdisk_hostinfo.port);
+
+    /*
+     * Open qnio channel to storage agent if not opened before
+     */
+    dev_handlep = iio_open(of_vsa_addr, s->vdisk_guid, 0,
+                           cacert, client_key, client_cert);
+    if (dev_handlep == NULL) {
+        trace_vxhs_open_iio_open(of_vsa_addr);
+        ret = -ENODEV;
+        goto out;
+    }
+    s->vdisk_hostinfo.dev_handle = dev_handlep;
+
+out:
+    g_free(of_vsa_addr);
+    QDECREF(backing_options);
+    qemu_opts_del(tcp_opts);
+    qemu_opts_del(opts);
+    g_free(cacert);
+    g_free(client_key);
+    g_free(client_cert);
+
+    if (ret < 0) {
+        vxhs_unref();
+        error_propagate(errp, local_err);
+        g_free(s->vdisk_hostinfo.host);
+        g_free(s->vdisk_guid);
+        g_free(s->tlscredsid);
+        s->vdisk_guid = NULL;
+    }
+
+    return ret;
+}
+
+static const AIOCBInfo vxhs_aiocb_info = {
+    .aiocb_size = sizeof(VXHSAIOCB)
+};
+
+/*
+ * This allocates QEMU-VXHS callback for each IO
+ * and is passed to QNIO. When QNIO completes the work,
+ * it will be passed back through the callback.
+ */
+static BlockAIOCB *vxhs_aio_rw(BlockDriverState *bs, int64_t sector_num,
+                               QEMUIOVector *qiov, int nb_sectors,
+                               BlockCompletionFunc *cb, void *opaque,
+                               VDISKAIOCmd iodir)
+{
+    VXHSAIOCB *acb = NULL;
+    BDRVVXHSState *s = bs->opaque;
+    size_t size;
+    uint64_t offset;
+    int iio_flags = 0;
+    int ret = 0;
+    void *dev_handle = s->vdisk_hostinfo.dev_handle;
+
+    offset = sector_num * BDRV_SECTOR_SIZE;
+    size = nb_sectors * BDRV_SECTOR_SIZE;
+    acb = qemu_aio_get(&vxhs_aiocb_info, bs, cb, opaque);
+
+    /*
+     * Initialize VXHSAIOCB.
+     */
+    acb->err = 0;
+
+    iio_flags = IIO_FLAG_ASYNC;
+
+    switch (iodir) {
+    case VDISK_AIO_WRITE:
+            ret = iio_writev(dev_handle, acb, qiov->iov, qiov->niov,
+                             offset, (uint64_t)size, iio_flags);
+            break;
+    case VDISK_AIO_READ:
+            ret = iio_readv(dev_handle, acb, qiov->iov, qiov->niov,
+                            offset, (uint64_t)size, iio_flags);
+            break;
+    default:
+            trace_vxhs_aio_rw_invalid(iodir);
+            goto errout;
+    }
+
+    if (ret != 0) {
+        trace_vxhs_aio_rw_ioerr(s->vdisk_guid, iodir, size, offset,
+                                acb, ret, errno);
+        goto errout;
+    }
+    return &acb->common;
+
+errout:
+    qemu_aio_unref(acb);
+    return NULL;
+}
+
+static BlockAIOCB *vxhs_aio_readv(BlockDriverState *bs,
+                                   int64_t sector_num, QEMUIOVector *qiov,
+                                   int nb_sectors,
+                                   BlockCompletionFunc *cb, void *opaque)
+{
+    return vxhs_aio_rw(bs, sector_num, qiov, nb_sectors, cb,
+                       opaque, VDISK_AIO_READ);
+}
+
+static BlockAIOCB *vxhs_aio_writev(BlockDriverState *bs,
+                                   int64_t sector_num, QEMUIOVector *qiov,
+                                   int nb_sectors,
+                                   BlockCompletionFunc *cb, void *opaque)
+{
+    return vxhs_aio_rw(bs, sector_num, qiov, nb_sectors,
+                       cb, opaque, VDISK_AIO_WRITE);
+}
+
+static void vxhs_close(BlockDriverState *bs)
+{
+    BDRVVXHSState *s = bs->opaque;
+
+    trace_vxhs_close(s->vdisk_guid);
+
+    g_free(s->vdisk_guid);
+    s->vdisk_guid = NULL;
+
+    /*
+     * Close vDisk device
+     */
+    if (s->vdisk_hostinfo.dev_handle) {
+        iio_close(s->vdisk_hostinfo.dev_handle);
+        s->vdisk_hostinfo.dev_handle = NULL;
+    }
+
+    vxhs_unref();
+
+    /*
+     * Free the dynamically allocated host string etc
+     */
+    g_free(s->vdisk_hostinfo.host);
+    g_free(s->tlscredsid);
+    s->tlscredsid = NULL;
+    s->vdisk_hostinfo.host = NULL;
+    s->vdisk_hostinfo.port = 0;
+}
+
+static int64_t vxhs_get_vdisk_stat(BDRVVXHSState *s)
+{
+    int64_t vdisk_size = -1;
+    int ret = 0;
+    void *dev_handle = s->vdisk_hostinfo.dev_handle;
+
+    ret = iio_ioctl(dev_handle, IOR_VDISK_STAT, &vdisk_size, 0);
+    if (ret < 0) {
+        trace_vxhs_get_vdisk_stat_err(s->vdisk_guid, ret, errno);
+        return -EIO;
+    }
+
+    trace_vxhs_get_vdisk_stat(s->vdisk_guid, vdisk_size);
+    return vdisk_size;
+}
+
+/*
+ * Returns the size of vDisk in bytes. This is required
+ * by QEMU block upper block layer so that it is visible
+ * to guest.
+ */
+static int64_t vxhs_getlength(BlockDriverState *bs)
+{
+    BDRVVXHSState *s = bs->opaque;
+    int64_t vdisk_size;
+
+    vdisk_size = vxhs_get_vdisk_stat(s);
+    if (vdisk_size < 0) {
+        return -EIO;
+    }
+
+    return vdisk_size;
+}
+
+static BlockDriver bdrv_vxhs = {
+    .format_name                  = "vxhs",
+    .protocol_name                = "vxhs",
+    .instance_size                = sizeof(BDRVVXHSState),
+    .bdrv_file_open               = vxhs_open,
+    .bdrv_parse_filename          = vxhs_parse_filename,
+    .bdrv_close                   = vxhs_close,
+    .bdrv_getlength               = vxhs_getlength,
+    .bdrv_aio_readv               = vxhs_aio_readv,
+    .bdrv_aio_writev              = vxhs_aio_writev,
+};
+
+static void bdrv_vxhs_init(void)
+{
+    bdrv_register(&bdrv_vxhs);
+}
+
+block_init(bdrv_vxhs_init);
diff --git a/configure b/configure
index XXXXXXX..XXXXXXX 100755
--- a/configure
+++ b/configure
@@ -XXX,XX +XXX,XX @@ numa=""
 tcmalloc="no"
 jemalloc="no"
 replication="yes"
+vxhs=""
 
 supported_cpu="no"
 supported_os="no"
@@ -XXX,XX +XXX,XX @@ for opt do
   ;;
   --enable-replication) replication="yes"
   ;;
+  --disable-vxhs) vxhs="no"
+  ;;
+  --enable-vxhs) vxhs="yes"
+  ;;
   *)
       echo "ERROR: unknown option $opt"
       echo "Try '$0 --help' for more information"
@@ -XXX,XX +XXX,XX @@ disabled with --disable-FEATURE, default is enabled if available:
   xfsctl          xfsctl support
   qom-cast-debug  cast debugging support
   tools           build qemu-io, qemu-nbd and qemu-image tools
+  vxhs            Veritas HyperScale vDisk backend support
 
 NOTE: The object files are built at the place where configure is launched
 EOF
@@ -XXX,XX +XXX,XX @@ if compile_prog "" "" ; then
 fi
 
 ##########################################
+# Veritas HyperScale block driver VxHS
+# Check if libvxhs is installed
+
+if test "$vxhs" != "no" ; then
+  cat > $TMPC <<EOF
+#include <stdint.h>
+#include <qnio/qnio_api.h>
+
+void *vxhs_callback;
+
+int main(void) {
+    iio_init(QNIO_VERSION, vxhs_callback);
+    return 0;
+}
+EOF
+  vxhs_libs="-lvxhs -lssl"
+  if compile_prog "" "$vxhs_libs" ; then
+    vxhs=yes
+  else
+    if test "$vxhs" = "yes" ; then
+      feature_not_found "vxhs block device" "Install libvxhs See github"
+    fi
+    vxhs=no
+  fi
+fi
+
+##########################################
 # End of CC checks
 # After here, no more $cc or $ld runs
 
@@ -XXX,XX +XXX,XX @@ echo "tcmalloc support  $tcmalloc"
 echo "jemalloc support  $jemalloc"
 echo "avx2 optimization $avx2_opt"
 echo "replication support $replication"
+echo "VxHS block device $vxhs"
 
 if test "$sdl_too_old" = "yes"; then
 echo "-> Your SDL version is too old - please upgrade to have SDL support"
@@ -XXX,XX +XXX,XX @@ if test "$pthread_setname_np" = "yes" ; then
   echo "CONFIG_PTHREAD_SETNAME_NP=y" >> $config_host_mak
 fi
 
+if test "$vxhs" = "yes" ; then
+  echo "CONFIG_VXHS=y" >> $config_host_mak
+  echo "VXHS_LIBS=$vxhs_libs" >> $config_host_mak
+fi
+
 if test "$tcg_interpreter" = "yes"; then
   QEMU_INCLUDES="-I\$(SRC_PATH)/tcg/tci $QEMU_INCLUDES"
 elif test "$ARCH" = "sparc64" ; then
diff --git a/qapi/block-core.json b/qapi/block-core.json
index XXXXXXX..XXXXXXX 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -XXX,XX +XXX,XX @@
 #
 # Drivers that are supported in block device operations.
 #
+# @vxhs: Since 2.10
+#
 # Since: 2.9
 ##
 { 'enum': 'BlockdevDriver',
@@ -XXX,XX +XXX,XX @@
             'host_device', 'http', 'https', 'iscsi', 'luks', 'nbd', 'nfs',
             'null-aio', 'null-co', 'parallels', 'qcow', 'qcow2', 'qed',
             'quorum', 'raw', 'rbd', 'replication', 'sheepdog', 'ssh',
-            'vdi', 'vhdx', 'vmdk', 'vpc', 'vvfat' ] }
+            'vdi', 'vhdx', 'vmdk', 'vpc', 'vvfat', 'vxhs' ] }
 
 ##
 # @BlockdevOptionsFile:
@@ -XXX,XX +XXX,XX @@
   'data': { '*offset': 'int', '*size': 'int' } }
 
 ##
+# @BlockdevOptionsVxHS:
+#
+# Driver specific block device options for VxHS
+#
+# @vdisk-id:    UUID of VxHS volume
+# @server:      vxhs server IP, port
+# @tls-creds:   TLS credentials ID
+#
+# Since: 2.10
+##
+{ 'struct': 'BlockdevOptionsVxHS',
+  'data': { 'vdisk-id': 'str',
+            'server': 'InetSocketAddressBase',
+            '*tls-creds': 'str' } }
+
+##
 # @BlockdevOptions:
 #
 # Options for creating a block device.  Many options are available for all
@@ -XXX,XX +XXX,XX @@
       'vhdx':       'BlockdevOptionsGenericFormat',
       'vmdk':       'BlockdevOptionsGenericCOWFormat',
       'vpc':        'BlockdevOptionsGenericFormat',
-      'vvfat':      'BlockdevOptionsVVFAT'
+      'vvfat':      'BlockdevOptionsVVFAT',
+      'vxhs':       'BlockdevOptionsVxHS'
   } }
 
 ##
-- 
2.9.3

From: Ashish Mittal <ashmit602@gmail.com>

These changes use a vxhs test server that is a part of the following
repository:
https://github.com/VeritasHyperScale/libqnio.git

Signed-off-by: Ashish Mittal <Ashish.Mittal@veritas.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Jeff Cody <jcody@redhat.com>
Signed-off-by: Jeff Cody <jcody@redhat.com>
Message-id: 1491277689-24949-3-git-send-email-Ashish.Mittal@veritas.com
---
 tests/qemu-iotests/common        |  6 ++++++
 tests/qemu-iotests/common.config | 13 +++++++++++++
 tests/qemu-iotests/common.filter |  1 +
 tests/qemu-iotests/common.rc     | 19 +++++++++++++++++++
 4 files changed, 39 insertions(+)

diff --git a/tests/qemu-iotests/common b/tests/qemu-iotests/common
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/common
+++ b/tests/qemu-iotests/common
@@ -XXX,XX +XXX,XX @@ check options
     -ssh                test ssh
     -nfs                test nfs
     -luks               test luks
+    -vxhs               test vxhs
     -xdiff              graphical mode diff
     -nocache            use O_DIRECT on backing file
     -misalign           misalign memory allocations
@@ -XXX,XX +XXX,XX @@ testlist options
             xpand=false
             ;;
 
+        -vxhs)
+            IMGPROTO=vxhs
+            xpand=false
+            ;;
+
         -ssh)
             IMGPROTO=ssh
             xpand=false
diff --git a/tests/qemu-iotests/common.config b/tests/qemu-iotests/common.config
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/common.config
+++ b/tests/qemu-iotests/common.config
@@ -XXX,XX +XXX,XX @@ if [ -z "$QEMU_NBD_PROG" ]; then
     export QEMU_NBD_PROG="`set_prog_path qemu-nbd`"
 fi
 
+if [ -z "$QEMU_VXHS_PROG" ]; then
+    export QEMU_VXHS_PROG="`set_prog_path qnio_server`"
+fi
+
 _qemu_wrapper()
 {
     (
@@ -XXX,XX +XXX,XX @@ _qemu_nbd_wrapper()
     )
 }
 
+_qemu_vxhs_wrapper()
+{
+    (
+        echo $BASHPID > "${TEST_DIR}/qemu-vxhs.pid"
+        exec "$QEMU_VXHS_PROG" $QEMU_VXHS_OPTIONS "$@"
+    )
+}
+
 export QEMU=_qemu_wrapper
 export QEMU_IMG=_qemu_img_wrapper
 export QEMU_IO=_qemu_io_wrapper
 export QEMU_NBD=_qemu_nbd_wrapper
+export QEMU_VXHS=_qemu_vxhs_wrapper
 
 QEMU_IMG_EXTRA_ARGS=
 if [ "$IMGOPTSSYNTAX" = "true" ]; then
diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/common.filter
+++ b/tests/qemu-iotests/common.filter
@@ -XXX,XX +XXX,XX @@ _filter_img_info()
         -e "s#$TEST_DIR#TEST_DIR#g" \
         -e "s#$IMGFMT#IMGFMT#g" \
         -e 's#nbd://127.0.0.1:10810$#TEST_DIR/t.IMGFMT#g' \
+        -e 's#json.*vdisk-id.*vxhs"}}#TEST_DIR/t.IMGFMT#' \
         -e "/encrypted: yes/d" \
         -e "/cluster_size: [0-9]\\+/d" \
         -e "/table_size: [0-9]\\+/d" \
diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
index XXXXXXX..XXXXXXX 100644
--- a/tests/qemu-iotests/common.rc
+++ b/tests/qemu-iotests/common.rc
@@ -XXX,XX +XXX,XX @@ else
     elif [ "$IMGPROTO" = "nfs" ]; then
         TEST_DIR="nfs://127.0.0.1/$TEST_DIR"
         TEST_IMG=$TEST_DIR/t.$IMGFMT
+    elif [ "$IMGPROTO" = "vxhs" ]; then
+        TEST_IMG_FILE=$TEST_DIR/t.$IMGFMT
+        TEST_IMG="vxhs://127.0.0.1:9999/t.$IMGFMT"
     else
         TEST_IMG=$IMGPROTO:$TEST_DIR/t.$IMGFMT
     fi
@@ -XXX,XX +XXX,XX @@ _make_test_img()
         eval "$QEMU_NBD -v -t -b 127.0.0.1 -p 10810 -f $IMGFMT  $TEST_IMG_FILE >/dev/null &"
         sleep 1 # FIXME: qemu-nbd needs to be listening before we continue
     fi
+
+    # Start QNIO server on image directory for vxhs protocol
+    if [ $IMGPROTO = "vxhs" ]; then
+        eval "$QEMU_VXHS -d  $TEST_DIR > /dev/null &"
+        sleep 1 # Wait for server to come up.
+    fi
 }
 
 _rm_test_img()
@@ -XXX,XX +XXX,XX @@ _cleanup_test_img()
             fi
             rm -f "$TEST_IMG_FILE"
             ;;
+        vxhs)
+            if [ -f "${TEST_DIR}/qemu-vxhs.pid" ]; then
+                local QEMU_VXHS_PID
+                read QEMU_VXHS_PID < "${TEST_DIR}/qemu-vxhs.pid"
+                kill ${QEMU_VXHS_PID} >/dev/null 2>&1
+                rm -f "${TEST_DIR}/qemu-vxhs.pid"
+            fi
+            rm -f "$TEST_IMG_FILE"
+            ;;
+
         file)
             _rm_test_img "$TEST_DIR/t.$IMGFMT"
             _rm_test_img "$TEST_DIR/t.$IMGFMT.orig"
-- 
2.9.3

The protocol VXHS does not support image creation.  Some tests expect
to be able to create images through the protocol.  Exclude VXHS from
these tests.

diff --git a/tests/qemu-iotests/017 b/tests/qemu-iotests/017
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/017
+++ b/tests/qemu-iotests/017
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # Any format supporting backing files
 _supported_fmt qcow qcow2 vmdk qed
 _supported_proto generic
+_unsupported_proto vxhs
 _supported_os Linux
 _unsupported_imgopts "subformat=monolithicFlat" "subformat=twoGbMaxExtentFlat"
 
diff --git a/tests/qemu-iotests/020 b/tests/qemu-iotests/020
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/020
+++ b/tests/qemu-iotests/020
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # Any format supporting backing files
 _supported_fmt qcow qcow2 vmdk qed
 _supported_proto generic
+_unsupported_proto vxhs
 _supported_os Linux
 _unsupported_imgopts "subformat=monolithicFlat" \
                      "subformat=twoGbMaxExtentFlat" \
diff --git a/tests/qemu-iotests/029 b/tests/qemu-iotests/029
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/029
+++ b/tests/qemu-iotests/029
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # Any format supporting intenal snapshots
 _supported_fmt qcow2
 _supported_proto generic
+_unsupported_proto vxhs
 _supported_os Linux
 # Internal snapshots are (currently) impossible with refcount_bits=1
 _unsupported_imgopts 'refcount_bits=1[^0-9]'
diff --git a/tests/qemu-iotests/073 b/tests/qemu-iotests/073
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/073
+++ b/tests/qemu-iotests/073
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto generic
+_unsupported_proto vxhs
 _supported_os Linux
 
 CLUSTER_SIZE=64k
diff --git a/tests/qemu-iotests/114 b/tests/qemu-iotests/114
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/114
+++ b/tests/qemu-iotests/114
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto generic
+_unsupported_proto vxhs
 _supported_os Linux
 
 
diff --git a/tests/qemu-iotests/130 b/tests/qemu-iotests/130
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/130
+++ b/tests/qemu-iotests/130
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto generic
+_unsupported_proto vxhs
 _supported_os Linux
 
 qemu_comm_method="monitor"
diff --git a/tests/qemu-iotests/134 b/tests/qemu-iotests/134
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/134
+++ b/tests/qemu-iotests/134
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto generic
+_unsupported_proto vxhs
 _supported_os Linux
 
 
diff --git a/tests/qemu-iotests/156 b/tests/qemu-iotests/156
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/156
+++ b/tests/qemu-iotests/156
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2 qed
 _supported_proto generic
+_unsupported_proto vxhs
 _supported_os Linux
 
 # Create source disk
diff --git a/tests/qemu-iotests/158 b/tests/qemu-iotests/158
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/158
+++ b/tests/qemu-iotests/158
@@ -XXX,XX +XXX,XX @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 
 _supported_fmt qcow2
 _supported_proto generic
+_unsupported_proto vxhs
 _supported_os Linux
 
 
-- 
2.9.3

We have a helper wrapper for checking for the BDS read_only flag,
add a helper wrapper to set the read_only flag as well.

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Jeff Cody <jcody@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Message-id: 9b18972d05f5fa2ac16c014f0af98d680553048d.1491597120.git.jcody@redhat.com
---
 block.c               | 5 +++++
 block/bochs.c         | 2 +-
 block/cloop.c         | 2 +-
 block/dmg.c           | 2 +-
 block/rbd.c           | 2 +-
 block/vvfat.c         | 4 ++--
 include/block/block.h | 1 +
 7 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/block.c b/block.c
index XXXXXXX..XXXXXXX 100644
--- a/block.c
+++ b/block.c
@@ -XXX,XX +XXX,XX @@ void path_combine(char *dest, int dest_size,
     }
 }
 
+void bdrv_set_read_only(BlockDriverState *bs, bool read_only)
+{
+    bs->read_only = read_only;
+}
+
 void bdrv_get_full_backing_filename_from_filename(const char *backed,
                                                   const char *backing,
                                                   char *dest, size_t sz,
diff --git a/block/bochs.c b/block/bochs.c
index XXXXXXX..XXXXXXX 100644
--- a/block/bochs.c
+++ b/block/bochs.c
@@ -XXX,XX +XXX,XX @@ static int bochs_open(BlockDriverState *bs, QDict *options, int flags,
         return -EINVAL;
     }
 
-    bs->read_only = true; /* no write support yet */
+    bdrv_set_read_only(bs, true); /* no write support yet */
 
     ret = bdrv_pread(bs->file, 0, &bochs, sizeof(bochs));
     if (ret < 0) {
diff --git a/block/cloop.c b/block/cloop.c
index XXXXXXX..XXXXXXX 100644
--- a/block/cloop.c
+++ b/block/cloop.c
@@ -XXX,XX +XXX,XX @@ static int cloop_open(BlockDriverState *bs, QDict *options, int flags,
         return -EINVAL;
     }
 
-    bs->read_only = true;
+    bdrv_set_read_only(bs, true);
 
     /* read header */
     ret = bdrv_pread(bs->file, 128, &s->block_size, 4);
diff --git a/block/dmg.c b/block/dmg.c
index XXXXXXX..XXXXXXX 100644
--- a/block/dmg.c
+++ b/block/dmg.c
@@ -XXX,XX +XXX,XX @@ static int dmg_open(BlockDriverState *bs, QDict *options, int flags,
     }
 
     block_module_load_one("dmg-bz2");
-    bs->read_only = true;
+    bdrv_set_read_only(bs, true);
 
     s->n_chunks = 0;
     s->offsets = s->lengths = s->sectors = s->sectorcounts = NULL;
diff --git a/block/rbd.c b/block/rbd.c
index XXXXXXX..XXXXXXX 100644
--- a/block/rbd.c
+++ b/block/rbd.c
@@ -XXX,XX +XXX,XX @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags,
         goto failed_open;
     }
 
-    bs->read_only = (s->snap != NULL);
+    bdrv_set_read_only(bs, (s->snap != NULL));
 
     qemu_opts_del(opts);
     return 0;
diff --git a/block/vvfat.c b/block/vvfat.c
index XXXXXXX..XXXXXXX 100644
--- a/block/vvfat.c
+++ b/block/vvfat.c
@@ -XXX,XX +XXX,XX @@ static int vvfat_open(BlockDriverState *bs, QDict *options, int flags,
     s->current_cluster=0xffffffff;
 
     /* read only is the default for safety */
-    bs->read_only = true;
+    bdrv_set_read_only(bs, true);
     s->qcow = NULL;
     s->qcow_filename = NULL;
     s->fat2 = NULL;
@@ -XXX,XX +XXX,XX @@ static int vvfat_open(BlockDriverState *bs, QDict *options, int flags,
         if (ret < 0) {
             goto fail;
         }
-        bs->read_only = false;
+        bdrv_set_read_only(bs, false);
     }
 
     bs->total_sectors = cyls * heads * secs;
diff --git a/include/block/block.h b/include/block/block.h
index XXXXXXX..XXXXXXX 100644
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -XXX,XX +XXX,XX @@ int bdrv_is_allocated_above(BlockDriverState *top, BlockDriverState *base,
                             int64_t sector_num, int nb_sectors, int *pnum);
 
 bool bdrv_is_read_only(BlockDriverState *bs);
+void bdrv_set_read_only(BlockDriverState *bs, bool read_only);
 bool bdrv_is_sg(BlockDriverState *bs);
 bool bdrv_is_inserted(BlockDriverState *bs);
 int bdrv_media_changed(BlockDriverState *bs);
-- 
2.9.3

A few block drivers will set the BDS read_only flag from their
.bdrv_open() function.  This means the bs->read_only flag could
be set after we enable copy_on_read, as the BDRV_O_COPY_ON_READ
flag check occurs prior to the call to bdrv->bdrv_open().

This adds an error return to bdrv_set_read_only(), and an error will be
return if we try to set the BDS to read_only while copy_on_read is
enabled.

This patch also changes the behavior of vvfat.  Before, vvfat could
override the drive 'readonly' flag with its own, internal 'rw' flag.

For instance, this -drive parameter would result in a writable image:

"-drive format=vvfat,dir=/tmp/vvfat,rw,if=virtio,readonly=on"

This is not correct.  Now, attempting to use the above -drive parameter
will result in an error (i.e., 'rw' is incompatible with 'readonly=on').

Signed-off-by: Jeff Cody <jcody@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Message-id: 0c5b4c1cc2c651471b131f21376dfd5ea24d2196.1491597120.git.jcody@redhat.com
---
 block.c               | 10 +++++++++-
 block/bochs.c         |  5 ++++-
 block/cloop.c         |  5 ++++-
 block/dmg.c           |  6 +++++-
 block/rbd.c           | 11 ++++++++++-
 block/vvfat.c         | 19 +++++++++++++++----
 include/block/block.h |  2 +-
 7 files changed, 48 insertions(+), 10 deletions(-)

diff --git a/block.c b/block.c
index XXXXXXX..XXXXXXX 100644
--- a/block.c
+++ b/block.c
@@ -XXX,XX +XXX,XX @@ void path_combine(char *dest, int dest_size,
     }
 }
 
-void bdrv_set_read_only(BlockDriverState *bs, bool read_only)
+int bdrv_set_read_only(BlockDriverState *bs, bool read_only, Error **errp)
 {
+    /* Do not set read_only if copy_on_read is enabled */
+    if (bs->copy_on_read && read_only) {
+        error_setg(errp, "Can't set node '%s' to r/o with copy-on-read enabled",
+                   bdrv_get_device_or_node_name(bs));
+        return -EINVAL;
+    }
+
     bs->read_only = read_only;
+    return 0;
 }
 
 void bdrv_get_full_backing_filename_from_filename(const char *backed,
diff --git a/block/bochs.c b/block/bochs.c
index XXXXXXX..XXXXXXX 100644
--- a/block/bochs.c
+++ b/block/bochs.c
@@ -XXX,XX +XXX,XX @@ static int bochs_open(BlockDriverState *bs, QDict *options, int flags,
         return -EINVAL;
     }
 
-    bdrv_set_read_only(bs, true); /* no write support yet */
+    ret = bdrv_set_read_only(bs, true, errp); /* no write support yet */
+    if (ret < 0) {
+        return ret;
+    }
 
     ret = bdrv_pread(bs->file, 0, &bochs, sizeof(bochs));
     if (ret < 0) {
diff --git a/block/cloop.c b/block/cloop.c
index XXXXXXX..XXXXXXX 100644
--- a/block/cloop.c
+++ b/block/cloop.c
@@ -XXX,XX +XXX,XX @@ static int cloop_open(BlockDriverState *bs, QDict *options, int flags,
         return -EINVAL;
     }
 
-    bdrv_set_read_only(bs, true);
+    ret = bdrv_set_read_only(bs, true, errp);
+    if (ret < 0) {
+        return ret;
+    }
 
     /* read header */
     ret = bdrv_pread(bs->file, 128, &s->block_size, 4);
diff --git a/block/dmg.c b/block/dmg.c
index XXXXXXX..XXXXXXX 100644
--- a/block/dmg.c
+++ b/block/dmg.c
@@ -XXX,XX +XXX,XX @@ static int dmg_open(BlockDriverState *bs, QDict *options, int flags,
         return -EINVAL;
     }
 
+    ret = bdrv_set_read_only(bs, true, errp);
+    if (ret < 0) {
+        return ret;
+    }
+
     block_module_load_one("dmg-bz2");
-    bdrv_set_read_only(bs, true);
 
     s->n_chunks = 0;
     s->offsets = s->lengths = s->sectors = s->sectorcounts = NULL;
diff --git a/block/rbd.c b/block/rbd.c
index XXXXXXX..XXXXXXX 100644
--- a/block/rbd.c
+++ b/block/rbd.c
@@ -XXX,XX +XXX,XX @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags,
         goto failed_shutdown;
     }
 
+    /* rbd_open is always r/w */
     r = rbd_open(s->io_ctx, s->name, &s->image, s->snap);
     if (r < 0) {
         error_setg_errno(errp, -r, "error reading header from %s", s->name);
         goto failed_open;
     }
 
-    bdrv_set_read_only(bs, (s->snap != NULL));
+    /* If we are using an rbd snapshot, we must be r/o, otherwise
+     * leave as-is */
+    if (s->snap != NULL) {
+        r = bdrv_set_read_only(bs, true, &local_err);
+        if (r < 0) {
+            error_propagate(errp, local_err);
+            goto failed_open;
+        }
+    }
 
     qemu_opts_del(opts);
     return 0;
diff --git a/block/vvfat.c b/block/vvfat.c
index XXXXXXX..XXXXXXX 100644
--- a/block/vvfat.c
+++ b/block/vvfat.c
@@ -XXX,XX +XXX,XX @@ static int vvfat_open(BlockDriverState *bs, QDict *options, int flags,
 
     s->current_cluster=0xffffffff;
 
-    /* read only is the default for safety */
-    bdrv_set_read_only(bs, true);
     s->qcow = NULL;
     s->qcow_filename = NULL;
     s->fat2 = NULL;
@@ -XXX,XX +XXX,XX @@ static int vvfat_open(BlockDriverState *bs, QDict *options, int flags,
     s->sector_count = cyls * heads * secs - (s->first_sectors_number - 1);
 
     if (qemu_opt_get_bool(opts, "rw", false)) {
-        ret = enable_write_target(bs, errp);
+        if (!bdrv_is_read_only(bs)) {
+            ret = enable_write_target(bs, errp);
+            if (ret < 0) {
+                goto fail;
+            }
+        } else {
+            ret = -EPERM;
+            error_setg(errp,
+                       "Unable to set VVFAT to 'rw' when drive is read-only");
+            goto fail;
+        }
+    } else  {
+        /* read only is the default for safety */
+        ret = bdrv_set_read_only(bs, true, &local_err);
         if (ret < 0) {
+            error_propagate(errp, local_err);
             goto fail;
         }
-        bdrv_set_read_only(bs, false);
     }
 
     bs->total_sectors = cyls * heads * secs;
diff --git a/include/block/block.h b/include/block/block.h
index XXXXXXX..XXXXXXX 100644
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -XXX,XX +XXX,XX @@ int bdrv_is_allocated_above(BlockDriverState *top, BlockDriverState *base,
                             int64_t sector_num, int nb_sectors, int *pnum);
 
 bool bdrv_is_read_only(BlockDriverState *bs);
-void bdrv_set_read_only(BlockDriverState *bs, bool read_only);
+int bdrv_set_read_only(BlockDriverState *bs, bool read_only, Error **errp);
 bool bdrv_is_sg(BlockDriverState *bs);
 bool bdrv_is_inserted(BlockDriverState *bs);
 int bdrv_media_changed(BlockDriverState *bs);
-- 
2.9.3

The BDRV_O_ALLOW_RDWR flag allows / prohibits the changing of
the BDS 'read_only' state, but there are a few places where it
is ignored.  In the bdrv_set_read_only() helper, make sure to
honor the flag.

Signed-off-by: Jeff Cody <jcody@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Message-id: be2e5fb2d285cbece2b6d06bed54a6f56520d251.1491597120.git.jcody@redhat.com
---
 block.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/block.c b/block.c
index XXXXXXX..XXXXXXX 100644
--- a/block.c
+++ b/block.c
@@ -XXX,XX +XXX,XX @@ int bdrv_set_read_only(BlockDriverState *bs, bool read_only, Error **errp)
         return -EINVAL;
     }
 
+    /* Do not clear read_only if it is prohibited */
+    if (!read_only && !(bs->open_flags & BDRV_O_ALLOW_RDWR)) {
+        error_setg(errp, "Node '%s' is read only",
+                   bdrv_get_device_or_node_name(bs));
+        return -EPERM;
+    }
+
     bs->read_only = read_only;
     return 0;
 }
-- 
2.9.3

Move bdrv_is_read_only() up with its friends.

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Signed-off-by: Jeff Cody <jcody@redhat.com>
Message-id: 73b2399459760c32506f9407efb9dddb3a2789de.1491597120.git.jcody@redhat.com
---
 block.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/block.c b/block.c
index XXXXXXX..XXXXXXX 100644
--- a/block.c
+++ b/block.c
@@ -XXX,XX +XXX,XX @@ void path_combine(char *dest, int dest_size,
     }
 }
 
+bool bdrv_is_read_only(BlockDriverState *bs)
+{
+    return bs->read_only;
+}
+
 int bdrv_set_read_only(BlockDriverState *bs, bool read_only, Error **errp)
 {
     /* Do not set read_only if copy_on_read is enabled */
@@ -XXX,XX +XXX,XX @@ void bdrv_get_geometry(BlockDriverState *bs, uint64_t *nb_sectors_ptr)
     *nb_sectors_ptr = nb_sectors < 0 ? 0 : nb_sectors;
 }
 
-bool bdrv_is_read_only(BlockDriverState *bs)
-{
-    return bs->read_only;
-}
-
 bool bdrv_is_sg(BlockDriverState *bs)
 {
     return bs->sg;
-- 
2.9.3

Introduce check function for setting read_only flags.  Will return < 0 on
error, with appropriate Error value set.  Does not alter any flags.

Signed-off-by: Jeff Cody <jcody@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Message-id: e2bba34ac3bc76a0c42adc390413f358ae0566e8.1491597120.git.jcody@redhat.com
---
 block.c               | 14 +++++++++++++-
 include/block/block.h |  1 +
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/block.c b/block.c
index XXXXXXX..XXXXXXX 100644
--- a/block.c
+++ b/block.c
@@ -XXX,XX +XXX,XX @@ bool bdrv_is_read_only(BlockDriverState *bs)
     return bs->read_only;
 }
 
-int bdrv_set_read_only(BlockDriverState *bs, bool read_only, Error **errp)
+int bdrv_can_set_read_only(BlockDriverState *bs, bool read_only, Error **errp)
 {
     /* Do not set read_only if copy_on_read is enabled */
     if (bs->copy_on_read && read_only) {
@@ -XXX,XX +XXX,XX @@ int bdrv_set_read_only(BlockDriverState *bs, bool read_only, Error **errp)
         return -EPERM;
     }
 
+    return 0;
+}
+
+int bdrv_set_read_only(BlockDriverState *bs, bool read_only, Error **errp)
+{
+    int ret = 0;
+
+    ret = bdrv_can_set_read_only(bs, read_only, errp);
+    if (ret < 0) {
+        return ret;
+    }
+
     bs->read_only = read_only;
     return 0;
 }
diff --git a/include/block/block.h b/include/block/block.h
index XXXXXXX..XXXXXXX 100644
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -XXX,XX +XXX,XX @@ int bdrv_is_allocated_above(BlockDriverState *top, BlockDriverState *base,
                             int64_t sector_num, int nb_sectors, int *pnum);
 
 bool bdrv_is_read_only(BlockDriverState *bs);
+int bdrv_can_set_read_only(BlockDriverState *bs, bool read_only, Error **errp);
 int bdrv_set_read_only(BlockDriverState *bs, bool read_only, Error **errp);
 bool bdrv_is_sg(BlockDriverState *bs);
 bool bdrv_is_inserted(BlockDriverState *bs);
-- 
2.9.3

Signed-off-by: Jeff Cody <jcody@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Message-id: 00aed7ffdd7be4b9ed9ce1007d50028a72b34ebe.1491597120.git.jcody@redhat.com
---
 block.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/block.c b/block.c
index XXXXXXX..XXXXXXX 100644
--- a/block.c
+++ b/block.c
@@ -XXX,XX +XXX,XX @@ int bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQueue *queue,
     BlockDriver *drv;
     QemuOpts *opts;
     const char *value;
+    bool read_only;
 
     assert(reopen_state != NULL);
     assert(reopen_state->bs->drv != NULL);
@@ -XXX,XX +XXX,XX @@ int bdrv_reopen_prepare(BDRVReopenState *reopen_state, BlockReopenQueue *queue,
         qdict_put(reopen_state->options, "driver", qstring_from_str(value));
     }
 
-    /* if we are to stay read-only, do not allow permission change
-     * to r/w */
-    if (!(reopen_state->bs->open_flags & BDRV_O_ALLOW_RDWR) &&
-        reopen_state->flags & BDRV_O_RDWR) {
-        error_setg(errp, "Node '%s' is read only",
-                   bdrv_get_device_or_node_name(reopen_state->bs));
+    /* If we are to stay read-only, do not allow permission change
+     * to r/w. Attempting to set to r/w may fail if either BDRV_O_ALLOW_RDWR is
+     * not set, or if the BDS still has copy_on_read enabled */
+    read_only = !(reopen_state->flags & BDRV_O_RDWR);
+    ret = bdrv_can_set_read_only(reopen_state->bs, read_only, &local_err);
+    if (local_err) {
+        error_propagate(errp, local_err);
         goto error;
     }
 
-- 
2.9.3

Update 'clientname' to be 'user', which tracks better with both
the QAPI and rados variable naming.

Update 'name' to be 'image_name', as it indicates the rbd image.
Naming it 'image' would have been ideal, but we are using that for
the rados_image_t value returned by rbd_open().

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Jeff Cody <jcody@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Message-id: b7ec1fb2e1cf36f9b6911631447a5b0422590b7d.1491597120.git.jcody@redhat.com
---
 block/rbd.c | 33 +++++++++++++++++----------------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/block/rbd.c b/block/rbd.c
index XXXXXXX..XXXXXXX 100644
--- a/block/rbd.c
+++ b/block/rbd.c
@@ -XXX,XX +XXX,XX @@ typedef struct BDRVRBDState {
     rados_t cluster;
     rados_ioctx_t io_ctx;
     rbd_image_t image;
-    char *name;
+    char *image_name;
     char *snap;
 } BDRVRBDState;
 
@@ -XXX,XX +XXX,XX @@ static int qemu_rbd_create(const char *filename, QemuOpts *opts, Error **errp)
     int64_t bytes = 0;
     int64_t objsize;
     int obj_order = 0;
-    const char *pool, *name, *conf, *clientname, *keypairs;
+    const char *pool, *image_name, *conf, *user, *keypairs;
     const char *secretid;
     rados_t cluster;
     rados_ioctx_t io_ctx;
@@ -XXX,XX +XXX,XX @@ static int qemu_rbd_create(const char *filename, QemuOpts *opts, Error **errp)
      */
     pool       = qdict_get_try_str(options, "pool");
     conf       = qdict_get_try_str(options, "conf");
-    clientname = qdict_get_try_str(options, "user");
-    name       = qdict_get_try_str(options, "image");
+    user       = qdict_get_try_str(options, "user");
+    image_name = qdict_get_try_str(options, "image");
     keypairs   = qdict_get_try_str(options, "=keyvalue-pairs");
 
-    ret = rados_create(&cluster, clientname);
+    ret = rados_create(&cluster, user);
     if (ret < 0) {
         error_setg_errno(errp, -ret, "error initializing");
         goto exit;
@@ -XXX,XX +XXX,XX @@ static int qemu_rbd_create(const char *filename, QemuOpts *opts, Error **errp)
         goto shutdown;
     }
 
-    ret = rbd_create(io_ctx, name, bytes, &obj_order);
+    ret = rbd_create(io_ctx, image_name, bytes, &obj_order);
     if (ret < 0) {
         error_setg_errno(errp, -ret, "error rbd create");
     }
@@ -XXX,XX +XXX,XX @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags,
                          Error **errp)
 {
     BDRVRBDState *s = bs->opaque;
-    const char *pool, *snap, *conf, *clientname, *name, *keypairs;
+    const char *pool, *snap, *conf, *user, *image_name, *keypairs;
     const char *secretid;
     QemuOpts *opts;
     Error *local_err = NULL;
@@ -XXX,XX +XXX,XX @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags,
     pool           = qemu_opt_get(opts, "pool");
     conf           = qemu_opt_get(opts, "conf");
     snap           = qemu_opt_get(opts, "snapshot");
-    clientname     = qemu_opt_get(opts, "user");
-    name           = qemu_opt_get(opts, "image");
+    user           = qemu_opt_get(opts, "user");
+    image_name     = qemu_opt_get(opts, "image");
     keypairs       = qemu_opt_get(opts, "=keyvalue-pairs");
 
-    if (!pool || !name) {
+    if (!pool || !image_name) {
         error_setg(errp, "Parameters 'pool' and 'image' are required");
         r = -EINVAL;
         goto failed_opts;
     }
 
-    r = rados_create(&s->cluster, clientname);
+    r = rados_create(&s->cluster, user);
     if (r < 0) {
         error_setg_errno(errp, -r, "error initializing");
         goto failed_opts;
     }
 
     s->snap = g_strdup(snap);
-    s->name = g_strdup(name);
+    s->image_name = g_strdup(image_name);
 
     /* try default location when conf=NULL, but ignore failure */
     r = rados_conf_read_file(s->cluster, conf);
@@ -XXX,XX +XXX,XX @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags,
     }
 
     /* rbd_open is always r/w */
-    r = rbd_open(s->io_ctx, s->name, &s->image, s->snap);
+    r = rbd_open(s->io_ctx, s->image_name, &s->image, s->snap);
     if (r < 0) {
-        error_setg_errno(errp, -r, "error reading header from %s", s->name);
+        error_setg_errno(errp, -r, "error reading header from %s",
+                         s->image_name);
         goto failed_open;
     }
 
@@ -XXX,XX +XXX,XX @@ failed_open:
 failed_shutdown:
     rados_shutdown(s->cluster);
     g_free(s->snap);
-    g_free(s->name);
+    g_free(s->image_name);
 failed_opts:
     qemu_opts_del(opts);
     g_free(mon_host);
@@ -XXX,XX +XXX,XX @@ static void qemu_rbd_close(BlockDriverState *bs)
     rbd_close(s->image);
     rados_ioctx_destroy(s->io_ctx);
     g_free(s->snap);
-    g_free(s->name);
+    g_free(s->image_name);
     rados_shutdown(s->cluster);
 }
 
-- 
2.9.3

This adds support for reopen in rbd, for changing between r/w and r/o.

Note, that this is only a flag change, but we will block a change from
r/o to r/w if we are using an RBD internal snapshot.

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Jeff Cody <jcody@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Message-id: d4e87539167ec6527d44c97b164eabcccf96e4f3.1491597120.git.jcody@redhat.com
---
 block/rbd.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/block/rbd.c b/block/rbd.c
index XXXXXXX..XXXXXXX 100644
--- a/block/rbd.c
+++ b/block/rbd.c
@@ -XXX,XX +XXX,XX @@ failed_opts:
     return r;
 }
 
+
+/* Since RBD is currently always opened R/W via the API,
+ * we just need to check if we are using a snapshot or not, in
+ * order to determine if we will allow it to be R/W */
+static int qemu_rbd_reopen_prepare(BDRVReopenState *state,
+                                   BlockReopenQueue *queue, Error **errp)
+{
+    BDRVRBDState *s = state->bs->opaque;
+    int ret = 0;
+
+    if (s->snap && state->flags & BDRV_O_RDWR) {
+        error_setg(errp,
+                   "Cannot change node '%s' to r/w when using RBD snapshot",
+                   bdrv_get_device_or_node_name(state->bs));
+        ret = -EINVAL;
+    }
+
+    return ret;
+}
+
 static void qemu_rbd_close(BlockDriverState *bs)
 {
     BDRVRBDState *s = bs->opaque;
@@ -XXX,XX +XXX,XX @@ static BlockDriver bdrv_rbd = {
     .bdrv_parse_filename    = qemu_rbd_parse_filename,
     .bdrv_file_open         = qemu_rbd_open,
     .bdrv_close             = qemu_rbd_close,
+    .bdrv_reopen_prepare    = qemu_rbd_reopen_prepare,
     .bdrv_create            = qemu_rbd_create,
     .bdrv_has_zero_init     = bdrv_has_zero_init_1,
     .bdrv_get_info          = qemu_rbd_getinfo,
-- 
2.9.3

For the tests that use the common.qemu functions for running a QEMU
process, _cleanup_qemu must be called in the exit function.

If it is not, if the qemu process aborts, then not all of the droppings
are cleaned up (e.g. pidfile, fifos).

This updates those tests that did not have a cleanup in qemu-iotests.

(I swapped spaces for tabs in test 102 as well)

Reported-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Jeff Cody <jcody@redhat.com>
Message-id: d59c2f6ad6c1da8b9b3c7f357c94a7122ccfc55a.1492544096.git.jcody@redhat.com
---
 tests/qemu-iotests/028 |  1 +
 tests/qemu-iotests/094 | 11 ++++++++---
 tests/qemu-iotests/102 |  5 +++--
 tests/qemu-iotests/109 |  1 +
 tests/qemu-iotests/117 |  1 +
 tests/qemu-iotests/130 |  1 +
 tests/qemu-iotests/140 |  1 +
 tests/qemu-iotests/141 |  1 +
 tests/qemu-iotests/143 |  1 +
 tests/qemu-iotests/156 |  1 +
 10 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/tests/qemu-iotests/028 b/tests/qemu-iotests/028
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/028
+++ b/tests/qemu-iotests/028
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 
 _cleanup()
 {
+    _cleanup_qemu
     rm -f "${TEST_IMG}.copy"
     _cleanup_test_img
 }
diff --git a/tests/qemu-iotests/094 b/tests/qemu-iotests/094
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/094
+++ b/tests/qemu-iotests/094
@@ -XXX,XX +XXX,XX @@ echo "QA output created by $seq"
 here="$PWD"
 status=1	# failure is the default!
 
-trap "exit \$status" 0 1 2 3 15
+_cleanup()
+{
+    _cleanup_qemu
+    _cleanup_test_img
+    rm -f "$TEST_DIR/source.$IMGFMT"
+}
+
+trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # get standard environment, filters and checks
 . ./common.rc
@@ -XXX,XX +XXX,XX @@ _send_qemu_cmd $QEMU_HANDLE \
 
 wait=1 _cleanup_qemu
 
-_cleanup_test_img
-rm -f "$TEST_DIR/source.$IMGFMT"
 
 # success, all done
 echo '*** done'
diff --git a/tests/qemu-iotests/102 b/tests/qemu-iotests/102
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/102
+++ b/tests/qemu-iotests/102
@@ -XXX,XX +XXX,XX @@ seq=$(basename $0)
 echo "QA output created by $seq"
 
 here=$PWD
-status=1	# failure is the default!
+status=1    # failure is the default!
 
 _cleanup()
 {
-	_cleanup_test_img
+    _cleanup_qemu
+    _cleanup_test_img
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/109 b/tests/qemu-iotests/109
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/109
+++ b/tests/qemu-iotests/109
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 
 _cleanup()
 {
+    _cleanup_qemu
     rm -f $TEST_IMG.src
 	_cleanup_test_img
 }
diff --git a/tests/qemu-iotests/117 b/tests/qemu-iotests/117
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/117
+++ b/tests/qemu-iotests/117
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 
 _cleanup()
 {
+    _cleanup_qemu
 	_cleanup_test_img
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/130 b/tests/qemu-iotests/130
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/130
+++ b/tests/qemu-iotests/130
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 
 _cleanup()
 {
+    _cleanup_qemu
     _cleanup_test_img
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/140 b/tests/qemu-iotests/140
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/140
+++ b/tests/qemu-iotests/140
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 
 _cleanup()
 {
+    _cleanup_qemu
     _cleanup_test_img
     rm -f "$TEST_DIR/nbd"
 }
diff --git a/tests/qemu-iotests/141 b/tests/qemu-iotests/141
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/141
+++ b/tests/qemu-iotests/141
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 
 _cleanup()
 {
+    _cleanup_qemu
     _cleanup_test_img
     rm -f "$TEST_DIR/{b,m,o}.$IMGFMT"
 }
diff --git a/tests/qemu-iotests/143 b/tests/qemu-iotests/143
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/143
+++ b/tests/qemu-iotests/143
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 
 _cleanup()
 {
+    _cleanup_qemu
     rm -f "$TEST_DIR/nbd"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/156 b/tests/qemu-iotests/156
index XXXXXXX..XXXXXXX 100755
--- a/tests/qemu-iotests/156
+++ b/tests/qemu-iotests/156
@@ -XXX,XX +XXX,XX @@ status=1	# failure is the default!
 
 _cleanup()
 {
+    _cleanup_qemu
     rm -f "$TEST_IMG{,.target}{,.backing,.overlay}"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
-- 
2.9.3

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

-- 
2.29.2

Use the GitLab repo URL as the main repo location in order to reduce
load on qemu.org.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-id: 20210111115017.156802-2-stefanha@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 .github/lockdown.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/lockdown.yml b/.github/lockdown.yml
index XXXXXXX..XXXXXXX 100644
--- a/.github/lockdown.yml
+++ b/.github/lockdown.yml
@@ -XXX,XX +XXX,XX @@ issues:
   comment: |
     Thank you for your interest in the QEMU project.
 
-    This repository is a read-only mirror of the project's master
-    repostories hosted on https://git.qemu.org/git/qemu.git.
+    This repository is a read-only mirror of the project's repostories hosted
+    at https://gitlab.com/qemu-project/qemu.git.
     The project does not process issues filed on GitHub.
 
     The project issues are tracked on Launchpad:
@@ -XXX,XX +XXX,XX @@ pulls:
   comment: |
     Thank you for your interest in the QEMU project.
 
-    This repository is a read-only mirror of the project's master
-    repostories hosted on https://git.qemu.org/git/qemu.git.
+    This repository is a read-only mirror of the project's repostories hosted
+    on https://gitlab.com/qemu-project/qemu.git.
     The project does not process merge requests filed on GitHub.
 
     QEMU welcomes contributions of code (either fixing bugs or adding new
-- 
2.29.2

qemu.org is running out of bandwidth and the QEMU project is moving
towards a gating CI on GitLab. Use the GitLab repos instead of qemu.org
(they will become mirrors).

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20210111115017.156802-3-stefanha@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 .gitmodules | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index XXXXXXX..XXXXXXX 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -XXX,XX +XXX,XX @@
 [submodule "roms/seabios"]
 	path = roms/seabios
-	url = https://git.qemu.org/git/seabios.git/
+	url = https://gitlab.com/qemu-project/seabios.git/
 [submodule "roms/SLOF"]
 	path = roms/SLOF
-	url = https://git.qemu.org/git/SLOF.git
+	url = https://gitlab.com/qemu-project/SLOF.git
 [submodule "roms/ipxe"]
 	path = roms/ipxe
-	url = https://git.qemu.org/git/ipxe.git
+	url = https://gitlab.com/qemu-project/ipxe.git
 [submodule "roms/openbios"]
 	path = roms/openbios
-	url = https://git.qemu.org/git/openbios.git
+	url = https://gitlab.com/qemu-project/openbios.git
 [submodule "roms/qemu-palcode"]
 	path = roms/qemu-palcode
-	url = https://git.qemu.org/git/qemu-palcode.git
+	url = https://gitlab.com/qemu-project/qemu-palcode.git
 [submodule "roms/sgabios"]
 	path = roms/sgabios
-	url = https://git.qemu.org/git/sgabios.git
+	url = https://gitlab.com/qemu-project/sgabios.git
 [submodule "dtc"]
 	path = dtc
-	url = https://git.qemu.org/git/dtc.git
+	url = https://gitlab.com/qemu-project/dtc.git
 [submodule "roms/u-boot"]
 	path = roms/u-boot
-	url = https://git.qemu.org/git/u-boot.git
+	url = https://gitlab.com/qemu-project/u-boot.git
 [submodule "roms/skiboot"]
 	path = roms/skiboot
-	url = https://git.qemu.org/git/skiboot.git
+	url = https://gitlab.com/qemu-project/skiboot.git
 [submodule "roms/QemuMacDrivers"]
 	path = roms/QemuMacDrivers
-	url = https://git.qemu.org/git/QemuMacDrivers.git
+	url = https://gitlab.com/qemu-project/QemuMacDrivers.git
 [submodule "ui/keycodemapdb"]
 	path = ui/keycodemapdb
-	url = https://git.qemu.org/git/keycodemapdb.git
+	url = https://gitlab.com/qemu-project/keycodemapdb.git
 [submodule "capstone"]
 	path = capstone
-	url = https://git.qemu.org/git/capstone.git
+	url = https://gitlab.com/qemu-project/capstone.git
 [submodule "roms/seabios-hppa"]
 	path = roms/seabios-hppa
-	url = https://git.qemu.org/git/seabios-hppa.git
+	url = https://gitlab.com/qemu-project/seabios-hppa.git
 [submodule "roms/u-boot-sam460ex"]
 	path = roms/u-boot-sam460ex
-	url = https://git.qemu.org/git/u-boot-sam460ex.git
+	url = https://gitlab.com/qemu-project/u-boot-sam460ex.git
 [submodule "tests/fp/berkeley-testfloat-3"]
 	path = tests/fp/berkeley-testfloat-3
-	url = https://git.qemu.org/git/berkeley-testfloat-3.git
+	url = https://gitlab.com/qemu-project/berkeley-testfloat-3.git
 [submodule "tests/fp/berkeley-softfloat-3"]
 	path = tests/fp/berkeley-softfloat-3
-	url = https://git.qemu.org/git/berkeley-softfloat-3.git
+	url = https://gitlab.com/qemu-project/berkeley-softfloat-3.git
 [submodule "roms/edk2"]
 	path = roms/edk2
-	url = https://git.qemu.org/git/edk2.git
+	url = https://gitlab.com/qemu-project/edk2.git
 [submodule "slirp"]
 	path = slirp
-	url = https://git.qemu.org/git/libslirp.git
+	url = https://gitlab.com/qemu-project/libslirp.git
 [submodule "roms/opensbi"]
 	path = roms/opensbi
-	url = 	https://git.qemu.org/git/opensbi.git
+	url = 	https://gitlab.com/qemu-project/opensbi.git
 [submodule "roms/qboot"]
 	path = roms/qboot
-	url = https://git.qemu.org/git/qboot.git
+	url = https://gitlab.com/qemu-project/qboot.git
 [submodule "meson"]
 	path = meson
-	url = https://git.qemu.org/git/meson.git
+	url = https://gitlab.com/qemu-project/meson.git
 [submodule "roms/vbootrom"]
 	path = roms/vbootrom
-	url = https://git.qemu.org/git/vbootrom.git
+	url = https://gitlab.com/qemu-project/vbootrom.git
-- 
2.29.2

qemu.org is running out of bandwidth and the QEMU project is moving
towards a gating CI on GitLab. Use the GitLab repos instead of qemu.org
(they will become mirrors).

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20210111115017.156802-5-stefanha@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 README.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.rst b/README.rst
index XXXXXXX..XXXXXXX 100644
--- a/README.rst
+++ b/README.rst
@@ -XXX,XX +XXX,XX @@ The QEMU source code is maintained under the GIT version control system.
 
 .. code-block:: shell
 
-   git clone https://git.qemu.org/git/qemu.git
+   git clone https://gitlab.com/qemu-project/qemu.git
 
 When submitting patches, one common approach is to use 'git
 format-patch' and/or 'git send-email' to format & send the mail to the
@@ -XXX,XX +XXX,XX @@ The QEMU website is also maintained under source control.
 
 .. code-block:: shell
 
-  git clone https://git.qemu.org/git/qemu-web.git
+  git clone https://gitlab.com/qemu-project/qemu-web.git
 
 * `<https://www.qemu.org/2017/02/04/the-new-qemu-website-is-up/>`_
 
-- 
2.29.2

qemu.org is running out of bandwidth and the QEMU project is moving
towards a gating CI on GitLab. Use the GitLab repos instead of qemu.org
(they will become mirrors).

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20210111115017.156802-6-stefanha@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 pc-bios/README | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pc-bios/README b/pc-bios/README
index XXXXXXX..XXXXXXX 100644
--- a/pc-bios/README
+++ b/pc-bios/README
@@ -XXX,XX +XXX,XX @@
   legacy x86 software to communicate with an attached serial console as
   if a video card were attached.  The master sources reside in a subversion
   repository at http://sgabios.googlecode.com/svn/trunk.  A git mirror is
-  available at https://git.qemu.org/git/sgabios.git.
+  available at https://gitlab.com/qemu-project/sgabios.git.
 
 - The PXE roms come from the iPXE project. Built with BANNER_TIME 0.
   Sources available at http://ipxe.org.  Vendor:Device ID -> ROM mapping:
@@ -XXX,XX +XXX,XX @@
 
 - The u-boot binary for e500 comes from the upstream denx u-boot project where
   it was compiled using the qemu-ppce500 target.
-  A git mirror is available at: https://git.qemu.org/git/u-boot.git
+  A git mirror is available at: https://gitlab.com/qemu-project/u-boot.git
   The hash used to compile the current version is: 2072e72
 
 - Skiboot (https://github.com/open-power/skiboot/) is an OPAL
-- 
2.29.2

qemu.org is running out of bandwidth and the QEMU project is moving
towards a gating CI on GitLab. Use the GitLab repos instead of qemu.org
(they will become mirrors).

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20210111115017.156802-7-stefanha@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 scripts/get_maintainer.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/get_maintainer.pl b/scripts/get_maintainer.pl
index XXXXXXX..XXXXXXX 100755
--- a/scripts/get_maintainer.pl
+++ b/scripts/get_maintainer.pl
@@ -XXX,XX +XXX,XX @@ sub vcs_exists {
 	warn("$P: No supported VCS found.  Add --nogit to options?\n");
 	warn("Using a git repository produces better results.\n");
 	warn("Try latest git repository using:\n");
-	warn("git clone https://git.qemu.org/git/qemu.git\n");
+	warn("git clone https://gitlab.com/qemu-project/qemu.git\n");
 	$printed_novcs = 1;
     }
     return 0;
-- 
2.29.2

From: John G Johnson <john.g.johnson@oracle.com>

Signed-off-by: John G Johnson <john.g.johnson@oracle.com>
Signed-off-by: Elena Ufimtseva <elena.ufimtseva@oracle.com>
Signed-off-by: Jagannathan Raman <jag.raman@oracle.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 02a68adef99f5df6a380bf8fd7b90948777e411c.1611938319.git.jag.raman@oracle.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 MAINTAINERS                  |   7 +
 docs/devel/index.rst         |   1 +
 docs/devel/multi-process.rst | 966 +++++++++++++++++++++++++++++++++++
 3 files changed, 974 insertions(+)
 create mode 100644 docs/devel/multi-process.rst

diff --git a/MAINTAINERS b/MAINTAINERS
index XXXXXXX..XXXXXXX 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -XXX,XX +XXX,XX @@ S: Maintained
 F: hw/semihosting/
 F: include/hw/semihosting/
 
+Multi-process QEMU
+M: Elena Ufimtseva <elena.ufimtseva@oracle.com>
+M: Jagannathan Raman <jag.raman@oracle.com>
+M: John G Johnson <john.g.johnson@oracle.com>
+S: Maintained
+F: docs/devel/multi-process.rst
+
 Build and test automation
 -------------------------
 Build and test automation
diff --git a/docs/devel/index.rst b/docs/devel/index.rst
index XXXXXXX..XXXXXXX 100644
--- a/docs/devel/index.rst
+++ b/docs/devel/index.rst
@@ -XXX,XX +XXX,XX @@ Contents:
    clocks
    qom
    block-coroutine-wrapper
+   multi-process
diff --git a/docs/devel/multi-process.rst b/docs/devel/multi-process.rst
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/docs/devel/multi-process.rst
@@ -XXX,XX +XXX,XX @@
+This is the design document for multi-process QEMU. It does not
+necessarily reflect the status of the current implementation, which
+may lack features or be considerably different from what is described
+in this document. This document is still useful as a description of
+the goals and general direction of this feature.
+
+Please refer to the following wiki for latest details:
+https://wiki.qemu.org/Features/MultiProcessQEMU
+
+Multi-process QEMU
+===================
+
+QEMU is often used as the hypervisor for virtual machines running in the
+Oracle cloud. Since one of the advantages of cloud computing is the
+ability to run many VMs from different tenants in the same cloud
+infrastructure, a guest that compromised its hypervisor could
+potentially use the hypervisor's access privileges to access data it is
+not authorized for.
+
+QEMU can be susceptible to security attacks because it is a large,
+monolithic program that provides many features to the VMs it services.
+Many of these features can be configured out of QEMU, but even a reduced
+configuration QEMU has a large amount of code a guest can potentially
+attack. Separating QEMU reduces the attack surface by aiding to
+limit each component in the system to only access the resources that
+it needs to perform its job.
+
+QEMU services
+-------------
+
+QEMU can be broadly described as providing three main services. One is a
+VM control point, where VMs can be created, migrated, re-configured, and
+destroyed. A second is to emulate the CPU instructions within the VM,
+often accelerated by HW virtualization features such as Intel's VT
+extensions. Finally, it provides IO services to the VM by emulating HW
+IO devices, such as disk and network devices.
+
+A multi-process QEMU
+~~~~~~~~~~~~~~~~~~~~
+
+A multi-process QEMU involves separating QEMU services into separate
+host processes. Each of these processes can be given only the privileges
+it needs to provide its service, e.g., a disk service could be given
+access only to the disk images it provides, and not be allowed to
+access other files, or any network devices. An attacker who compromised
+this service would not be able to use this exploit to access files or
+devices beyond what the disk service was given access to.
+
+A QEMU control process would remain, but in multi-process mode, will
+have no direct interfaces to the VM. During VM execution, it would still
+provide the user interface to hot-plug devices or live migrate the VM.
+
+A first step in creating a multi-process QEMU is to separate IO services
+from the main QEMU program, which would continue to provide CPU
+emulation. i.e., the control process would also be the CPU emulation
+process. In a later phase, CPU emulation could be separated from the
+control process.
+
+Separating IO services
+----------------------
+
+Separating IO services into individual host processes is a good place to
+begin for a couple of reasons. One is the sheer number of IO devices QEMU
+can emulate provides a large surface of interfaces which could potentially
+be exploited, and, indeed, have been a source of exploits in the past.
+Another is the modular nature of QEMU device emulation code provides
+interface points where the QEMU functions that perform device emulation
+can be separated from the QEMU functions that manage the emulation of
+guest CPU instructions. The devices emulated in the separate process are
+referred to as remote devices.
+
+QEMU device emulation
+~~~~~~~~~~~~~~~~~~~~~
+
+QEMU uses an object oriented SW architecture for device emulation code.
+Configured objects are all compiled into the QEMU binary, then objects
+are instantiated by name when used by the guest VM. For example, the
+code to emulate a device named "foo" is always present in QEMU, but its
+instantiation code is only run when the device is included in the target
+VM. (e.g., via the QEMU command line as *-device foo*)
+
+The object model is hierarchical, so device emulation code names its
+parent object (such as "pci-device" for a PCI device) and QEMU will
+instantiate a parent object before calling the device's instantiation
+code.
+
+Current separation models
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+In order to separate the device emulation code from the CPU emulation
+code, the device object code must run in a different process. There are
+a couple of existing QEMU features that can run emulation code
+separately from the main QEMU process. These are examined below.
+
+vhost user model
+^^^^^^^^^^^^^^^^
+
+Virtio guest device drivers can be connected to vhost user applications
+in order to perform their IO operations. This model uses special virtio
+device drivers in the guest and vhost user device objects in QEMU, but
+once the QEMU vhost user code has configured the vhost user application,
+mission-mode IO is performed by the application. The vhost user
+application is a daemon process that can be contacted via a known UNIX
+domain socket.
+
+vhost socket
+''''''''''''
+
+As mentioned above, one of the tasks of the vhost device object within
+QEMU is to contact the vhost application and send it configuration
+information about this device instance. As part of the configuration
+process, the application can also be sent other file descriptors over
+the socket, which then can be used by the vhost user application in
+various ways, some of which are described below.
+
+vhost MMIO store acceleration
+'''''''''''''''''''''''''''''
+
+VMs are often run using HW virtualization features via the KVM kernel
+driver. This driver allows QEMU to accelerate the emulation of guest CPU
+instructions by running the guest in a virtual HW mode. When the guest
+executes instructions that cannot be executed by virtual HW mode,
+execution returns to the KVM driver so it can inform QEMU to emulate the
+instructions in SW.
+
+One of the events that can cause a return to QEMU is when a guest device
+driver accesses an IO location. QEMU then dispatches the memory
+operation to the corresponding QEMU device object. In the case of a
+vhost user device, the memory operation would need to be sent over a
+socket to the vhost application. This path is accelerated by the QEMU
+virtio code by setting up an eventfd file descriptor that the vhost
+application can directly receive MMIO store notifications from the KVM
+driver, instead of needing them to be sent to the QEMU process first.
+
+vhost interrupt acceleration
+''''''''''''''''''''''''''''
+
+Another optimization used by the vhost application is the ability to
+directly inject interrupts into the VM via the KVM driver, again,
+bypassing the need to send the interrupt back to the QEMU process first.
+The QEMU virtio setup code configures the KVM driver with an eventfd
+that triggers the device interrupt in the guest when the eventfd is
+written. This irqfd file descriptor is then passed to the vhost user
+application program.
+
+vhost access to guest memory
+''''''''''''''''''''''''''''
+
+The vhost application is also allowed to directly access guest memory,
+instead of needing to send the data as messages to QEMU. This is also
+done with file descriptors sent to the vhost user application by QEMU.
+These descriptors can be passed to ``mmap()`` by the vhost application
+to map the guest address space into the vhost application.
+
+IOMMUs introduce another level of complexity, since the address given to
+the guest virtio device to DMA to or from is not a guest physical
+address. This case is handled by having vhost code within QEMU register
+as a listener for IOMMU mapping changes. The vhost application maintains
+a cache of IOMMMU translations: sending translation requests back to
+QEMU on cache misses, and in turn receiving flush requests from QEMU
+when mappings are purged.
+
+applicability to device separation
+''''''''''''''''''''''''''''''''''
+
+Much of the vhost model can be re-used by separated device emulation. In
+particular, the ideas of using a socket between QEMU and the device
+emulation application, using a file descriptor to inject interrupts into
+the VM via KVM, and allowing the application to ``mmap()`` the guest
+should be re used.
+
+There are, however, some notable differences between how a vhost
+application works and the needs of separated device emulation. The most
+basic is that vhost uses custom virtio device drivers which always
+trigger IO with MMIO stores. A separated device emulation model must
+work with existing IO device models and guest device drivers. MMIO loads
+break vhost store acceleration since they are synchronous - guest
+progress cannot continue until the load has been emulated. By contrast,
+stores are asynchronous, the guest can continue after the store event
+has been sent to the vhost application.
+
+Another difference is that in the vhost user model, a single daemon can
+support multiple QEMU instances. This is contrary to the security regime
+desired, in which the emulation application should only be allowed to
+access the files or devices the VM it's running on behalf of can access.
+#### qemu-io model
+
+Qemu-io is a test harness used to test changes to the QEMU block backend
+object code. (e.g., the code that implements disk images for disk driver
+emulation) Qemu-io is not a device emulation application per se, but it
+does compile the QEMU block objects into a separate binary from the main
+QEMU one. This could be useful for disk device emulation, since its
+emulation applications will need to include the QEMU block objects.
+
+New separation model based on proxy objects
+-------------------------------------------
+
+A different model based on proxy objects in the QEMU program
+communicating with remote emulation programs could provide separation
+while minimizing the changes needed to the device emulation code. The
+rest of this section is a discussion of how a proxy object model would
+work.
+
+Remote emulation processes
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The remote emulation process will run the QEMU object hierarchy without
+modification. The device emulation objects will be also be based on the
+QEMU code, because for anything but the simplest device, it would not be
+a tractable to re-implement both the object model and the many device
+backends that QEMU has.
+
+The processes will communicate with the QEMU process over UNIX domain
+sockets. The processes can be executed either as standalone processes,
+or be executed by QEMU. In both cases, the host backends the emulation
+processes will provide are specified on its command line, as they would
+be for QEMU. For example:
+
+::
+
+    disk-proc -blockdev driver=file,node-name=file0,filename=disk-file0  \
+    -blockdev driver=qcow2,node-name=drive0,file=file0
+
+would indicate process *disk-proc* uses a qcow2 emulated disk named
+*file0* as its backend.
+
+Emulation processes may emulate more than one guest controller. A common
+configuration might be to put all controllers of the same device class
+(e.g., disk, network, etc.) in a single process, so that all backends of
+the same type can be managed by a single QMP monitor.
+
+communication with QEMU
+^^^^^^^^^^^^^^^^^^^^^^^
+
+The first argument to the remote emulation process will be a Unix domain
+socket that connects with the Proxy object. This is a required argument.
+
+::
+
+    disk-proc <socket number> <backend list>
+
+remote process QMP monitor
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Remote emulation processes can be monitored via QMP, similar to QEMU
+itself. The QMP monitor socket is specified the same as for a QEMU
+process:
+
+::
+
+    disk-proc -qmp unix:/tmp/disk-mon,server
+
+can be monitored over the UNIX socket path */tmp/disk-mon*.
+
+QEMU command line
+~~~~~~~~~~~~~~~~~
+
+Each remote device emulated in a remote process on the host is
+represented as a *-device* of type *pci-proxy-dev*. A socket
+sub-option to this option specifies the Unix socket that connects
+to the remote process. An *id* sub-option is required, and it should
+be the same id as used in the remote process.
+
+::
+
+    qemu-system-x86_64 ... -device pci-proxy-dev,id=lsi0,socket=3
+
+can be used to add a device emulated in a remote process
+
+
+QEMU management of remote processes
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+QEMU is not aware of the type of type of the remote PCI device. It is
+a pass through device as far as QEMU is concerned.
+
+communication with emulation process
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+primary channel
+'''''''''''''''
+
+The primary channel (referred to as com in the code) is used to bootstrap
+the remote process. It is also used to pass on device-agnostic commands
+like reset.
+
+per-device channels
+'''''''''''''''''''
+
+Each remote device communicates with QEMU using a dedicated communication
+channel. The proxy object sets up this channel using the primary
+channel during its initialization.
+
+QEMU device proxy objects
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+QEMU has an object model based on sub-classes inherited from the
+"object" super-class. The sub-classes that are of interest here are the
+"device" and "bus" sub-classes whose child sub-classes make up the
+device tree of a QEMU emulated system.
+
+The proxy object model will use device proxy objects to replace the
+device emulation code within the QEMU process. These objects will live
+in the same place in the object and bus hierarchies as the objects they
+replace. i.e., the proxy object for an LSI SCSI controller will be a
+sub-class of the "pci-device" class, and will have the same PCI bus
+parent and the same SCSI bus child objects as the LSI controller object
+it replaces.
+
+It is worth noting that the same proxy object is used to mediate with
+all types of remote PCI devices.
+
+object initialization
+^^^^^^^^^^^^^^^^^^^^^
+
+The Proxy device objects are initialized in the exact same manner in
+which any other QEMU device would be initialized.
+
+In addition, the Proxy objects perform the following two tasks:
+- Parses the "socket" sub option and connects to the remote process
+using this channel
+- Uses the "id" sub-option to connect to the emulated device on the
+separate process
+
+class\_init
+'''''''''''
+
+The ``class_init()`` method of a proxy object will, in general behave
+similarly to the object it replaces, including setting any static
+properties and methods needed by the proxy.
+
+instance\_init / realize
+''''''''''''''''''''''''
+
+The ``instance_init()`` and ``realize()`` functions would only need to
+perform tasks related to being a proxy, such are registering its own
+MMIO handlers, or creating a child bus that other proxy devices can be
+attached to later.
+
+Other tasks will be device-specific. For example, PCI device objects
+will initialize the PCI config space in order to make a valid PCI device
+tree within the QEMU process.
+
+address space registration
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Most devices are driven by guest device driver accesses to IO addresses
+or ports. The QEMU device emulation code uses QEMU's memory region
+function calls (such as ``memory_region_init_io()``) to add callback
+functions that QEMU will invoke when the guest accesses the device's
+areas of the IO address space. When a guest driver does access the
+device, the VM will exit HW virtualization mode and return to QEMU,
+which will then lookup and execute the corresponding callback function.
+
+A proxy object would need to mirror the memory region calls the actual
+device emulator would perform in its initialization code, but with its
+own callbacks. When invoked by QEMU as a result of a guest IO operation,
+they will forward the operation to the device emulation process.
+
+PCI config space
+^^^^^^^^^^^^^^^^
+
+PCI devices also have a configuration space that can be accessed by the
+guest driver. Guest accesses to this space is not handled by the device
+emulation object, but by its PCI parent object. Much of this space is
+read-only, but certain registers (especially BAR and MSI-related ones)
+need to be propagated to the emulation process.
+
+PCI parent proxy
+''''''''''''''''
+
+One way to propagate guest PCI config accesses is to create a
+"pci-device-proxy" class that can serve as the parent of a PCI device
+proxy object. This class's parent would be "pci-device" and it would
+override the PCI parent's ``config_read()`` and ``config_write()``
+methods with ones that forward these operations to the emulation
+program.
+
+interrupt receipt
+^^^^^^^^^^^^^^^^^
+
+A proxy for a device that generates interrupts will need to create a
+socket to receive interrupt indications from the emulation process. An
+incoming interrupt indication would then be sent up to its bus parent to
+be injected into the guest. For example, a PCI device object may use
+``pci_set_irq()``.
+
+live migration
+^^^^^^^^^^^^^^
+
+The proxy will register to save and restore any *vmstate* it needs over
+a live migration event. The device proxy does not need to manage the
+remote device's *vmstate*; that will be handled by the remote process
+proxy (see below).
+
+QEMU remote device operation
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Generic device operations, such as DMA, will be performed by the remote
+process proxy by sending messages to the remote process.
+
+DMA operations
+^^^^^^^^^^^^^^
+
+DMA operations would be handled much like vhost applications do. One of
+the initial messages sent to the emulation process is a guest memory
+table. Each entry in this table consists of a file descriptor and size
+that the emulation process can ``mmap()`` to directly access guest
+memory, similar to ``vhost_user_set_mem_table()``. Note guest memory
+must be backed by file descriptors, such as when QEMU is given the
+*-mem-path* command line option.
+
+IOMMU operations
+^^^^^^^^^^^^^^^^
+
+When the emulated system includes an IOMMU, the remote process proxy in
+QEMU will need to create a socket for IOMMU requests from the emulation
+process. It will handle those requests with an
+``address_space_get_iotlb_entry()`` call. In order to handle IOMMU
+unmaps, the remote process proxy will also register as a listener on the
+device's DMA address space. When an IOMMU memory region is created
+within the DMA address space, an IOMMU notifier for unmaps will be added
+to the memory region that will forward unmaps to the emulation process
+over the IOMMU socket.
+
+device hot-plug via QMP
+^^^^^^^^^^^^^^^^^^^^^^^
+
+An QMP "device\_add" command can add a device emulated by a remote
+process. It will also have "rid" option to the command, just as the
+*-device* command line option does. The remote process may either be one
+started at QEMU startup, or be one added by the "add-process" QMP
+command described above. In either case, the remote process proxy will
+forward the new device's JSON description to the corresponding emulation
+process.
+
+live migration
+^^^^^^^^^^^^^^
+
+The remote process proxy will also register for live migration
+notifications with ``vmstate_register()``. When called to save state,
+the proxy will send the remote process a secondary socket file
+descriptor to save the remote process's device *vmstate* over. The
+incoming byte stream length and data will be saved as the proxy's
+*vmstate*. When the proxy is resumed on its new host, this *vmstate*
+will be extracted, and a secondary socket file descriptor will be sent
+to the new remote process through which it receives the *vmstate* in
+order to restore the devices there.
+
+device emulation in remote process
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The parts of QEMU that the emulation program will need include the
+object model; the memory emulation objects; the device emulation objects
+of the targeted device, and any dependent devices; and, the device's
+backends. It will also need code to setup the machine environment,
+handle requests from the QEMU process, and route machine-level requests
+(such as interrupts or IOMMU mappings) back to the QEMU process.
+
+initialization
+^^^^^^^^^^^^^^
+
+The process initialization sequence will follow the same sequence
+followed by QEMU. It will first initialize the backend objects, then
+device emulation objects. The JSON descriptions sent by the QEMU process
+will drive which objects need to be created.
+
+-  address spaces
+
+Before the device objects are created, the initial address spaces and
+memory regions must be configured with ``memory_map_init()``. This
+creates a RAM memory region object (*system\_memory*) and an IO memory
+region object (*system\_io*).
+
+-  RAM
+
+RAM memory region creation will follow how ``pc_memory_init()`` creates
+them, but must use ``memory_region_init_ram_from_fd()`` instead of
+``memory_region_allocate_system_memory()``. The file descriptors needed
+will be supplied by the guest memory table from above. Those RAM regions
+would then be added to the *system\_memory* memory region with
+``memory_region_add_subregion()``.
+
+-  PCI
+
+IO initialization will be driven by the JSON descriptions sent from the
+QEMU process. For a PCI device, a PCI bus will need to be created with
+``pci_root_bus_new()``, and a PCI memory region will need to be created
+and added to the *system\_memory* memory region with
+``memory_region_add_subregion_overlap()``. The overlap version is
+required for architectures where PCI memory overlaps with RAM memory.
+
+MMIO handling
+^^^^^^^^^^^^^
+
+The device emulation objects will use ``memory_region_init_io()`` to
+install their MMIO handlers, and ``pci_register_bar()`` to associate
+those handlers with a PCI BAR, as they do within QEMU currently.
+
+In order to use ``address_space_rw()`` in the emulation process to
+handle MMIO requests from QEMU, the PCI physical addresses must be the
+same in the QEMU process and the device emulation process. In order to
+accomplish that, guest BAR programming must also be forwarded from QEMU
+to the emulation process.
+
+interrupt injection
+^^^^^^^^^^^^^^^^^^^
+
+When device emulation wants to inject an interrupt into the VM, the
+request climbs the device's bus object hierarchy until the point where a
+bus object knows how to signal the interrupt to the guest. The details
+depend on the type of interrupt being raised.
+
+-  PCI pin interrupts
+
+On x86 systems, there is an emulated IOAPIC object attached to the root
+PCI bus object, and the root PCI object forwards interrupt requests to
+it. The IOAPIC object, in turn, calls the KVM driver to inject the
+corresponding interrupt into the VM. The simplest way to handle this in
+an emulation process would be to setup the root PCI bus driver (via
+``pci_bus_irqs()``) to send a interrupt request back to the QEMU
+process, and have the device proxy object reflect it up the PCI tree
+there.
+
+-  PCI MSI/X interrupts
+
+PCI MSI/X interrupts are implemented in HW as DMA writes to a
+CPU-specific PCI address. In QEMU on x86, a KVM APIC object receives
+these DMA writes, then calls into the KVM driver to inject the interrupt
+into the VM. A simple emulation process implementation would be to send
+the MSI DMA address from QEMU as a message at initialization, then
+install an address space handler at that address which forwards the MSI
+message back to QEMU.
+
+DMA operations
+^^^^^^^^^^^^^^
+
+When a emulation object wants to DMA into or out of guest memory, it
+first must use dma\_memory\_map() to convert the DMA address to a local
+virtual address. The emulation process memory region objects setup above
+will be used to translate the DMA address to a local virtual address the
+device emulation code can access.
+
+IOMMU
+^^^^^
+
+When an IOMMU is in use in QEMU, DMA translation uses IOMMU memory
+regions to translate the DMA address to a guest physical address before
+that physical address can be translated to a local virtual address. The
+emulation process will need similar functionality.
+
+-  IOTLB cache
+
+The emulation process will maintain a cache of recent IOMMU translations
+(the IOTLB). When the translate() callback of an IOMMU memory region is
+invoked, the IOTLB cache will be searched for an entry that will map the
+DMA address to a guest PA. On a cache miss, a message will be sent back
+to QEMU requesting the corresponding translation entry, which be both be
+used to return a guest address and be added to the cache.
+
+-  IOTLB purge
+
+The IOMMU emulation will also need to act on unmap requests from QEMU.
+These happen when the guest IOMMU driver purges an entry from the
+guest's translation table.
+
+live migration
+^^^^^^^^^^^^^^
+
+When a remote process receives a live migration indication from QEMU, it
+will set up a channel using the received file descriptor with
+``qio_channel_socket_new_fd()``. This channel will be used to create a
+*QEMUfile* that can be passed to ``qemu_save_device_state()`` to send
+the process's device state back to QEMU. This method will be reversed on
+restore - the channel will be passed to ``qemu_loadvm_state()`` to
+restore the device state.
+
+Accelerating device emulation
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The messages that are required to be sent between QEMU and the emulation
+process can add considerable latency to IO operations. The optimizations
+described below attempt to ameliorate this effect by allowing the
+emulation process to communicate directly with the kernel KVM driver.
+The KVM file descriptors created would be passed to the emulation process
+via initialization messages, much like the guest memory table is done.
+#### MMIO acceleration
+
+Vhost user applications can receive guest virtio driver stores directly
+from KVM. The issue with the eventfd mechanism used by vhost user is
+that it does not pass any data with the event indication, so it cannot
+handle guest loads or guest stores that carry store data. This concept
+could, however, be expanded to cover more cases.
+
+The expanded idea would require a new type of KVM device:
+*KVM\_DEV\_TYPE\_USER*. This device has two file descriptors: a master
+descriptor that QEMU can use for configuration, and a slave descriptor
+that the emulation process can use to receive MMIO notifications. QEMU
+would create both descriptors using the KVM driver, and pass the slave
+descriptor to the emulation process via an initialization message.
+
+data structures
+^^^^^^^^^^^^^^^
+
+-  guest physical range
+
+The guest physical range structure describes the address range that a
+device will respond to. It includes the base and length of the range, as
+well as which bus the range resides on (e.g., on an x86machine, it can
+specify whether the range refers to memory or IO addresses).
+
+A device can have multiple physical address ranges it responds to (e.g.,
+a PCI device can have multiple BARs), so the structure will also include
+an enumerated identifier to specify which of the device's ranges is
+being referred to.
+
++--------+----------------------------+
+| Name   | Description                |
++========+============================+
+| addr   | range base address         |
++--------+----------------------------+
+| len    | range length               |
++--------+----------------------------+
+| bus    | addr type (memory or IO)   |
++--------+----------------------------+
+| id     | range ID (e.g., PCI BAR)   |
++--------+----------------------------+
+
+-  MMIO request structure
+
+This structure describes an MMIO operation. It includes which guest
+physical range the MMIO was within, the offset within that range, the
+MMIO type (e.g., load or store), and its length and data. It also
+includes a sequence number that can be used to reply to the MMIO, and
+the CPU that issued the MMIO.
+
++----------+------------------------+
+| Name     | Description            |
++==========+========================+
+| rid      | range MMIO is within   |
++----------+------------------------+
+| offset   | offset withing *rid*   |
++----------+------------------------+
+| type     | e.g., load or store    |
++----------+------------------------+
+| len      | MMIO length            |
++----------+------------------------+
+| data     | store data             |
++----------+------------------------+
+| seq      | sequence ID            |
++----------+------------------------+
+
+-  MMIO request queues
+
+MMIO request queues are FIFO arrays of MMIO request structures. There
+are two queues: pending queue is for MMIOs that haven't been read by the
+emulation program, and the sent queue is for MMIOs that haven't been
+acknowledged. The main use of the second queue is to validate MMIO
+replies from the emulation program.
+
+-  scoreboard
+
+Each CPU in the VM is emulated in QEMU by a separate thread, so multiple
+MMIOs may be waiting to be consumed by an emulation program and multiple
+threads may be waiting for MMIO replies. The scoreboard would contain a
+wait queue and sequence number for the per-CPU threads, allowing them to
+be individually woken when the MMIO reply is received from the emulation
+program. It also tracks the number of posted MMIO stores to the device
+that haven't been replied to, in order to satisfy the PCI constraint
+that a load to a device will not complete until all previous stores to
+that device have been completed.
+
+-  device shadow memory
+
+Some MMIO loads do not have device side-effects. These MMIOs can be
+completed without sending a MMIO request to the emulation program if the
+emulation program shares a shadow image of the device's memory image
+with the KVM driver.
+
+The emulation program will ask the KVM driver to allocate memory for the
+shadow image, and will then use ``mmap()`` to directly access it. The
+emulation program can control KVM access to the shadow image by sending
+KVM an access map telling it which areas of the image have no
+side-effects (and can be completed immediately), and which require a
+MMIO request to the emulation program. The access map can also inform
+the KVM drive which size accesses are allowed to the image.
+
+master descriptor
+^^^^^^^^^^^^^^^^^
+
+The master descriptor is used by QEMU to configure the new KVM device.
+The descriptor would be returned by the KVM driver when QEMU issues a
+*KVM\_CREATE\_DEVICE* ``ioctl()`` with a *KVM\_DEV\_TYPE\_USER* type.
+
+KVM\_DEV\_TYPE\_USER device ops
+
+
+The *KVM\_DEV\_TYPE\_USER* operations vector will be registered by a
+``kvm_register_device_ops()`` call when the KVM system in initialized by
+``kvm_init()``. These device ops are called by the KVM driver when QEMU
+executes certain ``ioctl()`` operations on its KVM file descriptor. They
+include:
+
+-  create
+
+This routine is called when QEMU issues a *KVM\_CREATE\_DEVICE*
+``ioctl()`` on its per-VM file descriptor. It will allocate and
+initialize a KVM user device specific data structure, and assign the
+*kvm\_device* private field to it.
+
+-  ioctl
+
+This routine is invoked when QEMU issues an ``ioctl()`` on the master
+descriptor. The ``ioctl()`` commands supported are defined by the KVM
+device type. *KVM\_DEV\_TYPE\_USER* ones will need several commands:
+
+*KVM\_DEV\_USER\_SLAVE\_FD* creates the slave file descriptor that will
+be passed to the device emulation program. Only one slave can be created
+by each master descriptor. The file operations performed by this
+descriptor are described below.
+
+The *KVM\_DEV\_USER\_PA\_RANGE* command configures a guest physical
+address range that the slave descriptor will receive MMIO notifications
+for. The range is specified by a guest physical range structure
+argument. For buses that assign addresses to devices dynamically, this
+command can be executed while the guest is running, such as the case
+when a guest changes a device's PCI BAR registers.
+
+*KVM\_DEV\_USER\_PA\_RANGE* will use ``kvm_io_bus_register_dev()`` to
+register *kvm\_io\_device\_ops* callbacks to be invoked when the guest
+performs a MMIO operation within the range. When a range is changed,
+``kvm_io_bus_unregister_dev()`` is used to remove the previous
+instantiation.
+
+*KVM\_DEV\_USER\_TIMEOUT* will configure a timeout value that specifies
+how long KVM will wait for the emulation process to respond to a MMIO
+indication.
+
+-  destroy
+
+This routine is called when the VM instance is destroyed. It will need
+to destroy the slave descriptor; and free any memory allocated by the
+driver, as well as the *kvm\_device* structure itself.
+
+slave descriptor
+^^^^^^^^^^^^^^^^
+
+The slave descriptor will have its own file operations vector, which
+responds to system calls on the descriptor performed by the device
+emulation program.
+
+-  read
+
+A read returns any pending MMIO requests from the KVM driver as MMIO
+request structures. Multiple structures can be returned if there are
+multiple MMIO operations pending. The MMIO requests are moved from the
+pending queue to the sent queue, and if there are threads waiting for
+space in the pending to add new MMIO operations, they will be woken
+here.
+
+-  write
+
+A write also consists of a set of MMIO requests. They are compared to
+the MMIO requests in the sent queue. Matches are removed from the sent
+queue, and any threads waiting for the reply are woken. If a store is
+removed, then the number of posted stores in the per-CPU scoreboard is
+decremented. When the number is zero, and a non side-effect load was
+waiting for posted stores to complete, the load is continued.
+
+-  ioctl
+
+There are several ioctl()s that can be performed on the slave
+descriptor.
+
+A *KVM\_DEV\_USER\_SHADOW\_SIZE* ``ioctl()`` causes the KVM driver to
+allocate memory for the shadow image. This memory can later be
+``mmap()``\ ed by the emulation process to share the emulation's view of
+device memory with the KVM driver.
+
+A *KVM\_DEV\_USER\_SHADOW\_CTRL* ``ioctl()`` controls access to the
+shadow image. It will send the KVM driver a shadow control map, which
+specifies which areas of the image can complete guest loads without
+sending the load request to the emulation program. It will also specify
+the size of load operations that are allowed.
+
+-  poll
+
+An emulation program will use the ``poll()`` call with a *POLLIN* flag
+to determine if there are MMIO requests waiting to be read. It will
+return if the pending MMIO request queue is not empty.
+
+-  mmap
+
+This call allows the emulation program to directly access the shadow
+image allocated by the KVM driver. As device emulation updates device
+memory, changes with no side-effects will be reflected in the shadow,
+and the KVM driver can satisfy guest loads from the shadow image without
+needing to wait for the emulation program.
+
+kvm\_io\_device ops
+^^^^^^^^^^^^^^^^^^^
+
+Each KVM per-CPU thread can handle MMIO operation on behalf of the guest
+VM. KVM will use the MMIO's guest physical address to search for a
+matching *kvm\_io\_device* to see if the MMIO can be handled by the KVM
+driver instead of exiting back to QEMU. If a match is found, the
+corresponding callback will be invoked.
+
+-  read
+
+This callback is invoked when the guest performs a load to the device.
+Loads with side-effects must be handled synchronously, with the KVM
+driver putting the QEMU thread to sleep waiting for the emulation
+process reply before re-starting the guest. Loads that do not have
+side-effects may be optimized by satisfying them from the shadow image,
+if there are no outstanding stores to the device by this CPU. PCI memory
+ordering demands that a load cannot complete before all older stores to
+the same device have been completed.
+
+-  write
+
+Stores can be handled asynchronously unless the pending MMIO request
+queue is full. In this case, the QEMU thread must sleep waiting for
+space in the queue. Stores will increment the number of posted stores in
+the per-CPU scoreboard, in order to implement the PCI ordering
+constraint above.
+
+interrupt acceleration
+^^^^^^^^^^^^^^^^^^^^^^
+
+This performance optimization would work much like a vhost user
+application does, where the QEMU process sets up *eventfds* that cause
+the device's corresponding interrupt to be triggered by the KVM driver.
+These irq file descriptors are sent to the emulation process at
+initialization, and are used when the emulation code raises a device
+interrupt.
+
+intx acceleration
+'''''''''''''''''
+
+Traditional PCI pin interrupts are level based, so, in addition to an
+irq file descriptor, a re-sampling file descriptor needs to be sent to
+the emulation program. This second file descriptor allows multiple
+devices sharing an irq to be notified when the interrupt has been
+acknowledged by the guest, so they can re-trigger the interrupt if their
+device has not de-asserted its interrupt.
+
+intx irq descriptor
+
+
+The irq descriptors are created by the proxy object
+``using event_notifier_init()`` to create the irq and re-sampling
+*eventds*, and ``kvm_vm_ioctl(KVM_IRQFD)`` to bind them to an interrupt.
+The interrupt route can be found with
+``pci_device_route_intx_to_irq()``.
+
+intx routing changes
+
+
+Intx routing can be changed when the guest programs the APIC the device
+pin is connected to. The proxy object in QEMU will use
+``pci_device_set_intx_routing_notifier()`` to be informed of any guest
+changes to the route. This handler will broadly follow the VFIO
+interrupt logic to change the route: de-assigning the existing irq
+descriptor from its route, then assigning it the new route. (see
+``vfio_intx_update()``)
+
+MSI/X acceleration
+''''''''''''''''''
+
+MSI/X interrupts are sent as DMA transactions to the host. The interrupt
+data contains a vector that is programmed by the guest, A device may have
+multiple MSI interrupts associated with it, so multiple irq descriptors
+may need to be sent to the emulation program.
+
+MSI/X irq descriptor
+
+
+This case will also follow the VFIO example. For each MSI/X interrupt,
+an *eventfd* is created, a virtual interrupt is allocated by
+``kvm_irqchip_add_msi_route()``, and the virtual interrupt is bound to
+the eventfd with ``kvm_irqchip_add_irqfd_notifier()``.
+
+MSI/X config space changes
+
+
+The guest may dynamically update several MSI-related tables in the
+device's PCI config space. These include per-MSI interrupt enables and
+vector data. Additionally, MSIX tables exist in device memory space, not
+config space. Much like the BAR case above, the proxy object must look
+at guest config space programming to keep the MSI interrupt state
+consistent between QEMU and the emulation program.
+
+--------------
+
+Disaggregated CPU emulation
+---------------------------
+
+After IO services have been disaggregated, a second phase would be to
+separate a process to handle CPU instruction emulation from the main
+QEMU control function. There are no object separation points for this
+code, so the first task would be to create one.
+
+Host access controls
+--------------------
+
+Separating QEMU relies on the host OS's access restriction mechanisms to
+enforce that the differing processes can only access the objects they
+are entitled to. There are a couple types of mechanisms usually provided
+by general purpose OSs.
+
+Discretionary access control
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Discretionary access control allows each user to control who can access
+their files. In Linux, this type of control is usually too coarse for
+QEMU separation, since it only provides three separate access controls:
+one for the same user ID, the second for users IDs with the same group
+ID, and the third for all other user IDs. Each device instance would
+need a separate user ID to provide access control, which is likely to be
+unwieldy for dynamically created VMs.
+
+Mandatory access control
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+Mandatory access control allows the OS to add an additional set of
+controls on top of discretionary access for the OS to control. It also
+adds other attributes to processes and files such as types, roles, and
+categories, and can establish rules for how processes and files can
+interact.
+
+Type enforcement
+^^^^^^^^^^^^^^^^
+
+Type enforcement assigns a *type* attribute to processes and files, and
+allows rules to be written on what operations a process with a given
+type can perform on a file with a given type. QEMU separation could take
+advantage of type enforcement by running the emulation processes with
+different types, both from the main QEMU process, and from the emulation
+processes of different classes of devices.
+
+For example, guest disk images and disk emulation processes could have
+types separate from the main QEMU process and non-disk emulation
+processes, and the type rules could prevent processes other than disk
+emulation ones from accessing guest disk images. Similarly, network
+emulation processes can have a type separate from the main QEMU process
+and non-network emulation process, and only that type can access the
+host tun/tap device used to provide guest networking.
+
+Category enforcement
+^^^^^^^^^^^^^^^^^^^^
+
+Category enforcement assigns a set of numbers within a given range to
+the process or file. The process is granted access to the file if the
+process's set is a superset of the file's set. This enforcement can be
+used to separate multiple instances of devices in the same class.
+
+For example, if there are multiple disk devices provides to a guest,
+each device emulation process could be provisioned with a separate
+category. The different device emulation processes would not be able to
+access each other's backing disk images.
+
+Alternatively, categories could be used in lieu of the type enforcement
+scheme described above. In this scenario, different categories would be
+used to prevent device emulation processes in different classes from
+accessing resources assigned to other classes.
-- 
2.29.2

From: Elena Ufimtseva <elena.ufimtseva@oracle.com>

Adds documentation explaining the command-line arguments needed
to use multi-process.

[Move orphan docs/multi-process.rst document into docs/system/ and add
it to index.rst to prevent Sphinx "document isn't included in any
toctree" error.
--Stefan]

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 MAINTAINERS                   |  1 +
 docs/system/index.rst         |  1 +
 docs/system/multi-process.rst | 64 +++++++++++++++++++++++++++++++++++
 3 files changed, 66 insertions(+)
 create mode 100644 docs/system/multi-process.rst

diff --git a/MAINTAINERS b/MAINTAINERS
index XXXXXXX..XXXXXXX 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -XXX,XX +XXX,XX @@ M: Jagannathan Raman <jag.raman@oracle.com>
 M: John G Johnson <john.g.johnson@oracle.com>
 S: Maintained
 F: docs/devel/multi-process.rst
+F: docs/system/multi-process.rst
 
 Build and test automation
 -------------------------
diff --git a/docs/system/index.rst b/docs/system/index.rst
index XXXXXXX..XXXXXXX 100644
--- a/docs/system/index.rst
+++ b/docs/system/index.rst
@@ -XXX,XX +XXX,XX @@ Contents:
    pr-manager
    targets
    security
+   multi-process
    deprecated
    removed-features
    build-platforms
diff --git a/docs/system/multi-process.rst b/docs/system/multi-process.rst
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/docs/system/multi-process.rst
@@ -XXX,XX +XXX,XX @@
+Multi-process QEMU
+==================
+
+This document describes how to configure and use multi-process qemu.
+For the design document refer to docs/devel/qemu-multiprocess.
+
+1) Configuration
+----------------
+
+multi-process is enabled by default for targets that enable KVM
+
+
+2) Usage
+--------
+
+Multi-process QEMU requires an orchestrator to launch.
+
+Following is a description of command-line used to launch mpqemu.
+
+* Orchestrator:
+
+  - The Orchestrator creates a unix socketpair
+
+  - It launches the remote process and passes one of the
+    sockets to it via command-line.
+
+  - It then launches QEMU and specifies the other socket as an option
+    to the Proxy device object
+
+* Remote Process:
+
+  - QEMU can enter remote process mode by using the "remote" machine
+    option.
+
+  - The orchestrator creates a "remote-object" with details about
+    the device and the file descriptor for the device
+
+  - The remaining options are no different from how one launches QEMU with
+    devices.
+
+  - Example command-line for the remote process is as follows:
+
+      /usr/bin/qemu-system-x86_64                                        \
+      -machine x-remote                                                  \
+      -device lsi53c895a,id=lsi0                                         \
+      -drive id=drive_image2,file=/build/ol7-nvme-test-1.qcow2           \
+      -device scsi-hd,id=drive2,drive=drive_image2,bus=lsi0.0,scsi-id=0  \
+      -object x-remote-object,id=robj1,devid=lsi1,fd=4,
+
+* QEMU:
+
+  - Since parts of the RAM are shared between QEMU & remote process, a
+    memory-backend-memfd is required to facilitate this, as follows:
+
+    -object memory-backend-memfd,id=mem,size=2G
+
+  - A "x-pci-proxy-dev" device is created for each of the PCI devices emulated
+    in the remote process. A "socket" sub-option specifies the other end of
+    unix channel created by orchestrator. The "id" sub-option must be specified
+    and should be the same as the "id" specified for the remote PCI device
+
+  - Example commandline for QEMU is as follows:
+
+      -device x-pci-proxy-dev,id=lsi0,socket=3
-- 
2.29.2

From: Jagannathan Raman <jag.raman@oracle.com>

Allow RAM MemoryRegion to be created from an offset in a file, instead
of allocating at offset of 0 by default. This is needed to synchronize
RAM between QEMU & remote process.

Signed-off-by: Jagannathan Raman <jag.raman@oracle.com>
Signed-off-by: John G Johnson <john.g.johnson@oracle.com>
Signed-off-by: Elena Ufimtseva <elena.ufimtseva@oracle.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 609996697ad8617e3b01df38accc5c208c24d74e.1611938319.git.jag.raman@oracle.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 include/exec/memory.h     |  2 ++
 include/exec/ram_addr.h   |  2 +-
 include/qemu/mmap-alloc.h |  4 +++-
 backends/hostmem-memfd.c  |  2 +-
 hw/misc/ivshmem.c         |  3 ++-
 softmmu/memory.c          |  3 ++-
 softmmu/physmem.c         | 11 +++++++----
 util/mmap-alloc.c         |  7 ++++---
 util/oslib-posix.c        |  2 +-
 9 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/include/exec/memory.h b/include/exec/memory.h
index XXXXXXX..XXXXXXX 100644
--- a/include/exec/memory.h
+++ b/include/exec/memory.h
@@ -XXX,XX +XXX,XX @@ void memory_region_init_ram_from_file(MemoryRegion *mr,
  * @size: size of the region.
  * @share: %true if memory must be mmaped with the MAP_SHARED flag
  * @fd: the fd to mmap.
+ * @offset: offset within the file referenced by fd
  * @errp: pointer to Error*, to store an error if it happens.
  *
  * Note that this function does not do anything to cause the data in the
@@ -XXX,XX +XXX,XX @@ void memory_region_init_ram_from_fd(MemoryRegion *mr,
                                     uint64_t size,
                                     bool share,
                                     int fd,
+                                    ram_addr_t offset,
                                     Error **errp);
 #endif
 
diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h
index XXXXXXX..XXXXXXX 100644
--- a/include/exec/ram_addr.h
+++ b/include/exec/ram_addr.h
@@ -XXX,XX +XXX,XX @@ RAMBlock *qemu_ram_alloc_from_file(ram_addr_t size, MemoryRegion *mr,
                                    Error **errp);
 RAMBlock *qemu_ram_alloc_from_fd(ram_addr_t size, MemoryRegion *mr,
                                  uint32_t ram_flags, int fd,
-                                 Error **errp);
+                                 off_t offset, Error **errp);
 
 RAMBlock *qemu_ram_alloc_from_ptr(ram_addr_t size, void *host,
                                   MemoryRegion *mr, Error **errp);
diff --git a/include/qemu/mmap-alloc.h b/include/qemu/mmap-alloc.h
index XXXXXXX..XXXXXXX 100644
--- a/include/qemu/mmap-alloc.h
+++ b/include/qemu/mmap-alloc.h
@@ -XXX,XX +XXX,XX @@ size_t qemu_mempath_getpagesize(const char *mem_path);
  *          otherwise, the alignment in use will be determined by QEMU.
  *  @shared: map has RAM_SHARED flag.
  *  @is_pmem: map has RAM_PMEM flag.
+ *  @map_offset: map starts at offset of map_offset from the start of fd
  *
  * Return:
  *  On success, return a pointer to the mapped area.
@@ -XXX,XX +XXX,XX @@ void *qemu_ram_mmap(int fd,
                     size_t size,
                     size_t align,
                     bool shared,
-                    bool is_pmem);
+                    bool is_pmem,
+                    off_t map_offset);
 
 void qemu_ram_munmap(int fd, void *ptr, size_t size);
 
diff --git a/backends/hostmem-memfd.c b/backends/hostmem-memfd.c
index XXXXXXX..XXXXXXX 100644
--- a/backends/hostmem-memfd.c
+++ b/backends/hostmem-memfd.c
@@ -XXX,XX +XXX,XX @@ memfd_backend_memory_alloc(HostMemoryBackend *backend, Error **errp)
     name = host_memory_backend_get_name(backend);
     memory_region_init_ram_from_fd(&backend->mr, OBJECT(backend),
                                    name, backend->size,
-                                   backend->share, fd, errp);
+                                   backend->share, fd, 0, errp);
     g_free(name);
 }
 
diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/misc/ivshmem.c
+++ b/hw/misc/ivshmem.c
@@ -XXX,XX +XXX,XX @@ static void process_msg_shmem(IVShmemState *s, int fd, Error **errp)
 
     /* mmap the region and map into the BAR2 */
     memory_region_init_ram_from_fd(&s->server_bar2, OBJECT(s),
-                                   "ivshmem.bar2", size, true, fd, &local_err);
+                                   "ivshmem.bar2", size, true, fd, 0,
+                                   &local_err);
     if (local_err) {
         error_propagate(errp, local_err);
         return;
diff --git a/softmmu/memory.c b/softmmu/memory.c
index XXXXXXX..XXXXXXX 100644
--- a/softmmu/memory.c
+++ b/softmmu/memory.c
@@ -XXX,XX +XXX,XX @@ void memory_region_init_ram_from_fd(MemoryRegion *mr,
                                     uint64_t size,
                                     bool share,
                                     int fd,
+                                    ram_addr_t offset,
                                     Error **errp)
 {
     Error *err = NULL;
@@ -XXX,XX +XXX,XX @@ void memory_region_init_ram_from_fd(MemoryRegion *mr,
     mr->destructor = memory_region_destructor_ram;
     mr->ram_block = qemu_ram_alloc_from_fd(size, mr,
                                            share ? RAM_SHARED : 0,
-                                           fd, &err);
+                                           fd, offset, &err);
     if (err) {
         mr->size = int128_zero();
         object_unparent(OBJECT(mr));
diff --git a/softmmu/physmem.c b/softmmu/physmem.c
index XXXXXXX..XXXXXXX 100644
--- a/softmmu/physmem.c
+++ b/softmmu/physmem.c
@@ -XXX,XX +XXX,XX @@ static void *file_ram_alloc(RAMBlock *block,
                             ram_addr_t memory,
                             int fd,
                             bool truncate,
+                            off_t offset,
                             Error **errp)
 {
     void *area;
@@ -XXX,XX +XXX,XX @@ static void *file_ram_alloc(RAMBlock *block,
     }
 
     area = qemu_ram_mmap(fd, memory, block->mr->align,
-                         block->flags & RAM_SHARED, block->flags & RAM_PMEM);
+                         block->flags & RAM_SHARED, block->flags & RAM_PMEM,
+                         offset);
     if (area == MAP_FAILED) {
         error_setg_errno(errp, errno,
                          "unable to map backing store for guest RAM");
@@ -XXX,XX +XXX,XX @@ static void ram_block_add(RAMBlock *new_block, Error **errp, bool shared)
 #ifdef CONFIG_POSIX
 RAMBlock *qemu_ram_alloc_from_fd(ram_addr_t size, MemoryRegion *mr,
                                  uint32_t ram_flags, int fd,
-                                 Error **errp)
+                                 off_t offset, Error **errp)
 {
     RAMBlock *new_block;
     Error *local_err = NULL;
@@ -XXX,XX +XXX,XX @@ RAMBlock *qemu_ram_alloc_from_fd(ram_addr_t size, MemoryRegion *mr,
     new_block->used_length = size;
     new_block->max_length = size;
     new_block->flags = ram_flags;
-    new_block->host = file_ram_alloc(new_block, size, fd, !file_size, errp);
+    new_block->host = file_ram_alloc(new_block, size, fd, !file_size, offset,
+                                     errp);
     if (!new_block->host) {
         g_free(new_block);
         return NULL;
@@ -XXX,XX +XXX,XX @@ RAMBlock *qemu_ram_alloc_from_file(ram_addr_t size, MemoryRegion *mr,
         return NULL;
     }
 
-    block = qemu_ram_alloc_from_fd(size, mr, ram_flags, fd, errp);
+    block = qemu_ram_alloc_from_fd(size, mr, ram_flags, fd, 0, errp);
     if (!block) {
         if (created) {
             unlink(mem_path);
diff --git a/util/mmap-alloc.c b/util/mmap-alloc.c
index XXXXXXX..XXXXXXX 100644
--- a/util/mmap-alloc.c
+++ b/util/mmap-alloc.c
@@ -XXX,XX +XXX,XX @@ void *qemu_ram_mmap(int fd,
                     size_t size,
                     size_t align,
                     bool shared,
-                    bool is_pmem)
+                    bool is_pmem,
+                    off_t map_offset)
 {
     int flags;
     int map_sync_flags = 0;
@@ -XXX,XX +XXX,XX @@ void *qemu_ram_mmap(int fd,
     offset = QEMU_ALIGN_UP((uintptr_t)guardptr, align) - (uintptr_t)guardptr;
 
     ptr = mmap(guardptr + offset, size, PROT_READ | PROT_WRITE,
-               flags | map_sync_flags, fd, 0);
+               flags | map_sync_flags, fd, map_offset);
 
     if (ptr == MAP_FAILED && map_sync_flags) {
         if (errno == ENOTSUP) {
@@ -XXX,XX +XXX,XX @@ void *qemu_ram_mmap(int fd,
          * we will remove these flags to handle compatibility.
          */
         ptr = mmap(guardptr + offset, size, PROT_READ | PROT_WRITE,
-                   flags, fd, 0);
+                   flags, fd, map_offset);
     }
 
     if (ptr == MAP_FAILED) {
diff --git a/util/oslib-posix.c b/util/oslib-posix.c
index XXXXXXX..XXXXXXX 100644
--- a/util/oslib-posix.c
+++ b/util/oslib-posix.c
@@ -XXX,XX +XXX,XX @@ void *qemu_memalign(size_t alignment, size_t size)
 void *qemu_anon_ram_alloc(size_t size, uint64_t *alignment, bool shared)
 {
     size_t align = QEMU_VMALLOC_ALIGN;
-    void *ptr = qemu_ram_mmap(-1, size, align, shared, false);
+    void *ptr = qemu_ram_mmap(-1, size, align, shared, false, 0);
 
     if (ptr == MAP_FAILED) {
         return NULL;
-- 
2.29.2

From: Jagannathan Raman <jag.raman@oracle.com>

Add configuration options to enable or disable multiprocess QEMU code

diff --git a/configure b/configure
index XXXXXXX..XXXXXXX 100755
--- a/configure
+++ b/configure
@@ -XXX,XX +XXX,XX @@ skip_meson=no
 gettext="auto"
 fuse="auto"
 fuse_lseek="auto"
+multiprocess="no"
 
 malloc_trim="auto"
 
@@ -XXX,XX +XXX,XX @@ Linux)
   linux="yes"
   linux_user="yes"
   vhost_user=${default_feature:-yes}
+  multiprocess=${default_feature:-yes}
 ;;
 esac
 
@@ -XXX,XX +XXX,XX @@ for opt do
   ;;
   --disable-fuse-lseek) fuse_lseek="disabled"
   ;;
+  --enable-multiprocess) multiprocess="yes"
+  ;;
+  --disable-multiprocess) multiprocess="no"
+  ;;
   *)
       echo "ERROR: unknown option $opt"
       echo "Try '$0 --help' for more information"
@@ -XXX,XX +XXX,XX @@ disabled with --disable-FEATURE, default is enabled if available
   libdaxctl       libdaxctl support
   fuse            FUSE block device export
   fuse-lseek      SEEK_HOLE/SEEK_DATA support for FUSE exports
+  multiprocess    Multiprocess QEMU support
 
 NOTE: The object files are built at the place where configure is launched
 EOF
@@ -XXX,XX +XXX,XX @@ fi
 if test "$have_mlockall" = "yes" ; then
   echo "HAVE_MLOCKALL=y" >> $config_host_mak
 fi
+if test "$multiprocess" = "yes" ; then
+  echo "CONFIG_MULTIPROCESS_ALLOWED=y" >> $config_host_mak
+fi
 if test "$fuzzing" = "yes" ; then
   # If LIB_FUZZING_ENGINE is set, assume we are running on OSS-Fuzz, and the
   # needed CFLAGS have already been provided
diff --git a/meson.build b/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/meson.build
+++ b/meson.build
@@ -XXX,XX +XXX,XX @@ host_kconfig = \
   ('CONFIG_VHOST_KERNEL' in config_host ? ['CONFIG_VHOST_KERNEL=y'] : []) + \
   (have_virtfs ? ['CONFIG_VIRTFS=y'] : []) + \
   ('CONFIG_LINUX' in config_host ? ['CONFIG_LINUX=y'] : []) + \
-  ('CONFIG_PVRDMA' in config_host ? ['CONFIG_PVRDMA=y'] : [])
+  ('CONFIG_PVRDMA' in config_host ? ['CONFIG_PVRDMA=y'] : []) + \
+  ('CONFIG_MULTIPROCESS_ALLOWED' in config_host ? ['CONFIG_MULTIPROCESS_ALLOWED=y'] : [])
 
 ignored = [ 'TARGET_XML_FILES', 'TARGET_ABI_DIR', 'TARGET_ARCH' ]
 
@@ -XXX,XX +XXX,XX @@ summary_info += {'libpmem support':   config_host.has_key('CONFIG_LIBPMEM')}
 summary_info += {'libdaxctl support': config_host.has_key('CONFIG_LIBDAXCTL')}
 summary_info += {'libudev':           libudev.found()}
 summary_info += {'FUSE lseek':        fuse_lseek.found()}
+summary_info += {'Multiprocess QEMU': config_host.has_key('CONFIG_MULTIPROCESS_ALLOWED')}
 summary(summary_info, bool_yn: true, section: 'Dependencies')
 
 if not supported_cpus.contains(cpu)
diff --git a/Kconfig.host b/Kconfig.host
index XXXXXXX..XXXXXXX 100644
--- a/Kconfig.host
+++ b/Kconfig.host
@@ -XXX,XX +XXX,XX @@ config VIRTFS
 
 config PVRDMA
     bool
+
+config MULTIPROCESS_ALLOWED
+    bool
+    imply MULTIPROCESS
diff --git a/hw/Kconfig b/hw/Kconfig
index XXXXXXX..XXXXXXX 100644
--- a/hw/Kconfig
+++ b/hw/Kconfig
@@ -XXX,XX +XXX,XX @@ source pci-host/Kconfig
 source pcmcia/Kconfig
 source pci/Kconfig
 source rdma/Kconfig
+source remote/Kconfig
 source rtc/Kconfig
 source scsi/Kconfig
 source sd/Kconfig
diff --git a/hw/remote/Kconfig b/hw/remote/Kconfig
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/hw/remote/Kconfig
@@ -XXX,XX +XXX,XX @@
+config MULTIPROCESS
+    bool
+    depends on PCI && KVM
-- 
2.29.2

From: Jagannathan Raman <jag.raman@oracle.com>

PCI host bridge is setup for the remote device process. It is
implemented using remote-pcihost object. It is an extension of the PCI
host bridge setup by QEMU.
Remote-pcihost configures a PCI bus which could be used by the remote
PCI device to latch on to.

Signed-off-by: Jagannathan Raman <jag.raman@oracle.com>
Signed-off-by: John G Johnson <john.g.johnson@oracle.com>
Signed-off-by: Elena Ufimtseva <elena.ufimtseva@oracle.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 0871ba857abb2eafacde07e7fe66a3f12415bfb2.1611938319.git.jag.raman@oracle.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 MAINTAINERS                  |  2 +
 include/hw/pci-host/remote.h | 29 ++++++++++++++
 hw/pci-host/remote.c         | 75 ++++++++++++++++++++++++++++++++++++
 hw/pci-host/Kconfig          |  3 ++
 hw/pci-host/meson.build      |  1 +
 hw/remote/Kconfig            |  1 +
 6 files changed, 111 insertions(+)
 create mode 100644 include/hw/pci-host/remote.h
 create mode 100644 hw/pci-host/remote.c

diff --git a/MAINTAINERS b/MAINTAINERS
index XXXXXXX..XXXXXXX 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -XXX,XX +XXX,XX @@ M: John G Johnson <john.g.johnson@oracle.com>
 S: Maintained
 F: docs/devel/multi-process.rst
 F: docs/system/multi-process.rst
+F: hw/pci-host/remote.c
+F: include/hw/pci-host/remote.h
 
 Build and test automation
 -------------------------
diff --git a/include/hw/pci-host/remote.h b/include/hw/pci-host/remote.h
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/include/hw/pci-host/remote.h
@@ -XXX,XX +XXX,XX @@
+/*
+ * PCI Host for remote device
+ *
+ * Copyright © 2018, 2021 Oracle and/or its affiliates.
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ *
+ */
+
+#ifndef REMOTE_PCIHOST_H
+#define REMOTE_PCIHOST_H
+
+#include "exec/memory.h"
+#include "hw/pci/pcie_host.h"
+
+#define TYPE_REMOTE_PCIHOST "remote-pcihost"
+OBJECT_DECLARE_SIMPLE_TYPE(RemotePCIHost, REMOTE_PCIHOST)
+
+struct RemotePCIHost {
+    /*< private >*/
+    PCIExpressHost parent_obj;
+    /*< public >*/
+
+    MemoryRegion *mr_pci_mem;
+    MemoryRegion *mr_sys_io;
+};
+
+#endif
diff --git a/hw/pci-host/remote.c b/hw/pci-host/remote.c
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/hw/pci-host/remote.c
@@ -XXX,XX +XXX,XX @@
+/*
+ * Remote PCI host device
+ *
+ * Unlike PCI host devices that model physical hardware, the purpose
+ * of this PCI host is to host multi-process QEMU devices.
+ *
+ * Multi-process QEMU extends the PCI host of a QEMU machine into a
+ * remote process. Any PCI device attached to the remote process is
+ * visible in the QEMU guest. This allows existing QEMU device models
+ * to be reused in the remote process.
+ *
+ * This PCI host is purely a container for PCI devices. It's fake in the
+ * sense that the guest never sees this PCI host and has no way of
+ * accessing it. Its job is just to provide the environment that QEMU
+ * PCI device models need when running in a remote process.
+ *
+ * Copyright © 2018, 2021 Oracle and/or its affiliates.
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ *
+ */
+
+#include "qemu/osdep.h"
+#include "qemu-common.h"
+
+#include "hw/pci/pci.h"
+#include "hw/pci/pci_host.h"
+#include "hw/pci/pcie_host.h"
+#include "hw/qdev-properties.h"
+#include "hw/pci-host/remote.h"
+#include "exec/memory.h"
+
+static const char *remote_pcihost_root_bus_path(PCIHostState *host_bridge,
+                                                PCIBus *rootbus)
+{
+    return "0000:00";
+}
+
+static void remote_pcihost_realize(DeviceState *dev, Error **errp)
+{
+    PCIHostState *pci = PCI_HOST_BRIDGE(dev);
+    RemotePCIHost *s = REMOTE_PCIHOST(dev);
+
+    pci->bus = pci_root_bus_new(DEVICE(s), "remote-pci",
+                                s->mr_pci_mem, s->mr_sys_io,
+                                0, TYPE_PCIE_BUS);
+}
+
+static void remote_pcihost_class_init(ObjectClass *klass, void *data)
+{
+    DeviceClass *dc = DEVICE_CLASS(klass);
+    PCIHostBridgeClass *hc = PCI_HOST_BRIDGE_CLASS(klass);
+
+    hc->root_bus_path = remote_pcihost_root_bus_path;
+    dc->realize = remote_pcihost_realize;
+
+    dc->user_creatable = false;
+    set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
+    dc->fw_name = "pci";
+}
+
+static const TypeInfo remote_pcihost_info = {
+    .name = TYPE_REMOTE_PCIHOST,
+    .parent = TYPE_PCIE_HOST_BRIDGE,
+    .instance_size = sizeof(RemotePCIHost),
+    .class_init = remote_pcihost_class_init,
+};
+
+static void remote_pcihost_register(void)
+{
+    type_register_static(&remote_pcihost_info);
+}
+
+type_init(remote_pcihost_register)
diff --git a/hw/pci-host/Kconfig b/hw/pci-host/Kconfig
index XXXXXXX..XXXXXXX 100644
--- a/hw/pci-host/Kconfig
+++ b/hw/pci-host/Kconfig
@@ -XXX,XX +XXX,XX @@ config PCI_POWERNV
     select PCI_EXPRESS
     select MSI_NONBROKEN
     select PCIE_PORT
+
+config REMOTE_PCIHOST
+    bool
diff --git a/hw/pci-host/meson.build b/hw/pci-host/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/hw/pci-host/meson.build
+++ b/hw/pci-host/meson.build
@@ -XXX,XX +XXX,XX @@ pci_ss.add(when: 'CONFIG_PCI_EXPRESS_XILINX', if_true: files('xilinx-pcie.c'))
 pci_ss.add(when: 'CONFIG_PCI_I440FX', if_true: files('i440fx.c'))
 pci_ss.add(when: 'CONFIG_PCI_SABRE', if_true: files('sabre.c'))
 pci_ss.add(when: 'CONFIG_XEN_IGD_PASSTHROUGH', if_true: files('xen_igd_pt.c'))
+pci_ss.add(when: 'CONFIG_REMOTE_PCIHOST', if_true: files('remote.c'))
 
 # PPC devices
 pci_ss.add(when: 'CONFIG_PREP_PCI', if_true: files('prep.c'))
diff --git a/hw/remote/Kconfig b/hw/remote/Kconfig
index XXXXXXX..XXXXXXX 100644
--- a/hw/remote/Kconfig
+++ b/hw/remote/Kconfig
@@ -XXX,XX +XXX,XX @@
 config MULTIPROCESS
     bool
     depends on PCI && KVM
+    select REMOTE_PCIHOST
-- 
2.29.2

From: Jagannathan Raman <jag.raman@oracle.com>

x-remote-machine object sets up various subsystems of the remote
device process. Instantiate PCI host bridge object and initialize RAM, IO &
PCI memory regions.

Signed-off-by: John G Johnson <john.g.johnson@oracle.com>
Signed-off-by: Jagannathan Raman <jag.raman@oracle.com>
Signed-off-by: Elena Ufimtseva <elena.ufimtseva@oracle.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: c537f38d17f90453ca610c6b70cf3480274e0ba1.1611938319.git.jag.raman@oracle.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 MAINTAINERS                  |  2 ++
 include/hw/pci-host/remote.h |  1 +
 include/hw/remote/machine.h  | 27 ++++++++++++++
 hw/remote/machine.c          | 70 ++++++++++++++++++++++++++++++++++++
 hw/meson.build               |  1 +
 hw/remote/meson.build        |  5 +++
 6 files changed, 106 insertions(+)
 create mode 100644 include/hw/remote/machine.h
 create mode 100644 hw/remote/machine.c
 create mode 100644 hw/remote/meson.build

diff --git a/MAINTAINERS b/MAINTAINERS
index XXXXXXX..XXXXXXX 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -XXX,XX +XXX,XX @@ F: docs/devel/multi-process.rst
 F: docs/system/multi-process.rst
 F: hw/pci-host/remote.c
 F: include/hw/pci-host/remote.h
+F: hw/remote/machine.c
+F: include/hw/remote/machine.h
 
 Build and test automation
 -------------------------
diff --git a/include/hw/pci-host/remote.h b/include/hw/pci-host/remote.h
index XXXXXXX..XXXXXXX 100644
--- a/include/hw/pci-host/remote.h
+++ b/include/hw/pci-host/remote.h
@@ -XXX,XX +XXX,XX @@ struct RemotePCIHost {
 
     MemoryRegion *mr_pci_mem;
     MemoryRegion *mr_sys_io;
+    MemoryRegion *mr_sys_mem;
 };
 
 #endif
diff --git a/include/hw/remote/machine.h b/include/hw/remote/machine.h
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/include/hw/remote/machine.h
@@ -XXX,XX +XXX,XX @@
+/*
+ * Remote machine configuration
+ *
+ * Copyright © 2018, 2021 Oracle and/or its affiliates.
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ *
+ */
+
+#ifndef REMOTE_MACHINE_H
+#define REMOTE_MACHINE_H
+
+#include "qom/object.h"
+#include "hw/boards.h"
+#include "hw/pci-host/remote.h"
+
+struct RemoteMachineState {
+    MachineState parent_obj;
+
+    RemotePCIHost *host;
+};
+
+#define TYPE_REMOTE_MACHINE "x-remote-machine"
+OBJECT_DECLARE_SIMPLE_TYPE(RemoteMachineState, REMOTE_MACHINE)
+
+#endif
diff --git a/hw/remote/machine.c b/hw/remote/machine.c
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/hw/remote/machine.c
@@ -XXX,XX +XXX,XX @@
+/*
+ * Machine for remote device
+ *
+ *  This machine type is used by the remote device process in multi-process
+ *  QEMU. QEMU device models depend on parent busses, interrupt controllers,
+ *  memory regions, etc. The remote machine type offers this environment so
+ *  that QEMU device models can be used as remote devices.
+ *
+ * Copyright © 2018, 2021 Oracle and/or its affiliates.
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ *
+ */
+
+#include "qemu/osdep.h"
+#include "qemu-common.h"
+
+#include "hw/remote/machine.h"
+#include "exec/address-spaces.h"
+#include "exec/memory.h"
+#include "qapi/error.h"
+
+static void remote_machine_init(MachineState *machine)
+{
+    MemoryRegion *system_memory, *system_io, *pci_memory;
+    RemoteMachineState *s = REMOTE_MACHINE(machine);
+    RemotePCIHost *rem_host;
+
+    system_memory = get_system_memory();
+    system_io = get_system_io();
+
+    pci_memory = g_new(MemoryRegion, 1);
+    memory_region_init(pci_memory, NULL, "pci", UINT64_MAX);
+
+    rem_host = REMOTE_PCIHOST(qdev_new(TYPE_REMOTE_PCIHOST));
+
+    rem_host->mr_pci_mem = pci_memory;
+    rem_host->mr_sys_mem = system_memory;
+    rem_host->mr_sys_io = system_io;
+
+    s->host = rem_host;
+
+    object_property_add_child(OBJECT(s), "remote-pcihost", OBJECT(rem_host));
+    memory_region_add_subregion_overlap(system_memory, 0x0, pci_memory, -1);
+
+    qdev_realize(DEVICE(rem_host), sysbus_get_default(), &error_fatal);
+}
+
+static void remote_machine_class_init(ObjectClass *oc, void *data)
+{
+    MachineClass *mc = MACHINE_CLASS(oc);
+
+    mc->init = remote_machine_init;
+    mc->desc = "Experimental remote machine";
+}
+
+static const TypeInfo remote_machine = {
+    .name = TYPE_REMOTE_MACHINE,
+    .parent = TYPE_MACHINE,
+    .instance_size = sizeof(RemoteMachineState),
+    .class_init = remote_machine_class_init,
+};
+
+static void remote_machine_register_types(void)
+{
+    type_register_static(&remote_machine);
+}
+
+type_init(remote_machine_register_types);
diff --git a/hw/meson.build b/hw/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -XXX,XX +XXX,XX @@ subdir('moxie')
 subdir('nios2')
 subdir('openrisc')
 subdir('ppc')
+subdir('remote')
 subdir('riscv')
 subdir('rx')
 subdir('s390x')
diff --git a/hw/remote/meson.build b/hw/remote/meson.build
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/hw/remote/meson.build
@@ -XXX,XX +XXX,XX @@
+remote_ss = ss.source_set()
+
+remote_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('machine.c'))
+
+softmmu_ss.add_all(when: 'CONFIG_MULTIPROCESS', if_true: remote_ss)
-- 
2.29.2

From: Elena Ufimtseva <elena.ufimtseva@oracle.com>

Adds qio_channel_writev_full_all() to transmit both data and FDs.
Refactors existing code to use this helper.

Signed-off-by: Elena Ufimtseva <elena.ufimtseva@oracle.com>
Signed-off-by: John G Johnson <john.g.johnson@oracle.com>
Signed-off-by: Jagannathan Raman <jag.raman@oracle.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Acked-by: Daniel P. Berrangé <berrange@redhat.com>
Message-id: 480fbf1fe4152495d60596c9b665124549b426a5.1611938319.git.jag.raman@oracle.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 include/io/channel.h | 25 +++++++++++++++++++++++++
 io/channel.c         | 15 ++++++++++++++-
 2 files changed, 39 insertions(+), 1 deletion(-)

From: Elena Ufimtseva <elena.ufimtseva@oracle.com>

Adds qio_channel_readv_full_all_eof() and qio_channel_readv_full_all()
to read both data and FDs. Refactors existing code to use these helpers.

Signed-off-by: Elena Ufimtseva <elena.ufimtseva@oracle.com>
Signed-off-by: John G Johnson <john.g.johnson@oracle.com>
Signed-off-by: Jagannathan Raman <jag.raman@oracle.com>
Acked-by: Daniel P. Berrangé <berrange@redhat.com>
Message-id: b059c4cc0fb741e794d644c144cc21372cad877d.1611938319.git.jag.raman@oracle.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 include/io/channel.h |  53 +++++++++++++++++++++++
 io/channel.c         | 101 ++++++++++++++++++++++++++++++++++---------
 2 files changed, 134 insertions(+), 20 deletions(-)

diff --git a/include/io/channel.h b/include/io/channel.h
index XXXXXXX..XXXXXXX 100644
--- a/include/io/channel.h
+++ b/include/io/channel.h
@@ -XXX,XX +XXX,XX @@ void qio_channel_set_aio_fd_handler(QIOChannel *ioc,
                                     IOHandler *io_write,
                                     void *opaque);
 
+/**
+ * qio_channel_readv_full_all_eof:
+ * @ioc: the channel object
+ * @iov: the array of memory regions to read data to
+ * @niov: the length of the @iov array
+ * @fds: an array of file handles to read
+ * @nfds: number of file handles in @fds
+ * @errp: pointer to a NULL-initialized error object
+ *
+ *
+ * Performs same function as qio_channel_readv_all_eof.
+ * Additionally, attempts to read file descriptors shared
+ * over the channel. The function will wait for all
+ * requested data to be read, yielding from the current
+ * coroutine if required. data refers to both file
+ * descriptors and the iovs.
+ *
+ * Returns: 1 if all bytes were read, 0 if end-of-file
+ *          occurs without data, or -1 on error
+ */
+
+int qio_channel_readv_full_all_eof(QIOChannel *ioc,
+                                   const struct iovec *iov,
+                                   size_t niov,
+                                   int **fds, size_t *nfds,
+                                   Error **errp);
+
+/**
+ * qio_channel_readv_full_all:
+ * @ioc: the channel object
+ * @iov: the array of memory regions to read data to
+ * @niov: the length of the @iov array
+ * @fds: an array of file handles to read
+ * @nfds: number of file handles in @fds
+ * @errp: pointer to a NULL-initialized error object
+ *
+ *
+ * Performs same function as qio_channel_readv_all_eof.
+ * Additionally, attempts to read file descriptors shared
+ * over the channel. The function will wait for all
+ * requested data to be read, yielding from the current
+ * coroutine if required. data refers to both file
+ * descriptors and the iovs.
+ *
+ * Returns: 0 if all bytes were read, or -1 on error
+ */
+
+int qio_channel_readv_full_all(QIOChannel *ioc,
+                               const struct iovec *iov,
+                               size_t niov,
+                               int **fds, size_t *nfds,
+                               Error **errp);
+
 /**
  * qio_channel_writev_full_all:
  * @ioc: the channel object
diff --git a/io/channel.c b/io/channel.c
index XXXXXXX..XXXXXXX 100644
--- a/io/channel.c
+++ b/io/channel.c
@@ -XXX,XX +XXX,XX @@ int qio_channel_readv_all_eof(QIOChannel *ioc,
                               const struct iovec *iov,
                               size_t niov,
                               Error **errp)
+{
+    return qio_channel_readv_full_all_eof(ioc, iov, niov, NULL, NULL, errp);
+}
+
+int qio_channel_readv_all(QIOChannel *ioc,
+                          const struct iovec *iov,
+                          size_t niov,
+                          Error **errp)
+{
+    return qio_channel_readv_full_all(ioc, iov, niov, NULL, NULL, errp);
+}
+
+int qio_channel_readv_full_all_eof(QIOChannel *ioc,
+                                   const struct iovec *iov,
+                                   size_t niov,
+                                   int **fds, size_t *nfds,
+                                   Error **errp)
 {
     int ret = -1;
     struct iovec *local_iov = g_new(struct iovec, niov);
     struct iovec *local_iov_head = local_iov;
     unsigned int nlocal_iov = niov;
+    int **local_fds = fds;
+    size_t *local_nfds = nfds;
     bool partial = false;
 
+    if (nfds) {
+        *nfds = 0;
+    }
+
+    if (fds) {
+        *fds = NULL;
+    }
+
     nlocal_iov = iov_copy(local_iov, nlocal_iov,
                           iov, niov,
                           0, iov_size(iov, niov));
 
-    while (nlocal_iov > 0) {
+    while ((nlocal_iov > 0) || local_fds) {
         ssize_t len;
-        len = qio_channel_readv(ioc, local_iov, nlocal_iov, errp);
+        len = qio_channel_readv_full(ioc, local_iov, nlocal_iov, local_fds,
+                                     local_nfds, errp);
         if (len == QIO_CHANNEL_ERR_BLOCK) {
             if (qemu_in_coroutine()) {
                 qio_channel_yield(ioc, G_IO_IN);
@@ -XXX,XX +XXX,XX @@ int qio_channel_readv_all_eof(QIOChannel *ioc,
                 qio_channel_wait(ioc, G_IO_IN);
             }
             continue;
-        } else if (len < 0) {
-            goto cleanup;
-        } else if (len == 0) {
-            if (partial) {
-                error_setg(errp,
-                           "Unexpected end-of-file before all bytes were read");
-            } else {
+        }
+
+        if (len == 0) {
+            if (local_nfds && *local_nfds) {
+                /*
+                 * Got some FDs, but no data yet. This isn't an EOF
+                 * scenario (yet), so carry on to try to read data
+                 * on next loop iteration
+                 */
+                goto next_iter;
+            } else if (!partial) {
+                /* No fds and no data - EOF before any data read */
                 ret = 0;
+                goto cleanup;
+            } else {
+                len = -1;
+                error_setg(errp,
+                           "Unexpected end-of-file before all data were read");
+                /* Fallthrough into len < 0 handling */
+            }
+        }
+
+        if (len < 0) {
+            /* Close any FDs we previously received */
+            if (nfds && fds) {
+                size_t i;
+                for (i = 0; i < (*nfds); i++) {
+                    close((*fds)[i]);
+                }
+                g_free(*fds);
+                *fds = NULL;
+                *nfds = 0;
             }
             goto cleanup;
         }
 
+        if (nlocal_iov) {
+            iov_discard_front(&local_iov, &nlocal_iov, len);
+        }
+
+next_iter:
         partial = true;
-        iov_discard_front(&local_iov, &nlocal_iov, len);
+        local_fds = NULL;
+        local_nfds = NULL;
     }
 
     ret = 1;
@@ -XXX,XX +XXX,XX @@ int qio_channel_readv_all_eof(QIOChannel *ioc,
     return ret;
 }
 
-int qio_channel_readv_all(QIOChannel *ioc,
-                          const struct iovec *iov,
-                          size_t niov,
-                          Error **errp)
+int qio_channel_readv_full_all(QIOChannel *ioc,
+                               const struct iovec *iov,
+                               size_t niov,
+                               int **fds, size_t *nfds,
+                               Error **errp)
 {
-    int ret = qio_channel_readv_all_eof(ioc, iov, niov, errp);
+    int ret = qio_channel_readv_full_all_eof(ioc, iov, niov, fds, nfds, errp);
 
     if (ret == 0) {
-        ret = -1;
-        error_setg(errp,
-                   "Unexpected end-of-file before all bytes were read");
-    } else if (ret == 1) {
-        ret = 0;
+        error_prepend(errp,
+                      "Unexpected end-of-file before all data were read.");
+        return -1;
     }
+    if (ret == 1) {
+        return 0;
+    }
+
     return ret;
 }
 
-- 
2.29.2

From: Elena Ufimtseva <elena.ufimtseva@oracle.com>

Defines MPQemuMsg, which is the message that is sent to the remote
process. This message is sent over QIOChannel and is used to
command the remote process to perform various tasks.
Define transmission functions used by proxy and by remote.

Signed-off-by: Jagannathan Raman <jag.raman@oracle.com>
Signed-off-by: John G Johnson <john.g.johnson@oracle.com>
Signed-off-by: Elena Ufimtseva <elena.ufimtseva@oracle.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 56ca8bcf95195b2b195b08f6b9565b6d7410bce5.1611938319.git.jag.raman@oracle.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 MAINTAINERS                     |   2 +
 meson.build                     |   1 +
 hw/remote/trace.h               |   1 +
 include/hw/remote/mpqemu-link.h |  63 ++++++++++
 include/sysemu/iothread.h       |   6 +
 hw/remote/mpqemu-link.c         | 205 ++++++++++++++++++++++++++++++++
 iothread.c                      |   6 +
 hw/remote/meson.build           |   1 +
 hw/remote/trace-events          |   4 +
 9 files changed, 289 insertions(+)
 create mode 100644 hw/remote/trace.h
 create mode 100644 include/hw/remote/mpqemu-link.h
 create mode 100644 hw/remote/mpqemu-link.c
 create mode 100644 hw/remote/trace-events

diff --git a/MAINTAINERS b/MAINTAINERS
index XXXXXXX..XXXXXXX 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -XXX,XX +XXX,XX @@ F: hw/pci-host/remote.c
 F: include/hw/pci-host/remote.h
 F: hw/remote/machine.c
 F: include/hw/remote/machine.h
+F: hw/remote/mpqemu-link.c
+F: include/hw/remote/mpqemu-link.h
 
 Build and test automation
 -------------------------
diff --git a/meson.build b/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/meson.build
+++ b/meson.build
@@ -XXX,XX +XXX,XX @@ if have_system
     'net',
     'softmmu',
     'ui',
+    'hw/remote',
   ]
 endif
 trace_events_subdirs += [
diff --git a/hw/remote/trace.h b/hw/remote/trace.h
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/hw/remote/trace.h
@@ -0,0 +1 @@
+#include "trace/trace-hw_remote.h"
diff --git a/include/hw/remote/mpqemu-link.h b/include/hw/remote/mpqemu-link.h
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/include/hw/remote/mpqemu-link.h
@@ -XXX,XX +XXX,XX @@
+/*
+ * Communication channel between QEMU and remote device process
+ *
+ * Copyright © 2018, 2021 Oracle and/or its affiliates.
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ *
+ */
+
+#ifndef MPQEMU_LINK_H
+#define MPQEMU_LINK_H
+
+#include "qom/object.h"
+#include "qemu/thread.h"
+#include "io/channel.h"
+
+#define REMOTE_MAX_FDS 8
+
+#define MPQEMU_MSG_HDR_SIZE offsetof(MPQemuMsg, data.u64)
+
+/**
+ * MPQemuCmd:
+ *
+ * MPQemuCmd enum type to specify the command to be executed on the remote
+ * device.
+ *
+ * This uses a private protocol between QEMU and the remote process. vfio-user
+ * protocol would supersede this in the future.
+ *
+ */
+typedef enum {
+    MPQEMU_CMD_MAX,
+} MPQemuCmd;
+
+/**
+ * MPQemuMsg:
+ * @cmd: The remote command
+ * @size: Size of the data to be shared
+ * @data: Structured data
+ * @fds: File descriptors to be shared with remote device
+ *
+ * MPQemuMsg Format of the message sent to the remote device from QEMU.
+ *
+ */
+typedef struct {
+    int cmd;
+    size_t size;
+
+    union {
+        uint64_t u64;
+    } data;
+
+    int fds[REMOTE_MAX_FDS];
+    int num_fds;
+} MPQemuMsg;
+
+bool mpqemu_msg_send(MPQemuMsg *msg, QIOChannel *ioc, Error **errp);
+bool mpqemu_msg_recv(MPQemuMsg *msg, QIOChannel *ioc, Error **errp);
+
+bool mpqemu_msg_valid(MPQemuMsg *msg);
+
+#endif
diff --git a/include/sysemu/iothread.h b/include/sysemu/iothread.h
index XXXXXXX..XXXXXXX 100644
--- a/include/sysemu/iothread.h
+++ b/include/sysemu/iothread.h
@@ -XXX,XX +XXX,XX @@ IOThread *iothread_create(const char *id, Error **errp);
 void iothread_stop(IOThread *iothread);
 void iothread_destroy(IOThread *iothread);
 
+/*
+ * Returns true if executing withing IOThread context,
+ * false otherwise.
+ */
+bool qemu_in_iothread(void);
+
 #endif /* IOTHREAD_H */
diff --git a/hw/remote/mpqemu-link.c b/hw/remote/mpqemu-link.c
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/hw/remote/mpqemu-link.c
@@ -XXX,XX +XXX,XX @@
+/*
+ * Communication channel between QEMU and remote device process
+ *
+ * Copyright © 2018, 2021 Oracle and/or its affiliates.
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ *
+ */
+
+#include "qemu/osdep.h"
+#include "qemu-common.h"
+
+#include "qemu/module.h"
+#include "hw/remote/mpqemu-link.h"
+#include "qapi/error.h"
+#include "qemu/iov.h"
+#include "qemu/error-report.h"
+#include "qemu/main-loop.h"
+#include "io/channel.h"
+#include "sysemu/iothread.h"
+#include "trace.h"
+
+/*
+ * Send message over the ioc QIOChannel.
+ * This function is safe to call from:
+ * - main loop in co-routine context. Will block the main loop if not in
+ *   co-routine context;
+ * - vCPU thread with no co-routine context and if the channel is not part
+ *   of the main loop handling;
+ * - IOThread within co-routine context, outside of co-routine context
+ *   will block IOThread;
+ * Returns true if no errors were encountered, false otherwise.
+ */
+bool mpqemu_msg_send(MPQemuMsg *msg, QIOChannel *ioc, Error **errp)
+{
+    ERRP_GUARD();
+    bool iolock = qemu_mutex_iothread_locked();
+    bool iothread = qemu_in_iothread();
+    struct iovec send[2] = {0};
+    int *fds = NULL;
+    size_t nfds = 0;
+    bool ret = false;
+
+    send[0].iov_base = msg;
+    send[0].iov_len = MPQEMU_MSG_HDR_SIZE;
+
+    send[1].iov_base = (void *)&msg->data;
+    send[1].iov_len = msg->size;
+
+    if (msg->num_fds) {
+        nfds = msg->num_fds;
+        fds = msg->fds;
+    }
+
+    /*
+     * Dont use in IOThread out of co-routine context as
+     * it will block IOThread.
+     */
+    assert(qemu_in_coroutine() || !iothread);
+
+    /*
+     * Skip unlocking/locking iothread lock when the IOThread is running
+     * in co-routine context. Co-routine context is asserted above
+     * for IOThread case.
+     * Also skip lock handling while in a co-routine in the main context.
+     */
+    if (iolock && !iothread && !qemu_in_coroutine()) {
+        qemu_mutex_unlock_iothread();
+    }
+
+    if (!qio_channel_writev_full_all(ioc, send, G_N_ELEMENTS(send),
+                                    fds, nfds, errp)) {
+        ret = true;
+    } else {
+        trace_mpqemu_send_io_error(msg->cmd, msg->size, nfds);
+    }
+
+    if (iolock && !iothread && !qemu_in_coroutine()) {
+        /* See above comment why skip locking here. */
+        qemu_mutex_lock_iothread();
+    }
+
+    return ret;
+}
+
+/*
+ * Read message from the ioc QIOChannel.
+ * This function is safe to call from:
+ * - From main loop in co-routine context. Will block the main loop if not in
+ *   co-routine context;
+ * - From vCPU thread with no co-routine context and if the channel is not part
+ *   of the main loop handling;
+ * - From IOThread within co-routine context, outside of co-routine context
+ *   will block IOThread;
+ */
+static ssize_t mpqemu_read(QIOChannel *ioc, void *buf, size_t len, int **fds,
+                           size_t *nfds, Error **errp)
+{
+    ERRP_GUARD();
+    struct iovec iov = { .iov_base = buf, .iov_len = len };
+    bool iolock = qemu_mutex_iothread_locked();
+    bool iothread = qemu_in_iothread();
+    int ret = -1;
+
+    /*
+     * Dont use in IOThread out of co-routine context as
+     * it will block IOThread.
+     */
+    assert(qemu_in_coroutine() || !iothread);
+
+    if (iolock && !iothread && !qemu_in_coroutine()) {
+        qemu_mutex_unlock_iothread();
+    }
+
+    ret = qio_channel_readv_full_all_eof(ioc, &iov, 1, fds, nfds, errp);
+
+    if (iolock && !iothread && !qemu_in_coroutine()) {
+        qemu_mutex_lock_iothread();
+    }
+
+    return (ret <= 0) ? ret : iov.iov_len;
+}
+
+bool mpqemu_msg_recv(MPQemuMsg *msg, QIOChannel *ioc, Error **errp)
+{
+    ERRP_GUARD();
+    g_autofree int *fds = NULL;
+    size_t nfds = 0;
+    ssize_t len;
+    bool ret = false;
+
+    len = mpqemu_read(ioc, msg, MPQEMU_MSG_HDR_SIZE, &fds, &nfds, errp);
+    if (len <= 0) {
+        goto fail;
+    } else if (len != MPQEMU_MSG_HDR_SIZE) {
+        error_setg(errp, "Message header corrupted");
+        goto fail;
+    }
+
+    if (msg->size > sizeof(msg->data)) {
+        error_setg(errp, "Invalid size for message");
+        goto fail;
+    }
+
+    if (!msg->size) {
+        goto copy_fds;
+    }
+
+    len = mpqemu_read(ioc, &msg->data, msg->size, NULL, NULL, errp);
+    if (len <= 0) {
+        goto fail;
+    }
+    if (len != msg->size) {
+        error_setg(errp, "Unable to read full message");
+        goto fail;
+    }
+
+copy_fds:
+    msg->num_fds = nfds;
+    if (nfds > G_N_ELEMENTS(msg->fds)) {
+        error_setg(errp,
+                   "Overflow error: received %zu fds, more than max of %d fds",
+                   nfds, REMOTE_MAX_FDS);
+        goto fail;
+    }
+    if (nfds) {
+        memcpy(msg->fds, fds, nfds * sizeof(int));
+    }
+
+    ret = true;
+
+fail:
+    if (*errp) {
+        trace_mpqemu_recv_io_error(msg->cmd, msg->size, nfds);
+    }
+    while (*errp && nfds) {
+        close(fds[nfds - 1]);
+        nfds--;
+    }
+
+    return ret;
+}
+
+bool mpqemu_msg_valid(MPQemuMsg *msg)
+{
+    if (msg->cmd >= MPQEMU_CMD_MAX && msg->cmd < 0) {
+        return false;
+    }
+
+    /* Verify FDs. */
+    if (msg->num_fds >= REMOTE_MAX_FDS) {
+        return false;
+    }
+
+    if (msg->num_fds > 0) {
+        for (int i = 0; i < msg->num_fds; i++) {
+            if (fcntl(msg->fds[i], F_GETFL) == -1) {
+                return false;
+            }
+        }
+    }
+
+    return true;
+}
diff --git a/iothread.c b/iothread.c
index XXXXXXX..XXXXXXX 100644
--- a/iothread.c
+++ b/iothread.c
@@ -XXX,XX +XXX,XX @@ IOThread *iothread_by_id(const char *id)
 {
     return IOTHREAD(object_resolve_path_type(id, TYPE_IOTHREAD, NULL));
 }
+
+bool qemu_in_iothread(void)
+{
+    return qemu_get_current_aio_context() == qemu_get_aio_context() ?
+                    false : true;
+}
diff --git a/hw/remote/meson.build b/hw/remote/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/hw/remote/meson.build
+++ b/hw/remote/meson.build
@@ -XXX,XX +XXX,XX @@
 remote_ss = ss.source_set()
 
 remote_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('machine.c'))
+remote_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('mpqemu-link.c'))
 
 softmmu_ss.add_all(when: 'CONFIG_MULTIPROCESS', if_true: remote_ss)
diff --git a/hw/remote/trace-events b/hw/remote/trace-events
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/hw/remote/trace-events
@@ -XXX,XX +XXX,XX @@
+# multi-process trace events
+
+mpqemu_send_io_error(int cmd, int size, int nfds) "send command %d size %d, %d file descriptors to remote process"
+mpqemu_recv_io_error(int cmd, int size, int nfds) "failed to receive %d size %d, %d file descriptors to remote process"
-- 
2.29.2

From: Jagannathan Raman <jag.raman@oracle.com>

Initializes the message handler function in the remote process. It is
called whenever there's an event pending on QIOChannel that registers
this function.

Signed-off-by: Elena Ufimtseva <elena.ufimtseva@oracle.com>
Signed-off-by: John G Johnson <john.g.johnson@oracle.com>
Signed-off-by: Jagannathan Raman <jag.raman@oracle.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 99d38d8b93753a6409ac2340e858858cda59ab1b.1611938319.git.jag.raman@oracle.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 MAINTAINERS                 |  1 +
 include/hw/remote/machine.h |  9 ++++++
 hw/remote/message.c         | 57 +++++++++++++++++++++++++++++++++++++
 hw/remote/meson.build       |  1 +
 4 files changed, 68 insertions(+)
 create mode 100644 hw/remote/message.c

diff --git a/MAINTAINERS b/MAINTAINERS
index XXXXXXX..XXXXXXX 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -XXX,XX +XXX,XX @@ F: hw/remote/machine.c
 F: include/hw/remote/machine.h
 F: hw/remote/mpqemu-link.c
 F: include/hw/remote/mpqemu-link.h
+F: hw/remote/message.c
 
 Build and test automation
 -------------------------
diff --git a/include/hw/remote/machine.h b/include/hw/remote/machine.h
index XXXXXXX..XXXXXXX 100644
--- a/include/hw/remote/machine.h
+++ b/include/hw/remote/machine.h
@@ -XXX,XX +XXX,XX @@
 #include "qom/object.h"
 #include "hw/boards.h"
 #include "hw/pci-host/remote.h"
+#include "io/channel.h"
 
 struct RemoteMachineState {
     MachineState parent_obj;
@@ -XXX,XX +XXX,XX @@ struct RemoteMachineState {
     RemotePCIHost *host;
 };
 
+/* Used to pass to co-routine device and ioc. */
+typedef struct RemoteCommDev {
+    PCIDevice *dev;
+    QIOChannel *ioc;
+} RemoteCommDev;
+
 #define TYPE_REMOTE_MACHINE "x-remote-machine"
 OBJECT_DECLARE_SIMPLE_TYPE(RemoteMachineState, REMOTE_MACHINE)
 
+void coroutine_fn mpqemu_remote_msg_loop_co(void *data);
+
 #endif
diff --git a/hw/remote/message.c b/hw/remote/message.c
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/hw/remote/message.c
@@ -XXX,XX +XXX,XX @@
+/*
+ * Copyright © 2020, 2021 Oracle and/or its affiliates.
+ *
+ * This work is licensed under the terms of the GNU GPL-v2, version 2 or later.
+ *
+ * See the COPYING file in the top-level directory.
+ *
+ */
+
+#include "qemu/osdep.h"
+#include "qemu-common.h"
+
+#include "hw/remote/machine.h"
+#include "io/channel.h"
+#include "hw/remote/mpqemu-link.h"
+#include "qapi/error.h"
+#include "sysemu/runstate.h"
+
+void coroutine_fn mpqemu_remote_msg_loop_co(void *data)
+{
+    g_autofree RemoteCommDev *com = (RemoteCommDev *)data;
+    PCIDevice *pci_dev = NULL;
+    Error *local_err = NULL;
+
+    assert(com->ioc);
+
+    pci_dev = com->dev;
+    for (; !local_err;) {
+        MPQemuMsg msg = {0};
+
+        if (!mpqemu_msg_recv(&msg, com->ioc, &local_err)) {
+            break;
+        }
+
+        if (!mpqemu_msg_valid(&msg)) {
+            error_setg(&local_err, "Received invalid message from proxy"
+                                   "in remote process pid="FMT_pid"",
+                                   getpid());
+            break;
+        }
+
+        switch (msg.cmd) {
+        default:
+            error_setg(&local_err,
+                       "Unknown command (%d) received for device %s"
+                       " (pid="FMT_pid")",
+                       msg.cmd, DEVICE(pci_dev)->id, getpid());
+        }
+    }
+
+    if (local_err) {
+        error_report_err(local_err);
+        qemu_system_shutdown_request(SHUTDOWN_CAUSE_HOST_ERROR);
+    } else {
+        qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN);
+    }
+}
diff --git a/hw/remote/meson.build b/hw/remote/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/hw/remote/meson.build
+++ b/hw/remote/meson.build
@@ -XXX,XX +XXX,XX @@ remote_ss = ss.source_set()
 
 remote_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('machine.c'))
 remote_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('mpqemu-link.c'))
+remote_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('message.c'))
 
 softmmu_ss.add_all(when: 'CONFIG_MULTIPROCESS', if_true: remote_ss)
-- 
2.29.2

From: Jagannathan Raman <jag.raman@oracle.com>

Associate the file descriptor for a PCIDevice in remote process with
DeviceState object.

Signed-off-by: Elena Ufimtseva <elena.ufimtseva@oracle.com>
Signed-off-by: John G Johnson <john.g.johnson@oracle.com>
Signed-off-by: Jagannathan Raman <jag.raman@oracle.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: f405a2ed5d7518b87bea7c59cfdf334d67e5ee51.1611938319.git.jag.raman@oracle.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 MAINTAINERS            |   1 +
 hw/remote/remote-obj.c | 203 +++++++++++++++++++++++++++++++++++++++++
 hw/remote/meson.build  |   1 +
 3 files changed, 205 insertions(+)
 create mode 100644 hw/remote/remote-obj.c

diff --git a/MAINTAINERS b/MAINTAINERS
index XXXXXXX..XXXXXXX 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -XXX,XX +XXX,XX @@ F: include/hw/remote/machine.h
 F: hw/remote/mpqemu-link.c
 F: include/hw/remote/mpqemu-link.h
 F: hw/remote/message.c
+F: hw/remote/remote-obj.c
 
 Build and test automation
 -------------------------
diff --git a/hw/remote/remote-obj.c b/hw/remote/remote-obj.c
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/hw/remote/remote-obj.c
@@ -XXX,XX +XXX,XX @@
+/*
+ * Copyright © 2020, 2021 Oracle and/or its affiliates.
+ *
+ * This work is licensed under the terms of the GNU GPL-v2, version 2 or later.
+ *
+ * See the COPYING file in the top-level directory.
+ *
+ */
+
+#include "qemu/osdep.h"
+#include "qemu-common.h"
+
+#include "qemu/error-report.h"
+#include "qemu/notify.h"
+#include "qom/object_interfaces.h"
+#include "hw/qdev-core.h"
+#include "io/channel.h"
+#include "hw/qdev-core.h"
+#include "hw/remote/machine.h"
+#include "io/channel-util.h"
+#include "qapi/error.h"
+#include "sysemu/sysemu.h"
+#include "hw/pci/pci.h"
+#include "qemu/sockets.h"
+#include "monitor/monitor.h"
+
+#define TYPE_REMOTE_OBJECT "x-remote-object"
+OBJECT_DECLARE_TYPE(RemoteObject, RemoteObjectClass, REMOTE_OBJECT)
+
+struct RemoteObjectClass {
+    ObjectClass parent_class;
+
+    unsigned int nr_devs;
+    unsigned int max_devs;
+};
+
+struct RemoteObject {
+    /* private */
+    Object parent;
+
+    Notifier machine_done;
+
+    int32_t fd;
+    char *devid;
+
+    QIOChannel *ioc;
+
+    DeviceState *dev;
+    DeviceListener listener;
+};
+
+static void remote_object_set_fd(Object *obj, const char *str, Error **errp)
+{
+    RemoteObject *o = REMOTE_OBJECT(obj);
+    int fd = -1;
+
+    fd = monitor_fd_param(monitor_cur(), str, errp);
+    if (fd == -1) {
+        error_prepend(errp, "Could not parse remote object fd %s:", str);
+        return;
+    }
+
+    if (!fd_is_socket(fd)) {
+        error_setg(errp, "File descriptor '%s' is not a socket", str);
+        close(fd);
+        return;
+    }
+
+    o->fd = fd;
+}
+
+static void remote_object_set_devid(Object *obj, const char *str, Error **errp)
+{
+    RemoteObject *o = REMOTE_OBJECT(obj);
+
+    g_free(o->devid);
+
+    o->devid = g_strdup(str);
+}
+
+static void remote_object_unrealize_listener(DeviceListener *listener,
+                                             DeviceState *dev)
+{
+    RemoteObject *o = container_of(listener, RemoteObject, listener);
+
+    if (o->dev == dev) {
+        object_unref(OBJECT(o));
+    }
+}
+
+static void remote_object_machine_done(Notifier *notifier, void *data)
+{
+    RemoteObject *o = container_of(notifier, RemoteObject, machine_done);
+    DeviceState *dev = NULL;
+    QIOChannel *ioc = NULL;
+    Coroutine *co = NULL;
+    RemoteCommDev *comdev = NULL;
+    Error *err = NULL;
+
+    dev = qdev_find_recursive(sysbus_get_default(), o->devid);
+    if (!dev || !object_dynamic_cast(OBJECT(dev), TYPE_PCI_DEVICE)) {
+        error_report("%s is not a PCI device", o->devid);
+        return;
+    }
+
+    ioc = qio_channel_new_fd(o->fd, &err);
+    if (!ioc) {
+        error_report_err(err);
+        return;
+    }
+    qio_channel_set_blocking(ioc, false, NULL);
+
+    o->dev = dev;
+
+    o->listener.unrealize = remote_object_unrealize_listener;
+    device_listener_register(&o->listener);
+
+    /* co-routine should free this. */
+    comdev = g_new0(RemoteCommDev, 1);
+    *comdev = (RemoteCommDev) {
+        .ioc = ioc,
+        .dev = PCI_DEVICE(dev),
+    };
+
+    co = qemu_coroutine_create(mpqemu_remote_msg_loop_co, comdev);
+    qemu_coroutine_enter(co);
+}
+
+static void remote_object_init(Object *obj)
+{
+    RemoteObjectClass *k = REMOTE_OBJECT_GET_CLASS(obj);
+    RemoteObject *o = REMOTE_OBJECT(obj);
+
+    if (k->nr_devs >= k->max_devs) {
+        error_report("Reached maximum number of devices: %u", k->max_devs);
+        return;
+    }
+
+    o->ioc = NULL;
+    o->fd = -1;
+    o->devid = NULL;
+
+    k->nr_devs++;
+
+    o->machine_done.notify = remote_object_machine_done;
+    qemu_add_machine_init_done_notifier(&o->machine_done);
+}
+
+static void remote_object_finalize(Object *obj)
+{
+    RemoteObjectClass *k = REMOTE_OBJECT_GET_CLASS(obj);
+    RemoteObject *o = REMOTE_OBJECT(obj);
+
+    device_listener_unregister(&o->listener);
+
+    if (o->ioc) {
+        qio_channel_shutdown(o->ioc, QIO_CHANNEL_SHUTDOWN_BOTH, NULL);
+        qio_channel_close(o->ioc, NULL);
+    }
+
+    object_unref(OBJECT(o->ioc));
+
+    k->nr_devs--;
+    g_free(o->devid);
+}
+
+static void remote_object_class_init(ObjectClass *klass, void *data)
+{
+    RemoteObjectClass *k = REMOTE_OBJECT_CLASS(klass);
+
+    /*
+     * Limit number of supported devices to 1. This is done to avoid devices
+     * from one VM accessing the RAM of another VM. This is done until we
+     * start using separate address spaces for individual devices.
+     */
+    k->max_devs = 1;
+    k->nr_devs = 0;
+
+    object_class_property_add_str(klass, "fd", NULL, remote_object_set_fd);
+    object_class_property_add_str(klass, "devid", NULL,
+                                  remote_object_set_devid);
+}
+
+static const TypeInfo remote_object_info = {
+    .name = TYPE_REMOTE_OBJECT,
+    .parent = TYPE_OBJECT,
+    .instance_size = sizeof(RemoteObject),
+    .instance_init = remote_object_init,
+    .instance_finalize = remote_object_finalize,
+    .class_size = sizeof(RemoteObjectClass),
+    .class_init = remote_object_class_init,
+    .interfaces = (InterfaceInfo[]) {
+        { TYPE_USER_CREATABLE },
+        { }
+    }
+};
+
+static void register_types(void)
+{
+    type_register_static(&remote_object_info);
+}
+
+type_init(register_types);
diff --git a/hw/remote/meson.build b/hw/remote/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/hw/remote/meson.build
+++ b/hw/remote/meson.build
@@ -XXX,XX +XXX,XX @@ remote_ss = ss.source_set()
 remote_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('machine.c'))
 remote_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('mpqemu-link.c'))
 remote_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('message.c'))
+remote_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('remote-obj.c'))
 
 softmmu_ss.add_all(when: 'CONFIG_MULTIPROCESS', if_true: remote_ss)
-- 
2.29.2

From: Jagannathan Raman <jag.raman@oracle.com>

SyncSysMemMsg message format is defined. It is used to send
file descriptors of the RAM regions to remote device.
RAM on the remote device is configured with a set of file descriptors.
Old RAM regions are deleted and new regions, each with an fd, is
added to the RAM.

Signed-off-by: Jagannathan Raman <jag.raman@oracle.com>
Signed-off-by: John G Johnson <john.g.johnson@oracle.com>
Signed-off-by: Elena Ufimtseva <elena.ufimtseva@oracle.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 7d2d1831d812e85f681e7a8ab99e032cf4704689.1611938319.git.jag.raman@oracle.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 MAINTAINERS                     |  2 +
 include/hw/remote/memory.h      | 19 ++++++++++
 include/hw/remote/mpqemu-link.h | 10 +++++
 hw/remote/memory.c              | 65 +++++++++++++++++++++++++++++++++
 hw/remote/mpqemu-link.c         | 11 ++++++
 hw/remote/meson.build           |  2 +
 6 files changed, 109 insertions(+)
 create mode 100644 include/hw/remote/memory.h
 create mode 100644 hw/remote/memory.c

diff --git a/MAINTAINERS b/MAINTAINERS
index XXXXXXX..XXXXXXX 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -XXX,XX +XXX,XX @@ F: hw/remote/mpqemu-link.c
 F: include/hw/remote/mpqemu-link.h
 F: hw/remote/message.c
 F: hw/remote/remote-obj.c
+F: include/hw/remote/memory.h
+F: hw/remote/memory.c
 
 Build and test automation
 -------------------------
diff --git a/include/hw/remote/memory.h b/include/hw/remote/memory.h
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/include/hw/remote/memory.h
@@ -XXX,XX +XXX,XX @@
+/*
+ * Memory manager for remote device
+ *
+ * Copyright © 2018, 2021 Oracle and/or its affiliates.
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ *
+ */
+
+#ifndef REMOTE_MEMORY_H
+#define REMOTE_MEMORY_H
+
+#include "exec/hwaddr.h"
+#include "hw/remote/mpqemu-link.h"
+
+void remote_sysmem_reconfig(MPQemuMsg *msg, Error **errp);
+
+#endif
diff --git a/include/hw/remote/mpqemu-link.h b/include/hw/remote/mpqemu-link.h
index XXXXXXX..XXXXXXX 100644
--- a/include/hw/remote/mpqemu-link.h
+++ b/include/hw/remote/mpqemu-link.h
@@ -XXX,XX +XXX,XX @@
 #include "qom/object.h"
 #include "qemu/thread.h"
 #include "io/channel.h"
+#include "exec/hwaddr.h"
 
 #define REMOTE_MAX_FDS 8
 
@@ -XXX,XX +XXX,XX @@
  *
  */
 typedef enum {
+    MPQEMU_CMD_SYNC_SYSMEM,
     MPQEMU_CMD_MAX,
 } MPQemuCmd;
 
+typedef struct {
+    hwaddr gpas[REMOTE_MAX_FDS];
+    uint64_t sizes[REMOTE_MAX_FDS];
+    off_t offsets[REMOTE_MAX_FDS];
+} SyncSysmemMsg;
+
 /**
  * MPQemuMsg:
  * @cmd: The remote command
@@ -XXX,XX +XXX,XX @@ typedef enum {
  * MPQemuMsg Format of the message sent to the remote device from QEMU.
  *
  */
+
 typedef struct {
     int cmd;
     size_t size;
 
     union {
         uint64_t u64;
+        SyncSysmemMsg sync_sysmem;
     } data;
 
     int fds[REMOTE_MAX_FDS];
diff --git a/hw/remote/memory.c b/hw/remote/memory.c
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/hw/remote/memory.c
@@ -XXX,XX +XXX,XX @@
+/*
+ * Memory manager for remote device
+ *
+ * Copyright © 2018, 2021 Oracle and/or its affiliates.
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ *
+ */
+
+#include "qemu/osdep.h"
+#include "qemu-common.h"
+
+#include "hw/remote/memory.h"
+#include "exec/address-spaces.h"
+#include "exec/ram_addr.h"
+#include "qapi/error.h"
+
+static void remote_sysmem_reset(void)
+{
+    MemoryRegion *sysmem, *subregion, *next;
+
+    sysmem = get_system_memory();
+
+    QTAILQ_FOREACH_SAFE(subregion, &sysmem->subregions, subregions_link, next) {
+        if (subregion->ram) {
+            memory_region_del_subregion(sysmem, subregion);
+            object_unparent(OBJECT(subregion));
+        }
+    }
+}
+
+void remote_sysmem_reconfig(MPQemuMsg *msg, Error **errp)
+{
+    ERRP_GUARD();
+    SyncSysmemMsg *sysmem_info = &msg->data.sync_sysmem;
+    MemoryRegion *sysmem, *subregion;
+    static unsigned int suffix;
+    int region;
+
+    sysmem = get_system_memory();
+
+    remote_sysmem_reset();
+
+    for (region = 0; region < msg->num_fds; region++) {
+        g_autofree char *name;
+        subregion = g_new(MemoryRegion, 1);
+        name = g_strdup_printf("remote-mem-%u", suffix++);
+        memory_region_init_ram_from_fd(subregion, NULL,
+                                       name, sysmem_info->sizes[region],
+                                       true, msg->fds[region],
+                                       sysmem_info->offsets[region],
+                                       errp);
+
+        if (*errp) {
+            g_free(subregion);
+            remote_sysmem_reset();
+            return;
+        }
+
+        memory_region_add_subregion(sysmem, sysmem_info->gpas[region],
+                                    subregion);
+
+    }
+}
diff --git a/hw/remote/mpqemu-link.c b/hw/remote/mpqemu-link.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/remote/mpqemu-link.c
+++ b/hw/remote/mpqemu-link.c
@@ -XXX,XX +XXX,XX @@ bool mpqemu_msg_valid(MPQemuMsg *msg)
         }
     }
 
+     /* Verify message specific fields. */
+    switch (msg->cmd) {
+    case MPQEMU_CMD_SYNC_SYSMEM:
+        if (msg->num_fds == 0 || msg->size != sizeof(SyncSysmemMsg)) {
+            return false;
+        }
+        break;
+    default:
+        break;
+    }
+
     return true;
 }
diff --git a/hw/remote/meson.build b/hw/remote/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/hw/remote/meson.build
+++ b/hw/remote/meson.build
@@ -XXX,XX +XXX,XX @@ remote_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('mpqemu-link.c'))
 remote_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('message.c'))
 remote_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('remote-obj.c'))
 
+specific_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('memory.c'))
+
 softmmu_ss.add_all(when: 'CONFIG_MULTIPROCESS', if_true: remote_ss)
-- 
2.29.2

From: Elena Ufimtseva <elena.ufimtseva@oracle.com>

Defines a PCI Device proxy object as a child of TYPE_PCI_DEVICE.

Signed-off-by: Elena Ufimtseva <elena.ufimtseva@oracle.com>
Signed-off-by: Jagannathan Raman <jag.raman@oracle.com>
Signed-off-by: John G Johnson <john.g.johnson@oracle.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: b5186ebfedf8e557044d09a768846c59230ad3a7.1611938319.git.jag.raman@oracle.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 MAINTAINERS               |  2 +
 include/hw/remote/proxy.h | 33 +++++++++++++
 hw/remote/proxy.c         | 99 +++++++++++++++++++++++++++++++++++++++
 hw/remote/meson.build     |  1 +
 4 files changed, 135 insertions(+)
 create mode 100644 include/hw/remote/proxy.h
 create mode 100644 hw/remote/proxy.c

diff --git a/MAINTAINERS b/MAINTAINERS
index XXXXXXX..XXXXXXX 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -XXX,XX +XXX,XX @@ F: hw/remote/message.c
 F: hw/remote/remote-obj.c
 F: include/hw/remote/memory.h
 F: hw/remote/memory.c
+F: hw/remote/proxy.c
+F: include/hw/remote/proxy.h
 
 Build and test automation
 -------------------------
diff --git a/include/hw/remote/proxy.h b/include/hw/remote/proxy.h
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/include/hw/remote/proxy.h
@@ -XXX,XX +XXX,XX @@
+/*
+ * Copyright © 2018, 2021 Oracle and/or its affiliates.
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ *
+ */
+
+#ifndef PROXY_H
+#define PROXY_H
+
+#include "hw/pci/pci.h"
+#include "io/channel.h"
+
+#define TYPE_PCI_PROXY_DEV "x-pci-proxy-dev"
+OBJECT_DECLARE_SIMPLE_TYPE(PCIProxyDev, PCI_PROXY_DEV)
+
+struct PCIProxyDev {
+    PCIDevice parent_dev;
+    char *fd;
+
+    /*
+     * Mutex used to protect the QIOChannel fd from
+     * the concurrent access by the VCPUs since proxy
+     * blocks while awaiting for the replies from the
+     * process remote.
+     */
+    QemuMutex io_mutex;
+    QIOChannel *ioc;
+    Error *migration_blocker;
+};
+
+#endif /* PROXY_H */
diff --git a/hw/remote/proxy.c b/hw/remote/proxy.c
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/hw/remote/proxy.c
@@ -XXX,XX +XXX,XX @@
+/*
+ * Copyright © 2018, 2021 Oracle and/or its affiliates.
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ *
+ */
+
+#include "qemu/osdep.h"
+#include "qemu-common.h"
+
+#include "hw/remote/proxy.h"
+#include "hw/pci/pci.h"
+#include "qapi/error.h"
+#include "io/channel-util.h"
+#include "hw/qdev-properties.h"
+#include "monitor/monitor.h"
+#include "migration/blocker.h"
+#include "qemu/sockets.h"
+
+static void pci_proxy_dev_realize(PCIDevice *device, Error **errp)
+{
+    ERRP_GUARD();
+    PCIProxyDev *dev = PCI_PROXY_DEV(device);
+    int fd;
+
+    if (!dev->fd) {
+        error_setg(errp, "fd parameter not specified for %s",
+                   DEVICE(device)->id);
+        return;
+    }
+
+    fd = monitor_fd_param(monitor_cur(), dev->fd, errp);
+    if (fd == -1) {
+        error_prepend(errp, "proxy: unable to parse fd %s: ", dev->fd);
+        return;
+    }
+
+    if (!fd_is_socket(fd)) {
+        error_setg(errp, "proxy: fd %d is not a socket", fd);
+        close(fd);
+        return;
+    }
+
+    dev->ioc = qio_channel_new_fd(fd, errp);
+
+    error_setg(&dev->migration_blocker, "%s does not support migration",
+               TYPE_PCI_PROXY_DEV);
+    migrate_add_blocker(dev->migration_blocker, errp);
+
+    qemu_mutex_init(&dev->io_mutex);
+    qio_channel_set_blocking(dev->ioc, true, NULL);
+}
+
+static void pci_proxy_dev_exit(PCIDevice *pdev)
+{
+    PCIProxyDev *dev = PCI_PROXY_DEV(pdev);
+
+    if (dev->ioc) {
+        qio_channel_close(dev->ioc, NULL);
+    }
+
+    migrate_del_blocker(dev->migration_blocker);
+
+    error_free(dev->migration_blocker);
+}
+
+static Property proxy_properties[] = {
+    DEFINE_PROP_STRING("fd", PCIProxyDev, fd),
+    DEFINE_PROP_END_OF_LIST(),
+};
+
+static void pci_proxy_dev_class_init(ObjectClass *klass, void *data)
+{
+    DeviceClass *dc = DEVICE_CLASS(klass);
+    PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
+
+    k->realize = pci_proxy_dev_realize;
+    k->exit = pci_proxy_dev_exit;
+    device_class_set_props(dc, proxy_properties);
+}
+
+static const TypeInfo pci_proxy_dev_type_info = {
+    .name          = TYPE_PCI_PROXY_DEV,
+    .parent        = TYPE_PCI_DEVICE,
+    .instance_size = sizeof(PCIProxyDev),
+    .class_init    = pci_proxy_dev_class_init,
+    .interfaces = (InterfaceInfo[]) {
+        { INTERFACE_CONVENTIONAL_PCI_DEVICE },
+        { },
+    },
+};
+
+static void pci_proxy_dev_register_types(void)
+{
+    type_register_static(&pci_proxy_dev_type_info);
+}
+
+type_init(pci_proxy_dev_register_types)
diff --git a/hw/remote/meson.build b/hw/remote/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/hw/remote/meson.build
+++ b/hw/remote/meson.build
@@ -XXX,XX +XXX,XX @@ remote_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('machine.c'))
 remote_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('mpqemu-link.c'))
 remote_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('message.c'))
 remote_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('remote-obj.c'))
+remote_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('proxy.c'))
 
 specific_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('memory.c'))
 
-- 
2.29.2

From: Elena Ufimtseva <elena.ufimtseva@oracle.com>

Signed-off-by: Elena Ufimtseva <elena.ufimtseva@oracle.com>
Signed-off-by: Jagannathan Raman <jag.raman@oracle.com>
Signed-off-by: John G Johnson <john.g.johnson@oracle.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: d54edb4176361eed86b903e8f27058363b6c83b3.1611938319.git.jag.raman@oracle.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 include/hw/remote/mpqemu-link.h |  4 ++++
 hw/remote/mpqemu-link.c         | 34 +++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+)

diff --git a/include/hw/remote/mpqemu-link.h b/include/hw/remote/mpqemu-link.h
index XXXXXXX..XXXXXXX 100644
--- a/include/hw/remote/mpqemu-link.h
+++ b/include/hw/remote/mpqemu-link.h
@@ -XXX,XX +XXX,XX @@
 #include "qemu/thread.h"
 #include "io/channel.h"
 #include "exec/hwaddr.h"
+#include "io/channel-socket.h"
+#include "hw/remote/proxy.h"
 
 #define REMOTE_MAX_FDS 8
 
@@ -XXX,XX +XXX,XX @@ typedef struct {
 bool mpqemu_msg_send(MPQemuMsg *msg, QIOChannel *ioc, Error **errp);
 bool mpqemu_msg_recv(MPQemuMsg *msg, QIOChannel *ioc, Error **errp);
 
+uint64_t mpqemu_msg_send_and_await_reply(MPQemuMsg *msg, PCIProxyDev *pdev,
+                                         Error **errp);
 bool mpqemu_msg_valid(MPQemuMsg *msg);
 
 #endif
diff --git a/hw/remote/mpqemu-link.c b/hw/remote/mpqemu-link.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/remote/mpqemu-link.c
+++ b/hw/remote/mpqemu-link.c
@@ -XXX,XX +XXX,XX @@ fail:
     return ret;
 }
 
+/*
+ * Send msg and wait for a reply with command code RET_MSG.
+ * Returns the message received of size u64 or UINT64_MAX
+ * on error.
+ * Called from VCPU thread in non-coroutine context.
+ * Used by the Proxy object to communicate to remote processes.
+ */
+uint64_t mpqemu_msg_send_and_await_reply(MPQemuMsg *msg, PCIProxyDev *pdev,
+                                         Error **errp)
+{
+    ERRP_GUARD();
+    MPQemuMsg msg_reply = {0};
+    uint64_t ret = UINT64_MAX;
+
+    assert(!qemu_in_coroutine());
+
+    QEMU_LOCK_GUARD(&pdev->io_mutex);
+    if (!mpqemu_msg_send(msg, pdev->ioc, errp)) {
+        return ret;
+    }
+
+    if (!mpqemu_msg_recv(&msg_reply, pdev->ioc, errp)) {
+        return ret;
+    }
+
+    if (!mpqemu_msg_valid(&msg_reply)) {
+        error_setg(errp, "ERROR: Invalid reply received for command %d",
+                         msg->cmd);
+        return ret;
+    }
+
+    return msg_reply.data.u64;
+}
+
 bool mpqemu_msg_valid(MPQemuMsg *msg)
 {
     if (msg->cmd >= MPQEMU_CMD_MAX && msg->cmd < 0) {
-- 
2.29.2

From: Elena Ufimtseva <elena.ufimtseva@oracle.com>

The Proxy Object sends the PCI config space accesses as messages
to the remote process over the communication channel

Signed-off-by: Elena Ufimtseva <elena.ufimtseva@oracle.com>
Signed-off-by: Jagannathan Raman <jag.raman@oracle.com>
Signed-off-by: John G Johnson <john.g.johnson@oracle.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: d3c94f4618813234655356c60e6f0d0362ff42d6.1611938319.git.jag.raman@oracle.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 include/hw/remote/mpqemu-link.h | 10 ++++++
 hw/remote/message.c             | 60 +++++++++++++++++++++++++++++++++
 hw/remote/mpqemu-link.c         |  8 ++++-
 hw/remote/proxy.c               | 55 ++++++++++++++++++++++++++++++
 4 files changed, 132 insertions(+), 1 deletion(-)

diff --git a/include/hw/remote/mpqemu-link.h b/include/hw/remote/mpqemu-link.h
index XXXXXXX..XXXXXXX 100644
--- a/include/hw/remote/mpqemu-link.h
+++ b/include/hw/remote/mpqemu-link.h
@@ -XXX,XX +XXX,XX @@
  */
 typedef enum {
     MPQEMU_CMD_SYNC_SYSMEM,
+    MPQEMU_CMD_RET,
+    MPQEMU_CMD_PCI_CFGWRITE,
+    MPQEMU_CMD_PCI_CFGREAD,
     MPQEMU_CMD_MAX,
 } MPQemuCmd;
 
@@ -XXX,XX +XXX,XX @@ typedef struct {
     off_t offsets[REMOTE_MAX_FDS];
 } SyncSysmemMsg;
 
+typedef struct {
+    uint32_t addr;
+    uint32_t val;
+    int len;
+} PciConfDataMsg;
+
 /**
  * MPQemuMsg:
  * @cmd: The remote command
@@ -XXX,XX +XXX,XX @@ typedef struct {
 
     union {
         uint64_t u64;
+        PciConfDataMsg pci_conf_data;
         SyncSysmemMsg sync_sysmem;
     } data;
 
diff --git a/hw/remote/message.c b/hw/remote/message.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/remote/message.c
+++ b/hw/remote/message.c
@@ -XXX,XX +XXX,XX @@
 #include "hw/remote/mpqemu-link.h"
 #include "qapi/error.h"
 #include "sysemu/runstate.h"
+#include "hw/pci/pci.h"
+
+static void process_config_write(QIOChannel *ioc, PCIDevice *dev,
+                                 MPQemuMsg *msg, Error **errp);
+static void process_config_read(QIOChannel *ioc, PCIDevice *dev,
+                                MPQemuMsg *msg, Error **errp);
 
 void coroutine_fn mpqemu_remote_msg_loop_co(void *data)
 {
@@ -XXX,XX +XXX,XX @@ void coroutine_fn mpqemu_remote_msg_loop_co(void *data)
         }
 
         switch (msg.cmd) {
+        case MPQEMU_CMD_PCI_CFGWRITE:
+            process_config_write(com->ioc, pci_dev, &msg, &local_err);
+            break;
+        case MPQEMU_CMD_PCI_CFGREAD:
+            process_config_read(com->ioc, pci_dev, &msg, &local_err);
+            break;
         default:
             error_setg(&local_err,
                        "Unknown command (%d) received for device %s"
@@ -XXX,XX +XXX,XX @@ void coroutine_fn mpqemu_remote_msg_loop_co(void *data)
         qemu_system_shutdown_request(SHUTDOWN_CAUSE_GUEST_SHUTDOWN);
     }
 }
+
+static void process_config_write(QIOChannel *ioc, PCIDevice *dev,
+                                 MPQemuMsg *msg, Error **errp)
+{
+    ERRP_GUARD();
+    PciConfDataMsg *conf = (PciConfDataMsg *)&msg->data.pci_conf_data;
+    MPQemuMsg ret = { 0 };
+
+    if ((conf->addr + sizeof(conf->val)) > pci_config_size(dev)) {
+        error_setg(errp, "Bad address for PCI config write, pid "FMT_pid".",
+                   getpid());
+        ret.data.u64 = UINT64_MAX;
+    } else {
+        pci_default_write_config(dev, conf->addr, conf->val, conf->len);
+    }
+
+    ret.cmd = MPQEMU_CMD_RET;
+    ret.size = sizeof(ret.data.u64);
+
+    if (!mpqemu_msg_send(&ret, ioc, NULL)) {
+        error_prepend(errp, "Error returning code to proxy, pid "FMT_pid": ",
+                      getpid());
+    }
+}
+
+static void process_config_read(QIOChannel *ioc, PCIDevice *dev,
+                                MPQemuMsg *msg, Error **errp)
+{
+    ERRP_GUARD();
+    PciConfDataMsg *conf = (PciConfDataMsg *)&msg->data.pci_conf_data;
+    MPQemuMsg ret = { 0 };
+
+    if ((conf->addr + sizeof(conf->val)) > pci_config_size(dev)) {
+        error_setg(errp, "Bad address for PCI config read, pid "FMT_pid".",
+                   getpid());
+        ret.data.u64 = UINT64_MAX;
+    } else {
+        ret.data.u64 = pci_default_read_config(dev, conf->addr, conf->len);
+    }
+
+    ret.cmd = MPQEMU_CMD_RET;
+    ret.size = sizeof(ret.data.u64);
+
+    if (!mpqemu_msg_send(&ret, ioc, NULL)) {
+        error_prepend(errp, "Error returning code to proxy, pid "FMT_pid": ",
+                      getpid());
+    }
+}
diff --git a/hw/remote/mpqemu-link.c b/hw/remote/mpqemu-link.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/remote/mpqemu-link.c
+++ b/hw/remote/mpqemu-link.c
@@ -XXX,XX +XXX,XX @@ uint64_t mpqemu_msg_send_and_await_reply(MPQemuMsg *msg, PCIProxyDev *pdev,
         return ret;
     }
 
-    if (!mpqemu_msg_valid(&msg_reply)) {
+    if (!mpqemu_msg_valid(&msg_reply) || msg_reply.cmd != MPQEMU_CMD_RET) {
         error_setg(errp, "ERROR: Invalid reply received for command %d",
                          msg->cmd);
         return ret;
@@ -XXX,XX +XXX,XX @@ bool mpqemu_msg_valid(MPQemuMsg *msg)
             return false;
         }
         break;
+    case MPQEMU_CMD_PCI_CFGWRITE:
+    case MPQEMU_CMD_PCI_CFGREAD:
+        if (msg->size != sizeof(PciConfDataMsg)) {
+            return false;
+        }
+        break;
     default:
         break;
     }
diff --git a/hw/remote/proxy.c b/hw/remote/proxy.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/remote/proxy.c
+++ b/hw/remote/proxy.c
@@ -XXX,XX +XXX,XX @@
 #include "monitor/monitor.h"
 #include "migration/blocker.h"
 #include "qemu/sockets.h"
+#include "hw/remote/mpqemu-link.h"
+#include "qemu/error-report.h"
 
 static void pci_proxy_dev_realize(PCIDevice *device, Error **errp)
 {
@@ -XXX,XX +XXX,XX @@ static void pci_proxy_dev_exit(PCIDevice *pdev)
     error_free(dev->migration_blocker);
 }
 
+static void config_op_send(PCIProxyDev *pdev, uint32_t addr, uint32_t *val,
+                           int len, unsigned int op)
+{
+    MPQemuMsg msg = { 0 };
+    uint64_t ret = -EINVAL;
+    Error *local_err = NULL;
+
+    msg.cmd = op;
+    msg.data.pci_conf_data.addr = addr;
+    msg.data.pci_conf_data.val = (op == MPQEMU_CMD_PCI_CFGWRITE) ? *val : 0;
+    msg.data.pci_conf_data.len = len;
+    msg.size = sizeof(PciConfDataMsg);
+
+    ret = mpqemu_msg_send_and_await_reply(&msg, pdev, &local_err);
+    if (local_err) {
+        error_report_err(local_err);
+    }
+
+    if (ret == UINT64_MAX) {
+        error_report("Failed to perform PCI config %s operation",
+                     (op == MPQEMU_CMD_PCI_CFGREAD) ? "READ" : "WRITE");
+    }
+
+    if (op == MPQEMU_CMD_PCI_CFGREAD) {
+        *val = (uint32_t)ret;
+    }
+}
+
+static uint32_t pci_proxy_read_config(PCIDevice *d, uint32_t addr, int len)
+{
+    uint32_t val;
+
+    config_op_send(PCI_PROXY_DEV(d), addr, &val, len, MPQEMU_CMD_PCI_CFGREAD);
+
+    return val;
+}
+
+static void pci_proxy_write_config(PCIDevice *d, uint32_t addr, uint32_t val,
+                                   int len)
+{
+    /*
+     * Some of the functions access the copy of remote device's PCI config
+     * space which is cached in the proxy device. Therefore, maintain
+     * it updated.
+     */
+    pci_default_write_config(d, addr, val, len);
+
+    config_op_send(PCI_PROXY_DEV(d), addr, &val, len, MPQEMU_CMD_PCI_CFGWRITE);
+}
+
 static Property proxy_properties[] = {
     DEFINE_PROP_STRING("fd", PCIProxyDev, fd),
     DEFINE_PROP_END_OF_LIST(),
@@ -XXX,XX +XXX,XX @@ static void pci_proxy_dev_class_init(ObjectClass *klass, void *data)
 
     k->realize = pci_proxy_dev_realize;
     k->exit = pci_proxy_dev_exit;
+    k->config_read = pci_proxy_read_config;
+    k->config_write = pci_proxy_write_config;
+
     device_class_set_props(dc, proxy_properties);
 }
 
-- 
2.29.2

From: Jagannathan Raman <jag.raman@oracle.com>

Proxy device object implements handler for PCI BAR writes and reads.
The handler uses BAR_WRITE/BAR_READ message to communicate to the
remote process with the BAR address and value to be written/read.
The remote process implements handler for BAR_WRITE/BAR_READ
message.

Signed-off-by: Jagannathan Raman <jag.raman@oracle.com>
Signed-off-by: Elena Ufimtseva <elena.ufimtseva@oracle.com>
Signed-off-by: John G Johnson <john.g.johnson@oracle.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: a8b76714a9688be5552c4c92d089bc9e8a4707ff.1611938319.git.jag.raman@oracle.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 include/hw/remote/mpqemu-link.h | 10 ++++
 include/hw/remote/proxy.h       |  9 ++++
 hw/remote/message.c             | 83 +++++++++++++++++++++++++++++++++
 hw/remote/mpqemu-link.c         |  6 +++
 hw/remote/proxy.c               | 60 ++++++++++++++++++++++++
 5 files changed, 168 insertions(+)

diff --git a/include/hw/remote/mpqemu-link.h b/include/hw/remote/mpqemu-link.h
index XXXXXXX..XXXXXXX 100644
--- a/include/hw/remote/mpqemu-link.h
+++ b/include/hw/remote/mpqemu-link.h
@@ -XXX,XX +XXX,XX @@ typedef enum {
     MPQEMU_CMD_RET,
     MPQEMU_CMD_PCI_CFGWRITE,
     MPQEMU_CMD_PCI_CFGREAD,
+    MPQEMU_CMD_BAR_WRITE,
+    MPQEMU_CMD_BAR_READ,
     MPQEMU_CMD_MAX,
 } MPQemuCmd;
 
@@ -XXX,XX +XXX,XX @@ typedef struct {
     int len;
 } PciConfDataMsg;
 
+typedef struct {
+    hwaddr addr;
+    uint64_t val;
+    unsigned size;
+    bool memory;
+} BarAccessMsg;
+
 /**
  * MPQemuMsg:
  * @cmd: The remote command
@@ -XXX,XX +XXX,XX @@ typedef struct {
         uint64_t u64;
         PciConfDataMsg pci_conf_data;
         SyncSysmemMsg sync_sysmem;
+        BarAccessMsg bar_access;
     } data;
 
     int fds[REMOTE_MAX_FDS];
diff --git a/include/hw/remote/proxy.h b/include/hw/remote/proxy.h
index XXXXXXX..XXXXXXX 100644
--- a/include/hw/remote/proxy.h
+++ b/include/hw/remote/proxy.h
@@ -XXX,XX +XXX,XX @@
 #define TYPE_PCI_PROXY_DEV "x-pci-proxy-dev"
 OBJECT_DECLARE_SIMPLE_TYPE(PCIProxyDev, PCI_PROXY_DEV)
 
+typedef struct ProxyMemoryRegion {
+    PCIProxyDev *dev;
+    MemoryRegion mr;
+    bool memory;
+    bool present;
+    uint8_t type;
+} ProxyMemoryRegion;
+
 struct PCIProxyDev {
     PCIDevice parent_dev;
     char *fd;
@@ -XXX,XX +XXX,XX @@ struct PCIProxyDev {
     QemuMutex io_mutex;
     QIOChannel *ioc;
     Error *migration_blocker;
+    ProxyMemoryRegion region[PCI_NUM_REGIONS];
 };
 
 #endif /* PROXY_H */
diff --git a/hw/remote/message.c b/hw/remote/message.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/remote/message.c
+++ b/hw/remote/message.c
@@ -XXX,XX +XXX,XX @@
 #include "qapi/error.h"
 #include "sysemu/runstate.h"
 #include "hw/pci/pci.h"
+#include "exec/memattrs.h"
 
 static void process_config_write(QIOChannel *ioc, PCIDevice *dev,
                                  MPQemuMsg *msg, Error **errp);
 static void process_config_read(QIOChannel *ioc, PCIDevice *dev,
                                 MPQemuMsg *msg, Error **errp);
+static void process_bar_write(QIOChannel *ioc, MPQemuMsg *msg, Error **errp);
+static void process_bar_read(QIOChannel *ioc, MPQemuMsg *msg, Error **errp);
 
 void coroutine_fn mpqemu_remote_msg_loop_co(void *data)
 {
@@ -XXX,XX +XXX,XX @@ void coroutine_fn mpqemu_remote_msg_loop_co(void *data)
         case MPQEMU_CMD_PCI_CFGREAD:
             process_config_read(com->ioc, pci_dev, &msg, &local_err);
             break;
+        case MPQEMU_CMD_BAR_WRITE:
+            process_bar_write(com->ioc, &msg, &local_err);
+            break;
+        case MPQEMU_CMD_BAR_READ:
+            process_bar_read(com->ioc, &msg, &local_err);
+            break;
         default:
             error_setg(&local_err,
                        "Unknown command (%d) received for device %s"
@@ -XXX,XX +XXX,XX @@ static void process_config_read(QIOChannel *ioc, PCIDevice *dev,
                       getpid());
     }
 }
+
+static void process_bar_write(QIOChannel *ioc, MPQemuMsg *msg, Error **errp)
+{
+    ERRP_GUARD();
+    BarAccessMsg *bar_access = &msg->data.bar_access;
+    AddressSpace *as =
+        bar_access->memory ? &address_space_memory : &address_space_io;
+    MPQemuMsg ret = { 0 };
+    MemTxResult res;
+    uint64_t val;
+
+    if (!is_power_of_2(bar_access->size) ||
+       (bar_access->size > sizeof(uint64_t))) {
+        ret.data.u64 = UINT64_MAX;
+        goto fail;
+    }
+
+    val = cpu_to_le64(bar_access->val);
+
+    res = address_space_rw(as, bar_access->addr, MEMTXATTRS_UNSPECIFIED,
+                           (void *)&val, bar_access->size, true);
+
+    if (res != MEMTX_OK) {
+        error_setg(errp, "Bad address %"PRIx64" for mem write, pid "FMT_pid".",
+                   bar_access->addr, getpid());
+        ret.data.u64 = -1;
+    }
+
+fail:
+    ret.cmd = MPQEMU_CMD_RET;
+    ret.size = sizeof(ret.data.u64);
+
+    if (!mpqemu_msg_send(&ret, ioc, NULL)) {
+        error_prepend(errp, "Error returning code to proxy, pid "FMT_pid": ",
+                      getpid());
+    }
+}
+
+static void process_bar_read(QIOChannel *ioc, MPQemuMsg *msg, Error **errp)
+{
+    ERRP_GUARD();
+    BarAccessMsg *bar_access = &msg->data.bar_access;
+    MPQemuMsg ret = { 0 };
+    AddressSpace *as;
+    MemTxResult res;
+    uint64_t val = 0;
+
+    as = bar_access->memory ? &address_space_memory : &address_space_io;
+
+    if (!is_power_of_2(bar_access->size) ||
+       (bar_access->size > sizeof(uint64_t))) {
+        val = UINT64_MAX;
+        goto fail;
+    }
+
+    res = address_space_rw(as, bar_access->addr, MEMTXATTRS_UNSPECIFIED,
+                           (void *)&val, bar_access->size, false);
+
+    if (res != MEMTX_OK) {
+        error_setg(errp, "Bad address %"PRIx64" for mem read, pid "FMT_pid".",
+                   bar_access->addr, getpid());
+        val = UINT64_MAX;
+    }
+
+fail:
+    ret.cmd = MPQEMU_CMD_RET;
+    ret.data.u64 = le64_to_cpu(val);
+    ret.size = sizeof(ret.data.u64);
+
+    if (!mpqemu_msg_send(&ret, ioc, NULL)) {
+        error_prepend(errp, "Error returning code to proxy, pid "FMT_pid": ",
+                      getpid());
+    }
+}
diff --git a/hw/remote/mpqemu-link.c b/hw/remote/mpqemu-link.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/remote/mpqemu-link.c
+++ b/hw/remote/mpqemu-link.c
@@ -XXX,XX +XXX,XX @@ bool mpqemu_msg_valid(MPQemuMsg *msg)
             return false;
         }
         break;
+    case MPQEMU_CMD_BAR_WRITE:
+    case MPQEMU_CMD_BAR_READ:
+        if ((msg->size != sizeof(BarAccessMsg)) || (msg->num_fds != 0)) {
+            return false;
+        }
+        break;
     default:
         break;
     }
diff --git a/hw/remote/proxy.c b/hw/remote/proxy.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/remote/proxy.c
+++ b/hw/remote/proxy.c
@@ -XXX,XX +XXX,XX @@ static void pci_proxy_dev_register_types(void)
 }
 
 type_init(pci_proxy_dev_register_types)
+
+static void send_bar_access_msg(PCIProxyDev *pdev, MemoryRegion *mr,
+                                bool write, hwaddr addr, uint64_t *val,
+                                unsigned size, bool memory)
+{
+    MPQemuMsg msg = { 0 };
+    long ret = -EINVAL;
+    Error *local_err = NULL;
+
+    msg.size = sizeof(BarAccessMsg);
+    msg.data.bar_access.addr = mr->addr + addr;
+    msg.data.bar_access.size = size;
+    msg.data.bar_access.memory = memory;
+
+    if (write) {
+        msg.cmd = MPQEMU_CMD_BAR_WRITE;
+        msg.data.bar_access.val = *val;
+    } else {
+        msg.cmd = MPQEMU_CMD_BAR_READ;
+    }
+
+    ret = mpqemu_msg_send_and_await_reply(&msg, pdev, &local_err);
+    if (local_err) {
+        error_report_err(local_err);
+    }
+
+    if (!write) {
+        *val = ret;
+    }
+}
+
+static void proxy_bar_write(void *opaque, hwaddr addr, uint64_t val,
+                            unsigned size)
+{
+    ProxyMemoryRegion *pmr = opaque;
+
+    send_bar_access_msg(pmr->dev, &pmr->mr, true, addr, &val, size,
+                        pmr->memory);
+}
+
+static uint64_t proxy_bar_read(void *opaque, hwaddr addr, unsigned size)
+{
+    ProxyMemoryRegion *pmr = opaque;
+    uint64_t val;
+
+    send_bar_access_msg(pmr->dev, &pmr->mr, false, addr, &val, size,
+                        pmr->memory);
+
+    return val;
+}
+
+const MemoryRegionOps proxy_mr_ops = {
+    .read = proxy_bar_read,
+    .write = proxy_bar_write,
+    .endianness = DEVICE_NATIVE_ENDIAN,
+    .impl = {
+        .min_access_size = 1,
+        .max_access_size = 8,
+    },
+};
-- 
2.29.2

From: Jagannathan Raman <jag.raman@oracle.com>

Add ProxyMemoryListener object which is used to keep the view of the RAM
in sync between QEMU and remote process.
A MemoryListener is registered for system-memory AddressSpace. The
listener sends SYNC_SYSMEM message to the remote process when memory
listener commits the changes to memory, the remote process receives
the message and processes it in the handler for SYNC_SYSMEM message.

Signed-off-by: Jagannathan Raman <jag.raman@oracle.com>
Signed-off-by: John G Johnson <john.g.johnson@oracle.com>
Signed-off-by: Elena Ufimtseva <elena.ufimtseva@oracle.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 04fe4e6a9ca90d4f11ab6f59be7652f5b086a071.1611938319.git.jag.raman@oracle.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 MAINTAINERS                               |   2 +
 include/hw/remote/proxy-memory-listener.h |  28 +++
 include/hw/remote/proxy.h                 |   2 +
 hw/remote/message.c                       |   4 +
 hw/remote/proxy-memory-listener.c         | 227 ++++++++++++++++++++++
 hw/remote/proxy.c                         |   6 +
 hw/remote/meson.build                     |   1 +
 7 files changed, 270 insertions(+)
 create mode 100644 include/hw/remote/proxy-memory-listener.h
 create mode 100644 hw/remote/proxy-memory-listener.c

diff --git a/MAINTAINERS b/MAINTAINERS
index XXXXXXX..XXXXXXX 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -XXX,XX +XXX,XX @@ F: include/hw/remote/memory.h
 F: hw/remote/memory.c
 F: hw/remote/proxy.c
 F: include/hw/remote/proxy.h
+F: hw/remote/proxy-memory-listener.c
+F: include/hw/remote/proxy-memory-listener.h
 
 Build and test automation
 -------------------------
diff --git a/include/hw/remote/proxy-memory-listener.h b/include/hw/remote/proxy-memory-listener.h
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/include/hw/remote/proxy-memory-listener.h
@@ -XXX,XX +XXX,XX @@
+/*
+ * Copyright © 2018, 2021 Oracle and/or its affiliates.
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ *
+ */
+
+#ifndef PROXY_MEMORY_LISTENER_H
+#define PROXY_MEMORY_LISTENER_H
+
+#include "exec/memory.h"
+#include "io/channel.h"
+
+typedef struct ProxyMemoryListener {
+    MemoryListener listener;
+
+    int n_mr_sections;
+    MemoryRegionSection *mr_sections;
+
+    QIOChannel *ioc;
+} ProxyMemoryListener;
+
+void proxy_memory_listener_configure(ProxyMemoryListener *proxy_listener,
+                                     QIOChannel *ioc);
+void proxy_memory_listener_deconfigure(ProxyMemoryListener *proxy_listener);
+
+#endif
diff --git a/include/hw/remote/proxy.h b/include/hw/remote/proxy.h
index XXXXXXX..XXXXXXX 100644
--- a/include/hw/remote/proxy.h
+++ b/include/hw/remote/proxy.h
@@ -XXX,XX +XXX,XX @@
 
 #include "hw/pci/pci.h"
 #include "io/channel.h"
+#include "hw/remote/proxy-memory-listener.h"
 
 #define TYPE_PCI_PROXY_DEV "x-pci-proxy-dev"
 OBJECT_DECLARE_SIMPLE_TYPE(PCIProxyDev, PCI_PROXY_DEV)
@@ -XXX,XX +XXX,XX @@ struct PCIProxyDev {
     QemuMutex io_mutex;
     QIOChannel *ioc;
     Error *migration_blocker;
+    ProxyMemoryListener proxy_listener;
     ProxyMemoryRegion region[PCI_NUM_REGIONS];
 };
 
diff --git a/hw/remote/message.c b/hw/remote/message.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/remote/message.c
+++ b/hw/remote/message.c
@@ -XXX,XX +XXX,XX @@
 #include "sysemu/runstate.h"
 #include "hw/pci/pci.h"
 #include "exec/memattrs.h"
+#include "hw/remote/memory.h"
 
 static void process_config_write(QIOChannel *ioc, PCIDevice *dev,
                                  MPQemuMsg *msg, Error **errp);
@@ -XXX,XX +XXX,XX @@ void coroutine_fn mpqemu_remote_msg_loop_co(void *data)
         case MPQEMU_CMD_BAR_READ:
             process_bar_read(com->ioc, &msg, &local_err);
             break;
+        case MPQEMU_CMD_SYNC_SYSMEM:
+            remote_sysmem_reconfig(&msg, &local_err);
+            break;
         default:
             error_setg(&local_err,
                        "Unknown command (%d) received for device %s"
diff --git a/hw/remote/proxy-memory-listener.c b/hw/remote/proxy-memory-listener.c
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/hw/remote/proxy-memory-listener.c
@@ -XXX,XX +XXX,XX @@
+/*
+ * Copyright © 2018, 2021 Oracle and/or its affiliates.
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ *
+ */
+
+#include "qemu/osdep.h"
+#include "qemu-common.h"
+
+#include "qemu/compiler.h"
+#include "qemu/int128.h"
+#include "qemu/range.h"
+#include "exec/memory.h"
+#include "exec/cpu-common.h"
+#include "cpu.h"
+#include "exec/ram_addr.h"
+#include "exec/address-spaces.h"
+#include "qapi/error.h"
+#include "hw/remote/mpqemu-link.h"
+#include "hw/remote/proxy-memory-listener.h"
+
+/*
+ * TODO: get_fd_from_hostaddr(), proxy_mrs_can_merge() and
+ * proxy_memory_listener_commit() defined below perform tasks similar to the
+ * functions defined in vhost-user.c. These functions are good candidates
+ * for refactoring.
+ *
+ */
+
+static void proxy_memory_listener_reset(MemoryListener *listener)
+{
+    ProxyMemoryListener *proxy_listener = container_of(listener,
+                                                       ProxyMemoryListener,
+                                                       listener);
+    int mrs;
+
+    for (mrs = 0; mrs < proxy_listener->n_mr_sections; mrs++) {
+        memory_region_unref(proxy_listener->mr_sections[mrs].mr);
+    }
+
+    g_free(proxy_listener->mr_sections);
+    proxy_listener->mr_sections = NULL;
+    proxy_listener->n_mr_sections = 0;
+}
+
+static int get_fd_from_hostaddr(uint64_t host, ram_addr_t *offset)
+{
+    MemoryRegion *mr;
+    ram_addr_t off;
+
+    /**
+     * Assumes that the host address is a valid address as it's
+     * coming from the MemoryListener system. In the case host
+     * address is not valid, the following call would return
+     * the default subregion of "system_memory" region, and
+     * not NULL. So it's not possible to check for NULL here.
+     */
+    mr = memory_region_from_host((void *)(uintptr_t)host, &off);
+
+    if (offset) {
+        *offset = off;
+    }
+
+    return memory_region_get_fd(mr);
+}
+
+static bool proxy_mrs_can_merge(uint64_t host, uint64_t prev_host, size_t size)
+{
+    if (((prev_host + size) != host)) {
+        return false;
+    }
+
+    if (get_fd_from_hostaddr(host, NULL) !=
+            get_fd_from_hostaddr(prev_host, NULL)) {
+        return false;
+    }
+
+    return true;
+}
+
+static bool try_merge(ProxyMemoryListener *proxy_listener,
+                      MemoryRegionSection *section)
+{
+    uint64_t mrs_size, mrs_gpa, mrs_page;
+    MemoryRegionSection *prev_sec;
+    bool merged = false;
+    uintptr_t mrs_host;
+    RAMBlock *mrs_rb;
+
+    if (!proxy_listener->n_mr_sections) {
+        return false;
+    }
+
+    mrs_rb = section->mr->ram_block;
+    mrs_page = (uint64_t)qemu_ram_pagesize(mrs_rb);
+    mrs_size = int128_get64(section->size);
+    mrs_gpa = section->offset_within_address_space;
+    mrs_host = (uintptr_t)memory_region_get_ram_ptr(section->mr) +
+               section->offset_within_region;
+
+    if (get_fd_from_hostaddr(mrs_host, NULL) < 0) {
+        return true;
+    }
+
+    mrs_host = mrs_host & ~(mrs_page - 1);
+    mrs_gpa = mrs_gpa & ~(mrs_page - 1);
+    mrs_size = ROUND_UP(mrs_size, mrs_page);
+
+    prev_sec = proxy_listener->mr_sections +
+               (proxy_listener->n_mr_sections - 1);
+    uint64_t prev_gpa_start = prev_sec->offset_within_address_space;
+    uint64_t prev_size = int128_get64(prev_sec->size);
+    uint64_t prev_gpa_end   = range_get_last(prev_gpa_start, prev_size);
+    uint64_t prev_host_start =
+        (uintptr_t)memory_region_get_ram_ptr(prev_sec->mr) +
+        prev_sec->offset_within_region;
+    uint64_t prev_host_end = range_get_last(prev_host_start, prev_size);
+
+    if (mrs_gpa <= (prev_gpa_end + 1)) {
+        g_assert(mrs_gpa > prev_gpa_start);
+
+        if ((section->mr == prev_sec->mr) &&
+            proxy_mrs_can_merge(mrs_host, prev_host_start,
+                                (mrs_gpa - prev_gpa_start))) {
+            uint64_t max_end = MAX(prev_host_end, mrs_host + mrs_size);
+            merged = true;
+            prev_sec->offset_within_address_space =
+                MIN(prev_gpa_start, mrs_gpa);
+            prev_sec->offset_within_region =
+                MIN(prev_host_start, mrs_host) -
+                (uintptr_t)memory_region_get_ram_ptr(prev_sec->mr);
+            prev_sec->size = int128_make64(max_end - MIN(prev_host_start,
+                                                         mrs_host));
+        }
+    }
+
+    return merged;
+}
+
+static void proxy_memory_listener_region_addnop(MemoryListener *listener,
+                                                MemoryRegionSection *section)
+{
+    ProxyMemoryListener *proxy_listener = container_of(listener,
+                                                       ProxyMemoryListener,
+                                                       listener);
+
+    if (!memory_region_is_ram(section->mr) ||
+            memory_region_is_rom(section->mr)) {
+        return;
+    }
+
+    if (try_merge(proxy_listener, section)) {
+        return;
+    }
+
+    ++proxy_listener->n_mr_sections;
+    proxy_listener->mr_sections = g_renew(MemoryRegionSection,
+                                          proxy_listener->mr_sections,
+                                          proxy_listener->n_mr_sections);
+    proxy_listener->mr_sections[proxy_listener->n_mr_sections - 1] = *section;
+    proxy_listener->mr_sections[proxy_listener->n_mr_sections - 1].fv = NULL;
+    memory_region_ref(section->mr);
+}
+
+static void proxy_memory_listener_commit(MemoryListener *listener)
+{
+    ProxyMemoryListener *proxy_listener = container_of(listener,
+                                                       ProxyMemoryListener,
+                                                       listener);
+    MPQemuMsg msg;
+    MemoryRegionSection *section;
+    ram_addr_t offset;
+    uintptr_t host_addr;
+    int region;
+    Error *local_err = NULL;
+
+    memset(&msg, 0, sizeof(MPQemuMsg));
+
+    msg.cmd = MPQEMU_CMD_SYNC_SYSMEM;
+    msg.num_fds = proxy_listener->n_mr_sections;
+    msg.size = sizeof(SyncSysmemMsg);
+    if (msg.num_fds > REMOTE_MAX_FDS) {
+        error_report("Number of fds is more than %d", REMOTE_MAX_FDS);
+        return;
+    }
+
+    for (region = 0; region < proxy_listener->n_mr_sections; region++) {
+        section = &proxy_listener->mr_sections[region];
+        msg.data.sync_sysmem.gpas[region] =
+            section->offset_within_address_space;
+        msg.data.sync_sysmem.sizes[region] = int128_get64(section->size);
+        host_addr = (uintptr_t)memory_region_get_ram_ptr(section->mr) +
+                    section->offset_within_region;
+        msg.fds[region] = get_fd_from_hostaddr(host_addr, &offset);
+        msg.data.sync_sysmem.offsets[region] = offset;
+    }
+    if (!mpqemu_msg_send(&msg, proxy_listener->ioc, &local_err)) {
+        error_report_err(local_err);
+    }
+}
+
+void proxy_memory_listener_deconfigure(ProxyMemoryListener *proxy_listener)
+{
+    memory_listener_unregister(&proxy_listener->listener);
+
+    proxy_memory_listener_reset(&proxy_listener->listener);
+}
+
+void proxy_memory_listener_configure(ProxyMemoryListener *proxy_listener,
+                                     QIOChannel *ioc)
+{
+    proxy_listener->n_mr_sections = 0;
+    proxy_listener->mr_sections = NULL;
+
+    proxy_listener->ioc = ioc;
+
+    proxy_listener->listener.begin = proxy_memory_listener_reset;
+    proxy_listener->listener.commit = proxy_memory_listener_commit;
+    proxy_listener->listener.region_add = proxy_memory_listener_region_addnop;
+    proxy_listener->listener.region_nop = proxy_memory_listener_region_addnop;
+    proxy_listener->listener.priority = 10;
+
+    memory_listener_register(&proxy_listener->listener,
+                             &address_space_memory);
+}
diff --git a/hw/remote/proxy.c b/hw/remote/proxy.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/remote/proxy.c
+++ b/hw/remote/proxy.c
@@ -XXX,XX +XXX,XX @@
 #include "qemu/sockets.h"
 #include "hw/remote/mpqemu-link.h"
 #include "qemu/error-report.h"
+#include "hw/remote/proxy-memory-listener.h"
+#include "qom/object.h"
 
 static void pci_proxy_dev_realize(PCIDevice *device, Error **errp)
 {
@@ -XXX,XX +XXX,XX @@ static void pci_proxy_dev_realize(PCIDevice *device, Error **errp)
 
     qemu_mutex_init(&dev->io_mutex);
     qio_channel_set_blocking(dev->ioc, true, NULL);
+
+    proxy_memory_listener_configure(&dev->proxy_listener, dev->ioc);
 }
 
 static void pci_proxy_dev_exit(PCIDevice *pdev)
@@ -XXX,XX +XXX,XX @@ static void pci_proxy_dev_exit(PCIDevice *pdev)
     migrate_del_blocker(dev->migration_blocker);
 
     error_free(dev->migration_blocker);
+
+    proxy_memory_listener_deconfigure(&dev->proxy_listener);
 }
 
 static void config_op_send(PCIProxyDev *pdev, uint32_t addr, uint32_t *val,
diff --git a/hw/remote/meson.build b/hw/remote/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/hw/remote/meson.build
+++ b/hw/remote/meson.build
@@ -XXX,XX +XXX,XX @@ remote_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('remote-obj.c'))
 remote_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('proxy.c'))
 
 specific_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('memory.c'))
+specific_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('proxy-memory-listener.c'))
 
 softmmu_ss.add_all(when: 'CONFIG_MULTIPROCESS', if_true: remote_ss)
-- 
2.29.2

From: Jagannathan Raman <jag.raman@oracle.com>

IOHUB object is added to manage PCI IRQs. It uses KVM_IRQFD
ioctl to create irqfd to injecting PCI interrupts to the guest.
IOHUB object forwards the irqfd to the remote process. Remote process
uses this fd to directly send interrupts to the guest, bypassing QEMU.

Signed-off-by: John G Johnson <john.g.johnson@oracle.com>
Signed-off-by: Jagannathan Raman <jag.raman@oracle.com>
Signed-off-by: Elena Ufimtseva <elena.ufimtseva@oracle.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 51d5c3d54e28a68b002e3875c59599c9f5a424a1.1611938319.git.jag.raman@oracle.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 MAINTAINERS                     |   2 +
 include/hw/pci/pci_ids.h        |   3 +
 include/hw/remote/iohub.h       |  42 +++++++++++
 include/hw/remote/machine.h     |   2 +
 include/hw/remote/mpqemu-link.h |   1 +
 include/hw/remote/proxy.h       |   4 ++
 hw/remote/iohub.c               | 119 ++++++++++++++++++++++++++++++++
 hw/remote/machine.c             |  10 +++
 hw/remote/message.c             |   4 ++
 hw/remote/mpqemu-link.c         |   5 ++
 hw/remote/proxy.c               |  56 +++++++++++++++
 hw/remote/meson.build           |   1 +
 12 files changed, 249 insertions(+)
 create mode 100644 include/hw/remote/iohub.h
 create mode 100644 hw/remote/iohub.c

diff --git a/MAINTAINERS b/MAINTAINERS
index XXXXXXX..XXXXXXX 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -XXX,XX +XXX,XX @@ F: hw/remote/proxy.c
 F: include/hw/remote/proxy.h
 F: hw/remote/proxy-memory-listener.c
 F: include/hw/remote/proxy-memory-listener.h
+F: hw/remote/iohub.c
+F: include/hw/remote/iohub.h
 
 Build and test automation
 -------------------------
diff --git a/include/hw/pci/pci_ids.h b/include/hw/pci/pci_ids.h
index XXXXXXX..XXXXXXX 100644
--- a/include/hw/pci/pci_ids.h
+++ b/include/hw/pci/pci_ids.h
@@ -XXX,XX +XXX,XX @@
 #define PCI_DEVICE_ID_SUN_SIMBA          0x5000
 #define PCI_DEVICE_ID_SUN_SABRE          0xa000
 
+#define PCI_VENDOR_ID_ORACLE             0x108e
+#define PCI_DEVICE_ID_REMOTE_IOHUB       0xb000
+
 #define PCI_VENDOR_ID_CMD                0x1095
 #define PCI_DEVICE_ID_CMD_646            0x0646
 
diff --git a/include/hw/remote/iohub.h b/include/hw/remote/iohub.h
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/include/hw/remote/iohub.h
@@ -XXX,XX +XXX,XX @@
+/*
+ * IO Hub for remote device
+ *
+ * Copyright © 2018, 2021 Oracle and/or its affiliates.
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ *
+ */
+
+#ifndef REMOTE_IOHUB_H
+#define REMOTE_IOHUB_H
+
+#include "hw/pci/pci.h"
+#include "qemu/event_notifier.h"
+#include "qemu/thread-posix.h"
+#include "hw/remote/mpqemu-link.h"
+
+#define REMOTE_IOHUB_NB_PIRQS    PCI_DEVFN_MAX
+
+typedef struct ResampleToken {
+    void *iohub;
+    int pirq;
+} ResampleToken;
+
+typedef struct RemoteIOHubState {
+    PCIDevice d;
+    EventNotifier irqfds[REMOTE_IOHUB_NB_PIRQS];
+    EventNotifier resamplefds[REMOTE_IOHUB_NB_PIRQS];
+    unsigned int irq_level[REMOTE_IOHUB_NB_PIRQS];
+    ResampleToken token[REMOTE_IOHUB_NB_PIRQS];
+    QemuMutex irq_level_lock[REMOTE_IOHUB_NB_PIRQS];
+} RemoteIOHubState;
+
+int remote_iohub_map_irq(PCIDevice *pci_dev, int intx);
+void remote_iohub_set_irq(void *opaque, int pirq, int level);
+void process_set_irqfd_msg(PCIDevice *pci_dev, MPQemuMsg *msg);
+
+void remote_iohub_init(RemoteIOHubState *iohub);
+void remote_iohub_finalize(RemoteIOHubState *iohub);
+
+#endif
diff --git a/include/hw/remote/machine.h b/include/hw/remote/machine.h
index XXXXXXX..XXXXXXX 100644
--- a/include/hw/remote/machine.h
+++ b/include/hw/remote/machine.h
@@ -XXX,XX +XXX,XX @@
 #include "hw/boards.h"
 #include "hw/pci-host/remote.h"
 #include "io/channel.h"
+#include "hw/remote/iohub.h"
 
 struct RemoteMachineState {
     MachineState parent_obj;
 
     RemotePCIHost *host;
+    RemoteIOHubState iohub;
 };
 
 /* Used to pass to co-routine device and ioc. */
diff --git a/include/hw/remote/mpqemu-link.h b/include/hw/remote/mpqemu-link.h
index XXXXXXX..XXXXXXX 100644
--- a/include/hw/remote/mpqemu-link.h
+++ b/include/hw/remote/mpqemu-link.h
@@ -XXX,XX +XXX,XX @@ typedef enum {
     MPQEMU_CMD_PCI_CFGREAD,
     MPQEMU_CMD_BAR_WRITE,
     MPQEMU_CMD_BAR_READ,
+    MPQEMU_CMD_SET_IRQFD,
     MPQEMU_CMD_MAX,
 } MPQemuCmd;
 
diff --git a/include/hw/remote/proxy.h b/include/hw/remote/proxy.h
index XXXXXXX..XXXXXXX 100644
--- a/include/hw/remote/proxy.h
+++ b/include/hw/remote/proxy.h
@@ -XXX,XX +XXX,XX @@
 #include "hw/pci/pci.h"
 #include "io/channel.h"
 #include "hw/remote/proxy-memory-listener.h"
+#include "qemu/event_notifier.h"
 
 #define TYPE_PCI_PROXY_DEV "x-pci-proxy-dev"
 OBJECT_DECLARE_SIMPLE_TYPE(PCIProxyDev, PCI_PROXY_DEV)
@@ -XXX,XX +XXX,XX @@ struct PCIProxyDev {
     QIOChannel *ioc;
     Error *migration_blocker;
     ProxyMemoryListener proxy_listener;
+    int virq;
+    EventNotifier intr;
+    EventNotifier resample;
     ProxyMemoryRegion region[PCI_NUM_REGIONS];
 };
 
diff --git a/hw/remote/iohub.c b/hw/remote/iohub.c
new file mode 100644
index XXXXXXX..XXXXXXX
--- /dev/null
+++ b/hw/remote/iohub.c
@@ -XXX,XX +XXX,XX @@
+/*
+ * Remote IO Hub
+ *
+ * Copyright © 2018, 2021 Oracle and/or its affiliates.
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ *
+ */
+
+#include "qemu/osdep.h"
+#include "qemu-common.h"
+
+#include "hw/pci/pci.h"
+#include "hw/pci/pci_ids.h"
+#include "hw/pci/pci_bus.h"
+#include "qemu/thread.h"
+#include "hw/boards.h"
+#include "hw/remote/machine.h"
+#include "hw/remote/iohub.h"
+#include "qemu/main-loop.h"
+
+void remote_iohub_init(RemoteIOHubState *iohub)
+{
+    int pirq;
+
+    memset(&iohub->irqfds, 0, sizeof(iohub->irqfds));
+    memset(&iohub->resamplefds, 0, sizeof(iohub->resamplefds));
+
+    for (pirq = 0; pirq < REMOTE_IOHUB_NB_PIRQS; pirq++) {
+        qemu_mutex_init(&iohub->irq_level_lock[pirq]);
+        iohub->irq_level[pirq] = 0;
+        event_notifier_init_fd(&iohub->irqfds[pirq], -1);
+        event_notifier_init_fd(&iohub->resamplefds[pirq], -1);
+    }
+}
+
+void remote_iohub_finalize(RemoteIOHubState *iohub)
+{
+    int pirq;
+
+    for (pirq = 0; pirq < REMOTE_IOHUB_NB_PIRQS; pirq++) {
+        qemu_set_fd_handler(event_notifier_get_fd(&iohub->resamplefds[pirq]),
+                            NULL, NULL, NULL);
+        event_notifier_cleanup(&iohub->irqfds[pirq]);
+        event_notifier_cleanup(&iohub->resamplefds[pirq]);
+        qemu_mutex_destroy(&iohub->irq_level_lock[pirq]);
+    }
+}
+
+int remote_iohub_map_irq(PCIDevice *pci_dev, int intx)
+{
+    return pci_dev->devfn;
+}
+
+void remote_iohub_set_irq(void *opaque, int pirq, int level)
+{
+    RemoteIOHubState *iohub = opaque;
+
+    assert(pirq >= 0);
+    assert(pirq < PCI_DEVFN_MAX);
+
+    QEMU_LOCK_GUARD(&iohub->irq_level_lock[pirq]);
+
+    if (level) {
+        if (++iohub->irq_level[pirq] == 1) {
+            event_notifier_set(&iohub->irqfds[pirq]);
+        }
+    } else if (iohub->irq_level[pirq] > 0) {
+        iohub->irq_level[pirq]--;
+    }
+}
+
+static void intr_resample_handler(void *opaque)
+{
+    ResampleToken *token = opaque;
+    RemoteIOHubState *iohub = token->iohub;
+    int pirq, s;
+
+    pirq = token->pirq;
+
+    s = event_notifier_test_and_clear(&iohub->resamplefds[pirq]);
+
+    assert(s >= 0);
+
+    QEMU_LOCK_GUARD(&iohub->irq_level_lock[pirq]);
+
+    if (iohub->irq_level[pirq]) {
+        event_notifier_set(&iohub->irqfds[pirq]);
+    }
+}
+
+void process_set_irqfd_msg(PCIDevice *pci_dev, MPQemuMsg *msg)
+{
+    RemoteMachineState *machine = REMOTE_MACHINE(current_machine);
+    RemoteIOHubState *iohub = &machine->iohub;
+    int pirq, intx;
+
+    intx = pci_get_byte(pci_dev->config + PCI_INTERRUPT_PIN) - 1;
+
+    pirq = remote_iohub_map_irq(pci_dev, intx);
+
+    if (event_notifier_get_fd(&iohub->irqfds[pirq]) != -1) {
+        qemu_set_fd_handler(event_notifier_get_fd(&iohub->resamplefds[pirq]),
+                            NULL, NULL, NULL);
+        event_notifier_cleanup(&iohub->irqfds[pirq]);
+        event_notifier_cleanup(&iohub->resamplefds[pirq]);
+        memset(&iohub->token[pirq], 0, sizeof(ResampleToken));
+    }
+
+    event_notifier_init_fd(&iohub->irqfds[pirq], msg->fds[0]);
+    event_notifier_init_fd(&iohub->resamplefds[pirq], msg->fds[1]);
+
+    iohub->token[pirq].iohub = iohub;
+    iohub->token[pirq].pirq = pirq;
+
+    qemu_set_fd_handler(msg->fds[1], intr_resample_handler, NULL,
+                        &iohub->token[pirq]);
+}
diff --git a/hw/remote/machine.c b/hw/remote/machine.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/remote/machine.c
+++ b/hw/remote/machine.c
@@ -XXX,XX +XXX,XX @@
 #include "exec/address-spaces.h"
 #include "exec/memory.h"
 #include "qapi/error.h"
+#include "hw/pci/pci_host.h"
+#include "hw/remote/iohub.h"
 
 static void remote_machine_init(MachineState *machine)
 {
     MemoryRegion *system_memory, *system_io, *pci_memory;
     RemoteMachineState *s = REMOTE_MACHINE(machine);
     RemotePCIHost *rem_host;
+    PCIHostState *pci_host;
 
     system_memory = get_system_memory();
     system_io = get_system_io();
@@ -XXX,XX +XXX,XX @@ static void remote_machine_init(MachineState *machine)
     memory_region_add_subregion_overlap(system_memory, 0x0, pci_memory, -1);
 
     qdev_realize(DEVICE(rem_host), sysbus_get_default(), &error_fatal);
+
+    pci_host = PCI_HOST_BRIDGE(rem_host);
+
+    remote_iohub_init(&s->iohub);
+
+    pci_bus_irqs(pci_host->bus, remote_iohub_set_irq, remote_iohub_map_irq,
+                 &s->iohub, REMOTE_IOHUB_NB_PIRQS);
 }
 
 static void remote_machine_class_init(ObjectClass *oc, void *data)
diff --git a/hw/remote/message.c b/hw/remote/message.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/remote/message.c
+++ b/hw/remote/message.c
@@ -XXX,XX +XXX,XX @@
 #include "hw/pci/pci.h"
 #include "exec/memattrs.h"
 #include "hw/remote/memory.h"
+#include "hw/remote/iohub.h"
 
 static void process_config_write(QIOChannel *ioc, PCIDevice *dev,
                                  MPQemuMsg *msg, Error **errp);
@@ -XXX,XX +XXX,XX @@ void coroutine_fn mpqemu_remote_msg_loop_co(void *data)
         case MPQEMU_CMD_SYNC_SYSMEM:
             remote_sysmem_reconfig(&msg, &local_err);
             break;
+        case MPQEMU_CMD_SET_IRQFD:
+            process_set_irqfd_msg(pci_dev, &msg);
+            break;
         default:
             error_setg(&local_err,
                        "Unknown command (%d) received for device %s"
diff --git a/hw/remote/mpqemu-link.c b/hw/remote/mpqemu-link.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/remote/mpqemu-link.c
+++ b/hw/remote/mpqemu-link.c
@@ -XXX,XX +XXX,XX @@ bool mpqemu_msg_valid(MPQemuMsg *msg)
             return false;
         }
         break;
+    case MPQEMU_CMD_SET_IRQFD:
+        if (msg->size || (msg->num_fds != 2)) {
+            return false;
+        }
+        break;
     default:
         break;
     }
diff --git a/hw/remote/proxy.c b/hw/remote/proxy.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/remote/proxy.c
+++ b/hw/remote/proxy.c
@@ -XXX,XX +XXX,XX @@
 #include "qemu/error-report.h"
 #include "hw/remote/proxy-memory-listener.h"
 #include "qom/object.h"
+#include "qemu/event_notifier.h"
+#include "sysemu/kvm.h"
+#include "util/event_notifier-posix.c"
+
+static void proxy_intx_update(PCIDevice *pci_dev)
+{
+    PCIProxyDev *dev = PCI_PROXY_DEV(pci_dev);
+    PCIINTxRoute route;
+    int pin = pci_get_byte(pci_dev->config + PCI_INTERRUPT_PIN) - 1;
+
+    if (dev->virq != -1) {
+        kvm_irqchip_remove_irqfd_notifier_gsi(kvm_state, &dev->intr, dev->virq);
+        dev->virq = -1;
+    }
+
+    route = pci_device_route_intx_to_irq(pci_dev, pin);
+
+    dev->virq = route.irq;
+
+    if (dev->virq != -1) {
+        kvm_irqchip_add_irqfd_notifier_gsi(kvm_state, &dev->intr,
+                                           &dev->resample, dev->virq);
+    }
+}
+
+static void setup_irqfd(PCIProxyDev *dev)
+{
+    PCIDevice *pci_dev = PCI_DEVICE(dev);
+    MPQemuMsg msg;
+    Error *local_err = NULL;
+
+    event_notifier_init(&dev->intr, 0);
+    event_notifier_init(&dev->resample, 0);
+
+    memset(&msg, 0, sizeof(MPQemuMsg));
+    msg.cmd = MPQEMU_CMD_SET_IRQFD;
+    msg.num_fds = 2;
+    msg.fds[0] = event_notifier_get_fd(&dev->intr);
+    msg.fds[1] = event_notifier_get_fd(&dev->resample);
+    msg.size = 0;
+
+    if (!mpqemu_msg_send(&msg, dev->ioc, &local_err)) {
+        error_report_err(local_err);
+    }
+
+    dev->virq = -1;
+
+    proxy_intx_update(pci_dev);
+
+    pci_device_set_intx_routing_notifier(pci_dev, proxy_intx_update);
+}
 
 static void pci_proxy_dev_realize(PCIDevice *device, Error **errp)
 {
@@ -XXX,XX +XXX,XX @@ static void pci_proxy_dev_realize(PCIDevice *device, Error **errp)
     qio_channel_set_blocking(dev->ioc, true, NULL);
 
     proxy_memory_listener_configure(&dev->proxy_listener, dev->ioc);
+
+    setup_irqfd(dev);
 }
 
 static void pci_proxy_dev_exit(PCIDevice *pdev)
@@ -XXX,XX +XXX,XX @@ static void pci_proxy_dev_exit(PCIDevice *pdev)
     error_free(dev->migration_blocker);
 
     proxy_memory_listener_deconfigure(&dev->proxy_listener);
+
+    event_notifier_cleanup(&dev->intr);
+    event_notifier_cleanup(&dev->resample);
 }
 
 static void config_op_send(PCIProxyDev *pdev, uint32_t addr, uint32_t *val,
diff --git a/hw/remote/meson.build b/hw/remote/meson.build
index XXXXXXX..XXXXXXX 100644
--- a/hw/remote/meson.build
+++ b/hw/remote/meson.build
@@ -XXX,XX +XXX,XX @@ remote_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('mpqemu-link.c'))
 remote_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('message.c'))
 remote_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('remote-obj.c'))
 remote_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('proxy.c'))
+remote_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('iohub.c'))
 
 specific_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('memory.c'))
 specific_ss.add(when: 'CONFIG_MULTIPROCESS', if_true: files('proxy-memory-listener.c'))
-- 
2.29.2

From: Jagannathan Raman <jag.raman@oracle.com>

Retrieve PCI configuration info about the remote device and
configure the Proxy PCI object based on the returned information

Signed-off-by: Elena Ufimtseva <elena.ufimtseva@oracle.com>
Signed-off-by: John G Johnson <john.g.johnson@oracle.com>
Signed-off-by: Jagannathan Raman <jag.raman@oracle.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 85ee367bbb993aa23699b44cfedd83b4ea6d5221.1611938319.git.jag.raman@oracle.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 hw/remote/proxy.c | 84 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 84 insertions(+)

diff --git a/hw/remote/proxy.c b/hw/remote/proxy.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/remote/proxy.c
+++ b/hw/remote/proxy.c
@@ -XXX,XX +XXX,XX @@
 #include "sysemu/kvm.h"
 #include "util/event_notifier-posix.c"
 
+static void probe_pci_info(PCIDevice *dev, Error **errp);
+
 static void proxy_intx_update(PCIDevice *pci_dev)
 {
     PCIProxyDev *dev = PCI_PROXY_DEV(pci_dev);
@@ -XXX,XX +XXX,XX @@ static void pci_proxy_dev_realize(PCIDevice *device, Error **errp)
 {
     ERRP_GUARD();
     PCIProxyDev *dev = PCI_PROXY_DEV(device);
+    uint8_t *pci_conf = device->config;
     int fd;
 
     if (!dev->fd) {
@@ -XXX,XX +XXX,XX @@ static void pci_proxy_dev_realize(PCIDevice *device, Error **errp)
     qemu_mutex_init(&dev->io_mutex);
     qio_channel_set_blocking(dev->ioc, true, NULL);
 
+    pci_conf[PCI_LATENCY_TIMER] = 0xff;
+    pci_conf[PCI_INTERRUPT_PIN] = 0x01;
+
     proxy_memory_listener_configure(&dev->proxy_listener, dev->ioc);
 
     setup_irqfd(dev);
+
+    probe_pci_info(PCI_DEVICE(dev), errp);
 }
 
 static void pci_proxy_dev_exit(PCIDevice *pdev)
@@ -XXX,XX +XXX,XX @@ const MemoryRegionOps proxy_mr_ops = {
         .max_access_size = 8,
     },
 };
+
+static void probe_pci_info(PCIDevice *dev, Error **errp)
+{
+    PCIDeviceClass *pc = PCI_DEVICE_GET_CLASS(dev);
+    uint32_t orig_val, new_val, base_class, val;
+    PCIProxyDev *pdev = PCI_PROXY_DEV(dev);
+    DeviceClass *dc = DEVICE_CLASS(pc);
+    uint8_t type;
+    int i, size;
+
+    config_op_send(pdev, PCI_VENDOR_ID, &val, 2, MPQEMU_CMD_PCI_CFGREAD);
+    pc->vendor_id = (uint16_t)val;
+
+    config_op_send(pdev, PCI_DEVICE_ID, &val, 2, MPQEMU_CMD_PCI_CFGREAD);
+    pc->device_id = (uint16_t)val;
+
+    config_op_send(pdev, PCI_CLASS_DEVICE, &val, 2, MPQEMU_CMD_PCI_CFGREAD);
+    pc->class_id = (uint16_t)val;
+
+    config_op_send(pdev, PCI_SUBSYSTEM_ID, &val, 2, MPQEMU_CMD_PCI_CFGREAD);
+    pc->subsystem_id = (uint16_t)val;
+
+    base_class = pc->class_id >> 4;
+    switch (base_class) {
+    case PCI_BASE_CLASS_BRIDGE:
+        set_bit(DEVICE_CATEGORY_BRIDGE, dc->categories);
+        break;
+    case PCI_BASE_CLASS_STORAGE:
+        set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
+        break;
+    case PCI_BASE_CLASS_NETWORK:
+        set_bit(DEVICE_CATEGORY_NETWORK, dc->categories);
+        break;
+    case PCI_BASE_CLASS_INPUT:
+        set_bit(DEVICE_CATEGORY_INPUT, dc->categories);
+        break;
+    case PCI_BASE_CLASS_DISPLAY:
+        set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories);
+        break;
+    case PCI_BASE_CLASS_PROCESSOR:
+        set_bit(DEVICE_CATEGORY_CPU, dc->categories);
+        break;
+    default:
+        set_bit(DEVICE_CATEGORY_MISC, dc->categories);
+        break;
+    }
+
+    for (i = 0; i < PCI_NUM_REGIONS; i++) {
+        config_op_send(pdev, PCI_BASE_ADDRESS_0 + (4 * i), &orig_val, 4,
+                       MPQEMU_CMD_PCI_CFGREAD);
+        new_val = 0xffffffff;
+        config_op_send(pdev, PCI_BASE_ADDRESS_0 + (4 * i), &new_val, 4,
+                       MPQEMU_CMD_PCI_CFGWRITE);
+        config_op_send(pdev, PCI_BASE_ADDRESS_0 + (4 * i), &new_val, 4,
+                       MPQEMU_CMD_PCI_CFGREAD);
+        size = (~(new_val & 0xFFFFFFF0)) + 1;
+        config_op_send(pdev, PCI_BASE_ADDRESS_0 + (4 * i), &orig_val, 4,
+                       MPQEMU_CMD_PCI_CFGWRITE);
+        type = (new_val & 0x1) ?
+                   PCI_BASE_ADDRESS_SPACE_IO : PCI_BASE_ADDRESS_SPACE_MEMORY;
+
+        if (size) {
+            g_autofree char *name;
+            pdev->region[i].dev = pdev;
+            pdev->region[i].present = true;
+            if (type == PCI_BASE_ADDRESS_SPACE_MEMORY) {
+                pdev->region[i].memory = true;
+            }
+            name = g_strdup_printf("bar-region-%d", i);
+            memory_region_init_io(&pdev->region[i].mr, OBJECT(pdev),
+                                  &proxy_mr_ops, &pdev->region[i],
+                                  name, size);
+            pci_register_bar(dev, i, type, &pdev->region[i].mr);
+        }
+    }
+}
-- 
2.29.2

From: Elena Ufimtseva <elena.ufimtseva@oracle.com>

Perform device reset in the remote process when QEMU performs
device reset. This is required to reset the internal state
(like registers, etc...) of emulated devices

Signed-off-by: Elena Ufimtseva <elena.ufimtseva@oracle.com>
Signed-off-by: John G Johnson <john.g.johnson@oracle.com>
Signed-off-by: Jagannathan Raman <jag.raman@oracle.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-id: 7cb220a51f565dc0817bd76e2f540e89c2d2b850.1611938319.git.jag.raman@oracle.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 include/hw/remote/mpqemu-link.h |  1 +
 hw/remote/message.c             | 22 ++++++++++++++++++++++
 hw/remote/proxy.c               | 19 +++++++++++++++++++
 3 files changed, 42 insertions(+)

From: "Denis V. Lunev" <den@openvz.org>

Original specification says that l1 table size if 64 * l1_size, which
is obviously wrong. The size of the l1 entry is 64 _bits_, not bytes.
Thus 64 is to be replaces with 8 as specification says about bytes.

There is also minor tweak, field name is renamed from l1 to l1_table,
which matches with the later text.

Signed-off-by: Denis V. Lunev <den@openvz.org>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-id: 20210128171313.2210947-1-den@openvz.org
CC: Stefan Hajnoczi <stefanha@redhat.com>
CC: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>

[Replace the original commit message "docs: fix mistake in dirty bitmap
feature description" as suggested by Eric Blake.
--Stefan]

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 docs/interop/parallels.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/interop/parallels.txt b/docs/interop/parallels.txt
index XXXXXXX..XXXXXXX 100644
--- a/docs/interop/parallels.txt
+++ b/docs/interop/parallels.txt
@@ -XXX,XX +XXX,XX @@ of its data area are:
   28 - 31:    l1_size
               The number of entries in the L1 table of the bitmap.
 
-  variable:   l1 (64 * l1_size bytes)
+  variable:   l1_table (8 * l1_size bytes)
               L1 offset table (in bytes)
 
 A dirty bitmap is stored using a one-level structure for the mapping to host
-- 
2.29.2