qemu-commits
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-commits] [qemu/qemu] 886bc7: hw/arm/virt: fix cmdline parsing bug

From: GitHub
Subject: [Qemu-commits] [qemu/qemu] 886bc7: hw/arm/virt: fix cmdline parsing bug with CPU opti...
Date: Wed, 11 Mar 2015 11:30:05 -0700 
  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 886bc7a0492ff5d3b6c42157afff827b68595c34
      
https://github.com/qemu/qemu/commit/886bc7a0492ff5d3b6c42157afff827b68595c34
  Author: Ard Biesheuvel <address@hidden>
  Date:   2015-03-11 (Wed, 11 Mar 2015)

  Changed paths:
    M hw/arm/virt.c

  Log Message:
  -----------
  hw/arm/virt: fix cmdline parsing bug with CPU options and smp > 1

The recently introduced feature that allows 32 bit guests to be
executed under KVM on a 64-bit host incorrectly handles the case
where more than 1 cpu is specified using '-smp N'

For instance, this invocation of qemu

  qemu-system-aarch64 -M virt -cpu cortex-a57,aarch64=off -smp 2

produces the following error

  qemu-system-aarch64: Expected key=value format, found aarch64

which is caused by the destructive parsing performed by
cpu_common_parse_features(), resulting in subsequent attempts
to parse the CPU option string (for each additional CPU) to fail.

So duplicate the string before parsing it, and free it directly
afterwards.

Signed-off-by: Ard Biesheuvel <address@hidden>
Reviewed-by: Greg Bellows <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>


  Commit: be2847051421119f64a0134b5654a5134658d379
      
https://github.com/qemu/qemu/commit/be2847051421119f64a0134b5654a5134658d379
  Author: Alistair Francis <address@hidden>
  Date:   2015-03-11 (Wed, 11 Mar 2015)

  Changed paths:
    M default-configs/arm-softmmu.mak
    M hw/timer/Makefile.objs
    A hw/timer/stm32f2xx_timer.c
    A include/hw/timer/stm32f2xx_timer.h

  Log Message:
  -----------
  stm32f2xx_timer: Add the stm32f2xx Timer

This patch adds the stm32f2xx timers: TIM2, TIM3, TIM4 and TIM5
to QEMU.

Signed-off-by: Alistair Francis <address@hidden>
Signed-off-by: Peter Crosthwaite <address@hidden>
Reviewed-by: Peter Crosthwaite <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>


  Commit: 73af5d1115255ac921e3169d2d7376e5bc9d2838
      
https://github.com/qemu/qemu/commit/73af5d1115255ac921e3169d2d7376e5bc9d2838
  Author: Alistair Francis <address@hidden>
  Date:   2015-03-11 (Wed, 11 Mar 2015)

  Changed paths:
    M default-configs/arm-softmmu.mak
    M hw/char/Makefile.objs
    A hw/char/stm32f2xx_usart.c
    A include/hw/char/stm32f2xx_usart.h

  Log Message:
  -----------
  stm32f2xx_USART: Add the stm32f2xx USART Controller

This patch adds the stm32f2xx USART controller
(UART also uses the same controller).

Signed-off-by: Alistair Francis <address@hidden>
Reviewed-by: Peter Crosthwaite <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>


  Commit: bbbbd9002ffe9d03851bc87ab326b01378f93faf
      
https://github.com/qemu/qemu/commit/bbbbd9002ffe9d03851bc87ab326b01378f93faf
  Author: Alistair Francis <address@hidden>
  Date:   2015-03-11 (Wed, 11 Mar 2015)

  Changed paths:
    M default-configs/arm-softmmu.mak
    M hw/misc/Makefile.objs
    A hw/misc/stm32f2xx_syscfg.c
    A include/hw/misc/stm32f2xx_syscfg.h

  Log Message:
  -----------
  stm32f2xx_SYSCFG: Add the stm32f2xx SYSCFG

This patch adds the stm32f2xx System Configuration
Controller. This is used to configure what memory is mapped
at address 0 (although that is not supported) as well
as configure how the EXTI interrupts work (also not
supported at the moment).

This device is not required for basic examples, but more
complex systems will require it (as well as the EXTI device)

Signed-off-by: Alistair Francis <address@hidden>
Reviewed-by: Peter Crosthwaite <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>


  Commit: db635521a02c951d03ad7b373acfa92a8ff4359e
      
https://github.com/qemu/qemu/commit/db635521a02c951d03ad7b373acfa92a8ff4359e
  Author: Alistair Francis <address@hidden>
  Date:   2015-03-11 (Wed, 11 Mar 2015)

  Changed paths:
    M default-configs/arm-softmmu.mak
    M hw/arm/Makefile.objs
    A hw/arm/stm32f205_soc.c
    A include/hw/arm/stm32f205_soc.h

  Log Message:
  -----------
  stm32f205: Add the stm32f205 SoC

This patch adds the stm32f205 SoC. This will be used by the
Netduino 2 to create a machine.

Signed-off-by: Alistair Francis <address@hidden>
Reviewed-by: Peter Crosthwaite <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>


  Commit: da6bd924c049068723b91b97610940d63ce57850
      
https://github.com/qemu/qemu/commit/da6bd924c049068723b91b97610940d63ce57850
  Author: Alistair Francis <address@hidden>
  Date:   2015-03-11 (Wed, 11 Mar 2015)

  Changed paths:
    M hw/arm/Makefile.objs
    A hw/arm/netduino2.c

  Log Message:
  -----------
  netduino2: Add the Netduino 2 Machine

This patch adds the Netduino 2 Machine.

