[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [qemu/qemu] ac5e8c: Revert "hw/sparc64/niagara: Use blk_n
|
From: |
Richard Henderson |
|
Subject: |
[Qemu-commits] [qemu/qemu] ac5e8c: Revert "hw/sparc64/niagara: Use blk_name() instead... |
|
Date: |
Wed, 28 Jun 2023 08:29:22 -0700 |
Branch: refs/heads/master
Home: https://github.com/qemu/qemu
Commit: ac5e8c1dec246950d73e22dceab5cb36e82aac0b
https://github.com/qemu/qemu/commit/ac5e8c1dec246950d73e22dceab5cb36e82aac0b
Author: Markus Armbruster <armbru@redhat.com>
Date: 2023-06-28 (Wed, 28 Jun 2023)
Changed paths:
M hw/sparc64/niagara.c
Log Message:
-----------
Revert "hw/sparc64/niagara: Use blk_name() instead of open-coding it"
This reverts commit 1881f336a33a8a99cb17ab1c57ed953682e8e107.
This commit breaks "-drive if=pflash,readonly=on,file=image.iso". It
claims to merely replace an open-coded version of blk_name() by a
call, but that's not the case. Sorry for the inconvenience!
Reported-by: Jakub Jermář <jakub@jermar.eu>
Cc: qemu-stable@nongnu.org
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20230515151104.1350155-1-armbru@redhat.com>
Acked-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Commit: f67ccb2f77190e597562b2041b36ee7d9f6f302b
https://github.com/qemu/qemu/commit/f67ccb2f77190e597562b2041b36ee7d9f6f302b
Author: Richard Henderson <richard.henderson@linaro.org>
Date: 2023-06-28 (Wed, 28 Jun 2023)
Changed paths:
M target/sparc/translate.c
Log Message:
-----------
target/sparc: Use tcg_gen_lookup_and_goto_ptr in gen_goto_tb
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20230628071202.230991-2-richard.henderson@linaro.org>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Commit: 611a1684d0b46bae8fb1cfa15db28c0a5cb64cf5
https://github.com/qemu/qemu/commit/611a1684d0b46bae8fb1cfa15db28c0a5cb64cf5
Author: Richard Henderson <richard.henderson@linaro.org>
Date: 2023-06-28 (Wed, 28 Jun 2023)
Changed paths:
M target/sparc/translate.c
Log Message:
-----------
target/sparc: Fix npc comparison in sparc_tr_insn_start
During translation, npc == address, DYNAMIC_PC, or JUMP_PC.
It is only the encoding between here and sparc_restore_state_to_opc
that considers JUMP_PC to be a bit within a larger value.
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20230628071202.230991-3-richard.henderson@linaro.org>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Commit: 0c2e96c1703041badf675993247351f629b4ab20
https://github.com/qemu/qemu/commit/0c2e96c1703041badf675993247351f629b4ab20
Author: Richard Henderson <richard.henderson@linaro.org>
Date: 2023-06-28 (Wed, 28 Jun 2023)
Changed paths:
M target/sparc/translate.c
Log Message:
-----------
target/sparc: Drop inline markers from translate.c
Let the compiler decide about inlining.
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20230628071202.230991-4-richard.henderson@linaro.org>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Commit: 633c42834c7bbd528fdb0971c3d2f994a5137072
https://github.com/qemu/qemu/commit/633c42834c7bbd528fdb0971c3d2f994a5137072
Author: Richard Henderson <richard.henderson@linaro.org>
Date: 2023-06-28 (Wed, 28 Jun 2023)
Changed paths:
M target/sparc/translate.c
Log Message:
-----------
target/sparc: Introduce DYNAMIC_PC_LOOKUP
Create a new artificial "next pc" which also indicates
that nothing has changed within the cpu state which
requires returning to the main loop.
Pipe this new value though all pc/npc checks.
Do not produce this new value yet.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20230628071202.230991-5-richard.henderson@linaro.org>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Commit: 99c82c479b26ce18e124b86d0dab9fd3bfa3ec4f
https://github.com/qemu/qemu/commit/99c82c479b26ce18e124b86d0dab9fd3bfa3ec4f
Author: Richard Henderson <richard.henderson@linaro.org>
Date: 2023-06-28 (Wed, 28 Jun 2023)
Changed paths:
M target/sparc/translate.c
Log Message:
-----------
target/sparc: Use DYNAMIC_PC_LOOKUP for conditional branches
When resolving JUMP_PC, we know this is for a plain branch
with no other side effects.
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20230628071202.230991-6-richard.henderson@linaro.org>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Commit: 831543fc7678c169cb2190a14be3b8d097617776
https://github.com/qemu/qemu/commit/831543fc7678c169cb2190a14be3b8d097617776
Author: Richard Henderson <richard.henderson@linaro.org>
Date: 2023-06-28 (Wed, 28 Jun 2023)
Changed paths:
M target/sparc/translate.c
Log Message:
-----------
target/sparc: Use DYNAMIC_PC_LOOKUP for JMPL
This is for a plain indirect branch with no other side effects.
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20230628071202.230991-7-richard.henderson@linaro.org>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Commit: 553338dc32c97209a01e0717ec624505b66e7948
https://github.com/qemu/qemu/commit/553338dc32c97209a01e0717ec624505b66e7948
Author: Richard Henderson <richard.henderson@linaro.org>
Date: 2023-06-28 (Wed, 28 Jun 2023)
Changed paths:
M target/sparc/translate.c
Log Message:
-----------
target/sparc: Use DYNAMIC_PC_LOOKUP for v9 RETURN
After the register window unwind, this is for a plain indirect
branch with no further side effects.
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20230628071202.230991-8-richard.henderson@linaro.org>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Commit: 44a7c2ecd4fcdb9963824cf897a3e69364c187bb
https://github.com/qemu/qemu/commit/44a7c2ecd4fcdb9963824cf897a3e69364c187bb
Author: Richard Henderson <richard.henderson@linaro.org>
Date: 2023-06-28 (Wed, 28 Jun 2023)
Changed paths:
M target/sparc/translate.c
Log Message:
-----------
target/sparc: Use tcg_gen_lookup_and_goto_ptr for v9 WRASI
We incorporate %asi into tb->flags so that we may generate
inline code for the many ASIs for which it is easy to do so.
Setting %asi is common for e.g. memcpy and memset performing
block copy and clear, so it is worth noticing this case.
We must end the TB but do not need to return to the main loop.
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20230628071202.230991-9-richard.henderson@linaro.org>
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Commit: 6b90a4cdc04ec7ca94c3f664d63ee43c2046a875
https://github.com/qemu/qemu/commit/6b90a4cdc04ec7ca94c3f664d63ee43c2046a875
Author: Henrik Carlqvist <hc981@poolhem.se>
Date: 2023-06-28 (Wed, 28 Jun 2023)
Changed paths:
M docs/system/device-emulation.rst
A docs/system/devices/keyboard.rst
M docs/system/target-sparc.rst
M hw/char/escc.c
M include/hw/char/escc.h
Log Message:
-----------
escc: emulate dip switch language layout settings on SUN keyboard
SUN Type 4, 5 and 5c keyboards have dip switches to choose the language layout
of the keyboard. Solaris makes an ioctl to query the value of the dipswitches
and uses that value to select keyboard layout. Also the SUN bios like the one
in the file ss5.bin uses this value to support at least some keyboard layouts.
However, the OpenBIOS provided with qemu is hardcoded to always use an US
keyboard layout.
Before this patch, qemu allways gave dip switch value 0x21 (US keyboard),
this patch uses a command line switch like
"-global escc.chnA-sunkbd-layout=de" to select dip switch value. A table is
used to lookup values from arguments like:
-global escc.chnA-sunkbd-layout=fr
-global escc.chnA-sunkbd-layout=es
But the patch also accepts numeric dip switch values directly:
-global escc.chnA-sunkbd-layout=0x2b
-global escc.chnA-sunkbd-layout=43
Both values above are the same and select swedish keyboard as explained in
table 3-15 at
https://docs.oracle.com/cd/E19683-01/806-6642/new-43/index.html
Unless you want to do a full Solaris installation but happen to have
access to a Sun bios file, the easiest way to test that the patch works
is to:
qemu-system-sparc -global escc.chnA-sunkbd-layout=sv -bios /path/to/ss5.bin
If you already happen to have a Solaris installation in a qemu disk image
file you can easily try different keyboard layouts after this patch is
applied.
Signed-off-by: Henrik Carlqvist <hc1245@poolhem.se>
Message-Id: <20230623203007.56d3d182.hc981@poolhem.se>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
[MCA edit: update unsigned char to uint8_t, fix spacing issues]
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Commit: ca3fcdeeeef56f46a7ac7b2408eda608d59be6f1
https://github.com/qemu/qemu/commit/ca3fcdeeeef56f46a7ac7b2408eda608d59be6f1
Author: Ani Sinha <anisinha@redhat.com>
Date: 2023-06-28 (Wed, 28 Jun 2023)
Changed paths:
M hw/net/vhost_net.c
Log Message:
-----------
net/vhost-net: do not assert on null pointer return from tap_get_vhost_net()
When 'vhost=off' or no vhost specific options at all are passed for the tap
net-device backend, tap_get_vhost_net() can return NULL. The function
net_init_tap_one() does not call vhost_net_init() on such cases and therefore
vhost_net pointer within the tap device state structure remains NULL. Hence,
assertion here on a NULL pointer return from tap_get_vhost_net() would not be
correct. Remove it and fix the crash generated by qemu upon initialization in
the following call chain :
qdev_realize() -> pci_qdev_realize() -> virtio_device_realize() ->
virtio_bus_device_plugged() -> virtio_net_get_features() -> get_vhost_net()
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Tested-by: Cédric Le Goater <clg@redhat.com>
Fixes: 0e994668d00c9c ("vhost_net: add an assertion for TAP client backends")
Reported-by: Cédric Le Goater <clg@redhat.com>
Report: <abab7a71-216d-b103-fa47-70bdf9dc0080@redhat.com>
Signed-off-by: Ani Sinha <anisinha@redhat.com>
Message-Id: <20230628112804.36676-1-anisinha@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Commit: 37004ba469db57073631f48150fcc5bc8fc1c49a
https://github.com/qemu/qemu/commit/37004ba469db57073631f48150fcc5bc8fc1c49a
Author: Richard Henderson <richard.henderson@linaro.org>
Date: 2023-06-28 (Wed, 28 Jun 2023)
Changed paths:
M hw/net/vhost_net.c
Log Message:
-----------
Merge tag 'for_upstream' of https://git.kernel.org/pub/scm/virt/kvm/mst/qemu
into staging
virtio: regression fix
A regression was introduced in the last pull request. Fix it up.
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
# -----BEGIN PGP SIGNATURE-----
#
# iQFDBAABCAAtFiEEXQn9CHHI+FuUyooNKB8NuNKNVGkFAmScH0QPHG1zdEByZWRo
# YXQuY29tAAoJECgfDbjSjVRpEPUH/1s424Aerch82tdps+qIhuclf9Jq47oo7Q/Y
# JVeizUsFLtE0Wwmfyna1rIbaILM//Akcq8Y0Ny+GHtYA8NdIaAQfue87uy+k8qbc
# qFXbimZEzjZp7CAC+6tUiv8UDaYF7I9giImZnHkkbPDz22ACQQCzV6nTogoc1pzg
# BkLxbWjYUdSTT8l1h/H7XwGWKsKZ9RUGxxAOpKqdK3NElmy+1I1eeUvhnLZwAc3i
# 9HUMOg2JQBhky0jjkrDHQcyopxlHNBrz7D6/sZKOyua627DgRS1BOAM9h2u2F3rq
# +6Hv258g48764Hl0SYEKCBULI+CrgtpcS/aq8sLW6Tm7Cw2k/N0=
# =y9dL
# -----END PGP SIGNATURE-----
# gpg: Signature made Wed 28 Jun 2023 01:53:40 PM CEST
# gpg: using RSA key 5D09FD0871C8F85B94CA8A0D281F0DB8D28D5469
# gpg: issuer "mst@redhat.com"
# gpg: Good signature from "Michael S. Tsirkin <mst@kernel.org>" [undefined]
# gpg: aka "Michael S. Tsirkin <mst@redhat.com>" [undefined]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 0270 606B 6F3C DF3D 0B17 0970 C350 3912 AFBE 8E67
# Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA 8A0D 281F 0DB8 D28D 5469
* tag 'for_upstream' of https://git.kernel.org/pub/scm/virt/kvm/mst/qemu:
net/vhost-net: do not assert on null pointer return from tap_get_vhost_net()
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Commit: 47d183b7a8db1693e9cb342fb66b61809765872b
https://github.com/qemu/qemu/commit/47d183b7a8db1693e9cb342fb66b61809765872b
Author: Richard Henderson <richard.henderson@linaro.org>
Date: 2023-06-28 (Wed, 28 Jun 2023)
Changed paths:
M docs/system/device-emulation.rst
A docs/system/devices/keyboard.rst
M docs/system/target-sparc.rst
M hw/char/escc.c
M hw/sparc64/niagara.c
M include/hw/char/escc.h
M target/sparc/translate.c
Log Message:
-----------
Merge tag 'qemu-sparc-20230628' of https://github.com/mcayland/qemu into
staging
qemu-sparc queue
# -----BEGIN PGP SIGNATURE-----
#
# iQFSBAABCgA8FiEEzGIauY6CIA2RXMnEW8LFb64PMh8FAmScHBkeHG1hcmsuY2F2
# ZS1heWxhbmRAaWxhbmRlLmNvLnVrAAoJEFvCxW+uDzIfuZ8H/3KjLLCaGcO3jnus
# P/ky3wGYx9aah/iNfRDgaaGRkPX18Eabq0BidUt/DN28yQmKgnOcbCwHlIt4QdCt
# PeO9hRNLpCop63LwyQQTrSZEdVZP75CX6dRcN+6h5TsY66/ESZjBsivuJGVHIU6O
# L8zJv2KKg0SKtJHsPGkUppmfyM4btmGTerqSJHv1SJfy4DJdzRMF83/WOZtE5srm
# YvpgZsiztBpHbG/+jLn2mX7iaQiZQCCs+weU0ynszr5WENAnuJderjO+mo0DZkqD
# j+R6LMcHHj6I4uP68eJowdTezOpoZNROh/gdUozCweA1AC/8RotkJa9UcBeEplY/
# +wV8mts=
# =ga0/
# -----END PGP SIGNATURE-----
# gpg: Signature made Wed 28 Jun 2023 01:40:09 PM CEST
# gpg: using RSA key CC621AB98E82200D915CC9C45BC2C56FAE0F321F
# gpg: issuer "mark.cave-ayland@ilande.co.uk"
# gpg: Good signature from "Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>"
[undefined]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: CC62 1AB9 8E82 200D 915C C9C4 5BC2 C56F AE0F 321F
* tag 'qemu-sparc-20230628' of https://github.com/mcayland/qemu:
escc: emulate dip switch language layout settings on SUN keyboard
target/sparc: Use tcg_gen_lookup_and_goto_ptr for v9 WRASI
target/sparc: Use DYNAMIC_PC_LOOKUP for v9 RETURN
target/sparc: Use DYNAMIC_PC_LOOKUP for JMPL
target/sparc: Use DYNAMIC_PC_LOOKUP for conditional branches
target/sparc: Introduce DYNAMIC_PC_LOOKUP
target/sparc: Drop inline markers from translate.c
target/sparc: Fix npc comparison in sparc_tr_insn_start
target/sparc: Use tcg_gen_lookup_and_goto_ptr in gen_goto_tb
Revert "hw/sparc64/niagara: Use blk_name() instead of open-coding it"
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Compare: https://github.com/qemu/qemu/compare/aa1048e33c76...47d183b7a8db