On Tue, Apr 17, 2012 at 03:32:38PM +0300, Dmitry Fleytman wrote: > From: Dmitry Fleytman <dmi...@daynix.com> > > Signed-off-by: Dmitry Fleytman <dmi...@daynix.com> > Signed-off-by: Yan Vugenfirer <y...@daynix.com>
I can easily see how different vmware devices would share some code. However: > --- > hw/vmware_utils.h | 126 > +++++++++++++++++++++++++++++++++++++++++++++++++++++ > 1 files changed, 126 insertions(+), 0 deletions(-) > create mode 100644 hw/vmware_utils.h > > diff --git a/hw/vmware_utils.h b/hw/vmware_utils.h > new file mode 100644 > index 0000000..0d261c0 > --- /dev/null > +++ b/hw/vmware_utils.h > @@ -0,0 +1,126 @@ > +/* > + * QEMU VMWARE paravirtual devices - auxiliary code > + * > + * Copyright (c) 2012 Ravello Systems LTD (http://ravellosystems.com) > + * > + * Developed by Daynix Computing LTD (http://www.daynix.com) > + * > + * Authors: > + * Dmitry Fleytman <dmi...@daynix.com> > + * Yan Vugenfirer <y...@daynix.com> > + * > + * This work is licensed under the terms of the GNU GPL, version 2 or later. > + * See the COPYING file in the top-level directory. > + * > + */ > + > +#ifndef VMWARE_UTILS_H > +#define VMWARE_UTILS_H > + > +#ifndef VMW_SHPRN > +#define VMW_SHPRN(fmt, ...) do {} while (0) > +#endif > + > +/* Shared memory access functions with byte swap support */ > +static inline void > +vmw_shmem_read(target_phys_addr_t addr, void *buf, int len) > +{ > + VMW_SHPRN("SHMEM r: %" PRIx64 ", len: %d to %p", addr, len, buf); > + cpu_physical_memory_read(addr, buf, len); > +} > + > +static inline void > +vmw_shmem_write(target_phys_addr_t addr, void *buf, int len) > +{ > + VMW_SHPRN("SHMEM w: %" PRIx64 ", len: %d to %p", addr, len, buf); > + cpu_physical_memory_write(addr, buf, len); > +} > + > +static inline void > +vmw_shmem_rw(target_phys_addr_t addr, void *buf, int len, int is_write) > +{ > + VMW_SHPRN("SHMEM r/w: %" PRIx64 ", len: %d (to %p), is write: %d", > + addr, len, buf, is_write); > + > + cpu_physical_memory_rw(addr, buf, len, is_write); > +} > + > +static inline void > +vmw_shmem_set(target_phys_addr_t addr, uint8 val, int len) > +{ > + int i; > + VMW_SHPRN("SHMEM set: %" PRIx64 ", len: %d (value 0x%X)", addr, len, > val); > + > + for (i = 0; i < len; i++) { > + cpu_physical_memory_write(addr + i, &val, 1); > + } > +} > + > +static inline uint32_t > +vmw_shmem_ld8(target_phys_addr_t addr) > +{ > + uint8_t res = ldub_phys(addr); > + VMW_SHPRN("SHMEM load8: %" PRIx64 " (value 0x%X)", addr, res); > + return res; > +} > + > +static inline void > +vmw_shmem_st8(target_phys_addr_t addr, uint8_t value) > +{ > + VMW_SHPRN("SHMEM store8: %" PRIx64 " (value 0x%X)", addr, value); > + stb_phys(addr, value); > +} > + > +static inline uint32_t > +vmw_shmem_ld16(target_phys_addr_t addr) > +{ > + uint16_t res = lduw_le_phys(addr); > + VMW_SHPRN("SHMEM load16: %" PRIx64 " (value 0x%X)", addr, res); > + return res; > +} > + > +static inline void > +vmw_shmem_st16(target_phys_addr_t addr, uint16_t value) > +{ > + VMW_SHPRN("SHMEM store16: %" PRIx64 " (value 0x%X)", addr, value); > + stw_le_phys(addr, value); > +} > + > +static inline uint32_t > +vmw_shmem_ld32(target_phys_addr_t addr) > +{ > + uint32_t res = ldl_le_phys(addr); > + VMW_SHPRN("SHMEM load32: %" PRIx64 " (value 0x%X)", addr, res); > + return res; > +} > + > +static inline void > +vmw_shmem_st32(target_phys_addr_t addr, uint32_t value) > +{ > + VMW_SHPRN("SHMEM store32: %" PRIx64 " (value 0x%X)", addr, value); > + stl_le_phys(addr, value); > +} > + > +static inline uint64_t > +vmw_shmem_ld64(target_phys_addr_t addr) > +{ > + uint64_t res = ldq_le_phys(addr); > + VMW_SHPRN("SHMEM load64: %" PRIx64 " (value %" PRIx64 ")", addr, res); > + return res; > +} > + > +static inline void > +vmw_shmem_st64(target_phys_addr_t addr, uint64_t value) > +{ > + VMW_SHPRN("SHMEM store64: %" PRIx64 " (value %" PRIx64 ")", addr, value); > + stq_le_phys(addr, value); > +} > + Pls remove these wrappers. These are just memory stores. Our codebase is too large as it is without every driver wrapping all standard calls. > +/* MACROS for simplification of operations on array-style registers */ UPPERCASE ABUSE > +#define IS_MULTIREG_ADDR(addr, base, cnt, regsize) \ > + (((addr + 1) > (base)) && ((addr) < (base) + (cnt) * (regsize))) Same as range_covers_byte(base, cnt * regsize, addr)? > + > +#define MULTIREG_IDX_BY_ADDR(addr, base, regsize) \ > + (((addr) - (base)) / (regsize)) > + Above two macros is all that's left. No objection but it does not say what they do - want to add minimal documentation? And please prefix with VMWARE_ or something. > +#endif > -- > 1.7.7.6
