qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: David Hildenbrand <david@redhat.com>
To: qemu-devel@nongnu.org
Cc: "David Hildenbrand" <david@redhat.com>,
	"Paolo Bonzini" <pbonzini@redhat.com>,
	"Igor Mammedov" <imammedo@redhat.com>,
	"Xiao Guangrong" <xiaoguangrong.eric@gmail.com>,
	"Michael S. Tsirkin" <mst@redhat.com>,
	"Peter Xu" <peterx@redhat.com>,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>,
	"Eduardo Habkost" <eduardo@habkost.net>,
	"Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>,
	"Yanan Wang" <wangyanan55@huawei.com>,
	"Michal Privoznik" <mprivozn@redhat.com>,
	"Daniel P . Berrangé" <berrange@redhat.com>,
	"Gavin Shan" <gshan@redhat.com>,
	"Alex Williamson" <alex.williamson@redhat.com>,
	"Stefan Hajnoczi" <stefanha@redhat.com>,
	"Maciej S . Szmigiero" <mail@maciej.szmigiero.name>,
	kvm@vger.kernel.org
Subject: [PATCH v2 10/16] kvm: Add stub for kvm_get_max_memslots()
Date: Fri, 25 Aug 2023 15:21:43 +0200	[thread overview]
Message-ID: <20230825132149.366064-11-david@redhat.com> (raw)
In-Reply-To: <20230825132149.366064-1-david@redhat.com>

We'll need the stub soon from memory device context.

While at it, use "unsigned int" as return value and place the
declaration next to kvm_get_free_memslots().

Signed-off-by: David Hildenbrand <david@redhat.com>
---
 accel/kvm/kvm-all.c    | 2 +-
 accel/stubs/kvm-stub.c | 5 +++++
 include/sysemu/kvm.h   | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/accel/kvm/kvm-all.c b/accel/kvm/kvm-all.c
index 0fcea923a1..fea287ec7a 100644
--- a/accel/kvm/kvm-all.c
+++ b/accel/kvm/kvm-all.c
@@ -174,7 +174,7 @@ void kvm_resample_fd_notify(int gsi)
     }
 }
 
-int kvm_get_max_memslots(void)
+unsigned int kvm_get_max_memslots(void)
 {
     KVMState *s = KVM_STATE(current_accel());
 
diff --git a/accel/stubs/kvm-stub.c b/accel/stubs/kvm-stub.c
index f39997d86e..ca6a1d9698 100644
--- a/accel/stubs/kvm-stub.c
+++ b/accel/stubs/kvm-stub.c
@@ -109,6 +109,11 @@ int kvm_irqchip_remove_irqfd_notifier_gsi(KVMState *s, EventNotifier *n,
     return -ENOSYS;
 }
 
+unsigned int kvm_get_max_memslots(void)
+{
+    return UINT_MAX;
+}
+
 unsigned int kvm_get_free_memslots(void)
 {
     return UINT_MAX;
diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h
index 321427a543..cb9a7f131c 100644
--- a/include/sysemu/kvm.h
+++ b/include/sysemu/kvm.h
@@ -216,6 +216,7 @@ typedef struct KVMRouteChange {
 
 /* external API */
 
+unsigned int kvm_get_max_memslots(void);
 unsigned int kvm_get_free_memslots(void);
 bool kvm_has_sync_mmu(void);
 int kvm_has_vcpu_events(void);
@@ -564,7 +565,6 @@ int kvm_set_one_reg(CPUState *cs, uint64_t id, void *source);
  */
 int kvm_get_one_reg(CPUState *cs, uint64_t id, void *target);
 struct ppc_radix_page_info *kvm_get_radix_page_info(void);
-int kvm_get_max_memslots(void);
 
 /* Notify resamplefd for EOI of specific interrupts. */
 void kvm_resample_fd_notify(int gsi);
-- 
2.41.0



  parent reply	other threads:[~2023-08-25 13:24 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-25 13:21 [PATCH v2 00/16] virtio-mem: Expose device memory through multiple memslots David Hildenbrand
2023-08-25 13:21 ` [PATCH v2 01/16] vhost: Rework memslot filtering and fix "used_memslot" tracking David Hildenbrand
2023-08-25 13:21 ` [PATCH v2 02/16] vhost: Remove vhost_backend_can_merge() callback David Hildenbrand
2023-08-25 13:21 ` [PATCH v2 03/16] softmmu/physmem: Fixup qemu_ram_block_from_host() documentation David Hildenbrand
2023-08-25 13:21 ` [PATCH v2 04/16] kvm: Return number of free memslots David Hildenbrand
2023-08-28 22:26   ` Philippe Mathieu-Daudé
2023-09-06 14:14     ` David Hildenbrand
2023-09-06 14:37       ` David Hildenbrand
2023-08-25 13:21 ` [PATCH v2 05/16] vhost: " David Hildenbrand
2023-08-25 13:21 ` [PATCH v2 06/16] memory-device: Support memory devices with multiple memslots David Hildenbrand
2023-08-25 13:21 ` [PATCH v2 07/16] stubs: Rename qmp_memory_device.c to memory_device.c David Hildenbrand
2023-08-25 13:21 ` [PATCH v2 08/16] memory-device: Track required and actually used memslots in DeviceMemoryState David Hildenbrand
2023-08-25 13:21 ` [PATCH v2 09/16] memory-device, vhost: Support memory devices that dynamically consume memslots David Hildenbrand
2023-08-25 13:21 ` David Hildenbrand [this message]
2023-08-25 13:21 ` [PATCH v2 11/16] vhost: Add vhost_get_max_memslots() David Hildenbrand
2023-08-25 13:21 ` [PATCH v2 12/16] memory-device, vhost: Support automatic decision on the number of memslots David Hildenbrand
2023-08-25 13:21 ` [PATCH v2 13/16] memory: Clarify mapping requirements for RamDiscardManager David Hildenbrand
2023-08-25 13:21 ` [PATCH v2 14/16] virtio-mem: Expose device memory via multiple memslots if enabled David Hildenbrand
2023-08-25 13:21 ` [PATCH v2 15/16] memory, vhost: Allow for marking memory device memory regions unmergeable David Hildenbrand
2023-08-28 22:43   ` [PATCH v2 15/16] memory,vhost: " Philippe Mathieu-Daudé
2023-08-25 13:21 ` [PATCH v2 16/16] virtio-mem: Mark memslot alias " David Hildenbrand
2023-08-28 22:44   ` Philippe Mathieu-Daudé

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=20230825132149.366064-11-david@redhat.com \
    --to=david@redhat.com \
    --cc=alex.williamson@redhat.com \
    --cc=berrange@redhat.com \
    --cc=eduardo@habkost.net \
    --cc=gshan@redhat.com \
    --cc=imammedo@redhat.com \
    --cc=kvm@vger.kernel.org \
    --cc=mail@maciej.szmigiero.name \
    --cc=marcel.apfelbaum@gmail.com \
    --cc=mprivozn@redhat.com \
    --cc=mst@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=peterx@redhat.com \
    --cc=philmd@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    --cc=wangyanan55@huawei.com \
    --cc=xiaoguangrong.eric@gmail.com \
    /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).