| From 7d299e618bd3833b3874619d7b9b18b65dcc63e2 Mon Sep 17 00:00:00 2001 |
| From: Kevin Wolf <kwolf@redhat.com> |
| Date: Wed, 6 Nov 2013 14:41:07 +0100 |
| Subject: [PATCH 31/81] hw: import bitmap operations in qdev-core header |
| |
| RH-Author: Kevin Wolf <kwolf@redhat.com> |
| Message-id: <1383748882-22831-3-git-send-email-kwolf@redhat.com> |
| Patchwork-id: 55528 |
| O-Subject: [RHEL-7.0 qemu-kvm PATCH v2 02/17] hw: import bitmap operations in qdev-core header |
| Bugzilla: 1001216 |
| RH-Acked-by: Marcel Apfelbaum <marcel.a@redhat.com> |
| RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com> |
| RH-Acked-by: Kevin Wolf <kwolf@redhat.com> |
| RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com> |
| |
| From: Marcel Apfelbaum <marcel.a@redhat.com> |
| |
| Made small tweaks in code to prevent compilation issues |
| when importing qemu/bitmap.h in qdev-core |
| |
| Signed-off-by: Marcel Apfelbaum <marcel.a@redhat.com> |
| Message-id: 1375107465-25767-2-git-send-email-marcel.a@redhat.com |
| Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> |
| (cherry picked from commit 949fc82314cc84162e64a5323764527a542421ce) |
| Signed-off-by: Markus Armbruster <armbru@redhat.com> |
| Signed-off-by: Kevin Wolf <kwolf@redhat.com> |
| |
| hw/core/qdev-properties.c | 13 +++++++------ |
| hw/net/eepro100.c | 2 +- |
| include/hw/qdev-core.h | 1 + |
| 3 files changed, 9 insertions(+), 7 deletions(-) |
| |
| Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com> |
| |
| hw/core/qdev-properties.c | 13 +++++++------ |
| hw/net/eepro100.c | 2 +- |
| include/hw/qdev-core.h | 1 + |
| 3 files changed, 9 insertions(+), 7 deletions(-) |
| |
| diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c |
| index 3a324fb..6e1ed1e 100644 |
| |
| |
| @@ -74,13 +74,14 @@ static void bit_prop_set(DeviceState *dev, Property *props, bool val) |
| } |
| } |
| |
| -static int print_bit(DeviceState *dev, Property *prop, char *dest, size_t len) |
| +static int prop_print_bit(DeviceState *dev, Property *prop, char *dest, |
| + size_t len) |
| { |
| uint32_t *p = qdev_get_prop_ptr(dev, prop); |
| return snprintf(dest, len, (*p & qdev_get_prop_mask(prop)) ? "on" : "off"); |
| } |
| |
| -static void get_bit(Object *obj, Visitor *v, void *opaque, |
| +static void prop_get_bit(Object *obj, Visitor *v, void *opaque, |
| const char *name, Error **errp) |
| { |
| DeviceState *dev = DEVICE(obj); |
| @@ -91,7 +92,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); |
| @@ -115,9 +116,9 @@ static void set_bit(Object *obj, Visitor *v, void *opaque, |
| PropertyInfo qdev_prop_bit = { |
| .name = "boolean", |
| .legacy_name = "on/off", |
| - .print = print_bit, |
| - .get = get_bit, |
| - .set = set_bit, |
| + .print = prop_print_bit, |
| + .get = prop_get_bit, |
| + .set = prop_set_bit, |
| }; |
| |
| /* --- bool --- */ |
| diff --git a/hw/net/eepro100.c b/hw/net/eepro100.c |
| index dc99ea6..b69cc60 100644 |
| |
| |
| @@ -47,6 +47,7 @@ |
| #include "hw/nvram/eeprom93xx.h" |
| #include "sysemu/sysemu.h" |
| #include "sysemu/dma.h" |
| +#include "qemu/bitops.h" |
| |
| /* QEMU sends frames smaller than 60 bytes to ethernet nics. |
| * Such frames are rejected by real nics and their emulations. |
| @@ -105,7 +106,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: */ |
| diff --git a/include/hw/qdev-core.h b/include/hw/qdev-core.h |
| index cf83d54..9d995bf 100644 |
| |
| |
| @@ -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.7.1 |
| |