[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 18/63] stubs: move monitor_fdsets_cleanup with other fdset stubs
From: |
Paolo Bonzini |
Subject: |
[PULL 18/63] stubs: move monitor_fdsets_cleanup with other fdset stubs |
Date: |
Tue, 23 Apr 2024 17:09:06 +0200 |
Even though monitor_get_fd() has to remain separate because it is mocked by
tests/unit/test-util-sockets, monitor_fdsets_cleanup() is logically part
of the stubs for monitor/fds.c, so move it there.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-ID: <20240408155330.522792-19-pbonzini@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
stubs/fdset.c | 6 ++++++
stubs/monitor-internal.c | 5 -----
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/stubs/fdset.c b/stubs/fdset.c
index 56b3663d588..d7c39a28acb 100644
--- a/stubs/fdset.c
+++ b/stubs/fdset.c
@@ -1,5 +1,7 @@
#include "qemu/osdep.h"
+#include "qapi/error.h"
#include "monitor/monitor.h"
+#include "../monitor/monitor-internal.h"
int monitor_fdset_dup_fd_add(int64_t fdset_id, int flags)
{
@@ -15,3 +17,7 @@ int64_t monitor_fdset_dup_fd_find(int dup_fd)
void monitor_fdset_dup_fd_remove(int dupfd)
{
}
+
+void monitor_fdsets_cleanup(void)
+{
+}
diff --git a/stubs/monitor-internal.c b/stubs/monitor-internal.c
index 20786ac4ffb..4fece49d531 100644
--- a/stubs/monitor-internal.c
+++ b/stubs/monitor-internal.c
@@ -1,7 +1,6 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "monitor/monitor.h"
-#include "../monitor/monitor-internal.h"
int monitor_get_fd(Monitor *mon, const char *name, Error **errp)
{
@@ -12,7 +11,3 @@ int monitor_get_fd(Monitor *mon, const char *name, Error
**errp)
void monitor_init_hmp(Chardev *chr, bool use_readline, Error **errp)
{
}
-
-void monitor_fdsets_cleanup(void)
-{
-}
--
2.44.0
- [PULL 46/63] hw/i386/sev: Use legacy SEV VM types for older machine types, (continued)
- [PULL 46/63] hw/i386/sev: Use legacy SEV VM types for older machine types, Paolo Bonzini, 2024/04/23
- [PULL 50/63] kvm: Enable KVM_SET_USER_MEMORY_REGION2 for memslot, Paolo Bonzini, 2024/04/23
- [PULL 49/63] RAMBlock: Add support of KVM private guest memfd, Paolo Bonzini, 2024/04/23
- [PULL 51/63] kvm/memory: Make memory type private by default if it has guest memfd backend, Paolo Bonzini, 2024/04/23
- [PULL 62/63] pythondeps.toml: warn about updates needed to docs/requirements.txt, Paolo Bonzini, 2024/04/23
- [PULL 52/63] HostMem: Add mechanism to opt in kvm guest memfd via MachineState, Paolo Bonzini, 2024/04/23
- [PULL 57/63] kvm/tdx: Ignore memory conversion to shared of unassigned region, Paolo Bonzini, 2024/04/23
- [PULL 31/63] hw/i386/acpi: Set PCAT_COMPAT bit only when pic is not disabled, Paolo Bonzini, 2024/04/23
- [PULL 40/63] KVM: track whether guest state is encrypted, Paolo Bonzini, 2024/04/23
- [PULL 47/63] trace/kvm: Split address space and slot id in trace_kvm_set_user_memory(), Paolo Bonzini, 2024/04/23
- [PULL 18/63] stubs: move monitor_fdsets_cleanup with other fdset stubs,
Paolo Bonzini <=
- [PULL 16/63] stubs: split record/replay stubs further, Paolo Bonzini, 2024/04/23
- [PULL 26/63] target/i386: Introduce Icelake-Server-v7 to enable TSX, Paolo Bonzini, 2024/04/23
- [PULL 28/63] target/i386: Export RFDS bit to guests, Paolo Bonzini, 2024/04/23
- [PULL 35/63] s390: Switch to use confidential_guest_kvm_init(), Paolo Bonzini, 2024/04/23
- [PULL 43/63] target/i386: Implement mc->kvm_type() to get VM type, Paolo Bonzini, 2024/04/23
- [PULL 61/63] accel/tcg/icount-common: Consolidate the use of warn_report_once(), Paolo Bonzini, 2024/04/23
- [PULL 59/63] target/i386/cpu: Consolidate the use of warn_report_once(), Paolo Bonzini, 2024/04/23
- [PULL 06/63] util/qemu-config: Extract QMP commands to qemu-config-qmp.c, Paolo Bonzini, 2024/04/23
- [PULL 20/63] vga: move dirty memory region code together, Paolo Bonzini, 2024/04/23