[Qemu-devel] [PATCH 04/19] hw: move device-hotplug.o to toplevel, compile it once

[Paolo Bonzini]

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 <address@hidden>
---
 Makefile.objs                           |    2 +-
 hw/device-hotplug.c => device-hotplug.c |   13 ++-----------
 hw/Makefile.objs                        |    1 -
 stubs/Makefile.objs                     |    1 +
 stubs/pci-drive-hot-add.c               |   10 ++++++++++
 5 files changed, 14 insertions(+), 13 deletions(-)
 rename hw/device-hotplug.c => device-hotplug.c (88%)
 create mode 100644 stubs/pci-drive-hot-add.c

diff --git a/Makefile.objs b/Makefile.objs
index f37e701..2b8a638 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
similarity index 88%
rename from hw/device-hotplug.c
rename to device-hotplug.c
index 88da145..103d34a 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 ca7d5bd..186f4c4 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -203,7 +203,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 a260394..9c55b34 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 0000000..1d98145
--- /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;
+}
-- 
1.7.4.1