From patchwork Wed Nov 9 01:38:48 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 124464 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 879A3B6F72 for ; Wed, 9 Nov 2011 12:27:20 +1100 (EST) Received: from localhost ([::1]:45873 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RNwwa-0002wR-LD for incoming@patchwork.ozlabs.org; Tue, 08 Nov 2011 20:27:12 -0500 Received: from eggs.gnu.org ([140.186.70.92]:48031) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RNwwV-0002wB-QI for qemu-devel@nongnu.org; Tue, 08 Nov 2011 20:27:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RNwwU-0008I9-84 for qemu-devel@nongnu.org; Tue, 08 Nov 2011 20:27:07 -0500 Received: from cantor2.suse.de ([195.135.220.15]:36188 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RNwwU-0008I2-2R for qemu-devel@nongnu.org; Tue, 08 Nov 2011 20:27:06 -0500 Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.221.2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx2.suse.de (Postfix) with ESMTP id 242778A908; Wed, 9 Nov 2011 02:27:05 +0100 (CET) From: Alexander Graf To: qemu-devel@nongnu.org Date: Wed, 9 Nov 2011 02:38:48 +0100 Message-Id: <1320802728-21841-1-git-send-email-agraf@suse.de> X-Mailer: git-send-email 1.7.3.4 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 X-Received-From: 195.135.220.15 Cc: Luiz Capitulino Subject: [Qemu-devel] [PATCH] pci-stub: fix compile breakage with qmp 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 Commit 79627472db3 introduced breakage in compiling the s390x-softmmu target. Instead of compiling, it just throws a lot of errors: In file included from /dev/shm/qemu/hw/pci-stub.c:24: ./qmp-commands.h:3: error: expected identifier or ‘(’ before ‘{’ token [...] This is because we have two files called qmp-commands.h. One resides in the root directory of the source tree. The other one resides in the target build directory. Because pci-stub is not built in libhw, pci-stub.c seems to pick up the qmp-commands.h file from the target build directory which contains only definitions of qmp commands, not the function stubs. This patch at least fixes this breakage for me, allowing me to compile s390x-softmmu again. CC: Luiz Capitulino Signed-off-by: Alexander Graf --- hw/pci-stub.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/hw/pci-stub.c b/hw/pci-stub.c index 636171c..ab9789c 100644 --- a/hw/pci-stub.c +++ b/hw/pci-stub.c @@ -21,7 +21,7 @@ #include "sysemu.h" #include "monitor.h" #include "pci.h" -#include "qmp-commands.h" +#include "../qmp-commands.h" PciInfoList *qmp_query_pci(Error **errp) {