SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

trivial patches for 2024-02-13

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQFDBAABCAAtFiEEe3O61ovnosKJMUsicBtPaxppPlkFAmXLIcgPHG1qdEB0bHMu
 bXNrLnJ1AAoJEHAbT2saaT5Z2lMIAKBuoLX48bbaFsU3dHzPKtB3kVbBpsWJgkGd
 EovqkDTEDiX3+bvPkosUUkuZzRF3STTZx5jSQ5iKHYtwQ6ZnHOLALe/L6JCOHIs2
 DMeet0gacwB5sBDfXJAPDDETDLwaYv3MlQrxb2ok9ouDR4EJXFs8K7444BilhNHt
 nLE+Xtfm7oQBMgzivHSN6/6Y4DTU6mFLt6o+772EVfu6wrI07kOGZ1s/VCeLhqyZ
 6gppVAx5nbBAryndi6lVvqfo+1mReAIKpreslWgsBb5H1IpXKimG1wd7mrqHFpva
 OLmBuNySe0plvjIkGKM72rPR15MPn7UmHNmnyq6qFzVjLetV2i0=
 =f4L7
 -----END PGP SIGNATURE-----

Merge tag 'pull-trivial-patches' of https://gitlab.com/mjt0k/qemu into staging

trivial patches for 2024-02-13

# -----BEGIN PGP SIGNATURE-----
#
# iQFDBAABCAAtFiEEe3O61ovnosKJMUsicBtPaxppPlkFAmXLIcgPHG1qdEB0bHMu
# bXNrLnJ1AAoJEHAbT2saaT5Z2lMIAKBuoLX48bbaFsU3dHzPKtB3kVbBpsWJgkGd
# EovqkDTEDiX3+bvPkosUUkuZzRF3STTZx5jSQ5iKHYtwQ6ZnHOLALe/L6JCOHIs2
# DMeet0gacwB5sBDfXJAPDDETDLwaYv3MlQrxb2ok9ouDR4EJXFs8K7444BilhNHt
# nLE+Xtfm7oQBMgzivHSN6/6Y4DTU6mFLt6o+772EVfu6wrI07kOGZ1s/VCeLhqyZ
# 6gppVAx5nbBAryndi6lVvqfo+1mReAIKpreslWgsBb5H1IpXKimG1wd7mrqHFpva
# OLmBuNySe0plvjIkGKM72rPR15MPn7UmHNmnyq6qFzVjLetV2i0=
# =f4L7
# -----END PGP SIGNATURE-----
# gpg: Signature made Tue 13 Feb 2024 08:01:12 GMT
# gpg:                using RSA key 7B73BAD68BE7A2C289314B22701B4F6B1A693E59
# gpg:                issuer "mjt@tls.msk.ru"
# gpg: Good signature from "Michael Tokarev <mjt@tls.msk.ru>" [full]
# gpg:                 aka "Michael Tokarev <mjt@corpit.ru>" [full]
# gpg:                 aka "Michael Tokarev <mjt@debian.org>" [full]
# Primary key fingerprint: 6EE1 95D1 886E 8FFB 810D  4324 457C E0A0 8044 65C5
#      Subkey fingerprint: 7B73 BAD6 8BE7 A2C2 8931  4B22 701B 4F6B 1A69 3E59

* tag 'pull-trivial-patches' of https://gitlab.com/mjt0k/qemu:
  monitor/target: Include missing 'exec/memory.h' header
  cpu-target: Include missing 'exec/memory.h' header
  system: Move memory_ldst.c.inc to system
  qemu-options.hx: Add zoom-to-fit to option summary for gtk
  qemu-options.hx: document that tftp=dir is readonly
  iothread: Simplify expression in qemu_in_iothread()
  qemu-nbd: mention --tls-hostname option in qemu-nbd --help
  MAINTAINERS: Cover qapi/stats.json
  MAINTAINERS: Cover qapi/cxl.json
  hw/smbios: Fix port connector option validation
  hw/smbios: Fix OEM strings table option validation
  hw/arm/smmuv3: Consolidate the use of device_class_set_parent_realize()
  hw/intc/s390_flic: Consolidate the use of device_class_set_parent_realize()
  hw/isa/pc87312: Consolidate the use of device_class_set_parent_realize()
  hw/isa/vt82c686: Consolidate the use of device_class_set_parent_realize()

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2024-02-13 13:56:29 +00:00
commit 3971462c35
11 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cpu-target.c
View File

