[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [qemu/qemu] 342b07: stm32f205: Fix SoC type name
From: |
GitHub |
Subject: |
[Qemu-commits] [qemu/qemu] 342b07: stm32f205: Fix SoC type name |
Date: |
Mon, 13 Apr 2015 04:30:08 -0700 |
Branch: refs/heads/master
Home: https://github.com/qemu/qemu
Commit: 342b0711cd62ddc08d334d879eac57b68f925fd5
https://github.com/qemu/qemu/commit/342b0711cd62ddc08d334d879eac57b68f925fd5
Author: Andreas Färber <address@hidden>
Date: 2015-04-13 (Mon, 13 Apr 2015)
Changed paths:
M include/hw/arm/stm32f205_soc.h
Log Message:
-----------
stm32f205: Fix SoC type name
The type name for the SoC device, unlike those of its sub-devices,
did not follow the QOM naming conventions. While the usage is internal
only, this is exposed through QMP and HMP, so fix it before release.
Cc: Alistair Francis <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
Reviewed-by: Alistair Francis <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>
Commit: 4d0ecde44ae6dab3aa9d10c23e61d9d43789731a
https://github.com/qemu/qemu/commit/4d0ecde44ae6dab3aa9d10c23e61d9d43789731a
Author: Thomas Huth <address@hidden>
Date: 2015-04-13 (Mon, 13 Apr 2015)
Changed paths:
M hw/pci/pci.c
Log Message:
-----------
pci: Fix crash with illegal "-net nic, model=xxx" option
Current QEMU crashes when specifying an illegal model with the
"-net nic,model=xxx" option, e.g.:
$ qemu-system-x86_64 -net nic,model=n/a
qemu-system-x86_64: Unsupported NIC model: n/a
Program received signal SIGSEGV, Segmentation fault.
The gdb backtrace looks like this:
0x0000555555965fe0 in error_get_pretty (err=0x0) at util/error.c:152
152 return err->msg;
(gdb) bt
0 0x0000555555965fe0 in error_get_pretty (err=0x0) at util/error.c:152
1 0x0000555555965ffd in error_report_err (err=0x0) at util/error.c:157
2 0x0000555555809c90 in pci_nic_init_nofail (nd=0x555555e49860 <nd_table>,
rootbus=0x5555564409b0,
default_model=0x55555598c37b "e1000", default_devaddr=0x0) at
hw/pci/pci.c:1663
3 0x0000555555691e42 in pc_nic_init (isa_bus=0x555556f71900,
pci_bus=0x5555564409b0)
at hw/i386/pc.c:1506
4 0x000055555569396b in pc_init1 (machine=0x5555562abbf0, pci_enabled=1,
kvmclock_enabled=1)
at hw/i386/pc_piix.c:248
5 0x0000555555693d27 in pc_init_pci (machine=0x5555562abbf0) at
hw/i386/pc_piix.c:310
6 0x000055555572ddf5 in main (argc=3, argv=0x7fffffffe018,
envp=0x7fffffffe038) at vl.c:4226
The problem is that pci_nic_init_nofail() does not check whether the err
parameter from pci_nic_init has been set up and thus passes a NULL pointer
to error_report_err(). Fix it by correctly checking the err parameter.
Signed-off-by: Thomas Huth <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Jason Wang <address@hidden>
Signed-off-by: Peter Maydell <address@hidden>
Compare: https://github.com/qemu/qemu/compare/c0c8584142a1...4d0ecde44ae6
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-commits] [qemu/qemu] 342b07: stm32f205: Fix SoC type name,
GitHub <=