From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:43846) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TYlIk-0003AU-Ee for qemu-devel@nongnu.org; Wed, 14 Nov 2012 17:19:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TYlIh-0002Ok-CA for qemu-devel@nongnu.org; Wed, 14 Nov 2012 17:19:18 -0500 Received: from cantor2.suse.de ([195.135.220.15]:42237 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TYlIh-0002Od-3E for qemu-devel@nongnu.org; Wed, 14 Nov 2012 17:19:15 -0500 Message-ID: <50A418DE.5070103@suse.de> Date: Wed, 14 Nov 2012 23:19:10 +0100 From: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= MIME-Version: 1.0 References: <1352473012-20500-1-git-send-email-ehabkost@redhat.com> <1352473012-20500-15-git-send-email-ehabkost@redhat.com> <50A41397.2000702@suse.de> In-Reply-To: <50A41397.2000702@suse.de> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 14/24] sysemu.h: include qemu-types.h instead of qemu-common.h List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Eduardo Habkost Cc: peter.maydell@linaro.org, riku.voipio@iki.fi, qemu-devel@nongnu.org, blauwirbel@gmail.com, Anthony Liguori , Igor Mammedov Am 14.11.2012 22:56, schrieb Andreas F=C3=A4rber: > Am 09.11.2012 15:56, schrieb Eduardo Habkost: >> It just needs the Monitor and DeviceState typedefs, so it doesn't need >> all of qemu-common.h. >> >> Signed-off-by: Eduardo Habkost >> --- >> sysemu.h | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/sysemu.h b/sysemu.h >> index f5ac664..ab1ef8b 100644 >> --- a/sysemu.h >> +++ b/sysemu.h >> @@ -2,7 +2,7 @@ >> #define SYSEMU_H >> /* Misc. things related to the system emulator. */ >> =20 >> -#include "qemu-common.h" >> +#include "qemu-types.h" >> #include "qemu-option.h" >> #include "qemu-queue.h" >> #include "qemu-timer.h" >=20 > CC i386-softmmu/hw/i386/../kvmvapic.o > In file included from /home/andreas/QEMU/qemu-rcar/target-i386/cpu.h:83= 9:0, > from /home/andreas/QEMU/qemu-rcar/qemu-common.h:130, > from ../qapi-types.h:19, > from /home/andreas/QEMU/qemu-rcar/error.h:16, > from /home/andreas/QEMU/qemu-rcar/qemu-option.h:31, > from /home/andreas/QEMU/qemu-rcar/sysemu.h:6, > from /home/andreas/QEMU/qemu-rcar/hw/i386/../kvmvapic.= c:11: > /home/andreas/QEMU/qemu-rcar/target-i386/cpu-qom.h:76:35: error: unknow= n > type name =E2=80=98Error=E2=80=99 > make[1]: *** [hw/i386/../kvmvapic.o] Fehler 1 > make: *** [subdir-i386-softmmu] Fehler 2 >=20 > Probably "error.h" needed, too. Scratch that last part. There's a cyclic inclusion of qemu-common.h, solved by the qapi-types.h patch 16/24. Reordering solves this issue. Given that, Acked-by: Andreas F=C3=A4rber Andreas --=20 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=C3=BCrnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imend=C3=B6rffer; HRB 16746 AG N=C3=BC= rnberg