trivial patches for 2025-10-05
-----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEZKoqtTHVaQM2a/75gqpKJDselHgFAmjiFiUACgkQgqpKJDse lHitTBAAnv7RI9gCW7cc1y+BDPl+gqRuo8f+d1Mg/bUMf5BVjtPYUjzlwW1dShT+ W4cOwBZbuKt/EqodQvkBpaZrv3mlfVSmSWAYy5egL5naRgHOqnzcbt3nVSpJBfrI VWMYJDT8owU80gRpeJ70UEQgBUxJ6ipnBgTuo6ILfDYAaOGIgvh6UMqdPQqHjULV CCv+TgIs6Uu4clZvPunHjaqnocvxnSWzpn6sy0xzk94QDNTW2ijBMAEhjKcUE9GA 2UhqVeiHvRVhAkGOTR2JNXtwwl864JHtJ4TqfilE8OUVF2+KcG3t5j8SI0JLgvRz sjHcFaOuVQXz2xVQv1dD6xVeq0YxkMIHMVe0ScN4WtVNTc8y5zdUSaphEcT7ELWe a4juN1qTqJ7B0h1BqCJoKY6fhWAcKhQccESKmXoxuiiXTOJb436F0IXPWzeByg+2 Hm+dtgjCoOaR8KRgx7dS3zowMFCUDE0HqyHQVj974455bzlwdc3LIO2KniLtbZgV rt6JWbn5poBcRkSBXV2SI78dls10Dn+So/ecmJjxMz+61hBN+t6oqTdaaPaLnyUL yDwwn5Ji91hQO+hBL4+wRw+Ssbmz8YcdEyacbtgIE+erS0lHt9Df/21rSTSI3xRl 0sj+WTSQ1Ar7CwE8veVNqvgdZRc45kHvBwYXyxgLADmcGqok5wM= =gc8G -----END PGP SIGNATURE----- Merge tag 'pull-trivial-patches' of https://gitlab.com/mjt0k/qemu into staging trivial patches for 2025-10-05 # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCgAdFiEEZKoqtTHVaQM2a/75gqpKJDselHgFAmjiFiUACgkQgqpKJDse # lHitTBAAnv7RI9gCW7cc1y+BDPl+gqRuo8f+d1Mg/bUMf5BVjtPYUjzlwW1dShT+ # W4cOwBZbuKt/EqodQvkBpaZrv3mlfVSmSWAYy5egL5naRgHOqnzcbt3nVSpJBfrI # VWMYJDT8owU80gRpeJ70UEQgBUxJ6ipnBgTuo6ILfDYAaOGIgvh6UMqdPQqHjULV # CCv+TgIs6Uu4clZvPunHjaqnocvxnSWzpn6sy0xzk94QDNTW2ijBMAEhjKcUE9GA # 2UhqVeiHvRVhAkGOTR2JNXtwwl864JHtJ4TqfilE8OUVF2+KcG3t5j8SI0JLgvRz # sjHcFaOuVQXz2xVQv1dD6xVeq0YxkMIHMVe0ScN4WtVNTc8y5zdUSaphEcT7ELWe # a4juN1qTqJ7B0h1BqCJoKY6fhWAcKhQccESKmXoxuiiXTOJb436F0IXPWzeByg+2 # Hm+dtgjCoOaR8KRgx7dS3zowMFCUDE0HqyHQVj974455bzlwdc3LIO2KniLtbZgV # rt6JWbn5poBcRkSBXV2SI78dls10Dn+So/ecmJjxMz+61hBN+t6oqTdaaPaLnyUL # yDwwn5Ji91hQO+hBL4+wRw+Ssbmz8YcdEyacbtgIE+erS0lHt9Df/21rSTSI3xRl # 0sj+WTSQ1Ar7CwE8veVNqvgdZRc45kHvBwYXyxgLADmcGqok5wM= # =gc8G # -----END PGP SIGNATURE----- # gpg: Signature made Sat 04 Oct 2025 11:54:29 PM PDT # gpg: using RSA key 64AA2AB531D56903366BFEF982AA4A243B1E9478 # gpg: Good signature from "Michael Tokarev <mjt@debian.org>" [unknown] # gpg: aka "Michael Tokarev <mjt@corpit.ru>" [unknown] # gpg: aka "Michael Tokarev <mjt@tls.msk.ru>" [unknown] # 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: 9D8B E14E 3F2A 9DD7 9199 28F1 61AD 3D98 ECDF 2C8E # Subkey fingerprint: 64AA 2AB5 31D5 6903 366B FEF9 82AA 4A24 3B1E 9478 * tag 'pull-trivial-patches' of https://gitlab.com/mjt0k/qemu: system/runstate: remove duplicate in runstate transitions docs/specs/spdm.rst: Fix typo in x86_64 architecture name docs/devel: Correct uefi-vars-x64 device name wdt_i6300esb: fix incorrect mask for interrupt type hid: fix incorrect return value for hid vhost-user-test: remove trailing newlines in g_test_message() calls hw/net/can: Remove redundant status bit setting in can_sja1000 ui/gtk: Fix callback function signature Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Richard Henderson
commit
1245f601d3
8 changed files with 15 additions and 17 deletions
|
|
@ -34,7 +34,7 @@ configures the shared buffer location and size, and traps to the host
|
|||
to process the requests.
|
||||
|
||||
The ``uefi-vars`` device implements the UEFI virtual device. It comes
|
||||
in ``uefi-vars-x86`` and ``uefi-vars-sysbus`` flavours. The device
|
||||
in ``uefi-vars-x64`` and ``uefi-vars-sysbus`` flavours. The device
|
||||
reimplements the handlers needed, specifically
|
||||
``EfiSmmVariableProtocol`` and ``VarCheckPolicyLibMmiHandler``. It
|
||||
also consumes events (``EfiEndOfDxeEventGroup``,
|
||||
|
|
@ -57,7 +57,7 @@ usage on x86_64
|
|||
.. code::
|
||||
|
||||
qemu-system-x86_64 \
|
||||
-device uefi-vars-x86,jsonfile=/path/to/vars.json
|
||||
-device uefi-vars-x64,jsonfile=/path/to/vars.json
|
||||
|
||||
usage on aarch64
|
||||
----------------
|
||||
|
|
|
|||
|
|
@ -102,7 +102,7 @@ Then you can add this to your QEMU command line:
|
|||
|
||||
At which point QEMU will try to connect to the SPDM server.
|
||||
|
||||
Note that if using x64-64 you will want to use the q35 machine instead
|
||||
Note that if using x86_64 you will want to use the q35 machine instead
|
||||
of the default. So the entire QEMU command might look like this
|
||||
|
||||
.. code-block:: shell
|
||||
|
|
|
|||
|
|
@ -478,6 +478,7 @@ int hid_keyboard_write(HIDState *hs, uint8_t *buf, int len)
|
|||
ledstate |= QEMU_CAPS_LOCK_LED;
|
||||
}
|
||||
kbd_put_ledstate(ledstate);
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -842,7 +842,6 @@ ssize_t can_sja_receive(CanBusClientState *client, const qemu_can_frame *frames,
|
|||
s->status_pel |= 0x01; /* Set the Receive Buffer Status. DS-p23 */
|
||||
s->interrupt_pel |= 0x01;
|
||||
s->status_pel &= ~(1 << 4);
|
||||
s->status_pel |= (1 << 0);
|
||||
can_sja_update_pel_irq(s);
|
||||
} else { /* BasicCAN mode */
|
||||
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@
|
|||
/* Config register bits */
|
||||
#define ESB_WDT_REBOOT (0x01 << 5) /* Enable reboot on timeout */
|
||||
#define ESB_WDT_FREQ (0x01 << 2) /* Decrement frequency */
|
||||
#define ESB_WDT_INTTYPE (0x11 << 0) /* Interrupt type on timer1 timeout */
|
||||
#define ESB_WDT_INTTYPE (0x03 << 0) /* Interrupt type on timer1 timeout */
|
||||
|
||||
/* Reload register bits */
|
||||
#define ESB_WDT_RELOAD (0x01 << 8) /* prevent timeout */
|
||||
|
|
|
|||
|
|
@ -76,9 +76,6 @@ typedef struct {
|
|||
} RunStateTransition;
|
||||
|
||||
static const RunStateTransition runstate_transitions_def[] = {
|
||||
{ RUN_STATE_PRELAUNCH, RUN_STATE_INMIGRATE },
|
||||
{ RUN_STATE_PRELAUNCH, RUN_STATE_SUSPENDED },
|
||||
|
||||
{ RUN_STATE_DEBUG, RUN_STATE_RUNNING },
|
||||
{ RUN_STATE_DEBUG, RUN_STATE_FINISH_MIGRATE },
|
||||
{ RUN_STATE_DEBUG, RUN_STATE_PRELAUNCH },
|
||||
|
|
@ -118,6 +115,7 @@ static const RunStateTransition runstate_transitions_def[] = {
|
|||
{ RUN_STATE_PRELAUNCH, RUN_STATE_RUNNING },
|
||||
{ RUN_STATE_PRELAUNCH, RUN_STATE_FINISH_MIGRATE },
|
||||
{ RUN_STATE_PRELAUNCH, RUN_STATE_INMIGRATE },
|
||||
{ RUN_STATE_PRELAUNCH, RUN_STATE_SUSPENDED },
|
||||
|
||||
{ RUN_STATE_FINISH_MIGRATE, RUN_STATE_RUNNING },
|
||||
{ RUN_STATE_FINISH_MIGRATE, RUN_STATE_PAUSED },
|
||||
|
|
|
|||
|
|
@ -391,7 +391,7 @@ static void chr_read(void *opaque, const uint8_t *buf, int size)
|
|||
* We don't need to do anything here, the remote is just
|
||||
* letting us know it is in charge. Just log it.
|
||||
*/
|
||||
g_test_message("set_owner: start of session\n");
|
||||
g_test_message("set_owner: start of session");
|
||||
break;
|
||||
|
||||
case VHOST_USER_GET_PROTOCOL_FEATURES:
|
||||
|
|
@ -417,7 +417,7 @@ static void chr_read(void *opaque, const uint8_t *buf, int size)
|
|||
* the remote end to send this. There is no handshake reply so
|
||||
* just log the details for debugging.
|
||||
*/
|
||||
g_test_message("set_protocol_features: 0x%"PRIx64 "\n", msg.payload.u64);
|
||||
g_test_message("set_protocol_features: 0x%"PRIx64, msg.payload.u64);
|
||||
break;
|
||||
|
||||
/*
|
||||
|
|
@ -425,11 +425,11 @@ static void chr_read(void *opaque, const uint8_t *buf, int size)
|
|||
* address of the vrings but we can simply report them.
|
||||
*/
|
||||
case VHOST_USER_SET_VRING_NUM:
|
||||
g_test_message("set_vring_num: %d/%d\n",
|
||||
g_test_message("set_vring_num: %d/%d",
|
||||
msg.payload.state.index, msg.payload.state.num);
|
||||
break;
|
||||
case VHOST_USER_SET_VRING_ADDR:
|
||||
g_test_message("set_vring_addr: 0x%"PRIx64"/0x%"PRIx64"/0x%"PRIx64"\n",
|
||||
g_test_message("set_vring_addr: 0x%"PRIx64"/0x%"PRIx64"/0x%"PRIx64,
|
||||
msg.payload.addr.avail_user_addr,
|
||||
msg.payload.addr.desc_user_addr,
|
||||
msg.payload.addr.used_user_addr);
|
||||
|
|
@ -462,7 +462,7 @@ static void chr_read(void *opaque, const uint8_t *buf, int size)
|
|||
case VHOST_USER_SET_VRING_CALL:
|
||||
/* consume the fd */
|
||||
if (!qemu_chr_fe_get_msgfds(chr, &fd, 1) && fd < 0) {
|
||||
g_test_message("call fd: %d, do not set non-blocking\n", fd);
|
||||
g_test_message("call fd: %d, do not set non-blocking", fd);
|
||||
break;
|
||||
}
|
||||
/*
|
||||
|
|
@ -507,12 +507,12 @@ static void chr_read(void *opaque, const uint8_t *buf, int size)
|
|||
* fully functioning vhost-user we would enable/disable the
|
||||
* vring monitoring.
|
||||
*/
|
||||
g_test_message("set_vring(%d)=%s\n", msg.payload.state.index,
|
||||
g_test_message("set_vring(%d)=%s", msg.payload.state.index,
|
||||
msg.payload.state.num ? "enabled" : "disabled");
|
||||
break;
|
||||
|
||||
default:
|
||||
g_test_message("vhost-user: un-handled message: %d\n", msg.request);
|
||||
g_test_message("vhost-user: un-handled message: %d", msg.request);
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
|
|||
4
ui/gtk.c
4
ui/gtk.c
|
|
@ -766,9 +766,9 @@ static gboolean gd_render_event(GtkGLArea *area, GdkGLContext *context,
|
|||
}
|
||||
|
||||
static void gd_resize_event(GtkGLArea *area,
|
||||
gint width, gint height, gpointer *opaque)
|
||||
gint width, gint height, gpointer opaque)
|
||||
{
|
||||
VirtualConsole *vc = (void *)opaque;
|
||||
VirtualConsole *vc = opaque;
|
||||
double pw = width, ph = height;
|
||||
double sx = vc->gfx.scale_x, sy = vc->gfx.scale_y;
|
||||
GdkWindow *window = gtk_widget_get_window(GTK_WIDGET(area));
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue