diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2021-11-23 01:41:05 +0100 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2021-11-23 01:41:05 +0100 |
| commit | 6d9c9603ad2ffdbf2aae3f01955c17591287cb4c (patch) | |
| tree | 407c2436edfef30abce300ce60475fdbb8c6588c | |
| parent | 3c87012e3887e8a904a3494283c4acfa7ef777dc (diff) | |
| parent | 33a0c404fb90a3fa8eea6ebf5c535fc7bc0b9912 (diff) | |
Merge tag 'pull-target-arm-20211122-1' of https://git.linaro.org/people/pmaydell/qemu-arm into staging
target-arm queue:
* drop spurious bump of ITS vmstate version fields
# gpg: Signature made Mon 22 Nov 2021 07:43:19 PM CET
# gpg: using RSA key E1A5C593CD419DE28E8315CF3C2525ED14360CDE
# gpg: issuer "peter.maydell@linaro.org"
# gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>" [full]
# gpg: aka "Peter Maydell <pmaydell@gmail.com>" [full]
# gpg: aka "Peter Maydell <pmaydell@chiark.greenend.org.uk>" [full]
* tag 'pull-target-arm-20211122-1' of https://git.linaro.org/people/pmaydell/qemu-arm:
hw/intc/arm_gicv3_its: Revert version increments in vmstate_its
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
| -rw-r--r-- | hw/intc/arm_gicv3_its_common.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/hw/intc/arm_gicv3_its_common.c b/hw/intc/arm_gicv3_its_common.c index 7d7f3882e7..90b85f1e25 100644 --- a/hw/intc/arm_gicv3_its_common.c +++ b/hw/intc/arm_gicv3_its_common.c @@ -50,8 +50,6 @@ static int gicv3_its_post_load(void *opaque, int version_id) static const VMStateDescription vmstate_its = { .name = "arm_gicv3_its", - .version_id = 1, - .minimum_version_id = 1, .pre_save = gicv3_its_pre_save, .post_load = gicv3_its_post_load, .priority = MIG_PRI_GICV3_ITS, |