From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:46004)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1WQGhg-0007ZS-6F
	for qemu-devel@nongnu.org; Wed, 19 Mar 2014 09:38:49 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1WQGhb-0004nY-1k
	for qemu-devel@nongnu.org; Wed, 19 Mar 2014 09:38:44 -0400
Received: from cantor2.suse.de ([195.135.220.15]:50492 helo=mx2.suse.de)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <afaerber@suse.de>) id 1WQGha-0004nP-RW
	for qemu-devel@nongnu.org; Wed, 19 Mar 2014 09:38:38 -0400
Message-ID: <53299DDC.6060107@suse.de>
Date: Wed, 19 Mar 2014 14:38:36 +0100
From: =?ISO-8859-15?Q?Andreas_F=E4rber?= <afaerber@suse.de>
MIME-Version: 1.0
References: <1395156395-24747-1-git-send-email-marcel.a@redhat.com>
In-Reply-To: <1395156395-24747-1-git-send-email-marcel.a@redhat.com>
Content-Type: text/plain; charset=ISO-8859-15
Content-Transfer-Encoding: quoted-printable
Subject: Re: [Qemu-devel] [PATCH V2 for-2.0] vl.c: Fix OpenBSD compilation
 issue due to namespace collisions
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Marcel Apfelbaum <marcel.a@redhat.com>, qemu-devel@nongnu.org
Cc: peter.maydell@linaro.org, aliguori@amazon.com, brad@comstyle.com

Am 18.03.2014 16:26, schrieb Marcel Apfelbaum:
> Machine rewriting added MACHINE macro which is
> already in use by other OpenBSD library.
> Since qemu/sockets.h exposes the OpenBSD namespace,
> the minimalistic approach is to add it as the first QEMU include.
>=20
> Reported-by: Brad Smith <brad@comstyle.com>
> Signed-off-by: Marcel Apfelbaum <marcel.a@redhat.com>
> ---
> V1 -> V2
>  #undef MACHINE to avoid introducing warnings for redefining the macro.
>=20
>  include/hw/boards.h | 1 +
>  vl.c                | 2 +-
>  2 files changed, 2 insertions(+), 1 deletion(-)
>=20
> diff --git a/include/hw/boards.h b/include/hw/boards.h
> index 7bd2ea7..dd2c70d 100644
> --- a/include/hw/boards.h
> +++ b/include/hw/boards.h
> @@ -54,6 +54,7 @@ struct QEMUMachine {
>  int qemu_register_machine(QEMUMachine *m);
> =20
>  #define TYPE_MACHINE "machine"
> +#undef MACHINE  /* BSD defines it and QEMU does not use it */
>  #define MACHINE(obj) \
>      OBJECT_CHECK(MachineState, (obj), TYPE_MACHINE)
>  #define MACHINE_GET_CLASS(obj) \
> diff --git a/vl.c b/vl.c
> index f0fe48b..9f86e68 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -58,6 +58,7 @@ int main(int argc, char **argv)
> =20
>  #include <glib.h>
> =20
> +#include "qemu/sockets.h"
>  #include "hw/hw.h"
>  #include "hw/boards.h"
>  #include "hw/usb.h"

Thanks, I've queued this for testing but would probably like to add a
comment explaining why this is placed there.

https://github.com/afaerber/qemu-cpu/commits/qom-next

Andreas

> @@ -103,7 +104,6 @@ int main(int argc, char **argv)
> =20
>  #include "disas/disas.h"
> =20
> -#include "qemu/sockets.h"
> =20
>  #include "slirp/libslirp.h"
> =20
>=20


--=20
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 N=FCrnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imend=F6rffer; HRB 16746 AG N=FCrnbe=
rg