| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 1 | From 7023732c65b4dc509c46a54fb7715da275b5597f Mon Sep 17 00:00:00 2001 |
| 2 | From: Changqing Li <changqing.li@windriver.com> |
| 3 | Date: Thu, 13 Sep 2018 12:39:44 +0800 |
| 4 | Subject: [PATCH] spice: fix compile fail problem |
| 5 | |
| 6 | compile error: |
| 7 | format '%d' expects argument of type 'int', but argument 6 has |
| 8 | type 'long unsigned int' [-Werror=format=] |
| 9 | |
| 10 | spice compile failed on 32bit system, since upstream commit |
| 11 | 9541cd2fe(in V0.14.1) change %ld to %PRIdPTR, %PRIdPTR is %d, but argument |
| 12 | strm.total_out is uLong. |
| 13 | |
| 14 | Upstream-Status: Submitted[https://github.com/freedesktop/spice/pull/1] |
| 15 | |
| 16 | Signed-off-by: Changqing Li <changqing.li@windriver.com> |
| 17 | --- |
| 18 | server/red-replay-qxl.c | 2 +- |
| 19 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 20 | |
| 21 | diff --git a/server/red-replay-qxl.c b/server/red-replay-qxl.c |
| 22 | index 1fce76c..bd33b58 100644 |
| 23 | --- a/server/red-replay-qxl.c |
| 24 | +++ b/server/red-replay-qxl.c |
| 25 | @@ -266,7 +266,7 @@ static replay_t read_binary(SpiceReplay *replay, const char *prefix, size_t *siz |
| 26 | exit(1); |
| 27 | } |
| 28 | if ((ret = inflate(&strm, Z_NO_FLUSH)) != Z_STREAM_END) { |
| 29 | - spice_error("inflate error %d (disc: %" PRIdPTR ")", ret, *size - strm.total_out); |
| 30 | + spice_error("inflate error %d (disc: %ld)", ret, *size - strm.total_out); |
| 31 | if (ret == Z_DATA_ERROR) { |
| 32 | /* last operation may be wrong. since we do the recording |
| 33 | * in red_worker, when there is a shutdown from the vcpu/io thread |
| 34 | -- |
| 35 | 2.7.4 |
| 36 | |