diff mbox series

[RFC,15/15] virtio-mem: Set "max-memslots" to 0 (auto) for the 6.2 machine

Message ID 20211013103330.26869-16-david@redhat.com (mailing list archive)
State New, archived
Headers show
Series virtio-mem: Expose device memory via separate memslots | expand

Commit Message

David Hildenbrand Oct. 13, 2021, 10:33 a.m. UTC 
Let's enable automatic detection of memslots to use for the 6.2 machine,
leaving the behavior of compat machines unchanged.

Signed-off-by: David Hildenbrand <david@redhat.com>
---
 hw/core/machine.c      | 1 +
 hw/virtio/virtio-mem.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/hw/core/machine.c b/hw/core/machine.c
index b8d95eec32..25aa42cf9f 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -39,6 +39,7 @@ 
 
 GlobalProperty hw_compat_6_1[] = {
     { "vhost-user-vsock-device", "seqpacket", "off" },
+    { "virtio-mem", "max-memslots", "1" },
 };
 const size_t hw_compat_6_1_len = G_N_ELEMENTS(hw_compat_6_1);
 
diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c
index f7e8f1db83..3de8ed94e6 100644
--- a/hw/virtio/virtio-mem.c
+++ b/hw/virtio/virtio-mem.c
@@ -1272,7 +1272,7 @@  static Property virtio_mem_properties[] = {
     DEFINE_PROP_LINK(VIRTIO_MEM_MEMDEV_PROP, VirtIOMEM, memdev,
                      TYPE_MEMORY_BACKEND, HostMemoryBackend *),
     DEFINE_PROP_UINT16(VIRTIO_MEM_MAX_MEMSLOTS_PROP, VirtIOMEM, nb_max_memslots,
-                       1),
+                       0),
     DEFINE_PROP_END_OF_LIST(),
 };