Merging upstream version 2.40.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 295 insertions, 0 deletions

diff --git a/tests/expected/dmesg/cid-kmsg-json b/tests/expected/dmesg/cid-kmsg-json
new file mode 100644
index 0000000..942506c
--- /dev/null
+++ b/tests/expected/dmesg/cid-kmsg-json
@@ -0,0 +1,295 @@
+{
+   "dmesg": [
+      {
+         "pri": 0,
+         "time":     0.000000,
+         "caller": "T1",
+         "msg": "Linux version 6.6.4-arch1-1 (linux@archlinux) (gcc (GCC) 13.2.1 20230801, GNU ld (GNU Binutils) 2.41.0) #1 SMP PREEMPT_DYNAMIC Mon, 04 Dec 2023 00:29:19 +0000"
+      },{
+         "pri": 1,
+         "time":     0.000001,
+         "caller": "T2",
+         "msg": "Command line: initrd=\\ucode.img initrd=\\initramfs-linux.img rw cryptdevice=/dev/nvme0n1p3:system:discard root=/dev/mapper/system"
+      },{
+         "pri": 2,
+         "time":     0.000002,
+         "caller": "T3",
+         "msg": "BIOS-provided physical RAM map:"
+      },{
+         "pri": 3,
+         "time":     0.000003,
+         "caller": "T4",
+         "msg": "BIOS-e820: [mem 0x0000000000000000-0x000000000009efff] usable"
+      },{
+         "pri": 4,
+         "time":     0.000004,
+         "caller": "T5",
+         "msg": "BIOS-e820: [mem 0x000000000009f000-0x00000000000bffff] reserved"
+      },{
+         "pri": 5,
+         "time":     0.000005,
+         "caller": "T6",
+         "msg": "BIOS-e820: [mem 0x0000000000100000-0x0000000009afffff] usable"
+      },{
+         "pri": 6,
+         "time":     0.000006,
+         "caller": "T7",
+         "msg": "BIOS-e820: [mem 0x0000000009b00000-0x0000000009dfffff] reserved"
+      },{
+         "pri": 7,
+         "time":     0.000007,
+         "caller": "T8",
+         "msg": "BIOS-e820: [mem 0x0000000009e00000-0x0000000009efffff] usable"
+      },{
+         "pri": 6,
+         "time":     0.000008,
+         "caller": "T9",
+         "msg": "BIOS-e820: [mem 0x0000000009f00000-0x0000000009f3bfff] ACPI NVS"
+      },{
+         "pri": 6,
+         "time":     0.000009,
+         "caller": "T10",
+         "msg": "BIOS-e820: [mem 0x0000000009f3c000-0x000000004235ffff] usable"
+      },{
+         "pri": 6,
+         "time":     0.000010,
+         "caller": "T11",
+         "msg": "BIOS-e820: [mem 0x0000000042360000-0x000000004455ffff] reserved"
+      },{
+         "pri": 6,
+         "time":     0.201607,
+         "caller": "T12",
+         "msg": "smp: Bringing up secondary CPUs ..."
+      },{
+         "pri": 6,
+         "time":     0.201607,
+         "caller": "T13",
+         "msg": "smpboot: x86: Booting SMP configuration:"
+      },{
+         "pri": 4,
+         "time":     0.209670,
+         "caller": "T14",
+         "msg": "  #1  #3  #5  #7"
+      },{
+         "pri": 6,
+         "time":     0.212630,
+         "caller": "T15",
+         "msg": "smp: Brought up 1 node, 16 CPUs"
+      },{
+         "pri": 5,
+         "time":     0.215936,
+         "caller": "T16",
+         "msg": "audit: type=2000 audit(1702926179.015:1): state=initialized audit_enabled=0 res=1"
+      },{
+         "pri": 6,
+         "time":     0.215937,
+         "caller": "T17",
+         "msg": "thermal_sys: Registered thermal governor 'fair_share'"
+      },{
+         "pri": 4,
+         "time":     0.215966,
+         "caller": "T18",
+         "msg": "ENERGY_PERF_BIAS: Set to 'normal', was 'performance'"
+      },{
+         "pri": 6,
+         "time":     0.367657,
+         "caller": "T19",
+         "msg": "ACPI: \\_SB_.PCI0.GP19.NHI1.PWRS: New power resource"
+      },{
+         "pri": 6,
+         "time":     0.368615,
+         "caller": "T20",
+         "msg": "ACPI: \\_SB_.PCI0.GP19.XHC4.PWRS: New power resource"
+      },{
+         "pri": 6,
+         "time":     0.376316,
+         "caller": "T21",
+         "msg": "ACPI: \\_SB_.PRWL: New power resource"
+      },{
+         "pri": 6,
+         "time":     0.376343,
+         "caller": "T22",
+         "msg": "ACPI: \\_SB_.PRWB: New power resource"
+      },{
+         "pri": 6,
+         "time":     0.377373,
+         "caller": "T23",
+         "msg": "ACPI: PCI Root Bridge [PCI0] (domain 0000 [bus 00-ff])"
+      },{
+         "pri": 6,
+         "time":     0.377378,
+         "caller": "T24",
+         "msg": "acpi PNP0A08:00: _OSC: OS supports [ExtendedConfig ASPM ClockPM Segments MSI EDR HPX-Type3]"
+      },{
+         "pri": 6,
+         "time":     0.377569,
+         "caller": "T25",
+         "msg": "acpi PNP0A08:00: _OSC: platform does not support [SHPCHotplug AER]"
+      },{
+         "pri": 6,
+         "time":     0.377933,
+         "caller": "T26",
+         "msg": "acpi PNP0A08:00: _OSC: OS now controls [PCIeHotplug PME PCIeCapability LTR DPC]"
+      },{
+         "pri": 6,
+         "time":     0.378458,
+         "caller": "T27",
+         "msg": "PCI host bridge to bus 0000:00"
+      },{
+         "pri": 6,
+         "time":     0.378459,
+         "caller": "T28",
+         "msg": "pci_bus 0000:00: root bus resource [io  0x0000-0x0cf7 window]"
+      },{
+         "pri": 6,
+         "time":     0.378461,
+         "caller": "T29",
+         "msg": "pci_bus 0000:00: root bus resource [io  0x0d00-0xffff window]"
+      },{
+         "pri": 13,
+         "time":     9.398562,
+         "caller": "T30",
+         "msg": "user network daemon initialization complete"
+      },{
+         "pri": 30,
+         "time":    10.441520,
+         "caller": "T31",
+         "msg": "systemd[1]: systemd 254.7-1.fc39 running in system mode"
+      },{
+         "pri": 30,
+         "time":    11.441524,
+         "caller": "T32",
+         "msg": "systemd[1]: Detected architecture x86-64."
+      },{
+         "pri": 30,
+         "time":    12.441525,
+         "caller": "T33",
+         "msg": "systemd[1]: Running in initrd."
+      },{
+         "pri": 30,
+         "time":    13.541598,
+         "caller": "T34",
+         "msg": "systemd[1]: Hostname set to <catalina>."
+      },{
+         "pri": 6,
+         "time":    15.641860,
+         "caller": "T35",
+         "msg": "usb 3-3: New USB device found, idVendor=1a40, idProduct=0101, bcdDevice= 1.11"
+      },{
+         "pri": 3,
+         "time":    16.690000,
+         "caller": "T36",
+         "msg": "Serial bus multi instantiate pseudo device driver INT3515:00: error -ENXIO: IRQ index 1 not found."
+      },{
+         "pri": 3,
+         "time":    17.710000,
+         "caller": "T37",
+         "msg": "snd_hda_intel 0000:00:1f.3: CORB reset timeout#2, CORBRP = 65535"
+      },{
+         "pri": 46,
+         "time":    18.720000,
+         "caller": "T38",
+         "msg": "systemd-journald[723]: Received client request to flush runtime journal."
+      },{
+         "pri": 44,
+         "time":    20.740000,
+         "caller": "T39",
+         "msg": "systemd-journald[723]: File /var/log/journal/a124ea923b144109a12d557d5ac53179/system.journal corrupted or uncleanly shut down, renaming and replacing."
+      },{
+         "pri": 46,
+         "time":    21.752348,
+         "caller": "T40",
+         "msg": "systemd-journald[723]: /var/log/journal/ad7a2547ac0e4342a342e62a34a3eae4/user-1000.journal: Journal file uses a different sequence number ID, rotating."
+      },{
+         "pri": 4,
+         "time":    24.761100,
+         "caller": "T41",
+         "msg": "PEFILE: Unsigned PE binary"
+      },{
+         "pri": 3,
+         "time":    35.768091,
+         "caller": "T42",
+         "msg": "snd_hda_intel 0000:00:1f.3: CORB reset timeout#2, CORBRP = 65535"
+      },{
+         "pri": 6,
+         "time":   137.791785,
+         "caller": "C1",
+         "msg": "usb 3-3.1: device firmware changed"
+      },{
+         "pri": 6,
+         "time":   146.803248,
+         "caller": "C2",
+         "msg": "usb 3-3.1: USB disconnect, device number 44"
+      },{
+         "pri": 6,
+         "time":   148.821859,
+         "caller": "C3",
+         "msg": "usb 3-3.1: New USB device found, idVendor=17ef, idProduct=6047, bcdDevice= 3.30"
+      },{
+         "pri": 6,
+         "time":   149.840480,
+         "caller": "C4",
+         "msg": "perf: interrupt took too long (2518 > 2500)"
+      },{
+         "pri": 6,
+         "time":   150.853128,
+         "caller": "C5",
+         "msg": "perf: interrupt took too long (3217 > 3147)"
+      },{
+         "pri": 6,
+         "time":   153.859311,
+         "caller": "C12",
+         "msg": "perf: interrupt took too long (3654 > 3239)"
+      },{
+         "pri": 6,
+         "time":   155.861908,
+         "caller": "C123",
+         "msg": "perf: interrupt took too long (3789 > 3545)"
+      },{
+         "pri": 6,
+         "time":   158.870434,
+         "caller": "C1234",
+         "msg": "perf: interrupt took too long (3891 > 3647)"
+      },{
+         "pri": 6,
+         "time":   161.887625,
+         "caller": "C12345",
+         "msg": "perf: interrupt took too long (3947 > 3789)"
+      },{
+         "pri": 6,
+         "time":   163.898434,
+         "caller": "C123456",
+         "msg": "perf: interrupt took too long (4011 > 3898)"
+      },{
+         "pri": 6,
+         "time":   166.909842,
+         "caller": "C1234567",
+         "msg": "perf: interrupt took too long (4174 > 3987)"
+      },{
+         "pri": 12,
+         "time":   169.911147,
+         "caller": "T123",
+         "msg": "User program Dmesg Test Message at warn priority"
+      },{
+         "pri": 12,
+         "time":   178.927435,
+         "caller": "T1234",
+         "msg": "User program Dmesg Test Message at warn priority"
+      },{
+         "pri": 13,
+         "time":   185.943456,
+         "caller": "T12345",
+         "msg": "User program Dmesg Test Message at notice priority"
+      },{
+         "pri": 14,
+         "time":   189.963238,
+         "caller": "T123456",
+         "msg": "User program Dmesg Test Message at info priority"
+      },{
+         "pri": 15,
+         "time":   207.987439,
+         "caller": "T1234567",
+         "msg": "User program Dmesg Test Message at debug priority\n"
+      }
+   ]
+}