| 1 | The following changes since commit 00928a421d47f49691cace1207481b7aad31b1f1: | 1 | The following changes since commit ac5f7bf8e208cd7893dbb1a9520559e569a4677c: |
|---|---|---|---|
| 2 | 2 | ||
| 3 | Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20180626' into staging (2018-06-26 18:23:49 +0100) | 3 | Merge tag 'migration-20230424-pull-request' of https://gitlab.com/juan.quintela/qemu into staging (2023-04-24 15:00:39 +0100) |
| 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 ed6e2161715c527330f936d44af4c547f25f687e: | 9 | for you to fetch changes up to 9d672e290475001fcecdcc9dc79ad088ff89d17f: |
| 10 | 10 | ||
| 11 | linux-aio: properly bubble up errors from initialization (2018-06-27 13:06:34 +0100) | 11 | tracetool: use relative paths for '#line' preprocessor directives (2023-04-24 13:53:44 -0400) |
| 12 | 12 | ||
| 13 | ---------------------------------------------------------------- | 13 | ---------------------------------------------------------------- |
| 14 | Pull request | 14 | Pull request (v2) |
| 15 | 15 | ||
| 16 | * Gracefully handle Linux AIO init failure | 16 | I dropped the zoned storage patches that had CI failures. This pull request |
| 17 | only contains fixes now. | ||
| 17 | 18 | ||
| 18 | ---------------------------------------------------------------- | 19 | ---------------------------------------------------------------- |
| 19 | 20 | ||
| 20 | Nishanth Aravamudan (1): | 21 | Philippe Mathieu-Daudé (1): |
| 21 | linux-aio: properly bubble up errors from initialization | 22 | block/dmg: Declare a type definition for DMG uncompress function |
| 22 | 23 | ||
| 23 | Stefan Hajnoczi (1): | 24 | Thomas De Schampheleire (1): |
| 24 | compiler: add a sizeof_field() macro | 25 | tracetool: use relative paths for '#line' preprocessor directives |
| 25 | 26 | ||
| 26 | include/block/aio.h | 3 +++ | 27 | block/dmg.h | 8 ++++---- |
| 27 | include/block/raw-aio.h | 2 +- | 28 | block/dmg.c | 7 ++----- |
| 28 | include/hw/xen/io/ring.h | 2 +- | 29 | scripts/tracetool/backend/ftrace.py | 4 +++- |
| 29 | include/qemu/compiler.h | 2 ++ | 30 | scripts/tracetool/backend/log.py | 4 +++- |
| 30 | accel/tcg/translate-all.c | 2 +- | 31 | scripts/tracetool/backend/syslog.py | 4 +++- |
| 31 | block/file-posix.c | 33 ++++++++++++++++++++++++++++----- | 32 | 5 files changed, 15 insertions(+), 12 deletions(-) |
| 32 | block/linux-aio.c | 12 +++++++++--- | ||
| 33 | hw/display/xenfb.c | 4 ++-- | ||
| 34 | hw/net/rocker/rocker_of_dpa.c | 2 +- | ||
| 35 | hw/net/virtio-net.c | 2 +- | ||
| 36 | stubs/linux-aio.c | 2 +- | ||
| 37 | target/i386/kvm.c | 2 +- | ||
| 38 | target/ppc/arch_dump.c | 10 +++++----- | ||
| 39 | target/s390x/arch_dump.c | 20 ++++++++++---------- | ||
| 40 | util/async.c | 14 +++++++++++--- | ||
| 41 | 15 files changed, 77 insertions(+), 35 deletions(-) | ||
| 42 | 33 | ||
| 43 | -- | 34 | -- |
| 44 | 2.17.1 | 35 | 2.39.2 |
| 45 | 36 | ||
| 46 | 37 | diff view generated by jsdifflib |
| 1 | From: Nishanth Aravamudan <naravamudan@digitalocean.com> | 1 | From: Philippe Mathieu-Daudé <philmd@linaro.org> |
|---|---|---|---|
| 2 | 2 | ||
| 3 | laio_init() can fail for a couple of reasons, which will lead to a NULL | 3 | Introduce the BdrvDmgUncompressFunc type defintion. To emphasis |
| 4 | pointer dereference in laio_attach_aio_context(). | 4 | dmg_uncompress_bz2 and dmg_uncompress_lzfse are pointer to functions, |
| 5 | declare them using this new typedef. | ||
| 5 | 6 | ||
| 6 | To solve this, add a aio_setup_linux_aio() function which is called | 7 | Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> |
| 7 | early in raw_open_common. If this fails, propagate the error up. The | 8 | Message-id: 20230320152610.32052-1-philmd@linaro.org |
| 8 | signature of aio_get_linux_aio() was not modified, because it seems | ||
| 9 | preferable to return the actual errno from the possible failing | ||
| 10 | initialization calls. | ||
| 11 | |||
| 12 | Additionally, when the AioContext changes, we need to associate a | ||
| 13 | LinuxAioState with the new AioContext. Use the bdrv_attach_aio_context | ||
| 14 | callback and call the new aio_setup_linux_aio(), which will allocate a | ||
| 15 | new AioContext if needed, and return errors on failures. If it fails for | ||
| 16 | any reason, fallback to threaded AIO with an error message, as the | ||
| 17 | device is already in-use by the guest. | ||
| 18 | |||
| 19 | Add an assert that aio_get_linux_aio() cannot return NULL. | ||
| 20 | |||
| 21 | Signed-off-by: Nishanth Aravamudan <naravamudan@digitalocean.com> | ||
| 22 | Message-id: 20180622193700.6523-1-naravamudan@digitalocean.com | ||
| 23 | Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> | 9 | Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> |
| 24 | --- | 10 | --- |
| 25 | include/block/aio.h | 3 +++ | 11 | block/dmg.h | 8 ++++---- |
| 26 | include/block/raw-aio.h | 2 +- | 12 | block/dmg.c | 7 ++----- |
| 27 | block/file-posix.c | 33 ++++++++++++++++++++++++++++----- | 13 | 2 files changed, 6 insertions(+), 9 deletions(-) |
| 28 | block/linux-aio.c | 12 +++++++++--- | ||
| 29 | stubs/linux-aio.c | 2 +- | ||
| 30 | util/async.c | 14 +++++++++++--- | ||
| 31 | 6 files changed, 53 insertions(+), 13 deletions(-) | ||
| 32 | 14 | ||
| 33 | diff --git a/include/block/aio.h b/include/block/aio.h | 15 | diff --git a/block/dmg.h b/block/dmg.h |
| 34 | index XXXXXXX..XXXXXXX 100644 | 16 | index XXXXXXX..XXXXXXX 100644 |
| 35 | --- a/include/block/aio.h | 17 | --- a/block/dmg.h |
| 36 | +++ b/include/block/aio.h | 18 | +++ b/block/dmg.h |
| 37 | @@ -XXX,XX +XXX,XX @@ GSource *aio_get_g_source(AioContext *ctx); | 19 | @@ -XXX,XX +XXX,XX @@ typedef struct BDRVDMGState { |
| 38 | /* Return the ThreadPool bound to this AioContext */ | 20 | z_stream zstream; |
| 39 | struct ThreadPool *aio_get_thread_pool(AioContext *ctx); | 21 | } BDRVDMGState; |
| 40 | 22 | ||
| 41 | +/* Setup the LinuxAioState bound to this AioContext */ | 23 | -extern int (*dmg_uncompress_bz2)(char *next_in, unsigned int avail_in, |
| 42 | +struct LinuxAioState *aio_setup_linux_aio(AioContext *ctx, Error **errp); | 24 | - char *next_out, unsigned int avail_out); |
| 43 | + | 25 | +typedef int BdrvDmgUncompressFunc(char *next_in, unsigned int avail_in, |
| 44 | /* Return the LinuxAioState bound to this AioContext */ | 26 | + char *next_out, unsigned int avail_out); |
| 45 | struct LinuxAioState *aio_get_linux_aio(AioContext *ctx); | 27 | |
| 46 | 28 | -extern int (*dmg_uncompress_lzfse)(char *next_in, unsigned int avail_in, | |
| 47 | diff --git a/include/block/raw-aio.h b/include/block/raw-aio.h | 29 | - char *next_out, unsigned int avail_out); |
| 30 | +extern BdrvDmgUncompressFunc *dmg_uncompress_bz2; | ||
| 31 | +extern BdrvDmgUncompressFunc *dmg_uncompress_lzfse; | ||
| 32 | |||
| 33 | #endif | ||
| 34 | diff --git a/block/dmg.c b/block/dmg.c | ||
| 48 | index XXXXXXX..XXXXXXX 100644 | 35 | index XXXXXXX..XXXXXXX 100644 |
| 49 | --- a/include/block/raw-aio.h | 36 | --- a/block/dmg.c |
| 50 | +++ b/include/block/raw-aio.h | 37 | +++ b/block/dmg.c |
| 51 | @@ -XXX,XX +XXX,XX @@ | 38 | @@ -XXX,XX +XXX,XX @@ |
| 52 | /* linux-aio.c - Linux native implementation */ | 39 | #include "qemu/memalign.h" |
| 53 | #ifdef CONFIG_LINUX_AIO | 40 | #include "dmg.h" |
| 54 | typedef struct LinuxAioState LinuxAioState; | 41 | |
| 55 | -LinuxAioState *laio_init(void); | 42 | -int (*dmg_uncompress_bz2)(char *next_in, unsigned int avail_in, |
| 56 | +LinuxAioState *laio_init(Error **errp); | 43 | - char *next_out, unsigned int avail_out); |
| 57 | void laio_cleanup(LinuxAioState *s); | 44 | - |
| 58 | int coroutine_fn laio_co_submit(BlockDriverState *bs, LinuxAioState *s, int fd, | 45 | -int (*dmg_uncompress_lzfse)(char *next_in, unsigned int avail_in, |
| 59 | uint64_t offset, QEMUIOVector *qiov, int type); | 46 | - char *next_out, unsigned int avail_out); |
| 60 | diff --git a/block/file-posix.c b/block/file-posix.c | 47 | +BdrvDmgUncompressFunc *dmg_uncompress_bz2; |
| 61 | index XXXXXXX..XXXXXXX 100644 | 48 | +BdrvDmgUncompressFunc *dmg_uncompress_lzfse; |
| 62 | --- a/block/file-posix.c | 49 | |
| 63 | +++ b/block/file-posix.c | 50 | enum { |
| 64 | @@ -XXX,XX +XXX,XX @@ static int raw_open_common(BlockDriverState *bs, QDict *options, | 51 | /* Limit chunk sizes to prevent unreasonable amounts of memory being used |
| 65 | |||
| 66 | #ifdef CONFIG_LINUX_AIO | ||
| 67 | /* Currently Linux does AIO only for files opened with O_DIRECT */ | ||
| 68 | - if (s->use_linux_aio && !(s->open_flags & O_DIRECT)) { | ||
| 69 | - error_setg(errp, "aio=native was specified, but it requires " | ||
| 70 | - "cache.direct=on, which was not specified."); | ||
| 71 | - ret = -EINVAL; | ||
| 72 | - goto fail; | ||
| 73 | + if (s->use_linux_aio) { | ||
| 74 | + if (!(s->open_flags & O_DIRECT)) { | ||
| 75 | + error_setg(errp, "aio=native was specified, but it requires " | ||
| 76 | + "cache.direct=on, which was not specified."); | ||
| 77 | + ret = -EINVAL; | ||
| 78 | + goto fail; | ||
| 79 | + } | ||
| 80 | + if (!aio_setup_linux_aio(bdrv_get_aio_context(bs), errp)) { | ||
| 81 | + error_prepend(errp, "Unable to use native AIO: "); | ||
| 82 | + goto fail; | ||
| 83 | + } | ||
| 84 | } | ||
| 85 | #else | ||
| 86 | if (s->use_linux_aio) { | ||
| 87 | @@ -XXX,XX +XXX,XX @@ static BlockAIOCB *raw_aio_flush(BlockDriverState *bs, | ||
| 88 | return paio_submit(bs, s->fd, 0, NULL, 0, cb, opaque, QEMU_AIO_FLUSH); | ||
| 89 | } | ||
| 90 | |||
| 91 | +static void raw_aio_attach_aio_context(BlockDriverState *bs, | ||
| 92 | + AioContext *new_context) | ||
| 93 | +{ | ||
| 94 | +#ifdef CONFIG_LINUX_AIO | ||
| 95 | + BDRVRawState *s = bs->opaque; | ||
| 96 | + if (s->use_linux_aio) { | ||
| 97 | + Error *local_err; | ||
| 98 | + if (!aio_setup_linux_aio(new_context, &local_err)) { | ||
| 99 | + error_reportf_err(local_err, "Unable to use native AIO, " | ||
| 100 | + "falling back to thread pool: "); | ||
| 101 | + s->use_linux_aio = false; | ||
| 102 | + } | ||
| 103 | + } | ||
| 104 | +#endif | ||
| 105 | +} | ||
| 106 | + | ||
| 107 | static void raw_close(BlockDriverState *bs) | ||
| 108 | { | ||
| 109 | BDRVRawState *s = bs->opaque; | ||
| 110 | @@ -XXX,XX +XXX,XX @@ BlockDriver bdrv_file = { | ||
| 111 | .bdrv_refresh_limits = raw_refresh_limits, | ||
| 112 | .bdrv_io_plug = raw_aio_plug, | ||
| 113 | .bdrv_io_unplug = raw_aio_unplug, | ||
| 114 | + .bdrv_attach_aio_context = raw_aio_attach_aio_context, | ||
| 115 | |||
| 116 | .bdrv_truncate = raw_truncate, | ||
| 117 | .bdrv_getlength = raw_getlength, | ||
| 118 | diff --git a/block/linux-aio.c b/block/linux-aio.c | ||
| 119 | index XXXXXXX..XXXXXXX 100644 | ||
| 120 | --- a/block/linux-aio.c | ||
| 121 | +++ b/block/linux-aio.c | ||
| 122 | @@ -XXX,XX +XXX,XX @@ | ||
| 123 | #include "block/raw-aio.h" | ||
| 124 | #include "qemu/event_notifier.h" | ||
| 125 | #include "qemu/coroutine.h" | ||
| 126 | +#include "qapi/error.h" | ||
| 127 | |||
| 128 | #include <libaio.h> | ||
| 129 | |||
| 130 | @@ -XXX,XX +XXX,XX @@ void laio_attach_aio_context(LinuxAioState *s, AioContext *new_context) | ||
| 131 | qemu_laio_poll_cb); | ||
| 132 | } | ||
| 133 | |||
| 134 | -LinuxAioState *laio_init(void) | ||
| 135 | +LinuxAioState *laio_init(Error **errp) | ||
| 136 | { | ||
| 137 | + int rc; | ||
| 138 | LinuxAioState *s; | ||
| 139 | |||
| 140 | s = g_malloc0(sizeof(*s)); | ||
| 141 | - if (event_notifier_init(&s->e, false) < 0) { | ||
| 142 | + rc = event_notifier_init(&s->e, false); | ||
| 143 | + if (rc < 0) { | ||
| 144 | + error_setg_errno(errp, -rc, "failed to to initialize event notifier"); | ||
| 145 | goto out_free_state; | ||
| 146 | } | ||
| 147 | |||
| 148 | - if (io_setup(MAX_EVENTS, &s->ctx) != 0) { | ||
| 149 | + rc = io_setup(MAX_EVENTS, &s->ctx); | ||
| 150 | + if (rc < 0) { | ||
| 151 | + error_setg_errno(errp, -rc, "failed to create linux AIO context"); | ||
| 152 | goto out_close_efd; | ||
| 153 | } | ||
| 154 | |||
| 155 | diff --git a/stubs/linux-aio.c b/stubs/linux-aio.c | ||
| 156 | index XXXXXXX..XXXXXXX 100644 | ||
| 157 | --- a/stubs/linux-aio.c | ||
| 158 | +++ b/stubs/linux-aio.c | ||
| 159 | @@ -XXX,XX +XXX,XX @@ void laio_attach_aio_context(LinuxAioState *s, AioContext *new_context) | ||
| 160 | abort(); | ||
| 161 | } | ||
| 162 | |||
| 163 | -LinuxAioState *laio_init(void) | ||
| 164 | +LinuxAioState *laio_init(Error **errp) | ||
| 165 | { | ||
| 166 | abort(); | ||
| 167 | } | ||
| 168 | diff --git a/util/async.c b/util/async.c | ||
| 169 | index XXXXXXX..XXXXXXX 100644 | ||
| 170 | --- a/util/async.c | ||
| 171 | +++ b/util/async.c | ||
| 172 | @@ -XXX,XX +XXX,XX @@ ThreadPool *aio_get_thread_pool(AioContext *ctx) | ||
| 173 | } | ||
| 174 | |||
| 175 | #ifdef CONFIG_LINUX_AIO | ||
| 176 | -LinuxAioState *aio_get_linux_aio(AioContext *ctx) | ||
| 177 | +LinuxAioState *aio_setup_linux_aio(AioContext *ctx, Error **errp) | ||
| 178 | { | ||
| 179 | if (!ctx->linux_aio) { | ||
| 180 | - ctx->linux_aio = laio_init(); | ||
| 181 | - laio_attach_aio_context(ctx->linux_aio, ctx); | ||
| 182 | + ctx->linux_aio = laio_init(errp); | ||
| 183 | + if (ctx->linux_aio) { | ||
| 184 | + laio_attach_aio_context(ctx->linux_aio, ctx); | ||
| 185 | + } | ||
| 186 | } | ||
| 187 | return ctx->linux_aio; | ||
| 188 | } | ||
| 189 | + | ||
| 190 | +LinuxAioState *aio_get_linux_aio(AioContext *ctx) | ||
| 191 | +{ | ||
| 192 | + assert(ctx->linux_aio); | ||
| 193 | + return ctx->linux_aio; | ||
| 194 | +} | ||
| 195 | #endif | ||
| 196 | |||
| 197 | void aio_notify(AioContext *ctx) | ||
| 198 | -- | 52 | -- |
| 199 | 2.17.1 | 53 | 2.39.2 |
| 200 | 54 | ||
| 201 | 55 | diff view generated by jsdifflib |
| 1 | Determining the size of a field is useful when you don't have a struct | 1 | From: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com> |
|---|---|---|---|
| 2 | variable handy. Open-coding this is ugly. | ||
| 3 | 2 | ||
| 4 | This patch adds the sizeof_field() macro, which is similar to | 3 | The event filename is an absolute path. Convert it to a relative path when |
| 5 | typeof_field(). Existing instances are updated to use the macro. | 4 | writing '#line' directives, to preserve reproducibility of the generated |
| 5 | output when different base paths are used. | ||
| 6 | 6 | ||
| 7 | Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com> | ||
| 7 | Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> | 8 | Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> |
| 8 | Reviewed-by: John Snow <jsnow@redhat.com> | 9 | Message-Id: <20230406080045.21696-1-thomas.de_schampheleire@nokia.com> |
| 9 | Message-id: 20180614164431.29305-1-stefanha@redhat.com | ||
| 10 | Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> | ||
| 11 | --- | 10 | --- |
| 12 | include/hw/xen/io/ring.h | 2 +- | 11 | scripts/tracetool/backend/ftrace.py | 4 +++- |
| 13 | include/qemu/compiler.h | 2 ++ | 12 | scripts/tracetool/backend/log.py | 4 +++- |
| 14 | accel/tcg/translate-all.c | 2 +- | 13 | scripts/tracetool/backend/syslog.py | 4 +++- |
| 15 | hw/display/xenfb.c | 4 ++-- | 14 | 3 files changed, 9 insertions(+), 3 deletions(-) |
| 16 | hw/net/rocker/rocker_of_dpa.c | 2 +- | ||
| 17 | hw/net/virtio-net.c | 2 +- | ||
| 18 | target/i386/kvm.c | 2 +- | ||
| 19 | target/ppc/arch_dump.c | 10 +++++----- | ||
| 20 | target/s390x/arch_dump.c | 20 ++++++++++---------- | ||
| 21 | 9 files changed, 24 insertions(+), 22 deletions(-) | ||
| 22 | 15 | ||
| 23 | diff --git a/include/hw/xen/io/ring.h b/include/hw/xen/io/ring.h | 16 | diff --git a/scripts/tracetool/backend/ftrace.py b/scripts/tracetool/backend/ftrace.py |
| 24 | index XXXXXXX..XXXXXXX 100644 | 17 | index XXXXXXX..XXXXXXX 100644 |
| 25 | --- a/include/hw/xen/io/ring.h | 18 | --- a/scripts/tracetool/backend/ftrace.py |
| 26 | +++ b/include/hw/xen/io/ring.h | 19 | +++ b/scripts/tracetool/backend/ftrace.py |
| 27 | @@ -XXX,XX +XXX,XX @@ typedef unsigned int RING_IDX; | 20 | @@ -XXX,XX +XXX,XX @@ |
| 28 | */ | 21 | __email__ = "stefanha@redhat.com" |
| 29 | #define __CONST_RING_SIZE(_s, _sz) \ | 22 | |
| 30 | (__RD32(((_sz) - offsetof(struct _s##_sring, ring)) / \ | 23 | |
| 31 | - sizeof(((struct _s##_sring *)0)->ring[0]))) | 24 | +import os.path |
| 32 | + sizeof_field(struct _s##_sring, ring[0]))) | 25 | + |
| 33 | /* | 26 | from tracetool import out |
| 34 | * The same for passing in an actual pointer instead of a name tag. | 27 | |
| 35 | */ | 28 | |
| 36 | diff --git a/include/qemu/compiler.h b/include/qemu/compiler.h | 29 | @@ -XXX,XX +XXX,XX @@ def generate_h(event, group): |
| 30 | args=event.args, | ||
| 31 | event_id="TRACE_" + event.name.upper(), | ||
| 32 | event_lineno=event.lineno, | ||
| 33 | - event_filename=event.filename, | ||
| 34 | + event_filename=os.path.relpath(event.filename), | ||
| 35 | fmt=event.fmt.rstrip("\n"), | ||
| 36 | argnames=argnames) | ||
| 37 | |||
| 38 | diff --git a/scripts/tracetool/backend/log.py b/scripts/tracetool/backend/log.py | ||
| 37 | index XXXXXXX..XXXXXXX 100644 | 39 | index XXXXXXX..XXXXXXX 100644 |
| 38 | --- a/include/qemu/compiler.h | 40 | --- a/scripts/tracetool/backend/log.py |
| 39 | +++ b/include/qemu/compiler.h | 41 | +++ b/scripts/tracetool/backend/log.py |
| 40 | @@ -XXX,XX +XXX,XX @@ | 42 | @@ -XXX,XX +XXX,XX @@ |
| 41 | (type *) ((char *) __mptr - offsetof(type, member));}) | 43 | __email__ = "stefanha@redhat.com" |
| 42 | #endif | 44 | |
| 43 | 45 | ||
| 44 | +#define sizeof_field(type, field) sizeof(((type *)0)->field) | 46 | +import os.path |
| 45 | + | 47 | + |
| 46 | /* Convert from a base type to a parent type, with compile time checking. */ | 48 | from tracetool import out |
| 47 | #ifdef __GNUC__ | 49 | |
| 48 | #define DO_UPCAST(type, field, dev) ( __extension__ ( { \ | 50 | |
| 49 | diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c | 51 | @@ -XXX,XX +XXX,XX @@ def generate_h(event, group): |
| 52 | ' }', | ||
| 53 | cond=cond, | ||
| 54 | event_lineno=event.lineno, | ||
| 55 | - event_filename=event.filename, | ||
| 56 | + event_filename=os.path.relpath(event.filename), | ||
| 57 | name=event.name, | ||
| 58 | fmt=event.fmt.rstrip("\n"), | ||
| 59 | argnames=argnames) | ||
| 60 | diff --git a/scripts/tracetool/backend/syslog.py b/scripts/tracetool/backend/syslog.py | ||
| 50 | index XXXXXXX..XXXXXXX 100644 | 61 | index XXXXXXX..XXXXXXX 100644 |
| 51 | --- a/accel/tcg/translate-all.c | 62 | --- a/scripts/tracetool/backend/syslog.py |
| 52 | +++ b/accel/tcg/translate-all.c | 63 | +++ b/scripts/tracetool/backend/syslog.py |
| 53 | @@ -XXX,XX +XXX,XX @@ struct page_collection { | ||
| 54 | |||
| 55 | /* Make sure all possible CPU event bits fit in tb->trace_vcpu_dstate */ | ||
| 56 | QEMU_BUILD_BUG_ON(CPU_TRACE_DSTATE_MAX_EVENTS > | ||
| 57 | - sizeof(((TranslationBlock *)0)->trace_vcpu_dstate) | ||
| 58 | + sizeof_field(TranslationBlock, trace_vcpu_dstate) | ||
| 59 | * BITS_PER_BYTE); | ||
| 60 | |||
| 61 | /* | ||
| 62 | diff --git a/hw/display/xenfb.c b/hw/display/xenfb.c | ||
| 63 | index XXXXXXX..XXXXXXX 100644 | ||
| 64 | --- a/hw/display/xenfb.c | ||
| 65 | +++ b/hw/display/xenfb.c | ||
| 66 | @@ -XXX,XX +XXX,XX @@ static int xenfb_configure_fb(struct XenFB *xenfb, size_t fb_len_lim, | ||
| 67 | int width, int height, int depth, | ||
| 68 | size_t fb_len, int offset, int row_stride) | ||
| 69 | { | ||
| 70 | - size_t mfn_sz = sizeof(*((struct xenfb_page *)0)->pd); | ||
| 71 | - size_t pd_len = sizeof(((struct xenfb_page *)0)->pd) / mfn_sz; | ||
| 72 | + size_t mfn_sz = sizeof_field(struct xenfb_page, pd[0]); | ||
| 73 | + size_t pd_len = sizeof_field(struct xenfb_page, pd) / mfn_sz; | ||
| 74 | size_t fb_pages = pd_len * XC_PAGE_SIZE / mfn_sz; | ||
| 75 | size_t fb_len_max = fb_pages * XC_PAGE_SIZE; | ||
| 76 | int max_width, max_height; | ||
| 77 | diff --git a/hw/net/rocker/rocker_of_dpa.c b/hw/net/rocker/rocker_of_dpa.c | ||
| 78 | index XXXXXXX..XXXXXXX 100644 | ||
| 79 | --- a/hw/net/rocker/rocker_of_dpa.c | ||
| 80 | +++ b/hw/net/rocker/rocker_of_dpa.c | ||
| 81 | @@ -XXX,XX +XXX,XX @@ typedef struct of_dpa_flow_key { | ||
| 82 | |||
| 83 | /* Width of key which includes field 'f' in u64s, rounded up */ | ||
| 84 | #define FLOW_KEY_WIDTH(f) \ | ||
| 85 | - DIV_ROUND_UP(offsetof(OfDpaFlowKey, f) + sizeof(((OfDpaFlowKey *)0)->f), \ | ||
| 86 | + DIV_ROUND_UP(offsetof(OfDpaFlowKey, f) + sizeof_field(OfDpaFlowKey, f), \ | ||
| 87 | sizeof(uint64_t)) | ||
| 88 | |||
| 89 | typedef struct of_dpa_flow_action { | ||
| 90 | diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c | ||
| 91 | index XXXXXXX..XXXXXXX 100644 | ||
| 92 | --- a/hw/net/virtio-net.c | ||
| 93 | +++ b/hw/net/virtio-net.c | ||
| 94 | @@ -XXX,XX +XXX,XX @@ | 64 | @@ -XXX,XX +XXX,XX @@ |
| 95 | * 'container'. | 65 | __email__ = "stefanha@redhat.com" |
| 96 | */ | 66 | |
| 97 | #define endof(container, field) \ | 67 | |
| 98 | - (offsetof(container, field) + sizeof(((container *)0)->field)) | 68 | +import os.path |
| 99 | + (offsetof(container, field) + sizeof_field(container, field)) | 69 | + |
| 100 | 70 | from tracetool import out | |
| 101 | typedef struct VirtIOFeature { | 71 | |
| 102 | uint64_t flags; | 72 | |
| 103 | diff --git a/target/i386/kvm.c b/target/i386/kvm.c | 73 | @@ -XXX,XX +XXX,XX @@ def generate_h(event, group): |
| 104 | index XXXXXXX..XXXXXXX 100644 | 74 | ' }', |
| 105 | --- a/target/i386/kvm.c | 75 | cond=cond, |
| 106 | +++ b/target/i386/kvm.c | 76 | event_lineno=event.lineno, |
| 107 | @@ -XXX,XX +XXX,XX @@ static int kvm_put_fpu(X86CPU *cpu) | 77 | - event_filename=event.filename, |
| 108 | #define XSAVE_PKRU 672 | 78 | + event_filename=os.path.relpath(event.filename), |
| 109 | 79 | name=event.name, | |
| 110 | #define XSAVE_BYTE_OFFSET(word_offset) \ | 80 | fmt=event.fmt.rstrip("\n"), |
| 111 | - ((word_offset) * sizeof(((struct kvm_xsave *)0)->region[0])) | 81 | argnames=argnames) |
| 112 | + ((word_offset) * sizeof_field(struct kvm_xsave, region[0])) | ||
| 113 | |||
| 114 | #define ASSERT_OFFSET(word_offset, field) \ | ||
| 115 | QEMU_BUILD_BUG_ON(XSAVE_BYTE_OFFSET(word_offset) != \ | ||
| 116 | diff --git a/target/ppc/arch_dump.c b/target/ppc/arch_dump.c | ||
| 117 | index XXXXXXX..XXXXXXX 100644 | ||
| 118 | --- a/target/ppc/arch_dump.c | ||
| 119 | +++ b/target/ppc/arch_dump.c | ||
| 120 | @@ -XXX,XX +XXX,XX @@ static const struct NoteFuncDescStruct { | ||
| 121 | int contents_size; | ||
| 122 | void (*note_contents_func)(NoteFuncArg *arg, PowerPCCPU *cpu); | ||
| 123 | } note_func[] = { | ||
| 124 | - {sizeof(((Note *)0)->contents.prstatus), ppc_write_elf_prstatus}, | ||
| 125 | - {sizeof(((Note *)0)->contents.fpregset), ppc_write_elf_fpregset}, | ||
| 126 | - {sizeof(((Note *)0)->contents.vmxregset), ppc_write_elf_vmxregset}, | ||
| 127 | - {sizeof(((Note *)0)->contents.vsxregset), ppc_write_elf_vsxregset}, | ||
| 128 | - {sizeof(((Note *)0)->contents.speregset), ppc_write_elf_speregset}, | ||
| 129 | + {sizeof_field(Note, contents.prstatus), ppc_write_elf_prstatus}, | ||
| 130 | + {sizeof_field(Note, contents.fpregset), ppc_write_elf_fpregset}, | ||
| 131 | + {sizeof_field(Note, contents.vmxregset), ppc_write_elf_vmxregset}, | ||
| 132 | + {sizeof_field(Note, contents.vsxregset), ppc_write_elf_vsxregset}, | ||
| 133 | + {sizeof_field(Note, contents.speregset), ppc_write_elf_speregset}, | ||
| 134 | { 0, NULL} | ||
| 135 | }; | ||
| 136 | |||
| 137 | diff --git a/target/s390x/arch_dump.c b/target/s390x/arch_dump.c | ||
| 138 | index XXXXXXX..XXXXXXX 100644 | ||
| 139 | --- a/target/s390x/arch_dump.c | ||
| 140 | +++ b/target/s390x/arch_dump.c | ||
| 141 | @@ -XXX,XX +XXX,XX @@ typedef struct NoteFuncDescStruct { | ||
| 142 | } NoteFuncDesc; | ||
| 143 | |||
| 144 | static const NoteFuncDesc note_core[] = { | ||
| 145 | - {sizeof(((Note *)0)->contents.prstatus), s390x_write_elf64_prstatus}, | ||
| 146 | - {sizeof(((Note *)0)->contents.fpregset), s390x_write_elf64_fpregset}, | ||
| 147 | + {sizeof_field(Note, contents.prstatus), s390x_write_elf64_prstatus}, | ||
| 148 | + {sizeof_field(Note, contents.fpregset), s390x_write_elf64_fpregset}, | ||
| 149 | { 0, NULL} | ||
| 150 | }; | ||
| 151 | |||
| 152 | static const NoteFuncDesc note_linux[] = { | ||
| 153 | - {sizeof(((Note *)0)->contents.prefix), s390x_write_elf64_prefix}, | ||
| 154 | - {sizeof(((Note *)0)->contents.ctrs), s390x_write_elf64_ctrs}, | ||
| 155 | - {sizeof(((Note *)0)->contents.timer), s390x_write_elf64_timer}, | ||
| 156 | - {sizeof(((Note *)0)->contents.todcmp), s390x_write_elf64_todcmp}, | ||
| 157 | - {sizeof(((Note *)0)->contents.todpreg), s390x_write_elf64_todpreg}, | ||
| 158 | - {sizeof(((Note *)0)->contents.vregslo), s390x_write_elf64_vregslo}, | ||
| 159 | - {sizeof(((Note *)0)->contents.vregshi), s390x_write_elf64_vregshi}, | ||
| 160 | - {sizeof(((Note *)0)->contents.gscb), s390x_write_elf64_gscb}, | ||
| 161 | + {sizeof_field(Note, contents.prefix), s390x_write_elf64_prefix}, | ||
| 162 | + {sizeof_field(Note, contents.ctrs), s390x_write_elf64_ctrs}, | ||
| 163 | + {sizeof_field(Note, contents.timer), s390x_write_elf64_timer}, | ||
| 164 | + {sizeof_field(Note, contents.todcmp), s390x_write_elf64_todcmp}, | ||
| 165 | + {sizeof_field(Note, contents.todpreg), s390x_write_elf64_todpreg}, | ||
| 166 | + {sizeof_field(Note, contents.vregslo), s390x_write_elf64_vregslo}, | ||
| 167 | + {sizeof_field(Note, contents.vregshi), s390x_write_elf64_vregshi}, | ||
| 168 | + {sizeof_field(Note, contents.gscb), s390x_write_elf64_gscb}, | ||
| 169 | { 0, NULL} | ||
| 170 | }; | ||
| 171 | |||
| 172 | -- | 82 | -- |
| 173 | 2.17.1 | 83 | 2.39.2 |
| 174 | |||
| 175 | diff view generated by jsdifflib |