From patchwork Tue Apr 2 16:10:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 233092 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id E06452C009E for ; Wed, 3 Apr 2013 03:12:51 +1100 (EST) Received: from localhost ([::1]:58624 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UN3pK-0005Z1-1F for incoming@patchwork.ozlabs.org; Tue, 02 Apr 2013 12:12:50 -0400 Received: from eggs.gnu.org ([208.118.235.92]:58127) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UN3p2-0005RC-D3 for qemu-devel@nongnu.org; Tue, 02 Apr 2013 12:12:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UN3oy-0004lv-2l for qemu-devel@nongnu.org; Tue, 02 Apr 2013 12:12:32 -0400 Received: from 1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.d.1.0.0.b.8.0.1.0.0.2.ip6.arpa ([2001:8b0:1d0::1]:33347 helo=mnementh.archaic.org.uk) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UN3ox-0004lh-Ne for qemu-devel@nongnu.org; Tue, 02 Apr 2013 12:12:27 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1UN3nJ-0004nU-5c; Tue, 02 Apr 2013 17:10:45 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Date: Tue, 2 Apr 2013 17:10:44 +0100 Message-Id: <1364919044-18413-3-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1364919044-18413-1-git-send-email-peter.maydell@linaro.org> References: <1364919044-18413-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:8b0:1d0::1 Cc: Anthony Liguori , David Gibson , patches@linaro.org Subject: [Qemu-devel] [PATCH 2/2] qdev: Drop taddr properties X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Drop all the infrastructure for taddr properties (ie ones which are 'hwaddr' sized). These are now unused, and any further desired use would be rather questionable since device properties shouldn't generally depend on a type that is conceptually variable based on the target CPU. 32 or 64 bit integer properties should be used instead as appropriate for the specific device. Signed-off-by: Peter Maydell --- hw/Makefile.objs | 1 - hw/fdc.c | 1 - hw/milkymist-hw.h | 1 - hw/milkymist-minimac2.c | 1 - hw/qdev-addr.c | 78 ------------------------------------------------- hw/qdev-addr.h | 10 ------- hw/sm501.c | 1 - hw/sparc/sun4m.c | 1 - hw/tcx.c | 1 - hw/xilinx_axidma.c | 1 - 10 files changed, 96 deletions(-) delete mode 100644 hw/qdev-addr.c delete mode 100644 hw/qdev-addr.h diff --git a/hw/Makefile.objs b/hw/Makefile.objs index d0b2ecb..bee5736 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -134,7 +134,6 @@ common-obj-$(CONFIG_ESP) += esp.o common-obj-$(CONFIG_ESP_PCI) += esp-pci.o common-obj-y += sysbus.o isa-bus.o -common-obj-y += qdev-addr.o # VGA common-obj-$(CONFIG_VGA_PCI) += vga-pci.o diff --git a/hw/fdc.c b/hw/fdc.c index a4bb129..3220538 100644 --- a/hw/fdc.c +++ b/hw/fdc.c @@ -33,7 +33,6 @@ #include "qemu/timer.h" #include "hw/isa.h" #include "hw/sysbus.h" -#include "hw/qdev-addr.h" #include "sysemu/blockdev.h" #include "sysemu/sysemu.h" #include "qemu/log.h" diff --git a/hw/milkymist-hw.h b/hw/milkymist-hw.h index 4e86c4e..5317ce6 100644 --- a/hw/milkymist-hw.h +++ b/hw/milkymist-hw.h @@ -2,7 +2,6 @@ #define QEMU_HW_MILKYMIST_H #include "hw/qdev.h" -#include "hw/qdev-addr.h" #include "net/net.h" static inline DeviceState *milkymist_uart_create(hwaddr base, diff --git a/hw/milkymist-minimac2.c b/hw/milkymist-minimac2.c index 29618e8..4ef6318 100644 --- a/hw/milkymist-minimac2.c +++ b/hw/milkymist-minimac2.c @@ -27,7 +27,6 @@ #include "trace.h" #include "net/net.h" #include "qemu/error-report.h" -#include "hw/qdev-addr.h" #include diff --git a/hw/qdev-addr.c b/hw/qdev-addr.c deleted file mode 100644 index 80a38bb..0000000 --- a/hw/qdev-addr.c +++ /dev/null @@ -1,78 +0,0 @@ -#include "hw/qdev.h" -#include "hw/qdev-addr.h" -#include "exec/hwaddr.h" -#include "qapi/qmp/qerror.h" -#include "qapi/visitor.h" - -/* --- target physical address --- */ - -static int parse_taddr(DeviceState *dev, Property *prop, const char *str) -{ - hwaddr *ptr = qdev_get_prop_ptr(dev, prop); - - *ptr = strtoull(str, NULL, 16); - return 0; -} - -static int print_taddr(DeviceState *dev, Property *prop, char *dest, size_t len) -{ - hwaddr *ptr = qdev_get_prop_ptr(dev, prop); - return snprintf(dest, len, "0x" TARGET_FMT_plx, *ptr); -} - -static void get_taddr(Object *obj, Visitor *v, void *opaque, - const char *name, Error **errp) -{ - DeviceState *dev = DEVICE(obj); - Property *prop = opaque; - hwaddr *ptr = qdev_get_prop_ptr(dev, prop); - int64_t value; - - value = *ptr; - visit_type_int64(v, &value, name, errp); -} - -static void set_taddr(Object *obj, Visitor *v, void *opaque, - const char *name, Error **errp) -{ - DeviceState *dev = DEVICE(obj); - Property *prop = opaque; - hwaddr *ptr = qdev_get_prop_ptr(dev, prop); - Error *local_err = NULL; - int64_t value; - - if (dev->realized) { - qdev_prop_set_after_realize(dev, name, errp); - return; - } - - visit_type_int64(v, &value, name, &local_err); - if (local_err) { - error_propagate(errp, local_err); - return; - } - if ((uint64_t)value <= (uint64_t) ~(hwaddr)0) { - *ptr = value; - } else { - error_set(errp, QERR_PROPERTY_VALUE_OUT_OF_RANGE, - dev->id?:"", name, value, (uint64_t) 0, - (uint64_t) ~(hwaddr)0); - } -} - - -PropertyInfo qdev_prop_taddr = { - .name = "taddr", - .parse = parse_taddr, - .print = print_taddr, - .get = get_taddr, - .set = set_taddr, -}; - -void qdev_prop_set_taddr(DeviceState *dev, const char *name, hwaddr value) -{ - Error *errp = NULL; - object_property_set_int(OBJECT(dev), value, name, &errp); - assert(!errp); - -} diff --git a/hw/qdev-addr.h b/hw/qdev-addr.h deleted file mode 100644 index 79708e6..0000000 --- a/hw/qdev-addr.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef HW_QDEV_ADDR_H -#define HW_QDEV_ADDR_H 1 - -#define DEFINE_PROP_TADDR(_n, _s, _f, _d) \ - DEFINE_PROP_DEFAULT(_n, _s, _f, _d, qdev_prop_taddr, hwaddr) - -extern PropertyInfo qdev_prop_taddr; -void qdev_prop_set_taddr(DeviceState *dev, const char *name, hwaddr value); - -#endif diff --git a/hw/sm501.c b/hw/sm501.c index 0ef6b8a..5f89fb2 100644 --- a/hw/sm501.c +++ b/hw/sm501.c @@ -28,7 +28,6 @@ #include "ui/console.h" #include "hw/devices.h" #include "hw/sysbus.h" -#include "hw/qdev-addr.h" #include "qemu/range.h" #include "ui/pixel_ops.h" diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c index 9ebda02..fc282e2 100644 --- a/hw/sparc/sun4m.c +++ b/hw/sparc/sun4m.c @@ -37,7 +37,6 @@ #include "hw/fw_cfg.h" #include "hw/escc.h" #include "hw/empty_slot.h" -#include "hw/qdev-addr.h" #include "hw/loader.h" #include "elf.h" #include "sysemu/blockdev.h" diff --git a/hw/tcx.c b/hw/tcx.c index c44068e..55abaee 100644 --- a/hw/tcx.c +++ b/hw/tcx.c @@ -26,7 +26,6 @@ #include "ui/console.h" #include "ui/pixel_ops.h" #include "hw/sysbus.h" -#include "hw/qdev-addr.h" #define MAXX 1024 #define MAXY 768 diff --git a/hw/xilinx_axidma.c b/hw/xilinx_axidma.c index 8db1a74..997b06e 100644 --- a/hw/xilinx_axidma.c +++ b/hw/xilinx_axidma.c @@ -26,7 +26,6 @@ #include "qemu/timer.h" #include "hw/ptimer.h" #include "qemu/log.h" -#include "hw/qdev-addr.h" #include "hw/stream.h"