[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 04/18] hw: move device-hotplug.o to toplevel, compil
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 04/18] hw: move device-hotplug.o to toplevel, compile it once |
Date: |
Fri, 1 Mar 2013 14:33:35 +0100 |
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 2a8174d..8c90b92 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 f7ee133..43f467a 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 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.8.1.4
- [Qemu-devel] [PATCH 00/18] hw/ reorganization, part 1: out of hw/ + into hw/ARCH, Paolo Bonzini, 2013/03/01
- [Qemu-devel] [PATCH 01/18] hw: move char backends to backends/, Paolo Bonzini, 2013/03/01
- [Qemu-devel] [PATCH 02/18] hw: move fifo.[ch] to libqemuutil, Paolo Bonzini, 2013/03/01
- [Qemu-devel] [PATCH 05/18] virtio-9p: use CONFIG_VIRTFS, not CONFIG_LINUX, Paolo Bonzini, 2013/03/01
- [Qemu-devel] [PATCH 03/18] hw: move qdev-monitor.o to toplevel directory, Paolo Bonzini, 2013/03/01
- [Qemu-devel] [PATCH 07/18] vt82c686: vt82c686 is not a PCI host bridge, Paolo Bonzini, 2013/03/01
- [Qemu-devel] [PATCH 08/18] ppc: do not use ../ in include files, Paolo Bonzini, 2013/03/01
- [Qemu-devel] [PATCH 04/18] hw: move device-hotplug.o to toplevel, compile it once,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 06/18] virtio-9p: remove PCI dependencies from hw/9pfs/, Paolo Bonzini, 2013/03/01
- [Qemu-devel] [PATCH 10/18] build: always link device_tree.o into emulators if libfdt available, Paolo Bonzini, 2013/03/01
- [Qemu-devel] [PATCH 11/18] ppc: express FDT dependency of pSeries and e500 boards via default-configs/, Paolo Bonzini, 2013/03/01
- [Qemu-devel] [PATCH 13/18] arm: move files referencing CPU to hw/arm/, Paolo Bonzini, 2013/03/01
- [Qemu-devel] [PATCH 14/18] i386: move files referencing CPU to hw/i386/, Paolo Bonzini, 2013/03/01
- [Qemu-devel] [PATCH 12/18] hw: move boards and other isolated files to hw/ARCH, Paolo Bonzini, 2013/03/01
- [Qemu-devel] [PATCH 15/18] m68k: move files referencing CPU to hw/m68k/, Paolo Bonzini, 2013/03/01
- [Qemu-devel] [PATCH 16/18] ppc: move files referencing CPU to hw/ppc/, Paolo Bonzini, 2013/03/01
- [Qemu-devel] [PATCH 17/18] ppc: move more files to hw/ppc, Paolo Bonzini, 2013/03/01
- [Qemu-devel] [PATCH 18/18] sh: move files referencing CPU to hw/sh4/, Paolo Bonzini, 2013/03/01