diff options
| author | Peter Maydell | 2021-05-28 23:55:56 +0200 |
|---|---|---|
| committer | Peter Maydell | 2021-05-28 23:55:56 +0200 |
| commit | a648df38898ddbad1bd6d71a6680b3788f6528b2 (patch) | |
| tree | 690749f9f0534451b35ecd5707e3a09e8b4728b2 /hw/net/imx_fec.c | |
| parent | Merge remote-tracking branch 'remotes/rth-gitlab/tags/pull-tcg-20210526' into... (diff) | |
| parent | tap-bsd: Remove special casing for older OpenBSD releases (diff) | |
| download | qemu-a648df38898ddbad1bd6d71a6680b3788f6528b2.tar.gz qemu-a648df38898ddbad1bd6d71a6680b3788f6528b2.tar.xz qemu-a648df38898ddbad1bd6d71a6680b3788f6528b2.zip | |
Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging
# gpg: Signature made Thu 27 May 2021 04:06:17 BST
# gpg: using RSA key EF04965B398D6211
# gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <jasowang@redhat.com>" [marginal]
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 215D 46F4 8246 689E C77F 3562 EF04 965B 398D 6211
* remotes/jasowang/tags/net-pull-request:
tap-bsd: Remove special casing for older OpenBSD releases
virtio-net: failover: add missing remove_migration_state_change_notifier()
hw/net/imx_fec: return 0xffff when accessing non-existing PHY
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/net/imx_fec.c')
| -rw-r--r-- | hw/net/imx_fec.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/hw/net/imx_fec.c b/hw/net/imx_fec.c index f03450c028..9c7035bc94 100644 --- a/hw/net/imx_fec.c +++ b/hw/net/imx_fec.c @@ -283,9 +283,8 @@ static uint32_t imx_phy_read(IMXFECState *s, int reg) uint32_t phy = reg / 32; if (phy != s->phy_num) { - qemu_log_mask(LOG_GUEST_ERROR, "[%s.phy]%s: Bad phy num %u\n", - TYPE_IMX_FEC, __func__, phy); - return 0; + trace_imx_phy_read_num(phy, s->phy_num); + return 0xffff; } reg %= 32; @@ -345,8 +344,7 @@ static void imx_phy_write(IMXFECState *s, int reg, uint32_t val) uint32_t phy = reg / 32; if (phy != s->phy_num) { - qemu_log_mask(LOG_GUEST_ERROR, "[%s.phy]%s: Bad phy num %u\n", - TYPE_IMX_FEC, __func__, phy); + trace_imx_phy_write_num(phy, s->phy_num); return; } |