[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v14 RESEND 07/21] multi-process: setup a machine object for remot
From: |
elena . ufimtseva |
Subject: |
[PATCH v14 RESEND 07/21] multi-process: setup a machine object for remote device process |
Date: |
Thu, 17 Dec 2020 21:40:37 -0800 |
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>
---
include/hw/pci-host/remote.h | 1 +
include/hw/remote/machine.h | 28 +++++++++++++++
hw/remote/machine.c | 70 ++++++++++++++++++++++++++++++++++++
MAINTAINERS | 2 ++
hw/meson.build | 1 +
hw/remote/meson.build | 5 +++
6 files changed, 107 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/include/hw/pci-host/remote.h b/include/hw/pci-host/remote.h
index 2017422b42..c130c2e0a3 100644
--- a/include/hw/pci-host/remote.h
+++ b/include/hw/pci-host/remote.h
@@ -25,6 +25,7 @@ typedef struct RemotePCIHost {
MemoryRegion *mr_pci_mem;
MemoryRegion *mr_sys_io;
+ MemoryRegion *mr_sys_mem;
} RemotePCIHost;
#endif
diff --git a/include/hw/remote/machine.h b/include/hw/remote/machine.h
new file mode 100644
index 0000000000..d312972e85
--- /dev/null
+++ b/include/hw/remote/machine.h
@@ -0,0 +1,28 @@
+/*
+ * Remote machine configuration
+ *
+ * Copyright © 2018, 2020 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"
+
+typedef struct RemoteMachineState {
+ MachineState parent_obj;
+
+ RemotePCIHost *host;
+} RemoteMachineState;
+
+#define TYPE_REMOTE_MACHINE "x-remote-machine"
+#define REMOTE_MACHINE(obj) \
+ OBJECT_CHECK(RemoteMachineState, (obj), TYPE_REMOTE_MACHINE)
+
+#endif
diff --git a/hw/remote/machine.c b/hw/remote/machine.c
new file mode 100644
index 0000000000..17d07ec1ef
--- /dev/null
+++ b/hw/remote/machine.c
@@ -0,0 +1,70 @@
+/*
+ * 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, 2020 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/MAINTAINERS b/MAINTAINERS
index 6f1973c326..63976672f8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3171,6 +3171,8 @@ F: docs/devel/multi-process.rst
F: docs/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/hw/meson.build b/hw/meson.build
index 010de7219c..e615d72d4d 100644
--- a/hw/meson.build
+++ b/hw/meson.build
@@ -56,6 +56,7 @@ 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 0000000000..197b038646
--- /dev/null
+++ b/hw/remote/meson.build
@@ -0,0 +1,5 @@
+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.25.GIT
- [PATCH v14 00/21] Initial support for multi-process Qemu, elena . ufimtseva, 2020/12/17
- [PATCH v14 04/21] socket: export socket_get_fd() function, elena . ufimtseva, 2020/12/17
- [PATCH v14 02/21] multi-process: add configure and usage information, elena . ufimtseva, 2020/12/17
- [PATCH v14 03/21] memory: alloc RAM from file at offset, elena . ufimtseva, 2020/12/17
- [PATCH v14 01/21] multi-process: add the concept description to docs/devel/qemu-multiprocess, elena . ufimtseva, 2020/12/17
- Re: [PATCH v14 00/21] Initial support for multi-process Qemu, Elena Ufimtseva, 2020/12/18
- [PATCH v14 RESEND 06/21] multi-process: setup PCI host bridge for remote device, elena . ufimtseva, 2020/12/18
- [PATCH v14 RESEND 07/21] multi-process: setup a machine object for remote device process,
elena . ufimtseva <=
- [PATCH v14 RESEND 05/21] multi-process: Add config option for multi-process QEMU, elena . ufimtseva, 2020/12/18
- [PATCH v14 RESEND 09/21] multi-process: add qio channel read function, elena . ufimtseva, 2020/12/18
- [PATCH v14 RESEND 10/21] multi-process: define MPQemuMsg format and transmission functions, elena . ufimtseva, 2020/12/18
- [PATCH v14 RESEND 11/21] multi-process: Initialize message handler in remote device, elena . ufimtseva, 2020/12/18
- [PATCH v14 RESEND 12/21] multi-process: Associate fd of a PCIDevice with its object, elena . ufimtseva, 2020/12/18
- [PATCH v14 RESEND 14/21] multi-process: introduce proxy object, elena . ufimtseva, 2020/12/18
- [PATCH v14 RESEND 15/21] multi-process: add proxy communication functions, elena . ufimtseva, 2020/12/18
- [PATCH v14 RESEND 13/21] multi-process: setup memory manager for remote device, elena . ufimtseva, 2020/12/18