Fix const qualifier build errors with recent glibc
-----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEoPZlSPBIlev+awtgUaNDx8/77KEFAmlBXyEACgkQUaNDx8/7 7KHemxAAjOKuYG7LCZv6iPd0ezgErAyKuIDstgNn4x3KKA75sfEMJZINwLBaTXcy l/DWOoZP3s9ciMJTBY1JdgkbVJ1LDDsf94rTUbZoNjrOocNSXypHNpVbYxuw3Ntf vBhQ8gOdR62Ny/2ndmF525L0ir0pGd9lgy9I9fnZ2xQO6QxklInaJjfw8In0+l+t mf1sUW8ltSWZs1tWpGaEUKnEyxs2iFYP83yvPSs1O0WAgPSBqPkLIkHp+QJJcdUV f5IPfXPWrbgbjkSLyo8EbYwmegTHcXdSEvQxOm3hnSN+0HCMd5oTNcKbjdTaTcgk DaUl39PJ09CB24orNMXEZakD7p3lFBVB5Yfr87dDujILTtpPtKAVZMt+X/b0chqj g43L3m5pqu34zMWvGDOSgU+8azip11Wy4MG/yWsgMKVXMAPBf3oOunZVkQY/dqeI eqX1Hvh7qXHcinuZKAKBefPUqKyoaOKDk3PtUVjW1p4iLC3f5MMOl4SKe8R/hKoe xRz+SAcS8TJgrcnaKm1mMUDnqXorHb0IxUYCc/i0CVNJsVclmGI5rwLRMwEDAIIy GOfMHMFUhtFzhVC+tbIcAe8QDnrzR6hvxBvEeunZ/lZtTjtlSPyZklRqKEpXjU4i ME1Vj6wRIpI9jb5fcJCFy+ZTxQ94c8T8mHsXMfTSWcZzUlFC1/s= =rEBR -----END PGP SIGNATURE----- Merge tag 'pull-glibc-20251216' of https://github.com/legoater/qemu into staging Fix const qualifier build errors with recent glibc # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCAAdFiEEoPZlSPBIlev+awtgUaNDx8/77KEFAmlBXyEACgkQUaNDx8/7 # 7KHemxAAjOKuYG7LCZv6iPd0ezgErAyKuIDstgNn4x3KKA75sfEMJZINwLBaTXcy # l/DWOoZP3s9ciMJTBY1JdgkbVJ1LDDsf94rTUbZoNjrOocNSXypHNpVbYxuw3Ntf # vBhQ8gOdR62Ny/2ndmF525L0ir0pGd9lgy9I9fnZ2xQO6QxklInaJjfw8In0+l+t # mf1sUW8ltSWZs1tWpGaEUKnEyxs2iFYP83yvPSs1O0WAgPSBqPkLIkHp+QJJcdUV # f5IPfXPWrbgbjkSLyo8EbYwmegTHcXdSEvQxOm3hnSN+0HCMd5oTNcKbjdTaTcgk # DaUl39PJ09CB24orNMXEZakD7p3lFBVB5Yfr87dDujILTtpPtKAVZMt+X/b0chqj # g43L3m5pqu34zMWvGDOSgU+8azip11Wy4MG/yWsgMKVXMAPBf3oOunZVkQY/dqeI # eqX1Hvh7qXHcinuZKAKBefPUqKyoaOKDk3PtUVjW1p4iLC3f5MMOl4SKe8R/hKoe # xRz+SAcS8TJgrcnaKm1mMUDnqXorHb0IxUYCc/i0CVNJsVclmGI5rwLRMwEDAIIy # GOfMHMFUhtFzhVC+tbIcAe8QDnrzR6hvxBvEeunZ/lZtTjtlSPyZklRqKEpXjU4i # ME1Vj6wRIpI9jb5fcJCFy+ZTxQ94c8T8mHsXMfTSWcZzUlFC1/s= # =rEBR # -----END PGP SIGNATURE----- # gpg: Signature made Wed 17 Dec 2025 12:31:13 AM AEDT # gpg: using RSA key A0F66548F04895EBFE6B0B6051A343C7CFFBECA1 # gpg: Good signature from "Cédric Le Goater <clg@redhat.com>" [full] # gpg: aka "Cédric Le Goater <clg@kaod.org>" [full] * tag 'pull-glibc-20251216' of https://github.com/legoater/qemu: gdbstub: Fix const qualifier build errors with recent glibc monitor: Fix const qualifier build errors with recent glibc tests/vhost-user-bridge.c: Fix const qualifier build errors with recent glibc i386: Fix const qualifier build errors with recent glibc Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
commit
7154e4df40
4 changed files with 9 additions and 10 deletions
|
|
@ -317,7 +317,7 @@ static bool gdb_accept_socket(int gdb_fd)
|
|||
static int gdbserver_open_socket(const char *path, Error **errp)
|
||||
{
|
||||
g_autoptr(GString) buf = g_string_new("");
|
||||
char *pid_placeholder;
|
||||
const char *pid_placeholder;
|
||||
|
||||
pid_placeholder = strstr(path, "%d");
|
||||
if (pid_placeholder != NULL) {
|
||||
|
|
|
|||
|
|
@ -654,7 +654,7 @@ void x86_load_linux(X86MachineState *x86ms,
|
|||
uint8_t header[8192], *setup, *kernel;
|
||||
hwaddr real_addr, prot_addr, cmdline_addr, initrd_addr = 0;
|
||||
FILE *f;
|
||||
char *vmode;
|
||||
const char *vmode;
|
||||
MachineState *machine = MACHINE(x86ms);
|
||||
struct setup_data *setup_data;
|
||||
const char *kernel_filename = machine->kernel_filename;
|
||||
|
|
|
|||
|
|
@ -577,10 +577,11 @@ static const char *get_command_name(const char *cmdline,
|
|||
* Read key of 'type' into 'key' and return the current
|
||||
* 'type' pointer.
|
||||
*/
|
||||
static char *key_get_info(const char *type, char **key)
|
||||
static const char *key_get_info(const char *type, char **key)
|
||||
{
|
||||
size_t len;
|
||||
char *p, *str;
|
||||
const char *p;
|
||||
char *str;
|
||||
|
||||
if (*type == ',') {
|
||||
type++;
|
||||
|
|
|
|||
|
|
@ -746,14 +746,12 @@ vubr_run(VubrDev *dev)
|
|||
static int
|
||||
vubr_parse_host_port(const char **host, const char **port, const char *buf)
|
||||
{
|
||||
char *p = strchr(buf, ':');
|
||||
|
||||
if (!p) {
|
||||
g_auto(GStrv) tokens = g_strsplit(buf, ":", 2);
|
||||
if (!tokens[0] || !tokens[1]) {
|
||||
return -1;
|
||||
}
|
||||
*p = '\0';
|
||||
*host = strdup(buf);
|
||||
*port = strdup(p + 1);
|
||||
*host = g_steal_pointer(&tokens[0]);
|
||||
*port = g_steal_pointer(&tokens[1]);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue