mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-07-08 20:17:27 +00:00
coccinelle: Remove unnecessary variables for function return value
Use Coccinelle script to replace 'ret = E; return ret' with 'return E'. The script will do the substitution only when the function return type and variable type are the same. Manual fixups: * audio/audio.c: coding style of "read (...)" and "write (...)" * block/qcow2-cluster.c: wrap line to make it shorter * block/qcow2-refcount.c: change indentation of wrapped line * target-tricore/op_helper.c: fix coding style of "remainder|quotient" * target-mips/dsp_helper.c: reverted changes because I don't want to argue about checkpatch.pl * ui/qemu-pixman.c: fix line indentation * block/rbd.c: restore blank line between declarations and statements Reviewed-by: Eric Blake <eblake@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Message-Id: <1465855078-19435-4-git-send-email-ehabkost@redhat.com> Reviewed-by: Markus Armbruster <armbru@redhat.com> [Unused Coccinelle rule name dropped along with a redundant comment; whitespace touched up in block/qcow2-cluster.c; stale commit message paragraph deleted] Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
parent
6b62d96137
commit
9be385980d
|
@ -1131,8 +1131,6 @@ static void audio_timer (void *opaque)
|
||||||
*/
|
*/
|
||||||
int AUD_write (SWVoiceOut *sw, void *buf, int size)
|
int AUD_write (SWVoiceOut *sw, void *buf, int size)
|
||||||
{
|
{
|
||||||
int bytes;
|
|
||||||
|
|
||||||
if (!sw) {
|
if (!sw) {
|
||||||
/* XXX: Consider options */
|
/* XXX: Consider options */
|
||||||
return size;
|
return size;
|
||||||
|
@ -1143,14 +1141,11 @@ int AUD_write (SWVoiceOut *sw, void *buf, int size)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
bytes = sw->hw->pcm_ops->write (sw, buf, size);
|
return sw->hw->pcm_ops->write(sw, buf, size);
|
||||||
return bytes;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int AUD_read (SWVoiceIn *sw, void *buf, int size)
|
int AUD_read (SWVoiceIn *sw, void *buf, int size)
|
||||||
{
|
{
|
||||||
int bytes;
|
|
||||||
|
|
||||||
if (!sw) {
|
if (!sw) {
|
||||||
/* XXX: Consider options */
|
/* XXX: Consider options */
|
||||||
return size;
|
return size;
|
||||||
|
@ -1161,8 +1156,7 @@ int AUD_read (SWVoiceIn *sw, void *buf, int size)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
bytes = sw->hw->pcm_ops->read (sw, buf, size);
|
return sw->hw->pcm_ops->read(sw, buf, size);
|
||||||
return bytes;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int AUD_get_buffer_size_out (SWVoiceOut *sw)
|
int AUD_get_buffer_size_out (SWVoiceOut *sw)
|
||||||
|
|
|
@ -974,11 +974,9 @@ err_exit2:
|
||||||
|
|
||||||
static int64_t qemu_archipelago_getlength(BlockDriverState *bs)
|
static int64_t qemu_archipelago_getlength(BlockDriverState *bs)
|
||||||
{
|
{
|
||||||
int64_t ret;
|
|
||||||
BDRVArchipelagoState *s = bs->opaque;
|
BDRVArchipelagoState *s = bs->opaque;
|
||||||
|
|
||||||
ret = archipelago_volume_info(s);
|
return archipelago_volume_info(s);
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int qemu_archipelago_truncate(BlockDriverState *bs, int64_t offset)
|
static int qemu_archipelago_truncate(BlockDriverState *bs, int64_t offset)
|
||||||
|
|
|
@ -154,11 +154,9 @@ static int l2_load(BlockDriverState *bs, uint64_t l2_offset,
|
||||||
uint64_t **l2_table)
|
uint64_t **l2_table)
|
||||||
{
|
{
|
||||||
BDRVQcow2State *s = bs->opaque;
|
BDRVQcow2State *s = bs->opaque;
|
||||||
int ret;
|
|
||||||
|
|
||||||
ret = qcow2_cache_get(bs, s->l2_table_cache, l2_offset, (void**) l2_table);
|
return qcow2_cache_get(bs, s->l2_table_cache, l2_offset,
|
||||||
|
(void **)l2_table);
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -218,13 +218,10 @@ static int load_refcount_block(BlockDriverState *bs,
|
||||||
void **refcount_block)
|
void **refcount_block)
|
||||||
{
|
{
|
||||||
BDRVQcow2State *s = bs->opaque;
|
BDRVQcow2State *s = bs->opaque;
|
||||||
int ret;
|
|
||||||
|
|
||||||
BLKDBG_EVENT(bs->file, BLKDBG_REFBLOCK_LOAD);
|
BLKDBG_EVENT(bs->file, BLKDBG_REFBLOCK_LOAD);
|
||||||
ret = qcow2_cache_get(bs, s->refcount_block_cache, refcount_block_offset,
|
return qcow2_cache_get(bs, s->refcount_block_cache, refcount_block_offset,
|
||||||
refcount_block);
|
refcount_block);
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -582,11 +582,9 @@ static int raw_open(BlockDriverState *bs, QDict *options, int flags,
|
||||||
Error **errp)
|
Error **errp)
|
||||||
{
|
{
|
||||||
BDRVRawState *s = bs->opaque;
|
BDRVRawState *s = bs->opaque;
|
||||||
int ret;
|
|
||||||
|
|
||||||
s->type = FTYPE_FILE;
|
s->type = FTYPE_FILE;
|
||||||
ret = raw_open_common(bs, options, flags, 0, errp);
|
return raw_open_common(bs, options, flags, 0, errp);
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int raw_reopen_prepare(BDRVReopenState *state,
|
static int raw_reopen_prepare(BDRVReopenState *state,
|
||||||
|
@ -2437,13 +2435,11 @@ static int cdrom_open(BlockDriverState *bs, QDict *options, int flags,
|
||||||
Error **errp)
|
Error **errp)
|
||||||
{
|
{
|
||||||
BDRVRawState *s = bs->opaque;
|
BDRVRawState *s = bs->opaque;
|
||||||
int ret;
|
|
||||||
|
|
||||||
s->type = FTYPE_CD;
|
s->type = FTYPE_CD;
|
||||||
|
|
||||||
/* open will not fail even if no CD is inserted, so add O_NONBLOCK */
|
/* open will not fail even if no CD is inserted, so add O_NONBLOCK */
|
||||||
ret = raw_open_common(bs, options, flags, O_NONBLOCK, errp);
|
return raw_open_common(bs, options, flags, O_NONBLOCK, errp);
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int cdrom_probe_device(const char *filename)
|
static int cdrom_probe_device(const char *filename)
|
||||||
|
|
|
@ -190,10 +190,7 @@ static int raw_has_zero_init(BlockDriverState *bs)
|
||||||
|
|
||||||
static int raw_create(const char *filename, QemuOpts *opts, Error **errp)
|
static int raw_create(const char *filename, QemuOpts *opts, Error **errp)
|
||||||
{
|
{
|
||||||
int ret;
|
return bdrv_create_file(filename, opts, errp);
|
||||||
|
|
||||||
ret = bdrv_create_file(filename, opts, errp);
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int raw_open(BlockDriverState *bs, QDict *options, int flags,
|
static int raw_open(BlockDriverState *bs, QDict *options, int flags,
|
||||||
|
|
|
@ -883,10 +883,8 @@ static int qemu_rbd_snap_rollback(BlockDriverState *bs,
|
||||||
const char *snapshot_name)
|
const char *snapshot_name)
|
||||||
{
|
{
|
||||||
BDRVRBDState *s = bs->opaque;
|
BDRVRBDState *s = bs->opaque;
|
||||||
int r;
|
|
||||||
|
|
||||||
r = rbd_snap_rollback(s->image, snapshot_name);
|
return rbd_snap_rollback(s->image, snapshot_name);
|
||||||
return r;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int qemu_rbd_snap_list(BlockDriverState *bs,
|
static int qemu_rbd_snap_list(BlockDriverState *bs,
|
||||||
|
|
|
@ -1260,15 +1260,13 @@ static VmdkExtent *find_extent(BDRVVmdkState *s,
|
||||||
static inline uint64_t vmdk_find_offset_in_cluster(VmdkExtent *extent,
|
static inline uint64_t vmdk_find_offset_in_cluster(VmdkExtent *extent,
|
||||||
int64_t offset)
|
int64_t offset)
|
||||||
{
|
{
|
||||||
uint64_t offset_in_cluster, extent_begin_offset, extent_relative_offset;
|
uint64_t extent_begin_offset, extent_relative_offset;
|
||||||
uint64_t cluster_size = extent->cluster_sectors * BDRV_SECTOR_SIZE;
|
uint64_t cluster_size = extent->cluster_sectors * BDRV_SECTOR_SIZE;
|
||||||
|
|
||||||
extent_begin_offset =
|
extent_begin_offset =
|
||||||
(extent->end_sector - extent->sectors) * BDRV_SECTOR_SIZE;
|
(extent->end_sector - extent->sectors) * BDRV_SECTOR_SIZE;
|
||||||
extent_relative_offset = offset - extent_begin_offset;
|
extent_relative_offset = offset - extent_begin_offset;
|
||||||
offset_in_cluster = extent_relative_offset % cluster_size;
|
return extent_relative_offset % cluster_size;
|
||||||
|
|
||||||
return offset_in_cluster;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline uint64_t vmdk_find_index_in_cluster(VmdkExtent *extent,
|
static inline uint64_t vmdk_find_index_in_cluster(VmdkExtent *extent,
|
||||||
|
|
|
@ -114,15 +114,12 @@ static inline int array_ensure_allocated(array_t* array, int index)
|
||||||
|
|
||||||
static inline void* array_get_next(array_t* array) {
|
static inline void* array_get_next(array_t* array) {
|
||||||
unsigned int next = array->next;
|
unsigned int next = array->next;
|
||||||
void* result;
|
|
||||||
|
|
||||||
if (array_ensure_allocated(array, next) < 0)
|
if (array_ensure_allocated(array, next) < 0)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
array->next = next + 1;
|
array->next = next + 1;
|
||||||
result = array_get(array, next);
|
return array_get(array, next);
|
||||||
|
|
||||||
return result;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void* array_insert(array_t* array,unsigned int index,unsigned int count) {
|
static inline void* array_insert(array_t* array,unsigned int index,unsigned int count) {
|
||||||
|
|
|
@ -324,12 +324,9 @@ static void aml_free(gpointer data, gpointer user_data)
|
||||||
|
|
||||||
Aml *init_aml_allocator(void)
|
Aml *init_aml_allocator(void)
|
||||||
{
|
{
|
||||||
Aml *var;
|
|
||||||
|
|
||||||
assert(!alloc_list);
|
assert(!alloc_list);
|
||||||
alloc_list = g_ptr_array_new();
|
alloc_list = g_ptr_array_new();
|
||||||
var = aml_alloc();
|
return aml_alloc();
|
||||||
return var;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void free_aml_allocator(void)
|
void free_aml_allocator(void)
|
||||||
|
@ -451,12 +448,10 @@ Aml *aml_name_decl(const char *name, Aml *val)
|
||||||
/* ACPI 1.0b: 16.2.6.1 Arg Objects Encoding */
|
/* ACPI 1.0b: 16.2.6.1 Arg Objects Encoding */
|
||||||
Aml *aml_arg(int pos)
|
Aml *aml_arg(int pos)
|
||||||
{
|
{
|
||||||
Aml *var;
|
|
||||||
uint8_t op = 0x68 /* ARG0 op */ + pos;
|
uint8_t op = 0x68 /* ARG0 op */ + pos;
|
||||||
|
|
||||||
assert(pos <= 6);
|
assert(pos <= 6);
|
||||||
var = aml_opcode(op);
|
return aml_opcode(op);
|
||||||
return var;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ACPI 2.0a: 17.2.4.4 Type 2 Opcodes Encoding: DefToInteger */
|
/* ACPI 2.0a: 17.2.4.4 Type 2 Opcodes Encoding: DefToInteger */
|
||||||
|
@ -1082,12 +1077,10 @@ Aml *aml_string(const char *name_format, ...)
|
||||||
/* ACPI 1.0b: 16.2.6.2 Local Objects Encoding */
|
/* ACPI 1.0b: 16.2.6.2 Local Objects Encoding */
|
||||||
Aml *aml_local(int num)
|
Aml *aml_local(int num)
|
||||||
{
|
{
|
||||||
Aml *var;
|
|
||||||
uint8_t op = 0x60 /* Local0Op */ + num;
|
uint8_t op = 0x60 /* Local0Op */ + num;
|
||||||
|
|
||||||
assert(num <= 7);
|
assert(num <= 7);
|
||||||
var = aml_opcode(op);
|
return aml_opcode(op);
|
||||||
return var;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ACPI 2.0a: 17.2.2 Data Objects Encoding: DefVarPackage */
|
/* ACPI 2.0a: 17.2.2 Data Objects Encoding: DefVarPackage */
|
||||||
|
|
|
@ -219,10 +219,7 @@ static void intel_hda_reset(DeviceState *dev);
|
||||||
|
|
||||||
static hwaddr intel_hda_addr(uint32_t lbase, uint32_t ubase)
|
static hwaddr intel_hda_addr(uint32_t lbase, uint32_t ubase)
|
||||||
{
|
{
|
||||||
hwaddr addr;
|
return ((uint64_t)ubase << 32) | lbase;
|
||||||
|
|
||||||
addr = ((uint64_t)ubase << 32) | lbase;
|
|
||||||
return addr;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void intel_hda_update_int_sts(IntelHDAState *d)
|
static void intel_hda_update_int_sts(IntelHDAState *d)
|
||||||
|
|
|
@ -700,9 +700,7 @@ static void vbe_update_vgaregs(VGACommonState *s)
|
||||||
static uint32_t vbe_ioport_read_index(void *opaque, uint32_t addr)
|
static uint32_t vbe_ioport_read_index(void *opaque, uint32_t addr)
|
||||||
{
|
{
|
||||||
VGACommonState *s = opaque;
|
VGACommonState *s = opaque;
|
||||||
uint32_t val;
|
return s->vbe_index;
|
||||||
val = s->vbe_index;
|
|
||||||
return val;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
uint32_t vbe_ioport_read_data(void *opaque, uint32_t addr)
|
uint32_t vbe_ioport_read_data(void *opaque, uint32_t addr)
|
||||||
|
|
|
@ -195,7 +195,7 @@ static int kvm_s390_register_io_adapter(S390FLICState *fs, uint32_t id,
|
||||||
.swap = swap,
|
.swap = swap,
|
||||||
};
|
};
|
||||||
KVMS390FLICState *flic = KVM_S390_FLIC(fs);
|
KVMS390FLICState *flic = KVM_S390_FLIC(fs);
|
||||||
int r, ret;
|
int r;
|
||||||
struct kvm_device_attr attr = {
|
struct kvm_device_attr attr = {
|
||||||
.group = KVM_DEV_FLIC_ADAPTER_REGISTER,
|
.group = KVM_DEV_FLIC_ADAPTER_REGISTER,
|
||||||
.addr = (uint64_t)&adapter,
|
.addr = (uint64_t)&adapter,
|
||||||
|
@ -208,8 +208,7 @@ static int kvm_s390_register_io_adapter(S390FLICState *fs, uint32_t id,
|
||||||
|
|
||||||
r = ioctl(flic->fd, KVM_SET_DEVICE_ATTR, &attr);
|
r = ioctl(flic->fd, KVM_SET_DEVICE_ATTR, &attr);
|
||||||
|
|
||||||
ret = r ? -errno : 0;
|
return r ? -errno : 0;
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int kvm_s390_io_adapter_map(S390FLICState *fs, uint32_t id,
|
static int kvm_s390_io_adapter_map(S390FLICState *fs, uint32_t id,
|
||||||
|
|
|
@ -62,12 +62,9 @@ typedef struct UNINState {
|
||||||
|
|
||||||
static int pci_unin_map_irq(PCIDevice *pci_dev, int irq_num)
|
static int pci_unin_map_irq(PCIDevice *pci_dev, int irq_num)
|
||||||
{
|
{
|
||||||
int retval;
|
|
||||||
int devfn = pci_dev->devfn & 0x00FFFFFF;
|
int devfn = pci_dev->devfn & 0x00FFFFFF;
|
||||||
|
|
||||||
retval = (((devfn >> 11) & 0x1F) + irq_num) & 3;
|
return (((devfn >> 11) & 0x1F) + irq_num) & 3;
|
||||||
|
|
||||||
return retval;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void pci_unin_set_irq(void *opaque, int irq_num, int level)
|
static void pci_unin_set_irq(void *opaque, int irq_num, int level)
|
||||||
|
|
|
@ -57,12 +57,9 @@ static char *spapr_vio_get_dev_name(DeviceState *qdev)
|
||||||
{
|
{
|
||||||
VIOsPAPRDevice *dev = VIO_SPAPR_DEVICE(qdev);
|
VIOsPAPRDevice *dev = VIO_SPAPR_DEVICE(qdev);
|
||||||
VIOsPAPRDeviceClass *pc = VIO_SPAPR_DEVICE_GET_CLASS(dev);
|
VIOsPAPRDeviceClass *pc = VIO_SPAPR_DEVICE_GET_CLASS(dev);
|
||||||
char *name;
|
|
||||||
|
|
||||||
/* Device tree style name device@reg */
|
/* Device tree style name device@reg */
|
||||||
name = g_strdup_printf("%s@%x", pc->dt_name, dev->reg);
|
return g_strdup_printf("%s@%x", pc->dt_name, dev->reg);
|
||||||
|
|
||||||
return name;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void spapr_vio_bus_class_init(ObjectClass *klass, void *data)
|
static void spapr_vio_bus_class_init(ObjectClass *klass, void *data)
|
||||||
|
|
|
@ -410,17 +410,14 @@ static void megasas_encode_lba(uint8_t *cdb, uint64_t lba,
|
||||||
static uint64_t megasas_fw_time(void)
|
static uint64_t megasas_fw_time(void)
|
||||||
{
|
{
|
||||||
struct tm curtime;
|
struct tm curtime;
|
||||||
uint64_t bcd_time;
|
|
||||||
|
|
||||||
qemu_get_timedate(&curtime, 0);
|
qemu_get_timedate(&curtime, 0);
|
||||||
bcd_time = ((uint64_t)curtime.tm_sec & 0xff) << 48 |
|
return ((uint64_t)curtime.tm_sec & 0xff) << 48 |
|
||||||
((uint64_t)curtime.tm_min & 0xff) << 40 |
|
((uint64_t)curtime.tm_min & 0xff) << 40 |
|
||||||
((uint64_t)curtime.tm_hour & 0xff) << 32 |
|
((uint64_t)curtime.tm_hour & 0xff) << 32 |
|
||||||
((uint64_t)curtime.tm_mday & 0xff) << 24 |
|
((uint64_t)curtime.tm_mday & 0xff) << 24 |
|
||||||
((uint64_t)curtime.tm_mon & 0xff) << 16 |
|
((uint64_t)curtime.tm_mon & 0xff) << 16 |
|
||||||
((uint64_t)(curtime.tm_year + 1900) & 0xffff);
|
((uint64_t)(curtime.tm_year + 1900) & 0xffff);
|
||||||
|
|
||||||
return bcd_time;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -579,10 +579,7 @@ const SCSIReqOps scsi_generic_req_ops = {
|
||||||
static SCSIRequest *scsi_new_request(SCSIDevice *d, uint32_t tag, uint32_t lun,
|
static SCSIRequest *scsi_new_request(SCSIDevice *d, uint32_t tag, uint32_t lun,
|
||||||
uint8_t *buf, void *hba_private)
|
uint8_t *buf, void *hba_private)
|
||||||
{
|
{
|
||||||
SCSIRequest *req;
|
return scsi_req_alloc(&scsi_generic_req_ops, d, tag, lun, hba_private);
|
||||||
|
|
||||||
req = scsi_req_alloc(&scsi_generic_req_ops, d, tag, lun, hba_private);
|
|
||||||
return req;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static Property scsi_generic_properties[] = {
|
static Property scsi_generic_properties[] = {
|
||||||
|
|
|
@ -105,12 +105,10 @@ static inline bool rtc_running(RTCState *s)
|
||||||
|
|
||||||
static uint64_t get_guest_rtc_ns(RTCState *s)
|
static uint64_t get_guest_rtc_ns(RTCState *s)
|
||||||
{
|
{
|
||||||
uint64_t guest_rtc;
|
|
||||||
uint64_t guest_clock = qemu_clock_get_ns(rtc_clock);
|
uint64_t guest_clock = qemu_clock_get_ns(rtc_clock);
|
||||||
|
|
||||||
guest_rtc = s->base_rtc * NANOSECONDS_PER_SECOND +
|
return s->base_rtc * NANOSECONDS_PER_SECOND +
|
||||||
guest_clock - s->last_update + s->offset;
|
guest_clock - s->last_update + s->offset;
|
||||||
return guest_rtc;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef TARGET_I386
|
#ifdef TARGET_I386
|
||||||
|
|
|
@ -761,9 +761,7 @@ static int kvm_virtio_pci_irqfd_use(VirtIOPCIProxy *proxy,
|
||||||
VirtIODevice *vdev = virtio_bus_get_device(&proxy->bus);
|
VirtIODevice *vdev = virtio_bus_get_device(&proxy->bus);
|
||||||
VirtQueue *vq = virtio_get_queue(vdev, queue_no);
|
VirtQueue *vq = virtio_get_queue(vdev, queue_no);
|
||||||
EventNotifier *n = virtio_queue_get_guest_notifier(vq);
|
EventNotifier *n = virtio_queue_get_guest_notifier(vq);
|
||||||
int ret;
|
return kvm_irqchip_add_irqfd_notifier_gsi(kvm_state, n, NULL, irqfd->virq);
|
||||||
ret = kvm_irqchip_add_irqfd_notifier_gsi(kvm_state, n, NULL, irqfd->virq);
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void kvm_virtio_pci_irqfd_release(VirtIOPCIProxy *proxy,
|
static void kvm_virtio_pci_irqfd_release(VirtIOPCIProxy *proxy,
|
||||||
|
|
|
@ -195,7 +195,6 @@ int block_signals(void)
|
||||||
{
|
{
|
||||||
TaskState *ts = (TaskState *)thread_cpu->opaque;
|
TaskState *ts = (TaskState *)thread_cpu->opaque;
|
||||||
sigset_t set;
|
sigset_t set;
|
||||||
int pending;
|
|
||||||
|
|
||||||
/* It's OK to block everything including SIGSEGV, because we won't
|
/* It's OK to block everything including SIGSEGV, because we won't
|
||||||
* run any further guest code before unblocking signals in
|
* run any further guest code before unblocking signals in
|
||||||
|
@ -204,9 +203,7 @@ int block_signals(void)
|
||||||
sigfillset(&set);
|
sigfillset(&set);
|
||||||
sigprocmask(SIG_SETMASK, &set, 0);
|
sigprocmask(SIG_SETMASK, &set, 0);
|
||||||
|
|
||||||
pending = atomic_xchg(&ts->signal_pending, 1);
|
return atomic_xchg(&ts->signal_pending, 1);
|
||||||
|
|
||||||
return pending;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Wrapper for sigprocmask function
|
/* Wrapper for sigprocmask function
|
||||||
|
@ -3956,9 +3953,7 @@ static void setup_sigcontext(struct target_sigcontext *sc,
|
||||||
|
|
||||||
static inline unsigned long align_sigframe(unsigned long sp)
|
static inline unsigned long align_sigframe(unsigned long sp)
|
||||||
{
|
{
|
||||||
unsigned long i;
|
return sp & ~3UL;
|
||||||
i = sp & ~3UL;
|
|
||||||
return i;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline abi_ulong get_sigframe(struct target_sigaction *ka,
|
static inline abi_ulong get_sigframe(struct target_sigaction *ka,
|
||||||
|
@ -4555,7 +4550,7 @@ static target_ulong get_sigframe(struct target_sigaction *ka,
|
||||||
CPUPPCState *env,
|
CPUPPCState *env,
|
||||||
int frame_size)
|
int frame_size)
|
||||||
{
|
{
|
||||||
target_ulong oldsp, newsp;
|
target_ulong oldsp;
|
||||||
|
|
||||||
oldsp = env->gpr[1];
|
oldsp = env->gpr[1];
|
||||||
|
|
||||||
|
@ -4565,9 +4560,7 @@ static target_ulong get_sigframe(struct target_sigaction *ka,
|
||||||
+ target_sigaltstack_used.ss_size);
|
+ target_sigaltstack_used.ss_size);
|
||||||
}
|
}
|
||||||
|
|
||||||
newsp = (oldsp - frame_size) & ~0xFUL;
|
return (oldsp - frame_size) & ~0xFUL;
|
||||||
|
|
||||||
return newsp;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void save_user_regs(CPUPPCState *env, struct target_mcontext *frame)
|
static void save_user_regs(CPUPPCState *env, struct target_mcontext *frame)
|
||||||
|
|
|
@ -111,11 +111,8 @@ void cache_fini(PageCache *cache)
|
||||||
static size_t cache_get_cache_pos(const PageCache *cache,
|
static size_t cache_get_cache_pos(const PageCache *cache,
|
||||||
uint64_t address)
|
uint64_t address)
|
||||||
{
|
{
|
||||||
size_t pos;
|
|
||||||
|
|
||||||
g_assert(cache->max_num_items);
|
g_assert(cache->max_num_items);
|
||||||
pos = (address / cache->page_size) & (cache->max_num_items - 1);
|
return (address / cache->page_size) & (cache->max_num_items - 1);
|
||||||
return pos;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static CacheItem *cache_get_by_addr(const PageCache *cache, uint64_t addr)
|
static CacheItem *cache_get_by_addr(const PageCache *cache, uint64_t addr)
|
||||||
|
|
|
@ -127,7 +127,6 @@ int64_t qmp_guest_get_time(Error **errp)
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
qemu_timeval tq;
|
qemu_timeval tq;
|
||||||
int64_t time_ns;
|
|
||||||
|
|
||||||
ret = qemu_gettimeofday(&tq);
|
ret = qemu_gettimeofday(&tq);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
|
@ -135,8 +134,7 @@ int64_t qmp_guest_get_time(Error **errp)
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
time_ns = tq.tv_sec * 1000000000LL + tq.tv_usec * 1000;
|
return tq.tv_sec * 1000000000LL + tq.tv_usec * 1000;
|
||||||
return time_ns;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void qmp_guest_set_time(bool has_time, int64_t time_ns, Error **errp)
|
void qmp_guest_set_time(bool has_time, int64_t time_ns, Error **errp)
|
||||||
|
|
|
@ -1150,7 +1150,6 @@ out:
|
||||||
int64_t qmp_guest_get_time(Error **errp)
|
int64_t qmp_guest_get_time(Error **errp)
|
||||||
{
|
{
|
||||||
SYSTEMTIME ts = {0};
|
SYSTEMTIME ts = {0};
|
||||||
int64_t time_ns;
|
|
||||||
FILETIME tf;
|
FILETIME tf;
|
||||||
|
|
||||||
GetSystemTime(&ts);
|
GetSystemTime(&ts);
|
||||||
|
@ -1164,10 +1163,8 @@ int64_t qmp_guest_get_time(Error **errp)
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
time_ns = ((((int64_t)tf.dwHighDateTime << 32) | tf.dwLowDateTime)
|
return ((((int64_t)tf.dwHighDateTime << 32) | tf.dwLowDateTime)
|
||||||
- W32_FT_OFFSET) * 100;
|
- W32_FT_OFFSET) * 100;
|
||||||
|
|
||||||
return time_ns;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void qmp_guest_set_time(bool has_time, int64_t time_ns, Error **errp)
|
void qmp_guest_set_time(bool has_time, int64_t time_ns, Error **errp)
|
||||||
|
|
|
@ -100,7 +100,6 @@ QObject *qlist_pop(QList *qlist)
|
||||||
QObject *qlist_peek(QList *qlist)
|
QObject *qlist_peek(QList *qlist)
|
||||||
{
|
{
|
||||||
QListEntry *entry;
|
QListEntry *entry;
|
||||||
QObject *ret;
|
|
||||||
|
|
||||||
if (qlist == NULL || QTAILQ_EMPTY(&qlist->head)) {
|
if (qlist == NULL || QTAILQ_EMPTY(&qlist->head)) {
|
||||||
return NULL;
|
return NULL;
|
||||||
|
@ -108,9 +107,7 @@ QObject *qlist_peek(QList *qlist)
|
||||||
|
|
||||||
entry = QTAILQ_FIRST(&qlist->head);
|
entry = QTAILQ_FIRST(&qlist->head);
|
||||||
|
|
||||||
ret = entry->value;
|
return entry->value;
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int qlist_empty(const QList *qlist)
|
int qlist_empty(const QList *qlist)
|
||||||
|
|
19
scripts/coccinelle/return_directly.cocci
Normal file
19
scripts/coccinelle/return_directly.cocci
Normal file
|
@ -0,0 +1,19 @@
|
||||||
|
// replace 'R = X; return R;' with 'return R;'
|
||||||
|
@@
|
||||||
|
identifier VAR;
|
||||||
|
expression E;
|
||||||
|
type T;
|
||||||
|
identifier F;
|
||||||
|
@@
|
||||||
|
T F(...)
|
||||||
|
{
|
||||||
|
...
|
||||||
|
- T VAR;
|
||||||
|
... when != VAR
|
||||||
|
|
||||||
|
- VAR =
|
||||||
|
+ return
|
||||||
|
E;
|
||||||
|
- return VAR;
|
||||||
|
... when != VAR
|
||||||
|
}
|
|
@ -298,18 +298,12 @@ int32_t helper_fistt_ST0(CPUX86State *env)
|
||||||
|
|
||||||
int32_t helper_fisttl_ST0(CPUX86State *env)
|
int32_t helper_fisttl_ST0(CPUX86State *env)
|
||||||
{
|
{
|
||||||
int32_t val;
|
return floatx80_to_int32_round_to_zero(ST0, &env->fp_status);
|
||||||
|
|
||||||
val = floatx80_to_int32_round_to_zero(ST0, &env->fp_status);
|
|
||||||
return val;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int64_t helper_fisttll_ST0(CPUX86State *env)
|
int64_t helper_fisttll_ST0(CPUX86State *env)
|
||||||
{
|
{
|
||||||
int64_t val;
|
return floatx80_to_int64_round_to_zero(ST0, &env->fp_status);
|
||||||
|
|
||||||
val = floatx80_to_int64_round_to_zero(ST0, &env->fp_status);
|
|
||||||
return val;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void helper_fldt_ST0(CPUX86State *env, target_ulong ptr)
|
void helper_fldt_ST0(CPUX86State *env, target_ulong ptr)
|
||||||
|
|
|
@ -1346,7 +1346,7 @@ static int kvm_put_xsave(X86CPU *cpu)
|
||||||
CPUX86State *env = &cpu->env;
|
CPUX86State *env = &cpu->env;
|
||||||
X86XSaveArea *xsave = env->kvm_xsave_buf;
|
X86XSaveArea *xsave = env->kvm_xsave_buf;
|
||||||
uint16_t cwd, swd, twd;
|
uint16_t cwd, swd, twd;
|
||||||
int i, r;
|
int i;
|
||||||
|
|
||||||
if (!has_xsave) {
|
if (!has_xsave) {
|
||||||
return kvm_put_fpu(cpu);
|
return kvm_put_fpu(cpu);
|
||||||
|
@ -1395,8 +1395,7 @@ static int kvm_put_xsave(X86CPU *cpu)
|
||||||
16 * sizeof env->xmm_regs[16]);
|
16 * sizeof env->xmm_regs[16]);
|
||||||
memcpy(&xsave->pkru_state, &env->pkru, sizeof env->pkru);
|
memcpy(&xsave->pkru_state, &env->pkru, sizeof env->pkru);
|
||||||
#endif
|
#endif
|
||||||
r = kvm_vcpu_ioctl(CPU(cpu), KVM_SET_XSAVE, xsave);
|
return kvm_vcpu_ioctl(CPU(cpu), KVM_SET_XSAVE, xsave);
|
||||||
return r;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int kvm_put_xcrs(X86CPU *cpu)
|
static int kvm_put_xcrs(X86CPU *cpu)
|
||||||
|
|
|
@ -133,10 +133,8 @@ static inline uint64_t get_HILO(CPUMIPSState *env)
|
||||||
|
|
||||||
static inline target_ulong set_HIT0_LO(CPUMIPSState *env, uint64_t HILO)
|
static inline target_ulong set_HIT0_LO(CPUMIPSState *env, uint64_t HILO)
|
||||||
{
|
{
|
||||||
target_ulong tmp;
|
|
||||||
env->active_tc.LO[0] = (int32_t)(HILO & 0xFFFFFFFF);
|
env->active_tc.LO[0] = (int32_t)(HILO & 0xFFFFFFFF);
|
||||||
tmp = env->active_tc.HI[0] = (int32_t)(HILO >> 32);
|
return env->active_tc.HI[0] = (int32_t)(HILO >> 32);
|
||||||
return tmp;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline target_ulong set_HI_LOT0(CPUMIPSState *env, uint64_t HILO)
|
static inline target_ulong set_HI_LOT0(CPUMIPSState *env, uint64_t HILO)
|
||||||
|
|
|
@ -70,11 +70,7 @@ void s390x_cpu_timer(void *opaque)
|
||||||
|
|
||||||
S390CPU *cpu_s390x_create(const char *cpu_model, Error **errp)
|
S390CPU *cpu_s390x_create(const char *cpu_model, Error **errp)
|
||||||
{
|
{
|
||||||
S390CPU *cpu;
|
return S390_CPU(object_new(TYPE_S390_CPU));
|
||||||
|
|
||||||
cpu = S390_CPU(object_new(TYPE_S390_CPU));
|
|
||||||
|
|
||||||
return cpu;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
S390CPU *s390x_new_cpu(const char *cpu_model, int64_t id, Error **errp)
|
S390CPU *s390x_new_cpu(const char *cpu_model, int64_t id, Error **errp)
|
||||||
|
|
|
@ -200,10 +200,7 @@ static uint32_t compute_all_addx_xcc(CPUSPARCState *env)
|
||||||
|
|
||||||
static uint32_t compute_C_addx_xcc(CPUSPARCState *env)
|
static uint32_t compute_C_addx_xcc(CPUSPARCState *env)
|
||||||
{
|
{
|
||||||
uint32_t ret;
|
return get_C_addx_xcc(CC_DST, CC_SRC, CC_SRC2);
|
||||||
|
|
||||||
ret = get_C_addx_xcc(CC_DST, CC_SRC, CC_SRC2);
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -219,10 +216,7 @@ static uint32_t compute_all_addx(CPUSPARCState *env)
|
||||||
|
|
||||||
static uint32_t compute_C_addx(CPUSPARCState *env)
|
static uint32_t compute_C_addx(CPUSPARCState *env)
|
||||||
{
|
{
|
||||||
uint32_t ret;
|
return get_C_addx_icc(CC_DST, CC_SRC, CC_SRC2);
|
||||||
|
|
||||||
ret = get_C_addx_icc(CC_DST, CC_SRC, CC_SRC2);
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline uint32_t get_V_tag_icc(target_ulong src1, target_ulong src2)
|
static inline uint32_t get_V_tag_icc(target_ulong src1, target_ulong src2)
|
||||||
|
@ -365,10 +359,7 @@ static uint32_t compute_all_subx_xcc(CPUSPARCState *env)
|
||||||
|
|
||||||
static uint32_t compute_C_subx_xcc(CPUSPARCState *env)
|
static uint32_t compute_C_subx_xcc(CPUSPARCState *env)
|
||||||
{
|
{
|
||||||
uint32_t ret;
|
return get_C_subx_xcc(CC_DST, CC_SRC, CC_SRC2);
|
||||||
|
|
||||||
ret = get_C_subx_xcc(CC_DST, CC_SRC, CC_SRC2);
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -384,10 +375,7 @@ static uint32_t compute_all_subx(CPUSPARCState *env)
|
||||||
|
|
||||||
static uint32_t compute_C_subx(CPUSPARCState *env)
|
static uint32_t compute_C_subx(CPUSPARCState *env)
|
||||||
{
|
{
|
||||||
uint32_t ret;
|
return get_C_subx_icc(CC_DST, CC_SRC, CC_SRC2);
|
||||||
|
|
||||||
ret = get_C_subx_icc(CC_DST, CC_SRC, CC_SRC2);
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static uint32_t compute_all_tsub(CPUSPARCState *env)
|
static uint32_t compute_all_tsub(CPUSPARCState *env)
|
||||||
|
@ -479,8 +467,5 @@ void helper_compute_psr(CPUSPARCState *env)
|
||||||
|
|
||||||
uint32_t helper_compute_C_icc(CPUSPARCState *env)
|
uint32_t helper_compute_C_icc(CPUSPARCState *env)
|
||||||
{
|
{
|
||||||
uint32_t ret;
|
return icc_table[CC_OP].compute_c(env) >> PSR_CARRY_SHIFT;
|
||||||
|
|
||||||
ret = icc_table[CC_OP].compute_c(env) >> PSR_CARRY_SHIFT;
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -2117,7 +2117,7 @@ uint64_t helper_dvadj(uint64_t r1, uint32_t r2)
|
||||||
int32_t eq_pos = x_sign & ((r1 >> 32) == r2);
|
int32_t eq_pos = x_sign & ((r1 >> 32) == r2);
|
||||||
int32_t eq_neg = x_sign & ((r1 >> 32) == -r2);
|
int32_t eq_neg = x_sign & ((r1 >> 32) == -r2);
|
||||||
uint32_t quotient;
|
uint32_t quotient;
|
||||||
uint64_t ret, remainder;
|
uint64_t remainder;
|
||||||
|
|
||||||
if ((q_sign & ~eq_neg) | eq_pos) {
|
if ((q_sign & ~eq_neg) | eq_pos) {
|
||||||
quotient = (r1 + 1) & 0xffffffff;
|
quotient = (r1 + 1) & 0xffffffff;
|
||||||
|
@ -2130,8 +2130,7 @@ uint64_t helper_dvadj(uint64_t r1, uint32_t r2)
|
||||||
} else {
|
} else {
|
||||||
remainder = (r1 & 0xffffffff00000000ull);
|
remainder = (r1 & 0xffffffff00000000ull);
|
||||||
}
|
}
|
||||||
ret = remainder|quotient;
|
return remainder | quotient;
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
uint64_t helper_dvstep(uint64_t r1, uint32_t r2)
|
uint64_t helper_dvstep(uint64_t r1, uint32_t r2)
|
||||||
|
@ -2236,7 +2235,6 @@ uint64_t helper_divide_u(CPUTriCoreState *env, uint32_t r1, uint32_t r2)
|
||||||
uint64_t helper_mul_h(uint32_t arg00, uint32_t arg01,
|
uint64_t helper_mul_h(uint32_t arg00, uint32_t arg01,
|
||||||
uint32_t arg10, uint32_t arg11, uint32_t n)
|
uint32_t arg10, uint32_t arg11, uint32_t n)
|
||||||
{
|
{
|
||||||
uint64_t ret;
|
|
||||||
uint32_t result0, result1;
|
uint32_t result0, result1;
|
||||||
|
|
||||||
int32_t sc1 = ((arg00 & 0xffff) == 0x8000) &&
|
int32_t sc1 = ((arg00 & 0xffff) == 0x8000) &&
|
||||||
|
@ -2253,8 +2251,7 @@ uint64_t helper_mul_h(uint32_t arg00, uint32_t arg01,
|
||||||
} else {
|
} else {
|
||||||
result0 = (((uint32_t)(arg01 * arg11)) << n);
|
result0 = (((uint32_t)(arg01 * arg11)) << n);
|
||||||
}
|
}
|
||||||
ret = (((uint64_t)result1 << 32)) | result0;
|
return (((uint64_t)result1 << 32)) | result0;
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
uint64_t helper_mulm_h(uint32_t arg00, uint32_t arg01,
|
uint64_t helper_mulm_h(uint32_t arg00, uint32_t arg01,
|
||||||
|
@ -2308,11 +2305,9 @@ uint32_t helper_mulr_h(uint32_t arg00, uint32_t arg01,
|
||||||
uint32_t helper_crc32(uint32_t arg0, uint32_t arg1)
|
uint32_t helper_crc32(uint32_t arg0, uint32_t arg1)
|
||||||
{
|
{
|
||||||
uint8_t buf[4];
|
uint8_t buf[4];
|
||||||
uint32_t ret;
|
|
||||||
stl_be_p(buf, arg0);
|
stl_be_p(buf, arg0);
|
||||||
|
|
||||||
ret = crc32(arg1, buf, 4);
|
return crc32(arg1, buf, 4);
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* context save area (CSA) related helpers */
|
/* context save area (CSA) related helpers */
|
||||||
|
|
|
@ -50,8 +50,6 @@ static void pci_virtio_vga(void)
|
||||||
|
|
||||||
int main(int argc, char **argv)
|
int main(int argc, char **argv)
|
||||||
{
|
{
|
||||||
int ret;
|
|
||||||
|
|
||||||
g_test_init(&argc, &argv, NULL);
|
g_test_init(&argc, &argv, NULL);
|
||||||
|
|
||||||
qtest_add_func("/display/pci/cirrus", pci_cirrus);
|
qtest_add_func("/display/pci/cirrus", pci_cirrus);
|
||||||
|
@ -62,7 +60,5 @@ int main(int argc, char **argv)
|
||||||
#ifdef CONFIG_VIRTIO_VGA
|
#ifdef CONFIG_VIRTIO_VGA
|
||||||
qtest_add_func("/display/pci/virtio-vga", pci_virtio_vga);
|
qtest_add_func("/display/pci/virtio-vga", pci_virtio_vga);
|
||||||
#endif
|
#endif
|
||||||
ret = g_test_run();
|
return g_test_run();
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -282,7 +282,6 @@ static void test_endianness_combine(gconstpointer data)
|
||||||
int main(int argc, char **argv)
|
int main(int argc, char **argv)
|
||||||
{
|
{
|
||||||
const char *arch = qtest_get_arch();
|
const char *arch = qtest_get_arch();
|
||||||
int ret;
|
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
g_test_init(&argc, &argv, NULL);
|
g_test_init(&argc, &argv, NULL);
|
||||||
|
@ -305,7 +304,5 @@ int main(int argc, char **argv)
|
||||||
qtest_add_data_func(path, &test_cases[i], test_endianness_combine);
|
qtest_add_data_func(path, &test_cases[i], test_endianness_combine);
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = g_test_run();
|
return g_test_run();
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -394,7 +394,6 @@ static void request_pflash(FirmwareTestFixture *fixture,
|
||||||
int main(int argc, char **argv)
|
int main(int argc, char **argv)
|
||||||
{
|
{
|
||||||
TestData data;
|
TestData data;
|
||||||
int ret;
|
|
||||||
|
|
||||||
g_test_init(&argc, &argv, NULL);
|
g_test_init(&argc, &argv, NULL);
|
||||||
|
|
||||||
|
@ -405,6 +404,5 @@ int main(int argc, char **argv)
|
||||||
add_firmware_test("i440fx/firmware/bios", request_bios);
|
add_firmware_test("i440fx/firmware/bios", request_bios);
|
||||||
add_firmware_test("i440fx/firmware/pflash", request_pflash);
|
add_firmware_test("i440fx/firmware/pflash", request_pflash);
|
||||||
|
|
||||||
ret = g_test_run();
|
return g_test_run();
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -31,13 +31,9 @@ static void ich9_test(void)
|
||||||
|
|
||||||
int main(int argc, char **argv)
|
int main(int argc, char **argv)
|
||||||
{
|
{
|
||||||
int ret;
|
|
||||||
|
|
||||||
g_test_init(&argc, &argv, NULL);
|
g_test_init(&argc, &argv, NULL);
|
||||||
qtest_add_func("/intel-hda/ich6", ich6_test);
|
qtest_add_func("/intel-hda/ich6", ich6_test);
|
||||||
qtest_add_func("/intel-hda/ich9", ich9_test);
|
qtest_add_func("/intel-hda/ich9", ich9_test);
|
||||||
|
|
||||||
ret = g_test_run();
|
return g_test_run();
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -209,12 +209,8 @@ static void test_redirector_rx(void)
|
||||||
|
|
||||||
int main(int argc, char **argv)
|
int main(int argc, char **argv)
|
||||||
{
|
{
|
||||||
int ret;
|
|
||||||
|
|
||||||
g_test_init(&argc, &argv, NULL);
|
g_test_init(&argc, &argv, NULL);
|
||||||
qtest_add_func("/netfilter/redirector_tx", test_redirector_tx);
|
qtest_add_func("/netfilter/redirector_tx", test_redirector_tx);
|
||||||
qtest_add_func("/netfilter/redirector_rx", test_redirector_rx);
|
qtest_add_func("/netfilter/redirector_rx", test_redirector_rx);
|
||||||
ret = g_test_run();
|
return g_test_run();
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -763,7 +763,6 @@ static void mmio_basic(void)
|
||||||
|
|
||||||
int main(int argc, char **argv)
|
int main(int argc, char **argv)
|
||||||
{
|
{
|
||||||
int ret;
|
|
||||||
const char *arch = qtest_get_arch();
|
const char *arch = qtest_get_arch();
|
||||||
|
|
||||||
g_test_init(&argc, &argv, NULL);
|
g_test_init(&argc, &argv, NULL);
|
||||||
|
@ -779,7 +778,5 @@ int main(int argc, char **argv)
|
||||||
qtest_add_func("/virtio/blk/mmio/basic", mmio_basic);
|
qtest_add_func("/virtio/blk/mmio/basic", mmio_basic);
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = g_test_run();
|
return g_test_run();
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -27,13 +27,9 @@ static void serialport_pci_nop(void)
|
||||||
|
|
||||||
int main(int argc, char **argv)
|
int main(int argc, char **argv)
|
||||||
{
|
{
|
||||||
int ret;
|
|
||||||
|
|
||||||
g_test_init(&argc, &argv, NULL);
|
g_test_init(&argc, &argv, NULL);
|
||||||
qtest_add_func("/virtio/console/pci/nop", console_pci_nop);
|
qtest_add_func("/virtio/console/pci/nop", console_pci_nop);
|
||||||
qtest_add_func("/virtio/serialport/pci/nop", serialport_pci_nop);
|
qtest_add_func("/virtio/serialport/pci/nop", serialport_pci_nop);
|
||||||
|
|
||||||
ret = g_test_run();
|
return g_test_run();
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -248,8 +248,6 @@ static void hotplug(void)
|
||||||
|
|
||||||
int main(int argc, char **argv)
|
int main(int argc, char **argv)
|
||||||
{
|
{
|
||||||
int ret;
|
|
||||||
|
|
||||||
g_test_init(&argc, &argv, NULL);
|
g_test_init(&argc, &argv, NULL);
|
||||||
#ifndef _WIN32
|
#ifndef _WIN32
|
||||||
qtest_add_data_func("/virtio/net/pci/basic", send_recv_test, pci_basic);
|
qtest_add_data_func("/virtio/net/pci/basic", send_recv_test, pci_basic);
|
||||||
|
@ -258,7 +256,5 @@ int main(int argc, char **argv)
|
||||||
#endif
|
#endif
|
||||||
qtest_add_func("/virtio/net/pci/hotplug", hotplug);
|
qtest_add_func("/virtio/net/pci/hotplug", hotplug);
|
||||||
|
|
||||||
ret = g_test_run();
|
return g_test_run();
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -260,15 +260,11 @@ static void test_unaligned_write_same(void)
|
||||||
|
|
||||||
int main(int argc, char **argv)
|
int main(int argc, char **argv)
|
||||||
{
|
{
|
||||||
int ret;
|
|
||||||
|
|
||||||
g_test_init(&argc, &argv, NULL);
|
g_test_init(&argc, &argv, NULL);
|
||||||
qtest_add_func("/virtio/scsi/pci/nop", pci_nop);
|
qtest_add_func("/virtio/scsi/pci/nop", pci_nop);
|
||||||
qtest_add_func("/virtio/scsi/pci/hotplug", hotplug);
|
qtest_add_func("/virtio/scsi/pci/hotplug", hotplug);
|
||||||
qtest_add_func("/virtio/scsi/pci/scsi-disk/unaligned-write-same",
|
qtest_add_func("/virtio/scsi/pci/scsi-disk/unaligned-write-same",
|
||||||
test_unaligned_write_same);
|
test_unaligned_write_same);
|
||||||
|
|
||||||
ret = g_test_run();
|
return g_test_run();
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -117,15 +117,11 @@ static void ib700_none(void)
|
||||||
|
|
||||||
int main(int argc, char **argv)
|
int main(int argc, char **argv)
|
||||||
{
|
{
|
||||||
int ret;
|
|
||||||
|
|
||||||
g_test_init(&argc, &argv, NULL);
|
g_test_init(&argc, &argv, NULL);
|
||||||
qtest_add_func("/wdt_ib700/pause", ib700_pause);
|
qtest_add_func("/wdt_ib700/pause", ib700_pause);
|
||||||
qtest_add_func("/wdt_ib700/reset", ib700_reset);
|
qtest_add_func("/wdt_ib700/reset", ib700_reset);
|
||||||
qtest_add_func("/wdt_ib700/shutdown", ib700_shutdown);
|
qtest_add_func("/wdt_ib700/shutdown", ib700_shutdown);
|
||||||
qtest_add_func("/wdt_ib700/none", ib700_none);
|
qtest_add_func("/wdt_ib700/none", ib700_none);
|
||||||
|
|
||||||
ret = g_test_run();
|
return g_test_run();
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
|
|
10
ui/cursor.c
10
ui/cursor.c
|
@ -81,18 +81,12 @@ void cursor_print_ascii_art(QEMUCursor *c, const char *prefix)
|
||||||
|
|
||||||
QEMUCursor *cursor_builtin_hidden(void)
|
QEMUCursor *cursor_builtin_hidden(void)
|
||||||
{
|
{
|
||||||
QEMUCursor *c;
|
return cursor_parse_xpm(cursor_hidden_xpm);
|
||||||
|
|
||||||
c = cursor_parse_xpm(cursor_hidden_xpm);
|
|
||||||
return c;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
QEMUCursor *cursor_builtin_left_ptr(void)
|
QEMUCursor *cursor_builtin_left_ptr(void)
|
||||||
{
|
{
|
||||||
QEMUCursor *c;
|
return cursor_parse_xpm(cursor_left_ptr_xpm);
|
||||||
|
|
||||||
c = cursor_parse_xpm(cursor_left_ptr_xpm);
|
|
||||||
return c;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
QEMUCursor *cursor_alloc(int width, int height)
|
QEMUCursor *cursor_alloc(int width, int height)
|
||||||
|
|
|
@ -180,14 +180,11 @@ void qemu_pixman_linebuf_copy(pixman_image_t *fb, int width, int x, int y,
|
||||||
pixman_image_t *qemu_pixman_mirror_create(pixman_format_code_t format,
|
pixman_image_t *qemu_pixman_mirror_create(pixman_format_code_t format,
|
||||||
pixman_image_t *image)
|
pixman_image_t *image)
|
||||||
{
|
{
|
||||||
pixman_image_t *mirror;
|
return pixman_image_create_bits(format,
|
||||||
|
pixman_image_get_width(image),
|
||||||
mirror = pixman_image_create_bits(format,
|
pixman_image_get_height(image),
|
||||||
pixman_image_get_width(image),
|
NULL,
|
||||||
pixman_image_get_height(image),
|
pixman_image_get_stride(image));
|
||||||
NULL,
|
|
||||||
pixman_image_get_stride(image));
|
|
||||||
return mirror;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void qemu_pixman_image_unref(pixman_image_t *image)
|
void qemu_pixman_image_unref(pixman_image_t *image)
|
||||||
|
|
|
@ -55,13 +55,9 @@ static void init_lists(void)
|
||||||
|
|
||||||
static ModuleTypeList *find_type(module_init_type type)
|
static ModuleTypeList *find_type(module_init_type type)
|
||||||
{
|
{
|
||||||
ModuleTypeList *l;
|
|
||||||
|
|
||||||
init_lists();
|
init_lists();
|
||||||
|
|
||||||
l = &init_type_list[type];
|
return &init_type_list[type];
|
||||||
|
|
||||||
return l;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void register_module_init(void (*fn)(void), module_init_type type)
|
void register_module_init(void (*fn)(void), module_init_type type)
|
||||||
|
|
5
vl.c
5
vl.c
|
@ -2352,10 +2352,7 @@ static int chardev_init_func(void *opaque, QemuOpts *opts, Error **errp)
|
||||||
#ifdef CONFIG_VIRTFS
|
#ifdef CONFIG_VIRTFS
|
||||||
static int fsdev_init_func(void *opaque, QemuOpts *opts, Error **errp)
|
static int fsdev_init_func(void *opaque, QemuOpts *opts, Error **errp)
|
||||||
{
|
{
|
||||||
int ret;
|
return qemu_fsdev_add(opts);
|
||||||
ret = qemu_fsdev_add(opts);
|
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user