[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [qemu/qemu] 7dfddd: smbios: Fix assertion on socket count
|
From: |
GitHub |
|
Subject: |
[Qemu-commits] [qemu/qemu] 7dfddd: smbios: Fix assertion on socket count calculation |
|
Date: |
Mon, 03 Nov 2014 16:30:07 -0800 |
Branch: refs/heads/master
Home: https://github.com/qemu/qemu
Commit: 7dfddd7f884b6dd2abf230d8fa6c7c83aab4f5ec
https://github.com/qemu/qemu/commit/7dfddd7f884b6dd2abf230d8fa6c7c83aab4f5ec
Author: Eduardo Habkost <address@hidden>
Date: 2014-11-02 (Sun, 02 Nov 2014)
Changed paths:
M hw/i386/smbios.c
Log Message:
-----------
smbios: Fix assertion on socket count calculation
QEMU currently allows the number of VCPUs to not be a multiple of the
number of threads per socket, but the smbios socket count calculation
introduced by commit c97294ec1b9e36887e119589d456557d72ab37b5 doesn't
take that into account, triggering an assertion. e.g.:
$ ./x86_64-softmmu/qemu-system-x86_64 -smp 4,sockets=2,cores=6,threads=1
qemu-system-x86_64: /home/ehabkost/rh/proj/virt/qemu/hw/i386/smbios.c:825:
smbios_get_tables: Assertion `smbios_smp_sockets >= 1' failed.
Aborted (core dumped)
Socket count calculation doesn't belong to smbios.c and should
eventually be moved to the main SMP topology configuration code. But
while we don't move the code, at least make it correct by rounding up
the division.
Cc: Gabriel Somlo <address@hidden>
Cc: address@hidden
Signed-off-by: Eduardo Habkost <address@hidden>
Reviewed-By: Igor Mammedov <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Commit: 2709f263952bab66fc8f971c04d151216b177336
https://github.com/qemu/qemu/commit/2709f263952bab66fc8f971c04d151216b177336
Author: Laszlo Ersek <address@hidden>
Date: 2014-11-02 (Sun, 02 Nov 2014)
Changed paths:
M hw/i386/pc.c
M include/hw/boards.h
M vl.c
Log Message:
-----------
well-defined listing order for machine types
Commit 261747f1 ("vl: Use MachineClass instead of global QEMUMachine
list") broke the ordering of the machine types in the user-visible output
of
qemu-system-XXXX -M \?
This occurred because registration was rebased from a manually maintained
linked list to GLib hash tables:
qemu_register_machine()
type_register()
type_register_internal()
type_table_add()
g_hash_table_insert()
and because the listing was rebased accordingly, from the traversal of the
list to the traversal of the hash table (rendered as an ad-hoc list):
machine_parse()
object_class_get_list(TYPE_MACHINE)
object_class_foreach()
g_hash_table_foreach()
The current order is a "random" one, for practical purposes, which is
annoying for users.
Introduce new members QEMUMachine.family and MachineClass.family, allowing
machine types to be "clustered". Introduce a comparator function that
establishes a total ordering between machine types, ordering machine types
in the same family next to each other. In machine_parse(), list the
supported machine types sorted with the comparator function.
The comparator function:
- sorts whole families before standalone machine types,
- sorts whole families between each other in alphabetically increasing
order,
- sorts machine types inside the same family in alphabetically decreasing
order,
- sorts standalone machine types between each other in alphabetically
increasing order.
After this patch, all machine types are considered standalone, and
accordingly, the output is alphabetically ascending. This will be refined
in the following patches.
Effects on the x86_64 output:
Before:
> Supported machines are:
> pc-0.13 Standard PC (i440FX + PIIX, 1996)
> pc-i440fx-2.0 Standard PC (i440FX + PIIX, 1996)
> pc-1.0 Standard PC (i440FX + PIIX, 1996)
> pc-i440fx-2.1 Standard PC (i440FX + PIIX, 1996)
> pc-q35-1.7 Standard PC (Q35 + ICH9, 2009)
> pc-1.1 Standard PC (i440FX + PIIX, 1996)
> pc-0.14 Standard PC (i440FX + PIIX, 1996)
> pc-q35-2.0 Standard PC (Q35 + ICH9, 2009)
> pc-i440fx-1.4 Standard PC (i440FX + PIIX, 1996)
> pc-i440fx-1.5 Standard PC (i440FX + PIIX, 1996)
> pc-0.15 Standard PC (i440FX + PIIX, 1996)
> pc-q35-1.4 Standard PC (Q35 + ICH9, 2009)
> isapc ISA-only PC
> pc Standard PC (i440FX + PIIX, 1996) (alias of
> pc-i440fx-2.2)
> pc-i440fx-2.2 Standard PC (i440FX + PIIX, 1996) (default)
> pc-1.2 Standard PC (i440FX + PIIX, 1996)
> pc-0.10 Standard PC (i440FX + PIIX, 1996)
> pc-0.11 Standard PC (i440FX + PIIX, 1996)
> pc-q35-2.1 Standard PC (Q35 + ICH9, 2009)
> q35 Standard PC (Q35 + ICH9, 2009) (alias of pc-q35-2.2)
> pc-q35-2.2 Standard PC (Q35 + ICH9, 2009)
> pc-i440fx-1.6 Standard PC (i440FX + PIIX, 1996)
> pc-i440fx-1.7 Standard PC (i440FX + PIIX, 1996)
> none empty machine
> pc-q35-1.5 Standard PC (Q35 + ICH9, 2009)
> pc-q35-1.6 Standard PC (Q35 + ICH9, 2009)
> pc-0.12 Standard PC (i440FX + PIIX, 1996)
> pc-1.3 Standard PC (i440FX + PIIX, 1996)
After:
> Supported machines are:
> isapc ISA-only PC
> none empty machine
> pc-0.10 Standard PC (i440FX + PIIX, 1996)
> pc-0.11 Standard PC (i440FX + PIIX, 1996)
> pc-0.12 Standard PC (i440FX + PIIX, 1996)
> pc-0.13 Standard PC (i440FX + PIIX, 1996)
> pc-0.14 Standard PC (i440FX + PIIX, 1996)
> pc-0.15 Standard PC (i440FX + PIIX, 1996)
> pc-1.0 Standard PC (i440FX + PIIX, 1996)
> pc-1.1 Standard PC (i440FX + PIIX, 1996)
> pc-1.2 Standard PC (i440FX + PIIX, 1996)
> pc-1.3 Standard PC (i440FX + PIIX, 1996)
> pc-i440fx-1.4 Standard PC (i440FX + PIIX, 1996)
> pc-i440fx-1.5 Standard PC (i440FX + PIIX, 1996)
> pc-i440fx-1.6 Standard PC (i440FX + PIIX, 1996)
> pc-i440fx-1.7 Standard PC (i440FX + PIIX, 1996)
> pc-i440fx-2.0 Standard PC (i440FX + PIIX, 1996)
> pc-i440fx-2.1 Standard PC (i440FX + PIIX, 1996)
> pc Standard PC (i440FX + PIIX, 1996) (alias of
> pc-i440fx-2.2)
> pc-i440fx-2.2 Standard PC (i440FX + PIIX, 1996) (default)
> pc-q35-1.4 Standard PC (Q35 + ICH9, 2009)
> pc-q35-1.5 Standard PC (Q35 + ICH9, 2009)
> pc-q35-1.6 Standard PC (Q35 + ICH9, 2009)
> pc-q35-1.7 Standard PC (Q35 + ICH9, 2009)
> pc-q35-2.0 Standard PC (Q35 + ICH9, 2009)
> pc-q35-2.1 Standard PC (Q35 + ICH9, 2009)
> q35 Standard PC (Q35 + ICH9, 2009) (alias of pc-q35-2.2)
> pc-q35-2.2 Standard PC (Q35 + ICH9, 2009)
Effects on the aarch64 output:
Before:
> Supported machines are:
> lm3s811evb Stellaris LM3S811EVB
> canon-a1100 Canon PowerShot A1100 IS
> vexpress-a15 ARM Versatile Express for Cortex-A15
> vexpress-a9 ARM Versatile Express for Cortex-A9
> xilinx-zynq-a9 Xilinx Zynq Platform Baseboard for Cortex-A9
> connex Gumstix Connex (PXA255)
> n800 Nokia N800 tablet aka. RX-34 (OMAP2420)
> lm3s6965evb Stellaris LM3S6965EVB
> versatileab ARM Versatile/AB (ARM926EJ-S)
> borzoi Borzoi PDA (PXA270)
> tosa Tosa PDA (PXA255)
> cheetah Palm Tungsten|E aka. Cheetah PDA (OMAP310)
> midway Calxeda Midway (ECX-2000)
> mainstone Mainstone II (PXA27x)
> n810 Nokia N810 tablet aka. RX-44 (OMAP2420)
> terrier Terrier PDA (PXA270)
> highbank Calxeda Highbank (ECX-1000)
> cubieboard cubietech cubieboard
> sx1-v1 Siemens SX1 (OMAP310) V1
> sx1 Siemens SX1 (OMAP310) V2
> realview-eb-mpcore ARM RealView Emulation Baseboard (ARM11MPCore)
> kzm ARM KZM Emulation Baseboard (ARM1136)
> akita Akita PDA (PXA270)
> z2 Zipit Z2 (PXA27x)
> musicpal Marvell 88w8618 / MusicPal (ARM926EJ-S)
> realview-pb-a8 ARM RealView Platform Baseboard for Cortex-A8
> versatilepb ARM Versatile/PB (ARM926EJ-S)
> realview-eb ARM RealView Emulation Baseboard (ARM926EJ-S)
> realview-pbx-a9 ARM RealView Platform Baseboard Explore for Cortex-A9
> spitz Spitz PDA (PXA270)
> none empty machine
> virt ARM Virtual Machine
> collie Collie PDA (SA-1110)
> smdkc210 Samsung SMDKC210 board (Exynos4210)
> verdex Gumstix Verdex (PXA270)
> nuri Samsung NURI board (Exynos4210)
> integratorcp ARM Integrator/CP (ARM926EJ-S)
After:
> Supported machines are:
> akita Akita PDA (PXA270)
> borzoi Borzoi PDA (PXA270)
> canon-a1100 Canon PowerShot A1100 IS
> cheetah Palm Tungsten|E aka. Cheetah PDA (OMAP310)
> collie Collie PDA (SA-1110)
> connex Gumstix Connex (PXA255)
> cubieboard cubietech cubieboard
> highbank Calxeda Highbank (ECX-1000)
> integratorcp ARM Integrator/CP (ARM926EJ-S)
> kzm ARM KZM Emulation Baseboard (ARM1136)
> lm3s6965evb Stellaris LM3S6965EVB
> lm3s811evb Stellaris LM3S811EVB
> mainstone Mainstone II (PXA27x)
> midway Calxeda Midway (ECX-2000)
> musicpal Marvell 88w8618 / MusicPal (ARM926EJ-S)
> n800 Nokia N800 tablet aka. RX-34 (OMAP2420)
> n810 Nokia N810 tablet aka. RX-44 (OMAP2420)
> none empty machine
> nuri Samsung NURI board (Exynos4210)
> realview-eb ARM RealView Emulation Baseboard (ARM926EJ-S)
> realview-eb-mpcore ARM RealView Emulation Baseboard (ARM11MPCore)
> realview-pb-a8 ARM RealView Platform Baseboard for Cortex-A8
> realview-pbx-a9 ARM RealView Platform Baseboard Explore for Cortex-A9
> smdkc210 Samsung SMDKC210 board (Exynos4210)
> spitz Spitz PDA (PXA270)
> sx1 Siemens SX1 (OMAP310) V2
> sx1-v1 Siemens SX1 (OMAP310) V1
> terrier Terrier PDA (PXA270)
> tosa Tosa PDA (PXA255)
> verdex Gumstix Verdex (PXA270)
> versatileab ARM Versatile/AB (ARM926EJ-S)
> versatilepb ARM Versatile/PB (ARM926EJ-S)
> vexpress-a15 ARM Versatile Express for Cortex-A15
> vexpress-a9 ARM Versatile Express for Cortex-A9
> virt ARM Virtual Machine
> xilinx-zynq-a9 Xilinx Zynq Platform Baseboard for Cortex-A9
> z2 Zipit Z2 (PXA27x)
RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=1145042
Signed-off-by: Laszlo Ersek <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Reviewed-by: Marcel Apfelbaum <address@hidden>
Acked-by: David Gibson <address@hidden>
Commit: 562542b6aee2c6be5b6c411edc92c11905b4e9c9
https://github.com/qemu/qemu/commit/562542b6aee2c6be5b6c411edc92c11905b4e9c9
Author: Laszlo Ersek <address@hidden>
Date: 2014-11-02 (Sun, 02 Nov 2014)
Changed paths:
M hw/i386/pc_piix.c
M hw/i386/pc_q35.c
Log Message:
-----------
i386/pc: add piix and q35 machtypes to sorting families for -M \?
With this patch applied, the output of -M \? is
> Supported machines are:
> pc Standard PC (i440FX + PIIX, 1996) (alias of
> pc-i440fx-2.2)
> pc-i440fx-2.2 Standard PC (i440FX + PIIX, 1996) (default)
> pc-i440fx-2.1 Standard PC (i440FX + PIIX, 1996)
> pc-i440fx-2.0 Standard PC (i440FX + PIIX, 1996)
> pc-i440fx-1.7 Standard PC (i440FX + PIIX, 1996)
> pc-i440fx-1.6 Standard PC (i440FX + PIIX, 1996)
> pc-i440fx-1.5 Standard PC (i440FX + PIIX, 1996)
> pc-i440fx-1.4 Standard PC (i440FX + PIIX, 1996)
> pc-1.3 Standard PC (i440FX + PIIX, 1996)
> pc-1.2 Standard PC (i440FX + PIIX, 1996)
> pc-1.1 Standard PC (i440FX + PIIX, 1996)
> pc-1.0 Standard PC (i440FX + PIIX, 1996)
> pc-0.15 Standard PC (i440FX + PIIX, 1996)
> pc-0.14 Standard PC (i440FX + PIIX, 1996)
> pc-0.13 Standard PC (i440FX + PIIX, 1996)
> pc-0.12 Standard PC (i440FX + PIIX, 1996)
> pc-0.11 Standard PC (i440FX + PIIX, 1996)
> pc-0.10 Standard PC (i440FX + PIIX, 1996)
> q35 Standard PC (Q35 + ICH9, 2009) (alias of pc-q35-2.2)
> pc-q35-2.2 Standard PC (Q35 + ICH9, 2009)
> pc-q35-2.1 Standard PC (Q35 + ICH9, 2009)
> pc-q35-2.0 Standard PC (Q35 + ICH9, 2009)
> pc-q35-1.7 Standard PC (Q35 + ICH9, 2009)
> pc-q35-1.6 Standard PC (Q35 + ICH9, 2009)
> pc-q35-1.5 Standard PC (Q35 + ICH9, 2009)
> pc-q35-1.4 Standard PC (Q35 + ICH9, 2009)
> isapc ISA-only PC
> none empty machine
RHBZ: https://bugzilla.redhat.com/show_bug.cgi?id=1145042
Signed-off-by: Laszlo Ersek <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Reviewed-by: Marcel Apfelbaum <address@hidden>
Acked-by: David Gibson <address@hidden>
Commit: df1fd4b541b3ae0dc44843741363d00080775294
https://github.com/qemu/qemu/commit/df1fd4b541b3ae0dc44843741363d00080775294
Author: Jan Kiszka <address@hidden>
Date: 2014-11-02 (Sun, 02 Nov 2014)
Changed paths:
M hw/i386/pc_piix.c
Log Message:
-----------
pc: Fix disabling of vapic for compat PC models
We used to be able to address both the QEMU and the KVM APIC via "apic".
This doesn't work anymore. So we need to use their parent class to turn
off the vapic on machines that should not expose them.
Signed-off-by: Jan Kiszka <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Commit: 1c87d68c91dc91771a9189d518e75bf15babc33b
https://github.com/qemu/qemu/commit/1c87d68c91dc91771a9189d518e75bf15babc33b
Author: Gal Hammer <address@hidden>
Date: 2014-11-02 (Sun, 02 Nov 2014)
Changed paths:
M scripts/acpi_extract.py
Log Message:
-----------
i386: Add an ACPI_EXTRACT_NAME_BUFFER16 directive.
Add a 16-bytes buffer to allow storing a 128-bit UUID value in an
ACPI table.
Signed-off-by: Gal Hammer <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Commit: 4d5e17a53b12bf48953aa486d71bd1f5549c0dea
https://github.com/qemu/qemu/commit/4d5e17a53b12bf48953aa486d71bd1f5549c0dea
Author: Gonglei <address@hidden>
Date: 2014-11-02 (Sun, 02 Nov 2014)
Changed paths:
M hw/pci/pcie.c
Log Message:
-----------
pcie: change confused comment clearer
This comment applies to all functions below it.
It is not appropriate that called capability allocation
functions, change it into capability list management functions.
Signed-off-by: Gonglei <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Commit: 68a27b208a2328653faa09bc7a13d7ef0e2710bb
https://github.com/qemu/qemu/commit/68a27b208a2328653faa09bc7a13d7ef0e2710bb
Author: Michael S. Tsirkin <address@hidden>
Date: 2014-11-02 (Sun, 02 Nov 2014)
Changed paths:
M hw/i386/pc_piix.c
M hw/i386/pc_q35.c
M hw/ppc/spapr.c
M hw/virtio/virtio-pci.c
M hw/virtio/virtio-pci.h
A include/hw/compat.h
M include/hw/i386/pc.h
Log Message:
-----------
virtio-pci: fix migration for pci bus master
Current support for bus master (clearing OK bit) together with the need to
support guests which do not enable PCI bus mastering, leads to extra state in
VIRTIO_PCI_FLAG_BUS_MASTER_BUG bit, which isn't robust in case of cross-version
migration for the case when guests use the device before setting DRIVER_OK.
Rip out this code, and replace it:
- Modern QEMU doesn't need VIRTIO_PCI_FLAG_BUS_MASTER_BUG
so just drop it for latest machine type.
- For compat machine types, set PCI_COMMAND if DRIVER_OK
is set.
As this is needed for 2.1 for both pc and ppc, move PC_COMPAT macros from pc.h
to a new common header.
Cc: Greg Kurz <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Alexander Graf <address@hidden>
Commit: 1e06f131fd9a44dd4af223875660802fd2a3441f
https://github.com/qemu/qemu/commit/1e06f131fd9a44dd4af223875660802fd2a3441f
Author: Michael S. Tsirkin <address@hidden>
Date: 2014-11-02 (Sun, 02 Nov 2014)
Changed paths:
M include/hw/i386/intel_iommu.h
Log Message:
-----------
intel_iommu: fix VTD_SID_TO_BUS
(((sid) >> 8) && 0xff) makes no sense
(((sid) >> 8) & 0xff) seems to be what was meant.
https://bugs.launchpad.net/qemu/+bug/1382477
Signed-off-by: Michael S. Tsirkin <address@hidden>
Commit: 904757916150574747683d3000c978cd30291096
https://github.com/qemu/qemu/commit/904757916150574747683d3000c978cd30291096
Author: Paolo Bonzini <address@hidden>
Date: 2014-11-02 (Sun, 02 Nov 2014)
Changed paths:
M tests/acpi-test-data/rebuild-expected-aml.sh
Log Message:
-----------
tests: fix rebuild-expected-aml.sh for acpi-test rename
This is now called bios-tables-test.
Signed-off-by: Paolo Bonzini <address@hidden>
Acked-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Commit: 42a5b30844207e5644ba3c2d30f719d5bad9ee72
https://github.com/qemu/qemu/commit/42a5b30844207e5644ba3c2d30f719d5bad9ee72
Author: Stefan Berger <address@hidden>
Date: 2014-11-02 (Sun, 02 Nov 2014)
Changed paths:
M hw/i386/acpi-build.c
Log Message:
-----------
acpi: create separate file for TCPA log
Create the TCPA log in a separate file rather than allocating
ACPI table memory for it.
Signed-off-by: Stefan Berger <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Commit: 1be6b511a6a6f0d87b57725cf8d5caefcff3cc9a
https://github.com/qemu/qemu/commit/1be6b511a6a6f0d87b57725cf8d5caefcff3cc9a
Author: Gu Zheng <address@hidden>
Date: 2014-11-02 (Sun, 02 Nov 2014)
Changed paths:
M hw/acpi/cpu_hotplug.c
M include/hw/acpi/cpu_hotplug.h
Log Message:
-----------
acpi/cpu: add cpu hotplug callback function to match hotplug_handler API
Add cpu hotplug callback function (acpi_cpu_plug_cb) to match hotplug_handler
API.
Reviewed-by: Igor Mammedov <address@hidden>
Signed-off-by: Gu Zheng <address@hidden>
Acked-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Commit: c5171ed0cf9ca54d5f461cd6d08e99f324ba4c55
https://github.com/qemu/qemu/commit/c5171ed0cf9ca54d5f461cd6d08e99f324ba4c55
Author: Gu Zheng <address@hidden>
Date: 2014-11-02 (Sun, 02 Nov 2014)
Changed paths:
M hw/acpi/ich9.c
M include/hw/acpi/ich9.h
Log Message:
-----------
acpi:ich9: convert cpu hotplug to hotplug_handler API
Convert notifier based hotplug to hotplug_handler API.
Reviewed-by: Igor Mammedov <address@hidden>
Signed-off-by: Gu Zheng <address@hidden>
Acked-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Commit: 08bba95bd3782c74de9cac29e6f8f6b7a5d50392
https://github.com/qemu/qemu/commit/08bba95bd3782c74de9cac29e6f8f6b7a5d50392
Author: Gu Zheng <address@hidden>
Date: 2014-11-02 (Sun, 02 Nov 2014)
Changed paths:
M hw/acpi/cpu_hotplug.c
M hw/acpi/piix4.c
M include/hw/acpi/cpu_hotplug.h
Log Message:
-----------
acpi:piix4: convert cpu hotplug to hotplug_handler API
Convert notifier based hotplug to hotplug_handler API,
and remove the unused AcpiCpuHotplug_add().
Reviewed-by: Igor Mammedov <address@hidden>
Signed-off-by: Gu Zheng <address@hidden>
Acked-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Commit: 5279569eead697a41aa34b300ebbf13e4782f4f5
https://github.com/qemu/qemu/commit/5279569eead697a41aa34b300ebbf13e4782f4f5
Author: Gu Zheng <address@hidden>
Date: 2014-11-02 (Sun, 02 Nov 2014)
Changed paths:
M hw/i386/pc.c
Log Message:
-----------
pc: add cpu hotplug handler to PC_MACHINE
Add cpu hotplug handler to PC_MACHINE, which will perform the acpi
cpu hotplug callback via hotplug_handler API.
Reviewed-by: Igor Mammedov <address@hidden>
Signed-off-by: Gu Zheng <address@hidden>
Acked-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Commit: 2d996150ed68edb8754b73b36a3db187c08f2ba7
https://github.com/qemu/qemu/commit/2d996150ed68edb8754b73b36a3db187c08f2ba7
Author: Gu Zheng <address@hidden>
Date: 2014-11-02 (Sun, 02 Nov 2014)
Changed paths:
M hw/i386/pc.c
M hw/i386/pc_piix.c
M hw/i386/pc_q35.c
M include/hw/i386/pc.h
Log Message:
-----------
pc: Update rtc_cmos in pc_cpu_plug
Update rtc_cmos in pc_cpu_plug() directly, instead of the notifier.
Reviewed-by: Igor Mammedov <address@hidden>
Signed-off-by: Gu Zheng <address@hidden>
Acked-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Commit: fcd702e17a4aad936c53881fcdac1d9b9eb98452
https://github.com/qemu/qemu/commit/fcd702e17a4aad936c53881fcdac1d9b9eb98452
Author: Gu Zheng <address@hidden>
Date: 2014-11-02 (Sun, 02 Nov 2014)
Changed paths:
M include/sysemu/sysemu.h
M qom/cpu.c
Log Message:
-----------
qom/cpu: remove the unused CPU hot-plug notifier
Remove the unused CPU hot-plug notifier.
Reviewed-by: Igor Mammedov <address@hidden>
Signed-off-by: Gu Zheng <address@hidden>
Acked-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Commit: 411b5db8e51108f023d02ba7e37c6e5e2294b337
https://github.com/qemu/qemu/commit/411b5db8e51108f023d02ba7e37c6e5e2294b337
Author: Gu Zheng <address@hidden>
Date: 2014-11-02 (Sun, 02 Nov 2014)
Changed paths:
M hw/acpi/cpu_hotplug.c
M hw/acpi/ich9.c
M hw/acpi/piix4.c
M include/hw/acpi/cpu_hotplug.h
Log Message:
-----------
cpu-hotplug: rename function for better readability
Rename:
AcpiCpuHotplug_init --> acpi_cpu_hotplug_init
AcpiCpuHotplug_ops --> acpi_cpu_hotplug_ops
for better readability, just cleanup.
Reviewed-by: Igor Mammedov <address@hidden>
Signed-off-by: Gu Zheng <address@hidden>
Acked-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Commit: cc43364de7773c9838cedf8f461b7788b8b4fd8e
https://github.com/qemu/qemu/commit/cc43364de7773c9838cedf8f461b7788b8b4fd8e
Author: Gu Zheng <address@hidden>
Date: 2014-11-02 (Sun, 02 Nov 2014)
Changed paths:
M hw/acpi/cpu_hotplug.c
Log Message:
-----------
acpi/cpu-hotplug: introduce helper function to keep bit setting in one place
Introduce helper function acpi_set_cpu_present_bit() to simplify
acpi_cpu_plug_cb
and acpi_cpu_hotplug_init, so that we can keep bit setting in one place.
Signed-off-by: Gu Zheng <address@hidden>
Acked-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Commit: 9b23cfb76b3a5e9eb5cc899eaf2f46bc46d33ba4
https://github.com/qemu/qemu/commit/9b23cfb76b3a5e9eb5cc899eaf2f46bc46d33ba4
Author: Dr. David Alan Gilbert <address@hidden>
Date: 2014-11-02 (Sun, 02 Nov 2014)
Changed paths:
M hw/i386/pc.c
M hw/i386/pc_piix.c
M hw/i386/pc_q35.c
M include/hw/i386/pc.h
M qemu-options.hx
M vl.c
Log Message:
-----------
-machine vmport=off: Allow disabling of VMWare ioport emulation
This is a pc & q35 only machine opt.
VMWare apparently doesn't like running under QEMU due to our
incomplete emulation of it's special IO Port. This adds a
pc & q35 property to allow it to be turned off.
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Don Slutz <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
Reviewed-by: Eduardo Habkost <address@hidden>
Reviewed-by: Richard W.M. Jones <address@hidden>
Commit: 178e785fb4507ec3462dc772bbe08303416ece47
https://github.com/qemu/qemu/commit/178e785fb4507ec3462dc772bbe08303416ece47
Author: Marcel Apfelbaum <address@hidden>
Date: 2014-11-02 (Sun, 02 Nov 2014)
Changed paths:
M hw/pci/pci.c
Log Message:
-----------
hw/pci: fixed error flow in pci_qdev_init
Verify return code for pci_add_option_rom.
Signed-off-by: Marcel Apfelbaum <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Commit: db80c7b974f4ccab56bd5e8ff2248c7339b00c73
https://github.com/qemu/qemu/commit/db80c7b974f4ccab56bd5e8ff2248c7339b00c73
Author: Marcel Apfelbaum <address@hidden>
Date: 2014-11-02 (Sun, 02 Nov 2014)
Changed paths:
M hw/pci/pci.c
Log Message:
-----------
hw/pci: fixed hotplug crash when using rombar=0 with devices having romfile
Hot-plugging a device that has a romfile (either supplied by user
or built-in) using rombar=0 option is a user error,
do not allow the device to be hot-plugged.
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Marcel Apfelbaum <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Commit: a3614c65cfc3ba2958b69befdc156101953f8a8c
https://github.com/qemu/qemu/commit/a3614c65cfc3ba2958b69befdc156101953f8a8c
Author: Bin Wu <address@hidden>
Date: 2014-11-02 (Sun, 02 Nov 2014)
Changed paths:
M hw/virtio/dataplane/vring.c
M hw/virtio/virtio.c
Log Message:
-----------
hw/virtio/vring/event_idx: fix the vring_avail_event error
The event idx in virtio is an effective way to reduce the number of
interrupts and exits of the guest. When the guest puts an request
into the virtio ring, it doesn't exit immediately to inform the
backend. Instead, the guest checks the "avail" event idx to determine
the notification.
In virtqueue_pop, when a request is poped, the current avail event
idx should be set to the number of vq->last_avail_idx.
Signed-off-by: Bin Wu <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Commit: 2cad57c7177766e2779f30fed9e4578bc7ad62ac
https://github.com/qemu/qemu/commit/2cad57c7177766e2779f30fed9e4578bc7ad62ac
Author: Eduardo Habkost <address@hidden>
Date: 2014-11-02 (Sun, 02 Nov 2014)
Changed paths:
M hw/i386/pc_piix.c
M hw/i386/pc_q35.c
Log Message:
-----------
pc: Add pc_compat_2_1() function
Signed-off-by: Eduardo Habkost <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Commit: caad057bb6ce86a9cb71520af395fd0bd04a659f
https://github.com/qemu/qemu/commit/caad057bb6ce86a9cb71520af395fd0bd04a659f
Author: Eduardo Habkost <address@hidden>
Date: 2014-11-02 (Sun, 02 Nov 2014)
Changed paths:
M hw/i386/pc_piix.c
M hw/i386/pc_q35.c
M hw/i386/smbios.c
M include/hw/i386/smbios.h
M vl.c
Log Message:
-----------
smbios: Encode UUID according to SMBIOS specification
Differently from older versions, SMBIOS version 2.6 is explicit about
the encoding of UUID fields:
> Although RFC 4122 recommends network byte order for all fields, the PC
> industry (including the ACPI, UEFI, and Microsoft specifications) has
> consistently used little-endian byte encoding for the first three fields:
> time_low, time_mid, time_hi_and_version. The same encoding, also known as
> wire format, should also be used for the SMBIOS representation of the UUID.
>
> The UUID {00112233-4455-6677-8899-AABBCCDDEEFF} would thus be represented
> as 33 22 11 00 55 44 77 66 88 99 AA BB CC DD EE FF.
The dmidecode tool implements this and decodes the above "wire format"
when SMBIOS version >= 2.6. We moved from SMBIOS version 2.4 to 2.8 when
we started building the SMBIOS entry point inside QEMU, on commit
c97294ec1b9e36887e119589d456557d72ab37b5.
Change smbios_build_type_1_table() to encode the UUID as specified.
To make sure we won't change the guest-visible UUID when upgrading to a
newer QEMU version, keep the old behavior on pc-*-2.1 and older.
Signed-off-by: Eduardo Habkost <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Commit: ac369a77967d5dd984a5430505eaf24a380af1c0
https://github.com/qemu/qemu/commit/ac369a77967d5dd984a5430505eaf24a380af1c0
Author: Nikita Belov <address@hidden>
Date: 2014-11-02 (Sun, 02 Nov 2014)
Changed paths:
M hw/i386/acpi-build.c
Log Message:
-----------
hw/i386/acpi-build.c: Fix memory leak in acpi_build_tables_cleanup()
There are three ACPI tables: 'linker_data', 'rsdp' and 'table_data'. They are
used differently. Two of them are being copied before using and only the copy
is used later. But the third is used directly. Because of that we need to free
two tables completely and delete only wrapper for the third one.
Valgrind output:
==23931== 131,072 bytes in 1 blocks are definitely lost in loss record 7,729 of
7,734
==23931== at 0x4C2CE8E: realloc (in
/usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
==23931== by 0x2EA920: realloc_and_trace (vl.c:2811)
==23931== by 0x509E6AE: g_realloc (in
/lib/x86_64-linux-gnu/libglib-2.0.so.0.4000.0)
==23931== by 0x506DB32: ??? (in
/lib/x86_64-linux-gnu/libglib-2.0.so.0.4000.0)
==23931== by 0x506E463: g_array_set_size (in
/lib/x86_64-linux-gnu/libglib-2.0.so.0.4000.0)
==23931== by 0x256A4F: acpi_align_size (acpi-build.c:487)
==23931== by 0x259F92: acpi_build (acpi-build.c:1601)
==23931== by 0x25A212: acpi_setup (acpi-build.c:1682)
==23931== by 0x24F346: pc_guest_info_machine_done (pc.c:1110)
==23931== by 0x55FAAB: notifier_list_notify (notify.c:39)
==23931== by 0x2EA704: qemu_run_machine_init_done_notifiers (vl.c:2759)
==23931== by 0x2EEC3C: main (vl.c:4504)
Signed-off-by: Nikita Belov <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Acked-by: Christian Borntraeger <address@hidden>
Commit: d3f16ec887bb58b19eac94fcae139a39a7933e15
https://github.com/qemu/qemu/commit/d3f16ec887bb58b19eac94fcae139a39a7933e15
Author: Michael S. Tsirkin <address@hidden>
Date: 2014-11-03 (Mon, 03 Nov 2014)
Changed paths:
M hw/virtio/vhost-user.c
Log Message:
-----------
vhost-user: fix mmap offset calculation
qemu_get_ram_block_host_ptr should get ram_addr_t,
vhost-user passes in GPA.
That's very wrong.
Reported-by: Linhaifeng <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Commit: 6f00494abed261cdbfdd003fe45f671eb3a56d78
https://github.com/qemu/qemu/commit/6f00494abed261cdbfdd003fe45f671eb3a56d78
Author: Gerd Hoffmann <address@hidden>
Date: 2014-11-03 (Mon, 03 Nov 2014)
Changed paths:
M hw/i386/pc.c
M include/hw/boards.h
M vl.c
Log Message:
-----------
vga: add default display to machine class
This allows machine classes to specify which display device they want
as default. If unspecified the current behavior (try cirrus, failing
that try stdvga, failing that use no display) will be used.
Signed-off-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Commit: d43f0d641e366251bd9c63005241775f672bf3ec
https://github.com/qemu/qemu/commit/d43f0d641e366251bd9c63005241775f672bf3ec
Author: Gerd Hoffmann <address@hidden>
Date: 2014-11-03 (Mon, 03 Nov 2014)
Changed paths:
M hw/i386/pc_piix.c
M hw/i386/pc_q35.c
Log Message:
-----------
vga: flip qemu 2.2 pc machine types from cirrus to stdvga
This patch switches the default display from cirrus to vga
for the new (qemu 2.2+) machine types. Old machines types
stay as-is for compatibility reasons.
Signed-off-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
Commit: 949ca9e479c381a63ddb257adca1a6f0c44d898e
https://github.com/qemu/qemu/commit/949ca9e479c381a63ddb257adca1a6f0c44d898e
Author: Peter Maydell <address@hidden>
Date: 2014-11-03 (Mon, 03 Nov 2014)
Changed paths:
M hw/acpi/cpu_hotplug.c
M hw/acpi/ich9.c
M hw/acpi/piix4.c
M hw/i386/acpi-build.c
M hw/i386/pc.c
M hw/i386/pc_piix.c
M hw/i386/pc_q35.c
M hw/i386/smbios.c
M hw/pci/pci.c
M hw/pci/pcie.c
M hw/ppc/spapr.c
M hw/virtio/dataplane/vring.c
M hw/virtio/vhost-user.c
M hw/virtio/virtio-pci.c
M hw/virtio/virtio-pci.h
M hw/virtio/virtio.c
M include/hw/acpi/cpu_hotplug.h
M include/hw/acpi/ich9.h
M include/hw/boards.h
A include/hw/compat.h
M include/hw/i386/intel_iommu.h
M include/hw/i386/pc.h
M include/hw/i386/smbios.h
M include/sysemu/sysemu.h
M qom/cpu.c
M scripts/acpi_extract.py
M tests/acpi-test-data/rebuild-expected-aml.sh
M vl.c
Log Message:
-----------
Merge remote-tracking branch 'remotes/mst/tags/for_upstream' into staging
pc, virtio, misc bugfixes
A bunch of minor bugfixes all over the place.
changes from v2:
added cpu hotplug rework
added default vga type switch
more fixes
changes from v1:
fix for test re-generation script
add missing acks to two patches
Signed-off-by: Michael S. Tsirkin <address@hidden>
# gpg: Signature made Mon 03 Nov 2014 16:33:13 GMT using RSA key ID D28D5469
# gpg: Good signature from "Michael S. Tsirkin <address@hidden>"
# gpg: aka "Michael S. Tsirkin <address@hidden>"
* remotes/mst/tags/for_upstream: (28 commits)
vga: flip qemu 2.2 pc machine types from cirrus to stdvga
vga: add default display to machine class
vhost-user: fix mmap offset calculation
hw/i386/acpi-build.c: Fix memory leak in acpi_build_tables_cleanup()
smbios: Encode UUID according to SMBIOS specification
pc: Add pc_compat_2_1() function
hw/virtio/vring/event_idx: fix the vring_avail_event error
hw/pci: fixed hotplug crash when using rombar=0 with devices having romfile
hw/pci: fixed error flow in pci_qdev_init
-machine vmport=off: Allow disabling of VMWare ioport emulation
acpi/cpu-hotplug: introduce helper function to keep bit setting in one place
cpu-hotplug: rename function for better readability
qom/cpu: remove the unused CPU hot-plug notifier
pc: Update rtc_cmos in pc_cpu_plug
pc: add cpu hotplug handler to PC_MACHINE
acpi:piix4: convert cpu hotplug to hotplug_handler API
acpi:ich9: convert cpu hotplug to hotplug_handler API
acpi/cpu: add cpu hotplug callback function to match hotplug_handler API
acpi: create separate file for TCPA log
tests: fix rebuild-expected-aml.sh for acpi-test rename
...
Signed-off-by: Peter Maydell <address@hidden>
Compare: https://github.com/qemu/qemu/compare/47e8acb45fed...949ca9e479c3
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Qemu-commits] [qemu/qemu] 7dfddd: smbios: Fix assertion on socket count calculation,
GitHub <=