[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 14/24] sysemu.h: include qemu-types.h instead of
From: |
Andreas Färber |
Subject: |
Re: [Qemu-devel] [PATCH 14/24] sysemu.h: include qemu-types.h instead of qemu-common.h |
Date: |
Wed, 14 Nov 2012 23:19:10 +0100 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121025 Thunderbird/16.0.2 |
Am 14.11.2012 22:56, schrieb Andreas Färber:
> 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 <address@hidden>
>> ---
>> 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. */
>>
>> -#include "qemu-common.h"
>> +#include "qemu-types.h"
>> #include "qemu-option.h"
>> #include "qemu-queue.h"
>> #include "qemu-timer.h"
>
> CC i386-softmmu/hw/i386/../kvmvapic.o
> In file included from /home/andreas/QEMU/qemu-rcar/target-i386/cpu.h:839: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: unknown
> type name ‘Error’
> make[1]: *** [hw/i386/../kvmvapic.o] Fehler 1
> make: *** [subdir-i386-softmmu] Fehler 2
>
> 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ärber <address@hidden>
Andreas
--
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
- [Qemu-devel] [PATCH 15/24] qlist.h: do not include qemu-common.h, (continued)
- [Qemu-devel] [PATCH 15/24] qlist.h: do not include qemu-common.h, Eduardo Habkost, 2012/11/09
- [Qemu-devel] [PATCH 20/24] qdev: add weak aliases for vmstate handling on qdev.c, Eduardo Habkost, 2012/11/09
- [Qemu-devel] [PATCH 12/24] qga/channel-posix.c: include headers it needs, Eduardo Habkost, 2012/11/09
- [Qemu-devel] [PATCH 07/24] qemu-fsdev-dummy.c: include module.h, Eduardo Habkost, 2012/11/09
- [Qemu-devel] [PATCH 23/24] include qdev code into *-user, too, Eduardo Habkost, 2012/11/09
- [Qemu-devel] [PATCH 24/24] qom: make CPU a child of DeviceState, Eduardo Habkost, 2012/11/09
- [Qemu-devel] [PATCH 14/24] sysemu.h: include qemu-types.h instead of qemu-common.h, Eduardo Habkost, 2012/11/09
- [Qemu-devel] [PATCH 16/24] qapi-types.h: don't include qemu-common.h, Eduardo Habkost, 2012/11/09
- [Qemu-devel] [PATCH 21/24] qdev: add weak alias to sysbus_get_default() on qdev.c, Eduardo Habkost, 2012/11/09
- [Qemu-devel] [PATCH 04/24] move qemu_irq typedef out of cpu-common.h, Eduardo Habkost, 2012/11/09
- [Qemu-devel] [PATCH 06/24] move I/O-related definitions from qemu-common.h to a new header (qemu-stdio.h), Eduardo Habkost, 2012/11/09