mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-09-06 18:05:37 +00:00
Merge branch 'trivial-patches' of git://github.com/stefanha/qemu
* 'trivial-patches' of git://github.com/stefanha/qemu: versatilepb: Use symbolic indices for ARM PIC qdev: kill bogus comment qemu-barrier: Fix compiler version check for future gcc versions hw: Add missing 'static' attribute for QEMUMachine cleanup useless return sentence qemu-sockets: Fix compiler warning (regression for MinGW) vnc: Fix spelling (hellmen -> hellman) in comment slirp: Fix spelling in comment (enought -> enough, insure -> ensure) tcg/arm: Use tcg_out_mov_reg rather than inline equivalent code cpu: Add missing 'static' attribute to qemu_global_mutex configure: Support empty target list (--target-list=) hw: Fix return value check for bdrv_read, bdrv_write
This commit is contained in:
commit
048d3612a5
|
@ -103,7 +103,6 @@ static void qed_write_table_cb(void *opaque, int ret)
|
||||||
out:
|
out:
|
||||||
qemu_vfree(write_table_cb->table);
|
qemu_vfree(write_table_cb->table);
|
||||||
gencb_complete(&write_table_cb->gencb, ret);
|
gencb_complete(&write_table_cb->gencb, ret);
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -830,7 +830,6 @@ exit:
|
||||||
QSIMPLEQ_FOREACH_SAFE(states, &snap_bdrv_states, entry, next) {
|
QSIMPLEQ_FOREACH_SAFE(states, &snap_bdrv_states, entry, next) {
|
||||||
g_free(states);
|
g_free(states);
|
||||||
}
|
}
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
5
configure
vendored
5
configure
vendored
|
@ -125,7 +125,8 @@ cc_i386=i386-pc-linux-gnu-gcc
|
||||||
libs_qga=""
|
libs_qga=""
|
||||||
debug_info="yes"
|
debug_info="yes"
|
||||||
|
|
||||||
target_list=""
|
# Don't accept a target_list environment variable.
|
||||||
|
unset target_list
|
||||||
|
|
||||||
# Default value for a variable defining feature "foo".
|
# Default value for a variable defining feature "foo".
|
||||||
# * foo="no" feature will only be used if --enable-foo arg is given
|
# * foo="no" feature will only be used if --enable-foo arg is given
|
||||||
|
@ -1288,7 +1289,7 @@ if ! "$python" -c 'import sys; sys.exit(sys.version_info < (2,4) or sys.version_
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test -z "$target_list" ; then
|
if test -z "${target_list+xxx}" ; then
|
||||||
target_list="$default_target_list"
|
target_list="$default_target_list"
|
||||||
else
|
else
|
||||||
target_list=`echo "$target_list" | sed -e 's/,/ /g'`
|
target_list=`echo "$target_list" | sed -e 's/,/ /g'`
|
||||||
|
|
2
cpus.c
2
cpus.c
|
@ -613,7 +613,7 @@ static void qemu_tcg_init_cpu_signals(void)
|
||||||
}
|
}
|
||||||
#endif /* _WIN32 */
|
#endif /* _WIN32 */
|
||||||
|
|
||||||
QemuMutex qemu_global_mutex;
|
static QemuMutex qemu_global_mutex;
|
||||||
static QemuCond qemu_io_proceeded_cond;
|
static QemuCond qemu_io_proceeded_cond;
|
||||||
static bool iothread_requesting_mutex;
|
static bool iothread_requesting_mutex;
|
||||||
|
|
||||||
|
|
|
@ -505,7 +505,6 @@ static void virtfs_reset(V9fsPDU *pdu)
|
||||||
error_report("9pfs:%s: One or more uncluncked fids "
|
error_report("9pfs:%s: One or more uncluncked fids "
|
||||||
"found during reset", __func__);
|
"found during reset", __func__);
|
||||||
}
|
}
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#define P9_QID_TYPE_DIR 0x80
|
#define P9_QID_TYPE_DIR 0x80
|
||||||
|
@ -934,7 +933,6 @@ static void v9fs_version(void *opaque)
|
||||||
out:
|
out:
|
||||||
complete_pdu(s, pdu, offset);
|
complete_pdu(s, pdu, offset);
|
||||||
v9fs_string_free(&version);
|
v9fs_string_free(&version);
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void v9fs_attach(void *opaque)
|
static void v9fs_attach(void *opaque)
|
||||||
|
@ -1314,7 +1312,6 @@ out_nofid:
|
||||||
g_free(wnames);
|
g_free(wnames);
|
||||||
g_free(qids);
|
g_free(qids);
|
||||||
}
|
}
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int32_t get_iounit(V9fsPDU *pdu, V9fsPath *path)
|
static int32_t get_iounit(V9fsPDU *pdu, V9fsPath *path)
|
||||||
|
@ -2257,7 +2254,6 @@ static void v9fs_flush(void *opaque)
|
||||||
free_pdu(pdu->s, cancel_pdu);
|
free_pdu(pdu->s, cancel_pdu);
|
||||||
}
|
}
|
||||||
complete_pdu(s, pdu, 7);
|
complete_pdu(s, pdu, 7);
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void v9fs_link(void *opaque)
|
static void v9fs_link(void *opaque)
|
||||||
|
@ -2763,7 +2759,6 @@ out:
|
||||||
put_fid(pdu, fidp);
|
put_fid(pdu, fidp);
|
||||||
out_nofid:
|
out_nofid:
|
||||||
complete_pdu(s, pdu, retval);
|
complete_pdu(s, pdu, retval);
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void v9fs_mknod(void *opaque)
|
static void v9fs_mknod(void *opaque)
|
||||||
|
|
|
@ -878,8 +878,6 @@ void s1d13745_write_block(void *opaque, int dc,
|
||||||
len -= 2;
|
len -= 2;
|
||||||
buf += 2;
|
buf += 2;
|
||||||
}
|
}
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void blizzard_update_display(void *opaque)
|
static void blizzard_update_display(void *opaque)
|
||||||
|
|
|
@ -786,7 +786,6 @@ static void bt_hci_lmp_connection_request(struct bt_link_s *link)
|
||||||
memcpy(¶ms.dev_class, &link->host->class, sizeof(params.dev_class));
|
memcpy(¶ms.dev_class, &link->host->class, sizeof(params.dev_class));
|
||||||
params.link_type = ACL_LINK;
|
params.link_type = ACL_LINK;
|
||||||
bt_hci_event(hci, EVT_CONN_REQUEST, ¶ms, EVT_CONN_REQUEST_SIZE);
|
bt_hci_event(hci, EVT_CONN_REQUEST, ¶ms, EVT_CONN_REQUEST_SIZE);
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void bt_hci_conn_accept_timeout(void *opaque)
|
static void bt_hci_conn_accept_timeout(void *opaque)
|
||||||
|
|
|
@ -89,5 +89,4 @@ err:
|
||||||
if (dinfo) {
|
if (dinfo) {
|
||||||
drive_put_ref(dinfo);
|
drive_put_ref(dinfo);
|
||||||
}
|
}
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -347,8 +347,6 @@ static void exynos4210_combiner_write(void *opaque, target_phys_addr_t offset,
|
||||||
TARGET_FMT_plx "\n", offset);
|
TARGET_FMT_plx "\n", offset);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Get combiner group and bit from irq number */
|
/* Get combiner group and bit from irq number */
|
||||||
|
@ -380,8 +378,6 @@ static void exynos4210_combiner_handler(void *opaque, int irq, int level)
|
||||||
}
|
}
|
||||||
|
|
||||||
exynos4210_combiner_update(s, group_n);
|
exynos4210_combiner_update(s, group_n);
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void exynos4210_combiner_reset(DeviceState *d)
|
static void exynos4210_combiner_reset(DeviceState *d)
|
||||||
|
|
|
@ -193,8 +193,6 @@ static void exynos4210_irq_handler(void *opaque, int irq, int level)
|
||||||
|
|
||||||
/* Bypass */
|
/* Bypass */
|
||||||
qemu_set_irq(s->board_irqs[irq], level);
|
qemu_set_irq(s->board_irqs[irq], level);
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -410,8 +408,6 @@ static void exynos4210_irq_gate_handler(void *opaque, int irq, int level)
|
||||||
}
|
}
|
||||||
|
|
||||||
qemu_irq_lower(s->out);
|
qemu_irq_lower(s->out);
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void exynos4210_irq_gate_reset(DeviceState *d)
|
static void exynos4210_irq_gate_reset(DeviceState *d)
|
||||||
|
|
|
@ -574,8 +574,6 @@ static void exynos4210_gfrc_event(void *opaque)
|
||||||
exynos4210_gfrc_set_count(&s->g_timer, distance);
|
exynos4210_gfrc_set_count(&s->g_timer, distance);
|
||||||
|
|
||||||
exynos4210_gfrc_start(&s->g_timer);
|
exynos4210_gfrc_start(&s->g_timer);
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
2
hw/fdc.c
2
hw/fdc.c
|
@ -1286,8 +1286,6 @@ static void fdctrl_start_transfer(FDCtrl *fdctrl, int direction)
|
||||||
fdctrl->msr |= FD_MSR_DIO;
|
fdctrl->msr |= FD_MSR_DIO;
|
||||||
/* IO based transfer: calculate len */
|
/* IO based transfer: calculate len */
|
||||||
fdctrl_raise_irq(fdctrl, FD_SR0_SEEK);
|
fdctrl_raise_irq(fdctrl, FD_SR0_SEEK);
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Prepare a transfer of deleted data */
|
/* Prepare a transfer of deleted data */
|
||||||
|
|
|
@ -107,5 +107,4 @@ void framebuffer_update_display(
|
||||||
DIRTY_MEMORY_VGA);
|
DIRTY_MEMORY_VGA);
|
||||||
*first_row = first;
|
*first_row = first;
|
||||||
*last_row = last;
|
*last_row = last;
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -89,7 +89,6 @@ static void pmac_ide_atapi_transfer_cb(void *opaque, int ret)
|
||||||
done:
|
done:
|
||||||
bdrv_acct_done(s->bs, &s->acct);
|
bdrv_acct_done(s->bs, &s->acct);
|
||||||
io->dma_end(opaque);
|
io->dma_end(opaque);
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void pmac_ide_transfer_cb(void *opaque, int ret)
|
static void pmac_ide_transfer_cb(void *opaque, int ret)
|
||||||
|
|
|
@ -149,7 +149,6 @@ static void ivshmem_IntrStatus_write(IVShmemState *s, uint32_t val)
|
||||||
s->intrstatus = val;
|
s->intrstatus = val;
|
||||||
|
|
||||||
ivshmem_update_irq(s, val);
|
ivshmem_update_irq(s, val);
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static uint32_t ivshmem_IntrStatus_read(IVShmemState *s)
|
static uint32_t ivshmem_IntrStatus_read(IVShmemState *s)
|
||||||
|
@ -510,8 +509,6 @@ static void ivshmem_read(void *opaque, const uint8_t * buf, int flags)
|
||||||
if (ivshmem_has_feature(s, IVSHMEM_IOEVENTFD)) {
|
if (ivshmem_has_feature(s, IVSHMEM_IOEVENTFD)) {
|
||||||
ivshmem_add_eventfd(s, incoming_posn, guest_max_eventfd);
|
ivshmem_add_eventfd(s, incoming_posn, guest_max_eventfd);
|
||||||
}
|
}
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Select the MSI-X vectors used by device.
|
/* Select the MSI-X vectors used by device.
|
||||||
|
@ -536,7 +533,6 @@ static void ivshmem_reset(DeviceState *d)
|
||||||
|
|
||||||
s->intrstatus = 0;
|
s->intrstatus = 0;
|
||||||
ivshmem_use_msix(s);
|
ivshmem_use_msix(s);
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static uint64_t ivshmem_get_size(IVShmemState * s) {
|
static uint64_t ivshmem_get_size(IVShmemState * s) {
|
||||||
|
|
|
@ -210,7 +210,7 @@ static void leon3_generic_hw_init(ram_addr_t ram_size,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
QEMUMachine leon3_generic_machine = {
|
static QEMUMachine leon3_generic_machine = {
|
||||||
.name = "leon3_generic",
|
.name = "leon3_generic",
|
||||||
.desc = "Leon-3 generic",
|
.desc = "Leon-3 generic",
|
||||||
.init = leon3_generic_hw_init,
|
.init = leon3_generic_hw_init,
|
||||||
|
|
|
@ -652,7 +652,6 @@ static void megasas_finish_dcmd(MegasasCmd *cmd, uint32_t iov_size)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
cmd->iov_size = 0;
|
cmd->iov_size = 0;
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int megasas_ctrl_get_info(MegasasState *s, MegasasCmd *cmd)
|
static int megasas_ctrl_get_info(MegasasState *s, MegasasCmd *cmd)
|
||||||
|
|
|
@ -392,7 +392,7 @@ static void mips_fulong2e_init(ram_addr_t ram_size, const char *boot_device,
|
||||||
network_init();
|
network_init();
|
||||||
}
|
}
|
||||||
|
|
||||||
QEMUMachine mips_fulong2e_machine = {
|
static QEMUMachine mips_fulong2e_machine = {
|
||||||
.name = "fulong2e",
|
.name = "fulong2e",
|
||||||
.desc = "Fulong 2e mini pc",
|
.desc = "Fulong 2e mini pc",
|
||||||
.init = mips_fulong2e_init,
|
.init = mips_fulong2e_init,
|
||||||
|
|
|
@ -366,7 +366,6 @@ void msix_uninit(PCIDevice *dev, MemoryRegion *table_bar, MemoryRegion *pba_bar)
|
||||||
g_free(dev->msix_entry_used);
|
g_free(dev->msix_entry_used);
|
||||||
dev->msix_entry_used = NULL;
|
dev->msix_entry_used = NULL;
|
||||||
dev->cap_present &= ~QEMU_PCI_CAP_MSIX;
|
dev->cap_present &= ~QEMU_PCI_CAP_MSIX;
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void msix_uninit_exclusive_bar(PCIDevice *dev)
|
void msix_uninit_exclusive_bar(PCIDevice *dev)
|
||||||
|
|
34
hw/nand.c
34
hw/nand.c
|
@ -654,7 +654,7 @@ static void glue(nand_blk_write_, PAGE_SIZE)(NANDFlashState *s)
|
||||||
sector = SECTOR(s->addr);
|
sector = SECTOR(s->addr);
|
||||||
off = (s->addr & PAGE_MASK) + s->offset;
|
off = (s->addr & PAGE_MASK) + s->offset;
|
||||||
soff = SECTOR_OFFSET(s->addr);
|
soff = SECTOR_OFFSET(s->addr);
|
||||||
if (bdrv_read(s->bdrv, sector, iobuf, PAGE_SECTORS) == -1) {
|
if (bdrv_read(s->bdrv, sector, iobuf, PAGE_SECTORS) < 0) {
|
||||||
printf("%s: read error in sector %" PRIu64 "\n", __func__, sector);
|
printf("%s: read error in sector %" PRIu64 "\n", __func__, sector);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -666,21 +666,23 @@ static void glue(nand_blk_write_, PAGE_SIZE)(NANDFlashState *s)
|
||||||
MIN(OOB_SIZE, off + s->iolen - PAGE_SIZE));
|
MIN(OOB_SIZE, off + s->iolen - PAGE_SIZE));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (bdrv_write(s->bdrv, sector, iobuf, PAGE_SECTORS) == -1)
|
if (bdrv_write(s->bdrv, sector, iobuf, PAGE_SECTORS) < 0) {
|
||||||
printf("%s: write error in sector %" PRIu64 "\n", __func__, sector);
|
printf("%s: write error in sector %" PRIu64 "\n", __func__, sector);
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
off = PAGE_START(s->addr) + (s->addr & PAGE_MASK) + s->offset;
|
off = PAGE_START(s->addr) + (s->addr & PAGE_MASK) + s->offset;
|
||||||
sector = off >> 9;
|
sector = off >> 9;
|
||||||
soff = off & 0x1ff;
|
soff = off & 0x1ff;
|
||||||
if (bdrv_read(s->bdrv, sector, iobuf, PAGE_SECTORS + 2) == -1) {
|
if (bdrv_read(s->bdrv, sector, iobuf, PAGE_SECTORS + 2) < 0) {
|
||||||
printf("%s: read error in sector %" PRIu64 "\n", __func__, sector);
|
printf("%s: read error in sector %" PRIu64 "\n", __func__, sector);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
mem_and(iobuf + soff, s->io, s->iolen);
|
mem_and(iobuf + soff, s->io, s->iolen);
|
||||||
|
|
||||||
if (bdrv_write(s->bdrv, sector, iobuf, PAGE_SECTORS + 2) == -1)
|
if (bdrv_write(s->bdrv, sector, iobuf, PAGE_SECTORS + 2) < 0) {
|
||||||
printf("%s: write error in sector %" PRIu64 "\n", __func__, sector);
|
printf("%s: write error in sector %" PRIu64 "\n", __func__, sector);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
s->offset = 0;
|
s->offset = 0;
|
||||||
}
|
}
|
||||||
|
@ -704,31 +706,37 @@ static void glue(nand_blk_erase_, PAGE_SIZE)(NANDFlashState *s)
|
||||||
i = SECTOR(addr);
|
i = SECTOR(addr);
|
||||||
page = SECTOR(addr + (ADDR_SHIFT + s->erase_shift));
|
page = SECTOR(addr + (ADDR_SHIFT + s->erase_shift));
|
||||||
for (; i < page; i ++)
|
for (; i < page; i ++)
|
||||||
if (bdrv_write(s->bdrv, i, iobuf, 1) == -1)
|
if (bdrv_write(s->bdrv, i, iobuf, 1) < 0) {
|
||||||
printf("%s: write error in sector %" PRIu64 "\n", __func__, i);
|
printf("%s: write error in sector %" PRIu64 "\n", __func__, i);
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
addr = PAGE_START(addr);
|
addr = PAGE_START(addr);
|
||||||
page = addr >> 9;
|
page = addr >> 9;
|
||||||
if (bdrv_read(s->bdrv, page, iobuf, 1) == -1)
|
if (bdrv_read(s->bdrv, page, iobuf, 1) < 0) {
|
||||||
printf("%s: read error in sector %" PRIu64 "\n", __func__, page);
|
printf("%s: read error in sector %" PRIu64 "\n", __func__, page);
|
||||||
|
}
|
||||||
memset(iobuf + (addr & 0x1ff), 0xff, (~addr & 0x1ff) + 1);
|
memset(iobuf + (addr & 0x1ff), 0xff, (~addr & 0x1ff) + 1);
|
||||||
if (bdrv_write(s->bdrv, page, iobuf, 1) == -1)
|
if (bdrv_write(s->bdrv, page, iobuf, 1) < 0) {
|
||||||
printf("%s: write error in sector %" PRIu64 "\n", __func__, page);
|
printf("%s: write error in sector %" PRIu64 "\n", __func__, page);
|
||||||
|
}
|
||||||
|
|
||||||
memset(iobuf, 0xff, 0x200);
|
memset(iobuf, 0xff, 0x200);
|
||||||
i = (addr & ~0x1ff) + 0x200;
|
i = (addr & ~0x1ff) + 0x200;
|
||||||
for (addr += ((PAGE_SIZE + OOB_SIZE) << s->erase_shift) - 0x200;
|
for (addr += ((PAGE_SIZE + OOB_SIZE) << s->erase_shift) - 0x200;
|
||||||
i < addr; i += 0x200)
|
i < addr; i += 0x200)
|
||||||
if (bdrv_write(s->bdrv, i >> 9, iobuf, 1) == -1)
|
if (bdrv_write(s->bdrv, i >> 9, iobuf, 1) < 0) {
|
||||||
printf("%s: write error in sector %" PRIu64 "\n",
|
printf("%s: write error in sector %" PRIu64 "\n",
|
||||||
__func__, i >> 9);
|
__func__, i >> 9);
|
||||||
|
}
|
||||||
|
|
||||||
page = i >> 9;
|
page = i >> 9;
|
||||||
if (bdrv_read(s->bdrv, page, iobuf, 1) == -1)
|
if (bdrv_read(s->bdrv, page, iobuf, 1) < 0) {
|
||||||
printf("%s: read error in sector %" PRIu64 "\n", __func__, page);
|
printf("%s: read error in sector %" PRIu64 "\n", __func__, page);
|
||||||
|
}
|
||||||
memset(iobuf, 0xff, ((addr - 1) & 0x1ff) + 1);
|
memset(iobuf, 0xff, ((addr - 1) & 0x1ff) + 1);
|
||||||
if (bdrv_write(s->bdrv, page, iobuf, 1) == -1)
|
if (bdrv_write(s->bdrv, page, iobuf, 1) < 0) {
|
||||||
printf("%s: write error in sector %" PRIu64 "\n", __func__, page);
|
printf("%s: write error in sector %" PRIu64 "\n", __func__, page);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -740,18 +748,20 @@ static void glue(nand_blk_load_, PAGE_SIZE)(NANDFlashState *s,
|
||||||
|
|
||||||
if (s->bdrv) {
|
if (s->bdrv) {
|
||||||
if (s->mem_oob) {
|
if (s->mem_oob) {
|
||||||
if (bdrv_read(s->bdrv, SECTOR(addr), s->io, PAGE_SECTORS) == -1)
|
if (bdrv_read(s->bdrv, SECTOR(addr), s->io, PAGE_SECTORS) < 0) {
|
||||||
printf("%s: read error in sector %" PRIu64 "\n",
|
printf("%s: read error in sector %" PRIu64 "\n",
|
||||||
__func__, SECTOR(addr));
|
__func__, SECTOR(addr));
|
||||||
|
}
|
||||||
memcpy(s->io + SECTOR_OFFSET(s->addr) + PAGE_SIZE,
|
memcpy(s->io + SECTOR_OFFSET(s->addr) + PAGE_SIZE,
|
||||||
s->storage + (PAGE(s->addr) << OOB_SHIFT),
|
s->storage + (PAGE(s->addr) << OOB_SHIFT),
|
||||||
OOB_SIZE);
|
OOB_SIZE);
|
||||||
s->ioaddr = s->io + SECTOR_OFFSET(s->addr) + offset;
|
s->ioaddr = s->io + SECTOR_OFFSET(s->addr) + offset;
|
||||||
} else {
|
} else {
|
||||||
if (bdrv_read(s->bdrv, PAGE_START(addr) >> 9,
|
if (bdrv_read(s->bdrv, PAGE_START(addr) >> 9,
|
||||||
s->io, (PAGE_SECTORS + 2)) == -1)
|
s->io, (PAGE_SECTORS + 2)) < 0) {
|
||||||
printf("%s: read error in sector %" PRIu64 "\n",
|
printf("%s: read error in sector %" PRIu64 "\n",
|
||||||
__func__, PAGE_START(addr) >> 9);
|
__func__, PAGE_START(addr) >> 9);
|
||||||
|
}
|
||||||
s->ioaddr = s->io + (PAGE_START(addr) & 0x1ff) + offset;
|
s->ioaddr = s->io + (PAGE_START(addr) & 0x1ff) + offset;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -351,7 +351,7 @@ static inline int onenand_erase(OneNANDState *s, int sec, int num)
|
||||||
for (; num > 0; num--, sec++) {
|
for (; num > 0; num--, sec++) {
|
||||||
if (s->bdrv_cur) {
|
if (s->bdrv_cur) {
|
||||||
int erasesec = s->secs_cur + (sec >> 5);
|
int erasesec = s->secs_cur + (sec >> 5);
|
||||||
if (bdrv_write(s->bdrv_cur, sec, blankbuf, 1)) {
|
if (bdrv_write(s->bdrv_cur, sec, blankbuf, 1) < 0) {
|
||||||
goto fail;
|
goto fail;
|
||||||
}
|
}
|
||||||
if (bdrv_read(s->bdrv_cur, erasesec, tmpbuf, 1) < 0) {
|
if (bdrv_read(s->bdrv_cur, erasesec, tmpbuf, 1) < 0) {
|
||||||
|
|
|
@ -442,7 +442,6 @@ static void pflash_write(pflash_t *pfl, target_phys_addr_t offset,
|
||||||
pfl->bypass = 0;
|
pfl->bypass = 0;
|
||||||
pfl->wcycle = 0;
|
pfl->wcycle = 0;
|
||||||
pfl->cmd = 0;
|
pfl->cmd = 0;
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -474,7 +474,6 @@ static void pflash_write (pflash_t *pfl, target_phys_addr_t offset,
|
||||||
do_bypass:
|
do_bypass:
|
||||||
pfl->wcycle = 2;
|
pfl->wcycle = 2;
|
||||||
pfl->cmd = 0;
|
pfl->cmd = 0;
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -172,7 +172,6 @@ static void pxa27x_keyboard_event (PXA2xxKeyPadState *kp, int keycode)
|
||||||
kp->kpc |= KPC_MI;
|
kp->kpc |= KPC_MI;
|
||||||
qemu_irq_raise(kp->irq);
|
qemu_irq_raise(kp->irq);
|
||||||
}
|
}
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static uint64_t pxa2xx_keypad_read(void *opaque, target_phys_addr_t offset,
|
static uint64_t pxa2xx_keypad_read(void *opaque, target_phys_addr_t offset,
|
||||||
|
|
|
@ -34,7 +34,6 @@ int qdev_hotplug = 0;
|
||||||
static bool qdev_hot_added = false;
|
static bool qdev_hot_added = false;
|
||||||
static bool qdev_hot_removed = false;
|
static bool qdev_hot_removed = false;
|
||||||
|
|
||||||
/* Register a new device type. */
|
|
||||||
const VMStateDescription *qdev_get_vmsd(DeviceState *dev)
|
const VMStateDescription *qdev_get_vmsd(DeviceState *dev)
|
||||||
{
|
{
|
||||||
DeviceClass *dc = DEVICE_GET_CLASS(dev);
|
DeviceClass *dc = DEVICE_GET_CLASS(dev);
|
||||||
|
|
|
@ -822,7 +822,6 @@ static void complete (SB16State *s)
|
||||||
|
|
||||||
ldebug ("\n");
|
ldebug ("\n");
|
||||||
s->cmd = -1;
|
s->cmd = -1;
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void legacy_reset (SB16State *s)
|
static void legacy_reset (SB16State *s)
|
||||||
|
|
|
@ -1437,7 +1437,6 @@ invalid_param_len:
|
||||||
|
|
||||||
invalid_field:
|
invalid_field:
|
||||||
scsi_check_condition(r, SENSE_CODE(INVALID_FIELD));
|
scsi_check_condition(r, SENSE_CODE(INVALID_FIELD));
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline bool check_lba_range(SCSIDiskState *s,
|
static inline bool check_lba_range(SCSIDiskState *s,
|
||||||
|
@ -1535,7 +1534,6 @@ static void scsi_disk_emulate_unmap(SCSIDiskReq *r, uint8_t *inbuf)
|
||||||
|
|
||||||
invalid_param_len:
|
invalid_param_len:
|
||||||
scsi_check_condition(r, SENSE_CODE(INVALID_PARAM_LEN));
|
scsi_check_condition(r, SENSE_CODE(INVALID_PARAM_LEN));
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void scsi_disk_emulate_write_data(SCSIRequest *req)
|
static void scsi_disk_emulate_write_data(SCSIRequest *req)
|
||||||
|
|
16
hw/sd.c
16
hw/sd.c
|
@ -1407,7 +1407,7 @@ static void sd_blk_read(SDState *sd, uint64_t addr, uint32_t len)
|
||||||
|
|
||||||
DPRINTF("sd_blk_read: addr = 0x%08llx, len = %d\n",
|
DPRINTF("sd_blk_read: addr = 0x%08llx, len = %d\n",
|
||||||
(unsigned long long) addr, len);
|
(unsigned long long) addr, len);
|
||||||
if (!sd->bdrv || bdrv_read(sd->bdrv, addr >> 9, sd->buf, 1) == -1) {
|
if (!sd->bdrv || bdrv_read(sd->bdrv, addr >> 9, sd->buf, 1) < 0) {
|
||||||
fprintf(stderr, "sd_blk_read: read error on host side\n");
|
fprintf(stderr, "sd_blk_read: read error on host side\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -1415,7 +1415,7 @@ static void sd_blk_read(SDState *sd, uint64_t addr, uint32_t len)
|
||||||
if (end > (addr & ~511) + 512) {
|
if (end > (addr & ~511) + 512) {
|
||||||
memcpy(sd->data, sd->buf + (addr & 511), 512 - (addr & 511));
|
memcpy(sd->data, sd->buf + (addr & 511), 512 - (addr & 511));
|
||||||
|
|
||||||
if (bdrv_read(sd->bdrv, end >> 9, sd->buf, 1) == -1) {
|
if (bdrv_read(sd->bdrv, end >> 9, sd->buf, 1) < 0) {
|
||||||
fprintf(stderr, "sd_blk_read: read error on host side\n");
|
fprintf(stderr, "sd_blk_read: read error on host side\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -1429,29 +1429,31 @@ static void sd_blk_write(SDState *sd, uint64_t addr, uint32_t len)
|
||||||
uint64_t end = addr + len;
|
uint64_t end = addr + len;
|
||||||
|
|
||||||
if ((addr & 511) || len < 512)
|
if ((addr & 511) || len < 512)
|
||||||
if (!sd->bdrv || bdrv_read(sd->bdrv, addr >> 9, sd->buf, 1) == -1) {
|
if (!sd->bdrv || bdrv_read(sd->bdrv, addr >> 9, sd->buf, 1) < 0) {
|
||||||
fprintf(stderr, "sd_blk_write: read error on host side\n");
|
fprintf(stderr, "sd_blk_write: read error on host side\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (end > (addr & ~511) + 512) {
|
if (end > (addr & ~511) + 512) {
|
||||||
memcpy(sd->buf + (addr & 511), sd->data, 512 - (addr & 511));
|
memcpy(sd->buf + (addr & 511), sd->data, 512 - (addr & 511));
|
||||||
if (bdrv_write(sd->bdrv, addr >> 9, sd->buf, 1) == -1) {
|
if (bdrv_write(sd->bdrv, addr >> 9, sd->buf, 1) < 0) {
|
||||||
fprintf(stderr, "sd_blk_write: write error on host side\n");
|
fprintf(stderr, "sd_blk_write: write error on host side\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (bdrv_read(sd->bdrv, end >> 9, sd->buf, 1) == -1) {
|
if (bdrv_read(sd->bdrv, end >> 9, sd->buf, 1) < 0) {
|
||||||
fprintf(stderr, "sd_blk_write: read error on host side\n");
|
fprintf(stderr, "sd_blk_write: read error on host side\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
memcpy(sd->buf, sd->data + 512 - (addr & 511), end & 511);
|
memcpy(sd->buf, sd->data + 512 - (addr & 511), end & 511);
|
||||||
if (bdrv_write(sd->bdrv, end >> 9, sd->buf, 1) == -1)
|
if (bdrv_write(sd->bdrv, end >> 9, sd->buf, 1) < 0) {
|
||||||
fprintf(stderr, "sd_blk_write: write error on host side\n");
|
fprintf(stderr, "sd_blk_write: write error on host side\n");
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
memcpy(sd->buf + (addr & 511), sd->data, len);
|
memcpy(sd->buf + (addr & 511), sd->data, len);
|
||||||
if (!sd->bdrv || bdrv_write(sd->bdrv, addr >> 9, sd->buf, 1) == -1)
|
if (!sd->bdrv || bdrv_write(sd->bdrv, addr >> 9, sd->buf, 1) < 0) {
|
||||||
fprintf(stderr, "sd_blk_write: write error on host side\n");
|
fprintf(stderr, "sd_blk_write: write error on host side\n");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
1
hw/tcx.c
1
hw/tcx.c
|
@ -472,7 +472,6 @@ static void tcx_dac_writel(void *opaque, target_phys_addr_t addr, uint64_t val,
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static const MemoryRegionOps tcx_dac_ops = {
|
static const MemoryRegionOps tcx_dac_ops = {
|
||||||
|
|
|
@ -576,7 +576,6 @@ bad_target:
|
||||||
*/
|
*/
|
||||||
usb_uas_queue_response(uas, req->tag, UAS_RC_INVALID_INFO_UNIT, 0);
|
usb_uas_queue_response(uas, req->tag, UAS_RC_INVALID_INFO_UNIT, 0);
|
||||||
g_free(req);
|
g_free(req);
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void usb_uas_task(UASDevice *uas, uas_ui *ui)
|
static void usb_uas_task(UASDevice *uas, uas_ui *ui)
|
||||||
|
@ -640,7 +639,6 @@ bad_target:
|
||||||
|
|
||||||
incorrect_lun:
|
incorrect_lun:
|
||||||
usb_uas_queue_response(uas, tag, UAS_RC_INCORRECT_LUN, 0);
|
usb_uas_queue_response(uas, tag, UAS_RC_INCORRECT_LUN, 0);
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int usb_uas_handle_data(USBDevice *dev, USBPacket *p)
|
static int usb_uas_handle_data(USBDevice *dev, USBPacket *p)
|
||||||
|
|
|
@ -1470,8 +1470,6 @@ static void ohci_port_set_status(OHCIState *ohci, int portnum, uint32_t val)
|
||||||
|
|
||||||
if (old_state != port->ctrl)
|
if (old_state != port->ctrl)
|
||||||
ohci_set_interrupt(ohci, OHCI_INTR_RHSC);
|
ohci_set_interrupt(ohci, OHCI_INTR_RHSC);
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static uint64_t ohci_mem_read(void *opaque,
|
static uint64_t ohci_mem_read(void *opaque,
|
||||||
|
|
|
@ -807,7 +807,6 @@ static void xhci_events_update(XHCIState *xhci, int v)
|
||||||
DPRINTF("xhci_events_update(): event ring no longer full\n");
|
DPRINTF("xhci_events_update(): event ring no longer full\n");
|
||||||
intr->er_full = 0;
|
intr->er_full = 0;
|
||||||
}
|
}
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void xhci_event(XHCIState *xhci, XHCIEvent *event, int v)
|
static void xhci_event(XHCIState *xhci, XHCIEvent *event, int v)
|
||||||
|
|
|
@ -211,7 +211,8 @@ static void versatile_init(ram_addr_t ram_size,
|
||||||
|
|
||||||
cpu_pic = arm_pic_init_cpu(cpu);
|
cpu_pic = arm_pic_init_cpu(cpu);
|
||||||
dev = sysbus_create_varargs("pl190", 0x10140000,
|
dev = sysbus_create_varargs("pl190", 0x10140000,
|
||||||
cpu_pic[0], cpu_pic[1], NULL);
|
cpu_pic[ARM_PIC_CPU_IRQ],
|
||||||
|
cpu_pic[ARM_PIC_CPU_FIQ], NULL);
|
||||||
for (n = 0; n < 32; n++) {
|
for (n = 0; n < 32; n++) {
|
||||||
pic[n] = qdev_get_gpio_in(dev, n);
|
pic[n] = qdev_get_gpio_in(dev, n);
|
||||||
}
|
}
|
||||||
|
|
|
@ -153,7 +153,6 @@ static void xen_domain_poll(void *opaque)
|
||||||
|
|
||||||
quit:
|
quit:
|
||||||
qemu_system_shutdown_request();
|
qemu_system_shutdown_request();
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int xen_domain_watcher(void)
|
static int xen_domain_watcher(void)
|
||||||
|
|
|
@ -200,7 +200,6 @@ vcard_free(VCard *vcard)
|
||||||
}
|
}
|
||||||
vcard_buffer_response_delete(vcard->vcard_buffer_response);
|
vcard_buffer_response_delete(vcard->vcard_buffer_response);
|
||||||
g_free(vcard);
|
g_free(vcard);
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|
|
@ -168,7 +168,6 @@ vcard_emul_delete_key(VCardKey *key)
|
||||||
if (key->slot) {
|
if (key->slot) {
|
||||||
PK11_FreeSlot(key->slot);
|
PK11_FreeSlot(key->slot);
|
||||||
}
|
}
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -418,7 +417,6 @@ vcard_emul_reset(VCard *card, VCardPower power)
|
||||||
/* TODO: we may also need to send insertion/removal events? */
|
/* TODO: we may also need to send insertion/removal events? */
|
||||||
slot = vcard_emul_card_get_slot(card);
|
slot = vcard_emul_card_get_slot(card);
|
||||||
PK11_Logout(slot); /* NOTE: ignoring SECStatus return value */
|
PK11_Logout(slot); /* NOTE: ignoring SECStatus return value */
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -535,7 +533,6 @@ vcard_emul_get_atr(VCard *card, unsigned char *atr, int *atr_len)
|
||||||
|
|
||||||
memcpy(atr, nss_atr, len);
|
memcpy(atr, nss_atr, len);
|
||||||
*atr_len = len;
|
*atr_len = len;
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
@ -93,7 +93,6 @@ vreader_free(VReader *reader)
|
||||||
reader->reader_private_free(reader->reader_private);
|
reader->reader_private_free(reader->reader_private);
|
||||||
}
|
}
|
||||||
g_free(reader);
|
g_free(reader);
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static VCard *
|
static VCard *
|
||||||
|
|
|
@ -2762,7 +2762,6 @@ static void setup_frame(int sig, struct target_sigaction * ka,
|
||||||
give_sigsegv:
|
give_sigsegv:
|
||||||
unlock_user_struct(frame, frame_addr, 1);
|
unlock_user_struct(frame, frame_addr, 1);
|
||||||
force_sig(TARGET_SIGSEGV/*, current*/);
|
force_sig(TARGET_SIGSEGV/*, current*/);
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
long do_sigreturn(CPUMIPSState *regs)
|
long do_sigreturn(CPUMIPSState *regs)
|
||||||
|
@ -2871,7 +2870,6 @@ static void setup_rt_frame(int sig, struct target_sigaction *ka,
|
||||||
give_sigsegv:
|
give_sigsegv:
|
||||||
unlock_user_struct(frame, frame_addr, 1);
|
unlock_user_struct(frame, frame_addr, 1);
|
||||||
force_sig(TARGET_SIGSEGV/*, current*/);
|
force_sig(TARGET_SIGSEGV/*, current*/);
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
long do_rt_sigreturn(CPUMIPSState *env)
|
long do_rt_sigreturn(CPUMIPSState *env)
|
||||||
|
|
|
@ -193,7 +193,6 @@ void os_parse_cmd_args(int index, const char *optarg)
|
||||||
break;
|
break;
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void change_process_uid(void)
|
static void change_process_uid(void)
|
||||||
|
|
|
@ -223,11 +223,19 @@ int qemu_pipe(int pipefd[2]);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
/* MinGW needs a type cast for the 'buf' argument. */
|
/* MinGW needs type casts for the 'buf' and 'optval' arguments. */
|
||||||
|
#define qemu_getsockopt(sockfd, level, optname, optval, optlen) \
|
||||||
|
getsockopt(sockfd, level, optname, (void *)optval, optlen)
|
||||||
|
#define qemu_setsockopt(sockfd, level, optname, optval, optlen) \
|
||||||
|
setsockopt(sockfd, level, optname, (const void *)optval, optlen)
|
||||||
#define qemu_recv(sockfd, buf, len, flags) recv(sockfd, (void *)buf, len, flags)
|
#define qemu_recv(sockfd, buf, len, flags) recv(sockfd, (void *)buf, len, flags)
|
||||||
#define qemu_sendto(sockfd, buf, len, flags, destaddr, addrlen) \
|
#define qemu_sendto(sockfd, buf, len, flags, destaddr, addrlen) \
|
||||||
sendto(sockfd, (const void *)buf, len, flags, destaddr, addrlen)
|
sendto(sockfd, (const void *)buf, len, flags, destaddr, addrlen)
|
||||||
#else
|
#else
|
||||||
|
#define qemu_getsockopt(sockfd, level, optname, optval, optlen) \
|
||||||
|
getsockopt(sockfd, level, optname, optval, optlen)
|
||||||
|
#define qemu_setsockopt(sockfd, level, optname, optval, optlen) \
|
||||||
|
setsockopt(sockfd, level, optname, optval, optlen)
|
||||||
#define qemu_recv(sockfd, buf, len, flags) recv(sockfd, buf, len, flags)
|
#define qemu_recv(sockfd, buf, len, flags) recv(sockfd, buf, len, flags)
|
||||||
#define qemu_sendto(sockfd, buf, len, flags, destaddr, addrlen) \
|
#define qemu_sendto(sockfd, buf, len, flags, destaddr, addrlen) \
|
||||||
sendto(sockfd, buf, len, flags, destaddr, addrlen)
|
sendto(sockfd, buf, len, flags, destaddr, addrlen)
|
||||||
|
|
|
@ -266,7 +266,6 @@ static void wait_for_connect(void *opaque)
|
||||||
s->callback(s->fd, s->opaque);
|
s->callback(s->fd, s->opaque);
|
||||||
}
|
}
|
||||||
g_free(s);
|
g_free(s);
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int inet_connect_addr(struct addrinfo *addr, bool *in_progress,
|
static int inet_connect_addr(struct addrinfo *addr, bool *in_progress,
|
||||||
|
@ -282,7 +281,7 @@ static int inet_connect_addr(struct addrinfo *addr, bool *in_progress,
|
||||||
inet_strfamily(addr->ai_family), strerror(errno));
|
inet_strfamily(addr->ai_family), strerror(errno));
|
||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
|
qemu_setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on));
|
||||||
if (connect_state != NULL) {
|
if (connect_state != NULL) {
|
||||||
socket_set_nonblock(sock);
|
socket_set_nonblock(sock);
|
||||||
}
|
}
|
||||||
|
|
|
@ -988,8 +988,6 @@ int64_t qmp_guest_fsfreeze_thaw(Error **err)
|
||||||
void qmp_guest_fstrim(bool has_minimum, int64_t minimum, Error **err)
|
void qmp_guest_fstrim(bool has_minimum, int64_t minimum, Error **err)
|
||||||
{
|
{
|
||||||
error_set(err, QERR_UNSUPPORTED);
|
error_set(err, QERR_UNSUPPORTED);
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -180,8 +180,6 @@ int64_t qmp_guest_fsfreeze_thaw(Error **err)
|
||||||
void qmp_guest_fstrim(bool has_minimum, int64_t minimum, Error **err)
|
void qmp_guest_fstrim(bool has_minimum, int64_t minimum, Error **err)
|
||||||
{
|
{
|
||||||
error_set(err, QERR_UNSUPPORTED);
|
error_set(err, QERR_UNSUPPORTED);
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
typedef enum {
|
typedef enum {
|
||||||
|
|
1
savevm.c
1
savevm.c
|
@ -2201,7 +2201,6 @@ void qmp_xen_save_devices_state(const char *filename, Error **errp)
|
||||||
the_end:
|
the_end:
|
||||||
if (saved_vm_running)
|
if (saved_vm_running)
|
||||||
vm_start();
|
vm_start();
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int load_vmstate(const char *name)
|
int load_vmstate(const char *name)
|
||||||
|
|
|
@ -92,8 +92,8 @@ struct icmp {
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Lower bounds on packet lengths for various types.
|
* Lower bounds on packet lengths for various types.
|
||||||
* For the error advice packets must first insure that the
|
* For the error advice packets must first ensure that the
|
||||||
* packet is large enought to contain the returned ip header.
|
* packet is large enough to contain the returned ip header.
|
||||||
* Only then can we do the check to see if 64 bits of packet
|
* Only then can we do the check to see if 64 bits of packet
|
||||||
* data have been returned, since we need to check the returned
|
* data have been returned, since we need to check the returned
|
||||||
* ip header length.
|
* ip header length.
|
||||||
|
|
|
@ -213,7 +213,6 @@ ip_input(struct mbuf *m)
|
||||||
return;
|
return;
|
||||||
bad:
|
bad:
|
||||||
m_free(m);
|
m_free(m);
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#define iptofrag(P) ((struct ipasfrag *)(((char*)(P)) - sizeof(struct qlink)))
|
#define iptofrag(P) ((struct ipasfrag *)(((char*)(P)) - sizeof(struct qlink)))
|
||||||
|
|
|
@ -1281,8 +1281,6 @@ drop:
|
||||||
* Drop space held by incoming segment and return.
|
* Drop space held by incoming segment and return.
|
||||||
*/
|
*/
|
||||||
m_free(m);
|
m_free(m);
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
|
|
|
@ -231,7 +231,6 @@ udp_input(register struct mbuf *m, int iphlen)
|
||||||
return;
|
return;
|
||||||
bad:
|
bad:
|
||||||
m_free(m);
|
m_free(m);
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int udp_output2(struct socket *so, struct mbuf *m,
|
int udp_output2(struct socket *so, struct mbuf *m,
|
||||||
|
|
|
@ -1932,8 +1932,6 @@ static void disas_uc32_insn(CPUUniCore32State *env, DisasContext *s)
|
||||||
}
|
}
|
||||||
ILLEGAL;
|
ILLEGAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* generate intermediate code in gen_opc_buf and gen_opparam_buf for
|
/* generate intermediate code in gen_opc_buf and gen_opparam_buf for
|
||||||
|
|
|
@ -1197,20 +1197,11 @@ static inline void tcg_out_qemu_ld(TCGContext *s, const TCGArg *args, int opc)
|
||||||
case 1:
|
case 1:
|
||||||
case 2:
|
case 2:
|
||||||
default:
|
default:
|
||||||
if (data_reg != TCG_REG_R0) {
|
tcg_out_mov_reg(s, COND_AL, data_reg, TCG_REG_R0);
|
||||||
tcg_out_dat_reg(s, COND_AL, ARITH_MOV,
|
|
||||||
data_reg, 0, TCG_REG_R0, SHIFT_IMM_LSL(0));
|
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
case 3:
|
case 3:
|
||||||
if (data_reg != TCG_REG_R0) {
|
tcg_out_mov_reg(s, COND_AL, data_reg, TCG_REG_R0);
|
||||||
tcg_out_dat_reg(s, COND_AL, ARITH_MOV,
|
tcg_out_mov_reg(s, COND_AL, data_reg2, TCG_REG_R1);
|
||||||
data_reg, 0, TCG_REG_R0, SHIFT_IMM_LSL(0));
|
|
||||||
}
|
|
||||||
if (data_reg2 != TCG_REG_R1) {
|
|
||||||
tcg_out_dat_reg(s, COND_AL, ARITH_MOV,
|
|
||||||
data_reg2, 0, TCG_REG_R1, SHIFT_IMM_LSL(0));
|
|
||||||
}
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -617,7 +617,6 @@ void start_auth_sasl(VncState *vs)
|
||||||
|
|
||||||
authabort:
|
authabort:
|
||||||
vnc_client_error(vs);
|
vnc_client_error(vs);
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -49,7 +49,7 @@ static int vnc_tls_initialize(void)
|
||||||
if (gnutls_global_init () < 0)
|
if (gnutls_global_init () < 0)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
/* XXX ought to re-generate diffie-hellmen params periodically */
|
/* XXX ought to re-generate diffie-hellman params periodically */
|
||||||
if (gnutls_dh_params_init (&dh_params) < 0)
|
if (gnutls_dh_params_init (&dh_params) < 0)
|
||||||
return 0;
|
return 0;
|
||||||
if (gnutls_dh_params_generate2 (dh_params, DH_BITS) < 0)
|
if (gnutls_dh_params_generate2 (dh_params, DH_BITS) < 0)
|
||||||
|
|
1
vl.c
1
vl.c
|
@ -1023,7 +1023,6 @@ static void numa_add(const char *optarg)
|
||||||
}
|
}
|
||||||
nb_numa_nodes++;
|
nb_numa_nodes++;
|
||||||
}
|
}
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void smp_parse(const char *optarg)
|
static void smp_parse(const char *optarg)
|
||||||
|
|
Loading…
Reference in a new issue