From: Damien Hedde <damien.hedde@greensocs.com>
To: qemu-devel@nongnu.org
Cc: "Damien Hedde" <damien.hedde@greensocs.com>,
"Alistair Francis" <Alistair.Francis@wdc.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Eduardo Habkost" <ehabkost@redhat.com>,
"Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Michael S. Tsirkin" <mst@redhat.com>,
"Igor Mammedov" <imammedo@redhat.com>,
"Ani Sinha" <ani@anisinha.ca>,
"Gerd Hoffmann" <kraxel@redhat.com>,
"Eric Auger" <eric.auger@redhat.com>,
"Stefano Stabellini" <sstabellini@kernel.org>,
"Anthony Perard" <anthony.perard@citrix.com>,
"Paul Durrant" <paul@xen.org>, "Peter Xu" <peterx@redhat.com>,
"David Hildenbrand" <david@redhat.com>,
"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
"Markus Armbruster" <armbru@redhat.com>,
"Eric Blake" <eblake@redhat.com>,
qemu-riscv@nongnu.org, xen-devel@lists.xenproject.org,
mark.burton@greensocs.com, mirela.grujic@greensocs.com,
edgari@xilinx.com, "Peter Maydell" <peter.maydell@linaro.org>
Subject: [RFC PATCH v2 13/16] hw/mem/system-memory: add a memory sysbus device
Date: Wed, 22 Sep 2021 18:14:02 +0200 [thread overview]
Message-ID: <20210922161405.140018-14-damien.hedde@greensocs.com> (raw)
In-Reply-To: <20210922161405.140018-1-damien.hedde@greensocs.com>
This device can be used to create some memories using standard
device_add qmp command.
This device has one property 'readonly' which allows
to choose between a ram or a rom.
The device holds the adequate memory region and can be put on
the sysbus.
Signed-off-by: Damien Hedde <damien.hedde@greensocs.com>
---
Should we add a related CONFIG_ variable in the build system ?
Depending on the chosen condition to add a device, the commit may
change.
---
include/hw/mem/sysbus-memory.h | 32 +++++++++++++
hw/mem/sysbus-memory.c | 83 ++++++++++++++++++++++++++++++++++
hw/mem/meson.build | 2 +
3 files changed, 117 insertions(+)
create mode 100644 include/hw/mem/sysbus-memory.h
create mode 100644 hw/mem/sysbus-memory.c
diff --git a/include/hw/mem/sysbus-memory.h b/include/hw/mem/sysbus-memory.h
new file mode 100644
index 0000000000..3e1271dbfd
--- /dev/null
+++ b/include/hw/mem/sysbus-memory.h
@@ -0,0 +1,32 @@
+/*
+ * QEMU memory SysBusDevice
+ *
+ * Copyright (c) 2021 Greensocs
+ *
+ * Author:
+ * + Damien Hedde
+ *
+ * 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 HW_SYSBUS_MEMORY_H
+#define HW_SYSBUS_MEMORY_H
+
+#include "hw/sysbus.h"
+#include "qom/object.h"
+
+#define TYPE_SYSBUS_MEMORY "sysbus-memory"
+OBJECT_DECLARE_SIMPLE_TYPE(SysBusMemoryState, SYSBUS_MEMORY)
+
+struct SysBusMemoryState {
+ /* <private> */
+ SysBusDevice parent_obj;
+ uint64_t size;
+ bool readonly;
+
+ /* <public> */
+ MemoryRegion mem;
+};
+
+#endif /* HW_SYSBUS_MEMORY_H */
diff --git a/hw/mem/sysbus-memory.c b/hw/mem/sysbus-memory.c
new file mode 100644
index 0000000000..897fa154f0
--- /dev/null
+++ b/hw/mem/sysbus-memory.c
@@ -0,0 +1,83 @@
+/*
+ * QEMU memory SysBusDevice
+ *
+ * Copyright (c) 2021 Greensocs
+ *
+ * Author:
+ * + Damien Hedde
+ *
+ * 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 "hw/mem/sysbus-memory.h"
+#include "hw/qdev-properties.h"
+#include "qemu/log.h"
+#include "qemu/module.h"
+#include "qapi/error.h"
+
+static Property sysbus_memory_properties[] = {
+ DEFINE_PROP_UINT64("size", SysBusMemoryState, size, 0),
+ DEFINE_PROP_BOOL("readonly", SysBusMemoryState, readonly, false),
+ DEFINE_PROP_END_OF_LIST(),
+};
+
+static void sysbus_memory_realize(DeviceState *dev, Error **errp)
+{
+ SysBusMemoryState *s = SYSBUS_MEMORY(dev);
+ gchar *name;
+
+ if (!s->size) {
+ error_setg(errp, "'size' must be non-zero.");
+ return;
+ }
+
+ /*
+ * We impose having an id (which is unique) because we need to generate
+ * a unique name for the memory region.
+ * memory_region_init_ram/rom() will abort() (in qemu_ram_set_idstr()
+ * function if 2 system-memory devices are created with the same name
+ * for the memory region).
+ */
+ if (!dev->id) {
+ error_setg(errp, "system-memory device must have an id.");
+ return;
+ }
+ name = g_strdup_printf("%s.region", dev->id);
+
+ if (s->readonly) {
+ memory_region_init_rom(&s->mem, OBJECT(dev), name, s->size, errp);
+ } else {
+ memory_region_init_ram(&s->mem, OBJECT(dev), name, s->size, errp);
+ }
+
+ g_free(name);
+
+ if (!*errp) {
+ sysbus_init_mmio(SYS_BUS_DEVICE(s), &s->mem);
+ }
+}
+
+static void sysbus_memory_class_init(ObjectClass *klass, void *data)
+{
+ DeviceClass *dc = DEVICE_CLASS(klass);
+
+ dc->user_creatable = true;
+ dc->realize = sysbus_memory_realize;
+ device_class_set_props(dc, sysbus_memory_properties);
+}
+
+static const TypeInfo sysbus_memory_info = {
+ .name = TYPE_SYSBUS_MEMORY,
+ .parent = TYPE_SYS_BUS_DEVICE,
+ .instance_size = sizeof(SysBusMemoryState),
+ .class_init = sysbus_memory_class_init,
+};
+
+static void sysbus_memory_register_types(void)
+{
+ type_register_static(&sysbus_memory_info);
+}
+
+type_init(sysbus_memory_register_types)
diff --git a/hw/mem/meson.build b/hw/mem/meson.build
index 3c8fdef9f9..81e2de1d34 100644
--- a/hw/mem/meson.build
+++ b/hw/mem/meson.build
@@ -7,3 +7,5 @@ mem_ss.add(when: 'CONFIG_NVDIMM', if_true: files('nvdimm.c'))
softmmu_ss.add_all(when: 'CONFIG_MEM_DEVICE', if_true: mem_ss)
softmmu_ss.add(when: 'CONFIG_FUZZ', if_true: files('sparse-mem.c'))
+
+softmmu_ss.add(files('sysbus-memory.c'))
--
2.33.0
next prev parent reply other threads:[~2021-09-22 23:21 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-22 16:13 [RFC PATCH v2 00/16] Initial support for machine creation via QMP Damien Hedde
2021-09-22 16:13 ` [RFC PATCH v2 01/16] rename MachineInitPhase enum constants for QAPI compatibility Damien Hedde
2021-09-22 16:13 ` [RFC PATCH v2 02/16] qapi: Implement query-machine-phase QMP command Damien Hedde
2021-09-22 17:37 ` Philippe Mathieu-Daudé
2021-09-23 12:43 ` Damien Hedde
2021-09-23 13:46 ` Ani Sinha
2021-10-12 22:08 ` Alistair Francis
2021-09-22 16:13 ` [RFC PATCH v2 03/16] qapi: Implement x-machine-init " Damien Hedde
2021-10-12 22:19 ` Alistair Francis
2021-09-22 16:13 ` [RFC PATCH v2 04/16] softmmu/qdev-monitor: add error handling in qdev_set_id Damien Hedde
2021-10-13 7:10 ` Alistair Francis
2021-10-13 14:30 ` Damien Hedde
2021-09-22 16:13 ` [RFC PATCH v2 05/16] qdev-monitor: prevent conflicts between qmp/device_add and cli/-device Damien Hedde
2021-09-22 16:13 ` [RFC PATCH v2 06/16] qapi: Allow device_add to execute in machine initialized phase Damien Hedde
2021-10-12 22:25 ` Alistair Francis
2021-09-22 16:13 ` [RFC PATCH v2 07/16] hw/core/machine: add machine_class_is_dynamic_sysbus_dev_allowed Damien Hedde
2021-09-23 10:51 ` Ani Sinha
2021-09-23 13:07 ` Damien Hedde
2021-09-22 16:13 ` [RFC PATCH v2 08/16] qdev-monitor: Check sysbus device type before creating it Damien Hedde
2021-10-12 22:42 ` Alistair Francis
2021-09-22 16:13 ` [RFC PATCH v2 09/16] hw/core/machine: Remove the dynamic sysbus devices type check Damien Hedde
2021-10-12 23:07 ` Alistair Francis
2021-09-22 16:13 ` [RFC PATCH v2 10/16] qdev-monitor: allow adding any sysbus device before machine is ready Damien Hedde
2021-09-23 11:04 ` Ani Sinha
2021-09-23 11:55 ` Ani Sinha
2021-09-23 14:04 ` Damien Hedde
2021-09-22 16:14 ` [RFC PATCH v2 11/16] softmmu/memory: add memory_region_try_add_subregion function Damien Hedde
2021-09-22 17:42 ` Philippe Mathieu-Daudé
2021-09-22 17:49 ` David Hildenbrand
2021-10-13 7:12 ` Alistair Francis
2021-09-22 16:14 ` [RFC PATCH v2 12/16] add x-sysbus-mmio-map qmp command Damien Hedde
2021-10-13 7:16 ` Alistair Francis
2021-09-22 16:14 ` Damien Hedde [this message]
2021-09-22 16:14 ` [RFC PATCH v2 14/16] docs/system: add doc about the initialized machine phase and an example Damien Hedde
2021-09-22 16:14 ` [RFC PATCH v2 15/16] hw/char/ibex_uart: set user_creatable Damien Hedde
2021-09-22 16:14 ` [RFC PATCH v2 16/16] hw/intc/ibex_plic: " Damien Hedde
2021-09-22 17:50 ` [RFC PATCH v2 00/16] Initial support for machine creation via QMP Philippe Mathieu-Daudé
2021-09-23 11:08 ` Damien Hedde
2021-10-04 15:56 ` Damien Hedde
2021-10-12 22:16 ` Alistair Francis
2021-10-13 5:56 ` Mark Burton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210922161405.140018-14-damien.hedde@greensocs.com \
--to=damien.hedde@greensocs.com \
--cc=Alistair.Francis@wdc.com \
--cc=ani@anisinha.ca \
--cc=anthony.perard@citrix.com \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=david@redhat.com \
--cc=dgilbert@redhat.com \
--cc=eblake@redhat.com \
--cc=edgari@xilinx.com \
--cc=ehabkost@redhat.com \
--cc=eric.auger@redhat.com \
--cc=imammedo@redhat.com \
--cc=kraxel@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=marcel.apfelbaum@gmail.com \
--cc=mark.burton@greensocs.com \
--cc=mirela.grujic@greensocs.com \
--cc=mst@redhat.com \
--cc=paul@xen.org \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=peterx@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-riscv@nongnu.org \
--cc=sstabellini@kernel.org \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).