target_phys_addr_t is unwieldly, violates the C standard (_t suffixes are
reserved) and its purpose doesn't match the name (most target_phys_addr_t
addresses are not target specific).  Replace it with a finger-friendly,
standards conformant hwaddr.
Outstanding patchsets can be fixed up with the command
  git rebase -i --exec 'find -name "*.[ch]"
                        | xargs s/target_phys_addr_t/hwaddr/g' origin
Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
		
	
			
		
			
				
	
	
		
			77 lines
		
	
	
		
			1.9 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			77 lines
		
	
	
		
			1.9 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
#include "qdev.h"
 | 
						|
#include "qdev-addr.h"
 | 
						|
#include "hwaddr.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->state != DEV_STATE_CREATED) {
 | 
						|
        error_set(errp, QERR_PERMISSION_DENIED);
 | 
						|
        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);
 | 
						|
 | 
						|
}
 |