From patchwork Fri Mar 1 13:33:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 224338 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id CF2862C0094 for ; Sat, 2 Mar 2013 00:36:59 +1100 (EST) Received: from localhost ([::1]:34075 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UBQ8v-0006aR-UC for incoming@patchwork.ozlabs.org; Fri, 01 Mar 2013 08:36:57 -0500 Received: from eggs.gnu.org ([208.118.235.92]:40626) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UBQ6F-0003B5-12 for qemu-devel@nongnu.org; Fri, 01 Mar 2013 08:34:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UBQ6A-0007Np-1u for qemu-devel@nongnu.org; Fri, 01 Mar 2013 08:34:10 -0500 Received: from mail-qa0-f48.google.com ([209.85.216.48]:62330) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UBQ69-0007Nj-TY for qemu-devel@nongnu.org; Fri, 01 Mar 2013 08:34:05 -0500 Received: by mail-qa0-f48.google.com with SMTP id j8so2154287qah.14 for ; Fri, 01 Mar 2013 05:34:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=T7GsMWUBownc6c3Y5wIvpb2DH10fCklKtIMA7tseYP4=; b=NBhmPG6sfUbUdbJJvZ+ysraVM8efuhsRFmXvALNiOq4fUEhaIP9vLwWcVz6Pmy+/Pu 256bjMqZEKZpwZvDOvP7Ud/szvI5iGQboWFiUiLBQwFbtmAvChmsSSuGdQjm5wyV7CrC SFKcDLkku971u5NMTStW1Y3Bol6MgTVcqia06xFd0vlYg3yLKhz/d11+stV99MdCsvKm GpgtD2gpys3dAeJNd16KxYPch58y029IauaMvFLWeiqthBg/vTKe/U2/OzhNj0+5VNiA R2aUfmL6j5LUJheiAckWJDKBRgmE1zKqWONOeoGUCJ1y846qbksPbiWLxFMx1U/vlpnE seqQ== X-Received: by 10.224.116.148 with SMTP id m20mr19878835qaq.31.1362144845480; Fri, 01 Mar 2013 05:34:05 -0800 (PST) Received: from yakj.usersys.redhat.com (93-34-176-20.ip50.fastwebnet.it. [93.34.176.20]) by mx.google.com with ESMTPS id hr1sm19338754qeb.3.2013.03.01.05.34.03 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 01 Mar 2013 05:34:04 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 1 Mar 2013 14:33:35 +0100 Message-Id: <1362144829-26979-5-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1362144829-26979-1-git-send-email-pbonzini@redhat.com> References: <1362144829-26979-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 209.85.216.48 Cc: peter.maydell@linaro.org, afaerber@suse.de Subject: [Qemu-devel] [PATCH 04/18] hw: move device-hotplug.o to toplevel, compile it once X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 --- 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 +#include +#include + +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; +}