aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2013-02-04 17:20:47 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2013-03-01 13:57:13 +0100
commit1559e0d4b54d1b0744983b57da893617ceae8b94 (patch)
treebc23dde4149977b956df3d7bf1eee9ee69fa510f
parentb4a42f81383d60900aae09513f42eb857a5a7c7c (diff)
downloadqemu-arm-1559e0d4b54d1b0744983b57da893617ceae8b94.tar.gz
hw: move device-hotplug.o to toplevel, compile it once
The situation with device-hotplug.c is similar to qdev-monitor.c. Add a stub for pci_drive_hot_add, so that it can be compiled once, and move it out of hw/. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--Makefile.objs2
-rw-r--r--device-hotplug.c (renamed from hw/device-hotplug.c)13
-rw-r--r--hw/Makefile.objs1
-rw-r--r--stubs/Makefile.objs1
-rw-r--r--stubs/pci-drive-hot-add.c10
5 files changed, 14 insertions, 13 deletions
diff --git a/Makefile.objs b/Makefile.objs
index 2a8174dd15..8c90b92d01 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -51,7 +51,7 @@ ifeq ($(CONFIG_SOFTMMU),y)
common-obj-y = $(block-obj-y) blockdev.o blockdev-nbd.o block/
common-obj-y += net/
common-obj-y += readline.o
-common-obj-y += qdev-monitor.o
+common-obj-y += qdev-monitor.o device-hotplug.o
common-obj-$(CONFIG_WIN32) += os-win32.o
common-obj-$(CONFIG_POSIX) += os-posix.o
diff --git a/hw/device-hotplug.c b/device-hotplug.c
index 88da145a89..103d34ac45 100644
--- a/hw/device-hotplug.c
+++ b/device-hotplug.c
@@ -22,8 +22,8 @@
* THE SOFTWARE.
*/
-#include "hw.h"
-#include "boards.h"
+#include "hw/hw.h"
+#include "hw/boards.h"
#include "sysemu/blockdev.h"
#include "qemu/config-file.h"
#include "sysemu/sysemu.h"
@@ -47,15 +47,6 @@ DriveInfo *add_init_drive(const char *optstr)
return dinfo;
}
-#if !defined(TARGET_I386)
-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;
-}
-#endif
-
void drive_hot_add(Monitor *mon, const QDict *qdict)
{
DriveInfo *dinfo = NULL;
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index f7ee133627..43f467a1ee 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -206,7 +206,6 @@ obj-$(CONFIG_SOFTMMU) += vhost_net.o
obj-$(CONFIG_VHOST_NET) += vhost.o
obj-$(CONFIG_REALLY_VIRTFS) += 9pfs/
obj-$(CONFIG_VGA) += vga.o
-obj-$(CONFIG_SOFTMMU) += device-hotplug.o
obj-$(CONFIG_XEN) += xen_domainbuild.o xen_machine_pv.o
# Inter-VM PCI shared memory & VFIO PCI device assignment
diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs
index a2603947db..9c55b34354 100644
--- a/stubs/Makefile.objs
+++ b/stubs/Makefile.objs
@@ -15,6 +15,7 @@ stub-obj-y += mon-printf.o
stub-obj-y += mon-print-filename.o
stub-obj-y += mon-protocol-event.o
stub-obj-y += mon-set-error.o
+stub-obj-y += pci-drive-hot-add.o
stub-obj-y += reset.o
stub-obj-y += set-fd-handler.o
stub-obj-y += slirp.o
diff --git a/stubs/pci-drive-hot-add.c b/stubs/pci-drive-hot-add.c
new file mode 100644
index 0000000000..1d98145802
--- /dev/null
+++ b/stubs/pci-drive-hot-add.c
@@ -0,0 +1,10 @@
+#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;
+}