Commit 06a1564f authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream-qgraph' into staging 



qgraph project from GSoC 2018

# gpg: Signature made Thu 07 Mar 2019 16:29:17 GMT
# gpg:                using RSA key BFFBD25F78C7AE83
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full]
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>" [full]
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4  E2F7 7E15 100C CD36 69B1
#      Subkey fingerprint: F133 3857 4B66 2389 866C  7682 BFFB D25F 78C7 AE83

* remotes/bonzini/tags/for-upstream-qgraph: (57 commits)
  qos-test: megasas test node
  qos-test: e1000 test node
  qos-test: eepro100 test node
  qos-test: es1370 test node
  qos-test: vmxnet3 test node
  qos-test: usb-hcd-ohci test node
  qos-test: spapr-phb test node
  qos-test: pcnet test node
  qos-test: nvme test node
  qos-test: ne2k_pci test node
  qos-test: ipoctal232 test node
  qos-test: tpci200 test node
  qos-test: ac97 test node
  tests: move virtio entirely to qos-test
  tests/libqos: remove pre-qgraph QVirtioPCIDevice API
  qos-test: virtio-scsi test node
  tests/libqos: virtio-scsi driver and interface nodes
  qos-test: vhost-user test node
  vhost-user-test: always use 256 MiB of guest memory
  tests/libqos: support multiqueue for virtio-net
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 6bbbe16a 469bb49b

chardev/char-socket.c

