mirror of https://gitee.com/openkylin/qemu.git
* Current qtests queue
* Some Kconfig updates * Some trivial clean-ups here and there -----BEGIN PGP SIGNATURE----- iQJFBAABCAAvFiEEJ7iIR+7gJQEY8+q5LtnXdP5wLbUFAl45LrARHHRodXRoQHJl ZGhhdC5jb20ACgkQLtnXdP5wLbVpVw//Y+p64gpEvAK++HR9iCjGOEx3rO+2mgo6 KXeXw+HWHk9aHkWtplk96akchyFeAz8BuU6TU7vtd0Zczui3aBqSY0b2Sv2eVsPA /0TzWyRzmrJDSJLL8EM/x3j+F4nIrDm/Vbjwkkmdgk7zorO0YvxlqzRQmy4BXjR0 t5+qN/JhENh5Xz/i2kzCXBUDhPCC9LzuooVuKjFLg7CZCOFugBbZ8hU+6EmE+asL jip1LIfkCjeJZnGsNWFV9oVYi+hTTr3Hyj+CIcKi61nSuF/1e3nDQxNLAF49Qso7 YNjOFPSaVZXxyoZx5Bb5jv/cRw5HmFtT66ybNr2J2vHMaaZOWMhXbUUjnitf0G4t 1yUsEJLloqO7/0DQVCemUrG6+zLUNIvg8KPEGQJYmjT8mQ2Rbf1jATN/wFNMlVWR aXud6hSAcrwDFb4w6kHdCOcwFvef9xBUBQLzkn5OFSgoWCSI+kbzkSLp3BCNnzwv n8ChW2bm/gzhsbD0NsFMIkvLTtFauLVWquoEeSLFkybccMdM+TVNg0dg7So7u5Gx PiH4ivsoGtdNM9cEDDacWFcnjTPiNcNJjLleYJYFGYjU+UueN0I6Tlb2QUW4DtXC 6g3t01Y9GZgSrXZX+83Ec33pss1brC3uZBRRw6EaJtxd+iRg6gLNGtpi3MWo8VRN yGBfgzJi9s8= =qs+X -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2020-02-04' into staging * Current qtests queue * Some Kconfig updates * Some trivial clean-ups here and there # gpg: Signature made Tue 04 Feb 2020 08:43:28 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 * remotes/huth-gitlab/tags/pull-request-2020-02-04: configure: Fix typo of the have_afalg variable hw/hppa/Kconfig: LASI chipset requires PARALLEL port hw/input: Do not enable CONFIG_PCKBD by default Makefile: Do not use wildcard hw/*/Kconfig as input for minikconf hw/*/Makefile.objs: Move many .o files to common-objs trivial: Remove xenfb_enabled from sysemu.h include/sysemu/sysemu.h: Remove usused variable no_quit gitlab-ci: Refresh the list of iotests tests/qtest: update comments about bios-tables-test-allowed-diff.h boot-order-test: fix memleaks in boot-order-test tests/Makefile: Fix inclusion of the qos dependency files docs/devel: Fix qtest paths and info about check-block in testing.rst tests/vhost-user-bridge: Fix build test-logging: Fix -Werror=maybe-uninitialized warning Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
commit
7bd9d0a9e2
|
@ -54,12 +54,12 @@ build-tcg-disabled:
|
|||
- make check-qapi-schema
|
||||
- cd tests/qemu-iotests/
|
||||
- ./check -raw 001 002 003 004 005 008 009 010 011 012 021 025 032 033 048
|
||||
052 063 077 086 101 104 106 113 147 148 150 151 152 157 159 160
|
||||
163 170 171 183 184 192 194 197 205 208 215 221 222 226 227 236
|
||||
- ./check -qcow2 028 040 051 056 057 058 065 067 068 082 085 091 095 096 102
|
||||
122 124 127 129 132 139 142 144 145 147 151 152 155 157 165 194
|
||||
196 197 200 202 203 205 208 209 215 216 218 222 227 234 246 247
|
||||
248 250 254 255 256
|
||||
052 063 077 086 101 104 106 113 148 150 151 152 157 159 160 163
|
||||
170 171 183 184 192 194 197 208 215 221 222 226 227 236 253 277
|
||||
- ./check -qcow2 028 051 056 057 058 065 067 068 082 085 091 095 096 102 122
|
||||
124 132 139 142 144 145 151 152 155 157 165 194 196 197 200 202
|
||||
208 209 215 216 218 222 227 234 246 247 248 250 254 255 257 258
|
||||
260 261 262 263 264 270 272 273 277 279
|
||||
|
||||
build-user:
|
||||
script:
|
||||
|
|
6
Makefile
6
Makefile
|
@ -397,11 +397,11 @@ MINIKCONF_ARGS = \
|
|||
CONFIG_LINUX=$(CONFIG_LINUX) \
|
||||
CONFIG_PVRDMA=$(CONFIG_PVRDMA)
|
||||
|
||||
MINIKCONF_INPUTS = $(SRC_PATH)/Kconfig.host $(SRC_PATH)/hw/Kconfig \
|
||||
$(wildcard $(SRC_PATH)/hw/*/Kconfig)
|
||||
MINIKCONF_INPUTS = $(SRC_PATH)/Kconfig.host $(SRC_PATH)/hw/Kconfig
|
||||
MINIKCONF_DEPS = $(MINIKCONF_INPUTS) $(wildcard $(SRC_PATH)/hw/*/Kconfig)
|
||||
MINIKCONF = $(PYTHON) $(SRC_PATH)/scripts/minikconf.py \
|
||||
|
||||
$(SUBDIR_DEVICES_MAK): %/config-devices.mak: default-configs/%.mak $(MINIKCONF_INPUTS) $(BUILD_DIR)/config-host.mak
|
||||
$(SUBDIR_DEVICES_MAK): %/config-devices.mak: default-configs/%.mak $(MINIKCONF_DEPS) $(BUILD_DIR)/config-host.mak
|
||||
$(call quiet-command, $(MINIKCONF) $(MINIKCONF_ARGS) > $@.tmp, "GEN", "$@.tmp")
|
||||
$(call quiet-command, if test -f $@; then \
|
||||
if cmp -s $@.old $@; then \
|
||||
|
|
|
@ -5843,7 +5843,7 @@ fi
|
|||
|
||||
##########################################
|
||||
# check for usable AF_ALG environment
|
||||
hava_afalg=no
|
||||
have_afalg=no
|
||||
cat > $TMPC << EOF
|
||||
#include <errno.h>
|
||||
#include <sys/types.h>
|
||||
|
|
|
@ -16,8 +16,8 @@ The usual way to run these tests is:
|
|||
|
||||
make check
|
||||
|
||||
which includes QAPI schema tests, unit tests, and QTests. Different sub-types
|
||||
of "make check" tests will be explained below.
|
||||
which includes QAPI schema tests, unit tests, QTests and some iotests.
|
||||
Different sub-types of "make check" tests will be explained below.
|
||||
|
||||
Before running tests, it is best to build QEMU programs first. Some tests
|
||||
expect the executables to exist and will fail with obscure messages if they
|
||||
|
@ -79,8 +79,8 @@ QTest cases can be executed with
|
|||
|
||||
make check-qtest
|
||||
|
||||
The QTest library is implemented by ``tests/libqtest.c`` and the API is defined
|
||||
in ``tests/libqtest.h``.
|
||||
The QTest library is implemented by ``tests/qtest/libqtest.c`` and the API is
|
||||
defined in ``tests/qtest/libqtest.h``.
|
||||
|
||||
Consider adding a new QTest case when you are introducing a new virtual
|
||||
hardware, or extending one if you are adding functionalities to an existing
|
||||
|
@ -94,20 +94,20 @@ libqos instead of directly calling into libqtest.
|
|||
Steps to add a new QTest case are:
|
||||
|
||||
1. Create a new source file for the test. (More than one file can be added as
|
||||
necessary.) For example, ``tests/test-foo-device.c``.
|
||||
necessary.) For example, ``tests/qtest/foo-test.c``.
|
||||
|
||||
2. Write the test code with the glib and libqtest/libqos API. See also existing
|
||||
tests and the library headers for reference.
|
||||
|
||||
3. Register the new test in ``tests/Makefile.include``. Add the test executable
|
||||
name to an appropriate ``check-qtest-*-y`` variable. For example:
|
||||
3. Register the new test in ``tests/qtest/Makefile.include``. Add the test
|
||||
executable name to an appropriate ``check-qtest-*-y`` variable. For example:
|
||||
|
||||
``check-qtest-generic-y = tests/test-foo-device$(EXESUF)``
|
||||
``check-qtest-generic-y = tests/qtest/foo-test$(EXESUF)``
|
||||
|
||||
4. Add object dependencies of the executable in the Makefile, including the
|
||||
test source file(s) and other interesting objects. For example:
|
||||
|
||||
``tests/test-foo-device$(EXESUF): tests/test-foo-device.o $(libqos-obj-y)``
|
||||
``tests/qtest/foo-test$(EXESUF): tests/qtest/foo-test.o $(libqos-obj-y)``
|
||||
|
||||
Debugging a QTest failure is slightly harder than the unit test because the
|
||||
tests look up QEMU program names in the environment variables, such as
|
||||
|
@ -152,8 +152,9 @@ parser (either fixing a bug or extending/modifying the syntax). To do this:
|
|||
check-block
|
||||
-----------
|
||||
|
||||
``make check-block`` is a legacy command to invoke block layer iotests and is
|
||||
rarely used. See "QEMU iotests" section below for more information.
|
||||
``make check-block`` runs a subset of the block layer iotests (the tests that
|
||||
are in the "auto" group in ``tests/qemu-iotests/group``).
|
||||
See the "QEMU iotests" section below for more information.
|
||||
|
||||
GCC gcov support
|
||||
----------------
|
||||
|
|
|
@ -1 +1 @@
|
|||
obj-$(CONFIG_STM32F2XX_ADC) += stm32f2xx_adc.o
|
||||
common-obj-$(CONFIG_STM32F2XX_ADC) += stm32f2xx_adc.o
|
||||
|
|
|
@ -10,7 +10,7 @@ common-obj-$(CONFIG_ONENAND) += onenand.o
|
|||
common-obj-$(CONFIG_NVME_PCI) += nvme.o
|
||||
common-obj-$(CONFIG_SWIM) += swim.o
|
||||
|
||||
obj-$(CONFIG_SH4) += tc58128.o
|
||||
common-obj-$(CONFIG_SH4) += tc58128.o
|
||||
|
||||
obj-$(CONFIG_VIRTIO_BLK) += virtio-blk.o
|
||||
obj-$(CONFIG_VHOST_USER_BLK) += vhost-user-blk.o
|
||||
|
|
|
@ -13,14 +13,13 @@ common-obj-$(CONFIG_XILINX) += xilinx_uartlite.o
|
|||
common-obj-$(CONFIG_XEN) += xen_console.o
|
||||
common-obj-$(CONFIG_CADENCE) += cadence_uart.o
|
||||
|
||||
obj-$(CONFIG_EXYNOS4) += exynos4210_uart.o
|
||||
obj-$(CONFIG_COLDFIRE) += mcf_uart.o
|
||||
obj-$(CONFIG_OMAP) += omap_uart.o
|
||||
obj-$(CONFIG_SH4) += sh_serial.o
|
||||
obj-$(CONFIG_PSERIES) += spapr_vty.o
|
||||
obj-$(CONFIG_DIGIC) += digic-uart.o
|
||||
obj-$(CONFIG_STM32F2XX_USART) += stm32f2xx_usart.o
|
||||
obj-$(CONFIG_RASPI) += bcm2835_aux.o
|
||||
common-obj-$(CONFIG_EXYNOS4) += exynos4210_uart.o
|
||||
common-obj-$(CONFIG_COLDFIRE) += mcf_uart.o
|
||||
common-obj-$(CONFIG_OMAP) += omap_uart.o
|
||||
common-obj-$(CONFIG_SH4) += sh_serial.o
|
||||
common-obj-$(CONFIG_DIGIC) += digic-uart.o
|
||||
common-obj-$(CONFIG_STM32F2XX_USART) += stm32f2xx_usart.o
|
||||
common-obj-$(CONFIG_RASPI) += bcm2835_aux.o
|
||||
|
||||
common-obj-$(CONFIG_CMSDK_APB_UART) += cmsdk-apb-uart.o
|
||||
common-obj-$(CONFIG_ETRAXFS) += etraxfs_ser.o
|
||||
|
@ -33,4 +32,5 @@ common-obj-$(CONFIG_MILKYMIST) += milkymist-uart.o
|
|||
common-obj-$(CONFIG_SCLPCONSOLE) += sclpconsole.o sclpconsole-lm.o
|
||||
|
||||
obj-$(CONFIG_VIRTIO) += virtio-serial-bus.o
|
||||
obj-$(CONFIG_PSERIES) += spapr_vty.o
|
||||
obj-$(CONFIG_TERMINAL3270) += terminal3270.o
|
||||
|
|
|
@ -19,8 +19,8 @@ common-obj-$(CONFIG_SOFTMMU) += machine.o
|
|||
common-obj-$(CONFIG_SOFTMMU) += null-machine.o
|
||||
common-obj-$(CONFIG_SOFTMMU) += loader.o
|
||||
common-obj-$(CONFIG_SOFTMMU) += machine-hmp-cmds.o
|
||||
common-obj-$(CONFIG_SOFTMMU) += numa.o
|
||||
obj-$(CONFIG_SOFTMMU) += machine-qmp-cmds.o
|
||||
obj-$(CONFIG_SOFTMMU) += numa.o
|
||||
|
||||
common-obj-$(CONFIG_EMPTY_SLOT) += empty_slot.o
|
||||
common-obj-$(CONFIG_XILINX_AXI) += stream.o
|
||||
|
|
|
@ -24,7 +24,7 @@ common-obj-$(CONFIG_BOCHS_DISPLAY) += bochs-display.o
|
|||
common-obj-$(CONFIG_BLIZZARD) += blizzard.o
|
||||
common-obj-$(CONFIG_EXYNOS4) += exynos4210_fimd.o
|
||||
common-obj-$(CONFIG_FRAMEBUFFER) += framebuffer.o
|
||||
obj-$(CONFIG_MILKYMIST) += milkymist-vgafb.o
|
||||
common-obj-$(CONFIG_MILKYMIST) += milkymist-vgafb.o
|
||||
common-obj-$(CONFIG_ZAURUS) += tc6393xb.o
|
||||
common-obj-$(CONFIG_MACFB) += macfb.o
|
||||
|
||||
|
|
|
@ -8,9 +8,9 @@ common-obj-$(CONFIG_XILINX_AXI) += xilinx_axidma.o
|
|||
common-obj-$(CONFIG_ZYNQ_DEVCFG) += xlnx-zynq-devcfg.o
|
||||
common-obj-$(CONFIG_ETRAXFS) += etraxfs_dma.o
|
||||
common-obj-$(CONFIG_STP2000) += sparc32_dma.o
|
||||
obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx_dpdma.o
|
||||
common-obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx_dpdma.o
|
||||
common-obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx-zdma.o
|
||||
|
||||
obj-$(CONFIG_OMAP) += omap_dma.o soc_dma.o
|
||||
obj-$(CONFIG_PXA2XX) += pxa2xx_dma.o
|
||||
common-obj-$(CONFIG_OMAP) += omap_dma.o soc_dma.o
|
||||
common-obj-$(CONFIG_PXA2XX) += pxa2xx_dma.o
|
||||
common-obj-$(CONFIG_RASPI) += bcm2835_dma.o
|
||||
|
|
|
@ -5,8 +5,8 @@ common-obj-$(CONFIG_ZAURUS) += zaurus.o
|
|||
common-obj-$(CONFIG_E500) += mpc8xxx.o
|
||||
common-obj-$(CONFIG_GPIO_KEY) += gpio_key.o
|
||||
|
||||
obj-$(CONFIG_OMAP) += omap_gpio.o
|
||||
obj-$(CONFIG_IMX) += imx_gpio.o
|
||||
obj-$(CONFIG_RASPI) += bcm2835_gpio.o
|
||||
obj-$(CONFIG_NRF51_SOC) += nrf51_gpio.o
|
||||
obj-$(CONFIG_ASPEED_SOC) += aspeed_gpio.o
|
||||
common-obj-$(CONFIG_OMAP) += omap_gpio.o
|
||||
common-obj-$(CONFIG_IMX) += imx_gpio.o
|
||||
common-obj-$(CONFIG_RASPI) += bcm2835_gpio.o
|
||||
common-obj-$(CONFIG_NRF51_SOC) += nrf51_gpio.o
|
||||
common-obj-$(CONFIG_ASPEED_SOC) += aspeed_gpio.o
|
||||
|
|
|
@ -12,4 +12,5 @@ config DINO
|
|||
select LSI_SCSI_PCI
|
||||
select LASI_82596
|
||||
select LASIPS2
|
||||
select PARALLEL
|
||||
select ARTIST
|
||||
|
|
|
@ -9,5 +9,5 @@ common-obj-$(CONFIG_IMX_I2C) += imx_i2c.o
|
|||
common-obj-$(CONFIG_ASPEED_SOC) += aspeed_i2c.o
|
||||
common-obj-$(CONFIG_NRF51_SOC) += microbit_i2c.o
|
||||
common-obj-$(CONFIG_MPC_I2C) += mpc_i2c.o
|
||||
obj-$(CONFIG_OMAP) += omap_i2c.o
|
||||
obj-$(CONFIG_PPC4XX) += ppc4xx_i2c.o
|
||||
common-obj-$(CONFIG_OMAP) += omap_i2c.o
|
||||
common-obj-$(CONFIG_PPC4XX) += ppc4xx_i2c.o
|
||||
|
|
|
@ -27,7 +27,6 @@
|
|||
#include "qemu/osdep.h"
|
||||
#include "qemu/log.h"
|
||||
#include "qemu/module.h"
|
||||
#include "cpu.h"
|
||||
#include "hw/i2c/ppc4xx_i2c.h"
|
||||
#include "hw/irq.h"
|
||||
|
||||
|
|
|
@ -7,7 +7,6 @@ config LM832X
|
|||
|
||||
config PCKBD
|
||||
bool
|
||||
default y
|
||||
select PS2
|
||||
depends on ISA_BUS
|
||||
|
||||
|
|
|
@ -12,7 +12,7 @@ common-obj-$(CONFIG_VIRTIO_INPUT) += virtio-input-hid.o
|
|||
common-obj-$(CONFIG_VIRTIO_INPUT_HOST) += virtio-input-host.o
|
||||
common-obj-$(CONFIG_VHOST_USER_INPUT) += vhost-user-input.o
|
||||
|
||||
obj-$(CONFIG_MILKYMIST) += milkymist-softusb.o
|
||||
obj-$(CONFIG_PXA2XX) += pxa2xx_keypad.o
|
||||
obj-$(CONFIG_TSC210X) += tsc210x.o
|
||||
obj-$(CONFIG_LASIPS2) += lasips2.o
|
||||
common-obj-$(CONFIG_MILKYMIST) += milkymist-softusb.o
|
||||
common-obj-$(CONFIG_PXA2XX) += pxa2xx_keypad.o
|
||||
common-obj-$(CONFIG_TSC210X) += tsc210x.o
|
||||
common-obj-$(CONFIG_LASIPS2) += lasips2.o
|
||||
|
|
|
@ -16,6 +16,7 @@ config I82378
|
|||
config ISA_SUPERIO
|
||||
bool
|
||||
select ISA_BUS
|
||||
select PCKBD
|
||||
|
||||
config PC87312
|
||||
bool
|
||||
|
|
|
@ -34,8 +34,8 @@ common-obj-$(CONFIG_SUNHME) += sunhme.o
|
|||
common-obj-$(CONFIG_FTGMAC100) += ftgmac100.o
|
||||
common-obj-$(CONFIG_SUNGEM) += sungem.o
|
||||
|
||||
obj-$(CONFIG_ETRAXFS) += etraxfs_eth.o
|
||||
obj-$(CONFIG_COLDFIRE) += mcf_fec.o
|
||||
common-obj-$(CONFIG_ETRAXFS) += etraxfs_eth.o
|
||||
common-obj-$(CONFIG_COLDFIRE) += mcf_fec.o
|
||||
obj-$(CONFIG_MILKYMIST) += milkymist-minimac2.o
|
||||
obj-$(CONFIG_PSERIES) += spapr_llan.o
|
||||
obj-$(CONFIG_XILINX_ETHLITE) += xilinx_ethlite.o
|
||||
|
@ -45,7 +45,7 @@ common-obj-$(call land,$(CONFIG_VIRTIO_NET),$(CONFIG_VHOST_NET)) += vhost_net.o
|
|||
common-obj-$(call lnot,$(call land,$(CONFIG_VIRTIO_NET),$(CONFIG_VHOST_NET))) += vhost_net-stub.o
|
||||
common-obj-$(CONFIG_ALL) += vhost_net-stub.o
|
||||
|
||||
obj-$(CONFIG_ETSEC) += fsl_etsec/etsec.o fsl_etsec/registers.o \
|
||||
common-obj-$(CONFIG_ETSEC) += fsl_etsec/etsec.o fsl_etsec/registers.o \
|
||||
fsl_etsec/rings.o fsl_etsec/miim.o
|
||||
|
||||
common-obj-$(CONFIG_ROCKER) += rocker/rocker.o rocker/rocker_fp.o \
|
||||
|
|
|
@ -4,5 +4,5 @@ common-obj-$(CONFIG_AT24C) += eeprom_at24c.o
|
|||
common-obj-y += fw_cfg.o
|
||||
common-obj-$(CONFIG_CHRP_NVRAM) += chrp_nvram.o
|
||||
common-obj-$(CONFIG_MAC_NVRAM) += mac_nvram.o
|
||||
common-obj-$(CONFIG_NRF51_SOC) += nrf51_nvm.o
|
||||
obj-$(CONFIG_PSERIES) += spapr_nvram.o
|
||||
obj-$(CONFIG_NRF51_SOC) += nrf51_nvm.o
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
common-obj-y += pcmcia.o
|
||||
obj-$(CONFIG_PXA2XX) += pxa2xx.o
|
||||
common-obj-$(CONFIG_PXA2XX) += pxa2xx.o
|
||||
|
|
|
@ -4,8 +4,8 @@ common-obj-$(CONFIG_SD) += sd.o core.o sdmmc-internal.o
|
|||
common-obj-$(CONFIG_SDHCI) += sdhci.o
|
||||
common-obj-$(CONFIG_SDHCI_PCI) += sdhci-pci.o
|
||||
|
||||
obj-$(CONFIG_MILKYMIST) += milkymist-memcard.o
|
||||
obj-$(CONFIG_OMAP) += omap_mmc.o
|
||||
obj-$(CONFIG_PXA2XX) += pxa2xx_mmci.o
|
||||
obj-$(CONFIG_RASPI) += bcm2835_sdhost.o
|
||||
obj-$(CONFIG_ASPEED_SOC) += aspeed_sdhci.o
|
||||
common-obj-$(CONFIG_MILKYMIST) += milkymist-memcard.o
|
||||
common-obj-$(CONFIG_OMAP) += omap_mmc.o
|
||||
common-obj-$(CONFIG_PXA2XX) += pxa2xx_mmci.o
|
||||
common-obj-$(CONFIG_RASPI) += bcm2835_sdhost.o
|
||||
common-obj-$(CONFIG_ASPEED_SOC) += aspeed_sdhci.o
|
||||
|
|
|
@ -6,5 +6,5 @@ common-obj-$(CONFIG_ASPEED_SOC) += aspeed_smc.o
|
|||
common-obj-$(CONFIG_STM32F2XX_SPI) += stm32f2xx_spi.o
|
||||
common-obj-$(CONFIG_MSF2) += mss-spi.o
|
||||
|
||||
obj-$(CONFIG_OMAP) += omap_spi.o
|
||||
obj-$(CONFIG_IMX) += imx_spi.o
|
||||
common-obj-$(CONFIG_OMAP) += omap_spi.o
|
||||
common-obj-$(CONFIG_IMX) += imx_spi.o
|
||||
|
|
|
@ -13,8 +13,8 @@ common-obj-$(CONFIG_USB_XHCI) += hcd-xhci.o
|
|||
common-obj-$(CONFIG_USB_XHCI_NEC) += hcd-xhci-nec.o
|
||||
common-obj-$(CONFIG_USB_MUSB) += hcd-musb.o
|
||||
|
||||
obj-$(CONFIG_TUSB6010) += tusb6010.o
|
||||
obj-$(CONFIG_IMX) += chipidea.o
|
||||
common-obj-$(CONFIG_TUSB6010) += tusb6010.o
|
||||
common-obj-$(CONFIG_IMX) += chipidea.o
|
||||
|
||||
# emulated usb devices
|
||||
common-obj-$(CONFIG_USB) += dev-hub.o
|
||||
|
|
|
@ -60,7 +60,7 @@ static void xen_init_pv(MachineState *machine)
|
|||
xen_be_register("qnic", &xen_netdev_ops);
|
||||
|
||||
/* configure framebuffer */
|
||||
if (xenfb_enabled) {
|
||||
if (vga_interface_type == VGA_XENFB) {
|
||||
xen_config_dev_vfb(0, "vnc");
|
||||
xen_config_dev_vkbd(0);
|
||||
}
|
||||
|
|
|
@ -32,7 +32,6 @@ typedef enum {
|
|||
} VGAInterfaceType;
|
||||
|
||||
extern int vga_interface_type;
|
||||
#define xenfb_enabled (vga_interface_type == VGA_XENFB)
|
||||
|
||||
extern int graphic_width;
|
||||
extern int graphic_height;
|
||||
|
@ -44,7 +43,6 @@ extern int alt_grab;
|
|||
extern int ctrl_grab;
|
||||
extern int cursor_hide;
|
||||
extern int graphic_rotate;
|
||||
extern int no_quit;
|
||||
extern int no_shutdown;
|
||||
extern int old_param;
|
||||
extern int boot_menu;
|
||||
|
|
|
@ -586,6 +586,7 @@ include $(SRC_PATH)/tests/qtest/Makefile.include
|
|||
|
||||
tests/test-qga$(EXESUF): qemu-ga$(EXESUF)
|
||||
tests/test-qga$(EXESUF): tests/test-qga.o $(qtest-obj-y)
|
||||
tests/vhost-user-bridge$(EXESUF): tests/vhost-user-bridge.o $(test-util-obj-y) libvhost-user.a
|
||||
|
||||
SPEED = quick
|
||||
|
||||
|
@ -918,6 +919,6 @@ all: $(QEMU_IOTESTS_HELPERS-y)
|
|||
|
||||
-include $(wildcard tests/*.d)
|
||||
-include $(wildcard tests/qtest/*.d)
|
||||
-include $(wildcard tests/qtest/qos/*.d)
|
||||
-include $(wildcard tests/qtest/libqos/*.d)
|
||||
|
||||
endif
|
||||
|
|
|
@ -290,7 +290,6 @@ tests/qtest/test-filter-redirector$(EXESUF): tests/qtest/test-filter-redirector.
|
|||
tests/qtest/test-x86-cpuid-compat$(EXESUF): tests/qtest/test-x86-cpuid-compat.o $(qtest-obj-y)
|
||||
tests/qtest/ivshmem-test$(EXESUF): tests/qtest/ivshmem-test.o contrib/ivshmem-server/ivshmem-server.o $(libqos-pc-obj-y) $(libqos-spapr-obj-y)
|
||||
tests/qtest/dbus-vmstate-test$(EXESUF): tests/qtest/dbus-vmstate-test.o tests/qtest/migration-helpers.o tests/qtest/dbus-vmstate1.o $(libqos-pc-obj-y) $(libqos-spapr-obj-y)
|
||||
tests/qtest/vhost-user-bridge$(EXESUF): tests/qtest/vhost-user-bridge.o $(test-util-obj-y) libvhost-user.a
|
||||
tests/qtest/test-arm-mptimer$(EXESUF): tests/qtest/test-arm-mptimer.o
|
||||
tests/qtest/numa-test$(EXESUF): tests/qtest/numa-test.o
|
||||
tests/qtest/vmgenid-test$(EXESUF): tests/qtest/vmgenid-test.o tests/qtest/boot-sector.o tests/qtest/acpi-utils.o
|
||||
|
|
|
@ -14,14 +14,14 @@
|
|||
* How to add or update the tests:
|
||||
* Contributor:
|
||||
* 1. add empty files for new tables, if any, under tests/data/acpi
|
||||
* 2. list any changed files in tests/bios-tables-test-allowed-diff.h
|
||||
* 2. list any changed files in tests/qtest/bios-tables-test-allowed-diff.h
|
||||
* 3. commit the above *before* making changes that affect the tables
|
||||
*
|
||||
* Contributor or ACPI Maintainer (steps 4-7 need to be redone to resolve conflicts
|
||||
* in binary commit created in step 6):
|
||||
*
|
||||
* After 1-3 above tests will pass but ignore differences with the expected files.
|
||||
* You will also notice that tests/bios-tables-test-allowed-diff.h lists
|
||||
* You will also notice that tests/qtest/bios-tables-test-allowed-diff.h lists
|
||||
* a bunch of files. This is your hint that you need to do the below:
|
||||
* 4. Run
|
||||
* make check V=1
|
||||
|
@ -40,14 +40,14 @@
|
|||
* in commit log.
|
||||
* 7. Before sending patches to the list (Contributor)
|
||||
* or before doing a pull request (Maintainer), make sure
|
||||
* tests/bios-tables-test-allowed-diff.h is empty - this will ensure
|
||||
* tests/qtest/bios-tables-test-allowed-diff.h is empty - this will ensure
|
||||
* following changes to ACPI tables will be noticed.
|
||||
*
|
||||
* The resulting patchset/pull request then looks like this:
|
||||
* - patch 1: list changed files in tests/bios-tables-test-allowed-diff.h.
|
||||
* - patch 1: list changed files in tests/qtest/bios-tables-test-allowed-diff.h.
|
||||
* - patches 2 - n: real changes, may contain multiple patches.
|
||||
* - patch n + 1: update golden master binaries and empty
|
||||
* tests/bios-tables-test-allowed-diff.h
|
||||
* tests/qtest/bios-tables-test-allowed-diff.h
|
||||
*/
|
||||
|
||||
#include "qemu/osdep.h"
|
||||
|
|
|
@ -110,7 +110,7 @@ static void test_pc_boot_order(void)
|
|||
|
||||
static uint64_t read_boot_order_pmac(QTestState *qts)
|
||||
{
|
||||
QFWCFG *fw_cfg = mm_fw_cfg_init(qts, 0xf0000510);
|
||||
g_autoptr(QFWCFG) fw_cfg = mm_fw_cfg_init(qts, 0xf0000510);
|
||||
|
||||
return qfw_cfg_get_u16(fw_cfg, FW_CFG_BOOT_DEVICE);
|
||||
}
|
||||
|
@ -135,7 +135,7 @@ static void test_pmac_newworld_boot_order(void)
|
|||
|
||||
static uint64_t read_boot_order_sun4m(QTestState *qts)
|
||||
{
|
||||
QFWCFG *fw_cfg = mm_fw_cfg_init(qts, 0xd00000510ULL);
|
||||
g_autoptr(QFWCFG) fw_cfg = mm_fw_cfg_init(qts, 0xd00000510ULL);
|
||||
|
||||
return qfw_cfg_get_u16(fw_cfg, FW_CFG_BOOT_DEVICE);
|
||||
}
|
||||
|
@ -147,7 +147,7 @@ static void test_sun4m_boot_order(void)
|
|||
|
||||
static uint64_t read_boot_order_sun4u(QTestState *qts)
|
||||
{
|
||||
QFWCFG *fw_cfg = io_fw_cfg_init(qts, 0x510);
|
||||
g_autoptr(QFWCFG) fw_cfg = io_fw_cfg_init(qts, 0x510);
|
||||
|
||||
return qfw_cfg_get_u16(fw_cfg, FW_CFG_BOOT_DEVICE);
|
||||
}
|
||||
|
|
|
@ -49,4 +49,6 @@ static inline void pc_fw_cfg_uninit(QFWCFG *fw_cfg)
|
|||
io_fw_cfg_uninit(fw_cfg);
|
||||
}
|
||||
|
||||
G_DEFINE_AUTOPTR_CLEANUP_FUNC(QFWCFG, mm_fw_cfg_uninit)
|
||||
|
||||
#endif
|
||||
|
|
|
@ -114,8 +114,8 @@ static void test_logfile_write(gconstpointer data)
|
|||
QemuLogFile *logfile2;
|
||||
gchar const *dir = data;
|
||||
Error *err = NULL;
|
||||
g_autofree gchar *file_path;
|
||||
g_autofree gchar *file_path1;
|
||||
g_autofree gchar *file_path = NULL;
|
||||
g_autofree gchar *file_path1 = NULL;
|
||||
FILE *orig_fd;
|
||||
|
||||
/*
|
||||
|
@ -157,7 +157,7 @@ static void test_logfile_lock(gconstpointer data)
|
|||
FILE *logfile;
|
||||
gchar const *dir = data;
|
||||
Error *err = NULL;
|
||||
g_autofree gchar *file_path;
|
||||
g_autofree gchar *file_path = NULL;
|
||||
|
||||
file_path = g_build_filename(dir, "qemu_test_logfile_lock0.log", NULL);
|
||||
|
||||
|
|
Loading…
Reference in New Issue