Fast mem and devices snapshots (#16)
* Run docker probe only if docker or podman are available
The docker probe uses "sudo -n" which can cause an e-mail with a security warning
each time when configure is run. Therefore run docker probe only if either docker
or podman are available.
That avoids the problematic "sudo -n" on build environments which have neither
docker nor podman installed.
Fixes: c4575b59155e2e00 ("configure: store container engine in config-host.mak")
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Message-Id: <20221030083510.310584-1-sw@weilnetz.de>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20221117172532.538149-2-alex.bennee@linaro.org>
* tests/avocado/machine_aspeed.py: Reduce noise on the console for SDK tests
The Aspeed SDK images are based on OpenBMC which starts a lot of
services. The output noise on the console can break from time to time
the test waiting for the logging prompt.
Change the U-Boot bootargs variable to add "quiet" to the kernel
command line and reduce the output volume. This also drops the test on
the CPU id which was nice to have but not essential.
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Message-Id: <20221104075347.370503-1-clg@kaod.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20221117172532.538149-3-alex.bennee@linaro.org>
* tests/docker: allow user to override check target
This is useful when trying to bisect a particular failing test behind
a docker run. For example:
make docker-test-clang@fedora \
TARGET_LIST=arm-softmmu \
TEST_COMMAND="meson test qtest-arm/qos-test" \
J=9 V=1
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20221117172532.538149-4-alex.bennee@linaro.org>
* docs/devel: add a maintainers section to development process
We don't currently have a clear place in the documentation to describe
the roles and responsibilities of a maintainer. Lets create one so we
can. I've moved a few small bits out of other files to try and keep
everything in one place.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20221117172532.538149-5-alex.bennee@linaro.org>
* docs/devel: make language a little less code centric
We welcome all sorts of patches.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20221117172532.538149-6-alex.bennee@linaro.org>
* docs/devel: simplify the minimal checklist
The bullet points are quite long and contain process tips. Move those
bits of the bullet to the relevant sections and link to them. Use a
table for nicer formatting of the checklist.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20221117172532.538149-7-alex.bennee@linaro.org>
* docs/devel: try and improve the language around patch review
It is important that contributors take the review process seriously
and we collaborate in a respectful way while avoiding personal
attacks. Try and make this clear in the language.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20221117172532.538149-8-alex.bennee@linaro.org>
* tests/avocado: Raise timeout for boot_linux.py:BootLinuxPPC64.test_pseries_tcg
On my machine, a debug build of QEMU takes about 260 seconds to
complete this test, so with the current timeout value of 180 seconds
it always times out. Double the timeout value to 360 so the test
definitely has enough time to complete.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20221110142901.3832318-1-peter.maydell@linaro.org>
Message-Id: <20221117172532.538149-9-alex.bennee@linaro.org>
* tests/avocado: introduce alpine virt test for CI
The boot_linux tests download and run a full cloud image boot and
start a full distro. While the ability to test the full boot chain is
worthwhile it is perhaps a little too heavy weight and causes issues
in CI. Fix this by introducing a new alpine linux ISO boot in
machine_aarch64_virt.
This boots a fully loaded -cpu max with all the bells and whistles in
31s on my machine. A full debug build takes around 180s on my machine
so we set a more generous timeout to cover that.
We don't add a test for lesser GIC versions although there is some
coverage for that already in the boot_xen.py tests. If we want to
introduce more comprehensive testing we can do it with a custom kernel
and initrd rather than a full distro boot.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20221117172532.538149-10-alex.bennee@linaro.org>
* tests/avocado: skip aarch64 cloud TCG tests in CI
We now have a much lighter weight test in machine_aarch64_virt which
tests the full boot chain in less time. Rename the tests while we are
at it to make it clear it is a Fedora cloud image.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20221117172532.538149-11-alex.bennee@linaro.org>
* gitlab: integrate coverage report
This should hopefully give is nice coverage information about what our
tests (or at least the subset we are running) have hit. Ideally we
would want a way to trigger coverage on tests likely to be affected by
the current commit.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20221117172532.538149-12-alex.bennee@linaro.org>
* vhost: mask VIRTIO_F_RING_RESET for vhost and vhost-user devices
Commit 69e1c14aa2 ("virtio: core: vq reset feature negotation support")
enabled VIRTIO_F_RING_RESET by default for all virtio devices.
This feature is not currently emulated by QEMU, so for vhost and
vhost-user devices we need to make sure it is supported by the offloaded
device emulation (in-kernel or in another process).
To do this we need to add VIRTIO_F_RING_RESET to the features bitmap
passed to vhost_get_features(). This way it will be masked if the device
does not support it.
This issue was initially discovered with vhost-vsock and vhost-user-vsock,
and then also tested with vhost-user-rng which confirmed the same issue.
They fail when sending features through VHOST_SET_FEATURES ioctl or
VHOST_USER_SET_FEATURES message, since VIRTIO_F_RING_RESET is negotiated
by the guest (Linux >= v6.0), but not supported by the device.
Fixes: 69e1c14aa2 ("virtio: core: vq reset feature negotation support")
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1318
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
Message-Id: <20221121101101.29400-1-sgarzare@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Acked-by: Raphael Norwitz <raphael.norwitz@nutanix.com>
Acked-by: Jason Wang <jasowang@redhat.com>
* tests: acpi: whitelist DSDT before moving PRQx to _SB scope
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Message-Id: <20221121153613.3972225-2-imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
* acpi: x86: move RPQx field back to _SB scope
Commit 47a373faa6b2 (acpi: pc/q35: drop ad-hoc PCI-ISA bridge AML routines and let bus ennumeration generate AML)
moved ISA bridge AML generation to respective devices and was using
aml_alias() to provide PRQx fields in _SB. scope. However, it turned
out that SeaBIOS was not able to process Alias opcode when parsing DSDT,
resulting in lack of keyboard during boot (SeaBIOS console, grub, FreeDOS).
While fix for SeaBIOS is posted
https://mail.coreboot.org/hyperkitty/list/seabios@seabios.org/thread/RGPL7HESH5U5JRLEO6FP77CZVHZK5J65/
fixed SeaBIOS might not make into QEMU-7.2 in time.
Hence this workaround that puts PRQx back into _SB scope
and gets rid of aliases in ISA bridge description, so
DSDT will be parsable by broken SeaBIOS.
That brings back hardcoded references to ISA bridge
PCI0.S08.P40C/PCI0.SF8.PIRQ
where middle part now is auto generated based on slot it's
plugged in, but it should be fine as bridge initialization
also hardcodes PCI address of the bridge so it can't ever
move. Once QEMU tree has fixed SeaBIOS blob, we should be able
to drop this part and revert back to alias based approach
Reported-by: Volker Rümelin <vr_qemu@t-online.de>
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Message-Id: <20221121153613.3972225-3-imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
* tests: acpi: x86: update expected DSDT after moving PRQx fields in _SB scope
Expected DSDT changes,
pc:
- Field (P40C, ByteAcc, NoLock, Preserve)
+ Scope (\_SB)
{
- PRQ0, 8,
- PRQ1, 8,
- PRQ2, 8,
- PRQ3, 8
+ Field (PCI0.S08.P40C, ByteAcc, NoLock, Preserve)
+ {
+ PRQ0, 8,
+ PRQ1, 8,
+ PRQ2, 8,
+ PRQ3, 8
+ }
}
- Alias (PRQ0, \_SB.PRQ0)
- Alias (PRQ1, \_SB.PRQ1)
- Alias (PRQ2, \_SB.PRQ2)
- Alias (PRQ3, \_SB.PRQ3)
q35:
- Field (PIRQ, ByteAcc, NoLock, Preserve)
- {
- PRQA, 8,
- PRQB, 8,
- PRQC, 8,
- PRQD, 8,
- Offset (0x08),
- PRQE, 8,
- PRQF, 8,
- PRQG, 8,
- PRQH, 8
+ Scope (\_SB)
+ {
+ Field (PCI0.SF8.PIRQ, ByteAcc, NoLock, Preserve)
+ {
+ PRQA, 8,
+ PRQB, 8,
+ PRQC, 8,
+ PRQD, 8,
+ Offset (0x08),
+ PRQE, 8,
+ PRQF, 8,
+ PRQG, 8,
+ PRQH, 8
+ }
}
- Alias (PRQA, \_SB.PRQA)
- Alias (PRQB, \_SB.PRQB)
- Alias (PRQC, \_SB.PRQC)
- Alias (PRQD, \_SB.PRQD)
- Alias (PRQE, \_SB.PRQE)
- Alias (PRQF, \_SB.PRQF)
- Alias (PRQG, \_SB.PRQG)
- Alias (PRQH, \_SB.PRQH)
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Message-Id: <20221121153613.3972225-4-imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
* MAINTAINERS: add mst to list of biosbits maintainers
Adding Michael's name to the list of bios bits maintainers so that all changes
and fixes into biosbits framework can go through his tree and he is notified.
Suggested-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Ani Sinha <ani@anisinha.ca>
Message-Id: <20221111151138.36988-1-ani@anisinha.ca>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
* tests/avocado: configure acpi-bits to use avocado timeout
Instead of using a hardcoded timeout, just rely on Avocado's built-in
test case timeout. This helps avoid timeout issues on machines where 60
seconds is not sufficient.
Signed-off-by: John Snow <jsnow@redhat.com>
Message-Id: <20221115212759.3095751-1-jsnow@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Ani Sinha <ani@anisinha.ca>
* acpi/tests/avocado/bits: keep the work directory when BITS_DEBUG is set in env
Debugging bits issue often involves running the QEMU command line manually
outside of the avocado environment with the generated ISO. Hence, its
inconvenient if the iso gets cleaned up after the test has finished. This change
makes sure that the work directory is kept after the test finishes if the test
is run with BITS_DEBUG=1 in the environment so that the iso is available for use
with the QEMU command line.
CC: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Ani Sinha <ani@anisinha.ca>
Message-Id: <20221117113630.543495-1-ani@anisinha.ca>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
* virtio: disable error for out of spec queue-enable
Virtio 1.0 is pretty clear that features have to be
negotiated before enabling VQs. Unfortunately Seabios
ignored this ever since gaining 1.0 support (UEFI is ok).
Comment the error out for now, and add a TODO.
Fixes: 3c37f8b8d1 ("virtio: introduce virtio_queue_enable()")
Cc: "Kangjie Xu" <kangjie.xu@linux.alibaba.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Message-Id: <20221121200339.362452-1-mst@redhat.com>
* hw/loongarch: Add default stdout uart in fdt
Add "chosen" subnode into LoongArch fdt, and set it's
"stdout-path" prop to uart node.
Signed-off-by: Xiaojuan Yang <yangxiaojuan@loongson.cn>
Reviewed-by: Song Gao <gaosong@loongson.cn>
Message-Id: <20221115114923.3372414-1-yangxiaojuan@loongson.cn>
Signed-off-by: Song Gao <gaosong@loongson.cn>
* hw/loongarch: Fix setprop_sized method in fdt rtc node.
Fix setprop_sized method in fdt rtc node.
Signed-off-by: Xiaojuan Yang <yangxiaojuan@loongson.cn>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Song Gao <gaosong@loongson.cn>
Message-Id: <20221116040300.3459818-1-yangxiaojuan@loongson.cn>
Signed-off-by: Song Gao <gaosong@loongson.cn>
* hw/loongarch: Replace the value of uart info with macro
Using macro to replace the value of uart info such as addr, size
in acpi_build method.
Signed-off-by: Xiaojuan Yang <yangxiaojuan@loongson.cn>
Reviewed-by: Song Gao <gaosong@loongson.cn>
Message-Id: <20221115115008.3372489-1-yangxiaojuan@loongson.cn>
Signed-off-by: Song Gao <gaosong@loongson.cn>
* target/arm: Don't do two-stage lookup if stage 2 is disabled
In get_phys_addr_with_struct(), we call get_phys_addr_twostage() if
the CPU supports EL2. However, we don't check here that stage 2 is
actually enabled. Instead we only check that inside
get_phys_addr_twostage() to skip stage 2 translation. This means
that even if stage 2 is disabled we still tell the stage 1 lookup to
do its page table walks via stage 2.
This works by luck for normal CPU accesses, but it breaks for debug
accesses, which are used by the disassembler and also by semihosting
file reads and writes, because the debug case takes a different code
path inside S1_ptw_translate().
This means that setups that use semihosting for file loads are broken
(a regression since 7.1, introduced in recent ptw refactoring), and
that sometimes disassembly in debug logs reports "unable to read
memory" rather than showing the guest insns.
Fix the bug by hoisting the "is stage 2 enabled?" check up to
get_phys_addr_with_struct(), so that we handle S2 disabled the same
way we do the "no EL2" case, with a simple single stage lookup.
Reported-by: Jens Wiklander <jens.wiklander@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 20221121212404.1450382-1-peter.maydell@linaro.org
* target/arm: Use signed quantity to represent VMSAv8-64 translation level
The LPA2 extension implements 52-bit virtual addressing for 4k and 16k
translation granules, and for the former, this means an additional level
of translation is needed. This means we start counting at -1 instead of
0 when doing a walk, and so 'level' is now a signed quantity, and should
be typed as such. So turn it from uint32_t into int32_t.
This avoids a level of -1 getting misinterpreted as being >= 3, and
terminating a page table walk prematurely with a bogus output address.
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: Philippe Mathieu-Daudé <f4bug@amsat.org>
Cc: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
* Update VERSION for v7.2.0-rc2
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
* tests/avocado: Update the URLs of the advent calendar images
The qemu-advent-calendar.org server will be decommissioned soon.
I've mirrored the images that we use for the QEMU CI to gitlab,
so update their URLs to point to the new location.
Message-Id: <20221121102436.78635-1-thuth@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
* tests/qtest: Decrease the amount of output from the qom-test
The logs in the gitlab-CI have a size constraint, and sometimes
we already hit this limit. The biggest part of the log then seems
to be filled by the qom-test, so we should decrease the size of
the output - which can be done easily by not printing the path
for each property, since the path has already been logged at the
beginning of each node that we handle here.
However, if we omit the path, we should make sure to not recurse
into child nodes in between, so that it is clear to which node
each property belongs. Thus store the children and links in a
temporary list and recurse only at the end of each node, when
all properties have already been printed.
Message-Id: <20221121194240.149268-1-thuth@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
* tests/avocado: use new rootfs for orangepi test
The old URL wasn't stable. I suspect the current URL will only be
stable for a few months so maybe we need another strategy for hosting
rootfs snapshots?
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20221118113309.1057790-1-alex.bennee@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
* Revert "usbredir: avoid queuing hello packet on snapshot restore"
Run state is also in RUN_STATE_PRELAUNCH while "-S" is used.
This reverts commit 0631d4b448454ae8a1ab091c447e3f71ab6e088a
Signed-off-by: Joelle van Dyne <j@getutm.app>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
The original commit broke the usage of usbredir with libvirt, which
starts every domain with "-S".
This workaround is no longer needed because the usbredir behavior
has been fixed in the meantime:
https://gitlab.freedesktop.org/spice/usbredir/-/merge_requests/61
Signed-off-by: Ján Tomko <jtomko@redhat.com>
Message-Id: <1689cec3eadcea87255e390cb236033aca72e168.1669193161.git.jtomko@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
* gtk: disable GTK Clipboard with a new meson option
The GTK Clipboard implementation may cause guest hangs.
Therefore implement new configure switch: --enable-gtk-clipboard,
as a meson option disabled by default, which warns in the help
text about the experimental nature of the feature.
Regenerate the meson build options to include it.
The initialization of the clipboard is gtk.c, as well as the
compilation of gtk-clipboard.c are now conditional on this new
option to be set.
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1150
Signed-off-by: Claudio Fontana <cfontana@suse.de>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Jim Fehlig <jfehlig@suse.com>
Message-Id: <20221121135538.14625-1-cfontana@suse.de>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
* hw/usb/hcd-xhci.c: spelling: tranfer
Fixes: effaf5a240e03020f4ae953e10b764622c3e87cc
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Stefan Weil <sw@weilnetz.de>
Message-Id: <20221105114851.306206-1-mjt@msgid.tls.msk.ru>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
* ui/gtk: prevent ui lock up when dpy_gl_update called again before current draw event occurs
A warning, "qemu: warning: console: no gl-unblock within" followed by
guest scanout lockup can happen if dpy_gl_update is called in a row
and the second call is made before gd_draw_event scheduled by the first
call is taking place. This is because draw call returns without decrementing
gl_block ref count if the dmabuf was already submitted as shown below.
(gd_gl_area_draw/gd_egl_draw)
if (dmabuf) {
if (!dmabuf->draw_submitted) {
return;
} else {
dmabuf->draw_submitted = false;
}
}
So it should not schedule any redundant draw event in case draw_submitted is
already set in gd_egl_fluch/gd_gl_area_scanout_flush.
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Vivek Kasireddy <vivek.kasireddy@intel.com>
Signed-off-by: Dongwon Kim <dongwon.kim@intel.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20221021192315.9110-1-dongwon.kim@intel.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
* hw/usb/hcd-xhci: Reset the XHCIState with device_cold_reset()
Currently the hcd-xhci-pci and hcd-xhci-sysbus devices, which are
mostly wrappers around the TYPE_XHCI device, which is a direct
subclass of TYPE_DEVICE. Since TYPE_DEVICE devices are not on any
qbus and do not get automatically reset, the wrapper devices both
reset the TYPE_XHCI device in their own reset functions. However,
they do this using device_legacy_reset(), which will reset the device
itself but not any bus it has.
Switch to device_cold_reset(), which avoids using a deprecated
function and also propagates reset along any child buses.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20221014145423.2102706-1-peter.maydell@linaro.org>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
* hw/audio/intel-hda: don't reset codecs twice
Currently the intel-hda device has a reset method which manually
resets all the codecs by calling device_legacy_reset() on them. This
means they get reset twice, once because child devices on a qbus get
reset before the parent device's reset method is called, and then
again because we're manually resetting them.
Drop the manual reset call, and ensure that codecs are still reset
when the guest does a reset via ICH6_GCTL_RESET by using
device_cold_reset() (which resets all the devices on the qbus as well
as the device itself) instead of a direct call to the reset function.
This is a slight ordering change because the (only) codec reset now
happens before the controller registers etc are reset, rather than
once before and then once after, but the codec reset function
hda_audio_reset() doesn't care.
This lets us drop a use of device_legacy_reset(), which is
deprecated.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20221014142632.2092404-2-peter.maydell@linaro.org>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
* hw/audio/intel-hda: Drop unnecessary prototype
The only use of intel_hda_reset() is after its definition, so we
don't need to separately declare its prototype at the top of the
file; drop the unnecessary line.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20221014142632.2092404-3-peter.maydell@linaro.org>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
* add syx snapshot extras
* it compiles!
* virtiofsd: Add `sigreturn` to the seccomp whitelist
The virtiofsd currently crashes on s390x. This is because of a
`sigreturn` system call. See audit log below:
type=SECCOMP msg=audit(1669382477.611:459): auid=4294967295 uid=0 gid=0 ses=4294967295 subj=system_u:system_r:virtd_t:s0-s0:c0.c1023 pid=6649 comm="virtiofsd" exe="/usr/libexec/virtiofsd" sig=31 arch=80000016 syscall=119 compat=0 ip=0x3fff15f748a code=0x80000000AUID="unset" UID="root" GID="root" ARCH=s390x SYSCALL=sigreturn
Signed-off-by: Marc Hartmayer <mhartmay@linux.ibm.com>
Reviewed-by: German Maglione <gmaglione@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20221125143946.27717-1-mhartmay@linux.ibm.com>
* libvhost-user: Fix wrong type of argument to formatting function (reported by LGTM)
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Message-Id: <20220422070144.1043697-2-sw@weilnetz.de>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20221126152507.283271-2-sw@weilnetz.de>
* libvhost-user: Fix format strings
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20220422070144.1043697-3-sw@weilnetz.de>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20221126152507.283271-3-sw@weilnetz.de>
* libvhost-user: Fix two more format strings
This fix is required for 32 bit hosts. The bug was detected by CI
for arm-linux, but is also relevant for i386-linux.
Reported-by: Stefan Hajnoczi <stefanha@gmail.com>
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20221126152507.283271-4-sw@weilnetz.de>
* libvhost-user: Add format attribute to local function vu_panic
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20220422070144.1043697-4-sw@weilnetz.de>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20221126152507.283271-5-sw@weilnetz.de>
* MAINTAINERS: Add subprojects/libvhost-user to section "vhost"
Signed-off-by: Stefan Weil <sw@weilnetz.de>
[Michael agreed to act as maintainer for libvhost-user via email in
https://lore.kernel.org/qemu-devel/20221123015218-mutt-send-email-mst@kernel.org/.
--Stefan]
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20221126152507.283271-6-sw@weilnetz.de>
* Add G_GNUC_PRINTF to function qemu_set_info_str and fix related issues
With the G_GNUC_PRINTF function attribute the compiler detects
two potential insecure format strings:
../../../net/stream.c:248:31: warning: format string is not a string literal (potentially insecure) [-Wformat-security]
qemu_set_info_str(&s->nc, uri);
^~~
../../../net/stream.c:322:31: warning: format string is not a string literal (potentially insecure) [-Wformat-security]
qemu_set_info_str(&s->nc, uri);
^~~
There are also two other warnings:
../../../net/socket.c:182:35: warning: zero-length gnu_printf format string [-Wformat-zero-length]
182 | qemu_set_info_str(&s->nc, "");
| ^~
../../../net/stream.c:170:35: warning: zero-length gnu_printf format string [-Wformat-zero-length]
170 | qemu_set_info_str(&s->nc, "");
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20221126152507.283271-7-sw@weilnetz.de>
* del ramfile
* update seabios source from 1.16.0 to 1.16.1
git shortlog rel-1.16.0..rel-1.16.1
===================================
Gerd Hoffmann (3):
malloc: use variable for ZoneHigh size
malloc: use large ZoneHigh when there is enough memory
virtio-blk: use larger default request size
Igor Mammedov (1):
acpi: parse Alias object
Volker Rümelin (2):
pci: refactor the pci_config_*() functions
reset: force standard PCI configuration access
Xiaofei Lee (1):
virtio-blk: Fix incorrect type conversion in virtio_blk_op()
Xuan Zhuo (2):
virtio-mmio: read/write the hi 32 features for mmio
virtio: finalize features before using device
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
* update seabios binaries to 1.16.1
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
* fix for non i386 archs
* replay: Fix declaration of replay_read_next_clock
Fixes the build with gcc 13:
replay/replay-time.c:34:6: error: conflicting types for \
'replay_read_next_clock' due to enum/integer mismatch; \
have 'void(ReplayClockKind)' [-Werror=enum-int-mismatch]
34 | void replay_read_next_clock(ReplayClockKind kind)
| ^~~~~~~~~~~~~~~~~~~~~~
In file included from ../qemu/replay/replay-time.c:14:
replay/replay-internal.h:139:6: note: previous declaration of \
'replay_read_next_clock' with type 'void(unsigned int)'
139 | void replay_read_next_clock(unsigned int kind);
| ^~~~~~~~~~~~~~~~~~~~~~
Fixes: 8eda206e090 ("replay: recording and replaying clock ticks")
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Wilfred Mallawa <wilfred.mallawa@wdc.com>
Reviewed-by: Pavel Dovgalyuk <Pavel.Dovgalyuk@ispras.ru>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20221129010547.284051-1-richard.henderson@linaro.org>
* hw/display/qxl: Have qxl_log_command Return early if no log_cmd handler
Only 3 command types are logged: no need to call qxl_phys2virt()
for the other types. Using different cases will help to pass
different structure sizes to qxl_phys2virt() in a pair of commits.
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20221128202741.4945-2-philmd@linaro.org>
* hw/display/qxl: Document qxl_phys2virt()
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20221128202741.4945-3-philmd@linaro.org>
* hw/display/qxl: Pass requested buffer size to qxl_phys2virt()
Currently qxl_phys2virt() doesn't check for buffer overrun.
In order to do so in the next commit, pass the buffer size
as argument.
For QXLCursor in qxl_render_cursor() -> qxl_cursor() we
verify the size of the chunked data ahead, checking we can
access 'sizeof(QXLCursor) + chunk->data_size' bytes.
Since in the SPICE_CURSOR_TYPE_MONO case the cursor is
assumed to fit in one chunk, no change are required.
In SPICE_CURSOR_TYPE_ALPHA the ahead read is handled in
qxl_unpack_chunks().
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20221128202741.4945-4-philmd@linaro.org>
* hw/display/qxl: Avoid buffer overrun in qxl_phys2virt (CVE-2022-4144)
Have qxl_get_check_slot_offset() return false if the requested
buffer size does not fit within the slot memory region.
Similarly qxl_phys2virt() now returns NULL in such case, and
qxl_dirty_one_surface() aborts.
This avoids buffer overrun in the host pointer returned by
memory_region_get_ram_ptr().
Fixes: CVE-2022-4144 (out-of-bounds read)
Reported-by: Wenxu Yin (@awxylitol)
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1336
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20221128202741.4945-5-philmd@linaro.org>
* hw/display/qxl: Assert memory slot fits in preallocated MemoryRegion
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20221128202741.4945-6-philmd@linaro.org>
* block-backend: avoid bdrv_unregister_buf() NULL pointer deref
bdrv_*() APIs expect a valid BlockDriverState. Calling them with bs=NULL
leads to undefined behavior.
Jonathan Cameron reported this following NULL pointer dereference when a
VM with a virtio-blk device and a memory-backend-file object is
terminated:
1. qemu_cleanup() closes all drives, setting blk->root to NULL
2. qemu_cleanup() calls user_creatable_cleanup(), which results in a RAM
block notifier callback because the memory-backend-file is destroyed.
3. blk_unregister_buf() is called by virtio-blk's BlockRamRegistrar
notifier callback and undefined behavior occurs.
Fixes: baf422684d73 ("virtio-blk: use BDRV_REQ_REGISTERED_BUF optimization hint")
Co-authored-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20221121211923.1993171-1-stefanha@redhat.com>
* target/arm: Set TCGCPUOps.restore_state_to_opc for v7m
This setting got missed, breaking v7m.
Fixes: 56c6c98df85c ("target/arm: Convert to tcg_ops restore_state_to_opc")
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1347
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20221129204146.550394-1-richard.henderson@linaro.org>
* Update VERSION for v7.2.0-rc3
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
* hooks are now post mem access
* tests/qtests: override "force-legacy" for gpio virtio-mmio tests
The GPIO device is a VIRTIO_F_VERSION_1 devices but running with a
legacy MMIO interface we miss out that feature bit causing confusion.
For the GPIO test force the mmio bus to support non-legacy so we can
properly test it.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1333
Message-Id: <20221130112439.2527228-2-alex.bennee@linaro.org>
Acked-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
* vhost: enable vrings in vhost_dev_start() for vhost-user devices
Commit 02b61f38d3 ("hw/virtio: incorporate backend features in features")
properly negotiates VHOST_USER_F_PROTOCOL_FEATURES with the vhost-user
backend, but we forgot to enable vrings as specified in
docs/interop/vhost-user.rst:
If ``VHOST_USER_F_PROTOCOL_FEATURES`` has not been negotiated, the
ring starts directly in the enabled state.
If ``VHOST_USER_F_PROTOCOL_FEATURES`` has been negotiated, the ring is
initialized in a disabled state and is enabled by
``VHOST_USER_SET_VRING_ENABLE`` with parameter 1.
Some vhost-user front-ends already did this by calling
vhost_ops.vhost_set_vring_enable() directly:
- backends/cryptodev-vhost.c
- hw/net/virtio-net.c
- hw/virtio/vhost-user-gpio.c
But most didn't do that, so we would leave the vrings disabled and some
backends would not work. We observed this issue with the rust version of
virtiofsd [1], which uses the event loop [2] provided by the
vhost-user-backend crate where requests are not processed if vring is
not enabled.
Let's fix this issue by enabling the vrings in vhost_dev_start() for
vhost-user front-ends that don't already do this directly. Same thing
also in vhost_dev_stop() where we disable vrings.
[1] https://gitlab.com/virtio-fs/virtiofsd
[2] https://github.com/rust-vmm/vhost/blob/240fc2966/crates/vhost-user-backend/src/event_loop.rs#L217
Fixes: 02b61f38d3 ("hw/virtio: incorporate backend features in features")
Reported-by: German Maglione <gmaglione@redhat.com>
Tested-by: German Maglione <gmaglione@redhat.com>
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
Acked-by: Raphael Norwitz <raphael.norwitz@nutanix.com>
Message-Id: <20221123131630.52020-1-sgarzare@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Message-Id: <20221130112439.2527228-3-alex.bennee@linaro.org>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
* hw/virtio: add started_vu status field to vhost-user-gpio
As per the fix to vhost-user-blk in f5b22d06fb (vhost: recheck dev
state in the vhost_migration_log routine) we really should track the
connection and starting separately.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Message-Id: <20221130112439.2527228-4-alex.bennee@linaro.org>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
* hw/virtio: generalise CHR_EVENT_CLOSED handling
..and use for both virtio-user-blk and virtio-user-gpio. This avoids
the circular close by deferring shutdown due to disconnection until a
later point. virtio-user-blk already had this mechanism in place so
generalise it as a vhost-user helper function and use for both blk and
gpio devices.
While we are at it we also fix up vhost-user-gpio to re-establish the
event handler after close down so we can reconnect later.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Raphael Norwitz <raphael.norwitz@nutanix.com>
Message-Id: <20221130112439.2527228-5-alex.bennee@linaro.org>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
* include/hw: VM state takes precedence in virtio_device_should_start
The VM status should always preempt the device status for these
checks. This ensures the device is in the correct state when we
suspend the VM prior to migrations. This restores the checks to the
order they where in before the refactoring moved things around.
While we are at it lets improve our documentation of the various
fields involved and document the two functions.
Fixes: 9f6bcfd99f (hw/virtio: move vm_running check to virtio_device_started)
Fixes: 259d69c00b (hw/virtio: introduce virtio_device_should_start)
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Tested-by: Christian Borntraeger <borntraeger@linux.ibm.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Message-Id: <20221130112439.2527228-6-alex.bennee@linaro.org>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
* hw/nvme: fix aio cancel in format
There are several bugs in the async cancel code for the Format command.
Firstly, cancelling a format operation neglects to set iocb->ret as well
as clearing the iocb->aiocb after cancelling the underlying aiocb which
causes the aio callback to ignore the cancellation. Trivial fix.
Secondly, and worse, because the request is queued up for posting to the
CQ in a bottom half, if the cancellation is due to the submission queue
being deleted (which calls blk_aio_cancel), the req structure is
deallocated in nvme_del_sq prior to the bottom half being schedulued.
Fix this by simply removing the bottom half, there is no reason to defer
it anyway.
Fixes: 3bcf26d3d619 ("hw/nvme: reimplement format nvm to allow cancellation")
Reported-by: Jonathan Derrick <jonathan.derrick@linux.dev>
Reviewed-by: Keith Busch <kbusch@kernel.org>
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
* hw/nvme: fix aio cancel in flush
Make sure that iocb->aiocb is NULL'ed when cancelling.
Fix a potential use-after-free by removing the bottom half and enqueuing
the completion directly.
Fixes: 38f4ac65ac88 ("hw/nvme: reimplement flush to allow cancellation")
Reviewed-by: Keith Busch <kbusch@kernel.org>
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
* hw/nvme: fix aio cancel in zone reset
If the zone reset operation is cancelled but the block unmap operation
completes normally, the callback will continue resetting the next zone
since it neglects to check iocb->ret which will have been set to
-ECANCELED. Make sure that this is checked and bail out if an error is
present.
Secondly, fix a potential use-after-free by removing the bottom half and
enqueuing the completion directly.
Fixes: 63d96e4ffd71 ("hw/nvme: reimplement zone reset to allow cancellation")
Reviewed-by: Keith Busch <kbusch@kernel.org>
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
* hw/nvme: fix aio cancel in dsm
When the DSM operation is cancelled asynchronously, we set iocb->ret to
-ECANCELED. However, the callback function only checks the return value
of the completed aio, which may have completed succesfully prior to the
cancellation and thus the callback ends up continuing the dsm operation
instead of bailing out. Fix this.
Secondly, fix a potential use-after-free by removing the bottom half and
enqueuing the completion directly.
Fixes: d7d1474fd85d ("hw/nvme: reimplement dsm to allow cancellation")
Reviewed-by: Keith Busch <kbusch@kernel.org>
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
* hw/nvme: remove copy bh scheduling
Fix a potential use-after-free by removing the bottom half and enqueuing
the completion directly.
Fixes: 796d20681d9b ("hw/nvme: reimplement the copy command to allow aio cancellation")
Reviewed-by: Keith Busch <kbusch@kernel.org>
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
* target/i386: allow MMX instructions with CR4.OSFXSR=0
MMX state is saved/restored by FSAVE/FRSTOR so the instructions are
not illegal opcodes even if CR4.OSFXSR=0. Make sure that validate_vex
takes into account the prefix and only checks HF_OSFXSR_MASK in the
presence of an SSE instruction.
Fixes: 20581aadec5e ("target/i386: validate VEX prefixes via the instructions' exception classes", 2022-10-18)
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1350
Reported-by: Helge Konetzka (@hejko on gitlab.com)
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
* target/i386: Always completely initialize TranslateFault
In get_physical_address, the canonical address check failed to
set TranslateFault.stage2, which resulted in an uninitialized
read from the struct when reporting the fault in x86_cpu_tlb_fill.
Adjust all error paths to use structure assignment so that the
entire struct is always initialized.
Reported-by: Daniel Hoffman <dhoff749@gmail.com>
Fixes: 9bbcf372193a ("target/i386: Reorg GET_HPHYS")
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20221201074522.178498-1-richard.henderson@linaro.org>
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1324
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
* hw/loongarch/virt: Add cfi01 pflash device
Add cfi01 pflash device for LoongArch virt machine
Signed-off-by: Xiaojuan Yang <yangxiaojuan@loongson.cn>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20221130100647.398565-1-yangxiaojuan@loongson.cn>
Signed-off-by: Song Gao <gaosong@loongson.cn>
* Sync pc on breakpoints
* tests/qtest/migration-test: Fix unlink error and memory leaks
When running the migration test compiled with Clang from Fedora 37
and sanitizers enabled, there is an error complaining about unlink():
../tests/qtest/migration-test.c:1072:12: runtime error: null pointer
passed as argument 1, which is declared to never be null
/usr/include/unistd.h:858:48: note: nonnull attribute specified here
SUMMARY: UndefinedBehaviorSanitizer: undefined-behavior
../tests/qtest/migration-test.c:1072:12 in
(test program exited with status code 1)
TAP parsing error: Too few tests run (expected 33, got 20)
The data->clientcert and data->clientkey pointers can indeed be unset
in some tests, so we have to check them before calling unlink() with
those.
While we're at it, I also noticed that the code is only freeing
some but not all of the allocated strings in this function, and
indeed, valgrind is also complaining about memory leaks here.
So let's call g_free() on all allocated strings to avoid leaking
memory here.
Message-Id: <20221125083054.117504-1-thuth@redhat.com>
Tested-by: Bin Meng <bmeng@tinylab.org>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
* target/s390x/tcg: Fix and improve the SACF instruction
The SET ADDRESS SPACE CONTROL FAST instruction is not privileged, it can be
used from problem space, too. Just the switching to the home address space
is privileged and should still generate a privilege exception. This bug is
e.g. causing programs like Java that use the "getcpu" vdso kernel function
to crash (see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=990417#26 ).
While we're at it, also check if DAT is not enabled. In that case the
instruction is supposed to generate a special operation exception.
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/655
Message-Id: <20221201184443.136355-1-thuth@redhat.com>
Reviewed-by: Ilya Leoshkevich <iii@linux.ibm.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
* hw/display/next-fb: Fix comment typo
Signed-off-by: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Message-Id: <20221125160849.23711-1-evgeny.v.ermakov@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
* fix dev snapshots
* working syx snaps
* Revert "hw/loongarch/virt: Add cfi01 pflash device"
This reverts commit 14dccc8ea6ece7ee63273144fb55e4770a05e0fd.
Signed-off-by: Song Gao <gaosong@loongson.cn>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20221205113007.683505-1-gaosong@loongson.cn>
* Update VERSION for v7.2.0-rc4
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Stefano Garzarella <sgarzare@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Ani Sinha <ani@anisinha.ca>
Signed-off-by: John Snow <jsnow@redhat.com>
Signed-off-by: Xiaojuan Yang <yangxiaojuan@loongson.cn>
Signed-off-by: Song Gao <gaosong@loongson.cn>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Claudio Fontana <cfontana@suse.de>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Signed-off-by: Dongwon Kim <dongwon.kim@intel.com>
Signed-off-by: Marc Hartmayer <mhartmay@linux.ibm.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Signed-off-by: Klaus Jensen <k.jensen@samsung.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Co-authored-by: Stefan Weil <sw@weilnetz.de>
Co-authored-by: Cédric Le Goater <clg@kaod.org>
Co-authored-by: Alex Bennée <alex.bennee@linaro.org>
Co-authored-by: Peter Maydell <peter.maydell@linaro.org>
Co-authored-by: Stefano Garzarella <sgarzare@redhat.com>
Co-authored-by: Igor Mammedov <imammedo@redhat.com>
Co-authored-by: Ani Sinha <ani@anisinha.ca>
Co-authored-by: John Snow <jsnow@redhat.com>
Co-authored-by: Michael S. Tsirkin <mst@redhat.com>
Co-authored-by: Xiaojuan Yang <yangxiaojuan@loongson.cn>
Co-authored-by: Stefan Hajnoczi <stefanha@redhat.com>
Co-authored-by: Ard Biesheuvel <ardb@kernel.org>
Co-authored-by: Thomas Huth <thuth@redhat.com>
Co-authored-by: Joelle van Dyne <j@getutm.app>
Co-authored-by: Claudio Fontana <cfontana@suse.de>
Co-authored-by: Michael Tokarev <mjt@tls.msk.ru>
Co-authored-by: Dongwon Kim <dongwon.kim@intel.com>
Co-authored-by: Marc Hartmayer <mhartmay@linux.ibm.com>
Co-authored-by: Stefan Weil via <qemu-devel@nongnu.org>
Co-authored-by: Gerd Hoffmann <kraxel@redhat.com>
Co-authored-by: Richard Henderson <richard.henderson@linaro.org>
Co-authored-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Co-authored-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Co-authored-by: Evgeny Ermakov <evgeny.v.ermakov@gmail.com>
Co-authored-by: Klaus Jensen <k.jensen@samsung.com>
Co-authored-by: Paolo Bonzini <pbonzini@redhat.com>
Co-authored-by: Song Gao <gaosong@loongson.cn>
This commit is contained in:
Andrea Fioraldi
GitHub
parent
54e2c6f8bd
commit
21dda465fc
@ -494,7 +494,17 @@ check-gprof-gcov:
|
||||
IMAGE: ubuntu2004
|
||||
MAKE_CHECK_ARGS: check
|
||||
after_script:
|
||||
- ${CI_PROJECT_DIR}/scripts/ci/coverage-summary.sh
|
||||
- cd build
|
||||
- gcovr --xml-pretty --exclude-unreachable-branches --print-summary
|
||||
-o coverage.xml --root ${CI_PROJECT_DIR} . *.p
|
||||
coverage: /^\s*lines:\s*\d+.\d+\%/
|
||||
artifacts:
|
||||
name: ${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}-${CI_COMMIT_SHA}
|
||||
expire_in: 2 days
|
||||
reports:
|
||||
coverage_report:
|
||||
coverage_format: cobertura
|
||||
path: build/coverage.xml
|
||||
|
||||
build-oss-fuzz:
|
||||
extends: .native_build_job_template
|
||||
|
||||
@ -23,7 +23,7 @@ Descriptions of section entries:
|
||||
W: Web-page with status/info
|
||||
Q: Patchwork web based patch tracking system site
|
||||
T: SCM tree type and location. Type is one of: git, hg, quilt, stgit.
|
||||
S: Status, one of the following:
|
||||
S: Status, one of the following (keep in sync with docs/devel/maintainers.rst):
|
||||
Supported: Someone is actually paid to look after this.
|
||||
Maintained: Someone actually looks after it.
|
||||
Odd Fixes: It has a maintainer but they don't have time to do
|
||||
@ -1865,6 +1865,7 @@ F: hw/acpi/viot.h
|
||||
|
||||
ACPI/AVOCADO/BIOSBITS
|
||||
M: Ani Sinha <ani@anisinha.ca>
|
||||
M: Michael S. Tsirkin <mst@redhat.com>
|
||||
S: Supported
|
||||
F: tests/avocado/acpi-bits/*
|
||||
F: tests/avocado/acpi-bits.py
|
||||
@ -2004,6 +2005,7 @@ F: docs/interop/vhost-user.rst
|
||||
F: contrib/vhost-user-*/
|
||||
F: backends/vhost-user.c
|
||||
F: include/sysemu/vhost-user-backend.h
|
||||
F: subprojects/libvhost-user/
|
||||
|
||||
virtio
|
||||
M: Michael S. Tsirkin <mst@redhat.com>
|
||||
|
||||
@ -661,6 +661,12 @@ static inline void cpu_handle_debug_exception(CPUState *cpu)
|
||||
}
|
||||
}
|
||||
|
||||
//// --- Begin LibAFL code ---
|
||||
|
||||
void libafl_sync_breakpoint_cpu(void);
|
||||
|
||||
//// --- End LibAFL code ---
|
||||
|
||||
static inline bool cpu_handle_exception(CPUState *cpu, int *ret)
|
||||
{
|
||||
//// --- Begin LibAFL code ---
|
||||
@ -670,6 +676,8 @@ static inline bool cpu_handle_exception(CPUState *cpu, int *ret)
|
||||
if (cpu->exception_index == EXCP_LIBAFL_BP) {
|
||||
*ret = cpu->exception_index;
|
||||
cpu->exception_index = -1;
|
||||
|
||||
libafl_sync_breakpoint_cpu();
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@ -2312,6 +2312,12 @@ store_helper_unaligned(CPUArchState *env, target_ulong addr, uint64_t val,
|
||||
}
|
||||
}
|
||||
|
||||
//// --- Begin LibAFL code ---
|
||||
|
||||
void syx_snapshot_dirty_list_add_hostaddr(void* host_addr);
|
||||
|
||||
//// --- End LibAFL code ---
|
||||
|
||||
static inline void QEMU_ALWAYS_INLINE
|
||||
store_helper(CPUArchState *env, target_ulong addr, uint64_t val,
|
||||
MemOpIdx oi, uintptr_t retaddr, MemOp op)
|
||||
@ -2389,6 +2395,12 @@ store_helper(CPUArchState *env, target_ulong addr, uint64_t val,
|
||||
|
||||
haddr = (void *)((uintptr_t)addr + entry->addend);
|
||||
|
||||
//// --- Begin LibAFL code ---
|
||||
|
||||
syx_snapshot_dirty_list_add_hostaddr(haddr);
|
||||
|
||||
//// --- End LibAFL code ---
|
||||
|
||||
/*
|
||||
* Keep these two store_memop separate to ensure that the compiler
|
||||
* is able to fold the entire function to a single instruction.
|
||||
@ -2413,6 +2425,13 @@ store_helper(CPUArchState *env, target_ulong addr, uint64_t val,
|
||||
}
|
||||
|
||||
haddr = (void *)((uintptr_t)addr + entry->addend);
|
||||
|
||||
//// --- Begin LibAFL code ---
|
||||
|
||||
syx_snapshot_dirty_list_add_hostaddr(haddr);
|
||||
|
||||
//// --- End LibAFL code ---
|
||||
|
||||
store_memop(haddr, val, op);
|
||||
}
|
||||
|
||||
|
||||
@ -40,6 +40,8 @@
|
||||
#include "qapi/error.h"
|
||||
#include "qemu/error-report.h"
|
||||
#include "qemu/main-loop.h"
|
||||
#include "hw/core/cpu.h"
|
||||
#include "sysemu/hw_accel.h"
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
@ -129,28 +131,47 @@ void libafl_load_qemu_snapshot(char *name, bool sync)
|
||||
int libafl_qemu_break_asap = 0;
|
||||
|
||||
CPUState* libafl_breakpoint_cpu;
|
||||
vaddr libafl_breakpoint_pc;
|
||||
|
||||
#ifdef TARGET_ARM
|
||||
#define THUMB_MASK(value) (value | libafl_breakpoint_cpu->env_ptr->thumb)
|
||||
#else
|
||||
#define THUMB_MASK(value) value
|
||||
#endif
|
||||
|
||||
void libafl_qemu_trigger_breakpoint(CPUState* cpu);
|
||||
|
||||
void libafl_sync_breakpoint_cpu(void);
|
||||
|
||||
void libafl_sync_breakpoint_cpu(void)
|
||||
{
|
||||
if (libafl_breakpoint_pc) {
|
||||
CPUClass* cc = CPU_GET_CLASS(libafl_breakpoint_cpu);
|
||||
cc->set_pc(libafl_breakpoint_cpu, THUMB_MASK(libafl_breakpoint_pc));
|
||||
}
|
||||
libafl_breakpoint_pc = 0;
|
||||
}
|
||||
|
||||
void libafl_qemu_trigger_breakpoint(CPUState* cpu)
|
||||
{
|
||||
#ifndef CONFIG_USER_ONLY
|
||||
libafl_breakpoint_cpu = cpu;
|
||||
cpu->stopped = true;
|
||||
#ifndef CONFIG_USER_ONLY
|
||||
qemu_system_debug_request();
|
||||
#else
|
||||
cpu->stopped = true;
|
||||
#endif
|
||||
if (cpu->running) {
|
||||
cpu->exception_index = EXCP_LIBAFL_BP;
|
||||
cpu_loop_exit(cpu);
|
||||
} else {
|
||||
libafl_qemu_break_asap = 1;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
void HELPER(libafl_qemu_handle_breakpoint)(CPUArchState *env)
|
||||
void HELPER(libafl_qemu_handle_breakpoint)(CPUArchState *env, target_ulong pc)
|
||||
{
|
||||
libafl_qemu_trigger_breakpoint(env_cpu(env));
|
||||
CPUState* cpu = env_cpu(env);
|
||||
libafl_breakpoint_pc = pc;
|
||||
libafl_qemu_trigger_breakpoint(cpu);
|
||||
}
|
||||
|
||||
//// --- End LibAFL code ---
|
||||
|
||||
@ -288,6 +288,7 @@ DEF_HELPER_FLAGS_5(gvec_bitsel, TCG_CALL_NO_RWG, void, ptr, ptr, ptr, ptr, i32)
|
||||
|
||||
//// --- Begin LibAFL code ---
|
||||
|
||||
DEF_HELPER_FLAGS_1(libafl_qemu_handle_breakpoint, TCG_CALL_NO_RWG, void, env)
|
||||
DEF_HELPER_FLAGS_2(libafl_qemu_handle_breakpoint, TCG_CALL_NO_RWG,
|
||||
void, env, tl)
|
||||
|
||||
//// --- End LibAFL code ---
|
||||
|
||||
@ -145,7 +145,13 @@ void translator_loop(CPUState *cpu, TranslationBlock *tb, int max_insns,
|
||||
struct libafl_breakpoint* bp = libafl_qemu_breakpoints;
|
||||
while (bp) {
|
||||
if (bp->addr == db->pc_next) {
|
||||
gen_helper_libafl_qemu_handle_breakpoint(cpu_env);
|
||||
TCGv tmp0 = tcg_const_tl(db->pc_next);
|
||||
gen_helper_libafl_qemu_handle_breakpoint(cpu_env, tmp0);
|
||||
#if TARGET_LONG_BITS == 32
|
||||
tcg_temp_free_i32(tmp0);
|
||||
#else
|
||||
tcg_temp_free_i64(tmp0);
|
||||
#endif
|
||||
}
|
||||
bp = bp->next;
|
||||
}
|
||||
|
||||
@ -94,7 +94,7 @@ cryptodev_vhost_start_one(CryptoDevBackendVhost *crypto,
|
||||
goto fail_notifiers;
|
||||
}
|
||||
|
||||
r = vhost_dev_start(&crypto->dev, dev);
|
||||
r = vhost_dev_start(&crypto->dev, dev, false);
|
||||
if (r < 0) {
|
||||
goto fail_start;
|
||||
}
|
||||
@ -111,7 +111,7 @@ static void
|
||||
cryptodev_vhost_stop_one(CryptoDevBackendVhost *crypto,
|
||||
VirtIODevice *dev)
|
||||
{
|
||||
vhost_dev_stop(&crypto->dev, dev);
|
||||
vhost_dev_stop(&crypto->dev, dev, false);
|
||||
vhost_dev_disable_notifiers(&crypto->dev, dev);
|
||||
}
|
||||
|
||||
|
||||
@ -85,7 +85,7 @@ vhost_user_backend_start(VhostUserBackend *b)
|
||||
}
|
||||
|
||||
b->dev.acked_features = b->vdev->guest_features;
|
||||
ret = vhost_dev_start(&b->dev, b->vdev);
|
||||
ret = vhost_dev_start(&b->dev, b->vdev, true);
|
||||
if (ret < 0) {
|
||||
error_report("Error start vhost dev");
|
||||
goto err_guest_notifiers;
|
||||
@ -120,7 +120,7 @@ vhost_user_backend_stop(VhostUserBackend *b)
|
||||
return;
|
||||
}
|
||||
|
||||
vhost_dev_stop(&b->dev, b->vdev);
|
||||
vhost_dev_stop(&b->dev, b->vdev, true);
|
||||
|
||||
if (k->set_guest_notifiers) {
|
||||
ret = k->set_guest_notifiers(qbus->parent,
|
||||
|
||||
@ -2576,14 +2576,25 @@ static void blk_root_drained_end(BdrvChild *child, int *drained_end_counter)
|
||||
|
||||
bool blk_register_buf(BlockBackend *blk, void *host, size_t size, Error **errp)
|
||||
{
|
||||
BlockDriverState *bs = blk_bs(blk);
|
||||
|
||||
GLOBAL_STATE_CODE();
|
||||
return bdrv_register_buf(blk_bs(blk), host, size, errp);
|
||||
|
||||
if (bs) {
|
||||
return bdrv_register_buf(bs, host, size, errp);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
void blk_unregister_buf(BlockBackend *blk, void *host, size_t size)
|
||||
{
|
||||
BlockDriverState *bs = blk_bs(blk);
|
||||
|
||||
GLOBAL_STATE_CODE();
|
||||
bdrv_unregister_buf(blk_bs(blk), host, size);
|
||||
|
||||
if (bs) {
|
||||
bdrv_unregister_buf(bs, host, size);
|
||||
}
|
||||
}
|
||||
|
||||
int coroutine_fn blk_co_copy_range(BlockBackend *blk_in, int64_t off_in,
|
||||
|
||||
2
configure
vendored
2
configure
vendored
@ -1807,7 +1807,7 @@ fi
|
||||
# functions to probe cross compilers
|
||||
|
||||
container="no"
|
||||
if test $use_containers = "yes"; then
|
||||
if test $use_containers = "yes" && (has "docker" || has "podman"); then
|
||||
case $($python "$source_path"/tests/docker/docker.py probe) in
|
||||
*docker) container=docker ;;
|
||||
podman) container=podman ;;
|
||||
|
||||
13
cpu.c
13
cpu.c
@ -98,6 +98,8 @@ void libafl_flush_jit(void);
|
||||
|
||||
extern CPUState* libafl_breakpoint_cpu;
|
||||
|
||||
extern int libafl_restoring_devices;
|
||||
|
||||
/*
|
||||
void* libafl_qemu_g2h(CPUState *cpu, target_ulong x);
|
||||
target_ulong libafl_qemu_h2g(CPUState *cpu, void* x);
|
||||
@ -348,7 +350,15 @@ static int cpu_common_post_load(void *opaque, int version_id)
|
||||
* memory we've translated code from. So we must flush all TBs,
|
||||
* which will now be stale.
|
||||
*/
|
||||
tb_flush(cpu);
|
||||
//tb_flush(cpu);
|
||||
|
||||
//// --- Begin LibAFL code ---
|
||||
|
||||
// flushing the TBs every restore makes it really slow
|
||||
// TODO handle writes to X code with specific calls to tb_invalidate_phys_addr
|
||||
if (!libafl_restoring_devices) tb_flush(cpu);
|
||||
|
||||
//// --- End LibAFL code ---
|
||||
|
||||
return 0;
|
||||
}
|
||||
@ -610,6 +620,7 @@ void tb_invalidate_phys_addr(AddressSpace *as, hwaddr addr, MemTxAttrs attrs)
|
||||
|
||||
void libafl_breakpoint_invalidate(CPUState *cpu, target_ulong pc)
|
||||
{
|
||||
// TODO invalidate only the virtual pages related to the TB
|
||||
tb_flush(cpu);
|
||||
}
|
||||
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
.. _code_of_conduct:
|
||||
|
||||
Code of Conduct
|
||||
===============
|
||||
|
||||
|
||||
@ -8,6 +8,7 @@ Notes about how to interact with the community and how and where to submit patch
|
||||
|
||||
code-of-conduct
|
||||
conflict-resolution
|
||||
maintainers
|
||||
style
|
||||
submitting-a-patch
|
||||
trivial-patches
|
||||
|
||||
107
docs/devel/maintainers.rst
Normal file
107
docs/devel/maintainers.rst
Normal file
@ -0,0 +1,107 @@
|
||||
.. _maintainers:
|
||||
|
||||
The Role of Maintainers
|
||||
=======================
|
||||
|
||||
Maintainers are a critical part of the project's contributor ecosystem.
|
||||
They come from a wide range of backgrounds from unpaid hobbyists
|
||||
working in their spare time to employees who work on the project as
|
||||
part of their job. Maintainer activities include:
|
||||
|
||||
- reviewing patches and suggesting changes
|
||||
- collecting patches and preparing pull requests
|
||||
- tending to the long term health of their area
|
||||
- participating in other project activities
|
||||
|
||||
They are also human and subject to the same pressures as everyone else
|
||||
including overload and burnout. Like everyone else they are subject
|
||||
to project's :ref:`code_of_conduct` and should also be exemplars of
|
||||
excellent community collaborators.
|
||||
|
||||
The MAINTAINERS file
|
||||
--------------------
|
||||
|
||||
The `MAINTAINERS
|
||||
<https://gitlab.com/qemu-project/qemu/-/blob/master/MAINTAINERS>`__
|
||||
file contains the canonical list of who is a maintainer. The file
|
||||
is machine readable so an appropriately configured git (see
|
||||
:ref:`cc_the_relevant_maintainer`) can automatically Cc them on
|
||||
patches that touch their area of code.
|
||||
|
||||
The file also describes the status of the area of code to give an idea
|
||||
of how actively that section is maintained.
|
||||
|
||||
.. list-table:: Meaning of support status in MAINTAINERS
|
||||
:widths: 25 75
|
||||
:header-rows: 1
|
||||
|
||||
* - Status
|
||||
- Meaning
|
||||
* - Supported
|
||||
- Someone is actually paid to look after this.
|
||||
* - Maintained
|
||||
- Someone actually looks after it.
|
||||
* - Odd Fixes
|
||||
- It has a maintainer but they don't have time to do
|
||||
much other than throw the odd patch in.
|
||||
* - Orphan
|
||||
- No current maintainer.
|
||||
* - Obsolete
|
||||
- Old obsolete code, should use something else.
|
||||
|
||||
Please bear in mind that even if someone is paid to support something
|
||||
it does not mean they are paid to support you. This is open source and
|
||||
the code comes with no warranty and the project makes no guarantees
|
||||
about dealing with bugs or features requests.
|
||||
|
||||
|
||||
|
||||
Becoming a reviewer
|
||||
-------------------
|
||||
|
||||
Most maintainers start by becoming subsystem reviewers. While anyone
|
||||
is welcome to review code on the mailing list getting added to the
|
||||
MAINTAINERS file with a line like::
|
||||
|
||||
R: Random Hacker <rhacker@example.com>
|
||||
|
||||
marks you as a 'designated reviewer' - expected to provide regular
|
||||
spontaneous feedback. This will ensure that patches touching a given
|
||||
subsystem will automatically be CC'd to you.
|
||||
|
||||
Becoming a maintainer
|
||||
---------------------
|
||||
|
||||
Maintainers are volunteers who put themselves forward or have been
|
||||
asked by others to keep an eye on an area of code. They have generally
|
||||
demonstrated to the community, usually via contributions and code
|
||||
reviews, that they have a good understanding of the subsystem. They
|
||||
are also trusted to make a positive contribution to the project and
|
||||
work well with the other contributors.
|
||||
|
||||
The process is simple - simply send a patch to the list that updates
|
||||
the ``MAINTAINERS`` file. Sometimes this is done as part of a larger
|
||||
series when a new sub-system is being added to the code base. This can
|
||||
also be done by a retiring maintainer who nominates their replacement
|
||||
after discussion with other contributors.
|
||||
|
||||
Once the patch is reviewed and merged the only other step is to make
|
||||
sure your GPG key is signed.
|
||||
|
||||
.. _maintainer_keys:
|
||||
|
||||
Maintainer GPG Keys
|
||||
~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
GPG is used to sign pull requests so they can be identified as really
|
||||
coming from the maintainer. If your key is not already signed by
|
||||
members of the QEMU community, you should make arrangements to attend
|
||||
a `KeySigningParty <https://wiki.qemu.org/KeySigningParty>`__ (for
|
||||
example at KVM Forum) or make alternative arrangements to have your
|
||||
key signed by an attendee. Key signing requires meeting another
|
||||
community member **in person** [#]_ so please make appropriate
|
||||
arrangements.
|
||||
|
||||
.. [#] In recent pandemic times we have had to exercise some
|
||||
flexibility here. Maintainers still need to sign their pull
|
||||
requests though.
|
||||
@ -3,34 +3,27 @@
|
||||
Submitting a Patch
|
||||
==================
|
||||
|
||||
QEMU welcomes contributions of code (either fixing bugs or adding new
|
||||
functionality). However, we get a lot of patches, and so we have some
|
||||
guidelines about submitting patches. If you follow these, you'll help
|
||||
make our task of code review easier and your patch is likely to be
|
||||
committed faster.
|
||||
QEMU welcomes contributions to fix bugs, add functionality or improve
|
||||
the documentation. However, we get a lot of patches, and so we have
|
||||
some guidelines about submitting them. If you follow these, you'll
|
||||
help make our task of contribution review easier and your change is
|
||||
likely to be accepted and committed faster.
|
||||
|
||||
This page seems very long, so if you are only trying to post a quick
|
||||
one-shot fix, the bare minimum we ask is that:
|
||||
|
||||
- You **must** provide a Signed-off-by: line (this is a hard
|
||||
requirement because it's how you say "I'm legally okay to contribute
|
||||
this and happy for it to go into QEMU", modeled after the `Linux kernel
|
||||
<http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Documentation/SubmittingPatches?id=f6f94e2ab1b33f0082ac22d71f66385a60d8157f#n297>`__
|
||||
policy.) ``git commit -s`` or ``git format-patch -s`` will add one.
|
||||
- All contributions to QEMU must be **sent as patches** to the
|
||||
qemu-devel `mailing list <https://wiki.qemu.org/Contribute/MailingLists>`__.
|
||||
Patch contributions should not be posted on the bug tracker, posted on
|
||||
forums, or externally hosted and linked to. (We have other mailing lists too,
|
||||
but all patches must go to qemu-devel, possibly with a Cc: to another
|
||||
list.) ``git send-email`` (`step-by-step setup
|
||||
guide <https://git-send-email.io/>`__ and `hints and
|
||||
tips <https://elixir.bootlin.com/linux/latest/source/Documentation/process/email-clients.rst>`__)
|
||||
works best for delivering the patch without mangling it, but
|
||||
attachments can be used as a last resort on a first-time submission.
|
||||
- You must read replies to your message, and be willing to act on them.
|
||||
Note, however, that maintainers are often willing to manually fix up
|
||||
first-time contributions, since there is a learning curve involved in
|
||||
making an ideal patch submission.
|
||||
.. list-table:: Minimal Checklist for Patches
|
||||
:widths: 35 65
|
||||
:header-rows: 1
|
||||
|
||||
* - Check
|
||||
- Reason
|
||||
* - Patches contain Signed-off-by: Real Name <author@email>
|
||||
- States you are legally able to contribute the code. See :ref:`patch_emails_must_include_a_signed_off_by_line`
|
||||
* - Sent as patch emails to ``qemu-devel@nongnu.org``
|
||||
- The project uses an email list based workflow. See :ref:`submitting_your_patches`
|
||||
* - Be prepared to respond to review comments
|
||||
- Code that doesn't pass review will not get merged. See :ref:`participating_in_code_review`
|
||||
|
||||
You do not have to subscribe to post (list policy is to reply-to-all to
|
||||
preserve CCs and keep non-subscribers in the loop on the threads they
|
||||
@ -229,6 +222,19 @@ bisection doesn't land on a known-broken state.
|
||||
Submitting your Patches
|
||||
-----------------------
|
||||
|
||||
The QEMU project uses a public email based workflow for reviewing and
|
||||
merging patches. As a result all contributions to QEMU must be **sent
|
||||
as patches** to the qemu-devel `mailing list
|
||||
<https://wiki.qemu.org/Contribute/MailingLists>`__. Patch
|
||||
contributions should not be posted on the bug tracker, posted on
|
||||
forums, or externally hosted and linked to. (We have other mailing
|
||||
lists too, but all patches must go to qemu-devel, possibly with a Cc:
|
||||
to another list.) ``git send-email`` (`step-by-step setup guide
|
||||
<https://git-send-email.io/>`__ and `hints and tips
|
||||
<https://elixir.bootlin.com/linux/latest/source/Documentation/process/email-clients.rst>`__)
|
||||
works best for delivering the patch without mangling it, but
|
||||
attachments can be used as a last resort on a first-time submission.
|
||||
|
||||
.. _if_you_cannot_send_patch_emails:
|
||||
|
||||
If you cannot send patch emails
|
||||
@ -314,10 +320,12 @@ git repository to fetch the original commit.
|
||||
Patch emails must include a ``Signed-off-by:`` line
|
||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
|
||||
For more information see `SubmittingPatches 1.12
|
||||
<http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Documentation/SubmittingPatches?id=f6f94e2ab1b33f0082ac22d71f66385a60d8157f#n297>`__.
|
||||
This is vital or we will not be able to apply your patch! Please use
|
||||
your real name to sign a patch (not an alias or acronym).
|
||||
Your patches **must** include a Signed-off-by: line. This is a hard
|
||||
requirement because it's how you say "I'm legally okay to contribute
|
||||
this and happy for it to go into QEMU". The process is modelled after
|
||||
the `Linux kernel
|
||||
<http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Documentation/SubmittingPatches?id=f6f94e2ab1b33f0082ac22d71f66385a60d8157f#n297>`__
|
||||
policy.
|
||||
|
||||
If you wrote the patch, make sure your "From:" and "Signed-off-by:"
|
||||
lines use the same spelling. It's okay if you subscribe or contribute to
|
||||
@ -327,6 +335,11 @@ include a "From:" line in the body of the email (different from your
|
||||
envelope From:) that will give credit to the correct author; but again,
|
||||
that author's Signed-off-by: line is mandatory, with the same spelling.
|
||||
|
||||
There are various tooling options for automatically adding these tags
|
||||
include using ``git commit -s`` or ``git format-patch -s``. For more
|
||||
information see `SubmittingPatches 1.12
|
||||
<http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/Documentation/SubmittingPatches?id=f6f94e2ab1b33f0082ac22d71f66385a60d8157f#n297>`__.
|
||||
|
||||
.. _include_a_meaningful_cover_letter:
|
||||
|
||||
Include a meaningful cover letter
|
||||
@ -397,9 +410,19 @@ Participating in Code Review
|
||||
----------------------------
|
||||
|
||||
All patches submitted to the QEMU project go through a code review
|
||||
process before they are accepted. Some areas of code that are well
|
||||
maintained may review patches quickly, lesser-loved areas of code may
|
||||
have a longer delay.
|
||||
process before they are accepted. This will often mean a series will
|
||||
go through a number of iterations before being picked up by
|
||||
:ref:`maintainers<maintainers>`. You therefore should be prepared to
|
||||
read replies to your messages and be willing to act on them.
|
||||
|
||||
Maintainers are often willing to manually fix up first-time
|
||||
contributions, since there is a learning curve involved in making an
|
||||
ideal patch submission. However for the best results you should
|
||||
proactively respond to suggestions with changes or justifications for
|
||||
your current approach.
|
||||
|
||||
Some areas of code that are well maintained may review patches
|
||||
quickly, lesser-loved areas of code may have a longer delay.
|
||||
|
||||
.. _stay_around_to_fix_problems_raised_in_code_review:
|
||||
|
||||
@ -411,14 +434,20 @@ developers will identify bugs, or suggest a cleaner approach, or even
|
||||
just point out code style issues or commit message typos. You'll need to
|
||||
respond to these, and then send a second version of your patches with
|
||||
the issues fixed. This takes a little time and effort on your part, but
|
||||
if you don't do it then your changes will never get into QEMU. It's also
|
||||
just polite -- it is quite disheartening for a developer to spend time
|
||||
reviewing your code and suggesting improvements, only to find that
|
||||
you're not going to do anything further and it was all wasted effort.
|
||||
if you don't do it then your changes will never get into QEMU.
|
||||
|
||||
Remember that a maintainer is under no obligation to take your
|
||||
patches. If someone has spent the time reviewing your code and
|
||||
suggesting improvements and you simply re-post without either
|
||||
addressing the comment directly or providing additional justification
|
||||
for the change then it becomes wasted effort. You cannot demand others
|
||||
merge and then fix up your code after the fact.
|
||||
|
||||
When replying to comments on your patches **reply to all and not just
|
||||
the sender** -- keeping discussion on the mailing list means everybody
|
||||
can follow it.
|
||||
can follow it. Remember the spirit of the :ref:`code_of_conduct` and
|
||||
keep discussions respectful and collaborative and avoid making
|
||||
personal comments.
|
||||
|
||||
.. _pay_attention_to_review_comments:
|
||||
|
||||
|
||||
@ -53,14 +53,10 @@ series) and that "make check" passes before sending out the pull
|
||||
request. As a submaintainer you're one of QEMU's lines of defense
|
||||
against bad code, so double check the details.
|
||||
|
||||
**All pull requests must be signed**. If your key is not already signed
|
||||
by members of the QEMU community, you should make arrangements to attend
|
||||
a `KeySigningParty <https://wiki.qemu.org/KeySigningParty>`__ (for
|
||||
example at KVM Forum) or make alternative arrangements to have your key
|
||||
signed by an attendee. Key signing requires meeting another community
|
||||
member \*in person\* so please make appropriate arrangements. By
|
||||
"signed" here we mean that the pullreq email should quote a tag which is
|
||||
a GPG-signed tag (as created with 'gpg tag -s ...').
|
||||
**All pull requests must be signed**. By "signed" here we mean that
|
||||
the pullreq email should quote a tag which is a GPG-signed tag (as
|
||||
created with 'gpg tag -s ...'). See :ref:`maintainer_keys` for
|
||||
details.
|
||||
|
||||
**Pull requests not for master should say "not for master" and have
|
||||
"PULL SUBSYSTEM whatever" in the subject tag**. If your pull request is
|
||||
|
||||
@ -220,8 +220,6 @@ struct IntelHDAReg {
|
||||
void (*rhandler)(IntelHDAState *d, const IntelHDAReg *reg);
|
||||
};
|
||||
|
||||
static void intel_hda_reset(DeviceState *dev);
|
||||
|
||||
/* --------------------------------------------------------------------- */
|
||||
|
||||
static hwaddr intel_hda_addr(uint32_t lbase, uint32_t ubase)
|
||||
@ -516,7 +514,7 @@ static void intel_hda_notify_codecs(IntelHDAState *d, uint32_t stream, bool runn
|
||||
static void intel_hda_set_g_ctl(IntelHDAState *d, const IntelHDAReg *reg, uint32_t old)
|
||||
{
|
||||
if ((d->g_ctl & ICH6_GCTL_RESET) == 0) {
|
||||
intel_hda_reset(DEVICE(d));
|
||||
device_cold_reset(DEVICE(d));
|
||||
}
|
||||
}
|
||||
|
||||
@ -1083,11 +1081,9 @@ static void intel_hda_reset(DeviceState *dev)
|
||||
intel_hda_regs_reset(d);
|
||||
d->wall_base_ns = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);
|
||||
|
||||
/* reset codecs */
|
||||
QTAILQ_FOREACH(kid, &d->codecs.qbus.children, sibling) {
|
||||
DeviceState *qdev = kid->child;
|
||||
cdev = HDA_CODEC_DEVICE(qdev);
|
||||
device_legacy_reset(DEVICE(cdev));
|
||||
d->state_sts |= (1 << cdev->cad);
|
||||
}
|
||||
intel_hda_update_irq(d);
|
||||
|
||||
@ -52,6 +52,7 @@ static const int user_feature_bits[] = {
|
||||
VIRTIO_F_NOTIFY_ON_EMPTY,
|
||||
VIRTIO_F_RING_PACKED,
|
||||
VIRTIO_F_IOMMU_PLATFORM,
|
||||
VIRTIO_F_RING_RESET,
|
||||
VHOST_INVALID_FEATURE_BIT
|
||||
};
|
||||
|
||||
@ -177,7 +178,7 @@ static int vhost_user_blk_start(VirtIODevice *vdev, Error **errp)
|
||||
}
|
||||
|
||||
s->dev.vq_index_end = s->dev.nvqs;
|
||||
ret = vhost_dev_start(&s->dev, vdev);
|
||||
ret = vhost_dev_start(&s->dev, vdev, true);
|
||||
if (ret < 0) {
|
||||
error_setg_errno(errp, -ret, "Error starting vhost");
|
||||
goto err_guest_notifiers;
|
||||
@ -212,7 +213,7 @@ static void vhost_user_blk_stop(VirtIODevice *vdev)
|
||||
return;
|
||||
}
|
||||
|
||||
vhost_dev_stop(&s->dev, vdev);
|
||||
vhost_dev_stop(&s->dev, vdev, true);
|
||||
|
||||
ret = k->set_guest_notifiers(qbus->parent, s->dev.nvqs, false);
|
||||
if (ret < 0) {
|
||||
@ -368,17 +369,10 @@ static void vhost_user_blk_disconnect(DeviceState *dev)
|
||||
vhost_user_blk_stop(vdev);
|
||||
|
||||
vhost_dev_cleanup(&s->dev);
|
||||
}
|
||||
|
||||
static void vhost_user_blk_chr_closed_bh(void *opaque)
|
||||
{
|
||||
DeviceState *dev = opaque;
|
||||
VirtIODevice *vdev = VIRTIO_DEVICE(dev);
|
||||
VHostUserBlk *s = VHOST_USER_BLK(vdev);
|
||||
|
||||
vhost_user_blk_disconnect(dev);
|
||||
/* Re-instate the event handler for new connections */
|
||||
qemu_chr_fe_set_handlers(&s->chardev, NULL, NULL, vhost_user_blk_event,
|
||||
NULL, opaque, NULL, true);
|
||||
NULL, dev, NULL, true);
|
||||
}
|
||||
|
||||
static void vhost_user_blk_event(void *opaque, QEMUChrEvent event)
|
||||
@ -397,33 +391,9 @@ static void vhost_user_blk_event(void *opaque, QEMUChrEvent event)
|
||||
}
|
||||
break;
|
||||
case CHR_EVENT_CLOSED:
|
||||
if (!runstate_check(RUN_STATE_SHUTDOWN)) {
|
||||
/*
|
||||
* A close event may happen during a read/write, but vhost
|
||||
* code assumes the vhost_dev remains setup, so delay the
|
||||
* stop & clear.
|
||||
*/
|
||||
AioContext *ctx = qemu_get_current_aio_context();
|
||||
|
||||
qemu_chr_fe_set_handlers(&s->chardev, NULL, NULL, NULL, NULL,
|
||||
NULL, NULL, false);
|
||||
aio_bh_schedule_oneshot(ctx, vhost_user_blk_chr_closed_bh, opaque);
|
||||
|
||||
/*
|
||||
* Move vhost device to the stopped state. The vhost-user device
|
||||
* will be clean up and disconnected in BH. This can be useful in
|
||||
* the vhost migration code. If disconnect was caught there is an
|
||||
* option for the general vhost code to get the dev state without
|
||||
* knowing its type (in this case vhost-user).
|
||||
*
|
||||
* FIXME: this is sketchy to be reaching into vhost_dev
|
||||
* now because we are forcing something that implies we
|
||||
* have executed vhost_dev_stop() but that won't happen
|
||||
* until vhost_user_blk_stop() gets called from the bh.
|
||||
* Really this state check should be tracked locally.
|
||||
*/
|
||||
s->dev.started = false;
|
||||
}
|
||||
/* defer close until later to avoid circular close */
|
||||
vhost_user_async_close(dev, &s->chardev, &s->dev,
|
||||
vhost_user_blk_disconnect);
|
||||
break;
|
||||
case CHR_EVENT_BREAK:
|
||||
case CHR_EVENT_MUX_IN:
|
||||
|
||||
@ -126,7 +126,7 @@ static void nextfb_class_init(ObjectClass *oc, void *data)
|
||||
set_bit(DEVICE_CATEGORY_DISPLAY, dc->categories);
|
||||
dc->realize = nextfb_realize;
|
||||
|
||||
/* Note: This device does not any state that we have to reset or migrate */
|
||||
/* Note: This device does not have any state that we have to reset or migrate */
|
||||
}
|
||||
|
||||
static const TypeInfo nextfb_info = {
|
||||
|
||||
@ -106,7 +106,7 @@ static int qxl_log_image(PCIQXLDevice *qxl, QXLPHYSICAL addr, int group_id)
|
||||
QXLImage *image;
|
||||
QXLImageDescriptor *desc;
|
||||
|
||||
image = qxl_phys2virt(qxl, addr, group_id);
|
||||
image = qxl_phys2virt(qxl, addr, group_id, sizeof(QXLImage));
|
||||
if (!image) {
|
||||
return 1;
|
||||
}
|
||||
@ -214,7 +214,8 @@ int qxl_log_cmd_cursor(PCIQXLDevice *qxl, QXLCursorCmd *cmd, int group_id)
|
||||
cmd->u.set.position.y,
|
||||
cmd->u.set.visible ? "yes" : "no",
|
||||
cmd->u.set.shape);
|
||||
cursor = qxl_phys2virt(qxl, cmd->u.set.shape, group_id);
|
||||
cursor = qxl_phys2virt(qxl, cmd->u.set.shape, group_id,
|
||||
sizeof(QXLCursor));
|
||||
if (!cursor) {
|
||||
return 1;
|
||||
}
|
||||
@ -236,6 +237,7 @@ int qxl_log_command(PCIQXLDevice *qxl, const char *ring, QXLCommandExt *ext)
|
||||
{
|
||||
bool compat = ext->flags & QXL_COMMAND_FLAG_COMPAT;
|
||||
void *data;
|
||||
size_t datasz;
|
||||
int ret;
|
||||
|
||||
if (!qxl->cmdlog) {
|
||||
@ -247,7 +249,20 @@ int qxl_log_command(PCIQXLDevice *qxl, const char *ring, QXLCommandExt *ext)
|
||||
qxl_name(qxl_type, ext->cmd.type),
|
||||
compat ? "(compat)" : "");
|
||||
|
||||
data = qxl_phys2virt(qxl, ext->cmd.data, ext->group_id);
|
||||
switch (ext->cmd.type) {
|
||||
case QXL_CMD_DRAW:
|
||||
datasz = compat ? sizeof(QXLCompatDrawable) : sizeof(QXLDrawable);
|
||||
break;
|
||||
case QXL_CMD_SURFACE:
|
||||
datasz = sizeof(QXLSurfaceCmd);
|
||||
break;
|
||||
case QXL_CMD_CURSOR:
|
||||
datasz = sizeof(QXLCursorCmd);
|
||||
break;
|
||||
default:
|
||||
goto out;
|
||||
}
|
||||
data = qxl_phys2virt(qxl, ext->cmd.data, ext->group_id, datasz);
|
||||
if (!data) {
|
||||
return 1;
|
||||
}
|
||||
@ -269,6 +284,7 @@ int qxl_log_command(PCIQXLDevice *qxl, const char *ring, QXLCommandExt *ext)
|
||||
qxl_log_cmd_cursor(qxl, data, ext->group_id);
|
||||
break;
|
||||
}
|
||||
out:
|
||||
fprintf(stderr, "\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -107,7 +107,9 @@ static void qxl_render_update_area_unlocked(PCIQXLDevice *qxl)
|
||||
qxl->guest_primary.resized = 0;
|
||||
qxl->guest_primary.data = qxl_phys2virt(qxl,
|
||||
qxl->guest_primary.surface.mem,
|
||||
MEMSLOT_GROUP_GUEST);
|
||||
MEMSLOT_GROUP_GUEST,
|
||||
qxl->guest_primary.abs_stride
|
||||
* height);
|
||||
if (!qxl->guest_primary.data) {
|
||||
goto end;
|
||||
}
|
||||
@ -228,7 +230,8 @@ static void qxl_unpack_chunks(void *dest, size_t size, PCIQXLDevice *qxl,
|
||||
if (offset == size) {
|
||||
return;
|
||||
}
|
||||
chunk = qxl_phys2virt(qxl, chunk->next_chunk, group_id);
|
||||
chunk = qxl_phys2virt(qxl, chunk->next_chunk, group_id,
|
||||
sizeof(QXLDataChunk) + chunk->data_size);
|
||||
if (!chunk) {
|
||||
return;
|
||||
}
|
||||
@ -295,7 +298,8 @@ fail:
|
||||
/* called from spice server thread context only */
|
||||
int qxl_render_cursor(PCIQXLDevice *qxl, QXLCommandExt *ext)
|
||||
{
|
||||
QXLCursorCmd *cmd = qxl_phys2virt(qxl, ext->cmd.data, ext->group_id);
|
||||
QXLCursorCmd *cmd = qxl_phys2virt(qxl, ext->cmd.data, ext->group_id,
|
||||
sizeof(QXLCursorCmd));
|
||||
QXLCursor *cursor;
|
||||
QEMUCursor *c;
|
||||
|
||||
@ -314,7 +318,15 @@ int qxl_render_cursor(PCIQXLDevice *qxl, QXLCommandExt *ext)
|
||||
}
|
||||
switch (cmd->type) {
|
||||
case QXL_CURSOR_SET:
|
||||
cursor = qxl_phys2virt(qxl, cmd->u.set.shape, ext->group_id);
|
||||
/* First read the QXLCursor to get QXLDataChunk::data_size ... */
|
||||
cursor = qxl_phys2virt(qxl, cmd->u.set.shape, ext->group_id,
|
||||
sizeof(QXLCursor));
|
||||
if (!cursor) {
|
||||
return 1;
|
||||
}
|
||||
/* Then read including the chunked data following QXLCursor. */
|
||||
cursor = qxl_phys2virt(qxl, cmd->u.set.shape, ext->group_id,
|
||||
sizeof(QXLCursor) + cursor->chunk.data_size);
|
||||
if (!cursor) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
@ -274,7 +274,8 @@ static void qxl_spice_monitors_config_async(PCIQXLDevice *qxl, int replay)
|
||||
QXL_IO_MONITORS_CONFIG_ASYNC));
|
||||
}
|
||||
|
||||
cfg = qxl_phys2virt(qxl, qxl->guest_monitors_config, MEMSLOT_GROUP_GUEST);
|
||||
cfg = qxl_phys2virt(qxl, qxl->guest_monitors_config, MEMSLOT_GROUP_GUEST,
|
||||
sizeof(QXLMonitorsConfig));
|
||||
if (cfg != NULL && cfg->count == 1) {
|
||||
qxl->guest_primary.resized = 1;
|
||||
qxl->guest_head0_width = cfg->heads[0].width;
|
||||
@ -459,7 +460,8 @@ static int qxl_track_command(PCIQXLDevice *qxl, struct QXLCommandExt *ext)
|
||||
switch (le32_to_cpu(ext->cmd.type)) {
|
||||
case QXL_CMD_SURFACE:
|
||||
{
|
||||
QXLSurfaceCmd *cmd = qxl_phys2virt(qxl, ext->cmd.data, ext->group_id);
|
||||
QXLSurfaceCmd *cmd = qxl_phys2virt(qxl, ext->cmd.data, ext->group_id,
|
||||
sizeof(QXLSurfaceCmd));
|
||||
|
||||
if (!cmd) {
|
||||
return 1;
|
||||
@ -494,7 +496,8 @@ static int qxl_track_command(PCIQXLDevice *qxl, struct QXLCommandExt *ext)
|
||||
}
|
||||
case QXL_CMD_CURSOR:
|
||||
{
|
||||
QXLCursorCmd *cmd = qxl_phys2virt(qxl, ext->cmd.data, ext->group_id);
|
||||
QXLCursorCmd *cmd = qxl_phys2virt(qxl, ext->cmd.data, ext->group_id,
|
||||
sizeof(QXLCursorCmd));
|
||||
|
||||
if (!cmd) {
|
||||
return 1;
|
||||
@ -1381,6 +1384,7 @@ static int qxl_add_memslot(PCIQXLDevice *d, uint32_t slot_id, uint64_t delta,
|
||||
qxl_set_guest_bug(d, "%s: pci_region = %d", __func__, pci_region);
|
||||
return 1;
|
||||
}
|
||||
assert(guest_end - pci_start <= memory_region_size(mr));
|
||||
|
||||
virt_start = (intptr_t)memory_region_get_ram_ptr(mr);
|
||||
memslot.slot_id = slot_id;
|
||||
@ -1421,11 +1425,13 @@ static void qxl_reset_surfaces(PCIQXLDevice *d)
|
||||
|
||||
/* can be also called from spice server thread context */
|
||||
static bool qxl_get_check_slot_offset(PCIQXLDevice *qxl, QXLPHYSICAL pqxl,
|
||||
uint32_t *s, uint64_t *o)
|
||||
uint32_t *s, uint64_t *o,
|
||||
size_t size_requested)
|
||||
{
|
||||
uint64_t phys = le64_to_cpu(pqxl);
|
||||
uint32_t slot = (phys >> (64 - 8)) & 0xff;
|
||||
uint64_t offset = phys & 0xffffffffffff;
|
||||
uint64_t size_available;
|
||||
|
||||
if (slot >= NUM_MEMSLOTS) {
|
||||
qxl_set_guest_bug(qxl, "slot too large %d >= %d", slot,
|
||||
@ -1449,6 +1455,23 @@ static bool qxl_get_check_slot_offset(PCIQXLDevice *qxl, QXLPHYSICAL pqxl,
|
||||
slot, offset, qxl->guest_slots[slot].size);
|
||||
return false;
|
||||
}
|
||||
size_available = memory_region_size(qxl->guest_slots[slot].mr);
|
||||
if (qxl->guest_slots[slot].offset + offset >= size_available) {
|
||||
qxl_set_guest_bug(qxl,
|
||||
"slot %d offset %"PRIu64" > region size %"PRIu64"\n",
|
||||
slot, qxl->guest_slots[slot].offset + offset,
|
||||
size_available);
|
||||
return false;
|
||||
}
|
||||
size_available -= qxl->guest_slots[slot].offset + offset;
|
||||
if (size_requested > size_available) {
|
||||
qxl_set_guest_bug(qxl,
|
||||
"slot %d offset %"PRIu64" size %zu: "
|
||||
"overrun by %"PRIu64" bytes\n",
|
||||
slot, offset, size_requested,
|
||||
size_requested - size_available);
|
||||
return false;
|
||||
}
|
||||
|
||||
*s = slot;
|
||||
*o = offset;
|
||||
@ -1456,7 +1479,8 @@ static bool qxl_get_check_slot_offset(PCIQXLDevice *qxl, QXLPHYSICAL pqxl,
|
||||
}
|
||||
|
||||
/* can be also called from spice server thread context */
|
||||
void *qxl_phys2virt(PCIQXLDevice *qxl, QXLPHYSICAL pqxl, int group_id)
|
||||
void *qxl_phys2virt(PCIQXLDevice *qxl, QXLPHYSICAL pqxl, int group_id,
|
||||
size_t size)
|
||||
{
|
||||
uint64_t offset;
|
||||
uint32_t slot;
|
||||
@ -1467,7 +1491,7 @@ void *qxl_phys2virt(PCIQXLDevice *qxl, QXLPHYSICAL pqxl, int group_id)
|
||||
offset = le64_to_cpu(pqxl) & 0xffffffffffff;
|
||||
return (void *)(intptr_t)offset;
|
||||
case MEMSLOT_GROUP_GUEST:
|
||||
if (!qxl_get_check_slot_offset(qxl, pqxl, &slot, &offset)) {
|
||||
if (!qxl_get_check_slot_offset(qxl, pqxl, &slot, &offset, size)) {
|
||||
return NULL;
|
||||
}
|
||||
ptr = memory_region_get_ram_ptr(qxl->guest_slots[slot].mr);
|
||||
@ -1933,9 +1957,9 @@ static void qxl_dirty_one_surface(PCIQXLDevice *qxl, QXLPHYSICAL pqxl,
|
||||
uint32_t slot;
|
||||
bool rc;
|
||||
|
||||
rc = qxl_get_check_slot_offset(qxl, pqxl, &slot, &offset);
|
||||
assert(rc == true);
|
||||
size = (uint64_t)height * abs(stride);
|
||||
rc = qxl_get_check_slot_offset(qxl, pqxl, &slot, &offset, size);
|
||||
assert(rc == true);
|
||||
trace_qxl_surfaces_dirty(qxl->id, offset, size);
|
||||
qxl_set_dirty(qxl->guest_slots[slot].mr,
|
||||
qxl->guest_slots[slot].offset + offset,
|
||||
@ -1964,7 +1988,7 @@ static void qxl_dirty_surfaces(PCIQXLDevice *qxl)
|
||||
}
|
||||
|
||||
cmd = qxl_phys2virt(qxl, qxl->guest_surfaces.cmds[i],
|
||||
MEMSLOT_GROUP_GUEST);
|
||||
MEMSLOT_GROUP_GUEST, sizeof(QXLSurfaceCmd));
|
||||
assert(cmd);
|
||||
assert(cmd->type == QXL_SURFACE_CMD_CREATE);
|
||||
qxl_dirty_one_surface(qxl, cmd->u.surface_create.data,
|
||||
|
||||
@ -147,7 +147,28 @@ OBJECT_DECLARE_SIMPLE_TYPE(PCIQXLDevice, PCI_QXL)
|
||||
#define QXL_DEFAULT_REVISION (QXL_REVISION_STABLE_V12 + 1)
|
||||
|
||||
/* qxl.c */
|
||||
void *qxl_phys2virt(PCIQXLDevice *qxl, QXLPHYSICAL phys, int group_id);
|
||||
/**
|
||||
* qxl_phys2virt: Get a pointer within a PCI VRAM memory region.
|
||||
*
|
||||
* @qxl: QXL device
|
||||
* @phys: physical offset of buffer within the VRAM
|
||||
* @group_id: memory slot group
|
||||
* @size: size of the buffer
|
||||
*
|
||||
* Returns a host pointer to a buffer placed at offset @phys within the
|
||||
* active slot @group_id of the PCI VGA RAM memory region associated with
|
||||
* the @qxl device. If the slot is inactive, or the offset + size are out
|
||||
* of the memory region, returns NULL.
|
||||
*
|
||||
* Use with care; by the time this function returns, the returned pointer is
|
||||
* not protected by RCU anymore. If the caller is not within an RCU critical
|
||||
* section and does not hold the iothread lock, it must have other means of
|
||||
* protecting the pointer, such as a reference to the region that includes
|
||||
* the incoming ram_addr_t.
|
||||
*
|
||||
*/
|
||||
void *qxl_phys2virt(PCIQXLDevice *qxl, QXLPHYSICAL phys, int group_id,
|
||||
size_t size);
|
||||
void qxl_set_guest_bug(PCIQXLDevice *qxl, const char *msg, ...)
|
||||
G_GNUC_PRINTF(2, 3);
|
||||
|
||||
|
||||
@ -813,12 +813,13 @@ static void build_ich9_isa_aml(AcpiDevAmlIf *adev, Aml *scope)
|
||||
BusChild *kid;
|
||||
ICH9LPCState *s = ICH9_LPC_DEVICE(adev);
|
||||
BusState *bus = BUS(s->isa_bus);
|
||||
Aml *sb_scope = aml_scope("\\_SB");
|
||||
|
||||
/* ICH9 PCI to ISA irq remapping */
|
||||
aml_append(scope, aml_operation_region("PIRQ", AML_PCI_CONFIG,
|
||||
aml_int(0x60), 0x0C));
|
||||
/* Fields declarion has to happen *after* operation region */
|
||||
field = aml_field("PIRQ", AML_BYTE_ACC, AML_NOLOCK, AML_PRESERVE);
|
||||
field = aml_field("PCI0.SF8.PIRQ", AML_BYTE_ACC, AML_NOLOCK, AML_PRESERVE);
|
||||
aml_append(field, aml_named_field("PRQA", 8));
|
||||
aml_append(field, aml_named_field("PRQB", 8));
|
||||
aml_append(field, aml_named_field("PRQC", 8));
|
||||
@ -828,17 +829,8 @@ static void build_ich9_isa_aml(AcpiDevAmlIf *adev, Aml *scope)
|
||||
aml_append(field, aml_named_field("PRQF", 8));
|
||||
aml_append(field, aml_named_field("PRQG", 8));
|
||||
aml_append(field, aml_named_field("PRQH", 8));
|
||||
aml_append(scope, field);
|
||||
|
||||
/* hack: put fields into _SB scope for LNKx to find them */
|
||||
aml_append(scope, aml_alias("PRQA", "\\_SB.PRQA"));
|
||||
aml_append(scope, aml_alias("PRQB", "\\_SB.PRQB"));
|
||||
aml_append(scope, aml_alias("PRQC", "\\_SB.PRQC"));
|
||||
aml_append(scope, aml_alias("PRQD", "\\_SB.PRQD"));
|
||||
aml_append(scope, aml_alias("PRQE", "\\_SB.PRQE"));
|
||||
aml_append(scope, aml_alias("PRQF", "\\_SB.PRQF"));
|
||||
aml_append(scope, aml_alias("PRQG", "\\_SB.PRQG"));
|
||||
aml_append(scope, aml_alias("PRQH", "\\_SB.PRQH"));
|
||||
aml_append(sb_scope, field);
|
||||
aml_append(scope, sb_scope);
|
||||
|
||||
QTAILQ_FOREACH(kid, &bus->children, sibling) {
|
||||
call_dev_aml_func(DEVICE(kid->child), scope);
|
||||
|
||||
@ -318,24 +318,20 @@ static void build_pci_isa_aml(AcpiDevAmlIf *adev, Aml *scope)
|
||||
{
|
||||
Aml *field;
|
||||
BusChild *kid;
|
||||
Aml *sb_scope = aml_scope("\\_SB");
|
||||
BusState *bus = qdev_get_child_bus(DEVICE(adev), "isa.0");
|
||||
|
||||
/* PIIX PCI to ISA irq remapping */
|
||||
aml_append(scope, aml_operation_region("P40C", AML_PCI_CONFIG,
|
||||
aml_int(0x60), 0x04));
|
||||
/* Fields declarion has to happen *after* operation region */
|
||||
field = aml_field("P40C", AML_BYTE_ACC, AML_NOLOCK, AML_PRESERVE);
|
||||
field = aml_field("PCI0.S08.P40C", AML_BYTE_ACC, AML_NOLOCK, AML_PRESERVE);
|
||||
aml_append(field, aml_named_field("PRQ0", 8));
|
||||
aml_append(field, aml_named_field("PRQ1", 8));
|
||||
aml_append(field, aml_named_field("PRQ2", 8));
|
||||
aml_append(field, aml_named_field("PRQ3", 8));
|
||||
aml_append(scope, field);
|
||||
|
||||
/* hack: put fields into _SB scope for LNKx to find them */
|
||||
aml_append(scope, aml_alias("PRQ0", "\\_SB.PRQ0"));
|
||||
aml_append(scope, aml_alias("PRQ1", "\\_SB.PRQ1"));
|
||||
aml_append(scope, aml_alias("PRQ2", "\\_SB.PRQ2"));
|
||||
aml_append(scope, aml_alias("PRQ3", "\\_SB.PRQ3"));
|
||||
aml_append(sb_scope, field);
|
||||
aml_append(scope, sb_scope);
|
||||
|
||||
QTAILQ_FOREACH(kid, &bus->children, sibling) {
|
||||
call_dev_aml_func(DEVICE(kid->child), scope);
|
||||
|
||||
@ -226,7 +226,8 @@ static void build_uart_device_aml(Aml *table)
|
||||
aml_append(crs,
|
||||
aml_qword_memory(AML_POS_DECODE, AML_MIN_FIXED, AML_MAX_FIXED,
|
||||
AML_NON_CACHEABLE, AML_READ_WRITE,
|
||||
0, 0x1FE001E0, 0x1FE001E7, 0, 0x8));
|
||||
0, VIRT_UART_BASE, VIRT_UART_BASE + VIRT_UART_SIZE - 1,
|
||||
0, VIRT_UART_SIZE));
|
||||
aml_append(crs, aml_interrupt(AML_CONSUMER, AML_LEVEL, AML_ACTIVE_HIGH,
|
||||
AML_SHARED, &uart_irq, 1));
|
||||
aml_append(dev, aml_name_decl("_CRS", crs));
|
||||
|
||||
@ -53,7 +53,7 @@ static void fdt_add_rtc_node(LoongArchMachineState *lams)
|
||||
nodename = g_strdup_printf("/rtc@%" PRIx64, base);
|
||||
qemu_fdt_add_subnode(ms->fdt, nodename);
|
||||
qemu_fdt_setprop_string(ms->fdt, nodename, "compatible", "loongson,ls7a-rtc");
|
||||
qemu_fdt_setprop_sized_cells(ms->fdt, nodename, "reg", 0x0, base, size);
|
||||
qemu_fdt_setprop_sized_cells(ms->fdt, nodename, "reg", 2, base, 2, size);
|
||||
g_free(nodename);
|
||||
}
|
||||
|
||||
@ -69,6 +69,7 @@ static void fdt_add_uart_node(LoongArchMachineState *lams)
|
||||
qemu_fdt_setprop_string(ms->fdt, nodename, "compatible", "ns16550a");
|
||||
qemu_fdt_setprop_cells(ms->fdt, nodename, "reg", 0x0, base, 0x0, size);
|
||||
qemu_fdt_setprop_cell(ms->fdt, nodename, "clock-frequency", 100000000);
|
||||
qemu_fdt_setprop_string(ms->fdt, "/chosen", "stdout-path", nodename);
|
||||
g_free(nodename);
|
||||
}
|
||||
|
||||
@ -87,6 +88,7 @@ static void create_fdt(LoongArchMachineState *lams)
|
||||
"linux,dummy-loongson3");
|
||||
qemu_fdt_setprop_cell(ms->fdt, "/", "#address-cells", 0x2);
|
||||
qemu_fdt_setprop_cell(ms->fdt, "/", "#size-cells", 0x2);
|
||||
qemu_fdt_add_subnode(ms->fdt, "/chosen");
|
||||
}
|
||||
|
||||
static void fdt_add_cpu_nodes(const LoongArchMachineState *lams)
|
||||
|
||||
@ -75,6 +75,7 @@ static const int user_feature_bits[] = {
|
||||
VIRTIO_NET_F_MTU,
|
||||
VIRTIO_F_IOMMU_PLATFORM,
|
||||
VIRTIO_F_RING_PACKED,
|
||||
VIRTIO_F_RING_RESET,
|
||||
VIRTIO_NET_F_RSS,
|
||||
VIRTIO_NET_F_HASH_REPORT,
|
||||
|
||||
@ -258,7 +259,7 @@ static int vhost_net_start_one(struct vhost_net *net,
|
||||
goto fail_notifiers;
|
||||
}
|
||||
|
||||
r = vhost_dev_start(&net->dev, dev);
|
||||
r = vhost_dev_start(&net->dev, dev, false);
|
||||
if (r < 0) {
|
||||
goto fail_start;
|
||||
}
|
||||
@ -307,7 +308,7 @@ fail:
|
||||
if (net->nc->info->poll) {
|
||||
net->nc->info->poll(net->nc, true);
|
||||
}
|
||||
vhost_dev_stop(&net->dev, dev);
|
||||
vhost_dev_stop(&net->dev, dev, false);
|
||||
fail_start:
|
||||
vhost_dev_disable_notifiers(&net->dev, dev);
|
||||
fail_notifiers:
|
||||
@ -328,7 +329,7 @@ static void vhost_net_stop_one(struct vhost_net *net,
|
||||
if (net->nc->info->poll) {
|
||||
net->nc->info->poll(net->nc, true);
|
||||
}
|
||||
vhost_dev_stop(&net->dev, dev);
|
||||
vhost_dev_stop(&net->dev, dev, false);
|
||||
if (net->nc->info->stop) {
|
||||
net->nc->info->stop(net->nc);
|
||||
}
|
||||
@ -605,7 +606,7 @@ err_start:
|
||||
assert(r >= 0);
|
||||
}
|
||||
|
||||
vhost_dev_stop(&net->dev, vdev);
|
||||
vhost_dev_stop(&net->dev, vdev, false);
|
||||
|
||||
return r;
|
||||
}
|
||||
|
||||
182
hw/nvme/ctrl.c
182
hw/nvme/ctrl.c
@ -2329,7 +2329,6 @@ typedef struct NvmeDSMAIOCB {
|
||||
BlockAIOCB common;
|
||||
BlockAIOCB *aiocb;
|
||||
NvmeRequest *req;
|
||||
QEMUBH *bh;
|
||||
int ret;
|
||||
|
||||
NvmeDsmRange *range;
|
||||
@ -2351,7 +2350,7 @@ static void nvme_dsm_cancel(BlockAIOCB *aiocb)
|
||||
} else {
|
||||
/*
|
||||
* We only reach this if nvme_dsm_cancel() has already been called or
|
||||
* the command ran to completion and nvme_dsm_bh is scheduled to run.
|
||||
* the command ran to completion.
|
||||
*/
|
||||
assert(iocb->idx == iocb->nr);
|
||||
}
|
||||
@ -2362,17 +2361,6 @@ static const AIOCBInfo nvme_dsm_aiocb_info = {
|
||||
.cancel_async = nvme_dsm_cancel,
|
||||
};
|
||||
|
||||
static void nvme_dsm_bh(void *opaque)
|
||||
{
|
||||
NvmeDSMAIOCB *iocb = opaque;
|
||||
|
||||
iocb->common.cb(iocb->common.opaque, iocb->ret);
|
||||
|
||||
qemu_bh_delete(iocb->bh);
|
||||
iocb->bh = NULL;
|
||||
qemu_aio_unref(iocb);
|
||||
}
|
||||
|
||||
static void nvme_dsm_cb(void *opaque, int ret);
|
||||
|
||||
static void nvme_dsm_md_cb(void *opaque, int ret)
|
||||
@ -2384,16 +2372,10 @@ static void nvme_dsm_md_cb(void *opaque, int ret)
|
||||
uint64_t slba;
|
||||
uint32_t nlb;
|
||||
|
||||
if (ret < 0) {
|
||||
iocb->ret = ret;
|
||||
if (ret < 0 || iocb->ret < 0 || !ns->lbaf.ms) {
|
||||
goto done;
|
||||
}
|
||||
|
||||
if (!ns->lbaf.ms) {
|
||||
nvme_dsm_cb(iocb, 0);
|
||||
return;
|
||||
}
|
||||
|
||||
range = &iocb->range[iocb->idx - 1];
|
||||
slba = le64_to_cpu(range->slba);
|
||||
nlb = le32_to_cpu(range->nlb);
|
||||
@ -2406,7 +2388,6 @@ static void nvme_dsm_md_cb(void *opaque, int ret)
|
||||
ret = nvme_block_status_all(ns, slba, nlb, BDRV_BLOCK_ZERO);
|
||||
if (ret) {
|
||||
if (ret < 0) {
|
||||
iocb->ret = ret;
|
||||
goto done;
|
||||
}
|
||||
|
||||
@ -2420,8 +2401,7 @@ static void nvme_dsm_md_cb(void *opaque, int ret)
|
||||
return;
|
||||
|
||||
done:
|
||||
iocb->aiocb = NULL;
|
||||
qemu_bh_schedule(iocb->bh);
|
||||
nvme_dsm_cb(iocb, ret);
|
||||
}
|
||||
|
||||
static void nvme_dsm_cb(void *opaque, int ret)
|
||||
@ -2434,7 +2414,9 @@ static void nvme_dsm_cb(void *opaque, int ret)
|
||||
uint64_t slba;
|
||||
uint32_t nlb;
|
||||
|
||||
if (ret < 0) {
|
||||
if (iocb->ret < 0) {
|
||||
goto done;
|
||||
} else if (ret < 0) {
|
||||
iocb->ret = ret;
|
||||
goto done;
|
||||
}
|
||||
@ -2468,7 +2450,8 @@ next:
|
||||
|
||||
done:
|
||||
iocb->aiocb = NULL;
|
||||
qemu_bh_schedule(iocb->bh);
|
||||
iocb->common.cb(iocb->common.opaque, iocb->ret);
|
||||
qemu_aio_unref(iocb);
|
||||
}
|
||||
|
||||
static uint16_t nvme_dsm(NvmeCtrl *n, NvmeRequest *req)
|
||||
@ -2486,7 +2469,6 @@ static uint16_t nvme_dsm(NvmeCtrl *n, NvmeRequest *req)
|
||||
nvme_misc_cb, req);
|
||||
|
||||
iocb->req = req;
|
||||
iocb->bh = qemu_bh_new(nvme_dsm_bh, iocb);
|
||||
iocb->ret = 0;
|
||||
iocb->range = g_new(NvmeDsmRange, nr);
|
||||
iocb->nr = nr;
|
||||
@ -2570,7 +2552,6 @@ typedef struct NvmeCopyAIOCB {
|
||||
BlockAIOCB common;
|
||||
BlockAIOCB *aiocb;
|
||||
NvmeRequest *req;
|
||||
QEMUBH *bh;
|
||||
int ret;
|
||||
|
||||
void *ranges;
|
||||
@ -2608,9 +2589,8 @@ static const AIOCBInfo nvme_copy_aiocb_info = {
|
||||
.cancel_async = nvme_copy_cancel,
|
||||
};
|
||||
|
||||
static void nvme_copy_bh(void *opaque)
|
||||
static void nvme_copy_done(NvmeCopyAIOCB *iocb)
|
||||
{
|
||||
NvmeCopyAIOCB *iocb = opaque;
|
||||
NvmeRequest *req = iocb->req;
|
||||
NvmeNamespace *ns = req->ns;
|
||||
BlockAcctStats *stats = blk_get_stats(ns->blkconf.blk);
|
||||
@ -2622,9 +2602,6 @@ static void nvme_copy_bh(void *opaque)
|
||||
qemu_iovec_destroy(&iocb->iov);
|
||||
g_free(iocb->bounce);
|
||||
|
||||
qemu_bh_delete(iocb->bh);
|
||||
iocb->bh = NULL;
|
||||
|
||||
if (iocb->ret < 0) {
|
||||
block_acct_failed(stats, &iocb->acct.read);
|
||||
block_acct_failed(stats, &iocb->acct.write);
|
||||
@ -2637,7 +2614,7 @@ static void nvme_copy_bh(void *opaque)
|
||||
qemu_aio_unref(iocb);
|
||||
}
|
||||
|
||||
static void nvme_copy_cb(void *opaque, int ret);
|
||||
static void nvme_do_copy(NvmeCopyAIOCB *iocb);
|
||||
|
||||
static void nvme_copy_source_range_parse_format0(void *ranges, int idx,
|
||||
uint64_t *slba, uint32_t *nlb,
|
||||
@ -2749,7 +2726,7 @@ static void nvme_copy_out_completed_cb(void *opaque, int ret)
|
||||
iocb->idx++;
|
||||
iocb->slba += nlb;
|
||||
out:
|
||||
nvme_copy_cb(iocb, iocb->ret);
|
||||
nvme_do_copy(iocb);
|
||||
}
|
||||
|
||||
static void nvme_copy_out_cb(void *opaque, int ret)
|
||||
@ -2761,16 +2738,8 @@ static void nvme_copy_out_cb(void *opaque, int ret)
|
||||
size_t mlen;
|
||||
uint8_t *mbounce;
|
||||
|
||||
if (ret < 0) {
|
||||
iocb->ret = ret;
|
||||
if (ret < 0 || iocb->ret < 0 || !ns->lbaf.ms) {
|
||||
goto out;
|
||||
} else if (iocb->ret < 0) {
|
||||
goto out;
|
||||
}
|
||||
|
||||
if (!ns->lbaf.ms) {
|
||||
nvme_copy_out_completed_cb(iocb, 0);
|
||||
return;
|
||||
}
|
||||
|
||||
nvme_copy_source_range_parse(iocb->ranges, iocb->idx, iocb->format, NULL,
|
||||
@ -2789,7 +2758,7 @@ static void nvme_copy_out_cb(void *opaque, int ret)
|
||||
return;
|
||||
|
||||
out:
|
||||
nvme_copy_cb(iocb, ret);
|
||||
nvme_copy_out_completed_cb(iocb, ret);
|
||||
}
|
||||
|
||||
static void nvme_copy_in_completed_cb(void *opaque, int ret)
|
||||
@ -2883,15 +2852,9 @@ static void nvme_copy_in_completed_cb(void *opaque, int ret)
|
||||
|
||||
invalid:
|
||||
req->status = status;
|
||||
iocb->aiocb = NULL;
|
||||
if (iocb->bh) {
|
||||
qemu_bh_schedule(iocb->bh);
|
||||
}
|
||||
|
||||
return;
|
||||
|
||||
iocb->ret = -1;
|
||||
out:
|
||||
nvme_copy_cb(iocb, ret);
|
||||
nvme_do_copy(iocb);
|
||||
}
|
||||
|
||||
static void nvme_copy_in_cb(void *opaque, int ret)
|
||||
@ -2902,16 +2865,8 @@ static void nvme_copy_in_cb(void *opaque, int ret)
|
||||
uint64_t slba;
|
||||
uint32_t nlb;
|
||||
|
||||
if (ret < 0) {
|
||||
iocb->ret = ret;
|
||||
if (ret < 0 || iocb->ret < 0 || !ns->lbaf.ms) {
|
||||
goto out;
|
||||
} else if (iocb->ret < 0) {
|
||||
goto out;
|
||||
}
|
||||
|
||||
if (!ns->lbaf.ms) {
|
||||
nvme_copy_in_completed_cb(iocb, 0);
|
||||
return;
|
||||
}
|
||||
|
||||
nvme_copy_source_range_parse(iocb->ranges, iocb->idx, iocb->format, &slba,
|
||||
@ -2927,12 +2882,11 @@ static void nvme_copy_in_cb(void *opaque, int ret)
|
||||
return;
|
||||
|
||||
out:
|
||||
nvme_copy_cb(iocb, iocb->ret);
|
||||
nvme_copy_in_completed_cb(iocb, ret);
|
||||
}
|
||||
|
||||
static void nvme_copy_cb(void *opaque, int ret)
|
||||
static void nvme_do_copy(NvmeCopyAIOCB *iocb)
|
||||
{
|
||||
NvmeCopyAIOCB *iocb = opaque;
|
||||
NvmeRequest *req = iocb->req;
|
||||
NvmeNamespace *ns = req->ns;
|
||||
uint64_t slba;
|
||||
@ -2940,10 +2894,7 @@ static void nvme_copy_cb(void *opaque, int ret)
|
||||
size_t len;
|
||||
uint16_t status;
|
||||
|
||||
if (ret < 0) {
|
||||
iocb->ret = ret;
|
||||
goto done;
|
||||
} else if (iocb->ret < 0) {
|
||||
if (iocb->ret < 0) {
|
||||
goto done;
|
||||
}
|
||||
|
||||
@ -2990,13 +2941,10 @@ static void nvme_copy_cb(void *opaque, int ret)
|
||||
|
||||
invalid:
|
||||
req->status = status;
|
||||
iocb->ret = -1;
|
||||
done:
|
||||
iocb->aiocb = NULL;
|
||||
if (iocb->bh) {
|
||||
qemu_bh_schedule(iocb->bh);
|
||||
nvme_copy_done(iocb);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
static uint16_t nvme_copy(NvmeCtrl *n, NvmeRequest *req)
|
||||
{
|
||||
@ -3067,7 +3015,6 @@ static uint16_t nvme_copy(NvmeCtrl *n, NvmeRequest *req)
|
||||
}
|
||||
|
||||
iocb->req = req;
|
||||
iocb->bh = qemu_bh_new(nvme_copy_bh, iocb);
|
||||
iocb->ret = 0;
|
||||
iocb->nr = nr;
|
||||
iocb->idx = 0;
|
||||
@ -3084,7 +3031,7 @@ static uint16_t nvme_copy(NvmeCtrl *n, NvmeRequest *req)
|
||||
BLOCK_ACCT_WRITE);
|
||||
|
||||
req->aiocb = &iocb->common;
|
||||
nvme_copy_cb(iocb, 0);
|
||||
nvme_do_copy(iocb);
|
||||
|
||||
return NVME_NO_COMPLETE;
|
||||
|
||||
@ -3160,7 +3107,6 @@ typedef struct NvmeFlushAIOCB {
|
||||
BlockAIOCB common;
|
||||
BlockAIOCB *aiocb;
|
||||
NvmeRequest *req;
|
||||
QEMUBH *bh;
|
||||
int ret;
|
||||
|
||||
NvmeNamespace *ns;
|
||||
@ -3176,6 +3122,7 @@ static void nvme_flush_cancel(BlockAIOCB *acb)
|
||||
|
||||
if (iocb->aiocb) {
|
||||
blk_aio_cancel_async(iocb->aiocb);
|
||||
iocb->aiocb = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
@ -3185,6 +3132,8 @@ static const AIOCBInfo nvme_flush_aiocb_info = {
|
||||
.get_aio_context = nvme_get_aio_context,
|
||||
};
|
||||
|
||||
static void nvme_do_flush(NvmeFlushAIOCB *iocb);
|
||||
|
||||
static void nvme_flush_ns_cb(void *opaque, int ret)
|
||||
{
|
||||
NvmeFlushAIOCB *iocb = opaque;
|
||||
@ -3206,13 +3155,11 @@ static void nvme_flush_ns_cb(void *opaque, int ret)
|
||||
}
|
||||
|
||||
out:
|
||||
iocb->aiocb = NULL;
|
||||
qemu_bh_schedule(iocb->bh);
|
||||
nvme_do_flush(iocb);
|
||||
}
|
||||
|
||||
static void nvme_flush_bh(void *opaque)
|
||||
static void nvme_do_flush(NvmeFlushAIOCB *iocb)
|
||||
{
|
||||
NvmeFlushAIOCB *iocb = opaque;
|
||||
NvmeRequest *req = iocb->req;
|
||||
NvmeCtrl *n = nvme_ctrl(req);
|
||||
int i;
|
||||
@ -3239,14 +3186,8 @@ static void nvme_flush_bh(void *opaque)
|
||||
return;
|
||||
|
||||
done:
|
||||
qemu_bh_delete(iocb->bh);
|
||||
iocb->bh = NULL;
|
||||
|
||||
iocb->common.cb(iocb->common.opaque, iocb->ret);
|
||||
|
||||
qemu_aio_unref(iocb);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
static uint16_t nvme_flush(NvmeCtrl *n, NvmeRequest *req)
|
||||
@ -3258,7 +3199,6 @@ static uint16_t nvme_flush(NvmeCtrl *n, NvmeRequest *req)
|
||||
iocb = qemu_aio_get(&nvme_flush_aiocb_info, NULL, nvme_misc_cb, req);
|
||||
|
||||
iocb->req = req;
|
||||
iocb->bh = qemu_bh_new(nvme_flush_bh, iocb);
|
||||
iocb->ret = 0;
|
||||
iocb->ns = NULL;
|
||||
iocb->nsid = 0;
|
||||
@ -3280,13 +3220,11 @@ static uint16_t nvme_flush(NvmeCtrl *n, NvmeRequest *req)
|
||||
}
|
||||
|
||||
req->aiocb = &iocb->common;
|
||||
qemu_bh_schedule(iocb->bh);
|
||||
nvme_do_flush(iocb);
|
||||
|
||||
return NVME_NO_COMPLETE;
|
||||
|
||||
out:
|
||||
qemu_bh_delete(iocb->bh);
|
||||
iocb->bh = NULL;
|
||||
qemu_aio_unref(iocb);
|
||||
|
||||
return status;
|
||||
@ -3721,7 +3659,6 @@ typedef struct NvmeZoneResetAIOCB {
|
||||
BlockAIOCB common;
|
||||
BlockAIOCB *aiocb;
|
||||
NvmeRequest *req;
|
||||
QEMUBH *bh;
|
||||
int ret;
|
||||
|
||||
bool all;
|
||||
@ -3750,17 +3687,6 @@ static const AIOCBInfo nvme_zone_reset_aiocb_info = {
|
||||
.cancel_async = nvme_zone_reset_cancel,
|
||||
};
|
||||
|
||||
static void nvme_zone_reset_bh(void *opaque)
|
||||
{
|
||||
NvmeZoneResetAIOCB *iocb = opaque;
|
||||
|
||||
iocb->common.cb(iocb->common.opaque, iocb->ret);
|
||||
|
||||
qemu_bh_delete(iocb->bh);
|
||||
iocb->bh = NULL;
|
||||
qemu_aio_unref(iocb);
|
||||
}
|
||||
|
||||
static void nvme_zone_reset_cb(void *opaque, int ret);
|
||||
|
||||
static void nvme_zone_reset_epilogue_cb(void *opaque, int ret)
|
||||
@ -3771,14 +3697,8 @@ static void nvme_zone_reset_epilogue_cb(void *opaque, int ret)
|
||||
int64_t moff;
|
||||
int count;
|
||||
|
||||
if (ret < 0) {
|
||||
nvme_zone_reset_cb(iocb, ret);
|
||||
return;
|
||||
}
|
||||
|
||||
if (!ns->lbaf.ms) {
|
||||
nvme_zone_reset_cb(iocb, 0);
|
||||
return;
|
||||
if (ret < 0 || iocb->ret < 0 || !ns->lbaf.ms) {
|
||||
goto out;
|
||||
}
|
||||
|
||||
moff = nvme_moff(ns, iocb->zone->d.zslba);
|
||||
@ -3788,6 +3708,9 @@ static void nvme_zone_reset_epilogue_cb(void *opaque, int ret)
|
||||
BDRV_REQ_MAY_UNMAP,
|
||||
nvme_zone_reset_cb, iocb);
|
||||
return;
|
||||
|
||||
out:
|
||||
nvme_zone_reset_cb(iocb, ret);
|
||||
}
|
||||
|
||||
static void nvme_zone_reset_cb(void *opaque, int ret)
|
||||
@ -3796,7 +3719,9 @@ static void nvme_zone_reset_cb(void *opaque, int ret)
|
||||
NvmeRequest *req = iocb->req;
|
||||
NvmeNamespace *ns = req->ns;
|
||||
|
||||
if (ret < 0) {
|
||||
if (iocb->ret < 0) {
|
||||
goto done;
|
||||
} else if (ret < 0) {
|
||||
iocb->ret = ret;
|
||||
goto done;
|
||||
}
|
||||
@ -3844,9 +3769,9 @@ static void nvme_zone_reset_cb(void *opaque, int ret)
|
||||
|
||||
done:
|
||||
iocb->aiocb = NULL;
|
||||
if (iocb->bh) {
|
||||
qemu_bh_schedule(iocb->bh);
|
||||
}
|
||||
|
||||
iocb->common.cb(iocb->common.opaque, iocb->ret);
|
||||
qemu_aio_unref(iocb);
|
||||
}
|
||||
|
||||
static uint16_t nvme_zone_mgmt_send_zrwa_flush(NvmeCtrl *n, NvmeZone *zone,
|
||||
@ -3951,7 +3876,6 @@ static uint16_t nvme_zone_mgmt_send(NvmeCtrl *n, NvmeRequest *req)
|
||||
nvme_misc_cb, req);
|
||||
|
||||
iocb->req = req;
|
||||
iocb->bh = qemu_bh_new(nvme_zone_reset_bh, iocb);
|
||||
iocb->ret = 0;
|
||||
iocb->all = all;
|
||||
iocb->idx = zone_idx;
|
||||
@ -5741,7 +5665,6 @@ static uint16_t nvme_ns_attachment(NvmeCtrl *n, NvmeRequest *req)
|
||||
typedef struct NvmeFormatAIOCB {
|
||||
BlockAIOCB common;
|
||||
BlockAIOCB *aiocb;
|
||||
QEMUBH *bh;
|
||||
NvmeRequest *req;
|
||||
int ret;
|
||||
|
||||
@ -5756,14 +5679,15 @@ typedef struct NvmeFormatAIOCB {
|
||||
uint8_t pil;
|
||||
} NvmeFormatAIOCB;
|
||||
|
||||
static void nvme_format_bh(void *opaque);
|
||||
|
||||
static void nvme_format_cancel(BlockAIOCB *aiocb)
|
||||
{
|
||||
NvmeFormatAIOCB *iocb = container_of(aiocb, NvmeFormatAIOCB, common);
|
||||
|
||||
iocb->ret = -ECANCELED;
|
||||
|
||||
if (iocb->aiocb) {
|
||||
blk_aio_cancel_async(iocb->aiocb);
|
||||
iocb->aiocb = NULL;
|
||||
}
|
||||
}
|
||||
|
||||
@ -5787,13 +5711,17 @@ static void nvme_format_set(NvmeNamespace *ns, uint8_t lbaf, uint8_t mset,
|
||||
nvme_ns_init_format(ns);
|
||||
}
|
||||
|
||||
static void nvme_do_format(NvmeFormatAIOCB *iocb);
|
||||
|
||||
static void nvme_format_ns_cb(void *opaque, int ret)
|
||||
{
|
||||
NvmeFormatAIOCB *iocb = opaque;
|
||||
NvmeNamespace *ns = iocb->ns;
|
||||
int bytes;
|
||||
|
||||
if (ret < 0) {
|
||||
if (iocb->ret < 0) {
|
||||
goto done;
|
||||
} else if (ret < 0) {
|
||||
iocb->ret = ret;
|
||||
goto done;
|
||||
}
|
||||
@ -5817,8 +5745,7 @@ static void nvme_format_ns_cb(void *opaque, int ret)
|
||||
iocb->offset = 0;
|
||||
|
||||
done:
|
||||
iocb->aiocb = NULL;
|
||||
qemu_bh_schedule(iocb->bh);
|
||||
nvme_do_format(iocb);
|
||||
}
|
||||
|
||||
static uint16_t nvme_format_check(NvmeNamespace *ns, uint8_t lbaf, uint8_t pi)
|
||||
@ -5842,9 +5769,8 @@ static uint16_t nvme_format_check(NvmeNamespace *ns, uint8_t lbaf, uint8_t pi)
|
||||
return NVME_SUCCESS;
|
||||
}
|
||||
|
||||
static void nvme_format_bh(void *opaque)
|
||||
static void nvme_do_format(NvmeFormatAIOCB *iocb)
|
||||
{
|
||||
NvmeFormatAIOCB *iocb = opaque;
|
||||
NvmeRequest *req = iocb->req;
|
||||
NvmeCtrl *n = nvme_ctrl(req);
|
||||
uint32_t dw10 = le32_to_cpu(req->cmd.cdw10);
|
||||
@ -5882,11 +5808,7 @@ static void nvme_format_bh(void *opaque)
|
||||
return;
|
||||
|
||||
done:
|
||||
qemu_bh_delete(iocb->bh);
|
||||
iocb->bh = NULL;
|
||||
|
||||
iocb->common.cb(iocb->common.opaque, iocb->ret);
|
||||
|
||||
qemu_aio_unref(iocb);
|
||||
}
|
||||
|
||||
@ -5905,7 +5827,6 @@ static uint16_t nvme_format(NvmeCtrl *n, NvmeRequest *req)
|
||||
iocb = qemu_aio_get(&nvme_format_aiocb_info, NULL, nvme_misc_cb, req);
|
||||
|
||||
iocb->req = req;
|
||||
iocb->bh = qemu_bh_new(nvme_format_bh, iocb);
|
||||
iocb->ret = 0;
|
||||
iocb->ns = NULL;
|
||||
iocb->nsid = 0;
|
||||
@ -5934,14 +5855,13 @@ static uint16_t nvme_format(NvmeCtrl *n, NvmeRequest *req)
|
||||
}
|
||||
|
||||
req->aiocb = &iocb->common;
|
||||
qemu_bh_schedule(iocb->bh);
|
||||
nvme_do_format(iocb);
|
||||
|
||||
return NVME_NO_COMPLETE;
|
||||
|
||||
out:
|
||||
qemu_bh_delete(iocb->bh);
|
||||
iocb->bh = NULL;
|
||||
qemu_aio_unref(iocb);
|
||||
|
||||
return status;
|
||||
}
|
||||
|
||||
|
||||
@ -68,7 +68,7 @@ int vhost_scsi_common_start(VHostSCSICommon *vsc)
|
||||
goto err_guest_notifiers;
|
||||
}
|
||||
|
||||
ret = vhost_dev_start(&vsc->dev, vdev);
|
||||
ret = vhost_dev_start(&vsc->dev, vdev, true);
|
||||
if (ret < 0) {
|
||||
error_report("Error start vhost dev");
|
||||
goto err_guest_notifiers;
|
||||
@ -101,7 +101,7 @@ void vhost_scsi_common_stop(VHostSCSICommon *vsc)
|
||||
VirtioBusClass *k = VIRTIO_BUS_GET_CLASS(qbus);
|
||||
int ret = 0;
|
||||
|
||||
vhost_dev_stop(&vsc->dev, vdev);
|
||||
vhost_dev_stop(&vsc->dev, vdev, true);
|
||||
|
||||
if (k->set_guest_notifiers) {
|
||||
ret = k->set_guest_notifiers(qbus->parent, vsc->dev.nvqs, false);
|
||||
|
||||
@ -38,6 +38,7 @@ static const int kernel_feature_bits[] = {
|
||||
VIRTIO_RING_F_INDIRECT_DESC,
|
||||
VIRTIO_RING_F_EVENT_IDX,
|
||||
VIRTIO_SCSI_F_HOTPLUG,
|
||||
VIRTIO_F_RING_RESET,
|
||||
VHOST_INVALID_FEATURE_BIT
|
||||
};
|
||||
|
||||
|
||||
@ -36,6 +36,7 @@ static const int user_feature_bits[] = {
|
||||
VIRTIO_RING_F_INDIRECT_DESC,
|
||||
VIRTIO_RING_F_EVENT_IDX,
|
||||
VIRTIO_SCSI_F_HOTPLUG,
|
||||
VIRTIO_F_RING_RESET,
|
||||
VHOST_INVALID_FEATURE_BIT
|
||||
};
|
||||
|
||||
|
||||
@ -85,7 +85,7 @@ static void xhci_pci_reset(DeviceState *dev)
|
||||
{
|
||||
XHCIPciState *s = XHCI_PCI(dev);
|
||||
|
||||
device_legacy_reset(DEVICE(&s->xhci));
|
||||
device_cold_reset(DEVICE(&s->xhci));
|
||||
}
|
||||
|
||||
static int xhci_pci_vmstate_post_load(void *opaque, int version_id)
|
||||
|
||||
@ -29,7 +29,7 @@ void xhci_sysbus_reset(DeviceState *dev)
|
||||
{
|
||||
XHCISysbusState *s = XHCI_SYSBUS(dev);
|
||||
|
||||
device_legacy_reset(DEVICE(&s->xhci));
|
||||
device_cold_reset(DEVICE(&s->xhci));
|
||||
}
|
||||
|
||||
static void xhci_sysbus_realize(DeviceState *dev, Error **errp)
|
||||
|
||||
@ -796,7 +796,7 @@ static int xhci_ring_chain_length(XHCIState *xhci, const XHCIRing *ring)
|
||||
*/
|
||||
} while (length < TRB_LINK_LIMIT * 65536 / TRB_SIZE);
|
||||
|
||||
qemu_log_mask(LOG_GUEST_ERROR, "%s: exceeded maximum tranfer ring size!\n",
|
||||
qemu_log_mask(LOG_GUEST_ERROR, "%s: exceeded maximum transfer ring size!\n",
|
||||
__func__);
|
||||
|
||||
return -1;
|
||||
|
||||
@ -1280,8 +1280,7 @@ static void usbredir_create_parser(USBRedirDevice *dev)
|
||||
}
|
||||
#endif
|
||||
|
||||
if (runstate_check(RUN_STATE_INMIGRATE) ||
|
||||
runstate_check(RUN_STATE_PRELAUNCH)) {
|
||||
if (runstate_check(RUN_STATE_INMIGRATE)) {
|
||||
flags |= usbredirparser_fl_no_hello;
|
||||
}
|
||||
usbredirparser_init(dev->parser, VERSION, caps, USB_REDIR_CAPS_SIZE,
|
||||
|
||||
@ -9,8 +9,8 @@ vhost_section(const char *name) "%s"
|
||||
vhost_reject_section(const char *name, int d) "%s:%d"
|
||||
vhost_iotlb_miss(void *dev, int step) "%p step %d"
|
||||
vhost_dev_cleanup(void *dev) "%p"
|
||||
vhost_dev_start(void *dev, const char *name) "%p:%s"
|
||||
vhost_dev_stop(void *dev, const char *name) "%p:%s"
|
||||
vhost_dev_start(void *dev, const char *name, bool vrings) "%p:%s vrings:%d"
|
||||
vhost_dev_stop(void *dev, const char *name, bool vrings) "%p:%s vrings:%d"
|
||||
|
||||
|
||||
# vhost-user.c
|
||||
|
||||
@ -32,6 +32,7 @@ static const int user_feature_bits[] = {
|
||||
VIRTIO_F_NOTIFY_ON_EMPTY,
|
||||
VIRTIO_F_RING_PACKED,
|
||||
VIRTIO_F_IOMMU_PLATFORM,
|
||||
VIRTIO_F_RING_RESET,
|
||||
|
||||
VHOST_INVALID_FEATURE_BIT
|
||||
};
|
||||
@ -75,7 +76,7 @@ static void vuf_start(VirtIODevice *vdev)
|
||||
}
|
||||
|
||||
fs->vhost_dev.acked_features = vdev->guest_features;
|
||||
ret = vhost_dev_start(&fs->vhost_dev, vdev);
|
||||
ret = vhost_dev_start(&fs->vhost_dev, vdev, true);
|
||||
if (ret < 0) {
|
||||
error_report("Error starting vhost: %d", -ret);
|
||||
goto err_guest_notifiers;
|
||||
@ -109,7 +110,7 @@ static void vuf_stop(VirtIODevice *vdev)
|
||||
return;
|
||||
}
|
||||
|
||||
vhost_dev_stop(&fs->vhost_dev, vdev);
|
||||
vhost_dev_stop(&fs->vhost_dev, vdev, true);
|
||||
|
||||
ret = k->set_guest_notifiers(qbus->parent, fs->vhost_dev.nvqs, false);
|
||||
if (ret < 0) {
|
||||
|
||||
@ -24,6 +24,7 @@ static const int feature_bits[] = {
|
||||
VIRTIO_RING_F_INDIRECT_DESC,
|
||||
VIRTIO_RING_F_EVENT_IDX,
|
||||
VIRTIO_GPIO_F_IRQ,
|
||||
VIRTIO_F_RING_RESET,
|
||||
VHOST_INVALID_FEATURE_BIT
|
||||
};
|
||||
|
||||
@ -80,11 +81,12 @@ static int vu_gpio_start(VirtIODevice *vdev)
|
||||
*/
|
||||
vhost_ack_features(&gpio->vhost_dev, feature_bits, vdev->guest_features);
|
||||
|
||||
ret = vhost_dev_start(&gpio->vhost_dev, vdev);
|
||||
ret = vhost_dev_start(&gpio->vhost_dev, vdev, false);
|
||||
if (ret < 0) {
|
||||
error_report("Error starting vhost-user-gpio: %d", ret);
|
||||
goto err_guest_notifiers;
|
||||
}
|
||||
gpio->started_vu = true;
|
||||
|
||||
/*
|
||||
* guest_notifier_mask/pending not used yet, so just unmask
|
||||
@ -125,20 +127,16 @@ static void vu_gpio_stop(VirtIODevice *vdev)
|
||||
struct vhost_dev *vhost_dev = &gpio->vhost_dev;
|
||||
int ret;
|
||||
|
||||
if (!gpio->started_vu) {
|
||||
return;
|
||||
}
|
||||
gpio->started_vu = false;
|
||||
|
||||
if (!k->set_guest_notifiers) {
|
||||
return;
|
||||
}
|
||||
|
||||
/*
|
||||
* We can call vu_gpio_stop multiple times, for example from
|
||||
* vm_state_notify and the final object finalisation. Check we
|
||||
* aren't already stopped before doing so.
|
||||
*/
|
||||
if (!vhost_dev_is_started(vhost_dev)) {
|
||||
return;
|
||||
}
|
||||
|
||||
vhost_dev_stop(vhost_dev, vdev);
|
||||
vhost_dev_stop(vhost_dev, vdev, false);
|
||||
|
||||
ret = k->set_guest_notifiers(qbus->parent, vhost_dev->nvqs, false);
|
||||
if (ret < 0) {
|
||||
@ -235,6 +233,8 @@ static int vu_gpio_connect(DeviceState *dev, Error **errp)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void vu_gpio_event(void *opaque, QEMUChrEvent event);
|
||||
|
||||
static void vu_gpio_disconnect(DeviceState *dev)
|
||||
{
|
||||
VirtIODevice *vdev = VIRTIO_DEVICE(dev);
|
||||
@ -247,6 +247,11 @@ static void vu_gpio_disconnect(DeviceState *dev)
|
||||
|
||||
vu_gpio_stop(vdev);
|
||||
vhost_dev_cleanup(&gpio->vhost_dev);
|
||||
|
||||
/* Re-instate the event handler for new connections */
|
||||
qemu_chr_fe_set_handlers(&gpio->chardev,
|
||||
NULL, NULL, vu_gpio_event,
|
||||
NULL, dev, NULL, true);
|
||||
}
|
||||
|
||||
static void vu_gpio_event(void *opaque, QEMUChrEvent event)
|
||||
@ -264,7 +269,9 @@ static void vu_gpio_event(void *opaque, QEMUChrEvent event)
|
||||
}
|
||||
break;
|
||||
case CHR_EVENT_CLOSED:
|
||||
vu_gpio_disconnect(dev);
|
||||
/* defer close until later to avoid circular close */
|
||||
vhost_user_async_close(dev, &gpio->chardev, &gpio->vhost_dev,
|
||||
vu_gpio_disconnect);
|
||||
break;
|
||||
case CHR_EVENT_BREAK:
|
||||
case CHR_EVENT_MUX_IN:
|
||||
|
||||
@ -16,6 +16,7 @@
|
||||
|
||||
static const int feature_bits[] = {
|
||||
VIRTIO_I2C_F_ZERO_LENGTH_REQUEST,
|
||||
VIRTIO_F_RING_RESET,
|
||||
VHOST_INVALID_FEATURE_BIT
|
||||
};
|
||||
|
||||
@ -45,7 +46,7 @@ static void vu_i2c_start(VirtIODevice *vdev)
|
||||
|
||||
i2c->vhost_dev.acked_features = vdev->guest_features;
|
||||
|
||||
ret = vhost_dev_start(&i2c->vhost_dev, vdev);
|
||||
ret = vhost_dev_start(&i2c->vhost_dev, vdev, true);
|
||||
if (ret < 0) {
|
||||
error_report("Error starting vhost-user-i2c: %d", -ret);
|
||||
goto err_guest_notifiers;
|
||||
@ -79,7 +80,7 @@ static void vu_i2c_stop(VirtIODevice *vdev)
|
||||
return;
|
||||
}
|
||||
|
||||
vhost_dev_stop(&i2c->vhost_dev, vdev);
|
||||
vhost_dev_stop(&i2c->vhost_dev, vdev, true);
|
||||
|
||||
ret = k->set_guest_notifiers(qbus->parent, i2c->vhost_dev.nvqs, false);
|
||||
if (ret < 0) {
|
||||
|
||||
@ -16,6 +16,11 @@
|
||||
#include "qemu/error-report.h"
|
||||
#include "standard-headers/linux/virtio_ids.h"
|
||||
|
||||
static const int feature_bits[] = {
|
||||
VIRTIO_F_RING_RESET,
|
||||
VHOST_INVALID_FEATURE_BIT
|
||||
};
|
||||
|
||||
static void vu_rng_start(VirtIODevice *vdev)
|
||||
{
|
||||
VHostUserRNG *rng = VHOST_USER_RNG(vdev);
|
||||
@ -42,7 +47,7 @@ static void vu_rng_start(VirtIODevice *vdev)
|
||||
}
|
||||
|
||||
rng->vhost_dev.acked_features = vdev->guest_features;
|
||||
ret = vhost_dev_start(&rng->vhost_dev, vdev);
|
||||
ret = vhost_dev_start(&rng->vhost_dev, vdev, true);
|
||||
if (ret < 0) {
|
||||
error_report("Error starting vhost-user-rng: %d", -ret);
|
||||
goto err_guest_notifiers;
|
||||
@ -76,7 +81,7 @@ static void vu_rng_stop(VirtIODevice *vdev)
|
||||
return;
|
||||
}
|
||||
|
||||
vhost_dev_stop(&rng->vhost_dev, vdev);
|
||||
vhost_dev_stop(&rng->vhost_dev, vdev, true);
|
||||
|
||||
ret = k->set_guest_notifiers(qbus->parent, rng->vhost_dev.nvqs, false);
|
||||
if (ret < 0) {
|
||||
@ -106,8 +111,10 @@ static void vu_rng_set_status(VirtIODevice *vdev, uint8_t status)
|
||||
static uint64_t vu_rng_get_features(VirtIODevice *vdev,
|
||||
uint64_t requested_features, Error **errp)
|
||||
{
|
||||
/* No feature bits used yet */
|
||||
return requested_features;
|
||||
VHostUserRNG *rng = VHOST_USER_RNG(vdev);
|
||||
|
||||
return vhost_get_features(&rng->vhost_dev, feature_bits,
|
||||
requested_features);
|
||||
}
|
||||
|
||||
static void vu_rng_handle_output(VirtIODevice *vdev, VirtQueue *vq)
|
||||
|
||||
@ -21,6 +21,7 @@
|
||||
#include "qemu/error-report.h"
|
||||
#include "qemu/main-loop.h"
|
||||
#include "qemu/sockets.h"
|
||||
#include "sysemu/runstate.h"
|
||||
#include "sysemu/cryptodev.h"
|
||||
#include "migration/migration.h"
|
||||
#include "migration/postcopy-ram.h"
|
||||
@ -2670,6 +2671,76 @@ void vhost_user_cleanup(VhostUserState *user)
|
||||
user->chr = NULL;
|
||||
}
|
||||
|
||||
|
||||
typedef struct {
|
||||
vu_async_close_fn cb;
|
||||
DeviceState *dev;
|
||||
CharBackend *cd;
|
||||
struct vhost_dev *vhost;
|
||||
} VhostAsyncCallback;
|
||||
|
||||
static void vhost_user_async_close_bh(void *opaque)
|
||||
{
|
||||
VhostAsyncCallback *data = opaque;
|
||||
struct vhost_dev *vhost = data->vhost;
|
||||
|
||||
/*
|
||||
* If the vhost_dev has been cleared in the meantime there is
|
||||
* nothing left to do as some other path has completed the
|
||||
* cleanup.
|
||||
*/
|
||||
if (vhost->vdev) {
|
||||
data->cb(data->dev);
|
||||
}
|
||||
|
||||
g_free(data);
|
||||
}
|
||||
|
||||
/*
|
||||
* We only schedule the work if the machine is running. If suspended
|
||||
* we want to keep all the in-flight data as is for migration
|
||||
* purposes.
|
||||
*/
|
||||
void vhost_user_async_close(DeviceState *d,
|
||||
CharBackend *chardev, struct vhost_dev *vhost,
|
||||
vu_async_close_fn cb)
|
||||
{
|
||||
if (!runstate_check(RUN_STATE_SHUTDOWN)) {
|
||||
/*
|
||||
* A close event may happen during a read/write, but vhost
|
||||
* code assumes the vhost_dev remains setup, so delay the
|
||||
* stop & clear.
|
||||
*/
|
||||
AioContext *ctx = qemu_get_current_aio_context();
|
||||
VhostAsyncCallback *data = g_new0(VhostAsyncCallback, 1);
|
||||
|
||||
/* Save data for the callback */
|
||||
data->cb = cb;
|
||||
data->dev = d;
|
||||
data->cd = chardev;
|
||||
data->vhost = vhost;
|
||||
|
||||
/* Disable any further notifications on the chardev */
|
||||
qemu_chr_fe_set_handlers(chardev,
|
||||
NULL, NULL, NULL, NULL, NULL, NULL,
|
||||
false);
|
||||
|
||||
aio_bh_schedule_oneshot(ctx, vhost_user_async_close_bh, data);
|
||||
|
||||
/*
|
||||
* Move vhost device to the stopped state. The vhost-user device
|
||||
* will be clean up and disconnected in BH. This can be useful in
|
||||
* the vhost migration code. If disconnect was caught there is an
|
||||
* option for the general vhost code to get the dev state without
|
||||
* knowing its type (in this case vhost-user).
|
||||
*
|
||||
* Note if the vhost device is fully cleared by the time we
|
||||
* execute the bottom half we won't continue with the cleanup.
|
||||
*/
|
||||
vhost->started = false;
|
||||
}
|
||||
}
|
||||
|
||||
static int vhost_user_dev_start(struct vhost_dev *dev, bool started)
|
||||
{
|
||||
if (!virtio_has_feature(dev->protocol_features,
|
||||
|
||||
@ -21,6 +21,7 @@
|
||||
|
||||
const int feature_bits[] = {
|
||||
VIRTIO_VSOCK_F_SEQPACKET,
|
||||
VIRTIO_F_RING_RESET,
|
||||
VHOST_INVALID_FEATURE_BIT
|
||||
};
|
||||
|
||||
@ -69,7 +70,7 @@ int vhost_vsock_common_start(VirtIODevice *vdev)
|
||||
}
|
||||
|
||||
vvc->vhost_dev.acked_features = vdev->guest_features;
|
||||
ret = vhost_dev_start(&vvc->vhost_dev, vdev);
|
||||
ret = vhost_dev_start(&vvc->vhost_dev, vdev, true);
|
||||
if (ret < 0) {
|
||||
error_report("Error starting vhost: %d", -ret);
|
||||
goto err_guest_notifiers;
|
||||
@ -104,7 +105,7 @@ void vhost_vsock_common_stop(VirtIODevice *vdev)
|
||||
return;
|
||||
}
|
||||
|
||||
vhost_dev_stop(&vvc->vhost_dev, vdev);
|
||||
vhost_dev_stop(&vvc->vhost_dev, vdev, true);
|
||||
|
||||
ret = k->set_guest_notifiers(qbus->parent, vvc->vhost_dev.nvqs, false);
|
||||
if (ret < 0) {
|
||||
|
||||
@ -1777,15 +1777,36 @@ int vhost_dev_get_inflight(struct vhost_dev *dev, uint16_t queue_size,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int vhost_dev_set_vring_enable(struct vhost_dev *hdev, int enable)
|
||||
{
|
||||
if (!hdev->vhost_ops->vhost_set_vring_enable) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* For vhost-user devices, if VHOST_USER_F_PROTOCOL_FEATURES has not
|
||||
* been negotiated, the rings start directly in the enabled state, and
|
||||
* .vhost_set_vring_enable callback will fail since
|
||||
* VHOST_USER_SET_VRING_ENABLE is not supported.
|
||||
*/
|
||||
if (hdev->vhost_ops->backend_type == VHOST_BACKEND_TYPE_USER &&
|
||||
!virtio_has_feature(hdev->backend_features,
|
||||
VHOST_USER_F_PROTOCOL_FEATURES)) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
return hdev->vhost_ops->vhost_set_vring_enable(hdev, enable);
|
||||
}
|
||||
|
||||
/* Host notifiers must be enabled at this point. */
|
||||
int vhost_dev_start(struct vhost_dev *hdev, VirtIODevice *vdev)
|
||||
int vhost_dev_start(struct vhost_dev *hdev, VirtIODevice *vdev, bool vrings)
|
||||
{
|
||||
int i, r;
|
||||
|
||||
/* should only be called after backend is connected */
|
||||
assert(hdev->vhost_ops);
|
||||
|
||||
trace_vhost_dev_start(hdev, vdev->name);
|
||||
trace_vhost_dev_start(hdev, vdev->name, vrings);
|
||||
|
||||
vdev->vhost_started = true;
|
||||
hdev->started = true;
|
||||
@ -1830,10 +1851,16 @@ int vhost_dev_start(struct vhost_dev *hdev, VirtIODevice *vdev)
|
||||
goto fail_log;
|
||||
}
|
||||
}
|
||||
if (vrings) {
|
||||
r = vhost_dev_set_vring_enable(hdev, true);
|
||||
if (r) {
|
||||
goto fail_log;
|
||||
}
|
||||
}
|
||||
if (hdev->vhost_ops->vhost_dev_start) {
|
||||
r = hdev->vhost_ops->vhost_dev_start(hdev, true);
|
||||
if (r) {
|
||||
goto fail_log;
|
||||
goto fail_start;
|
||||
}
|
||||
}
|
||||
if (vhost_dev_has_iommu(hdev) &&
|
||||
@ -1848,6 +1875,10 @@ int vhost_dev_start(struct vhost_dev *hdev, VirtIODevice *vdev)
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
fail_start:
|
||||
if (vrings) {
|
||||
vhost_dev_set_vring_enable(hdev, false);
|
||||
}
|
||||
fail_log:
|
||||
vhost_log_put(hdev, false);
|
||||
fail_vq:
|
||||
@ -1866,18 +1897,21 @@ fail_features:
|
||||
}
|
||||
|
||||
/* Host notifiers must be enabled at this point. */
|
||||
void vhost_dev_stop(struct vhost_dev *hdev, VirtIODevice *vdev)
|
||||
void vhost_dev_stop(struct vhost_dev *hdev, VirtIODevice *vdev, bool vrings)
|
||||
{
|
||||
int i;
|
||||
|
||||
/* should only be called after backend is connected */
|
||||
assert(hdev->vhost_ops);
|
||||
|
||||
trace_vhost_dev_stop(hdev, vdev->name);
|
||||
trace_vhost_dev_stop(hdev, vdev->name, vrings);
|
||||
|
||||
if (hdev->vhost_ops->vhost_dev_start) {
|
||||
hdev->vhost_ops->vhost_dev_start(hdev, false);
|
||||
}
|
||||
if (vrings) {
|
||||
vhost_dev_set_vring_enable(hdev, false);
|
||||
}
|
||||
for (i = 0; i < hdev->nvqs; ++i) {
|
||||
vhost_virtqueue_stop(hdev,
|
||||
vdev,
|
||||
|
||||
@ -2499,10 +2499,17 @@ void virtio_queue_enable(VirtIODevice *vdev, uint32_t queue_index)
|
||||
{
|
||||
VirtioDeviceClass *k = VIRTIO_DEVICE_GET_CLASS(vdev);
|
||||
|
||||
/*
|
||||
* TODO: Seabios is currently out of spec and triggering this error.
|
||||
* So this needs to be fixed in Seabios, then this can
|
||||
* be re-enabled for new machine types only, and also after
|
||||
* being converted to LOG_GUEST_ERROR.
|
||||
*
|
||||
if (!virtio_vdev_has_feature(vdev, VIRTIO_F_VERSION_1)) {
|
||||
error_report("queue_enable is only suppported in devices of virtio "
|
||||
"1.0 or later.");
|
||||
}
|
||||
*/
|
||||
|
||||
if (k->queue_enable) {
|
||||
k->queue_enable(vdev, queue_index);
|
||||
|
||||
@ -28,7 +28,17 @@ struct VHostUserGPIO {
|
||||
VhostUserState vhost_user;
|
||||
VirtQueue *command_vq;
|
||||
VirtQueue *interrupt_vq;
|
||||
/**
|
||||
* There are at least two steps of initialization of the
|
||||
* vhost-user device. The first is a "connect" step and
|
||||
* second is a "start" step. Make a separation between
|
||||
* those initialization phases by using two fields.
|
||||
*
|
||||
* @connected: see vu_gpio_connect()/vu_gpio_disconnect()
|
||||
* @started_vu: see vu_gpio_start()/vu_gpio_stop()
|
||||
*/
|
||||
bool connected;
|
||||
bool started_vu;
|
||||
/*< public >*/
|
||||
};
|
||||
|
||||
|
||||
@ -68,4 +68,22 @@ bool vhost_user_init(VhostUserState *user, CharBackend *chr, Error **errp);
|
||||
*/
|
||||
void vhost_user_cleanup(VhostUserState *user);
|
||||
|
||||
/**
|
||||
* vhost_user_async_close() - cleanup vhost-user post connection drop
|
||||
* @d: DeviceState for the associated device (passed to callback)
|
||||
* @chardev: the CharBackend associated with the connection
|
||||
* @vhost: the common vhost device
|
||||
* @cb: the user callback function to complete the clean-up
|
||||
*
|
||||
* This function is used to handle the shutdown of a vhost-user
|
||||
* connection to a backend. We handle this centrally to make sure we
|
||||
* do all the steps and handle potential races due to VM shutdowns.
|
||||
* Once the connection is disabled we call a backhalf to ensure
|
||||
*/
|
||||
typedef void (*vu_async_close_fn)(DeviceState *cb);
|
||||
|
||||
void vhost_user_async_close(DeviceState *d,
|
||||
CharBackend *chardev, struct vhost_dev *vhost,
|
||||
vu_async_close_fn cb);
|
||||
|
||||
#endif
|
||||
|
||||
@ -184,24 +184,26 @@ static inline bool vhost_dev_is_started(struct vhost_dev *hdev)
|
||||
* vhost_dev_start() - start the vhost device
|
||||
* @hdev: common vhost_dev structure
|
||||
* @vdev: the VirtIODevice structure
|
||||
* @vrings: true to have vrings enabled in this call
|
||||
*
|
||||
* Starts the vhost device. From this point VirtIO feature negotiation
|
||||
* can start and the device can start processing VirtIO transactions.
|
||||
*
|
||||
* Return: 0 on success, < 0 on error.
|
||||
*/
|
||||
int vhost_dev_start(struct vhost_dev *hdev, VirtIODevice *vdev);
|
||||
int vhost_dev_start(struct vhost_dev *hdev, VirtIODevice *vdev, bool vrings);
|
||||
|
||||
/**
|
||||
* vhost_dev_stop() - stop the vhost device
|
||||
* @hdev: common vhost_dev structure
|
||||
* @vdev: the VirtIODevice structure
|
||||
* @vrings: true to have vrings disabled in this call
|
||||
*
|
||||
* Stop the vhost device. After the device is stopped the notifiers
|
||||
* can be disabled (@vhost_dev_disable_notifiers) and the device can
|
||||
* be torn down (@vhost_dev_cleanup).
|
||||
*/
|
||||
void vhost_dev_stop(struct vhost_dev *hdev, VirtIODevice *vdev);
|
||||
void vhost_dev_stop(struct vhost_dev *hdev, VirtIODevice *vdev, bool vrings);
|
||||
|
||||
/**
|
||||
* DOC: vhost device configuration handling
|
||||
|
||||
@ -116,6 +116,13 @@ struct VirtIODevice
|
||||
bool broken; /* device in invalid state, needs reset */
|
||||
bool use_disabled_flag; /* allow use of 'disable' flag when needed */
|
||||
bool disabled; /* device in temporarily disabled state */
|
||||
/**
|
||||
* @use_started: true if the @started flag should be used to check the
|
||||
* current state of the VirtIO device. Otherwise status bits
|
||||
* should be checked for a current status of the device.
|
||||
* @use_started is only set via QMP and defaults to true for all
|
||||
* modern machines (since 4.1).
|
||||
*/
|
||||
bool use_started;
|
||||
bool started;
|
||||
bool start_on_kick; /* when virtio 1.0 feature has not been negotiated */
|
||||
@ -391,6 +398,16 @@ static inline bool virtio_is_big_endian(VirtIODevice *vdev)
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* virtio_device_started() - check if device started
|
||||
* @vdev - the VirtIO device
|
||||
* @status - the devices status bits
|
||||
*
|
||||
* Check if the device is started. For most modern machines this is
|
||||
* tracked via the @vdev->started field (to support migration),
|
||||
* otherwise we check for the final negotiated status bit that
|
||||
* indicates everything is ready.
|
||||
*/
|
||||
static inline bool virtio_device_started(VirtIODevice *vdev, uint8_t status)
|
||||
{
|
||||
if (vdev->use_started) {
|
||||
@ -411,15 +428,11 @@ static inline bool virtio_device_started(VirtIODevice *vdev, uint8_t status)
|
||||
*/
|
||||
static inline bool virtio_device_should_start(VirtIODevice *vdev, uint8_t status)
|
||||
{
|
||||
if (vdev->use_started) {
|
||||
return vdev->started;
|
||||
}
|
||||
|
||||
if (!vdev->vm_running) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return status & VIRTIO_CONFIG_S_DRIVER_OK;
|
||||
return virtio_device_started(vdev, status);
|
||||
}
|
||||
|
||||
static inline void virtio_set_started(VirtIODevice *vdev, bool started)
|
||||
|
||||
@ -177,7 +177,8 @@ ssize_t qemu_send_packet_async(NetClientState *nc, const uint8_t *buf,
|
||||
void qemu_purge_queued_packets(NetClientState *nc);
|
||||
void qemu_flush_queued_packets(NetClientState *nc);
|
||||
void qemu_flush_or_purge_queued_packets(NetClientState *nc, bool purge);
|
||||
void qemu_set_info_str(NetClientState *nc, const char *fmt, ...);
|
||||
void qemu_set_info_str(NetClientState *nc,
|
||||
const char *fmt, ...) G_GNUC_PRINTF(2, 3);
|
||||
void qemu_format_nic_info_str(NetClientState *nc, uint8_t macaddr[6]);
|
||||
bool qemu_has_ufo(NetClientState *nc);
|
||||
bool qemu_has_vnet_hdr(NetClientState *nc);
|
||||
|
||||
4
libafl_extras/meson.build
Normal file
4
libafl_extras/meson.build
Normal file
@ -0,0 +1,4 @@
|
||||
specific_ss.add(when: 'CONFIG_SOFTMMU', if_true: [files(
|
||||
'syx-snapshot/device-save.c',
|
||||
'syx-snapshot/syx-snapshot.c',
|
||||
)])
|
||||
16
libafl_extras/syx-misc.h
Normal file
16
libafl_extras/syx-misc.h
Normal file
@ -0,0 +1,16 @@
|
||||
#pragma once
|
||||
//#ifdef QEMU_SYX
|
||||
|
||||
#define SYX_PRINTF(format, ...) fprintf(stderr, ("[QEMU-SYX] " format), ##__VA_ARGS__)
|
||||
|
||||
#ifdef CONFIG_DEBUG_SYX
|
||||
#define SYX_DEBUG(format, ...) fprintf(stderr, ("[QEMU-SYX] DEBUG: " format), ##__VA_ARGS__)
|
||||
#else
|
||||
#define SYX_DEBUG(format, ...)
|
||||
#endif
|
||||
|
||||
#define SYX_WARNING(format, ...) warn_report(("[QEMU-SYX] " format), ##__VA_ARGS__)
|
||||
|
||||
#define SYX_ERROR(format, ...) error_report(("[QEMU-SYX] " format), ##__VA_ARGS__)
|
||||
|
||||
//#endif
|
||||
147
libafl_extras/syx-snapshot/device-save.c
Normal file
147
libafl_extras/syx-snapshot/device-save.c
Normal file
@ -0,0 +1,147 @@
|
||||
#include "qemu/osdep.h"
|
||||
#include "device-save.h"
|
||||
#include "migration/qemu-file.h"
|
||||
#include "migration/vmstate.h"
|
||||
#include "qemu/main-loop.h"
|
||||
#include "libafl_extras/syx-misc.h"
|
||||
|
||||
#include "migration/savevm.h"
|
||||
|
||||
#define QEMU_FILE_RAM_LIMIT (32 * 1024 * 1024)
|
||||
|
||||
///// From migration/savevm.c
|
||||
|
||||
#include "qapi/qapi-commands-migration.h"
|
||||
#include "migration/vmstate.h"
|
||||
#include "migration/register.h"
|
||||
#include "qemu/uuid.h"
|
||||
|
||||
typedef struct CompatEntry {
|
||||
char idstr[256];
|
||||
int instance_id;
|
||||
} CompatEntry;
|
||||
|
||||
typedef struct SaveStateEntry {
|
||||
QTAILQ_ENTRY(SaveStateEntry) entry;
|
||||
char idstr[256];
|
||||
uint32_t instance_id;
|
||||
int alias_id;
|
||||
int version_id;
|
||||
/* version id read from the stream */
|
||||
int load_version_id;
|
||||
int section_id;
|
||||
/* section id read from the stream */
|
||||
int load_section_id;
|
||||
const SaveVMHandlers *ops;
|
||||
const VMStateDescription *vmsd;
|
||||
void *opaque;
|
||||
CompatEntry *compat;
|
||||
int is_ram;
|
||||
} SaveStateEntry;
|
||||
|
||||
typedef struct SaveState {
|
||||
QTAILQ_HEAD(, SaveStateEntry) handlers;
|
||||
SaveStateEntry *handler_pri_head[MIG_PRI_MAX + 1];
|
||||
int global_section_id;
|
||||
uint32_t len;
|
||||
const char *name;
|
||||
uint32_t target_page_bits;
|
||||
uint32_t caps_count;
|
||||
MigrationCapability *capabilities;
|
||||
QemuUUID uuid;
|
||||
} SaveState;
|
||||
|
||||
///// End migration/savevm.c
|
||||
|
||||
int libafl_restoring_devices;
|
||||
|
||||
extern SaveState savevm_state;
|
||||
|
||||
void save_section_header(QEMUFile *f, SaveStateEntry *se, uint8_t section_type);
|
||||
void save_section_footer(QEMUFile *f, SaveStateEntry *se);
|
||||
int vmstate_save(QEMUFile *f, SaveStateEntry *se, JSONWriter *vmdesc);
|
||||
|
||||
// iothread must be locked
|
||||
device_save_state_t* device_save_all(void) {
|
||||
device_save_state_t* dss = g_new0(device_save_state_t, 1);
|
||||
SaveStateEntry *se;
|
||||
|
||||
dss->kind = DEVICE_SAVE_KIND_FULL;
|
||||
dss->save_buffer = qio_channel_buffer_new(QEMU_FILE_RAM_LIMIT);
|
||||
|
||||
QEMUFile* f = qemu_file_new_output(QIO_CHANNEL(dss->save_buffer));
|
||||
|
||||
QTAILQ_FOREACH(se, &savevm_state.handlers, entry) {
|
||||
int ret;
|
||||
|
||||
if (se->is_ram) {
|
||||
continue;
|
||||
}
|
||||
if ((!se->ops || !se->ops->save_state) && !se->vmsd) {
|
||||
continue;
|
||||
}
|
||||
if (se->vmsd && !vmstate_save_needed(se->vmsd, se->opaque)) {
|
||||
continue;
|
||||
}
|
||||
if (!strcmp(se->idstr, "globalstate")) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// printf("Saving section %p %s...\n", se, se->idstr);
|
||||
|
||||
save_section_header(f, se, QEMU_VM_SECTION_FULL);
|
||||
|
||||
ret = vmstate_save(f, se, NULL);
|
||||
|
||||
if (ret) {
|
||||
SYX_PRINTF("Device save all error: %d\n", ret);
|
||||
abort();
|
||||
}
|
||||
|
||||
save_section_footer(f, se);
|
||||
}
|
||||
|
||||
printf("\n");
|
||||
|
||||
qemu_put_byte(f, QEMU_VM_EOF);
|
||||
|
||||
qemu_fflush(f);
|
||||
|
||||
// fclose will call io_close and free device_save_state->save_buffer, don't do that
|
||||
//qemu_fclose(f);
|
||||
|
||||
return dss;
|
||||
}
|
||||
|
||||
void device_restore_all(device_save_state_t* device_save_state) {
|
||||
bool must_unlock_iothread = false;
|
||||
|
||||
Error* errp = NULL;
|
||||
qio_channel_io_seek(QIO_CHANNEL(device_save_state->save_buffer), 0, SEEK_SET, &errp);
|
||||
QEMUFile* f = qemu_file_new_input(QIO_CHANNEL(device_save_state->save_buffer));
|
||||
|
||||
if (!qemu_mutex_iothread_locked()) {
|
||||
qemu_mutex_lock_iothread();
|
||||
must_unlock_iothread = true;
|
||||
}
|
||||
|
||||
int save_libafl_restoring_devices = libafl_restoring_devices;
|
||||
libafl_restoring_devices = 1;
|
||||
|
||||
qemu_load_device_state(f);
|
||||
|
||||
libafl_restoring_devices = save_libafl_restoring_devices;
|
||||
|
||||
if (must_unlock_iothread) {
|
||||
qemu_mutex_unlock_iothread();
|
||||
}
|
||||
|
||||
// qemu_fclose(f);
|
||||
}
|
||||
|
||||
void device_free_all(device_save_state_t* dss) {
|
||||
// g_free(dss->save_buffer);
|
||||
Error* errp = NULL;
|
||||
qio_channel_close(QIO_CHANNEL(dss->save_buffer), &errp);
|
||||
object_unref(OBJECT(dss->save_buffer));
|
||||
}
|
||||
16
libafl_extras/syx-snapshot/device-save.h
Normal file
16
libafl_extras/syx-snapshot/device-save.h
Normal file
@ -0,0 +1,16 @@
|
||||
#pragma once
|
||||
|
||||
#include "qemu/osdep.h"
|
||||
#include "io/channel-buffer.h"
|
||||
|
||||
#define DEVICE_SAVE_KIND_FULL 0
|
||||
|
||||
typedef struct device_save_state_s {
|
||||
uint8_t kind;
|
||||
QIOChannelBuffer* save_buffer;
|
||||
QEMUFile* save_file;
|
||||
} device_save_state_t;
|
||||
|
||||
device_save_state_t* device_save_all(void);
|
||||
void device_restore_all(device_save_state_t* device_save_state);
|
||||
void device_free_all(device_save_state_t* dss);
|
||||
429
libafl_extras/syx-snapshot/syx-snapshot.c
Normal file
429
libafl_extras/syx-snapshot/syx-snapshot.c
Normal file
@ -0,0 +1,429 @@
|
||||
#include "qemu/osdep.h"
|
||||
//#include "qemu-common.h"
|
||||
#include "sysemu/sysemu.h"
|
||||
#include "cpu.h"
|
||||
#include "qemu/main-loop.h"
|
||||
#include "migration/qemu-file.h"
|
||||
#include "migration/vmstate.h"
|
||||
#include "migration/savevm.h"
|
||||
#include "memory.h"
|
||||
|
||||
#include "exec/ram_addr.h"
|
||||
#include "exec/ramlist.h"
|
||||
#include "exec/address-spaces.h"
|
||||
#include "exec/exec-all.h"
|
||||
|
||||
#include "sysemu/block-backend.h"
|
||||
#include "migration/register.h"
|
||||
|
||||
#include "syx-snapshot.h"
|
||||
#include "device-save.h"
|
||||
|
||||
///// From migration/savevm.c
|
||||
|
||||
#include "qapi/qapi-commands-migration.h"
|
||||
#include "migration/vmstate.h"
|
||||
#include "migration/register.h"
|
||||
#include "qemu/uuid.h"
|
||||
|
||||
typedef struct CompatEntry {
|
||||
char idstr[256];
|
||||
int instance_id;
|
||||
} CompatEntry;
|
||||
|
||||
typedef struct SaveStateEntry {
|
||||
QTAILQ_ENTRY(SaveStateEntry) entry;
|
||||
char idstr[256];
|
||||
uint32_t instance_id;
|
||||
int alias_id;
|
||||
int version_id;
|
||||
/* version id read from the stream */
|
||||
int load_version_id;
|
||||
int section_id;
|
||||
/* section id read from the stream */
|
||||
int load_section_id;
|
||||
const SaveVMHandlers *ops;
|
||||
const VMStateDescription *vmsd;
|
||||
void *opaque;
|
||||
CompatEntry *compat;
|
||||
int is_ram;
|
||||
} SaveStateEntry;
|
||||
|
||||
typedef struct SaveState {
|
||||
QTAILQ_HEAD(, SaveStateEntry) handlers;
|
||||
SaveStateEntry *handler_pri_head[MIG_PRI_MAX + 1];
|
||||
int global_section_id;
|
||||
uint32_t len;
|
||||
const char *name;
|
||||
uint32_t target_page_bits;
|
||||
uint32_t caps_count;
|
||||
MigrationCapability *capabilities;
|
||||
QemuUUID uuid;
|
||||
} SaveState;
|
||||
|
||||
///// End migration/savevm.c
|
||||
|
||||
#define SYX_SNAPSHOT_LIST_INIT_SIZE 4096
|
||||
#define SYX_SNAPSHOT_LIST_GROW_FACTOR 2
|
||||
|
||||
syx_snapshot_state_t syx_snapshot_state = {0};
|
||||
|
||||
void syx_snapshot_init(void) {
|
||||
uint64_t page_size = TARGET_PAGE_SIZE;
|
||||
|
||||
syx_snapshot_state.page_size = page_size;
|
||||
syx_snapshot_state.page_mask = ((uint64_t)-1) << __builtin_ctz(page_size);
|
||||
|
||||
syx_snapshot_state.tracked_snapshots = syx_snapshot_tracker_init();
|
||||
|
||||
syx_snapshot_state.is_enabled = false;
|
||||
}
|
||||
|
||||
syx_snapshot_t* syx_snapshot_create(bool track) {
|
||||
syx_snapshot_t* snapshot = g_new0(syx_snapshot_t, 1);
|
||||
|
||||
snapshot->root_snapshot = syx_snapshot_root_create();
|
||||
snapshot->last_incremental_snapshot = NULL;
|
||||
snapshot->dirty_list = syx_snapshot_dirty_list_create();
|
||||
|
||||
if (track) {
|
||||
syx_snapshot_track(&syx_snapshot_state.tracked_snapshots, snapshot);
|
||||
}
|
||||
|
||||
syx_snapshot_state.is_enabled = true;
|
||||
|
||||
return snapshot;
|
||||
}
|
||||
|
||||
void syx_snapshot_free(syx_snapshot_t* snapshot) {
|
||||
syx_snapshot_increment_t* increment = snapshot->last_incremental_snapshot;
|
||||
|
||||
while (increment != NULL) {
|
||||
increment = syx_snapshot_increment_free(increment);
|
||||
}
|
||||
|
||||
syx_snapshot_dirty_list_free(&snapshot->dirty_list);
|
||||
syx_snapshot_root_free(&snapshot->root_snapshot);
|
||||
|
||||
g_free(snapshot);
|
||||
}
|
||||
|
||||
syx_snapshot_root_t syx_snapshot_root_create(void) {
|
||||
syx_snapshot_root_t root = {0};
|
||||
|
||||
RAMBlock* block;
|
||||
uint64_t nb_blocks = 0;
|
||||
device_save_state_t* dss = device_save_all();
|
||||
|
||||
RAMBLOCK_FOREACH(block) {
|
||||
nb_blocks++;
|
||||
}
|
||||
|
||||
root.ram_blocks = g_new0(syx_snapshot_ramblock_t, nb_blocks);
|
||||
root.nb_ram_blocks = nb_blocks;
|
||||
root.dss = dss;
|
||||
|
||||
uint64_t ram_block_idx = 0;
|
||||
RAMBLOCK_FOREACH(block) {
|
||||
syx_snapshot_ramblock_t* snapshot_ram_block = &root.ram_blocks[ram_block_idx];
|
||||
strcpy(snapshot_ram_block->idstr, block->idstr);
|
||||
snapshot_ram_block->used_length = block->used_length;
|
||||
|
||||
snapshot_ram_block->ram = g_new(uint8_t, block->used_length);
|
||||
memcpy(snapshot_ram_block->ram, block->host, block->used_length);
|
||||
|
||||
ram_block_idx++;
|
||||
}
|
||||
assert(ram_block_idx == nb_blocks);
|
||||
|
||||
return root;
|
||||
}
|
||||
|
||||
void syx_snapshot_root_free(syx_snapshot_root_t* root) {
|
||||
for (uint64_t i = 0; i < root->nb_ram_blocks; ++i) {
|
||||
g_free(root->ram_blocks[i].ram);
|
||||
}
|
||||
|
||||
g_free(root->ram_blocks);
|
||||
}
|
||||
|
||||
syx_snapshot_tracker_t syx_snapshot_tracker_init(void) {
|
||||
syx_snapshot_tracker_t tracker = {
|
||||
.length = 0,
|
||||
.capacity = SYX_SNAPSHOT_LIST_INIT_SIZE,
|
||||
.tracked_snapshots = g_new(syx_snapshot_t*, SYX_SNAPSHOT_LIST_INIT_SIZE)
|
||||
};
|
||||
|
||||
return tracker;
|
||||
}
|
||||
|
||||
void syx_snapshot_track(syx_snapshot_tracker_t* tracker, syx_snapshot_t* snapshot) {
|
||||
if (tracker->length == tracker->capacity) {
|
||||
tracker->capacity *= SYX_SNAPSHOT_LIST_GROW_FACTOR;
|
||||
tracker->tracked_snapshots = g_realloc(tracker->tracked_snapshots, tracker->capacity * sizeof(syx_snapshot_t*));
|
||||
}
|
||||
|
||||
assert(tracker->length < tracker->capacity);
|
||||
|
||||
tracker->tracked_snapshots[tracker->length] = snapshot;
|
||||
tracker->length++;
|
||||
}
|
||||
|
||||
void syx_snapshot_stop_track(syx_snapshot_tracker_t* tracker, syx_snapshot_t* snapshot) {
|
||||
for (uint64_t i = 0; i < tracker->length; ++i) {
|
||||
if (tracker->tracked_snapshots[i] == snapshot) {
|
||||
for (uint64_t j = i + i; j < tracker->length; ++j) {
|
||||
tracker->tracked_snapshots[j-1] = tracker->tracked_snapshots[j];
|
||||
}
|
||||
tracker->length--;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
SYX_PRINTF("ERROR: trying to remove an untracked snapshot\n");
|
||||
abort();
|
||||
}
|
||||
|
||||
void syx_snapshot_increment_push(syx_snapshot_t* snapshot) {
|
||||
syx_snapshot_increment_t* increment = g_new0(syx_snapshot_increment_t, 1);
|
||||
increment->parent = snapshot->last_incremental_snapshot;
|
||||
snapshot->last_incremental_snapshot = increment;
|
||||
|
||||
increment->dirty_page_list = syx_snapshot_dirty_list_to_dirty_page_list(&snapshot->dirty_list);
|
||||
increment->dss = device_save_all();
|
||||
|
||||
syx_snapshot_dirty_list_flush(&snapshot->dirty_list);
|
||||
}
|
||||
|
||||
static syx_snapshot_dirty_page_t* get_dirty_page_from_addr_rec(syx_snapshot_increment_t* increment, hwaddr addr) {
|
||||
if (increment == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
for (uint64_t i = 0; i < increment->dirty_page_list.length; ++i) {
|
||||
if (increment->dirty_page_list.dirty_pages[i].addr == addr) {
|
||||
return &increment->dirty_page_list.dirty_pages[i];
|
||||
}
|
||||
}
|
||||
|
||||
return get_dirty_page_from_addr_rec(increment->parent, addr);
|
||||
}
|
||||
|
||||
static syx_snapshot_ramblock_t* find_ramblock(syx_snapshot_root_t* root, char* idstr) {
|
||||
for (size_t i = 0; i < root->nb_ram_blocks; i++) {
|
||||
if (!strcmp(idstr, root->ram_blocks[i].idstr)) {
|
||||
return &root->ram_blocks[i];
|
||||
}
|
||||
}
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static void restore_page_from_root(syx_snapshot_root_t* root, MemoryRegion* mr, hwaddr addr) {
|
||||
MemoryRegionSection mr_section = memory_region_find(mr, addr, syx_snapshot_state.page_size); // memory_region_find is quite slow
|
||||
|
||||
if (mr_section.size == 0) {
|
||||
assert(mr_section.mr == NULL);
|
||||
|
||||
SYX_WARNING("Did not found a memory region while restoring the address %p from root snapshot.\n", (void*) addr);
|
||||
return;
|
||||
}
|
||||
|
||||
if (mr_section.mr->ram) {
|
||||
syx_snapshot_ramblock_t* ram_block = find_ramblock(root, mr_section.mr->ram_block->idstr);
|
||||
assert(ram_block != NULL);
|
||||
assert(!strcmp(mr_section.mr->ram_block->idstr, ram_block->idstr));
|
||||
|
||||
memcpy(mr_section.mr->ram_block->host + mr_section.offset_within_region,
|
||||
ram_block->ram + mr_section.offset_within_region, syx_snapshot_state.page_size);
|
||||
}
|
||||
}
|
||||
|
||||
static void restore_page(MemoryRegion* mr, syx_snapshot_dirty_page_t* page) {
|
||||
MemoryRegionSection mr_section = memory_region_find(mr, page->addr, syx_snapshot_state.page_size);
|
||||
assert(mr_section.size != 0 && mr_section.mr != NULL);
|
||||
assert(mr_section.mr->ram);
|
||||
|
||||
memcpy(mr_section.mr->ram_block->host + mr_section.offset_within_region, page->data, syx_snapshot_state.page_size);
|
||||
}
|
||||
|
||||
static void restore_to_last_increment(syx_snapshot_t* snapshot, MemoryRegion* mr) {
|
||||
syx_snapshot_increment_t* increment = snapshot->last_incremental_snapshot;
|
||||
syx_snapshot_dirty_list_t* dirty_list = &snapshot->dirty_list;
|
||||
|
||||
for (uint64_t i = 0; i < dirty_list->length; ++i) {
|
||||
syx_snapshot_dirty_page_t* dirty_page = get_dirty_page_from_addr_rec(increment, dirty_list->dirty_addr[i]);
|
||||
if (dirty_page == NULL) {
|
||||
restore_page_from_root(&snapshot->root_snapshot, mr, dirty_list->dirty_addr[i]);
|
||||
} else {
|
||||
restore_page(mr, dirty_page);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void syx_snapshot_increment_pop(syx_snapshot_t* snapshot) {
|
||||
MemoryRegion* system_mr = get_system_memory();
|
||||
syx_snapshot_increment_t* last_increment = snapshot->last_incremental_snapshot;
|
||||
|
||||
restore_to_last_increment(snapshot, system_mr);
|
||||
|
||||
device_restore_all(last_increment->dss);
|
||||
|
||||
syx_snapshot_dirty_list_flush(&snapshot->dirty_list);
|
||||
|
||||
snapshot->last_incremental_snapshot = last_increment->parent;
|
||||
syx_snapshot_increment_free(last_increment);
|
||||
}
|
||||
|
||||
void syx_snapshot_increment_restore_last(syx_snapshot_t* snapshot) {
|
||||
MemoryRegion* system_mr = get_system_memory();
|
||||
syx_snapshot_increment_t* last_increment = snapshot->last_incremental_snapshot;
|
||||
|
||||
restore_to_last_increment(snapshot, system_mr);
|
||||
|
||||
device_restore_all(last_increment->dss);
|
||||
|
||||
syx_snapshot_dirty_list_flush(&snapshot->dirty_list);
|
||||
}
|
||||
|
||||
syx_snapshot_increment_t* syx_snapshot_increment_free(syx_snapshot_increment_t* increment) {
|
||||
syx_snapshot_increment_t* parent = increment->parent;
|
||||
|
||||
for (uint64_t i = 0; i < increment->dirty_page_list.length; ++i) {
|
||||
g_free(increment->dirty_page_list.dirty_pages[i].data);
|
||||
}
|
||||
|
||||
device_free_all(increment->dss);
|
||||
g_free(increment);
|
||||
|
||||
return parent;
|
||||
}
|
||||
|
||||
syx_snapshot_dirty_list_t syx_snapshot_dirty_list_create(void) {
|
||||
syx_snapshot_dirty_list_t dirty_list = {
|
||||
.length = 0,
|
||||
.capacity = SYX_SNAPSHOT_LIST_INIT_SIZE,
|
||||
.dirty_addr = g_new(hwaddr, SYX_SNAPSHOT_LIST_INIT_SIZE)
|
||||
};
|
||||
|
||||
return dirty_list;
|
||||
}
|
||||
|
||||
void syx_snapshot_dirty_list_free(syx_snapshot_dirty_list_t* dirty_list) {
|
||||
g_free(dirty_list->dirty_addr);
|
||||
}
|
||||
|
||||
static inline syx_snapshot_dirty_page_t* syx_snapshot_save_page_from_addr(MemoryRegion* mr, hwaddr addr) {
|
||||
syx_snapshot_dirty_page_t* dirty_page = g_new(syx_snapshot_dirty_page_t, 1);
|
||||
|
||||
dirty_page->addr = addr;
|
||||
dirty_page->data = g_new(uint8_t, syx_snapshot_state.page_size);
|
||||
|
||||
MemoryRegionSection mr_section = memory_region_find(mr, addr, syx_snapshot_state.page_size);
|
||||
|
||||
assert(mr_section.size != 0 && mr_section.mr != NULL);
|
||||
|
||||
if (!mr_section.mr->ram) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
memcpy(dirty_page->data, mr_section.mr->ram_block->host + mr_section.offset_within_region, syx_snapshot_state.page_size);
|
||||
return dirty_page;
|
||||
}
|
||||
|
||||
syx_snapshot_dirty_page_list_t syx_snapshot_dirty_list_to_dirty_page_list(syx_snapshot_dirty_list_t* dirty_list) {
|
||||
syx_snapshot_dirty_page_list_t dirty_page_list = {
|
||||
.length = dirty_list->length,
|
||||
.dirty_pages = g_new(syx_snapshot_dirty_page_t, dirty_list->length)
|
||||
};
|
||||
MemoryRegion* system_mr = get_system_memory();
|
||||
|
||||
uint64_t real_len = 0;
|
||||
for (uint64_t i = 0; i < dirty_page_list.length; ++i) {
|
||||
syx_snapshot_dirty_page_t* page = syx_snapshot_save_page_from_addr(system_mr, dirty_list->dirty_addr[i]);
|
||||
if (page == NULL) {
|
||||
continue;
|
||||
}
|
||||
dirty_page_list.dirty_pages[real_len] = *page;
|
||||
real_len++;
|
||||
g_free(page);
|
||||
}
|
||||
|
||||
dirty_page_list.length = real_len;
|
||||
|
||||
return dirty_page_list;
|
||||
}
|
||||
|
||||
static inline void syx_snapshot_dirty_list_add_internal(hwaddr paddr) {
|
||||
paddr &= syx_snapshot_state.page_mask;
|
||||
|
||||
for (uint64_t i = 0; i < syx_snapshot_state.tracked_snapshots.length; ++i) {
|
||||
syx_snapshot_dirty_list_t* dirty_list = &syx_snapshot_state.tracked_snapshots.tracked_snapshots[i]->dirty_list;
|
||||
|
||||
// Avoid adding already marked addresses
|
||||
for (uint64_t j = 0; j < dirty_list->length; ++j) {
|
||||
if (dirty_list->dirty_addr[j] == paddr) {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
if (dirty_list->length == dirty_list->capacity) {
|
||||
dirty_list->capacity *= SYX_SNAPSHOT_LIST_GROW_FACTOR;
|
||||
dirty_list->dirty_addr = g_realloc(dirty_list->dirty_addr, dirty_list->capacity * sizeof(hwaddr));
|
||||
}
|
||||
|
||||
dirty_list->dirty_addr[dirty_list->length] = paddr;
|
||||
|
||||
dirty_list->length++;
|
||||
}
|
||||
}
|
||||
|
||||
bool syx_snapshot_is_enabled(void) {
|
||||
return syx_snapshot_state.is_enabled;
|
||||
}
|
||||
|
||||
void syx_snapshot_dirty_list_add_hostaddr(void* host_addr) {
|
||||
// early check to know whether we should log the page access or not
|
||||
if (!syx_snapshot_is_enabled()) {
|
||||
return;
|
||||
}
|
||||
|
||||
ram_addr_t offset;
|
||||
RAMBlock* rb = qemu_ram_block_from_host((void*) host_addr, true, &offset);
|
||||
|
||||
assert(rb);
|
||||
|
||||
hwaddr paddr = rb->mr->addr + offset;
|
||||
// If this assert is ever false, please understand why
|
||||
// qemu_ram_block_from_host result with true as second
|
||||
// param would not be host page aligned.
|
||||
assert(paddr == (paddr & syx_snapshot_state.page_mask));
|
||||
|
||||
syx_snapshot_dirty_list_add_internal(paddr);
|
||||
}
|
||||
|
||||
|
||||
void syx_snapshot_dirty_list_add(hwaddr paddr) {
|
||||
if (!syx_snapshot_is_enabled()) {
|
||||
return;
|
||||
}
|
||||
|
||||
syx_snapshot_dirty_list_add_internal(paddr);
|
||||
}
|
||||
|
||||
inline void syx_snapshot_dirty_list_flush(syx_snapshot_dirty_list_t* dirty_list) {
|
||||
dirty_list->length = 0;
|
||||
}
|
||||
|
||||
static void syx_snapshot_restore_root_from_dirty_list(syx_snapshot_root_t* root, MemoryRegion* mr, syx_snapshot_dirty_list_t* dirty_list) {
|
||||
for (size_t i = 0; i < dirty_list->length; ++i) {
|
||||
restore_page_from_root(root, mr, dirty_list->dirty_addr[i]);
|
||||
}
|
||||
}
|
||||
|
||||
void syx_snapshot_root_restore(syx_snapshot_t* snapshot) {
|
||||
MemoryRegion* system_mr = get_system_memory();
|
||||
syx_snapshot_restore_root_from_dirty_list(&snapshot->root_snapshot, system_mr, &snapshot->dirty_list);
|
||||
device_restore_all(snapshot->root_snapshot.dss);
|
||||
syx_snapshot_dirty_list_flush(&snapshot->dirty_list);
|
||||
}
|
||||
166
libafl_extras/syx-snapshot/syx-snapshot.h
Normal file
166
libafl_extras/syx-snapshot/syx-snapshot.h
Normal file
@ -0,0 +1,166 @@
|
||||
#pragma once
|
||||
//#ifdef QEMU_SYX
|
||||
|
||||
#include "qemu/osdep.h"
|
||||
#include "qom/object.h"
|
||||
#include "device-save.h"
|
||||
//#include "qemu-common.h"
|
||||
#include "sysemu/sysemu.h"
|
||||
#include "libafl_extras/syx-misc.h"
|
||||
|
||||
/**
|
||||
* Saved ramblock
|
||||
*/
|
||||
typedef struct syx_snapshot_ramblock_s {
|
||||
uint8_t* ram; // RAM block
|
||||
uint64_t used_length; // Length of the ram block
|
||||
char idstr[256]; // Unique string identifier for the ramblock
|
||||
} syx_snapshot_ramblock_t;
|
||||
|
||||
/**
|
||||
* A root snapshot representation.
|
||||
*/
|
||||
typedef struct syx_snapshot_root_s {
|
||||
syx_snapshot_ramblock_t* ram_blocks;
|
||||
uint64_t nb_ram_blocks;
|
||||
|
||||
device_save_state_t* dss;
|
||||
} syx_snapshot_root_t;
|
||||
|
||||
/**
|
||||
* A snapshot's dirty list. It only stores dirty addresses
|
||||
* (without data). It is the developer's responsibility to
|
||||
* to effectively save dirty pages when it is necessary.
|
||||
*/
|
||||
typedef struct syx_snapshot_dirty_list_s {
|
||||
// Dirty pages since the last snapshot
|
||||
// Only physical addresses are stored at this point
|
||||
// Better if a few addresses are marked
|
||||
hwaddr* dirty_addr;
|
||||
uint64_t length;
|
||||
uint64_t capacity;
|
||||
} syx_snapshot_dirty_list_t;
|
||||
|
||||
/**
|
||||
* A list of dirty pages with their old data.
|
||||
*/
|
||||
typedef struct syx_snapshot_dirty_page_s {
|
||||
hwaddr addr;
|
||||
uint8_t* data;
|
||||
} syx_snapshot_dirty_page_t;
|
||||
|
||||
typedef struct syx_snapshot_dirty_page_list_s {
|
||||
syx_snapshot_dirty_page_t* dirty_pages;
|
||||
uint64_t length;
|
||||
} syx_snapshot_dirty_page_list_t;
|
||||
|
||||
/**
|
||||
* A snapshot increment. It is used to quickly
|
||||
* save a VM state.
|
||||
*/
|
||||
typedef struct syx_snapshot_increment_s {
|
||||
// Back to root snapshot if NULL
|
||||
struct syx_snapshot_increment_s* parent;
|
||||
|
||||
device_save_state_t* dss;
|
||||
|
||||
syx_snapshot_dirty_page_list_t dirty_page_list;
|
||||
} syx_snapshot_increment_t;
|
||||
|
||||
/**
|
||||
* A snapshot. It is the main object used in this API to
|
||||
* handle snapshoting.
|
||||
*/
|
||||
typedef struct syx_snapshot_s {
|
||||
syx_snapshot_root_t root_snapshot;
|
||||
syx_snapshot_increment_t* last_incremental_snapshot;
|
||||
|
||||
syx_snapshot_dirty_list_t dirty_list;
|
||||
} syx_snapshot_t;
|
||||
|
||||
typedef struct syx_snapshot_tracker_s {
|
||||
syx_snapshot_t** tracked_snapshots;
|
||||
uint64_t length;
|
||||
uint64_t capacity;
|
||||
} syx_snapshot_tracker_t;
|
||||
|
||||
typedef struct syx_snapshot_state_s {
|
||||
bool is_enabled;
|
||||
|
||||
uint64_t page_size;
|
||||
uint64_t page_mask;
|
||||
|
||||
// Actively tracked snapshots. Their dirty lists will
|
||||
// be updated at each dirty access
|
||||
syx_snapshot_tracker_t tracked_snapshots;
|
||||
} syx_snapshot_state_t;
|
||||
|
||||
//
|
||||
// Namespace API's functions
|
||||
//
|
||||
|
||||
void syx_snapshot_init(void);
|
||||
|
||||
//
|
||||
// Snapshot API
|
||||
//
|
||||
|
||||
syx_snapshot_t* syx_snapshot_create(bool track);
|
||||
void syx_snapshot_free(syx_snapshot_t* snapshot);
|
||||
// void syx_snapshot_load(syx_snapshot_t* snapshot);
|
||||
|
||||
|
||||
//
|
||||
// Root snapshot API
|
||||
//
|
||||
|
||||
syx_snapshot_root_t syx_snapshot_root_create(void);
|
||||
void syx_snapshot_root_restore(syx_snapshot_t* snapshot);
|
||||
void syx_snapshot_root_free(syx_snapshot_root_t* root);
|
||||
|
||||
|
||||
//
|
||||
// Snapshot tracker API
|
||||
//
|
||||
|
||||
syx_snapshot_tracker_t syx_snapshot_tracker_init(void);
|
||||
void syx_snapshot_track(syx_snapshot_tracker_t* tracker, syx_snapshot_t* snapshot);
|
||||
void syx_snapshot_stop_track(syx_snapshot_tracker_t* tracker, syx_snapshot_t* snapshot);
|
||||
|
||||
|
||||
//
|
||||
// Snapshot increment API
|
||||
//
|
||||
|
||||
void syx_snapshot_increment_push(syx_snapshot_t* snapshot);
|
||||
void syx_snapshot_increment_pop(syx_snapshot_t* snapshot);
|
||||
void syx_snapshot_increment_restore_last(syx_snapshot_t* snapshot);
|
||||
syx_snapshot_increment_t* syx_snapshot_increment_free(syx_snapshot_increment_t* increment);
|
||||
|
||||
|
||||
//
|
||||
// Misc functions
|
||||
//
|
||||
|
||||
bool syx_snapshot_is_enabled(void);
|
||||
|
||||
|
||||
//
|
||||
// Dirty list API
|
||||
//
|
||||
|
||||
syx_snapshot_dirty_list_t syx_snapshot_dirty_list_create(void);
|
||||
void syx_snapshot_dirty_list_free(syx_snapshot_dirty_list_t* dirty_list);
|
||||
syx_snapshot_dirty_page_list_t syx_snapshot_dirty_list_to_dirty_page_list(syx_snapshot_dirty_list_t* dirty_list);
|
||||
void syx_snapshot_dirty_list_flush(syx_snapshot_dirty_list_t* dirty_list);
|
||||
|
||||
|
||||
/**
|
||||
* @brief Add a dirty physical address to the list
|
||||
*
|
||||
* @param paddr The physical address to add
|
||||
*/
|
||||
void syx_snapshot_dirty_list_add(hwaddr paddr);
|
||||
void syx_snapshot_dirty_list_add_hostaddr(void* host_addr);
|
||||
|
||||
//#endif
|
||||
@ -1246,6 +1246,8 @@ endif
|
||||
gtk = not_found
|
||||
gtkx11 = not_found
|
||||
vte = not_found
|
||||
have_gtk_clipboard = get_option('gtk_clipboard').enabled()
|
||||
|
||||
if not get_option('gtk').auto() or have_system
|
||||
gtk = dependency('gtk+-3.0', version: '>=3.22.0',
|
||||
method: 'pkg-config',
|
||||
@ -1264,6 +1266,8 @@ if not get_option('gtk').auto() or have_system
|
||||
required: get_option('vte'),
|
||||
kwargs: static_kwargs)
|
||||
endif
|
||||
elif have_gtk_clipboard
|
||||
error('GTK clipboard requested, but GTK not found')
|
||||
endif
|
||||
endif
|
||||
|
||||
@ -1842,6 +1846,7 @@ if glusterfs.found()
|
||||
endif
|
||||
config_host_data.set('CONFIG_GTK', gtk.found())
|
||||
config_host_data.set('CONFIG_VTE', vte.found())
|
||||
config_host_data.set('CONFIG_GTK_CLIPBOARD', have_gtk_clipboard)
|
||||
config_host_data.set('CONFIG_LIBATTR', have_old_libattr)
|
||||
config_host_data.set('CONFIG_LIBCAP_NG', libcap_ng.found())
|
||||
config_host_data.set('CONFIG_EBPF', libbpf.found())
|
||||
@ -2883,6 +2888,10 @@ target_arch = {}
|
||||
target_softmmu_arch = {}
|
||||
target_user_arch = {}
|
||||
|
||||
### LibAFL extras
|
||||
|
||||
subdir('libafl_extras')
|
||||
|
||||
###############
|
||||
# Trace files #
|
||||
###############
|
||||
|
||||
@ -219,6 +219,13 @@ option('vnc_sasl', type : 'feature', value : 'auto',
|
||||
description: 'SASL authentication for VNC server')
|
||||
option('vte', type : 'feature', value : 'auto',
|
||||
description: 'vte support for the gtk UI')
|
||||
|
||||
# GTK Clipboard implementation is disabled by default, since it may cause hangs
|
||||
# of the guest VCPUs. See gitlab issue 1150:
|
||||
# https://gitlab.com/qemu-project/qemu/-/issues/1150
|
||||
|
||||
option('gtk_clipboard', type: 'feature', value : 'disabled',
|
||||
description: 'clipboard support for the gtk UI (EXPERIMENTAL, MAY HANG)')
|
||||
option('xkbcommon', type : 'feature', value : 'auto',
|
||||
description: 'xkbcommon support')
|
||||
option('zstd', type : 'feature', value : 'auto',
|
||||
|
||||
@ -228,7 +228,7 @@ typedef struct SaveState {
|
||||
QemuUUID uuid;
|
||||
} SaveState;
|
||||
|
||||
static SaveState savevm_state = {
|
||||
/* static */ SaveState savevm_state = {
|
||||
.handlers = QTAILQ_HEAD_INITIALIZER(savevm_state.handlers),
|
||||
.handler_pri_head = { [MIG_PRI_DEFAULT ... MIG_PRI_MAX] = NULL },
|
||||
.global_section_id = 0,
|
||||
@ -897,7 +897,15 @@ static void vmstate_save_old_style(QEMUFile *f, SaveStateEntry *se,
|
||||
}
|
||||
}
|
||||
|
||||
static int vmstate_save(QEMUFile *f, SaveStateEntry *se,
|
||||
//// --- Begin LibAFL code ---
|
||||
|
||||
void save_section_header(QEMUFile *f, SaveStateEntry *se, uint8_t section_type);
|
||||
void save_section_footer(QEMUFile *f, SaveStateEntry *se);
|
||||
int vmstate_save(QEMUFile *f, SaveStateEntry *se, JSONWriter *vmdesc);
|
||||
|
||||
//// --- End LibAFL code ---
|
||||
|
||||
/* static */ int vmstate_save(QEMUFile *f, SaveStateEntry *se,
|
||||
JSONWriter *vmdesc)
|
||||
{
|
||||
trace_vmstate_save(se->idstr, se->vmsd ? se->vmsd->name : "(old)");
|
||||
@ -911,7 +919,7 @@ static int vmstate_save(QEMUFile *f, SaveStateEntry *se,
|
||||
/*
|
||||
* Write the header for device section (QEMU_VM_SECTION START/END/PART/FULL)
|
||||
*/
|
||||
static void save_section_header(QEMUFile *f, SaveStateEntry *se,
|
||||
/* static */ void save_section_header(QEMUFile *f, SaveStateEntry *se,
|
||||
uint8_t section_type)
|
||||
{
|
||||
qemu_put_byte(f, section_type);
|
||||
@ -933,7 +941,7 @@ static void save_section_header(QEMUFile *f, SaveStateEntry *se,
|
||||
* Write a footer onto device sections that catches cases misformatted device
|
||||
* sections.
|
||||
*/
|
||||
static void save_section_footer(QEMUFile *f, SaveStateEntry *se)
|
||||
/* static */ void save_section_footer(QEMUFile *f, SaveStateEntry *se)
|
||||
{
|
||||
if (migrate_get_current()->send_section_footer) {
|
||||
qemu_put_byte(f, QEMU_VM_SECTION_FOOTER);
|
||||
|
||||
@ -179,7 +179,7 @@ static void net_socket_send(void *opaque)
|
||||
s->fd = -1;
|
||||
net_socket_rs_init(&s->rs, net_socket_rs_finalize, false);
|
||||
s->nc.link_down = true;
|
||||
qemu_set_info_str(&s->nc, "");
|
||||
qemu_set_info_str(&s->nc, "%s", "");
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
@ -167,7 +167,7 @@ static gboolean net_stream_send(QIOChannel *ioc,
|
||||
|
||||
net_socket_rs_init(&s->rs, net_stream_rs_finalize, false);
|
||||
s->nc.link_down = true;
|
||||
qemu_set_info_str(&s->nc, "");
|
||||
qemu_set_info_str(&s->nc, "%s", "");
|
||||
|
||||
qapi_event_send_netdev_stream_disconnected(s->nc.name);
|
||||
|
||||
@ -245,7 +245,7 @@ static void net_stream_listen(QIONetListener *listener,
|
||||
}
|
||||
g_assert(addr != NULL);
|
||||
uri = socket_uri(addr);
|
||||
qemu_set_info_str(&s->nc, uri);
|
||||
qemu_set_info_str(&s->nc, "%s", uri);
|
||||
g_free(uri);
|
||||
qapi_event_send_netdev_stream_connected(s->nc.name, addr);
|
||||
qapi_free_SocketAddress(addr);
|
||||
@ -319,7 +319,7 @@ static void net_stream_client_connected(QIOTask *task, gpointer opaque)
|
||||
addr = qio_channel_socket_get_remote_address(sioc, NULL);
|
||||
g_assert(addr != NULL);
|
||||
uri = socket_uri(addr);
|
||||
qemu_set_info_str(&s->nc, uri);
|
||||
qemu_set_info_str(&s->nc, "%s", uri);
|
||||
g_free(uri);
|
||||
|
||||
ret = qemu_socket_try_set_nonblock(sioc->fd);
|
||||
|
||||
@ -69,6 +69,7 @@ const int vdpa_feature_bits[] = {
|
||||
VIRTIO_NET_F_CTRL_VQ,
|
||||
VIRTIO_F_IOMMU_PLATFORM,
|
||||
VIRTIO_F_RING_PACKED,
|
||||
VIRTIO_F_RING_RESET,
|
||||
VIRTIO_NET_F_RSS,
|
||||
VIRTIO_NET_F_HASH_REPORT,
|
||||
VIRTIO_NET_F_GUEST_ANNOUNCE,
|
||||
|
||||
Binary file not shown.
Binary file not shown.
BIN
pc-bios/bios.bin
BIN
pc-bios/bios.bin
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -136,7 +136,7 @@ bool replay_next_event_is(int event);
|
||||
/*! Reads next clock value from the file.
|
||||
If clock kind read from the file is different from the parameter,
|
||||
the value is not used. */
|
||||
void replay_read_next_clock(unsigned int kind);
|
||||
void replay_read_next_clock(ReplayClockKind kind);
|
||||
|
||||
/* Asynchronous events queue */
|
||||
|
||||
|
||||
@ -1 +1 @@
|
||||
Subproject commit d239552ce7220e448ae81f41515138f7b9e3c4db
|
||||
Subproject commit 3208b098f51a9ef96d0dfa71d5ec3a3eaec88f0a
|
||||
@ -93,6 +93,7 @@ meson_options_help() {
|
||||
printf "%s\n" ' glusterfs Glusterfs block device driver'
|
||||
printf "%s\n" ' gnutls GNUTLS cryptography support'
|
||||
printf "%s\n" ' gtk GTK+ user interface'
|
||||
printf "%s\n" ' gtk-clipboard clipboard support for GTK (EXPERIMENTAL, MAY HANG)'
|
||||
printf "%s\n" ' guest-agent Build QEMU Guest Agent'
|
||||
printf "%s\n" ' guest-agent-msi Build MSI package for the QEMU Guest Agent'
|
||||
printf "%s\n" ' hax HAX acceleration support'
|
||||
@ -276,6 +277,8 @@ _meson_option_parse() {
|
||||
--disable-gprof) printf "%s" -Dgprof=false ;;
|
||||
--enable-gtk) printf "%s" -Dgtk=enabled ;;
|
||||
--disable-gtk) printf "%s" -Dgtk=disabled ;;
|
||||
--enable-gtk-clipboard) printf "%s" -Dgtk_clipboard=enabled ;;
|
||||
--disable-gtk-clipboard) printf "%s" -Dgtk_clipboard=disabled ;;
|
||||
--enable-guest-agent) printf "%s" -Dguest_agent=enabled ;;
|
||||
--disable-guest-agent) printf "%s" -Dguest_agent=disabled ;;
|
||||
--enable-guest-agent-msi) printf "%s" -Dguest_agent_msi=enabled ;;
|
||||
|
||||
@ -45,6 +45,17 @@
|
||||
#include "libvhost-user.h"
|
||||
|
||||
/* usually provided by GLib */
|
||||
#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
|
||||
#if !defined(__clang__) && (__GNUC__ == 4 && __GNUC_MINOR__ == 4)
|
||||
#define G_GNUC_PRINTF(format_idx, arg_idx) \
|
||||
__attribute__((__format__(gnu_printf, format_idx, arg_idx)))
|
||||
#else
|
||||
#define G_GNUC_PRINTF(format_idx, arg_idx) \
|
||||
__attribute__((__format__(__printf__, format_idx, arg_idx)))
|
||||
#endif
|
||||
#else /* !__GNUC__ */
|
||||
#define G_GNUC_PRINTF(format_idx, arg_idx)
|
||||
#endif /* !__GNUC__ */
|
||||
#ifndef MIN
|
||||
#define MIN(x, y) ({ \
|
||||
typeof(x) _min1 = (x); \
|
||||
@ -151,7 +162,7 @@ vu_request_to_string(unsigned int req)
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
static void G_GNUC_PRINTF(2, 3)
|
||||
vu_panic(VuDev *dev, const char *msg, ...)
|
||||
{
|
||||
char *buf = NULL;
|
||||
@ -651,7 +662,8 @@ generate_faults(VuDev *dev) {
|
||||
|
||||
if (ioctl(dev->postcopy_ufd, UFFDIO_REGISTER, ®_struct)) {
|
||||
vu_panic(dev, "%s: Failed to userfault region %d "
|
||||
"@%p + size:%zx offset: %zx: (ufd=%d)%s\n",
|
||||
"@%" PRIx64 " + size:%" PRIx64 " offset: %" PRIx64
|
||||
": (ufd=%d)%s\n",
|
||||
__func__, i,
|
||||
dev_region->mmap_addr,
|
||||
dev_region->size, dev_region->mmap_offset,
|
||||
@ -700,7 +712,7 @@ vu_add_mem_reg(VuDev *dev, VhostUserMsg *vmsg) {
|
||||
if (vmsg->size < VHOST_USER_MEM_REG_SIZE) {
|
||||
close(vmsg->fds[0]);
|
||||
vu_panic(dev, "VHOST_USER_ADD_MEM_REG requires a message size of at "
|
||||
"least %d bytes and only %d bytes were received",
|
||||
"least %zu bytes and only %d bytes were received",
|
||||
VHOST_USER_MEM_REG_SIZE, vmsg->size);
|
||||
return false;
|
||||
}
|
||||
@ -826,7 +838,7 @@ vu_rem_mem_reg(VuDev *dev, VhostUserMsg *vmsg) {
|
||||
if (vmsg->size < VHOST_USER_MEM_REG_SIZE) {
|
||||
vmsg_close_fds(vmsg);
|
||||
vu_panic(dev, "VHOST_USER_REM_MEM_REG requires a message size of at "
|
||||
"least %d bytes and only %d bytes were received",
|
||||
"least %zu bytes and only %d bytes were received",
|
||||
VHOST_USER_MEM_REG_SIZE, vmsg->size);
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -91,7 +91,7 @@ void arm_cpu_synchronize_from_tb(CPUState *cs,
|
||||
}
|
||||
}
|
||||
|
||||
static void arm_restore_state_to_opc(CPUState *cs,
|
||||
void arm_restore_state_to_opc(CPUState *cs,
|
||||
const TranslationBlock *tb,
|
||||
const uint64_t *data)
|
||||
{
|
||||
|
||||
@ -1035,6 +1035,7 @@ static const struct TCGCPUOps arm_v7m_tcg_ops = {
|
||||
.initialize = arm_translate_init,
|
||||
.synchronize_from_tb = arm_cpu_synchronize_from_tb,
|
||||
.debug_excp_handler = arm_debug_excp_handler,
|
||||
.restore_state_to_opc = arm_restore_state_to_opc,
|
||||
|
||||
#ifdef CONFIG_USER_ONLY
|
||||
.record_sigsegv = arm_cpu_record_sigsegv,
|
||||
|
||||
@ -185,6 +185,10 @@ static inline int r14_bank_number(int mode)
|
||||
void arm_cpu_register_gdb_regs_for_features(ARMCPU *cpu);
|
||||
void arm_translate_init(void);
|
||||
|
||||
void arm_restore_state_to_opc(CPUState *cs,
|
||||
const TranslationBlock *tb,
|
||||
const uint64_t *data);
|
||||
|
||||
#ifdef CONFIG_TCG
|
||||
void arm_cpu_synchronize_from_tb(CPUState *cs, const TranslationBlock *tb);
|
||||
#endif /* CONFIG_TCG */
|
||||
|
||||
@ -1172,7 +1172,7 @@ static bool get_phys_addr_lpae(CPUARMState *env, S1Translate *ptw,
|
||||
ARMCPU *cpu = env_archcpu(env);
|
||||
ARMMMUIdx mmu_idx = ptw->in_mmu_idx;
|
||||
bool is_secure = ptw->in_secure;
|
||||
uint32_t level;
|
||||
int32_t level;
|
||||
ARMVAParameters param;
|
||||
uint64_t ttbr;
|
||||
hwaddr descaddr, indexmask, indexmask_grainsize;
|
||||
@ -1302,7 +1302,7 @@ static bool get_phys_addr_lpae(CPUARMState *env, S1Translate *ptw,
|
||||
*/
|
||||
uint32_t sl0 = extract32(tcr, 6, 2);
|
||||
uint32_t sl2 = extract64(tcr, 33, 1);
|
||||
uint32_t startlevel;
|
||||
int32_t startlevel;
|
||||
bool ok;
|
||||
|
||||
/* SL2 is RES0 unless DS=1 & 4kb granule. */
|
||||
@ -2612,8 +2612,8 @@ static bool get_phys_addr_twostage(CPUARMState *env, S1Translate *ptw,
|
||||
|
||||
ret = get_phys_addr_with_struct(env, ptw, address, access_type, result, fi);
|
||||
|
||||
/* If S1 fails or S2 is disabled, return early. */
|
||||
if (ret || regime_translation_disabled(env, ARMMMUIdx_Stage2, is_secure)) {
|
||||
/* If S1 fails, return early. */
|
||||
if (ret) {
|
||||
return ret;
|
||||
}
|
||||
|
||||
@ -2739,7 +2739,8 @@ static bool get_phys_addr_with_struct(CPUARMState *env, S1Translate *ptw,
|
||||
* Otherwise, a stage1+stage2 translation is just stage 1.
|
||||
*/
|
||||
ptw->in_mmu_idx = mmu_idx = s1_mmu_idx;
|
||||
if (arm_feature(env, ARM_FEATURE_EL2)) {
|
||||
if (arm_feature(env, ARM_FEATURE_EL2) &&
|
||||
!regime_translation_disabled(env, ARMMMUIdx_Stage2, is_secure)) {
|
||||
return get_phys_addr_twostage(env, ptw, address, access_type,
|
||||
result, fi);
|
||||
}
|
||||
|
||||
@ -1488,7 +1488,8 @@ static bool validate_vex(DisasContext *s, X86DecodedInsn *decode)
|
||||
if (!(s->flags & HF_AVX_EN_MASK)) {
|
||||
goto illegal;
|
||||
}
|
||||
} else {
|
||||
} else if (e->special != X86_SPECIAL_MMX ||
|
||||
(s->prefix & (PREFIX_REPZ | PREFIX_REPNZ | PREFIX_DATA))) {
|
||||
if (!(s->flags & HF_OSFXSR_MASK)) {
|
||||
goto illegal;
|
||||
}
|
||||
|
||||
@ -71,10 +71,11 @@ static bool ptw_translate(PTETranslate *inout, hwaddr addr)
|
||||
TranslateFault *err = inout->err;
|
||||
|
||||
assert(inout->ptw_idx == MMU_NESTED_IDX);
|
||||
err->exception_index = 0; /* unused */
|
||||
err->error_code = inout->env->error_code;
|
||||
err->cr2 = addr;
|
||||
err->stage2 = S2_GPT;
|
||||
*err = (TranslateFault){
|
||||
.error_code = inout->env->error_code,
|
||||
.cr2 = addr,
|
||||
.stage2 = S2_GPT,
|
||||
};
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
@ -431,10 +432,11 @@ do_check_protect_pse36:
|
||||
MMU_NESTED_IDX, true,
|
||||
&pte_trans.haddr, &full, 0);
|
||||
if (unlikely(flags & TLB_INVALID_MASK)) {
|
||||
err->exception_index = 0; /* unused */
|
||||
err->error_code = env->error_code;
|
||||
err->cr2 = paddr;
|
||||
err->stage2 = S2_GPA;
|
||||
*err = (TranslateFault){
|
||||
.error_code = env->error_code,
|
||||
.cr2 = paddr,
|
||||
.stage2 = S2_GPA,
|
||||
};
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -494,10 +496,11 @@ do_check_protect_pse36:
|
||||
}
|
||||
break;
|
||||
}
|
||||
err->exception_index = EXCP0E_PAGE;
|
||||
err->error_code = error_code;
|
||||
err->cr2 = addr;
|
||||
err->stage2 = S2_NONE;
|
||||
*err = (TranslateFault){
|
||||
.exception_index = EXCP0E_PAGE,
|
||||
.error_code = error_code,
|
||||
.cr2 = addr,
|
||||
};
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -564,9 +567,10 @@ static bool get_physical_address(CPUX86State *env, vaddr addr,
|
||||
int shift = in.pg_mode & PG_MODE_LA57 ? 56 : 47;
|
||||
int64_t sext = (int64_t)addr >> shift;
|
||||
if (sext != 0 && sext != -1) {
|
||||
err->exception_index = EXCP0D_GPF;
|
||||
err->error_code = 0;
|
||||
err->cr2 = addr;
|
||||
*err = (TranslateFault){
|
||||
.exception_index = EXCP0D_GPF,
|
||||
.cr2 = addr,
|
||||
};
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
@ -487,6 +487,10 @@ void HELPER(sacf)(CPUS390XState *env, uint64_t a1)
|
||||
{
|
||||
HELPER_LOG("%s: %16" PRIx64 "\n", __func__, a1);
|
||||
|
||||
if (!(env->psw.mask & PSW_MASK_DAT)) {
|
||||
tcg_s390_program_interrupt(env, PGM_SPECIAL_OP, GETPC());
|
||||
}
|
||||
|
||||
switch (a1 & 0xf00) {
|
||||
case 0x000:
|
||||
env->psw.mask &= ~PSW_MASK_ASC;
|
||||
@ -497,6 +501,9 @@ void HELPER(sacf)(CPUS390XState *env, uint64_t a1)
|
||||
env->psw.mask |= PSW_ASC_SECONDARY;
|
||||
break;
|
||||
case 0x300:
|
||||
if ((env->psw.mask & PSW_MASK_PSTATE) != 0) {
|
||||
tcg_s390_program_interrupt(env, PGM_PRIVILEGED, GETPC());
|
||||
}
|
||||
env->psw.mask &= ~PSW_MASK_ASC;
|
||||
env->psw.mask |= PSW_ASC_HOME;
|
||||
break;
|
||||
|
||||
@ -1365,7 +1365,7 @@
|
||||
/* SERVICE CALL LOGICAL PROCESSOR (PV hypercall) */
|
||||
F(0xb220, SERVC, RRE, Z, r1_o, r2_o, 0, 0, servc, 0, IF_PRIV | IF_IO)
|
||||
/* SET ADDRESS SPACE CONTROL FAST */
|
||||
F(0xb279, SACF, S, Z, 0, a2, 0, 0, sacf, 0, IF_PRIV)
|
||||
C(0xb279, SACF, S, Z, 0, a2, 0, 0, sacf, 0)
|
||||
/* SET CLOCK */
|
||||
F(0xb204, SCK, S, Z, 0, m2_64a, 0, 0, sck, 0, IF_PRIV | IF_IO)
|
||||
/* SET CLOCK COMPARATOR */
|
||||
|
||||
30
tcg/tcg-op.c
30
tcg/tcg-op.c
@ -2925,15 +2925,15 @@ void tcg_gen_qemu_ld_i32(TCGv_i32 val, TCGv addr, TCGArg idx, MemOp memop)
|
||||
|
||||
addr = plugin_prep_mem_callbacks(addr);
|
||||
|
||||
gen_ldst_i32(INDEX_op_qemu_ld_i32, val, addr, memop, idx);
|
||||
plugin_gen_mem_callbacks(addr, oi, QEMU_PLUGIN_MEM_R);
|
||||
|
||||
//// --- Begin LibAFL code ---
|
||||
|
||||
libafl_gen_read(addr, oi);
|
||||
|
||||
//// --- End LibAFL code ---
|
||||
|
||||
gen_ldst_i32(INDEX_op_qemu_ld_i32, val, addr, memop, idx);
|
||||
plugin_gen_mem_callbacks(addr, oi, QEMU_PLUGIN_MEM_R);
|
||||
|
||||
if ((orig_memop ^ memop) & MO_BSWAP) {
|
||||
switch (orig_memop & MO_SIZE) {
|
||||
case MO_16:
|
||||
@ -2977,12 +2977,6 @@ void tcg_gen_qemu_st_i32(TCGv_i32 val, TCGv addr, TCGArg idx, MemOp memop)
|
||||
|
||||
addr = plugin_prep_mem_callbacks(addr);
|
||||
|
||||
//// --- Begin LibAFL code ---
|
||||
|
||||
libafl_gen_write(addr, oi);
|
||||
|
||||
//// --- End LibAFL code ---
|
||||
|
||||
if (TCG_TARGET_HAS_qemu_st8_i32 && (memop & MO_SIZE) == MO_8) {
|
||||
gen_ldst_i32(INDEX_op_qemu_st8_i32, val, addr, memop, idx);
|
||||
} else {
|
||||
@ -2990,6 +2984,12 @@ void tcg_gen_qemu_st_i32(TCGv_i32 val, TCGv addr, TCGArg idx, MemOp memop)
|
||||
}
|
||||
plugin_gen_mem_callbacks(addr, oi, QEMU_PLUGIN_MEM_W);
|
||||
|
||||
//// --- Begin LibAFL code ---
|
||||
|
||||
libafl_gen_write(addr, oi);
|
||||
|
||||
//// --- End LibAFL code ---
|
||||
|
||||
if (swap) {
|
||||
tcg_temp_free_i32(swap);
|
||||
}
|
||||
@ -3025,15 +3025,15 @@ void tcg_gen_qemu_ld_i64(TCGv_i64 val, TCGv addr, TCGArg idx, MemOp memop)
|
||||
|
||||
addr = plugin_prep_mem_callbacks(addr);
|
||||
|
||||
gen_ldst_i64(INDEX_op_qemu_ld_i64, val, addr, memop, idx);
|
||||
plugin_gen_mem_callbacks(addr, oi, QEMU_PLUGIN_MEM_R);
|
||||
|
||||
//// --- Begin LibAFL code ---
|
||||
|
||||
libafl_gen_read(addr, oi);
|
||||
|
||||
//// --- End LibAFL code ---
|
||||
|
||||
gen_ldst_i64(INDEX_op_qemu_ld_i64, val, addr, memop, idx);
|
||||
plugin_gen_mem_callbacks(addr, oi, QEMU_PLUGIN_MEM_R);
|
||||
|
||||
if ((orig_memop ^ memop) & MO_BSWAP) {
|
||||
int flags = (orig_memop & MO_SIGN
|
||||
? TCG_BSWAP_IZ | TCG_BSWAP_OS
|
||||
@ -3089,15 +3089,15 @@ void tcg_gen_qemu_st_i64(TCGv_i64 val, TCGv addr, TCGArg idx, MemOp memop)
|
||||
|
||||
addr = plugin_prep_mem_callbacks(addr);
|
||||
|
||||
gen_ldst_i64(INDEX_op_qemu_st_i64, val, addr, memop, idx);
|
||||
plugin_gen_mem_callbacks(addr, oi, QEMU_PLUGIN_MEM_W);
|
||||
|
||||
//// --- Begin LibAFL code ---
|
||||
|
||||
libafl_gen_write(addr, oi);
|
||||
|
||||
//// --- End LibAFL code ---
|
||||
|
||||
gen_ldst_i64(INDEX_op_qemu_st_i64, val, addr, memop, idx);
|
||||
plugin_gen_mem_callbacks(addr, oi, QEMU_PLUGIN_MEM_W);
|
||||
|
||||
if (swap) {
|
||||
tcg_temp_free_i64(swap);
|
||||
}
|
||||
|
||||
@ -263,7 +263,7 @@ class AcpiBitsTest(QemuBaseTest): #pylint: disable=too-many-instance-attributes
|
||||
self.logger.info('using grub-mkrescue for generating biosbits iso ...')
|
||||
|
||||
try:
|
||||
if os.getenv('V'):
|
||||
if os.getenv('V') or os.getenv('BITS_DEBUG'):
|
||||
subprocess.check_call([mkrescue_script, '-o', iso_file,
|
||||
bits_dir], stderr=subprocess.STDOUT)
|
||||
else:
|
||||
@ -347,7 +347,7 @@ class AcpiBitsTest(QemuBaseTest): #pylint: disable=too-many-instance-attributes
|
||||
self._print_log(log)
|
||||
raise e
|
||||
else:
|
||||
if os.getenv('V'):
|
||||
if os.getenv('V') or os.getenv('BITS_DEBUG'):
|
||||
self._print_log(log)
|
||||
|
||||
def tearDown(self):
|
||||
@ -356,8 +356,13 @@ class AcpiBitsTest(QemuBaseTest): #pylint: disable=too-many-instance-attributes
|
||||
"""
|
||||
if self._vm:
|
||||
self.assertFalse(not self._vm.is_running)
|
||||
if not os.getenv('BITS_DEBUG'):
|
||||
self.logger.info('removing the work directory %s', self._workDir)
|
||||
shutil.rmtree(self._workDir)
|
||||
else:
|
||||
self.logger.info('not removing the work directory %s ' \
|
||||
'as BITS_DEBUG is ' \
|
||||
'passed in the environment', self._workDir)
|
||||
super().tearDown()
|
||||
|
||||
def test_acpi_smbios_bits(self):
|
||||
@ -388,12 +393,6 @@ class AcpiBitsTest(QemuBaseTest): #pylint: disable=too-many-instance-attributes
|
||||
self._vm.launch()
|
||||
# biosbits has been configured to run all the specified test suites
|
||||
# in batch mode and then automatically initiate a vm shutdown.
|
||||
# sleep for maximum of one minute
|
||||
max_sleep_time = time.monotonic() + 60
|
||||
while self._vm.is_running() and time.monotonic() < max_sleep_time:
|
||||
time.sleep(1)
|
||||
|
||||
self.assertFalse(time.monotonic() > max_sleep_time,
|
||||
'The VM seems to have failed to shutdown in time')
|
||||
|
||||
# Rely on avocado's unit test timeout.
|
||||
self._vm.wait(timeout=None)
|
||||
self.parse_log()
|
||||
|
||||
@ -58,6 +58,9 @@ class BootLinuxX8664(LinuxTest):
|
||||
self.launch_and_wait(set_up_ssh_connection=False)
|
||||
|
||||
|
||||
# For Aarch64 we only boot KVM tests in CI as the TCG tests are very
|
||||
# heavyweight. There are lighter weight distros which we use in the
|
||||
# machine_aarch64_virt.py tests.
|
||||
class BootLinuxAarch64(LinuxTest):
|
||||
"""
|
||||
:avocado: tags=arch:aarch64
|
||||
@ -73,7 +76,8 @@ class BootLinuxAarch64(LinuxTest):
|
||||
self.vm.add_args('-device', 'virtio-rng-pci,rng=rng0')
|
||||
self.vm.add_args('-object', 'rng-random,id=rng0,filename=/dev/urandom')
|
||||
|
||||
def test_virt_tcg_gicv2(self):
|
||||
@skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab')
|
||||
def test_fedora_cloud_tcg_gicv2(self):
|
||||
"""
|
||||
:avocado: tags=accel:tcg
|
||||
:avocado: tags=cpu:max
|
||||
@ -86,7 +90,8 @@ class BootLinuxAarch64(LinuxTest):
|
||||
self.add_common_args()
|
||||
self.launch_and_wait(set_up_ssh_connection=False)
|
||||
|
||||
def test_virt_tcg_gicv3(self):
|
||||
@skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab')
|
||||
def test_fedora_cloud_tcg_gicv3(self):
|
||||
"""
|
||||
:avocado: tags=accel:tcg
|
||||
:avocado: tags=cpu:max
|
||||
@ -116,7 +121,7 @@ class BootLinuxPPC64(LinuxTest):
|
||||
:avocado: tags=arch:ppc64
|
||||
"""
|
||||
|
||||
timeout = 180
|
||||
timeout = 360
|
||||
|
||||
def test_pseries_tcg(self):
|
||||
"""
|
||||
|
||||
@ -793,8 +793,8 @@ class BootLinuxConsole(LinuxKernelTest):
|
||||
dtb_path = '/usr/lib/linux-image-current-sunxi/sun8i-h3-orangepi-pc.dtb'
|
||||
dtb_path = self.extract_from_deb(deb_path, dtb_path)
|
||||
rootfs_url = ('http://storage.kernelci.org/images/rootfs/buildroot/'
|
||||
'kci-2019.02/armel/base/rootfs.ext2.xz')
|
||||
rootfs_hash = '692510cb625efda31640d1de0a8d60e26040f061'
|
||||
'buildroot-baseline/20221116.0/armel/rootfs.ext2.xz')
|
||||
rootfs_hash = 'fae32f337c7b87547b10f42599acf109da8b6d9a'
|
||||
rootfs_path_xz = self.fetch_asset(rootfs_url, asset_hash=rootfs_hash)
|
||||
rootfs_path = os.path.join(self.workdir, 'rootfs.cpio')
|
||||
archive.lzma_uncompress(rootfs_path_xz, rootfs_path)
|
||||
@ -1029,8 +1029,8 @@ class BootLinuxConsole(LinuxKernelTest):
|
||||
self.wait_for_console_pattern(console_pattern)
|
||||
|
||||
def do_test_advcal_2018(self, day, tar_hash, kernel_name, console=0):
|
||||
tar_url = ('https://www.qemu-advent-calendar.org'
|
||||
'/2018/download/day' + day + '.tar.xz')
|
||||
tar_url = ('https://qemu-advcal.gitlab.io'
|
||||
'/qac-best-of-multiarch/download/day' + day + '.tar.xz')
|
||||
file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
|
||||
archive.extract(file_path, self.workdir)
|
||||
self.vm.set_console(console_index=console)
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
# Functional test that boots a Linux kernel and checks the console
|
||||
# Functional test that boots a various Linux systems and checks the
|
||||
# console output.
|
||||
#
|
||||
# Copyright (c) 2022 Linaro Ltd.
|
||||
#
|
||||
@ -8,19 +9,62 @@
|
||||
# SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
import time
|
||||
import os
|
||||
|
||||
from avocado_qemu import QemuSystemTest
|
||||
from avocado_qemu import wait_for_console_pattern
|
||||
from avocado_qemu import exec_command
|
||||
from avocado_qemu import BUILD_DIR
|
||||
|
||||
class Aarch64VirtMachine(QemuSystemTest):
|
||||
KERNEL_COMMON_COMMAND_LINE = 'printk.time=0 '
|
||||
timeout = 360
|
||||
|
||||
def wait_for_console_pattern(self, success_message, vm=None):
|
||||
wait_for_console_pattern(self, success_message,
|
||||
failure_message='Kernel panic - not syncing',
|
||||
vm=vm)
|
||||
|
||||
# This tests the whole boot chain from EFI to Userspace
|
||||
# We only boot a whole OS for the current top level CPU and GIC
|
||||
# Other test profiles should use more minimal boots
|
||||
def test_alpine_virt_tcg_gic_max(self):
|
||||
"""
|
||||
:avocado: tags=arch:aarch64
|
||||
:avocado: tags=machine:virt
|
||||
:avocado: tags=accel:tcg
|
||||
"""
|
||||
iso_url = ('https://dl-cdn.alpinelinux.org/'
|
||||
'alpine/v3.16/releases/aarch64/'
|
||||
'alpine-virt-3.16.3-aarch64.iso')
|
||||
|
||||
# Alpine use sha256 so I recalculated this myself
|
||||
iso_sha1 = '0683bc089486d55c91bf6607d5ecb93925769bc0'
|
||||
iso_path = self.fetch_asset(iso_url, asset_hash=iso_sha1)
|
||||
|
||||
self.vm.set_console()
|
||||
kernel_command_line = (self.KERNEL_COMMON_COMMAND_LINE +
|
||||
'console=ttyAMA0')
|
||||
self.require_accelerator("tcg")
|
||||
|
||||
self.vm.add_args("-accel", "tcg")
|
||||
self.vm.add_args("-cpu", "max,pauth-impdef=on")
|
||||
self.vm.add_args("-machine",
|
||||
"virt,acpi=on,"
|
||||
"virtualization=on,"
|
||||
"mte=on,"
|
||||
"gic-version=max,iommu=smmuv3")
|
||||
self.vm.add_args("-smp", "2", "-m", "1024")
|
||||
self.vm.add_args('-bios', os.path.join(BUILD_DIR, 'pc-bios',
|
||||
'edk2-aarch64-code.fd'))
|
||||
self.vm.add_args("-drive", f"file={iso_path},format=raw")
|
||||
self.vm.add_args('-device', 'virtio-rng-pci,rng=rng0')
|
||||
self.vm.add_args('-object', 'rng-random,id=rng0,filename=/dev/urandom')
|
||||
|
||||
self.vm.launch()
|
||||
self.wait_for_console_pattern('Welcome to Alpine Linux 3.16')
|
||||
|
||||
|
||||
def test_aarch64_virt(self):
|
||||
"""
|
||||
:avocado: tags=arch:aarch64
|
||||
|
||||
@ -23,8 +23,8 @@ class CanonA1100Machine(QemuSystemTest):
|
||||
:avocado: tags=machine:canon-a1100
|
||||
:avocado: tags=device:pflash_cfi02
|
||||
"""
|
||||
tar_url = ('https://www.qemu-advent-calendar.org'
|
||||
'/2018/download/day18.tar.xz')
|
||||
tar_url = ('https://qemu-advcal.gitlab.io'
|
||||
'/qac-best-of-multiarch/download/day18.tar.xz')
|
||||
tar_hash = '068b5fc4242b29381acee94713509f8a876e9db6'
|
||||
file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
|
||||
archive.extract(file_path, self.workdir)
|
||||
|
||||
@ -12,6 +12,7 @@ from avocado_qemu import QemuSystemTest
|
||||
from avocado_qemu import wait_for_console_pattern
|
||||
from avocado_qemu import exec_command
|
||||
from avocado_qemu import exec_command_and_wait_for_pattern
|
||||
from avocado_qemu import interrupt_interactive_console_until_pattern
|
||||
from avocado.utils import archive
|
||||
from avocado import skipIf
|
||||
|
||||
@ -182,6 +183,8 @@ class AST2x00Machine(QemuSystemTest):
|
||||
|
||||
class AST2x00MachineSDK(QemuSystemTest):
|
||||
|
||||
EXTRA_BOOTARGS = ' quiet'
|
||||
|
||||
# FIXME: Although these tests boot a whole distro they are still
|
||||
# slower than comparable machine models. There may be some
|
||||
# optimisations which bring down the runtime. In the meantime they
|
||||
@ -194,7 +197,7 @@ class AST2x00MachineSDK(QemuSystemTest):
|
||||
failure_message='Kernel panic - not syncing',
|
||||
vm=vm)
|
||||
|
||||
def do_test_arm_aspeed_sdk_start(self, image, cpu_id):
|
||||
def do_test_arm_aspeed_sdk_start(self, image):
|
||||
self.require_netdev('user')
|
||||
self.vm.set_console()
|
||||
self.vm.add_args('-drive', 'file=' + image + ',if=mtd,format=raw',
|
||||
@ -202,9 +205,13 @@ class AST2x00MachineSDK(QemuSystemTest):
|
||||
self.vm.launch()
|
||||
|
||||
self.wait_for_console_pattern('U-Boot 2019.04')
|
||||
self.wait_for_console_pattern('## Loading kernel from FIT Image')
|
||||
interrupt_interactive_console_until_pattern(
|
||||
self, 'Hit any key to stop autoboot:', 'ast#')
|
||||
exec_command_and_wait_for_pattern(
|
||||
self, 'setenv bootargs ${bootargs}' + self.EXTRA_BOOTARGS, 'ast#')
|
||||
exec_command_and_wait_for_pattern(
|
||||
self, 'boot', '## Loading kernel from FIT Image')
|
||||
self.wait_for_console_pattern('Starting kernel ...')
|
||||
self.wait_for_console_pattern('Booting Linux on physical CPU ' + cpu_id)
|
||||
|
||||
@skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab')
|
||||
def test_arm_ast2500_evb_sdk(self):
|
||||
@ -221,7 +228,7 @@ class AST2x00MachineSDK(QemuSystemTest):
|
||||
archive.extract(image_path, self.workdir)
|
||||
|
||||
self.do_test_arm_aspeed_sdk_start(
|
||||
self.workdir + '/ast2500-default/image-bmc', '0x0')
|
||||
self.workdir + '/ast2500-default/image-bmc')
|
||||
self.wait_for_console_pattern('ast2500-default login:')
|
||||
|
||||
@skipIf(os.getenv('GITLAB_CI'), 'Running on GitLab')
|
||||
@ -243,7 +250,7 @@ class AST2x00MachineSDK(QemuSystemTest):
|
||||
self.vm.add_args('-device',
|
||||
'ds1338,bus=aspeed.i2c.bus.5,address=0x32');
|
||||
self.do_test_arm_aspeed_sdk_start(
|
||||
self.workdir + '/ast2600-default/image-bmc', '0xf00')
|
||||
self.workdir + '/ast2600-default/image-bmc')
|
||||
self.wait_for_console_pattern('ast2600-default login:')
|
||||
exec_command_and_wait_for_pattern(self, 'root', 'Password:')
|
||||
exec_command_and_wait_for_pattern(self, '0penBmc', 'root@ast2600-default:~#')
|
||||
|
||||
@ -19,8 +19,8 @@ class MicroblazeMachine(QemuSystemTest):
|
||||
:avocado: tags=machine:petalogix-s3adsp1800
|
||||
"""
|
||||
|
||||
tar_url = ('https://www.qemu-advent-calendar.org'
|
||||
'/2018/download/day17.tar.xz')
|
||||
tar_url = ('https://qemu-advcal.gitlab.io'
|
||||
'/qac-best-of-multiarch/download/day17.tar.xz')
|
||||
tar_hash = '08bf3e3bfb6b6c7ce1e54ab65d54e189f2caf13f'
|
||||
file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
|
||||
archive.extract(file_path, self.workdir)
|
||||
|
||||
@ -24,8 +24,8 @@ class Sun4uMachine(LinuxKernelTest):
|
||||
:avocado: tags=arch:sparc64
|
||||
:avocado: tags=machine:sun4u
|
||||
"""
|
||||
tar_url = ('https://www.qemu-advent-calendar.org'
|
||||
'/2018/download/day23.tar.xz')
|
||||
tar_url = ('https://qemu-advcal.gitlab.io'
|
||||
'/qac-best-of-multiarch/download/day23.tar.xz')
|
||||
tar_hash = '142db83cd974ffadc4f75c8a5cad5bcc5722c240'
|
||||
file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
|
||||
archive.extract(file_path, self.workdir)
|
||||
|
||||
@ -22,9 +22,9 @@ class Mpc8544dsMachine(QemuSystemTest):
|
||||
:avocado: tags=accel:tcg
|
||||
"""
|
||||
self.require_accelerator("tcg")
|
||||
tar_url = ('https://www.qemu-advent-calendar.org'
|
||||
'/2020/download/day17.tar.gz')
|
||||
tar_hash = '7a5239542a7c4257aa4d3b7f6ddf08fb6775c494'
|
||||
tar_url = ('https://qemu-advcal.gitlab.io'
|
||||
'/qac-best-of-multiarch/download/day04.tar.xz')
|
||||
tar_hash = 'f46724d281a9f30fa892d458be7beb7d34dc25f9'
|
||||
file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
|
||||
archive.extract(file_path, self.workdir)
|
||||
self.vm.set_console()
|
||||
|
||||
@ -22,9 +22,9 @@ class VirtexMl507Machine(QemuSystemTest):
|
||||
:avocado: tags=accel:tcg
|
||||
"""
|
||||
self.require_accelerator("tcg")
|
||||
tar_url = ('https://www.qemu-advent-calendar.org'
|
||||
'/2020/download/hippo.tar.gz')
|
||||
tar_hash = '306b95bfe7d147f125aa176a877e266db8ef914a'
|
||||
tar_url = ('https://qemu-advcal.gitlab.io'
|
||||
'/qac-best-of-multiarch/download/day08.tar.xz')
|
||||
tar_hash = '74c68f5af7a7b8f21c03097b298f3bb77ff52c1f'
|
||||
file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
|
||||
archive.extract(file_path, self.workdir)
|
||||
self.vm.set_console()
|
||||
|
||||
@ -296,8 +296,8 @@ class ReplayKernelNormal(ReplayKernelBase):
|
||||
:avocado: tags=machine:vexpress-a9
|
||||
"""
|
||||
tar_hash = '32b7677ce8b6f1471fb0059865f451169934245b'
|
||||
tar_url = ('https://www.qemu-advent-calendar.org'
|
||||
'/2018/download/day16.tar.xz')
|
||||
tar_url = ('https://qemu-advcal.gitlab.io'
|
||||
'/qac-best-of-multiarch/download/day16.tar.xz')
|
||||
file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
|
||||
dtb_path = self.workdir + '/day16/vexpress-v2p-ca9.dtb'
|
||||
self.do_test_advcal_2018(file_path, 'winter.zImage',
|
||||
@ -309,8 +309,8 @@ class ReplayKernelNormal(ReplayKernelBase):
|
||||
:avocado: tags=machine:mcf5208evb
|
||||
"""
|
||||
tar_hash = 'ac688fd00561a2b6ce1359f9ff6aa2b98c9a570c'
|
||||
tar_url = ('https://www.qemu-advent-calendar.org'
|
||||
'/2018/download/day07.tar.xz')
|
||||
tar_url = ('https://qemu-advcal.gitlab.io'
|
||||
'/qac-best-of-multiarch/download/day07.tar.xz')
|
||||
file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
|
||||
self.do_test_advcal_2018(file_path, 'sanity-clause.elf')
|
||||
|
||||
@ -321,8 +321,8 @@ class ReplayKernelNormal(ReplayKernelBase):
|
||||
:avocado: tags=machine:petalogix-s3adsp1800
|
||||
"""
|
||||
tar_hash = '08bf3e3bfb6b6c7ce1e54ab65d54e189f2caf13f'
|
||||
tar_url = ('https://www.qemu-advent-calendar.org'
|
||||
'/2018/download/day17.tar.xz')
|
||||
tar_url = ('https://qemu-advcal.gitlab.io'
|
||||
'/qac-best-of-multiarch/download/day17.tar.xz')
|
||||
file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
|
||||
self.do_test_advcal_2018(file_path, 'ballerina.bin')
|
||||
|
||||
@ -333,8 +333,8 @@ class ReplayKernelNormal(ReplayKernelBase):
|
||||
:avocado: tags=cpu:e5500
|
||||
"""
|
||||
tar_hash = '6951d86d644b302898da2fd701739c9406527fe1'
|
||||
tar_url = ('https://www.qemu-advent-calendar.org'
|
||||
'/2018/download/day19.tar.xz')
|
||||
tar_url = ('https://qemu-advcal.gitlab.io'
|
||||
'/qac-best-of-multiarch/download/day19.tar.xz')
|
||||
file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
|
||||
self.do_test_advcal_2018(file_path, 'uImage')
|
||||
|
||||
@ -344,8 +344,8 @@ class ReplayKernelNormal(ReplayKernelBase):
|
||||
:avocado: tags=machine:or1k-sim
|
||||
"""
|
||||
tar_hash = '20334cdaf386108c530ff0badaecc955693027dd'
|
||||
tar_url = ('https://www.qemu-advent-calendar.org'
|
||||
'/2018/download/day20.tar.xz')
|
||||
tar_url = ('https://qemu-advcal.gitlab.io'
|
||||
'/qac-best-of-multiarch/download/day20.tar.xz')
|
||||
file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
|
||||
self.do_test_advcal_2018(file_path, 'vmlinux')
|
||||
|
||||
@ -355,8 +355,8 @@ class ReplayKernelNormal(ReplayKernelBase):
|
||||
:avocado: tags=machine:10m50-ghrd
|
||||
"""
|
||||
tar_hash = 'e4251141726c412ac0407c5a6bceefbbff018918'
|
||||
tar_url = ('https://www.qemu-advent-calendar.org'
|
||||
'/2018/download/day14.tar.xz')
|
||||
tar_url = ('https://qemu-advcal.gitlab.io'
|
||||
'/qac-best-of-multiarch/download/day14.tar.xz')
|
||||
file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
|
||||
self.do_test_advcal_2018(file_path, 'vmlinux.elf')
|
||||
|
||||
@ -366,8 +366,8 @@ class ReplayKernelNormal(ReplayKernelBase):
|
||||
:avocado: tags=machine:g3beige
|
||||
"""
|
||||
tar_hash = 'e0b872a5eb8fdc5bed19bd43ffe863900ebcedfc'
|
||||
tar_url = ('https://www.qemu-advent-calendar.org'
|
||||
'/2018/download/day15.tar.xz')
|
||||
tar_url = ('https://qemu-advcal.gitlab.io'
|
||||
'/qac-best-of-multiarch/download/day15.tar.xz')
|
||||
file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
|
||||
self.do_test_advcal_2018(file_path, 'invaders.elf',
|
||||
args=('-M', 'graphics=off'))
|
||||
@ -378,8 +378,8 @@ class ReplayKernelNormal(ReplayKernelBase):
|
||||
:avocado: tags=machine:mac99
|
||||
"""
|
||||
tar_hash = 'e0b872a5eb8fdc5bed19bd43ffe863900ebcedfc'
|
||||
tar_url = ('https://www.qemu-advent-calendar.org'
|
||||
'/2018/download/day15.tar.xz')
|
||||
tar_url = ('https://qemu-advcal.gitlab.io'
|
||||
'/qac-best-of-multiarch/download/day15.tar.xz')
|
||||
file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
|
||||
self.do_test_advcal_2018(file_path, 'invaders.elf',
|
||||
args=('-M', 'graphics=off'))
|
||||
@ -390,8 +390,8 @@ class ReplayKernelNormal(ReplayKernelBase):
|
||||
:avocado: tags=machine:SS-20
|
||||
"""
|
||||
tar_hash = 'b18550d5d61c7615d989a06edace051017726a9f'
|
||||
tar_url = ('https://www.qemu-advent-calendar.org'
|
||||
'/2018/download/day11.tar.xz')
|
||||
tar_url = ('https://qemu-advcal.gitlab.io'
|
||||
'/qac-best-of-multiarch/download/day11.tar.xz')
|
||||
file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
|
||||
self.do_test_advcal_2018(file_path, 'zImage.elf')
|
||||
|
||||
@ -402,8 +402,8 @@ class ReplayKernelNormal(ReplayKernelBase):
|
||||
:avocado: tags=cpu:dc233c
|
||||
"""
|
||||
tar_hash = '49e88d9933742f0164b60839886c9739cb7a0d34'
|
||||
tar_url = ('https://www.qemu-advent-calendar.org'
|
||||
'/2018/download/day02.tar.xz')
|
||||
tar_url = ('https://qemu-advcal.gitlab.io'
|
||||
'/qac-best-of-multiarch/download/day02.tar.xz')
|
||||
file_path = self.fetch_asset(tar_url, asset_hash=tar_hash)
|
||||
self.do_test_advcal_2018(file_path, 'santas-sleigh-ride.elf')
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user