+1 −1
Original line number Diff line number Diff line
@@ -632,7 +632,7 @@ static void tcp_chr_update_read_handler(Chardev *chr) 
{

    SocketChardev *s = SOCKET_CHARDEV(chr);



    if (s->listener) {

    if (s->listener && s->state == TCP_CHARDEV_STATE_DISCONNECTED) {

        /*

         * It's possible that chardev context is changed in

         * qemu_chr_be_update_read_handlers().  Reset it for QIO net

configure

+1 −1
Original line number Diff line number Diff line
@@ -7733,7 +7733,7 @@ fi 
# tests might fail. Prefer to keep the relevant files in their own

# directory and symlink the directory instead.

DIRS="tests tests/tcg tests/tcg/cris tests/tcg/lm32 tests/libqos tests/qapi-schema tests/tcg/xtensa tests/qemu-iotests tests/vm"

DIRS="$DIRS tests/fp"

DIRS="$DIRS tests/fp tests/qgraph"

DIRS="$DIRS docs docs/interop fsdev scsi"

DIRS="$DIRS pc-bios/optionrom pc-bios/spapr-rtas pc-bios/s390-ccw"

DIRS="$DIRS roms/seabios roms/vgabios"

include/qemu/module.h

+2 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ typedef enum { 
    MODULE_INIT_QOM,

    MODULE_INIT_TRACE,

    MODULE_INIT_XEN_BACKEND,

    MODULE_INIT_LIBQOS,

    MODULE_INIT_MAX

} module_init_type;
@@ -54,6 +55,7 @@ typedef enum { 
#define trace_init(function) module_init(function, MODULE_INIT_TRACE)

#define xen_backend_init(function) module_init(function, \

                                               MODULE_INIT_XEN_BACKEND)

#define libqos_init(function) module_init(function, MODULE_INIT_LIBQOS)



#define block_module_load_one(lib) module_load_one("block-", lib)

#define ui_module_load_one(lib) module_load_one("ui-", lib)

tests/Makefile.include

+63 −66
Original line number Diff line number Diff line
@@ -151,37 +151,10 @@ check-qtest-generic-y += tests/qmp-cmd-test$(EXESUF) 
check-qtest-generic-y += tests/device-introspect-test$(EXESUF)

check-qtest-generic-y += tests/cdrom-test$(EXESUF)



check-qtest-ipack-y += tests/ipoctal232-test$(EXESUF)



check-qtest-virtioserial-$(CONFIG_VIRTIO_SERIAL) += tests/virtio-console-test$(EXESUF)



check-qtest-virtio-$(CONFIG_VIRTIO_NET) += tests/virtio-net-test$(EXESUF)

check-qtest-virtio-$(CONFIG_VIRTIO_BALLOON) += tests/virtio-balloon-test$(EXESUF)

check-qtest-virtio-$(CONFIG_VIRTIO_BLK) += tests/virtio-blk-test$(EXESUF)

check-qtest-virtio-$(CONFIG_VIRTIO_RNG) += tests/virtio-rng-test$(EXESUF)

check-qtest-virtio-$(CONFIG_VIRTIO_SCSI) += tests/virtio-scsi-test$(EXESUF)

ifeq ($(CONFIG_VIRTIO)$(CONFIG_VIRTFS)$(CONFIG_PCI),yyy)

check-qtest-virtio-$(CONFIG_VIRTIO_9P) += tests/virtio-9p-test$(EXESUF)

endif

check-qtest-virtio-$(CONFIG_VIRTIO_SERIAL) += tests/virtio-serial-test$(EXESUF)

check-qtest-virtio-y += $(check-qtest-virtioserial-y)



check-qtest-pci-y += tests/e1000-test$(EXESUF)

check-qtest-pci-y += tests/e1000e-test$(EXESUF)

check-qtest-pci-$(CONFIG_RTL8139_PCI) += tests/rtl8139-test$(EXESUF)

check-qtest-pci-$(CONFIG_PCNET_PCI) += tests/pcnet-test$(EXESUF)

check-qtest-pci-$(CONFIG_EEPRO100_PCI) += tests/eepro100-test$(EXESUF)

check-qtest-pci-$(CONFIG_NE2000_PCI) += tests/ne2000-test$(EXESUF)

check-qtest-pci-$(CONFIG_NVME_PCI) += tests/nvme-test$(EXESUF)

check-qtest-pci-$(CONFIG_AC97) += tests/ac97-test$(EXESUF)

check-qtest-pci-$(CONFIG_ES1370) += tests/es1370-test$(EXESUF)

check-qtest-pci-$(CONFIG_VIRTIO) += $(check-qtest-virtio-y)

check-qtest-pci-$(CONFIG_IPACK) += tests/tpci200-test$(EXESUF)

check-qtest-pci-$(CONFIG_IPACK) += $(check-qtest-ipack-y)

check-qtest-pci-$(CONFIG_VGA) += tests/display-vga-test$(EXESUF)

check-qtest-pci-$(CONFIG_HDA) += tests/intel-hda-test$(EXESUF)

check-qtest-pci-$(CONFIG_IVSHMEM_DEVICE) += tests/ivshmem-test$(EXESUF)

check-qtest-pci-$(CONFIG_MEGASAS_SCSI_PCI) += tests/megasas-test$(EXESUF)



check-qtest-i386-$(CONFIG_ISA_TESTDEV) = tests/endianness-test$(EXESUF)

check-qtest-i386-y += tests/fdc-test$(EXESUF)
@@ -203,11 +176,9 @@ check-qtest-i386-y += tests/drive_del-test$(EXESUF) 
check-qtest-i386-$(CONFIG_WDT_IB700) += tests/wdt_ib700-test$(EXESUF)

check-qtest-i386-y += tests/tco-test$(EXESUF)

check-qtest-i386-y += $(check-qtest-pci-y)

check-qtest-i386-$(CONFIG_VMXNET3_PCI) += tests/vmxnet3-test$(EXESUF)

check-qtest-i386-$(CONFIG_PVPANIC) += tests/pvpanic-test$(EXESUF)

check-qtest-i386-$(CONFIG_I82801B11) += tests/i82801b11-test$(EXESUF)

check-qtest-i386-$(CONFIG_IOH3420) += tests/ioh3420-test$(EXESUF)

check-qtest-i386-$(CONFIG_USB_OHCI) += tests/usb-hcd-ohci-test$(EXESUF)

check-qtest-i386-$(CONFIG_USB_UHCI) += tests/usb-hcd-uhci-test$(EXESUF)

ifeq ($(CONFIG_USB_ECHI)$(CONFIG_USB_UHCI),yy)

check-qtest-i386-y += tests/usb-hcd-ehci-test$(EXESUF)
@@ -216,7 +187,6 @@ check-qtest-i386-$(CONFIG_USB_XHCI_NEC) += tests/usb-hcd-xhci-test$(EXESUF) 
check-qtest-i386-y += tests/cpu-plug-test$(EXESUF)

check-qtest-i386-y += tests/q35-test$(EXESUF)

check-qtest-i386-y += tests/vmgenid-test$(EXESUF)

check-qtest-i386-$(CONFIG_VHOST_NET_USER) += tests/vhost-user-test$(EXESUF)

check-qtest-i386-$(CONFIG_TPM_CRB) += tests/tpm-crb-swtpm-test$(EXESUF)

check-qtest-i386-$(CONFIG_TPM_CRB) += tests/tpm-crb-test$(EXESUF)

check-qtest-i386-$(CONFIG_TPM_TIS) += tests/tpm-tis-swtpm-test$(EXESUF)
@@ -229,7 +199,6 @@ check-qtest-i386-y += tests/test-announce-self$(EXESUF) 
check-qtest-i386-y += tests/test-x86-cpuid-compat$(EXESUF)

check-qtest-i386-y += tests/numa-test$(EXESUF)

check-qtest-x86_64-y += $(check-qtest-i386-y)

check-qtest-x86_64-$(CONFIG_SDHCI) += tests/sdhci-test$(EXESUF)



check-qtest-alpha-y += tests/boot-serial-test$(EXESUF)

check-qtest-alpha-$(CONFIG_VGA) += tests/display-vga-test$(EXESUF)
@@ -260,17 +229,14 @@ check-qtest-ppc-y += tests/boot-serial-test$(EXESUF) 
check-qtest-ppc-$(CONFIG_M48T59) += tests/m48t59-test$(EXESUF)



check-qtest-ppc64-y += $(check-qtest-ppc-y)

check-qtest-ppc64-$(CONFIG_PSERIES) += tests/spapr-phb-test$(EXESUF)

check-qtest-ppc64-$(CONFIG_PSERIES) += tests/device-plug-test$(EXESUF)

check-qtest-ppc64-$(CONFIG_POWERNV) += tests/pnv-xscom-test$(EXESUF)

check-qtest-ppc64-y += tests/migration-test$(EXESUF)

check-qtest-ppc64-y += tests/test-announce-self$(EXESUF)

check-qtest-ppc64-$(CONFIG_PSERIES) += tests/rtas-test$(EXESUF)

check-qtest-ppc64-$(CONFIG_SLIRP) += tests/pxe-test$(EXESUF)

check-qtest-ppc64-$(CONFIG_USB_OHCI) += tests/usb-hcd-ohci-test$(EXESUF)

check-qtest-ppc64-$(CONFIG_USB_UHCI) += tests/usb-hcd-uhci-test$(EXESUF)

check-qtest-ppc64-$(CONFIG_USB_XHCI_NEC) += tests/usb-hcd-xhci-test$(EXESUF)

check-qtest-ppc64-$(CONFIG_VIRTIO) += $(check-qtest-virtio-y)

check-qtest-ppc64-$(CONFIG_SLIRP) += tests/test-netfilter$(EXESUF)

check-qtest-ppc64-$(CONFIG_POSIX) += tests/test-filter-mirror$(EXESUF)

check-qtest-ppc64-$(CONFIG_RTL8139_PCI) += tests/test-filter-redirector$(EXESUF)
@@ -296,14 +262,11 @@ check-qtest-arm-y += tests/pca9552-test$(EXESUF) 
check-qtest-arm-y += tests/ds1338-test$(EXESUF)

check-qtest-arm-y += tests/microbit-test$(EXESUF)

check-qtest-arm-y += tests/m25p80-test$(EXESUF)

check-qtest-arm-$(CONFIG_VIRTIO_BLK) += tests/virtio-blk-test$(EXESUF)

check-qtest-arm-y += tests/test-arm-mptimer$(EXESUF)

check-qtest-arm-y += tests/boot-serial-test$(EXESUF)

check-qtest-arm-$(CONFIG_SDHCI) += tests/sdhci-test$(EXESUF)

check-qtest-arm-y += tests/hexloader-test$(EXESUF)



check-qtest-aarch64-y = tests/numa-test$(EXESUF)

check-qtest-aarch64-$(CONFIG_SDHCI) += tests/sdhci-test$(EXESUF)

check-qtest-aarch64-y += tests/boot-serial-test$(EXESUF)

check-qtest-aarch64-y += tests/migration-test$(EXESUF)
@@ -732,7 +695,10 @@ tests/test-crypto-ivgen$(EXESUF): tests/test-crypto-ivgen.o $(test-crypto-obj-y) 
tests/test-crypto-afsplit$(EXESUF): tests/test-crypto-afsplit.o $(test-crypto-obj-y)

tests/test-crypto-block$(EXESUF): tests/test-crypto-block.o $(test-crypto-obj-y)



libqos-obj-y = tests/libqos/pci.o tests/libqos/fw_cfg.o tests/libqos/malloc.o

libqgraph-obj-y = tests/libqos/qgraph.o



libqos-obj-y = $(libqgraph-obj-y) tests/libqos/pci.o tests/libqos/fw_cfg.o

libqos-obj-y += tests/libqos/malloc.o

libqos-obj-y += tests/libqos/i2c.o tests/libqos/libqos.o

libqos-spapr-obj-y = $(libqos-obj-y) tests/libqos/malloc-spapr.o

libqos-spapr-obj-y += tests/libqos/libqos-spapr.o
@@ -744,7 +710,64 @@ libqos-pc-obj-y += tests/libqos/ahci.o 
libqos-omap-obj-y = $(libqos-obj-y) tests/libqos/i2c-omap.o

libqos-imx-obj-y = $(libqos-obj-y) tests/libqos/i2c-imx.o

libqos-usb-obj-y = $(libqos-spapr-obj-y) $(libqos-pc-obj-y) tests/libqos/usb.o

libqos-virtio-obj-y = $(libqos-spapr-obj-y) $(libqos-pc-obj-y) tests/libqos/virtio.o tests/libqos/virtio-pci.o tests/libqos/virtio-mmio.o tests/libqos/malloc-generic.o



# Devices

qos-test-obj-y = tests/qos-test.o $(libqgraph-obj-y)

qos-test-obj-y += $(libqos-pc-obj-y) $(libqos-spapr-obj-y)

qos-test-obj-y += tests/libqos/e1000e.o

qos-test-obj-y += tests/libqos/sdhci.o

qos-test-obj-y += tests/libqos/tpci200.o

qos-test-obj-y += tests/libqos/virtio.o

qos-test-obj-$(CONFIG_VIRTFS) += tests/libqos/virtio-9p.o

qos-test-obj-y += tests/libqos/virtio-balloon.o

qos-test-obj-y += tests/libqos/virtio-blk.o

qos-test-obj-y += tests/libqos/virtio-mmio.o

qos-test-obj-y += tests/libqos/virtio-net.o

qos-test-obj-y += tests/libqos/virtio-pci.o

qos-test-obj-y += tests/libqos/virtio-rng.o

qos-test-obj-y += tests/libqos/virtio-scsi.o

qos-test-obj-y += tests/libqos/virtio-serial.o



# Machines

qos-test-obj-y += tests/libqos/aarch64-xlnx-zcu102-machine.o

qos-test-obj-y += tests/libqos/arm-raspi2-machine.o

qos-test-obj-y += tests/libqos/arm-sabrelite-machine.o

qos-test-obj-y += tests/libqos/arm-smdkc210-machine.o

qos-test-obj-y += tests/libqos/arm-virt-machine.o

qos-test-obj-y += tests/libqos/arm-xilinx-zynq-a9-machine.o

qos-test-obj-y += tests/libqos/ppc64_pseries-machine.o

qos-test-obj-y += tests/libqos/x86_64_pc-machine.o



# Tests

qos-test-obj-y += tests/ac97-test.o

qos-test-obj-y += tests/e1000-test.o

qos-test-obj-y += tests/e1000e-test.o

qos-test-obj-y += tests/eepro100-test.o

qos-test-obj-y += tests/es1370-test.o

qos-test-obj-y += tests/ipoctal232-test.o

qos-test-obj-y += tests/megasas-test.o

qos-test-obj-y += tests/ne2000-test.o

qos-test-obj-y += tests/nvme-test.o

qos-test-obj-y += tests/pci-test.o

qos-test-obj-y += tests/pcnet-test.o

qos-test-obj-y += tests/sdhci-test.o

qos-test-obj-y += tests/spapr-phb-test.o

qos-test-obj-y += tests/usb-hcd-ohci-test.o $(libqos-usb-obj-y)

qos-test-obj-$(CONFIG_VHOST_NET_USER) += tests/vhost-user-test.o $(chardev-obj-y) $(test-io-obj-y)

qos-test-obj-y += tests/virtio-test.o

qos-test-obj-$(CONFIG_VIRTFS) += tests/virtio-9p-test.o

qos-test-obj-y += tests/virtio-blk-test.o

qos-test-obj-y += tests/virtio-net-test.o

qos-test-obj-y += tests/virtio-rng-test.o

qos-test-obj-y += tests/virtio-scsi-test.o

qos-test-obj-y += tests/virtio-serial-test.o

qos-test-obj-y += tests/vmxnet3-test.o



check-unit-y += tests/test-qgraph$(EXESUF)

tests/test-qgraph$(EXESUF): tests/test-qgraph.o $(libqgraph-obj-y)



check-qtest-generic-y += tests/qos-test$(EXESUF)

tests/qos-test$(EXESUF): $(qos-test-obj-y)



tests/qmp-test$(EXESUF): tests/qmp-test.o

tests/qmp-cmd-test$(EXESUF): tests/qmp-cmd-test.o
@@ -753,7 +776,6 @@ tests/rtc-test$(EXESUF): tests/rtc-test.o 
tests/m48t59-test$(EXESUF): tests/m48t59-test.o

tests/hexloader-test$(EXESUF): tests/hexloader-test.o

tests/endianness-test$(EXESUF): tests/endianness-test.o

tests/spapr-phb-test$(EXESUF): tests/spapr-phb-test.o $(libqos-obj-y)

tests/prom-env-test$(EXESUF): tests/prom-env-test.o $(libqos-obj-y)

tests/rtas-test$(EXESUF): tests/rtas-test.o $(libqos-spapr-obj-y)

tests/fdc-test$(EXESUF): tests/fdc-test.o
@@ -775,50 +797,27 @@ tests/m25p80-test$(EXESUF): tests/m25p80-test.o 
tests/i440fx-test$(EXESUF): tests/i440fx-test.o $(libqos-pc-obj-y)

tests/q35-test$(EXESUF): tests/q35-test.o $(libqos-pc-obj-y)

tests/fw_cfg-test$(EXESUF): tests/fw_cfg-test.o $(libqos-pc-obj-y)

tests/e1000-test$(EXESUF): tests/e1000-test.o

tests/e1000e-test$(EXESUF): tests/e1000e-test.o $(libqos-pc-obj-y)

tests/rtl8139-test$(EXESUF): tests/rtl8139-test.o $(libqos-pc-obj-y)

tests/pcnet-test$(EXESUF): tests/pcnet-test.o

tests/pnv-xscom-test$(EXESUF): tests/pnv-xscom-test.o

tests/eepro100-test$(EXESUF): tests/eepro100-test.o

tests/vmxnet3-test$(EXESUF): tests/vmxnet3-test.o

tests/ne2000-test$(EXESUF): tests/ne2000-test.o

tests/wdt_ib700-test$(EXESUF): tests/wdt_ib700-test.o

tests/tco-test$(EXESUF): tests/tco-test.o $(libqos-pc-obj-y)

tests/virtio-balloon-test$(EXESUF): tests/virtio-balloon-test.o $(libqos-virtio-obj-y)

tests/virtio-blk-test$(EXESUF): tests/virtio-blk-test.o $(libqos-virtio-obj-y)

tests/virtio-ccw-test$(EXESUF): tests/virtio-ccw-test.o

tests/virtio-net-test$(EXESUF): tests/virtio-net-test.o $(libqos-pc-obj-y) $(libqos-virtio-obj-y)

tests/virtio-rng-test$(EXESUF): tests/virtio-rng-test.o $(libqos-pc-obj-y)

tests/virtio-scsi-test$(EXESUF): tests/virtio-scsi-test.o $(libqos-virtio-obj-y)

tests/virtio-9p-test$(EXESUF): tests/virtio-9p-test.o $(libqos-virtio-obj-y)

tests/virtio-serial-test$(EXESUF): tests/virtio-serial-test.o $(libqos-virtio-obj-y)

tests/virtio-console-test$(EXESUF): tests/virtio-console-test.o $(libqos-virtio-obj-y)

tests/tpci200-test$(EXESUF): tests/tpci200-test.o

tests/display-vga-test$(EXESUF): tests/display-vga-test.o

tests/ipoctal232-test$(EXESUF): tests/ipoctal232-test.o

tests/qom-test$(EXESUF): tests/qom-test.o

tests/test-hmp$(EXESUF): tests/test-hmp.o

tests/machine-none-test$(EXESUF): tests/machine-none-test.o

tests/device-plug-test$(EXESUF): tests/device-plug-test.o

tests/drive_del-test$(EXESUF): tests/drive_del-test.o $(libqos-virtio-obj-y)

tests/nvme-test$(EXESUF): tests/nvme-test.o $(libqos-pc-obj-y)

tests/drive_del-test$(EXESUF): tests/drive_del-test.o

tests/pvpanic-test$(EXESUF): tests/pvpanic-test.o

tests/i82801b11-test$(EXESUF): tests/i82801b11-test.o

tests/ac97-test$(EXESUF): tests/ac97-test.o

tests/es1370-test$(EXESUF): tests/es1370-test.o

tests/intel-hda-test$(EXESUF): tests/intel-hda-test.o

tests/ioh3420-test$(EXESUF): tests/ioh3420-test.o

tests/usb-hcd-ohci-test$(EXESUF): tests/usb-hcd-ohci-test.o $(libqos-usb-obj-y)

tests/usb-hcd-uhci-test$(EXESUF): tests/usb-hcd-uhci-test.o $(libqos-usb-obj-y)

tests/usb-hcd-ehci-test$(EXESUF): tests/usb-hcd-ehci-test.o $(libqos-usb-obj-y)

tests/usb-hcd-xhci-test$(EXESUF): tests/usb-hcd-xhci-test.o $(libqos-usb-obj-y)

tests/cpu-plug-test$(EXESUF): tests/cpu-plug-test.o

tests/migration-test$(EXESUF): tests/migration-test.o

tests/test-announce-self$(EXESUF): tests/test-announce-self.o

tests/vhost-user-test$(EXESUF): tests/vhost-user-test.o $(test-util-obj-y) \

	$(qtest-obj-y) $(test-io-obj-y) $(libqos-virtio-obj-y) $(libqos-pc-obj-y) \

	$(chardev-obj-y)

tests/qemu-iotests/socket_scm_helper$(EXESUF): tests/qemu-iotests/socket_scm_helper.o

tests/test-qemu-opts$(EXESUF): tests/test-qemu-opts.o $(test-util-obj-y)

tests/test-keyval$(EXESUF): tests/test-keyval.o $(test-util-obj-y) $(test-qapi-obj-y)
@@ -828,14 +827,12 @@ tests/test-filter-mirror$(EXESUF): tests/test-filter-mirror.o $(qtest-obj-y) 
tests/test-filter-redirector$(EXESUF): tests/test-filter-redirector.o $(qtest-obj-y)

tests/test-x86-cpuid-compat$(EXESUF): tests/test-x86-cpuid-compat.o $(qtest-obj-y)

tests/ivshmem-test$(EXESUF): tests/ivshmem-test.o contrib/ivshmem-server/ivshmem-server.o $(libqos-pc-obj-y) $(libqos-spapr-obj-y)

tests/megasas-test$(EXESUF): tests/megasas-test.o $(libqos-spapr-obj-y) $(libqos-pc-obj-y)

tests/vhost-user-bridge$(EXESUF): tests/vhost-user-bridge.o $(test-util-obj-y) libvhost-user.a

tests/test-uuid$(EXESUF): tests/test-uuid.o $(test-util-obj-y)

tests/test-arm-mptimer$(EXESUF): tests/test-arm-mptimer.o

tests/test-qapi-util$(EXESUF): tests/test-qapi-util.o $(test-util-obj-y)

tests/numa-test$(EXESUF): tests/numa-test.o

tests/vmgenid-test$(EXESUF): tests/vmgenid-test.o tests/boot-sector.o tests/acpi-utils.o

tests/sdhci-test$(EXESUF): tests/sdhci-test.o $(libqos-pc-obj-y)

tests/cdrom-test$(EXESUF): tests/cdrom-test.o tests/boot-sector.o $(libqos-obj-y)



tests/migration/stress$(EXESUF): tests/migration/stress.o

tests/ac97-test.c

+36 −11
Original line number Diff line number Diff line
@@ -9,23 +9,48 @@ 


#include "qemu/osdep.h"

#include "libqtest.h"

#include "libqos/qgraph.h"

#include "libqos/pci.h"



/* Tests only initialization so far. TODO: Replace with functional tests */

static void nop(void)

typedef struct QAC97 QAC97;



struct QAC97 {

    QOSGraphObject obj;

    QPCIDevice dev;

};



static void *ac97_get_driver(void *obj, const char *interface)

{

    QAC97 *ac97 = obj;



    if (!g_strcmp0(interface, "pci-device")) {

        return &ac97->dev;

    }



int main(int argc, char **argv)

{

    int ret;

    fprintf(stderr, "%s not present in e1000e\n", interface);

    g_assert_not_reached();

}



    g_test_init(&argc, &argv, NULL);

    qtest_add_func("/ac97/nop", nop);

static void *ac97_create(void *pci_bus, QGuestAllocator *alloc, void *addr)

{

    QAC97 *ac97 = g_new0(QAC97, 1);

    QPCIBus *bus = pci_bus;



    qtest_start("-device AC97");

    ret = g_test_run();

    qpci_device_init(&ac97->dev, bus, addr);

    ac97->obj.get_driver = ac97_get_driver;

    return &ac97->obj;

}



    qtest_end();

static void ac97_register_nodes(void)

{

    QOSGraphEdgeOptions opts = {

        .extra_device_opts = "addr=04.0",

    };

    add_qpci_address(&opts, &(QPCIAddress) { .devfn = QPCI_DEVFN(4, 0) });



    return ret;

    qos_node_create_driver("AC97", ac97_create);

    qos_node_produces("AC97", "pci-device");

    qos_node_consumes("AC97", "pci-bus", &opts);

}



libqos_init(ac97_register_nodes);