@ -31,6 +31,7 @@
#else #else
#include "hw/core/sysemu-cpu-ops.h" #include "hw/core/sysemu-cpu-ops.h"
#include "exec/address-spaces.h" #include "exec/address-spaces.h"
#include "exec/memory.h"
#endif #endif
#include "sysemu/cpus.h" #include "sysemu/cpus.h"
#include "sysemu/tcg.h" #include "sysemu/tcg.h"

4
hw/arm/smmuv3.c
View File

@ -1857,8 +1857,8 @@ static void smmuv3_class_init(ObjectClass *klass, void *data)
dc->vmsd = &vmstate_smmuv3; dc->vmsd = &vmstate_smmuv3;
resettable_class_set_parent_phases(rc, NULL, smmu_reset_hold, NULL, resettable_class_set_parent_phases(rc, NULL, smmu_reset_hold, NULL,
&c->parent_phases); &c->parent_phases);
c->parent_realize = dc->realize; device_class_set_parent_realize(dc, smmu_realize,
dc->realize = smmu_realize; &c->parent_realize);
device_class_set_props(dc, smmuv3_properties); device_class_set_props(dc, smmuv3_properties);
} }

5
hw/intc/s390_flic_kvm.c
View File

@ -646,9 +646,10 @@ static void kvm_s390_flic_class_init(ObjectClass *oc, void *data)
{ {
DeviceClass *dc = DEVICE_CLASS(oc); DeviceClass *dc = DEVICE_CLASS(oc);
S390FLICStateClass *fsc = S390_FLIC_COMMON_CLASS(oc); S390FLICStateClass *fsc = S390_FLIC_COMMON_CLASS(oc);
KVMS390FLICStateClass *kfsc = KVM_S390_FLIC_CLASS(oc);
KVM_S390_FLIC_CLASS(oc)->parent_realize = dc->realize; device_class_set_parent_realize(dc, kvm_s390_flic_realize,
dc->realize = kvm_s390_flic_realize; &kfsc->parent_realize);
dc->vmsd = &kvm_s390_flic_vmstate; dc->vmsd = &kvm_s390_flic_vmstate;
dc->reset = kvm_s390_flic_reset; dc->reset = kvm_s390_flic_reset;
fsc->register_io_adapter = kvm_s390_register_io_adapter; fsc->register_io_adapter = kvm_s390_register_io_adapter;

4
hw/isa/pc87312.c
View File

@ -338,10 +338,10 @@ static void pc87312_class_init(ObjectClass *klass, void *data)
DeviceClass *dc = DEVICE_CLASS(klass); DeviceClass *dc = DEVICE_CLASS(klass);
ISASuperIOClass *sc = ISA_SUPERIO_CLASS(klass); ISASuperIOClass *sc = ISA_SUPERIO_CLASS(klass);
sc->parent_realize = dc->realize;
dc->realize = pc87312_realize;
dc->reset = pc87312_reset; dc->reset = pc87312_reset;
dc->vmsd = &vmstate_pc87312; dc->vmsd = &vmstate_pc87312;
device_class_set_parent_realize(dc, pc87312_realize,
&sc->parent_realize);
device_class_set_props(dc, pc87312_properties); device_class_set_props(dc, pc87312_properties);
sc->parallel = (ISASuperIOFuncs){ sc->parallel = (ISASuperIOFuncs){

4
hw/isa/vt82c686.c
View File

@ -328,8 +328,8 @@ static void via_superio_class_init(ObjectClass *klass, void *data)
DeviceClass *dc = DEVICE_CLASS(klass); DeviceClass *dc = DEVICE_CLASS(klass);
ISASuperIOClass *sc = ISA_SUPERIO_CLASS(klass); ISASuperIOClass *sc = ISA_SUPERIO_CLASS(klass);
sc->parent_realize = dc->realize; device_class_set_parent_realize(dc, via_superio_realize,
dc->realize = via_superio_realize; &sc->parent_realize);
} }
static const TypeInfo via_superio_info = { static const TypeInfo via_superio_info = {

12
hw/smbios/smbios.c
View File

@ -352,6 +352,11 @@ static const QemuOptDesc qemu_smbios_type4_opts[] = {
}; };
static const QemuOptDesc qemu_smbios_type8_opts[] = { static const QemuOptDesc qemu_smbios_type8_opts[] = {
{
.name = "type",
.type = QEMU_OPT_NUMBER,
.help = "SMBIOS element type",
},
{ {
.name = "internal_reference", .name = "internal_reference",
.type = QEMU_OPT_STRING, .type = QEMU_OPT_STRING,
@ -372,9 +377,15 @@ static const QemuOptDesc qemu_smbios_type8_opts[] = {
.type = QEMU_OPT_NUMBER, .type = QEMU_OPT_NUMBER,
.help = "port type", .help = "port type",
}, },
{ /* end of list */ }
}; };
static const QemuOptDesc qemu_smbios_type11_opts[] = { static const QemuOptDesc qemu_smbios_type11_opts[] = {
{
.name = "type",
.type = QEMU_OPT_NUMBER,
.help = "SMBIOS element type",
},
{ {
.name = "value", .name = "value",
.type = QEMU_OPT_STRING, .type = QEMU_OPT_STRING,
@ -385,6 +396,7 @@ static const QemuOptDesc qemu_smbios_type11_opts[] = {
.type = QEMU_OPT_STRING, .type = QEMU_OPT_STRING,
.help = "OEM string data from file", .help = "OEM string data from file",
}, },
{ /* end of list */ }
}; };
static const QemuOptDesc qemu_smbios_type17_opts[] = { static const QemuOptDesc qemu_smbios_type17_opts[] = {

3
iothread.c
View File

@ -404,6 +404,5 @@ IOThread *iothread_by_id(const char *id)
bool qemu_in_iothread(void) bool qemu_in_iothread(void)
{ {
return qemu_get_current_aio_context() == qemu_get_aio_context() ? return qemu_get_current_aio_context() != qemu_get_aio_context();
false : true;
} }

1
monitor/hmp-cmds-target.c
View File

@ -25,6 +25,7 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "disas/disas.h" #include "disas/disas.h"
#include "exec/address-spaces.h" #include "exec/address-spaces.h"
#include "exec/memory.h"
#include "monitor/hmp-target.h" #include "monitor/hmp-target.h"
#include "monitor/monitor-internal.h" #include "monitor/monitor-internal.h"
#include "qapi/error.h" #include "qapi/error.h"

1
qemu-nbd.c
View File

@ -114,6 +114,7 @@ static void usage(const char *name)
" --tls-creds=ID use id of an earlier --object to provide TLS\n" " --tls-creds=ID use id of an earlier --object to provide TLS\n"
" --tls-authz=ID use id of an earlier --object to provide\n" " --tls-authz=ID use id of an earlier --object to provide\n"
" authorization\n" " authorization\n"
" --tls-hostname=HOSTNAME override hostname used to check x509 certificate\n"
" -T, --trace [[enable=]<pattern>][,events=<file>][,file=<file>]\n" " -T, --trace [[enable=]<pattern>][,events=<file>][,file=<file>]\n"
" specify tracing options\n" " specify tracing options\n"
" --fork fork off the server process and exit the parent\n" " --fork fork off the server process and exit the parent\n"

4
qemu-options.hx
View File

@ -2085,7 +2085,7 @@ DEF("display", HAS_ARG, QEMU_OPTION_display,
#if defined(CONFIG_GTK) #if defined(CONFIG_GTK)
"-display gtk[,full-screen=on|off][,gl=on|off][,grab-on-hover=on|off]\n" "-display gtk[,full-screen=on|off][,gl=on|off][,grab-on-hover=on|off]\n"
" [,show-tabs=on|off][,show-cursor=on|off][,window-close=on|off]\n" " [,show-tabs=on|off][,show-cursor=on|off][,window-close=on|off]\n"
" [,show-menubar=on|off]\n" " [,show-menubar=on|off][,zoom-to-fit=on|off]\n"
#endif #endif
#if defined(CONFIG_VNC) #if defined(CONFIG_VNC)
"-display vnc=<display>[,<optargs>]\n" "-display vnc=<display>[,<optargs>]\n"
@ -3100,6 +3100,8 @@ SRST
server. The files in dir will be exposed as the root of a TFTP server. The files in dir will be exposed as the root of a TFTP
server. The TFTP client on the guest must be configured in server. The TFTP client on the guest must be configured in
binary mode (use the command ``bin`` of the Unix TFTP client). binary mode (use the command ``bin`` of the Unix TFTP client).
The built-in TFTP server is read-only; it does not implement any
command for writing files. QEMU will not write to this directory.
``tftp-server-name=name`` ``tftp-server-name=name``
In BOOTP reply, broadcast name as the "TFTP server name" In BOOTP reply, broadcast name as the "TFTP server name"

0
memory_ldst.c.inc → system/memory_ldst.c.inc
View File