Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NtVgw-0006Bd-NN for qemu-devel@nongnu.org; Sun, 21 Mar 2010 20:40:26 -0400 Received: from [199.232.76.173] (port=56911 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NtVgv-0006BJ-PV for qemu-devel@nongnu.org; Sun, 21 Mar 2010 20:40:25 -0400 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NtVgu-0001xS-BC for qemu-devel@nongnu.org; Sun, 21 Mar 2010 20:40:25 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40891) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NtVgt-0001xM-U6 for qemu-devel@nongnu.org; Sun, 21 Mar 2010 20:40:24 -0400 Received: from int-mx04.intmail.prod.int.phx2.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.17]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o2M0eNOv012752 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Sun, 21 Mar 2010 20:40:23 -0400 Date: Sun, 21 Mar 2010 21:40:16 -0300 From: Luiz Capitulino Message-ID: <20100321214016.6054f3d9@redhat.com> In-Reply-To: References: <1268848614-6844-1-git-send-email-armbru@redhat.com> <1268848614-6844-2-git-send-email-armbru@redhat.com> <20100318183059.13fabf8d@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] Re: [PATCH 1/6] error: Trim includes after "Move qemu_error & friends..." List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Markus Armbruster Cc: qemu-devel@nongnu.org On Fri, 19 Mar 2010 22:31:05 +0100 Markus Armbruster wrote: > Luiz Capitulino writes: > > > On Wed, 17 Mar 2010 18:56:49 +0100 > > Markus Armbruster wrote: > > > >> Missed in commit 2f792016. > >> > >> Signed-off-by: Markus Armbruster > >> --- > >> hw/qdev-properties.c | 1 + > >> monitor.c | 2 -- > >> sysemu.h | 2 -- > >> 3 files changed, 1 insertions(+), 4 deletions(-) > >> > >> diff --git a/hw/qdev-properties.c b/hw/qdev-properties.c > >> index 92d6793..157a111 100644 > >> --- a/hw/qdev-properties.c > >> +++ b/hw/qdev-properties.c > >> @@ -1,6 +1,7 @@ > >> #include "sysemu.h" > >> #include "net.h" > >> #include "qdev.h" > >> +#include "qerror.h" > >> > >> void *qdev_get_prop_ptr(DeviceState *dev, Property *prop) > >> { > >> diff --git a/monitor.c b/monitor.c > >> index 0448a70..822dc27 100644 > >> --- a/monitor.c > >> +++ b/monitor.c > >> @@ -49,10 +49,8 @@ > >> #include "qint.h" > >> #include "qfloat.h" > >> #include "qlist.h" > >> -#include "qdict.h" > >> #include "qbool.h" > >> #include "qstring.h" > >> -#include "qerror.h" > >> #include "qjson.h" > >> #include "json-streamer.h" > >> #include "json-parser.h" > >> diff --git a/sysemu.h b/sysemu.h > >> index 8a9c630..9d3d51d 100644 > > > > Hmm, why this second hunk? Also note that we have qemu-objects.h. > > The one below or the one above? The one above, but I believe it's because monitor.h includes them, right? This is fine. > What do you mean by "we have qemu-objects.h"? That header includes all QObject header files, so if you want do some cleanup you could include it and drop all q-ones. > > >> --- a/sysemu.h > >> +++ b/sysemu.h > >> @@ -6,8 +6,6 @@ > >> #include "qemu-option.h" > >> #include "qemu-queue.h" > >> #include "qemu-timer.h" > >> -#include "qdict.h" > >> -#include "qerror.h" > >> > >> #ifdef _WIN32 > >> #include