This is a Cortex-M3 based machine. Information can be found at:
http://www.netduino.com/netduino2/specs.htm

Signed-off-by: Alistair Francis <address@hidden>
Reviewed-by: Peter Crosthwaite <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>


  Commit: 0458b7b5b87be2422a67912c222aa1ec97fe94fa
      
https://github.com/qemu/qemu/commit/0458b7b5b87be2422a67912c222aa1ec97fe94fa
  Author: Ryota Ozaki <address@hidden>
  Date:   2015-03-11 (Wed, 11 Mar 2015)

  Changed paths:
    M target-arm/cpu64.c

  Log Message:
  -----------
  target-arm: Add missing compatible property to A57

Signed-off-by: Ryota Ozaki <address@hidden>
Reviewed-by: Alistair Francis <address@hidden>
Reviewed-by: Peter Crosthwaite <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>


  Commit: ffc8542a660c447db6ba972b71b4903458309e7e
      
https://github.com/qemu/qemu/commit/ffc8542a660c447db6ba972b71b4903458309e7e
  Author: Jan Kiszka <address@hidden>
  Date:   2015-03-11 (Wed, 11 Mar 2015)

  Changed paths:
    M hw/arm/integratorcp.c

  Log Message:
  -----------
  integrator/cp: Model CP control registers as sysbus device

No new features yet, just encapsulation.

Signed-off-by: Jan Kiszka <address@hidden>
Message-id: address@hidden
Reviewed-by: Peter Crosthwaite <address@hidden>
Signed-off-by: Peter Maydell <address@hidden>


  Commit: 83d0cf895f9b1c35fb56d3c93fd3504bc1ac8344
      
https://github.com/qemu/qemu/commit/83d0cf895f9b1c35fb56d3c93fd3504bc1ac8344
  Author: Jan Kiszka <address@hidden>
  Date:   2015-03-11 (Wed, 11 Mar 2015)

  Changed paths:
    M hw/arm/integratorcp.c

  Log Message:
  -----------
  integrator/cp: Implement CARDIN and WPROT signals

This allows to use the SD card emulation of the board: Forward the
signals from the pl181 top the CP control register emulation, report the
current state via CP_INTREG, deliver CARDIN IRQ to the secondary
interrupt controller and also support clearing that line via CP_INTREG.

Signed-off-by: Jan Kiszka <address@hidden>
Message-id: address@hidden
Reviewed-by: Peter Crosthwaite <address@hidden>
Signed-off-by: Peter Maydell <address@hidden>


  Commit: 4f9950520a115acf9c0a209f0befa45758ad0215
      
https://github.com/qemu/qemu/commit/4f9950520a115acf9c0a209f0befa45758ad0215
  Author: Peter Maydell <address@hidden>
  Date:   2015-03-11 (Wed, 11 Mar 2015)

  Changed paths:
    M include/qemu/bitops.h

  Log Message:
  -----------
  bitops.h: sextract64() return type should be int64_t, not uint64_t

The documentation for sextract64() claims that the return type is
an int64_t, but the code itself disagrees. Fix the return type to
conform to the documentation and to bring it into line with
sextract32(), which returns int32_t.

Signed-off-by: Peter Maydell <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Message-id: address@hidden


  Commit: d598911b6f5e7bf7bafb63b8e1d074729e94aca7
      
https://github.com/qemu/qemu/commit/d598911b6f5e7bf7bafb63b8e1d074729e94aca7
  Author: Peter Maydell <address@hidden>
  Date:   2015-03-11 (Wed, 11 Mar 2015)

  Changed paths:
    M default-configs/arm-softmmu.mak
    M hw/arm/Makefile.objs
    M hw/arm/integratorcp.c
    A hw/arm/netduino2.c
    A hw/arm/stm32f205_soc.c
    M hw/arm/virt.c
    M hw/char/Makefile.objs
    A hw/char/stm32f2xx_usart.c
    M hw/misc/Makefile.objs
    A hw/misc/stm32f2xx_syscfg.c
    M hw/timer/Makefile.objs
    A hw/timer/stm32f2xx_timer.c
    A include/hw/arm/stm32f205_soc.h
    A include/hw/char/stm32f2xx_usart.h
    A include/hw/misc/stm32f2xx_syscfg.h
    A include/hw/timer/stm32f2xx_timer.h
    M include/qemu/bitops.h
    M target-arm/cpu64.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20150311' 
into staging

target-arm queue:
 * fix a bug in bitops.h
 * implement SD card support on integratorcp
 * add a missing 'compatible' property for Cortex-A57
 * add Netduino 2 machine model
 * fix command line parsing bug for CPU options with multiple CPUs

# gpg: Signature made Wed Mar 11 14:14:22 2015 GMT using RSA key ID 14360CDE
# gpg: Good signature from "Peter Maydell <address@hidden>"

* remotes/pmaydell/tags/pull-target-arm-20150311:
  bitops.h: sextract64() return type should be int64_t, not uint64_t
  integrator/cp: Implement CARDIN and WPROT signals
  integrator/cp: Model CP control registers as sysbus device
  target-arm: Add missing compatible property to A57
  netduino2: Add the Netduino 2 Machine
  stm32f205: Add the stm32f205 SoC
  stm32f2xx_SYSCFG: Add the stm32f2xx SYSCFG
  stm32f2xx_USART: Add the stm32f2xx USART Controller
  stm32f2xx_timer: Add the stm32f2xx Timer
  hw/arm/virt: fix cmdline parsing bug with CPU options and smp > 1

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


Compare: https://github.com/qemu/qemu/compare/165fa4091e97...d598911b6f5e
reply via email to
[Prev in Thread] Current Thread [Next in Thread]