qemu-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] b92be8: hw/input: Add a CONFIG_PS2 switch for


From: Peter Maydell
Subject: [Qemu-commits] [qemu/qemu] b92be8: hw/input: Add a CONFIG_PS2 switch for the ps2.c file
Date: Fri, 17 May 2019 09:24:56 -0700

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: b92be8d0920021fca4cfac90e552a74ce066a0a3
      
https://github.com/qemu/qemu/commit/b92be8d0920021fca4cfac90e552a74ce066a0a3
  Author: Thomas Huth <address@hidden>
  Date:   2019-05-15 (Wed, 15 May 2019)

  Changed paths:
    M hw/input/Kconfig
    M hw/input/Makefile.objs

  Log Message:
  -----------
  hw/input: Add a CONFIG_PS2 switch for the ps2.c file

ps2.c only needs to be compiled if we are building pckbd.c or pl050.c.

Signed-off-by: Thomas Huth <address@hidden>
Message-Id: <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 85fad7e11508fd581fdbb14dd6a6555a9e0c8d70
      
https://github.com/qemu/qemu/commit/85fad7e11508fd581fdbb14dd6a6555a9e0c8d70
  Author: Igor Mammedov <address@hidden>
  Date:   2019-05-15 (Wed, 15 May 2019)

  Changed paths:
    M hw/core/loader.c

  Log Message:
  -----------
  roms: assert if max rom size is less than the used size

It would ensure that we would notice attempt to write beyond
the allocated buffer. In case of MemoryRegion backed ROM it's
the host buffer and the guest RAM otherwise.

assert can be triggered with:
  dd if=/dev/zero of=/tmp/blob bs=63k count=1
  qemu-system-x86_64 `for  i in {1..33}; do echo -n " -acpitable /tmp/blob"; 
done`

Fixes: (a1666142db acpi-build: make ROMs RAM blocks resizeable)

Reported-by: Wei Yang <address@hidden>
Signed-off-by: Igor Mammedov <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 583f34c493fc5b91aa05a8987023244a72f8efae
      
https://github.com/qemu/qemu/commit/583f34c493fc5b91aa05a8987023244a72f8efae
  Author: Thomas Huth <address@hidden>
  Date:   2019-05-15 (Wed, 15 May 2019)

  Changed paths:
    M qemu-deprecated.texi
    M vl.c

  Log Message:
  -----------
  Declare -realtime as deprecated

The old -realtime mlock=on|off parameter does exactly the same as the
new -overcommit mem-lock=on|off parameter. Additionally, "-realtime"
does not activate any additional "realtime" capabilities as the name
might indicate. We should avoid to confuse the users this way, so
let's deprecate the old -realtime option.

Signed-off-by: Thomas Huth <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>
Message-Id: <address@hidden>


  Commit: d2fa65cd1c17801bde1dbfc9f622ba627ebd0adb
      
https://github.com/qemu/qemu/commit/d2fa65cd1c17801bde1dbfc9f622ba627ebd0adb
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2019-05-15 (Wed, 15 May 2019)

  Changed paths:
    M vl.c

  Log Message:
  -----------
  vl: Add missing descriptions to the VGA adapters list

Some VGA adapters do not contain an helpful description,
this can be confusing:

  $ qemu-system-arm -M virt -vga help
  none
  std                  standard VGA
  cirrus               Cirrus VGA (default)
  vmware               VMWare SVGA
  xenfb

Add a description to the missing adapters:

  $ qemu-system-arm -M virt -vga help
  none                 no graphic card
  std                  standard VGA
  cirrus               Cirrus VGA (default)
  vmware               VMWare SVGA
  xenfb                Xen paravirtualized framebuffer

Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Based-on: <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Reviewed-by: Paul Durrant <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 2e56fbc87f6ec3cd56c37b01d313abd502b80d61
      
https://github.com/qemu/qemu/commit/2e56fbc87f6ec3cd56c37b01d313abd502b80d61
  Author: Peter Lieven <address@hidden>
  Date:   2019-05-15 (Wed, 15 May 2019)

  Changed paths:
    M hw/scsi/megasas.c

  Log Message:
  -----------
  megasas: fix mapped frame size

