diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-09-15 17:10:28 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-09-15 17:10:30 +0100 |
| commit | 518352b601997723bd03d928d1bb5854648942e8 (patch) | |
| tree | a46663616557d2584014c898c53db15665123658 /block/sheepdog.c | |
| parent | 9f16390cd3cdd85fa20739f07120f4d697c11837 (diff) | |
| parent | afe4c95331cea4c78cab3240594055a72aa5c30c (diff) | |
| download | qemu-518352b601997723bd03d928d1bb5854648942e8.zip qemu-518352b601997723bd03d928d1bb5854648942e8.tar.gz qemu-518352b601997723bd03d928d1bb5854648942e8.tar.bz2 | |
Merge remote-tracking branch 'remotes/mjt/tags/trivial-patches-fetch' into staging
trivial patches for 2016-09-15
# gpg: Signature made Thu 15 Sep 2016 13:40:55 BST
# gpg: using RSA key 0x701B4F6B1A693E59
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>"
# gpg: aka "Michael Tokarev <mjt@corpit.ru>"
# gpg: aka "Michael Tokarev <mjt@debian.org>"
# Primary key fingerprint: 6EE1 95D1 886E 8FFB 810D 4324 457C E0A0 8044 65C5
# Subkey fingerprint: 7B73 BAD6 8BE7 A2C2 8931 4B22 701B 4F6B 1A69 3E59
* remotes/mjt/tags/trivial-patches-fetch: (21 commits)
mptsas: change .realize function name
linux-user/qemu.h: change malloc to g_malloc, free to g_free
win32: don't run subprocess tests on Mingw32 platform
sheepdog: remove useless casts
fw_cfg: remove useless casts
tricore: remove useless cast
s390x: remove useless cast
linux-user,s390x: remove useless cast
coccinelle: add a script to remove useless casts
curl: Operate on zero-length file
Remove unused function declarations
ivshmem: Delete duplicate debug message
sh4: fix broken link to documentation
MAINTAINERS: Fix up F: entry bit rot
MAINTAINERS: Add include/sysemu/cpus.h
MAINTAINERS: Add include/hw/sh4/ to SH4 section
MAINTAINERS: Add include/hw/tricore/ to TriCore section
MAINTAINERS: Add include/hw/unicore32/ to UniCore32 section
ui/console: Fix non-working backspace key in monitor of gtk UI
tcg: Remove duplicate header includes
...
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'block/sheepdog.c')
| -rw-r--r-- | block/sheepdog.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/block/sheepdog.c b/block/sheepdog.c index 66e1cb2..ccbf7e1 100644 --- a/block/sheepdog.c +++ b/block/sheepdog.c @@ -1049,7 +1049,7 @@ static int parse_vdiname(BDRVSheepdogState *s, const char *filename, const char *host_spec, *vdi_spec; int nr_sep, ret; - strstart(filename, "sheepdog:", (const char **)&filename); + strstart(filename, "sheepdog:", &filename); p = q = g_strdup(filename); /* count the number of separators */ @@ -2652,7 +2652,7 @@ static int sd_snapshot_list(BlockDriverState *bs, QEMUSnapshotInfo **psn_tab) req.opcode = SD_OP_READ_VDIS; req.data_length = max; - ret = do_req(fd, s->aio_context, (SheepdogReq *)&req, + ret = do_req(fd, s->aio_context, &req, vdi_inuse, &wlen, &rlen); closesocket(fd); |