From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42274) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3i4h-0002OA-Aq for qemu-devel@nongnu.org; Mon, 29 Jul 2013 03:41:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V3i4b-0007xL-B8 for qemu-devel@nongnu.org; Mon, 29 Jul 2013 03:40:59 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38208) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V3i4a-0007xA-Me for qemu-devel@nongnu.org; Mon, 29 Jul 2013 03:40:53 -0400 Date: Mon, 29 Jul 2013 10:42:15 +0300 From: "Michael S. Tsirkin" Message-ID: <20130729074215.GD2308@redhat.com> References: <1375081655-28541-1-git-send-email-marcel.a@redhat.com> <1375081655-28541-2-git-send-email-marcel.a@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1375081655-28541-2-git-send-email-marcel.a@redhat.com> Subject: Re: [Qemu-devel] [PATCH v2 1/3] hw: import bitmap operations in qdev-core header List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Marcel Apfelbaum Cc: pbonzini@redhat.com, aliguori@us.ibm.com, qemu-devel@nongnu.org, afaerber@suse.de On Mon, Jul 29, 2013 at 10:07:33AM +0300, Marcel Apfelbaum wrote: > Made small tweaks in code to prevent compilation issues > when importing qemu/bitmap.h in qdev-core > > Signed-off-by: Marcel Apfelbaum > --- > hw/core/qdev-properties.c | 4 ++-- > hw/net/eepro100.c | 1 - > include/hw/qdev-core.h | 1 + > 3 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c > index 3a324fb..01b27eb 100644 > --- a/hw/core/qdev-properties.c > +++ b/hw/core/qdev-properties.c > @@ -91,7 +91,7 @@ static void get_bit(Object *obj, Visitor *v, void *opaque, > visit_type_bool(v, &value, name, errp); > } > > -static void set_bit(Object *obj, Visitor *v, void *opaque, > +static void prop_set_bit(Object *obj, Visitor *v, void *opaque, > const char *name, Error **errp) > { > DeviceState *dev = DEVICE(obj); > @@ -117,7 +117,7 @@ PropertyInfo qdev_prop_bit = { > .legacy_name = "on/off", > .print = print_bit, > .get = get_bit, > - .set = set_bit, > + .set = prop_set_bit, > }; > > /* --- bool --- */ Other code uses qdev_prop prefix, which makes sense I think. Let's also update get_bit and print_bit, keep it consistent. > diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c > index e0befb2..3dc4937 100644 > --- a/hw/net/eepro100.c > +++ b/hw/net/eepro100.c > @@ -105,7 +105,6 @@ > #define PCI_IO_SIZE 64 > #define PCI_FLASH_SIZE (128 * KiB) > > -#define BIT(n) (1 << (n)) > #define BITS(n, m) (((0xffffffffU << (31 - n)) >> (31 - n + m)) << m) > > /* The SCB accepts the following controls for the Tx and Rx units: */ Please #include "qemu/bitops.h" - don't rely on other headers pulling it in. > diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h > index 7fbffcb..e8b89b1 100644 > --- a/include/hw/qdev-core.h > +++ b/include/hw/qdev-core.h > @@ -4,6 +4,7 @@ > #include "qemu/queue.h" > #include "qemu/option.h" > #include "qemu/typedefs.h" > +#include "qemu/bitmap.h" > #include "qom/object.h" > #include "hw/irq.h" > #include "qapi/error.h" > -- > 1.8.3.1