From patchwork Mon Feb 4 17:29:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 218006 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 4E37A2C029D for ; Tue, 5 Feb 2013 04:31:17 +1100 (EST) Received: from localhost ([::1]:43704 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U2Psx-0000px-Es for incoming@patchwork.ozlabs.org; Mon, 04 Feb 2013 12:31:15 -0500 Received: from eggs.gnu.org ([208.118.235.92]:37571) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U2PsE-0007Uy-Q2 for qemu-devel@nongnu.org; Mon, 04 Feb 2013 12:30:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U2PsD-0002KX-H9 for qemu-devel@nongnu.org; Mon, 04 Feb 2013 12:30:30 -0500 Received: from mail-ea0-f179.google.com ([209.85.215.179]:37889) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U2PsD-0002KL-BS for qemu-devel@nongnu.org; Mon, 04 Feb 2013 12:30:29 -0500 Received: by mail-ea0-f179.google.com with SMTP id d12so2773790eaa.38 for ; Mon, 04 Feb 2013 09:30:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:subject:date:message-id:x-mailer :in-reply-to:references; bh=zh0yMXlR7w2piiZOf4UnyBDPPJgPqik3IFeI93L8/rc=; b=GVT1J1mygtq97Zc2kZPXMta+U1h3cIwQQjWLLt+aE+DWQIWC0gSeuXB32fVq8uPH7O C8oxrWJZ9MQS4L+7ROC08bGUOz5FZgWZeecu334RHyG6mwslRJA+b1oKdy1j68rzQsyz XftSs+a0JWIgMfLts/ArFw5fRZpqxLzoe8RueYOQ58PXHVyw/EBCyWQVTfX+BpnB1fpy 5v8KvoiCfAOVdHvUQSZaImCnpnHxjND1SZkgun0PtAaBKNzGzONqPN1LnzBJby4YHJa0 dp6CsufRNajUfZrVh0UOb+2huCHYlA32u5SAVIptCt6u5FNHB4HNHxbJhWwYEDFEC8R3 UEgg== X-Received: by 10.14.198.198 with SMTP id v46mr73880211een.4.1359999028565; Mon, 04 Feb 2013 09:30:28 -0800 (PST) Received: from localhost.localdomain (93-34-179-137.ip50.fastwebnet.it. [93.34.179.137]) by mx.google.com with ESMTPS id b2sm28291549eep.9.2013.02.04.09.30.26 (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 04 Feb 2013 09:30:27 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Mon, 4 Feb 2013 18:29:49 +0100 Message-Id: <1359999004-22982-5-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1359999004-22982-1-git-send-email-pbonzini@redhat.com> References: <1359999004-22982-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.215.179 Subject: [Qemu-devel] [PATCH 04/19] 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 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 +#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; +}