the current value of 1024 bytes (16 * MFI_FRAME_SIZE) we map is not enough to 
hold
the maximum number of scatter gather elements we advertise. We actually need a
maximum of 2048 bytes. This is 128 max sg elements * 16 bytes (sizeof (union 
mfi_sgl)).

Cc: address@hidden
Signed-off-by: Peter Lieven <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Hannes Reinecke <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 3b9c59daf9ef13f96027062c803fd0780ae04e90
      
https://github.com/qemu/qemu/commit/3b9c59daf9ef13f96027062c803fd0780ae04e90
  Author: Chen Zhang <address@hidden>
  Date:   2019-05-17 (Fri, 17 May 2019)

  Changed paths:
    M target/i386/hvf/hvf.c

  Log Message:
  -----------
  hvf: Add missing break statement

In target/i386/hvf/hvf.c, a break statement was probably missing in
`hvf_vcpu_exec()`, in handling EXIT_REASON_HLT.

These lines seemed to be equivalent to `kvm_handle_halt()`.

Signed-off-by: Chen Zhang <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 2bb814a45be0bffb2f2499245a22fe72225c34ac
      
https://github.com/qemu/qemu/commit/2bb814a45be0bffb2f2499245a22fe72225c34ac
  Author: Marc-André Lureau <address@hidden>
  Date:   2019-05-17 (Fri, 17 May 2019)

  Changed paths:
    M vl.c

  Log Message:
  -----------
  vl: fix -sandbox parsing crash when seccomp support is disabled

$ ./x86_64-softmmu/qemu-system-x86_64 -sandbox off
qemu-system-x86_64: -sandbox off: There is no option group 'sandbox'
Segmentation fault

Commit 5780760f5e ("seccomp: check TSYNC host capability") wrapped one
use of the sandbox option group to produce a sensible error, it didn't
do the same for another call to qemu_opts_parse_noisily():

(gdb) bt
    at util/qemu-option.c:829
 #0  0x00000000105b36d8 in opts_parse (list=0x0, params=0x3ffffffffab5 "off", 
permit_abbrev=true, defaults=false, errp=0x3ffffffff080)
     at util/qemu-option.c:829
 #1  0x00000000105b3b74 in qemu_opts_parse_noisily (list=<optimized out>, 
params=<optimized out>, permit_abbrev=<optimized out>) at util/qemu-option.c:890
 #2  0x0000000010024964 in main (argc=<optimized out>, argv=<optimized out>, 
envp=<optimized out>) at vl.c:3589

Fixes: 5780760f5ea6163939a5dabe7427318b4f07d1a2
Cc: address@hidden
Cc: address@hidden
Signed-off-by: Marc-André Lureau <address@hidden>
Message-Id: <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Laurent Vivier <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 39adb536b3502060206c7515a50fb8faad22f51f
      
https://github.com/qemu/qemu/commit/39adb536b3502060206c7515a50fb8faad22f51f
  Author: Wei Yang <address@hidden>
  Date:   2019-05-17 (Fri, 17 May 2019)

  Changed paths:
    M memory.c

  Log Message:
  -----------
  memory: correct the comment to DIRTY_MEMORY_MIGRATION

The dirty bit is DIRTY_MEMORY_MIGRATION. Correct the comment.

Signed-off-by: Wei Yang <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: f5e0a8f42fbc5c7c2b8c0720ee657aba6cc122fd
      
https://github.com/qemu/qemu/commit/f5e0a8f42fbc5c7c2b8c0720ee657aba6cc122fd
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2019-05-17 (Fri, 17 May 2019)

  Changed paths:
    M hw/acpi/piix4.c
    M include/hw/acpi/piix4.h

  Log Message:
  -----------
  hw/acpi/piix4: Move TYPE_PIIX4_PM to a public header

Move the TYPE_PIIX4_PM definition to the corresponding header,
so other files can use it.

Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 81c48dd79655296f5bf94823e8ac95902a8ac3e4
      
https://github.com/qemu/qemu/commit/81c48dd79655296f5bf94823e8ac95902a8ac3e4
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2019-05-17 (Fri, 17 May 2019)

  Changed paths:
    M hw/acpi/piix4.c
    M hw/i386/acpi-build.c
    M hw/isa/lpc_ich9.c
    M include/hw/acpi/piix4.h
    M include/hw/i386/ich9.h

  Log Message:
  -----------
  hw/i386/acpi: Add object_resolve_type_unambiguous to improve modularity

