diff options
| author | Yonghee Han <onstudy@samsung.com> | 2016-07-27 16:39:12 +0900 |
|---|---|---|
| committer | Yonghee Han <onstudy@samsung.com> | 2016-07-27 16:47:03 +0900 |
| commit | a3b133b0ea0696e42fd876b9a803e28bc6ef5299 (patch) | |
| tree | 68d7537fb9ede28b2e4d2b9f44eb70988279b8ba /stubs | |
| parent | 0d6a2f7e595218b5632ba7005128470e65138951 (diff) | |
| download | qemu-a3b133b0ea0696e42fd876b9a803e28bc6ef5299.tar.gz qemu-a3b133b0ea0696e42fd876b9a803e28bc6ef5299.tar.bz2 qemu-a3b133b0ea0696e42fd876b9a803e28bc6ef5299.zip | |
Imported Upstream version 2.3.1upstream/2.3.1
Change-Id: I2161522ea1d7ff10cd1d697609d473243c05e1df
Diffstat (limited to 'stubs')
| -rw-r--r-- | stubs/Makefile.objs | 1 | ||||
| -rw-r--r-- | stubs/pci-drive-hot-add.c | 10 | ||||
| -rw-r--r-- | stubs/qmp_pc_dimm_device_list.c | 5 | ||||
| -rw-r--r-- | stubs/qtest.c | 2 |
4 files changed, 6 insertions, 12 deletions
diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs index 5e347d04b..8beff4c73 100644 --- a/stubs/Makefile.objs +++ b/stubs/Makefile.objs @@ -24,7 +24,6 @@ stub-obj-y += mon-printf.o stub-obj-y += mon-set-error.o stub-obj-y += monitor-init.o stub-obj-y += notify-event.o -stub-obj-y += pci-drive-hot-add.o stub-obj-$(CONFIG_SPICE) += qemu-chr-open-spice.o stub-obj-y += qtest.o stub-obj-y += reset.o diff --git a/stubs/pci-drive-hot-add.c b/stubs/pci-drive-hot-add.c deleted file mode 100644 index 1d9814580..000000000 --- a/stubs/pci-drive-hot-add.c +++ /dev/null @@ -1,10 +0,0 @@ -#include <monitor/monitor.h> -#include <sysemu/sysemu.h> -#include <sysemu/blockdev.h> - -int pci_drive_hot_add(Monitor *mon, const QDict *qdict, DriveInfo *dinfo) -{ - /* On non-x86 we don't do PCI hotplug */ - monitor_printf(mon, "Can't hot-add drive to type %d\n", dinfo->type); - return -1; -} diff --git a/stubs/qmp_pc_dimm_device_list.c b/stubs/qmp_pc_dimm_device_list.c index 5cb220c66..b584bd8b2 100644 --- a/stubs/qmp_pc_dimm_device_list.c +++ b/stubs/qmp_pc_dimm_device_list.c @@ -5,3 +5,8 @@ int qmp_pc_dimm_device_list(Object *obj, void *opaque) { return 0; } + +ram_addr_t get_current_ram_size(void) +{ + return ram_size; +} diff --git a/stubs/qtest.c b/stubs/qtest.c index e671ed8e8..dc17594bb 100644 --- a/stubs/qtest.c +++ b/stubs/qtest.c @@ -8,7 +8,7 @@ * See the COPYING file in the top-level directory. */ -#include "qemu-common.h" +#include "sysemu/qtest.h" /* Needed for qtest_allowed() */ bool qtest_allowed; |