mirror of
https://github.com/izzy2lost/xemu.git
synced 2026-07-06 00:20:22 -07:00
Merge tag 'pull-request-2025-06-26' of https://gitlab.com/thuth/qemu into staging
* Implement the "Control Program Identification" feature on s390x * Fix memory leak in loadparm setter on s390x * Update OpenBSD image to 7.7 * Replace the invalid address of the Free Software Foundation * Some updates to the MAINTAINERS file # -----BEGIN PGP SIGNATURE----- # # iQJFBAABCAAvFiEEJ7iIR+7gJQEY8+q5LtnXdP5wLbUFAmhc3vURHHRodXRoQHJl # ZGhhdC5jb20ACgkQLtnXdP5wLbWqfg/+KKMEWjE0PLwVNnHRsoQhtbaJNIfHvejo # pchQLCIhMsakBUX/00xFNnKfxIMOMY06tMvRkg6/lYjEFs1JWSxZZF1DhElgYNDJ # hOCYV94bW2Xd/xe3QXfJAlf1f2lvAocBe8F1fh7N6mTD0YExXlusvm5ROfEUChlO # Qt+CkYlKwy2ag8j1tXdfEy9I8Hs71I3DYFUFKLf8Dq7mbsygST2nn40fNAWT8i/H # u7K7Fna3ybtsz9tkb8HpkGYraIxU7TI9NE+5hd9U5sniduvTNt+9573V29lOOe3o # ym164pzsVuks2m2jDRdWmBXjk5/aheU7SUTGJgY9uRapBBulDK+bJb02dRfrMNB7 # mYt/bbXkidLQ5e/N4K8xqHjS6rx4cm5T2porf8HzMmPbLzo6TsXWWdGip2qBWd78 # XIXdXeu7AZzKDfbeL58RCuiMJzQOlPquN7OgFERZ3DSvd+gLoRoSrowH7YHdjJl3 # N9ymL7QUgsqfWySwv/0gtbwXsjjev0z7XyJIjG80o1CQhV25hoo78mKm2Q1pBz+k # aoWKkAlzrLPyjCezA6sWUNxh7DJ9UtN30z4B51sr95PxcLYjJAqOe0ZD+4FZySgH # 0g0rLs7uZ1hw/LTr/sAQZUfniEiTf8MDXcNNUKd+oeYHAHXat25jWKXu+NObs6rn # vow7/0ZzV6I= # =nm/1 # -----END PGP SIGNATURE----- # gpg: Signature made Thu 26 Jun 2025 01:47:33 EDT # gpg: using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5 # gpg: issuer "thuth@redhat.com" # gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full] # gpg: aka "Thomas Huth <thuth@redhat.com>" [full] # gpg: aka "Thomas Huth <huth@tuxfamily.org>" [full] # gpg: aka "Thomas Huth <th.huth@posteo.de>" [unknown] # Primary key fingerprint: 27B8 8847 EEE0 2501 18F3 EAB9 2ED9 D774 FE70 2DB5 * tag 'pull-request-2025-06-26' of https://gitlab.com/thuth/qemu: target/i386/emulate: replace FSF postal address with licenses URL target/xtensa: replace FSF postal address with licenses URL contrib: replace FSF postal address with licenses URL scripts: replace FSF postal address with licenses URL hw: replace FSF postal address with licenses URL util/rcu.c: replace FSF postal address with licenses URL include/qemu: replace FSF postal address with licenses URL include/hw: replace FSF postal address with licenses URL include/libdecnumber: replace FSF postal address with licenses URL libdecnumber: replace FSF postal address with licenses URL COPYING: replace FSF postal address with licenses URL tests/vm: update openbsd image to 7.7 hw/s390x/ccw-device: Fix memory leak in loadparm setter MAINTAINERS: add reviewers for some s390 areas hw/s390x: support migration of CPI data hw/s390x: add Control-Program Identification to QOM hw/s390x: add SCLP event type CPI MAINTAINERS: Yoshinori Sato email address has been updated tests/functional/test_pc_cpu_hotplug_props: Set 'pc' machine type explicitly Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Stefan Hajnoczi
@@ -2,7 +2,7 @@
|
||||
Version 2, June 1991
|
||||
|
||||
Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
<https://fsf.org/>
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
@@ -304,8 +304,7 @@ the "copyright" line and a pointer to where the full notice is found.
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License along
|
||||
with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
with this program; if not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
Also add information on how to contact you by electronic and paper mail.
|
||||
|
||||
|
||||
+2
-3
@@ -2,7 +2,7 @@
|
||||
Version 2.1, February 1999
|
||||
|
||||
Copyright (C) 1991, 1999 Free Software Foundation, Inc.
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
<https://fsf.org/>
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
@@ -484,8 +484,7 @@ convey the exclusion of warranty; and each file should have at least the
|
||||
Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public
|
||||
License along with this library; if not, write to the Free Software
|
||||
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
License along with this library; if not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
Also add information on how to contact you by electronic and paper mail.
|
||||
|
||||
|
||||
+18
-6
@@ -352,7 +352,7 @@ F: target/riscv/insn_trans/trans_xventanacondops.c.inc
|
||||
F: disas/riscv-xventana*
|
||||
|
||||
RENESAS RX CPUs
|
||||
R: Yoshinori Sato <ysato@users.sourceforge.jp>
|
||||
R: Yoshinori Sato <yoshinori.sato@nifty.com>
|
||||
S: Orphan
|
||||
F: target/rx/
|
||||
|
||||
@@ -368,7 +368,7 @@ F: tests/tcg/s390x/
|
||||
L: qemu-s390x@nongnu.org
|
||||
|
||||
SH4 TCG CPUs
|
||||
R: Yoshinori Sato <ysato@users.sourceforge.jp>
|
||||
R: Yoshinori Sato <yoshinori.sato@nifty.com>
|
||||
S: Orphan
|
||||
F: target/sh4/
|
||||
F: hw/sh4/
|
||||
@@ -459,6 +459,8 @@ F: target/ppc/kvm.c
|
||||
S390 KVM CPUs
|
||||
M: Halil Pasic <pasic@linux.ibm.com>
|
||||
M: Christian Borntraeger <borntraeger@linux.ibm.com>
|
||||
R: Eric Farman <farman@linux.ibm.com>
|
||||
R: Matthew Rosato <mjrosato@linux.ibm.com>
|
||||
S: Supported
|
||||
F: target/s390x/kvm/
|
||||
F: target/s390x/machine.c
|
||||
@@ -1696,7 +1698,7 @@ F: docs/system/riscv/microblaze-v-generic.rst
|
||||
RX Machines
|
||||
-----------
|
||||
rx-gdbsim
|
||||
R: Yoshinori Sato <ysato@users.sourceforge.jp>
|
||||
R: Yoshinori Sato <yoshinori.sato@nifty.com>
|
||||
S: Orphan
|
||||
F: docs/system/target-rx.rst
|
||||
F: hw/rx/rx-gdbsim.c
|
||||
@@ -1705,7 +1707,7 @@ F: tests/functional/test_rx_gdbsim.py
|
||||
SH4 Machines
|
||||
------------
|
||||
R2D
|
||||
R: Yoshinori Sato <ysato@users.sourceforge.jp>
|
||||
R: Yoshinori Sato <yoshinori.sato@nifty.com>
|
||||
R: Magnus Damm <magnus.damm@gmail.com>
|
||||
S: Odd Fixes
|
||||
F: hw/char/sh_serial.c
|
||||
@@ -1771,6 +1773,7 @@ S390 Virtio-ccw
|
||||
M: Halil Pasic <pasic@linux.ibm.com>
|
||||
M: Christian Borntraeger <borntraeger@linux.ibm.com>
|
||||
M: Eric Farman <farman@linux.ibm.com>
|
||||
R: Matthew Rosato <mjrosato@linux.ibm.com>
|
||||
S: Supported
|
||||
F: hw/s390x/
|
||||
F: include/hw/s390x/
|
||||
@@ -1782,6 +1785,8 @@ L: qemu-s390x@nongnu.org
|
||||
S390-ccw boot
|
||||
M: Christian Borntraeger <borntraeger@linux.ibm.com>
|
||||
M: Thomas Huth <thuth@redhat.com>
|
||||
R: Jared Rossi <jrossi@linux.ibm.com>
|
||||
R: Zhuoying Cai <zycai@linux.ibm.com>
|
||||
S: Supported
|
||||
F: hw/s390x/ipl.*
|
||||
F: pc-bios/s390-ccw/
|
||||
@@ -1802,6 +1807,7 @@ S390 channel subsystem
|
||||
M: Halil Pasic <pasic@linux.ibm.com>
|
||||
M: Christian Borntraeger <borntraeger@linux.ibm.com>
|
||||
M: Eric Farman <farman@linux.ibm.com>
|
||||
R: Farhan Ali <alifm@linux.ibm.com>
|
||||
S: Supported
|
||||
F: hw/s390x/ccw-device.[ch]
|
||||
F: hw/s390x/css.c
|
||||
@@ -1822,6 +1828,7 @@ L: qemu-s390x@nongnu.org
|
||||
S390 SCLP-backed devices
|
||||
M: Halil Pasic <pasic@linux.ibm.com>
|
||||
M: Christian Borntraeger <borntraeger@linux.ibm.com>
|
||||
R: Jason Herne <jjherne@linux.ibm.com>
|
||||
S: Supported
|
||||
F: include/hw/s390x/event-facility.h
|
||||
F: include/hw/s390x/sclp.h
|
||||
@@ -2756,7 +2763,7 @@ F: tests/qtest/*xive*
|
||||
F: docs/*/*xive*
|
||||
|
||||
Renesas peripherals
|
||||
R: Yoshinori Sato <ysato@users.sourceforge.jp>
|
||||
R: Yoshinori Sato <yoshinori.sato@nifty.com>
|
||||
R: Magnus Damm <magnus.damm@gmail.com>
|
||||
S: Odd Fixes
|
||||
F: hw/char/renesas_sci.c
|
||||
@@ -2768,7 +2775,7 @@ F: include/hw/sh4/sh.h
|
||||
F: include/hw/timer/renesas_*.h
|
||||
|
||||
Renesas RX peripherals
|
||||
R: Yoshinori Sato <ysato@users.sourceforge.jp>
|
||||
R: Yoshinori Sato <yoshinori.sato@nifty.com>
|
||||
S: Orphan
|
||||
F: hw/intc/rx_icu.c
|
||||
F: hw/rx/
|
||||
@@ -2809,6 +2816,7 @@ F: include/hw/timer/mips_gictimer.h
|
||||
S390 3270 device
|
||||
M: Halil Pasic <pasic@linux.ibm.com>
|
||||
M: Christian Borntraeger <borntraeger@linux.ibm.com>
|
||||
R: Collin Walling <walling@linux.ibm.com>
|
||||
S: Odd fixes
|
||||
F: include/hw/s390x/3270-ccw.h
|
||||
F: hw/char/terminal3270.c
|
||||
@@ -2818,6 +2826,7 @@ L: qemu-s390x@nongnu.org
|
||||
S390 diag 288 watchdog
|
||||
M: Halil Pasic <pasic@linux.ibm.com>
|
||||
M: Christian Borntraeger <borntraeger@linux.ibm.com>
|
||||
R: Collin Walling <walling@linux.ibm.com>
|
||||
S: Supported
|
||||
F: hw/watchdog/wdt_diag288.c
|
||||
F: include/hw/watchdog/wdt_diag288.h
|
||||
@@ -2826,6 +2835,7 @@ L: qemu-s390x@nongnu.org
|
||||
S390 storage key device
|
||||
M: Halil Pasic <pasic@linux.ibm.com>
|
||||
M: Christian Borntraeger <borntraeger@linux.ibm.com>
|
||||
R: Jason Herne <jjherne@linux.ibm.com>
|
||||
S: Supported
|
||||
F: hw/s390x/storage-keys.h
|
||||
F: hw/s390x/s390-skeys*.c
|
||||
@@ -2834,6 +2844,7 @@ L: qemu-s390x@nongnu.org
|
||||
S390 storage attribute device
|
||||
M: Halil Pasic <pasic@linux.ibm.com>
|
||||
M: Christian Borntraeger <borntraeger@linux.ibm.com>
|
||||
R: Jason Herne <jjherne@linux.ibm.com>
|
||||
S: Supported
|
||||
F: hw/s390x/storage-attributes.h
|
||||
F: hw/s390x/s390-stattrib*.c
|
||||
@@ -2843,6 +2854,7 @@ S390 floating interrupt controller
|
||||
M: Halil Pasic <pasic@linux.ibm.com>
|
||||
M: Christian Borntraeger <borntraeger@linux.ibm.com>
|
||||
M: David Hildenbrand <david@redhat.com>
|
||||
R: Jason Herne <jjherne@linux.ibm.com>
|
||||
S: Supported
|
||||
F: hw/intc/s390_flic*.c
|
||||
F: include/hw/s390x/s390_flic.h
|
||||
|
||||
@@ -14,8 +14,8 @@
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
* License along with this library; if not, see
|
||||
* <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "qemu/osdep.h"
|
||||
|
||||
+2
-2
@@ -63,8 +63,8 @@
|
||||
* details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
* along with this program; if not, see
|
||||
* <https://www.gnu.org/licenses/>.
|
||||
*
|
||||
* The full GNU General Public License is included in this distribution in
|
||||
* the file called "COPYING".
|
||||
|
||||
@@ -57,7 +57,7 @@ static void ccw_device_set_loadparm(Object *obj, Visitor *v,
|
||||
Error **errp)
|
||||
{
|
||||
CcwDevice *dev = CCW_DEVICE(obj);
|
||||
char *val;
|
||||
g_autofree char *val = NULL;
|
||||
int index;
|
||||
|
||||
index = object_property_get_int(obj, "bootindex", NULL);
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
* handles SCLP event types
|
||||
* - Signal Quiesce - system power down
|
||||
* - ASCII Console Data - VT220 read and write
|
||||
* - Control-Program Identification - Send OS data from guest to host
|
||||
*
|
||||
* Copyright IBM, Corp. 2012
|
||||
*
|
||||
@@ -40,6 +41,7 @@ struct SCLPEventFacility {
|
||||
SysBusDevice parent_obj;
|
||||
SCLPEventsBus sbus;
|
||||
SCLPEvent quiesce, cpu_hotplug;
|
||||
SCLPEventCPI cpi;
|
||||
/* guest's receive mask */
|
||||
union {
|
||||
uint32_t receive_mask_pieces[2];
|
||||
|
||||
@@ -13,6 +13,7 @@ s390x_ss.add(files(
|
||||
's390-skeys.c',
|
||||
's390-stattrib.c',
|
||||
'sclp.c',
|
||||
'sclpcpi.c',
|
||||
'sclpcpu.c',
|
||||
'sclpquiesce.c',
|
||||
'tod.c',
|
||||
|
||||
@@ -260,9 +260,21 @@ static void s390_create_sclpconsole(SCLPDevice *sclp,
|
||||
qdev_realize_and_unref(dev, ev_fac_bus, &error_fatal);
|
||||
}
|
||||
|
||||
static void s390_create_sclpcpi(SCLPDevice *sclp)
|
||||
{
|
||||
SCLPEventFacility *ef = sclp->event_facility;
|
||||
BusState *ev_fac_bus = sclp_get_event_facility_bus(ef);
|
||||
DeviceState *dev;
|
||||
|
||||
dev = qdev_new(TYPE_SCLP_EVENT_CPI);
|
||||
object_property_add_child(OBJECT(ef), "sclpcpi", OBJECT(dev));
|
||||
qdev_realize_and_unref(dev, ev_fac_bus, &error_fatal);
|
||||
}
|
||||
|
||||
static void ccw_init(MachineState *machine)
|
||||
{
|
||||
MachineClass *mc = MACHINE_GET_CLASS(machine);
|
||||
S390CcwMachineClass *s390mc = S390_CCW_MACHINE_CLASS(mc);
|
||||
S390CcwMachineState *ms = S390_CCW_MACHINE(machine);
|
||||
int ret;
|
||||
VirtualCssBus *css_bus;
|
||||
@@ -323,6 +335,12 @@ static void ccw_init(MachineState *machine)
|
||||
|
||||
/* init the TOD clock */
|
||||
s390_init_tod();
|
||||
|
||||
/* init SCLP event Control-Program Identification */
|
||||
if (s390mc->use_cpi) {
|
||||
s390_create_sclpcpi(ms->sclp);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
static void s390_cpu_plug(HotplugHandler *hotplug_dev,
|
||||
@@ -783,6 +801,7 @@ static void ccw_machine_class_init(ObjectClass *oc, const void *data)
|
||||
DumpSKeysInterface *dsi = DUMP_SKEYS_INTERFACE_CLASS(oc);
|
||||
|
||||
s390mc->max_threads = 1;
|
||||
s390mc->use_cpi = true;
|
||||
mc->reset = s390_machine_reset;
|
||||
mc->block_default_type = IF_VIRTIO;
|
||||
mc->no_cdrom = 1;
|
||||
@@ -908,6 +927,9 @@ static void ccw_machine_10_0_instance_options(MachineState *machine)
|
||||
|
||||
static void ccw_machine_10_0_class_options(MachineClass *mc)
|
||||
{
|
||||
S390CcwMachineClass *s390mc = S390_CCW_MACHINE_CLASS(mc);
|
||||
s390mc->use_cpi = false;
|
||||
|
||||
ccw_machine_10_1_class_options(mc);
|
||||
compat_props_add(mc->compat_props, hw_compat_10_0, hw_compat_10_0_len);
|
||||
}
|
||||
|
||||
@@ -0,0 +1,212 @@
|
||||
/*
|
||||
* SPDX-License-Identifier: GPL-2.0-or-later
|
||||
*
|
||||
* SCLP event type 11 - Control-Program Identification (CPI):
|
||||
* CPI is used to send program identifiers from the guest to the
|
||||
* Service-Call Logical Processor (SCLP). It is not sent by the SCLP.
|
||||
*
|
||||
* Control-program identifiers provide data about the guest operating
|
||||
* system. The control-program identifiers are: system type, system name,
|
||||
* system level and sysplex name.
|
||||
*
|
||||
* In Linux, all the control-program identifiers are user configurable. The
|
||||
* system type, system name, and sysplex name use EBCDIC characters from
|
||||
* this set: capital A-Z, 0-9, $, @, #, and blank. In Linux, the system
|
||||
* type, system name and sysplex name are arbitrary free-form texts.
|
||||
*
|
||||
* In Linux, the 8-byte hexadecimal system-level has the format
|
||||
* 0x<a><b><cc><dd><eeee><ff><gg><hh>, where:
|
||||
* <a>: is a 4-bit digit, its most significant bit indicates hypervisor use
|
||||
* <b>: is one digit that represents Linux distributions as follows
|
||||
* 0: generic Linux
|
||||
* 1: Red Hat Enterprise Linux
|
||||
* 2: SUSE Linux Enterprise Server
|
||||
* 3: Canonical Ubuntu
|
||||
* 4: Fedora
|
||||
* 5: openSUSE Leap
|
||||
* 6: Debian GNU/Linux
|
||||
* 7: Red Hat Enterprise Linux CoreOS
|
||||
* <cc>: are two digits for a distribution-specific encoding of the major
|
||||
* version of the distribution
|
||||
* <dd>: are two digits for a distribution-specific encoding of the minor
|
||||
* version of the distribution
|
||||
* <eeee>: are four digits for the patch level of the distribution
|
||||
* <ff>: are two digits for the major version of the kernel
|
||||
* <gg>: are two digits for the minor version of the kernel
|
||||
* <hh>: are two digits for the stable version of the kernel
|
||||
* (e.g. 74872343805430528, when converted to hex is 0x010a000000060b00). On
|
||||
* machines prior to z16, some of the values are not available to display.
|
||||
*
|
||||
* Sysplex refers to a cluster of logical partitions that communicates and
|
||||
* co-operates with each other.
|
||||
*
|
||||
* The CPI feature is supported since 10.1.
|
||||
*
|
||||
* Copyright IBM, Corp. 2024
|
||||
*
|
||||
* Authors:
|
||||
* Shalini Chellathurai Saroja <shalini@linux.ibm.com>
|
||||
*
|
||||
*/
|
||||
|
||||
#include "qemu/osdep.h"
|
||||
#include "qemu/timer.h"
|
||||
#include "hw/s390x/event-facility.h"
|
||||
#include "hw/s390x/ebcdic.h"
|
||||
#include "qapi/qapi-visit-machine.h"
|
||||
#include "migration/vmstate.h"
|
||||
|
||||
typedef struct Data {
|
||||
uint8_t id_format;
|
||||
uint8_t reserved0;
|
||||
uint8_t system_type[8];
|
||||
uint64_t reserved1;
|
||||
uint8_t system_name[8];
|
||||
uint64_t reserved2;
|
||||
uint64_t system_level;
|
||||
uint64_t reserved3;
|
||||
uint8_t sysplex_name[8];
|
||||
uint8_t reserved4[16];
|
||||
} QEMU_PACKED Data;
|
||||
|
||||
typedef struct ControlProgramIdMsg {
|
||||
EventBufferHeader ebh;
|
||||
Data data;
|
||||
} QEMU_PACKED ControlProgramIdMsg;
|
||||
|
||||
static bool can_handle_event(uint8_t type)
|
||||
{
|
||||
return type == SCLP_EVENT_CTRL_PGM_ID;
|
||||
}
|
||||
|
||||
static sccb_mask_t send_mask(void)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Enable SCLP to accept buffers of event type CPI from the control-program. */
|
||||
static sccb_mask_t receive_mask(void)
|
||||
{
|
||||
return SCLP_EVENT_MASK_CTRL_PGM_ID;
|
||||
}
|
||||
|
||||
static int write_event_data(SCLPEvent *event, EventBufferHeader *evt_buf_hdr)
|
||||
{
|
||||
ControlProgramIdMsg *cpim = container_of(evt_buf_hdr, ControlProgramIdMsg,
|
||||
ebh);
|
||||
SCLPEventCPI *e = SCLP_EVENT_CPI(event);
|
||||
|
||||
ascii_put(e->system_type, (char *)cpim->data.system_type,
|
||||
sizeof(cpim->data.system_type));
|
||||
ascii_put(e->system_name, (char *)cpim->data.system_name,
|
||||
sizeof(cpim->data.system_name));
|
||||
ascii_put(e->sysplex_name, (char *)cpim->data.sysplex_name,
|
||||
sizeof(cpim->data.sysplex_name));
|
||||
e->system_level = ldq_be_p(&cpim->data.system_level);
|
||||
e->timestamp = qemu_clock_get_ns(QEMU_CLOCK_HOST);
|
||||
|
||||
cpim->ebh.flags = SCLP_EVENT_BUFFER_ACCEPTED;
|
||||
return SCLP_RC_NORMAL_COMPLETION;
|
||||
}
|
||||
|
||||
static char *get_system_type(Object *obj, Error **errp)
|
||||
{
|
||||
SCLPEventCPI *e = SCLP_EVENT_CPI(obj);
|
||||
|
||||
return g_strndup((char *) e->system_type, sizeof(e->system_type));
|
||||
}
|
||||
|
||||
static char *get_system_name(Object *obj, Error **errp)
|
||||
{
|
||||
SCLPEventCPI *e = SCLP_EVENT_CPI(obj);
|
||||
|
||||
return g_strndup((char *) e->system_name, sizeof(e->system_name));
|
||||
}
|
||||
|
||||
static char *get_sysplex_name(Object *obj, Error **errp)
|
||||
{
|
||||
SCLPEventCPI *e = SCLP_EVENT_CPI(obj);
|
||||
|
||||
return g_strndup((char *) e->sysplex_name, sizeof(e->sysplex_name));
|
||||
}
|
||||
|
||||
static void get_system_level(Object *obj, Visitor *v, const char *name,
|
||||
void *opaque, Error **errp)
|
||||
{
|
||||
SCLPEventCPI *e = SCLP_EVENT_CPI(obj);
|
||||
|
||||
visit_type_uint64(v, name, &e->system_level, errp);
|
||||
}
|
||||
|
||||
static void get_timestamp(Object *obj, Visitor *v, const char *name,
|
||||
void *opaque, Error **errp)
|
||||
{
|
||||
SCLPEventCPI *e = SCLP_EVENT_CPI(obj);
|
||||
|
||||
visit_type_uint64(v, name, &e->timestamp, errp);
|
||||
}
|
||||
|
||||
static const VMStateDescription vmstate_sclpcpi = {
|
||||
.name = "s390_control_program_id",
|
||||
.version_id = 0,
|
||||
.fields = (const VMStateField[]) {
|
||||
VMSTATE_UINT8_ARRAY(system_type, SCLPEventCPI, 8),
|
||||
VMSTATE_UINT8_ARRAY(system_name, SCLPEventCPI, 8),
|
||||
VMSTATE_UINT64(system_level, SCLPEventCPI),
|
||||
VMSTATE_UINT8_ARRAY(sysplex_name, SCLPEventCPI, 8),
|
||||
VMSTATE_UINT64(timestamp, SCLPEventCPI),
|
||||
VMSTATE_END_OF_LIST()
|
||||
}
|
||||
};
|
||||
|
||||
static void cpi_class_init(ObjectClass *klass, const void *data)
|
||||
{
|
||||
DeviceClass *dc = DEVICE_CLASS(klass);
|
||||
SCLPEventClass *k = SCLP_EVENT_CLASS(klass);
|
||||
|
||||
dc->user_creatable = false;
|
||||
dc->vmsd = &vmstate_sclpcpi;
|
||||
|
||||
k->can_handle_event = can_handle_event;
|
||||
k->get_send_mask = send_mask;
|
||||
k->get_receive_mask = receive_mask;
|
||||
k->write_event_data = write_event_data;
|
||||
|
||||
object_class_property_add_str(klass, "system_type", get_system_type, NULL);
|
||||
object_class_property_set_description(klass, "system_type",
|
||||
"operating system e.g. \"LINUX \"");
|
||||
|
||||
object_class_property_add_str(klass, "system_name", get_system_name, NULL);
|
||||
object_class_property_set_description(klass, "system_name",
|
||||
"user configurable name of the VM e.g. \"TESTVM \"");
|
||||
|
||||
object_class_property_add_str(klass, "sysplex_name", get_sysplex_name,
|
||||
NULL);
|
||||
object_class_property_set_description(klass, "sysplex_name",
|
||||
"name of the cluster which the VM belongs to, if any"
|
||||
" e.g. \"PLEX \"");
|
||||
|
||||
object_class_property_add(klass, "system_level", "uint64", get_system_level,
|
||||
NULL, NULL, NULL);
|
||||
object_class_property_set_description(klass, "system_level",
|
||||
"distribution and kernel version in Linux e.g. 74872343805430528");
|
||||
|
||||
object_class_property_add(klass, "timestamp", "uint64", get_timestamp,
|
||||
NULL, NULL, NULL);
|
||||
object_class_property_set_description(klass, "timestamp",
|
||||
"latest update of CPI data in nanoseconds since the UNIX EPOCH");
|
||||
}
|
||||
|
||||
static const TypeInfo sclp_cpi_info = {
|
||||
.name = TYPE_SCLP_EVENT_CPI,
|
||||
.parent = TYPE_SCLP_EVENT,
|
||||
.instance_size = sizeof(SCLPEventCPI),
|
||||
.class_init = cpi_class_init,
|
||||
};
|
||||
|
||||
static void sclp_cpi_register_types(void)
|
||||
{
|
||||
type_register_static(&sclp_cpi_info);
|
||||
}
|
||||
|
||||
type_init(sclp_cpi_register_types)
|
||||
@@ -14,8 +14,8 @@
|
||||
* details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
* along with this program; if not, see
|
||||
* <https://www.gnu.org/licenses/>.
|
||||
*
|
||||
* Maintained by: Arvind Kumar <arvindkumar@vmware.com>
|
||||
*
|
||||
|
||||
@@ -14,8 +14,7 @@
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
* with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
* with this program; if not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#ifndef ASPEED_I2C_H
|
||||
|
||||
@@ -14,8 +14,8 @@
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
* along with this program; if not, see
|
||||
* <https://www.gnu.org/licenses/>.
|
||||
*
|
||||
* split out pci bus specific stuff from pci.[hc] to pci_bridge.[hc]
|
||||
* Copyright (c) 2009 Isaku Yamahata <yamahata at valinux co jp>
|
||||
|
||||
@@ -25,6 +25,7 @@
|
||||
#define SCLP_EVENT_MESSAGE 0x02
|
||||
#define SCLP_EVENT_CONFIG_MGT_DATA 0x04
|
||||
#define SCLP_EVENT_PMSGCMD 0x09
|
||||
#define SCLP_EVENT_CTRL_PGM_ID 0x0b
|
||||
#define SCLP_EVENT_ASCII_CONSOLE_DATA 0x1a
|
||||
#define SCLP_EVENT_SIGNAL_QUIESCE 0x1d
|
||||
|
||||
@@ -35,6 +36,7 @@
|
||||
#define SCLP_EVENT_MASK_MSG SCLP_EVMASK(SCLP_EVENT_MESSAGE)
|
||||
#define SCLP_EVENT_MASK_CONFIG_MGT_DATA SCLP_EVMASK(SCLP_EVENT_CONFIG_MGT_DATA)
|
||||
#define SCLP_EVENT_MASK_PMSGCMD SCLP_EVMASK(SCLP_EVENT_PMSGCMD)
|
||||
#define SCLP_EVENT_MASK_CTRL_PGM_ID SCLP_EVMASK(SCLP_EVENT_CTRL_PGM_ID)
|
||||
#define SCLP_EVENT_MASK_MSG_ASCII SCLP_EVMASK(SCLP_EVENT_ASCII_CONSOLE_DATA)
|
||||
#define SCLP_EVENT_MASK_SIGNAL_QUIESCE SCLP_EVMASK(SCLP_EVENT_SIGNAL_QUIESCE)
|
||||
|
||||
@@ -191,6 +193,21 @@ struct SCLPEventClass {
|
||||
bool (*can_handle_event)(uint8_t type);
|
||||
};
|
||||
|
||||
#define TYPE_SCLP_EVENT_CPI "sclpcpi"
|
||||
typedef struct SCLPEventCPIClass SCLPEventCPIClass;
|
||||
typedef struct SCLPEventCPI SCLPEventCPI;
|
||||
OBJECT_DECLARE_TYPE(SCLPEventCPI, SCLPEventCPIClass,
|
||||
SCLP_EVENT_CPI)
|
||||
|
||||
struct SCLPEventCPI {
|
||||
SCLPEvent event;
|
||||
uint8_t system_type[8];
|
||||
uint8_t system_name[8];
|
||||
uint64_t system_level;
|
||||
uint8_t sysplex_name[8];
|
||||
uint64_t timestamp;
|
||||
};
|
||||
|
||||
#define TYPE_SCLP_EVENT_FACILITY "s390-sclp-event-facility"
|
||||
typedef struct SCLPEventFacility SCLPEventFacility;
|
||||
typedef struct SCLPEventFacilityClass SCLPEventFacilityClass;
|
||||
|
||||
@@ -54,6 +54,7 @@ struct S390CcwMachineClass {
|
||||
|
||||
/*< public >*/
|
||||
int max_threads;
|
||||
bool use_cpi;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
@@ -16,8 +16,7 @@
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
* with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
* with this program; if not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
#ifndef ASPEED_TIMER_H
|
||||
#define ASPEED_TIMER_H
|
||||
|
||||
@@ -23,9 +23,8 @@
|
||||
for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with GCC; see the file COPYING. If not, write to the Free
|
||||
Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
|
||||
02110-1301, USA. */
|
||||
along with GCC; see the file COPYING. If not, see
|
||||
<https://www.gnu.org/licenses/>. */
|
||||
|
||||
|
||||
#if HOST_BIG_ENDIAN
|
||||
|
||||
@@ -24,9 +24,8 @@
|
||||
for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with GCC; see the file COPYING. If not, write to the Free
|
||||
Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
|
||||
02110-1301, USA. */
|
||||
along with GCC; see the file COPYING. If not, see
|
||||
<https://www.gnu.org/licenses/>. */
|
||||
|
||||
/* ------------------------------------------------------------------ */
|
||||
/* Decimal Context module header */
|
||||
|
||||
@@ -24,9 +24,8 @@
|
||||
for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with GCC; see the file COPYING. If not, write to the Free
|
||||
Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
|
||||
02110-1301, USA. */
|
||||
along with GCC; see the file COPYING. If not, see
|
||||
<https://www.gnu.org/licenses/>. */
|
||||
|
||||
/* ------------------------------------------------------------------------ */
|
||||
/* Binary Coded Decimal and Densely Packed Decimal conversion lookup tables */
|
||||
|
||||
@@ -24,9 +24,8 @@
|
||||
for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with GCC; see the file COPYING. If not, write to the Free
|
||||
Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
|
||||
02110-1301, USA. */
|
||||
along with GCC; see the file COPYING. If not, see
|
||||
<https://www.gnu.org/licenses/>. */
|
||||
|
||||
/* ------------------------------------------------------------------ */
|
||||
/* Decimal Number arithmetic module header */
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user