When building with CONFIG_Q35=n, we get:

    LINK    x86_64-softmmu/qemu-system-x86_64
  /usr/bin/ld: hw/i386/acpi-build.o: in function `acpi_get_misc_info':
  /source/qemu/hw/i386/acpi-build.c:243: undefined reference to `ich9_lpc_find'
  collect2: error: ld returned 1 exit status
  make[1]: *** [Makefile:204: qemu-system-x86_64] Error 1

This is due to a dependency in acpi-build.c on the ICH9_LPC
(via ich9_lpc_find) and PIIX4_PM (via piix4_pm_find) devices.

To allow better modularity (compile acpi-build.c with only
Q35/ICH9 or ISAPC/PIIX4), refactor the similar helper as
object_resolve_type_unambiguous(). This way we relax the
linker dependencies and can build the x86 targets with a
selection of machines (instead of all of them).

Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 6fa5171f4fb483f9c6b417c4fda3ed21549c4113
      
https://github.com/qemu/qemu/commit/6fa5171f4fb483f9c6b417c4fda3ed21549c4113
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2019-05-17 (Fri, 17 May 2019)

  Changed paths:
    M hw/i386/acpi-build.c

  Log Message:
  -----------
  hw/i386/acpi: Assert a pointer is not null BEFORE using it

Commit 72c194f7e75c added a non-null check on the 'obj' pointer.
Later, commit 500b11ea5095 added code which uses the 'obj'
pointer _before_ the assertion check. Move the assertion
_before_ the pointer use.

Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 78c37d88f1b8b0b3ebcc632c458f0c3779fe2951
      
https://github.com/qemu/qemu/commit/78c37d88f1b8b0b3ebcc632c458f0c3779fe2951
  Author: Paolo Bonzini <address@hidden>
  Date:   2019-05-17 (Fri, 17 May 2019)

  Changed paths:
    M hw/mips/mips_fulong2e.c

  Log Message:
  -----------
  mips-fulong2e: obey -vga none

Do not create an ATI VGA if "-vga none" was passed on the command line.

Cc: BALATON Zoltan <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 6807874d55b380a2478d56d5e61e10805e315026
      
https://github.com/qemu/qemu/commit/6807874d55b380a2478d56d5e61e10805e315026
  Author: Paolo Bonzini <address@hidden>
  Date:   2019-05-17 (Fri, 17 May 2019)

  Changed paths:
    M hw/sparc/sun4m.c

  Log Message:
  -----------
  sun4m: obey -vga none

Do not create a TCX if "-vga none" was passed on the command line.
Remove some dead code along the way to avoid big reindentation.

Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 5b4a969a701fd298be7bb9a916f8918200cdd827
      
https://github.com/qemu/qemu/commit/5b4a969a701fd298be7bb9a916f8918200cdd827
  Author: Laurent Vivier <address@hidden>
  Date:   2019-05-17 (Fri, 17 May 2019)

  Changed paths:
    M Makefile.objs

  Log Message:
  -----------
  trace: only include trace-event-subdirs when they are needed

Some directories are built only for softmmu targets,
and the related trace-event-subdirs must do the same

Signed-off-by: Laurent Vivier <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Message-Id: <address@hidden>


  Commit: 3dff199cca2702846a23d7193dbd447064b60d0d
      
https://github.com/qemu/qemu/commit/3dff199cca2702846a23d7193dbd447064b60d0d
  Author: Laurent Vivier <address@hidden>
  Date:   2019-05-17 (Fri, 17 May 2019)

  Changed paths:
    M Makefile
    M Makefile.target
    M target/s390x/Makefile.objs
    M tests/Makefile.include

  Log Message:
  -----------
  build: replace GENERATED_FILES by generated-files-y

When possible use generated-files-$(FLAG) to disable
some targets (like KEYCODEMAP_FILES).

Suggested-by: Paolo Bonzini <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>
Message-Id: <address@hidden>


  Commit: a51259059503a197dd8fbc152786cbacf3127bbb
      
