Merge remote-tracking branch 'mjt/trivial-patches' into staging
# By Stefan Weil (5) and others
# Via Michael Tokarev
* mjt/trivial-patches:
migration: Fix compiler warning ('caps' may be used uninitialized)
util/path: Fix type which is longer than 8 bit for MinGW
hw/9pfs: Fix errno value for xattr functions
vl: Clean up unnecessary boot_order complications
qemu-char: Fix potential out of bounds access to local arrays
pci-ohci: Add missing 'break' in ohci_service_td
sh4: Fix serial line access for Linux kernels later than 3.2
hw/alpha: Fix compiler warning (integer constant is too large)
target-i386: Fix compiler warning (integer constant is too large)
block: Remove unused assignment (fixes warning from clang)
exec: cleanup DEBUG_SUBPAGE
tests: Fix schema parser test for in-tree build
tests: Update .gitignore for test-int128 and test-bitops
.gitignore: ignore tests/qemu-iotests/socket_scm_helper
Message-id: 1381051979-25742-1-git-send-email-mjt@msgid.tls.msk.ru
Signed-off-by: Anthony Liguori <anthony@codemonkey.ws>
This commit is contained in:
Anthony Liguori
commit
80dfc87394
@ -1926,7 +1926,6 @@ void qmp_drive_mirror(const char *device, const char *target,
|
||||
} else {
|
||||
switch (mode) {
|
||||
case NEW_IMAGE_MODE_EXISTING:
|
||||
ret = 0;
|
||||
break;
|
||||
case NEW_IMAGE_MODE_ABSOLUTE_PATHS:
|
||||
/* create new image with backing file */
|
||||
|
||||
18
exec.c
18
exec.c
@ -1573,7 +1573,7 @@ static uint64_t subpage_read(void *opaque, hwaddr addr,
|
||||
uint8_t buf[4];
|
||||
|
||||
#if defined(DEBUG_SUBPAGE)
|
||||
printf("%s: subpage %p len %d addr " TARGET_FMT_plx "\n", __func__,
|
||||
printf("%s: subpage %p len %u addr " TARGET_FMT_plx "\n", __func__,
|
||||
subpage, len, addr);
|
||||
#endif
|
||||
address_space_read(subpage->as, addr + subpage->base, buf, len);
|
||||
@ -1596,7 +1596,7 @@ static void subpage_write(void *opaque, hwaddr addr,
|
||||
uint8_t buf[4];
|
||||
|
||||
#if defined(DEBUG_SUBPAGE)
|
||||
printf("%s: subpage %p len %d addr " TARGET_FMT_plx
|
||||
printf("%s: subpage %p len %u addr " TARGET_FMT_plx
|
||||
" value %"PRIx64"\n",
|
||||
__func__, subpage, len, addr, value);
|
||||
#endif
|
||||
@ -1617,16 +1617,16 @@ static void subpage_write(void *opaque, hwaddr addr,
|
||||
}
|
||||
|
||||
static bool subpage_accepts(void *opaque, hwaddr addr,
|
||||
unsigned size, bool is_write)
|
||||
unsigned len, bool is_write)
|
||||
{
|
||||
subpage_t *subpage = opaque;
|
||||
#if defined(DEBUG_SUBPAGE)
|
||||
printf("%s: subpage %p %c len %d addr " TARGET_FMT_plx "\n",
|
||||
printf("%s: subpage %p %c len %u addr " TARGET_FMT_plx "\n",
|
||||
__func__, subpage, is_write ? 'w' : 'r', len, addr);
|
||||
#endif
|
||||
|
||||
return address_space_access_valid(subpage->as, addr + subpage->base,
|
||||
size, is_write);
|
||||
len, is_write);
|
||||
}
|
||||
|
||||
static const MemoryRegionOps subpage_ops = {
|
||||
@ -1646,8 +1646,8 @@ static int subpage_register (subpage_t *mmio, uint32_t start, uint32_t end,
|
||||
idx = SUBPAGE_IDX(start);
|
||||
eidx = SUBPAGE_IDX(end);
|
||||
#if defined(DEBUG_SUBPAGE)
|
||||
printf("%s: %p start %08x end %08x idx %08x eidx %08x mem %ld\n", __func__,
|
||||
mmio, start, end, idx, eidx, memory);
|
||||
printf("%s: %p start %08x end %08x idx %08x eidx %08x section %d\n",
|
||||
__func__, mmio, start, end, idx, eidx, section);
|
||||
#endif
|
||||
for (; idx <= eidx; idx++) {
|
||||
mmio->sub_section[idx] = section;
|
||||
@ -1668,8 +1668,8 @@ static subpage_t *subpage_init(AddressSpace *as, hwaddr base)
|
||||
"subpage", TARGET_PAGE_SIZE);
|
||||
mmio->iomem.subpage = true;
|
||||
#if defined(DEBUG_SUBPAGE)
|
||||
printf("%s: %p base " TARGET_FMT_plx " len %08x %d\n", __func__,
|
||||
mmio, base, TARGET_PAGE_SIZE, subpage_memory);
|
||||
printf("%s: %p base " TARGET_FMT_plx " len %08x\n", __func__,
|
||||
mmio, base, TARGET_PAGE_SIZE);
|
||||
#endif
|
||||
subpage_register(mmio, 0, TARGET_PAGE_SIZE-1, PHYS_SECTION_UNASSIGNED);
|
||||
|
||||
|
||||
@ -36,7 +36,7 @@ ssize_t v9fs_get_xattr(FsContext *ctx, const char *path,
|
||||
if (xops) {
|
||||
return xops->getxattr(ctx, path, name, value, size);
|
||||
}
|
||||
errno = -EOPNOTSUPP;
|
||||
errno = EOPNOTSUPP;
|
||||
return -1;
|
||||
}
|
||||
|
||||
@ -123,7 +123,7 @@ int v9fs_set_xattr(FsContext *ctx, const char *path, const char *name,
|
||||
if (xops) {
|
||||
return xops->setxattr(ctx, path, name, value, size, flags);
|
||||
}
|
||||
errno = -EOPNOTSUPP;
|
||||
errno = EOPNOTSUPP;
|
||||
return -1;
|
||||
|
||||
}
|
||||
@ -135,7 +135,7 @@ int v9fs_remove_xattr(FsContext *ctx,
|
||||
if (xops) {
|
||||
return xops->removexattr(ctx, path, name);
|
||||
}
|
||||
errno = -EOPNOTSUPP;
|
||||
errno = EOPNOTSUPP;
|
||||
return -1;
|
||||
|
||||
}
|
||||
|
||||
@ -700,7 +700,7 @@ static IOMMUTLBEntry typhoon_translate_iommu(MemoryRegion *iommu, hwaddr addr)
|
||||
}
|
||||
}
|
||||
|
||||
if (addr >= 0x80000000000 && addr <= 0xfffffffffff) {
|
||||
if (addr >= 0x80000000000ull && addr <= 0xfffffffffffull) {
|
||||
/* Check the fourth window for DAC enable and window enable. */
|
||||
if ((pchip->win[3].wba & 0x80000000001ull) == 0x80000000001ull) {
|
||||
uint64_t pte_addr;
|
||||
|
||||
@ -248,11 +248,9 @@ static uint64_t sh_serial_read(void *opaque, hwaddr offs,
|
||||
s->flags &= ~SH_SERIAL_FLAG_RDF;
|
||||
}
|
||||
break;
|
||||
#if 0
|
||||
case 0x18:
|
||||
ret = s->fcr;
|
||||
break;
|
||||
#endif
|
||||
case 0x1c:
|
||||
ret = s->rx_cnt;
|
||||
break;
|
||||
|
||||
@ -1143,7 +1143,9 @@ static int ohci_service_td(OHCIState *ohci, struct ohci_ed *ed)
|
||||
switch (ret) {
|
||||
case USB_RET_IOERROR:
|
||||
case USB_RET_NODEV:
|
||||
DPRINTF("usb-ohci: got DEV ERROR\n");
|
||||
OHCI_SET_BM(td.flags, TD_CC, OHCI_CC_DEVICENOTRESPONDING);
|
||||
break;
|
||||
case USB_RET_NAK:
|
||||
DPRINTF("usb-ohci: got NAK\n");
|
||||
return 1;
|
||||
|
||||
@ -150,6 +150,7 @@ MigrationCapabilityStatusList *qmp_query_migrate_capabilities(Error **errp)
|
||||
MigrationState *s = migrate_get_current();
|
||||
int i;
|
||||
|
||||
caps = NULL; /* silence compiler warning */
|
||||
for (i = 0; i < MIGRATION_CAPABILITY_MAX; i++) {
|
||||
if (head == NULL) {
|
||||
head = g_malloc0(sizeof(*caps));
|
||||
|
||||
@ -2989,11 +2989,11 @@ QemuOpts *qemu_chr_parse_compat(const char *label, const char *filename)
|
||||
if (strstart(filename, "vc", &p)) {
|
||||
qemu_opt_set(opts, "backend", "vc");
|
||||
if (*p == ':') {
|
||||
if (sscanf(p+1, "%8[0-9]x%8[0-9]", width, height) == 2) {
|
||||
if (sscanf(p+1, "%7[0-9]x%7[0-9]", width, height) == 2) {
|
||||
/* pixels */
|
||||
qemu_opt_set(opts, "width", width);
|
||||
qemu_opt_set(opts, "height", height);
|
||||
} else if (sscanf(p+1, "%8[0-9]Cx%8[0-9]C", width, height) == 2) {
|
||||
} else if (sscanf(p+1, "%7[0-9]Cx%7[0-9]C", width, height) == 2) {
|
||||
/* chars */
|
||||
qemu_opt_set(opts, "cols", width);
|
||||
qemu_opt_set(opts, "rows", height);
|
||||
|
||||
@ -75,7 +75,7 @@ static void walk_pte2(MemoryMappingList *list,
|
||||
}
|
||||
|
||||
/* PAE Paging or IA-32e Paging */
|
||||
#define PLM4_ADDR_MASK 0xffffffffff000 /* selects bits 51:12 */
|
||||
#define PLM4_ADDR_MASK 0xffffffffff000ULL /* selects bits 51:12 */
|
||||
|
||||
static void walk_pde(MemoryMappingList *list, hwaddr pde_start_addr,
|
||||
int32_t a20_mask, target_ulong start_line_addr)
|
||||
|
||||
3
tests/.gitignore
vendored
3
tests/.gitignore
vendored
@ -5,9 +5,11 @@ check-qjson
|
||||
check-qlist
|
||||
check-qstring
|
||||
test-aio
|
||||
test-bitops
|
||||
test-throttle
|
||||
test-cutils
|
||||
test-hbitmap
|
||||
test-int128
|
||||
test-iov
|
||||
test-mul64
|
||||
test-qapi-types.[ch]
|
||||
@ -21,3 +23,4 @@ test-thread-pool
|
||||
test-x86-cpuid
|
||||
test-xbzrle
|
||||
*-test
|
||||
qapi-schema/*.test.*
|
||||
|
||||
@ -261,10 +261,10 @@ check-tests/test-qapi.py: tests/test-qapi.py
|
||||
|
||||
.PHONY: $(patsubst %, check-%, $(check-qapi-schema-y))
|
||||
$(patsubst %, check-%, $(check-qapi-schema-y)): check-%.json: $(SRC_PATH)/%.json
|
||||
$(call quiet-command, PYTHONPATH=$(SRC_PATH)/scripts $(PYTHON) $(SRC_PATH)/tests/qapi-schema/test-qapi.py <$^ >$*.out 2>$*.err; echo $$? >$*.exit, " TEST $*.out")
|
||||
@diff -q $(SRC_PATH)/$*.out $*.out
|
||||
@diff -q $(SRC_PATH)/$*.err $*.err
|
||||
@diff -q $(SRC_PATH)/$*.exit $*.exit
|
||||
$(call quiet-command, PYTHONPATH=$(SRC_PATH)/scripts $(PYTHON) $(SRC_PATH)/tests/qapi-schema/test-qapi.py <$^ >$*.test.out 2>$*.test.err; echo $$? >$*.test.exit, " TEST $*.out")
|
||||
@diff -q $(SRC_PATH)/$*.out $*.test.out
|
||||
@diff -q $(SRC_PATH)/$*.err $*.test.err
|
||||
@diff -q $(SRC_PATH)/$*.exit $*.test.exit
|
||||
|
||||
# Consolidated targets
|
||||
|
||||
|
||||
1
tests/qemu-iotests/.gitignore
vendored
1
tests/qemu-iotests/.gitignore
vendored
@ -2,6 +2,7 @@ check.log
|
||||
check.time
|
||||
*.out.bad
|
||||
*.notrun
|
||||
socket_scm_helper
|
||||
|
||||
# ignore everything in the scratch directory
|
||||
scratch/
|
||||
|
||||
@ -39,7 +39,7 @@ static int strneq(const char *s1, unsigned int n, const char *s2)
|
||||
}
|
||||
|
||||
static struct pathelem *add_entry(struct pathelem *root, const char *name,
|
||||
unsigned char type);
|
||||
unsigned type);
|
||||
|
||||
static struct pathelem *new_entry(const char *root,
|
||||
struct pathelem *parent,
|
||||
@ -82,7 +82,7 @@ static struct pathelem *add_dir_maybe(struct pathelem *path)
|
||||
}
|
||||
|
||||
static struct pathelem *add_entry(struct pathelem *root, const char *name,
|
||||
unsigned char type)
|
||||
unsigned type)
|
||||
{
|
||||
struct pathelem **e;
|
||||
|
||||
|
||||
6
vl.c
6
vl.c
@ -2825,7 +2825,7 @@ int main(int argc, char **argv, char **envp)
|
||||
const char *icount_option = NULL;
|
||||
const char *initrd_filename;
|
||||
const char *kernel_filename, *kernel_cmdline;
|
||||
const char *boot_order = NULL;
|
||||
const char *boot_order;
|
||||
DisplayState *ds;
|
||||
int cyls, heads, secs, translation;
|
||||
QemuOpts *hda_opts = NULL, *opts, *machine_opts;
|
||||
@ -4050,9 +4050,7 @@ int main(int argc, char **argv, char **envp)
|
||||
initrd_filename = qemu_opt_get(machine_opts, "initrd");
|
||||
kernel_cmdline = qemu_opt_get(machine_opts, "append");
|
||||
|
||||
if (!boot_order) {
|
||||
boot_order = machine->default_boot_order;
|
||||
}
|
||||
boot_order = machine->default_boot_order;
|
||||
opts = qemu_opts_find(qemu_find_opts("boot-opts"), NULL);
|
||||
if (opts) {
|
||||
char *normal_boot_order;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user