mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'stefanha/trivial-patches' into staging

Browse Source 
* stefanha/trivial-patches:
  Add .gitignore for tests/
  e1000: Fix spelling (segmentaion -> segmentation) in debug output
  spice-qemu-char.c: Show what name is unsupported
  pflash_cfi01: remove redundant line
  qxl: Add missing GCC_FMT_ATTR and fix format specifier
  fix block_job_set_speed name in documentation
  error.c: don't return value for void function
This commit is contained in:
Anthony Liguori 2012-04-23 09:58:33 -05:00
commit 6b03296606
8 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
error.c
View File

@ -93,7 +93,7 @@ QDict *error_get_data(Error *err)
void error_set_field(Error *err, const char *field, const char *value) void error_set_field(Error *err, const char *field, const char *value)
{ {
QDict *dict = qdict_get_qdict(err->obj, "data"); QDict *dict = qdict_get_qdict(err->obj, "data");
return qdict_put(dict, field, qstring_from_str(value)); qdict_put(dict, field, qstring_from_str(value));
} }
void error_free(Error *err) void error_free(Error *err)

4
hmp-commands.hx
View File

@ -92,8 +92,8 @@ ETEXI
}, },
STEXI STEXI
@item block_job_set_stream @item block_job_set_speed
@findex block_job_set_stream @findex block_job_set_speed
Set maximum speed for a background block operation. Set maximum speed for a background block operation.
ETEXI ETEXI

2
hw/e1000.c
View File

@ -481,7 +481,7 @@ process_tx_desc(E1000State *s, struct e1000_tx_desc *dp)
} while (split_size -= bytes); } while (split_size -= bytes);
} else if (!tp->tse && tp->cptse) { } else if (!tp->tse && tp->cptse) {
// context descriptor TSE is not set, while data descriptor TSE is set // context descriptor TSE is not set, while data descriptor TSE is set
DBGOUT(TXERR, "TCP segmentaion Error\n"); DBGOUT(TXERR, "TCP segmentation error\n");
} else { } else {
split_size = MIN(sizeof(tp->data) - tp->size, split_size); split_size = MIN(sizeof(tp->data) - tp->size, split_size);
pci_dma_read(&s->dev, addr, tp->data + tp->size, split_size); pci_dma_read(&s->dev, addr, tp->data + tp->size, split_size);

1
hw/pflash_cfi01.c
View File

@ -144,7 +144,6 @@ static uint32_t pflash_read (pflash_t *pfl, target_phys_addr_t offset,
} else { } else {
ret = p[offset]; ret = p[offset];
ret |= p[offset + 1] << 8; ret |= p[offset + 1] << 8;
ret |= p[offset + 1] << 8;
ret |= p[offset + 2] << 16; ret |= p[offset + 2] << 16;
ret |= p[offset + 3] << 24; ret |= p[offset + 3] << 24;
} }

2
hw/qxl.c
View File

@ -1370,7 +1370,7 @@ async_common:
case QXL_IO_DESTROY_SURFACE_WAIT: case QXL_IO_DESTROY_SURFACE_WAIT:
if (val >= NUM_SURFACES) { if (val >= NUM_SURFACES) {
qxl_guest_bug(d, "QXL_IO_DESTROY_SURFACE (async=%d):" qxl_guest_bug(d, "QXL_IO_DESTROY_SURFACE (async=%d):"
"%d >= NUM_SURFACES", async, val); "%" PRIu64 " >= NUM_SURFACES", async, val);
goto cancel_async; goto cancel_async;
} }
qxl_spice_destroy_surface_wait(d, val, async); qxl_spice_destroy_surface_wait(d, val, async);

2
hw/qxl.h
View File

@ -127,7 +127,7 @@ typedef struct PCIQXLDevice {
/* qxl.c */ /* qxl.c */
void *qxl_phys2virt(PCIQXLDevice *qxl, QXLPHYSICAL phys, int group_id); void *qxl_phys2virt(PCIQXLDevice *qxl, QXLPHYSICAL phys, int group_id);
void qxl_guest_bug(PCIQXLDevice *qxl, const char *msg, ...); void qxl_guest_bug(PCIQXLDevice *qxl, const char *msg, ...) GCC_FMT_ATTR(2, 3);
void qxl_spice_update_area(PCIQXLDevice *qxl, uint32_t surface_id, void qxl_spice_update_area(PCIQXLDevice *qxl, uint32_t surface_id,
struct QXLRect *area, struct QXLRect *dirty_rects, struct QXLRect *area, struct QXLRect *dirty_rects,

2
spice-qemu-char.c
View File

@ -209,7 +209,7 @@ CharDriverState *qemu_chr_open_spice(QemuOpts *opts)
} }
} }
if (subtype == NULL) { if (subtype == NULL) {
fprintf(stderr, "spice-qemu-char: unsupported name\n"); fprintf(stderr, "spice-qemu-char: unsupported name: %s\n", name);
print_allowed_subtypes(); print_allowed_subtypes();
return NULL; return NULL;
} }

13
tests/.gitignore vendored Normal file
View File

@ -0,0 +1,13 @@
check-qdict
check-qfloat
check-qint
check-qjson
check-qlist
check-qstring
test-qapi-types.[ch]
test-qapi-visit.[ch]
test-qmp-commands.h
test-qmp-commands
test-qmp-input-strict
test-qmp-marshal.c
*-test