https://github.com/qemu/qemu/commit/a51259059503a197dd8fbc152786cbacf3127bbb
  Author: Laurent Vivier <address@hidden>
  Date:   2019-05-17 (Fri, 17 May 2019)

  Changed paths:
    M configure

  Log Message:
  -----------
  configure: qemu-ga is only needed with softmmu targets

Remove it from the list of tools if --disable-system
and --disable-tools are used as we don't need it for
linux-user targets.

Suggested-by: Paolo Bonzini <address@hidden>
[lv: I also disable it with disable-tools, not only with disable-system]
Signed-off-by: Laurent Vivier <address@hidden>
Message-Id: <address@hidden>


  Commit: 8d5d515a0fbfa7b6370656a9bee2f8eece1a890f
      
https://github.com/qemu/qemu/commit/8d5d515a0fbfa7b6370656a9bee2f8eece1a890f
  Author: Laurent Vivier <address@hidden>
  Date:   2019-05-17 (Fri, 17 May 2019)

  Changed paths:
    M Makefile
    M Makefile.objs

  Log Message:
  -----------
  build: chardev is only needed for softmmu targets

Move the dependency from SUBDIR_RULES to SOFTMMU_SUBDIR_RULES

Suggested-by: Paolo Bonzini <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>
Message-Id: <address@hidden>


  Commit: 29de2804014097f8d0e6eaec3318164405afe317
      
https://github.com/qemu/qemu/commit/29de2804014097f8d0e6eaec3318164405afe317
  Author: Laurent Vivier <address@hidden>
  Date:   2019-05-17 (Fri, 17 May 2019)

  Changed paths:
    M Makefile
    M Makefile.objs
    M tests/Makefile.include

  Log Message:
  -----------
  build: don't build hardware objects with linux-user

Some objects are only needed for system emulation and tools.
We can ignore them for the user mode case

Update tests to run accordingly: conditionally build some tests
on CONFIG_BLOCK.

Some tests use components that are only built when softmmu or
block tools are enabled, not for linux-user. So, if these components
are not available, disable the tests.

Signed-off-by: Laurent Vivier <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>


  Commit: 958a01dab8e02fc49f4fd619fad8c82a1108afdb
      
https://github.com/qemu/qemu/commit/958a01dab8e02fc49f4fd619fad8c82a1108afdb
  Author: Vitaly Kuznetsov <address@hidden>
  Date:   2019-05-17 (Fri, 17 May 2019)

  Changed paths:
    M hw/intc/ioapic.c
    M hw/intc/trace-events
    M include/hw/i386/ioapic_internal.h

  Log Message:
  -----------
  ioapic: allow buggy guests mishandling level-triggered interrupts to make 
progress

It was found that Hyper-V 2016 on KVM in some configurations (q35 machine +
piix4-usb-uhci) hangs on boot. Root-cause was that one of Hyper-V
level-triggered interrupt handler performs EOI before fixing the cause of
the interrupt. This results in IOAPIC keep re-raising the level-triggered
interrupt after EOI because irq-line remains asserted.

Gory details: https://www.spinics.net/lists/kvm/msg184484.html
(the whole thread).

