* [PULL v2 000/113] First batch of misc (i386, kernel-doc, memory, vl.c) changes for QEMU 6.0
@ 2020-12-11 12:31 Paolo Bonzini
2020-12-11 12:31 ` [PULL 001/113] target/i386: fix operand order for PDEP and PEXT Paolo Bonzini
2020-12-11 15:00 ` [PULL v2 000/113] First batch of misc (i386, kernel-doc, memory, vl.c) changes for QEMU 6.0 Peter Maydell
0 siblings, 2 replies; 5+ messages in thread
From: Paolo Bonzini @ 2020-12-11 12:31 UTC (permalink / raw)
To: qemu-devel
The following changes since commit 379e9eaed497a2e09b5985e1e15967d7bfea8296:
Merge remote-tracking branch 'remotes/legoater/tags/pull-aspeed-20201210' into staging (2020-12-10 14:26:35 +0000)
are available in the Git repository at:
https://gitlab.com/bonzini/qemu.git tags/for-upstream
for you to fetch changes up to 953d0c333e2825656ba1ec5bd1c18bc53485b39c:
scripts: kernel-doc: remove unnecessary change wrt Linux (2020-12-10 12:15:25 -0500)
----------------------------------------------------------------
* Fix for NULL segments (Bin Meng)
* Support for 32768 CPUs on x86 without IOMMU (David)
* PDEP/PEXT fix and testcase (myself)
* Remove bios_name and ram_size globals (myself)
* qemu_init rationalization (myself)
* Update kernel-doc (myself + upstream patches)
* Propagate MemTxResult across DMA and PCI functions (Philippe)
* Remove master/slave when applicable (Philippe)
* WHPX support for in-kernel irqchip (Sunil)
----------------------------------------------------------------
v2->v3: Fix warning on 32-bit compilation of test-i386-bmi2
Alexander A. Klimov (1):
Replace HTTP links with HTTPS ones: documentation
André Almeida (2):
kernel-doc: fix processing nested structs with attributes
kernel-doc: add support for ____cacheline_aligned_in_smp attribute
Bin Meng (1):
target/i386: seg_helper: Correct segment selector nullification in the RET/IRET helper
David Woodhouse (1):
target/i386: Support up to 32768 CPUs without IRQ remapping
Jonathan Cameron (1):
kernel-doc: add support for ____cacheline_aligned attribute
Jonathan Neuschäfer (1):
scripts/kernel-doc: Add support for named variable macro arguments
Mauro Carvalho Chehab (19):
scripts: kernel-doc: proper handle @foo->bar()
scripts: kernel-doc: accept negation like !@var
scripts: kernel-doc: accept blank lines on parameter description
scripts/kernel-doc: parse __ETHTOOL_DECLARE_LINK_MODE_MASK
scripts/kernel-doc: handle function pointer prototypes
kernel-doc: include line numbers for function prototypes
scripts: kernel-doc: add support for typedef enum
scripts: kernel-doc: make it more compatible with Sphinx 3.x
scripts: kernel-doc: use a less pedantic markup for funcs on Sphinx 3.x
scripts: kernel-doc: fix troubles with line counts
scripts: kernel-doc: reimplement -nofunction argument
scripts: kernel-doc: fix typedef identification
scripts: kernel-doc: don't mangle with parameter list
scripts: kernel-doc: allow passing desired Sphinx C domain dialect
scripts: kernel-doc: fix line number handling
scripts: kernel-doc: try to use c:function if possible
scripts: kernel-doc: fix typedef parsing
scripts: kernel-doc: split typedef complex regex
scripts: kernel-doc: use :c:union when needed
Paolo Bonzini (69):
target/i386: fix operand order for PDEP and PEXT
qom: eliminate identical functions
alpha: remove bios_name
arm: remove bios_name
hppa: remove bios_name
i386: remove bios_name
lm32: remove bios_name
m68k: remove bios_name
mips: remove bios_name
moxie: remove bios_name
ppc: remove bios_name
rx: move BIOS load from MCU to board
s390: remove bios_name
sh4: remove bios_name
sparc: remove bios_name
digic: remove bios_name
vl: remove bios_name
arm: do not use ram_size global
cris: do not use ram_size global
hppa: do not use ram_size global
i386: do not use ram_size global
m68k: do not use ram_size global
microblaze: do not use ram_size global
mips: do not use ram_size global
moxie: do not use ram_size global
nios2: do not use ram_size global
ppc: do not use ram_size global
riscv: do not use ram_size global
s390x: do not use ram_size global
sparc64: do not use ram_size global
make ram_size local to vl.c
treewide: do not use short-form boolean options
vl: extract validation of -smp to machine.c
vl: remove bogus check
vl: split various early command line options to a separate function
vl: move various initialization routines out of qemu_init
vl: extract qemu_init_subsystems
vl: move prelaunch part of qemu_init to new functions
vl: extract various command line validation snippets to a new function
vl: preconfig and loadvm are mutually exclusive
vl: extract various command line desugaring snippets to a new function
qemu-option: restrict qemu_opts_set to merge-lists QemuOpts
vl: create "-net nic -net user" default earlier
vl: load plugins as late as possible
vl: extract default devices to separate functions
vl: move CHECKPOINT_INIT after preconfig
vl: separate qemu_create_early_backends
vl: separate qemu_create_late_backends
vl: separate qemu_create_machine
vl: separate qemu_apply_machine_options
vl: separate qemu_resolve_machine_memdev
vl: initialize displays before preconfig loop
vl: move -global check earlier
migration, vl: start migration via qmp_migrate_incoming
vl: start VM via qmp_cont
hmp: introduce cmd_available
vl: extract softmmu/datadir.c
vl: extract machine done notifiers
vl: extract softmmu/rtc.c
vl: remove serial_max_hds
vl: clean up -boot variables
config-file: move -set implementation to vl.c
docs: temporarily disable the kernel-doc extension
Revert "scripts/kerneldoc: For Sphinx 3 use c:macro for macros with arguments"
Revert "kernel-doc: Use c:struct for Sphinx 3.0 and later"
Revert "kernel-doc: Handle function typedefs without asterisks"
Revert "kernel-doc: Handle function typedefs that return pointers"
Revert "docs: temporarily disable the kernel-doc extension"
scripts: kernel-doc: remove unnecessary change wrt Linux
Philippe Mathieu-Daudé (16):
docs/devel/loads-stores: Add regexp for DMA functions
dma: Document address_space_map/address_space_unmap() prototypes
dma: Let dma_memory_set() propagate MemTxResult
dma: Let dma_memory_rw() propagate MemTxResult
dma: Let dma_memory_read() propagate MemTxResult
dma: Let dma_memory_write() propagate MemTxResult
pci: Let pci_dma_rw() propagate MemTxResult
pci: Let pci_dma_read() propagate MemTxResult
pci: Let pci_dma_write() propagate MemTxResult
hw/ssi/aspeed_smc: Rename 'max_slaves' variable as 'max_peripherals'
hw/ssi: Update coding style to make checkpatch.pl happy
hw/ssi: Rename SSI 'slave' as 'peripheral'
hw/core/stream: Rename StreamSlave as StreamSink
hw/dma/xilinx_axidma: Rename StreamSlave as StreamSink
hw/net/xilinx_axienet: Rename StreamSlave as StreamSink
hw/char/serial: Clean up unnecessary code
Pierre-Louis Bossart (1):
scripts/kernel-doc: optionally treat warnings as errors
Sunil Muthuswamy (1):
WHPX: support for the kernel-irqchip on/off
MAINTAINERS | 1 +
docs/devel/loads-stores.rst | 2 +
docs/specs/tpm.rst | 2 +-
docs/sphinx/kerneldoc.py | 6 +-
hw/alpha/dp264.c | 3 +-
hw/arm/aspeed.c | 8 +-
hw/arm/boot.c | 1 +
hw/arm/cubieboard.c | 2 +-
hw/arm/digic_boards.c | 20 +-
hw/arm/highbank.c | 9 +-
hw/arm/npcm7xx_boards.c | 6 +-
hw/arm/orangepi.c | 2 +-
hw/arm/sbsa-ref.c | 3 +
hw/arm/spitz.c | 32 +-
hw/arm/stellaris.c | 4 +-
hw/arm/tosa.c | 12 +-
hw/arm/vexpress.c | 9 +-
hw/arm/virt.c | 3 +
hw/arm/z2.c | 14 +-
hw/avr/boot.c | 1 +
hw/block/m25p80.c | 14 +-
hw/char/serial.c | 13 +-
hw/core/generic-loader.c | 3 +-
hw/core/loader.c | 1 +
hw/core/machine.c | 56 +
hw/core/numa.c | 10 +-
hw/core/stream.c | 20 +-
hw/cris/axis_dev88.c | 1 +
hw/cris/boot.c | 2 +-
hw/cris/boot.h | 1 +
hw/display/ads7846.c | 12 +-
hw/display/cg3.c | 1 +
hw/display/pxa2xx_lcd.c | 5 +-
hw/display/ssd0323.c | 12 +-
hw/display/tcx.c | 1 +
hw/dma/xilinx_axidma.c | 58 +-
hw/hppa/machine.c | 14 +-
hw/i386/fw_cfg.c | 2 +-
hw/i386/kvm/apic.c | 7 +
hw/i386/microvm.c | 7 +-
hw/i386/pc.c | 16 +-
hw/i386/pc_sysfw.c | 4 +-
hw/i386/vmport.c | 3 +-
hw/i386/x86.c | 17 +-
hw/i386/xen/xen-hvm.c | 2 +-
hw/intc/apic_common.c | 3 +-
hw/lm32/milkymist.c | 5 +-
hw/m68k/mcf5206.c | 4 +-
hw/m68k/mcf5208.c | 14 +-
hw/m68k/next-cube.c | 4 +-
hw/m68k/q800.c | 5 +-
hw/microblaze/boot.c | 9 +-
hw/mips/fuloong2e.c | 11 +-
hw/mips/jazz.c | 7 +-
hw/mips/malta.c | 9 +-
hw/mips/mipssim.c | 7 +-
hw/misc/max111x.c | 18 +-
hw/moxie/moxiesim.c | 8 +-
hw/net/xilinx_axienet.c | 44 +-
hw/nios2/boot.c | 9 +-
hw/nvram/fw_cfg.c | 1 +
hw/pci-host/prep.c | 1 +
hw/pci/pci.c | 1 +
hw/ppc/e500.c | 5 +-
hw/ppc/mac_newworld.c | 5 +-
hw/ppc/mac_oldworld.c | 5 +-
hw/ppc/pnv.c | 6 +-
hw/ppc/ppc405_boards.c | 7 +-
hw/ppc/ppc440_bamboo.c | 1 +
hw/ppc/prep.c | 6 +-
hw/ppc/sam460ex.c | 1 +
hw/ppc/spapr.c | 11 +-
hw/ppc/spapr_vio.c | 4 +-
hw/ppc/virtex_ml507.c | 1 +
hw/riscv/boot.c | 6 +-
hw/rx/rx-gdbsim.c | 10 +
hw/rx/rx62n.c | 9 -
hw/s390x/ipl.c | 19 +-
hw/s390x/s390-skeys.c | 6 +-
hw/s390x/s390-virtio-ccw.c | 7 +-
hw/sd/ssi-sd.c | 12 +-
hw/sh4/shix.c | 3 +-
hw/smbios/smbios.c | 8 +-
hw/sparc/leon3.c | 5 +-
hw/sparc/sun4m.c | 3 +-
hw/sparc64/sparc64.c | 3 +-
hw/sparc64/sun4u.c | 7 +-
hw/ssi/aspeed_smc.c | 53 +-
hw/ssi/pl022.c | 2 +-
hw/ssi/ssi.c | 48 +-
hw/ssi/xilinx_spips.c | 9 +-
hw/virtio/virtio-balloon.c | 3 +-
include/exec/cpu-common.h | 2 -
include/hw/boards.h | 2 +
include/hw/i386/x86.h | 3 +-
include/hw/misc/max111x.h | 2 +-
include/hw/pci/pci.h | 50 +-
include/hw/qdev-core.h | 8 -
include/hw/ssi/aspeed_smc.h | 2 +-
include/hw/ssi/ssi.h | 56 +-
include/hw/ssi/xilinx_spips.h | 2 +-
include/hw/stream.h | 41 +-
include/migration/misc.h | 1 -
include/qemu-common.h | 21 -
include/qemu/config-file.h | 1 -
include/qemu/datadir.h | 28 +
include/qemu/option.h | 3 +-
include/standard-headers/asm-x86/kvm_para.h | 1 +
include/sysemu/dma.h | 117 +-
include/sysemu/sysemu.h | 10 +-
include/sysemu/whpx.h | 22 +
migration/migration.c | 37 +-
monitor/hmp.c | 18 +-
monitor/qmp-cmds.c | 3 +-
python/qemu/machine.py | 2 +-
qemu-options.hx | 32 +-
qom/object.c | 36 +-
scripts/kernel-doc | 455 ++++---
softmmu/cpus.c | 3 +-
softmmu/datadir.c | 129 ++
softmmu/dma-helpers.c | 7 +-
softmmu/meson.build | 2 +
softmmu/qdev-monitor.c | 6 -
softmmu/rtc.c | 190 +++
softmmu/vl.c | 1755 ++++++++++++---------------
target/arm/arm-semi.c | 3 +-
target/i386/cpu.c | 8 +-
target/i386/kvm.c | 77 +-
target/i386/kvm_i386.h | 2 +
target/i386/meson.build | 1 +
target/i386/seg_helper.c | 5 +-
target/i386/translate.c | 8 +-
target/i386/whp-dispatch.h | 9 +-
target/i386/whpx-all.c | 291 ++++-
target/i386/whpx-apic.c | 274 +++++
target/m68k/m68k-semi.c | 5 +-
target/s390x/excp_helper.c | 3 +-
target/s390x/mem_helper.c | 10 +-
target/s390x/mmu_helper.c | 4 +-
tests/qtest/bios-tables-test.c | 4 +-
tests/qtest/fuzz/fuzz.c | 1 +
tests/qtest/pflash-cfi02-test.c | 4 +-
tests/qtest/test-filter-redirector.c | 8 +-
tests/qtest/vhost-user-test.c | 8 +-
tests/tcg/i386/Makefile.target | 3 +
tests/tcg/i386/test-i386-bmi2.c | 42 +
tests/test-char.c | 8 +-
tests/test-qemu-opts.c | 20 +-
ui/keymaps.c | 1 +
util/qemu-config.c | 33 -
util/qemu-option.c | 9 +-
151 files changed, 2923 insertions(+), 1812 deletions(-)
create mode 100644 include/qemu/datadir.h
create mode 100644 softmmu/datadir.c
create mode 100644 softmmu/rtc.c
create mode 100644 target/i386/whpx-apic.c
create mode 100644 tests/tcg/i386/test-i386-bmi2.c
--
2.26.2
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PULL 001/113] target/i386: fix operand order for PDEP and PEXT
2020-12-11 12:31 [PULL v2 000/113] First batch of misc (i386, kernel-doc, memory, vl.c) changes for QEMU 6.0 Paolo Bonzini
@ 2020-12-11 12:31 ` Paolo Bonzini
2020-12-11 15:00 ` [PULL v2 000/113] First batch of misc (i386, kernel-doc, memory, vl.c) changes for QEMU 6.0 Peter Maydell
1 sibling, 0 replies; 5+ messages in thread
From: Paolo Bonzini @ 2020-12-11 12:31 UTC (permalink / raw)
To: qemu-devel; +Cc: Lenard Szolnoki, Richard Henderson
For PDEP and PEXT, the mask is provided in the memory (mod+r/m)
operand, and therefore is loaded in s->T0 by gen_ldst_modrm.
The source is provided in the second source operand (VEX.vvvv)
and therefore is loaded in s->T1. Fix the order in which
they are passed to the helpers.
Reported-by: Lenard Szolnoki <blog@lenardszolnoki.com>
Analyzed-by: Lenard Szolnoki <blog@lenardszolnoki.com>
Fixes: https://bugs.launchpad.net/qemu/+bug/1605123
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
target/i386/translate.c | 8 +++----
tests/tcg/i386/Makefile.target | 3 +++
tests/tcg/i386/test-i386-bmi2.c | 42 +++++++++++++++++++++++++++++++++
3 files changed, 49 insertions(+), 4 deletions(-)
create mode 100644 tests/tcg/i386/test-i386-bmi2.c
diff --git a/target/i386/translate.c b/target/i386/translate.c
index 4c57307e42..e8f5f5803a 100644
--- a/target/i386/translate.c
+++ b/target/i386/translate.c
@@ -3936,14 +3936,14 @@ static void gen_sse(CPUX86State *env, DisasContext *s, int b,
}
ot = mo_64_32(s->dflag);
gen_ldst_modrm(env, s, modrm, ot, OR_TMP0, 0);
- /* Note that by zero-extending the mask operand, we
+ /* Note that by zero-extending the source operand, we
automatically handle zero-extending the result. */
if (ot == MO_64) {
tcg_gen_mov_tl(s->T1, cpu_regs[s->vex_v]);
} else {
tcg_gen_ext32u_tl(s->T1, cpu_regs[s->vex_v]);
}
- gen_helper_pdep(cpu_regs[reg], s->T0, s->T1);
+ gen_helper_pdep(cpu_regs[reg], s->T1, s->T0);
break;
case 0x2f5: /* pext Gy, By, Ey */
@@ -3954,14 +3954,14 @@ static void gen_sse(CPUX86State *env, DisasContext *s, int b,
}
ot = mo_64_32(s->dflag);
gen_ldst_modrm(env, s, modrm, ot, OR_TMP0, 0);
- /* Note that by zero-extending the mask operand, we
+ /* Note that by zero-extending the source operand, we
automatically handle zero-extending the result. */
if (ot == MO_64) {
tcg_gen_mov_tl(s->T1, cpu_regs[s->vex_v]);
} else {
tcg_gen_ext32u_tl(s->T1, cpu_regs[s->vex_v]);
}
- gen_helper_pext(cpu_regs[reg], s->T0, s->T1);
+ gen_helper_pext(cpu_regs[reg], s->T1, s->T0);
break;
case 0x1f6: /* adcx Gy, Ey */
diff --git a/tests/tcg/i386/Makefile.target b/tests/tcg/i386/Makefile.target
index a66232a67d..ad187cb2c9 100644
--- a/tests/tcg/i386/Makefile.target
+++ b/tests/tcg/i386/Makefile.target
@@ -18,6 +18,9 @@ test-i386-pcmpistri: CFLAGS += -msse4.2
run-test-i386-pcmpistri: QEMU_OPTS += -cpu max
run-plugin-test-i386-pcmpistri-%: QEMU_OPTS += -cpu max
+run-test-i386-bmi2: QEMU_OPTS += -cpu max
+run-plugin-test-i386-bmi2-%: QEMU_OPTS += -cpu max
+
#
# hello-i386 is a barebones app
#
diff --git a/tests/tcg/i386/test-i386-bmi2.c b/tests/tcg/i386/test-i386-bmi2.c
new file mode 100644
index 0000000000..935a4d2a73
--- /dev/null
+++ b/tests/tcg/i386/test-i386-bmi2.c
@@ -0,0 +1,42 @@
+/* See if various BMI2 instructions give expected results */
+#include <assert.h>
+#include <stdint.h>
+
+int main(int argc, char *argv[]) {
+ uint64_t ehlo = 0x202020204f4c4845ull;
+ uint64_t mask = 0xa080800302020001ull;
+ uint32_t result32;
+
+#ifdef __x86_64
+ uint64_t result64;
+
+ /* 64 bits */
+ asm volatile ("pextq %2, %1, %0" : "=r"(result64) : "r"(ehlo), "m"(mask));
+ assert(result64 == 133);
+
+ asm volatile ("pdepq %2, %1, %0" : "=r"(result64) : "r"(result64), "m"(mask));
+ assert(result64 == (ehlo & mask));
+
+ asm volatile ("pextq %2, %1, %0" : "=r"(result64) : "r"(-1ull), "m"(mask));
+ assert(result64 == 511); /* mask has 9 bits set */
+
+ asm volatile ("pdepq %2, %1, %0" : "=r"(result64) : "r"(-1ull), "m"(mask));
+ assert(result64 == mask);
+#endif
+
+ /* 32 bits */
+ asm volatile ("pextl %2, %k1, %k0" : "=r"(result32) : "r"((uint32_t) ehlo), "m"(mask));
+ assert(result32 == 5);
+
+ asm volatile ("pdepl %2, %k1, %k0" : "=r"(result32) : "r"(result32), "m"(mask));
+ assert(result32 == (uint32_t)(ehlo & mask));
+
+ asm volatile ("pextl %2, %k1, %k0" : "=r"(result32) : "r"(-1ull), "m"(mask));
+ assert(result32 == 7); /* mask has 3 bits set */
+
+ asm volatile ("pdepl %2, %k1, %k0" : "=r"(result32) : "r"(-1ull), "m"(mask));
+ assert(result32 == (uint32_t)mask);
+
+ return 0;
+}
+
--
2.26.2
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PULL v2 000/113] First batch of misc (i386, kernel-doc, memory, vl.c) changes for QEMU 6.0
2020-12-11 12:31 [PULL v2 000/113] First batch of misc (i386, kernel-doc, memory, vl.c) changes for QEMU 6.0 Paolo Bonzini
2020-12-11 12:31 ` [PULL 001/113] target/i386: fix operand order for PDEP and PEXT Paolo Bonzini
@ 2020-12-11 15:00 ` Peter Maydell
1 sibling, 0 replies; 5+ messages in thread
From: Peter Maydell @ 2020-12-11 15:00 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: QEMU Developers
On Fri, 11 Dec 2020 at 12:34, Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> The following changes since commit 379e9eaed497a2e09b5985e1e15967d7bfea8296:
>
> Merge remote-tracking branch 'remotes/legoater/tags/pull-aspeed-20201210' into staging (2020-12-10 14:26:35 +0000)
>
> are available in the Git repository at:
>
> https://gitlab.com/bonzini/qemu.git tags/for-upstream
>
> for you to fetch changes up to 953d0c333e2825656ba1ec5bd1c18bc53485b39c:
>
> scripts: kernel-doc: remove unnecessary change wrt Linux (2020-12-10 12:15:25 -0500)
>
> ----------------------------------------------------------------
> * Fix for NULL segments (Bin Meng)
> * Support for 32768 CPUs on x86 without IOMMU (David)
> * PDEP/PEXT fix and testcase (myself)
> * Remove bios_name and ram_size globals (myself)
> * qemu_init rationalization (myself)
> * Update kernel-doc (myself + upstream patches)
> * Propagate MemTxResult across DMA and PCI functions (Philippe)
> * Remove master/slave when applicable (Philippe)
> * WHPX support for in-kernel irqchip (Sunil)
>
> ----------------------------------------------------------------
>
Applied, thanks.
Please update the changelog at https://wiki.qemu.org/ChangeLog/6.0
for any user-visible changes.
-- PMM
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PULL v2 000/113] First batch of misc (i386, kernel-doc, memory, vl.c) changes for QEMU 6.0
2020-12-10 12:19 Paolo Bonzini
@ 2020-12-10 17:00 ` Peter Maydell
0 siblings, 0 replies; 5+ messages in thread
From: Peter Maydell @ 2020-12-10 17:00 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: QEMU Developers
On Thu, 10 Dec 2020 at 13:37, Paolo Bonzini <pbonzini@redhat.com> wrote:
>
> The following changes since commit 5e7b204dbfae9a562fc73684986f936b97f63877:
>
> Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (2020-12-09 20:08:54 +0000)
>
> are available in the Git repository at:
>
> https://gitlab.com/bonzini/qemu.git tags/for-upstream
>
> for you to fetch changes up to aeea99accef39f34dd1090c4aee86b7052076ce9:
>
> scripts: kernel-doc: remove unnecessary change wrt Linux (2020-12-09 18:16:05 -0500)
>
> ----------------------------------------------------------------
> * Fix for NULL segments (Bin Meng)
> * Support for 32768 CPUs on x86 without IOMMU (David)
> * PDEP/PEXT fix and testcase (myself)
> * Remove bios_name and ram_size globals (myself)
> * qemu_init rationalization (myself)
> * Update kernel-doc (myself + upstream patches)
> * Propagate MemTxResult across DMA and PCI functions (Philippe)
> * Remove master/slave when applicable (Philippe)
> * WHPX support for in-kernel irqchip (Sunil)
Warning building test-i386-bmi2.c:
make[2]: Entering directory
'/home/petmay01/linaro/qemu-for-merges/build/all-linux-static/tests/tcg/i386-linux-user'
/home/petmay01/linaro/qemu-for-merges/tests/docker/docker.py --engine
auto cc --cc gcc -i qemu/fedora-i386-cross -s /hom
e/petmay01/linaro/qemu-for-merges -- -Wall -O0 -g
-fno-strict-aliasing -m32 /home/petmay01/linaro/qemu-for-merges/test
s/tcg/i386/test-i386-bmi2.c -o test-i386-bmi2 -static
/home/petmay01/linaro/qemu-for-merges/tests/tcg/i386/test-i386-bmi2.c:
In function 'main':
/home/petmay01/linaro/qemu-for-merges/tests/tcg/i386/test-i386-bmi2.c:8:14:
warning: unused variable 'result64' [-Wunuse
d-variable]
8 | uint64_t result64;
| ^~~~~~~~
make[2]: Leaving directory
'/home/petmay01/linaro/qemu-for-merges/build/all-linux-static/tests/tcg/i386-linux-user'
thanks
-- PMM
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PULL v2 000/113] First batch of misc (i386, kernel-doc, memory, vl.c) changes for QEMU 6.0
@ 2020-12-10 12:19 Paolo Bonzini
2020-12-10 17:00 ` Peter Maydell
0 siblings, 1 reply; 5+ messages in thread
From: Paolo Bonzini @ 2020-12-10 12:19 UTC (permalink / raw)
To: qemu-devel
The following changes since commit 5e7b204dbfae9a562fc73684986f936b97f63877:
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging (2020-12-09 20:08:54 +0000)
are available in the Git repository at:
https://gitlab.com/bonzini/qemu.git tags/for-upstream
for you to fetch changes up to aeea99accef39f34dd1090c4aee86b7052076ce9:
scripts: kernel-doc: remove unnecessary change wrt Linux (2020-12-09 18:16:05 -0500)
----------------------------------------------------------------
* Fix for NULL segments (Bin Meng)
* Support for 32768 CPUs on x86 without IOMMU (David)
* PDEP/PEXT fix and testcase (myself)
* Remove bios_name and ram_size globals (myself)
* qemu_init rationalization (myself)
* Update kernel-doc (myself + upstream patches)
* Propagate MemTxResult across DMA and PCI functions (Philippe)
* Remove master/slave when applicable (Philippe)
* WHPX support for in-kernel irqchip (Sunil)
----------------------------------------------------------------
v1->v2: Avoid &x->y on NULL
Fix 32-bit compilation of test-i386-bmi2
Fix conflicts
Alexander A. Klimov (1):
Replace HTTP links with HTTPS ones: documentation
André Almeida (2):
kernel-doc: fix processing nested structs with attributes
kernel-doc: add support for ____cacheline_aligned_in_smp attribute
Bin Meng (1):
target/i386: seg_helper: Correct segment selector nullification in the RET/IRET helper
David Woodhouse (1):
target/i386: Support up to 32768 CPUs without IRQ remapping
Jonathan Cameron (1):
kernel-doc: add support for ____cacheline_aligned attribute
Jonathan Neuschäfer (1):
scripts/kernel-doc: Add support for named variable macro arguments
Mauro Carvalho Chehab (19):
scripts: kernel-doc: proper handle @foo->bar()
scripts: kernel-doc: accept negation like !@var
scripts: kernel-doc: accept blank lines on parameter description
scripts/kernel-doc: parse __ETHTOOL_DECLARE_LINK_MODE_MASK
scripts/kernel-doc: handle function pointer prototypes
kernel-doc: include line numbers for function prototypes
scripts: kernel-doc: add support for typedef enum
scripts: kernel-doc: make it more compatible with Sphinx 3.x
scripts: kernel-doc: use a less pedantic markup for funcs on Sphinx 3.x
scripts: kernel-doc: fix troubles with line counts
scripts: kernel-doc: reimplement -nofunction argument
scripts: kernel-doc: fix typedef identification
scripts: kernel-doc: don't mangle with parameter list
scripts: kernel-doc: allow passing desired Sphinx C domain dialect
scripts: kernel-doc: fix line number handling
scripts: kernel-doc: try to use c:function if possible
scripts: kernel-doc: fix typedef parsing
scripts: kernel-doc: split typedef complex regex
scripts: kernel-doc: use :c:union when needed
Paolo Bonzini (69):
target/i386: fix operand order for PDEP and PEXT
qom: eliminate identical functions
alpha: remove bios_name
arm: remove bios_name
hppa: remove bios_name
i386: remove bios_name
lm32: remove bios_name
m68k: remove bios_name
mips: remove bios_name
moxie: remove bios_name
ppc: remove bios_name
rx: move BIOS load from MCU to board
s390: remove bios_name
sh4: remove bios_name
sparc: remove bios_name
digic: remove bios_name
vl: remove bios_name
arm: do not use ram_size global
cris: do not use ram_size global
hppa: do not use ram_size global
i386: do not use ram_size global
m68k: do not use ram_size global
microblaze: do not use ram_size global
mips: do not use ram_size global
moxie: do not use ram_size global
nios2: do not use ram_size global
ppc: do not use ram_size global
riscv: do not use ram_size global
s390x: do not use ram_size global
sparc64: do not use ram_size global
make ram_size local to vl.c
treewide: do not use short-form boolean options
vl: extract validation of -smp to machine.c
vl: remove bogus check
vl: split various early command line options to a separate function
vl: move various initialization routines out of qemu_init
vl: extract qemu_init_subsystems
vl: move prelaunch part of qemu_init to new functions
vl: extract various command line validation snippets to a new function
vl: preconfig and loadvm are mutually exclusive
vl: extract various command line desugaring snippets to a new function
qemu-option: restrict qemu_opts_set to merge-lists QemuOpts
vl: create "-net nic -net user" default earlier
vl: load plugins as late as possible
vl: extract default devices to separate functions
vl: move CHECKPOINT_INIT after preconfig
vl: separate qemu_create_early_backends
vl: separate qemu_create_late_backends
vl: separate qemu_create_machine
vl: separate qemu_apply_machine_options
vl: separate qemu_resolve_machine_memdev
vl: initialize displays before preconfig loop
vl: move -global check earlier
migration, vl: start migration via qmp_migrate_incoming
vl: start VM via qmp_cont
hmp: introduce cmd_available
vl: extract softmmu/datadir.c
vl: extract machine done notifiers
vl: extract softmmu/rtc.c
vl: remove serial_max_hds
vl: clean up -boot variables
config-file: move -set implementation to vl.c
docs: temporarily disable the kernel-doc extension
Revert "scripts/kerneldoc: For Sphinx 3 use c:macro for macros with arguments"
Revert "kernel-doc: Use c:struct for Sphinx 3.0 and later"
Revert "kernel-doc: Handle function typedefs without asterisks"
Revert "kernel-doc: Handle function typedefs that return pointers"
Revert "docs: temporarily disable the kernel-doc extension"
scripts: kernel-doc: remove unnecessary change wrt Linux
Philippe Mathieu-Daudé (16):
docs/devel/loads-stores: Add regexp for DMA functions
dma: Document address_space_map/address_space_unmap() prototypes
dma: Let dma_memory_set() propagate MemTxResult
dma: Let dma_memory_rw() propagate MemTxResult
dma: Let dma_memory_read() propagate MemTxResult
dma: Let dma_memory_write() propagate MemTxResult
pci: Let pci_dma_rw() propagate MemTxResult
pci: Let pci_dma_read() propagate MemTxResult
pci: Let pci_dma_write() propagate MemTxResult
hw/ssi/aspeed_smc: Rename 'max_slaves' variable as 'max_peripherals'
hw/ssi: Update coding style to make checkpatch.pl happy
hw/ssi: Rename SSI 'slave' as 'peripheral'
hw/core/stream: Rename StreamSlave as StreamSink
hw/dma/xilinx_axidma: Rename StreamSlave as StreamSink
hw/net/xilinx_axienet: Rename StreamSlave as StreamSink
hw/char/serial: Clean up unnecessary code
Pierre-Louis Bossart (1):
scripts/kernel-doc: optionally treat warnings as errors
Sunil Muthuswamy (1):
WHPX: support for the kernel-irqchip on/off
MAINTAINERS | 1 +
docs/devel/loads-stores.rst | 2 +
docs/specs/tpm.rst | 2 +-
docs/sphinx/kerneldoc.py | 6 +-
hw/alpha/dp264.c | 3 +-
hw/arm/aspeed.c | 8 +-
hw/arm/boot.c | 1 +
hw/arm/cubieboard.c | 2 +-
hw/arm/digic_boards.c | 20 +-
hw/arm/highbank.c | 9 +-
hw/arm/npcm7xx_boards.c | 6 +-
hw/arm/orangepi.c | 2 +-
hw/arm/sbsa-ref.c | 3 +
hw/arm/spitz.c | 32 +-
hw/arm/stellaris.c | 4 +-
hw/arm/tosa.c | 12 +-
hw/arm/vexpress.c | 9 +-
hw/arm/virt.c | 3 +
hw/arm/z2.c | 14 +-
hw/avr/boot.c | 1 +
hw/block/m25p80.c | 14 +-
hw/char/serial.c | 13 +-
hw/core/generic-loader.c | 3 +-
hw/core/loader.c | 1 +
hw/core/machine.c | 56 +
hw/core/numa.c | 10 +-
hw/core/stream.c | 20 +-
hw/cris/axis_dev88.c | 1 +
hw/cris/boot.c | 2 +-
hw/cris/boot.h | 1 +
hw/display/ads7846.c | 12 +-
hw/display/cg3.c | 1 +
hw/display/pxa2xx_lcd.c | 5 +-
hw/display/ssd0323.c | 12 +-
hw/display/tcx.c | 1 +
hw/dma/xilinx_axidma.c | 58 +-
hw/hppa/machine.c | 14 +-
hw/i386/fw_cfg.c | 2 +-
hw/i386/kvm/apic.c | 7 +
hw/i386/microvm.c | 7 +-
hw/i386/pc.c | 16 +-
hw/i386/pc_sysfw.c | 4 +-
hw/i386/vmport.c | 3 +-
hw/i386/x86.c | 17 +-
hw/i386/xen/xen-hvm.c | 2 +-
hw/intc/apic_common.c | 3 +-
hw/lm32/milkymist.c | 5 +-
hw/m68k/mcf5206.c | 4 +-
hw/m68k/mcf5208.c | 14 +-
hw/m68k/next-cube.c | 4 +-
hw/m68k/q800.c | 5 +-
hw/microblaze/boot.c | 9 +-
hw/mips/fuloong2e.c | 11 +-
hw/mips/jazz.c | 7 +-
hw/mips/malta.c | 9 +-
hw/mips/mipssim.c | 7 +-
hw/misc/max111x.c | 18 +-
hw/moxie/moxiesim.c | 8 +-
hw/net/xilinx_axienet.c | 44 +-
hw/nios2/boot.c | 9 +-
hw/nvram/fw_cfg.c | 1 +
hw/pci-host/prep.c | 1 +
hw/pci/pci.c | 1 +
hw/ppc/e500.c | 5 +-
hw/ppc/mac_newworld.c | 5 +-
hw/ppc/mac_oldworld.c | 5 +-
hw/ppc/pnv.c | 6 +-
hw/ppc/ppc405_boards.c | 7 +-
hw/ppc/ppc440_bamboo.c | 1 +
hw/ppc/prep.c | 6 +-
hw/ppc/sam460ex.c | 1 +
hw/ppc/spapr.c | 11 +-
hw/ppc/spapr_vio.c | 4 +-
hw/ppc/virtex_ml507.c | 1 +
hw/riscv/boot.c | 6 +-
hw/rx/rx-gdbsim.c | 10 +
hw/rx/rx62n.c | 9 -
hw/s390x/ipl.c | 19 +-
hw/s390x/s390-skeys.c | 6 +-
hw/s390x/s390-virtio-ccw.c | 7 +-
hw/sd/ssi-sd.c | 12 +-
hw/sh4/shix.c | 3 +-
hw/smbios/smbios.c | 8 +-
hw/sparc/leon3.c | 5 +-
hw/sparc/sun4m.c | 3 +-
hw/sparc64/sparc64.c | 3 +-
hw/sparc64/sun4u.c | 7 +-
hw/ssi/aspeed_smc.c | 53 +-
hw/ssi/pl022.c | 2 +-
hw/ssi/ssi.c | 48 +-
hw/ssi/xilinx_spips.c | 9 +-
hw/virtio/virtio-balloon.c | 3 +-
include/exec/cpu-common.h | 2 -
include/hw/boards.h | 2 +
include/hw/i386/x86.h | 3 +-
include/hw/misc/max111x.h | 2 +-
include/hw/pci/pci.h | 50 +-
include/hw/qdev-core.h | 8 -
include/hw/ssi/aspeed_smc.h | 2 +-
include/hw/ssi/ssi.h | 56 +-
include/hw/ssi/xilinx_spips.h | 2 +-
include/hw/stream.h | 41 +-
include/migration/misc.h | 1 -
include/qemu-common.h | 21 -
include/qemu/config-file.h | 1 -
include/qemu/datadir.h | 28 +
include/qemu/option.h | 3 +-
include/standard-headers/asm-x86/kvm_para.h | 1 +
include/sysemu/dma.h | 117 +-
include/sysemu/sysemu.h | 10 +-
include/sysemu/whpx.h | 22 +
migration/migration.c | 37 +-
monitor/hmp.c | 18 +-
monitor/qmp-cmds.c | 3 +-
python/qemu/machine.py | 2 +-
qemu-options.hx | 32 +-
qom/object.c | 36 +-
scripts/kernel-doc | 455 ++++---
softmmu/cpus.c | 3 +-
softmmu/datadir.c | 129 ++
softmmu/dma-helpers.c | 7 +-
softmmu/meson.build | 2 +
softmmu/qdev-monitor.c | 6 -
softmmu/rtc.c | 190 +++
softmmu/vl.c | 1755 ++++++++++++---------------
target/arm/arm-semi.c | 3 +-
target/i386/cpu.c | 8 +-
target/i386/kvm.c | 77 +-
target/i386/kvm_i386.h | 2 +
target/i386/meson.build | 1 +
target/i386/seg_helper.c | 5 +-
target/i386/translate.c | 8 +-
target/i386/whp-dispatch.h | 9 +-
target/i386/whpx-all.c | 291 ++++-
target/i386/whpx-apic.c | 274 +++++
target/m68k/m68k-semi.c | 5 +-
target/s390x/excp_helper.c | 3 +-
target/s390x/mem_helper.c | 10 +-
target/s390x/mmu_helper.c | 4 +-
tests/qtest/bios-tables-test.c | 4 +-
tests/qtest/fuzz/fuzz.c | 1 +
tests/qtest/pflash-cfi02-test.c | 4 +-
tests/qtest/test-filter-redirector.c | 8 +-
tests/qtest/vhost-user-test.c | 8 +-
tests/tcg/i386/Makefile.target | 3 +
tests/tcg/i386/test-i386-bmi2.c | 41 +
tests/test-char.c | 8 +-
tests/test-qemu-opts.c | 20 +-
ui/keymaps.c | 1 +
util/qemu-config.c | 33 -
util/qemu-option.c | 9 +-
151 files changed, 2922 insertions(+), 1812 deletions(-)
create mode 100644 include/qemu/datadir.h
create mode 100644 softmmu/datadir.c
create mode 100644 softmmu/rtc.c
create mode 100644 target/i386/whpx-apic.c
create mode 100644 tests/tcg/i386/test-i386-bmi2.c
--
2.26.2
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-12-11 15:03 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-11 12:31 [PULL v2 000/113] First batch of misc (i386, kernel-doc, memory, vl.c) changes for QEMU 6.0 Paolo Bonzini
2020-12-11 12:31 ` [PULL 001/113] target/i386: fix operand order for PDEP and PEXT Paolo Bonzini
2020-12-11 15:00 ` [PULL v2 000/113] First batch of misc (i386, kernel-doc, memory, vl.c) changes for QEMU 6.0 Peter Maydell
-- strict thread matches above, loose matches on Subject: below --
2020-12-10 12:19 Paolo Bonzini
2020-12-10 17:00 ` Peter Maydell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).