Remove unused functions
v3 cover Remove unused functions
There are quite a lot of completely unused functions scattered around in the QEMU sources - here are some patches to remove at least some of them.
I've limited the patches now to the ones which have been ack'ed by the corresponding subsystem maintainers, so it should be really save now to apply these patches (I'll maybe re-post the other patches later again for further discusison).
Michael, can you take these through your trivial-patches repository?
Thomas Huth (3):
ui: Removed unused functions
ui/vnc: Remove vnc_stop_worker_thread()
xen: Remove xen_cmos_set_s3_resume()
include/hw/xen/xen.h | 1 - include/ui/console.h | 3 --- ui/console.c | 12 ------------ ui/d3des.c | 9 --------- ui/d3des.h | 6 ------ ui/input-legacy.c | 6 ------ ui/vnc-jobs.c | 13 ------------- ui/vnc-jobs.h | 1 - xen-hvm-stub.c | 4 ---- 9 files changed, 0 insertions(+), 55 deletions(-)
PATCH v3 1/3 ui: Removed unused functions
Remove qemu_console_displaystate(), qemu_remove_kbd_event_handler(), qemu_different_endianness_pixelformat() and cpkey(), since they are completely unused.
--- include/ui/console.h | 3 --- ui/console.c | 12 ------------ ui/d3des.c | 9 --------- ui/d3des.h | 6 ------ ui/input-legacy.c | 6 ------ 5 files changed, 0 insertions(+), 36 deletions(-)
include/ui/console.h +0 -3
@@ -36,7 +36,6 @@ typedef struct QEMUPutLEDEntry QEMUPutLEDEntry;QEMUPutKbdEntry *qemu_add_kbd_event_handler (QEMUPutKBDEvent *func,void *opaque); -void qemu_remove_kbd_event_handler (QEMUPutKbdEntry *entry);QEMUPutMouseEntry *qemu_add_mouse_event_handler (QEMUPutMouseEvent *func,void *opaque,int absolute,const char *name);
@@ -194,7 +193,6 @@ DisplaySurface *qemu_create_displaysurface_guestmem(int width, int height,pixman_format_code_t format, int linesize, uint64_t addr); -PixelFormat qemu_different_endianness_pixelformat (int bpp);PixelFormat qemu_default_pixelformat (int bpp);DisplaySurface *qemu_create_displaysurface (int width,int height);
@@ -322,7 +320,6 @@ void qemu_console_resize(QemuConsole *con, int width, int height);void qemu_console_copy (QemuConsole *con,int src_x,int src_y,int dst_x,int dst_y,int w,int h);DisplaySurface *qemu_console_surface (QemuConsole *con); -DisplayState *qemu_console_displaystate (QemuConsole *console);/* sdl.c */ void sdl_display_init (DisplayState *ds,int full_screen,int no_frame);
ui/console.c +0 -12
@@ -2005,18 +2005,6 @@ DisplaySurface *qemu_console_surface(QemuConsole *console)return console->surface; } -DisplayState *qemu_console_displaystate (QemuConsole *console) -{ -return console->ds; -} - -PixelFormat qemu_different_endianness_pixelformat (int bpp) -{ -pixman_format_code_t fmt =qemu_default_pixman_format (bpp, false); -PixelFormat pf =qemu_pixelformat_from_pixman (fmt); -return pf; -} -PixelFormat qemu_default_pixelformat (int bpp) {pixman_format_code_t fmt =qemu_default_pixman_format (bpp, true);
ui/d3des.c +0 -9
@@ -121,15 +121,6 @@ static void cookey(register unsigned long *raw1)return ; } -void cpkey (registerunsigned long *into) -{ - registerunsigned long *from, *endp; - - from = KnL, endp = &KnL[32 ]; -while ( from < endp ) *into++ = *from++; -return ; - } -void usekey (registerunsigned long *from) { registerunsigned long *to, *endp;
ui/d3des.h +0 -6
@@ -36,12 +36,6 @@ void usekey(unsigned long *);* Loads the internal key register with the data in cookedkey. */ -void cpkey (unsigned long *); -/* cookedkey[32] -* Copies the contents of the internal key register into the storage -* located at &cookedkey[0]. -*/ -void des (unsigned char *,unsigned char *);/* from[8] to[8] * Encrypts/Decrypts (according to the key currently loaded in the
ui/input-legacy.c +0 -6
@@ -143,12 +143,6 @@ QEMUPutKbdEntry *qemu_add_kbd_event_handler(QEMUPutKBDEvent *func, void *opaque)return entry; } -void qemu_remove_kbd_event_handler (QEMUPutKbdEntry *entry) -{ -qemu_input_handler_unregister (entry->s); -g_free (entry); -} -static void legacy_mouse_event (DeviceState *dev,QemuConsole *src,InputEvent *evt) {
Signature · 1 line
1.7.1
PATCH v3 2/3 ui/vnc: Remove vnc_stop_worker_thread()
In reply to Thomas HuthThis function is not used anymore, let's remove it.
--- ui/vnc-jobs.c | 13 ------------- ui/vnc-jobs.h | 1 - 2 files changed, 0 insertions(+), 14 deletions(-)
ui/vnc-jobs.c +0 -13
@@ -342,16 +342,3 @@ void vnc_start_worker_thread(void) QEMU_THREAD_DETACHED); queue = q;/* Set global queue */ } - -void vnc_stop_worker_thread (void ) -{ -if (!vnc_worker_thread_running ()) -return ; - -/* Remove all jobs and wake up the thread */ -vnc_lock_queue (queue); - queue->exit = true; -vnc_unlock_queue (queue); -vnc_jobs_clear (NULL ); -qemu_cond_broadcast (&queue->cond); -}
ui/vnc-jobs.h +0 -1
@@ -40,7 +40,6 @@ void vnc_jobs_join(VncState *vs);void vnc_jobs_consume_buffer (VncState *vs);void vnc_start_worker_thread (void ); -void vnc_stop_worker_thread (void );/* Locks */ static inline int vnc_trylock_display (VncDisplay *vd)
Signature · 1 line
1.7.1
PATCH v3 3/3 xen: Remove xen_cmos_set_s3_resume()
In reply to Thomas HuthThe function is not used anymore, and thus can be deleted.
--- include/hw/xen/xen.h | 1 - xen-hvm-stub.c | 4 ---- 2 files changed, 0 insertions(+), 5 deletions(-)
include/hw/xen/xen.h +0 -1
@@ -32,7 +32,6 @@ int xen_pci_slot_get_pirq(PCIDevice *pci_dev, int irq_num);void xen_piix3_set_irq (void *opaque,int irq_num,int level);void xen_piix_pci_write_config_client (uint32_t address,uint32_t val,int len);void xen_hvm_inject_msi (uint64_t addr,uint32_t data); -void xen_cmos_set_s3_resume (void *opaque,int irq,int level);qemu_irq *xen_interrupt_controller_init (void );
xen-hvm-stub.c +0 -4
@@ -30,10 +30,6 @@ void xen_hvm_inject_msi(uint64_t addr, uint32_t data) { } -void xen_cmos_set_s3_resume (void *opaque,int irq,int level) -{ -} -void xen_ram_alloc (ram_addr_t ram_addr,ram_addr_t size,MemoryRegion *mr) { }
Signature · 1 line
1.7.1
Quoted 10 lines · Thomas Huth
There are quite a lot of completely unused functions scattered around in the QEMU sources - here are some patches to remove at least some of them.
I've limited the patches now to the ones which have been ack'ed by the corresponding subsystem maintainers, so it should be really save now to apply these patches (I'll maybe re-post the other patches later again for further discusison).
Michael, can you take these through your trivial-patches repository?
Yes, applied this v3 (instead of previous v2) to -trivial now, so not applying the migration part.
Thanks,
/mjt