Turns out we were dealing with similar issues before; in-kernel IOAPIC
implementation has commit 184564efae4d ("kvm: ioapic: conditionally delay
irq delivery duringeoi broadcast") which describes a very similar issue.

Steal the idea from the above mentioned commit for IOAPIC implementation in
QEMU. SUCCESSIVE_IRQ_MAX_COUNT, delay and the comment are borrowed as well.

Signed-off-by: Vitaly Kuznetsov <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: d09ecd8c14d11d805f65445557cfa691a510dd31
      
https://github.com/qemu/qemu/commit/d09ecd8c14d11d805f65445557cfa691a510dd31
  Author: Thomas Huth <address@hidden>
  Date:   2019-05-17 (Fri, 17 May 2019)

  Changed paths:
    M hw/char/Kconfig
    M hw/char/Makefile.objs
    A hw/char/serial-pci-multi.c
    M hw/char/serial-pci.c

  Log Message:
  -----------
  hw/char: Move multi-serial devices into separate file

In our downstream distribution of QEMU, we'd like to ship the binary
without the multi-serial PCI devices. To make this disablement easier,
let's move the devices into a separate file and add a proper Kconfig-
switch for these devices.

Signed-off-by: Thomas Huth <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 7a188f2b5744c0492de1c8eea315f259e0256a1e
      
https://github.com/qemu/qemu/commit/7a188f2b5744c0492de1c8eea315f259e0256a1e
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2019-05-17 (Fri, 17 May 2019)

  Changed paths:
    M hw/net/Kconfig
    M hw/net/Makefile.objs
    A hw/net/ne2000-pci.c
    M hw/net/ne2000.c

  Log Message:
  -----------
  hw/net/ne2000: Extract the PCI device from the chipset common code

The ne2000.c file contains functions common the the ISA and PCI
devices. To allow to build with one or another, extract the PCI
specific part into a new file.

This fix an issue where the NE2000_ISA Kconfig had to pull the
full PCI core objects.

Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>


  Commit: 27cb89d1d321e6deb6fc7f80771bb0018af4cd49
      
https://github.com/qemu/qemu/commit/27cb89d1d321e6deb6fc7f80771bb0018af4cd49
  Author: Peter Maydell <address@hidden>
  Date:   2019-05-17 (Fri, 17 May 2019)

  Changed paths:
    M Makefile
    M Makefile.objs
    M Makefile.target
    M configure
    M hw/acpi/piix4.c
    M hw/char/Kconfig
    M hw/char/Makefile.objs
    A hw/char/serial-pci-multi.c
    M hw/char/serial-pci.c
    M hw/core/loader.c
    M hw/i386/acpi-build.c
    M hw/input/Kconfig
    M hw/input/Makefile.objs
    M hw/intc/ioapic.c
    M hw/intc/trace-events
    M hw/isa/lpc_ich9.c
    M hw/mips/mips_fulong2e.c
    M hw/net/Kconfig
    M hw/net/Makefile.objs
    A hw/net/ne2000-pci.c
    M hw/net/ne2000.c
    M hw/scsi/megasas.c
    M hw/sparc/sun4m.c
    M include/hw/acpi/piix4.h
    M include/hw/i386/ich9.h
    M include/hw/i386/ioapic_internal.h
    M memory.c
    M qemu-deprecated.texi
    M target/i386/hvf/hvf.c
    M target/s390x/Makefile.objs
    M tests/Makefile.include
    M vl.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging

Mostly bugfixes and cleanups, the most important being
"megasas: fix mapped frame size" from Peter Lieven.
In addition, -realtime is marked as deprecated.

# gpg: Signature made Fri 17 May 2019 14:25:11 BST
# gpg:                using RSA key BFFBD25F78C7AE83
# gpg: Good signature from "Paolo Bonzini <address@hidden>" [full]
# gpg:                 aka "Paolo Bonzini <address@hidden>" [full]
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4  E2F7 7E15 100C CD36 69B1
#      Subkey fingerprint: F133 3857 4B66 2389 866C  7682 BFFB D25F 78C7 AE83

* remotes/bonzini/tags/for-upstream: (21 commits)
  hw/net/ne2000: Extract the PCI device from the chipset common code
  hw/char: Move multi-serial devices into separate file
  ioapic: allow buggy guests mishandling level-triggered interrupts to make 
progress
  build: don't build hardware objects with linux-user
  build: chardev is only needed for softmmu targets
  configure: qemu-ga is only needed with softmmu targets
  build: replace GENERATED_FILES by generated-files-y
  trace: only include trace-event-subdirs when they are needed
  sun4m: obey -vga none
  mips-fulong2e: obey -vga none
  hw/i386/acpi: Assert a pointer is not null BEFORE using it
  hw/i386/acpi: Add object_resolve_type_unambiguous to improve modularity
  hw/acpi/piix4: Move TYPE_PIIX4_PM to a public header
  memory: correct the comment to DIRTY_MEMORY_MIGRATION
  vl: fix -sandbox parsing crash when seccomp support is disabled
  hvf: Add missing break statement
  megasas: fix mapped frame size
  vl: Add missing descriptions to the VGA adapters list
  Declare -realtime as deprecated
  roms: assert if max rom size is less than the used size
  ...

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/f2a930ad8c43...27cb89d1d321



reply via email to

[Prev in Thread] Current Thread [Next in Thread]