| 1 | The following changes since commit fb68096da3d35e64c88cd610c1fa42766c58e92a: | 1 | The following changes since commit ca61fa4b803e5d0abaf6f1ceb690f23bb78a4def: |
|---|---|---|---|
| 2 | 2 | ||
| 3 | Revert "tests: use memfd in vhost-user-test" (2018-02-13 09:51:52 +0000) | 3 | Merge remote-tracking branch 'remotes/quic/tags/pull-hex-20211006' into staging (2021-10-06 12:11:14 -0700) |
| 4 | 4 | ||
| 5 | are available in the Git repository at: | 5 | are available in the Git repository at: |
| 6 | 6 | ||
| 7 | git://github.com/stefanha/qemu.git tags/block-pull-request | 7 | https://gitlab.com/stefanha/qemu.git tags/block-pull-request |
| 8 | 8 | ||
| 9 | for you to fetch changes up to 64b01feca991e5b19a5d750ef77cdca92b68bdbb: | 9 | for you to fetch changes up to 1cc7eada97914f090125e588497986f6f7900514: |
| 10 | 10 | ||
| 11 | misc: fix spelling (2018-02-13 15:38:17 +0000) | 11 | iothread: use IOThreadParamInfo in iothread_[set|get]_param() (2021-10-07 15:29:50 +0100) |
| 12 | |||
| 13 | ---------------------------------------------------------------- | ||
| 14 | Pull request | ||
| 12 | 15 | ||
| 13 | ---------------------------------------------------------------- | 16 | ---------------------------------------------------------------- |
| 14 | 17 | ||
| 15 | ---------------------------------------------------------------- | 18 | Stefano Garzarella (2): |
| 19 | iothread: rename PollParamInfo to IOThreadParamInfo | ||
| 20 | iothread: use IOThreadParamInfo in iothread_[set|get]_param() | ||
| 16 | 21 | ||
| 17 | Fam Zheng (2): | 22 | iothread.c | 28 +++++++++++++++------------- |
| 18 | Add a git-publish configuration file | 23 | 1 file changed, 15 insertions(+), 13 deletions(-) |
| 19 | README: Document 'git-publish' workflow | ||
| 20 | |||
| 21 | Marc-André Lureau (1): | ||
| 22 | misc: fix spelling | ||
| 23 | |||
| 24 | Stefan Hajnoczi (1): | ||
| 25 | vl: pause vcpus before stopping iothreads | ||
| 26 | |||
| 27 | Wolfgang Bumiller (1): | ||
| 28 | ratelimit: don't align wait time with slices | ||
| 29 | |||
| 30 | include/qemu/ratelimit.h | 11 ++++----- | ||
| 31 | util/qemu-coroutine-lock.c | 2 +- | ||
| 32 | vl.c | 12 ++++++++-- | ||
| 33 | .gitpublish | 58 ++++++++++++++++++++++++++++++++++++++++++++++ | ||
| 34 | README | 31 ++++++++++++++++++++++++- | ||
| 35 | 5 files changed, 104 insertions(+), 10 deletions(-) | ||
| 36 | create mode 100644 .gitpublish | ||
| 37 | 24 | ||
| 38 | -- | 25 | -- |
| 39 | 2.14.3 | 26 | 2.31.1 |
| 40 | 27 | ||
| 41 | 28 | ||
| 29 | diff view generated by jsdifflib |
Deleted patch | |||
|---|---|---|---|
| 1 | From: Fam Zheng <famz@redhat.com> | ||
| 2 | 1 | ||
| 3 | git-publish [1] is a convenient tool to send patches and has been | ||
| 4 | popular among QEMU developers. Recently it has been made available in | ||
| 5 | Fedora official repo thanks to Stefan's work. | ||
| 6 | |||
| 7 | One nice feature of the tool is a per-project configuration with | ||
| 8 | profiles, especially in which the cccmd option is a handy method to | ||
| 9 | create the Cc list. | ||
| 10 | |||
| 11 | [1]: https://github.com/stefanha/git-publish | ||
| 12 | |||
| 13 | Signed-off-by: Fam Zheng <famz@redhat.com> | ||
| 14 | Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> | ||
| 15 | Message-id: 20180205054725.25634-2-famz@redhat.com | ||
| 16 | Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> | ||
| 17 | --- | ||
| 18 | .gitpublish | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ | ||
| 19 | 1 file changed, 58 insertions(+) | ||
| 20 | create mode 100644 .gitpublish | ||
| 21 | |||
| 22 | diff --git a/.gitpublish b/.gitpublish | ||
| 23 | new file mode 100644 | ||
| 24 | index XXXXXXX..XXXXXXX | ||
| 25 | --- /dev/null | ||
| 26 | +++ b/.gitpublish | ||
| 27 | @@ -XXX,XX +XXX,XX @@ | ||
| 28 | +# | ||
| 29 | +# Common git-publish profiles that can be used to send patches to QEMU upstream. | ||
| 30 | +# | ||
| 31 | +# See https://github.com/stefanha/git-publish for more information | ||
| 32 | +# | ||
| 33 | +[gitpublishprofile "default"] | ||
| 34 | +base = master | ||
| 35 | +prefix = PATCH | ||
| 36 | +to = qemu-devel@nongnu.org | ||
| 37 | +cccmd = scripts/get_maintainer.pl --noroles --norolestats --nogit --nogit-fallback 2>/dev/null | ||
| 38 | + | ||
| 39 | +[gitpublishprofile "rfc"] | ||
| 40 | +base = master | ||
| 41 | +prefix = RFC PATCH | ||
| 42 | +to = qemu-devel@nongnu.org | ||
| 43 | +cccmd = scripts/get_maintainer.pl --noroles --norolestats --nogit --nogit-fallback 2>/dev/null | ||
| 44 | + | ||
| 45 | +[gitpublishprofile "stable"] | ||
| 46 | +base = master | ||
| 47 | +prefix = PATCH | ||
| 48 | +to = qemu-devel@nongnu.org | ||
| 49 | +cc = qemu-stable@nongnu.org | ||
| 50 | +cccmd = scripts/get_maintainer.pl --noroles --norolestats --nogit --nogit-fallback 2>/dev/null | ||
| 51 | + | ||
| 52 | +[gitpublishprofile "trivial"] | ||
| 53 | +base = master | ||
| 54 | +prefix = PATCH | ||
| 55 | +to = qemu-devel@nongnu.org | ||
| 56 | +cc = qemu-trivial@nongnu.org | ||
| 57 | +cccmd = scripts/get_maintainer.pl --noroles --norolestats --nogit --nogit-fallback 2>/dev/null | ||
| 58 | + | ||
| 59 | +[gitpublishprofile "block"] | ||
| 60 | +base = master | ||
| 61 | +prefix = PATCH | ||
| 62 | +to = qemu-devel@nongnu.org | ||
| 63 | +cc = qemu-block@nongnu.org | ||
| 64 | +cccmd = scripts/get_maintainer.pl --noroles --norolestats --nogit --nogit-fallback 2>/dev/null | ||
| 65 | + | ||
| 66 | +[gitpublishprofile "arm"] | ||
| 67 | +base = master | ||
| 68 | +prefix = PATCH | ||
| 69 | +to = qemu-devel@nongnu.org | ||
| 70 | +cc = qemu-arm@nongnu.org | ||
| 71 | +cccmd = scripts/get_maintainer.pl --noroles --norolestats --nogit --nogit-fallback 2>/dev/null | ||
| 72 | + | ||
| 73 | +[gitpublishprofile "s390"] | ||
| 74 | +base = master | ||
| 75 | +prefix = PATCH | ||
| 76 | +to = qemu-devel@nongnu.org | ||
| 77 | +cc = qemu-s390@nongnu.org | ||
| 78 | +cccmd = scripts/get_maintainer.pl --noroles --norolestats --nogit --nogit-fallback 2>/dev/null | ||
| 79 | + | ||
| 80 | +[gitpublishprofile "ppc"] | ||
| 81 | +base = master | ||
| 82 | +prefix = PATCH | ||
| 83 | +to = qemu-devel@nongnu.org | ||
| 84 | +cc = qemu-ppc@nongnu.org | ||
| 85 | +cccmd = scripts/get_maintainer.pl --noroles --norolestats --nogit --nogit-fallback 2>/dev/null | ||
| 86 | -- | ||
| 87 | 2.14.3 | ||
| 88 | |||
| 89 | diff view generated by jsdifflib |
| 1 | From: Fam Zheng <famz@redhat.com> | 1 | From: Stefano Garzarella <sgarzare@redhat.com> |
|---|---|---|---|
| 2 | 2 | ||
| 3 | [Fixed s/git-profile/git-publish/ typo and s/for once/the first time/. | 3 | Commit 1793ad0247 ("iothread: add aio-max-batch parameter") added |
| 4 | --Stefan] | 4 | a new parameter (aio-max-batch) to IOThread and used PollParamInfo |
| 5 | structure to handle it. | ||
| 5 | 6 | ||
| 6 | Signed-off-by: Fam Zheng <famz@redhat.com> | 7 | Since it is not a parameter of the polling mechanism, we rename the |
| 7 | Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> | 8 | structure to a more generic IOThreadParamInfo. |
| 8 | Message-id: 20180205054725.25634-3-famz@redhat.com | 9 | |
| 10 | Suggested-by: Kevin Wolf <kwolf@redhat.com> | ||
| 11 | Signed-off-by: Stefano Garzarella <sgarzare@redhat.com> | ||
| 12 | Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> | ||
| 13 | Message-id: 20210727145936.147032-2-sgarzare@redhat.com | ||
| 9 | Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> | 14 | Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> |
| 10 | --- | 15 | --- |
| 11 | README | 31 ++++++++++++++++++++++++++++++- | 16 | iothread.c | 14 +++++++------- |
| 12 | 1 file changed, 30 insertions(+), 1 deletion(-) | 17 | 1 file changed, 7 insertions(+), 7 deletions(-) |
| 13 | 18 | ||
| 14 | diff --git a/README b/README | 19 | diff --git a/iothread.c b/iothread.c |
| 15 | index XXXXXXX..XXXXXXX 100644 | 20 | index XXXXXXX..XXXXXXX 100644 |
| 16 | --- a/README | 21 | --- a/iothread.c |
| 17 | +++ b/README | 22 | +++ b/iothread.c |
| 18 | @@ -XXX,XX +XXX,XX @@ The QEMU source code is maintained under the GIT version control system. | 23 | @@ -XXX,XX +XXX,XX @@ static void iothread_complete(UserCreatable *obj, Error **errp) |
| 19 | 24 | typedef struct { | |
| 20 | git clone git://git.qemu.org/qemu.git | 25 | const char *name; |
| 21 | 26 | ptrdiff_t offset; /* field's byte offset in IOThread struct */ | |
| 22 | -When submitting patches, the preferred approach is to use 'git | 27 | -} PollParamInfo; |
| 23 | +When submitting patches, one common approach is to use 'git | 28 | +} IOThreadParamInfo; |
| 24 | format-patch' and/or 'git send-email' to format & send the mail to the | 29 | |
| 25 | qemu-devel@nongnu.org mailing list. All patches submitted must contain | 30 | -static PollParamInfo poll_max_ns_info = { |
| 26 | a 'Signed-off-by' line from the author. Patches should follow the | 31 | +static IOThreadParamInfo poll_max_ns_info = { |
| 27 | guidelines set out in the HACKING and CODING_STYLE files. | 32 | "poll-max-ns", offsetof(IOThread, poll_max_ns), |
| 28 | 33 | }; | |
| 29 | +A 'git-publish' utility was created to make above process less | 34 | -static PollParamInfo poll_grow_info = { |
| 30 | +cumbersome, and is highly recommended for making regular contributions, | 35 | +static IOThreadParamInfo poll_grow_info = { |
| 31 | +or even just for sending consecutive patch series revisions. It also | 36 | "poll-grow", offsetof(IOThread, poll_grow), |
| 32 | +requires a working 'git send-email' setup, and by default doesn't | 37 | }; |
| 33 | +automate everything, so you may want to go through the above steps | 38 | -static PollParamInfo poll_shrink_info = { |
| 34 | +manually the first time. | 39 | +static IOThreadParamInfo poll_shrink_info = { |
| 35 | + | 40 | "poll-shrink", offsetof(IOThread, poll_shrink), |
| 36 | +For installation instructions, please go to | 41 | }; |
| 37 | + | 42 | -static PollParamInfo aio_max_batch_info = { |
| 38 | + https://github.com/stefanha/git-publish | 43 | +static IOThreadParamInfo aio_max_batch_info = { |
| 39 | + | 44 | "aio-max-batch", offsetof(IOThread, aio_max_batch), |
| 40 | +The workflow with 'git-publish' is: | 45 | }; |
| 41 | + | 46 | |
| 42 | + $ git checkout master -b my-feature | 47 | @@ -XXX,XX +XXX,XX @@ static void iothread_get_param(Object *obj, Visitor *v, |
| 43 | + $ # work on new commits, add your 'Signed-off-by' lines to each | 48 | const char *name, void *opaque, Error **errp) |
| 44 | + $ git publish | 49 | { |
| 45 | + | 50 | IOThread *iothread = IOTHREAD(obj); |
| 46 | +Your patch series will be sent and tagged as my-feature-v1 if you need to refer | 51 | - PollParamInfo *info = opaque; |
| 47 | +back to it in the future. | 52 | + IOThreadParamInfo *info = opaque; |
| 48 | + | 53 | int64_t *field = (void *)iothread + info->offset; |
| 49 | +Sending v2: | 54 | |
| 50 | + | 55 | visit_type_int64(v, name, field, errp); |
| 51 | + $ git checkout my-feature # same topic branch | 56 | @@ -XXX,XX +XXX,XX @@ static bool iothread_set_param(Object *obj, Visitor *v, |
| 52 | + $ # making changes to the commits (using 'git rebase', for example) | 57 | const char *name, void *opaque, Error **errp) |
| 53 | + $ git publish | 58 | { |
| 54 | + | 59 | IOThread *iothread = IOTHREAD(obj); |
| 55 | +Your patch series will be sent with 'v2' tag in the subject and the git tip | 60 | - PollParamInfo *info = opaque; |
| 56 | +will be tagged as my-feature-v2. | 61 | + IOThreadParamInfo *info = opaque; |
| 57 | + | 62 | int64_t *field = (void *)iothread + info->offset; |
| 58 | Additional information on submitting patches can be found online via | 63 | int64_t value; |
| 59 | the QEMU website | ||
| 60 | 64 | ||
| 61 | -- | 65 | -- |
| 62 | 2.14.3 | 66 | 2.31.1 |
| 63 | 67 | ||
| 64 | 68 | diff view generated by jsdifflib |
Deleted patch | |||
|---|---|---|---|
| 1 | Commit dce8921b2baaf95974af8176406881872067adfa ("iothread: Stop threads | ||
| 2 | before main() quits") introduced iothread_stop_all() to avoid the | ||
| 3 | following virtio-scsi assertion failure: | ||
| 4 | 1 | ||
| 5 | assert(blk_get_aio_context(d->conf.blk) == s->ctx); | ||
| 6 | |||
| 7 | Back then the assertion failed because when bdrv_close_all() made | ||
| 8 | d->conf.blk NULL, blk_get_aio_context() returned the global AioContext | ||
| 9 | instead of s->ctx. | ||
| 10 | |||
| 11 | The same assertion can still fail today when vcpus submit new I/O | ||
| 12 | requests after iothread_stop_all() has moved the BDS to the global | ||
| 13 | AioContext. | ||
| 14 | |||
| 15 | This patch hardens the iothread_stop_all() approach by pausing vcpus | ||
| 16 | before calling iothread_stop_all(). | ||
| 17 | |||
| 18 | Note that the assertion failure is a race condition. It is not possible | ||
| 19 | to reproduce it reliably. | ||
| 20 | |||
| 21 | Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> | ||
| 22 | Message-id: 20180201110708.8080-1-stefanha@redhat.com | ||
| 23 | Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> | ||
| 24 | --- | ||
| 25 | vl.c | 12 ++++++++++-- | ||
| 26 | 1 file changed, 10 insertions(+), 2 deletions(-) | ||
| 27 | |||
| 28 | diff --git a/vl.c b/vl.c | ||
| 29 | index XXXXXXX..XXXXXXX 100644 | ||
| 30 | --- a/vl.c | ||
| 31 | +++ b/vl.c | ||
| 32 | @@ -XXX,XX +XXX,XX @@ int main(int argc, char **argv, char **envp) | ||
| 33 | |||
| 34 | main_loop(); | ||
| 35 | replay_disable_events(); | ||
| 36 | + | ||
| 37 | + /* The ordering of the following is delicate. Stop vcpus to prevent new | ||
| 38 | + * I/O requests being queued by the guest. Then stop IOThreads (this | ||
| 39 | + * includes a drain operation and completes all request processing). At | ||
| 40 | + * this point emulated devices are still associated with their IOThreads | ||
| 41 | + * (if any) but no longer have any work to do. Only then can we close | ||
| 42 | + * block devices safely because we know there is no more I/O coming. | ||
| 43 | + */ | ||
| 44 | + pause_all_vcpus(); | ||
| 45 | iothread_stop_all(); | ||
| 46 | - | ||
| 47 | - pause_all_vcpus(); | ||
| 48 | bdrv_close_all(); | ||
| 49 | + | ||
| 50 | res_free(); | ||
| 51 | |||
| 52 | /* vhost-user must be cleaned up before chardevs. */ | ||
| 53 | -- | ||
| 54 | 2.14.3 | ||
| 55 | |||
| 56 | diff view generated by jsdifflib |
| 1 | From: Wolfgang Bumiller <w.bumiller@proxmox.com> | 1 | From: Stefano Garzarella <sgarzare@redhat.com> |
|---|---|---|---|
| 2 | 2 | ||
| 3 | It is possible for rate limited writes to keep overshooting a slice's | 3 | Commit 0445409d74 ("iothread: generalize |
| 4 | quota by a tiny amount causing the slice-aligned waiting period to | 4 | iothread_set_param/iothread_get_param") moved common code to set and |
| 5 | effectively halve the rate. | 5 | get IOThread parameters in two new functions. |
| 6 | 6 | ||
| 7 | Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com> | 7 | These functions are called inside callbacks, so we don't need to use an |
| 8 | Reviewed-by: Alberto Garcia <berto@igalia.com> | 8 | opaque pointer. Let's replace `void *opaque` parameter with |
| 9 | Message-id: 20180207071758.6818-1-w.bumiller@proxmox.com | 9 | `IOThreadParamInfo *info`. |
| 10 | |||
| 11 | Suggested-by: Kevin Wolf <kwolf@redhat.com> | ||
| 12 | Signed-off-by: Stefano Garzarella <sgarzare@redhat.com> | ||
| 13 | Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> | ||
| 14 | Message-id: 20210727145936.147032-3-sgarzare@redhat.com | ||
| 10 | Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> | 15 | Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> |
| 11 | --- | 16 | --- |
| 12 | include/qemu/ratelimit.h | 11 +++++------ | 17 | iothread.c | 18 ++++++++++-------- |
| 13 | 1 file changed, 5 insertions(+), 6 deletions(-) | 18 | 1 file changed, 10 insertions(+), 8 deletions(-) |
| 14 | 19 | ||
| 15 | diff --git a/include/qemu/ratelimit.h b/include/qemu/ratelimit.h | 20 | diff --git a/iothread.c b/iothread.c |
| 16 | index XXXXXXX..XXXXXXX 100644 | 21 | index XXXXXXX..XXXXXXX 100644 |
| 17 | --- a/include/qemu/ratelimit.h | 22 | --- a/iothread.c |
| 18 | +++ b/include/qemu/ratelimit.h | 23 | +++ b/iothread.c |
| 19 | @@ -XXX,XX +XXX,XX @@ typedef struct { | 24 | @@ -XXX,XX +XXX,XX @@ static IOThreadParamInfo aio_max_batch_info = { |
| 20 | static inline int64_t ratelimit_calculate_delay(RateLimit *limit, uint64_t n) | 25 | }; |
| 26 | |||
| 27 | static void iothread_get_param(Object *obj, Visitor *v, | ||
| 28 | - const char *name, void *opaque, Error **errp) | ||
| 29 | + const char *name, IOThreadParamInfo *info, Error **errp) | ||
| 21 | { | 30 | { |
| 22 | int64_t now = qemu_clock_get_ns(QEMU_CLOCK_REALTIME); | 31 | IOThread *iothread = IOTHREAD(obj); |
| 23 | - uint64_t delay_slices; | 32 | - IOThreadParamInfo *info = opaque; |
| 24 | + double delay_slices; | 33 | int64_t *field = (void *)iothread + info->offset; |
| 25 | 34 | ||
| 26 | assert(limit->slice_quota && limit->slice_ns); | 35 | visit_type_int64(v, name, field, errp); |
| 27 | 36 | } | |
| 28 | @@ -XXX,XX +XXX,XX @@ static inline int64_t ratelimit_calculate_delay(RateLimit *limit, uint64_t n) | 37 | |
| 29 | return 0; | 38 | static bool iothread_set_param(Object *obj, Visitor *v, |
| 39 | - const char *name, void *opaque, Error **errp) | ||
| 40 | + const char *name, IOThreadParamInfo *info, Error **errp) | ||
| 41 | { | ||
| 42 | IOThread *iothread = IOTHREAD(obj); | ||
| 43 | - IOThreadParamInfo *info = opaque; | ||
| 44 | int64_t *field = (void *)iothread + info->offset; | ||
| 45 | int64_t value; | ||
| 46 | |||
| 47 | @@ -XXX,XX +XXX,XX @@ static bool iothread_set_param(Object *obj, Visitor *v, | ||
| 48 | static void iothread_get_poll_param(Object *obj, Visitor *v, | ||
| 49 | const char *name, void *opaque, Error **errp) | ||
| 50 | { | ||
| 51 | + IOThreadParamInfo *info = opaque; | ||
| 52 | |||
| 53 | - iothread_get_param(obj, v, name, opaque, errp); | ||
| 54 | + iothread_get_param(obj, v, name, info, errp); | ||
| 55 | } | ||
| 56 | |||
| 57 | static void iothread_set_poll_param(Object *obj, Visitor *v, | ||
| 58 | const char *name, void *opaque, Error **errp) | ||
| 59 | { | ||
| 60 | IOThread *iothread = IOTHREAD(obj); | ||
| 61 | + IOThreadParamInfo *info = opaque; | ||
| 62 | |||
| 63 | - if (!iothread_set_param(obj, v, name, opaque, errp)) { | ||
| 64 | + if (!iothread_set_param(obj, v, name, info, errp)) { | ||
| 65 | return; | ||
| 30 | } | 66 | } |
| 31 | 67 | ||
| 32 | - /* Quota exceeded. Calculate the next time slice we may start | 68 | @@ -XXX,XX +XXX,XX @@ static void iothread_set_poll_param(Object *obj, Visitor *v, |
| 33 | - * sending data again. */ | 69 | static void iothread_get_aio_param(Object *obj, Visitor *v, |
| 34 | - delay_slices = (limit->dispatched + limit->slice_quota - 1) / | 70 | const char *name, void *opaque, Error **errp) |
| 35 | - limit->slice_quota; | 71 | { |
| 36 | + /* Quota exceeded. Wait based on the excess amount and then start a new | 72 | + IOThreadParamInfo *info = opaque; |
| 37 | + * slice. */ | 73 | |
| 38 | + delay_slices = (double)limit->dispatched / limit->slice_quota; | 74 | - iothread_get_param(obj, v, name, opaque, errp); |
| 39 | limit->slice_end_time = limit->slice_start_time + | 75 | + iothread_get_param(obj, v, name, info, errp); |
| 40 | - delay_slices * limit->slice_ns; | ||
| 41 | + (uint64_t)(delay_slices * limit->slice_ns); | ||
| 42 | return limit->slice_end_time - now; | ||
| 43 | } | 76 | } |
| 44 | 77 | ||
| 78 | static void iothread_set_aio_param(Object *obj, Visitor *v, | ||
| 79 | const char *name, void *opaque, Error **errp) | ||
| 80 | { | ||
| 81 | IOThread *iothread = IOTHREAD(obj); | ||
| 82 | + IOThreadParamInfo *info = opaque; | ||
| 83 | |||
| 84 | - if (!iothread_set_param(obj, v, name, opaque, errp)) { | ||
| 85 | + if (!iothread_set_param(obj, v, name, info, errp)) { | ||
| 86 | return; | ||
| 87 | } | ||
| 88 | |||
| 45 | -- | 89 | -- |
| 46 | 2.14.3 | 90 | 2.31.1 |
| 47 | 91 | ||
| 48 | 92 | diff view generated by jsdifflib |
Deleted patch | |||
|---|---|---|---|
| 1 | From: Marc-André Lureau <marcandre.lureau@redhat.com> | ||
| 2 | 1 | ||
| 3 | s/pupulate/populate | ||
| 4 | |||
| 5 | Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> | ||
| 6 | Reviewed-by: Peter Maydell <peter.maydell@linaro.org> | ||
| 7 | Message-id: 20180208162447.10851-1-marcandre.lureau@redhat.com | ||
| 8 | Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> | ||
| 9 | --- | ||
| 10 | util/qemu-coroutine-lock.c | 2 +- | ||
| 11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 12 | |||
| 13 | diff --git a/util/qemu-coroutine-lock.c b/util/qemu-coroutine-lock.c | ||
| 14 | index XXXXXXX..XXXXXXX 100644 | ||
| 15 | --- a/util/qemu-coroutine-lock.c | ||
| 16 | +++ b/util/qemu-coroutine-lock.c | ||
| 17 | @@ -XXX,XX +XXX,XX @@ void qemu_co_queue_run_restart(Coroutine *co) | ||
| 18 | * invalid memory. Therefore, use a temporary queue and do not touch | ||
| 19 | * the "co" coroutine as soon as you enter another one. | ||
| 20 | * | ||
| 21 | - * In its turn resumed "co" can pupulate "co_queue_wakeup" queue with | ||
| 22 | + * In its turn resumed "co" can populate "co_queue_wakeup" queue with | ||
| 23 | * new coroutines to be woken up. The caller, who has resumed "co", | ||
| 24 | * will be responsible for traversing the same queue, which may cause | ||
| 25 | * a different wakeup order but not any missing wakeups. | ||
| 26 | -- | ||
| 27 | 2.14.3 | ||
| 28 | |||
| 29 | diff view generated by jsdifflib |