mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-04 16:23:55 -06:00
* Fix the FreeBSD CI jobs in Gitlab by upgrading the packages in the beginning
* Fix the Haiku VM test by updating it to r1beta4 * Allow "make uninstall" * Rename TARGET_FMT_plx to HWADDR_FMT_plx * Some small qtest fixes/improvements * Check for valid amount of CPUs before starting a secure execution s390x guest -----BEGIN PGP SIGNATURE----- iQJFBAABCAAvFiEEJ7iIR+7gJQEY8+q5LtnXdP5wLbUFAmPH2JIRHHRodXRoQHJl ZGhhdC5jb20ACgkQLtnXdP5wLbUSWRAAk7C6vcVeDL066ftV75qErGcY1lpTF5GA 6rn1EO8wxGUxdjwi5koqqcn7m4LGWJKNnbZkp+7u5h4ni1G6Wu5v5Lnemtb0I5qI M7fTr9QUErK39eV5bPNrZ/Zr4bXRnM6BdYGrTh5d4FZoeIwhjBG/zofWNw/4p11L HLxeG3z3xns5DHQFeMn2v8oapRVWq9h5dIFhWwmEoc0+UBT5cboDM0UnJ8iiZ0Q+ 5AvZVn01iQK/UXGj1iT3JK47jE0P5dregm+h4sd0MUYU1/8LaOIy93YvWk1qI7ID WPJoo9EwqYOYf2lmEfbitgxW5tlp5l/1SGtDXuvkisXmQeMMRB3Dv48nta80sFow PVSwwXqkqbazocsBdFP1tF2cBR/mvRPpVKa+VtF2pu9szCREdfbbt6ERJ2sePUyG MpKhqFV/dPLgcbNgvtUQbyzGBxlieoIRgndYmZwxMIb6uJKmlcJkQg2SYfRAVrri Bdbo0/HdW0IBTn7zFmpVUgEtkpxxpiz1zjPKBA4o/vaTDh44HT1EcFCTZ1HKaUbp iLABMtz5DRS+HJbeIsI8IiCAsIG0r8JRukRrde3k4iEzLq4gt+Df7NIXJtlSIJ+H 8M+JO7c2N4meWuHV7x3xUFGVQxYQQG93m8bWbhgyBtdtoayaN9Fb8XpXXShblXxc ozHrBQe3ciI= =zfXp -----END PGP SIGNATURE----- Merge tag 'pull-request-2023-01-18' of https://gitlab.com/thuth/qemu into staging * Fix the FreeBSD CI jobs in Gitlab by upgrading the packages in the beginning * Fix the Haiku VM test by updating it to r1beta4 * Allow "make uninstall" * Rename TARGET_FMT_plx to HWADDR_FMT_plx * Some small qtest fixes/improvements * Check for valid amount of CPUs before starting a secure execution s390x guest # -----BEGIN PGP SIGNATURE----- # # iQJFBAABCAAvFiEEJ7iIR+7gJQEY8+q5LtnXdP5wLbUFAmPH2JIRHHRodXRoQHJl # ZGhhdC5jb20ACgkQLtnXdP5wLbUSWRAAk7C6vcVeDL066ftV75qErGcY1lpTF5GA # 6rn1EO8wxGUxdjwi5koqqcn7m4LGWJKNnbZkp+7u5h4ni1G6Wu5v5Lnemtb0I5qI # M7fTr9QUErK39eV5bPNrZ/Zr4bXRnM6BdYGrTh5d4FZoeIwhjBG/zofWNw/4p11L # HLxeG3z3xns5DHQFeMn2v8oapRVWq9h5dIFhWwmEoc0+UBT5cboDM0UnJ8iiZ0Q+ # 5AvZVn01iQK/UXGj1iT3JK47jE0P5dregm+h4sd0MUYU1/8LaOIy93YvWk1qI7ID # WPJoo9EwqYOYf2lmEfbitgxW5tlp5l/1SGtDXuvkisXmQeMMRB3Dv48nta80sFow # PVSwwXqkqbazocsBdFP1tF2cBR/mvRPpVKa+VtF2pu9szCREdfbbt6ERJ2sePUyG # MpKhqFV/dPLgcbNgvtUQbyzGBxlieoIRgndYmZwxMIb6uJKmlcJkQg2SYfRAVrri # Bdbo0/HdW0IBTn7zFmpVUgEtkpxxpiz1zjPKBA4o/vaTDh44HT1EcFCTZ1HKaUbp # iLABMtz5DRS+HJbeIsI8IiCAsIG0r8JRukRrde3k4iEzLq4gt+Df7NIXJtlSIJ+H # 8M+JO7c2N4meWuHV7x3xUFGVQxYQQG93m8bWbhgyBtdtoayaN9Fb8XpXXShblXxc # ozHrBQe3ciI= # =zfXp # -----END PGP SIGNATURE----- # gpg: Signature made Wed 18 Jan 2023 11:31:30 GMT # 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-2023-01-18' of https://gitlab.com/thuth/qemu: s390x/pv: Implement a CGS check helper tests/vm/haiku.x86_64: Update the Haiku VM to Beta 4 tests/qtest/libqos/e1000e: Remove duplicate register definitions tests/qtest/e1000e-test: Fix the code style tests/qtest: Restrict bcm2835-dma-test to CONFIG_RASPI MAINTAINERS: Remove bouncing mail address from Kamil Rytarowski bulk: Rename TARGET_FMT_plx -> HWADDR_FMT_plx Makefile: allow 'make uninstall' Upgrade all packages in the FreeBSD VMs to ensure the freshness Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell
commit
701ed34833
78 changed files with 300 additions and 267 deletions
|
|
@ -1,4 +1,4 @@
|
|||
/*
|
||||
/*
|
||||
* QTest testcase for e1000e NIC
|
||||
*
|
||||
* Copyright (c) 2015 Ravello Systems LTD (http://ravellosystems.com)
|
||||
|
|
|
|||
|
|
@ -51,13 +51,13 @@ static uint32_t e1000e_macreg_read(QE1000E *d, uint32_t reg)
|
|||
void e1000e_tx_ring_push(QE1000E *d, void *descr)
|
||||
{
|
||||
QE1000E_PCI *d_pci = container_of(d, QE1000E_PCI, e1000e);
|
||||
uint32_t tail = e1000e_macreg_read(d, E1000E_TDT);
|
||||
uint32_t len = e1000e_macreg_read(d, E1000E_TDLEN) / E1000_RING_DESC_LEN;
|
||||
uint32_t tail = e1000e_macreg_read(d, E1000_TDT);
|
||||
uint32_t len = e1000e_macreg_read(d, E1000_TDLEN) / E1000_RING_DESC_LEN;
|
||||
|
||||
qtest_memwrite(d_pci->pci_dev.bus->qts,
|
||||
d->tx_ring + tail * E1000_RING_DESC_LEN,
|
||||
descr, E1000_RING_DESC_LEN);
|
||||
e1000e_macreg_write(d, E1000E_TDT, (tail + 1) % len);
|
||||
e1000e_macreg_write(d, E1000_TDT, (tail + 1) % len);
|
||||
|
||||
/* Read WB data for the packet transmitted */
|
||||
qtest_memread(d_pci->pci_dev.bus->qts,
|
||||
|
|
@ -68,13 +68,13 @@ void e1000e_tx_ring_push(QE1000E *d, void *descr)
|
|||
void e1000e_rx_ring_push(QE1000E *d, void *descr)
|
||||
{
|
||||
QE1000E_PCI *d_pci = container_of(d, QE1000E_PCI, e1000e);
|
||||
uint32_t tail = e1000e_macreg_read(d, E1000E_RDT);
|
||||
uint32_t len = e1000e_macreg_read(d, E1000E_RDLEN) / E1000_RING_DESC_LEN;
|
||||
uint32_t tail = e1000e_macreg_read(d, E1000_RDT);
|
||||
uint32_t len = e1000e_macreg_read(d, E1000_RDLEN) / E1000_RING_DESC_LEN;
|
||||
|
||||
qtest_memwrite(d_pci->pci_dev.bus->qts,
|
||||
d->rx_ring + tail * E1000_RING_DESC_LEN,
|
||||
descr, E1000_RING_DESC_LEN);
|
||||
e1000e_macreg_write(d, E1000E_RDT, (tail + 1) % len);
|
||||
e1000e_macreg_write(d, E1000_RDT, (tail + 1) % len);
|
||||
|
||||
/* Read WB data for the packet received */
|
||||
qtest_memread(d_pci->pci_dev.bus->qts,
|
||||
|
|
@ -145,8 +145,8 @@ static void e1000e_pci_start_hw(QOSGraphObject *obj)
|
|||
(uint32_t) d->e1000e.tx_ring);
|
||||
e1000e_macreg_write(&d->e1000e, E1000_TDBAH,
|
||||
(uint32_t) (d->e1000e.tx_ring >> 32));
|
||||
e1000e_macreg_write(&d->e1000e, E1000E_TDLEN, E1000E_RING_LEN);
|
||||
e1000e_macreg_write(&d->e1000e, E1000E_TDT, 0);
|
||||
e1000e_macreg_write(&d->e1000e, E1000_TDLEN, E1000E_RING_LEN);
|
||||
e1000e_macreg_write(&d->e1000e, E1000_TDT, 0);
|
||||
e1000e_macreg_write(&d->e1000e, E1000_TDH, 0);
|
||||
|
||||
/* Enable transmit */
|
||||
|
|
@ -156,8 +156,8 @@ static void e1000e_pci_start_hw(QOSGraphObject *obj)
|
|||
(uint32_t)d->e1000e.rx_ring);
|
||||
e1000e_macreg_write(&d->e1000e, E1000_RDBAH,
|
||||
(uint32_t)(d->e1000e.rx_ring >> 32));
|
||||
e1000e_macreg_write(&d->e1000e, E1000E_RDLEN, E1000E_RING_LEN);
|
||||
e1000e_macreg_write(&d->e1000e, E1000E_RDT, 0);
|
||||
e1000e_macreg_write(&d->e1000e, E1000_RDLEN, E1000E_RING_LEN);
|
||||
e1000e_macreg_write(&d->e1000e, E1000_RDT, 0);
|
||||
e1000e_macreg_write(&d->e1000e, E1000_RDH, 0);
|
||||
|
||||
/* Enable receive */
|
||||
|
|
@ -222,8 +222,10 @@ static void e1000e_register_nodes(void)
|
|||
.device_id = E1000_DEV_ID_82574L,
|
||||
};
|
||||
|
||||
/* FIXME: every test using this node needs to setup a -netdev socket,id=hs0
|
||||
* otherwise QEMU is not going to start */
|
||||
/*
|
||||
* FIXME: every test using this node needs to setup a -netdev socket,id=hs0
|
||||
* otherwise QEMU is not going to start
|
||||
*/
|
||||
QOSGraphEdgeOptions opts = {
|
||||
.extra_device_opts = "netdev=hs0",
|
||||
};
|
||||
|
|
|
|||
|
|
@ -25,11 +25,6 @@
|
|||
#define E1000E_RX0_MSG_ID (0)
|
||||
#define E1000E_TX0_MSG_ID (1)
|
||||
|
||||
#define E1000E_TDLEN (0x3808)
|
||||
#define E1000E_TDT (0x3818)
|
||||
#define E1000E_RDLEN (0x2808)
|
||||
#define E1000E_RDT (0x2818)
|
||||
|
||||
typedef struct QE1000E QE1000E;
|
||||
typedef struct QE1000E_PCI QE1000E_PCI;
|
||||
|
||||
|
|
|
|||
|
|
@ -207,11 +207,11 @@ qtests_aarch64 = \
|
|||
(config_all_devices.has_key('CONFIG_TPM_TIS_SYSBUS') ? ['tpm-tis-device-test'] : []) + \
|
||||
(config_all_devices.has_key('CONFIG_TPM_TIS_SYSBUS') ? ['tpm-tis-device-swtpm-test'] : []) + \
|
||||
(config_all_devices.has_key('CONFIG_XLNX_ZYNQMP_ARM') ? ['xlnx-can-test', 'fuzz-xlnx-dp-test'] : []) + \
|
||||
(config_all_devices.has_key('CONFIG_RASPI') ? ['bcm2835-dma-test'] : []) + \
|
||||
['arm-cpu-features',
|
||||
'numa-test',
|
||||
'boot-serial-test',
|
||||
'migration-test',
|
||||
'bcm2835-dma-test']
|
||||
'migration-test']
|
||||
|
||||
qtests_s390x = \
|
||||
(slirp.found() ? ['pxe-test', 'test-netfilter'] : []) + \
|
||||
|
|
|
|||
|
|
@ -48,8 +48,8 @@ class HaikuVM(basevm.BaseVM):
|
|||
name = "haiku"
|
||||
arch = "x86_64"
|
||||
|
||||
link = "https://app.vagrantup.com/haiku-os/boxes/r1beta3-x86_64/versions/20220216/providers/libvirt.box"
|
||||
csum = "e67d4aacbcc687013d5cc91990ddd86cc5d70a5d28432ae2691944f8ce5d5041"
|
||||
link = "https://app.vagrantup.com/haiku-os/boxes/r1beta4-x86_64/versions/20230114/providers/libvirt.box"
|
||||
csum = "6e72a2a470e03dbc3c5e808664e057bb4022b390dca88e4c7da6188f26f6a3c9"
|
||||
|
||||
poweroff = "shutdown"
|
||||
|
||||
|
|
@ -80,13 +80,12 @@ class HaikuVM(basevm.BaseVM):
|
|||
"ninja",
|
||||
]
|
||||
|
||||
# https://dev.haiku-os.org/ticket/16512 virtio disk1 shows up as 0 (reversed order)
|
||||
BUILD_SCRIPT = """
|
||||
set -e;
|
||||
rm -rf /tmp/qemu-test.*
|
||||
cd $(mktemp -d /tmp/qemu-test.XXXXXX);
|
||||
mkdir src build; cd src;
|
||||
tar -xf /dev/disk/virtual/virtio_block/0/raw;
|
||||
tar -xf /dev/disk/virtual/virtio_block/1/raw;
|
||||
mkdir -p /usr/bin
|
||||
ln -s /boot/system/bin/env /usr/bin/env
|
||||
cd ../build
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue