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