Adding qemu as a submodule of KVMFORNFV

This Patch includes the changes to add qemu as a submodule to
kvmfornfv repo and make use of the updated latest qemu for the
execution of all testcase
Change-Id: I1280af507a857675c7f81d30c95255635667bdd7
Signed-off-by:RajithaY<rajithax.yerrumsetty@intel.com>

44 files changed, 0 insertions, 583 deletions

diff --git a/qemu/stubs/Makefile.objs b/qemu/stubs/Makefile.objs
deleted file mode 100644
index 4b258a673..000000000
--- a/qemu/stubs/Makefile.objs
+++ /dev/null
@@ -1,43 +0,0 @@
-stub-obj-y += arch-query-cpu-def.o
-stub-obj-y += bdrv-next-monitor-owned.o
-stub-obj-y += blk-commit-all.o
-stub-obj-y += blockdev-close-all-bdrv-states.o
-stub-obj-y += clock-warp.o
-stub-obj-y += cpu-get-clock.o
-stub-obj-y += cpu-get-icount.o
-stub-obj-y += dump.o
-stub-obj-y += fdset-add-fd.o
-stub-obj-y += fdset-find-fd.o
-stub-obj-y += fdset-get-fd.o
-stub-obj-y += fdset-remove-fd.o
-stub-obj-y += gdbstub.o
-stub-obj-y += get-fd.o
-stub-obj-y += get-next-serial.o
-stub-obj-y += get-vm-name.o
-stub-obj-y += iothread-lock.o
-stub-obj-y += is-daemonized.o
-stub-obj-y += machine-init-done.o
-stub-obj-y += migr-blocker.o
-stub-obj-y += mon-is-qmp.o
-stub-obj-y += mon-printf.o
-stub-obj-y += monitor-init.o
-stub-obj-y += notify-event.o
-stub-obj-y += qtest.o
-stub-obj-y += replay.o
-stub-obj-y += replay-user.o
-stub-obj-y += reset.o
-stub-obj-y += runstate-check.o
-stub-obj-y += set-fd-handler.o
-stub-obj-y += slirp.o
-stub-obj-y += sysbus.o
-stub-obj-y += uuid.o
-stub-obj-y += vm-stop.o
-stub-obj-y += vmstate.o
-stub-obj-$(CONFIG_WIN32) += fd-register.o
-stub-obj-y += cpus.o
-stub-obj-y += kvm.o
-stub-obj-y += qmp_pc_dimm_device_list.o
-stub-obj-y += target-monitor-defs.o
-stub-obj-y += target-get-monitor-def.o
-stub-obj-y += vhost.o
-stub-obj-y += iohandler.o
diff --git a/qemu/stubs/arch-query-cpu-def.c b/qemu/stubs/arch-query-cpu-def.c
deleted file mode 100644
index cefe4beb8..000000000
--- a/qemu/stubs/arch-query-cpu-def.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "qemu/osdep.h"
-#include "qemu-common.h"
-#include "sysemu/arch_init.h"
-#include "qapi/qmp/qerror.h"
-
-CpuDefinitionInfoList *arch_query_cpu_definitions(Error **errp)
-{
-    error_setg(errp, QERR_UNSUPPORTED);
-    return NULL;
-}
diff --git a/qemu/stubs/bdrv-next-monitor-owned.c b/qemu/stubs/bdrv-next-monitor-owned.c
deleted file mode 100644
index 2acf6c3ec..000000000
--- a/qemu/stubs/bdrv-next-monitor-owned.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "qemu/osdep.h"
-#include "qemu-common.h"
-#include "block/block.h"
-
-BlockDriverState *bdrv_next_monitor_owned(BlockDriverState *bs)
-{
-    return NULL;
-}
diff --git a/qemu/stubs/blk-commit-all.c b/qemu/stubs/blk-commit-all.c
deleted file mode 100644
index c82fb7f5f..000000000
--- a/qemu/stubs/blk-commit-all.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "qemu/osdep.h"
-#include "qemu-common.h"
-#include "sysemu/block-backend.h"
-
-int blk_commit_all(void)
-{
-    return 0;
-}
diff --git a/qemu/stubs/blockdev-close-all-bdrv-states.c b/qemu/stubs/blockdev-close-all-bdrv-states.c
deleted file mode 100644
index f1f1d9cdc..000000000
--- a/qemu/stubs/blockdev-close-all-bdrv-states.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "qemu/osdep.h"
-#include "block/block_int.h"
-
-void blockdev_close_all_bdrv_states(void)
-{
-}
diff --git a/qemu/stubs/clock-warp.c b/qemu/stubs/clock-warp.c
deleted file mode 100644
index 8acb58a77..000000000
--- a/qemu/stubs/clock-warp.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "qemu/osdep.h"
-#include "qemu-common.h"
-#include "qemu/timer.h"
-
-void qemu_start_warp_timer(void)
-{
-}
-
diff --git a/qemu/stubs/cpu-get-clock.c b/qemu/stubs/cpu-get-clock.c
deleted file mode 100644
index 1d07523b8..000000000
--- a/qemu/stubs/cpu-get-clock.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "qemu/osdep.h"
-#include "qemu-common.h"
-#include "qemu/timer.h"
-
-int64_t cpu_get_clock(void)
-{
-    return get_clock_realtime();
-}
diff --git a/qemu/stubs/cpu-get-icount.c b/qemu/stubs/cpu-get-icount.c
deleted file mode 100644
index 3a6f2ab00..000000000
--- a/qemu/stubs/cpu-get-icount.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "qemu/osdep.h"
-#include "qemu-common.h"
-#include "qemu/timer.h"
-
-int use_icount;
-
-int64_t cpu_get_icount(void)
-{
-    abort();
-}
diff --git a/qemu/stubs/cpus.c b/qemu/stubs/cpus.c
deleted file mode 100644
index e19272297..000000000
--- a/qemu/stubs/cpus.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "qemu/osdep.h"
-#include "qemu-common.h"
-#include "qom/cpu.h"
-
-void cpu_resume(CPUState *cpu)
-{
-}
-
-void qemu_init_vcpu(CPUState *cpu)
-{
-}
diff --git a/qemu/stubs/dump.c b/qemu/stubs/dump.c
deleted file mode 100644
index d9ee23f1e..000000000
--- a/qemu/stubs/dump.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * QEMU dump
- *
- * Copyright Fujitsu, Corp. 2011, 2012
- *
- * Authors:
- *     Wen Congyang <wency@cn.fujitsu.com>
- *
- * This work is licensed under the terms of the GNU GPL, version 2 or later.
- * See the COPYING file in the top-level directory.
- *
- */
-
-#include "qemu/osdep.h"
-#include "qemu-common.h"
-#include "sysemu/dump-arch.h"
-#include "qmp-commands.h"
-
-int cpu_get_dump_info(ArchDumpInfo *info,
-                      const struct GuestPhysBlockList *guest_phys_blocks)
-{
-    return -1;
-}
-
-ssize_t cpu_get_note_size(int class, int machine, int nr_cpus)
-{
-    return -1;
-}
-
diff --git a/qemu/stubs/fd-register.c b/qemu/stubs/fd-register.c
deleted file mode 100644
index f91aa3418..000000000
--- a/qemu/stubs/fd-register.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "qemu/osdep.h"
-#include "qemu-common.h"
-#include "qemu/main-loop.h"
-
-void qemu_fd_register(int fd)
-{
-}
diff --git a/qemu/stubs/fdset-add-fd.c b/qemu/stubs/fdset-add-fd.c
deleted file mode 100644
index bf9e60aed..000000000
--- a/qemu/stubs/fdset-add-fd.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "qemu/osdep.h"
-#include "qemu-common.h"
-#include "monitor/monitor.h"
-
-int monitor_fdset_dup_fd_add(int64_t fdset_id, int dup_fd)
-{
-    return -1;
-}
diff --git a/qemu/stubs/fdset-find-fd.c b/qemu/stubs/fdset-find-fd.c
deleted file mode 100644
index 1d9caf37e..000000000
--- a/qemu/stubs/fdset-find-fd.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "qemu/osdep.h"
-#include "qemu-common.h"
-#include "monitor/monitor.h"
-
-int monitor_fdset_dup_fd_find(int dup_fd)
-{
-    return -1;
-}
diff --git a/qemu/stubs/fdset-get-fd.c b/qemu/stubs/fdset-get-fd.c
deleted file mode 100644
index 5325044b5..000000000
--- a/qemu/stubs/fdset-get-fd.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "qemu/osdep.h"
-#include "qemu-common.h"
-#include "monitor/monitor.h"
-
-int monitor_fdset_get_fd(int64_t fdset_id, int flags)
-{
-    return -1;
-}
diff --git a/qemu/stubs/fdset-remove-fd.c b/qemu/stubs/fdset-remove-fd.c
deleted file mode 100644
index 47ea29721..000000000
--- a/qemu/stubs/fdset-remove-fd.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "qemu/osdep.h"
-#include "qemu-common.h"
-#include "monitor/monitor.h"
-
-void monitor_fdset_dup_fd_remove(int dupfd)
-{
-}
diff --git a/qemu/stubs/gdbstub.c b/qemu/stubs/gdbstub.c
deleted file mode 100644
index 2b7aee50d..000000000
--- a/qemu/stubs/gdbstub.c
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "qemu/osdep.h"
-#include "exec/gdbstub.h"       /* xml_builtin */
-
-const char *const xml_builtin[][2] = {
-  { NULL, NULL }
-};
diff --git a/qemu/stubs/get-fd.c b/qemu/stubs/get-fd.c
deleted file mode 100644
index 7dfdfb55f..000000000
--- a/qemu/stubs/get-fd.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "qemu/osdep.h"
-#include "qapi/error.h"
-#include "qemu-common.h"
-#include "monitor/monitor.h"
-
-int monitor_get_fd(Monitor *mon, const char *name, Error **errp)
-{
-    error_setg(errp, "only QEMU supports file descriptor passing");
-    return -1;
-}
diff --git a/qemu/stubs/get-next-serial.c b/qemu/stubs/get-next-serial.c
deleted file mode 100644
index 6ff6a6d3b..000000000
--- a/qemu/stubs/get-next-serial.c
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "qemu/osdep.h"
-#include "qemu-common.h"
-
-CharDriverState *serial_hds[0];
diff --git a/qemu/stubs/get-vm-name.c b/qemu/stubs/get-vm-name.c
deleted file mode 100644
index fa990136b..000000000
--- a/qemu/stubs/get-vm-name.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "qemu/osdep.h"
-#include "qemu-common.h"
-
-const char *qemu_get_vm_name(void)
-{
-    return NULL;
-}
-
diff --git a/qemu/stubs/iohandler.c b/qemu/stubs/iohandler.c
deleted file mode 100644
index 22b0ee5b0..000000000
--- a/qemu/stubs/iohandler.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "qemu/osdep.h"
-#include "qemu-common.h"
-#include "qemu/main-loop.h"
-
-AioContext *iohandler_get_aio_context(void)
-{
-    abort();
-}
diff --git a/qemu/stubs/iothread-lock.c b/qemu/stubs/iothread-lock.c
deleted file mode 100644
index 9b6db2e74..000000000
--- a/qemu/stubs/iothread-lock.c
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "qemu/osdep.h"
-#include "qemu-common.h"
-#include "qemu/main-loop.h"
-
-bool qemu_mutex_iothread_locked(void)
-{
-    return true;
-}
-
-void qemu_mutex_lock_iothread(void)
-{
-}
-
-void qemu_mutex_unlock_iothread(void)
-{
-}
diff --git a/qemu/stubs/is-daemonized.c b/qemu/stubs/is-daemonized.c
deleted file mode 100644
index d5cd1dc37..000000000
--- a/qemu/stubs/is-daemonized.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "qemu/osdep.h"
-#include "qemu-common.h"
-
-/* Win32 has its own inline stub */
-#ifndef _WIN32
-bool is_daemonized(void)
-{
-    return false;
-}
-#endif
diff --git a/qemu/stubs/kvm.c b/qemu/stubs/kvm.c
deleted file mode 100644
index ddd620499..000000000
--- a/qemu/stubs/kvm.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "qemu/osdep.h"
-#include "qemu-common.h"
-#include "sysemu/kvm.h"
-
-int kvm_arch_irqchip_create(MachineState *ms, KVMState *s)
-{
-    return 0;
-}
diff --git a/qemu/stubs/machine-init-done.c b/qemu/stubs/machine-init-done.c
deleted file mode 100644
index 9a0d62514..000000000
--- a/qemu/stubs/machine-init-done.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "qemu/osdep.h"
-#include "qemu-common.h"
-#include "sysemu/sysemu.h"
-
-void qemu_add_machine_init_done_notifier(Notifier *notify)
-{
-}
diff --git a/qemu/stubs/migr-blocker.c b/qemu/stubs/migr-blocker.c
deleted file mode 100644
index 8ab3604df..000000000
--- a/qemu/stubs/migr-blocker.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "qemu/osdep.h"
-#include "qemu-common.h"
-#include "migration/migration.h"
-
-void migrate_add_blocker(Error *reason)
-{
-}
-
-void migrate_del_blocker(Error *reason)
-{
-}
diff --git a/qemu/stubs/mon-is-qmp.c b/qemu/stubs/mon-is-qmp.c
deleted file mode 100644
index a8344ced8..000000000
--- a/qemu/stubs/mon-is-qmp.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "qemu/osdep.h"
-#include "qemu-common.h"
-#include "monitor/monitor.h"
-
-Monitor *cur_mon;
-
-bool monitor_cur_is_qmp(void)
-{
-    return false;
-}
diff --git a/qemu/stubs/mon-printf.c b/qemu/stubs/mon-printf.c
deleted file mode 100644
index e7c1e0cf7..000000000
--- a/qemu/stubs/mon-printf.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "qemu/osdep.h"
-#include "qemu-common.h"
-#include "monitor/monitor.h"
-
-void monitor_printf(Monitor *mon, const char *fmt, ...)
-{
-}
-
-void monitor_vprintf(Monitor *mon, const char *fmt, va_list ap)
-{
-}
diff --git a/qemu/stubs/monitor-init.c b/qemu/stubs/monitor-init.c
deleted file mode 100644
index de1bc7cd5..000000000
--- a/qemu/stubs/monitor-init.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "qemu/osdep.h"
-#include "qemu-common.h"
-#include "monitor/monitor.h"
-
-void monitor_init(CharDriverState *chr, int flags)
-{
-}
diff --git a/qemu/stubs/notify-event.c b/qemu/stubs/notify-event.c
deleted file mode 100644
index 14e52268a..000000000
--- a/qemu/stubs/notify-event.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "qemu/osdep.h"
-#include "qemu-common.h"
-#include "qemu/main-loop.h"
-
-void qemu_notify_event(void)
-{
-}
diff --git a/qemu/stubs/qmp_pc_dimm_device_list.c b/qemu/stubs/qmp_pc_dimm_device_list.c
deleted file mode 100644
index def211564..000000000
--- a/qemu/stubs/qmp_pc_dimm_device_list.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "qemu/osdep.h"
-#include "qom/object.h"
-#include "hw/mem/pc-dimm.h"
-
-int qmp_pc_dimm_device_list(Object *obj, void *opaque)
-{
-   return 0;
-}
diff --git a/qemu/stubs/qtest.c b/qemu/stubs/qtest.c
deleted file mode 100644
index 891eb954f..000000000
--- a/qemu/stubs/qtest.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * qtest stubs
- *
- * Copyright (c) 2014 Linaro Limited
- * Written by Peter Maydell
- *
- * This work is licensed under the terms of the GNU GPL, version 2 or later.
- * See the COPYING file in the top-level directory.
- */
-
-#include "qemu/osdep.h"
-#include "sysemu/qtest.h"
-
-/* Needed for qtest_allowed() */
-bool qtest_allowed;
-
-bool qtest_driver(void)
-{
-    return false;
-}
diff --git a/qemu/stubs/replay-user.c b/qemu/stubs/replay-user.c
deleted file mode 100644
index b29e7ebba..000000000
--- a/qemu/stubs/replay-user.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * replay.c
- *
- * Copyright (c) 2010-2015 Institute for System Programming
- *                         of the Russian Academy of Sciences.
- *
- * This work is licensed under the terms of the GNU GPL, version 2 or later.
- * See the COPYING file in the top-level directory.
- *
- */
-
-#include "qemu/osdep.h"
-#include "sysemu/replay.h"
-
-bool replay_exception(void)
-{
-    return true;
-}
-
-bool replay_has_exception(void)
-{
-    return false;
-}
-
-bool replay_interrupt(void)
-{
-    return true;
-}
-
-bool replay_has_interrupt(void)
-{
-    return false;
-}
diff --git a/qemu/stubs/replay.c b/qemu/stubs/replay.c
deleted file mode 100644
index de9fa1ec9..000000000
--- a/qemu/stubs/replay.c
+++ /dev/null
@@ -1,69 +0,0 @@
-#include "qemu/osdep.h"
-#include "sysemu/replay.h"
-#include "sysemu/sysemu.h"
-
-ReplayMode replay_mode;
-
-int64_t replay_save_clock(unsigned int kind, int64_t clock)
-{
-    abort();
-    return 0;
-}
-
-int64_t replay_read_clock(unsigned int kind)
-{
-    abort();
-    return 0;
-}
-
-bool replay_checkpoint(ReplayCheckpoint checkpoint)
-{
-    return true;
-}
-
-bool replay_events_enabled(void)
-{
-    return false;
-}
-
-void replay_finish(void)
-{
-}
-
-void replay_register_char_driver(CharDriverState *chr)
-{
-}
-
-void replay_chr_be_write(CharDriverState *s, uint8_t *buf, int len)
-{
-    abort();
-}
-
-void replay_char_write_event_save(int res, int offset)
-{
-    abort();
-}
-
-void replay_char_write_event_load(int *res, int *offset)
-{
-    abort();
-}
-
-int replay_char_read_all_load(uint8_t *buf)
-{
-    abort();
-}
-
-void replay_char_read_all_save_error(int res)
-{
-    abort();
-}
-
-void replay_char_read_all_save_buf(uint8_t *buf, int offset)
-{
-    abort();
-}
-
-void replay_block_event(QEMUBH *bh, uint64_t id)
-{
-}
diff --git a/qemu/stubs/reset.c b/qemu/stubs/reset.c
deleted file mode 100644
index 5d47711f9..000000000
--- a/qemu/stubs/reset.c
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "qemu/osdep.h"
-#include "hw/hw.h"
-
-/* Stub functions for binaries that never call qemu_devices_reset(),
- * and don't need to keep track of the reset handler list.
- */
-
-void qemu_register_reset(QEMUResetHandler *func, void *opaque)
-{
-}
-
-void qemu_unregister_reset(QEMUResetHandler *func, void *opaque)
-{
-}
diff --git a/qemu/stubs/runstate-check.c b/qemu/stubs/runstate-check.c
deleted file mode 100644
index 7c5227e84..000000000
--- a/qemu/stubs/runstate-check.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "qemu/osdep.h"
-#include "sysemu/sysemu.h"
-
-bool runstate_check(RunState state)
-{
-    return state == RUN_STATE_PRELAUNCH;
-}
diff --git a/qemu/stubs/set-fd-handler.c b/qemu/stubs/set-fd-handler.c
deleted file mode 100644
index 06a5da48f..000000000
--- a/qemu/stubs/set-fd-handler.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include "qemu/osdep.h"
-#include "qemu-common.h"
-#include "qemu/main-loop.h"
-
-void qemu_set_fd_handler(int fd,
-                         IOHandler *fd_read,
-                         IOHandler *fd_write,
-                         void *opaque)
-{
-    abort();
-}
-
-void aio_set_fd_handler(AioContext *ctx,
-                        int fd,
-                        bool is_external,
-                        IOHandler *io_read,
-                        IOHandler *io_write,
-                        void *opaque)
-{
-    abort();
-}
diff --git a/qemu/stubs/slirp.c b/qemu/stubs/slirp.c
deleted file mode 100644
index dcae51f0e..000000000
--- a/qemu/stubs/slirp.c
+++ /dev/null
@@ -1,12 +0,0 @@
-#include "qemu/osdep.h"
-#include "qemu-common.h"
-#include "slirp/slirp.h"
-
-void slirp_pollfds_fill(GArray *pollfds, uint32_t *timeout)
-{
-}
-
-void slirp_pollfds_poll(GArray *pollfds, int select_error)
-{
-}
-
diff --git a/qemu/stubs/sysbus.c b/qemu/stubs/sysbus.c
deleted file mode 100644
index d8da90caa..000000000
--- a/qemu/stubs/sysbus.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "qemu/osdep.h"
-#include "hw/qdev-core.h"
-
-BusState *sysbus_get_default(void)
-{
-    return NULL;
-}
diff --git a/qemu/stubs/target-get-monitor-def.c b/qemu/stubs/target-get-monitor-def.c
deleted file mode 100644
index 394e0f9a7..000000000
--- a/qemu/stubs/target-get-monitor-def.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- *  Stub for target_get_monitor_def.
- *
- *  Copyright IBM Corp., 2015
- *
- *  Author: Alexey Kardashevskiy <aik@ozlabs.ru>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License,
- *  or (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "qemu/osdep.h"
-
-int target_get_monitor_def(CPUState *cs, const char *name, uint64_t *pval);
-
-int target_get_monitor_def(CPUState *cs, const char *name, uint64_t *pval)
-{
-    return -1;
-}
diff --git a/qemu/stubs/target-monitor-defs.c b/qemu/stubs/target-monitor-defs.c
deleted file mode 100644
index ac07b1906..000000000
--- a/qemu/stubs/target-monitor-defs.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "qemu/osdep.h"
-
-const MonitorDef *target_monitor_defs(void);
-
-const MonitorDef *target_monitor_defs(void)
-{
-    return NULL;
-}
diff --git a/qemu/stubs/uuid.c b/qemu/stubs/uuid.c
deleted file mode 100644
index 92ad71783..000000000
--- a/qemu/stubs/uuid.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include "qemu/osdep.h"
-#include "qemu-common.h"
-#include "sysemu/sysemu.h"
-#include "qmp-commands.h"
-
-UuidInfo *qmp_query_uuid(Error **errp)
-{
-    UuidInfo *info = g_malloc0(sizeof(*info));
-
-    info->UUID = g_strdup(UUID_NONE);
-    return info;
-}
-
diff --git a/qemu/stubs/vhost.c b/qemu/stubs/vhost.c
deleted file mode 100644
index 2d76cdebd..000000000
--- a/qemu/stubs/vhost.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "qemu/osdep.h"
-#include "hw/virtio/vhost.h"
-
-bool vhost_has_free_slot(void)
-{
-    return true;
-}
diff --git a/qemu/stubs/vm-stop.c b/qemu/stubs/vm-stop.c
deleted file mode 100644
index 8271cad65..000000000
--- a/qemu/stubs/vm-stop.c
+++ /dev/null
@@ -1,13 +0,0 @@
-#include "qemu/osdep.h"
-#include "qemu-common.h"
-#include "sysemu/sysemu.h"
-
-void qemu_system_vmstop_request_prepare(void)
-{
-    abort();
-}
-
-void qemu_system_vmstop_request(RunState state)
-{
-    abort();
-}
diff --git a/qemu/stubs/vmstate.c b/qemu/stubs/vmstate.c
deleted file mode 100644
index 65906271d..000000000
--- a/qemu/stubs/vmstate.c
+++ /dev/null
@@ -1,20 +0,0 @@
-#include "qemu/osdep.h"
-#include "qemu-common.h"
-#include "migration/vmstate.h"
-
-const VMStateDescription vmstate_dummy = {};
-
-int vmstate_register_with_alias_id(DeviceState *dev,
-                                   int instance_id,
-                                   const VMStateDescription *vmsd,
-                                   void *base, int alias_id,
-                                   int required_for_version)
-{
-    return 0;
-}
-
-void vmstate_unregister(DeviceState *dev,
-                        const VMStateDescription *vmsd,
-                        void *opaque)
-{
-}