[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 06/17] ui/spice: QXLInterface method set_mm_time() is now dead, dr
From: |
Markus Armbruster |
Subject: |
[PULL 06/17] ui/spice: QXLInterface method set_mm_time() is now dead, drop |
Date: |
Thu, 19 Jan 2023 14:27:02 +0100 |
SPICE_NEEDS_SET_MM_TIME is now always off. Bury the dead code.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20230109190321.1056914-7-armbru@redhat.com>
---
include/ui/qemu-spice.h | 2 --
hw/display/qxl.c | 19 -------------------
ui/spice-display.c | 10 ----------
hw/display/trace-events | 1 -
4 files changed, 32 deletions(-)
diff --git a/include/ui/qemu-spice.h b/include/ui/qemu-spice.h
index a7a1890b3f..b7d493742c 100644
--- a/include/ui/qemu-spice.h
+++ b/include/ui/qemu-spice.h
@@ -34,8 +34,6 @@ int qemu_spice_add_display_interface(QXLInstance *qxlin,
QemuConsole *con);
int qemu_spice_migrate_info(const char *hostname, int port, int tls_port,
const char *subject);
-#define SPICE_NEEDS_SET_MM_TIME 0
-
#if SPICE_SERVER_VERSION >= 0x000f00 /* release 0.15.0 */
#define SPICE_HAS_ATTACHED_WORKER 1
#else
diff --git a/hw/display/qxl.c b/hw/display/qxl.c
index ddca611804..ec712d3ca2 100644
--- a/hw/display/qxl.c
+++ b/hw/display/qxl.c
@@ -543,22 +543,6 @@ static void interface_set_compression_level(QXLInstance
*sin, int level)
qxl_rom_set_dirty(qxl);
}
-#if SPICE_NEEDS_SET_MM_TIME
-static void interface_set_mm_time(QXLInstance *sin, uint32_t mm_time)
-{
- PCIQXLDevice *qxl = container_of(sin, PCIQXLDevice, ssd.qxl);
-
- if (!qemu_spice_display_is_running(&qxl->ssd)) {
- return;
- }
-
- trace_qxl_interface_set_mm_time(qxl->id, mm_time);
- qxl->shadow_rom.mm_clock = cpu_to_le32(mm_time);
- qxl->rom->mm_clock = cpu_to_le32(mm_time);
- qxl_rom_set_dirty(qxl);
-}
-#endif
-
static void interface_get_init_info(QXLInstance *sin, QXLDevInitInfo *info)
{
PCIQXLDevice *qxl = container_of(sin, PCIQXLDevice, ssd.qxl);
@@ -1145,9 +1129,6 @@ static const QXLInterface qxl_interface = {
#endif
.set_compression_level = interface_set_compression_level,
-#if SPICE_NEEDS_SET_MM_TIME
- .set_mm_time = interface_set_mm_time,
-#endif
.get_init_info = interface_get_init_info,
/* the callbacks below are called from spice server thread context */
diff --git a/ui/spice-display.c b/ui/spice-display.c
index 494168e7fe..0616a6982f 100644
--- a/ui/spice-display.c
+++ b/ui/spice-display.c
@@ -517,13 +517,6 @@ static void interface_set_compression_level(QXLInstance
*sin, int level)
/* nothing to do */
}
-#if SPICE_NEEDS_SET_MM_TIME
-static void interface_set_mm_time(QXLInstance *sin, uint32_t mm_time)
-{
- /* nothing to do */
-}
-#endif
-
static void interface_get_init_info(QXLInstance *sin, QXLDevInitInfo *info)
{
SimpleSpiceDisplay *ssd = container_of(sin, SimpleSpiceDisplay, qxl);
@@ -715,9 +708,6 @@ static const QXLInterface dpy_interface = {
.attache_worker = interface_attach_worker,
#endif
.set_compression_level = interface_set_compression_level,
-#if SPICE_NEEDS_SET_MM_TIME
- .set_mm_time = interface_set_mm_time,
-#endif
.get_init_info = interface_get_init_info,
/* the callbacks below are called from spice server thread context */
diff --git a/hw/display/trace-events b/hw/display/trace-events
index 0c0ffcbe42..2336a0ca15 100644
--- a/hw/display/trace-events
+++ b/hw/display/trace-events
@@ -55,7 +55,6 @@ virtio_gpu_fence_ctrl(uint64_t fence, uint32_t type) "fence
0x%" PRIx64 ", type
virtio_gpu_fence_resp(uint64_t fence) "fence 0x%" PRIx64
# qxl.c
-disable qxl_interface_set_mm_time(int qid, uint32_t mm_time) "%d %d"
disable qxl_io_write_vga(int qid, const char *mode, uint32_t addr, uint32_t
val) "%d %s addr=%u val=%u"
qxl_create_guest_primary(int qid, uint32_t width, uint32_t height, uint64_t
mem, uint32_t format, uint32_t position) "%d %ux%u mem=0x%" PRIx64 " %u,%u"
qxl_create_guest_primary_rest(int qid, int32_t stride, uint32_t type, uint32_t
flags) "%d %d,%d,%d"
--
2.39.0
- [PULL 05/17] ui/spice: Require spice-server >= 0.14.0, (continued)
- [PULL 05/17] ui/spice: Require spice-server >= 0.14.0, Markus Armbruster, 2023/01/19
- [PULL 10/17] ui: Factor out qmp_add_client() parts and move to ui/ui-qmp-cmds.c, Markus Armbruster, 2023/01/19
- [PULL 02/17] ui: Fix silent truncation of numeric keys in HMP sendkey, Markus Armbruster, 2023/01/19
- [PULL 11/17] ui: Move HMP commands from monitor to new ui/ui-hmp-cmds.c, Markus Armbruster, 2023/01/19
- [PULL 14/17] ui: Reduce nesting in hmp_change_vnc() slightly, Markus Armbruster, 2023/01/19
- [PULL 13/17] ui: Factor out hmp_change_vnc(), and move to ui/ui-hmp-cmds.c, Markus Armbruster, 2023/01/19
- [PULL 17/17] ui: Simplify control flow in qemu_mouse_set(), Markus Armbruster, 2023/01/19
- [PULL 07/17] ui/spice: Give hmp_info_spice()'s channel_names[] static linkage, Markus Armbruster, 2023/01/19
- [PULL 08/17] ui: Clean up a few things checkpatch.pl would flag later on, Markus Armbruster, 2023/01/19
- [PULL 12/17] ui: Improve "change vnc" error reporting, Markus Armbruster, 2023/01/19
- [PULL 06/17] ui/spice: QXLInterface method set_mm_time() is now dead, drop,
Markus Armbruster <=
- [PULL 01/17] ui: Check numeric part of expire_password argument @time properly, Markus Armbruster, 2023/01/19
- Re: [PULL 00/17] Monitor patches for 2023-01-19, Peter Maydell, 2023/01/20