From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=38224 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1PFV2a-0004SB-R7
	for qemu-devel@nongnu.org; Mon, 08 Nov 2010 11:58:01 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <berrange@redhat.com>) id 1PFV2Z-0007F0-BT
	for qemu-devel@nongnu.org; Mon, 08 Nov 2010 11:57:56 -0500
Received: from mx1.redhat.com ([209.132.183.28]:24229)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <berrange@redhat.com>) id 1PFV2Z-0007Er-3J
	for qemu-devel@nongnu.org; Mon, 08 Nov 2010 11:57:55 -0500
Date: Mon, 8 Nov 2010 16:57:49 +0000
From: "Daniel P. Berrange" <berrange@redhat.com>
Subject: Re: [Qemu-devel] [PATCH 1/2] Add a DTrace tracing backend targetted
	for SystemTAP compatability
Message-ID: <20101108165749.GA26714@redhat.com>
References: <1289215984-9484-1-git-send-email-dan@berrange.com>
	<1289215984-9484-2-git-send-email-dan@berrange.com>
	<AANLkTinskGojPH-8L95+-v3UJD9gxDN4Y3ufEc8Y2L+m@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
In-Reply-To: <AANLkTinskGojPH-8L95+-v3UJD9gxDN4Y3ufEc8Y2L+m@mail.gmail.com>
Content-Transfer-Encoding: quoted-printable
Reply-To: "Daniel P. Berrange" <berrange@redhat.com>
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/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: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Stefan Hajnoczi <stefanha@gmail.com>
Cc: "Daniel P. Berrange" <dan@berrange.com>, qemu-devel@nongnu.org

On Mon, Nov 08, 2010 at 04:52:01PM +0000, Stefan Hajnoczi wrote:
> On Mon, Nov 8, 2010 at 11:33 AM, Daniel P. Berrange <dan@berrange.com> =
wrote:
> > diff --git a/Makefile b/Makefile
> > index 02698e9..384bf72 100644
> > --- a/Makefile
> > +++ b/Makefile
> > @@ -1,6 +1,10 @@
> > =C2=A0# Makefile for QEMU.
> >
> > =C2=A0GENERATED_HEADERS =3D config-host.h trace.h qemu-options.def
> > +GENERATED_HEADERS =3D config-host.h trace.h
> > +ifeq ($(TRACE_BACKEND),dtrace)
> > +GENERATED_HEADERS +=3D trace-dtrace.h
> > +endif
>=20
> What happened to qemu-options.def?  GENERATED_HEADERS is defined
> twice, the first line should probably be deleted.

Oh, the loss of qemu-options.def is a rebase/merge error. GENERATED_HEADE=
RS
isn't defined twice, because the second line is using +=3D to append to t=
he
first definition.

Regards,
Daniel
--=20
|: Red Hat, Engineering, London    -o-   http://people.redhat.com/berrang=
e/ :|
|: http://libvirt.org -o- http://virt-manager.org -o- http://deltacloud.o=
rg :|
|: http://autobuild.org        -o-         http://search.cpan.org/~danber=
r/ :|
|: GnuPG: 7D3B9505  -o-   F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 95=
05 :|